diff --git a/.metadata/.log b/.metadata/.log
index 62cfd1d8..022b6ebd 100644
--- a/.metadata/.log
+++ b/.metadata/.log
@@ -2873,3 +2873,2098 @@ java.lang.StringIndexOutOfBoundsException: begin 0, end 3, length 2
 	at org.eclipse.equinox.launcher.Main.invokeFramework(Main.java:659)
 	at org.eclipse.equinox.launcher.Main.basicRun(Main.java:596)
 	at org.eclipse.equinox.launcher.Main.run(Main.java:1467)
+
+!ENTRY org.eclipse.lsp4e 4 0 2023-03-02 20:55:21.028
+!MESSAGE org.eclipse.lsp4j.jsonrpc.JsonRpcException: java.io.IOException: The pipe is being closed
+!STACK 0
+java.util.concurrent.ExecutionException: org.eclipse.lsp4j.jsonrpc.JsonRpcException: java.io.IOException: The pipe is being closed
+	at java.base/java.util.concurrent.CompletableFuture.reportGet(CompletableFuture.java:396)
+	at java.base/java.util.concurrent.CompletableFuture.get(CompletableFuture.java:2096)
+	at org.eclipse.lsp4e.LanguageServerWrapper.lambda$10(LanguageServerWrapper.java:547)
+	at java.base/java.util.concurrent.CompletableFuture$AsyncRun.run(CompletableFuture.java:1804)
+	at java.base/java.util.concurrent.CompletableFuture$AsyncRun.exec(CompletableFuture.java:1796)
+	at java.base/java.util.concurrent.ForkJoinTask.doExec(ForkJoinTask.java:373)
+	at java.base/java.util.concurrent.ForkJoinPool$WorkQueue.topLevelExec(ForkJoinPool.java:1182)
+	at java.base/java.util.concurrent.ForkJoinPool.scan(ForkJoinPool.java:1655)
+	at java.base/java.util.concurrent.ForkJoinPool.runWorker(ForkJoinPool.java:1622)
+	at java.base/java.util.concurrent.ForkJoinWorkerThread.run(ForkJoinWorkerThread.java:165)
+Caused by: org.eclipse.lsp4j.jsonrpc.JsonRpcException: java.io.IOException: The pipe is being closed
+	at org.eclipse.lsp4j.jsonrpc.json.StreamMessageConsumer.consume(StreamMessageConsumer.java:72)
+	at org.eclipse.lsp4e.LanguageServerWrapper.lambda$3(LanguageServerWrapper.java:315)
+	at org.eclipse.lsp4j.jsonrpc.RemoteEndpoint.request(RemoteEndpoint.java:161)
+	at org.eclipse.lsp4j.jsonrpc.services.EndpointProxy.invoke(EndpointProxy.java:91)
+	at jdk.proxy15/jdk.proxy15.$Proxy51.shutdown(Unknown Source)
+	at org.eclipse.lsp4e.LanguageServerWrapper.lambda$10(LanguageServerWrapper.java:545)
+	... 7 more
+Caused by: java.io.IOException: The pipe is being closed
+	at java.base/java.io.FileOutputStream.writeBytes(Native Method)
+	at java.base/java.io.FileOutputStream.write(FileOutputStream.java:349)
+	at java.base/java.io.BufferedOutputStream.flushBuffer(BufferedOutputStream.java:81)
+	at java.base/java.io.BufferedOutputStream.flush(BufferedOutputStream.java:142)
+	at org.eclipse.lsp4j.jsonrpc.json.StreamMessageConsumer.consume(StreamMessageConsumer.java:69)
+	... 12 more
+
+!ENTRY org.eclipse.lsp4e 2 0 2023-03-02 20:55:49.996
+!MESSAGE Timeout waiting for data to generate LS hover
+!STACK 0
+java.util.concurrent.TimeoutException
+	at java.base/java.util.concurrent.CompletableFuture.timedGet(CompletableFuture.java:1960)
+	at java.base/java.util.concurrent.CompletableFuture.get(CompletableFuture.java:2095)
+	at org.eclipse.lsp4e.jdt.LSJavaHoverProvider.getHoverInfo2(LSJavaHoverProvider.java:70)
+	at org.eclipse.jdt.internal.ui.text.java.hover.BestMatchHover.getHoverInfo2(BestMatchHover.java:163)
+	at org.eclipse.jdt.internal.ui.text.java.hover.BestMatchHover.getHoverInfo2(BestMatchHover.java:130)
+	at org.eclipse.jdt.internal.ui.text.java.hover.JavaEditorTextHoverProxy.getHoverInfo2(JavaEditorTextHoverProxy.java:89)
+	at org.eclipse.jface.text.TextViewerHoverManager$1.run(TextViewerHoverManager.java:155)
+
+!ENTRY org.eclipse.lsp4e 2 0 2023-03-02 20:56:44.072
+!MESSAGE Javadoc unavailable. Failed to obtain it.
+!STACK 0
+java.lang.InterruptedException
+	at java.base/java.util.concurrent.CompletableFuture.reportGet(CompletableFuture.java:386)
+	at java.base/java.util.concurrent.CompletableFuture.get(CompletableFuture.java:2096)
+	at org.eclipse.lsp4e.jdt.LSJavaHoverProvider.getHoverInfo2(LSJavaHoverProvider.java:70)
+	at org.eclipse.jdt.internal.ui.text.java.hover.BestMatchHover.getHoverInfo2(BestMatchHover.java:163)
+	at org.eclipse.jdt.internal.ui.text.java.hover.BestMatchHover.getHoverInfo2(BestMatchHover.java:130)
+	at org.eclipse.jdt.internal.ui.text.java.hover.JavaEditorTextHoverProxy.getHoverInfo2(JavaEditorTextHoverProxy.java:89)
+	at org.eclipse.jface.text.TextViewerHoverManager$1.run(TextViewerHoverManager.java:155)
+
+!ENTRY org.eclipse.lsp4e 1 0 2023-03-02 23:15:48.946
+!MESSAGE [Log]	Scanner.scan has not advanced at offset 1755, state before: 10 after: 4
+
+!ENTRY org.eclipse.lsp4e 4 0 2023-03-02 23:15:51.539
+!MESSAGE Marker id 2766 not found.
+!STACK 1
+org.eclipse.core.internal.resources.ResourceException: Marker id 2766 not found.
+	at org.eclipse.core.internal.resources.Marker.checkInfo(Marker.java:63)
+	at org.eclipse.core.internal.resources.Marker.setAttribute(Marker.java:260)
+	at org.eclipse.lsp4e.operations.codeactions.LSPCodeActionMarkerResolution.lambda$1(LSPCodeActionMarkerResolution.java:149)
+	at java.base/java.util.concurrent.CompletableFuture$UniAccept.tryFire(CompletableFuture.java:718)
+	at java.base/java.util.concurrent.CompletableFuture$Completion.exec(CompletableFuture.java:483)
+	at java.base/java.util.concurrent.ForkJoinTask.doExec(ForkJoinTask.java:373)
+	at java.base/java.util.concurrent.ForkJoinPool$WorkQueue.topLevelExec(ForkJoinPool.java:1182)
+	at java.base/java.util.concurrent.ForkJoinPool.scan(ForkJoinPool.java:1655)
+	at java.base/java.util.concurrent.ForkJoinPool.runWorker(ForkJoinPool.java:1622)
+	at java.base/java.util.concurrent.ForkJoinWorkerThread.run(ForkJoinWorkerThread.java:165)
+!SUBENTRY 1 org.eclipse.core.resources 4 376 2023-03-02 23:15:51.539
+!MESSAGE Marker id 2766 not found.
+
+!ENTRY org.eclipse.lsp4e 4 0 2023-03-02 23:15:51.540
+!MESSAGE Marker id 2766 not found.
+!STACK 1
+org.eclipse.core.internal.resources.ResourceException: Marker id 2766 not found.
+	at org.eclipse.core.internal.resources.Marker.checkInfo(Marker.java:63)
+	at org.eclipse.core.internal.resources.Marker.getAttribute(Marker.java:108)
+	at org.eclipse.lsp4e.operations.codeactions.LSPCodeActionMarkerResolution.hasResolutions(LSPCodeActionMarkerResolution.java:237)
+	at org.eclipse.ui.internal.ide.registry.MarkerHelpRegistry.hasResolution(MarkerHelpRegistry.java:264)
+	at org.eclipse.ui.internal.ide.registry.MarkerHelpRegistry.hasResolutions(MarkerHelpRegistry.java:234)
+	at org.eclipse.ui.views.markers.MarkerField.annotateImage(MarkerField.java:87)
+	at org.eclipse.ui.internal.views.markers.MarkerProblemSeverityAndMessageField.update(MarkerProblemSeverityAndMessageField.java:80)
+	at org.eclipse.ui.internal.views.markers.MarkerColumnLabelProvider.update(MarkerColumnLabelProvider.java:57)
+	at org.eclipse.jface.viewers.ViewerColumn.refresh(ViewerColumn.java:144)
+	at org.eclipse.jface.viewers.AbstractTreeViewer.doUpdateItem(AbstractTreeViewer.java:970)
+	at org.eclipse.ui.internal.views.markers.MarkersTreeViewer.doUpdateItem(MarkersTreeViewer.java:70)
+	at org.eclipse.jface.viewers.AbstractTreeViewer$UpdateItemSafeRunnable.run(AbstractTreeViewer.java:126)
+	at org.eclipse.core.runtime.SafeRunner.run(SafeRunner.java:45)
+	at org.eclipse.jface.util.SafeRunnable.run(SafeRunnable.java:174)
+	at org.eclipse.jface.viewers.AbstractTreeViewer.doUpdateItem(AbstractTreeViewer.java:1048)
+	at org.eclipse.jface.viewers.StructuredViewer$UpdateItemSafeRunnable.run(StructuredViewer.java:427)
+	at org.eclipse.core.runtime.SafeRunner.run(SafeRunner.java:45)
+	at org.eclipse.jface.util.SafeRunnable.run(SafeRunnable.java:174)
+	at org.eclipse.jface.viewers.StructuredViewer.updateItem(StructuredViewer.java:2107)
+	at org.eclipse.jface.viewers.AbstractTreeViewer.createTreeItem(AbstractTreeViewer.java:864)
+	at org.eclipse.jface.viewers.AbstractTreeViewer.createChildren(AbstractTreeViewer.java:842)
+	at org.eclipse.jface.viewers.TreeViewer.createChildren(TreeViewer.java:611)
+	at org.eclipse.jface.viewers.AbstractTreeViewer.internalExpandToLevel(AbstractTreeViewer.java:1821)
+	at org.eclipse.jface.viewers.AbstractTreeViewer.expandToLevel(AbstractTreeViewer.java:1144)
+	at org.eclipse.jface.viewers.AbstractTreeViewer.expandToLevel(AbstractTreeViewer.java:1116)
+	at org.eclipse.ui.internal.views.markers.ExtendedMarkersView.reexpandCategories(ExtendedMarkersView.java:1196)
+	at org.eclipse.ui.internal.views.markers.UIUpdateJob.runInUIThread(UIUpdateJob.java:106)
+	at org.eclipse.ui.progress.UIJob.lambda$0(UIJob.java:148)
+	at org.eclipse.swt.widgets.RunnableLock.run(RunnableLock.java:40)
+	at org.eclipse.swt.widgets.Synchronizer.runAsyncMessages(Synchronizer.java:132)
+	at org.eclipse.swt.widgets.Display.runAsyncMessages(Display.java:4029)
+	at org.eclipse.swt.widgets.Display.readAndDispatch(Display.java:3645)
+	at org.eclipse.e4.ui.internal.workbench.swt.PartRenderingEngine$5.run(PartRenderingEngine.java:1155)
+	at org.eclipse.core.databinding.observable.Realm.runWithDefault(Realm.java:338)
+	at org.eclipse.e4.ui.internal.workbench.swt.PartRenderingEngine.run(PartRenderingEngine.java:1046)
+	at org.eclipse.e4.ui.internal.workbench.E4Workbench.createAndRunUI(E4Workbench.java:155)
+	at org.eclipse.ui.internal.Workbench.lambda$3(Workbench.java:643)
+	at org.eclipse.core.databinding.observable.Realm.runWithDefault(Realm.java:338)
+	at org.eclipse.ui.internal.Workbench.createAndRunWorkbench(Workbench.java:550)
+	at org.eclipse.ui.PlatformUI.createAndRunWorkbench(PlatformUI.java:171)
+	at org.eclipse.ui.internal.ide.application.IDEApplication.start(IDEApplication.java:152)
+	at org.eclipse.equinox.internal.app.EclipseAppHandle.run(EclipseAppHandle.java:203)
+	at org.eclipse.core.runtime.internal.adaptor.EclipseAppLauncher.runApplication(EclipseAppLauncher.java:136)
+	at org.eclipse.core.runtime.internal.adaptor.EclipseAppLauncher.start(EclipseAppLauncher.java:104)
+	at org.eclipse.core.runtime.adaptor.EclipseStarter.run(EclipseStarter.java:402)
+	at org.eclipse.core.runtime.adaptor.EclipseStarter.run(EclipseStarter.java:255)
+	at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
+	at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:77)
+	at java.base/jdk.internal.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
+	at java.base/java.lang.reflect.Method.invoke(Method.java:568)
+	at org.eclipse.equinox.launcher.Main.invokeFramework(Main.java:659)
+	at org.eclipse.equinox.launcher.Main.basicRun(Main.java:596)
+	at org.eclipse.equinox.launcher.Main.run(Main.java:1467)
+!SUBENTRY 1 org.eclipse.core.resources 4 376 2023-03-02 23:15:51.540
+!MESSAGE Marker id 2766 not found.
+!SESSION 2023-03-03 12:08:56.910 -----------------------------------------------
+eclipse.buildId=4.17.2.202301310704
+java.version=17.0.6
+java.vendor=Eclipse Adoptium
+BootLoader constants: OS=win32, ARCH=x86_64, WS=win32, NL=en_US
+Framework arguments:  -product org.springframework.boot.ide.branding.sts4
+Command-line arguments:  -os win32 -ws win32 -arch x86_64 -product org.springframework.boot.ide.branding.sts4
+
+!ENTRY ch.qos.logback.classic 1 0 2023-03-03 12:09:13.273
+!MESSAGE Activated before the state location was initialized. Retry after the state location is initialized.
+
+!ENTRY ch.qos.logback.classic 1 0 2023-03-03 12:12:05.181
+!MESSAGE Logback config file: C:\Users\User\Desktop\ShopmeEcommerce\.metadata\.plugins\org.eclipse.m2e.logback\logback.2.1.0.20221015-0744.xml
+
+!ENTRY org.eclipse.jface 2 0 2023-03-03 12:12:19.961
+!MESSAGE Keybinding conflicts occurred.  They may interfere with normal accelerator operation.
+!SUBENTRY 1 org.eclipse.jface 2 0 2023-03-03 12:12:19.961
+!MESSAGE A conflict occurred for CTRL+SHIFT+T:
+Binding(CTRL+SHIFT+T,
+	ParameterizedCommand(Command(org.eclipse.jdt.ui.navigate.open.type,Open Type,
+		Open a type in a Java editor,
+		Category(org.eclipse.ui.category.navigate,Navigate,null,true),
+		WorkbenchHandlerServiceHandler("org.eclipse.jdt.ui.navigate.open.type"),
+		,,true),null),
+	org.eclipse.ui.defaultAcceleratorConfiguration,
+	org.eclipse.ui.contexts.window,,,system)
+Binding(CTRL+SHIFT+T,
+	ParameterizedCommand(Command(org.eclipse.lsp4e.symbolinworkspace,Go to Symbol in Workspace,
+		,
+		Category(org.eclipse.lsp4e.category,Language Servers,null,true),
+		WorkbenchHandlerServiceHandler("org.eclipse.lsp4e.symbolinworkspace"),
+		,,true),null),
+	org.eclipse.ui.defaultAcceleratorConfiguration,
+	org.eclipse.ui.contexts.window,,,system)
+!SUBENTRY 1 org.eclipse.jface 2 0 2023-03-03 12:12:19.961
+!MESSAGE A conflict occurred for ALT+SHIFT+R:
+Binding(ALT+SHIFT+R,
+	ParameterizedCommand(Command(org.eclipse.jdt.ui.edit.text.java.rename.element,Rename - Refactoring ,
+		Rename the selected element,
+		Category(org.eclipse.jdt.ui.category.refactoring,Refactor - Java,Java Refactoring Actions,true),
+		WorkbenchHandlerServiceHandler("org.eclipse.jdt.ui.edit.text.java.rename.element"),
+		,,true),null),
+	org.eclipse.ui.defaultAcceleratorConfiguration,
+	org.eclipse.ui.contexts.window,,,system)
+Binding(ALT+SHIFT+R,
+	ParameterizedCommand(Command(org.eclipse.ui.edit.rename,Rename,
+		Rename the selected item,
+		Category(org.eclipse.ui.category.file,File,null,true),
+		WorkbenchHandlerServiceHandler("org.eclipse.ui.edit.rename"),
+		,,true),null),
+	org.eclipse.ui.defaultAcceleratorConfiguration,
+	org.eclipse.ui.contexts.window,,,system)
+
+!ENTRY org.eclipse.wildwebdeveloper.embedder.node 4 0 2023-03-03 12:12:37.908
+!MESSAGE failed to create directory C:\Program Files\Java\STS4\sts-4.17.2.RELEASE\.node\node-v18.12.1-win-x64
+!STACK 0
+java.io.IOException: failed to create directory C:\Program Files\Java\STS4\sts-4.17.2.RELEASE\.node\node-v18.12.1-win-x64
+	at org.eclipse.wildwebdeveloper.embedder.node.CompressUtils.extractArchive(CompressUtils.java:81)
+	at org.eclipse.wildwebdeveloper.embedder.node.CompressUtils.unarchive(CompressUtils.java:52)
+	at org.eclipse.wildwebdeveloper.embedder.node.NodeJSManager.getNodeJsLocation(NodeJSManager.java:83)
+	at org.eclipse.wildwebdeveloper.angular.AngularLanguageServer.<init>(AngularLanguageServer.java:43)
+	at java.base/jdk.internal.reflect.NativeConstructorAccessorImpl.newInstance0(Native Method)
+	at java.base/jdk.internal.reflect.NativeConstructorAccessorImpl.newInstance(NativeConstructorAccessorImpl.java:77)
+	at java.base/jdk.internal.reflect.DelegatingConstructorAccessorImpl.newInstance(DelegatingConstructorAccessorImpl.java:45)
+	at java.base/java.lang.reflect.Constructor.newInstanceWithCaller(Constructor.java:499)
+	at java.base/java.lang.reflect.Constructor.newInstance(Constructor.java:480)
+	at org.eclipse.core.internal.registry.osgi.RegistryStrategyOSGI.createExecutableExtension(RegistryStrategyOSGI.java:204)
+	at org.eclipse.core.internal.registry.ExtensionRegistry.createExecutableExtension(ExtensionRegistry.java:920)
+	at org.eclipse.core.internal.registry.ConfigurationElement.createExecutableExtension(ConfigurationElement.java:246)
+	at org.eclipse.core.internal.registry.ConfigurationElementHandle.createExecutableExtension(ConfigurationElementHandle.java:63)
+	at org.eclipse.lsp4e.LanguageServersRegistry$ExtensionLanguageServerDefinition.createConnectionProvider(LanguageServersRegistry.java:161)
+	at org.eclipse.lsp4e.LanguageServerWrapper.lambda$0(LanguageServerWrapper.java:294)
+	at java.base/java.util.concurrent.CompletableFuture$AsyncSupply.run(CompletableFuture.java:1768)
+	at java.base/java.util.concurrent.CompletableFuture$AsyncSupply.exec(CompletableFuture.java:1760)
+	at java.base/java.util.concurrent.ForkJoinTask.doExec(ForkJoinTask.java:373)
+	at java.base/java.util.concurrent.ForkJoinPool$WorkQueue.topLevelExec(ForkJoinPool.java:1182)
+	at java.base/java.util.concurrent.ForkJoinPool.scan(ForkJoinPool.java:1655)
+	at java.base/java.util.concurrent.ForkJoinPool.runWorker(ForkJoinPool.java:1622)
+	at java.base/java.util.concurrent.ForkJoinWorkerThread.run(ForkJoinWorkerThread.java:165)
+
+!ENTRY org.eclipse.wildwebdeveloper.embedder.node 4 0 2023-03-03 12:12:37.911
+!MESSAGE failed to create directory C:\Program Files\Java\STS4\sts-4.17.2.RELEASE\.node\node-v18.12.1-win-x64
+!STACK 0
+java.io.IOException: failed to create directory C:\Program Files\Java\STS4\sts-4.17.2.RELEASE\.node\node-v18.12.1-win-x64
+	at org.eclipse.wildwebdeveloper.embedder.node.CompressUtils.extractArchive(CompressUtils.java:81)
+	at org.eclipse.wildwebdeveloper.embedder.node.CompressUtils.unarchive(CompressUtils.java:52)
+	at org.eclipse.wildwebdeveloper.embedder.node.NodeJSManager.getNodeJsLocation(NodeJSManager.java:83)
+	at org.eclipse.wildwebdeveloper.html.HTMLLanguageServer.<init>(HTMLLanguageServer.java:44)
+	at java.base/jdk.internal.reflect.NativeConstructorAccessorImpl.newInstance0(Native Method)
+	at java.base/jdk.internal.reflect.NativeConstructorAccessorImpl.newInstance(NativeConstructorAccessorImpl.java:77)
+	at java.base/jdk.internal.reflect.DelegatingConstructorAccessorImpl.newInstance(DelegatingConstructorAccessorImpl.java:45)
+	at java.base/java.lang.reflect.Constructor.newInstanceWithCaller(Constructor.java:499)
+	at java.base/java.lang.reflect.Constructor.newInstance(Constructor.java:480)
+	at org.eclipse.core.internal.registry.osgi.RegistryStrategyOSGI.createExecutableExtension(RegistryStrategyOSGI.java:204)
+	at org.eclipse.core.internal.registry.ExtensionRegistry.createExecutableExtension(ExtensionRegistry.java:920)
+	at org.eclipse.core.internal.registry.ConfigurationElement.createExecutableExtension(ConfigurationElement.java:246)
+	at org.eclipse.core.internal.registry.ConfigurationElementHandle.createExecutableExtension(ConfigurationElementHandle.java:63)
+	at org.eclipse.lsp4e.LanguageServersRegistry$ExtensionLanguageServerDefinition.createConnectionProvider(LanguageServersRegistry.java:161)
+	at org.eclipse.lsp4e.LanguageServerWrapper.lambda$0(LanguageServerWrapper.java:294)
+	at java.base/java.util.concurrent.CompletableFuture$AsyncSupply.run(CompletableFuture.java:1768)
+	at java.base/java.util.concurrent.CompletableFuture$AsyncSupply.exec(CompletableFuture.java:1760)
+	at java.base/java.util.concurrent.ForkJoinTask.doExec(ForkJoinTask.java:373)
+	at java.base/java.util.concurrent.ForkJoinPool$WorkQueue.topLevelExec(ForkJoinPool.java:1182)
+	at java.base/java.util.concurrent.ForkJoinPool.scan(ForkJoinPool.java:1655)
+	at java.base/java.util.concurrent.ForkJoinPool.runWorker(ForkJoinPool.java:1622)
+	at java.base/java.util.concurrent.ForkJoinWorkerThread.run(ForkJoinWorkerThread.java:165)
+
+!ENTRY org.eclipse.egit.ui 2 0 2023-03-03 12:12:43.966
+!MESSAGE Warning: The environment variable HOME is not set. The following directory will be used to store the Git
+user global configuration and to define the default location to store repositories: 'C:\Users\User'. If this is
+not correct please set the HOME environment variable and restart Eclipse. Otherwise Git for Windows and
+EGit might behave differently since they see different configuration options.
+This warning can be switched off on the Team > Git > Confirmations and Warnings preference page.
+
+!ENTRY org.springframework.tooling.ls.eclipse.commons 1 0 2023-03-03 12:14:20.885
+!MESSAGE executing callback sts4.classpath.CIQeZQHj FAILED
+
+!ENTRY org.springframework.tooling.ls.eclipse.commons 4 0 2023-03-03 12:14:20.887
+!MESSAGE TimeoutException
+!STACK 0
+java.util.concurrent.TimeoutException
+	at java.base/java.util.concurrent.CompletableFuture.timedGet(CompletableFuture.java:1960)
+	at java.base/java.util.concurrent.CompletableFuture.get(CompletableFuture.java:2095)
+	at org.springframework.tooling.ls.eclipse.commons.LSP4ECommandExecutor.executeClientCommand(LSP4ECommandExecutor.java:37)
+	at org.springframework.tooling.jdt.ls.commons.classpath.SendClasspathNotificationsJob.flush(SendClasspathNotificationsJob.java:178)
+	at org.springframework.tooling.jdt.ls.commons.classpath.SendClasspathNotificationsJob.run(SendClasspathNotificationsJob.java:149)
+	at org.eclipse.core.internal.jobs.Worker.run(Worker.java:63)
+
+!ENTRY org.eclipse.equinox.p2.repository 2 0 2023-03-03 13:27:59.101
+!MESSAGE Using unsafe http transport to retrieve http://download.eclipse.org/usssdk/updates/release/latest, see CVE-2021-41033. Consider using https instead.
+
+!ENTRY org.eclipse.equinox.p2.repository 2 0 2023-03-03 13:28:02.903
+!MESSAGE Using unsafe http transport to retrieve http://download.eclipse.org/usssdk/drops/release/1.2.2/content.xml.xz, see CVE-2021-41033. Consider using https instead.
+
+!ENTRY org.eclipse.equinox.p2.repository 2 0 2023-03-03 13:28:23.381
+!MESSAGE Using unsafe http transport to retrieve http://downloads.genuitec.com/downloads/products/codetogether/updates/ct20221214/content.xml.xz, see CVE-2021-41033. Consider using https instead.
+
+!ENTRY org.eclipse.m2e.logback.appender 2 0 2023-03-03 14:04:41.214
+!MESSAGE The artifact mysql:mysql-connector-java:jar:8.0.32 has been relocated to com.mysql:mysql-connector-j:jar:8.0.32: MySQL Connector/J artifacts moved to reverse-DNS compliant Maven 2+ coordinates.
+
+!ENTRY org.eclipse.m2e.logback.appender 2 0 2023-03-03 14:04:41.953
+!MESSAGE The artifact mysql:mysql-connector-java:jar:8.0.32 has been relocated to com.mysql:mysql-connector-j:jar:8.0.32: MySQL Connector/J artifacts moved to reverse-DNS compliant Maven 2+ coordinates.
+
+!ENTRY org.eclipse.m2e.logback.appender 2 0 2023-03-03 14:04:46.792
+!MESSAGE The artifact mysql:mysql-connector-java:jar:8.0.32 has been relocated to com.mysql:mysql-connector-j:jar:8.0.32: MySQL Connector/J artifacts moved to reverse-DNS compliant Maven 2+ coordinates.
+
+!ENTRY org.eclipse.lsp4e 2 0 2023-03-03 14:06:47.171
+!MESSAGE Javadoc unavailable. Failed to obtain it.
+!STACK 0
+java.lang.InterruptedException
+	at java.base/java.util.concurrent.CompletableFuture.reportGet(CompletableFuture.java:386)
+	at java.base/java.util.concurrent.CompletableFuture.get(CompletableFuture.java:2096)
+	at org.eclipse.lsp4e.jdt.LSJavaHoverProvider.getHoverInfo2(LSJavaHoverProvider.java:70)
+	at org.eclipse.jdt.internal.ui.text.java.hover.BestMatchHover.getHoverInfo2(BestMatchHover.java:163)
+	at org.eclipse.jdt.internal.ui.text.java.hover.BestMatchHover.getHoverInfo2(BestMatchHover.java:130)
+	at org.eclipse.jdt.internal.ui.text.java.hover.JavaEditorTextHoverProxy.getHoverInfo2(JavaEditorTextHoverProxy.java:89)
+	at org.eclipse.jface.text.TextViewerHoverManager$1.run(TextViewerHoverManager.java:155)
+!SESSION 2023-03-03 15:49:16.344 -----------------------------------------------
+eclipse.buildId=4.17.2.202301310704
+java.version=17.0.6
+java.vendor=Eclipse Adoptium
+BootLoader constants: OS=win32, ARCH=x86_64, WS=win32, NL=en_US
+Framework arguments:  -product org.springframework.boot.ide.branding.sts4
+Command-line arguments:  -os win32 -ws win32 -arch x86_64 -product org.springframework.boot.ide.branding.sts4
+
+!ENTRY ch.qos.logback.classic 1 0 2023-03-03 15:49:27.434
+!MESSAGE Activated before the state location was initialized. Retry after the state location is initialized.
+
+!ENTRY ch.qos.logback.classic 1 0 2023-03-03 15:51:26.020
+!MESSAGE Logback config file: C:\Users\User\Desktop\ShopmeEcommerce\.metadata\.plugins\org.eclipse.m2e.logback\logback.2.1.0.20221015-0744.xml
+
+!ENTRY org.eclipse.jface 2 0 2023-03-03 15:51:40.021
+!MESSAGE Keybinding conflicts occurred.  They may interfere with normal accelerator operation.
+!SUBENTRY 1 org.eclipse.jface 2 0 2023-03-03 15:51:40.021
+!MESSAGE A conflict occurred for CTRL+SHIFT+T:
+Binding(CTRL+SHIFT+T,
+	ParameterizedCommand(Command(org.eclipse.jdt.ui.navigate.open.type,Open Type,
+		Open a type in a Java editor,
+		Category(org.eclipse.ui.category.navigate,Navigate,null,true),
+		WorkbenchHandlerServiceHandler("org.eclipse.jdt.ui.navigate.open.type"),
+		,,true),null),
+	org.eclipse.ui.defaultAcceleratorConfiguration,
+	org.eclipse.ui.contexts.window,,,system)
+Binding(CTRL+SHIFT+T,
+	ParameterizedCommand(Command(org.eclipse.lsp4e.symbolinworkspace,Go to Symbol in Workspace,
+		,
+		Category(org.eclipse.lsp4e.category,Language Servers,null,true),
+		WorkbenchHandlerServiceHandler("org.eclipse.lsp4e.symbolinworkspace"),
+		,,true),null),
+	org.eclipse.ui.defaultAcceleratorConfiguration,
+	org.eclipse.ui.contexts.window,,,system)
+!SUBENTRY 1 org.eclipse.jface 2 0 2023-03-03 15:51:40.021
+!MESSAGE A conflict occurred for ALT+SHIFT+R:
+Binding(ALT+SHIFT+R,
+	ParameterizedCommand(Command(org.eclipse.jdt.ui.edit.text.java.rename.element,Rename - Refactoring ,
+		Rename the selected element,
+		Category(org.eclipse.jdt.ui.category.refactoring,Refactor - Java,Java Refactoring Actions,true),
+		WorkbenchHandlerServiceHandler("org.eclipse.jdt.ui.edit.text.java.rename.element"),
+		,,true),null),
+	org.eclipse.ui.defaultAcceleratorConfiguration,
+	org.eclipse.ui.contexts.window,,,system)
+Binding(ALT+SHIFT+R,
+	ParameterizedCommand(Command(org.eclipse.ui.edit.rename,Rename,
+		Rename the selected item,
+		Category(org.eclipse.ui.category.file,File,null,true),
+		WorkbenchHandlerServiceHandler("org.eclipse.ui.edit.rename"),
+		,,true),null),
+	org.eclipse.ui.defaultAcceleratorConfiguration,
+	org.eclipse.ui.contexts.window,,,system)
+
+!ENTRY org.eclipse.egit.ui 2 0 2023-03-03 15:52:15.786
+!MESSAGE Warning: The environment variable HOME is not set. The following directory will be used to store the Git
+user global configuration and to define the default location to store repositories: 'C:\Users\User'. If this is
+not correct please set the HOME environment variable and restart Eclipse. Otherwise Git for Windows and
+EGit might behave differently since they see different configuration options.
+This warning can be switched off on the Team > Git > Confirmations and Warnings preference page.
+
+!ENTRY org.springframework.tooling.ls.eclipse.commons 1 0 2023-03-03 15:52:30.173
+!MESSAGE executing callback sts4.classpath.CPRexzXi FAILED
+
+!ENTRY org.springframework.tooling.ls.eclipse.commons 4 0 2023-03-03 15:52:30.174
+!MESSAGE TimeoutException
+!STACK 0
+java.util.concurrent.TimeoutException
+	at java.base/java.util.concurrent.CompletableFuture.timedGet(CompletableFuture.java:1960)
+	at java.base/java.util.concurrent.CompletableFuture.get(CompletableFuture.java:2095)
+	at org.springframework.tooling.ls.eclipse.commons.LSP4ECommandExecutor.executeClientCommand(LSP4ECommandExecutor.java:37)
+	at org.springframework.tooling.jdt.ls.commons.classpath.SendClasspathNotificationsJob.flush(SendClasspathNotificationsJob.java:178)
+	at org.springframework.tooling.jdt.ls.commons.classpath.SendClasspathNotificationsJob.run(SendClasspathNotificationsJob.java:149)
+	at org.eclipse.core.internal.jobs.Worker.run(Worker.java:63)
+
+!ENTRY org.eclipse.m2e.logback.appender 2 0 2023-03-03 15:59:05.996
+!MESSAGE The artifact mysql:mysql-connector-java:jar:8.0.32 has been relocated to com.mysql:mysql-connector-j:jar:8.0.32: MySQL Connector/J artifacts moved to reverse-DNS compliant Maven 2+ coordinates.
+
+!ENTRY org.eclipse.m2e.logback.appender 2 0 2023-03-03 15:59:06.661
+!MESSAGE The artifact mysql:mysql-connector-java:jar:8.0.32 has been relocated to com.mysql:mysql-connector-j:jar:8.0.32: MySQL Connector/J artifacts moved to reverse-DNS compliant Maven 2+ coordinates.
+
+!ENTRY org.eclipse.m2e.logback.appender 2 0 2023-03-03 15:59:11.965
+!MESSAGE The artifact mysql:mysql-connector-java:jar:8.0.32 has been relocated to com.mysql:mysql-connector-j:jar:8.0.32: MySQL Connector/J artifacts moved to reverse-DNS compliant Maven 2+ coordinates.
+
+!ENTRY org.eclipse.lsp4e 2 0 2023-03-03 16:03:59.283
+!MESSAGE Javadoc unavailable. Failed to obtain it.
+!STACK 0
+java.lang.InterruptedException
+	at java.base/java.util.concurrent.CompletableFuture.reportGet(CompletableFuture.java:386)
+	at java.base/java.util.concurrent.CompletableFuture.get(CompletableFuture.java:2096)
+	at org.eclipse.lsp4e.jdt.LSJavaHoverProvider.getHoverInfo2(LSJavaHoverProvider.java:70)
+	at org.eclipse.jdt.internal.ui.text.java.hover.BestMatchHover.getHoverInfo2(BestMatchHover.java:163)
+	at org.eclipse.jdt.internal.ui.text.java.hover.BestMatchHover.getHoverInfo2(BestMatchHover.java:130)
+	at org.eclipse.jdt.internal.ui.text.java.hover.JavaEditorTextHoverProxy.getHoverInfo2(JavaEditorTextHoverProxy.java:89)
+	at org.eclipse.jface.text.TextViewerHoverManager$1.run(TextViewerHoverManager.java:155)
+
+!ENTRY org.eclipse.wildwebdeveloper.embedder.node 4 0 2023-03-03 16:14:59.750
+!MESSAGE failed to create directory C:\Program Files\Java\STS4\sts-4.17.2.RELEASE\.node\node-v18.12.1-win-x64
+!STACK 0
+java.io.IOException: failed to create directory C:\Program Files\Java\STS4\sts-4.17.2.RELEASE\.node\node-v18.12.1-win-x64
+	at org.eclipse.wildwebdeveloper.embedder.node.CompressUtils.extractArchive(CompressUtils.java:81)
+	at org.eclipse.wildwebdeveloper.embedder.node.CompressUtils.unarchive(CompressUtils.java:52)
+	at org.eclipse.wildwebdeveloper.embedder.node.NodeJSManager.getNodeJsLocation(NodeJSManager.java:83)
+	at org.eclipse.wildwebdeveloper.angular.AngularLanguageServer.<init>(AngularLanguageServer.java:43)
+	at java.base/jdk.internal.reflect.NativeConstructorAccessorImpl.newInstance0(Native Method)
+	at java.base/jdk.internal.reflect.NativeConstructorAccessorImpl.newInstance(NativeConstructorAccessorImpl.java:77)
+	at java.base/jdk.internal.reflect.DelegatingConstructorAccessorImpl.newInstance(DelegatingConstructorAccessorImpl.java:45)
+	at java.base/java.lang.reflect.Constructor.newInstanceWithCaller(Constructor.java:499)
+	at java.base/java.lang.reflect.Constructor.newInstance(Constructor.java:480)
+	at org.eclipse.core.internal.registry.osgi.RegistryStrategyOSGI.createExecutableExtension(RegistryStrategyOSGI.java:204)
+	at org.eclipse.core.internal.registry.ExtensionRegistry.createExecutableExtension(ExtensionRegistry.java:920)
+	at org.eclipse.core.internal.registry.ConfigurationElement.createExecutableExtension(ConfigurationElement.java:246)
+	at org.eclipse.core.internal.registry.ConfigurationElementHandle.createExecutableExtension(ConfigurationElementHandle.java:63)
+	at org.eclipse.lsp4e.LanguageServersRegistry$ExtensionLanguageServerDefinition.createConnectionProvider(LanguageServersRegistry.java:161)
+	at org.eclipse.lsp4e.LanguageServerWrapper.lambda$0(LanguageServerWrapper.java:294)
+	at java.base/java.util.concurrent.CompletableFuture$AsyncSupply.run(CompletableFuture.java:1768)
+	at java.base/java.util.concurrent.CompletableFuture$AsyncSupply.exec(CompletableFuture.java:1760)
+	at java.base/java.util.concurrent.ForkJoinTask.doExec(ForkJoinTask.java:373)
+	at java.base/java.util.concurrent.ForkJoinPool$WorkQueue.topLevelExec(ForkJoinPool.java:1182)
+	at java.base/java.util.concurrent.ForkJoinPool.scan(ForkJoinPool.java:1655)
+	at java.base/java.util.concurrent.ForkJoinPool.runWorker(ForkJoinPool.java:1622)
+	at java.base/java.util.concurrent.ForkJoinWorkerThread.run(ForkJoinWorkerThread.java:165)
+
+!ENTRY org.eclipse.wildwebdeveloper.embedder.node 4 0 2023-03-03 16:14:59.751
+!MESSAGE failed to create directory C:\Program Files\Java\STS4\sts-4.17.2.RELEASE\.node\node-v18.12.1-win-x64
+!STACK 0
+java.io.IOException: failed to create directory C:\Program Files\Java\STS4\sts-4.17.2.RELEASE\.node\node-v18.12.1-win-x64
+	at org.eclipse.wildwebdeveloper.embedder.node.CompressUtils.extractArchive(CompressUtils.java:81)
+	at org.eclipse.wildwebdeveloper.embedder.node.CompressUtils.unarchive(CompressUtils.java:52)
+	at org.eclipse.wildwebdeveloper.embedder.node.NodeJSManager.getNodeJsLocation(NodeJSManager.java:83)
+	at org.eclipse.wildwebdeveloper.html.HTMLLanguageServer.<init>(HTMLLanguageServer.java:44)
+	at java.base/jdk.internal.reflect.NativeConstructorAccessorImpl.newInstance0(Native Method)
+	at java.base/jdk.internal.reflect.NativeConstructorAccessorImpl.newInstance(NativeConstructorAccessorImpl.java:77)
+	at java.base/jdk.internal.reflect.DelegatingConstructorAccessorImpl.newInstance(DelegatingConstructorAccessorImpl.java:45)
+	at java.base/java.lang.reflect.Constructor.newInstanceWithCaller(Constructor.java:499)
+	at java.base/java.lang.reflect.Constructor.newInstance(Constructor.java:480)
+	at org.eclipse.core.internal.registry.osgi.RegistryStrategyOSGI.createExecutableExtension(RegistryStrategyOSGI.java:204)
+	at org.eclipse.core.internal.registry.ExtensionRegistry.createExecutableExtension(ExtensionRegistry.java:920)
+	at org.eclipse.core.internal.registry.ConfigurationElement.createExecutableExtension(ConfigurationElement.java:246)
+	at org.eclipse.core.internal.registry.ConfigurationElementHandle.createExecutableExtension(ConfigurationElementHandle.java:63)
+	at org.eclipse.lsp4e.LanguageServersRegistry$ExtensionLanguageServerDefinition.createConnectionProvider(LanguageServersRegistry.java:161)
+	at org.eclipse.lsp4e.LanguageServerWrapper.lambda$0(LanguageServerWrapper.java:294)
+	at java.base/java.util.concurrent.CompletableFuture$AsyncSupply.run(CompletableFuture.java:1768)
+	at java.base/java.util.concurrent.CompletableFuture$AsyncSupply.exec(CompletableFuture.java:1760)
+	at java.base/java.util.concurrent.ForkJoinTask.doExec(ForkJoinTask.java:373)
+	at java.base/java.util.concurrent.ForkJoinPool$WorkQueue.topLevelExec(ForkJoinPool.java:1182)
+	at java.base/java.util.concurrent.ForkJoinPool.scan(ForkJoinPool.java:1655)
+	at java.base/java.util.concurrent.ForkJoinPool.runWorker(ForkJoinPool.java:1622)
+	at java.base/java.util.concurrent.ForkJoinWorkerThread.run(ForkJoinWorkerThread.java:165)
+
+!ENTRY org.eclipse.jface 2 0 2023-03-03 20:33:12.069
+!MESSAGE Keybinding conflicts occurred.  They may interfere with normal accelerator operation.
+!SUBENTRY 1 org.eclipse.jface 2 0 2023-03-03 20:33:12.069
+!MESSAGE A conflict occurred for CTRL+SHIFT+C:
+Binding(CTRL+SHIFT+C,
+	ParameterizedCommand(Command(org.eclipse.tm4e.languageconfiguration.toggleLineCommentCommand,Toggle Line Comment,
+		,
+		Category(org.eclipse.tm4e.languageconfiguration.category,TM4E Language Configuration,null,true),
+		WorkbenchHandlerServiceHandler("org.eclipse.tm4e.languageconfiguration.toggleLineCommentCommand"),
+		,,true),null),
+	org.eclipse.ui.defaultAcceleratorConfiguration,
+	org.eclipse.ui.textEditorScope,,,system)
+Binding(CTRL+SHIFT+C,
+	ParameterizedCommand(Command(org.springframework.tooling.boot.ls.ToggleComment,Toggle Comment,
+		,
+		Category(org.springframework.ide.eclipse.commands,Spring Generic Text Editor,Spring Language Server Commands,true),
+		WorkbenchHandlerServiceHandler("org.springframework.tooling.boot.ls.ToggleComment"),
+		,,true),null),
+	org.eclipse.ui.defaultAcceleratorConfiguration,
+	org.eclipse.ui.textEditorScope,,,system)
+
+!ENTRY org.eclipse.lsp4e 4 0 2023-03-03 20:33:36.611
+!MESSAGE org.eclipse.lsp4j.jsonrpc.JsonRpcException: java.io.IOException: The pipe is being closed
+!STACK 0
+java.util.concurrent.ExecutionException: org.eclipse.lsp4j.jsonrpc.JsonRpcException: java.io.IOException: The pipe is being closed
+	at java.base/java.util.concurrent.CompletableFuture.reportGet(CompletableFuture.java:396)
+	at java.base/java.util.concurrent.CompletableFuture.get(CompletableFuture.java:2096)
+	at org.eclipse.lsp4e.LanguageServerWrapper.lambda$10(LanguageServerWrapper.java:547)
+	at java.base/java.util.concurrent.CompletableFuture$AsyncRun.run(CompletableFuture.java:1804)
+	at java.base/java.util.concurrent.CompletableFuture$AsyncRun.exec(CompletableFuture.java:1796)
+	at java.base/java.util.concurrent.ForkJoinTask.doExec(ForkJoinTask.java:373)
+	at java.base/java.util.concurrent.ForkJoinPool$WorkQueue.topLevelExec(ForkJoinPool.java:1182)
+	at java.base/java.util.concurrent.ForkJoinPool.scan(ForkJoinPool.java:1655)
+	at java.base/java.util.concurrent.ForkJoinPool.runWorker(ForkJoinPool.java:1622)
+	at java.base/java.util.concurrent.ForkJoinWorkerThread.run(ForkJoinWorkerThread.java:165)
+Caused by: org.eclipse.lsp4j.jsonrpc.JsonRpcException: java.io.IOException: The pipe is being closed
+	at org.eclipse.lsp4j.jsonrpc.json.StreamMessageConsumer.consume(StreamMessageConsumer.java:72)
+	at org.eclipse.lsp4e.LanguageServerWrapper.lambda$3(LanguageServerWrapper.java:315)
+	at org.eclipse.lsp4j.jsonrpc.RemoteEndpoint.request(RemoteEndpoint.java:161)
+	at org.eclipse.lsp4j.jsonrpc.services.EndpointProxy.invoke(EndpointProxy.java:91)
+	at jdk.proxy15/jdk.proxy15.$Proxy51.shutdown(Unknown Source)
+	at org.eclipse.lsp4e.LanguageServerWrapper.lambda$10(LanguageServerWrapper.java:545)
+	... 7 more
+Caused by: java.io.IOException: The pipe is being closed
+	at java.base/java.io.FileOutputStream.writeBytes(Native Method)
+	at java.base/java.io.FileOutputStream.write(FileOutputStream.java:349)
+	at java.base/java.io.BufferedOutputStream.flushBuffer(BufferedOutputStream.java:81)
+	at java.base/java.io.BufferedOutputStream.flush(BufferedOutputStream.java:142)
+	at org.eclipse.lsp4j.jsonrpc.json.StreamMessageConsumer.consume(StreamMessageConsumer.java:69)
+	... 12 more
+
+!ENTRY org.eclipse.lsp4e 2 0 2023-03-03 20:33:37.664
+!MESSAGE Could not get if the workspace folder capability is supported due to timeout after 1 second
+!STACK 0
+java.util.concurrent.TimeoutException
+	at java.base/java.util.concurrent.CompletableFuture.timedGet(CompletableFuture.java:1960)
+	at java.base/java.util.concurrent.CompletableFuture.get(CompletableFuture.java:2095)
+	at org.eclipse.lsp4e.LanguageServerWrapper.supportsWorkspaceFolderCapability(LanguageServerWrapper.java:650)
+	at org.eclipse.lsp4e.LanguageServerWrapper.canOperate(LanguageServerWrapper.java:639)
+	at org.eclipse.lsp4e.LanguageServerWrapper.canOperate(LanguageServerWrapper.java:1029)
+	at org.eclipse.lsp4e.LanguageServiceAccessor.lambda$6(LanguageServiceAccessor.java:348)
+	at java.base/java.util.stream.ReferencePipeline$2$1.accept(ReferencePipeline.java:178)
+	at java.base/java.util.Spliterators$ArraySpliterator.forEachRemaining(Spliterators.java:992)
+	at java.base/java.util.stream.AbstractPipeline.copyInto(AbstractPipeline.java:509)
+	at java.base/java.util.stream.AbstractPipeline.wrapAndCopyInto(AbstractPipeline.java:499)
+	at java.base/java.util.stream.ReduceOps$ReduceOp.evaluateSequential(ReduceOps.java:921)
+	at java.base/java.util.stream.AbstractPipeline.evaluate(AbstractPipeline.java:234)
+	at java.base/java.util.stream.ReferencePipeline.collect(ReferencePipeline.java:682)
+	at org.eclipse.lsp4e.LanguageServiceAccessor.getLSWrappers(LanguageServiceAccessor.java:356)
+	at org.eclipse.lsp4e.LanguageServiceAccessor.getLanguageServers(LanguageServiceAccessor.java:623)
+	at org.eclipse.lsp4e.operations.rename.LSPRenameHandler.setEnabled(LSPRenameHandler.java:106)
+	at org.eclipse.ui.internal.handlers.HandlerProxy.setEnabled(HandlerProxy.java:229)
+	at org.eclipse.ui.internal.handlers.E4HandlerProxy.setEnabled(E4HandlerProxy.java:133)
+	at jdk.internal.reflect.GeneratedMethodAccessor16.invoke(Unknown Source)
+	at java.base/jdk.internal.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
+	at java.base/java.lang.reflect.Method.invoke(Method.java:568)
+	at org.eclipse.e4.core.internal.di.MethodRequestor.execute(MethodRequestor.java:58)
+	at org.eclipse.e4.core.internal.di.InjectorImpl.invokeUsingClass(InjectorImpl.java:317)
+	at org.eclipse.e4.core.internal.di.InjectorImpl.invoke(InjectorImpl.java:251)
+	at org.eclipse.e4.core.contexts.ContextInjectionFactory.invoke(ContextInjectionFactory.java:173)
+	at org.eclipse.e4.core.commands.internal.HandlerServiceHandler.setEnabled(HandlerServiceHandler.java:84)
+	at org.eclipse.core.commands.Command.setEnabled(Command.java:856)
+	at org.eclipse.ui.menus.CommandContributionItem.isEnabled(CommandContributionItem.java:916)
+	at org.eclipse.ui.menus.CommandContributionItem.updateMenuItem(CommandContributionItem.java:531)
+	at org.eclipse.ui.menus.CommandContributionItem.update(CommandContributionItem.java:484)
+	at org.eclipse.jface.action.MenuManager.update(MenuManager.java:858)
+	at org.eclipse.jface.action.MenuManager.update(MenuManager.java:858)
+	at org.eclipse.ui.internal.Workbench.updateActiveWorkbenchWindowMenuManager(Workbench.java:3138)
+	at org.eclipse.ui.internal.Workbench.lambda$0(Workbench.java:3120)
+	at org.eclipse.jface.bindings.BindingManager.fireBindingManagerChanged(BindingManager.java:901)
+	at org.eclipse.jface.bindings.BindingManager.setActiveBindings(BindingManager.java:2181)
+	at org.eclipse.jface.bindings.BindingManager.recomputeBindings(BindingManager.java:1742)
+	at org.eclipse.jface.bindings.BindingManager.contextManagerChanged(BindingManager.java:691)
+	at org.eclipse.core.commands.contexts.ContextManager.fireContextManagerChanged(ContextManager.java:164)
+	at org.eclipse.core.commands.contexts.ContextManager.setEventCaching(ContextManager.java:323)
+	at org.eclipse.core.commands.contexts.ContextManager.deferUpdates(ContextManager.java:85)
+	at org.eclipse.e4.ui.internal.workbench.PartServiceImpl.activate(PartServiceImpl.java:781)
+	at org.eclipse.e4.ui.internal.workbench.PartServiceImpl.activate(PartServiceImpl.java:683)
+	at org.eclipse.e4.ui.internal.workbench.swt.AbstractPartRenderer.activate(AbstractPartRenderer.java:97)
+	at org.eclipse.e4.ui.workbench.renderers.swt.ContributedPartRenderer.lambda$0(ContributedPartRenderer.java:63)
+	at org.eclipse.swt.widgets.EventTable.sendEvent(EventTable.java:89)
+	at org.eclipse.swt.widgets.Display.sendEvent(Display.java:4256)
+	at org.eclipse.swt.widgets.Widget.sendEvent(Widget.java:1066)
+	at org.eclipse.swt.widgets.Widget.sendEvent(Widget.java:1090)
+	at org.eclipse.swt.widgets.Widget.sendEvent(Widget.java:1075)
+	at org.eclipse.swt.widgets.Shell.setActiveControl(Shell.java:1530)
+	at org.eclipse.swt.widgets.Shell.setActiveControl(Shell.java:1493)
+	at org.eclipse.swt.widgets.Control.sendFocusEvent(Control.java:2954)
+	at org.eclipse.swt.widgets.Widget.wmSetFocus(Widget.java:2321)
+	at org.eclipse.swt.widgets.Control.WM_SETFOCUS(Control.java:5424)
+	at org.eclipse.swt.widgets.Canvas.WM_SETFOCUS(Canvas.java:437)
+	at org.eclipse.swt.widgets.Control.windowProc(Control.java:4815)
+	at org.eclipse.swt.widgets.Canvas.windowProc(Canvas.java:340)
+	at org.eclipse.swt.widgets.Display.windowProc(Display.java:5022)
+	at org.eclipse.swt.internal.win32.OS.SetFocus(Native Method)
+	at org.eclipse.swt.widgets.Control.forceFocus(Control.java:1091)
+	at org.eclipse.swt.widgets.Control.setFocus(Control.java:3439)
+	at org.eclipse.swt.widgets.Composite.setFocus(Composite.java:1081)
+	at org.eclipse.swt.custom.StyledText.setFocus(StyledText.java:8742)
+	at org.eclipse.ui.texteditor.AbstractTextEditor.setFocus(AbstractTextEditor.java:6186)
+	at org.eclipse.ui.texteditor.StatusTextEditor.setFocus(StatusTextEditor.java:149)
+	at org.eclipse.jdt.internal.ui.javaeditor.JavaEditor.setFocus(JavaEditor.java:2353)
+	at org.eclipse.ui.internal.e4.compatibility.CompatibilityPart.delegateSetFocus(CompatibilityPart.java:226)
+	at jdk.internal.reflect.GeneratedMethodAccessor92.invoke(Unknown Source)
+	at java.base/jdk.internal.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
+	at java.base/java.lang.reflect.Method.invoke(Method.java:568)
+	at org.eclipse.e4.core.internal.di.MethodRequestor.execute(MethodRequestor.java:58)
+	at org.eclipse.e4.core.internal.di.InjectorImpl.invokeUsingClass(InjectorImpl.java:317)
+	at org.eclipse.e4.core.internal.di.InjectorImpl.invokeUsingClass(InjectorImpl.java:323)
+	at org.eclipse.e4.core.internal.di.InjectorImpl.invoke(InjectorImpl.java:245)
+	at org.eclipse.e4.core.contexts.ContextInjectionFactory.invoke(ContextInjectionFactory.java:147)
+	at org.eclipse.e4.ui.internal.workbench.swt.PartRenderingEngine.focusGui(PartRenderingEngine.java:790)
+	at org.eclipse.e4.ui.workbench.renderers.swt.ContributedPartRenderer$1.setFocus(ContributedPartRenderer.java:106)
+	at org.eclipse.swt.custom.CTabItem.setFocus(CTabItem.java:379)
+	at org.eclipse.swt.custom.CTabFolder.setFocus(CTabFolder.java:2683)
+	at org.eclipse.swt.widgets.Control.fixFocus(Control.java:1049)
+	at org.eclipse.swt.widgets.Control.setVisible(Control.java:3951)
+	at org.eclipse.swt.custom.CTabFolder.setSelection(CTabFolder.java:3236)
+	at org.eclipse.swt.custom.CTabFolder.setSelection(CTabFolder.java:3244)
+	at org.eclipse.swt.custom.CTabFolder.onMouse(CTabFolder.java:1882)
+	at org.eclipse.swt.custom.CTabFolder.lambda$0(CTabFolder.java:332)
+	at org.eclipse.swt.widgets.EventTable.sendEvent(EventTable.java:89)
+	at org.eclipse.swt.widgets.Display.sendEvent(Display.java:4256)
+	at org.eclipse.swt.widgets.Widget.sendEvent(Widget.java:1066)
+	at org.eclipse.swt.widgets.Display.runDeferredEvents(Display.java:4054)
+	at org.eclipse.swt.widgets.Display.readAndDispatch(Display.java:3642)
+	at org.eclipse.e4.ui.internal.workbench.swt.PartRenderingEngine$5.run(PartRenderingEngine.java:1155)
+	at org.eclipse.core.databinding.observable.Realm.runWithDefault(Realm.java:338)
+	at org.eclipse.e4.ui.internal.workbench.swt.PartRenderingEngine.run(PartRenderingEngine.java:1046)
+	at org.eclipse.e4.ui.internal.workbench.E4Workbench.createAndRunUI(E4Workbench.java:155)
+	at org.eclipse.ui.internal.Workbench.lambda$3(Workbench.java:643)
+	at org.eclipse.core.databinding.observable.Realm.runWithDefault(Realm.java:338)
+	at org.eclipse.ui.internal.Workbench.createAndRunWorkbench(Workbench.java:550)
+	at org.eclipse.ui.PlatformUI.createAndRunWorkbench(PlatformUI.java:171)
+	at org.eclipse.ui.internal.ide.application.IDEApplication.start(IDEApplication.java:152)
+	at org.eclipse.equinox.internal.app.EclipseAppHandle.run(EclipseAppHandle.java:203)
+	at org.eclipse.core.runtime.internal.adaptor.EclipseAppLauncher.runApplication(EclipseAppLauncher.java:136)
+	at org.eclipse.core.runtime.internal.adaptor.EclipseAppLauncher.start(EclipseAppLauncher.java:104)
+	at org.eclipse.core.runtime.adaptor.EclipseStarter.run(EclipseStarter.java:402)
+	at org.eclipse.core.runtime.adaptor.EclipseStarter.run(EclipseStarter.java:255)
+	at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
+	at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:77)
+	at java.base/jdk.internal.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
+	at java.base/java.lang.reflect.Method.invoke(Method.java:568)
+	at org.eclipse.equinox.launcher.Main.invokeFramework(Main.java:659)
+	at org.eclipse.equinox.launcher.Main.basicRun(Main.java:596)
+	at org.eclipse.equinox.launcher.Main.run(Main.java:1467)
+
+!ENTRY org.eclipse.lsp4e 2 0 2023-03-03 20:33:38.670
+!MESSAGE Could not get if the workspace folder capability is supported due to timeout after 1 second
+!STACK 0
+java.util.concurrent.TimeoutException
+	at java.base/java.util.concurrent.CompletableFuture.timedGet(CompletableFuture.java:1960)
+	at java.base/java.util.concurrent.CompletableFuture.get(CompletableFuture.java:2095)
+	at org.eclipse.lsp4e.LanguageServerWrapper.supportsWorkspaceFolderCapability(LanguageServerWrapper.java:650)
+	at org.eclipse.lsp4e.LanguageServerWrapper.canOperate(LanguageServerWrapper.java:639)
+	at org.eclipse.lsp4e.LanguageServerWrapper.canOperate(LanguageServerWrapper.java:1029)
+	at org.eclipse.lsp4e.LanguageServiceAccessor.lambda$6(LanguageServiceAccessor.java:348)
+	at java.base/java.util.stream.ReferencePipeline$2$1.accept(ReferencePipeline.java:178)
+	at java.base/java.util.Spliterators$ArraySpliterator.forEachRemaining(Spliterators.java:992)
+	at java.base/java.util.stream.AbstractPipeline.copyInto(AbstractPipeline.java:509)
+	at java.base/java.util.stream.AbstractPipeline.wrapAndCopyInto(AbstractPipeline.java:499)
+	at java.base/java.util.stream.ReduceOps$ReduceOp.evaluateSequential(ReduceOps.java:921)
+	at java.base/java.util.stream.AbstractPipeline.evaluate(AbstractPipeline.java:234)
+	at java.base/java.util.stream.ReferencePipeline.collect(ReferencePipeline.java:682)
+	at org.eclipse.lsp4e.LanguageServiceAccessor.getLSWrappers(LanguageServiceAccessor.java:356)
+	at org.eclipse.lsp4e.LanguageServiceAccessor.getLanguageServers(LanguageServiceAccessor.java:623)
+	at org.eclipse.lsp4e.operations.rename.LSPRenameHandler.setEnabled(LSPRenameHandler.java:100)
+	at org.eclipse.ui.internal.handlers.HandlerProxy.setEnabled(HandlerProxy.java:229)
+	at org.eclipse.ui.internal.handlers.E4HandlerProxy.setEnabled(E4HandlerProxy.java:133)
+	at jdk.internal.reflect.GeneratedMethodAccessor16.invoke(Unknown Source)
+	at java.base/jdk.internal.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
+	at java.base/java.lang.reflect.Method.invoke(Method.java:568)
+	at org.eclipse.e4.core.internal.di.MethodRequestor.execute(MethodRequestor.java:58)
+	at org.eclipse.e4.core.internal.di.InjectorImpl.invokeUsingClass(InjectorImpl.java:317)
+	at org.eclipse.e4.core.internal.di.InjectorImpl.invoke(InjectorImpl.java:251)
+	at org.eclipse.e4.core.contexts.ContextInjectionFactory.invoke(ContextInjectionFactory.java:173)
+	at org.eclipse.e4.core.commands.internal.HandlerServiceHandler.setEnabled(HandlerServiceHandler.java:84)
+	at org.eclipse.core.commands.Command.setEnabled(Command.java:856)
+	at org.eclipse.ui.menus.CommandContributionItem.isEnabled(CommandContributionItem.java:916)
+	at org.eclipse.ui.menus.CommandContributionItem.updateMenuItem(CommandContributionItem.java:531)
+	at org.eclipse.ui.menus.CommandContributionItem.update(CommandContributionItem.java:484)
+	at org.eclipse.ui.menus.CommandContributionItem.lambda$2(CommandContributionItem.java:323)
+	at org.eclipse.ui.menus.CommandContributionItem.updateCommandProperties(CommandContributionItem.java:327)
+	at org.eclipse.ui.menus.CommandContributionItem.lambda$1(CommandContributionItem.java:294)
+	at org.eclipse.core.commands.Command$1.run(Command.java:529)
+	at org.eclipse.core.runtime.SafeRunner.run(SafeRunner.java:45)
+	at org.eclipse.core.commands.Command.fireCommandChanged(Command.java:522)
+	at org.eclipse.core.commands.Command.lambda$0(Command.java:1002)
+	at org.eclipse.core.commands.AbstractHandler.fireHandlerChanged(AbstractHandler.java:77)
+	at org.eclipse.e4.core.commands.internal.HandlerServiceHandler.fireHandlerChanged(HandlerServiceHandler.java:180)
+	at org.eclipse.ui.internal.handlers.E4HandlerProxy.handlerChanged(E4HandlerProxy.java:115)
+	at org.eclipse.core.commands.AbstractHandler.fireHandlerChanged(AbstractHandler.java:77)
+	at org.eclipse.ui.internal.handlers.HandlerProxy.lambda$1(HandlerProxy.java:372)
+	at org.eclipse.core.commands.AbstractHandler.fireHandlerChanged(AbstractHandler.java:77)
+	at org.eclipse.core.commands.AbstractHandler.setBaseEnabled(AbstractHandler.java:111)
+	at org.eclipse.lsp4e.operations.rename.LSPRenameHandler.setEnabled(LSPRenameHandler.java:121)
+	at org.eclipse.ui.internal.handlers.HandlerProxy.setEnabled(HandlerProxy.java:229)
+	at org.eclipse.ui.internal.handlers.E4HandlerProxy.setEnabled(E4HandlerProxy.java:133)
+	at jdk.internal.reflect.GeneratedMethodAccessor16.invoke(Unknown Source)
+	at java.base/jdk.internal.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
+	at java.base/java.lang.reflect.Method.invoke(Method.java:568)
+	at org.eclipse.e4.core.internal.di.MethodRequestor.execute(MethodRequestor.java:58)
+	at org.eclipse.e4.core.internal.di.InjectorImpl.invokeUsingClass(InjectorImpl.java:317)
+	at org.eclipse.e4.core.internal.di.InjectorImpl.invoke(InjectorImpl.java:251)
+	at org.eclipse.e4.core.contexts.ContextInjectionFactory.invoke(ContextInjectionFactory.java:173)
+	at org.eclipse.e4.core.commands.internal.HandlerServiceHandler.setEnabled(HandlerServiceHandler.java:84)
+	at org.eclipse.core.commands.Command.setEnabled(Command.java:856)
+	at org.eclipse.ui.menus.CommandContributionItem.isEnabled(CommandContributionItem.java:916)
+	at org.eclipse.ui.menus.CommandContributionItem.updateMenuItem(CommandContributionItem.java:531)
+	at org.eclipse.ui.menus.CommandContributionItem.update(CommandContributionItem.java:484)
+	at org.eclipse.jface.action.MenuManager.update(MenuManager.java:858)
+	at org.eclipse.jface.action.MenuManager.update(MenuManager.java:858)
+	at org.eclipse.ui.internal.Workbench.updateActiveWorkbenchWindowMenuManager(Workbench.java:3138)
+	at org.eclipse.ui.internal.Workbench.lambda$0(Workbench.java:3120)
+	at org.eclipse.jface.bindings.BindingManager.fireBindingManagerChanged(BindingManager.java:901)
+	at org.eclipse.jface.bindings.BindingManager.setActiveBindings(BindingManager.java:2181)
+	at org.eclipse.jface.bindings.BindingManager.recomputeBindings(BindingManager.java:1742)
+	at org.eclipse.jface.bindings.BindingManager.contextManagerChanged(BindingManager.java:691)
+	at org.eclipse.core.commands.contexts.ContextManager.fireContextManagerChanged(ContextManager.java:164)
+	at org.eclipse.core.commands.contexts.ContextManager.setEventCaching(ContextManager.java:323)
+	at org.eclipse.core.commands.contexts.ContextManager.deferUpdates(ContextManager.java:85)
+	at org.eclipse.e4.ui.internal.workbench.PartServiceImpl.activate(PartServiceImpl.java:781)
+	at org.eclipse.e4.ui.internal.workbench.PartServiceImpl.activate(PartServiceImpl.java:683)
+	at org.eclipse.e4.ui.internal.workbench.swt.AbstractPartRenderer.activate(AbstractPartRenderer.java:97)
+	at org.eclipse.e4.ui.workbench.renderers.swt.ContributedPartRenderer.lambda$0(ContributedPartRenderer.java:63)
+	at org.eclipse.swt.widgets.EventTable.sendEvent(EventTable.java:89)
+	at org.eclipse.swt.widgets.Display.sendEvent(Display.java:4256)
+	at org.eclipse.swt.widgets.Widget.sendEvent(Widget.java:1066)
+	at org.eclipse.swt.widgets.Widget.sendEvent(Widget.java:1090)
+	at org.eclipse.swt.widgets.Widget.sendEvent(Widget.java:1075)
+	at org.eclipse.swt.widgets.Shell.setActiveControl(Shell.java:1530)
+	at org.eclipse.swt.widgets.Shell.setActiveControl(Shell.java:1493)
+	at org.eclipse.swt.widgets.Control.sendFocusEvent(Control.java:2954)
+	at org.eclipse.swt.widgets.Widget.wmSetFocus(Widget.java:2321)
+	at org.eclipse.swt.widgets.Control.WM_SETFOCUS(Control.java:5424)
+	at org.eclipse.swt.widgets.Canvas.WM_SETFOCUS(Canvas.java:437)
+	at org.eclipse.swt.widgets.Control.windowProc(Control.java:4815)
+	at org.eclipse.swt.widgets.Canvas.windowProc(Canvas.java:340)
+	at org.eclipse.swt.widgets.Display.windowProc(Display.java:5022)
+	at org.eclipse.swt.internal.win32.OS.SetFocus(Native Method)
+	at org.eclipse.swt.widgets.Control.forceFocus(Control.java:1091)
+	at org.eclipse.swt.widgets.Control.setFocus(Control.java:3439)
+	at org.eclipse.swt.widgets.Composite.setFocus(Composite.java:1081)
+	at org.eclipse.swt.custom.StyledText.setFocus(StyledText.java:8742)
+	at org.eclipse.ui.texteditor.AbstractTextEditor.setFocus(AbstractTextEditor.java:6186)
+	at org.eclipse.ui.texteditor.StatusTextEditor.setFocus(StatusTextEditor.java:149)
+	at org.eclipse.jdt.internal.ui.javaeditor.JavaEditor.setFocus(JavaEditor.java:2353)
+	at org.eclipse.ui.internal.e4.compatibility.CompatibilityPart.delegateSetFocus(CompatibilityPart.java:226)
+	at jdk.internal.reflect.GeneratedMethodAccessor92.invoke(Unknown Source)
+	at java.base/jdk.internal.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
+	at java.base/java.lang.reflect.Method.invoke(Method.java:568)
+	at org.eclipse.e4.core.internal.di.MethodRequestor.execute(MethodRequestor.java:58)
+	at org.eclipse.e4.core.internal.di.InjectorImpl.invokeUsingClass(InjectorImpl.java:317)
+	at org.eclipse.e4.core.internal.di.InjectorImpl.invokeUsingClass(InjectorImpl.java:323)
+	at org.eclipse.e4.core.internal.di.InjectorImpl.invoke(InjectorImpl.java:245)
+	at org.eclipse.e4.core.contexts.ContextInjectionFactory.invoke(ContextInjectionFactory.java:147)
+	at org.eclipse.e4.ui.internal.workbench.swt.PartRenderingEngine.focusGui(PartRenderingEngine.java:790)
+	at org.eclipse.e4.ui.workbench.renderers.swt.ContributedPartRenderer$1.setFocus(ContributedPartRenderer.java:106)
+	at org.eclipse.swt.custom.CTabItem.setFocus(CTabItem.java:379)
+	at org.eclipse.swt.custom.CTabFolder.setFocus(CTabFolder.java:2683)
+	at org.eclipse.swt.widgets.Control.fixFocus(Control.java:1049)
+	at org.eclipse.swt.widgets.Control.setVisible(Control.java:3951)
+	at org.eclipse.swt.custom.CTabFolder.setSelection(CTabFolder.java:3236)
+	at org.eclipse.swt.custom.CTabFolder.setSelection(CTabFolder.java:3244)
+	at org.eclipse.swt.custom.CTabFolder.onMouse(CTabFolder.java:1882)
+	at org.eclipse.swt.custom.CTabFolder.lambda$0(CTabFolder.java:332)
+	at org.eclipse.swt.widgets.EventTable.sendEvent(EventTable.java:89)
+	at org.eclipse.swt.widgets.Display.sendEvent(Display.java:4256)
+	at org.eclipse.swt.widgets.Widget.sendEvent(Widget.java:1066)
+	at org.eclipse.swt.widgets.Display.runDeferredEvents(Display.java:4054)
+	at org.eclipse.swt.widgets.Display.readAndDispatch(Display.java:3642)
+	at org.eclipse.e4.ui.internal.workbench.swt.PartRenderingEngine$5.run(PartRenderingEngine.java:1155)
+	at org.eclipse.core.databinding.observable.Realm.runWithDefault(Realm.java:338)
+	at org.eclipse.e4.ui.internal.workbench.swt.PartRenderingEngine.run(PartRenderingEngine.java:1046)
+	at org.eclipse.e4.ui.internal.workbench.E4Workbench.createAndRunUI(E4Workbench.java:155)
+	at org.eclipse.ui.internal.Workbench.lambda$3(Workbench.java:643)
+	at org.eclipse.core.databinding.observable.Realm.runWithDefault(Realm.java:338)
+	at org.eclipse.ui.internal.Workbench.createAndRunWorkbench(Workbench.java:550)
+	at org.eclipse.ui.PlatformUI.createAndRunWorkbench(PlatformUI.java:171)
+	at org.eclipse.ui.internal.ide.application.IDEApplication.start(IDEApplication.java:152)
+	at org.eclipse.equinox.internal.app.EclipseAppHandle.run(EclipseAppHandle.java:203)
+	at org.eclipse.core.runtime.internal.adaptor.EclipseAppLauncher.runApplication(EclipseAppLauncher.java:136)
+	at org.eclipse.core.runtime.internal.adaptor.EclipseAppLauncher.start(EclipseAppLauncher.java:104)
+	at org.eclipse.core.runtime.adaptor.EclipseStarter.run(EclipseStarter.java:402)
+	at org.eclipse.core.runtime.adaptor.EclipseStarter.run(EclipseStarter.java:255)
+	at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
+	at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:77)
+	at java.base/jdk.internal.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
+	at java.base/java.lang.reflect.Method.invoke(Method.java:568)
+	at org.eclipse.equinox.launcher.Main.invokeFramework(Main.java:659)
+	at org.eclipse.equinox.launcher.Main.basicRun(Main.java:596)
+	at org.eclipse.equinox.launcher.Main.run(Main.java:1467)
+
+!ENTRY org.eclipse.lsp4e 2 0 2023-03-03 20:33:39.724
+!MESSAGE Could not get if the workspace folder capability is supported due to timeout after 1 second
+!STACK 0
+java.util.concurrent.TimeoutException
+	at java.base/java.util.concurrent.CompletableFuture.timedGet(CompletableFuture.java:1960)
+	at java.base/java.util.concurrent.CompletableFuture.get(CompletableFuture.java:2095)
+	at org.eclipse.lsp4e.LanguageServerWrapper.supportsWorkspaceFolderCapability(LanguageServerWrapper.java:650)
+	at org.eclipse.lsp4e.LanguageServerWrapper.canOperate(LanguageServerWrapper.java:639)
+	at org.eclipse.lsp4e.LanguageServerWrapper.canOperate(LanguageServerWrapper.java:1029)
+	at org.eclipse.lsp4e.LanguageServiceAccessor.lambda$6(LanguageServiceAccessor.java:348)
+	at java.base/java.util.stream.ReferencePipeline$2$1.accept(ReferencePipeline.java:178)
+	at java.base/java.util.Spliterators$ArraySpliterator.forEachRemaining(Spliterators.java:992)
+	at java.base/java.util.stream.AbstractPipeline.copyInto(AbstractPipeline.java:509)
+	at java.base/java.util.stream.AbstractPipeline.wrapAndCopyInto(AbstractPipeline.java:499)
+	at java.base/java.util.stream.ReduceOps$ReduceOp.evaluateSequential(ReduceOps.java:921)
+	at java.base/java.util.stream.AbstractPipeline.evaluate(AbstractPipeline.java:234)
+	at java.base/java.util.stream.ReferencePipeline.collect(ReferencePipeline.java:682)
+	at org.eclipse.lsp4e.LanguageServiceAccessor.getLSWrappers(LanguageServiceAccessor.java:356)
+	at org.eclipse.lsp4e.LanguageServiceAccessor.getLanguageServers(LanguageServiceAccessor.java:623)
+	at org.eclipse.lsp4e.operations.rename.LSPRenameHandler.setEnabled(LSPRenameHandler.java:106)
+	at org.eclipse.ui.internal.handlers.HandlerProxy.setEnabled(HandlerProxy.java:229)
+	at org.eclipse.ui.internal.handlers.E4HandlerProxy.setEnabled(E4HandlerProxy.java:133)
+	at jdk.internal.reflect.GeneratedMethodAccessor16.invoke(Unknown Source)
+	at java.base/jdk.internal.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
+	at java.base/java.lang.reflect.Method.invoke(Method.java:568)
+	at org.eclipse.e4.core.internal.di.MethodRequestor.execute(MethodRequestor.java:58)
+	at org.eclipse.e4.core.internal.di.InjectorImpl.invokeUsingClass(InjectorImpl.java:317)
+	at org.eclipse.e4.core.internal.di.InjectorImpl.invoke(InjectorImpl.java:251)
+	at org.eclipse.e4.core.contexts.ContextInjectionFactory.invoke(ContextInjectionFactory.java:173)
+	at org.eclipse.e4.core.commands.internal.HandlerServiceHandler.setEnabled(HandlerServiceHandler.java:84)
+	at org.eclipse.core.commands.Command.setEnabled(Command.java:856)
+	at org.eclipse.ui.menus.CommandContributionItem.isEnabled(CommandContributionItem.java:916)
+	at org.eclipse.ui.menus.CommandContributionItem.updateMenuItem(CommandContributionItem.java:531)
+	at org.eclipse.ui.menus.CommandContributionItem.update(CommandContributionItem.java:484)
+	at org.eclipse.ui.menus.CommandContributionItem.lambda$2(CommandContributionItem.java:323)
+	at org.eclipse.ui.menus.CommandContributionItem.updateCommandProperties(CommandContributionItem.java:327)
+	at org.eclipse.ui.menus.CommandContributionItem.lambda$1(CommandContributionItem.java:294)
+	at org.eclipse.core.commands.Command$1.run(Command.java:529)
+	at org.eclipse.core.runtime.SafeRunner.run(SafeRunner.java:45)
+	at org.eclipse.core.commands.Command.fireCommandChanged(Command.java:522)
+	at org.eclipse.core.commands.Command.lambda$0(Command.java:1002)
+	at org.eclipse.core.commands.AbstractHandler.fireHandlerChanged(AbstractHandler.java:77)
+	at org.eclipse.e4.core.commands.internal.HandlerServiceHandler.fireHandlerChanged(HandlerServiceHandler.java:180)
+	at org.eclipse.ui.internal.handlers.E4HandlerProxy.handlerChanged(E4HandlerProxy.java:115)
+	at org.eclipse.core.commands.AbstractHandler.fireHandlerChanged(AbstractHandler.java:77)
+	at org.eclipse.ui.internal.handlers.HandlerProxy.lambda$1(HandlerProxy.java:372)
+	at org.eclipse.core.commands.AbstractHandler.fireHandlerChanged(AbstractHandler.java:77)
+	at org.eclipse.core.commands.AbstractHandler.setBaseEnabled(AbstractHandler.java:111)
+	at org.eclipse.lsp4e.operations.rename.LSPRenameHandler.setEnabled(LSPRenameHandler.java:121)
+	at org.eclipse.ui.internal.handlers.HandlerProxy.setEnabled(HandlerProxy.java:229)
+	at org.eclipse.ui.internal.handlers.E4HandlerProxy.setEnabled(E4HandlerProxy.java:133)
+	at jdk.internal.reflect.GeneratedMethodAccessor16.invoke(Unknown Source)
+	at java.base/jdk.internal.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
+	at java.base/java.lang.reflect.Method.invoke(Method.java:568)
+	at org.eclipse.e4.core.internal.di.MethodRequestor.execute(MethodRequestor.java:58)
+	at org.eclipse.e4.core.internal.di.InjectorImpl.invokeUsingClass(InjectorImpl.java:317)
+	at org.eclipse.e4.core.internal.di.InjectorImpl.invoke(InjectorImpl.java:251)
+	at org.eclipse.e4.core.contexts.ContextInjectionFactory.invoke(ContextInjectionFactory.java:173)
+	at org.eclipse.e4.core.commands.internal.HandlerServiceHandler.setEnabled(HandlerServiceHandler.java:84)
+	at org.eclipse.core.commands.Command.setEnabled(Command.java:856)
+	at org.eclipse.ui.menus.CommandContributionItem.isEnabled(CommandContributionItem.java:916)
+	at org.eclipse.ui.menus.CommandContributionItem.updateMenuItem(CommandContributionItem.java:531)
+	at org.eclipse.ui.menus.CommandContributionItem.update(CommandContributionItem.java:484)
+	at org.eclipse.jface.action.MenuManager.update(MenuManager.java:858)
+	at org.eclipse.jface.action.MenuManager.update(MenuManager.java:858)
+	at org.eclipse.ui.internal.Workbench.updateActiveWorkbenchWindowMenuManager(Workbench.java:3138)
+	at org.eclipse.ui.internal.Workbench.lambda$0(Workbench.java:3120)
+	at org.eclipse.jface.bindings.BindingManager.fireBindingManagerChanged(BindingManager.java:901)
+	at org.eclipse.jface.bindings.BindingManager.setActiveBindings(BindingManager.java:2181)
+	at org.eclipse.jface.bindings.BindingManager.recomputeBindings(BindingManager.java:1742)
+	at org.eclipse.jface.bindings.BindingManager.contextManagerChanged(BindingManager.java:691)
+	at org.eclipse.core.commands.contexts.ContextManager.fireContextManagerChanged(ContextManager.java:164)
+	at org.eclipse.core.commands.contexts.ContextManager.setEventCaching(ContextManager.java:323)
+	at org.eclipse.core.commands.contexts.ContextManager.deferUpdates(ContextManager.java:85)
+	at org.eclipse.e4.ui.internal.workbench.PartServiceImpl.activate(PartServiceImpl.java:781)
+	at org.eclipse.e4.ui.internal.workbench.PartServiceImpl.activate(PartServiceImpl.java:683)
+	at org.eclipse.e4.ui.internal.workbench.swt.AbstractPartRenderer.activate(AbstractPartRenderer.java:97)
+	at org.eclipse.e4.ui.workbench.renderers.swt.ContributedPartRenderer.lambda$0(ContributedPartRenderer.java:63)
+	at org.eclipse.swt.widgets.EventTable.sendEvent(EventTable.java:89)
+	at org.eclipse.swt.widgets.Display.sendEvent(Display.java:4256)
+	at org.eclipse.swt.widgets.Widget.sendEvent(Widget.java:1066)
+	at org.eclipse.swt.widgets.Widget.sendEvent(Widget.java:1090)
+	at org.eclipse.swt.widgets.Widget.sendEvent(Widget.java:1075)
+	at org.eclipse.swt.widgets.Shell.setActiveControl(Shell.java:1530)
+	at org.eclipse.swt.widgets.Shell.setActiveControl(Shell.java:1493)
+	at org.eclipse.swt.widgets.Control.sendFocusEvent(Control.java:2954)
+	at org.eclipse.swt.widgets.Widget.wmSetFocus(Widget.java:2321)
+	at org.eclipse.swt.widgets.Control.WM_SETFOCUS(Control.java:5424)
+	at org.eclipse.swt.widgets.Canvas.WM_SETFOCUS(Canvas.java:437)
+	at org.eclipse.swt.widgets.Control.windowProc(Control.java:4815)
+	at org.eclipse.swt.widgets.Canvas.windowProc(Canvas.java:340)
+	at org.eclipse.swt.widgets.Display.windowProc(Display.java:5022)
+	at org.eclipse.swt.internal.win32.OS.SetFocus(Native Method)
+	at org.eclipse.swt.widgets.Control.forceFocus(Control.java:1091)
+	at org.eclipse.swt.widgets.Control.setFocus(Control.java:3439)
+	at org.eclipse.swt.widgets.Composite.setFocus(Composite.java:1081)
+	at org.eclipse.swt.custom.StyledText.setFocus(StyledText.java:8742)
+	at org.eclipse.ui.texteditor.AbstractTextEditor.setFocus(AbstractTextEditor.java:6186)
+	at org.eclipse.ui.texteditor.StatusTextEditor.setFocus(StatusTextEditor.java:149)
+	at org.eclipse.jdt.internal.ui.javaeditor.JavaEditor.setFocus(JavaEditor.java:2353)
+	at org.eclipse.ui.internal.e4.compatibility.CompatibilityPart.delegateSetFocus(CompatibilityPart.java:226)
+	at jdk.internal.reflect.GeneratedMethodAccessor92.invoke(Unknown Source)
+	at java.base/jdk.internal.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
+	at java.base/java.lang.reflect.Method.invoke(Method.java:568)
+	at org.eclipse.e4.core.internal.di.MethodRequestor.execute(MethodRequestor.java:58)
+	at org.eclipse.e4.core.internal.di.InjectorImpl.invokeUsingClass(InjectorImpl.java:317)
+	at org.eclipse.e4.core.internal.di.InjectorImpl.invokeUsingClass(InjectorImpl.java:323)
+	at org.eclipse.e4.core.internal.di.InjectorImpl.invoke(InjectorImpl.java:245)
+	at org.eclipse.e4.core.contexts.ContextInjectionFactory.invoke(ContextInjectionFactory.java:147)
+	at org.eclipse.e4.ui.internal.workbench.swt.PartRenderingEngine.focusGui(PartRenderingEngine.java:790)
+	at org.eclipse.e4.ui.workbench.renderers.swt.ContributedPartRenderer$1.setFocus(ContributedPartRenderer.java:106)
+	at org.eclipse.swt.custom.CTabItem.setFocus(CTabItem.java:379)
+	at org.eclipse.swt.custom.CTabFolder.setFocus(CTabFolder.java:2683)
+	at org.eclipse.swt.widgets.Control.fixFocus(Control.java:1049)
+	at org.eclipse.swt.widgets.Control.setVisible(Control.java:3951)
+	at org.eclipse.swt.custom.CTabFolder.setSelection(CTabFolder.java:3236)
+	at org.eclipse.swt.custom.CTabFolder.setSelection(CTabFolder.java:3244)
+	at org.eclipse.swt.custom.CTabFolder.onMouse(CTabFolder.java:1882)
+	at org.eclipse.swt.custom.CTabFolder.lambda$0(CTabFolder.java:332)
+	at org.eclipse.swt.widgets.EventTable.sendEvent(EventTable.java:89)
+	at org.eclipse.swt.widgets.Display.sendEvent(Display.java:4256)
+	at org.eclipse.swt.widgets.Widget.sendEvent(Widget.java:1066)
+	at org.eclipse.swt.widgets.Display.runDeferredEvents(Display.java:4054)
+	at org.eclipse.swt.widgets.Display.readAndDispatch(Display.java:3642)
+	at org.eclipse.e4.ui.internal.workbench.swt.PartRenderingEngine$5.run(PartRenderingEngine.java:1155)
+	at org.eclipse.core.databinding.observable.Realm.runWithDefault(Realm.java:338)
+	at org.eclipse.e4.ui.internal.workbench.swt.PartRenderingEngine.run(PartRenderingEngine.java:1046)
+	at org.eclipse.e4.ui.internal.workbench.E4Workbench.createAndRunUI(E4Workbench.java:155)
+	at org.eclipse.ui.internal.Workbench.lambda$3(Workbench.java:643)
+	at org.eclipse.core.databinding.observable.Realm.runWithDefault(Realm.java:338)
+	at org.eclipse.ui.internal.Workbench.createAndRunWorkbench(Workbench.java:550)
+	at org.eclipse.ui.PlatformUI.createAndRunWorkbench(PlatformUI.java:171)
+	at org.eclipse.ui.internal.ide.application.IDEApplication.start(IDEApplication.java:152)
+	at org.eclipse.equinox.internal.app.EclipseAppHandle.run(EclipseAppHandle.java:203)
+	at org.eclipse.core.runtime.internal.adaptor.EclipseAppLauncher.runApplication(EclipseAppLauncher.java:136)
+	at org.eclipse.core.runtime.internal.adaptor.EclipseAppLauncher.start(EclipseAppLauncher.java:104)
+	at org.eclipse.core.runtime.adaptor.EclipseStarter.run(EclipseStarter.java:402)
+	at org.eclipse.core.runtime.adaptor.EclipseStarter.run(EclipseStarter.java:255)
+	at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
+	at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:77)
+	at java.base/jdk.internal.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
+	at java.base/java.lang.reflect.Method.invoke(Method.java:568)
+	at org.eclipse.equinox.launcher.Main.invokeFramework(Main.java:659)
+	at org.eclipse.equinox.launcher.Main.basicRun(Main.java:596)
+	at org.eclipse.equinox.launcher.Main.run(Main.java:1467)
+
+!ENTRY org.eclipse.lsp4e 2 0 2023-03-03 20:33:40.728
+!MESSAGE Could not get if the workspace folder capability is supported due to timeout after 1 second
+!STACK 0
+java.util.concurrent.TimeoutException
+	at java.base/java.util.concurrent.CompletableFuture.timedGet(CompletableFuture.java:1960)
+	at java.base/java.util.concurrent.CompletableFuture.get(CompletableFuture.java:2095)
+	at org.eclipse.lsp4e.LanguageServerWrapper.supportsWorkspaceFolderCapability(LanguageServerWrapper.java:650)
+	at org.eclipse.lsp4e.LanguageServerWrapper.canOperate(LanguageServerWrapper.java:639)
+	at org.eclipse.lsp4e.LanguageServerWrapper.canOperate(LanguageServerWrapper.java:1029)
+	at org.eclipse.lsp4e.LanguageServiceAccessor.lambda$6(LanguageServiceAccessor.java:348)
+	at java.base/java.util.stream.ReferencePipeline$2$1.accept(ReferencePipeline.java:178)
+	at java.base/java.util.Spliterators$ArraySpliterator.forEachRemaining(Spliterators.java:992)
+	at java.base/java.util.stream.AbstractPipeline.copyInto(AbstractPipeline.java:509)
+	at java.base/java.util.stream.AbstractPipeline.wrapAndCopyInto(AbstractPipeline.java:499)
+	at java.base/java.util.stream.ReduceOps$ReduceOp.evaluateSequential(ReduceOps.java:921)
+	at java.base/java.util.stream.AbstractPipeline.evaluate(AbstractPipeline.java:234)
+	at java.base/java.util.stream.ReferencePipeline.collect(ReferencePipeline.java:682)
+	at org.eclipse.lsp4e.LanguageServiceAccessor.getLSWrappers(LanguageServiceAccessor.java:356)
+	at org.eclipse.lsp4e.LanguageServiceAccessor.getLanguageServers(LanguageServiceAccessor.java:623)
+	at org.eclipse.lsp4e.operations.rename.LSPRenameHandler.setEnabled(LSPRenameHandler.java:100)
+	at org.eclipse.ui.internal.handlers.HandlerProxy.setEnabled(HandlerProxy.java:229)
+	at org.eclipse.ui.internal.handlers.E4HandlerProxy.canExecute(E4HandlerProxy.java:76)
+	at jdk.internal.reflect.GeneratedMethodAccessor15.invoke(Unknown Source)
+	at java.base/jdk.internal.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
+	at java.base/java.lang.reflect.Method.invoke(Method.java:568)
+	at org.eclipse.e4.core.internal.di.MethodRequestor.execute(MethodRequestor.java:58)
+	at org.eclipse.e4.core.internal.di.InjectorImpl.invokeUsingClass(InjectorImpl.java:317)
+	at org.eclipse.e4.core.internal.di.InjectorImpl.invoke(InjectorImpl.java:251)
+	at org.eclipse.e4.core.contexts.ContextInjectionFactory.invoke(ContextInjectionFactory.java:173)
+	at org.eclipse.e4.core.commands.internal.HandlerServiceHandler.isEnabled(HandlerServiceHandler.java:62)
+	at org.eclipse.core.commands.Command.isEnabled(Command.java:832)
+	at org.eclipse.ui.menus.CommandContributionItem.isEnabled(CommandContributionItem.java:917)
+	at org.eclipse.ui.menus.CommandContributionItem.updateMenuItem(CommandContributionItem.java:531)
+	at org.eclipse.ui.menus.CommandContributionItem.update(CommandContributionItem.java:484)
+	at org.eclipse.ui.menus.CommandContributionItem.lambda$2(CommandContributionItem.java:323)
+	at org.eclipse.ui.menus.CommandContributionItem.updateCommandProperties(CommandContributionItem.java:327)
+	at org.eclipse.ui.menus.CommandContributionItem.lambda$1(CommandContributionItem.java:294)
+	at org.eclipse.core.commands.Command$1.run(Command.java:529)
+	at org.eclipse.core.runtime.SafeRunner.run(SafeRunner.java:45)
+	at org.eclipse.core.commands.Command.fireCommandChanged(Command.java:522)
+	at org.eclipse.core.commands.Command.lambda$0(Command.java:1002)
+	at org.eclipse.core.commands.AbstractHandler.fireHandlerChanged(AbstractHandler.java:77)
+	at org.eclipse.e4.core.commands.internal.HandlerServiceHandler.fireHandlerChanged(HandlerServiceHandler.java:180)
+	at org.eclipse.ui.internal.handlers.E4HandlerProxy.handlerChanged(E4HandlerProxy.java:115)
+	at org.eclipse.core.commands.AbstractHandler.fireHandlerChanged(AbstractHandler.java:77)
+	at org.eclipse.ui.internal.handlers.HandlerProxy.lambda$1(HandlerProxy.java:372)
+	at org.eclipse.core.commands.AbstractHandler.fireHandlerChanged(AbstractHandler.java:77)
+	at org.eclipse.core.commands.AbstractHandler.setBaseEnabled(AbstractHandler.java:111)
+	at org.eclipse.lsp4e.operations.rename.LSPRenameHandler.setEnabled(LSPRenameHandler.java:121)
+	at org.eclipse.ui.internal.handlers.HandlerProxy.setEnabled(HandlerProxy.java:229)
+	at org.eclipse.ui.internal.handlers.E4HandlerProxy.setEnabled(E4HandlerProxy.java:133)
+	at jdk.internal.reflect.GeneratedMethodAccessor16.invoke(Unknown Source)
+	at java.base/jdk.internal.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
+	at java.base/java.lang.reflect.Method.invoke(Method.java:568)
+	at org.eclipse.e4.core.internal.di.MethodRequestor.execute(MethodRequestor.java:58)
+	at org.eclipse.e4.core.internal.di.InjectorImpl.invokeUsingClass(InjectorImpl.java:317)
+	at org.eclipse.e4.core.internal.di.InjectorImpl.invoke(InjectorImpl.java:251)
+	at org.eclipse.e4.core.contexts.ContextInjectionFactory.invoke(ContextInjectionFactory.java:173)
+	at org.eclipse.e4.core.commands.internal.HandlerServiceHandler.setEnabled(HandlerServiceHandler.java:84)
+	at org.eclipse.core.commands.Command.setEnabled(Command.java:856)
+	at org.eclipse.ui.menus.CommandContributionItem.isEnabled(CommandContributionItem.java:916)
+	at org.eclipse.ui.menus.CommandContributionItem.updateMenuItem(CommandContributionItem.java:531)
+	at org.eclipse.ui.menus.CommandContributionItem.update(CommandContributionItem.java:484)
+	at org.eclipse.jface.action.MenuManager.update(MenuManager.java:858)
+	at org.eclipse.jface.action.MenuManager.update(MenuManager.java:858)
+	at org.eclipse.ui.internal.Workbench.updateActiveWorkbenchWindowMenuManager(Workbench.java:3138)
+	at org.eclipse.ui.internal.Workbench.lambda$0(Workbench.java:3120)
+	at org.eclipse.jface.bindings.BindingManager.fireBindingManagerChanged(BindingManager.java:901)
+	at org.eclipse.jface.bindings.BindingManager.setActiveBindings(BindingManager.java:2181)
+	at org.eclipse.jface.bindings.BindingManager.recomputeBindings(BindingManager.java:1742)
+	at org.eclipse.jface.bindings.BindingManager.contextManagerChanged(BindingManager.java:691)
+	at org.eclipse.core.commands.contexts.ContextManager.fireContextManagerChanged(ContextManager.java:164)
+	at org.eclipse.core.commands.contexts.ContextManager.setEventCaching(ContextManager.java:323)
+	at org.eclipse.core.commands.contexts.ContextManager.deferUpdates(ContextManager.java:85)
+	at org.eclipse.e4.ui.internal.workbench.PartServiceImpl.activate(PartServiceImpl.java:781)
+	at org.eclipse.e4.ui.internal.workbench.PartServiceImpl.activate(PartServiceImpl.java:683)
+	at org.eclipse.e4.ui.internal.workbench.swt.AbstractPartRenderer.activate(AbstractPartRenderer.java:97)
+	at org.eclipse.e4.ui.workbench.renderers.swt.ContributedPartRenderer.lambda$0(ContributedPartRenderer.java:63)
+	at org.eclipse.swt.widgets.EventTable.sendEvent(EventTable.java:89)
+	at org.eclipse.swt.widgets.Display.sendEvent(Display.java:4256)
+	at org.eclipse.swt.widgets.Widget.sendEvent(Widget.java:1066)
+	at org.eclipse.swt.widgets.Widget.sendEvent(Widget.java:1090)
+	at org.eclipse.swt.widgets.Widget.sendEvent(Widget.java:1075)
+	at org.eclipse.swt.widgets.Shell.setActiveControl(Shell.java:1530)
+	at org.eclipse.swt.widgets.Shell.setActiveControl(Shell.java:1493)
+	at org.eclipse.swt.widgets.Control.sendFocusEvent(Control.java:2954)
+	at org.eclipse.swt.widgets.Widget.wmSetFocus(Widget.java:2321)
+	at org.eclipse.swt.widgets.Control.WM_SETFOCUS(Control.java:5424)
+	at org.eclipse.swt.widgets.Canvas.WM_SETFOCUS(Canvas.java:437)
+	at org.eclipse.swt.widgets.Control.windowProc(Control.java:4815)
+	at org.eclipse.swt.widgets.Canvas.windowProc(Canvas.java:340)
+	at org.eclipse.swt.widgets.Display.windowProc(Display.java:5022)
+	at org.eclipse.swt.internal.win32.OS.SetFocus(Native Method)
+	at org.eclipse.swt.widgets.Control.forceFocus(Control.java:1091)
+	at org.eclipse.swt.widgets.Control.setFocus(Control.java:3439)
+	at org.eclipse.swt.widgets.Composite.setFocus(Composite.java:1081)
+	at org.eclipse.swt.custom.StyledText.setFocus(StyledText.java:8742)
+	at org.eclipse.ui.texteditor.AbstractTextEditor.setFocus(AbstractTextEditor.java:6186)
+	at org.eclipse.ui.texteditor.StatusTextEditor.setFocus(StatusTextEditor.java:149)
+	at org.eclipse.jdt.internal.ui.javaeditor.JavaEditor.setFocus(JavaEditor.java:2353)
+	at org.eclipse.ui.internal.e4.compatibility.CompatibilityPart.delegateSetFocus(CompatibilityPart.java:226)
+	at jdk.internal.reflect.GeneratedMethodAccessor92.invoke(Unknown Source)
+	at java.base/jdk.internal.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
+	at java.base/java.lang.reflect.Method.invoke(Method.java:568)
+	at org.eclipse.e4.core.internal.di.MethodRequestor.execute(MethodRequestor.java:58)
+	at org.eclipse.e4.core.internal.di.InjectorImpl.invokeUsingClass(InjectorImpl.java:317)
+	at org.eclipse.e4.core.internal.di.InjectorImpl.invokeUsingClass(InjectorImpl.java:323)
+	at org.eclipse.e4.core.internal.di.InjectorImpl.invoke(InjectorImpl.java:245)
+	at org.eclipse.e4.core.contexts.ContextInjectionFactory.invoke(ContextInjectionFactory.java:147)
+	at org.eclipse.e4.ui.internal.workbench.swt.PartRenderingEngine.focusGui(PartRenderingEngine.java:790)
+	at org.eclipse.e4.ui.workbench.renderers.swt.ContributedPartRenderer$1.setFocus(ContributedPartRenderer.java:106)
+	at org.eclipse.swt.custom.CTabItem.setFocus(CTabItem.java:379)
+	at org.eclipse.swt.custom.CTabFolder.setFocus(CTabFolder.java:2683)
+	at org.eclipse.swt.widgets.Control.fixFocus(Control.java:1049)
+	at org.eclipse.swt.widgets.Control.setVisible(Control.java:3951)
+	at org.eclipse.swt.custom.CTabFolder.setSelection(CTabFolder.java:3236)
+	at org.eclipse.swt.custom.CTabFolder.setSelection(CTabFolder.java:3244)
+	at org.eclipse.swt.custom.CTabFolder.onMouse(CTabFolder.java:1882)
+	at org.eclipse.swt.custom.CTabFolder.lambda$0(CTabFolder.java:332)
+	at org.eclipse.swt.widgets.EventTable.sendEvent(EventTable.java:89)
+	at org.eclipse.swt.widgets.Display.sendEvent(Display.java:4256)
+	at org.eclipse.swt.widgets.Widget.sendEvent(Widget.java:1066)
+	at org.eclipse.swt.widgets.Display.runDeferredEvents(Display.java:4054)
+	at org.eclipse.swt.widgets.Display.readAndDispatch(Display.java:3642)
+	at org.eclipse.e4.ui.internal.workbench.swt.PartRenderingEngine$5.run(PartRenderingEngine.java:1155)
+	at org.eclipse.core.databinding.observable.Realm.runWithDefault(Realm.java:338)
+	at org.eclipse.e4.ui.internal.workbench.swt.PartRenderingEngine.run(PartRenderingEngine.java:1046)
+	at org.eclipse.e4.ui.internal.workbench.E4Workbench.createAndRunUI(E4Workbench.java:155)
+	at org.eclipse.ui.internal.Workbench.lambda$3(Workbench.java:643)
+	at org.eclipse.core.databinding.observable.Realm.runWithDefault(Realm.java:338)
+	at org.eclipse.ui.internal.Workbench.createAndRunWorkbench(Workbench.java:550)
+	at org.eclipse.ui.PlatformUI.createAndRunWorkbench(PlatformUI.java:171)
+	at org.eclipse.ui.internal.ide.application.IDEApplication.start(IDEApplication.java:152)
+	at org.eclipse.equinox.internal.app.EclipseAppHandle.run(EclipseAppHandle.java:203)
+	at org.eclipse.core.runtime.internal.adaptor.EclipseAppLauncher.runApplication(EclipseAppLauncher.java:136)
+	at org.eclipse.core.runtime.internal.adaptor.EclipseAppLauncher.start(EclipseAppLauncher.java:104)
+	at org.eclipse.core.runtime.adaptor.EclipseStarter.run(EclipseStarter.java:402)
+	at org.eclipse.core.runtime.adaptor.EclipseStarter.run(EclipseStarter.java:255)
+	at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
+	at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:77)
+	at java.base/jdk.internal.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
+	at java.base/java.lang.reflect.Method.invoke(Method.java:568)
+	at org.eclipse.equinox.launcher.Main.invokeFramework(Main.java:659)
+	at org.eclipse.equinox.launcher.Main.basicRun(Main.java:596)
+	at org.eclipse.equinox.launcher.Main.run(Main.java:1467)
+
+!ENTRY org.eclipse.lsp4e 2 0 2023-03-03 20:33:41.784
+!MESSAGE Could not get if the workspace folder capability is supported due to timeout after 1 second
+!STACK 0
+java.util.concurrent.TimeoutException
+	at java.base/java.util.concurrent.CompletableFuture.timedGet(CompletableFuture.java:1960)
+	at java.base/java.util.concurrent.CompletableFuture.get(CompletableFuture.java:2095)
+	at org.eclipse.lsp4e.LanguageServerWrapper.supportsWorkspaceFolderCapability(LanguageServerWrapper.java:650)
+	at org.eclipse.lsp4e.LanguageServerWrapper.canOperate(LanguageServerWrapper.java:639)
+	at org.eclipse.lsp4e.LanguageServerWrapper.canOperate(LanguageServerWrapper.java:1029)
+	at org.eclipse.lsp4e.LanguageServiceAccessor.lambda$6(LanguageServiceAccessor.java:348)
+	at java.base/java.util.stream.ReferencePipeline$2$1.accept(ReferencePipeline.java:178)
+	at java.base/java.util.Spliterators$ArraySpliterator.forEachRemaining(Spliterators.java:992)
+	at java.base/java.util.stream.AbstractPipeline.copyInto(AbstractPipeline.java:509)
+	at java.base/java.util.stream.AbstractPipeline.wrapAndCopyInto(AbstractPipeline.java:499)
+	at java.base/java.util.stream.ReduceOps$ReduceOp.evaluateSequential(ReduceOps.java:921)
+	at java.base/java.util.stream.AbstractPipeline.evaluate(AbstractPipeline.java:234)
+	at java.base/java.util.stream.ReferencePipeline.collect(ReferencePipeline.java:682)
+	at org.eclipse.lsp4e.LanguageServiceAccessor.getLSWrappers(LanguageServiceAccessor.java:356)
+	at org.eclipse.lsp4e.LanguageServiceAccessor.getLanguageServers(LanguageServiceAccessor.java:623)
+	at org.eclipse.lsp4e.operations.rename.LSPRenameHandler.setEnabled(LSPRenameHandler.java:106)
+	at org.eclipse.ui.internal.handlers.HandlerProxy.setEnabled(HandlerProxy.java:229)
+	at org.eclipse.ui.internal.handlers.E4HandlerProxy.canExecute(E4HandlerProxy.java:76)
+	at jdk.internal.reflect.GeneratedMethodAccessor15.invoke(Unknown Source)
+	at java.base/jdk.internal.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
+	at java.base/java.lang.reflect.Method.invoke(Method.java:568)
+	at org.eclipse.e4.core.internal.di.MethodRequestor.execute(MethodRequestor.java:58)
+	at org.eclipse.e4.core.internal.di.InjectorImpl.invokeUsingClass(InjectorImpl.java:317)
+	at org.eclipse.e4.core.internal.di.InjectorImpl.invoke(InjectorImpl.java:251)
+	at org.eclipse.e4.core.contexts.ContextInjectionFactory.invoke(ContextInjectionFactory.java:173)
+	at org.eclipse.e4.core.commands.internal.HandlerServiceHandler.isEnabled(HandlerServiceHandler.java:62)
+	at org.eclipse.core.commands.Command.isEnabled(Command.java:832)
+	at org.eclipse.ui.menus.CommandContributionItem.isEnabled(CommandContributionItem.java:917)
+	at org.eclipse.ui.menus.CommandContributionItem.updateMenuItem(CommandContributionItem.java:531)
+	at org.eclipse.ui.menus.CommandContributionItem.update(CommandContributionItem.java:484)
+	at org.eclipse.ui.menus.CommandContributionItem.lambda$2(CommandContributionItem.java:323)
+	at org.eclipse.ui.menus.CommandContributionItem.updateCommandProperties(CommandContributionItem.java:327)
+	at org.eclipse.ui.menus.CommandContributionItem.lambda$1(CommandContributionItem.java:294)
+	at org.eclipse.core.commands.Command$1.run(Command.java:529)
+	at org.eclipse.core.runtime.SafeRunner.run(SafeRunner.java:45)
+	at org.eclipse.core.commands.Command.fireCommandChanged(Command.java:522)
+	at org.eclipse.core.commands.Command.lambda$0(Command.java:1002)
+	at org.eclipse.core.commands.AbstractHandler.fireHandlerChanged(AbstractHandler.java:77)
+	at org.eclipse.e4.core.commands.internal.HandlerServiceHandler.fireHandlerChanged(HandlerServiceHandler.java:180)
+	at org.eclipse.ui.internal.handlers.E4HandlerProxy.handlerChanged(E4HandlerProxy.java:115)
+	at org.eclipse.core.commands.AbstractHandler.fireHandlerChanged(AbstractHandler.java:77)
+	at org.eclipse.ui.internal.handlers.HandlerProxy.lambda$1(HandlerProxy.java:372)
+	at org.eclipse.core.commands.AbstractHandler.fireHandlerChanged(AbstractHandler.java:77)
+	at org.eclipse.core.commands.AbstractHandler.setBaseEnabled(AbstractHandler.java:111)
+	at org.eclipse.lsp4e.operations.rename.LSPRenameHandler.setEnabled(LSPRenameHandler.java:121)
+	at org.eclipse.ui.internal.handlers.HandlerProxy.setEnabled(HandlerProxy.java:229)
+	at org.eclipse.ui.internal.handlers.E4HandlerProxy.setEnabled(E4HandlerProxy.java:133)
+	at jdk.internal.reflect.GeneratedMethodAccessor16.invoke(Unknown Source)
+	at java.base/jdk.internal.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
+	at java.base/java.lang.reflect.Method.invoke(Method.java:568)
+	at org.eclipse.e4.core.internal.di.MethodRequestor.execute(MethodRequestor.java:58)
+	at org.eclipse.e4.core.internal.di.InjectorImpl.invokeUsingClass(InjectorImpl.java:317)
+	at org.eclipse.e4.core.internal.di.InjectorImpl.invoke(InjectorImpl.java:251)
+	at org.eclipse.e4.core.contexts.ContextInjectionFactory.invoke(ContextInjectionFactory.java:173)
+	at org.eclipse.e4.core.commands.internal.HandlerServiceHandler.setEnabled(HandlerServiceHandler.java:84)
+	at org.eclipse.core.commands.Command.setEnabled(Command.java:856)
+	at org.eclipse.ui.menus.CommandContributionItem.isEnabled(CommandContributionItem.java:916)
+	at org.eclipse.ui.menus.CommandContributionItem.updateMenuItem(CommandContributionItem.java:531)
+	at org.eclipse.ui.menus.CommandContributionItem.update(CommandContributionItem.java:484)
+	at org.eclipse.jface.action.MenuManager.update(MenuManager.java:858)
+	at org.eclipse.jface.action.MenuManager.update(MenuManager.java:858)
+	at org.eclipse.ui.internal.Workbench.updateActiveWorkbenchWindowMenuManager(Workbench.java:3138)
+	at org.eclipse.ui.internal.Workbench.lambda$0(Workbench.java:3120)
+	at org.eclipse.jface.bindings.BindingManager.fireBindingManagerChanged(BindingManager.java:901)
+	at org.eclipse.jface.bindings.BindingManager.setActiveBindings(BindingManager.java:2181)
+	at org.eclipse.jface.bindings.BindingManager.recomputeBindings(BindingManager.java:1742)
+	at org.eclipse.jface.bindings.BindingManager.contextManagerChanged(BindingManager.java:691)
+	at org.eclipse.core.commands.contexts.ContextManager.fireContextManagerChanged(ContextManager.java:164)
+	at org.eclipse.core.commands.contexts.ContextManager.setEventCaching(ContextManager.java:323)
+	at org.eclipse.core.commands.contexts.ContextManager.deferUpdates(ContextManager.java:85)
+	at org.eclipse.e4.ui.internal.workbench.PartServiceImpl.activate(PartServiceImpl.java:781)
+	at org.eclipse.e4.ui.internal.workbench.PartServiceImpl.activate(PartServiceImpl.java:683)
+	at org.eclipse.e4.ui.internal.workbench.swt.AbstractPartRenderer.activate(AbstractPartRenderer.java:97)
+	at org.eclipse.e4.ui.workbench.renderers.swt.ContributedPartRenderer.lambda$0(ContributedPartRenderer.java:63)
+	at org.eclipse.swt.widgets.EventTable.sendEvent(EventTable.java:89)
+	at org.eclipse.swt.widgets.Display.sendEvent(Display.java:4256)
+	at org.eclipse.swt.widgets.Widget.sendEvent(Widget.java:1066)
+	at org.eclipse.swt.widgets.Widget.sendEvent(Widget.java:1090)
+	at org.eclipse.swt.widgets.Widget.sendEvent(Widget.java:1075)
+	at org.eclipse.swt.widgets.Shell.setActiveControl(Shell.java:1530)
+	at org.eclipse.swt.widgets.Shell.setActiveControl(Shell.java:1493)
+	at org.eclipse.swt.widgets.Control.sendFocusEvent(Control.java:2954)
+	at org.eclipse.swt.widgets.Widget.wmSetFocus(Widget.java:2321)
+	at org.eclipse.swt.widgets.Control.WM_SETFOCUS(Control.java:5424)
+	at org.eclipse.swt.widgets.Canvas.WM_SETFOCUS(Canvas.java:437)
+	at org.eclipse.swt.widgets.Control.windowProc(Control.java:4815)
+	at org.eclipse.swt.widgets.Canvas.windowProc(Canvas.java:340)
+	at org.eclipse.swt.widgets.Display.windowProc(Display.java:5022)
+	at org.eclipse.swt.internal.win32.OS.SetFocus(Native Method)
+	at org.eclipse.swt.widgets.Control.forceFocus(Control.java:1091)
+	at org.eclipse.swt.widgets.Control.setFocus(Control.java:3439)
+	at org.eclipse.swt.widgets.Composite.setFocus(Composite.java:1081)
+	at org.eclipse.swt.custom.StyledText.setFocus(StyledText.java:8742)
+	at org.eclipse.ui.texteditor.AbstractTextEditor.setFocus(AbstractTextEditor.java:6186)
+	at org.eclipse.ui.texteditor.StatusTextEditor.setFocus(StatusTextEditor.java:149)
+	at org.eclipse.jdt.internal.ui.javaeditor.JavaEditor.setFocus(JavaEditor.java:2353)
+	at org.eclipse.ui.internal.e4.compatibility.CompatibilityPart.delegateSetFocus(CompatibilityPart.java:226)
+	at jdk.internal.reflect.GeneratedMethodAccessor92.invoke(Unknown Source)
+	at java.base/jdk.internal.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
+	at java.base/java.lang.reflect.Method.invoke(Method.java:568)
+	at org.eclipse.e4.core.internal.di.MethodRequestor.execute(MethodRequestor.java:58)
+	at org.eclipse.e4.core.internal.di.InjectorImpl.invokeUsingClass(InjectorImpl.java:317)
+	at org.eclipse.e4.core.internal.di.InjectorImpl.invokeUsingClass(InjectorImpl.java:323)
+	at org.eclipse.e4.core.internal.di.InjectorImpl.invoke(InjectorImpl.java:245)
+	at org.eclipse.e4.core.contexts.ContextInjectionFactory.invoke(ContextInjectionFactory.java:147)
+	at org.eclipse.e4.ui.internal.workbench.swt.PartRenderingEngine.focusGui(PartRenderingEngine.java:790)
+	at org.eclipse.e4.ui.workbench.renderers.swt.ContributedPartRenderer$1.setFocus(ContributedPartRenderer.java:106)
+	at org.eclipse.swt.custom.CTabItem.setFocus(CTabItem.java:379)
+	at org.eclipse.swt.custom.CTabFolder.setFocus(CTabFolder.java:2683)
+	at org.eclipse.swt.widgets.Control.fixFocus(Control.java:1049)
+	at org.eclipse.swt.widgets.Control.setVisible(Control.java:3951)
+	at org.eclipse.swt.custom.CTabFolder.setSelection(CTabFolder.java:3236)
+	at org.eclipse.swt.custom.CTabFolder.setSelection(CTabFolder.java:3244)
+	at org.eclipse.swt.custom.CTabFolder.onMouse(CTabFolder.java:1882)
+	at org.eclipse.swt.custom.CTabFolder.lambda$0(CTabFolder.java:332)
+	at org.eclipse.swt.widgets.EventTable.sendEvent(EventTable.java:89)
+	at org.eclipse.swt.widgets.Display.sendEvent(Display.java:4256)
+	at org.eclipse.swt.widgets.Widget.sendEvent(Widget.java:1066)
+	at org.eclipse.swt.widgets.Display.runDeferredEvents(Display.java:4054)
+	at org.eclipse.swt.widgets.Display.readAndDispatch(Display.java:3642)
+	at org.eclipse.e4.ui.internal.workbench.swt.PartRenderingEngine$5.run(PartRenderingEngine.java:1155)
+	at org.eclipse.core.databinding.observable.Realm.runWithDefault(Realm.java:338)
+	at org.eclipse.e4.ui.internal.workbench.swt.PartRenderingEngine.run(PartRenderingEngine.java:1046)
+	at org.eclipse.e4.ui.internal.workbench.E4Workbench.createAndRunUI(E4Workbench.java:155)
+	at org.eclipse.ui.internal.Workbench.lambda$3(Workbench.java:643)
+	at org.eclipse.core.databinding.observable.Realm.runWithDefault(Realm.java:338)
+	at org.eclipse.ui.internal.Workbench.createAndRunWorkbench(Workbench.java:550)
+	at org.eclipse.ui.PlatformUI.createAndRunWorkbench(PlatformUI.java:171)
+	at org.eclipse.ui.internal.ide.application.IDEApplication.start(IDEApplication.java:152)
+	at org.eclipse.equinox.internal.app.EclipseAppHandle.run(EclipseAppHandle.java:203)
+	at org.eclipse.core.runtime.internal.adaptor.EclipseAppLauncher.runApplication(EclipseAppLauncher.java:136)
+	at org.eclipse.core.runtime.internal.adaptor.EclipseAppLauncher.start(EclipseAppLauncher.java:104)
+	at org.eclipse.core.runtime.adaptor.EclipseStarter.run(EclipseStarter.java:402)
+	at org.eclipse.core.runtime.adaptor.EclipseStarter.run(EclipseStarter.java:255)
+	at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
+	at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:77)
+	at java.base/jdk.internal.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
+	at java.base/java.lang.reflect.Method.invoke(Method.java:568)
+	at org.eclipse.equinox.launcher.Main.invokeFramework(Main.java:659)
+	at org.eclipse.equinox.launcher.Main.basicRun(Main.java:596)
+	at org.eclipse.equinox.launcher.Main.run(Main.java:1467)
+
+!ENTRY org.eclipse.lsp4e 2 0 2023-03-03 20:33:42.788
+!MESSAGE Could not get if the workspace folder capability is supported due to timeout after 1 second
+!STACK 0
+java.util.concurrent.TimeoutException
+	at java.base/java.util.concurrent.CompletableFuture.timedGet(CompletableFuture.java:1960)
+	at java.base/java.util.concurrent.CompletableFuture.get(CompletableFuture.java:2095)
+	at org.eclipse.lsp4e.LanguageServerWrapper.supportsWorkspaceFolderCapability(LanguageServerWrapper.java:650)
+	at org.eclipse.lsp4e.LanguageServerWrapper.canOperate(LanguageServerWrapper.java:639)
+	at org.eclipse.lsp4e.LanguageServerWrapper.canOperate(LanguageServerWrapper.java:1029)
+	at org.eclipse.lsp4e.LanguageServiceAccessor.lambda$6(LanguageServiceAccessor.java:348)
+	at java.base/java.util.stream.ReferencePipeline$2$1.accept(ReferencePipeline.java:178)
+	at java.base/java.util.Spliterators$ArraySpliterator.forEachRemaining(Spliterators.java:992)
+	at java.base/java.util.stream.AbstractPipeline.copyInto(AbstractPipeline.java:509)
+	at java.base/java.util.stream.AbstractPipeline.wrapAndCopyInto(AbstractPipeline.java:499)
+	at java.base/java.util.stream.ReduceOps$ReduceOp.evaluateSequential(ReduceOps.java:921)
+	at java.base/java.util.stream.AbstractPipeline.evaluate(AbstractPipeline.java:234)
+	at java.base/java.util.stream.ReferencePipeline.collect(ReferencePipeline.java:682)
+	at org.eclipse.lsp4e.LanguageServiceAccessor.getLSWrappers(LanguageServiceAccessor.java:356)
+	at org.eclipse.lsp4e.LanguageServiceAccessor.getLanguageServers(LanguageServiceAccessor.java:623)
+	at org.eclipse.lsp4e.operations.rename.LSPRenameHandler.setEnabled(LSPRenameHandler.java:100)
+	at org.eclipse.ui.internal.handlers.HandlerProxy.setEnabled(HandlerProxy.java:229)
+	at org.eclipse.ui.internal.handlers.E4HandlerProxy.setEnabled(E4HandlerProxy.java:133)
+	at jdk.internal.reflect.GeneratedMethodAccessor16.invoke(Unknown Source)
+	at java.base/jdk.internal.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
+	at java.base/java.lang.reflect.Method.invoke(Method.java:568)
+	at org.eclipse.e4.core.internal.di.MethodRequestor.execute(MethodRequestor.java:58)
+	at org.eclipse.e4.core.internal.di.InjectorImpl.invokeUsingClass(InjectorImpl.java:317)
+	at org.eclipse.e4.core.internal.di.InjectorImpl.invoke(InjectorImpl.java:251)
+	at org.eclipse.e4.core.contexts.ContextInjectionFactory.invoke(ContextInjectionFactory.java:173)
+	at org.eclipse.e4.core.commands.internal.HandlerServiceHandler.setEnabled(HandlerServiceHandler.java:84)
+	at org.eclipse.core.commands.Command.setEnabled(Command.java:856)
+	at org.eclipse.ui.menus.CommandContributionItem.isEnabled(CommandContributionItem.java:916)
+	at org.eclipse.ui.menus.CommandContributionItem.updateMenuItem(CommandContributionItem.java:531)
+	at org.eclipse.ui.menus.CommandContributionItem.update(CommandContributionItem.java:484)
+	at org.eclipse.ui.menus.CommandContributionItem.lambda$2(CommandContributionItem.java:323)
+	at org.eclipse.ui.menus.CommandContributionItem.updateCommandProperties(CommandContributionItem.java:327)
+	at org.eclipse.ui.menus.CommandContributionItem.lambda$1(CommandContributionItem.java:294)
+	at org.eclipse.core.commands.Command$1.run(Command.java:529)
+	at org.eclipse.core.runtime.SafeRunner.run(SafeRunner.java:45)
+	at org.eclipse.core.commands.Command.fireCommandChanged(Command.java:522)
+	at org.eclipse.core.commands.Command.lambda$0(Command.java:1002)
+	at org.eclipse.core.commands.AbstractHandler.fireHandlerChanged(AbstractHandler.java:77)
+	at org.eclipse.e4.core.commands.internal.HandlerServiceHandler.fireHandlerChanged(HandlerServiceHandler.java:180)
+	at org.eclipse.core.commands.AbstractHandler.setBaseEnabled(AbstractHandler.java:111)
+	at org.eclipse.e4.core.commands.internal.HandlerServiceHandler.isEnabled(HandlerServiceHandler.java:64)
+	at org.eclipse.core.commands.Command.isEnabled(Command.java:832)
+	at org.eclipse.ui.menus.CommandContributionItem.isEnabled(CommandContributionItem.java:917)
+	at org.eclipse.ui.menus.CommandContributionItem.updateMenuItem(CommandContributionItem.java:531)
+	at org.eclipse.ui.menus.CommandContributionItem.update(CommandContributionItem.java:484)
+	at org.eclipse.ui.menus.CommandContributionItem.lambda$2(CommandContributionItem.java:323)
+	at org.eclipse.ui.menus.CommandContributionItem.updateCommandProperties(CommandContributionItem.java:327)
+	at org.eclipse.ui.menus.CommandContributionItem.lambda$1(CommandContributionItem.java:294)
+	at org.eclipse.core.commands.Command$1.run(Command.java:529)
+	at org.eclipse.core.runtime.SafeRunner.run(SafeRunner.java:45)
+	at org.eclipse.core.commands.Command.fireCommandChanged(Command.java:522)
+	at org.eclipse.core.commands.Command.lambda$0(Command.java:1002)
+	at org.eclipse.core.commands.AbstractHandler.fireHandlerChanged(AbstractHandler.java:77)
+	at org.eclipse.e4.core.commands.internal.HandlerServiceHandler.fireHandlerChanged(HandlerServiceHandler.java:180)
+	at org.eclipse.ui.internal.handlers.E4HandlerProxy.handlerChanged(E4HandlerProxy.java:115)
+	at org.eclipse.core.commands.AbstractHandler.fireHandlerChanged(AbstractHandler.java:77)
+	at org.eclipse.ui.internal.handlers.HandlerProxy.lambda$1(HandlerProxy.java:372)
+	at org.eclipse.core.commands.AbstractHandler.fireHandlerChanged(AbstractHandler.java:77)
+	at org.eclipse.core.commands.AbstractHandler.setBaseEnabled(AbstractHandler.java:111)
+	at org.eclipse.lsp4e.operations.rename.LSPRenameHandler.setEnabled(LSPRenameHandler.java:121)
+	at org.eclipse.ui.internal.handlers.HandlerProxy.setEnabled(HandlerProxy.java:229)
+	at org.eclipse.ui.internal.handlers.E4HandlerProxy.setEnabled(E4HandlerProxy.java:133)
+	at jdk.internal.reflect.GeneratedMethodAccessor16.invoke(Unknown Source)
+	at java.base/jdk.internal.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
+	at java.base/java.lang.reflect.Method.invoke(Method.java:568)
+	at org.eclipse.e4.core.internal.di.MethodRequestor.execute(MethodRequestor.java:58)
+	at org.eclipse.e4.core.internal.di.InjectorImpl.invokeUsingClass(InjectorImpl.java:317)
+	at org.eclipse.e4.core.internal.di.InjectorImpl.invoke(InjectorImpl.java:251)
+	at org.eclipse.e4.core.contexts.ContextInjectionFactory.invoke(ContextInjectionFactory.java:173)
+	at org.eclipse.e4.core.commands.internal.HandlerServiceHandler.setEnabled(HandlerServiceHandler.java:84)
+	at org.eclipse.core.commands.Command.setEnabled(Command.java:856)
+	at org.eclipse.ui.menus.CommandContributionItem.isEnabled(CommandContributionItem.java:916)
+	at org.eclipse.ui.menus.CommandContributionItem.updateMenuItem(CommandContributionItem.java:531)
+	at org.eclipse.ui.menus.CommandContributionItem.update(CommandContributionItem.java:484)
+	at org.eclipse.jface.action.MenuManager.update(MenuManager.java:858)
+	at org.eclipse.jface.action.MenuManager.update(MenuManager.java:858)
+	at org.eclipse.ui.internal.Workbench.updateActiveWorkbenchWindowMenuManager(Workbench.java:3138)
+	at org.eclipse.ui.internal.Workbench.lambda$0(Workbench.java:3120)
+	at org.eclipse.jface.bindings.BindingManager.fireBindingManagerChanged(BindingManager.java:901)
+	at org.eclipse.jface.bindings.BindingManager.setActiveBindings(BindingManager.java:2181)
+	at org.eclipse.jface.bindings.BindingManager.recomputeBindings(BindingManager.java:1742)
+	at org.eclipse.jface.bindings.BindingManager.contextManagerChanged(BindingManager.java:691)
+	at org.eclipse.core.commands.contexts.ContextManager.fireContextManagerChanged(ContextManager.java:164)
+	at org.eclipse.core.commands.contexts.ContextManager.setEventCaching(ContextManager.java:323)
+	at org.eclipse.core.commands.contexts.ContextManager.deferUpdates(ContextManager.java:85)
+	at org.eclipse.e4.ui.internal.workbench.PartServiceImpl.activate(PartServiceImpl.java:781)
+	at org.eclipse.e4.ui.internal.workbench.PartServiceImpl.activate(PartServiceImpl.java:683)
+	at org.eclipse.e4.ui.internal.workbench.swt.AbstractPartRenderer.activate(AbstractPartRenderer.java:97)
+	at org.eclipse.e4.ui.workbench.renderers.swt.ContributedPartRenderer.lambda$0(ContributedPartRenderer.java:63)
+	at org.eclipse.swt.widgets.EventTable.sendEvent(EventTable.java:89)
+	at org.eclipse.swt.widgets.Display.sendEvent(Display.java:4256)
+	at org.eclipse.swt.widgets.Widget.sendEvent(Widget.java:1066)
+	at org.eclipse.swt.widgets.Widget.sendEvent(Widget.java:1090)
+	at org.eclipse.swt.widgets.Widget.sendEvent(Widget.java:1075)
+	at org.eclipse.swt.widgets.Shell.setActiveControl(Shell.java:1530)
+	at org.eclipse.swt.widgets.Shell.setActiveControl(Shell.java:1493)
+	at org.eclipse.swt.widgets.Control.sendFocusEvent(Control.java:2954)
+	at org.eclipse.swt.widgets.Widget.wmSetFocus(Widget.java:2321)
+	at org.eclipse.swt.widgets.Control.WM_SETFOCUS(Control.java:5424)
+	at org.eclipse.swt.widgets.Canvas.WM_SETFOCUS(Canvas.java:437)
+	at org.eclipse.swt.widgets.Control.windowProc(Control.java:4815)
+	at org.eclipse.swt.widgets.Canvas.windowProc(Canvas.java:340)
+	at org.eclipse.swt.widgets.Display.windowProc(Display.java:5022)
+	at org.eclipse.swt.internal.win32.OS.SetFocus(Native Method)
+	at org.eclipse.swt.widgets.Control.forceFocus(Control.java:1091)
+	at org.eclipse.swt.widgets.Control.setFocus(Control.java:3439)
+	at org.eclipse.swt.widgets.Composite.setFocus(Composite.java:1081)
+	at org.eclipse.swt.custom.StyledText.setFocus(StyledText.java:8742)
+	at org.eclipse.ui.texteditor.AbstractTextEditor.setFocus(AbstractTextEditor.java:6186)
+	at org.eclipse.ui.texteditor.StatusTextEditor.setFocus(StatusTextEditor.java:149)
+	at org.eclipse.jdt.internal.ui.javaeditor.JavaEditor.setFocus(JavaEditor.java:2353)
+	at org.eclipse.ui.internal.e4.compatibility.CompatibilityPart.delegateSetFocus(CompatibilityPart.java:226)
+	at jdk.internal.reflect.GeneratedMethodAccessor92.invoke(Unknown Source)
+	at java.base/jdk.internal.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
+	at java.base/java.lang.reflect.Method.invoke(Method.java:568)
+	at org.eclipse.e4.core.internal.di.MethodRequestor.execute(MethodRequestor.java:58)
+	at org.eclipse.e4.core.internal.di.InjectorImpl.invokeUsingClass(InjectorImpl.java:317)
+	at org.eclipse.e4.core.internal.di.InjectorImpl.invokeUsingClass(InjectorImpl.java:323)
+	at org.eclipse.e4.core.internal.di.InjectorImpl.invoke(InjectorImpl.java:245)
+	at org.eclipse.e4.core.contexts.ContextInjectionFactory.invoke(ContextInjectionFactory.java:147)
+	at org.eclipse.e4.ui.internal.workbench.swt.PartRenderingEngine.focusGui(PartRenderingEngine.java:790)
+	at org.eclipse.e4.ui.workbench.renderers.swt.ContributedPartRenderer$1.setFocus(ContributedPartRenderer.java:106)
+	at org.eclipse.swt.custom.CTabItem.setFocus(CTabItem.java:379)
+	at org.eclipse.swt.custom.CTabFolder.setFocus(CTabFolder.java:2683)
+	at org.eclipse.swt.widgets.Control.fixFocus(Control.java:1049)
+	at org.eclipse.swt.widgets.Control.setVisible(Control.java:3951)
+	at org.eclipse.swt.custom.CTabFolder.setSelection(CTabFolder.java:3236)
+	at org.eclipse.swt.custom.CTabFolder.setSelection(CTabFolder.java:3244)
+	at org.eclipse.swt.custom.CTabFolder.onMouse(CTabFolder.java:1882)
+	at org.eclipse.swt.custom.CTabFolder.lambda$0(CTabFolder.java:332)
+	at org.eclipse.swt.widgets.EventTable.sendEvent(EventTable.java:89)
+	at org.eclipse.swt.widgets.Display.sendEvent(Display.java:4256)
+	at org.eclipse.swt.widgets.Widget.sendEvent(Widget.java:1066)
+	at org.eclipse.swt.widgets.Display.runDeferredEvents(Display.java:4054)
+	at org.eclipse.swt.widgets.Display.readAndDispatch(Display.java:3642)
+	at org.eclipse.e4.ui.internal.workbench.swt.PartRenderingEngine$5.run(PartRenderingEngine.java:1155)
+	at org.eclipse.core.databinding.observable.Realm.runWithDefault(Realm.java:338)
+	at org.eclipse.e4.ui.internal.workbench.swt.PartRenderingEngine.run(PartRenderingEngine.java:1046)
+	at org.eclipse.e4.ui.internal.workbench.E4Workbench.createAndRunUI(E4Workbench.java:155)
+	at org.eclipse.ui.internal.Workbench.lambda$3(Workbench.java:643)
+	at org.eclipse.core.databinding.observable.Realm.runWithDefault(Realm.java:338)
+	at org.eclipse.ui.internal.Workbench.createAndRunWorkbench(Workbench.java:550)
+	at org.eclipse.ui.PlatformUI.createAndRunWorkbench(PlatformUI.java:171)
+	at org.eclipse.ui.internal.ide.application.IDEApplication.start(IDEApplication.java:152)
+	at org.eclipse.equinox.internal.app.EclipseAppHandle.run(EclipseAppHandle.java:203)
+	at org.eclipse.core.runtime.internal.adaptor.EclipseAppLauncher.runApplication(EclipseAppLauncher.java:136)
+	at org.eclipse.core.runtime.internal.adaptor.EclipseAppLauncher.start(EclipseAppLauncher.java:104)
+	at org.eclipse.core.runtime.adaptor.EclipseStarter.run(EclipseStarter.java:402)
+	at org.eclipse.core.runtime.adaptor.EclipseStarter.run(EclipseStarter.java:255)
+	at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
+	at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:77)
+	at java.base/jdk.internal.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
+	at java.base/java.lang.reflect.Method.invoke(Method.java:568)
+	at org.eclipse.equinox.launcher.Main.invokeFramework(Main.java:659)
+	at org.eclipse.equinox.launcher.Main.basicRun(Main.java:596)
+	at org.eclipse.equinox.launcher.Main.run(Main.java:1467)
+
+!ENTRY org.eclipse.lsp4e 2 0 2023-03-03 20:33:43.868
+!MESSAGE Could not get if the workspace folder capability is supported due to timeout after 1 second
+!STACK 0
+java.util.concurrent.TimeoutException
+	at java.base/java.util.concurrent.CompletableFuture.timedGet(CompletableFuture.java:1960)
+	at java.base/java.util.concurrent.CompletableFuture.get(CompletableFuture.java:2095)
+	at org.eclipse.lsp4e.LanguageServerWrapper.supportsWorkspaceFolderCapability(LanguageServerWrapper.java:650)
+	at org.eclipse.lsp4e.LanguageServerWrapper.canOperate(LanguageServerWrapper.java:639)
+	at org.eclipse.lsp4e.LanguageServerWrapper.canOperate(LanguageServerWrapper.java:1029)
+	at org.eclipse.lsp4e.LanguageServiceAccessor.lambda$6(LanguageServiceAccessor.java:348)
+	at java.base/java.util.stream.ReferencePipeline$2$1.accept(ReferencePipeline.java:178)
+	at java.base/java.util.Spliterators$ArraySpliterator.forEachRemaining(Spliterators.java:992)
+	at java.base/java.util.stream.AbstractPipeline.copyInto(AbstractPipeline.java:509)
+	at java.base/java.util.stream.AbstractPipeline.wrapAndCopyInto(AbstractPipeline.java:499)
+	at java.base/java.util.stream.ReduceOps$ReduceOp.evaluateSequential(ReduceOps.java:921)
+	at java.base/java.util.stream.AbstractPipeline.evaluate(AbstractPipeline.java:234)
+	at java.base/java.util.stream.ReferencePipeline.collect(ReferencePipeline.java:682)
+	at org.eclipse.lsp4e.LanguageServiceAccessor.getLSWrappers(LanguageServiceAccessor.java:356)
+	at org.eclipse.lsp4e.LanguageServiceAccessor.getLanguageServers(LanguageServiceAccessor.java:623)
+	at org.eclipse.lsp4e.operations.rename.LSPRenameHandler.setEnabled(LSPRenameHandler.java:106)
+	at org.eclipse.ui.internal.handlers.HandlerProxy.setEnabled(HandlerProxy.java:229)
+	at org.eclipse.ui.internal.handlers.E4HandlerProxy.setEnabled(E4HandlerProxy.java:133)
+	at jdk.internal.reflect.GeneratedMethodAccessor16.invoke(Unknown Source)
+	at java.base/jdk.internal.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
+	at java.base/java.lang.reflect.Method.invoke(Method.java:568)
+	at org.eclipse.e4.core.internal.di.MethodRequestor.execute(MethodRequestor.java:58)
+	at org.eclipse.e4.core.internal.di.InjectorImpl.invokeUsingClass(InjectorImpl.java:317)
+	at org.eclipse.e4.core.internal.di.InjectorImpl.invoke(InjectorImpl.java:251)
+	at org.eclipse.e4.core.contexts.ContextInjectionFactory.invoke(ContextInjectionFactory.java:173)
+	at org.eclipse.e4.core.commands.internal.HandlerServiceHandler.setEnabled(HandlerServiceHandler.java:84)
+	at org.eclipse.core.commands.Command.setEnabled(Command.java:856)
+	at org.eclipse.ui.menus.CommandContributionItem.isEnabled(CommandContributionItem.java:916)
+	at org.eclipse.ui.menus.CommandContributionItem.updateMenuItem(CommandContributionItem.java:531)
+	at org.eclipse.ui.menus.CommandContributionItem.update(CommandContributionItem.java:484)
+	at org.eclipse.ui.menus.CommandContributionItem.lambda$2(CommandContributionItem.java:323)
+	at org.eclipse.ui.menus.CommandContributionItem.updateCommandProperties(CommandContributionItem.java:327)
+	at org.eclipse.ui.menus.CommandContributionItem.lambda$1(CommandContributionItem.java:294)
+	at org.eclipse.core.commands.Command$1.run(Command.java:529)
+	at org.eclipse.core.runtime.SafeRunner.run(SafeRunner.java:45)
+	at org.eclipse.core.commands.Command.fireCommandChanged(Command.java:522)
+	at org.eclipse.core.commands.Command.lambda$0(Command.java:1002)
+	at org.eclipse.core.commands.AbstractHandler.fireHandlerChanged(AbstractHandler.java:77)
+	at org.eclipse.e4.core.commands.internal.HandlerServiceHandler.fireHandlerChanged(HandlerServiceHandler.java:180)
+	at org.eclipse.core.commands.AbstractHandler.setBaseEnabled(AbstractHandler.java:111)
+	at org.eclipse.e4.core.commands.internal.HandlerServiceHandler.isEnabled(HandlerServiceHandler.java:64)
+	at org.eclipse.core.commands.Command.isEnabled(Command.java:832)
+	at org.eclipse.ui.menus.CommandContributionItem.isEnabled(CommandContributionItem.java:917)
+	at org.eclipse.ui.menus.CommandContributionItem.updateMenuItem(CommandContributionItem.java:531)
+	at org.eclipse.ui.menus.CommandContributionItem.update(CommandContributionItem.java:484)
+	at org.eclipse.ui.menus.CommandContributionItem.lambda$2(CommandContributionItem.java:323)
+	at org.eclipse.ui.menus.CommandContributionItem.updateCommandProperties(CommandContributionItem.java:327)
+	at org.eclipse.ui.menus.CommandContributionItem.lambda$1(CommandContributionItem.java:294)
+	at org.eclipse.core.commands.Command$1.run(Command.java:529)
+	at org.eclipse.core.runtime.SafeRunner.run(SafeRunner.java:45)
+	at org.eclipse.core.commands.Command.fireCommandChanged(Command.java:522)
+	at org.eclipse.core.commands.Command.lambda$0(Command.java:1002)
+	at org.eclipse.core.commands.AbstractHandler.fireHandlerChanged(AbstractHandler.java:77)
+	at org.eclipse.e4.core.commands.internal.HandlerServiceHandler.fireHandlerChanged(HandlerServiceHandler.java:180)
+	at org.eclipse.ui.internal.handlers.E4HandlerProxy.handlerChanged(E4HandlerProxy.java:115)
+	at org.eclipse.core.commands.AbstractHandler.fireHandlerChanged(AbstractHandler.java:77)
+	at org.eclipse.ui.internal.handlers.HandlerProxy.lambda$1(HandlerProxy.java:372)
+	at org.eclipse.core.commands.AbstractHandler.fireHandlerChanged(AbstractHandler.java:77)
+	at org.eclipse.core.commands.AbstractHandler.setBaseEnabled(AbstractHandler.java:111)
+	at org.eclipse.lsp4e.operations.rename.LSPRenameHandler.setEnabled(LSPRenameHandler.java:121)
+	at org.eclipse.ui.internal.handlers.HandlerProxy.setEnabled(HandlerProxy.java:229)
+	at org.eclipse.ui.internal.handlers.E4HandlerProxy.setEnabled(E4HandlerProxy.java:133)
+	at jdk.internal.reflect.GeneratedMethodAccessor16.invoke(Unknown Source)
+	at java.base/jdk.internal.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
+	at java.base/java.lang.reflect.Method.invoke(Method.java:568)
+	at org.eclipse.e4.core.internal.di.MethodRequestor.execute(MethodRequestor.java:58)
+	at org.eclipse.e4.core.internal.di.InjectorImpl.invokeUsingClass(InjectorImpl.java:317)
+	at org.eclipse.e4.core.internal.di.InjectorImpl.invoke(InjectorImpl.java:251)
+	at org.eclipse.e4.core.contexts.ContextInjectionFactory.invoke(ContextInjectionFactory.java:173)
+	at org.eclipse.e4.core.commands.internal.HandlerServiceHandler.setEnabled(HandlerServiceHandler.java:84)
+	at org.eclipse.core.commands.Command.setEnabled(Command.java:856)
+	at org.eclipse.ui.menus.CommandContributionItem.isEnabled(CommandContributionItem.java:916)
+	at org.eclipse.ui.menus.CommandContributionItem.updateMenuItem(CommandContributionItem.java:531)
+	at org.eclipse.ui.menus.CommandContributionItem.update(CommandContributionItem.java:484)
+	at org.eclipse.jface.action.MenuManager.update(MenuManager.java:858)
+	at org.eclipse.jface.action.MenuManager.update(MenuManager.java:858)
+	at org.eclipse.ui.internal.Workbench.updateActiveWorkbenchWindowMenuManager(Workbench.java:3138)
+	at org.eclipse.ui.internal.Workbench.lambda$0(Workbench.java:3120)
+	at org.eclipse.jface.bindings.BindingManager.fireBindingManagerChanged(BindingManager.java:901)
+	at org.eclipse.jface.bindings.BindingManager.setActiveBindings(BindingManager.java:2181)
+	at org.eclipse.jface.bindings.BindingManager.recomputeBindings(BindingManager.java:1742)
+	at org.eclipse.jface.bindings.BindingManager.contextManagerChanged(BindingManager.java:691)
+	at org.eclipse.core.commands.contexts.ContextManager.fireContextManagerChanged(ContextManager.java:164)
+	at org.eclipse.core.commands.contexts.ContextManager.setEventCaching(ContextManager.java:323)
+	at org.eclipse.core.commands.contexts.ContextManager.deferUpdates(ContextManager.java:85)
+	at org.eclipse.e4.ui.internal.workbench.PartServiceImpl.activate(PartServiceImpl.java:781)
+	at org.eclipse.e4.ui.internal.workbench.PartServiceImpl.activate(PartServiceImpl.java:683)
+	at org.eclipse.e4.ui.internal.workbench.swt.AbstractPartRenderer.activate(AbstractPartRenderer.java:97)
+	at org.eclipse.e4.ui.workbench.renderers.swt.ContributedPartRenderer.lambda$0(ContributedPartRenderer.java:63)
+	at org.eclipse.swt.widgets.EventTable.sendEvent(EventTable.java:89)
+	at org.eclipse.swt.widgets.Display.sendEvent(Display.java:4256)
+	at org.eclipse.swt.widgets.Widget.sendEvent(Widget.java:1066)
+	at org.eclipse.swt.widgets.Widget.sendEvent(Widget.java:1090)
+	at org.eclipse.swt.widgets.Widget.sendEvent(Widget.java:1075)
+	at org.eclipse.swt.widgets.Shell.setActiveControl(Shell.java:1530)
+	at org.eclipse.swt.widgets.Shell.setActiveControl(Shell.java:1493)
+	at org.eclipse.swt.widgets.Control.sendFocusEvent(Control.java:2954)
+	at org.eclipse.swt.widgets.Widget.wmSetFocus(Widget.java:2321)
+	at org.eclipse.swt.widgets.Control.WM_SETFOCUS(Control.java:5424)
+	at org.eclipse.swt.widgets.Canvas.WM_SETFOCUS(Canvas.java:437)
+	at org.eclipse.swt.widgets.Control.windowProc(Control.java:4815)
+	at org.eclipse.swt.widgets.Canvas.windowProc(Canvas.java:340)
+	at org.eclipse.swt.widgets.Display.windowProc(Display.java:5022)
+	at org.eclipse.swt.internal.win32.OS.SetFocus(Native Method)
+	at org.eclipse.swt.widgets.Control.forceFocus(Control.java:1091)
+	at org.eclipse.swt.widgets.Control.setFocus(Control.java:3439)
+	at org.eclipse.swt.widgets.Composite.setFocus(Composite.java:1081)
+	at org.eclipse.swt.custom.StyledText.setFocus(StyledText.java:8742)
+	at org.eclipse.ui.texteditor.AbstractTextEditor.setFocus(AbstractTextEditor.java:6186)
+	at org.eclipse.ui.texteditor.StatusTextEditor.setFocus(StatusTextEditor.java:149)
+	at org.eclipse.jdt.internal.ui.javaeditor.JavaEditor.setFocus(JavaEditor.java:2353)
+	at org.eclipse.ui.internal.e4.compatibility.CompatibilityPart.delegateSetFocus(CompatibilityPart.java:226)
+	at jdk.internal.reflect.GeneratedMethodAccessor92.invoke(Unknown Source)
+	at java.base/jdk.internal.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
+	at java.base/java.lang.reflect.Method.invoke(Method.java:568)
+	at org.eclipse.e4.core.internal.di.MethodRequestor.execute(MethodRequestor.java:58)
+	at org.eclipse.e4.core.internal.di.InjectorImpl.invokeUsingClass(InjectorImpl.java:317)
+	at org.eclipse.e4.core.internal.di.InjectorImpl.invokeUsingClass(InjectorImpl.java:323)
+	at org.eclipse.e4.core.internal.di.InjectorImpl.invoke(InjectorImpl.java:245)
+	at org.eclipse.e4.core.contexts.ContextInjectionFactory.invoke(ContextInjectionFactory.java:147)
+	at org.eclipse.e4.ui.internal.workbench.swt.PartRenderingEngine.focusGui(PartRenderingEngine.java:790)
+	at org.eclipse.e4.ui.workbench.renderers.swt.ContributedPartRenderer$1.setFocus(ContributedPartRenderer.java:106)
+	at org.eclipse.swt.custom.CTabItem.setFocus(CTabItem.java:379)
+	at org.eclipse.swt.custom.CTabFolder.setFocus(CTabFolder.java:2683)
+	at org.eclipse.swt.widgets.Control.fixFocus(Control.java:1049)
+	at org.eclipse.swt.widgets.Control.setVisible(Control.java:3951)
+	at org.eclipse.swt.custom.CTabFolder.setSelection(CTabFolder.java:3236)
+	at org.eclipse.swt.custom.CTabFolder.setSelection(CTabFolder.java:3244)
+	at org.eclipse.swt.custom.CTabFolder.onMouse(CTabFolder.java:1882)
+	at org.eclipse.swt.custom.CTabFolder.lambda$0(CTabFolder.java:332)
+	at org.eclipse.swt.widgets.EventTable.sendEvent(EventTable.java:89)
+	at org.eclipse.swt.widgets.Display.sendEvent(Display.java:4256)
+	at org.eclipse.swt.widgets.Widget.sendEvent(Widget.java:1066)
+	at org.eclipse.swt.widgets.Display.runDeferredEvents(Display.java:4054)
+	at org.eclipse.swt.widgets.Display.readAndDispatch(Display.java:3642)
+	at org.eclipse.e4.ui.internal.workbench.swt.PartRenderingEngine$5.run(PartRenderingEngine.java:1155)
+	at org.eclipse.core.databinding.observable.Realm.runWithDefault(Realm.java:338)
+	at org.eclipse.e4.ui.internal.workbench.swt.PartRenderingEngine.run(PartRenderingEngine.java:1046)
+	at org.eclipse.e4.ui.internal.workbench.E4Workbench.createAndRunUI(E4Workbench.java:155)
+	at org.eclipse.ui.internal.Workbench.lambda$3(Workbench.java:643)
+	at org.eclipse.core.databinding.observable.Realm.runWithDefault(Realm.java:338)
+	at org.eclipse.ui.internal.Workbench.createAndRunWorkbench(Workbench.java:550)
+	at org.eclipse.ui.PlatformUI.createAndRunWorkbench(PlatformUI.java:171)
+	at org.eclipse.ui.internal.ide.application.IDEApplication.start(IDEApplication.java:152)
+	at org.eclipse.equinox.internal.app.EclipseAppHandle.run(EclipseAppHandle.java:203)
+	at org.eclipse.core.runtime.internal.adaptor.EclipseAppLauncher.runApplication(EclipseAppLauncher.java:136)
+	at org.eclipse.core.runtime.internal.adaptor.EclipseAppLauncher.start(EclipseAppLauncher.java:104)
+	at org.eclipse.core.runtime.adaptor.EclipseStarter.run(EclipseStarter.java:402)
+	at org.eclipse.core.runtime.adaptor.EclipseStarter.run(EclipseStarter.java:255)
+	at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
+	at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:77)
+	at java.base/jdk.internal.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
+	at java.base/java.lang.reflect.Method.invoke(Method.java:568)
+	at org.eclipse.equinox.launcher.Main.invokeFramework(Main.java:659)
+	at org.eclipse.equinox.launcher.Main.basicRun(Main.java:596)
+	at org.eclipse.equinox.launcher.Main.run(Main.java:1467)
+
+!ENTRY org.eclipse.lsp4e 2 0 2023-03-03 20:33:44.872
+!MESSAGE Could not get if the workspace folder capability is supported due to timeout after 1 second
+!STACK 0
+java.util.concurrent.TimeoutException
+	at java.base/java.util.concurrent.CompletableFuture.timedGet(CompletableFuture.java:1960)
+	at java.base/java.util.concurrent.CompletableFuture.get(CompletableFuture.java:2095)
+	at org.eclipse.lsp4e.LanguageServerWrapper.supportsWorkspaceFolderCapability(LanguageServerWrapper.java:650)
+	at org.eclipse.lsp4e.LanguageServerWrapper.canOperate(LanguageServerWrapper.java:639)
+	at org.eclipse.lsp4e.LanguageServerWrapper.canOperate(LanguageServerWrapper.java:1029)
+	at org.eclipse.lsp4e.LanguageServiceAccessor.lambda$6(LanguageServiceAccessor.java:348)
+	at java.base/java.util.stream.ReferencePipeline$2$1.accept(ReferencePipeline.java:178)
+	at java.base/java.util.Spliterators$ArraySpliterator.forEachRemaining(Spliterators.java:992)
+	at java.base/java.util.stream.AbstractPipeline.copyInto(AbstractPipeline.java:509)
+	at java.base/java.util.stream.AbstractPipeline.wrapAndCopyInto(AbstractPipeline.java:499)
+	at java.base/java.util.stream.ReduceOps$ReduceOp.evaluateSequential(ReduceOps.java:921)
+	at java.base/java.util.stream.AbstractPipeline.evaluate(AbstractPipeline.java:234)
+	at java.base/java.util.stream.ReferencePipeline.collect(ReferencePipeline.java:682)
+	at org.eclipse.lsp4e.LanguageServiceAccessor.getLSWrappers(LanguageServiceAccessor.java:356)
+	at org.eclipse.lsp4e.LanguageServiceAccessor.getLanguageServers(LanguageServiceAccessor.java:623)
+	at org.eclipse.lsp4e.operations.rename.LSPRenameHandler.setEnabled(LSPRenameHandler.java:100)
+	at org.eclipse.ui.internal.handlers.HandlerProxy.setEnabled(HandlerProxy.java:229)
+	at org.eclipse.ui.internal.handlers.E4HandlerProxy.canExecute(E4HandlerProxy.java:76)
+	at jdk.internal.reflect.GeneratedMethodAccessor15.invoke(Unknown Source)
+	at java.base/jdk.internal.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
+	at java.base/java.lang.reflect.Method.invoke(Method.java:568)
+	at org.eclipse.e4.core.internal.di.MethodRequestor.execute(MethodRequestor.java:58)
+	at org.eclipse.e4.core.internal.di.InjectorImpl.invokeUsingClass(InjectorImpl.java:317)
+	at org.eclipse.e4.core.internal.di.InjectorImpl.invoke(InjectorImpl.java:251)
+	at org.eclipse.e4.core.contexts.ContextInjectionFactory.invoke(ContextInjectionFactory.java:173)
+	at org.eclipse.e4.core.commands.internal.HandlerServiceHandler.isEnabled(HandlerServiceHandler.java:62)
+	at org.eclipse.core.commands.Command.isEnabled(Command.java:832)
+	at org.eclipse.ui.menus.CommandContributionItem.isEnabled(CommandContributionItem.java:917)
+	at org.eclipse.ui.menus.CommandContributionItem.updateMenuItem(CommandContributionItem.java:531)
+	at org.eclipse.ui.menus.CommandContributionItem.update(CommandContributionItem.java:484)
+	at org.eclipse.ui.menus.CommandContributionItem.lambda$2(CommandContributionItem.java:323)
+	at org.eclipse.ui.menus.CommandContributionItem.updateCommandProperties(CommandContributionItem.java:327)
+	at org.eclipse.ui.menus.CommandContributionItem.lambda$1(CommandContributionItem.java:294)
+	at org.eclipse.core.commands.Command$1.run(Command.java:529)
+	at org.eclipse.core.runtime.SafeRunner.run(SafeRunner.java:45)
+	at org.eclipse.core.commands.Command.fireCommandChanged(Command.java:522)
+	at org.eclipse.core.commands.Command.lambda$0(Command.java:1002)
+	at org.eclipse.core.commands.AbstractHandler.fireHandlerChanged(AbstractHandler.java:77)
+	at org.eclipse.e4.core.commands.internal.HandlerServiceHandler.fireHandlerChanged(HandlerServiceHandler.java:180)
+	at org.eclipse.core.commands.AbstractHandler.setBaseEnabled(AbstractHandler.java:111)
+	at org.eclipse.e4.core.commands.internal.HandlerServiceHandler.isEnabled(HandlerServiceHandler.java:64)
+	at org.eclipse.core.commands.Command.isEnabled(Command.java:832)
+	at org.eclipse.ui.menus.CommandContributionItem.isEnabled(CommandContributionItem.java:917)
+	at org.eclipse.ui.menus.CommandContributionItem.updateMenuItem(CommandContributionItem.java:531)
+	at org.eclipse.ui.menus.CommandContributionItem.update(CommandContributionItem.java:484)
+	at org.eclipse.ui.menus.CommandContributionItem.lambda$2(CommandContributionItem.java:323)
+	at org.eclipse.ui.menus.CommandContributionItem.updateCommandProperties(CommandContributionItem.java:327)
+	at org.eclipse.ui.menus.CommandContributionItem.lambda$1(CommandContributionItem.java:294)
+	at org.eclipse.core.commands.Command$1.run(Command.java:529)
+	at org.eclipse.core.runtime.SafeRunner.run(SafeRunner.java:45)
+	at org.eclipse.core.commands.Command.fireCommandChanged(Command.java:522)
+	at org.eclipse.core.commands.Command.lambda$0(Command.java:1002)
+	at org.eclipse.core.commands.AbstractHandler.fireHandlerChanged(AbstractHandler.java:77)
+	at org.eclipse.e4.core.commands.internal.HandlerServiceHandler.fireHandlerChanged(HandlerServiceHandler.java:180)
+	at org.eclipse.ui.internal.handlers.E4HandlerProxy.handlerChanged(E4HandlerProxy.java:115)
+	at org.eclipse.core.commands.AbstractHandler.fireHandlerChanged(AbstractHandler.java:77)
+	at org.eclipse.ui.internal.handlers.HandlerProxy.lambda$1(HandlerProxy.java:372)
+	at org.eclipse.core.commands.AbstractHandler.fireHandlerChanged(AbstractHandler.java:77)
+	at org.eclipse.core.commands.AbstractHandler.setBaseEnabled(AbstractHandler.java:111)
+	at org.eclipse.lsp4e.operations.rename.LSPRenameHandler.setEnabled(LSPRenameHandler.java:121)
+	at org.eclipse.ui.internal.handlers.HandlerProxy.setEnabled(HandlerProxy.java:229)
+	at org.eclipse.ui.internal.handlers.E4HandlerProxy.setEnabled(E4HandlerProxy.java:133)
+	at jdk.internal.reflect.GeneratedMethodAccessor16.invoke(Unknown Source)
+	at java.base/jdk.internal.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
+	at java.base/java.lang.reflect.Method.invoke(Method.java:568)
+	at org.eclipse.e4.core.internal.di.MethodRequestor.execute(MethodRequestor.java:58)
+	at org.eclipse.e4.core.internal.di.InjectorImpl.invokeUsingClass(InjectorImpl.java:317)
+	at org.eclipse.e4.core.internal.di.InjectorImpl.invoke(InjectorImpl.java:251)
+	at org.eclipse.e4.core.contexts.ContextInjectionFactory.invoke(ContextInjectionFactory.java:173)
+	at org.eclipse.e4.core.commands.internal.HandlerServiceHandler.setEnabled(HandlerServiceHandler.java:84)
+	at org.eclipse.core.commands.Command.setEnabled(Command.java:856)
+	at org.eclipse.ui.menus.CommandContributionItem.isEnabled(CommandContributionItem.java:916)
+	at org.eclipse.ui.menus.CommandContributionItem.updateMenuItem(CommandContributionItem.java:531)
+	at org.eclipse.ui.menus.CommandContributionItem.update(CommandContributionItem.java:484)
+	at org.eclipse.jface.action.MenuManager.update(MenuManager.java:858)
+	at org.eclipse.jface.action.MenuManager.update(MenuManager.java:858)
+	at org.eclipse.ui.internal.Workbench.updateActiveWorkbenchWindowMenuManager(Workbench.java:3138)
+	at org.eclipse.ui.internal.Workbench.lambda$0(Workbench.java:3120)
+	at org.eclipse.jface.bindings.BindingManager.fireBindingManagerChanged(BindingManager.java:901)
+	at org.eclipse.jface.bindings.BindingManager.setActiveBindings(BindingManager.java:2181)
+	at org.eclipse.jface.bindings.BindingManager.recomputeBindings(BindingManager.java:1742)
+	at org.eclipse.jface.bindings.BindingManager.contextManagerChanged(BindingManager.java:691)
+	at org.eclipse.core.commands.contexts.ContextManager.fireContextManagerChanged(ContextManager.java:164)
+	at org.eclipse.core.commands.contexts.ContextManager.setEventCaching(ContextManager.java:323)
+	at org.eclipse.core.commands.contexts.ContextManager.deferUpdates(ContextManager.java:85)
+	at org.eclipse.e4.ui.internal.workbench.PartServiceImpl.activate(PartServiceImpl.java:781)
+	at org.eclipse.e4.ui.internal.workbench.PartServiceImpl.activate(PartServiceImpl.java:683)
+	at org.eclipse.e4.ui.internal.workbench.swt.AbstractPartRenderer.activate(AbstractPartRenderer.java:97)
+	at org.eclipse.e4.ui.workbench.renderers.swt.ContributedPartRenderer.lambda$0(ContributedPartRenderer.java:63)
+	at org.eclipse.swt.widgets.EventTable.sendEvent(EventTable.java:89)
+	at org.eclipse.swt.widgets.Display.sendEvent(Display.java:4256)
+	at org.eclipse.swt.widgets.Widget.sendEvent(Widget.java:1066)
+	at org.eclipse.swt.widgets.Widget.sendEvent(Widget.java:1090)
+	at org.eclipse.swt.widgets.Widget.sendEvent(Widget.java:1075)
+	at org.eclipse.swt.widgets.Shell.setActiveControl(Shell.java:1530)
+	at org.eclipse.swt.widgets.Shell.setActiveControl(Shell.java:1493)
+	at org.eclipse.swt.widgets.Control.sendFocusEvent(Control.java:2954)
+	at org.eclipse.swt.widgets.Widget.wmSetFocus(Widget.java:2321)
+	at org.eclipse.swt.widgets.Control.WM_SETFOCUS(Control.java:5424)
+	at org.eclipse.swt.widgets.Canvas.WM_SETFOCUS(Canvas.java:437)
+	at org.eclipse.swt.widgets.Control.windowProc(Control.java:4815)
+	at org.eclipse.swt.widgets.Canvas.windowProc(Canvas.java:340)
+	at org.eclipse.swt.widgets.Display.windowProc(Display.java:5022)
+	at org.eclipse.swt.internal.win32.OS.SetFocus(Native Method)
+	at org.eclipse.swt.widgets.Control.forceFocus(Control.java:1091)
+	at org.eclipse.swt.widgets.Control.setFocus(Control.java:3439)
+	at org.eclipse.swt.widgets.Composite.setFocus(Composite.java:1081)
+	at org.eclipse.swt.custom.StyledText.setFocus(StyledText.java:8742)
+	at org.eclipse.ui.texteditor.AbstractTextEditor.setFocus(AbstractTextEditor.java:6186)
+	at org.eclipse.ui.texteditor.StatusTextEditor.setFocus(StatusTextEditor.java:149)
+	at org.eclipse.jdt.internal.ui.javaeditor.JavaEditor.setFocus(JavaEditor.java:2353)
+	at org.eclipse.ui.internal.e4.compatibility.CompatibilityPart.delegateSetFocus(CompatibilityPart.java:226)
+	at jdk.internal.reflect.GeneratedMethodAccessor92.invoke(Unknown Source)
+	at java.base/jdk.internal.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
+	at java.base/java.lang.reflect.Method.invoke(Method.java:568)
+	at org.eclipse.e4.core.internal.di.MethodRequestor.execute(MethodRequestor.java:58)
+	at org.eclipse.e4.core.internal.di.InjectorImpl.invokeUsingClass(InjectorImpl.java:317)
+	at org.eclipse.e4.core.internal.di.InjectorImpl.invokeUsingClass(InjectorImpl.java:323)
+	at org.eclipse.e4.core.internal.di.InjectorImpl.invoke(InjectorImpl.java:245)
+	at org.eclipse.e4.core.contexts.ContextInjectionFactory.invoke(ContextInjectionFactory.java:147)
+	at org.eclipse.e4.ui.internal.workbench.swt.PartRenderingEngine.focusGui(PartRenderingEngine.java:790)
+	at org.eclipse.e4.ui.workbench.renderers.swt.ContributedPartRenderer$1.setFocus(ContributedPartRenderer.java:106)
+	at org.eclipse.swt.custom.CTabItem.setFocus(CTabItem.java:379)
+	at org.eclipse.swt.custom.CTabFolder.setFocus(CTabFolder.java:2683)
+	at org.eclipse.swt.widgets.Control.fixFocus(Control.java:1049)
+	at org.eclipse.swt.widgets.Control.setVisible(Control.java:3951)
+	at org.eclipse.swt.custom.CTabFolder.setSelection(CTabFolder.java:3236)
+	at org.eclipse.swt.custom.CTabFolder.setSelection(CTabFolder.java:3244)
+	at org.eclipse.swt.custom.CTabFolder.onMouse(CTabFolder.java:1882)
+	at org.eclipse.swt.custom.CTabFolder.lambda$0(CTabFolder.java:332)
+	at org.eclipse.swt.widgets.EventTable.sendEvent(EventTable.java:89)
+	at org.eclipse.swt.widgets.Display.sendEvent(Display.java:4256)
+	at org.eclipse.swt.widgets.Widget.sendEvent(Widget.java:1066)
+	at org.eclipse.swt.widgets.Display.runDeferredEvents(Display.java:4054)
+	at org.eclipse.swt.widgets.Display.readAndDispatch(Display.java:3642)
+	at org.eclipse.e4.ui.internal.workbench.swt.PartRenderingEngine$5.run(PartRenderingEngine.java:1155)
+	at org.eclipse.core.databinding.observable.Realm.runWithDefault(Realm.java:338)
+	at org.eclipse.e4.ui.internal.workbench.swt.PartRenderingEngine.run(PartRenderingEngine.java:1046)
+	at org.eclipse.e4.ui.internal.workbench.E4Workbench.createAndRunUI(E4Workbench.java:155)
+	at org.eclipse.ui.internal.Workbench.lambda$3(Workbench.java:643)
+	at org.eclipse.core.databinding.observable.Realm.runWithDefault(Realm.java:338)
+	at org.eclipse.ui.internal.Workbench.createAndRunWorkbench(Workbench.java:550)
+	at org.eclipse.ui.PlatformUI.createAndRunWorkbench(PlatformUI.java:171)
+	at org.eclipse.ui.internal.ide.application.IDEApplication.start(IDEApplication.java:152)
+	at org.eclipse.equinox.internal.app.EclipseAppHandle.run(EclipseAppHandle.java:203)
+	at org.eclipse.core.runtime.internal.adaptor.EclipseAppLauncher.runApplication(EclipseAppLauncher.java:136)
+	at org.eclipse.core.runtime.internal.adaptor.EclipseAppLauncher.start(EclipseAppLauncher.java:104)
+	at org.eclipse.core.runtime.adaptor.EclipseStarter.run(EclipseStarter.java:402)
+	at org.eclipse.core.runtime.adaptor.EclipseStarter.run(EclipseStarter.java:255)
+	at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
+	at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:77)
+	at java.base/jdk.internal.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
+	at java.base/java.lang.reflect.Method.invoke(Method.java:568)
+	at org.eclipse.equinox.launcher.Main.invokeFramework(Main.java:659)
+	at org.eclipse.equinox.launcher.Main.basicRun(Main.java:596)
+	at org.eclipse.equinox.launcher.Main.run(Main.java:1467)
+
+!ENTRY org.eclipse.lsp4e 2 0 2023-03-03 20:33:45.928
+!MESSAGE Could not get if the workspace folder capability is supported due to timeout after 1 second
+!STACK 0
+java.util.concurrent.TimeoutException
+	at java.base/java.util.concurrent.CompletableFuture.timedGet(CompletableFuture.java:1960)
+	at java.base/java.util.concurrent.CompletableFuture.get(CompletableFuture.java:2095)
+	at org.eclipse.lsp4e.LanguageServerWrapper.supportsWorkspaceFolderCapability(LanguageServerWrapper.java:650)
+	at org.eclipse.lsp4e.LanguageServerWrapper.canOperate(LanguageServerWrapper.java:639)
+	at org.eclipse.lsp4e.LanguageServerWrapper.canOperate(LanguageServerWrapper.java:1029)
+	at org.eclipse.lsp4e.LanguageServiceAccessor.lambda$6(LanguageServiceAccessor.java:348)
+	at java.base/java.util.stream.ReferencePipeline$2$1.accept(ReferencePipeline.java:178)
+	at java.base/java.util.Spliterators$ArraySpliterator.forEachRemaining(Spliterators.java:992)
+	at java.base/java.util.stream.AbstractPipeline.copyInto(AbstractPipeline.java:509)
+	at java.base/java.util.stream.AbstractPipeline.wrapAndCopyInto(AbstractPipeline.java:499)
+	at java.base/java.util.stream.ReduceOps$ReduceOp.evaluateSequential(ReduceOps.java:921)
+	at java.base/java.util.stream.AbstractPipeline.evaluate(AbstractPipeline.java:234)
+	at java.base/java.util.stream.ReferencePipeline.collect(ReferencePipeline.java:682)
+	at org.eclipse.lsp4e.LanguageServiceAccessor.getLSWrappers(LanguageServiceAccessor.java:356)
+	at org.eclipse.lsp4e.LanguageServiceAccessor.getLanguageServers(LanguageServiceAccessor.java:623)
+	at org.eclipse.lsp4e.operations.rename.LSPRenameHandler.setEnabled(LSPRenameHandler.java:106)
+	at org.eclipse.ui.internal.handlers.HandlerProxy.setEnabled(HandlerProxy.java:229)
+	at org.eclipse.ui.internal.handlers.E4HandlerProxy.canExecute(E4HandlerProxy.java:76)
+	at jdk.internal.reflect.GeneratedMethodAccessor15.invoke(Unknown Source)
+	at java.base/jdk.internal.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
+	at java.base/java.lang.reflect.Method.invoke(Method.java:568)
+	at org.eclipse.e4.core.internal.di.MethodRequestor.execute(MethodRequestor.java:58)
+	at org.eclipse.e4.core.internal.di.InjectorImpl.invokeUsingClass(InjectorImpl.java:317)
+	at org.eclipse.e4.core.internal.di.InjectorImpl.invoke(InjectorImpl.java:251)
+	at org.eclipse.e4.core.contexts.ContextInjectionFactory.invoke(ContextInjectionFactory.java:173)
+	at org.eclipse.e4.core.commands.internal.HandlerServiceHandler.isEnabled(HandlerServiceHandler.java:62)
+	at org.eclipse.core.commands.Command.isEnabled(Command.java:832)
+	at org.eclipse.ui.menus.CommandContributionItem.isEnabled(CommandContributionItem.java:917)
+	at org.eclipse.ui.menus.CommandContributionItem.updateMenuItem(CommandContributionItem.java:531)
+	at org.eclipse.ui.menus.CommandContributionItem.update(CommandContributionItem.java:484)
+	at org.eclipse.ui.menus.CommandContributionItem.lambda$2(CommandContributionItem.java:323)
+	at org.eclipse.ui.menus.CommandContributionItem.updateCommandProperties(CommandContributionItem.java:327)
+	at org.eclipse.ui.menus.CommandContributionItem.lambda$1(CommandContributionItem.java:294)
+	at org.eclipse.core.commands.Command$1.run(Command.java:529)
+	at org.eclipse.core.runtime.SafeRunner.run(SafeRunner.java:45)
+	at org.eclipse.core.commands.Command.fireCommandChanged(Command.java:522)
+	at org.eclipse.core.commands.Command.lambda$0(Command.java:1002)
+	at org.eclipse.core.commands.AbstractHandler.fireHandlerChanged(AbstractHandler.java:77)
+	at org.eclipse.e4.core.commands.internal.HandlerServiceHandler.fireHandlerChanged(HandlerServiceHandler.java:180)
+	at org.eclipse.core.commands.AbstractHandler.setBaseEnabled(AbstractHandler.java:111)
+	at org.eclipse.e4.core.commands.internal.HandlerServiceHandler.isEnabled(HandlerServiceHandler.java:64)
+	at org.eclipse.core.commands.Command.isEnabled(Command.java:832)
+	at org.eclipse.ui.menus.CommandContributionItem.isEnabled(CommandContributionItem.java:917)
+	at org.eclipse.ui.menus.CommandContributionItem.updateMenuItem(CommandContributionItem.java:531)
+	at org.eclipse.ui.menus.CommandContributionItem.update(CommandContributionItem.java:484)
+	at org.eclipse.ui.menus.CommandContributionItem.lambda$2(CommandContributionItem.java:323)
+	at org.eclipse.ui.menus.CommandContributionItem.updateCommandProperties(CommandContributionItem.java:327)
+	at org.eclipse.ui.menus.CommandContributionItem.lambda$1(CommandContributionItem.java:294)
+	at org.eclipse.core.commands.Command$1.run(Command.java:529)
+	at org.eclipse.core.runtime.SafeRunner.run(SafeRunner.java:45)
+	at org.eclipse.core.commands.Command.fireCommandChanged(Command.java:522)
+	at org.eclipse.core.commands.Command.lambda$0(Command.java:1002)
+	at org.eclipse.core.commands.AbstractHandler.fireHandlerChanged(AbstractHandler.java:77)
+	at org.eclipse.e4.core.commands.internal.HandlerServiceHandler.fireHandlerChanged(HandlerServiceHandler.java:180)
+	at org.eclipse.ui.internal.handlers.E4HandlerProxy.handlerChanged(E4HandlerProxy.java:115)
+	at org.eclipse.core.commands.AbstractHandler.fireHandlerChanged(AbstractHandler.java:77)
+	at org.eclipse.ui.internal.handlers.HandlerProxy.lambda$1(HandlerProxy.java:372)
+	at org.eclipse.core.commands.AbstractHandler.fireHandlerChanged(AbstractHandler.java:77)
+	at org.eclipse.core.commands.AbstractHandler.setBaseEnabled(AbstractHandler.java:111)
+	at org.eclipse.lsp4e.operations.rename.LSPRenameHandler.setEnabled(LSPRenameHandler.java:121)
+	at org.eclipse.ui.internal.handlers.HandlerProxy.setEnabled(HandlerProxy.java:229)
+	at org.eclipse.ui.internal.handlers.E4HandlerProxy.setEnabled(E4HandlerProxy.java:133)
+	at jdk.internal.reflect.GeneratedMethodAccessor16.invoke(Unknown Source)
+	at java.base/jdk.internal.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
+	at java.base/java.lang.reflect.Method.invoke(Method.java:568)
+	at org.eclipse.e4.core.internal.di.MethodRequestor.execute(MethodRequestor.java:58)
+	at org.eclipse.e4.core.internal.di.InjectorImpl.invokeUsingClass(InjectorImpl.java:317)
+	at org.eclipse.e4.core.internal.di.InjectorImpl.invoke(InjectorImpl.java:251)
+	at org.eclipse.e4.core.contexts.ContextInjectionFactory.invoke(ContextInjectionFactory.java:173)
+	at org.eclipse.e4.core.commands.internal.HandlerServiceHandler.setEnabled(HandlerServiceHandler.java:84)
+	at org.eclipse.core.commands.Command.setEnabled(Command.java:856)
+	at org.eclipse.ui.menus.CommandContributionItem.isEnabled(CommandContributionItem.java:916)
+	at org.eclipse.ui.menus.CommandContributionItem.updateMenuItem(CommandContributionItem.java:531)
+	at org.eclipse.ui.menus.CommandContributionItem.update(CommandContributionItem.java:484)
+	at org.eclipse.jface.action.MenuManager.update(MenuManager.java:858)
+	at org.eclipse.jface.action.MenuManager.update(MenuManager.java:858)
+	at org.eclipse.ui.internal.Workbench.updateActiveWorkbenchWindowMenuManager(Workbench.java:3138)
+	at org.eclipse.ui.internal.Workbench.lambda$0(Workbench.java:3120)
+	at org.eclipse.jface.bindings.BindingManager.fireBindingManagerChanged(BindingManager.java:901)
+	at org.eclipse.jface.bindings.BindingManager.setActiveBindings(BindingManager.java:2181)
+	at org.eclipse.jface.bindings.BindingManager.recomputeBindings(BindingManager.java:1742)
+	at org.eclipse.jface.bindings.BindingManager.contextManagerChanged(BindingManager.java:691)
+	at org.eclipse.core.commands.contexts.ContextManager.fireContextManagerChanged(ContextManager.java:164)
+	at org.eclipse.core.commands.contexts.ContextManager.setEventCaching(ContextManager.java:323)
+	at org.eclipse.core.commands.contexts.ContextManager.deferUpdates(ContextManager.java:85)
+	at org.eclipse.e4.ui.internal.workbench.PartServiceImpl.activate(PartServiceImpl.java:781)
+	at org.eclipse.e4.ui.internal.workbench.PartServiceImpl.activate(PartServiceImpl.java:683)
+	at org.eclipse.e4.ui.internal.workbench.swt.AbstractPartRenderer.activate(AbstractPartRenderer.java:97)
+	at org.eclipse.e4.ui.workbench.renderers.swt.ContributedPartRenderer.lambda$0(ContributedPartRenderer.java:63)
+	at org.eclipse.swt.widgets.EventTable.sendEvent(EventTable.java:89)
+	at org.eclipse.swt.widgets.Display.sendEvent(Display.java:4256)
+	at org.eclipse.swt.widgets.Widget.sendEvent(Widget.java:1066)
+	at org.eclipse.swt.widgets.Widget.sendEvent(Widget.java:1090)
+	at org.eclipse.swt.widgets.Widget.sendEvent(Widget.java:1075)
+	at org.eclipse.swt.widgets.Shell.setActiveControl(Shell.java:1530)
+	at org.eclipse.swt.widgets.Shell.setActiveControl(Shell.java:1493)
+	at org.eclipse.swt.widgets.Control.sendFocusEvent(Control.java:2954)
+	at org.eclipse.swt.widgets.Widget.wmSetFocus(Widget.java:2321)
+	at org.eclipse.swt.widgets.Control.WM_SETFOCUS(Control.java:5424)
+	at org.eclipse.swt.widgets.Canvas.WM_SETFOCUS(Canvas.java:437)
+	at org.eclipse.swt.widgets.Control.windowProc(Control.java:4815)
+	at org.eclipse.swt.widgets.Canvas.windowProc(Canvas.java:340)
+	at org.eclipse.swt.widgets.Display.windowProc(Display.java:5022)
+	at org.eclipse.swt.internal.win32.OS.SetFocus(Native Method)
+	at org.eclipse.swt.widgets.Control.forceFocus(Control.java:1091)
+	at org.eclipse.swt.widgets.Control.setFocus(Control.java:3439)
+	at org.eclipse.swt.widgets.Composite.setFocus(Composite.java:1081)
+	at org.eclipse.swt.custom.StyledText.setFocus(StyledText.java:8742)
+	at org.eclipse.ui.texteditor.AbstractTextEditor.setFocus(AbstractTextEditor.java:6186)
+	at org.eclipse.ui.texteditor.StatusTextEditor.setFocus(StatusTextEditor.java:149)
+	at org.eclipse.jdt.internal.ui.javaeditor.JavaEditor.setFocus(JavaEditor.java:2353)
+	at org.eclipse.ui.internal.e4.compatibility.CompatibilityPart.delegateSetFocus(CompatibilityPart.java:226)
+	at jdk.internal.reflect.GeneratedMethodAccessor92.invoke(Unknown Source)
+	at java.base/jdk.internal.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
+	at java.base/java.lang.reflect.Method.invoke(Method.java:568)
+	at org.eclipse.e4.core.internal.di.MethodRequestor.execute(MethodRequestor.java:58)
+	at org.eclipse.e4.core.internal.di.InjectorImpl.invokeUsingClass(InjectorImpl.java:317)
+	at org.eclipse.e4.core.internal.di.InjectorImpl.invokeUsingClass(InjectorImpl.java:323)
+	at org.eclipse.e4.core.internal.di.InjectorImpl.invoke(InjectorImpl.java:245)
+	at org.eclipse.e4.core.contexts.ContextInjectionFactory.invoke(ContextInjectionFactory.java:147)
+	at org.eclipse.e4.ui.internal.workbench.swt.PartRenderingEngine.focusGui(PartRenderingEngine.java:790)
+	at org.eclipse.e4.ui.workbench.renderers.swt.ContributedPartRenderer$1.setFocus(ContributedPartRenderer.java:106)
+	at org.eclipse.swt.custom.CTabItem.setFocus(CTabItem.java:379)
+	at org.eclipse.swt.custom.CTabFolder.setFocus(CTabFolder.java:2683)
+	at org.eclipse.swt.widgets.Control.fixFocus(Control.java:1049)
+	at org.eclipse.swt.widgets.Control.setVisible(Control.java:3951)
+	at org.eclipse.swt.custom.CTabFolder.setSelection(CTabFolder.java:3236)
+	at org.eclipse.swt.custom.CTabFolder.setSelection(CTabFolder.java:3244)
+	at org.eclipse.swt.custom.CTabFolder.onMouse(CTabFolder.java:1882)
+	at org.eclipse.swt.custom.CTabFolder.lambda$0(CTabFolder.java:332)
+	at org.eclipse.swt.widgets.EventTable.sendEvent(EventTable.java:89)
+	at org.eclipse.swt.widgets.Display.sendEvent(Display.java:4256)
+	at org.eclipse.swt.widgets.Widget.sendEvent(Widget.java:1066)
+	at org.eclipse.swt.widgets.Display.runDeferredEvents(Display.java:4054)
+	at org.eclipse.swt.widgets.Display.readAndDispatch(Display.java:3642)
+	at org.eclipse.e4.ui.internal.workbench.swt.PartRenderingEngine$5.run(PartRenderingEngine.java:1155)
+	at org.eclipse.core.databinding.observable.Realm.runWithDefault(Realm.java:338)
+	at org.eclipse.e4.ui.internal.workbench.swt.PartRenderingEngine.run(PartRenderingEngine.java:1046)
+	at org.eclipse.e4.ui.internal.workbench.E4Workbench.createAndRunUI(E4Workbench.java:155)
+	at org.eclipse.ui.internal.Workbench.lambda$3(Workbench.java:643)
+	at org.eclipse.core.databinding.observable.Realm.runWithDefault(Realm.java:338)
+	at org.eclipse.ui.internal.Workbench.createAndRunWorkbench(Workbench.java:550)
+	at org.eclipse.ui.PlatformUI.createAndRunWorkbench(PlatformUI.java:171)
+	at org.eclipse.ui.internal.ide.application.IDEApplication.start(IDEApplication.java:152)
+	at org.eclipse.equinox.internal.app.EclipseAppHandle.run(EclipseAppHandle.java:203)
+	at org.eclipse.core.runtime.internal.adaptor.EclipseAppLauncher.runApplication(EclipseAppLauncher.java:136)
+	at org.eclipse.core.runtime.internal.adaptor.EclipseAppLauncher.start(EclipseAppLauncher.java:104)
+	at org.eclipse.core.runtime.adaptor.EclipseStarter.run(EclipseStarter.java:402)
+	at org.eclipse.core.runtime.adaptor.EclipseStarter.run(EclipseStarter.java:255)
+	at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
+	at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:77)
+	at java.base/jdk.internal.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
+	at java.base/java.lang.reflect.Method.invoke(Method.java:568)
+	at org.eclipse.equinox.launcher.Main.invokeFramework(Main.java:659)
+	at org.eclipse.equinox.launcher.Main.basicRun(Main.java:596)
+	at org.eclipse.equinox.launcher.Main.run(Main.java:1467)
+
+!ENTRY org.eclipse.lsp4e 2 0 2023-03-03 20:33:46.932
+!MESSAGE Could not get if the workspace folder capability is supported due to timeout after 1 second
+!STACK 0
+java.util.concurrent.TimeoutException
+	at java.base/java.util.concurrent.CompletableFuture.timedGet(CompletableFuture.java:1960)
+	at java.base/java.util.concurrent.CompletableFuture.get(CompletableFuture.java:2095)
+	at org.eclipse.lsp4e.LanguageServerWrapper.supportsWorkspaceFolderCapability(LanguageServerWrapper.java:650)
+	at org.eclipse.lsp4e.LanguageServerWrapper.canOperate(LanguageServerWrapper.java:639)
+	at org.eclipse.lsp4e.LanguageServerWrapper.canOperate(LanguageServerWrapper.java:1029)
+	at org.eclipse.lsp4e.LanguageServiceAccessor.lambda$6(LanguageServiceAccessor.java:348)
+	at java.base/java.util.stream.ReferencePipeline$2$1.accept(ReferencePipeline.java:178)
+	at java.base/java.util.Spliterators$ArraySpliterator.forEachRemaining(Spliterators.java:992)
+	at java.base/java.util.stream.AbstractPipeline.copyInto(AbstractPipeline.java:509)
+	at java.base/java.util.stream.AbstractPipeline.wrapAndCopyInto(AbstractPipeline.java:499)
+	at java.base/java.util.stream.ReduceOps$ReduceOp.evaluateSequential(ReduceOps.java:921)
+	at java.base/java.util.stream.AbstractPipeline.evaluate(AbstractPipeline.java:234)
+	at java.base/java.util.stream.ReferencePipeline.collect(ReferencePipeline.java:682)
+	at org.eclipse.lsp4e.LanguageServiceAccessor.getLSWrappers(LanguageServiceAccessor.java:356)
+	at org.eclipse.lsp4e.LanguageServiceAccessor.getLanguageServers(LanguageServiceAccessor.java:623)
+	at org.eclipse.lsp4e.operations.rename.LSPRenameHandler.setEnabled(LSPRenameHandler.java:100)
+	at org.eclipse.ui.internal.handlers.HandlerProxy.setEnabled(HandlerProxy.java:229)
+	at org.eclipse.ui.internal.handlers.E4HandlerProxy.canExecute(E4HandlerProxy.java:76)
+	at jdk.internal.reflect.GeneratedMethodAccessor15.invoke(Unknown Source)
+	at java.base/jdk.internal.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
+	at java.base/java.lang.reflect.Method.invoke(Method.java:568)
+	at org.eclipse.e4.core.internal.di.MethodRequestor.execute(MethodRequestor.java:58)
+	at org.eclipse.e4.core.internal.di.InjectorImpl.invokeUsingClass(InjectorImpl.java:317)
+	at org.eclipse.e4.core.internal.di.InjectorImpl.invoke(InjectorImpl.java:251)
+	at org.eclipse.e4.core.contexts.ContextInjectionFactory.invoke(ContextInjectionFactory.java:173)
+	at org.eclipse.e4.core.commands.internal.HandlerServiceHandler.isEnabled(HandlerServiceHandler.java:62)
+	at org.eclipse.core.commands.Command.isEnabled(Command.java:832)
+	at org.eclipse.ui.menus.CommandContributionItem.isEnabled(CommandContributionItem.java:917)
+	at org.eclipse.ui.menus.CommandContributionItem.updateMenuItem(CommandContributionItem.java:531)
+	at org.eclipse.ui.menus.CommandContributionItem.update(CommandContributionItem.java:484)
+	at org.eclipse.jface.action.MenuManager.update(MenuManager.java:858)
+	at org.eclipse.jface.action.MenuManager.update(MenuManager.java:858)
+	at org.eclipse.ui.internal.Workbench.updateActiveWorkbenchWindowMenuManager(Workbench.java:3138)
+	at org.eclipse.ui.internal.Workbench.lambda$0(Workbench.java:3120)
+	at org.eclipse.jface.bindings.BindingManager.fireBindingManagerChanged(BindingManager.java:901)
+	at org.eclipse.jface.bindings.BindingManager.setActiveBindings(BindingManager.java:2181)
+	at org.eclipse.jface.bindings.BindingManager.recomputeBindings(BindingManager.java:1742)
+	at org.eclipse.jface.bindings.BindingManager.contextManagerChanged(BindingManager.java:691)
+	at org.eclipse.core.commands.contexts.ContextManager.fireContextManagerChanged(ContextManager.java:164)
+	at org.eclipse.core.commands.contexts.ContextManager.setEventCaching(ContextManager.java:323)
+	at org.eclipse.core.commands.contexts.ContextManager.deferUpdates(ContextManager.java:85)
+	at org.eclipse.e4.ui.internal.workbench.PartServiceImpl.activate(PartServiceImpl.java:781)
+	at org.eclipse.e4.ui.internal.workbench.PartServiceImpl.activate(PartServiceImpl.java:683)
+	at org.eclipse.e4.ui.internal.workbench.swt.AbstractPartRenderer.activate(AbstractPartRenderer.java:97)
+	at org.eclipse.e4.ui.workbench.renderers.swt.ContributedPartRenderer.lambda$0(ContributedPartRenderer.java:63)
+	at org.eclipse.swt.widgets.EventTable.sendEvent(EventTable.java:89)
+	at org.eclipse.swt.widgets.Display.sendEvent(Display.java:4256)
+	at org.eclipse.swt.widgets.Widget.sendEvent(Widget.java:1066)
+	at org.eclipse.swt.widgets.Widget.sendEvent(Widget.java:1090)
+	at org.eclipse.swt.widgets.Widget.sendEvent(Widget.java:1075)
+	at org.eclipse.swt.widgets.Shell.setActiveControl(Shell.java:1530)
+	at org.eclipse.swt.widgets.Shell.setActiveControl(Shell.java:1493)
+	at org.eclipse.swt.widgets.Control.sendFocusEvent(Control.java:2954)
+	at org.eclipse.swt.widgets.Widget.wmSetFocus(Widget.java:2321)
+	at org.eclipse.swt.widgets.Control.WM_SETFOCUS(Control.java:5424)
+	at org.eclipse.swt.widgets.Canvas.WM_SETFOCUS(Canvas.java:437)
+	at org.eclipse.swt.widgets.Control.windowProc(Control.java:4815)
+	at org.eclipse.swt.widgets.Canvas.windowProc(Canvas.java:340)
+	at org.eclipse.swt.widgets.Display.windowProc(Display.java:5022)
+	at org.eclipse.swt.internal.win32.OS.SetFocus(Native Method)
+	at org.eclipse.swt.widgets.Control.forceFocus(Control.java:1091)
+	at org.eclipse.swt.widgets.Control.setFocus(Control.java:3439)
+	at org.eclipse.swt.widgets.Composite.setFocus(Composite.java:1081)
+	at org.eclipse.swt.custom.StyledText.setFocus(StyledText.java:8742)
+	at org.eclipse.ui.texteditor.AbstractTextEditor.setFocus(AbstractTextEditor.java:6186)
+	at org.eclipse.ui.texteditor.StatusTextEditor.setFocus(StatusTextEditor.java:149)
+	at org.eclipse.jdt.internal.ui.javaeditor.JavaEditor.setFocus(JavaEditor.java:2353)
+	at org.eclipse.ui.internal.e4.compatibility.CompatibilityPart.delegateSetFocus(CompatibilityPart.java:226)
+	at jdk.internal.reflect.GeneratedMethodAccessor92.invoke(Unknown Source)
+	at java.base/jdk.internal.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
+	at java.base/java.lang.reflect.Method.invoke(Method.java:568)
+	at org.eclipse.e4.core.internal.di.MethodRequestor.execute(MethodRequestor.java:58)
+	at org.eclipse.e4.core.internal.di.InjectorImpl.invokeUsingClass(InjectorImpl.java:317)
+	at org.eclipse.e4.core.internal.di.InjectorImpl.invokeUsingClass(InjectorImpl.java:323)
+	at org.eclipse.e4.core.internal.di.InjectorImpl.invoke(InjectorImpl.java:245)
+	at org.eclipse.e4.core.contexts.ContextInjectionFactory.invoke(ContextInjectionFactory.java:147)
+	at org.eclipse.e4.ui.internal.workbench.swt.PartRenderingEngine.focusGui(PartRenderingEngine.java:790)
+	at org.eclipse.e4.ui.workbench.renderers.swt.ContributedPartRenderer$1.setFocus(ContributedPartRenderer.java:106)
+	at org.eclipse.swt.custom.CTabItem.setFocus(CTabItem.java:379)
+	at org.eclipse.swt.custom.CTabFolder.setFocus(CTabFolder.java:2683)
+	at org.eclipse.swt.widgets.Control.fixFocus(Control.java:1049)
+	at org.eclipse.swt.widgets.Control.setVisible(Control.java:3951)
+	at org.eclipse.swt.custom.CTabFolder.setSelection(CTabFolder.java:3236)
+	at org.eclipse.swt.custom.CTabFolder.setSelection(CTabFolder.java:3244)
+	at org.eclipse.swt.custom.CTabFolder.onMouse(CTabFolder.java:1882)
+	at org.eclipse.swt.custom.CTabFolder.lambda$0(CTabFolder.java:332)
+	at org.eclipse.swt.widgets.EventTable.sendEvent(EventTable.java:89)
+	at org.eclipse.swt.widgets.Display.sendEvent(Display.java:4256)
+	at org.eclipse.swt.widgets.Widget.sendEvent(Widget.java:1066)
+	at org.eclipse.swt.widgets.Display.runDeferredEvents(Display.java:4054)
+	at org.eclipse.swt.widgets.Display.readAndDispatch(Display.java:3642)
+	at org.eclipse.e4.ui.internal.workbench.swt.PartRenderingEngine$5.run(PartRenderingEngine.java:1155)
+	at org.eclipse.core.databinding.observable.Realm.runWithDefault(Realm.java:338)
+	at org.eclipse.e4.ui.internal.workbench.swt.PartRenderingEngine.run(PartRenderingEngine.java:1046)
+	at org.eclipse.e4.ui.internal.workbench.E4Workbench.createAndRunUI(E4Workbench.java:155)
+	at org.eclipse.ui.internal.Workbench.lambda$3(Workbench.java:643)
+	at org.eclipse.core.databinding.observable.Realm.runWithDefault(Realm.java:338)
+	at org.eclipse.ui.internal.Workbench.createAndRunWorkbench(Workbench.java:550)
+	at org.eclipse.ui.PlatformUI.createAndRunWorkbench(PlatformUI.java:171)
+	at org.eclipse.ui.internal.ide.application.IDEApplication.start(IDEApplication.java:152)
+	at org.eclipse.equinox.internal.app.EclipseAppHandle.run(EclipseAppHandle.java:203)
+	at org.eclipse.core.runtime.internal.adaptor.EclipseAppLauncher.runApplication(EclipseAppLauncher.java:136)
+	at org.eclipse.core.runtime.internal.adaptor.EclipseAppLauncher.start(EclipseAppLauncher.java:104)
+	at org.eclipse.core.runtime.adaptor.EclipseStarter.run(EclipseStarter.java:402)
+	at org.eclipse.core.runtime.adaptor.EclipseStarter.run(EclipseStarter.java:255)
+	at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
+	at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:77)
+	at java.base/jdk.internal.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
+	at java.base/java.lang.reflect.Method.invoke(Method.java:568)
+	at org.eclipse.equinox.launcher.Main.invokeFramework(Main.java:659)
+	at org.eclipse.equinox.launcher.Main.basicRun(Main.java:596)
+	at org.eclipse.equinox.launcher.Main.run(Main.java:1467)
+
+!ENTRY org.eclipse.lsp4e 2 0 2023-03-03 20:33:47.987
+!MESSAGE Could not get if the workspace folder capability is supported due to timeout after 1 second
+!STACK 0
+java.util.concurrent.TimeoutException
+	at java.base/java.util.concurrent.CompletableFuture.timedGet(CompletableFuture.java:1960)
+	at java.base/java.util.concurrent.CompletableFuture.get(CompletableFuture.java:2095)
+	at org.eclipse.lsp4e.LanguageServerWrapper.supportsWorkspaceFolderCapability(LanguageServerWrapper.java:650)
+	at org.eclipse.lsp4e.LanguageServerWrapper.canOperate(LanguageServerWrapper.java:639)
+	at org.eclipse.lsp4e.LanguageServerWrapper.canOperate(LanguageServerWrapper.java:1029)
+	at org.eclipse.lsp4e.LanguageServiceAccessor.lambda$6(LanguageServiceAccessor.java:348)
+	at java.base/java.util.stream.ReferencePipeline$2$1.accept(ReferencePipeline.java:178)
+	at java.base/java.util.Spliterators$ArraySpliterator.forEachRemaining(Spliterators.java:992)
+	at java.base/java.util.stream.AbstractPipeline.copyInto(AbstractPipeline.java:509)
+	at java.base/java.util.stream.AbstractPipeline.wrapAndCopyInto(AbstractPipeline.java:499)
+	at java.base/java.util.stream.ReduceOps$ReduceOp.evaluateSequential(ReduceOps.java:921)
+	at java.base/java.util.stream.AbstractPipeline.evaluate(AbstractPipeline.java:234)
+	at java.base/java.util.stream.ReferencePipeline.collect(ReferencePipeline.java:682)
+	at org.eclipse.lsp4e.LanguageServiceAccessor.getLSWrappers(LanguageServiceAccessor.java:356)
+	at org.eclipse.lsp4e.LanguageServiceAccessor.getLanguageServers(LanguageServiceAccessor.java:623)
+	at org.eclipse.lsp4e.operations.rename.LSPRenameHandler.setEnabled(LSPRenameHandler.java:106)
+	at org.eclipse.ui.internal.handlers.HandlerProxy.setEnabled(HandlerProxy.java:229)
+	at org.eclipse.ui.internal.handlers.E4HandlerProxy.canExecute(E4HandlerProxy.java:76)
+	at jdk.internal.reflect.GeneratedMethodAccessor15.invoke(Unknown Source)
+	at java.base/jdk.internal.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
+	at java.base/java.lang.reflect.Method.invoke(Method.java:568)
+	at org.eclipse.e4.core.internal.di.MethodRequestor.execute(MethodRequestor.java:58)
+	at org.eclipse.e4.core.internal.di.InjectorImpl.invokeUsingClass(InjectorImpl.java:317)
+	at org.eclipse.e4.core.internal.di.InjectorImpl.invoke(InjectorImpl.java:251)
+	at org.eclipse.e4.core.contexts.ContextInjectionFactory.invoke(ContextInjectionFactory.java:173)
+	at org.eclipse.e4.core.commands.internal.HandlerServiceHandler.isEnabled(HandlerServiceHandler.java:62)
+	at org.eclipse.core.commands.Command.isEnabled(Command.java:832)
+	at org.eclipse.ui.menus.CommandContributionItem.isEnabled(CommandContributionItem.java:917)
+	at org.eclipse.ui.menus.CommandContributionItem.updateMenuItem(CommandContributionItem.java:531)
+	at org.eclipse.ui.menus.CommandContributionItem.update(CommandContributionItem.java:484)
+	at org.eclipse.jface.action.MenuManager.update(MenuManager.java:858)
+	at org.eclipse.jface.action.MenuManager.update(MenuManager.java:858)
+	at org.eclipse.ui.internal.Workbench.updateActiveWorkbenchWindowMenuManager(Workbench.java:3138)
+	at org.eclipse.ui.internal.Workbench.lambda$0(Workbench.java:3120)
+	at org.eclipse.jface.bindings.BindingManager.fireBindingManagerChanged(BindingManager.java:901)
+	at org.eclipse.jface.bindings.BindingManager.setActiveBindings(BindingManager.java:2181)
+	at org.eclipse.jface.bindings.BindingManager.recomputeBindings(BindingManager.java:1742)
+	at org.eclipse.jface.bindings.BindingManager.contextManagerChanged(BindingManager.java:691)
+	at org.eclipse.core.commands.contexts.ContextManager.fireContextManagerChanged(ContextManager.java:164)
+	at org.eclipse.core.commands.contexts.ContextManager.setEventCaching(ContextManager.java:323)
+	at org.eclipse.core.commands.contexts.ContextManager.deferUpdates(ContextManager.java:85)
+	at org.eclipse.e4.ui.internal.workbench.PartServiceImpl.activate(PartServiceImpl.java:781)
+	at org.eclipse.e4.ui.internal.workbench.PartServiceImpl.activate(PartServiceImpl.java:683)
+	at org.eclipse.e4.ui.internal.workbench.swt.AbstractPartRenderer.activate(AbstractPartRenderer.java:97)
+	at org.eclipse.e4.ui.workbench.renderers.swt.ContributedPartRenderer.lambda$0(ContributedPartRenderer.java:63)
+	at org.eclipse.swt.widgets.EventTable.sendEvent(EventTable.java:89)
+	at org.eclipse.swt.widgets.Display.sendEvent(Display.java:4256)
+	at org.eclipse.swt.widgets.Widget.sendEvent(Widget.java:1066)
+	at org.eclipse.swt.widgets.Widget.sendEvent(Widget.java:1090)
+	at org.eclipse.swt.widgets.Widget.sendEvent(Widget.java:1075)
+	at org.eclipse.swt.widgets.Shell.setActiveControl(Shell.java:1530)
+	at org.eclipse.swt.widgets.Shell.setActiveControl(Shell.java:1493)
+	at org.eclipse.swt.widgets.Control.sendFocusEvent(Control.java:2954)
+	at org.eclipse.swt.widgets.Widget.wmSetFocus(Widget.java:2321)
+	at org.eclipse.swt.widgets.Control.WM_SETFOCUS(Control.java:5424)
+	at org.eclipse.swt.widgets.Canvas.WM_SETFOCUS(Canvas.java:437)
+	at org.eclipse.swt.widgets.Control.windowProc(Control.java:4815)
+	at org.eclipse.swt.widgets.Canvas.windowProc(Canvas.java:340)
+	at org.eclipse.swt.widgets.Display.windowProc(Display.java:5022)
+	at org.eclipse.swt.internal.win32.OS.SetFocus(Native Method)
+	at org.eclipse.swt.widgets.Control.forceFocus(Control.java:1091)
+	at org.eclipse.swt.widgets.Control.setFocus(Control.java:3439)
+	at org.eclipse.swt.widgets.Composite.setFocus(Composite.java:1081)
+	at org.eclipse.swt.custom.StyledText.setFocus(StyledText.java:8742)
+	at org.eclipse.ui.texteditor.AbstractTextEditor.setFocus(AbstractTextEditor.java:6186)
+	at org.eclipse.ui.texteditor.StatusTextEditor.setFocus(StatusTextEditor.java:149)
+	at org.eclipse.jdt.internal.ui.javaeditor.JavaEditor.setFocus(JavaEditor.java:2353)
+	at org.eclipse.ui.internal.e4.compatibility.CompatibilityPart.delegateSetFocus(CompatibilityPart.java:226)
+	at jdk.internal.reflect.GeneratedMethodAccessor92.invoke(Unknown Source)
+	at java.base/jdk.internal.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
+	at java.base/java.lang.reflect.Method.invoke(Method.java:568)
+	at org.eclipse.e4.core.internal.di.MethodRequestor.execute(MethodRequestor.java:58)
+	at org.eclipse.e4.core.internal.di.InjectorImpl.invokeUsingClass(InjectorImpl.java:317)
+	at org.eclipse.e4.core.internal.di.InjectorImpl.invokeUsingClass(InjectorImpl.java:323)
+	at org.eclipse.e4.core.internal.di.InjectorImpl.invoke(InjectorImpl.java:245)
+	at org.eclipse.e4.core.contexts.ContextInjectionFactory.invoke(ContextInjectionFactory.java:147)
+	at org.eclipse.e4.ui.internal.workbench.swt.PartRenderingEngine.focusGui(PartRenderingEngine.java:790)
+	at org.eclipse.e4.ui.workbench.renderers.swt.ContributedPartRenderer$1.setFocus(ContributedPartRenderer.java:106)
+	at org.eclipse.swt.custom.CTabItem.setFocus(CTabItem.java:379)
+	at org.eclipse.swt.custom.CTabFolder.setFocus(CTabFolder.java:2683)
+	at org.eclipse.swt.widgets.Control.fixFocus(Control.java:1049)
+	at org.eclipse.swt.widgets.Control.setVisible(Control.java:3951)
+	at org.eclipse.swt.custom.CTabFolder.setSelection(CTabFolder.java:3236)
+	at org.eclipse.swt.custom.CTabFolder.setSelection(CTabFolder.java:3244)
+	at org.eclipse.swt.custom.CTabFolder.onMouse(CTabFolder.java:1882)
+	at org.eclipse.swt.custom.CTabFolder.lambda$0(CTabFolder.java:332)
+	at org.eclipse.swt.widgets.EventTable.sendEvent(EventTable.java:89)
+	at org.eclipse.swt.widgets.Display.sendEvent(Display.java:4256)
+	at org.eclipse.swt.widgets.Widget.sendEvent(Widget.java:1066)
+	at org.eclipse.swt.widgets.Display.runDeferredEvents(Display.java:4054)
+	at org.eclipse.swt.widgets.Display.readAndDispatch(Display.java:3642)
+	at org.eclipse.e4.ui.internal.workbench.swt.PartRenderingEngine$5.run(PartRenderingEngine.java:1155)
+	at org.eclipse.core.databinding.observable.Realm.runWithDefault(Realm.java:338)
+	at org.eclipse.e4.ui.internal.workbench.swt.PartRenderingEngine.run(PartRenderingEngine.java:1046)
+	at org.eclipse.e4.ui.internal.workbench.E4Workbench.createAndRunUI(E4Workbench.java:155)
+	at org.eclipse.ui.internal.Workbench.lambda$3(Workbench.java:643)
+	at org.eclipse.core.databinding.observable.Realm.runWithDefault(Realm.java:338)
+	at org.eclipse.ui.internal.Workbench.createAndRunWorkbench(Workbench.java:550)
+	at org.eclipse.ui.PlatformUI.createAndRunWorkbench(PlatformUI.java:171)
+	at org.eclipse.ui.internal.ide.application.IDEApplication.start(IDEApplication.java:152)
+	at org.eclipse.equinox.internal.app.EclipseAppHandle.run(EclipseAppHandle.java:203)
+	at org.eclipse.core.runtime.internal.adaptor.EclipseAppLauncher.runApplication(EclipseAppLauncher.java:136)
+	at org.eclipse.core.runtime.internal.adaptor.EclipseAppLauncher.start(EclipseAppLauncher.java:104)
+	at org.eclipse.core.runtime.adaptor.EclipseStarter.run(EclipseStarter.java:402)
+	at org.eclipse.core.runtime.adaptor.EclipseStarter.run(EclipseStarter.java:255)
+	at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
+	at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:77)
+	at java.base/jdk.internal.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
+	at java.base/java.lang.reflect.Method.invoke(Method.java:568)
+	at org.eclipse.equinox.launcher.Main.invokeFramework(Main.java:659)
+	at org.eclipse.equinox.launcher.Main.basicRun(Main.java:596)
+	at org.eclipse.equinox.launcher.Main.run(Main.java:1467)
+
+!ENTRY org.springframework.tooling.ls.eclipse.commons 1 0 2023-03-03 20:33:56.737
+!MESSAGE executing callback sts4.classpath.OPyineLm FAILED
+
+!ENTRY org.springframework.tooling.ls.eclipse.commons 4 0 2023-03-03 20:33:56.738
+!MESSAGE TimeoutException
+!STACK 0
+java.util.concurrent.TimeoutException
+	at java.base/java.util.concurrent.CompletableFuture.timedGet(CompletableFuture.java:1960)
+	at java.base/java.util.concurrent.CompletableFuture.get(CompletableFuture.java:2095)
+	at org.springframework.tooling.ls.eclipse.commons.LSP4ECommandExecutor.executeClientCommand(LSP4ECommandExecutor.java:37)
+	at org.springframework.tooling.jdt.ls.commons.classpath.SendClasspathNotificationsJob.flush(SendClasspathNotificationsJob.java:178)
+	at org.springframework.tooling.jdt.ls.commons.classpath.SendClasspathNotificationsJob.run(SendClasspathNotificationsJob.java:149)
+	at org.eclipse.core.internal.jobs.Worker.run(Worker.java:63)
+
+!ENTRY org.eclipse.equinox.p2.repository 2 0 2023-03-03 20:39:07.053
+!MESSAGE Using unsafe http transport to retrieve http://download.eclipse.org/usssdk/updates/release/latest, see CVE-2021-41033. Consider using https instead.
+
+!ENTRY org.eclipse.equinox.p2.repository 2 0 2023-03-03 20:39:10.304
+!MESSAGE Using unsafe http transport to retrieve http://download.eclipse.org/usssdk/drops/release/1.2.2/content.xml.xz, see CVE-2021-41033. Consider using https instead.
+
+!ENTRY org.eclipse.equinox.p2.repository 2 0 2023-03-03 20:39:28.730
+!MESSAGE Using unsafe http transport to retrieve http://downloads.genuitec.com/downloads/products/codetogether/updates/ct20221214/content.xml.xz, see CVE-2021-41033. Consider using https instead.
+
+!ENTRY org.eclipse.ui 2 2 2023-03-03 22:24:07.442
+!MESSAGE Invalid property category path: org.springframework.ide.eclipse.beans.ui.properties.ProjectPropertyPage (bundle: org.springframework.ide.eclipse.xml.namespaces, propertyPage: org.springframework.ide.eclipse.beans.ui.namespaces.projectPropertyPage)
diff --git a/.metadata/.plugins/com.genuitec.eclipse.devstyle/recent.json b/.metadata/.plugins/com.genuitec.eclipse.devstyle/recent.json
index 34581e73..12c60066 100644
--- a/.metadata/.plugins/com.genuitec.eclipse.devstyle/recent.json
+++ b/.metadata/.plugins/com.genuitec.eclipse.devstyle/recent.json
@@ -1 +1 @@
-{"lastUsed":1677752506975,"path":"C:\/Users\/User\/Desktop\/ShopmeEcommerce","projectCount":5,"recentFiles":[{"path":"\/ShopmeBackEnd","parentWorkspace":"C:\/Users\/User\/Desktop\/ShopmeEcommerce","name":"pom.xml","lastModified":1677155680077,"locationURI":"file:\/C:\/Users\/User\/Desktop\/ShopmeEcommerce\/ShopmeProject\/ShopmeWebParent\/ShopmeBackEnd\/pom.xml"},{"path":"\/ShopmeBackEnd\/src\/main\/resources\/static\/js","parentWorkspace":"C:\/Users\/User\/Desktop\/ShopmeEcommerce","name":"common.js","lastModified":1677741168380,"locationURI":"file:\/C:\/Users\/User\/Desktop\/ShopmeEcommerce\/ShopmeProject\/ShopmeWebParent\/ShopmeBackEnd\/src\/main\/resources\/static\/js\/common.js"},{"path":"\/ShopmeBackEnd\/src\/main\/resources\/templates\/categories","parentWorkspace":"C:\/Users\/User\/Desktop\/ShopmeEcommerce","name":"categories.html","lastModified":1677740873467,"locationURI":"file:\/C:\/Users\/User\/Desktop\/ShopmeEcommerce\/ShopmeProject\/ShopmeWebParent\/ShopmeBackEnd\/src\/main\/resources\/templates\/categories\/categories.html"},{"path":"\/ShopmeBackEnd\/src\/main\/java\/com\/shopme\/admin\/user\/controller","parentWorkspace":"C:\/Users\/User\/Desktop\/ShopmeEcommerce","name":"UserController.java","lastModified":1677466069813,"locationURI":"file:\/C:\/Users\/User\/Desktop\/ShopmeEcommerce\/ShopmeProject\/ShopmeWebParent\/ShopmeBackEnd\/src\/main\/java\/com\/shopme\/admin\/user\/controller\/UserController.java"},{"path":"\/ShopmeBackEnd\/src\/main\/java\/com\/shopme\/admin","parentWorkspace":"C:\/Users\/User\/Desktop\/ShopmeEcommerce","name":"MainController.java","lastModified":1677217115874,"locationURI":"file:\/C:\/Users\/User\/Desktop\/ShopmeEcommerce\/ShopmeProject\/ShopmeWebParent\/ShopmeBackEnd\/src\/main\/java\/com\/shopme\/admin\/MainController.java"},{"path":"\/ShopmeBackEnd\/src\/main\/resources\/templates\/users","parentWorkspace":"C:\/Users\/User\/Desktop\/ShopmeEcommerce","name":"user_form.html","lastModified":1677467322866,"locationURI":"file:\/C:\/Users\/User\/Desktop\/ShopmeEcommerce\/ShopmeProject\/ShopmeWebParent\/ShopmeBackEnd\/src\/main\/resources\/templates\/users\/user_form.html"},{"path":"\/ShopmeFrontEnd\/src\/main\/resources","parentWorkspace":"C:\/Users\/User\/Desktop\/ShopmeEcommerce","name":"application.properties","lastModified":1676283960183,"locationURI":"file:\/C:\/Users\/User\/Desktop\/ShopmeEcommerce\/ShopmeProject\/ShopmeWebParent\/ShopmeFrontEnd\/src\/main\/resources\/application.properties"},{"path":"\/ShopmeBackEnd\/src\/main\/resources","parentWorkspace":"C:\/Users\/User\/Desktop\/ShopmeEcommerce","name":"application.properties","lastModified":1677508301870,"locationURI":"file:\/C:\/Users\/User\/Desktop\/ShopmeEcommerce\/ShopmeProject\/ShopmeWebParent\/ShopmeBackEnd\/src\/main\/resources\/application.properties"},{"path":"\/ShopmeBackEnd\/src\/main\/java\/com\/shopme\/admin\/category","parentWorkspace":"C:\/Users\/User\/Desktop\/ShopmeEcommerce","name":"CategoryController.java","lastModified":1677752176932,"locationURI":"file:\/C:\/Users\/User\/Desktop\/ShopmeEcommerce\/ShopmeProject\/ShopmeWebParent\/ShopmeBackEnd\/src\/main\/java\/com\/shopme\/admin\/category\/CategoryController.java"},{"path":"\/ShopmeFrontEnd\/src\/main\/java\/com\/shopme\/site","parentWorkspace":"C:\/Users\/User\/Desktop\/ShopmeEcommerce","name":"MainController.java","lastModified":1676289534507,"locationURI":"file:\/C:\/Users\/User\/Desktop\/ShopmeEcommerce\/ShopmeProject\/ShopmeWebParent\/ShopmeFrontEnd\/src\/main\/java\/com\/shopme\/site\/MainController.java"},{"path":"\/ShopmeBackEnd\/src\/main\/resources\/templates\/categories","parentWorkspace":"C:\/Users\/User\/Desktop\/ShopmeEcommerce","name":"category_form.html","lastModified":1677744090339,"locationURI":"file:\/C:\/Users\/User\/Desktop\/ShopmeEcommerce\/ShopmeProject\/ShopmeWebParent\/ShopmeBackEnd\/src\/main\/resources\/templates\/categories\/category_form.html"},{"path":"\/ShopmeProject\/ShopmeWebParent\/ShopmeBackEnd\/target\/classes\/com\/shopme\/admin\/user","parentWorkspace":"C:\/Users\/User\/Desktop\/ShopmeEcommerce","name":"UserRepository.class","lastModified":1677229460809,"locationURI":"file:\/C:\/Users\/User\/Desktop\/ShopmeEcommerce\/ShopmeProject\/ShopmeWebParent\/ShopmeBackEnd\/target\/classes\/com\/shopme\/admin\/user\/UserRepository.class"},{"path":"\/ShopmeBackEnd\/src\/main\/resources\/static\/js","parentWorkspace":"C:\/Users\/User\/Desktop\/ShopmeEcommerce","name":"common_form.js","lastModified":1677467253790,"locationURI":"file:\/C:\/Users\/User\/Desktop\/ShopmeEcommerce\/ShopmeProject\/ShopmeWebParent\/ShopmeBackEnd\/src\/main\/resources\/static\/js\/common_form.js"},{"path":"\/ShopmeBackEnd\/src\/main\/resources\/templates\/error","parentWorkspace":"C:\/Users\/User\/Desktop\/ShopmeEcommerce","name":"404.html","lastModified":1677478592367,"locationURI":"file:\/C:\/Users\/User\/Desktop\/ShopmeEcommerce\/ShopmeProject\/ShopmeWebParent\/ShopmeBackEnd\/src\/main\/resources\/templates\/error\/404.html"},{"path":"\/ShopmeBackEnd\/src\/main\/java\/com\/shopme\/admin\/security","parentWorkspace":"C:\/Users\/User\/Desktop\/ShopmeEcommerce","name":"WebSecurityConfig.java","lastModified":1677578435114,"locationURI":"file:\/C:\/Users\/User\/Desktop\/ShopmeEcommerce\/ShopmeProject\/ShopmeWebParent\/ShopmeBackEnd\/src\/main\/java\/com\/shopme\/admin\/security\/WebSecurityConfig.java"},{"path":"\/ShopmeWebParent","parentWorkspace":"C:\/Users\/User\/Desktop\/ShopmeEcommerce","name":"pom.xml","lastModified":1677229487576,"locationURI":"file:\/C:\/Users\/User\/Desktop\/ShopmeEcommerce\/ShopmeProject\/ShopmeWebParent\/pom.xml"},{"path":"\/ShopmeBackEnd\/src\/main\/java\/com\/shopme\/admin\/user","parentWorkspace":"C:\/Users\/User\/Desktop\/ShopmeEcommerce","name":"UserRepository.java","lastModified":1677132400134,"locationURI":"file:\/C:\/Users\/User\/Desktop\/ShopmeEcommerce\/ShopmeProject\/ShopmeWebParent\/ShopmeBackEnd\/src\/main\/java\/com\/shopme\/admin\/user\/UserRepository.java"},{"path":"\/ShopmeBackEnd\/src\/test\/java\/com\/shopme\/admin\/user","parentWorkspace":"C:\/Users\/User\/Desktop\/ShopmeEcommerce","name":"PasswordEncoderTest.java","lastModified":1677556633916,"locationURI":"file:\/C:\/Users\/User\/Desktop\/ShopmeEcommerce\/ShopmeProject\/ShopmeWebParent\/ShopmeBackEnd\/src\/test\/java\/com\/shopme\/admin\/user\/PasswordEncoderTest.java"},{"path":"\/ShopmeBackEnd\/src\/main\/java\/com\/shopme\/admin\/security","parentWorkspace":"C:\/Users\/User\/Desktop\/ShopmeEcommerce","name":"ShopmeUserDetails.java","lastModified":1677308467553,"locationURI":"file:\/C:\/Users\/User\/Desktop\/ShopmeEcommerce\/ShopmeProject\/ShopmeWebParent\/ShopmeBackEnd\/src\/main\/java\/com\/shopme\/admin\/security\/ShopmeUserDetails.java"},{"path":"\/ShopmeProject\/ShopmeCommon\/target\/classes\/com\/shopme\/common\/entity","parentWorkspace":"C:\/Users\/User\/Desktop\/ShopmeEcommerce","name":"User.class","lastModified":1677226090850,"locationURI":"file:\/C:\/Users\/User\/Desktop\/ShopmeEcommerce\/ShopmeProject\/ShopmeCommon\/target\/classes\/com\/shopme\/common\/entity\/User.class"},{"path":"\/ShopmeProject","parentWorkspace":"C:\/Users\/User\/Desktop\/ShopmeEcommerce","name":"pom.xml","lastModified":1676222003209,"locationURI":"file:\/C:\/Users\/User\/Desktop\/ShopmeEcommerce\/ShopmeProject\/pom.xml"},{"path":"\/ShopmeBackEnd\/src\/main\/resources\/templates","parentWorkspace":"C:\/Users\/User\/Desktop\/ShopmeEcommerce","name":"navigation.html","lastModified":1677410844649,"locationURI":"file:\/C:\/Users\/User\/Desktop\/ShopmeEcommerce\/ShopmeProject\/ShopmeWebParent\/ShopmeBackEnd\/src\/main\/resources\/templates\/navigation.html"},{"path":"\/ShopmeBackEnd\/src\/main\/resources\/templates\/error","parentWorkspace":"C:\/Users\/User\/Desktop\/ShopmeEcommerce","name":"500.html","lastModified":1677478845429,"locationURI":"file:\/C:\/Users\/User\/Desktop\/ShopmeEcommerce\/ShopmeProject\/ShopmeWebParent\/ShopmeBackEnd\/src\/main\/resources\/templates\/error\/500.html"},{"path":"\/ShopmeBackEnd\/src\/main\/java\/com\/shopme\/admin\/user\/controller","parentWorkspace":"C:\/Users\/User\/Desktop\/ShopmeEcommerce","name":"UserRestController.java","lastModified":1676886778703,"locationURI":"file:\/C:\/Users\/User\/Desktop\/ShopmeEcommerce\/ShopmeProject\/ShopmeWebParent\/ShopmeBackEnd\/src\/main\/java\/com\/shopme\/admin\/user\/controller\/UserRestController.java"},{"path":"\/ShopmeCommon\/src\/main\/java\/com\/shopme\/common\/entity","parentWorkspace":"C:\/Users\/User\/Desktop\/ShopmeEcommerce","name":"Category.java","lastModified":1677751967290,"locationURI":"file:\/C:\/Users\/User\/Desktop\/ShopmeEcommerce\/ShopmeProject\/ShopmeCommon\/src\/main\/java\/com\/shopme\/common\/entity\/Category.java"},{"path":"\/ShopmeWebParent\/ShopmeBackEnd","parentWorkspace":"C:\/Users\/User\/Desktop\/ShopmeEcommerce","name":"pom.xml","lastModified":1676222003209,"locationURI":"file:\/C:\/Users\/User\/Desktop\/ShopmeEcommerce\/ShopmeProject\/ShopmeWebParent\/ShopmeBackEnd\/pom.xml"},{"path":"\/ShopmeBackEnd\/src\/main\/java\/com\/shopme\/admin","parentWorkspace":"C:\/Users\/User\/Desktop\/ShopmeEcommerce","name":"ShopmeBackEndApplication.java","lastModified":1676544146510,"locationURI":"file:\/C:\/Users\/User\/Desktop\/ShopmeEcommerce\/ShopmeProject\/ShopmeWebParent\/ShopmeBackEnd\/src\/main\/java\/com\/shopme\/admin\/ShopmeBackEndApplication.java"},{"path":"\/ShopmeBackEnd\/src\/test\/java\/com\/shopme\/admin\/user","parentWorkspace":"C:\/Users\/User\/Desktop\/ShopmeEcommerce","name":"UserRepositoryTests.java","lastModified":1677556399974,"locationURI":"file:\/C:\/Users\/User\/Desktop\/ShopmeEcommerce\/ShopmeProject\/ShopmeWebParent\/ShopmeBackEnd\/src\/test\/java\/com\/shopme\/admin\/user\/UserRepositoryTests.java"},{"path":"\/ShopmeBackEnd\/src\/main\/resources\/static","parentWorkspace":"C:\/Users\/User\/Desktop\/ShopmeEcommerce","name":"style.css","lastModified":1677166116629,"locationURI":"file:\/C:\/Users\/User\/Desktop\/ShopmeEcommerce\/ShopmeProject\/ShopmeWebParent\/ShopmeBackEnd\/src\/main\/resources\/static\/style.css"},{"path":"\/ShopmeBackEnd\/src\/main\/java\/com\/shopme\/admin\/user\/export","parentWorkspace":"C:\/Users\/User\/Desktop\/ShopmeEcommerce","name":"UserCsvExporter.java","lastModified":1677157446759,"locationURI":"file:\/C:\/Users\/User\/Desktop\/ShopmeEcommerce\/ShopmeProject\/ShopmeWebParent\/ShopmeBackEnd\/src\/main\/java\/com\/shopme\/admin\/user\/export\/UserCsvExporter.java"},{"path":"\/ShopmeCommon","parentWorkspace":"C:\/Users\/User\/Desktop\/ShopmeEcommerce","name":"pom.xml","lastModified":1676541672655,"locationURI":"file:\/C:\/Users\/User\/Desktop\/ShopmeEcommerce\/ShopmeProject\/ShopmeCommon\/pom.xml"},{"path":"\/ShopmeBackEnd\/src\/test\/java\/com\/shopme\/admin\/category","parentWorkspace":"C:\/Users\/User\/Desktop\/ShopmeEcommerce","name":"CategoryRepositoryTests.java","lastModified":1677751817903,"locationURI":"file:\/C:\/Users\/User\/Desktop\/ShopmeEcommerce\/ShopmeProject\/ShopmeWebParent\/ShopmeBackEnd\/src\/test\/java\/com\/shopme\/admin\/category\/CategoryRepositoryTests.java"},{"path":"\/ShopmeBackEnd\/src\/main\/java\/com\/shopme\/admin\/category","parentWorkspace":"C:\/Users\/User\/Desktop\/ShopmeEcommerce","name":"CategoryService.java","lastModified":1677752507177,"locationURI":"file:\/C:\/Users\/User\/Desktop\/ShopmeEcommerce\/ShopmeProject\/ShopmeWebParent\/ShopmeBackEnd\/src\/main\/java\/com\/shopme\/admin\/category\/CategoryService.java"},{"path":"\/ShopmeCommon\/src\/main\/java\/com\/shopme\/common\/entity","parentWorkspace":"C:\/Users\/User\/Desktop\/ShopmeEcommerce","name":"User.java","lastModified":1677226090850,"locationURI":"file:\/C:\/Users\/User\/Desktop\/ShopmeEcommerce\/ShopmeProject\/ShopmeCommon\/src\/main\/java\/com\/shopme\/common\/entity\/User.java"},{"path":"\/ShopmeCommon\/src\/main\/java\/com\/shopme\/common\/entity","parentWorkspace":"C:\/Users\/User\/Desktop\/ShopmeEcommerce","name":"Role.java","lastModified":1676954212002,"locationURI":"file:\/C:\/Users\/User\/Desktop\/ShopmeEcommerce\/ShopmeProject\/ShopmeCommon\/src\/main\/java\/com\/shopme\/common\/entity\/Role.java"},{"path":"\/ShopmeBackEnd\/src\/main\/java\/com\/shopme\/admin\/user","parentWorkspace":"C:\/Users\/User\/Desktop\/ShopmeEcommerce","name":"UserNotFoundException.java","lastModified":1676879518482,"locationURI":"file:\/C:\/Users\/User\/Desktop\/ShopmeEcommerce\/ShopmeProject\/ShopmeWebParent\/ShopmeBackEnd\/src\/main\/java\/com\/shopme\/admin\/user\/UserNotFoundException.java"},{"path":"\/ShopmeBackEnd\/src\/main\/resources\/templates","parentWorkspace":"C:\/Users\/User\/Desktop\/ShopmeEcommerce","name":"index.html","lastModified":1677389989130,"locationURI":"file:\/C:\/Users\/User\/Desktop\/ShopmeEcommerce\/ShopmeProject\/ShopmeWebParent\/ShopmeBackEnd\/src\/main\/resources\/templates\/index.html"},{"path":"\/ShopmeBackEnd\/src\/main\/java\/com\/shopme\/admin\/user\/controller","parentWorkspace":"C:\/Users\/User\/Desktop\/ShopmeEcommerce","name":"AccountController.java","lastModified":1677494555729,"locationURI":"file:\/C:\/Users\/User\/Desktop\/ShopmeEcommerce\/ShopmeProject\/ShopmeWebParent\/ShopmeBackEnd\/src\/main\/java\/com\/shopme\/admin\/user\/controller\/AccountController.java"},{"path":"\/ShopmeBackEnd\/src\/main\/resources\/templates","parentWorkspace":"C:\/Users\/User\/Desktop\/ShopmeEcommerce","name":"login.html","lastModified":1677245871792,"locationURI":"file:\/C:\/Users\/User\/Desktop\/ShopmeEcommerce\/ShopmeProject\/ShopmeWebParent\/ShopmeBackEnd\/src\/main\/resources\/templates\/login.html"},{"path":"\/ShopmeFrontEnd","parentWorkspace":"C:\/Users\/User\/Desktop\/ShopmeEcommerce","name":"pom.xml","lastModified":1676348025599,"locationURI":"file:\/C:\/Users\/User\/Desktop\/ShopmeEcommerce\/ShopmeProject\/ShopmeWebParent\/ShopmeFrontEnd\/pom.xml"},{"path":"\/ShopmeFrontEnd\/src\/main\/resources\/templates","parentWorkspace":"C:\/Users\/User\/Desktop\/ShopmeEcommerce","name":"index.html","lastModified":1676284076822,"locationURI":"file:\/C:\/Users\/User\/Desktop\/ShopmeEcommerce\/ShopmeProject\/ShopmeWebParent\/ShopmeFrontEnd\/src\/main\/resources\/templates\/index.html"},{"path":"\/ShopmeBackEnd\/src\/main\/java\/com\/shopme\/admin","parentWorkspace":"C:\/Users\/User\/Desktop\/ShopmeEcommerce","name":"FileUploadUtil.java","lastModified":1677494843707,"locationURI":"file:\/C:\/Users\/User\/Desktop\/ShopmeEcommerce\/ShopmeProject\/ShopmeWebParent\/ShopmeBackEnd\/src\/main\/java\/com\/shopme\/admin\/FileUploadUtil.java"},{"path":"\/ShopmeBackEnd\/src\/main\/java\/com\/shopme\/admin\/user","parentWorkspace":"C:\/Users\/User\/Desktop\/ShopmeEcommerce","name":"UserService.java","lastModified":1677306762024,"locationURI":"file:\/C:\/Users\/User\/Desktop\/ShopmeEcommerce\/ShopmeProject\/ShopmeWebParent\/ShopmeBackEnd\/src\/main\/java\/com\/shopme\/admin\/user\/UserService.java"},{"path":"\/ShopmeBackEnd\/src\/main\/resources\/templates","parentWorkspace":"C:\/Users\/User\/Desktop\/ShopmeEcommerce","name":"error.html","lastModified":1677478580858,"locationURI":"file:\/C:\/Users\/User\/Desktop\/ShopmeEcommerce\/ShopmeProject\/ShopmeWebParent\/ShopmeBackEnd\/src\/main\/resources\/templates\/error.html"},{"path":"\/ShopmeBackEnd\/src\/main\/java\/com\/shopme\/admin\/user","parentWorkspace":"C:\/Users\/User\/Desktop\/ShopmeEcommerce","name":"RoleRepository.java","lastModified":1676541672655,"locationURI":"file:\/C:\/Users\/User\/Desktop\/ShopmeEcommerce\/ShopmeProject\/ShopmeWebParent\/ShopmeBackEnd\/src\/main\/java\/com\/shopme\/admin\/user\/RoleRepository.java"},{"path":"\/ShopmeBackEnd\/src\/main\/resources\/templates\/users","parentWorkspace":"C:\/Users\/User\/Desktop\/ShopmeEcommerce","name":"users.html","lastModified":1677307765208,"locationURI":"file:\/C:\/Users\/User\/Desktop\/ShopmeEcommerce\/ShopmeProject\/ShopmeWebParent\/ShopmeBackEnd\/src\/main\/resources\/templates\/users\/users.html"},{"path":"\/ShopmeBackEnd\/src\/main\/resources\/templates","parentWorkspace":"C:\/Users\/User\/Desktop\/ShopmeEcommerce","name":"fragments.html","lastModified":1677591060743,"locationURI":"file:\/C:\/Users\/User\/Desktop\/ShopmeEcommerce\/ShopmeProject\/ShopmeWebParent\/ShopmeBackEnd\/src\/main\/resources\/templates\/fragments.html"},{"path":"\/ShopmeBackEnd\/src\/main\/java\/com\/shopme\/admin","parentWorkspace":"C:\/Users\/User\/Desktop\/ShopmeEcommerce","name":"MvcConfig.java","lastModified":1676990349408,"locationURI":"file:\/C:\/Users\/User\/Desktop\/ShopmeEcommerce\/ShopmeProject\/ShopmeWebParent\/ShopmeBackEnd\/src\/main\/java\/com\/shopme\/admin\/MvcConfig.java"},{"path":"\/ShopmeBackEnd\/src\/main\/java\/com\/shopme\/admin\/category","parentWorkspace":"C:\/Users\/User\/Desktop\/ShopmeEcommerce","name":"CategoryRepository.java","lastModified":1677750248333,"locationURI":"file:\/C:\/Users\/User\/Desktop\/ShopmeEcommerce\/ShopmeProject\/ShopmeWebParent\/ShopmeBackEnd\/src\/main\/java\/com\/shopme\/admin\/category\/CategoryRepository.java"},{"path":"\/ShopmeBackEnd\/src\/main\/resources\/templates\/error","parentWorkspace":"C:\/Users\/User\/Desktop\/ShopmeEcommerce","name":"403.html","lastModified":1677478669863,"locationURI":"file:\/C:\/Users\/User\/Desktop\/ShopmeEcommerce\/ShopmeProject\/ShopmeWebParent\/ShopmeBackEnd\/src\/main\/resources\/templates\/error\/403.html"},{"path":"\/ShopmeBackEnd\/src\/main\/resources\/templates\/users","parentWorkspace":"C:\/Users\/User\/Desktop\/ShopmeEcommerce","name":"account_form.html","lastModified":1677467603206,"locationURI":"file:\/C:\/Users\/User\/Desktop\/ShopmeEcommerce\/ShopmeProject\/ShopmeWebParent\/ShopmeBackEnd\/src\/main\/resources\/templates\/users\/account_form.html"},{"path":"\/ShopmeBackEnd\/src\/test\/java\/com\/shopme\/admin\/user","parentWorkspace":"C:\/Users\/User\/Desktop\/ShopmeEcommerce","name":"RoleRepositoryTests.java","lastModified":1677556469813,"locationURI":"file:\/C:\/Users\/User\/Desktop\/ShopmeEcommerce\/ShopmeProject\/ShopmeWebParent\/ShopmeBackEnd\/src\/test\/java\/com\/shopme\/admin\/user\/RoleRepositoryTests.java"},{"path":"\/ShopmeBackEnd\/src\/main\/java\/com\/shopme\/admin\/security","parentWorkspace":"C:\/Users\/User\/Desktop\/ShopmeEcommerce","name":"ShopmeUserDetailsService.java","lastModified":1677225020383,"locationURI":"file:\/C:\/Users\/User\/Desktop\/ShopmeEcommerce\/ShopmeProject\/ShopmeWebParent\/ShopmeBackEnd\/src\/main\/java\/com\/shopme\/admin\/security\/ShopmeUserDetailsService.java"},{"path":"\/ShopmeWebParent\/ShopmeBackEnd\/src\/main\/resources\/templates","parentWorkspace":"C:\/Users\/User\/Desktop\/ShopmeEcommerce","name":"index.html","lastModified":1676220716827,"locationURI":"file:\/C:\/Users\/User\/Desktop\/ShopmeEcommerce\/ShopmeProject\/ShopmeWebParent\/ShopmeBackEnd\/src\/main\/resources\/templates\/index.html"}]}
\ No newline at end of file
+{"lastUsed":1677855217658,"path":"C:\/Users\/User\/Desktop\/ShopmeEcommerce","projectCount":5,"recentFiles":[{"path":"\/ShopmeBackEnd","parentWorkspace":"C:\/Users\/User\/Desktop\/ShopmeEcommerce","name":"pom.xml","lastModified":1677155680077,"locationURI":"file:\/C:\/Users\/User\/Desktop\/ShopmeEcommerce\/ShopmeProject\/ShopmeWebParent\/ShopmeBackEnd\/pom.xml"},{"path":"\/ShopmeBackEnd\/src\/main\/java\/com\/shopme\/admin\/category","parentWorkspace":"C:\/Users\/User\/Desktop\/ShopmeEcommerce","name":"CategoryNotFoundException.java","lastModified":1677823516531,"locationURI":"file:\/C:\/Users\/User\/Desktop\/ShopmeEcommerce\/ShopmeProject\/ShopmeWebParent\/ShopmeBackEnd\/src\/main\/java\/com\/shopme\/admin\/category\/CategoryNotFoundException.java"},{"path":"\/ShopmeBackEnd\/src\/main\/resources\/static\/js","parentWorkspace":"C:\/Users\/User\/Desktop\/ShopmeEcommerce","name":"common.js","lastModified":1677741168380,"locationURI":"file:\/C:\/Users\/User\/Desktop\/ShopmeEcommerce\/ShopmeProject\/ShopmeWebParent\/ShopmeBackEnd\/src\/main\/resources\/static\/js\/common.js"},{"path":"\/ShopmeBackEnd\/src\/main\/resources\/templates\/categories","parentWorkspace":"C:\/Users\/User\/Desktop\/ShopmeEcommerce","name":"categories.html","lastModified":1677849115103,"locationURI":"file:\/C:\/Users\/User\/Desktop\/ShopmeEcommerce\/ShopmeProject\/ShopmeWebParent\/ShopmeBackEnd\/src\/main\/resources\/templates\/categories\/categories.html"},{"path":"\/ShopmeBackEnd\/src\/main\/java\/com\/shopme\/admin\/user\/controller","parentWorkspace":"C:\/Users\/User\/Desktop\/ShopmeEcommerce","name":"UserController.java","lastModified":1677466069813,"locationURI":"file:\/C:\/Users\/User\/Desktop\/ShopmeEcommerce\/ShopmeProject\/ShopmeWebParent\/ShopmeBackEnd\/src\/main\/java\/com\/shopme\/admin\/user\/controller\/UserController.java"},{"path":"\/ShopmeBackEnd\/src\/main\/java\/com\/shopme\/admin","parentWorkspace":"C:\/Users\/User\/Desktop\/ShopmeEcommerce","name":"MainController.java","lastModified":1677217115874,"locationURI":"file:\/C:\/Users\/User\/Desktop\/ShopmeEcommerce\/ShopmeProject\/ShopmeWebParent\/ShopmeBackEnd\/src\/main\/java\/com\/shopme\/admin\/MainController.java"},{"path":"\/ShopmeBackEnd\/src\/main\/resources\/templates\/users","parentWorkspace":"C:\/Users\/User\/Desktop\/ShopmeEcommerce","name":"user_form.html","lastModified":1677467322866,"locationURI":"file:\/C:\/Users\/User\/Desktop\/ShopmeEcommerce\/ShopmeProject\/ShopmeWebParent\/ShopmeBackEnd\/src\/main\/resources\/templates\/users\/user_form.html"},{"path":"\/ShopmeFrontEnd\/src\/main\/resources","parentWorkspace":"C:\/Users\/User\/Desktop\/ShopmeEcommerce","name":"application.properties","lastModified":1676283960183,"locationURI":"file:\/C:\/Users\/User\/Desktop\/ShopmeEcommerce\/ShopmeProject\/ShopmeWebParent\/ShopmeFrontEnd\/src\/main\/resources\/application.properties"},{"path":"\/ShopmeBackEnd\/src\/main\/resources","parentWorkspace":"C:\/Users\/User\/Desktop\/ShopmeEcommerce","name":"application.properties","lastModified":1677508301870,"locationURI":"file:\/C:\/Users\/User\/Desktop\/ShopmeEcommerce\/ShopmeProject\/ShopmeWebParent\/ShopmeBackEnd\/src\/main\/resources\/application.properties"},{"path":"\/ShopmeBackEnd\/src\/main\/java\/com\/shopme\/admin\/category","parentWorkspace":"C:\/Users\/User\/Desktop\/ShopmeEcommerce","name":"CategoryController.java","lastModified":1677831872296,"locationURI":"file:\/C:\/Users\/User\/Desktop\/ShopmeEcommerce\/ShopmeProject\/ShopmeWebParent\/ShopmeBackEnd\/src\/main\/java\/com\/shopme\/admin\/category\/CategoryController.java"},{"path":"\/ShopmeFrontEnd\/src\/main\/java\/com\/shopme\/site","parentWorkspace":"C:\/Users\/User\/Desktop\/ShopmeEcommerce","name":"MainController.java","lastModified":1676289534507,"locationURI":"file:\/C:\/Users\/User\/Desktop\/ShopmeEcommerce\/ShopmeProject\/ShopmeWebParent\/ShopmeFrontEnd\/src\/main\/java\/com\/shopme\/site\/MainController.java"},{"path":"\/ShopmeBackEnd\/src\/main\/resources\/templates\/categories","parentWorkspace":"C:\/Users\/User\/Desktop\/ShopmeEcommerce","name":"category_form.html","lastModified":1677831444564,"locationURI":"file:\/C:\/Users\/User\/Desktop\/ShopmeEcommerce\/ShopmeProject\/ShopmeWebParent\/ShopmeBackEnd\/src\/main\/resources\/templates\/categories\/category_form.html"},{"path":"\/ShopmeBackEnd\/src\/main\/resources\/static\/js","parentWorkspace":"C:\/Users\/User\/Desktop\/ShopmeEcommerce","name":"common_form.js","lastModified":1677467253790,"locationURI":"file:\/C:\/Users\/User\/Desktop\/ShopmeEcommerce\/ShopmeProject\/ShopmeWebParent\/ShopmeBackEnd\/src\/main\/resources\/static\/js\/common_form.js"},{"path":"\/ShopmeBackEnd\/src\/main\/resources\/templates\/error","parentWorkspace":"C:\/Users\/User\/Desktop\/ShopmeEcommerce","name":"404.html","lastModified":1677478592367,"locationURI":"file:\/C:\/Users\/User\/Desktop\/ShopmeEcommerce\/ShopmeProject\/ShopmeWebParent\/ShopmeBackEnd\/src\/main\/resources\/templates\/error\/404.html"},{"path":"\/ShopmeBackEnd\/src\/main\/java\/com\/shopme\/admin\/security","parentWorkspace":"C:\/Users\/User\/Desktop\/ShopmeEcommerce","name":"WebSecurityConfig.java","lastModified":1677578435114,"locationURI":"file:\/C:\/Users\/User\/Desktop\/ShopmeEcommerce\/ShopmeProject\/ShopmeWebParent\/ShopmeBackEnd\/src\/main\/java\/com\/shopme\/admin\/security\/WebSecurityConfig.java"},{"path":"\/ShopmeWebParent","parentWorkspace":"C:\/Users\/User\/Desktop\/ShopmeEcommerce","name":"pom.xml","lastModified":1677229487576,"locationURI":"file:\/C:\/Users\/User\/Desktop\/ShopmeEcommerce\/ShopmeProject\/ShopmeWebParent\/pom.xml"},{"path":"\/ShopmeBackEnd\/src\/main\/java\/com\/shopme\/admin\/user","parentWorkspace":"C:\/Users\/User\/Desktop\/ShopmeEcommerce","name":"UserRepository.java","lastModified":1677132400134,"locationURI":"file:\/C:\/Users\/User\/Desktop\/ShopmeEcommerce\/ShopmeProject\/ShopmeWebParent\/ShopmeBackEnd\/src\/main\/java\/com\/shopme\/admin\/user\/UserRepository.java"},{"path":"\/ShopmeBackEnd\/src\/test\/java\/com\/shopme\/admin\/user","parentWorkspace":"C:\/Users\/User\/Desktop\/ShopmeEcommerce","name":"PasswordEncoderTest.java","lastModified":1677556633916,"locationURI":"file:\/C:\/Users\/User\/Desktop\/ShopmeEcommerce\/ShopmeProject\/ShopmeWebParent\/ShopmeBackEnd\/src\/test\/java\/com\/shopme\/admin\/user\/PasswordEncoderTest.java"},{"path":"\/ShopmeBackEnd\/src\/main\/java\/com\/shopme\/admin\/security","parentWorkspace":"C:\/Users\/User\/Desktop\/ShopmeEcommerce","name":"ShopmeUserDetails.java","lastModified":1677308467553,"locationURI":"file:\/C:\/Users\/User\/Desktop\/ShopmeEcommerce\/ShopmeProject\/ShopmeWebParent\/ShopmeBackEnd\/src\/main\/java\/com\/shopme\/admin\/security\/ShopmeUserDetails.java"},{"path":"\/ShopmeProject\/ShopmeCommon\/target\/classes\/com\/shopme\/common\/entity","parentWorkspace":"C:\/Users\/User\/Desktop\/ShopmeEcommerce","name":"User.class","lastModified":1677226090850,"locationURI":"file:\/C:\/Users\/User\/Desktop\/ShopmeEcommerce\/ShopmeProject\/ShopmeCommon\/target\/classes\/com\/shopme\/common\/entity\/User.class"},{"path":"\/ShopmeProject","parentWorkspace":"C:\/Users\/User\/Desktop\/ShopmeEcommerce","name":"pom.xml","lastModified":1676222003209,"locationURI":"file:\/C:\/Users\/User\/Desktop\/ShopmeEcommerce\/ShopmeProject\/pom.xml"},{"path":"\/ShopmeBackEnd\/src\/main\/resources\/templates","parentWorkspace":"C:\/Users\/User\/Desktop\/ShopmeEcommerce","name":"navigation.html","lastModified":1677410844649,"locationURI":"file:\/C:\/Users\/User\/Desktop\/ShopmeEcommerce\/ShopmeProject\/ShopmeWebParent\/ShopmeBackEnd\/src\/main\/resources\/templates\/navigation.html"},{"path":"\/ShopmeBackEnd\/src\/main\/resources\/templates\/error","parentWorkspace":"C:\/Users\/User\/Desktop\/ShopmeEcommerce","name":"500.html","lastModified":1677478845429,"locationURI":"file:\/C:\/Users\/User\/Desktop\/ShopmeEcommerce\/ShopmeProject\/ShopmeWebParent\/ShopmeBackEnd\/src\/main\/resources\/templates\/error\/500.html"},{"path":"\/ShopmeBackEnd\/src\/main\/java\/com\/shopme\/admin\/user\/controller","parentWorkspace":"C:\/Users\/User\/Desktop\/ShopmeEcommerce","name":"UserRestController.java","lastModified":1676886778703,"locationURI":"file:\/C:\/Users\/User\/Desktop\/ShopmeEcommerce\/ShopmeProject\/ShopmeWebParent\/ShopmeBackEnd\/src\/main\/java\/com\/shopme\/admin\/user\/controller\/UserRestController.java"},{"path":"\/ShopmeCommon\/src\/main\/java\/com\/shopme\/common\/entity","parentWorkspace":"C:\/Users\/User\/Desktop\/ShopmeEcommerce","name":"Category.java","lastModified":1677831563880,"locationURI":"file:\/C:\/Users\/User\/Desktop\/ShopmeEcommerce\/ShopmeProject\/ShopmeCommon\/src\/main\/java\/com\/shopme\/common\/entity\/Category.java"},{"path":"\/ShopmeWebParent\/ShopmeBackEnd","parentWorkspace":"C:\/Users\/User\/Desktop\/ShopmeEcommerce","name":"pom.xml","lastModified":1676222003209,"locationURI":"file:\/C:\/Users\/User\/Desktop\/ShopmeEcommerce\/ShopmeProject\/ShopmeWebParent\/ShopmeBackEnd\/pom.xml"},{"path":"\/ShopmeBackEnd\/src\/main\/java\/com\/shopme\/admin","parentWorkspace":"C:\/Users\/User\/Desktop\/ShopmeEcommerce","name":"ShopmeBackEndApplication.java","lastModified":1676544146510,"locationURI":"file:\/C:\/Users\/User\/Desktop\/ShopmeEcommerce\/ShopmeProject\/ShopmeWebParent\/ShopmeBackEnd\/src\/main\/java\/com\/shopme\/admin\/ShopmeBackEndApplication.java"},{"path":"\/ShopmeBackEnd\/src\/test\/java\/com\/shopme\/admin\/user","parentWorkspace":"C:\/Users\/User\/Desktop\/ShopmeEcommerce","name":"UserRepositoryTests.java","lastModified":1677556399974,"locationURI":"file:\/C:\/Users\/User\/Desktop\/ShopmeEcommerce\/ShopmeProject\/ShopmeWebParent\/ShopmeBackEnd\/src\/test\/java\/com\/shopme\/admin\/user\/UserRepositoryTests.java"},{"path":"\/ShopmeBackEnd\/src\/main\/resources\/static","parentWorkspace":"C:\/Users\/User\/Desktop\/ShopmeEcommerce","name":"style.css","lastModified":1677166116629,"locationURI":"file:\/C:\/Users\/User\/Desktop\/ShopmeEcommerce\/ShopmeProject\/ShopmeWebParent\/ShopmeBackEnd\/src\/main\/resources\/static\/style.css"},{"path":"\/ShopmeBackEnd\/src\/main\/java\/com\/shopme\/admin\/user\/export","parentWorkspace":"C:\/Users\/User\/Desktop\/ShopmeEcommerce","name":"UserCsvExporter.java","lastModified":1677157446759,"locationURI":"file:\/C:\/Users\/User\/Desktop\/ShopmeEcommerce\/ShopmeProject\/ShopmeWebParent\/ShopmeBackEnd\/src\/main\/java\/com\/shopme\/admin\/user\/export\/UserCsvExporter.java"},{"path":"\/ShopmeCommon","parentWorkspace":"C:\/Users\/User\/Desktop\/ShopmeEcommerce","name":"pom.xml","lastModified":1676541672655,"locationURI":"file:\/C:\/Users\/User\/Desktop\/ShopmeEcommerce\/ShopmeProject\/ShopmeCommon\/pom.xml"},{"path":"\/ShopmeBackEnd\/src\/test\/java\/com\/shopme\/admin\/category","parentWorkspace":"C:\/Users\/User\/Desktop\/ShopmeEcommerce","name":"CategoryRepositoryTests.java","lastModified":1677769562924,"locationURI":"file:\/C:\/Users\/User\/Desktop\/ShopmeEcommerce\/ShopmeProject\/ShopmeWebParent\/ShopmeBackEnd\/src\/test\/java\/com\/shopme\/admin\/category\/CategoryRepositoryTests.java"},{"path":"\/ShopmeBackEnd\/src\/main\/java\/com\/shopme\/admin\/category","parentWorkspace":"C:\/Users\/User\/Desktop\/ShopmeEcommerce","name":"CategoryService.java","lastModified":1677853530550,"locationURI":"file:\/C:\/Users\/User\/Desktop\/ShopmeEcommerce\/ShopmeProject\/ShopmeWebParent\/ShopmeBackEnd\/src\/main\/java\/com\/shopme\/admin\/category\/CategoryService.java"},{"path":"\/ShopmeCommon\/src\/main\/java\/com\/shopme\/common\/entity","parentWorkspace":"C:\/Users\/User\/Desktop\/ShopmeEcommerce","name":"User.java","lastModified":1677226090850,"locationURI":"file:\/C:\/Users\/User\/Desktop\/ShopmeEcommerce\/ShopmeProject\/ShopmeCommon\/src\/main\/java\/com\/shopme\/common\/entity\/User.java"},{"path":"\/ShopmeCommon\/src\/main\/java\/com\/shopme\/common\/entity","parentWorkspace":"C:\/Users\/User\/Desktop\/ShopmeEcommerce","name":"Role.java","lastModified":1676954212002,"locationURI":"file:\/C:\/Users\/User\/Desktop\/ShopmeEcommerce\/ShopmeProject\/ShopmeCommon\/src\/main\/java\/com\/shopme\/common\/entity\/Role.java"},{"path":"\/ShopmeBackEnd\/src\/main\/java\/com\/shopme\/admin\/user","parentWorkspace":"C:\/Users\/User\/Desktop\/ShopmeEcommerce","name":"UserNotFoundException.java","lastModified":1676879518482,"locationURI":"file:\/C:\/Users\/User\/Desktop\/ShopmeEcommerce\/ShopmeProject\/ShopmeWebParent\/ShopmeBackEnd\/src\/main\/java\/com\/shopme\/admin\/user\/UserNotFoundException.java"},{"path":"\/ShopmeBackEnd\/src\/main\/resources\/templates","parentWorkspace":"C:\/Users\/User\/Desktop\/ShopmeEcommerce","name":"index.html","lastModified":1677389989130,"locationURI":"file:\/C:\/Users\/User\/Desktop\/ShopmeEcommerce\/ShopmeProject\/ShopmeWebParent\/ShopmeBackEnd\/src\/main\/resources\/templates\/index.html"},{"path":"\/ShopmeBackEnd\/src\/main\/java\/com\/shopme\/admin\/user\/controller","parentWorkspace":"C:\/Users\/User\/Desktop\/ShopmeEcommerce","name":"AccountController.java","lastModified":1677494555729,"locationURI":"file:\/C:\/Users\/User\/Desktop\/ShopmeEcommerce\/ShopmeProject\/ShopmeWebParent\/ShopmeBackEnd\/src\/main\/java\/com\/shopme\/admin\/user\/controller\/AccountController.java"},{"path":"\/ShopmeBackEnd\/src\/main\/resources\/templates","parentWorkspace":"C:\/Users\/User\/Desktop\/ShopmeEcommerce","name":"login.html","lastModified":1677245871792,"locationURI":"file:\/C:\/Users\/User\/Desktop\/ShopmeEcommerce\/ShopmeProject\/ShopmeWebParent\/ShopmeBackEnd\/src\/main\/resources\/templates\/login.html"},{"path":"\/ShopmeFrontEnd","parentWorkspace":"C:\/Users\/User\/Desktop\/ShopmeEcommerce","name":"pom.xml","lastModified":1676348025599,"locationURI":"file:\/C:\/Users\/User\/Desktop\/ShopmeEcommerce\/ShopmeProject\/ShopmeWebParent\/ShopmeFrontEnd\/pom.xml"},{"path":"\/ShopmeFrontEnd\/src\/main\/resources\/templates","parentWorkspace":"C:\/Users\/User\/Desktop\/ShopmeEcommerce","name":"index.html","lastModified":1676284076822,"locationURI":"file:\/C:\/Users\/User\/Desktop\/ShopmeEcommerce\/ShopmeProject\/ShopmeWebParent\/ShopmeFrontEnd\/src\/main\/resources\/templates\/index.html"},{"path":"\/ShopmeBackEnd\/src\/main\/java\/com\/shopme\/admin","parentWorkspace":"C:\/Users\/User\/Desktop\/ShopmeEcommerce","name":"FileUploadUtil.java","lastModified":1677494843707,"locationURI":"file:\/C:\/Users\/User\/Desktop\/ShopmeEcommerce\/ShopmeProject\/ShopmeWebParent\/ShopmeBackEnd\/src\/main\/java\/com\/shopme\/admin\/FileUploadUtil.java"},{"path":"\/ShopmeBackEnd\/src\/main\/java\/com\/shopme\/admin\/user","parentWorkspace":"C:\/Users\/User\/Desktop\/ShopmeEcommerce","name":"UserService.java","lastModified":1677306762024,"locationURI":"file:\/C:\/Users\/User\/Desktop\/ShopmeEcommerce\/ShopmeProject\/ShopmeWebParent\/ShopmeBackEnd\/src\/main\/java\/com\/shopme\/admin\/user\/UserService.java"},{"path":"\/ShopmeBackEnd\/src\/main\/resources\/templates","parentWorkspace":"C:\/Users\/User\/Desktop\/ShopmeEcommerce","name":"error.html","lastModified":1677478580858,"locationURI":"file:\/C:\/Users\/User\/Desktop\/ShopmeEcommerce\/ShopmeProject\/ShopmeWebParent\/ShopmeBackEnd\/src\/main\/resources\/templates\/error.html"},{"path":"\/ShopmeBackEnd\/src\/main\/java\/com\/shopme\/admin\/user","parentWorkspace":"C:\/Users\/User\/Desktop\/ShopmeEcommerce","name":"RoleRepository.java","lastModified":1676541672655,"locationURI":"file:\/C:\/Users\/User\/Desktop\/ShopmeEcommerce\/ShopmeProject\/ShopmeWebParent\/ShopmeBackEnd\/src\/main\/java\/com\/shopme\/admin\/user\/RoleRepository.java"},{"path":"\/ShopmeBackEnd\/src\/main\/resources\/templates\/users","parentWorkspace":"C:\/Users\/User\/Desktop\/ShopmeEcommerce","name":"users.html","lastModified":1677307765208,"locationURI":"file:\/C:\/Users\/User\/Desktop\/ShopmeEcommerce\/ShopmeProject\/ShopmeWebParent\/ShopmeBackEnd\/src\/main\/resources\/templates\/users\/users.html"},{"path":"\/ShopmeBackEnd\/src\/main\/resources\/templates","parentWorkspace":"C:\/Users\/User\/Desktop\/ShopmeEcommerce","name":"fragments.html","lastModified":1677849095456,"locationURI":"file:\/C:\/Users\/User\/Desktop\/ShopmeEcommerce\/ShopmeProject\/ShopmeWebParent\/ShopmeBackEnd\/src\/main\/resources\/templates\/fragments.html"},{"path":"\/ShopmeBackEnd\/src\/main\/java\/com\/shopme\/admin","parentWorkspace":"C:\/Users\/User\/Desktop\/ShopmeEcommerce","name":"MvcConfig.java","lastModified":1677769420026,"locationURI":"file:\/C:\/Users\/User\/Desktop\/ShopmeEcommerce\/ShopmeProject\/ShopmeWebParent\/ShopmeBackEnd\/src\/main\/java\/com\/shopme\/admin\/MvcConfig.java"},{"path":"\/ShopmeBackEnd\/src\/main\/java\/com\/shopme\/admin\/category","parentWorkspace":"C:\/Users\/User\/Desktop\/ShopmeEcommerce","name":"CategoryRepository.java","lastModified":1677750248333,"locationURI":"file:\/C:\/Users\/User\/Desktop\/ShopmeEcommerce\/ShopmeProject\/ShopmeWebParent\/ShopmeBackEnd\/src\/main\/java\/com\/shopme\/admin\/category\/CategoryRepository.java"},{"path":"\/ShopmeBackEnd\/src\/main\/resources\/templates\/error","parentWorkspace":"C:\/Users\/User\/Desktop\/ShopmeEcommerce","name":"403.html","lastModified":1677478669863,"locationURI":"file:\/C:\/Users\/User\/Desktop\/ShopmeEcommerce\/ShopmeProject\/ShopmeWebParent\/ShopmeBackEnd\/src\/main\/resources\/templates\/error\/403.html"},{"path":"\/ShopmeBackEnd\/src\/main\/resources\/templates\/users","parentWorkspace":"C:\/Users\/User\/Desktop\/ShopmeEcommerce","name":"account_form.html","lastModified":1677467603206,"locationURI":"file:\/C:\/Users\/User\/Desktop\/ShopmeEcommerce\/ShopmeProject\/ShopmeWebParent\/ShopmeBackEnd\/src\/main\/resources\/templates\/users\/account_form.html"},{"path":"\/ShopmeBackEnd\/src\/test\/java\/com\/shopme\/admin\/user","parentWorkspace":"C:\/Users\/User\/Desktop\/ShopmeEcommerce","name":"RoleRepositoryTests.java","lastModified":1677556469813,"locationURI":"file:\/C:\/Users\/User\/Desktop\/ShopmeEcommerce\/ShopmeProject\/ShopmeWebParent\/ShopmeBackEnd\/src\/test\/java\/com\/shopme\/admin\/user\/RoleRepositoryTests.java"},{"path":"\/ShopmeBackEnd\/src\/main\/java\/com\/shopme\/admin\/security","parentWorkspace":"C:\/Users\/User\/Desktop\/ShopmeEcommerce","name":"ShopmeUserDetailsService.java","lastModified":1677225020383,"locationURI":"file:\/C:\/Users\/User\/Desktop\/ShopmeEcommerce\/ShopmeProject\/ShopmeWebParent\/ShopmeBackEnd\/src\/main\/java\/com\/shopme\/admin\/security\/ShopmeUserDetailsService.java"},{"path":"\/ShopmeWebParent\/ShopmeBackEnd\/src\/main\/resources\/templates","parentWorkspace":"C:\/Users\/User\/Desktop\/ShopmeEcommerce","name":"index.html","lastModified":1676220716827,"locationURI":"file:\/C:\/Users\/User\/Desktop\/ShopmeEcommerce\/ShopmeProject\/ShopmeWebParent\/ShopmeBackEnd\/src\/main\/resources\/templates\/index.html"}]}
\ No newline at end of file
diff --git a/.metadata/.plugins/com.genuitec.eclipse.monitor/myeclipse-usage.properties b/.metadata/.plugins/com.genuitec.eclipse.monitor/myeclipse-usage.properties
index 32c0e414..fdb34815 100644
--- a/.metadata/.plugins/com.genuitec.eclipse.monitor/myeclipse-usage.properties
+++ b/.metadata/.plugins/com.genuitec.eclipse.monitor/myeclipse-usage.properties
@@ -1,45 +1,45 @@
 #MyEclipse Usage Data
-#Thu Mar 02 18:06:09 SGT 2023
+#Fri Mar 03 22:53:49 SGT 2023
 misc/arch=x86_64
 view/org.eclipse.pde.runtime.LogView=3
 misc/eclipseVersion/4.17.2.202301310704=1
-bundle/com.genuitec.eclipse.startup.workspace=294
-bundle/com.genuitec.eclipse.theming.ui=294
+bundle/com.genuitec.eclipse.startup.workspace=315
+bundle/com.genuitec.eclipse.theming.ui=315
 bundle/com.genuitec.eclipse.theming.elevation.win32=-1
-view/org.eclipse.ui.console.ConsoleView=81
+view/org.eclipse.ui.console.ConsoleView=82
 bundle/com.genuitec.eclipse.theming.css=-1
 editor/org.eclipse.wst.css.core.csssource.source=25
 perspective/org.eclipse.egit.ui.GitRepositoryExploring=1
 view/org.eclipse.ui.navigator.ProjectExplorer=1
-misc/timestamp=Mar 2, 2023, 10\:06\:09 AM
+misc/timestamp=Mar 3, 2023, 2\:53\:49 PM
 editor/org.eclipse.ui.genericeditor.GenericEditor=87
-editor/org.eclipse.jdt.ui.CompilationUnitEditor=1005
-bundle/com.genuitec.eclipse.theming.scrollbar=294
-bundle/com.genuitec.eclipse.theming.base=294
+editor/org.eclipse.jdt.ui.CompilationUnitEditor=1043
+bundle/com.genuitec.eclipse.theming.scrollbar=315
+bundle/com.genuitec.eclipse.theming.base=315
 devstyle/state/iconsColor/primary=1
-bundle/com.genuitec.eclipse.inlinesearch=294
-bundle/com.genuitec.eclipse.monitor=294
+bundle/com.genuitec.eclipse.inlinesearch=315
+bundle/com.genuitec.eclipse.monitor=315
 devstyle/state/enabled=1
-editor/org.eclipse.jdt.ui.ClassFileEditor=35
-bundle/com.genuitec.eclipse.webclipse.evergreen=294
+editor/org.eclipse.jdt.ui.ClassFileEditor=36
+bundle/com.genuitec.eclipse.webclipse.evergreen=315
 editor/SpringBootPropertyEditor=71
 misc/product/org.springframework.boot.ide.branding.sts4=1
 bundle/com.genuitec.eclipse.news=-1
 bundle/com.genuitec.eclipse.theming.scrollbar.win=-1
-misc/period=654627250
+misc/period=713573554
 bundle/com.genuitec.eclipse.theming.icon.designer=-1
 devstyle/state/inlinesearch=1
-bundle/com.genuitec.eclipse.ui.common.platform=339
-misc/count=339
+bundle/com.genuitec.eclipse.ui.common.platform=363
+misc/count=363
 view/org.eclipse.ui.views.ProblemView=3
-bundle/com.genuitec.eclipse.meexplorer=294
+bundle/com.genuitec.eclipse.meexplorer=315
 misc/productType/devstyle=1
 misc/os=win32
-bundle/com.genuitec.eclipse.meexplorer.jdt=294
-editor/org.eclipse.wst.html.core.htmlsource.source=557
+bundle/com.genuitec.eclipse.meexplorer.jdt=315
+editor/org.eclipse.wst.html.core.htmlsource.source=594
 devstyle/state/workbenchColor/Dark_Gray=1
-view/org.eclipse.jdt.ui.PackageExplorer=433
-bundle/com.genuitec.eclipse.webicons=339
+view/org.eclipse.jdt.ui.PackageExplorer=445
+bundle/com.genuitec.eclipse.webicons=363
 misc/core_version=<unknown>
 view/org.eclipse.help.ui.HelpView=1
 view/org.eclipse.ui.views.ContentOutline=2
@@ -51,19 +51,19 @@ editor/org.eclipse.m2e.editor.MavenPomEditor=246
 misc/ws=win32
 view/org.eclipse.jdt.junit.ResultView=20
 view/org.eclipse.egit.ui.RepositoriesView=1
-bundle/com.genuitec.eclipse.patches=339
-bundle/com.genuitec.eclipse.startup=294
+bundle/com.genuitec.eclipse.patches=363
+bundle/com.genuitec.eclipse.startup=315
 view/org.eclipse.search.ui.views.SearchView=4
 devstyle/state/editorColor/IntelliJ_IDEA_Dark=1
 bundle/com.genuitec.eclipse.theming.base.win=-1
 misc/installmode/standalone=0
 misc/locale=en_US
 misc/workspace_hash=-2114249626
-view/org.springframework.ide.eclipse.boot.dash.views.BootDashView=122
-perspective/org.eclipse.jdt.ui.JavaPerspective=49
+view/org.springframework.ide.eclipse.boot.dash.views.BootDashView=123
+perspective/org.eclipse.jdt.ui.JavaPerspective=51
 bundle/com.genuitec.eclipse.theming.epl=-1
-bundle/com.genuitec.eclipsecolortheme.api=339
+bundle/com.genuitec.eclipsecolortheme.api=363
 view/org.eclipse.wst.server.ui.ServersView=1
-bundle/com.genuitec.eclipse.theming.core=294
-bundle/com.genuitec.eclipse.core.common.platform=339
+bundle/com.genuitec.eclipse.theming.core=315
+bundle/com.genuitec.eclipse.core.common.platform=363
 view/org.eclipse.debug.ui.DebugView=3
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/0/70f9861f2ab8001d1d97982e354adf88 b/.metadata/.plugins/org.eclipse.core.resources/.history/0/70f9861f2ab8001d1d97982e354adf88
deleted file mode 100644
index 4b477ae0..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/0/70f9861f2ab8001d1d97982e354adf88
+++ /dev/null
@@ -1,65 +0,0 @@
-package com.shopme.admin.category;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Set;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import com.shopme.common.entity.Category;
-
-@Service
-public class CategoryService {
-
-	@Autowired
-	private CategoryRepository repo;
-	
-	public List<Category> listAll(){
-		return (List<Category>) repo.findAll();
-	}
-	
-	public List<Category> listCategoriesUsedInForm(){
-		
-		List<Category> categoriesUsedInForm = new ArrayList<>();
-		
-		Iterable<Category> categoriesInDB = repo.findAll();
-		
-		for (Category category : categoriesInDB) {
-
-			// root category
-			if (category.getParent() == null) {
-				categoriesUsedInForm.add(new Category(category.getName()));
-
-				category.getChildren().forEach(subCategory -> {
-
-					System.out.println("--" + subCategory.getName());
-					listChildren(subCategory, 1);
-				});
-			}
-
-		}
-		
-		
-		return categoriesUsedInForm;
-	}
-	
-	private void listChildren(Category parent, int subLevel) {
-
-		int newSubLevel = subLevel + 1;
-		Set<Category> children = parent.getChildren();
-
-		for (Category subCategory : children) {
-
-			for (int i = 0; i < newSubLevel; i++) {
-				System.out.print("--");
-			}
-
-			System.out.println(subCategory.getName());
-
-			printChildren(subCategory, newSubLevel);
-		}
-
-	}
-	
-}
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/0/900ad9c130b4001d1d079a924effdc9e b/.metadata/.plugins/org.eclipse.core.resources/.history/0/900ad9c130b4001d1d079a924effdc9e
deleted file mode 100644
index fc5c3ef9..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/0/900ad9c130b4001d1d079a924effdc9e
+++ /dev/null
@@ -1,112 +0,0 @@
-<!DOCTYPE html>
-<html xmlns:th="http://www.thymeleaf.org"
-	  xmlns:sec="https://www.thymeleaf.org/thymeleaf-extras-springsecurity5">
-
-<head>
-	<meta http-equiv="Content-Type" content="text/html; charset= UTF-8">
-	<meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0">
-	<title>Home - Shopme Admin</title>
-	
-	<link rel="stylesheet" type="text/css" th:href="@{/fontawesome/all.css}" />
-	<link rel="stylesheet" type="text/css" th:href="@{/style.css}" />
-	<link rel="stylesheet" type="text/css" th:href="@{/webjars/bootstrap/css/bootstrap.min.css}" />
-	
-	<script type="text/javascript" th:src="@{/webjars/jquery/jquery.min.js}"></script>
-	<script type="text/javascript" th:src="@{/webjars/bootstrap/js/bootstrap.min.js}"></script>
-</head>
-
-<body>
-	<div class="container-fluid">
-		<div>
-			<form th:action="@{/logout}" method="post" th:hidden="true" name="logoutForm">
-				<input type="submit"/>
-			</form>
-			<nav class="navbar navbar-expand-lg bg-dark navbar-dark">
-				<a class="navbar-brand" th:href="@{/}">
-					<img th:src="@{/images/ShopmeAdminSmall.png}"/>
-				</a>
-				<!--hamburger toggler for mobile devices(responsive)-->
-				<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#topNavbar">
-					<span class="navbar-toggler-icon"></span>
-				</button>
-				<div class="collapse navbar-collapse" id="topNavbar">
-					<ul class="navbar-nav">
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/users}">Users</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/categories}">Categories</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/brands}">Brands</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/products}">Products</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/customers}">Customers</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/shipping}">Shipping</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/orders}">Orders</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/report}">Sales Report</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/articles}">Articles</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/menus}">Menus</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/settings}">Settings</a>
-						</li>
-						<li>
-							<span class="fas fa-user fa-2x icon-silver"></span>
-						</li>
-						<li class="nav-item dropdown">
-								<!-- principal refers to user; display username -->
-							<a class="nav-link dropdown-toggle" sec:authentication="principal.fullname" data-toggle="dropdown"></a>
-							<div class="dropdown-menu">
-								<a class="dropdown-item" id="logoutLink" href="">Logout</a>
-							</div>
-							
-						</li>
-					</ul>
-				</div>
-				
-			</nav>
-		</div>
-
-		<div>
-			<h1>Shopme Control Panel</h1>
-		</div>
-
-		<div>
-			<p>Shopme Control Panel - Copyright &copy; Shopme</p>
-		</div>
-
-
-	</div>
-	
-<script type="text/javascript">
-
-	$(document).ready(function(){
-		$("#logoutLink").on("click" function(e){
-			e.preventDefault(); /* stop the hyperlink default behaviour  */
-			/* use  the form to  log out and navigate to the url path /logout  
-			
-			 NOTE: spring security requires POST to logout for the csrf token in form
-			*/
-			document.logoutForm.submit();
-		});
-	});
-
-</script>
-
-</body>
-
-</html>
\ No newline at end of file
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/0/b01f881077b3001d19bbb001c1a81c20 b/.metadata/.plugins/org.eclipse.core.resources/.history/0/b01f881077b3001d19bbb001c1a81c20
deleted file mode 100644
index 1ddaf760..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/0/b01f881077b3001d19bbb001c1a81c20
+++ /dev/null
@@ -1,192 +0,0 @@
-package com.shopme.admin.user;
-
-import java.io.IOException;
-import java.util.List;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.domain.Page;
-import org.springframework.data.repository.query.Param;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
-import org.springframework.util.StringUtils;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.ModelAttribute;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.multipart.MultipartFile;
-import org.springframework.web.servlet.mvc.support.RedirectAttributes;
-
-import com.fasterxml.jackson.annotation.ObjectIdGenerators.StringIdGenerator;
-import com.shopme.admin.FileUploadUtil;
-import com.shopme.common.entity.Role;
-import com.shopme.common.entity.User;
-
-import jakarta.servlet.http.HttpServletResponse;
-
-@Controller
-public class UserController {
-
-	@Autowired
-	private UserService service;
-
-	@GetMapping("/users")
-	public String listFirstPage(Model model) {
-
-		// NOTE: these are the default values for path variable and URL parameters
-		return listByPage(1, model, "firstName", "asc", null);
-	}
-
-	@GetMapping("/users/page/{pageNum}")
-	public String listByPage(@PathVariable(name = "pageNum") int pageNum, Model model,
-			@Param("sortField") String sortField, @Param("sortDir") String sortDir, @Param("keyword") String keyword) {
-
-		System.out.println("sort field: " + sortField);
-		System.out.println("sort order: " + sortDir);
-
-		Page<User> page = service.listByPage(pageNum, sortField, sortDir, keyword);
-		List<User> listUsers = page.getContent();
-
-		long startCount = (pageNum - 1) * UserService.USERS_PER_PAGE + 1;
-		long endCount = startCount + UserService.USERS_PER_PAGE - 1;
-		if (endCount > page.getTotalElements()) {
-			endCount = page.getTotalElements();
-		}
-
-		String reverseSortDir = sortDir.equals("asc") ? "desc" : "asc";
-
-		model.addAttribute("currentPage", pageNum);
-		model.addAttribute("totalPages", page.getTotalPages());
-		model.addAttribute("startCount", startCount);
-		model.addAttribute("endCount", endCount);
-		model.addAttribute("totalItems", page.getTotalElements());
-		model.addAttribute("listUsers", listUsers);
-		model.addAttribute("sortField", sortField);
-		model.addAttribute("sortDir", sortDir);
-		model.addAttribute("reverseSortDir", reverseSortDir);
-		model.addAttribute("keyword", keyword);
-
-		return "users";
-
-	}
-
-	@GetMapping("/users/new")
-	public String newUser(Model model) {
-
-		List<Role> listRoles = service.listRoles();
-
-		User user = new User();
-		user.setEnabled(true);
-
-		model.addAttribute("user", user);
-		model.addAttribute("listRoles", listRoles);
-		model.addAttribute("pageTitle", "Create New User");
-
-		return "user_form";
-
-	}
-
-	// using @RequestParam, we can get the image file input, the input has the
-	// property name="image"
-	@PostMapping("/users/save")
-	public String saveUser(@ModelAttribute("user") User user, RedirectAttributes redirectAttributes,
-			@RequestParam("image") MultipartFile multipartFile) throws IOException {
-
-		if (!multipartFile.isEmpty()) {
-
-			String fileName = StringUtils.cleanPath(multipartFile.getOriginalFilename());
-			user.setPhotos(fileName);
-
-			User savedUser = service.save(user);
-
-			String uploadDir = "user-photos/" + savedUser.getId();
-
-			FileUploadUtil.cleanDir(uploadDir);
-			FileUploadUtil.saveFile(uploadDir, fileName, multipartFile);
-		} else {
-
-			// set photo to null for getPhotosImagePath() method's conditional statement in
-			// User class
-			if (user.getPhotos().isEmpty())
-				user.setPhotos(null);
-			service.save(user);
-		}
-
-		redirectAttributes.addFlashAttribute("message", "the user has been saved successfully");
-
-		// POST/REDIRECT/GET web design
-		return getRedirectURLtoAffectedUser(user);
-	}
-
-	private String getRedirectURLtoAffectedUser(User user) {
-
-		// after user is saved display the user instead of the entire user list
-		// email is a unique field to identify each user.
-		String firstPartOfEmail = user.getEmail().split("@")[0];
-		return "redirect:/users/page/1?sortField=id&sortDir=asc&keyword=" + firstPartOfEmail;
-	}
-
-	@GetMapping("/users/edit/{id}")
-	public String editUser(@PathVariable(name = "id") Integer id, RedirectAttributes redirectAttributes, Model model) {
-		try {
-			User user = service.get(id);
-			List<Role> listRoles = service.listRoles();
-
-			model.addAttribute("user", user);
-			model.addAttribute("pageTitle", "Edit User (ID: " + id + ")");
-			model.addAttribute("listRoles", listRoles);
-
-			return "user_form";
-		} catch (UserNotFoundException ex) {
-			redirectAttributes.addFlashAttribute("message", ex.getMessage());
-
-			return "redirect:/users";
-		}
-
-	}
-
-	@GetMapping("/users/delete/{id}")
-	public String deleteUser(@PathVariable(name = "id") Integer id, RedirectAttributes redirectAttributes,
-			Model model) {
-		try {
-			service.delete(id);
-			redirectAttributes.addFlashAttribute("message", "The user ID " + id + " has been deleted successfully.");
-
-		} catch (UserNotFoundException ex) {
-			redirectAttributes.addFlashAttribute("message", ex.getMessage());
-
-		}
-
-		return "redirect:/users";
-	}
-
-	@GetMapping("/users/{id}/enabled/{status}")
-	public String updateUserEnabledStatus(@PathVariable(name = "id") Integer id,
-			@PathVariable(name = "status") boolean enabled, RedirectAttributes redirectAttributes) {
-
-		service.updateUserEnabledStatus(id, enabled);
-		String status = enabled ? "enabled" : "disabled";
-		String message = "The user id " + id + " has been " + status;
-		redirectAttributes.addFlashAttribute("message", message);
-
-		return "redirect:/users";
-	}
-
-	@GetMapping("/users/export/csv")
-	public void exportToCSV(HttpServletResponse response) throws IOException {
-
-		List<User> listUsers = service.listAll();
-		UserCsvExporter exporter = new UserCsvExporter();
-		exporter.export(listUsers, response);
-	}
-	
-	@GetMapping("/users/export/excel")
-	public void exportToCSV(HttpServletResponse response) throws IOException {
-
-		List<User> listUsers = service.listAll();
-	}
-	
-	
-	
-
-}
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/0/c01c784f99b9001d10d0f9513979f945 b/.metadata/.plugins/org.eclipse.core.resources/.history/0/c01c784f99b9001d10d0f9513979f945
new file mode 100644
index 00000000..04eede00
--- /dev/null
+++ b/.metadata/.plugins/org.eclipse.core.resources/.history/0/c01c784f99b9001d10d0f9513979f945
@@ -0,0 +1,78 @@
+package com.shopme.admin.category;
+
+import java.io.IOException;
+import java.util.List;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.scheduling.support.SimpleTriggerContext;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
+import org.springframework.util.StringUtils;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.ModelAttribute;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.multipart.MultipartFile;
+import org.springframework.web.servlet.mvc.support.RedirectAttributes;
+
+import com.shopme.admin.FileUploadUtil;
+import com.shopme.common.entity.Category;
+
+@Controller
+public class CategoryController {
+	
+	@Autowired
+	private CategoryService service;
+	
+	@GetMapping("/categories")
+	public String listAll(Model model) {
+		
+		List<Category> listCategories = service.listAll();
+		model.addAttribute("listCategories", listCategories);
+		
+		return "categories/categories";
+	}
+	
+	
+	@GetMapping("/categories/new")
+	public String newCategory(Model model) {
+		
+		List<Category> listCategories = service.listCategoriesUsedInForm();
+		
+		model.addAttribute("category", new Category());
+		model.addAttribute("listCategories", listCategories);
+		model.addAttribute("pageTitle", "Create New Category");
+		
+		return "categories/category_form";
+	
+	}
+	
+	@PostMapping("/categories/save")
+	public String saveCategory(@ModelAttribute("category") Category category, 
+			RedirectAttributes redirectAttributes,
+			@RequestParam("fileImage") MultipartFile multipartFile) throws IOException {
+		
+		String fileName = StringUtils.cleanPath(multipartFile.getOriginalFilename());
+		category.setImage(fileName);
+		
+		Category savedCategory = service.save(category);
+		String uploadDir = "../category-images/" + savedCategory.getId();
+		FileUploadUtil.saveFile(uploadDir, fileName, multipartFile);
+		
+		
+		redirectAttributes.addFlashAttribute("message", "the category have been saved successfully");
+		
+		
+		return "redirect:/categories";
+	}
+
+	
+	@GetMapping("/categories/edit/{id}")
+	
+	
+	
+}
+	
+
+
+
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/0/d024f4ac8fb3001d19bbb001c1a81c20 b/.metadata/.plugins/org.eclipse.core.resources/.history/0/d024f4ac8fb3001d19bbb001c1a81c20
deleted file mode 100644
index 20d75cb3..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/0/d024f4ac8fb3001d19bbb001c1a81c20
+++ /dev/null
@@ -1,280 +0,0 @@
-<!DOCTYPE html>
-<html xmlns:th="http://www.thymeleaf.org">
-
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset= UTF-8">
-<meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0">
-<title>Manage Users</title>
-
-<link rel="stylesheet" type="text/css" th:href="@{/webjars/bootstrap/css/bootstrap.min.css}" />
-<link rel="stylesheet" type="text/css" th:href="@{/fontawesome/all.css}" />
-<link rel="stylesheet" type="text/css" th:href="@{/style.css}" />
-	
-<script type="text/javascript" th:src="@{/webjars/jquery/jquery.min.js}"></script>
-<script type="text/javascript" th:src="@{/webjars/bootstrap/js/bootstrap.min.js}"></script>
-</head>
-
-<body>
-	<div class="container-fluid">
-		<div>
-			<nav class="navbar navbar-expand-lg bg-dark navbar-dark">
-				<a class="navbar-brand" th:href="@{/}"> <img
-					th:src="@{/images/ShopmeAdminSmall.png}" />
-				</a>
-				<!--hamburger toggler for mobile devices(responsive)-->
-				<button class="navbar-toggler" type="button" data-toggle="collapse"
-					data-target="#topNavbar">
-					<span class="navbar-toggler-icon"></span>
-				</button>
-				<div class="collapse navbar-collapse" id="topNavbar">
-					<ul class="navbar-nav">
-						<li class="nav-item"><a class="nav-link" th:href="@{/users}">Users</a>
-						</li>
-						<li class="nav-item"><a class="nav-link"
-							th:href="@{/categories}">Categories</a></li>
-						<li class="nav-item"><a class="nav-link" th:href="@{/brands}">Brands</a>
-						</li>
-						<li class="nav-item"><a class="nav-link"
-							th:href="@{/products}">Products</a></li>
-						<li class="nav-item"><a class="nav-link"
-							th:href="@{/customers}">Customers</a></li>
-						<li class="nav-item"><a class="nav-link"
-							th:href="@{/shipping}">Shipping</a></li>
-						<li class="nav-item"><a class="nav-link" th:href="@{/orders}">Orders</a>
-						</li>
-						<li class="nav-item"><a class="nav-link" th:href="@{/report}">Sales
-								Report</a></li>
-						<li class="nav-item"><a class="nav-link"
-							th:href="@{/articles}">Articles</a></li>
-						<li class="nav-item"><a class="nav-link" th:href="@{/menus}">Menus</a>
-						</li>
-						<li class="nav-item"><a class="nav-link"
-							th:href="@{/settings}">Settings</a></li>
-					</ul>
-				</div>
-
-			</nav>
-		</div>
-
-		<div>
-			<h2>Manage Users</h2>
-			<a th:href="@{/users/new}" class="fas fa-user-plus fa-2x icon-dark mr-2"></a>
-			
-			<a th:href="@{/users/export/csv}" class="fas fa-file-csv fa-2x icon-dark mr-2"></a>
-		</div>
-		
-		
-		
-		<!-- only display success message when a new user is created -->
-		<div th:if="${message != null}" class="alert alert-success text-center">
-			[[${message}]]
-		</div>
-			
-		<div>
-			<form th:action="@{/users/page/1}" class="form-inline m-3">
-				
-				<input type="hidden" name="sortField" th:value="${sortField}" />
-				<input type="hidden" name="sortDir" th:value="${sortDir}" />
-				Filter:&nbsp;
-				<input type="search" name="keyword" th:value="${keyword}" class="form-control" required/>
-				&nbsp;&nbsp;
-				<button type="submit" class="btn btn-primary">
-					<i class="fas fa-search"></i>
-				</button>
-				&nbsp;&nbsp;
-				<button type="button" class="btn btn-secondary" onclick="clearFilter()">
-					<i class="fas fa-eraser"></i>
-				</button>
-			</form>
-		
-		</div>
-
-			<!-- css class to display this table in large screens only , refer to static/style.css for more info-->
-			<div class="full-details">
-				<table class="table table-bordered table-striped table-hover table-responsive-xL">
-					<thead class="thead-dark">
-						<tr>
-							<!-- refer to templates/fragments.html for fragment code-->
-							
-							<th>
-								<th th:replace="fragments :: column_link('id', 'User ID')"/>
-							</th>
-							
-							<th>Photos</th>
-							<th th:replace="fragments :: column_link('email', 'Email')"/>
-							<th th:replace="fragments :: column_link('firstName', 'First Name')"/>
-							<th th:replace="fragments :: column_link('lastName', 'Last Name')"/>
-							<th>Roles</th>
-							<th th:replace="fragments :: column_link('enabled', 'Enabled')"/>
-							<th></th>
-						</tr>
-					</thead>
-					<tbody>
-						<tr th:each="user : ${listUsers}">
-							<td class="hideable-column">[[${user.id}]]</td>
-							<td>
-								<span th:if="${user.photos == null}" class="fas fa-portrait fa-3x icon-dark"></span>
-								<img th:if="${user.photos != null}" th:src="@{${user.photosImagePath}}"
-								style="width: 100px"/>
-							</td>
-							<td class="hideable-column">[[${user.email}]]</td>
-							<td>[[${user.firstName}]]</td>
-							<td>[[${user.lastName}]]</td>
-							<td>[[${user.roles}]]</td>
-							
-							<td>
-								<a th:if="${user.enabled == true}" class="fas fa-check-circle fa-2x icon-green" 
-								th:href="@{'/users/' + ${user.id} + '/enabled/false'}"
-								title="Disable this user"></a>
-								
-								<a th:if="${user.enabled == false}" class="fas fa-circle fa-2x icon-silver"
-								 th:href="@{'/users/' + ${user.id} + '/enabled/true'}"
-								 title="Enable this user"></a>
-							</td>
-							<td>
-									<a class="fas fa-edit fa-2x icon-green" th:href="@{'/users/edit/' + ${user.id}}"
-									title="edit this user"></a>
-									&nbsp; 
-									<a class="fas fa-trash fa-2x icon-dark link-delete" th:href="@{'/users/delete/' + ${user.id}}"
-									title="delete this user" th:userId="${user.id}"></a>
-							</td>
-						</tr>
-					</tbody>
-				</table>
-			</div>
-			
-			
-			<!-- css class to display this <div> on mobile screens only, refer to /static/style.css for more info-->
-			<div class="less-details">
-				
-				<div th:each="user : ${listUsers}" class="row m-1">
-					
-					<div class="col-4">
-						
-						<span th:if="${user.photos == null}" class="fas fa-portrait fa-3x icon-dark"></span>
-								<img th:if="${user.photos != null}" th:src="@{${user.photosImagePath}}"
-								style="width: 100px"/>
-					</div>
-					
-					<div class="col-8">
-						<div>[[${user.fullName}]]</div>
-						<div>[[${user.roles}]]</div>
-						<div class="mt-2">
-							<a th:if="${user.enabled == true}" class="fas fa-check-circle fa-2x icon-green" 
-								th:href="@{'/users/' + ${user.id} + '/enabled/false'}"
-								title="Disable this user"></a>
-								
-							<a th:if="${user.enabled == false}" class="fas fa-circle fa-2x icon-silver"
-								 th:href="@{'/users/' + ${user.id} + '/enabled/true'}"
-								 title="Enable this user"></a>
-						
-									&nbsp;
-							<a class="fas fa-edit fa-2x icon-green" th:href="@{'/users/edit/' + ${user.id}}"
-									title="edit this user"></a>
-									&nbsp; 
-							<a class="fas fa-trash fa-2x icon-dark link-delete" th:href="@{'/users/delete/' + ${user.id}}"
-									title="delete this user" th:userId="${user.id}"></a>
-						</div>
-					</div>
-					<div>&nbsp;</div>
-				</div>
-			</div>
-			
-			
-			<!-- IF -->
-			<div class="text-center m-1" th:if="${totalItems > 0}">
-				<span>Showing Users # [[${startCount}]] to [[${endCount}]] of [[${totalItems}]]</span>
-			</div>
-			
-			<!-- ELSE -->
-			<div class="text-center m-1" th:unless="${totalItems > 0}">
-				<span>No users found</span>
-			</div>
-			
-			<!-- only display pagination when there are users; else, no users no pagination -->
-			<div th:if="${totalPages > 1}">
-				<nav>
-					  <ul class="pagination justify-content-center flex-wrap">
-					  
-					  	<li th:class=" ${currentPage > 1 ? 'page-item' : 'page-item disabled'}">
-					  		<a th:replace="fragments :: page_link(1, 'First')"></a>
-				    	</li>
-					  
-					    <li th:class=" ${currentPage > 1 ? 'page-item' : 'page-item disabled'}">
-					    	<a th:replace="fragments :: page_link(${currentPage - 1 }, 'previous')"></a>
-				    	</li>
-					    	
-					    <!-- org.thymeleaf.expression.Numbers class, An object of this class is usually available in variable evaluation expressions with the name #numbers. -->
-					    <li th:class="${currentPage != i ? 'page-item' : 'page-item active'}" 
-					    	th:each="i : ${#numbers.sequence(1, totalPages)}">
-					    	<a th:replace="fragments :: page_link(${i}, ${i})"></a>
-					    </li>
-					    
-					    <li  th:class=" ${currentPage < totalPages ? 'page-item' : 'page-item disabled'}">
-					    	<a th:replace="fragments :: page_link(${currentPage + 1}, 'Next')"></a>
-					    </li>
-					    
-					    <li th:class=" ${currentPage < totalPages ? 'page-item' : 'page-item disabled'}">
-							<a th:replace="fragments :: page_link(${totalPages}, 'Last')"></a>		
-					    </li>
-					  </ul>
-				</nav>
-			</div>
-			
-			
-			
-			<div class="modal fade text-center" id="confirmModal">
-				<div class="modal-dialog">
-					<div class="modal-content">
-					
-						<div class="modal-header">
-							<h4 class="modal-title">Delete Confirmation</h4>
-							<button type="button" class="close" data-dismiss="modal">&times;</button>
-						</div>
-						
-						<div class="modal-body">
-							<span id="confirmText"></span>
-						</div>
-						
-						<div class="modal-footer">
-							<a class="btn btn-success" href="" id="yesButton">Yes</a>
-							<button type="button" class="btn btn-danger" data-dismiss="modal">Close</button>
-						</div>
-					</div>
-				</div>
-			</div>
-			
-			
-			<div class="text-center">
-				<p>Shopme Control Panel - Copyright &copy; Shopme</p>
-			</div>
-
-
-	</div>
-	
-<script type="text/javascript">
-
-//confirmation modal dialogue for delete user
-$(document).ready(function(){
-	$(".link-delete").on("click", function(e){
-		//stop the <a> tag default behaviour and pop out a confirmation modal dialogue
-		e.preventDefault();
-		//alert($(this).attr("href"));
-		link = $(this);
-		userId = link.attr("userId");
-		$("#yesButton").attr("href", link.attr("href"));
-		$("#confirmText").text("Are you sure you want to delete this user ID " + userId + "?");
-		$("#confirmModal").modal();
-	});
-});
-
-	function clearFilter(){
-		window.location = "[[@{/users}]]";
-	}
-
-
-</script>
-	
-</body>
-
-</html>
\ No newline at end of file
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/1/60393c1f8bb3001d19bbb001c1a81c20 b/.metadata/.plugins/org.eclipse.core.resources/.history/1/60393c1f8bb3001d19bbb001c1a81c20
deleted file mode 100644
index 51ddff93..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/1/60393c1f8bb3001d19bbb001c1a81c20
+++ /dev/null
@@ -1,255 +0,0 @@
-<!DOCTYPE html>
-<html xmlns:th="http://www.thymeleaf.org">
-
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset= UTF-8">
-<meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0">
-<title>Manage Users</title>
-
-<link rel="stylesheet" type="text/css" th:href="@{/webjars/bootstrap/css/bootstrap.min.css}" />
-<link rel="stylesheet" type="text/css" th:href="@{/fontawesome/all.css}" />
-<link rel="stylesheet" type="text/css" th:href="@{/style.css}" />
-	
-<script type="text/javascript" th:src="@{/webjars/jquery/jquery.min.js}"></script>
-<script type="text/javascript" th:src="@{/webjars/bootstrap/js/bootstrap.min.js}"></script>
-</head>
-
-<body>
-	<div class="container-fluid">
-		<div>
-			<nav class="navbar navbar-expand-lg bg-dark navbar-dark">
-				<a class="navbar-brand" th:href="@{/}"> <img
-					th:src="@{/images/ShopmeAdminSmall.png}" />
-				</a>
-				<!--hamburger toggler for mobile devices(responsive)-->
-				<button class="navbar-toggler" type="button" data-toggle="collapse"
-					data-target="#topNavbar">
-					<span class="navbar-toggler-icon"></span>
-				</button>
-				<div class="collapse navbar-collapse" id="topNavbar">
-					<ul class="navbar-nav">
-						<li class="nav-item"><a class="nav-link" th:href="@{/users}">Users</a>
-						</li>
-						<li class="nav-item"><a class="nav-link"
-							th:href="@{/categories}">Categories</a></li>
-						<li class="nav-item"><a class="nav-link" th:href="@{/brands}">Brands</a>
-						</li>
-						<li class="nav-item"><a class="nav-link"
-							th:href="@{/products}">Products</a></li>
-						<li class="nav-item"><a class="nav-link"
-							th:href="@{/customers}">Customers</a></li>
-						<li class="nav-item"><a class="nav-link"
-							th:href="@{/shipping}">Shipping</a></li>
-						<li class="nav-item"><a class="nav-link" th:href="@{/orders}">Orders</a>
-						</li>
-						<li class="nav-item"><a class="nav-link" th:href="@{/report}">Sales
-								Report</a></li>
-						<li class="nav-item"><a class="nav-link"
-							th:href="@{/articles}">Articles</a></li>
-						<li class="nav-item"><a class="nav-link" th:href="@{/menus}">Menus</a>
-						</li>
-						<li class="nav-item"><a class="nav-link"
-							th:href="@{/settings}">Settings</a></li>
-					</ul>
-				</div>
-
-			</nav>
-		</div>
-
-		<div>
-			<h2>Manage Users</h2>
-			<a th:href="@{/users/new}" class="fas fa-user-plus fa-2x icon-dark mr-2"></a>
-			
-			<a th:href="@{/users/export/csv}" class="fas fa-file-csv fa-2x icon-dark mr-2"></a>
-		</div>
-		
-		
-		
-		<!-- only display success message when a new user is created -->
-		<div th:if="${message != null}" class="alert alert-success text-center">
-			[[${message}]]
-		</div>
-			
-		<div>
-			<form th:action="@{/users/page/1}" class="form-inline m-3">
-				
-				<input type="hidden" name="sortField" th:value="${sortField}" />
-				<input type="hidden" name="sortDir" th:value="${sortDir}" />
-				Filter:&nbsp;
-				<input type="search" name="keyword" th:value="${keyword}" class="form-control" required/>
-				&nbsp;&nbsp;
-				<button type="submit" class="btn btn-primary">
-					<i class="fas fa-search"></i>
-				</button>
-				&nbsp;&nbsp;
-				<button type="button" class="btn btn-secondary" onclick="clearFilter()">
-					<i class="fas fa-eraser"></i>
-				</button>
-			</form>
-		
-		</div>
-
-
-			<div class="full-details">
-				<table class="table table-bordered table-striped table-hover table-responsive-xL">
-					<thead class="thead-dark">
-						<tr>
-							<!-- refer to templates/fragments.html for fragment code-->
-							<th th:replace="fragments :: column_link('id', 'User ID')"/>
-							<th>Photos</th>
-							<th th:replace="fragments :: column_link('email', 'Email')"/>
-							<th th:replace="fragments :: column_link('firstName', 'First Name')"/>
-							<th th:replace="fragments :: column_link('lastName', 'Last Name')"/>
-							<th>Roles</th>
-							<th th:replace="fragments :: column_link('enabled', 'Enabled')"/>
-							<th></th>
-						</tr>
-					</thead>
-					<tbody>
-						<tr th:each="user : ${listUsers}">
-							<td>[[${user.id}]]</td>
-							<td>
-								<span th:if="${user.photos == null}" class="fas fa-portrait fa-3x icon-dark"></span>
-								<img th:if="${user.photos != null}" th:src="@{${user.photosImagePath}}"
-								style="width: 100px"/>
-							</td>
-							<td>[[${user.email}]]</td>
-							<td>[[${user.firstName}]]</td>
-							<td>[[${user.lastName}]]</td>
-							<td>[[${user.roles}]]</td>
-							
-							<td>
-								<a th:if="${user.enabled == true}" class="fas fa-check-circle fa-2x icon-green" 
-								th:href="@{'/users/' + ${user.id} + '/enabled/false'}"
-								title="Disable this user"></a>
-								
-								<a th:if="${user.enabled == false}" class="fas fa-circle fa-2x icon-silver"
-								 th:href="@{'/users/' + ${user.id} + '/enabled/true'}"
-								 title="Enable this user"></a>
-							</td>
-							<td>
-									<a class="fas fa-edit fa-2x icon-green" th:href="@{'/users/edit/' + ${user.id}}"
-									title="edit this user"></a>
-									&nbsp; 
-									<a class="fas fa-trash fa-2x icon-dark link-delete" th:href="@{'/users/delete/' + ${user.id}}"
-									title="delete this user" th:userId="${user.id}"></a>
-							</td>
-						</tr>
-					</tbody>
-				</table>
-			</div>
-			
-			
-			<!-- display this on mobile screens only, refer to /static/style.css for more info-->
-			<div class="less-details">
-				
-				<div th:each="user : ${listUsers}" class="row m-1">
-					
-					<div class="col">
-						
-						<span th:if="${user.photos == null}" class="fas fa-portrait fa-3x icon-dark"></span>
-								<img th:if="${user.photos != null}" th:src="@{${user.photosImagePath}}"
-								style="width: 100px"/>
-					</div>
-					<div>&nbsp;</div>
-				</div>
-			</div>
-			
-			
-			<!-- IF -->
-			<div class="text-center m-1" th:if="${totalItems > 0}">
-				<span>Showing Users # [[${startCount}]] to [[${endCount}]] of [[${totalItems}]]</span>
-			</div>
-			
-			<!-- ELSE -->
-			<div class="text-center m-1" th:unless="${totalItems > 0}">
-				<span>No users found</span>
-			</div>
-			
-			<!-- only display pagination when there are users; else, no users no pagination -->
-			<div th:if="${totalPages > 1}">
-				<nav>
-					  <ul class="pagination justify-content-center">
-					  
-					  	<li th:class=" ${currentPage > 1 ? 'page-item' : 'page-item disabled'}">
-					  		<a th:replace="fragments :: page_link(1, 'First')"></a>
-				    	</li>
-					  
-					    <li th:class=" ${currentPage > 1 ? 'page-item' : 'page-item disabled'}">
-					    	<a th:replace="fragments :: page_link(${currentPage - 1 }, 'previous')"></a>
-				    	</li>
-					    	
-					    <!-- org.thymeleaf.expression.Numbers class, An object of this class is usually available in variable evaluation expressions with the name #numbers. -->
-					    <li th:class="${currentPage != i ? 'page-item' : 'page-item active'}" 
-					    	th:each="i : ${#numbers.sequence(1, totalPages)}">
-					    	<a th:replace="fragments :: page_link(${i}, ${i})"></a>
-					    </li>
-					    
-					    <li  th:class=" ${currentPage < totalPages ? 'page-item' : 'page-item disabled'}">
-					    	<a th:replace="fragments :: page_link(${currentPage + 1}, 'Next')"></a>
-					    </li>
-					    
-					    <li th:class=" ${currentPage < totalPages ? 'page-item' : 'page-item disabled'}">
-							<a th:replace="fragments :: page_link(${totalPages}, 'Last')"></a>		
-					    </li>
-					  </ul>
-				</nav>
-			</div>
-			
-			
-			
-			<div class="modal fade text-center" id="confirmModal">
-				<div class="modal-dialog">
-					<div class="modal-content">
-					
-						<div class="modal-header">
-							<h4 class="modal-title">Delete Confirmation</h4>
-							<button type="button" class="close" data-dismiss="modal">&times;</button>
-						</div>
-						
-						<div class="modal-body">
-							<span id="confirmText"></span>
-						</div>
-						
-						<div class="modal-footer">
-							<a class="btn btn-success" href="" id="yesButton">Yes</a>
-							<button type="button" class="btn btn-danger" data-dismiss="modal">Close</button>
-						</div>
-					</div>
-				</div>
-			</div>
-			
-			
-			<div class="text-center">
-				<p>Shopme Control Panel - Copyright &copy; Shopme</p>
-			</div>
-
-
-	</div>
-	
-<script type="text/javascript">
-
-//confirmation modal dialogue for delete user
-$(document).ready(function(){
-	$(".link-delete").on("click", function(e){
-		//stop the <a> tag default behaviour and pop out a confirmation modal dialogue
-		e.preventDefault();
-		//alert($(this).attr("href"));
-		link = $(this);
-		userId = link.attr("userId");
-		$("#yesButton").attr("href", link.attr("href"));
-		$("#confirmText").text("Are you sure you want to delete this user ID " + userId + "?");
-		$("#confirmModal").modal();
-	});
-});
-
-	function clearFilter(){
-		window.location = "[[@{/users}]]";
-	}
-
-
-</script>
-	
-</body>
-
-</html>
\ No newline at end of file
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/1/708626a79cb9001d10d0f9513979f945 b/.metadata/.plugins/org.eclipse.core.resources/.history/1/708626a79cb9001d10d0f9513979f945
new file mode 100644
index 00000000..b0d431ae
--- /dev/null
+++ b/.metadata/.plugins/org.eclipse.core.resources/.history/1/708626a79cb9001d10d0f9513979f945
@@ -0,0 +1,95 @@
+package com.shopme.admin.category;
+
+import java.io.IOException;
+import java.util.List;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.scheduling.support.SimpleTriggerContext;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
+import org.springframework.util.StringUtils;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.ModelAttribute;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.multipart.MultipartFile;
+import org.springframework.web.servlet.mvc.support.RedirectAttributes;
+
+import com.shopme.admin.FileUploadUtil;
+import com.shopme.common.entity.Category;
+
+@Controller
+public class CategoryController {
+	
+	@Autowired
+	private CategoryService service;
+	
+	@GetMapping("/categories")
+	public String listAll(Model model) {
+		
+		List<Category> listCategories = service.listAll();
+		model.addAttribute("listCategories", listCategories);
+		
+		return "categories/categories";
+	}
+	
+	
+	@GetMapping("/categories/new")
+	public String newCategory(Model model) {
+		
+		List<Category> listCategories = service.listCategoriesUsedInForm();
+		
+		model.addAttribute("category", new Category());
+		model.addAttribute("listCategories", listCategories);
+		model.addAttribute("pageTitle", "Create New Category");
+		
+		return "categories/category_form";
+	
+	}
+	
+	@PostMapping("/categories/save")
+	public String saveCategory(@ModelAttribute("category") Category category, 
+			RedirectAttributes redirectAttributes,
+			@RequestParam("fileImage") MultipartFile multipartFile) throws IOException {
+		
+		String fileName = StringUtils.cleanPath(multipartFile.getOriginalFilename());
+		category.setImage(fileName);
+		
+		Category savedCategory = service.save(category);
+		String uploadDir = "../category-images/" + savedCategory.getId();
+		FileUploadUtil.saveFile(uploadDir, fileName, multipartFile);
+		
+		
+		redirectAttributes.addFlashAttribute("message", "the category have been saved successfully");
+		
+		
+		return "redirect:/categories";
+	}
+
+	
+	@GetMapping("/categories/edit/{id}")
+	public String editCategory(@PathVariable(name = "id") Integer id, Model model,
+			RedirectAttributes ra) {
+		try {
+			Category category = service.get(id);
+			List<Category> listCategories = service.listCategoriesUsedInForm();
+			
+			model.addAttribute("category", category);
+			model.addAttribute("listCategories", listCategories);
+			model.addAttribute("pageTitle", "Edit Category (ID: " + id + ")");
+			
+			return "categories/category_form";			
+		} catch (CategoryNotFoundException ex) {
+			ra.addFlashAttribute("message", ex.getMessage());
+			return "redirect:/categories";
+		}
+	}
+	
+	
+	
+}
+	
+
+
+
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/1/c0aa97a252b4001d1d079a924effdc9e b/.metadata/.plugins/org.eclipse.core.resources/.history/1/c0aa97a252b4001d1d079a924effdc9e
deleted file mode 100644
index b5a92016..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/1/c0aa97a252b4001d1d079a924effdc9e
+++ /dev/null
@@ -1,17 +0,0 @@
-$(document).ready(function(){
-		$("#logoutLink").on("click", function(e){
-			e.preventDefault(); /* stop the hyperlink default behaviour  */
-			
-			/* use  the form to  log out and navigate to the url path /logout  
-			
-			 NOTE: spring security requires a POST request form to logout in order to obtain the csrf token, 
-			 		the csrf token is a hidden property in the form
-			*/
-			document.logoutForm.submit();
-		});
-		
-		customizeDropDownMenu();
-	});
-	
-	
-	
\ No newline at end of file
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/11/80cf7a2413b4001d128fb79045552177 b/.metadata/.plugins/org.eclipse.core.resources/.history/11/80cf7a2413b4001d128fb79045552177
deleted file mode 100644
index d1db7c1f..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/11/80cf7a2413b4001d128fb79045552177
+++ /dev/null
@@ -1,71 +0,0 @@
-package com.shopme.admin.security;
-
-import java.util.Collection;
-import java.util.List;
-import java.util.Set;
-
-import org.springframework.security.core.GrantedAuthority;
-import org.springframework.security.core.authority.SimpleGrantedAuthority;
-import org.springframework.security.core.userdetails.UserDetails;
-
-import com.shopme.common.entity.User;
-
-
-/*
- *  Think of it as a wrapper class for  Type User
- * 
- * */
-public class ShopmeUserDetails implements UserDetails {
-
-	private User user;
-	
-	public ShopmeUserDetails(User user) {
-		this.user = user;
-	}
-
-	@Override
-	public Collection<? extends GrantedAuthority> getAuthorities() {
-
-		Set<Role> roles = user.getRoles();
-		
-		List<SimpleGrantedAuthority> authorities = new ArrayList<>();
-		return null;
-	}
-
-	@Override
-	public String getPassword() {
-		// TODO Auto-generated method stub
-		return null;
-	}
-
-	@Override
-	public String getUsername() {
-		// TODO Auto-generated method stub
-		return null;
-	}
-
-	@Override
-	public boolean isAccountNonExpired() {
-		// TODO Auto-generated method stub
-		return false;
-	}
-
-	@Override
-	public boolean isAccountNonLocked() {
-		// TODO Auto-generated method stub
-		return false;
-	}
-
-	@Override
-	public boolean isCredentialsNonExpired() {
-		// TODO Auto-generated method stub
-		return false;
-	}
-
-	@Override
-	public boolean isEnabled() {
-		// TODO Auto-generated method stub
-		return false;
-	}
-
-}
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/12/00b42dda13b4001d128fb79045552177 b/.metadata/.plugins/org.eclipse.core.resources/.history/12/00b42dda13b4001d128fb79045552177
deleted file mode 100644
index 065554c4..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/12/00b42dda13b4001d128fb79045552177
+++ /dev/null
@@ -1,78 +0,0 @@
-package com.shopme.admin.security;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-import java.util.Set;
-
-import org.springframework.security.core.GrantedAuthority;
-import org.springframework.security.core.authority.SimpleGrantedAuthority;
-import org.springframework.security.core.userdetails.UserDetails;
-
-import com.shopme.common.entity.Role;
-import com.shopme.common.entity.User;
-
-/*
- *  Think of it as a wrapper class for  Type User
- * 
- * */
-public class ShopmeUserDetails implements UserDetails {
-
-	private User user;
-
-	public ShopmeUserDetails(User user) {
-		this.user = user;
-	}
-
-	/* get a list of assigned roles to user */
-	@Override
-	public Collection<? extends GrantedAuthority> getAuthorities() {
-
-		Set<Role> roles = user.getRoles();
-
-		List<SimpleGrantedAuthority> authorities = new ArrayList<>();
-
-		for (Role role : roles) {
-			authorities.add(new SimpleGrantedAuthority(role.getName()));
-		}
-
-		return authorities;
-	}
-
-	@Override
-	public String getPassword() {
-		// TODO Auto-generated method stub
-		return null;
-	}
-
-	@Override
-	public String getUsername() {
-		// TODO Auto-generated method stub
-		return null;
-	}
-
-	@Override
-	public boolean isAccountNonExpired() {
-		// TODO Auto-generated method stub
-		return false;
-	}
-
-	@Override
-	public boolean isAccountNonLocked() {
-		// TODO Auto-generated method stub
-		return false;
-	}
-
-	@Override
-	public boolean isCredentialsNonExpired() {
-		// TODO Auto-generated method stub
-		return false;
-	}
-
-	@Override
-	public boolean isEnabled() {
-		// TODO Auto-generated method stub
-		return false;
-	}
-
-}
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/12/708113159cb9001d10d0f9513979f945 b/.metadata/.plugins/org.eclipse.core.resources/.history/12/708113159cb9001d10d0f9513979f945
new file mode 100644
index 00000000..939a94b2
--- /dev/null
+++ b/.metadata/.plugins/org.eclipse.core.resources/.history/12/708113159cb9001d10d0f9513979f945
@@ -0,0 +1,168 @@
+package com.shopme.common.entity;
+
+import java.util.HashSet;
+import java.util.Set;
+
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.OneToMany;
+import jakarta.persistence.OneToOne;
+import jakarta.persistence.Table;
+import jakarta.persistence.Transient;
+
+@Entity
+@Table(name = "categories")
+public class Category {
+
+	@Id
+	@GeneratedValue(strategy = GenerationType.IDENTITY)
+	private Integer id;
+
+	@Column(length = 128, nullable = false, unique = true)
+	private String name;
+
+	@Column(length = 64, nullable = false, unique = true)
+	private String alias;
+
+	@Column(length = 128, nullable = false)
+	private String image;
+
+	private boolean enabled;
+
+	@OneToOne
+	@JoinColumn(name = "parent_id")
+	private Category parent;
+
+	@OneToMany(mappedBy = "parent")
+	private Set<Category> children = new HashSet<>();
+
+	public Category() {
+	}
+
+	public Category(Integer id) {
+		this.id = id;
+	}
+
+	public static Category copyIdAndName(Category category) {
+
+		Category copyCategory = new Category();
+		copyCategory.setName(category.getName());
+		copyCategory.setId(category.getId());
+
+		return copyCategory;
+	}
+
+	public static Category copyIdAndName(Integer id, String name) {
+
+		Category copyCategory = new Category();
+		copyCategory.setName(name);
+		copyCategory.setId(id);
+
+		return copyCategory;
+	}
+
+	/* create a copy of a category object in order to append the -- symbol to denote hierarchy level
+	 * */
+	public static Category copyFull(Category category) {
+
+		Category copyCategory = new Category();
+		copyCategory.setName(category.getName());
+		copyCategory.setId(category.getId());
+		copyCategory.setImage(category.getImage());
+		copyCategory.setAlias(category.getAlias());
+		copyCategory.setEnabled(category.isEnabled());
+
+		return copyCategory;
+	}
+	
+	/* create a copy of a category object in order to append the -- symbol to denote hierarchy level
+	 * */
+	public static Category copyFull(Category category, String name) {
+
+		Category copyCategory = Category.copyFull(category);
+		copyCategory.setName(name);
+
+		return copyCategory;
+	}
+	
+	
+
+	public Category(String name) {
+		this.name = name;
+		this.alias = name;
+		this.image = "default.png";
+
+	}
+
+	public Category(String name, Category parent) {
+		this(name);
+		this.parent = parent;
+	}
+
+	public Integer getId() {
+		return id;
+	}
+
+	public void setId(Integer id) {
+		this.id = id;
+	}
+
+	public String getName() {
+		return name;
+	}
+
+	public void setName(String name) {
+		this.name = name;
+	}
+
+	public String getAlias() {
+		return alias;
+	}
+
+	public void setAlias(String alias) {
+		this.alias = alias;
+	}
+
+	public String getImage() {
+		return image;
+	}
+
+	public void setImage(String image) {
+		this.image = image;
+	}
+
+	public boolean isEnabled() {
+		return enabled;
+	}
+
+	public void setEnabled(boolean enabled) {
+		this.enabled = enabled;
+	}
+
+	public Category getParent() {
+		return parent;
+	}
+
+	public void setParent(Category parent) {
+		this.parent = parent;
+	}
+
+	public Set<Category> getChildren() {
+		return children;
+	}
+
+	public void setChildren(Set<Category> children) {
+		this.children = children;
+	}
+
+	@Transient
+	public String getImagePath() {
+		
+		return "/category-images/" + this.id + "/" + this.image;
+	}
+	
+}
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/13/20ccac9e7ab3001d19bbb001c1a81c20 b/.metadata/.plugins/org.eclipse.core.resources/.history/13/20ccac9e7ab3001d19bbb001c1a81c20
deleted file mode 100644
index e497c222..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/13/20ccac9e7ab3001d19bbb001c1a81c20
+++ /dev/null
@@ -1,194 +0,0 @@
-package com.shopme.admin.user;
-
-import java.io.IOException;
-import java.util.List;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.domain.Page;
-import org.springframework.data.repository.query.Param;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
-import org.springframework.util.StringUtils;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.ModelAttribute;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.multipart.MultipartFile;
-import org.springframework.web.servlet.mvc.support.RedirectAttributes;
-
-import com.fasterxml.jackson.annotation.ObjectIdGenerators.StringIdGenerator;
-import com.shopme.admin.FileUploadUtil;
-import com.shopme.common.entity.Role;
-import com.shopme.common.entity.User;
-
-import jakarta.servlet.http.HttpServletResponse;
-
-@Controller
-public class UserController {
-
-	@Autowired
-	private UserService service;
-
-	@GetMapping("/users")
-	public String listFirstPage(Model model) {
-
-		// NOTE: these are the default values for path variable and URL parameters
-		return listByPage(1, model, "firstName", "asc", null);
-	}
-
-	@GetMapping("/users/page/{pageNum}")
-	public String listByPage(@PathVariable(name = "pageNum") int pageNum, Model model,
-			@Param("sortField") String sortField, @Param("sortDir") String sortDir, @Param("keyword") String keyword) {
-
-		System.out.println("sort field: " + sortField);
-		System.out.println("sort order: " + sortDir);
-
-		Page<User> page = service.listByPage(pageNum, sortField, sortDir, keyword);
-		List<User> listUsers = page.getContent();
-
-		long startCount = (pageNum - 1) * UserService.USERS_PER_PAGE + 1;
-		long endCount = startCount + UserService.USERS_PER_PAGE - 1;
-		if (endCount > page.getTotalElements()) {
-			endCount = page.getTotalElements();
-		}
-
-		String reverseSortDir = sortDir.equals("asc") ? "desc" : "asc";
-
-		model.addAttribute("currentPage", pageNum);
-		model.addAttribute("totalPages", page.getTotalPages());
-		model.addAttribute("startCount", startCount);
-		model.addAttribute("endCount", endCount);
-		model.addAttribute("totalItems", page.getTotalElements());
-		model.addAttribute("listUsers", listUsers);
-		model.addAttribute("sortField", sortField);
-		model.addAttribute("sortDir", sortDir);
-		model.addAttribute("reverseSortDir", reverseSortDir);
-		model.addAttribute("keyword", keyword);
-
-		return "users";
-
-	}
-
-	@GetMapping("/users/new")
-	public String newUser(Model model) {
-
-		List<Role> listRoles = service.listRoles();
-
-		User user = new User();
-		user.setEnabled(true);
-
-		model.addAttribute("user", user);
-		model.addAttribute("listRoles", listRoles);
-		model.addAttribute("pageTitle", "Create New User");
-
-		return "user_form";
-
-	}
-
-	// using @RequestParam, we can get the image file input, the input has the
-	// property name="image"
-	@PostMapping("/users/save")
-	public String saveUser(@ModelAttribute("user") User user, RedirectAttributes redirectAttributes,
-			@RequestParam("image") MultipartFile multipartFile) throws IOException {
-
-		if (!multipartFile.isEmpty()) {
-
-			String fileName = StringUtils.cleanPath(multipartFile.getOriginalFilename());
-			user.setPhotos(fileName);
-
-			User savedUser = service.save(user);
-
-			String uploadDir = "user-photos/" + savedUser.getId();
-
-			FileUploadUtil.cleanDir(uploadDir);
-			FileUploadUtil.saveFile(uploadDir, fileName, multipartFile);
-		} else {
-
-			// set photo to null for getPhotosImagePath() method's conditional statement in
-			// User class
-			if (user.getPhotos().isEmpty())
-				user.setPhotos(null);
-			service.save(user);
-		}
-
-		redirectAttributes.addFlashAttribute("message", "the user has been saved successfully");
-
-		// POST/REDIRECT/GET web design
-		return getRedirectURLtoAffectedUser(user);
-	}
-
-	private String getRedirectURLtoAffectedUser(User user) {
-
-		// after user is saved display the user instead of the entire user list
-		// email is a unique field to identify each user.
-		String firstPartOfEmail = user.getEmail().split("@")[0];
-		return "redirect:/users/page/1?sortField=id&sortDir=asc&keyword=" + firstPartOfEmail;
-	}
-
-	@GetMapping("/users/edit/{id}")
-	public String editUser(@PathVariable(name = "id") Integer id, RedirectAttributes redirectAttributes, Model model) {
-		try {
-			User user = service.get(id);
-			List<Role> listRoles = service.listRoles();
-
-			model.addAttribute("user", user);
-			model.addAttribute("pageTitle", "Edit User (ID: " + id + ")");
-			model.addAttribute("listRoles", listRoles);
-
-			return "user_form";
-		} catch (UserNotFoundException ex) {
-			redirectAttributes.addFlashAttribute("message", ex.getMessage());
-
-			return "redirect:/users";
-		}
-
-	}
-
-	@GetMapping("/users/delete/{id}")
-	public String deleteUser(@PathVariable(name = "id") Integer id, RedirectAttributes redirectAttributes,
-			Model model) {
-		try {
-			service.delete(id);
-			redirectAttributes.addFlashAttribute("message", "The user ID " + id + " has been deleted successfully.");
-
-		} catch (UserNotFoundException ex) {
-			redirectAttributes.addFlashAttribute("message", ex.getMessage());
-
-		}
-
-		return "redirect:/users";
-	}
-
-	@GetMapping("/users/{id}/enabled/{status}")
-	public String updateUserEnabledStatus(@PathVariable(name = "id") Integer id,
-			@PathVariable(name = "status") boolean enabled, RedirectAttributes redirectAttributes) {
-
-		service.updateUserEnabledStatus(id, enabled);
-		String status = enabled ? "enabled" : "disabled";
-		String message = "The user id " + id + " has been " + status;
-		redirectAttributes.addFlashAttribute("message", message);
-
-		return "redirect:/users";
-	}
-
-	@GetMapping("/users/export/csv")
-	public void exportToCSV(HttpServletResponse response) throws IOException {
-
-		List<User> listUsers = service.listAll();
-		UserCsvExporter exporter = new UserCsvExporter();
-		exporter.export(listUsers, response);
-	}
-	
-	@GetMapping("/users/export/excel")
-	public void exportToExcel(HttpServletResponse response) throws IOException {
-
-		List<User> listUsers = service.listAll();
-		
-		UserExcelExporter exporter = new UserExcelExporter();
-	}
-	
-	
-	
-
-}
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/13/301308bb2db4001d1d079a924effdc9e b/.metadata/.plugins/org.eclipse.core.resources/.history/13/301308bb2db4001d1d079a924effdc9e
deleted file mode 100644
index f5a4c507..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/13/301308bb2db4001d1d079a924effdc9e
+++ /dev/null
@@ -1,94 +0,0 @@
-<!DOCTYPE html>
-<html xmlns:th="http://www.thymeleaf.org"
-	  xmlns:sec="https://www.thymeleaf.org/thymeleaf-extras-springsecurity5">
-
-<head>
-	<meta http-equiv="Content-Type" content="text/html; charset= UTF-8">
-	<meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0">
-	<title>Home - Shopme Admin</title>
-	
-	<link rel="stylesheet" type="text/css" th:href="@{/fontawesome/all.css}" />
-	<link rel="stylesheet" type="text/css" th:href="@{/style.css}" />
-	<link rel="stylesheet" type="text/css" th:href="@{/webjars/bootstrap/css/bootstrap.min.css}" />
-	
-	<script type="text/javascript" th:src="@{/webjars/jquery/jquery.min.js}"></script>
-	<script type="text/javascript" th:src="@{/webjars/bootstrap/js/bootstrap.min.js}"></script>
-</head>
-
-<body>
-	<div class="container-fluid">
-		<div>
-			<nav class="navbar navbar-expand-lg bg-dark navbar-dark">
-				<a class="navbar-brand" th:href="@{/}">
-					<img th:src="@{/images/ShopmeAdminSmall.png}"/>
-				</a>
-				<!--hamburger toggler for mobile devices(responsive)-->
-				<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#topNavbar">
-					<span class="navbar-toggler-icon"></span>
-				</button>
-				<div class="collapse navbar-collapse" id="topNavbar">
-					<ul class="navbar-nav">
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/users}">Users</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/categories}">Categories</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/brands}">Brands</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/products}">Products</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/customers}">Customers</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/shipping}">Shipping</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/orders}">Orders</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/report}">Sales Report</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/articles}">Articles</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/menus}">Menus</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/settings}">Settings</a>
-						</li>
-						<li>
-							<span class="fas fa-user fa-2x icon-silver"></span>
-						</li>
-						<li class="nav-item dropdown">
-								<!-- principal refers to user; display username -->
-							<a class="nav-link dropdown-toggle" sec:authentication="principal.fullname" data-toggle="dropdown"></a>
-							<div>
-							
-							</div>
-							
-						</li>
-					</ul>
-				</div>
-				
-			</nav>
-		</div>
-
-		<div>
-			<h1>Shopme Control Panel</h1>
-		<div />
-
-		<div>
-			<p>Shopme Control Panel - Copyright &copy; Shopme</p>
-		<div />
-
-
-	</div>
-
-</body>
-
-</html>
\ No newline at end of file
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/14/6008667f8cb3001d19bbb001c1a81c20 b/.metadata/.plugins/org.eclipse.core.resources/.history/14/6008667f8cb3001d19bbb001c1a81c20
deleted file mode 100644
index 953609ae..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/14/6008667f8cb3001d19bbb001c1a81c20
+++ /dev/null
@@ -1,259 +0,0 @@
-<!DOCTYPE html>
-<html xmlns:th="http://www.thymeleaf.org">
-
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset= UTF-8">
-<meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0">
-<title>Manage Users</title>
-
-<link rel="stylesheet" type="text/css" th:href="@{/webjars/bootstrap/css/bootstrap.min.css}" />
-<link rel="stylesheet" type="text/css" th:href="@{/fontawesome/all.css}" />
-<link rel="stylesheet" type="text/css" th:href="@{/style.css}" />
-	
-<script type="text/javascript" th:src="@{/webjars/jquery/jquery.min.js}"></script>
-<script type="text/javascript" th:src="@{/webjars/bootstrap/js/bootstrap.min.js}"></script>
-</head>
-
-<body>
-	<div class="container-fluid">
-		<div>
-			<nav class="navbar navbar-expand-lg bg-dark navbar-dark">
-				<a class="navbar-brand" th:href="@{/}"> <img
-					th:src="@{/images/ShopmeAdminSmall.png}" />
-				</a>
-				<!--hamburger toggler for mobile devices(responsive)-->
-				<button class="navbar-toggler" type="button" data-toggle="collapse"
-					data-target="#topNavbar">
-					<span class="navbar-toggler-icon"></span>
-				</button>
-				<div class="collapse navbar-collapse" id="topNavbar">
-					<ul class="navbar-nav">
-						<li class="nav-item"><a class="nav-link" th:href="@{/users}">Users</a>
-						</li>
-						<li class="nav-item"><a class="nav-link"
-							th:href="@{/categories}">Categories</a></li>
-						<li class="nav-item"><a class="nav-link" th:href="@{/brands}">Brands</a>
-						</li>
-						<li class="nav-item"><a class="nav-link"
-							th:href="@{/products}">Products</a></li>
-						<li class="nav-item"><a class="nav-link"
-							th:href="@{/customers}">Customers</a></li>
-						<li class="nav-item"><a class="nav-link"
-							th:href="@{/shipping}">Shipping</a></li>
-						<li class="nav-item"><a class="nav-link" th:href="@{/orders}">Orders</a>
-						</li>
-						<li class="nav-item"><a class="nav-link" th:href="@{/report}">Sales
-								Report</a></li>
-						<li class="nav-item"><a class="nav-link"
-							th:href="@{/articles}">Articles</a></li>
-						<li class="nav-item"><a class="nav-link" th:href="@{/menus}">Menus</a>
-						</li>
-						<li class="nav-item"><a class="nav-link"
-							th:href="@{/settings}">Settings</a></li>
-					</ul>
-				</div>
-
-			</nav>
-		</div>
-
-		<div>
-			<h2>Manage Users</h2>
-			<a th:href="@{/users/new}" class="fas fa-user-plus fa-2x icon-dark mr-2"></a>
-			
-			<a th:href="@{/users/export/csv}" class="fas fa-file-csv fa-2x icon-dark mr-2"></a>
-		</div>
-		
-		
-		
-		<!-- only display success message when a new user is created -->
-		<div th:if="${message != null}" class="alert alert-success text-center">
-			[[${message}]]
-		</div>
-			
-		<div>
-			<form th:action="@{/users/page/1}" class="form-inline m-3">
-				
-				<input type="hidden" name="sortField" th:value="${sortField}" />
-				<input type="hidden" name="sortDir" th:value="${sortDir}" />
-				Filter:&nbsp;
-				<input type="search" name="keyword" th:value="${keyword}" class="form-control" required/>
-				&nbsp;&nbsp;
-				<button type="submit" class="btn btn-primary">
-					<i class="fas fa-search"></i>
-				</button>
-				&nbsp;&nbsp;
-				<button type="button" class="btn btn-secondary" onclick="clearFilter()">
-					<i class="fas fa-eraser"></i>
-				</button>
-			</form>
-		
-		</div>
-
-			<!-- css class to display this table in large screens only , refer to static/style.css for more info-->
-			<div class="full-details">
-				<table class="table table-bordered table-striped table-hover table-responsive-xL">
-					<thead class="thead-dark">
-						<tr>
-							<!-- refer to templates/fragments.html for fragment code-->
-							<th th:replace="fragments :: column_link('id', 'User ID')"/>
-							<th>Photos</th>
-							<th th:replace="fragments :: column_link('email', 'Email')"/>
-							<th th:replace="fragments :: column_link('firstName', 'First Name')"/>
-							<th th:replace="fragments :: column_link('lastName', 'Last Name')"/>
-							<th>Roles</th>
-							<th th:replace="fragments :: column_link('enabled', 'Enabled')"/>
-							<th></th>
-						</tr>
-					</thead>
-					<tbody>
-						<tr th:each="user : ${listUsers}">
-							<td>[[${user.id}]]</td>
-							<td>
-								<span th:if="${user.photos == null}" class="fas fa-portrait fa-3x icon-dark"></span>
-								<img th:if="${user.photos != null}" th:src="@{${user.photosImagePath}}"
-								style="width: 100px"/>
-							</td>
-							<td>[[${user.email}]]</td>
-							<td>[[${user.firstName}]]</td>
-							<td>[[${user.lastName}]]</td>
-							<td>[[${user.roles}]]</td>
-							
-							<td>
-								<a th:if="${user.enabled == true}" class="fas fa-check-circle fa-2x icon-green" 
-								th:href="@{'/users/' + ${user.id} + '/enabled/false'}"
-								title="Disable this user"></a>
-								
-								<a th:if="${user.enabled == false}" class="fas fa-circle fa-2x icon-silver"
-								 th:href="@{'/users/' + ${user.id} + '/enabled/true'}"
-								 title="Enable this user"></a>
-							</td>
-							<td>
-									<a class="fas fa-edit fa-2x icon-green" th:href="@{'/users/edit/' + ${user.id}}"
-									title="edit this user"></a>
-									&nbsp; 
-									<a class="fas fa-trash fa-2x icon-dark link-delete" th:href="@{'/users/delete/' + ${user.id}}"
-									title="delete this user" th:userId="${user.id}"></a>
-							</td>
-						</tr>
-					</tbody>
-				</table>
-			</div>
-			
-			
-			<!-- css class to display this <div> on mobile screens only, refer to /static/style.css for more info-->
-			<div class="less-details">
-				
-				<div th:each="user : ${listUsers}" class="row m-1">
-					
-					<div class="col-4">
-						
-						<span th:if="${user.photos == null}" class="fas fa-portrait fa-3x icon-dark"></span>
-								<img th:if="${user.photos != null}" th:src="@{${user.photosImagePath}}"
-								style="width: 100px"/>
-					</div>
-						<div class="col-8">
-							<div>[[${user.fullName}]]</div>
-							<div>[[${user.roles}]]</div>
-						</div>
-					<div>&nbsp;</div>
-				</div>
-			</div>
-			
-			
-			<!-- IF -->
-			<div class="text-center m-1" th:if="${totalItems > 0}">
-				<span>Showing Users # [[${startCount}]] to [[${endCount}]] of [[${totalItems}]]</span>
-			</div>
-			
-			<!-- ELSE -->
-			<div class="text-center m-1" th:unless="${totalItems > 0}">
-				<span>No users found</span>
-			</div>
-			
-			<!-- only display pagination when there are users; else, no users no pagination -->
-			<div th:if="${totalPages > 1}">
-				<nav>
-					  <ul class="pagination justify-content-center flex-wrap">
-					  
-					  	<li th:class=" ${currentPage > 1 ? 'page-item' : 'page-item disabled'}">
-					  		<a th:replace="fragments :: page_link(1, 'First')"></a>
-				    	</li>
-					  
-					    <li th:class=" ${currentPage > 1 ? 'page-item' : 'page-item disabled'}">
-					    	<a th:replace="fragments :: page_link(${currentPage - 1 }, 'previous')"></a>
-				    	</li>
-					    	
-					    <!-- org.thymeleaf.expression.Numbers class, An object of this class is usually available in variable evaluation expressions with the name #numbers. -->
-					    <li th:class="${currentPage != i ? 'page-item' : 'page-item active'}" 
-					    	th:each="i : ${#numbers.sequence(1, totalPages)}">
-					    	<a th:replace="fragments :: page_link(${i}, ${i})"></a>
-					    </li>
-					    
-					    <li  th:class=" ${currentPage < totalPages ? 'page-item' : 'page-item disabled'}">
-					    	<a th:replace="fragments :: page_link(${currentPage + 1}, 'Next')"></a>
-					    </li>
-					    
-					    <li th:class=" ${currentPage < totalPages ? 'page-item' : 'page-item disabled'}">
-							<a th:replace="fragments :: page_link(${totalPages}, 'Last')"></a>		
-					    </li>
-					  </ul>
-				</nav>
-			</div>
-			
-			
-			
-			<div class="modal fade text-center" id="confirmModal">
-				<div class="modal-dialog">
-					<div class="modal-content">
-					
-						<div class="modal-header">
-							<h4 class="modal-title">Delete Confirmation</h4>
-							<button type="button" class="close" data-dismiss="modal">&times;</button>
-						</div>
-						
-						<div class="modal-body">
-							<span id="confirmText"></span>
-						</div>
-						
-						<div class="modal-footer">
-							<a class="btn btn-success" href="" id="yesButton">Yes</a>
-							<button type="button" class="btn btn-danger" data-dismiss="modal">Close</button>
-						</div>
-					</div>
-				</div>
-			</div>
-			
-			
-			<div class="text-center">
-				<p>Shopme Control Panel - Copyright &copy; Shopme</p>
-			</div>
-
-
-	</div>
-	
-<script type="text/javascript">
-
-//confirmation modal dialogue for delete user
-$(document).ready(function(){
-	$(".link-delete").on("click", function(e){
-		//stop the <a> tag default behaviour and pop out a confirmation modal dialogue
-		e.preventDefault();
-		//alert($(this).attr("href"));
-		link = $(this);
-		userId = link.attr("userId");
-		$("#yesButton").attr("href", link.attr("href"));
-		$("#confirmText").text("Are you sure you want to delete this user ID " + userId + "?");
-		$("#confirmModal").modal();
-	});
-});
-
-	function clearFilter(){
-		window.location = "[[@{/users}]]";
-	}
-
-
-</script>
-	
-</body>
-
-</html>
\ No newline at end of file
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/16/204d4a901fb3001d1e75aa5ef0815903 b/.metadata/.plugins/org.eclipse.core.resources/.history/16/204d4a901fb3001d1e75aa5ef0815903
deleted file mode 100644
index d3a88ab7..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/16/204d4a901fb3001d1e75aa5ef0815903
+++ /dev/null
@@ -1,47 +0,0 @@
-package com.shopme.admin.user;
-
-import org.springframework.data.domain.Page;
-import org.springframework.data.domain.Pageable;
-import org.springframework.data.jpa.repository.Modifying;
-import org.springframework.data.jpa.repository.Query;
-import org.springframework.data.repository.CrudRepository;
-import org.springframework.data.repository.PagingAndSortingRepository;
-import org.springframework.data.repository.query.Param;
-import org.springframework.stereotype.Repository;
-
-import com.shopme.common.entity.User;
-
-@Repository
-public interface UserRepository extends CrudRepository<User, Integer>, PagingAndSortingRepository<User, Integer> {
-
-	/*
-	 * JPQL statement. It should be noted that as compared to native SQL, JPQL does
-	 * not interact with database tables, records, and fields - but with Java
-	 * classes and instances.
-	 * 
-	 * JPA kicks in as the mediator and transpiles JPQL queries to SQL queries for execution.
-	 * 
-	 * If your database can change or varies from development to production, as long as 
-	 * they're both relational - JPQL works wonders and you can 
-	 * write JPQL queries to create generic logic that can be used over and over again.
-	 */
-	@Query("SELECT u FROM User u WHERE u.email = :email")
-	public User getUserByEmail(@Param("email") String email);
-	
-	// countById() declaration follows the JPA specification
-	//to check the existence of a user
-	public Long countById(Integer id);
-	
-	
-	//for filtering users
-	
-	public Page<User> findAll(String keyword, Pageable pageable);
-	
-	
-	
-	//change user enabled status
-	//need @Modifying annotation for update/delete operation
-	@Query("UPDATE User u SET u.enabled = ?2 WHERE u.id = ?1")
-	@Modifying
-	public void updateEnabledStatus(Integer id, boolean enabled);
-}
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/16/7003c42190b3001d19bbb001c1a81c20 b/.metadata/.plugins/org.eclipse.core.resources/.history/16/7003c42190b3001d19bbb001c1a81c20
deleted file mode 100644
index eee1c1a5..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/16/7003c42190b3001d19bbb001c1a81c20
+++ /dev/null
@@ -1,280 +0,0 @@
-<!DOCTYPE html>
-<html xmlns:th="http://www.thymeleaf.org">
-
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset= UTF-8">
-<meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0">
-<title>Manage Users</title>
-
-<link rel="stylesheet" type="text/css" th:href="@{/webjars/bootstrap/css/bootstrap.min.css}" />
-<link rel="stylesheet" type="text/css" th:href="@{/fontawesome/all.css}" />
-<link rel="stylesheet" type="text/css" th:href="@{/style.css}" />
-	
-<script type="text/javascript" th:src="@{/webjars/jquery/jquery.min.js}"></script>
-<script type="text/javascript" th:src="@{/webjars/bootstrap/js/bootstrap.min.js}"></script>
-</head>
-
-<body>
-	<div class="container-fluid">
-		<div>
-			<nav class="navbar navbar-expand-lg bg-dark navbar-dark">
-				<a class="navbar-brand" th:href="@{/}"> <img
-					th:src="@{/images/ShopmeAdminSmall.png}" />
-				</a>
-				<!--hamburger toggler for mobile devices(responsive)-->
-				<button class="navbar-toggler" type="button" data-toggle="collapse"
-					data-target="#topNavbar">
-					<span class="navbar-toggler-icon"></span>
-				</button>
-				<div class="collapse navbar-collapse" id="topNavbar">
-					<ul class="navbar-nav">
-						<li class="nav-item"><a class="nav-link" th:href="@{/users}">Users</a>
-						</li>
-						<li class="nav-item"><a class="nav-link"
-							th:href="@{/categories}">Categories</a></li>
-						<li class="nav-item"><a class="nav-link" th:href="@{/brands}">Brands</a>
-						</li>
-						<li class="nav-item"><a class="nav-link"
-							th:href="@{/products}">Products</a></li>
-						<li class="nav-item"><a class="nav-link"
-							th:href="@{/customers}">Customers</a></li>
-						<li class="nav-item"><a class="nav-link"
-							th:href="@{/shipping}">Shipping</a></li>
-						<li class="nav-item"><a class="nav-link" th:href="@{/orders}">Orders</a>
-						</li>
-						<li class="nav-item"><a class="nav-link" th:href="@{/report}">Sales
-								Report</a></li>
-						<li class="nav-item"><a class="nav-link"
-							th:href="@{/articles}">Articles</a></li>
-						<li class="nav-item"><a class="nav-link" th:href="@{/menus}">Menus</a>
-						</li>
-						<li class="nav-item"><a class="nav-link"
-							th:href="@{/settings}">Settings</a></li>
-					</ul>
-				</div>
-
-			</nav>
-		</div>
-
-		<div>
-			<h2>Manage Users</h2>
-			<a th:href="@{/users/new}" class="fas fa-user-plus fa-2x icon-dark mr-2"></a>
-			
-			<a th:href="@{/users/export/csv}" class="fas fa-file-csv fa-2x icon-dark mr-2"></a>
-		</div>
-		
-		
-		
-		<!-- only display success message when a new user is created -->
-		<div th:if="${message != null}" class="alert alert-success text-center">
-			[[${message}]]
-		</div>
-			
-		<div>
-			<form th:action="@{/users/page/1}" class="form-inline m-3">
-				
-				<input type="hidden" name="sortField" th:value="${sortField}" />
-				<input type="hidden" name="sortDir" th:value="${sortDir}" />
-				Filter:&nbsp;
-				<input type="search" name="keyword" th:value="${keyword}" class="form-control" required/>
-				&nbsp;&nbsp;
-				<button type="submit" class="btn btn-primary">
-					<i class="fas fa-search"></i>
-				</button>
-				&nbsp;&nbsp;
-				<button type="button" class="btn btn-secondary" onclick="clearFilter()">
-					<i class="fas fa-eraser"></i>
-				</button>
-			</form>
-		
-		</div>
-
-			<!-- css class to display this table in large screens only , refer to static/style.css for more info-->
-			<div class="full-details">
-				<table class="table table-bordered table-striped table-hover table-responsive-xL">
-					<thead class="thead-dark">
-						<tr>
-							<!-- refer to templates/fragments.html for fragment code-->
-							
-							<th class="hideable-column">
-								<th th:replace="fragments :: column_link('id', 'User ID', 'tag')"/>
-							</th>
-							
-							<th>Photos</th>
-							<th th:replace="fragments :: column_link('email', 'Email')"/>
-							<th th:replace="fragments :: column_link('firstName', 'First Name', 'none')"/>
-							<th th:replace="fragments :: column_link('lastName', 'Last Name', 'none')"/>
-							<th>Roles</th>
-							<th th:replace="fragments :: column_link('enabled', 'Enabled', 'none')"/>
-							<th></th>
-						</tr>
-					</thead>
-					<tbody>
-						<tr th:each="user : ${listUsers}">
-							<td class="hideable-column">[[${user.id}]]</td>
-							<td>
-								<span th:if="${user.photos == null}" class="fas fa-portrait fa-3x icon-dark"></span>
-								<img th:if="${user.photos != null}" th:src="@{${user.photosImagePath}}"
-								style="width: 100px"/>
-							</td>
-							<td class="hideable-column">[[${user.email}]]</td>
-							<td>[[${user.firstName}]]</td>
-							<td>[[${user.lastName}]]</td>
-							<td>[[${user.roles}]]</td>
-							
-							<td>
-								<a th:if="${user.enabled == true}" class="fas fa-check-circle fa-2x icon-green" 
-								th:href="@{'/users/' + ${user.id} + '/enabled/false'}"
-								title="Disable this user"></a>
-								
-								<a th:if="${user.enabled == false}" class="fas fa-circle fa-2x icon-silver"
-								 th:href="@{'/users/' + ${user.id} + '/enabled/true'}"
-								 title="Enable this user"></a>
-							</td>
-							<td>
-									<a class="fas fa-edit fa-2x icon-green" th:href="@{'/users/edit/' + ${user.id}}"
-									title="edit this user"></a>
-									&nbsp; 
-									<a class="fas fa-trash fa-2x icon-dark link-delete" th:href="@{'/users/delete/' + ${user.id}}"
-									title="delete this user" th:userId="${user.id}"></a>
-							</td>
-						</tr>
-					</tbody>
-				</table>
-			</div>
-			
-			
-			<!-- css class to display this <div> on mobile screens only, refer to /static/style.css for more info-->
-			<div class="less-details">
-				
-				<div th:each="user : ${listUsers}" class="row m-1">
-					
-					<div class="col-4">
-						
-						<span th:if="${user.photos == null}" class="fas fa-portrait fa-3x icon-dark"></span>
-								<img th:if="${user.photos != null}" th:src="@{${user.photosImagePath}}"
-								style="width: 100px"/>
-					</div>
-					
-					<div class="col-8">
-						<div>[[${user.fullName}]]</div>
-						<div>[[${user.roles}]]</div>
-						<div class="mt-2">
-							<a th:if="${user.enabled == true}" class="fas fa-check-circle fa-2x icon-green" 
-								th:href="@{'/users/' + ${user.id} + '/enabled/false'}"
-								title="Disable this user"></a>
-								
-							<a th:if="${user.enabled == false}" class="fas fa-circle fa-2x icon-silver"
-								 th:href="@{'/users/' + ${user.id} + '/enabled/true'}"
-								 title="Enable this user"></a>
-						
-									&nbsp;
-							<a class="fas fa-edit fa-2x icon-green" th:href="@{'/users/edit/' + ${user.id}}"
-									title="edit this user"></a>
-									&nbsp; 
-							<a class="fas fa-trash fa-2x icon-dark link-delete" th:href="@{'/users/delete/' + ${user.id}}"
-									title="delete this user" th:userId="${user.id}"></a>
-						</div>
-					</div>
-					<div>&nbsp;</div>
-				</div>
-			</div>
-			
-			
-			<!-- IF -->
-			<div class="text-center m-1" th:if="${totalItems > 0}">
-				<span>Showing Users # [[${startCount}]] to [[${endCount}]] of [[${totalItems}]]</span>
-			</div>
-			
-			<!-- ELSE -->
-			<div class="text-center m-1" th:unless="${totalItems > 0}">
-				<span>No users found</span>
-			</div>
-			
-			<!-- only display pagination when there are users; else, no users no pagination -->
-			<div th:if="${totalPages > 1}">
-				<nav>
-					  <ul class="pagination justify-content-center flex-wrap">
-					  
-					  	<li th:class=" ${currentPage > 1 ? 'page-item' : 'page-item disabled'}">
-					  		<a th:replace="fragments :: page_link(1, 'First')"></a>
-				    	</li>
-					  
-					    <li th:class=" ${currentPage > 1 ? 'page-item' : 'page-item disabled'}">
-					    	<a th:replace="fragments :: page_link(${currentPage - 1 }, 'previous')"></a>
-				    	</li>
-					    	
-					    <!-- org.thymeleaf.expression.Numbers class, An object of this class is usually available in variable evaluation expressions with the name #numbers. -->
-					    <li th:class="${currentPage != i ? 'page-item' : 'page-item active'}" 
-					    	th:each="i : ${#numbers.sequence(1, totalPages)}">
-					    	<a th:replace="fragments :: page_link(${i}, ${i})"></a>
-					    </li>
-					    
-					    <li  th:class=" ${currentPage < totalPages ? 'page-item' : 'page-item disabled'}">
-					    	<a th:replace="fragments :: page_link(${currentPage + 1}, 'Next')"></a>
-					    </li>
-					    
-					    <li th:class=" ${currentPage < totalPages ? 'page-item' : 'page-item disabled'}">
-							<a th:replace="fragments :: page_link(${totalPages}, 'Last')"></a>		
-					    </li>
-					  </ul>
-				</nav>
-			</div>
-			
-			
-			
-			<div class="modal fade text-center" id="confirmModal">
-				<div class="modal-dialog">
-					<div class="modal-content">
-					
-						<div class="modal-header">
-							<h4 class="modal-title">Delete Confirmation</h4>
-							<button type="button" class="close" data-dismiss="modal">&times;</button>
-						</div>
-						
-						<div class="modal-body">
-							<span id="confirmText"></span>
-						</div>
-						
-						<div class="modal-footer">
-							<a class="btn btn-success" href="" id="yesButton">Yes</a>
-							<button type="button" class="btn btn-danger" data-dismiss="modal">Close</button>
-						</div>
-					</div>
-				</div>
-			</div>
-			
-			
-			<div class="text-center">
-				<p>Shopme Control Panel - Copyright &copy; Shopme</p>
-			</div>
-
-
-	</div>
-	
-<script type="text/javascript">
-
-//confirmation modal dialogue for delete user
-$(document).ready(function(){
-	$(".link-delete").on("click", function(e){
-		//stop the <a> tag default behaviour and pop out a confirmation modal dialogue
-		e.preventDefault();
-		//alert($(this).attr("href"));
-		link = $(this);
-		userId = link.attr("userId");
-		$("#yesButton").attr("href", link.attr("href"));
-		$("#confirmText").text("Are you sure you want to delete this user ID " + userId + "?");
-		$("#confirmModal").modal();
-	});
-});
-
-	function clearFilter(){
-		window.location = "[[@{/users}]]";
-	}
-
-
-</script>
-	
-</body>
-
-</html>
\ No newline at end of file
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/16/7074bb4918b4001d128fb79045552177 b/.metadata/.plugins/org.eclipse.core.resources/.history/16/7074bb4918b4001d128fb79045552177
deleted file mode 100644
index 70698262..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/16/7074bb4918b4001d128fb79045552177
+++ /dev/null
@@ -1,62 +0,0 @@
-package com.shopme.admin.security;
-
-import org.aspectj.weaver.ast.And;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.security.config.annotation.web.builders.HttpSecurity;
-import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
-import org.springframework.security.config.annotation.web.configuration.WebSecurityConfiguration;
-import org.springframework.security.config.annotation.web.configuration.WebSecurityCustomizer;
-import org.springframework.security.core.userdetails.UserDetailsService;
-import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
-import org.springframework.security.crypto.password.PasswordEncoder;
-import org.springframework.security.web.SecurityFilterChain;
-
-@Configuration
-@EnableWebSecurity
-public class WebSecurityConfig {
-
-	/*
-	 * refer to this link: https://www.codejava.net/frameworks/spring-boot/fix-
-	 * websecurityconfigureradapter-deprecated
-	 * 
-	 */
-	
-	
-	 /* This bean will be called by spring security when performing authentication*/ 
-	@Bean
-	public UserDetailsService  userDetailsService()	{
-		return new ShopmeUserDetailsService();
-	}
-	
-
-	@Bean
-	public PasswordEncoder passwordEncoder() {
-		return new BCryptPasswordEncoder();
-	}
-
-	@Bean
-	public SecurityFilterChain filterChain(HttpSecurity http) throws Exception {
-
-		// any request need to be authenticated (require login)
-		// custom login page at "/login" - handler method in MainController class
-		http.authorizeHttpRequests()
-			.anyRequest().authenticated()
-			.and()
-			.formLogin()
-				.loginPage("/login")
-				.usernameParameter("email")
-				.permitAll();
-
-		return http.build();
-	}
-
-	//NOTE: antMatchers() changed to requestMatchers()
-	//stack: https://stackoverflow.com/questions/74907533/the-method-antmatchersstring-is-undefined-for-the-type
-	@Bean
-	public WebSecurityCustomizer webSecurityCustomizer() {
-		//permit access to the assets in the following directories
-		return (web) -> web.ignoring().requestMatchers("/images/**", "/js/**", "/webjars/**");
-	}
-
-}
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/16/a0c9c93e99b9001d10d0f9513979f945 b/.metadata/.plugins/org.eclipse.core.resources/.history/16/a0c9c93e99b9001d10d0f9513979f945
new file mode 100644
index 00000000..b48a50dd
--- /dev/null
+++ b/.metadata/.plugins/org.eclipse.core.resources/.history/16/a0c9c93e99b9001d10d0f9513979f945
@@ -0,0 +1,78 @@
+package com.shopme.admin.category;
+
+import java.io.IOException;
+import java.util.List;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.scheduling.support.SimpleTriggerContext;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
+import org.springframework.util.StringUtils;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.ModelAttribute;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.multipart.MultipartFile;
+import org.springframework.web.servlet.mvc.support.RedirectAttributes;
+
+import com.shopme.admin.FileUploadUtil;
+import com.shopme.common.entity.Category;
+
+@Controller
+public class CategoryController {
+	
+	@Autowired
+	private CategoryService service;
+	
+	@GetMapping("/categories")
+	public String listAll(Model model) {
+		
+		List<Category> listCategories = service.listAll();
+		model.addAttribute("listCategories", listCategories);
+		
+		return "categories/categories";
+	}
+	
+	
+	@GetMapping("/categories/new")
+	public String newCategory(Model model) {
+		
+		List<Category> listCategories = service.listCategoriesUsedInForm();
+		
+		model.addAttribute("category", new Category());
+		model.addAttribute("listCategories", listCategories);
+		model.addAttribute("pageTitle", "Create New Category");
+		
+		return "categories/category_form";
+	
+	}
+	
+	@PostMapping("/categories/save")
+	public String saveCategory(@ModelAttribute("category") Category category, 
+			RedirectAttributes redirectAttributes,
+			@RequestParam("fileImage") MultipartFile multipartFile) throws IOException {
+		
+		String fileName = StringUtils.cleanPath(multipartFile.getOriginalFilename());
+		category.setImage(fileName);
+		
+		Category savedCategory = service.save(category);
+		String uploadDir = "../category-images/" + savedCategory.getId();
+		FileUploadUtil.saveFile(uploadDir, fileName, multipartFile);
+		
+		
+		redirectAttributes.addFlashAttribute("message", "the category have been saved successfully");
+		
+		
+		return "redirect:/categories";
+	}
+
+	
+	@GetMapping("")
+	
+	
+	
+}
+	
+
+
+
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/17/10414bcb30b4001d1d079a924effdc9e b/.metadata/.plugins/org.eclipse.core.resources/.history/17/10414bcb30b4001d1d079a924effdc9e
deleted file mode 100644
index ee91d8e2..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/17/10414bcb30b4001d1d079a924effdc9e
+++ /dev/null
@@ -1,113 +0,0 @@
-<!DOCTYPE html>
-<html xmlns:th="http://www.thymeleaf.org"
-	  xmlns:sec="https://www.thymeleaf.org/thymeleaf-extras-springsecurity5">
-
-<head>
-	<meta http-equiv="Content-Type" content="text/html; charset= UTF-8">
-	<meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0">
-	<title>Home - Shopme Admin</title>
-	
-	<link rel="stylesheet" type="text/css" th:href="@{/fontawesome/all.css}" />
-	<link rel="stylesheet" type="text/css" th:href="@{/style.css}" />
-	<link rel="stylesheet" type="text/css" th:href="@{/webjars/bootstrap/css/bootstrap.min.css}" />
-	
-	<script type="text/javascript" th:src="@{/webjars/jquery/jquery.min.js}"></script>
-	<script type="text/javascript" th:src="@{/webjars/bootstrap/js/bootstrap.min.js}"></script>
-</head>
-
-<body>
-	<div class="container-fluid">
-		<div>
-			<form th:action="@{/logout}" method="post" th:hidden="true" name="logoutForm">
-				<input type="submit"/>
-			</form>
-			<nav class="navbar navbar-expand-lg bg-dark navbar-dark">
-				<a class="navbar-brand" th:href="@{/}">
-					<img th:src="@{/images/ShopmeAdminSmall.png}"/>
-				</a>
-				<!--hamburger toggler for mobile devices(responsive)-->
-				<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#topNavbar">
-					<span class="navbar-toggler-icon"></span>
-				</button>
-				<div class="collapse navbar-collapse" id="topNavbar">
-					<ul class="navbar-nav">
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/users}">Users</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/categories}">Categories</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/brands}">Brands</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/products}">Products</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/customers}">Customers</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/shipping}">Shipping</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/orders}">Orders</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/report}">Sales Report</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/articles}">Articles</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/menus}">Menus</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/settings}">Settings</a>
-						</li>
-						<li>
-							<span class="fas fa-user fa-2x icon-silver"></span>
-						</li>
-						<li class="nav-item dropdown">
-								<!-- principal refers to user; display username -->
-							<a class="nav-link dropdown-toggle" sec:authentication="principal.fullname" data-toggle="dropdown"></a>
-							<div class="dropdown-menu">
-								<a class="dropdown-item" id="logoutLink" href="">Logout</a>
-							</div>
-							
-						</li>
-					</ul>
-				</div>
-				
-			</nav>
-		</div>
-
-		<div>
-			<h1>Shopme Control Panel</h1>
-		</div>
-
-		<div>
-			<p>Shopme Control Panel - Copyright &copy; Shopme</p>
-		</div>
-
-
-	</div>
-	
-<script type="text/javascript">
-
-	$(document).ready(function(){
-		$("#logoutLink").on("click" function(e){
-			e.preventDefault(); /* stop the hyperlink default behaviour  */
-			/* use  the form to  log out and navigate to the url path /logout  
-			
-			 NOTE: spring security requires POST to logout in order to obtain the csrf token, 
-			 		the csrf token is a hidden property in the form
-			*/
-			document.logoutForm.submit();
-		});
-	});
-
-</script>
-
-</body>
-
-</html>
\ No newline at end of file
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/17/a0915c1315b4001d128fb79045552177 b/.metadata/.plugins/org.eclipse.core.resources/.history/17/a0915c1315b4001d128fb79045552177
deleted file mode 100644
index 07c75100..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/17/a0915c1315b4001d128fb79045552177
+++ /dev/null
@@ -1,25 +0,0 @@
-package com.shopme.admin.security;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.core.userdetails.UserDetails;
-import org.springframework.security.core.userdetails.UserDetailsService;
-import org.springframework.security.core.userdetails.UsernameNotFoundException;
-
-import com.shopme.admin.user.UserRepository;
-
-public class ShopmeUserDetailsService implements UserDetailsService {
-
-	
-	@Autowired
-	private UserRepository userRepo;
-	
-	
-	
-	
-	@Override
-	public UserDetails loadUserByUsername(String username) throws UsernameNotFoundException {
-		// TODO Auto-generated method stub
-		return null;
-	}
-
-}
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/17/a0ddc50446b4001d1d079a924effdc9e b/.metadata/.plugins/org.eclipse.core.resources/.history/17/a0ddc50446b4001d1d079a924effdc9e
deleted file mode 100644
index 7023c32f..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/17/a0ddc50446b4001d1d079a924effdc9e
+++ /dev/null
@@ -1,236 +0,0 @@
-<!DOCTYPE html>
-<html xmlns:th="http://www.thymeleaf.org">
-
-<head th:replace="fragments :: page_head('Users - Shopme Admin')"/>
-
-<body>
-	<div class="container-fluid">
-		
-		<div th:replace="navigation :: menu"></div>
-
-		<div>
-			<h2>Manage Users</h2>
-			<a th:href="@{/users/new}" class="fas fa-user-plus fa-2x icon-dark mr-2"></a>
-			
-			<a th:href="@{/users/export/csv}" class="fas fa-file-csv fa-2x icon-dark mr-2"></a>
-		</div>
-		
-		
-		
-		<!-- only display success message when a new user is created -->
-		<div th:if="${message != null}" class="alert alert-success text-center">
-			[[${message}]]
-		</div>
-			
-		<div>
-			<form th:action="@{/users/page/1}" class="form-inline m-3">
-				
-				<input type="hidden" name="sortField" th:value="${sortField}" />
-				<input type="hidden" name="sortDir" th:value="${sortDir}" />
-				Filter:&nbsp;
-				<input type="search" name="keyword" th:value="${keyword}" class="form-control" required/>
-				&nbsp;&nbsp;
-				<button type="submit" class="btn btn-primary">
-					<i class="fas fa-search"></i>
-				</button>
-				&nbsp;&nbsp;
-				<button type="button" class="btn btn-secondary" onclick="clearFilter()">
-					<i class="fas fa-eraser"></i>
-				</button>
-			</form>
-		
-		</div>
-
-			<!-- css class to display this table in large screens only , refer to static/style.css for more info-->
-			<div class="full-details">
-				<table class="table table-bordered table-striped table-hover table-responsive-xL">
-					<thead class="thead-dark">
-						<tr>
-							<!-- refer to templates/fragments.html for fragment code-->
-							
-							<th class="hideable-column">
-								<th th:replace="fragments :: column_link('id', 'User ID', 'tag')"/>
-							</th>
-							
-							<th>Photos</th>
-							
-							<th class="hideable-column">
-								<th th:replace="fragments :: column_link('email', 'Email', 'tag')"/>
-							</th>
-							
-							<th th:replace="fragments :: column_link('firstName', 'First Name', 'none')"/>
-							<th th:replace="fragments :: column_link('lastName', 'Last Name', 'none')"/>
-							<th>Roles</th>
-							<th th:replace="fragments :: column_link('enabled', 'Enabled', 'none')"/>
-							<th></th>
-						</tr>
-					</thead>
-					<tbody>
-						<tr th:each="user : ${listUsers}">
-							<td class="hideable-column">[[${user.id}]]</td>
-							<td>
-								<span th:if="${user.photos == null}" class="fas fa-portrait fa-3x icon-dark"></span>
-								<img th:if="${user.photos != null}" th:src="@{${user.photosImagePath}}"
-								style="width: 100px"/>
-							</td>
-							<td class="hideable-column">[[${user.email}]]</td>
-							<td>[[${user.firstName}]]</td>
-							<td>[[${user.lastName}]]</td>
-							<td>[[${user.roles}]]</td>
-							
-							<td>
-								<a th:if="${user.enabled == true}" class="fas fa-check-circle fa-2x icon-green" 
-								th:href="@{'/users/' + ${user.id} + '/enabled/false'}"
-								title="Disable this user"></a>
-								
-								<a th:if="${user.enabled == false}" class="fas fa-circle fa-2x icon-silver"
-								 th:href="@{'/users/' + ${user.id} + '/enabled/true'}"
-								 title="Enable this user"></a>
-							</td>
-							<td>
-									<a class="fas fa-edit fa-2x icon-green" th:href="@{'/users/edit/' + ${user.id}}"
-									title="edit this user"></a>
-									&nbsp; 
-									<a class="fas fa-trash fa-2x icon-dark link-delete" th:href="@{'/users/delete/' + ${user.id}}"
-									title="delete this user" th:userId="${user.id}"></a>
-							</td>
-						</tr>
-					</tbody>
-				</table>
-			</div>
-			
-			
-			<!-- css class to display this <div> on mobile screens only, refer to /static/style.css for more info-->
-			<div class="less-details">
-				
-				<div th:each="user : ${listUsers}" class="row m-1">
-					
-					<div class="col-4">
-						
-						<span th:if="${user.photos == null}" class="fas fa-portrait fa-3x icon-dark"></span>
-								<img th:if="${user.photos != null}" th:src="@{${user.photosImagePath}}"
-								style="width: 100px"/>
-					</div>
-					
-					<div class="col-8">
-						<div>[[${user.fullName}]]</div>
-						<div>[[${user.roles}]]</div>
-						<div class="mt-2">
-							<a th:if="${user.enabled == true}" class="fas fa-check-circle fa-2x icon-green" 
-								th:href="@{'/users/' + ${user.id} + '/enabled/false'}"
-								title="Disable this user"></a>
-								
-							<a th:if="${user.enabled == false}" class="fas fa-circle fa-2x icon-silver"
-								 th:href="@{'/users/' + ${user.id} + '/enabled/true'}"
-								 title="Enable this user"></a>
-						
-									&nbsp;
-							<a class="fas fa-edit fa-2x icon-green" th:href="@{'/users/edit/' + ${user.id}}"
-									title="edit this user"></a>
-									&nbsp; 
-							<a class="fas fa-trash fa-2x icon-dark link-delete" th:href="@{'/users/delete/' + ${user.id}}"
-									title="delete this user" th:userId="${user.id}"></a>
-						</div>
-					</div>
-					<div>&nbsp;</div>
-				</div>
-			</div>
-			
-			
-			<!-- IF -->
-			<div class="text-center m-1" th:if="${totalItems > 0}">
-				<span>Showing Users # [[${startCount}]] to [[${endCount}]] of [[${totalItems}]]</span>
-			</div>
-			
-			<!-- ELSE -->
-			<div class="text-center m-1" th:unless="${totalItems > 0}">
-				<span>No users found</span>
-			</div>
-			
-			<!-- only display pagination when there are users; else, no users no pagination -->
-			<div th:if="${totalPages > 1}">
-				<nav>
-					  <ul class="pagination justify-content-center flex-wrap">
-					  
-					  	<li th:class=" ${currentPage > 1 ? 'page-item' : 'page-item disabled'}">
-					  		<a th:replace="fragments :: page_link(1, 'First')"></a>
-				    	</li>
-					  
-					    <li th:class=" ${currentPage > 1 ? 'page-item' : 'page-item disabled'}">
-					    	<a th:replace="fragments :: page_link(${currentPage - 1 }, 'previous')"></a>
-				    	</li>
-					    	
-					    <!-- org.thymeleaf.expression.Numbers class, An object of this class is usually available in variable evaluation expressions with the name #numbers. -->
-					    <li th:class="${currentPage != i ? 'page-item' : 'page-item active'}" 
-					    	th:each="i : ${#numbers.sequence(1, totalPages)}">
-					    	<a th:replace="fragments :: page_link(${i}, ${i})"></a>
-					    </li>
-					    
-					    <li  th:class=" ${currentPage < totalPages ? 'page-item' : 'page-item disabled'}">
-					    	<a th:replace="fragments :: page_link(${currentPage + 1}, 'Next')"></a>
-					    </li>
-					    
-					    <li th:class=" ${currentPage < totalPages ? 'page-item' : 'page-item disabled'}">
-							<a th:replace="fragments :: page_link(${totalPages}, 'Last')"></a>		
-					    </li>
-					  </ul>
-				</nav>
-			</div>
-			
-			
-			
-			<div class="modal fade text-center" id="confirmModal">
-				<div class="modal-dialog">
-					<div class="modal-content">
-					
-						<div class="modal-header">
-							<h4 class="modal-title">Delete Confirmation</h4>
-							<button type="button" class="close" data-dismiss="modal">&times;</button>
-						</div>
-						
-						<div class="modal-body">
-							<span id="confirmText"></span>
-						</div>
-						
-						<div class="modal-footer">
-							<a class="btn btn-success" href="" id="yesButton">Yes</a>
-							<button type="button" class="btn btn-danger" data-dismiss="modal">Close</button>
-						</div>
-					</div>
-				</div>
-			</div>
-			
-			
-			<div class="text-center">
-				<p>Shopme Control Panel - Copyright &copy; Shopme</p>
-			</div>
-
-
-	</div>
-	
-<script type="text/javascript">
-
-//confirmation modal dialogue for delete user
-$(document).ready(function(){
-	$(".link-delete").on("click", function(e){
-		//stop the <a> tag default behaviour and pop out a confirmation modal dialogue
-		e.preventDefault();
-		//alert($(this).attr("href"));
-		link = $(this);
-		userId = link.attr("userId");
-		$("#yesButton").attr("href", link.attr("href"));
-		$("#confirmText").text("Are you sure you want to delete this user ID " + userId + "?");
-		$("#confirmModal").modal();
-	});
-});
-
-	function clearFilter(){
-		window.location = "[[@{/users}]]";
-	}
-
-
-</script>
-	
-</body>
-
-</html>
\ No newline at end of file
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/18/400279a26db3001d19bbb001c1a81c20 b/.metadata/.plugins/org.eclipse.core.resources/.history/18/400279a26db3001d19bbb001c1a81c20
deleted file mode 100644
index 47bf74e1..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/18/400279a26db3001d19bbb001c1a81c20
+++ /dev/null
@@ -1,17 +0,0 @@
-package com.shopme.admin.user;
-
-import java.util.List;
-
-import com.shopme.common.entity.User;
-
-import jakarta.servlet.http.HttpServletResponse;
-
-public class UserCsvExporter {
-
-	public void export(List<User> user, HttpServletResponse response) {
-		
-		
-	
-	}
-	
-}
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/18/701ef4fc4ab4001d1d079a924effdc9e b/.metadata/.plugins/org.eclipse.core.resources/.history/18/701ef4fc4ab4001d1d079a924effdc9e
deleted file mode 100644
index 037ef79e..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/18/701ef4fc4ab4001d1d079a924effdc9e
+++ /dev/null
@@ -1,83 +0,0 @@
-package com.shopme.admin.security;
-
-import org.aspectj.weaver.ast.And;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.security.authentication.dao.DaoAuthenticationProvider;
-import org.springframework.security.config.annotation.web.builders.HttpSecurity;
-import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
-import org.springframework.security.config.annotation.web.configuration.WebSecurityConfiguration;
-import org.springframework.security.config.annotation.web.configuration.WebSecurityCustomizer;
-import org.springframework.security.core.userdetails.UserDetailsService;
-import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
-import org.springframework.security.crypto.password.PasswordEncoder;
-import org.springframework.security.web.SecurityFilterChain;
-
-@Configuration
-@EnableWebSecurity
-public class WebSecurityConfig {
-
-	/*
-	 * refer to this link: https://www.codejava.net/frameworks/spring-boot/fix-
-	 * websecurityconfigureradapter-deprecated
-	 * 
-	 */
-	
-	
-	 /* This bean will be called by spring security when performing authentication*/ 
-	@Bean
-	public UserDetailsService  userDetailsService()	{
-		return new ShopmeUserDetailsService();
-	}
-	
-
-	@Bean
-	public PasswordEncoder passwordEncoder() {
-		return new BCryptPasswordEncoder();
-	}
-
-	
-	@Bean
-	public DaoAuthenticationProvider authenticationProvider() {
-	    DaoAuthenticationProvider authProvider = new DaoAuthenticationProvider();
-	     
-	    authProvider.setUserDetailsService(userDetailsService());
-	    authProvider.setPasswordEncoder(passwordEncoder());
-	 
-	    return authProvider;
-	}
-	
-	
-	@Bean
-	public SecurityFilterChain filterChain(HttpSecurity http) throws Exception {
-
-		// any request need to be authenticated (require login)
-		// custom login page at "/login" - handler method in MainController class
-		http.authorizeHttpRequests()
-			.anyRequest().authenticated()
-			.and()
-			.formLogin()
-				.loginPage("/login")
-				.usernameParameter("email")
-				.permitAll()
-			.and().logout().permitAll()
-			.and().rememberMe().key("AbcDefgHijKlmnOpqrs_1234567890"); 
-				// set a fix key used for the md5 hash algorithm to encrypt cookie content
-				//each time the application is restarted a new key will be generated
-				//so, in order for the cookie to be  a fix key
-		
-		http.authenticationProvider(authenticationProvider());
-		
-		
-		return http.build();
-	}
-
-	//NOTE: antMatchers() changed to requestMatchers()
-	//stack: https://stackoverflow.com/questions/74907533/the-method-antmatchersstring-is-undefined-for-the-type
-	@Bean
-	public WebSecurityCustomizer webSecurityCustomizer() {
-		//permit access to the assets in the following directories
-		return (web) -> web.ignoring().requestMatchers("/images/**", "/js/**", "/webjars/**");
-	}
-
-}
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/18/90c2ac7645b4001d1d079a924effdc9e b/.metadata/.plugins/org.eclipse.core.resources/.history/18/90c2ac7645b4001d1d079a924effdc9e
deleted file mode 100644
index eb0de705..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/18/90c2ac7645b4001d1d079a924effdc9e
+++ /dev/null
@@ -1,44 +0,0 @@
-<!DOCTYPE html>
-<html xmlns:th="http://www.thymeleaf.org"
-	  xmlns:sec="https://www.thymeleaf.org/thymeleaf-extras-springsecurity5">
-
-<head th:replace="fragments :: page_head('Home - Shopme Admin')"/>
-
-<body>
-	<div class="container-fluid">
-			
-			<!-- navigation bar -->
-		<div th:replace="fragments :: menu"></div>
-
-		<div>
-			<h1>Shopme Control Panel</h1>
-		</div>
-
-		<div>
-			<p>Shopme Control Panel - Copyright &copy; Shopme</p>
-		</div>
-
-
-	</div>
-	
-<script type="text/javascript">
-
-	$(document).ready(function(){
-		$("#logoutLink").on("click", function(e){
-			e.preventDefault(); /* stop the hyperlink default behaviour  */
-			
-			
-			/* use  the form to  log out and navigate to the url path /logout  
-			
-			 NOTE: spring security requires a POST request form to logout in order to obtain the csrf token, 
-			 		the csrf token is a hidden property in the form
-			*/
-			document.logoutForm.submit();
-		});
-	});
-
-</script>
-
-</body>
-
-</html>
\ No newline at end of file
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/1a/507029fa87b3001d19bbb001c1a81c20 b/.metadata/.plugins/org.eclipse.core.resources/.history/1a/507029fa87b3001d19bbb001c1a81c20
deleted file mode 100644
index 0f12883c..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/1a/507029fa87b3001d19bbb001c1a81c20
+++ /dev/null
@@ -1,6 +0,0 @@
-*.icon-white{color: white}
-*.icon-silver{color: silver}
-*.icon-green{color: green}
-*.icon-dark{color: gray}
-*.icon-red{color: red}
-
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/1a/704368b5f9b8001d11addcb4256c67f9 b/.metadata/.plugins/org.eclipse.core.resources/.history/1a/704368b5f9b8001d11addcb4256c67f9
new file mode 100644
index 00000000..fdde1043
--- /dev/null
+++ b/.metadata/.plugins/org.eclipse.core.resources/.history/1a/704368b5f9b8001d11addcb4256c67f9
@@ -0,0 +1,44 @@
+package com.shopme.admin;
+
+import java.nio.file.Path;
+import java.nio.file.Paths;
+
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
+
+@Configuration
+public class MvcConfig implements WebMvcConfigurer {
+
+	
+	/*
+	 * In short, we can tell Spring MVC to map a given URL (e.g. "/user-photos") 
+	 * to any directory (e.g. D:/ShopmeProject/ShopmeBackend/user-photos) 
+	 * and expose the resources (images, js, css...) in this directory to 
+	 * the web clients (browsers) - that's the primary purpose
+	 *  of using resource handlers in Spring MVC.
+	 * 
+	 * Because the assets are not locoated in the src/main/resources/static folder
+	 * */
+	
+	@Override
+	public void addResourceHandlers(ResourceHandlerRegistry registry) {
+
+		String dirName = "user-photos";
+		
+		Path userPhotoDir = Paths.get(dirName);
+		
+		String userPhotosPath = userPhotoDir.toFile().getAbsolutePath();
+		
+		
+		// add /** to allow all files under this directory to be available to client
+		
+		registry.addResourceHandler("/" + dirName + "/**")
+		.addResourceLocations("file:/" + userPhotosPath + "/");
+		
+	}
+	
+	
+	
+	
+}
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/1c/20565b3f05b4001d128fb79045552177 b/.metadata/.plugins/org.eclipse.core.resources/.history/1c/20565b3f05b4001d128fb79045552177
deleted file mode 100644
index 378fd419..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/1c/20565b3f05b4001d128fb79045552177
+++ /dev/null
@@ -1,28 +0,0 @@
-<!DOCTYPE html>
-<html xmlns:th="http://www.thymeleaf.org">
-
-<head>
-	<meta http-equiv="Content-Type" content="text/html; charset= UTF-8">
-	<meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0">
-	<title>Login - Shopme Admin</title>
-	<link rel="stylesheet" type="text/css" th:href="@{/webjars/bootstrap/css/bootstrap.min.css}" />
-</head>
-
-<body>
-	<div class="container-fluid">
-		
-
-		<div>
-			<h1>Custom login page</h1>
-		</div>
-
-		<div>
-			<p>Shopme Control Panel - Copyright &copy; Shopme</p>
-		</div>
-
-
-	</div>
-
-</body>
-
-</html>
\ No newline at end of file
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/1c/80fc0b8b26b8001d1d97982e354adf88 b/.metadata/.plugins/org.eclipse.core.resources/.history/1c/80fc0b8b26b8001d1d97982e354adf88
deleted file mode 100644
index ddd094c6..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/1c/80fc0b8b26b8001d1d97982e354adf88
+++ /dev/null
@@ -1,23 +0,0 @@
-package com.shopme.admin.category;
-
-import java.util.List;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import com.shopme.common.entity.Category;
-
-@Service
-public class CategoryService {
-
-	@Autowired
-	private CategoryRepository repo;
-	
-	public List<Category> listAll(){
-		return (List<Category>) repo.findAll();
-	}
-	
-	public List<Category> listCategoriesUsedInForm(){
-		return (List<Category>) repo.findAll();
-	}
-}
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/1c/a02bce3609b4001d128fb79045552177 b/.metadata/.plugins/org.eclipse.core.resources/.history/1c/a02bce3609b4001d128fb79045552177
deleted file mode 100644
index 7fe2dcf7..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/1c/a02bce3609b4001d128fb79045552177
+++ /dev/null
@@ -1,46 +0,0 @@
-package com.shopme.admin.security;
-
-import org.aspectj.weaver.ast.And;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.security.config.annotation.web.builders.HttpSecurity;
-import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
-import org.springframework.security.config.annotation.web.configuration.WebSecurityConfiguration;
-import org.springframework.security.config.annotation.web.configuration.WebSecurityCustomizer;
-import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
-import org.springframework.security.crypto.password.PasswordEncoder;
-import org.springframework.security.web.SecurityFilterChain;
-
-@Configuration
-@EnableWebSecurity
-public class WebSecurityConfig {
-
-	/*
-	 * refer to this link: https://www.codejava.net/frameworks/spring-boot/fix-
-	 * websecurityconfigureradapter-deprecated
-	 * 
-	 */
-
-	@Bean
-	public PasswordEncoder PasswordEncoder() {
-		return new BCryptPasswordEncoder();
-	}
-
-	@Bean
-	public SecurityFilterChain filterChain(HttpSecurity http) throws Exception {
-
-		// any request need to be authenticated (require login)
-		// custom login page at "/login" - handler method in MainController class
-		http.authorizeHttpRequests().anyRequest().authenticated().and().formLogin().loginPage("/login").permitAll();
-
-		return http.build();
-	}
-
-	//NOTE: antMatchers() changed to requestMatchers()
-	//stack: https://stackoverflow.com/questions/74907533/the-method-antmatchersstring-is-undefined-for-the-type
-	@Bean
-	public WebSecurityCustomizer webSecurityCustomizer() {
-		return (web) -> web.ignoring().requestMatchers("/images/**", "/js/**", "/webjars/**");
-	}
-
-}
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/1d/30b98d238bb3001d19bbb001c1a81c20 b/.metadata/.plugins/org.eclipse.core.resources/.history/1d/30b98d238bb3001d19bbb001c1a81c20
deleted file mode 100644
index 41bc2dca..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/1d/30b98d238bb3001d19bbb001c1a81c20
+++ /dev/null
@@ -1,259 +0,0 @@
-<!DOCTYPE html>
-<html xmlns:th="http://www.thymeleaf.org">
-
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset= UTF-8">
-<meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0">
-<title>Manage Users</title>
-
-<link rel="stylesheet" type="text/css" th:href="@{/webjars/bootstrap/css/bootstrap.min.css}" />
-<link rel="stylesheet" type="text/css" th:href="@{/fontawesome/all.css}" />
-<link rel="stylesheet" type="text/css" th:href="@{/style.css}" />
-	
-<script type="text/javascript" th:src="@{/webjars/jquery/jquery.min.js}"></script>
-<script type="text/javascript" th:src="@{/webjars/bootstrap/js/bootstrap.min.js}"></script>
-</head>
-
-<body>
-	<div class="container-fluid">
-		<div>
-			<nav class="navbar navbar-expand-lg bg-dark navbar-dark">
-				<a class="navbar-brand" th:href="@{/}"> <img
-					th:src="@{/images/ShopmeAdminSmall.png}" />
-				</a>
-				<!--hamburger toggler for mobile devices(responsive)-->
-				<button class="navbar-toggler" type="button" data-toggle="collapse"
-					data-target="#topNavbar">
-					<span class="navbar-toggler-icon"></span>
-				</button>
-				<div class="collapse navbar-collapse" id="topNavbar">
-					<ul class="navbar-nav">
-						<li class="nav-item"><a class="nav-link" th:href="@{/users}">Users</a>
-						</li>
-						<li class="nav-item"><a class="nav-link"
-							th:href="@{/categories}">Categories</a></li>
-						<li class="nav-item"><a class="nav-link" th:href="@{/brands}">Brands</a>
-						</li>
-						<li class="nav-item"><a class="nav-link"
-							th:href="@{/products}">Products</a></li>
-						<li class="nav-item"><a class="nav-link"
-							th:href="@{/customers}">Customers</a></li>
-						<li class="nav-item"><a class="nav-link"
-							th:href="@{/shipping}">Shipping</a></li>
-						<li class="nav-item"><a class="nav-link" th:href="@{/orders}">Orders</a>
-						</li>
-						<li class="nav-item"><a class="nav-link" th:href="@{/report}">Sales
-								Report</a></li>
-						<li class="nav-item"><a class="nav-link"
-							th:href="@{/articles}">Articles</a></li>
-						<li class="nav-item"><a class="nav-link" th:href="@{/menus}">Menus</a>
-						</li>
-						<li class="nav-item"><a class="nav-link"
-							th:href="@{/settings}">Settings</a></li>
-					</ul>
-				</div>
-
-			</nav>
-		</div>
-
-		<div>
-			<h2>Manage Users</h2>
-			<a th:href="@{/users/new}" class="fas fa-user-plus fa-2x icon-dark mr-2"></a>
-			
-			<a th:href="@{/users/export/csv}" class="fas fa-file-csv fa-2x icon-dark mr-2"></a>
-		</div>
-		
-		
-		
-		<!-- only display success message when a new user is created -->
-		<div th:if="${message != null}" class="alert alert-success text-center">
-			[[${message}]]
-		</div>
-			
-		<div>
-			<form th:action="@{/users/page/1}" class="form-inline m-3">
-				
-				<input type="hidden" name="sortField" th:value="${sortField}" />
-				<input type="hidden" name="sortDir" th:value="${sortDir}" />
-				Filter:&nbsp;
-				<input type="search" name="keyword" th:value="${keyword}" class="form-control" required/>
-				&nbsp;&nbsp;
-				<button type="submit" class="btn btn-primary">
-					<i class="fas fa-search"></i>
-				</button>
-				&nbsp;&nbsp;
-				<button type="button" class="btn btn-secondary" onclick="clearFilter()">
-					<i class="fas fa-eraser"></i>
-				</button>
-			</form>
-		
-		</div>
-
-
-			<div class="full-details">
-				<table class="table table-bordered table-striped table-hover table-responsive-xL">
-					<thead class="thead-dark">
-						<tr>
-							<!-- refer to templates/fragments.html for fragment code-->
-							<th th:replace="fragments :: column_link('id', 'User ID')"/>
-							<th>Photos</th>
-							<th th:replace="fragments :: column_link('email', 'Email')"/>
-							<th th:replace="fragments :: column_link('firstName', 'First Name')"/>
-							<th th:replace="fragments :: column_link('lastName', 'Last Name')"/>
-							<th>Roles</th>
-							<th th:replace="fragments :: column_link('enabled', 'Enabled')"/>
-							<th></th>
-						</tr>
-					</thead>
-					<tbody>
-						<tr th:each="user : ${listUsers}">
-							<td>[[${user.id}]]</td>
-							<td>
-								<span th:if="${user.photos == null}" class="fas fa-portrait fa-3x icon-dark"></span>
-								<img th:if="${user.photos != null}" th:src="@{${user.photosImagePath}}"
-								style="width: 100px"/>
-							</td>
-							<td>[[${user.email}]]</td>
-							<td>[[${user.firstName}]]</td>
-							<td>[[${user.lastName}]]</td>
-							<td>[[${user.roles}]]</td>
-							
-							<td>
-								<a th:if="${user.enabled == true}" class="fas fa-check-circle fa-2x icon-green" 
-								th:href="@{'/users/' + ${user.id} + '/enabled/false'}"
-								title="Disable this user"></a>
-								
-								<a th:if="${user.enabled == false}" class="fas fa-circle fa-2x icon-silver"
-								 th:href="@{'/users/' + ${user.id} + '/enabled/true'}"
-								 title="Enable this user"></a>
-							</td>
-							<td>
-									<a class="fas fa-edit fa-2x icon-green" th:href="@{'/users/edit/' + ${user.id}}"
-									title="edit this user"></a>
-									&nbsp; 
-									<a class="fas fa-trash fa-2x icon-dark link-delete" th:href="@{'/users/delete/' + ${user.id}}"
-									title="delete this user" th:userId="${user.id}"></a>
-							</td>
-						</tr>
-					</tbody>
-				</table>
-			</div>
-			
-			
-			<!-- display this on mobile screens only, refer to /static/style.css for more info-->
-			<div class="less-details">
-				
-				<div th:each="user : ${listUsers}" class="row m-1">
-					
-					<div class="col">
-						
-						<span th:if="${user.photos == null}" class="fas fa-portrait fa-3x icon-dark"></span>
-								<img th:if="${user.photos != null}" th:src="@{${user.photosImagePath}}"
-								style="width: 100px"/>
-					</div>
-						<div>
-						
-						
-						</div>
-					<div>&nbsp;</div>
-				</div>
-			</div>
-			
-			
-			<!-- IF -->
-			<div class="text-center m-1" th:if="${totalItems > 0}">
-				<span>Showing Users # [[${startCount}]] to [[${endCount}]] of [[${totalItems}]]</span>
-			</div>
-			
-			<!-- ELSE -->
-			<div class="text-center m-1" th:unless="${totalItems > 0}">
-				<span>No users found</span>
-			</div>
-			
-			<!-- only display pagination when there are users; else, no users no pagination -->
-			<div th:if="${totalPages > 1}">
-				<nav>
-					  <ul class="pagination justify-content-center">
-					  
-					  	<li th:class=" ${currentPage > 1 ? 'page-item' : 'page-item disabled'}">
-					  		<a th:replace="fragments :: page_link(1, 'First')"></a>
-				    	</li>
-					  
-					    <li th:class=" ${currentPage > 1 ? 'page-item' : 'page-item disabled'}">
-					    	<a th:replace="fragments :: page_link(${currentPage - 1 }, 'previous')"></a>
-				    	</li>
-					    	
-					    <!-- org.thymeleaf.expression.Numbers class, An object of this class is usually available in variable evaluation expressions with the name #numbers. -->
-					    <li th:class="${currentPage != i ? 'page-item' : 'page-item active'}" 
-					    	th:each="i : ${#numbers.sequence(1, totalPages)}">
-					    	<a th:replace="fragments :: page_link(${i}, ${i})"></a>
-					    </li>
-					    
-					    <li  th:class=" ${currentPage < totalPages ? 'page-item' : 'page-item disabled'}">
-					    	<a th:replace="fragments :: page_link(${currentPage + 1}, 'Next')"></a>
-					    </li>
-					    
-					    <li th:class=" ${currentPage < totalPages ? 'page-item' : 'page-item disabled'}">
-							<a th:replace="fragments :: page_link(${totalPages}, 'Last')"></a>		
-					    </li>
-					  </ul>
-				</nav>
-			</div>
-			
-			
-			
-			<div class="modal fade text-center" id="confirmModal">
-				<div class="modal-dialog">
-					<div class="modal-content">
-					
-						<div class="modal-header">
-							<h4 class="modal-title">Delete Confirmation</h4>
-							<button type="button" class="close" data-dismiss="modal">&times;</button>
-						</div>
-						
-						<div class="modal-body">
-							<span id="confirmText"></span>
-						</div>
-						
-						<div class="modal-footer">
-							<a class="btn btn-success" href="" id="yesButton">Yes</a>
-							<button type="button" class="btn btn-danger" data-dismiss="modal">Close</button>
-						</div>
-					</div>
-				</div>
-			</div>
-			
-			
-			<div class="text-center">
-				<p>Shopme Control Panel - Copyright &copy; Shopme</p>
-			</div>
-
-
-	</div>
-	
-<script type="text/javascript">
-
-//confirmation modal dialogue for delete user
-$(document).ready(function(){
-	$(".link-delete").on("click", function(e){
-		//stop the <a> tag default behaviour and pop out a confirmation modal dialogue
-		e.preventDefault();
-		//alert($(this).attr("href"));
-		link = $(this);
-		userId = link.attr("userId");
-		$("#yesButton").attr("href", link.attr("href"));
-		$("#confirmText").text("Are you sure you want to delete this user ID " + userId + "?");
-		$("#confirmModal").modal();
-	});
-});
-
-	function clearFilter(){
-		window.location = "[[@{/users}]]";
-	}
-
-
-</script>
-	
-</body>
-
-</html>
\ No newline at end of file
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/1d/604aa35e4bb4001d1d079a924effdc9e b/.metadata/.plugins/org.eclipse.core.resources/.history/1d/604aa35e4bb4001d1d079a924effdc9e
deleted file mode 100644
index 6c9dc19d..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/1d/604aa35e4bb4001d1d079a924effdc9e
+++ /dev/null
@@ -1,87 +0,0 @@
-package com.shopme.admin.security;
-
-import org.aspectj.weaver.ast.And;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.security.authentication.dao.DaoAuthenticationProvider;
-import org.springframework.security.config.annotation.web.builders.HttpSecurity;
-import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
-import org.springframework.security.config.annotation.web.configuration.WebSecurityConfiguration;
-import org.springframework.security.config.annotation.web.configuration.WebSecurityCustomizer;
-import org.springframework.security.core.userdetails.UserDetailsService;
-import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
-import org.springframework.security.crypto.password.PasswordEncoder;
-import org.springframework.security.web.SecurityFilterChain;
-
-@Configuration
-@EnableWebSecurity
-public class WebSecurityConfig {
-
-	/*
-	 * refer to this link: https://www.codejava.net/frameworks/spring-boot/fix-
-	 * websecurityconfigureradapter-deprecated
-	 * 
-	 */
-	
-	
-	 /* This bean will be called by spring security when performing authentication*/ 
-	@Bean
-	public UserDetailsService  userDetailsService()	{
-		return new ShopmeUserDetailsService();
-	}
-	
-
-	@Bean
-	public PasswordEncoder passwordEncoder() {
-		return new BCryptPasswordEncoder();
-	}
-
-	
-	@Bean
-	public DaoAuthenticationProvider authenticationProvider() {
-	    DaoAuthenticationProvider authProvider = new DaoAuthenticationProvider();
-	     
-	    authProvider.setUserDetailsService(userDetailsService());
-	    authProvider.setPasswordEncoder(passwordEncoder());
-	 
-	    return authProvider;
-	}
-	
-	
-	@Bean
-	public SecurityFilterChain filterChain(HttpSecurity http) throws Exception {
-
-		// any request need to be authenticated (require login)
-		// custom login page at "/login" - handler method in MainController class
-		http.authorizeHttpRequests()
-			.anyRequest().authenticated()
-			.and()
-			.formLogin()
-				.loginPage("/login")
-				.usernameParameter("email")
-				.permitAll()
-			.and().logout().permitAll()
-			.and().rememberMe().key("AbcDefgHijKlmnOpqrs_1234567890"); 
-		
-		/*
-		 * set a fix key used for the md5 hash algorithm to encrypt cookie content each
-		 * time the application is restarted, a new key will be generated; this key will
-		 * be used to encrypt the cookie content so, in order for the cookie to be
-		 * permanent; a fix key is needed.
-		 */
-		
-		http.authenticationProvider(authenticationProvider());
-		
-		
-		return http.build();
-	}
-
-	//NOTE: antMatchers() changed to requestMatchers()
-	//stack: https://stackoverflow.com/questions/74907533/the-method-antmatchersstring-is-undefined-for-the-type
-	@Bean
-	public WebSecurityCustomizer webSecurityCustomizer() {
-		//permit access to the assets in the following directories
-		return (web) -> web.ignoring().requestMatchers("/images/**", "/js/**", "/webjars/**");
-	}
-
-}
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/1d/a0be049f13b4001d128fb79045552177 b/.metadata/.plugins/org.eclipse.core.resources/.history/1d/a0be049f13b4001d128fb79045552177
deleted file mode 100644
index e0332645..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/1d/a0be049f13b4001d128fb79045552177
+++ /dev/null
@@ -1,77 +0,0 @@
-package com.shopme.admin.security;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-import java.util.Set;
-
-import org.springframework.security.core.GrantedAuthority;
-import org.springframework.security.core.authority.SimpleGrantedAuthority;
-import org.springframework.security.core.userdetails.UserDetails;
-
-import com.shopme.common.entity.Role;
-import com.shopme.common.entity.User;
-
-/*
- *  Think of it as a wrapper class for  Type User
- * 
- * */
-public class ShopmeUserDetails implements UserDetails {
-
-	private User user;
-
-	public ShopmeUserDetails(User user) {
-		this.user = user;
-	}
-
-	@Override
-	public Collection<? extends GrantedAuthority> getAuthorities() {
-
-		Set<Role> roles = user.getRoles();
-
-		List<SimpleGrantedAuthority> authorities = new ArrayList<>();
-
-		for (Role role : roles) {
-			authorities.add(new SimpleGrantedAuthority(role.getName()));
-		}
-
-		return authorities;
-	}
-
-	@Override
-	public String getPassword() {
-		// TODO Auto-generated method stub
-		return null;
-	}
-
-	@Override
-	public String getUsername() {
-		// TODO Auto-generated method stub
-		return null;
-	}
-
-	@Override
-	public boolean isAccountNonExpired() {
-		// TODO Auto-generated method stub
-		return false;
-	}
-
-	@Override
-	public boolean isAccountNonLocked() {
-		// TODO Auto-generated method stub
-		return false;
-	}
-
-	@Override
-	public boolean isCredentialsNonExpired() {
-		// TODO Auto-generated method stub
-		return false;
-	}
-
-	@Override
-	public boolean isEnabled() {
-		// TODO Auto-generated method stub
-		return false;
-	}
-
-}
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/1d/f06238e929b8001d1d97982e354adf88 b/.metadata/.plugins/org.eclipse.core.resources/.history/1d/f06238e929b8001d1d97982e354adf88
deleted file mode 100644
index 4b477ae0..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/1d/f06238e929b8001d1d97982e354adf88
+++ /dev/null
@@ -1,65 +0,0 @@
-package com.shopme.admin.category;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Set;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import com.shopme.common.entity.Category;
-
-@Service
-public class CategoryService {
-
-	@Autowired
-	private CategoryRepository repo;
-	
-	public List<Category> listAll(){
-		return (List<Category>) repo.findAll();
-	}
-	
-	public List<Category> listCategoriesUsedInForm(){
-		
-		List<Category> categoriesUsedInForm = new ArrayList<>();
-		
-		Iterable<Category> categoriesInDB = repo.findAll();
-		
-		for (Category category : categoriesInDB) {
-
-			// root category
-			if (category.getParent() == null) {
-				categoriesUsedInForm.add(new Category(category.getName()));
-
-				category.getChildren().forEach(subCategory -> {
-
-					System.out.println("--" + subCategory.getName());
-					listChildren(subCategory, 1);
-				});
-			}
-
-		}
-		
-		
-		return categoriesUsedInForm;
-	}
-	
-	private void listChildren(Category parent, int subLevel) {
-
-		int newSubLevel = subLevel + 1;
-		Set<Category> children = parent.getChildren();
-
-		for (Category subCategory : children) {
-
-			for (int i = 0; i < newSubLevel; i++) {
-				System.out.print("--");
-			}
-
-			System.out.println(subCategory.getName());
-
-			printChildren(subCategory, newSubLevel);
-		}
-
-	}
-	
-}
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/1e/e0dd64f229b8001d1d97982e354adf88 b/.metadata/.plugins/org.eclipse.core.resources/.history/1e/e0dd64f229b8001d1d97982e354adf88
deleted file mode 100644
index a61dfe94..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/1e/e0dd64f229b8001d1d97982e354adf88
+++ /dev/null
@@ -1,65 +0,0 @@
-package com.shopme.admin.category;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Set;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import com.shopme.common.entity.Category;
-
-@Service
-public class CategoryService {
-
-	@Autowired
-	private CategoryRepository repo;
-	
-	public List<Category> listAll(){
-		return (List<Category>) repo.findAll();
-	}
-	
-	public List<Category> listCategoriesUsedInForm(){
-		
-		List<Category> categoriesUsedInForm = new ArrayList<>();
-		
-		Iterable<Category> categoriesInDB = repo.findAll();
-		
-		for (Category category : categoriesInDB) {
-
-			// root category
-			if (category.getParent() == null) {
-				categoriesUsedInForm.add(new Category(category.getName()));
-
-				categoriesUsedInForm.getChildren().forEach(subCategory -> {
-
-					System.out.println("--" + subCategory.getName());
-					listChildren(subCategory, 1);
-				});
-			}
-
-		}
-		
-		
-		return categoriesUsedInForm;
-	}
-	
-	private void listChildren(Category parent, int subLevel) {
-
-		int newSubLevel = subLevel + 1;
-		Set<Category> children = parent.getChildren();
-
-		for (Category subCategory : children) {
-
-			for (int i = 0; i < newSubLevel; i++) {
-				System.out.print("--");
-			}
-
-			System.out.println(subCategory.getName());
-
-			printChildren(subCategory, newSubLevel);
-		}
-
-	}
-	
-}
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/20/00b8af2b46b4001d1d079a924effdc9e b/.metadata/.plugins/org.eclipse.core.resources/.history/20/00b8af2b46b4001d1d079a924effdc9e
deleted file mode 100644
index 6339824a..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/20/00b8af2b46b4001d1d079a924effdc9e
+++ /dev/null
@@ -1,44 +0,0 @@
-<!DOCTYPE html>
-<html xmlns:th="http://www.thymeleaf.org"
-	  xmlns:sec="https://www.thymeleaf.org/thymeleaf-extras-springsecurity5">
-
-<head th:replace="fragments :: page_head('Home - Shopme Admin')"/>
-
-<body>
-	<div class="container-fluid">
-			
-			<!-- navigation bar -->
-		<div th:replace="navigation :: menu"></div>
-
-		<div>
-			<h1>Shopme Control Panel</h1>
-		</div>
-
-		<div>
-			<p>Shopme Control Panel - Copyright &copy; Shopme</p>
-		</div>
-
-
-	</div>
-	
-<script type="text/javascript">
-
-	$(document).ready(function(){
-		$("#logoutLink").on("click", function(e){
-			e.preventDefault(); /* stop the hyperlink default behaviour  */
-			
-			
-			/* use  the form to  log out and navigate to the url path /logout  
-			
-			 NOTE: spring security requires a POST request form to logout in order to obtain the csrf token, 
-			 		the csrf token is a hidden property in the form
-			*/
-			document.logoutForm.submit();
-		});
-	});
-
-</script>
-
-</body>
-
-</html>
\ No newline at end of file
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/20/00ed8abc09b4001d128fb79045552177 b/.metadata/.plugins/org.eclipse.core.resources/.history/20/00ed8abc09b4001d128fb79045552177
deleted file mode 100644
index 26a9656e..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/20/00ed8abc09b4001d128fb79045552177
+++ /dev/null
@@ -1,31 +0,0 @@
-<!DOCTYPE html>
-<html xmlns:th="http://www.thymeleaf.org">
-
-<head>
-	<meta http-equiv="Content-Type" content="text/html; charset= UTF-8">
-	<meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0">
-	<title>Login - Shopme Admin</title>
-	<link rel="stylesheet" type="text/css" th:href="@{/webjars/bootstrap/css/bootstrap.min.css}" />
-</head>
-
-<body>
-	<div class="container-fluid text-center">
-		
-		<div>
-			<img th:src="@{/images/ShopmeAdminBig.png}" />
-		</div>
-		
-		<form th:action="@{/login}" method="post">
-		
-		
-		</form>
-
-		<div>
-			<p>Shopme Control Panel - Copyright &copy; Shopme</p>
-		</div>
-
-	</div>
-
-</body>
-
-</html>
\ No newline at end of file
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/21/20c1dbba2fb4001d1d079a924effdc9e b/.metadata/.plugins/org.eclipse.core.resources/.history/21/20c1dbba2fb4001d1d079a924effdc9e
deleted file mode 100644
index ac3f05c8..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/21/20c1dbba2fb4001d1d079a924effdc9e
+++ /dev/null
@@ -1,103 +0,0 @@
-<!DOCTYPE html>
-<html xmlns:th="http://www.thymeleaf.org"
-	  xmlns:sec="https://www.thymeleaf.org/thymeleaf-extras-springsecurity5">
-
-<head>
-	<meta http-equiv="Content-Type" content="text/html; charset= UTF-8">
-	<meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0">
-	<title>Home - Shopme Admin</title>
-	
-	<link rel="stylesheet" type="text/css" th:href="@{/fontawesome/all.css}" />
-	<link rel="stylesheet" type="text/css" th:href="@{/style.css}" />
-	<link rel="stylesheet" type="text/css" th:href="@{/webjars/bootstrap/css/bootstrap.min.css}" />
-	
-	<script type="text/javascript" th:src="@{/webjars/jquery/jquery.min.js}"></script>
-	<script type="text/javascript" th:src="@{/webjars/bootstrap/js/bootstrap.min.js}"></script>
-</head>
-
-<body>
-	<div class="container-fluid">
-		<div>
-			<form th:action="@{/logout}" method="post" th:hidden="true" name="logoutForm">
-				<input type="submit"/>
-			</form>
-			<nav class="navbar navbar-expand-lg bg-dark navbar-dark">
-				<a class="navbar-brand" th:href="@{/}">
-					<img th:src="@{/images/ShopmeAdminSmall.png}"/>
-				</a>
-				<!--hamburger toggler for mobile devices(responsive)-->
-				<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#topNavbar">
-					<span class="navbar-toggler-icon"></span>
-				</button>
-				<div class="collapse navbar-collapse" id="topNavbar">
-					<ul class="navbar-nav">
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/users}">Users</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/categories}">Categories</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/brands}">Brands</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/products}">Products</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/customers}">Customers</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/shipping}">Shipping</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/orders}">Orders</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/report}">Sales Report</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/articles}">Articles</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/menus}">Menus</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/settings}">Settings</a>
-						</li>
-						<li>
-							<span class="fas fa-user fa-2x icon-silver"></span>
-						</li>
-						<li class="nav-item dropdown">
-								<!-- principal refers to user; display username -->
-							<a class="nav-link dropdown-toggle" sec:authentication="principal.fullname" data-toggle="dropdown"></a>
-							<div class="dropdown-menu">
-								<a class="dropdown-item" id="logoutLink" href="">Logout</a>
-							</div>
-							
-						</li>
-					</ul>
-				</div>
-				
-			</nav>
-		</div>
-
-		<div>
-			<h1>Shopme Control Panel</h1>
-		</div>
-
-		<div>
-			<p>Shopme Control Panel - Copyright &copy; Shopme</p>
-		</div>
-
-
-	</div>
-	
-<script type="text/javascript">
-
-
-
-</script>
-
-</body>
-
-</html>
\ No newline at end of file
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/21/90513610f8b3001d128fb79045552177 b/.metadata/.plugins/org.eclipse.core.resources/.history/21/90513610f8b3001d128fb79045552177
deleted file mode 100644
index 05667546..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/21/90513610f8b3001d128fb79045552177
+++ /dev/null
@@ -1,78 +0,0 @@
-<!DOCTYPE html>
-<html xmlns:th="http://www.thymeleaf.org">
-
-<head>
-	<meta http-equiv="Content-Type" content="text/html; charset= UTF-8">
-	<meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0">
-	<title>Login - Shopme Admin</title>
-	<link rel="stylesheet" type="text/css" th:href="@{/webjars/bootstrap/css/bootstrap.min.css}" />
-	<script type="text/javascript" th:src="@{/webjars/jquery/jquery.min.js}"></script>
-	<script type="text/javascript" th:src="@{/webjars/bootstrap/js/bootstrap.min.js}"></script>
-</head>
-
-<body>
-	<div class="container-fluid">
-		<div>
-			<nav class="navbar navbar-expand-lg bg-dark navbar-dark">
-				<a class="navbar-brand" th:href="@{/}">
-					<img th:src="@{/images/ShopmeAdminSmall.png}"/>
-				</a>
-				<!--hamburger toggler for mobile devices(responsive)-->
-				<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#topNavbar">
-					<span class="navbar-toggler-icon"></span>
-				</button>
-				<div class="collapse navbar-collapse" id="topNavbar">
-					<ul class="navbar-nav">
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/users}">Users</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/categories}">Categories</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/brands}">Brands</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/products}">Products</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/customers}">Customers</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/shipping}">Shipping</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/orders}">Orders</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/report}">Sales Report</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/articles}">Articles</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/menus}">Menus</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/settings}">Settings</a>
-						</li>
-					</ul>
-				</div>
-				
-			</nav>
-		</div>
-
-		<div>
-			<h1>Shopme Control Panel</h1>
-		<div />
-
-		<div>
-			<p>Shopme Control Panel - Copyright &copy; Shopme</p>
-		<div />
-
-
-	</div>
-
-</body>
-
-</html>
\ No newline at end of file
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/35/a0aeab1b46b4001d1d079a924effdc9e b/.metadata/.plugins/org.eclipse.core.resources/.history/22/30d088250db9001d11addcb4256c67f9
similarity index 69%
rename from .metadata/.plugins/org.eclipse.core.resources/.history/35/a0aeab1b46b4001d1d079a924effdc9e
rename to .metadata/.plugins/org.eclipse.core.resources/.history/22/30d088250db9001d11addcb4256c67f9
index 4a08b73d..99321d7c 100644
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/35/a0aeab1b46b4001d1d079a924effdc9e
+++ b/.metadata/.plugins/org.eclipse.core.resources/.history/22/30d088250db9001d11addcb4256c67f9
@@ -1,33 +1,30 @@
 <!DOCTYPE html>
 <html xmlns:th="http://www.thymeleaf.org">
 
-<head th:replace="fragments :: page_head('Users - Shopme Admin')"/>
+<head th:replace="fragments :: page_head('Categories - Shopme Admin')"/>
 
 <body>
 	<div class="container-fluid">
 		
-		<!-- navigation -->
+		<!-- navigation bar -->
 		<div th:replace="navigation :: menu"></div>
 
 		<div>
-			<h2>Manage Users</h2>
-			<a th:href="@{/users/new}" class="fas fa-user-plus fa-2x icon-dark mr-2"></a>
+			<h2>Manage Categories</h2>
+			<a th:href="@{/categories/new}" class="fas fa-folder-plus fa-2x icon-dark mr-2"></a>
 			
-			<a th:href="@{/users/export/csv}" class="fas fa-file-csv fa-2x icon-dark mr-2"></a>
+			<a th:href="@{/categories/export/csv}" class="fas fa-file-csv fa-2x icon-dark mr-2"></a>
 		</div>
 		
-		
-		
-		<!-- only display success message when a new user is created -->
+		<!-- redirect message from controller -->
 		<div th:if="${message != null}" class="alert alert-success text-center">
 			[[${message}]]
 		</div>
+		
 			
 		<div>
-			<form th:action="@{/users/page/1}" class="form-inline m-3">
+			<form th:action="@{/categories/page/1}" class="form-inline m-3">
 				
-				<input type="hidden" name="sortField" th:value="${sortField}" />
-				<input type="hidden" name="sortDir" th:value="${sortDir}" />
 				Filter:&nbsp;
 				<input type="search" name="keyword" th:value="${keyword}" class="form-control" required/>
 				&nbsp;&nbsp;
@@ -47,53 +44,27 @@
 				<table class="table table-bordered table-striped table-hover table-responsive-xL">
 					<thead class="thead-dark">
 						<tr>
-							<!-- refer to templates/fragments.html for fragment code-->
-							
-							<th class="hideable-column">
-								<th th:replace="fragments :: column_link('id', 'User ID', 'tag')"/>
-							</th>
-							
-							<th>Photos</th>
-							
-							<th class="hideable-column">
-								<th th:replace="fragments :: column_link('email', 'Email', 'tag')"/>
-							</th>
-							
-							<th th:replace="fragments :: column_link('firstName', 'First Name', 'none')"/>
-							<th th:replace="fragments :: column_link('lastName', 'Last Name', 'none')"/>
-							<th>Roles</th>
-							<th th:replace="fragments :: column_link('enabled', 'Enabled', 'none')"/>
+							<th>ID</th>
+							<th>Category Image</th>
+							<th>Category Name</th>
+							<th>Alias</th>
+							<th>Enabled</th>
 							<th></th>
 						</tr>
 					</thead>
 					<tbody>
-						<tr th:each="user : ${listUsers}">
-							<td class="hideable-column">[[${user.id}]]</td>
-							<td>
-								<span th:if="${user.photos == null}" class="fas fa-portrait fa-3x icon-dark"></span>
-								<img th:if="${user.photos != null}" th:src="@{${user.photosImagePath}}"
-								style="width: 100px"/>
+						<tr th:each="cat : ${listCategories}">
+							<td>[[${cat.id}]]</td>
+							<td>	
+								<img th:src="@{${cat.imagePath}}"/>
 							</td>
-							<td class="hideable-column">[[${user.email}]]</td>
-							<td>[[${user.firstName}]]</td>
-							<td>[[${user.lastName}]]</td>
-							<td>[[${user.roles}]]</td>
-							
+							<td>[[${cat.name}]]</td>
+							<td>[[${cat.alias}]]</td>
 							<td>
-								<a th:if="${user.enabled == true}" class="fas fa-check-circle fa-2x icon-green" 
-								th:href="@{'/users/' + ${user.id} + '/enabled/false'}"
-								title="Disable this user"></a>
-								
-								<a th:if="${user.enabled == false}" class="fas fa-circle fa-2x icon-silver"
-								 th:href="@{'/users/' + ${user.id} + '/enabled/true'}"
-								 title="Enable this user"></a>
+								<div th:replace="fragments :: category_status"></div>
 							</td>
 							<td>
-									<a class="fas fa-edit fa-2x icon-green" th:href="@{'/users/edit/' + ${user.id}}"
-									title="edit this user"></a>
-									&nbsp; 
-									<a class="fas fa-trash fa-2x icon-dark link-delete" th:href="@{'/users/delete/' + ${user.id}}"
-									title="delete this user" th:userId="${user.id}"></a>
+								<div th:replace="fragments :: category_actions"></div>
 							</td>
 						</tr>
 					</tbody>
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/22/70ea77204bb4001d1d079a924effdc9e b/.metadata/.plugins/org.eclipse.core.resources/.history/22/70ea77204bb4001d1d079a924effdc9e
deleted file mode 100644
index a231e376..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/22/70ea77204bb4001d1d079a924effdc9e
+++ /dev/null
@@ -1,83 +0,0 @@
-package com.shopme.admin.security;
-
-import org.aspectj.weaver.ast.And;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.security.authentication.dao.DaoAuthenticationProvider;
-import org.springframework.security.config.annotation.web.builders.HttpSecurity;
-import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
-import org.springframework.security.config.annotation.web.configuration.WebSecurityConfiguration;
-import org.springframework.security.config.annotation.web.configuration.WebSecurityCustomizer;
-import org.springframework.security.core.userdetails.UserDetailsService;
-import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
-import org.springframework.security.crypto.password.PasswordEncoder;
-import org.springframework.security.web.SecurityFilterChain;
-
-@Configuration
-@EnableWebSecurity
-public class WebSecurityConfig {
-
-	/*
-	 * refer to this link: https://www.codejava.net/frameworks/spring-boot/fix-
-	 * websecurityconfigureradapter-deprecated
-	 * 
-	 */
-	
-	
-	 /* This bean will be called by spring security when performing authentication*/ 
-	@Bean
-	public UserDetailsService  userDetailsService()	{
-		return new ShopmeUserDetailsService();
-	}
-	
-
-	@Bean
-	public PasswordEncoder passwordEncoder() {
-		return new BCryptPasswordEncoder();
-	}
-
-	
-	@Bean
-	public DaoAuthenticationProvider authenticationProvider() {
-	    DaoAuthenticationProvider authProvider = new DaoAuthenticationProvider();
-	     
-	    authProvider.setUserDetailsService(userDetailsService());
-	    authProvider.setPasswordEncoder(passwordEncoder());
-	 
-	    return authProvider;
-	}
-	
-	
-	@Bean
-	public SecurityFilterChain filterChain(HttpSecurity http) throws Exception {
-
-		// any request need to be authenticated (require login)
-		// custom login page at "/login" - handler method in MainController class
-		http.authorizeHttpRequests()
-			.anyRequest().authenticated()
-			.and()
-			.formLogin()
-				.loginPage("/login")
-				.usernameParameter("email")
-				.permitAll()
-			.and().logout().permitAll()
-			.and().rememberMe().key("AbcDefgHijKlmnOpqrs_1234567890"); 
-				// set a fix key used for the md5 hash algorithm to encrypt cookie content
-				//each time the application is restarted, a new key will be generated; this key will be used to encrypt the cookie content
-				//so, in order for the cookie to be permanent; a fix key is needed.
-		
-		http.authenticationProvider(authenticationProvider());
-		
-		
-		return http.build();
-	}
-
-	//NOTE: antMatchers() changed to requestMatchers()
-	//stack: https://stackoverflow.com/questions/74907533/the-method-antmatchersstring-is-undefined-for-the-type
-	@Bean
-	public WebSecurityCustomizer webSecurityCustomizer() {
-		//permit access to the assets in the following directories
-		return (web) -> web.ignoring().requestMatchers("/images/**", "/js/**", "/webjars/**");
-	}
-
-}
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/23/403f0d373fb3001d1e75aa5ef0815903 b/.metadata/.plugins/org.eclipse.core.resources/.history/23/403f0d373fb3001d1e75aa5ef0815903
deleted file mode 100644
index b7b46809..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/23/403f0d373fb3001d1e75aa5ef0815903
+++ /dev/null
@@ -1,51 +0,0 @@
-package com.shopme.admin.user;
-
-import org.springframework.data.domain.Page;
-import org.springframework.data.domain.Pageable;
-import org.springframework.data.jpa.repository.Modifying;
-import org.springframework.data.jpa.repository.Query;
-import org.springframework.data.repository.CrudRepository;
-import org.springframework.data.repository.PagingAndSortingRepository;
-import org.springframework.data.repository.query.Param;
-import org.springframework.stereotype.Repository;
-
-import com.shopme.common.entity.User;
-
-@Repository
-public interface UserRepository extends CrudRepository<User, Integer>, PagingAndSortingRepository<User, Integer> {
-
-	/*
-	 * JPQL statement. It should be noted that as compared to native SQL, JPQL does
-	 * not interact with database tables, records, and fields - but with Java
-	 * classes and instances.
-	 * 
-	 * JPA kicks in as the mediator and transpiles JPQL queries to SQL queries for execution.
-	 * 
-	 * If your database can change or varies from development to production, as long as 
-	 * they're both relational - JPQL works wonders and you can 
-	 * write JPQL queries to create generic logic that can be used over and over again.
-	 */
-	@Query("SELECT u FROM User u WHERE u.email = :email")
-	public User getUserByEmail(@Param("email") String email);
-	
-	// countById() declaration follows the JPA specification
-	//to check the existence of a user
-	public Long countById(Integer id);
-	
-	
-	//for filtering users by keyword
-	/*
-	 * @Query("SELECT u FROM User u WHERE u.firstName LIKE %?1% OR u.lastName LIKE %?1%"
-	 * + " OR u.email LIKE %?1%")
-	 * 
-	 * the above query does not work when we search for user with keyword "nam ha minh"
-	 */
-	public Page<User> findAll(String keyword, Pageable pageable);
-	
-	
-	//change user enabled status
-	//need @Modifying annotation for update/delete operation
-	@Query("UPDATE User u SET u.enabled = ?2 WHERE u.id = ?1")
-	@Modifying
-	public void updateEnabledStatus(Integer id, boolean enabled);
-}
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/a7/a0cfb58ad8b4001d1dd58082704b0bec b/.metadata/.plugins/org.eclipse.core.resources/.history/23/d0f49f2b0db9001d11addcb4256c67f9
similarity index 70%
rename from .metadata/.plugins/org.eclipse.core.resources/.history/a7/a0cfb58ad8b4001d1dd58082704b0bec
rename to .metadata/.plugins/org.eclipse.core.resources/.history/23/d0f49f2b0db9001d11addcb4256c67f9
index eedc7a97..f8d6e79d 100644
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/a7/a0cfb58ad8b4001d1dd58082704b0bec
+++ b/.metadata/.plugins/org.eclipse.core.resources/.history/23/d0f49f2b0db9001d11addcb4256c67f9
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html xmlns:th="http://www.thymeleaf.org">
 
-<head th:replace="fragments :: page_head('Users - Shopme Admin')"/>
+<head th:replace="fragments :: page_head('Categories - Shopme Admin')"/>
 
 <body>
 	<div class="container-fluid">
@@ -10,24 +10,21 @@
 		<div th:replace="navigation :: menu"></div>
 
 		<div>
-			<h2>Manage Users</h2>
-			<a th:href="@{/users/new}" class="fas fa-user-plus fa-2x icon-dark mr-2"></a>
+			<h2>Manage Categories</h2>
+			<a th:href="@{/categories/new}" class="fas fa-folder-plus fa-2x icon-dark mr-2"></a>
 			
-			<a th:href="@{/users/export/csv}" class="fas fa-file-csv fa-2x icon-dark mr-2"></a>
+			<a th:href="@{/categories/export/csv}" class="fas fa-file-csv fa-2x icon-dark mr-2"></a>
 		</div>
 		
-		
-		
-		<!-- only display success message when a new user is created -->
+		<!-- redirect message from controller -->
 		<div th:if="${message != null}" class="alert alert-success text-center">
 			[[${message}]]
 		</div>
+		
 			
 		<div>
-			<form th:action="@{/users/page/1}" class="form-inline m-3">
+			<form th:action="@{/categories/page/1}" class="form-inline m-3">
 				
-				<input type="hidden" name="sortField" th:value="${sortField}" />
-				<input type="hidden" name="sortDir" th:value="${sortDir}" />
 				Filter:&nbsp;
 				<input type="search" name="keyword" th:value="${keyword}" class="form-control" required/>
 				&nbsp;&nbsp;
@@ -47,53 +44,27 @@
 				<table class="table table-bordered table-striped table-hover table-responsive-xL">
 					<thead class="thead-dark">
 						<tr>
-							<!-- refer to templates/fragments.html for fragment code-->
-							
-							<th class="hideable-column">
-								<th th:replace="fragments :: column_link('id', 'User ID', 'tag')"/>
-							</th>
-							
-							<th>Photos</th>
-							
-							<th class="hideable-column">
-								<th th:replace="fragments :: column_link('email', 'Email', 'tag')"/>
-							</th>
-							
-							<th th:replace="fragments :: column_link('firstName', 'First Name', 'none')"/>
-							<th th:replace="fragments :: column_link('lastName', 'Last Name', 'none')"/>
-							<th>Roles</th>
-							<th th:replace="fragments :: column_link('enabled', 'Enabled', 'none')"/>
+							<th>ID</th>
+							<th>Category Image</th>
+							<th>Category Name</th>
+							<th>Alias</th>
+							<th>Enabled</th>
 							<th></th>
 						</tr>
 					</thead>
 					<tbody>
-						<tr th:each="user : ${listUsers}">
-							<td class="hideable-column">[[${user.id}]]</td>
-							<td>
-								<span th:if="${user.photos == null}" class="fas fa-portrait fa-3x icon-dark"></span>
-								<img th:if="${user.photos != null}" th:src="@{${user.photosImagePath}}"
-								style="width: 100px"/>
+						<tr th:each="cat : ${listCategories}">
+							<td>[[${cat.id}]]</td>
+							<td>	
+								<img th:src="@{${cat.imagePath}}" style="width:100px;"/>
 							</td>
-							<td class="hideable-column">[[${user.email}]]</td>
-							<td>[[${user.firstName}]]</td>
-							<td>[[${user.lastName}]]</td>
-							<td>[[${user.roles}]]</td>
-							
+							<td>[[${cat.name}]]</td>
+							<td>[[${cat.alias}]]</td>
 							<td>
-								<a th:if="${user.enabled == true}" class="fas fa-check-circle fa-2x icon-green" 
-								th:href="@{'/users/' + ${user.id} + '/enabled/false'}"
-								title="Disable this user"></a>
-								
-								<a th:if="${user.enabled == false}" class="fas fa-circle fa-2x icon-silver"
-								 th:href="@{'/users/' + ${user.id} + '/enabled/true'}"
-								 title="Enable this user"></a>
+								<div th:replace="fragments :: category_status"></div>
 							</td>
 							<td>
-									<a class="fas fa-edit fa-2x icon-green" th:href="@{'/users/edit/' + ${user.id}}"
-									title="edit this user"></a>
-									&nbsp; 
-									<a class="fas fa-trash fa-2x icon-dark link-delete" th:href="@{'/users/delete/' + ${user.id}}"
-									title="delete this user" th:userId="${user.id}"></a>
+								<div th:replace="fragments :: category_actions"></div>
 							</td>
 						</tr>
 					</tbody>
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/24/10a3c00c09b4001d128fb79045552177 b/.metadata/.plugins/org.eclipse.core.resources/.history/24/10a3c00c09b4001d128fb79045552177
deleted file mode 100644
index 5e767394..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/24/10a3c00c09b4001d128fb79045552177
+++ /dev/null
@@ -1,44 +0,0 @@
-package com.shopme.admin.security;
-
-import org.aspectj.weaver.ast.And;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.security.config.annotation.web.builders.HttpSecurity;
-import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
-import org.springframework.security.config.annotation.web.configuration.WebSecurityConfiguration;
-import org.springframework.security.config.annotation.web.configuration.WebSecurityCustomizer;
-import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
-import org.springframework.security.crypto.password.PasswordEncoder;
-import org.springframework.security.web.SecurityFilterChain;
-
-@Configuration
-@EnableWebSecurity
-public class WebSecurityConfig {
-
-	/*
-	 * refer to this link: https://www.codejava.net/frameworks/spring-boot/fix-
-	 * websecurityconfigureradapter-deprecated
-	 * 
-	 */
-
-	@Bean
-	public PasswordEncoder PasswordEncoder() {
-		return new BCryptPasswordEncoder();
-	}
-
-	@Bean
-	public SecurityFilterChain filterChain(HttpSecurity http) throws Exception {
-
-		// any request need to be authenticated (require login)
-		// custom login page at "/login" - handler method in MainController class
-		http.authorizeHttpRequests().anyRequest().authenticated().and().formLogin().loginPage("/login").permitAll();
-
-		return http.build();
-	}
-
-	@Bean
-	public WebSecurityCustomizer webSecurityCustomizer() {
-		return (web) -> web.ignoring().requestMatchers("/images/**", "/js/**", "/webjars/**");
-	}
-
-}
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/24/20f0f4a209b4001d128fb79045552177 b/.metadata/.plugins/org.eclipse.core.resources/.history/24/20f0f4a209b4001d128fb79045552177
deleted file mode 100644
index cf67136e..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/24/20f0f4a209b4001d128fb79045552177
+++ /dev/null
@@ -1,31 +0,0 @@
-<!DOCTYPE html>
-<html xmlns:th="http://www.thymeleaf.org">
-
-<head>
-	<meta http-equiv="Content-Type" content="text/html; charset= UTF-8">
-	<meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0">
-	<title>Login - Shopme Admin</title>
-	<link rel="stylesheet" type="text/css" th:href="@{/webjars/bootstrap/css/bootstrap.min.css}" />
-</head>
-
-<body>
-	<div class="container-fluid">
-		
-		<div>
-			<img th:src="@{/images/ShopmeAdminBig.png}" />
-		</div>
-		
-		<form th:action="@{/login}" method="post">
-		
-		
-		</form>
-
-		<div>
-			<p>Shopme Control Panel - Copyright &copy; Shopme</p>
-		</div>
-
-	</div>
-
-</body>
-
-</html>
\ No newline at end of file
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/24/609567f8c4b9001d10d0f9513979f945 b/.metadata/.plugins/org.eclipse.core.resources/.history/24/609567f8c4b9001d10d0f9513979f945
new file mode 100644
index 00000000..c2bf7e7e
--- /dev/null
+++ b/.metadata/.plugins/org.eclipse.core.resources/.history/24/609567f8c4b9001d10d0f9513979f945
@@ -0,0 +1,206 @@
+<!DOCTYPE html>
+<html xmlns:th="http://www.thymeleaf.org">
+
+<head th:replace="fragments :: page_head('Categories - Shopme Admin')"/>
+
+<body>
+	<div class="container-fluid">
+		
+		<!-- navigation bar -->
+		<div th:replace="navigation :: menu"></div>
+
+		<div>
+			<h2>Manage Categories</h2>
+			<a th:href="@{/categories/new}" class="fas fa-folder-plus fa-2x icon-dark mr-2"></a>
+			
+			<a th:href="@{/categories/export/csv}" class="fas fa-file-csv fa-2x icon-dark mr-2"></a>
+		</div>
+		
+		<!-- redirect message from controller -->
+		<div th:if="${message != null}" class="alert alert-success text-center">
+			[[${message}]]
+		</div>
+		
+			
+		<div>
+			<form th:action="@{/categories/page/1}" class="form-inline m-3">
+				
+				Filter:&nbsp;
+				<input type="search" name="keyword" th:value="${keyword}" class="form-control" required/>
+				&nbsp;&nbsp;
+				<button type="submit" class="btn btn-primary">
+					<i class="fas fa-search"></i>
+				</button>
+				&nbsp;&nbsp;
+				<button type="button" class="btn btn-secondary" onclick="clearFilter()">
+					<i class="fas fa-eraser"></i>
+				</button>
+			</form>
+		
+		</div>
+
+			<!-- css class to display this table in large screens only , refer to static/style.css for more info-->
+			<div class="full-details">
+				<table class="table table-bordered table-striped table-hover table-responsive-xL">
+					<thead class="thead-dark">
+						<tr>
+							<th>ID</th>
+							<th>Category Image</th>
+							<th>Category Name</th>
+							<th>Alias</th>
+							<th>Enabled</th>
+							<th></th>
+						</tr>
+					</thead>
+					<tbody>
+						<tr th:each="cat : ${listCategories}">
+							<td>[[${cat.id}]]</td>
+							<td>	
+								<img th:src="@{${cat.imagePath}}" style="width: 100px;" class="image-fluid"/>
+							</td>
+							<td>[[${cat.name}]]</td>
+							<td>[[${cat.alias}]]</td>
+							<td>
+								<div th:replace="fragments :: category_status"></div>
+							</td>
+							<td>
+								<div th:replace="fragments :: category_actions(id)"></div>
+							</td>
+						</tr>
+					</tbody>
+				</table>
+			</div>
+			
+			
+			<!-- css class to display this <div> on mobile screens only, refer to /static/style.css for more info-->
+			<div class="less-details">
+				
+				<div th:each="user : ${listUsers}" class="row m-1">
+					
+					<div class="col-4">
+						
+						<span th:if="${user.photos == null}" class="fas fa-portrait fa-3x icon-dark"></span>
+								<img th:if="${user.photos != null}" th:src="@{${user.photosImagePath}}"
+								style="width: 100px"/>
+					</div>
+					
+					<div class="col-8">
+						<div>[[${user.fullName}]]</div>
+						<div>[[${user.roles}]]</div>
+						<div class="mt-2">
+							<a th:if="${user.enabled == true}" class="fas fa-check-circle fa-2x icon-green" 
+								th:href="@{'/users/' + ${user.id} + '/enabled/false'}"
+								title="Disable this user"></a>
+								
+							<a th:if="${user.enabled == false}" class="fas fa-circle fa-2x icon-silver"
+								 th:href="@{'/users/' + ${user.id} + '/enabled/true'}"
+								 title="Enable this user"></a>
+						
+									&nbsp;
+							<a class="fas fa-edit fa-2x icon-green" th:href="@{'/users/edit/' + ${user.id}}"
+									title="edit this user"></a>
+									&nbsp; 
+							<a class="fas fa-trash fa-2x icon-dark link-delete" th:href="@{'/users/delete/' + ${user.id}}"
+									title="delete this user" th:userId="${user.id}"></a>
+						</div>
+					</div>
+					<div>&nbsp;</div>
+				</div>
+			</div>
+			
+			
+			<!-- IF -->
+			<div class="text-center m-1" th:if="${totalItems > 0}">
+				<span>Showing Users # [[${startCount}]] to [[${endCount}]] of [[${totalItems}]]</span>
+			</div>
+			
+			<!-- ELSE -->
+			<div class="text-center m-1" th:unless="${totalItems > 0}">
+				<span>No users found</span>
+			</div>
+			
+			<!-- only display pagination when there are users; else, no users no pagination -->
+			<div th:if="${totalPages > 1}">
+				<nav>
+					  <ul class="pagination justify-content-center flex-wrap">
+					  
+					  	<li th:class=" ${currentPage > 1 ? 'page-item' : 'page-item disabled'}">
+					  		<a th:replace="fragments :: page_link(1, 'First')"></a>
+				    	</li>
+					  
+					    <li th:class=" ${currentPage > 1 ? 'page-item' : 'page-item disabled'}">
+					    	<a th:replace="fragments :: page_link(${currentPage - 1 }, 'previous')"></a>
+				    	</li>
+					    	
+					    <!-- org.thymeleaf.expression.Numbers class, An object of this class is usually available in variable evaluation expressions with the name #numbers. -->
+					    <li th:class="${currentPage != i ? 'page-item' : 'page-item active'}" 
+					    	th:each="i : ${#numbers.sequence(1, totalPages)}">
+					    	<a th:replace="fragments :: page_link(${i}, ${i})"></a>
+					    </li>
+					    
+					    <li  th:class=" ${currentPage < totalPages ? 'page-item' : 'page-item disabled'}">
+					    	<a th:replace="fragments :: page_link(${currentPage + 1}, 'Next')"></a>
+					    </li>
+					    
+					    <li th:class=" ${currentPage < totalPages ? 'page-item' : 'page-item disabled'}">
+							<a th:replace="fragments :: page_link(${totalPages}, 'Last')"></a>		
+					    </li>
+					  </ul>
+				</nav>
+			</div>
+			
+			
+			
+			<div class="modal fade text-center" id="confirmModal">
+				<div class="modal-dialog">
+					<div class="modal-content">
+					
+						<div class="modal-header">
+							<h4 class="modal-title">Delete Confirmation</h4>
+							<button type="button" class="close" data-dismiss="modal">&times;</button>
+						</div>
+						
+						<div class="modal-body">
+							<span id="confirmText"></span>
+						</div>
+						
+						<div class="modal-footer">
+							<a class="btn btn-success" href="" id="yesButton">Yes</a>
+							<button type="button" class="btn btn-danger" data-dismiss="modal">Close</button>
+						</div>
+					</div>
+				</div>
+			</div>
+			
+			<!-- footer -->
+			<div th:replace="fragments :: footer"></div>
+
+
+	</div>
+	
+<script type="text/javascript">
+
+//confirmation modal dialogue for delete user
+$(document).ready(function(){
+	$(".link-delete").on("click", function(e){
+		//stop the <a> tag default behaviour and pop out a confirmation modal dialogue
+		e.preventDefault();
+		//alert($(this).attr("href"));
+		link = $(this);
+		userId = link.attr("userId");
+		$("#yesButton").attr("href", link.attr("href"));
+		$("#confirmText").text("Are you sure you want to delete this user ID " + userId + "?");
+		$("#confirmModal").modal();
+	});
+});
+
+	function clearFilter(){
+		window.location = "[[@{/users}]]";
+	}
+
+
+</script>
+	
+</body>
+
+</html>
\ No newline at end of file
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/24/a023f76177b3001d19bbb001c1a81c20 b/.metadata/.plugins/org.eclipse.core.resources/.history/24/a023f76177b3001d19bbb001c1a81c20
deleted file mode 100644
index cddcf6c1..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/24/a023f76177b3001d19bbb001c1a81c20
+++ /dev/null
@@ -1,5 +0,0 @@
-package com.shopme.admin.user;
-
-public class UserExcelExporter {
-
-}
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/24/c02b9e4f8db3001d19bbb001c1a81c20 b/.metadata/.plugins/org.eclipse.core.resources/.history/24/c02b9e4f8db3001d19bbb001c1a81c20
deleted file mode 100644
index a15e2204..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/24/c02b9e4f8db3001d19bbb001c1a81c20
+++ /dev/null
@@ -1,276 +0,0 @@
-<!DOCTYPE html>
-<html xmlns:th="http://www.thymeleaf.org">
-
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset= UTF-8">
-<meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0">
-<title>Manage Users</title>
-
-<link rel="stylesheet" type="text/css" th:href="@{/webjars/bootstrap/css/bootstrap.min.css}" />
-<link rel="stylesheet" type="text/css" th:href="@{/fontawesome/all.css}" />
-<link rel="stylesheet" type="text/css" th:href="@{/style.css}" />
-	
-<script type="text/javascript" th:src="@{/webjars/jquery/jquery.min.js}"></script>
-<script type="text/javascript" th:src="@{/webjars/bootstrap/js/bootstrap.min.js}"></script>
-</head>
-
-<body>
-	<div class="container-fluid">
-		<div>
-			<nav class="navbar navbar-expand-lg bg-dark navbar-dark">
-				<a class="navbar-brand" th:href="@{/}"> <img
-					th:src="@{/images/ShopmeAdminSmall.png}" />
-				</a>
-				<!--hamburger toggler for mobile devices(responsive)-->
-				<button class="navbar-toggler" type="button" data-toggle="collapse"
-					data-target="#topNavbar">
-					<span class="navbar-toggler-icon"></span>
-				</button>
-				<div class="collapse navbar-collapse" id="topNavbar">
-					<ul class="navbar-nav">
-						<li class="nav-item"><a class="nav-link" th:href="@{/users}">Users</a>
-						</li>
-						<li class="nav-item"><a class="nav-link"
-							th:href="@{/categories}">Categories</a></li>
-						<li class="nav-item"><a class="nav-link" th:href="@{/brands}">Brands</a>
-						</li>
-						<li class="nav-item"><a class="nav-link"
-							th:href="@{/products}">Products</a></li>
-						<li class="nav-item"><a class="nav-link"
-							th:href="@{/customers}">Customers</a></li>
-						<li class="nav-item"><a class="nav-link"
-							th:href="@{/shipping}">Shipping</a></li>
-						<li class="nav-item"><a class="nav-link" th:href="@{/orders}">Orders</a>
-						</li>
-						<li class="nav-item"><a class="nav-link" th:href="@{/report}">Sales
-								Report</a></li>
-						<li class="nav-item"><a class="nav-link"
-							th:href="@{/articles}">Articles</a></li>
-						<li class="nav-item"><a class="nav-link" th:href="@{/menus}">Menus</a>
-						</li>
-						<li class="nav-item"><a class="nav-link"
-							th:href="@{/settings}">Settings</a></li>
-					</ul>
-				</div>
-
-			</nav>
-		</div>
-
-		<div>
-			<h2>Manage Users</h2>
-			<a th:href="@{/users/new}" class="fas fa-user-plus fa-2x icon-dark mr-2"></a>
-			
-			<a th:href="@{/users/export/csv}" class="fas fa-file-csv fa-2x icon-dark mr-2"></a>
-		</div>
-		
-		
-		
-		<!-- only display success message when a new user is created -->
-		<div th:if="${message != null}" class="alert alert-success text-center">
-			[[${message}]]
-		</div>
-			
-		<div>
-			<form th:action="@{/users/page/1}" class="form-inline m-3">
-				
-				<input type="hidden" name="sortField" th:value="${sortField}" />
-				<input type="hidden" name="sortDir" th:value="${sortDir}" />
-				Filter:&nbsp;
-				<input type="search" name="keyword" th:value="${keyword}" class="form-control" required/>
-				&nbsp;&nbsp;
-				<button type="submit" class="btn btn-primary">
-					<i class="fas fa-search"></i>
-				</button>
-				&nbsp;&nbsp;
-				<button type="button" class="btn btn-secondary" onclick="clearFilter()">
-					<i class="fas fa-eraser"></i>
-				</button>
-			</form>
-		
-		</div>
-
-			<!-- css class to display this table in large screens only , refer to static/style.css for more info-->
-			<div class="full-details">
-				<table class="table table-bordered table-striped table-hover table-responsive-xL">
-					<thead class="thead-dark">
-						<tr>
-							<!-- refer to templates/fragments.html for fragment code-->
-							<th th:replace="fragments :: column_link('id', 'User ID')"/>
-							<th>Photos</th>
-							<th th:replace="fragments :: column_link('email', 'Email')"/>
-							<th th:replace="fragments :: column_link('firstName', 'First Name')"/>
-							<th th:replace="fragments :: column_link('lastName', 'Last Name')"/>
-							<th>Roles</th>
-							<th th:replace="fragments :: column_link('enabled', 'Enabled')"/>
-							<th></th>
-						</tr>
-					</thead>
-					<tbody>
-						<tr th:each="user : ${listUsers}">
-							<td>[[${user.id}]]</td>
-							<td>
-								<span th:if="${user.photos == null}" class="fas fa-portrait fa-3x icon-dark"></span>
-								<img th:if="${user.photos != null}" th:src="@{${user.photosImagePath}}"
-								style="width: 100px"/>
-							</td>
-							<td>[[${user.email}]]</td>
-							<td>[[${user.firstName}]]</td>
-							<td>[[${user.lastName}]]</td>
-							<td>[[${user.roles}]]</td>
-							
-							<td>
-								<a th:if="${user.enabled == true}" class="fas fa-check-circle fa-2x icon-green" 
-								th:href="@{'/users/' + ${user.id} + '/enabled/false'}"
-								title="Disable this user"></a>
-								
-								<a th:if="${user.enabled == false}" class="fas fa-circle fa-2x icon-silver"
-								 th:href="@{'/users/' + ${user.id} + '/enabled/true'}"
-								 title="Enable this user"></a>
-							</td>
-							<td>
-									<a class="fas fa-edit fa-2x icon-green" th:href="@{'/users/edit/' + ${user.id}}"
-									title="edit this user"></a>
-									&nbsp; 
-									<a class="fas fa-trash fa-2x icon-dark link-delete" th:href="@{'/users/delete/' + ${user.id}}"
-									title="delete this user" th:userId="${user.id}"></a>
-							</td>
-						</tr>
-					</tbody>
-				</table>
-			</div>
-			
-			
-			<!-- css class to display this <div> on mobile screens only, refer to /static/style.css for more info-->
-			<div class="less-details">
-				
-				<div th:each="user : ${listUsers}" class="row m-1">
-					
-					<div class="col-4">
-						
-						<span th:if="${user.photos == null}" class="fas fa-portrait fa-3x icon-dark"></span>
-								<img th:if="${user.photos != null}" th:src="@{${user.photosImagePath}}"
-								style="width: 100px"/>
-					</div>
-					
-					<div class="col-8">
-						<div>[[${user.fullName}]]</div>
-						<div>[[${user.roles}]]</div>
-						<div class="mt-1">
-							<a th:if="${user.enabled == true}" class="fas fa-check-circle fa-2x icon-green" 
-								th:href="@{'/users/' + ${user.id} + '/enabled/false'}"
-								title="Disable this user"></a>
-								
-							<a th:if="${user.enabled == false}" class="fas fa-circle fa-2x icon-silver"
-								 th:href="@{'/users/' + ${user.id} + '/enabled/true'}"
-								 title="Enable this user"></a>
-						
-									&nbsp;
-							<a class="fas fa-edit fa-2x icon-green" th:href="@{'/users/edit/' + ${user.id}}"
-									title="edit this user"></a>
-									&nbsp; 
-							<a class="fas fa-trash fa-2x icon-dark link-delete" th:href="@{'/users/delete/' + ${user.id}}"
-									title="delete this user" th:userId="${user.id}"></a>
-						</div>
-					</div>
-					<div>&nbsp;</div>
-				</div>
-			</div>
-			
-			
-			<!-- IF -->
-			<div class="text-center m-1" th:if="${totalItems > 0}">
-				<span>Showing Users # [[${startCount}]] to [[${endCount}]] of [[${totalItems}]]</span>
-			</div>
-			
-			<!-- ELSE -->
-			<div class="text-center m-1" th:unless="${totalItems > 0}">
-				<span>No users found</span>
-			</div>
-			
-			<!-- only display pagination when there are users; else, no users no pagination -->
-			<div th:if="${totalPages > 1}">
-				<nav>
-					  <ul class="pagination justify-content-center flex-wrap">
-					  
-					  	<li th:class=" ${currentPage > 1 ? 'page-item' : 'page-item disabled'}">
-					  		<a th:replace="fragments :: page_link(1, 'First')"></a>
-				    	</li>
-					  
-					    <li th:class=" ${currentPage > 1 ? 'page-item' : 'page-item disabled'}">
-					    	<a th:replace="fragments :: page_link(${currentPage - 1 }, 'previous')"></a>
-				    	</li>
-					    	
-					    <!-- org.thymeleaf.expression.Numbers class, An object of this class is usually available in variable evaluation expressions with the name #numbers. -->
-					    <li th:class="${currentPage != i ? 'page-item' : 'page-item active'}" 
-					    	th:each="i : ${#numbers.sequence(1, totalPages)}">
-					    	<a th:replace="fragments :: page_link(${i}, ${i})"></a>
-					    </li>
-					    
-					    <li  th:class=" ${currentPage < totalPages ? 'page-item' : 'page-item disabled'}">
-					    	<a th:replace="fragments :: page_link(${currentPage + 1}, 'Next')"></a>
-					    </li>
-					    
-					    <li th:class=" ${currentPage < totalPages ? 'page-item' : 'page-item disabled'}">
-							<a th:replace="fragments :: page_link(${totalPages}, 'Last')"></a>		
-					    </li>
-					  </ul>
-				</nav>
-			</div>
-			
-			
-			
-			<div class="modal fade text-center" id="confirmModal">
-				<div class="modal-dialog">
-					<div class="modal-content">
-					
-						<div class="modal-header">
-							<h4 class="modal-title">Delete Confirmation</h4>
-							<button type="button" class="close" data-dismiss="modal">&times;</button>
-						</div>
-						
-						<div class="modal-body">
-							<span id="confirmText"></span>
-						</div>
-						
-						<div class="modal-footer">
-							<a class="btn btn-success" href="" id="yesButton">Yes</a>
-							<button type="button" class="btn btn-danger" data-dismiss="modal">Close</button>
-						</div>
-					</div>
-				</div>
-			</div>
-			
-			
-			<div class="text-center">
-				<p>Shopme Control Panel - Copyright &copy; Shopme</p>
-			</div>
-
-
-	</div>
-	
-<script type="text/javascript">
-
-//confirmation modal dialogue for delete user
-$(document).ready(function(){
-	$(".link-delete").on("click", function(e){
-		//stop the <a> tag default behaviour and pop out a confirmation modal dialogue
-		e.preventDefault();
-		//alert($(this).attr("href"));
-		link = $(this);
-		userId = link.attr("userId");
-		$("#yesButton").attr("href", link.attr("href"));
-		$("#confirmText").text("Are you sure you want to delete this user ID " + userId + "?");
-		$("#confirmModal").modal();
-	});
-});
-
-	function clearFilter(){
-		window.location = "[[@{/users}]]";
-	}
-
-
-</script>
-	
-</body>
-
-</html>
\ No newline at end of file
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/25/c0127da08fb3001d19bbb001c1a81c20 b/.metadata/.plugins/org.eclipse.core.resources/.history/25/c0127da08fb3001d19bbb001c1a81c20
deleted file mode 100644
index 12b2dc2a..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/25/c0127da08fb3001d19bbb001c1a81c20
+++ /dev/null
@@ -1,280 +0,0 @@
-<!DOCTYPE html>
-<html xmlns:th="http://www.thymeleaf.org">
-
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset= UTF-8">
-<meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0">
-<title>Manage Users</title>
-
-<link rel="stylesheet" type="text/css" th:href="@{/webjars/bootstrap/css/bootstrap.min.css}" />
-<link rel="stylesheet" type="text/css" th:href="@{/fontawesome/all.css}" />
-<link rel="stylesheet" type="text/css" th:href="@{/style.css}" />
-	
-<script type="text/javascript" th:src="@{/webjars/jquery/jquery.min.js}"></script>
-<script type="text/javascript" th:src="@{/webjars/bootstrap/js/bootstrap.min.js}"></script>
-</head>
-
-<body>
-	<div class="container-fluid">
-		<div>
-			<nav class="navbar navbar-expand-lg bg-dark navbar-dark">
-				<a class="navbar-brand" th:href="@{/}"> <img
-					th:src="@{/images/ShopmeAdminSmall.png}" />
-				</a>
-				<!--hamburger toggler for mobile devices(responsive)-->
-				<button class="navbar-toggler" type="button" data-toggle="collapse"
-					data-target="#topNavbar">
-					<span class="navbar-toggler-icon"></span>
-				</button>
-				<div class="collapse navbar-collapse" id="topNavbar">
-					<ul class="navbar-nav">
-						<li class="nav-item"><a class="nav-link" th:href="@{/users}">Users</a>
-						</li>
-						<li class="nav-item"><a class="nav-link"
-							th:href="@{/categories}">Categories</a></li>
-						<li class="nav-item"><a class="nav-link" th:href="@{/brands}">Brands</a>
-						</li>
-						<li class="nav-item"><a class="nav-link"
-							th:href="@{/products}">Products</a></li>
-						<li class="nav-item"><a class="nav-link"
-							th:href="@{/customers}">Customers</a></li>
-						<li class="nav-item"><a class="nav-link"
-							th:href="@{/shipping}">Shipping</a></li>
-						<li class="nav-item"><a class="nav-link" th:href="@{/orders}">Orders</a>
-						</li>
-						<li class="nav-item"><a class="nav-link" th:href="@{/report}">Sales
-								Report</a></li>
-						<li class="nav-item"><a class="nav-link"
-							th:href="@{/articles}">Articles</a></li>
-						<li class="nav-item"><a class="nav-link" th:href="@{/menus}">Menus</a>
-						</li>
-						<li class="nav-item"><a class="nav-link"
-							th:href="@{/settings}">Settings</a></li>
-					</ul>
-				</div>
-
-			</nav>
-		</div>
-
-		<div>
-			<h2>Manage Users</h2>
-			<a th:href="@{/users/new}" class="fas fa-user-plus fa-2x icon-dark mr-2"></a>
-			
-			<a th:href="@{/users/export/csv}" class="fas fa-file-csv fa-2x icon-dark mr-2"></a>
-		</div>
-		
-		
-		
-		<!-- only display success message when a new user is created -->
-		<div th:if="${message != null}" class="alert alert-success text-center">
-			[[${message}]]
-		</div>
-			
-		<div>
-			<form th:action="@{/users/page/1}" class="form-inline m-3">
-				
-				<input type="hidden" name="sortField" th:value="${sortField}" />
-				<input type="hidden" name="sortDir" th:value="${sortDir}" />
-				Filter:&nbsp;
-				<input type="search" name="keyword" th:value="${keyword}" class="form-control" required/>
-				&nbsp;&nbsp;
-				<button type="submit" class="btn btn-primary">
-					<i class="fas fa-search"></i>
-				</button>
-				&nbsp;&nbsp;
-				<button type="button" class="btn btn-secondary" onclick="clearFilter()">
-					<i class="fas fa-eraser"></i>
-				</button>
-			</form>
-		
-		</div>
-
-			<!-- css class to display this table in large screens only , refer to static/style.css for more info-->
-			<div class="full-details">
-				<table class="table table-bordered table-striped table-hover table-responsive-xL">
-					<thead class="thead-dark">
-						<tr>
-							<!-- refer to templates/fragments.html for fragment code-->
-							
-							<th>
-							<th th:replace="fragments :: column_link('id', 'User ID')"/>
-							</th>
-							
-							<th>Photos</th>
-							<th th:replace="fragments :: column_link('email', 'Email')"/>
-							<th th:replace="fragments :: column_link('firstName', 'First Name')"/>
-							<th th:replace="fragments :: column_link('lastName', 'Last Name')"/>
-							<th>Roles</th>
-							<th th:replace="fragments :: column_link('enabled', 'Enabled')"/>
-							<th></th>
-						</tr>
-					</thead>
-					<tbody>
-						<tr th:each="user : ${listUsers}">
-							<td class="hideable-column">[[${user.id}]]</td>
-							<td>
-								<span th:if="${user.photos == null}" class="fas fa-portrait fa-3x icon-dark"></span>
-								<img th:if="${user.photos != null}" th:src="@{${user.photosImagePath}}"
-								style="width: 100px"/>
-							</td>
-							<td class="hideable-column">[[${user.email}]]</td>
-							<td>[[${user.firstName}]]</td>
-							<td>[[${user.lastName}]]</td>
-							<td>[[${user.roles}]]</td>
-							
-							<td>
-								<a th:if="${user.enabled == true}" class="fas fa-check-circle fa-2x icon-green" 
-								th:href="@{'/users/' + ${user.id} + '/enabled/false'}"
-								title="Disable this user"></a>
-								
-								<a th:if="${user.enabled == false}" class="fas fa-circle fa-2x icon-silver"
-								 th:href="@{'/users/' + ${user.id} + '/enabled/true'}"
-								 title="Enable this user"></a>
-							</td>
-							<td>
-									<a class="fas fa-edit fa-2x icon-green" th:href="@{'/users/edit/' + ${user.id}}"
-									title="edit this user"></a>
-									&nbsp; 
-									<a class="fas fa-trash fa-2x icon-dark link-delete" th:href="@{'/users/delete/' + ${user.id}}"
-									title="delete this user" th:userId="${user.id}"></a>
-							</td>
-						</tr>
-					</tbody>
-				</table>
-			</div>
-			
-			
-			<!-- css class to display this <div> on mobile screens only, refer to /static/style.css for more info-->
-			<div class="less-details">
-				
-				<div th:each="user : ${listUsers}" class="row m-1">
-					
-					<div class="col-4">
-						
-						<span th:if="${user.photos == null}" class="fas fa-portrait fa-3x icon-dark"></span>
-								<img th:if="${user.photos != null}" th:src="@{${user.photosImagePath}}"
-								style="width: 100px"/>
-					</div>
-					
-					<div class="col-8">
-						<div>[[${user.fullName}]]</div>
-						<div>[[${user.roles}]]</div>
-						<div class="mt-2">
-							<a th:if="${user.enabled == true}" class="fas fa-check-circle fa-2x icon-green" 
-								th:href="@{'/users/' + ${user.id} + '/enabled/false'}"
-								title="Disable this user"></a>
-								
-							<a th:if="${user.enabled == false}" class="fas fa-circle fa-2x icon-silver"
-								 th:href="@{'/users/' + ${user.id} + '/enabled/true'}"
-								 title="Enable this user"></a>
-						
-									&nbsp;
-							<a class="fas fa-edit fa-2x icon-green" th:href="@{'/users/edit/' + ${user.id}}"
-									title="edit this user"></a>
-									&nbsp; 
-							<a class="fas fa-trash fa-2x icon-dark link-delete" th:href="@{'/users/delete/' + ${user.id}}"
-									title="delete this user" th:userId="${user.id}"></a>
-						</div>
-					</div>
-					<div>&nbsp;</div>
-				</div>
-			</div>
-			
-			
-			<!-- IF -->
-			<div class="text-center m-1" th:if="${totalItems > 0}">
-				<span>Showing Users # [[${startCount}]] to [[${endCount}]] of [[${totalItems}]]</span>
-			</div>
-			
-			<!-- ELSE -->
-			<div class="text-center m-1" th:unless="${totalItems > 0}">
-				<span>No users found</span>
-			</div>
-			
-			<!-- only display pagination when there are users; else, no users no pagination -->
-			<div th:if="${totalPages > 1}">
-				<nav>
-					  <ul class="pagination justify-content-center flex-wrap">
-					  
-					  	<li th:class=" ${currentPage > 1 ? 'page-item' : 'page-item disabled'}">
-					  		<a th:replace="fragments :: page_link(1, 'First')"></a>
-				    	</li>
-					  
-					    <li th:class=" ${currentPage > 1 ? 'page-item' : 'page-item disabled'}">
-					    	<a th:replace="fragments :: page_link(${currentPage - 1 }, 'previous')"></a>
-				    	</li>
-					    	
-					    <!-- org.thymeleaf.expression.Numbers class, An object of this class is usually available in variable evaluation expressions with the name #numbers. -->
-					    <li th:class="${currentPage != i ? 'page-item' : 'page-item active'}" 
-					    	th:each="i : ${#numbers.sequence(1, totalPages)}">
-					    	<a th:replace="fragments :: page_link(${i}, ${i})"></a>
-					    </li>
-					    
-					    <li  th:class=" ${currentPage < totalPages ? 'page-item' : 'page-item disabled'}">
-					    	<a th:replace="fragments :: page_link(${currentPage + 1}, 'Next')"></a>
-					    </li>
-					    
-					    <li th:class=" ${currentPage < totalPages ? 'page-item' : 'page-item disabled'}">
-							<a th:replace="fragments :: page_link(${totalPages}, 'Last')"></a>		
-					    </li>
-					  </ul>
-				</nav>
-			</div>
-			
-			
-			
-			<div class="modal fade text-center" id="confirmModal">
-				<div class="modal-dialog">
-					<div class="modal-content">
-					
-						<div class="modal-header">
-							<h4 class="modal-title">Delete Confirmation</h4>
-							<button type="button" class="close" data-dismiss="modal">&times;</button>
-						</div>
-						
-						<div class="modal-body">
-							<span id="confirmText"></span>
-						</div>
-						
-						<div class="modal-footer">
-							<a class="btn btn-success" href="" id="yesButton">Yes</a>
-							<button type="button" class="btn btn-danger" data-dismiss="modal">Close</button>
-						</div>
-					</div>
-				</div>
-			</div>
-			
-			
-			<div class="text-center">
-				<p>Shopme Control Panel - Copyright &copy; Shopme</p>
-			</div>
-
-
-	</div>
-	
-<script type="text/javascript">
-
-//confirmation modal dialogue for delete user
-$(document).ready(function(){
-	$(".link-delete").on("click", function(e){
-		//stop the <a> tag default behaviour and pop out a confirmation modal dialogue
-		e.preventDefault();
-		//alert($(this).attr("href"));
-		link = $(this);
-		userId = link.attr("userId");
-		$("#yesButton").attr("href", link.attr("href"));
-		$("#confirmText").text("Are you sure you want to delete this user ID " + userId + "?");
-		$("#confirmModal").modal();
-	});
-});
-
-	function clearFilter(){
-		window.location = "[[@{/users}]]";
-	}
-
-
-</script>
-	
-</body>
-
-</html>
\ No newline at end of file
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/26/10b52e3218b4001d128fb79045552177 b/.metadata/.plugins/org.eclipse.core.resources/.history/26/10b52e3218b4001d128fb79045552177
deleted file mode 100644
index 98d2cf16..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/26/10b52e3218b4001d128fb79045552177
+++ /dev/null
@@ -1,62 +0,0 @@
-package com.shopme.admin.security;
-
-import org.aspectj.weaver.ast.And;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.security.config.annotation.web.builders.HttpSecurity;
-import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
-import org.springframework.security.config.annotation.web.configuration.WebSecurityConfiguration;
-import org.springframework.security.config.annotation.web.configuration.WebSecurityCustomizer;
-import org.springframework.security.core.userdetails.UserDetailsService;
-import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
-import org.springframework.security.crypto.password.PasswordEncoder;
-import org.springframework.security.web.SecurityFilterChain;
-
-@Configuration
-@EnableWebSecurity
-public class WebSecurityConfig {
-
-	/*
-	 * refer to this link: https://www.codejava.net/frameworks/spring-boot/fix-
-	 * websecurityconfigureradapter-deprecated
-	 * 
-	 */
-	
-	
-	 /* This bean will be called by spring security when performing authentication*/ 
-	@Bean
-	public UserDetailsService  UserDetailsService()	{
-		return new ShopmeUserDetailsService();
-	}
-	
-
-	@Bean
-	public PasswordEncoder PasswordEncoder() {
-		return new BCryptPasswordEncoder();
-	}
-
-	@Bean
-	public SecurityFilterChain filterChain(HttpSecurity http) throws Exception {
-
-		// any request need to be authenticated (require login)
-		// custom login page at "/login" - handler method in MainController class
-		http.authorizeHttpRequests()
-			.anyRequest().authenticated()
-			.and()
-			.formLogin()
-				.loginPage("/login")
-				.usernameParameter("email")
-				.permitAll();
-
-		return http.build();
-	}
-
-	//NOTE: antMatchers() changed to requestMatchers()
-	//stack: https://stackoverflow.com/questions/74907533/the-method-antmatchersstring-is-undefined-for-the-type
-	@Bean
-	public WebSecurityCustomizer webSecurityCustomizer() {
-		//permit access to the assets in the following directories
-		return (web) -> web.ignoring().requestMatchers("/images/**", "/js/**", "/webjars/**");
-	}
-
-}
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/26/20f3cd8d7ab3001d19bbb001c1a81c20 b/.metadata/.plugins/org.eclipse.core.resources/.history/26/20f3cd8d7ab3001d19bbb001c1a81c20
deleted file mode 100644
index 1f7bf9f2..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/26/20f3cd8d7ab3001d19bbb001c1a81c20
+++ /dev/null
@@ -1,45 +0,0 @@
-package com.shopme.admin.user;
-
-import java.io.IOException;
-import java.text.DateFormat;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.List;
-
-import org.supercsv.io.CsvBeanWriter;
-import org.supercsv.io.ICsvBeanWriter;
-import org.supercsv.prefs.CsvPreference;
-
-import com.shopme.common.entity.User;
-
-import jakarta.servlet.http.HttpServletResponse;
-
-public class UserCsvExporter extends AbstractExporter {
-
-	public void export(List<User> listUsers, HttpServletResponse response) throws IOException {
-		
-		DateFormat dateFormatter = new SimpleDateFormat("yyyy-MM-dd_HH-mm-ss");
-		String timestamp = dateFormatter.format(new Date());
-		String fileName = "users_" + timestamp + ".csv";
-		
-		response.setContentType("text/csv");
-		
-		String headerKey = "Content-Disposition";
-		String headerValue = "attachment; filename=" + fileName;
-		response.setHeader(headerKey, headerValue);
-		
-		ICsvBeanWriter csvWriter = new CsvBeanWriter(response.getWriter(), CsvPreference.STANDARD_PREFERENCE);
-		
-		String[] csvHeader = {"User ID", "E-mail", "First Name", "Last Name", "Roles", "Enabled"};
-		String[] fieldMapping = {"id", "email", "firstName", "lastName", "roles", "enabled"};
-		
-		csvWriter.writeHeader(csvHeader);
-		
-		for (User user : listUsers) {
-			csvWriter.write(user, fieldMapping);
-		}
-		
-		csvWriter.close();
-	}
-	
-}
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/26/a073217714b4001d128fb79045552177 b/.metadata/.plugins/org.eclipse.core.resources/.history/26/a073217714b4001d128fb79045552177
deleted file mode 100644
index d137072f..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/26/a073217714b4001d128fb79045552177
+++ /dev/null
@@ -1,78 +0,0 @@
-package com.shopme.admin.security;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-import java.util.Set;
-
-import org.springframework.security.core.GrantedAuthority;
-import org.springframework.security.core.authority.SimpleGrantedAuthority;
-import org.springframework.security.core.userdetails.UserDetails;
-
-import com.shopme.common.entity.Role;
-import com.shopme.common.entity.User;
-
-/*
- *  Think of it as a wrapper class for  Type User
- *  
- *  ShopmeUserDetailsService will use this dao class
- * 
- * */
-public class ShopmeUserDetails implements UserDetails {
-
-	private User user;
-
-	public ShopmeUserDetails(User user) {
-		this.user = user;
-	}
-
-	/* get a list of assigned roles to user */
-	@Override
-	public Collection<? extends GrantedAuthority> getAuthorities() {
-
-		Set<Role> roles = user.getRoles();
-
-		List<SimpleGrantedAuthority> authorities = new ArrayList<>();
-
-		for (Role role : roles) {
-			authorities.add(new SimpleGrantedAuthority(role.getName()));
-		}
-
-		return authorities;
-	}
-
-	@Override
-	public String getPassword() {
-		return user.getPassword();
-	}
-
-	@Override
-	public String getUsername() {
-		return user.getEmail();
-	}
-
-	// "true" means account not expired
-	@Override
-	public boolean isAccountNonExpired() {
-		return true;
-	}
-
-	@Override
-	public boolean isAccountNonLocked() {
-		// TODO Auto-generated method stub
-		return true;
-	}
-
-	@Override
-	public boolean isCredentialsNonExpired() {
-		// TODO Auto-generated method stub
-		return true;
-	}
-
-	@Override
-	public boolean isEnabled() {
-		// TODO Auto-generated method stub
-		return user.isEnabled();
-	}
-
-}
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/26/c01512a452b4001d1d079a924effdc9e b/.metadata/.plugins/org.eclipse.core.resources/.history/26/c01512a452b4001d1d079a924effdc9e
deleted file mode 100644
index 453c8ff5..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/26/c01512a452b4001d1d079a924effdc9e
+++ /dev/null
@@ -1,17 +0,0 @@
-$(document).ready(function(){
-		$("#logoutLink").on("click", function(e){
-			e.preventDefault(); /* stop the hyperlink default behaviour  */
-			
-			/* use  the form to  log out and navigate to the url path /logout  
-			
-			 NOTE: spring security requires a POST request form to logout in order to obtain the csrf token, 
-			 		the csrf token is a hidden property in the form
-			*/
-			document.logoutForm.submit();
-		});
-		
-		customizeDropDownMenu();
-	});
-	
-function customizeDropDownMenu();
-	
\ No newline at end of file
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/27/704b374a0bb9001d11addcb4256c67f9 b/.metadata/.plugins/org.eclipse.core.resources/.history/27/704b374a0bb9001d11addcb4256c67f9
new file mode 100644
index 00000000..fda90d77
--- /dev/null
+++ b/.metadata/.plugins/org.eclipse.core.resources/.history/27/704b374a0bb9001d11addcb4256c67f9
@@ -0,0 +1,49 @@
+package com.shopme.admin;
+
+import java.nio.file.Path;
+import java.nio.file.Paths;
+
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
+
+@Configuration
+public class MvcConfig implements WebMvcConfigurer {
+
+	
+	/*
+	 * In short, we can tell Spring MVC to map a given URL (e.g. "/user-photos") 
+	 * to any directory (e.g. D:/ShopmeProject/ShopmeBackend/user-photos) 
+	 * and expose the resources (images, js, css...) in this directory to 
+	 * the web clients (browsers) - that's the primary purpose
+	 *  of using resource handlers in Spring MVC.
+	 * 
+	 * Because the assets are not located in the src/main/resources/static folder
+	 * */
+	
+	@Override
+	public void addResourceHandlers(ResourceHandlerRegistry registry) {
+
+		String dirName = "user-photos";
+		Path userPhotoDir = Paths.get(dirName);
+		String userPhotosPath = userPhotoDir.toFile().getAbsolutePath();
+		
+		// add /** to allow all files under this directory to be available to client
+		registry.addResourceHandler("/" + dirName + "/**")
+		.addResourceLocations("file:/" + userPhotosPath + "/");
+		
+		
+		String categoryImagesDirName = "category-images";
+		Path categoryImagesDir = Paths.get(categoryImagesDirName);
+		String categoryImagesPath = categoryImagesDir.toFile().getAbsolutePath();
+		
+		// add /** to allow all files under this directory to be available to client
+		registry.addResourceHandler("/" + categoryImagesDirName + "/**")
+		.addResourceLocations("file:/" + categoryImagesPath + "/");
+		
+	}
+	
+	
+	
+	
+}
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/27/b0de25c83fb3001d1e75aa5ef0815903 b/.metadata/.plugins/org.eclipse.core.resources/.history/27/b0de25c83fb3001d1e75aa5ef0815903
deleted file mode 100644
index ba6b153e..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/27/b0de25c83fb3001d1e75aa5ef0815903
+++ /dev/null
@@ -1,55 +0,0 @@
-package com.shopme.admin.user;
-
-import org.springframework.data.domain.Page;
-import org.springframework.data.domain.Pageable;
-import org.springframework.data.jpa.repository.Modifying;
-import org.springframework.data.jpa.repository.Query;
-import org.springframework.data.repository.CrudRepository;
-import org.springframework.data.repository.PagingAndSortingRepository;
-import org.springframework.data.repository.query.Param;
-import org.springframework.stereotype.Repository;
-
-import com.shopme.common.entity.User;
-
-@Repository
-public interface UserRepository extends CrudRepository<User, Integer>, PagingAndSortingRepository<User, Integer> {
-
-	/*
-	 * JPQL statement. It should be noted that as compared to native SQL, JPQL does
-	 * not interact with database tables, records, and fields - but with Java
-	 * classes and instances.
-	 * 
-	 * JPA kicks in as the mediator and transpiles JPQL queries to SQL queries for execution.
-	 * 
-	 * If your database can change or varies from development to production, as long as 
-	 * they're both relational - JPQL works wonders and you can 
-	 * write JPQL queries to create generic logic that can be used over and over again.
-	 */
-	@Query("SELECT u FROM User u WHERE u.email = :email")
-	public User getUserByEmail(@Param("email") String email);
-	
-	// countById() declaration follows the JPA specification
-	//to check the existence of a user
-	public Long countById(Integer id);
-	
-	
-	//for filtering users by keyword
-	/*
-	 * @Query("SELECT u FROM User u WHERE u.firstName LIKE %?1% OR u.lastName LIKE %?1%"
-	 * + " OR u.email LIKE %?1%")
-	 * 
-	 * the above query does not work when we search for user with keyword "nam ha minh".
-	 * 
-	 * Instead we should concatenate the fields separated by space as the query below
-	 */
-	 @Query("SELECT u FROM User u WHERE  CONCAT(u.id, ' ', u.email, ' ', u.firstName, ' ',"
-			  + " u.email) LIKE %?1%")
-	public Page<User> findAll(String keyword, Pageable pageable);
-	
-	
-	//change user enabled status
-	//need @Modifying annotation for update/delete operation
-	@Query("UPDATE User u SET u.enabled = ?2 WHERE u.id = ?1")
-	@Modifying
-	public void updateEnabledStatus(Integer id, boolean enabled);
-}
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/2a/303ce6a432b4001d1d079a924effdc9e b/.metadata/.plugins/org.eclipse.core.resources/.history/2a/303ce6a432b4001d1d079a924effdc9e
deleted file mode 100644
index c6dc59ca..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/2a/303ce6a432b4001d1d079a924effdc9e
+++ /dev/null
@@ -1,56 +0,0 @@
-<!DOCTYPE html>
-<html xmlns:th="http://www.thymeleaf.org">
-
-<head>
-	<meta http-equiv="Content-Type" content="text/html; charset= UTF-8">
-	<meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0">
-	<title>Login - Shopme Admin</title>
-	<link rel="stylesheet" type="text/css" th:href="@{/webjars/bootstrap/css/bootstrap.min.css}" />
-</head>
-
-<body>
-	<div class="container-fluid text-center">
-		
-		<div>
-			<img th:src="@{/images/ShopmeAdminBig.png}" />
-		</div>
-		
-		<form th:action="@{/login}" method="post" style="max-width:350px; margin: 0 auto">
-			
-			<!--  ?error param will appear at the end of url if there is error with email or password  -->
-			<div th:if="${param.error}">
-				<p class="text-danger">[[${session.SPRING_SECURITY_LAST_EXCEPTION.message}]]</p>
-			</div>
-			
-			<div th:if="${param.logout}">
-				<p class="text-warning">[[${session.SPRING_SECURITY_LAST_EXCEPTION.message}]]</p>
-			</div>
-			
-			
-			<div class="border border-secondary rounded p-3">
-				<p>Access to Shopme Control Panel </p>
-				
-				<p>
-					<input type="email" name="email" class="form-control" placeholder="Email" required />
-				</p>
-				
-				<p>
-					<input type="password" name="password" class="form-control" placeholder="Password" required />
-				</p>
-				
-				<p>
-					<input type="submit" value="Login" class="btn btn-primary" />
-				</p>
-			</div>
-		
-		</form>
-
-		<div>
-			<p>Shopme Control Panel - Copyright &copy; Shopme</p>
-		</div>
-
-	</div>
-
-</body>
-
-</html>
\ No newline at end of file
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/2a/903ee6de09b4001d128fb79045552177 b/.metadata/.plugins/org.eclipse.core.resources/.history/2a/903ee6de09b4001d128fb79045552177
deleted file mode 100644
index 2961db9b..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/2a/903ee6de09b4001d128fb79045552177
+++ /dev/null
@@ -1,34 +0,0 @@
-<!DOCTYPE html>
-<html xmlns:th="http://www.thymeleaf.org">
-
-<head>
-	<meta http-equiv="Content-Type" content="text/html; charset= UTF-8">
-	<meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0">
-	<title>Login - Shopme Admin</title>
-	<link rel="stylesheet" type="text/css" th:href="@{/webjars/bootstrap/css/bootstrap.min.css}" />
-</head>
-
-<body>
-	<div class="container-fluid text-center">
-		
-		<div>
-			<img th:src="@{/images/ShopmeAdminBig.png}" />
-		</div>
-		
-		<form th:action="@{/login}" method="post">
-		
-			<div class="border border-secondary">
-				<p>Access to Shopme Control Panel </p>
-			</div>
-		
-		</form>
-
-		<div>
-			<p>Shopme Control Panel - Copyright &copy; Shopme</p>
-		</div>
-
-	</div>
-
-</body>
-
-</html>
\ No newline at end of file
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/2b/e06a1040cfb9001d10d0f9513979f945 b/.metadata/.plugins/org.eclipse.core.resources/.history/2b/e06a1040cfb9001d10d0f9513979f945
new file mode 100644
index 00000000..a405ff0f
--- /dev/null
+++ b/.metadata/.plugins/org.eclipse.core.resources/.history/2b/e06a1040cfb9001d10d0f9513979f945
@@ -0,0 +1,131 @@
+package com.shopme.admin.category;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.NoSuchElementException;
+import java.util.Set;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.repository.support.Repositories;
+import org.springframework.stereotype.Service;
+
+import com.shopme.common.entity.Category;
+
+@Service
+public class CategoryService {
+
+	@Autowired
+	private CategoryRepository repo;
+
+	public List<Category> listAll() {
+
+		List<Category> rootCategories = repo.findRootCategories();
+
+		return listHierarchicalCategories(rootCategories);
+	}
+
+	private List<Category> listHierarchicalCategories(List<Category> rootCategories) {
+
+		List<Category> hierarchicalCategories = new ArrayList<>();
+
+		for (Category rootCategory : rootCategories) {
+			hierarchicalCategories.add(Category.copyFull(rootCategory));
+
+			Set<Category> children = rootCategory.getChildren();
+
+			for (Category subCategory : children) {
+				String name = "--" + subCategory.getName();
+				hierarchicalCategories.add(Category.copyFull(subCategory, name));
+
+				listHierarchicalCategories(hierarchicalCategories, subCategory, 1);
+			}
+		}
+
+		return hierarchicalCategories;
+
+	}
+
+	// recursive method
+	private void listHierarchicalCategories(List<Category> hierarchicalCategories, Category parent, int subLevel) {
+
+		Set<Category> children = parent.getChildren();
+		int newSubLevel = subLevel + 1;
+
+		for (Category subCategory : children) {
+
+			String name = "";
+			for (int i = 0; i < newSubLevel; i++) {
+				name += "--";
+			}
+
+			name += subCategory.getName();
+			hierarchicalCategories.add(Category.copyFull(subCategory, name));
+
+			listHierarchicalCategories(hierarchicalCategories, subCategory, newSubLevel);
+
+		}
+
+	}
+
+	public Category save(Category category) {
+		return repo.save(category);
+	}
+
+	public List<Category> listCategoriesUsedInForm() {
+
+		List<Category> categoriesUsedInForm = new ArrayList<>();
+
+		Iterable<Category> categoriesInDB = repo.findAll();
+
+		for (Category category : categoriesInDB) {
+
+			// root category
+			if (category.getParent() == null) {
+				categoriesUsedInForm.add(Category.copyIdAndName(category));
+
+				category.getChildren().forEach(subCategory -> {
+					String name = "--" + subCategory.getName();
+
+					categoriesUsedInForm.add(Category.copyIdAndName(subCategory.getId(), name));
+					listSubCategoriesUsedInForm(categoriesUsedInForm, subCategory, 1);
+				});
+			}
+
+		}
+
+		return categoriesUsedInForm;
+	}
+
+	// recursive method
+	private void listSubCategoriesUsedInForm(List<Category> categoriesUsedInForm, Category parent, int subLevel) {
+
+		int newSubLevel = subLevel + 1;
+		Set<Category> children = parent.getChildren();
+
+		for (Category subCategory : children) {
+
+			String name = "";
+			for (int i = 0; i < newSubLevel; i++) {
+				name += "--";
+			}
+			name += subCategory.getName();
+			categoriesUsedInForm.add(Category.copyIdAndName(subCategory.getId(), name));
+
+			listSubCategoriesUsedInForm(categoriesUsedInForm, subCategory, newSubLevel);
+		}
+
+	}
+
+	public Category get(Integer id) throws CategoryNotFoundException {
+
+		try {
+			return repo.findById(id).get();
+
+		} catch (NoSuchElementException ex) {
+
+			throw new CategoryNotFoundException("could not find any category with the integer: " + id);
+		}
+
+	}
+
+}
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/2c/b05f62752eb4001d1d079a924effdc9e b/.metadata/.plugins/org.eclipse.core.resources/.history/2c/b05f62752eb4001d1d079a924effdc9e
deleted file mode 100644
index 01dc5d83..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/2c/b05f62752eb4001d1d079a924effdc9e
+++ /dev/null
@@ -1,97 +0,0 @@
-<!DOCTYPE html>
-<html xmlns:th="http://www.thymeleaf.org"
-	  xmlns:sec="https://www.thymeleaf.org/thymeleaf-extras-springsecurity5">
-
-<head>
-	<meta http-equiv="Content-Type" content="text/html; charset= UTF-8">
-	<meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0">
-	<title>Home - Shopme Admin</title>
-	
-	<link rel="stylesheet" type="text/css" th:href="@{/fontawesome/all.css}" />
-	<link rel="stylesheet" type="text/css" th:href="@{/style.css}" />
-	<link rel="stylesheet" type="text/css" th:href="@{/webjars/bootstrap/css/bootstrap.min.css}" />
-	
-	<script type="text/javascript" th:src="@{/webjars/jquery/jquery.min.js}"></script>
-	<script type="text/javascript" th:src="@{/webjars/bootstrap/js/bootstrap.min.js}"></script>
-</head>
-
-<body>
-	<div class="container-fluid">
-		<div>
-			<form th:action="@{/logout}" method="post" th:hidden="true" name="logoutForm">
-			
-			</form>
-			<nav class="navbar navbar-expand-lg bg-dark navbar-dark">
-				<a class="navbar-brand" th:href="@{/}">
-					<img th:src="@{/images/ShopmeAdminSmall.png}"/>
-				</a>
-				<!--hamburger toggler for mobile devices(responsive)-->
-				<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#topNavbar">
-					<span class="navbar-toggler-icon"></span>
-				</button>
-				<div class="collapse navbar-collapse" id="topNavbar">
-					<ul class="navbar-nav">
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/users}">Users</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/categories}">Categories</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/brands}">Brands</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/products}">Products</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/customers}">Customers</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/shipping}">Shipping</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/orders}">Orders</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/report}">Sales Report</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/articles}">Articles</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/menus}">Menus</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/settings}">Settings</a>
-						</li>
-						<li>
-							<span class="fas fa-user fa-2x icon-silver"></span>
-						</li>
-						<li class="nav-item dropdown">
-								<!-- principal refers to user; display username -->
-							<a class="nav-link dropdown-toggle" sec:authentication="principal.fullname" data-toggle="dropdown"></a>
-							<div class="dropdown-menu">
-								<a class="dropdown-item" href="">Logout</a>
-							</div>
-							
-						</li>
-					</ul>
-				</div>
-				
-			</nav>
-		</div>
-
-		<div>
-			<h1>Shopme Control Panel</h1>
-		<div />
-
-		<div>
-			<p>Shopme Control Panel - Copyright &copy; Shopme</p>
-		<div />
-
-
-	</div>
-
-</body>
-
-</html>
\ No newline at end of file
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/2d/d084db878bb3001d19bbb001c1a81c20 b/.metadata/.plugins/org.eclipse.core.resources/.history/2d/d084db878bb3001d19bbb001c1a81c20
deleted file mode 100644
index 5f2b9c1e..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/2d/d084db878bb3001d19bbb001c1a81c20
+++ /dev/null
@@ -1,259 +0,0 @@
-<!DOCTYPE html>
-<html xmlns:th="http://www.thymeleaf.org">
-
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset= UTF-8">
-<meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0">
-<title>Manage Users</title>
-
-<link rel="stylesheet" type="text/css" th:href="@{/webjars/bootstrap/css/bootstrap.min.css}" />
-<link rel="stylesheet" type="text/css" th:href="@{/fontawesome/all.css}" />
-<link rel="stylesheet" type="text/css" th:href="@{/style.css}" />
-	
-<script type="text/javascript" th:src="@{/webjars/jquery/jquery.min.js}"></script>
-<script type="text/javascript" th:src="@{/webjars/bootstrap/js/bootstrap.min.js}"></script>
-</head>
-
-<body>
-	<div class="container-fluid">
-		<div>
-			<nav class="navbar navbar-expand-lg bg-dark navbar-dark">
-				<a class="navbar-brand" th:href="@{/}"> <img
-					th:src="@{/images/ShopmeAdminSmall.png}" />
-				</a>
-				<!--hamburger toggler for mobile devices(responsive)-->
-				<button class="navbar-toggler" type="button" data-toggle="collapse"
-					data-target="#topNavbar">
-					<span class="navbar-toggler-icon"></span>
-				</button>
-				<div class="collapse navbar-collapse" id="topNavbar">
-					<ul class="navbar-nav">
-						<li class="nav-item"><a class="nav-link" th:href="@{/users}">Users</a>
-						</li>
-						<li class="nav-item"><a class="nav-link"
-							th:href="@{/categories}">Categories</a></li>
-						<li class="nav-item"><a class="nav-link" th:href="@{/brands}">Brands</a>
-						</li>
-						<li class="nav-item"><a class="nav-link"
-							th:href="@{/products}">Products</a></li>
-						<li class="nav-item"><a class="nav-link"
-							th:href="@{/customers}">Customers</a></li>
-						<li class="nav-item"><a class="nav-link"
-							th:href="@{/shipping}">Shipping</a></li>
-						<li class="nav-item"><a class="nav-link" th:href="@{/orders}">Orders</a>
-						</li>
-						<li class="nav-item"><a class="nav-link" th:href="@{/report}">Sales
-								Report</a></li>
-						<li class="nav-item"><a class="nav-link"
-							th:href="@{/articles}">Articles</a></li>
-						<li class="nav-item"><a class="nav-link" th:href="@{/menus}">Menus</a>
-						</li>
-						<li class="nav-item"><a class="nav-link"
-							th:href="@{/settings}">Settings</a></li>
-					</ul>
-				</div>
-
-			</nav>
-		</div>
-
-		<div>
-			<h2>Manage Users</h2>
-			<a th:href="@{/users/new}" class="fas fa-user-plus fa-2x icon-dark mr-2"></a>
-			
-			<a th:href="@{/users/export/csv}" class="fas fa-file-csv fa-2x icon-dark mr-2"></a>
-		</div>
-		
-		
-		
-		<!-- only display success message when a new user is created -->
-		<div th:if="${message != null}" class="alert alert-success text-center">
-			[[${message}]]
-		</div>
-			
-		<div>
-			<form th:action="@{/users/page/1}" class="form-inline m-3">
-				
-				<input type="hidden" name="sortField" th:value="${sortField}" />
-				<input type="hidden" name="sortDir" th:value="${sortDir}" />
-				Filter:&nbsp;
-				<input type="search" name="keyword" th:value="${keyword}" class="form-control" required/>
-				&nbsp;&nbsp;
-				<button type="submit" class="btn btn-primary">
-					<i class="fas fa-search"></i>
-				</button>
-				&nbsp;&nbsp;
-				<button type="button" class="btn btn-secondary" onclick="clearFilter()">
-					<i class="fas fa-eraser"></i>
-				</button>
-			</form>
-		
-		</div>
-
-
-			<div class="full-details">
-				<table class="table table-bordered table-striped table-hover table-responsive-xL">
-					<thead class="thead-dark">
-						<tr>
-							<!-- refer to templates/fragments.html for fragment code-->
-							<th th:replace="fragments :: column_link('id', 'User ID')"/>
-							<th>Photos</th>
-							<th th:replace="fragments :: column_link('email', 'Email')"/>
-							<th th:replace="fragments :: column_link('firstName', 'First Name')"/>
-							<th th:replace="fragments :: column_link('lastName', 'Last Name')"/>
-							<th>Roles</th>
-							<th th:replace="fragments :: column_link('enabled', 'Enabled')"/>
-							<th></th>
-						</tr>
-					</thead>
-					<tbody>
-						<tr th:each="user : ${listUsers}">
-							<td>[[${user.id}]]</td>
-							<td>
-								<span th:if="${user.photos == null}" class="fas fa-portrait fa-3x icon-dark"></span>
-								<img th:if="${user.photos != null}" th:src="@{${user.photosImagePath}}"
-								style="width: 100px"/>
-							</td>
-							<td>[[${user.email}]]</td>
-							<td>[[${user.firstName}]]</td>
-							<td>[[${user.lastName}]]</td>
-							<td>[[${user.roles}]]</td>
-							
-							<td>
-								<a th:if="${user.enabled == true}" class="fas fa-check-circle fa-2x icon-green" 
-								th:href="@{'/users/' + ${user.id} + '/enabled/false'}"
-								title="Disable this user"></a>
-								
-								<a th:if="${user.enabled == false}" class="fas fa-circle fa-2x icon-silver"
-								 th:href="@{'/users/' + ${user.id} + '/enabled/true'}"
-								 title="Enable this user"></a>
-							</td>
-							<td>
-									<a class="fas fa-edit fa-2x icon-green" th:href="@{'/users/edit/' + ${user.id}}"
-									title="edit this user"></a>
-									&nbsp; 
-									<a class="fas fa-trash fa-2x icon-dark link-delete" th:href="@{'/users/delete/' + ${user.id}}"
-									title="delete this user" th:userId="${user.id}"></a>
-							</td>
-						</tr>
-					</tbody>
-				</table>
-			</div>
-			
-			
-			<!-- display this on mobile screens only, refer to /static/style.css for more info-->
-			<div class="less-details">
-				
-				<div th:each="user : ${listUsers}" class="row m-1">
-					
-					<div class="col">
-						
-						<span th:if="${user.photos == null}" class="fas fa-portrait fa-3x icon-dark"></span>
-								<img th:if="${user.photos != null}" th:src="@{${user.photosImagePath}}"
-								style="width: 100px"/>
-					</div>
-						<div class="col">
-							<div>[[${}]]</div>
-						
-						</div>
-					<div>&nbsp;</div>
-				</div>
-			</div>
-			
-			
-			<!-- IF -->
-			<div class="text-center m-1" th:if="${totalItems > 0}">
-				<span>Showing Users # [[${startCount}]] to [[${endCount}]] of [[${totalItems}]]</span>
-			</div>
-			
-			<!-- ELSE -->
-			<div class="text-center m-1" th:unless="${totalItems > 0}">
-				<span>No users found</span>
-			</div>
-			
-			<!-- only display pagination when there are users; else, no users no pagination -->
-			<div th:if="${totalPages > 1}">
-				<nav>
-					  <ul class="pagination justify-content-center">
-					  
-					  	<li th:class=" ${currentPage > 1 ? 'page-item' : 'page-item disabled'}">
-					  		<a th:replace="fragments :: page_link(1, 'First')"></a>
-				    	</li>
-					  
-					    <li th:class=" ${currentPage > 1 ? 'page-item' : 'page-item disabled'}">
-					    	<a th:replace="fragments :: page_link(${currentPage - 1 }, 'previous')"></a>
-				    	</li>
-					    	
-					    <!-- org.thymeleaf.expression.Numbers class, An object of this class is usually available in variable evaluation expressions with the name #numbers. -->
-					    <li th:class="${currentPage != i ? 'page-item' : 'page-item active'}" 
-					    	th:each="i : ${#numbers.sequence(1, totalPages)}">
-					    	<a th:replace="fragments :: page_link(${i}, ${i})"></a>
-					    </li>
-					    
-					    <li  th:class=" ${currentPage < totalPages ? 'page-item' : 'page-item disabled'}">
-					    	<a th:replace="fragments :: page_link(${currentPage + 1}, 'Next')"></a>
-					    </li>
-					    
-					    <li th:class=" ${currentPage < totalPages ? 'page-item' : 'page-item disabled'}">
-							<a th:replace="fragments :: page_link(${totalPages}, 'Last')"></a>		
-					    </li>
-					  </ul>
-				</nav>
-			</div>
-			
-			
-			
-			<div class="modal fade text-center" id="confirmModal">
-				<div class="modal-dialog">
-					<div class="modal-content">
-					
-						<div class="modal-header">
-							<h4 class="modal-title">Delete Confirmation</h4>
-							<button type="button" class="close" data-dismiss="modal">&times;</button>
-						</div>
-						
-						<div class="modal-body">
-							<span id="confirmText"></span>
-						</div>
-						
-						<div class="modal-footer">
-							<a class="btn btn-success" href="" id="yesButton">Yes</a>
-							<button type="button" class="btn btn-danger" data-dismiss="modal">Close</button>
-						</div>
-					</div>
-				</div>
-			</div>
-			
-			
-			<div class="text-center">
-				<p>Shopme Control Panel - Copyright &copy; Shopme</p>
-			</div>
-
-
-	</div>
-	
-<script type="text/javascript">
-
-//confirmation modal dialogue for delete user
-$(document).ready(function(){
-	$(".link-delete").on("click", function(e){
-		//stop the <a> tag default behaviour and pop out a confirmation modal dialogue
-		e.preventDefault();
-		//alert($(this).attr("href"));
-		link = $(this);
-		userId = link.attr("userId");
-		$("#yesButton").attr("href", link.attr("href"));
-		$("#confirmText").text("Are you sure you want to delete this user ID " + userId + "?");
-		$("#confirmModal").modal();
-	});
-});
-
-	function clearFilter(){
-		window.location = "[[@{/users}]]";
-	}
-
-
-</script>
-	
-</body>
-
-</html>
\ No newline at end of file
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/2d/f062a65aabb6001d1567bacd2f52a0b7 b/.metadata/.plugins/org.eclipse.core.resources/.history/2d/f062a65aabb6001d1567bacd2f52a0b7
deleted file mode 100644
index 89135fb2..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/2d/f062a65aabb6001d1567bacd2f52a0b7
+++ /dev/null
@@ -1,198 +0,0 @@
-package com.shopme.admin.user;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
-import java.util.List;
-
-import org.junit.jupiter.api.Test;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.autoconfigure.jdbc.AutoConfigureTestDatabase;
-import org.springframework.boot.test.autoconfigure.jdbc.AutoConfigureTestDatabase.Replace;
-import org.springframework.boot.test.autoconfigure.orm.jpa.DataJpaTest;
-import org.springframework.boot.test.autoconfigure.orm.jpa.TestEntityManager;
-import org.springframework.data.domain.Page;
-import org.springframework.data.domain.PageRequest;
-import org.springframework.data.domain.Pageable;
-import org.springframework.test.annotation.Rollback;
-
-import com.shopme.common.entity.Role;
-import com.shopme.common.entity.User;
-
-@DataJpaTest(showSql = false)
-//configure to run on real database(MySQL) instead of a test database
-@AutoConfigureTestDatabase(replace = Replace.NONE)
-/*
- * Datajpatest will rollback the transaction after executing the test method
- * everytime, so that the transaction will not be committed. if we want to
- * commit the transaction(aka "save the record"), we can disable rollback by
- * setting it to false. Now, all transactions will be committed
- */
-@Rollback(false)
-public class UserRepositoryTests {
-
-	@Autowired
-	private UserRepository repo;
-
-	@Autowired
-	private TestEntityManager entityManager;
-
-	// On the very first execution of testCreateUser() method; hibernate will create
-	// the users table & users_roles table
-	@Test
-	public void testCreateUserWithOneRole() {
-
-		Role roleAdmin = entityManager.find(Role.class, 1);
-		User userChow = new User("chow@gmail.com", "password", "chow", "seng fung");
-		userChow.addRoles(roleAdmin);
-		User savedUser = repo.save(userChow);
-		assertThat(savedUser.getId()).isGreaterThan(0);
-
-	}
-
-	@Test
-	public void testCreateUserWithTwoRole() {
-
-		User userRavi = new User("ravi@gmail.com", "ravipass", "ravi", "kumar");
-		Role roleEditor = new Role(3);
-		Role roleAssistant = new Role(5);
-
-		userRavi.addRoles(roleEditor);
-		userRavi.addRoles(roleAssistant);
-
-		User savedUser = repo.save(userRavi);
-		assertThat(savedUser.getId()).isGreaterThan(0);
-	}
-
-	@Test
-	public void testListAllUsers() {
-		Iterable<User> listUsers = repo.findAll();
-
-		// use method reference instead of lambda expression here
-		listUsers.forEach(System.out::println);
-
-	}
-
-	@Test
-	public void testGetUserById() {
-
-		User userChow = repo.findById(1).get();
-		System.out.println(userChow);
-		// use method reference instead of lambda expression here
-		assertThat(userChow).isNotNull();
-	}
-
-	@Test
-	public void testUpdateUserDetails() {
-		
-		User userChow = repo.findById(1).get();
-		userChow.setEnabled(true);
-		userChow.setEmail("chow22@gmail.com");
-		
-		repo.save(userChow);
-	}
-	
-	@Test
-	public void testUpdateUserRoles() {
-		
-		User userRavi = repo.findById(4).get();
-		Role roleEditor = new Role(3);
-		Role roleSalesperson= new Role(2);
-		
-		//change role from editor to salesperson
-		
-		/* take note of overriding/implementing the hashcode and equals method in roles
-		 * class. need to override those two methods for remove() to work.
-		 *  The remove() method removes an element "e" such that Objects.equals(o, e),
-		 *  this will invoke the overwritten equals() method in Role Class. 
-		 * */
-		userRavi.getRoles().remove(roleEditor);
-		userRavi.addRoles(roleSalesperson);
-		
-		repo.save(userRavi);
-	}
-	
-	@Test
-	public void testDeleteUser() {
-		
-		Integer userId = 4;
-		repo.deleteById(userId);
-	}
-	
-	
-	@Test
-	public void testGetUserByEmail() {
-		String email = "ravi@gmail.com";
-		User user = repo.getUserByEmail(email);
-		
-		assertThat(user).isNotNull();
-	}
-	
-	/*
-	 * count the number of records in database with a particular id.
-	 * return value should be 1,
-	 * because id is unique.
-	 * 
-	 * use countById() method to test whether a user exists. 
-	 */
-	@Test
-	public void testCountById() {
-		
-		Integer userId = 1;
-		Long countById = repo.countById(userId);
-		
-		assertThat(countById).isNotNull().isGreaterThan(0).isEqualTo(1);
-	}
-	
-	@Test	
-	public void testDisableUser() {
-		Integer userId = 1;
-		
-		repo.updateEnabledStatus(userId, false);
-	}
-
-	@Test	
-	public void testEnableUser() {
-		Integer userId = 1;
-		
-		repo.updateEnabledStatus(userId, true);
-	}
-	
-	@Test
-	public void testListFirstPage() {
-		int pageNumber = 0; // the first page number always start with 0, change pageNumber to 1 to get the second page, 2 for thid page and so forth
-		int pageSize = 4; // no of elements
-		
-		Pageable pageable = PageRequest.of(pageNumber, pageSize);
-		Page<User> page = repo.findAll(pageable);
-		
-		List<User> listUsers = page.getContent();
-		
-		listUsers.forEach(System.out::println);
-		
-		assertThat(listUsers.size()).isEqualTo(pageSize);
-	}
-	
-	
-	@Test 
-	public void testSearchUsers() {
-		
-		String keyword = "bruce";
-		
-		
-		int pageNumber = 0; // the first page number always start with 0, change pageNumber to 1 to get the second page, 2 for thid page and so forth
-		int pageSize = 4; // no of elements
-		
-		Pageable pageable = PageRequest.of(pageNumber, pageSize);
-		Page<User> page = repo.findAll(keyword, pageable);
-		
-		List<User> listUsers = page.getContent();
-		
-		listUsers.forEach(System.out::println);
-		
-		assertThat(listUsers.size()).isGreaterThan(0);
-		
-	}
-	
-	
-}
-
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/2e/a08e0d3451b3001d1e75aa5ef0815903 b/.metadata/.plugins/org.eclipse.core.resources/.history/2e/a08e0d3451b3001d1e75aa5ef0815903
deleted file mode 100644
index 92adf271..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/2e/a08e0d3451b3001d1e75aa5ef0815903
+++ /dev/null
@@ -1,176 +0,0 @@
-package com.shopme.admin.user;
-
-import java.io.IOException;
-import java.util.List;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.domain.Page;
-import org.springframework.data.repository.query.Param;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
-import org.springframework.util.StringUtils;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.ModelAttribute;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.multipart.MultipartFile;
-import org.springframework.web.servlet.mvc.support.RedirectAttributes;
-
-import com.fasterxml.jackson.annotation.ObjectIdGenerators.StringIdGenerator;
-import com.shopme.admin.FileUploadUtil;
-import com.shopme.common.entity.Role;
-import com.shopme.common.entity.User;
-
-@Controller
-public class UserController {
-
-	@Autowired
-	private UserService service;
-
-	@GetMapping("/users")
-	public String listFirstPage(Model model) {
-		
-		//default values for path variable and URL parameters
-		return listByPage(1, model, "firstName", "asc", null);
-	}
-
-	@GetMapping("/users/page/{pageNum}")
-	public String listByPage(@PathVariable(name = "pageNum") int pageNum, Model model,
-			@Param("sortField") String sortField, @Param("sortDir") String sortDir,
-			@Param("keyword") String keyword) {
-		
-		System.out.println("sort field: " + sortField);
-		System.out.println("sort order: " + sortDir);
-		
-		Page<User> page = service.listByPage(pageNum, sortField, sortDir, keyword);
-		List<User> listUsers = page.getContent();
-
-		
-		long startCount = (pageNum - 1) * UserService.USERS_PER_PAGE + 1;
-		long endCount = startCount + UserService.USERS_PER_PAGE - 1;
-		if(endCount > page.getTotalElements()) {
-			endCount = page.getTotalElements();
-		}
-		
-		String reverseSortDir = sortDir.equals("asc") ? "desc" : "asc";
-		
-		model.addAttribute("currentPage", pageNum);
-		model.addAttribute("totalPages", page.getTotalPages());
-		model.addAttribute("startCount", startCount);
-		model.addAttribute("endCount", endCount);
-		model.addAttribute("totalItems", page.getTotalElements());
-		model.addAttribute("listUsers", listUsers);
-		model.addAttribute("sortField", sortField);
-		model.addAttribute("sortDir", sortDir);
-		model.addAttribute("reverseSortDir", reverseSortDir);
-		model.addAttribute("keyword", keyword);
-		
-
-		return "users";
-
-	}
-
-	@GetMapping("/users/new")
-	public String newUser(Model model) {
-
-		List<Role> listRoles = service.listRoles();
-
-		User user = new User();
-		user.setEnabled(true);
-
-		model.addAttribute("user", user);
-		model.addAttribute("listRoles", listRoles);
-		model.addAttribute("pageTitle", "Create New User");
-
-		return "user_form";
-
-	}
-
-	// using @RequestParam, we can get the image file input, the input has the
-	// property name="image"
-	@PostMapping("/users/save")
-	public String saveUser(@ModelAttribute("user") User user, RedirectAttributes redirectAttributes,
-			@RequestParam("image") MultipartFile multipartFile) throws IOException {
-
-		if (!multipartFile.isEmpty()) {
-
-			String fileName = StringUtils.cleanPath(multipartFile.getOriginalFilename());
-			user.setPhotos(fileName);
-
-			User savedUser = service.save(user);
-
-			String uploadDir = "user-photos/" + savedUser.getId();
-
-			FileUploadUtil.cleanDir(uploadDir);
-			FileUploadUtil.saveFile(uploadDir, fileName, multipartFile);
-		} else {
-
-			// set photo to null for getPhotosImagePath() method's conditional statement in
-			// User class
-			if (user.getPhotos().isEmpty())
-				user.setPhotos(null);
-			service.save(user);
-		}
-
-		redirectAttributes.addFlashAttribute("message", "the user has been saved successfully");
-
-		// POST/REDIRECT/GET web design
-		return getRedirectURLtoAffectedUser(user);
-	}
-
-	private String getRedirectURLtoAffectedUser(User user) {
-		
-		//after user is saved display the user instead of the entire user list
-		//email is a unique field to identify each user.
-		String firstPartOfEmail = user.getEmail().split("@")[0];
-		return "redirect:/users/page/1?sortField=id&sortDir=asc&keyword=" + firstPartOfEmail;
-	}
-
-	@GetMapping("/users/edit/{id}")
-	public String editUser(@PathVariable(name = "id") Integer id, RedirectAttributes redirectAttributes, Model model) {
-		try {
-			User user = service.get(id);
-			List<Role> listRoles = service.listRoles();
-
-			model.addAttribute("user", user);
-			model.addAttribute("pageTitle", "Edit User (ID: " + id + ")");
-			model.addAttribute("listRoles", listRoles);
-
-			return "user_form";
-		} catch (UserNotFoundException ex) {
-			redirectAttributes.addFlashAttribute("message", ex.getMessage());
-
-			return "redirect:/users";
-		}
-
-	}
-
-	@GetMapping("/users/delete/{id}")
-	public String deleteUser(@PathVariable(name = "id") Integer id, RedirectAttributes redirectAttributes,
-			Model model) {
-		try {
-			service.delete(id);
-			redirectAttributes.addFlashAttribute("message", "The user ID " + id + " has been deleted successfully.");
-
-		} catch (UserNotFoundException ex) {
-			redirectAttributes.addFlashAttribute("message", ex.getMessage());
-
-		}
-
-		return "redirect:/users";
-	}
-
-	@GetMapping("/users/{id}/enabled/{status}")
-	public String updateUserEnabledStatus(@PathVariable(name = "id") Integer id,
-			@PathVariable(name = "status") boolean enabled, RedirectAttributes redirectAttributes) {
-
-		service.updateUserEnabledStatus(id, enabled);
-		String status = enabled ? "enabled" : "disabled";
-		String message = "The user id " + id + " has been " + status;
-		redirectAttributes.addFlashAttribute("message", message);
-
-		return "redirect:/users";
-	}
-
-}
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/2e/d02a033d40b3001d1e75aa5ef0815903 b/.metadata/.plugins/org.eclipse.core.resources/.history/2e/d02a033d40b3001d1e75aa5ef0815903
deleted file mode 100644
index 9e481997..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/2e/d02a033d40b3001d1e75aa5ef0815903
+++ /dev/null
@@ -1,54 +0,0 @@
-package com.shopme.admin.user;
-
-import org.springframework.data.domain.Page;
-import org.springframework.data.domain.Pageable;
-import org.springframework.data.jpa.repository.Modifying;
-import org.springframework.data.jpa.repository.Query;
-import org.springframework.data.repository.CrudRepository;
-import org.springframework.data.repository.PagingAndSortingRepository;
-import org.springframework.data.repository.query.Param;
-import org.springframework.stereotype.Repository;
-
-import com.shopme.common.entity.User;
-
-@Repository
-public interface UserRepository extends CrudRepository<User, Integer>, PagingAndSortingRepository<User, Integer> {
-
-	/*
-	 * JPQL statement. It should be noted that as compared to native SQL, JPQL does
-	 * not interact with database tables, records, and fields - but with Java
-	 * classes and instances.
-	 * 
-	 * JPA kicks in as the mediator and transpiles JPQL queries to SQL queries for execution.
-	 * 
-	 * If your database can change or varies from development to production, as long as 
-	 * they're both relational - JPQL works wonders and you can 
-	 * write JPQL queries to create generic logic that can be used over and over again.
-	 */
-	@Query("SELECT u FROM User u WHERE u.email = :email")
-	public User getUserByEmail(@Param("email") String email);
-	
-	// countById() declaration follows the JPA specification
-	//to check the existence of a user
-	public Long countById(Integer id);
-	
-	
-	//for filtering users by keyword
-	/*
-	 * @Query("SELECT u FROM User u WHERE u.firstName LIKE %?1% OR u.lastName LIKE %?1%"
-	 * + " OR u.email LIKE %?1%")
-	 * 
-	 * the above query does not work when we search for user with keyword "nam ha minh".
-	 * 
-	 * Instead we should concatenate the fields separated by space as the query below
-	 */
-	 @Query("SELECT u FROM User u WHERE  CONCAT(u.id, ' ', u.email, ' ', u.lastName, ' ', u.firstName) LIKE %?1%")
-	public Page<User> findAll(String keyword, Pageable pageable);
-	
-	
-	//change user enabled status
-	//need @Modifying annotation for update/delete operation
-	@Query("UPDATE User u SET u.enabled = ?2 WHERE u.id = ?1")
-	@Modifying
-	public void updateEnabledStatus(Integer id, boolean enabled);
-}
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/2e/f0c9f7e523b4001d1216d7fff398b3d6 b/.metadata/.plugins/org.eclipse.core.resources/.history/2e/f0c9f7e523b4001d1216d7fff398b3d6
deleted file mode 100644
index c57b8d47..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/2e/f0c9f7e523b4001d1216d7fff398b3d6
+++ /dev/null
@@ -1,94 +0,0 @@
-<!DOCTYPE html>
-<html xmlns:th="http://www.thymeleaf.org"
-	  xmlns:sec="https://www.thymeleaf.org/thymeleaf-extras-springsecurity5">
-
-<head>
-	<meta http-equiv="Content-Type" content="text/html; charset= UTF-8">
-	<meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0">
-	<title>Home - Shopme Admin</title>
-	
-	<link rel="stylesheet" type="text/css" th:href="@{/fontawesome/all.css}" />
-	<link rel="stylesheet" type="text/css" th:href="@{/style.css}" />
-	<link rel="stylesheet" type="text/css" th:href="@{/webjars/bootstrap/css/bootstrap.min.css}" />
-	
-	<script type="text/javascript" th:src="@{/webjars/jquery/jquery.min.js}"></script>
-	<script type="text/javascript" th:src="@{/webjars/bootstrap/js/bootstrap.min.js}"></script>
-</head>
-
-<body>
-	<div class="container-fluid">
-		<div>
-			<nav class="navbar navbar-expand-lg bg-dark navbar-dark">
-				<a class="navbar-brand" th:href="@{/}">
-					<img th:src="@{/images/ShopmeAdminSmall.png}"/>
-				</a>
-				<!--hamburger toggler for mobile devices(responsive)-->
-				<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#topNavbar">
-					<span class="navbar-toggler-icon"></span>
-				</button>
-				<div class="collapse navbar-collapse" id="topNavbar">
-					<ul class="navbar-nav">
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/users}">Users</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/categories}">Categories</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/brands}">Brands</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/products}">Products</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/customers}">Customers</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/shipping}">Shipping</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/orders}">Orders</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/report}">Sales Report</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/articles}">Articles</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/menus}">Menus</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/settings}">Settings</a>
-						</li>
-						<li>
-							<span class="fas fa-user fa-2x icon-silver"></span>
-						</li>
-						<li class="nav-item dropdown">
-								<!-- principal refers to user; display username -->
-							<a class="nav-link" sec:authentication="principal.fullname"></a>
-							<div>
-							
-							</div>
-							
-						</li>
-					</ul>
-				</div>
-				
-			</nav>
-		</div>
-
-		<div>
-			<h1>Shopme Control Panel</h1>
-		<div />
-
-		<div>
-			<p>Shopme Control Panel - Copyright &copy; Shopme</p>
-		<div />
-
-
-	</div>
-
-</body>
-
-</html>
\ No newline at end of file
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/2f/508d3e8b88b3001d19bbb001c1a81c20 b/.metadata/.plugins/org.eclipse.core.resources/.history/2f/508d3e8b88b3001d19bbb001c1a81c20
deleted file mode 100644
index c0c685e7..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/2f/508d3e8b88b3001d19bbb001c1a81c20
+++ /dev/null
@@ -1,19 +0,0 @@
-*.icon-white{color: white}
-*.icon-silver{color: silver}
-*.icon-green{color: green}
-*.icon-dark{color: gray}
-*.icon-red{color: red}
-
-
-@media screen and (max-width: 768px) {
-	/* small screen */
-}
-
-@media screen and (min-width: 768px) and (max-width: 1024px) {
-	/* medium screen */
-}
-
-
-@media screen and (mini-width: 1024px) {
-	/* large screen */
-}
\ No newline at end of file
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/2f/a07c5f9d1fb4001d1216d7fff398b3d6 b/.metadata/.plugins/org.eclipse.core.resources/.history/2f/a07c5f9d1fb4001d1216d7fff398b3d6
deleted file mode 100644
index 1dc8bcbb..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/2f/a07c5f9d1fb4001d1216d7fff398b3d6
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-	<parent>
-		<groupId>org.springframework.boot</groupId>
-		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>3.0.2</version>
-		<relativePath /> <!-- lookup parent from repository -->
-	</parent>
-	<groupId>com.shopme</groupId>
-	<artifactId>ShopmeWebParent</artifactId>
-	<version>0.0.1-SNAPSHOT</version>
-	<name>ShopmeWebParent</name>
-	<packaging>pom</packaging>
-	<description>parent spring web project</description>
-	<properties>
-		<java.version>15</java.version>
-	</properties>
-	<modules>
-		<module>ShopmeBackEnd</module>
-		<module>ShopmeFrontEnd</module>
-	</modules>
-	<dependencies>
-		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-web</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-security</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-thymeleaf</artifactId>
-		</dependency>
-		
-		<dependency>
-			<groupId>mysql</groupId>
-			<artifactId>mysql-connector-java</artifactId>
-			<scope>runtime</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-data-jpa</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-test</artifactId>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.webjars</groupId>
-			<artifactId>bootstrap</artifactId>
-			<version>4.3.1</version>
-		</dependency>
-		<dependency>
-			<groupId>org.webjars</groupId>
-			<artifactId>jquery</artifactId>
-			<version>3.4.1</version>
-		</dependency>
-		<!--dependency for discovery and reference of webjars (bootstrap & jquery)-->
-		<dependency>
-			<groupId>org.webjars</groupId>
-			<artifactId>webjars-locator-core</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>com.shopme</groupId>
-			<artifactId>ShopmeCommon</artifactId>
-			<version>0.0.1-SNAPSHOT</version>
-		</dependency>
-	</dependencies>
-</project>
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/2f/b0842adc2fb4001d1d079a924effdc9e b/.metadata/.plugins/org.eclipse.core.resources/.history/2f/b0842adc2fb4001d1d079a924effdc9e
deleted file mode 100644
index 1a1f3668..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/2f/b0842adc2fb4001d1d079a924effdc9e
+++ /dev/null
@@ -1,105 +0,0 @@
-<!DOCTYPE html>
-<html xmlns:th="http://www.thymeleaf.org"
-	  xmlns:sec="https://www.thymeleaf.org/thymeleaf-extras-springsecurity5">
-
-<head>
-	<meta http-equiv="Content-Type" content="text/html; charset= UTF-8">
-	<meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0">
-	<title>Home - Shopme Admin</title>
-	
-	<link rel="stylesheet" type="text/css" th:href="@{/fontawesome/all.css}" />
-	<link rel="stylesheet" type="text/css" th:href="@{/style.css}" />
-	<link rel="stylesheet" type="text/css" th:href="@{/webjars/bootstrap/css/bootstrap.min.css}" />
-	
-	<script type="text/javascript" th:src="@{/webjars/jquery/jquery.min.js}"></script>
-	<script type="text/javascript" th:src="@{/webjars/bootstrap/js/bootstrap.min.js}"></script>
-</head>
-
-<body>
-	<div class="container-fluid">
-		<div>
-			<form th:action="@{/logout}" method="post" th:hidden="true" name="logoutForm">
-				<input type="submit"/>
-			</form>
-			<nav class="navbar navbar-expand-lg bg-dark navbar-dark">
-				<a class="navbar-brand" th:href="@{/}">
-					<img th:src="@{/images/ShopmeAdminSmall.png}"/>
-				</a>
-				<!--hamburger toggler for mobile devices(responsive)-->
-				<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#topNavbar">
-					<span class="navbar-toggler-icon"></span>
-				</button>
-				<div class="collapse navbar-collapse" id="topNavbar">
-					<ul class="navbar-nav">
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/users}">Users</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/categories}">Categories</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/brands}">Brands</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/products}">Products</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/customers}">Customers</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/shipping}">Shipping</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/orders}">Orders</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/report}">Sales Report</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/articles}">Articles</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/menus}">Menus</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/settings}">Settings</a>
-						</li>
-						<li>
-							<span class="fas fa-user fa-2x icon-silver"></span>
-						</li>
-						<li class="nav-item dropdown">
-								<!-- principal refers to user; display username -->
-							<a class="nav-link dropdown-toggle" sec:authentication="principal.fullname" data-toggle="dropdown"></a>
-							<div class="dropdown-menu">
-								<a class="dropdown-item" id="logoutLink" href="">Logout</a>
-							</div>
-							
-						</li>
-					</ul>
-				</div>
-				
-			</nav>
-		</div>
-
-		<div>
-			<h1>Shopme Control Panel</h1>
-		</div>
-
-		<div>
-			<p>Shopme Control Panel - Copyright &copy; Shopme</p>
-		</div>
-
-
-	</div>
-	
-<script type="text/javascript">
-
-	$(document).ready(function(){
-		
-	});
-
-</script>
-
-</body>
-
-</html>
\ No newline at end of file
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/3/1012d6ef0ab4001d128fb79045552177 b/.metadata/.plugins/org.eclipse.core.resources/.history/3/1012d6ef0ab4001d128fb79045552177
deleted file mode 100644
index 6b02fea1..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/3/1012d6ef0ab4001d128fb79045552177
+++ /dev/null
@@ -1,46 +0,0 @@
-<!DOCTYPE html>
-<html xmlns:th="http://www.thymeleaf.org">
-
-<head>
-	<meta http-equiv="Content-Type" content="text/html; charset= UTF-8">
-	<meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0">
-	<title>Login - Shopme Admin</title>
-	<link rel="stylesheet" type="text/css" th:href="@{/webjars/bootstrap/css/bootstrap.min.css}" />
-</head>
-
-<body>
-	<div class="container-fluid text-center">
-		
-		<div>
-			<img th:src="@{/images/ShopmeAdminBig.png}" />
-		</div>
-		
-		<form th:action="@{/login}" method="post" style="max-width:350px; margin: 0 auto">
-		
-			<div class="border border-secondary rounded p-3">
-				<p>Access to Shopme Control Panel </p>
-				
-				<p>
-					<input type="email" name="email" class="form-control" placeholder="Email" required />
-				</p>
-				
-				<p>
-					<input type="password" name="password" class="form-control" placeholder="Password" required />
-				</p>
-				
-				<p>
-					<input type="submit" value="Login" class="form-control" />
-				</p>
-			</div>
-		
-		</form>
-
-		<div>
-			<p>Shopme Control Panel - Copyright &copy; Shopme</p>
-		</div>
-
-	</div>
-
-</body>
-
-</html>
\ No newline at end of file
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/3/2014c1192fb4001d1d079a924effdc9e b/.metadata/.plugins/org.eclipse.core.resources/.history/3/2014c1192fb4001d1d079a924effdc9e
deleted file mode 100644
index 43e5b902..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/3/2014c1192fb4001d1d079a924effdc9e
+++ /dev/null
@@ -1,97 +0,0 @@
-<!DOCTYPE html>
-<html xmlns:th="http://www.thymeleaf.org"
-	  xmlns:sec="https://www.thymeleaf.org/thymeleaf-extras-springsecurity5">
-
-<head>
-	<meta http-equiv="Content-Type" content="text/html; charset= UTF-8">
-	<meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0">
-	<title>Home - Shopme Admin</title>
-	
-	<link rel="stylesheet" type="text/css" th:href="@{/fontawesome/all.css}" />
-	<link rel="stylesheet" type="text/css" th:href="@{/style.css}" />
-	<link rel="stylesheet" type="text/css" th:href="@{/webjars/bootstrap/css/bootstrap.min.css}" />
-	
-	<script type="text/javascript" th:src="@{/webjars/jquery/jquery.min.js}"></script>
-	<script type="text/javascript" th:src="@{/webjars/bootstrap/js/bootstrap.min.js}"></script>
-</head>
-
-<body>
-	<div class="container-fluid">
-		<div>
-			<form th:action="@{/logout}" method="post" th:hidden="true" name="logoutForm">
-				<input        />
-			</form>
-			<nav class="navbar navbar-expand-lg bg-dark navbar-dark">
-				<a class="navbar-brand" th:href="@{/}">
-					<img th:src="@{/images/ShopmeAdminSmall.png}"/>
-				</a>
-				<!--hamburger toggler for mobile devices(responsive)-->
-				<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#topNavbar">
-					<span class="navbar-toggler-icon"></span>
-				</button>
-				<div class="collapse navbar-collapse" id="topNavbar">
-					<ul class="navbar-nav">
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/users}">Users</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/categories}">Categories</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/brands}">Brands</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/products}">Products</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/customers}">Customers</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/shipping}">Shipping</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/orders}">Orders</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/report}">Sales Report</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/articles}">Articles</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/menus}">Menus</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/settings}">Settings</a>
-						</li>
-						<li>
-							<span class="fas fa-user fa-2x icon-silver"></span>
-						</li>
-						<li class="nav-item dropdown">
-								<!-- principal refers to user; display username -->
-							<a class="nav-link dropdown-toggle" sec:authentication="principal.fullname" data-toggle="dropdown"></a>
-							<div class="dropdown-menu">
-								<a class="dropdown-item" href="">Logout</a>
-							</div>
-							
-						</li>
-					</ul>
-				</div>
-				
-			</nav>
-		</div>
-
-		<div>
-			<h1>Shopme Control Panel</h1>
-		<div />
-
-		<div>
-			<p>Shopme Control Panel - Copyright &copy; Shopme</p>
-		<div />
-
-
-	</div>
-
-</body>
-
-</html>
\ No newline at end of file
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/3/b0a8827b05b4001d128fb79045552177 b/.metadata/.plugins/org.eclipse.core.resources/.history/3/b0a8827b05b4001d128fb79045552177
deleted file mode 100644
index e0fa1ae9..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/3/b0a8827b05b4001d128fb79045552177
+++ /dev/null
@@ -1,22 +0,0 @@
-package com.shopme.admin;
-
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.GetMapping;
-
-@Controller
-public class MainController {
-
-	@GetMapping("")
-	public String viewHomePage() {
-		return "index";
-	}
-	
-	
-	@GetMapping("/login")
-	public String viewLoginPage() {
-		return "login";
-	}
-	
-	
-	
-}
\ No newline at end of file
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/3/f007dfc3d9b4001d1dd58082704b0bec b/.metadata/.plugins/org.eclipse.core.resources/.history/3/f007dfc3d9b4001d1dd58082704b0bec
deleted file mode 100644
index f2350b57..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/3/f007dfc3d9b4001d1dd58082704b0bec
+++ /dev/null
@@ -1,86 +0,0 @@
-package com.shopme.admin.security;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-import java.util.Set;
-
-import org.aspectj.weaver.patterns.ThisOrTargetAnnotationPointcut;
-import org.springframework.security.core.GrantedAuthority;
-import org.springframework.security.core.authority.SimpleGrantedAuthority;
-import org.springframework.security.core.userdetails.UserDetails;
-
-import com.shopme.common.entity.Role;
-import com.shopme.common.entity.User;
-
-/*
- *  Think of it as a wrapper class for  Type User
- *  
- *  ShopmeUserDetailsService will use this dao class
- * 
- * 	this class  for spring security
- * */
-public class ShopmeUserDetails implements UserDetails {
-
-	private User user;
-
-	public ShopmeUserDetails(User user) {
-		this.user = user;
-	}
-
-	/* get a list of assigned roles to user */
-	@Override
-	public Collection<? extends GrantedAuthority> getAuthorities() {
-
-		Set<Role> roles = user.getRoles();
-
-		List<SimpleGrantedAuthority> authorities = new ArrayList<>();
-
-		for (Role role : roles) {
-			authorities.add(new SimpleGrantedAuthority(role.getName()));
-		}
-
-		return authorities;
-	}
-
-	@Override
-	public String getPassword() {
-		return user.getPassword();
-	}
-
-	@Override
-	public String getUsername() {
-		return user.getEmail();
-	}
-
-	// "true" means account not expired
-	@Override
-	public boolean isAccountNonExpired() {
-		return true;
-	}
-
-	@Override
-	public boolean isAccountNonLocked() {
-		// TODO Auto-generated method stub
-		return true;
-	}
-
-	@Override
-	public boolean isCredentialsNonExpired() {
-		// TODO Auto-generated method stub
-		return true;
-	}
-
-	@Override
-	public boolean isEnabled() {
-		// TODO Auto-generated method stub
-		return user.isEnabled();
-	}
-	
-	public String getFullname() {
-		
-		return this.user.getFirstName() + " " + this.user.getLastName();
-	}
-	
-
-}
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/3/f0fbbf178ab3001d19bbb001c1a81c20 b/.metadata/.plugins/org.eclipse.core.resources/.history/3/f0fbbf178ab3001d19bbb001c1a81c20
deleted file mode 100644
index 11e0279b..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/3/f0fbbf178ab3001d19bbb001c1a81c20
+++ /dev/null
@@ -1,245 +0,0 @@
-<!DOCTYPE html>
-<html xmlns:th="http://www.thymeleaf.org">
-
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset= UTF-8">
-<meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0">
-<title>Manage Users</title>
-
-<link rel="stylesheet" type="text/css" th:href="@{/webjars/bootstrap/css/bootstrap.min.css}" />
-<link rel="stylesheet" type="text/css" th:href="@{/fontawesome/all.css}" />
-<link rel="stylesheet" type="text/css" th:href="@{/style.css}" />
-	
-<script type="text/javascript" th:src="@{/webjars/jquery/jquery.min.js}"></script>
-<script type="text/javascript" th:src="@{/webjars/bootstrap/js/bootstrap.min.js}"></script>
-</head>
-
-<body>
-	<div class="container-fluid">
-		<div>
-			<nav class="navbar navbar-expand-lg bg-dark navbar-dark">
-				<a class="navbar-brand" th:href="@{/}"> <img
-					th:src="@{/images/ShopmeAdminSmall.png}" />
-				</a>
-				<!--hamburger toggler for mobile devices(responsive)-->
-				<button class="navbar-toggler" type="button" data-toggle="collapse"
-					data-target="#topNavbar">
-					<span class="navbar-toggler-icon"></span>
-				</button>
-				<div class="collapse navbar-collapse" id="topNavbar">
-					<ul class="navbar-nav">
-						<li class="nav-item"><a class="nav-link" th:href="@{/users}">Users</a>
-						</li>
-						<li class="nav-item"><a class="nav-link"
-							th:href="@{/categories}">Categories</a></li>
-						<li class="nav-item"><a class="nav-link" th:href="@{/brands}">Brands</a>
-						</li>
-						<li class="nav-item"><a class="nav-link"
-							th:href="@{/products}">Products</a></li>
-						<li class="nav-item"><a class="nav-link"
-							th:href="@{/customers}">Customers</a></li>
-						<li class="nav-item"><a class="nav-link"
-							th:href="@{/shipping}">Shipping</a></li>
-						<li class="nav-item"><a class="nav-link" th:href="@{/orders}">Orders</a>
-						</li>
-						<li class="nav-item"><a class="nav-link" th:href="@{/report}">Sales
-								Report</a></li>
-						<li class="nav-item"><a class="nav-link"
-							th:href="@{/articles}">Articles</a></li>
-						<li class="nav-item"><a class="nav-link" th:href="@{/menus}">Menus</a>
-						</li>
-						<li class="nav-item"><a class="nav-link"
-							th:href="@{/settings}">Settings</a></li>
-					</ul>
-				</div>
-
-			</nav>
-		</div>
-
-		<div>
-			<h2>Manage Users</h2>
-			<a th:href="@{/users/new}" class="fas fa-user-plus fa-2x icon-dark mr-2"></a>
-			
-			<a th:href="@{/users/export/csv}" class="fas fa-file-csv fa-2x icon-dark mr-2"></a>
-		</div>
-		
-		
-		
-		<!-- only display success message when a new user is created -->
-		<div th:if="${message != null}" class="alert alert-success text-center">
-			[[${message}]]
-		</div>
-			
-		<div>
-			<form th:action="@{/users/page/1}" class="form-inline m-3">
-				
-				<input type="hidden" name="sortField" th:value="${sortField}" />
-				<input type="hidden" name="sortDir" th:value="${sortDir}" />
-				Filter:&nbsp;
-				<input type="search" name="keyword" th:value="${keyword}" class="form-control" required/>
-				&nbsp;&nbsp;
-				<button type="submit" class="btn btn-primary">
-					<i class="fas fa-search"></i>
-				</button>
-				&nbsp;&nbsp;
-				<button type="button" class="btn btn-secondary" onclick="clearFilter()">
-					<i class="fas fa-eraser"></i>
-				</button>
-			</form>
-		
-		</div>
-
-
-			<div class="full-details">
-				<table class="table table-bordered table-striped table-hover table-responsive-xL">
-					<thead class="thead-dark">
-						<tr>
-							<!-- refer to templates/fragments.html for fragment code-->
-							<th th:replace="fragments :: column_link('id', 'User ID')"/>
-							<th>Photos</th>
-							<th th:replace="fragments :: column_link('email', 'Email')"/>
-							<th th:replace="fragments :: column_link('firstName', 'First Name')"/>
-							<th th:replace="fragments :: column_link('lastName', 'Last Name')"/>
-							<th>Roles</th>
-							<th th:replace="fragments :: column_link('enabled', 'Enabled')"/>
-							<th></th>
-						</tr>
-					</thead>
-					<tbody>
-						<tr th:each="user : ${listUsers}">
-							<td>[[${user.id}]]</td>
-							<td>
-								<span th:if="${user.photos == null}" class="fas fa-portrait fa-3x icon-dark"></span>
-								<img th:if="${user.photos != null}" th:src="@{${user.photosImagePath}}"
-								style="width: 100px"/>
-							</td>
-							<td>[[${user.email}]]</td>
-							<td>[[${user.firstName}]]</td>
-							<td>[[${user.lastName}]]</td>
-							<td>[[${user.roles}]]</td>
-							
-							<td>
-								<a th:if="${user.enabled == true}" class="fas fa-check-circle fa-2x icon-green" 
-								th:href="@{'/users/' + ${user.id} + '/enabled/false'}"
-								title="Disable this user"></a>
-								
-								<a th:if="${user.enabled == false}" class="fas fa-circle fa-2x icon-silver"
-								 th:href="@{'/users/' + ${user.id} + '/enabled/true'}"
-								 title="Enable this user"></a>
-							</td>
-							<td>
-									<a class="fas fa-edit fa-2x icon-green" th:href="@{'/users/edit/' + ${user.id}}"
-									title="edit this user"></a>
-									&nbsp; 
-									<a class="fas fa-trash fa-2x icon-dark link-delete" th:href="@{'/users/delete/' + ${user.id}}"
-									title="delete this user" th:userId="${user.id}"></a>
-							</td>
-						</tr>
-					</tbody>
-				</table>
-			</div>
-			
-			
-			<!-- display this on mobile screens only -->
-			<div class="less-details">
-				<h2>Showing user list on small screen</h2>
-			</div>
-			
-			
-			<!-- IF -->
-			<div class="text-center m-1" th:if="${totalItems > 0}">
-				<span>Showing Users # [[${startCount}]] to [[${endCount}]] of [[${totalItems}]]</span>
-			</div>
-			
-			<!-- ELSE -->
-			<div class="text-center m-1" th:unless="${totalItems > 0}">
-				<span>No users found</span>
-			</div>
-			
-			<!-- only display pagination when there are users; else, no users no pagination -->
-			<div th:if="${totalPages > 1}">
-				<nav>
-					  <ul class="pagination justify-content-center">
-					  
-					  	<li th:class=" ${currentPage > 1 ? 'page-item' : 'page-item disabled'}">
-					  		<a th:replace="fragments :: page_link(1, 'First')"></a>
-				    	</li>
-					  
-					    <li th:class=" ${currentPage > 1 ? 'page-item' : 'page-item disabled'}">
-					    	<a th:replace="fragments :: page_link(${currentPage - 1 }, 'previous')"></a>
-				    	</li>
-					    	
-					    <!-- org.thymeleaf.expression.Numbers class, An object of this class is usually available in variable evaluation expressions with the name #numbers. -->
-					    <li th:class="${currentPage != i ? 'page-item' : 'page-item active'}" 
-					    	th:each="i : ${#numbers.sequence(1, totalPages)}">
-					    	<a th:replace="fragments :: page_link(${i}, ${i})"></a>
-					    </li>
-					    
-					    <li  th:class=" ${currentPage < totalPages ? 'page-item' : 'page-item disabled'}">
-					    	<a th:replace="fragments :: page_link(${currentPage + 1}, 'Next')"></a>
-					    </li>
-					    
-					    <li th:class=" ${currentPage < totalPages ? 'page-item' : 'page-item disabled'}">
-							<a th:replace="fragments :: page_link(${totalPages}, 'Last')"></a>		
-					    </li>
-					  </ul>
-				</nav>
-			</div>
-			
-			
-			
-			<div class="modal fade text-center" id="confirmModal">
-				<div class="modal-dialog">
-					<div class="modal-content">
-					
-						<div class="modal-header">
-							<h4 class="modal-title">Delete Confirmation</h4>
-							<button type="button" class="close" data-dismiss="modal">&times;</button>
-						</div>
-						
-						<div class="modal-body">
-							<span id="confirmText"></span>
-						</div>
-						
-						<div class="modal-footer">
-							<a class="btn btn-success" href="" id="yesButton">Yes</a>
-							<button type="button" class="btn btn-danger" data-dismiss="modal">Close</button>
-						</div>
-					</div>
-				</div>
-			</div>
-			
-			
-			<div class="text-center">
-				<p>Shopme Control Panel - Copyright &copy; Shopme</p>
-			</div>
-
-
-	</div>
-	
-<script type="text/javascript">
-
-//confirmation modal dialogue for delete user
-$(document).ready(function(){
-	$(".link-delete").on("click", function(e){
-		//stop the <a> tag default behaviour and pop out a confirmation modal dialogue
-		e.preventDefault();
-		//alert($(this).attr("href"));
-		link = $(this);
-		userId = link.attr("userId");
-		$("#yesButton").attr("href", link.attr("href"));
-		$("#confirmText").text("Are you sure you want to delete this user ID " + userId + "?");
-		$("#confirmModal").modal();
-	});
-});
-
-	function clearFilter(){
-		window.location = "[[@{/users}]]";
-	}
-
-
-</script>
-	
-</body>
-
-</html>
\ No newline at end of file
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/30/1041f76819b4001d128fb79045552177 b/.metadata/.plugins/org.eclipse.core.resources/.history/30/1041f76819b4001d128fb79045552177
deleted file mode 100644
index 6166eecc..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/30/1041f76819b4001d128fb79045552177
+++ /dev/null
@@ -1,52 +0,0 @@
-<!DOCTYPE html>
-<html xmlns:th="http://www.thymeleaf.org">
-
-<head>
-	<meta http-equiv="Content-Type" content="text/html; charset= UTF-8">
-	<meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0">
-	<title>Login - Shopme Admin</title>
-	<link rel="stylesheet" type="text/css" th:href="@{/webjars/bootstrap/css/bootstrap.min.css}" />
-</head>
-
-<body>
-	<div class="container-fluid text-center">
-		
-		<div>
-			<img th:src="@{/images/ShopmeAdminBig.png}" />
-		</div>
-		
-		<form th:action="@{/login}" method="post" style="max-width:350px; margin: 0 auto">
-			
-			<!--  ?error will appear at the end of url if there is error with email or password  -->
-			<div th:if="${param.error}">
-			
-			
-			</div>
-			
-			<div class="border border-secondary rounded p-3">
-				<p>Access to Shopme Control Panel </p>
-				
-				<p>
-					<input type="email" name="email" class="form-control" placeholder="Email" required />
-				</p>
-				
-				<p>
-					<input type="password" name="password" class="form-control" placeholder="Password" required />
-				</p>
-				
-				<p>
-					<input type="submit" value="Login" class="btn btn-primary" />
-				</p>
-			</div>
-		
-		</form>
-
-		<div>
-			<p>Shopme Control Panel - Copyright &copy; Shopme</p>
-		</div>
-
-	</div>
-
-</body>
-
-</html>
\ No newline at end of file
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/30/a00a193d2eb4001d1d079a924effdc9e b/.metadata/.plugins/org.eclipse.core.resources/.history/30/a00a193d2eb4001d1d079a924effdc9e
deleted file mode 100644
index 5b03a2a5..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/30/a00a193d2eb4001d1d079a924effdc9e
+++ /dev/null
@@ -1,94 +0,0 @@
-<!DOCTYPE html>
-<html xmlns:th="http://www.thymeleaf.org"
-	  xmlns:sec="https://www.thymeleaf.org/thymeleaf-extras-springsecurity5">
-
-<head>
-	<meta http-equiv="Content-Type" content="text/html; charset= UTF-8">
-	<meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0">
-	<title>Home - Shopme Admin</title>
-	
-	<link rel="stylesheet" type="text/css" th:href="@{/fontawesome/all.css}" />
-	<link rel="stylesheet" type="text/css" th:href="@{/style.css}" />
-	<link rel="stylesheet" type="text/css" th:href="@{/webjars/bootstrap/css/bootstrap.min.css}" />
-	
-	<script type="text/javascript" th:src="@{/webjars/jquery/jquery.min.js}"></script>
-	<script type="text/javascript" th:src="@{/webjars/bootstrap/js/bootstrap.min.js}"></script>
-</head>
-
-<body>
-	<div class="container-fluid">
-		<div>
-			<nav class="navbar navbar-expand-lg bg-dark navbar-dark">
-				<a class="navbar-brand" th:href="@{/}">
-					<img th:src="@{/images/ShopmeAdminSmall.png}"/>
-				</a>
-				<!--hamburger toggler for mobile devices(responsive)-->
-				<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#topNavbar">
-					<span class="navbar-toggler-icon"></span>
-				</button>
-				<div class="collapse navbar-collapse" id="topNavbar">
-					<ul class="navbar-nav">
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/users}">Users</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/categories}">Categories</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/brands}">Brands</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/products}">Products</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/customers}">Customers</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/shipping}">Shipping</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/orders}">Orders</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/report}">Sales Report</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/articles}">Articles</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/menus}">Menus</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/settings}">Settings</a>
-						</li>
-						<li>
-							<span class="fas fa-user fa-2x icon-silver"></span>
-						</li>
-						<li class="nav-item dropdown">
-								<!-- principal refers to user; display username -->
-							<a class="nav-link dropdown-toggle" sec:authentication="principal.fullname" data-toggle="dropdown"></a>
-							<div class="dropdown-menu">
-								<a class="dropdown-item" href="">Logout</a>
-							</div>
-							
-						</li>
-					</ul>
-				</div>
-				
-			</nav>
-		</div>
-
-		<div>
-			<h1>Shopme Control Panel</h1>
-		<div />
-
-		<div>
-			<p>Shopme Control Panel - Copyright &copy; Shopme</p>
-		<div />
-
-
-	</div>
-
-</body>
-
-</html>
\ No newline at end of file
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/31/00e0a4eb50b3001d1e75aa5ef0815903 b/.metadata/.plugins/org.eclipse.core.resources/.history/31/00e0a4eb50b3001d1e75aa5ef0815903
deleted file mode 100644
index 35f4bc6f..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/31/00e0a4eb50b3001d1e75aa5ef0815903
+++ /dev/null
@@ -1,177 +0,0 @@
-package com.shopme.admin.user;
-
-import java.io.IOException;
-import java.util.List;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.domain.Page;
-import org.springframework.data.repository.query.Param;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
-import org.springframework.util.StringUtils;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.ModelAttribute;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.multipart.MultipartFile;
-import org.springframework.web.servlet.mvc.support.RedirectAttributes;
-
-import com.fasterxml.jackson.annotation.ObjectIdGenerators.StringIdGenerator;
-import com.shopme.admin.FileUploadUtil;
-import com.shopme.common.entity.Role;
-import com.shopme.common.entity.User;
-
-@Controller
-public class UserController {
-
-	@Autowired
-	private UserService service;
-
-	@GetMapping("/users")
-	public String listFirstPage(Model model) {
-		return listByPage(1, model, "firstName", "asc", null);
-	}
-
-	@GetMapping("/users/page/{pageNum}")
-	public String listByPage(@PathVariable(name = "pageNum") int pageNum, Model model,
-			@Param("sortField") String sortField, @Param("sortDir") String sortDir,
-			@Param("keyword") String keyword) {
-		
-		System.out.println("sort field: " + sortField);
-		System.out.println("sort order: " + sortDir);
-		
-		Page<User> page = service.listByPage(pageNum, sortField, sortDir, keyword);
-		List<User> listUsers = page.getContent();
-
-		
-		long startCount = (pageNum - 1) * UserService.USERS_PER_PAGE + 1;
-		long endCount = startCount + UserService.USERS_PER_PAGE - 1;
-		if(endCount > page.getTotalElements()) {
-			endCount = page.getTotalElements();
-		}
-		
-		String reverseSortDir = sortDir.equals("asc") ? "desc" : "asc";
-		
-		model.addAttribute("currentPage", pageNum);
-		model.addAttribute("totalPages", page.getTotalPages());
-		model.addAttribute("startCount", startCount);
-		model.addAttribute("endCount", endCount);
-		model.addAttribute("totalItems", page.getTotalElements());
-		model.addAttribute("listUsers", listUsers);
-		model.addAttribute("sortField", sortField);
-		model.addAttribute("sortDir", sortDir);
-		model.addAttribute("reverseSortDir", reverseSortDir);
-		model.addAttribute("keyword", keyword);
-		
-
-		return "users";
-
-	}
-
-	@GetMapping("/users/new")
-	public String newUser(Model model) {
-
-		List<Role> listRoles = service.listRoles();
-
-		User user = new User();
-		user.setEnabled(true);
-
-		model.addAttribute("user", user);
-		model.addAttribute("listRoles", listRoles);
-		model.addAttribute("pageTitle", "Create New User");
-
-		return "user_form";
-
-	}
-
-	// using @RequestParam, we can get the image file input, the input has the
-	// property name="image"
-	@PostMapping("/users/save")
-	public String saveUser(@ModelAttribute("user") User user, RedirectAttributes redirectAttributes,
-			@RequestParam("image") MultipartFile multipartFile) throws IOException {
-
-		if (!multipartFile.isEmpty()) {
-
-			String fileName = StringUtils.cleanPath(multipartFile.getOriginalFilename());
-			user.setPhotos(fileName);
-
-			User savedUser = service.save(user);
-
-			String uploadDir = "user-photos/" + savedUser.getId();
-
-			FileUploadUtil.cleanDir(uploadDir);
-			FileUploadUtil.saveFile(uploadDir, fileName, multipartFile);
-		} else {
-
-			// set photo to null for getPhotosImagePath() method's conditional statement in
-			// User class
-			if (user.getPhotos().isEmpty())
-				user.setPhotos(null);
-			service.save(user);
-		}
-
-		redirectAttributes.addFlashAttribute("message", "the user has been saved successfully");
-
-		// POST/REDIRECT/GET web design
-		
-		
-		
-		return getRedirectURLtoAffectedUser(user);
-	}
-
-	private String getRedirectURLtoAffectedUser(User user) {
-		
-		//after user is saved display the user instead of the entire user list
-		//email is a unique field to identify each user.
-		String firstPartOfEmail = user.getEmail().split("@")[0];
-		return "redirect:/users/page/1?sortField=id&sortDir=asc&keyword=" + firstPartOfEmail;
-	}
-
-	@GetMapping("/users/edit/{id}")
-	public String editUser(@PathVariable(name = "id") Integer id, RedirectAttributes redirectAttributes, Model model) {
-		try {
-			User user = service.get(id);
-			List<Role> listRoles = service.listRoles();
-
-			model.addAttribute("user", user);
-			model.addAttribute("pageTitle", "Edit User (ID: " + id + ")");
-			model.addAttribute("listRoles", listRoles);
-
-			return "user_form";
-		} catch (UserNotFoundException ex) {
-			redirectAttributes.addFlashAttribute("message", ex.getMessage());
-
-			return "redirect:/users";
-		}
-
-	}
-
-	@GetMapping("/users/delete/{id}")
-	public String deleteUser(@PathVariable(name = "id") Integer id, RedirectAttributes redirectAttributes,
-			Model model) {
-		try {
-			service.delete(id);
-			redirectAttributes.addFlashAttribute("message", "The user ID " + id + " has been deleted successfully.");
-
-		} catch (UserNotFoundException ex) {
-			redirectAttributes.addFlashAttribute("message", ex.getMessage());
-
-		}
-
-		return "redirect:/users";
-	}
-
-	@GetMapping("/users/{id}/enabled/{status}")
-	public String updateUserEnabledStatus(@PathVariable(name = "id") Integer id,
-			@PathVariable(name = "status") boolean enabled, RedirectAttributes redirectAttributes) {
-
-		service.updateUserEnabledStatus(id, enabled);
-		String status = enabled ? "enabled" : "disabled";
-		String message = "The user id " + id + " has been " + status;
-		redirectAttributes.addFlashAttribute("message", message);
-
-		return "redirect:/users";
-	}
-
-}
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/31/b0a778ba6db3001d19bbb001c1a81c20 b/.metadata/.plugins/org.eclipse.core.resources/.history/31/b0a778ba6db3001d19bbb001c1a81c20
deleted file mode 100644
index 4231566b..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/31/b0a778ba6db3001d19bbb001c1a81c20
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.shopme.admin.user;
-
-import java.text.DateFormat;
-import java.text.SimpleDateFormat;
-import java.util.List;
-
-import com.shopme.common.entity.User;
-
-import jakarta.servlet.http.HttpServletResponse;
-
-public class UserCsvExporter {
-
-	public void export(List<User> user, HttpServletResponse response) {
-		
-		DateFormat dateFormatter = new SimpleDateFormat();
-		
-	
-	}
-	
-}
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/33/1086895c22b3001d1e75aa5ef0815903 b/.metadata/.plugins/org.eclipse.core.resources/.history/33/1086895c22b3001d1e75aa5ef0815903
deleted file mode 100644
index 1d6ef52f..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/33/1086895c22b3001d1e75aa5ef0815903
+++ /dev/null
@@ -1,47 +0,0 @@
-package com.shopme.admin.user;
-
-import org.springframework.data.domain.Page;
-import org.springframework.data.domain.Pageable;
-import org.springframework.data.jpa.repository.Modifying;
-import org.springframework.data.jpa.repository.Query;
-import org.springframework.data.repository.CrudRepository;
-import org.springframework.data.repository.PagingAndSortingRepository;
-import org.springframework.data.repository.query.Param;
-import org.springframework.stereotype.Repository;
-
-import com.shopme.common.entity.User;
-
-@Repository
-public interface UserRepository extends CrudRepository<User, Integer>, PagingAndSortingRepository<User, Integer> {
-
-	/*
-	 * JPQL statement. It should be noted that as compared to native SQL, JPQL does
-	 * not interact with database tables, records, and fields - but with Java
-	 * classes and instances.
-	 * 
-	 * JPA kicks in as the mediator and transpiles JPQL queries to SQL queries for execution.
-	 * 
-	 * If your database can change or varies from development to production, as long as 
-	 * they're both relational - JPQL works wonders and you can 
-	 * write JPQL queries to create generic logic that can be used over and over again.
-	 */
-	@Query("SELECT u FROM User u WHERE u.email = :email")
-	public User getUserByEmail(@Param("email") String email);
-	
-	// countById() declaration follows the JPA specification
-	//to check the existence of a user
-	public Long countById(Integer id);
-	
-	
-	//for filtering users by keyword
-	@Query("SELECT u FROM User u WHERE u.firstName LIKE %?1%")
-	public Page<User> findAll(String keyword, Pageable pageable);
-	
-	
-	
-	//change user enabled status
-	//need @Modifying annotation for update/delete operation
-	@Query("UPDATE User u SET u.enabled = ?2 WHERE u.id = ?1")
-	@Modifying
-	public void updateEnabledStatus(Integer id, boolean enabled);
-}
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/33/40d2ccb18db5001d12b59aa089645058 b/.metadata/.plugins/org.eclipse.core.resources/.history/33/40d2ccb18db5001d12b59aa089645058
deleted file mode 100644
index 13a2a8c5..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/33/40d2ccb18db5001d12b59aa089645058
+++ /dev/null
@@ -1,24 +0,0 @@
-<!DOCTYPE html>
-<html xmlns:th="http://www.thymeleaf.org"
-	  xmlns:sec="https://www.thymeleaf.org/thymeleaf-extras-springsecurity5">
-
-<head th:replace="fragments :: page_head('Home - Shopme Admin')"/>
-
-<body>
-	<div class="container-fluid">
-			
-			<!-- navigation bar -->
-		<div th:replace="navigation :: menu"></div>
-
-		<div>
-			<h1>Shopme Control Panel</h1>
-		</div>
-
-		<!-- footer -->
-		<div th:replace="fragments :: footer"></div>
-
-	</div>
-
-</body>
-
-</html>
\ No newline at end of file
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/33/8057c27b0ab4001d128fb79045552177 b/.metadata/.plugins/org.eclipse.core.resources/.history/33/8057c27b0ab4001d128fb79045552177
deleted file mode 100644
index 01711bee..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/33/8057c27b0ab4001d128fb79045552177
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<html xmlns:th="http://www.thymeleaf.org">
-
-<head>
-	<meta http-equiv="Content-Type" content="text/html; charset= UTF-8">
-	<meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0">
-	<title>Login - Shopme Admin</title>
-	<link rel="stylesheet" type="text/css" th:href="@{/webjars/bootstrap/css/bootstrap.min.css}" />
-</head>
-
-<body>
-	<div class="container-fluid text-center">
-		
-		<div>
-			<img th:src="@{/images/ShopmeAdminBig.png}" />
-		</div>
-		
-		<form th:action="@{/login}" method="post" style="max-width:350px; margin: 0 auto">
-		
-			<div class="border border-secondary rounded p-3">
-				<p>Access to Shopme Control Panel </p>
-				
-				<p>
-					<input type="email" name="email" class="form-control" required />
-					
-				
-				</p>
-			</div>
-		
-		</form>
-
-		<div>
-			<p>Shopme Control Panel - Copyright &copy; Shopme</p>
-		</div>
-
-	</div>
-
-</body>
-
-</html>
\ No newline at end of file
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/34/9010050c1fb3001d1e75aa5ef0815903 b/.metadata/.plugins/org.eclipse.core.resources/.history/34/9010050c1fb3001d1e75aa5ef0815903
deleted file mode 100644
index 39e08738..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/34/9010050c1fb3001d1e75aa5ef0815903
+++ /dev/null
@@ -1,47 +0,0 @@
-package com.shopme.admin.user;
-
-import org.springframework.data.domain.Page;
-import org.springframework.data.domain.Pageable;
-import org.springframework.data.jpa.repository.Modifying;
-import org.springframework.data.jpa.repository.Query;
-import org.springframework.data.repository.CrudRepository;
-import org.springframework.data.repository.PagingAndSortingRepository;
-import org.springframework.data.repository.query.Param;
-import org.springframework.stereotype.Repository;
-
-import com.shopme.common.entity.User;
-
-@Repository
-public interface UserRepository extends CrudRepository<User, Integer>, PagingAndSortingRepository<User, Integer> {
-
-	/*
-	 * JPQL statement. It should be noted that as compared to native SQL, JPQL does
-	 * not interact with database tables, records, and fields - but with Java
-	 * classes and instances.
-	 * 
-	 * JPA kicks in as the mediator and transpiles JPQL queries to SQL queries for execution.
-	 * 
-	 * If your database can change or varies from development to production, as long as 
-	 * they're both relational - JPQL works wonders and you can 
-	 * write JPQL queries to create generic logic that can be used over and over again.
-	 */
-	@Query("SELECT u FROM User u WHERE u.email = :email")
-	public User getUserByEmail(@Param("email") String email);
-	
-	// countById() declaration follows the JPA specification
-	//to check the existence of a user
-	public Long countById(Integer id);
-	
-	
-	//
-	
-	public Page<User> findAll(String keyword, Pageable pageable);
-	
-	
-	
-	//change user enabled status
-	//need @Modifying annotation for update/delete operation
-	@Query("UPDATE User u SET u.enabled = ?2 WHERE u.id = ?1")
-	@Modifying
-	public void updateEnabledStatus(Integer id, boolean enabled);
-}
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/34/e0cadb1452b4001d1d079a924effdc9e b/.metadata/.plugins/org.eclipse.core.resources/.history/34/e0cadb1452b4001d1d079a924effdc9e
deleted file mode 100644
index 171e68c9..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/34/e0cadb1452b4001d1d079a924effdc9e
+++ /dev/null
@@ -1,78 +0,0 @@
-<!DOCTYPE html>
-<html xmlns:th="http://www.thymeleaf.org">
-
-<body>
-
-	<div th:fragment="menu">
-		<!--   
-			use  the form to  log out and navigate to the url path /logout  
-		
-		    NOTE: spring security requires a POST request form to logout in order to obtain the csrf token, 
-		 		the csrf token is a hidden property in the form -->
-		 
-		<form th:action="@{/logout}" method="post" th:hidden="true" name="logoutForm">
-			<input type="submit"/>
-		</form>
-		<nav class="navbar navbar-expand-lg bg-dark navbar-dark">
-			<a class="navbar-brand" th:href="@{/}">
-				<img th:src="@{/images/ShopmeAdminSmall.png}"/>
-			</a>
-			<!--hamburger toggler for mobile devices(responsive)-->
-			<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#topNavbar">
-				<span class="navbar-toggler-icon"></span>
-			</button>
-			<div class="collapse navbar-collapse" id="topNavbar">
-				<ul class="navbar-nav">
-					<li class="nav-item">
-						<a class="nav-link" th:href="@{/users}">Users</a>
-					</li>
-					<li class="nav-item">
-						<a class="nav-link" th:href="@{/categories}">Categories</a>
-					</li>
-					<li class="nav-item">
-						<a class="nav-link" th:href="@{/brands}">Brands</a>
-					</li>
-					<li class="nav-item">
-						<a class="nav-link" th:href="@{/products}">Products</a>
-					</li>
-					<li class="nav-item">
-						<a class="nav-link" th:href="@{/customers}">Customers</a>
-					</li>
-					<li class="nav-item">
-						<a class="nav-link" th:href="@{/shipping}">Shipping</a>
-					</li>
-					<li class="nav-item">
-						<a class="nav-link" th:href="@{/orders}">Orders</a>
-					</li>
-					<li class="nav-item">
-						<a class="nav-link" th:href="@{/report}">Sales Report</a>
-					</li>
-					<li class="nav-item">
-						<a class="nav-link" th:href="@{/articles}">Articles</a>
-					</li>
-					<li class="nav-item">
-						<a class="nav-link" th:href="@{/menus}">Menus</a>
-					</li>
-					<li class="nav-item">
-						<a class="nav-link" th:href="@{/settings}">Settings</a>
-					</li>
-					<li>
-						<span class="fas fa-user fa-2x icon-silver"></span>
-					</li>
-					<li class="nav-item dropdown">
-							<!-- principal refers to user; display username -->
-						<a class="nav-link dropdown-toggle" sec:authentication="principal.fullname" data-toggle="dropdown"></a>
-						<div class="dropdown-menu">
-							<a class="dropdown-item" id="logoutLink" href="">Logout</a>
-						</div>
-						
-					</li>
-				</ul>
-			</div>
-			
-		</nav>
-	</div>
-	
-	
-</body>
-</html>
\ No newline at end of file
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/35/105cab7228b3001d1e75aa5ef0815903 b/.metadata/.plugins/org.eclipse.core.resources/.history/35/105cab7228b3001d1e75aa5ef0815903
deleted file mode 100644
index 9baa5f64..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/35/105cab7228b3001d1e75aa5ef0815903
+++ /dev/null
@@ -1,165 +0,0 @@
-package com.shopme.admin.user;
-
-import java.io.IOException;
-import java.util.List;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.domain.Page;
-import org.springframework.data.repository.query.Param;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
-import org.springframework.util.StringUtils;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.ModelAttribute;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.multipart.MultipartFile;
-import org.springframework.web.servlet.mvc.support.RedirectAttributes;
-
-import com.fasterxml.jackson.annotation.ObjectIdGenerators.StringIdGenerator;
-import com.shopme.admin.FileUploadUtil;
-import com.shopme.common.entity.Role;
-import com.shopme.common.entity.User;
-
-@Controller
-public class UserController {
-
-	@Autowired
-	private UserService service;
-
-	@GetMapping("/users")
-	public String listFirstPage(Model model) {
-		return listByPage(1, model, "firstName", "asc");
-	}
-
-	@GetMapping("/users/page/{pageNum}")
-	public String listByPage(@PathVariable(name = "pageNum") int pageNum, Model model,
-			@Param("sortField") String sortField, @Param("sortDir") String sortDir,
-			@Param("keyword") String keyword) {
-		
-		System.out.println("sort field: " + sortField);
-		System.out.println("sort order: " + sortDir);
-		
-		Page<User> page = service.listByPage(pageNum, sortField, sortDir, keyword);
-		List<User> listUsers = page.getContent();
-
-		
-		long startCount = (pageNum - 1) * UserService.USERS_PER_PAGE + 1;
-		long endCount = startCount + UserService.USERS_PER_PAGE - 1;
-		if(endCount > page.getTotalElements()) {
-			endCount = page.getTotalElements();
-		}
-		
-		String reverseSortDir = sortDir.equals("asc") ? "desc" : "asc";
-		
-		model.addAttribute("currentPage", pageNum);
-		model.addAttribute("totalPages", page.getTotalPages());
-		model.addAttribute("startCount", startCount);
-		model.addAttribute("endCount", endCount);
-		model.addAttribute("totalItems", page.getTotalElements());
-		model.addAttribute("listUsers", listUsers);
-		model.addAttribute("sortField", sortField);
-		model.addAttribute("sortDir", sortDir);
-		model.addAttribute("reverseSortDir", reverseSortDir);
-		
-
-		return "users";
-
-	}
-
-	@GetMapping("/users/new")
-	public String newUser(Model model) {
-
-		List<Role> listRoles = service.listRoles();
-
-		User user = new User();
-		user.setEnabled(true);
-
-		model.addAttribute("user", user);
-		model.addAttribute("listRoles", listRoles);
-		model.addAttribute("pageTitle", "Create New User");
-
-		return "user_form";
-
-	}
-
-	// using @RequestParam, we can get the image file input, the input has the
-	// property name="image"
-	@PostMapping("/users/save")
-	public String saveUser(@ModelAttribute("user") User user, RedirectAttributes redirectAttributes,
-			@RequestParam("image") MultipartFile multipartFile) throws IOException {
-
-		if (!multipartFile.isEmpty()) {
-
-			String fileName = StringUtils.cleanPath(multipartFile.getOriginalFilename());
-			user.setPhotos(fileName);
-
-			User savedUser = service.save(user);
-
-			String uploadDir = "user-photos/" + savedUser.getId();
-
-			FileUploadUtil.cleanDir(uploadDir);
-			FileUploadUtil.saveFile(uploadDir, fileName, multipartFile);
-		} else {
-
-			// set photo to null for getPhotosImagePath() method's conditional statement in
-			// User class
-			if (user.getPhotos().isEmpty())
-				user.setPhotos(null);
-			service.save(user);
-		}
-
-		redirectAttributes.addFlashAttribute("message", "the user has been saved successfully");
-
-		// POST/REDIRECT/GET web design
-		return "redirect:/users";
-	}
-
-	@GetMapping("/users/edit/{id}")
-	public String editUser(@PathVariable(name = "id") Integer id, RedirectAttributes redirectAttributes, Model model) {
-		try {
-			User user = service.get(id);
-			List<Role> listRoles = service.listRoles();
-
-			model.addAttribute("user", user);
-			model.addAttribute("pageTitle", "Edit User (ID: " + id + ")");
-			model.addAttribute("listRoles", listRoles);
-
-			return "user_form";
-		} catch (UserNotFoundException ex) {
-			redirectAttributes.addFlashAttribute("message", ex.getMessage());
-
-			return "redirect:/users";
-		}
-
-	}
-
-	@GetMapping("/users/delete/{id}")
-	public String deleteUser(@PathVariable(name = "id") Integer id, RedirectAttributes redirectAttributes,
-			Model model) {
-		try {
-			service.delete(id);
-			redirectAttributes.addFlashAttribute("message", "The user ID " + id + " has been deleted successfully.");
-
-		} catch (UserNotFoundException ex) {
-			redirectAttributes.addFlashAttribute("message", ex.getMessage());
-
-		}
-
-		return "redirect:/users";
-	}
-
-	@GetMapping("/users/{id}/enabled/{status}")
-	public String updateUserEnabledStatus(@PathVariable(name = "id") Integer id,
-			@PathVariable(name = "status") boolean enabled, RedirectAttributes redirectAttributes) {
-
-		service.updateUserEnabledStatus(id, enabled);
-		String status = enabled ? "enabled" : "disabled";
-		String message = "The user id " + id + " has been " + status;
-		redirectAttributes.addFlashAttribute("message", message);
-
-		return "redirect:/users";
-	}
-
-}
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/35/601c5db89cb9001d10d0f9513979f945 b/.metadata/.plugins/org.eclipse.core.resources/.history/35/601c5db89cb9001d10d0f9513979f945
new file mode 100644
index 00000000..d641832d
--- /dev/null
+++ b/.metadata/.plugins/org.eclipse.core.resources/.history/35/601c5db89cb9001d10d0f9513979f945
@@ -0,0 +1,102 @@
+package com.shopme.admin.category;
+
+import java.io.IOException;
+import java.util.List;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.scheduling.support.SimpleTriggerContext;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
+import org.springframework.util.StringUtils;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.ModelAttribute;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.multipart.MultipartFile;
+import org.springframework.web.servlet.mvc.support.RedirectAttributes;
+
+import com.shopme.admin.FileUploadUtil;
+import com.shopme.common.entity.Category;
+
+@Controller
+public class CategoryController {
+	
+	@Autowired
+	private CategoryService service;
+	
+	@GetMapping("/categories")
+	public String listAll(Model model) {
+		
+		List<Category> listCategories = service.listAll();
+		model.addAttribute("listCategories", listCategories);
+		
+		return "categories/categories";
+	}
+	
+	
+	@GetMapping("/categories/new")
+	public String newCategory(Model model) {
+		
+		List<Category> listCategories = service.listCategoriesUsedInForm();
+		
+		model.addAttribute("category", new Category());
+		model.addAttribute("listCategories", listCategories);
+		model.addAttribute("pageTitle", "Create New Category");
+		
+		return "categories/category_form";
+	
+	}
+	
+	@PostMapping("/categories/save")
+	public String saveCategory(@ModelAttribute("category") Category category, 
+			RedirectAttributes redirectAttributes,
+			@RequestParam("fileImage") MultipartFile multipartFile) throws IOException {
+		
+		if(!multipartFile.isEmpty()) {
+			
+		}
+		
+		
+		String fileName = StringUtils.cleanPath(multipartFile.getOriginalFilename());
+		category.setImage(fileName);
+		
+		Category savedCategory = service.save(category);
+		String uploadDir = "../category-images/" + savedCategory.getId();
+		
+		FileUploadUtil.cleanDir(uploadDir);
+		FileUploadUtil.saveFile(uploadDir, fileName, multipartFile);
+		
+		
+		redirectAttributes.addFlashAttribute("message", "the category have been saved successfully");
+		
+		
+		return "redirect:/categories";
+	}
+
+	
+	@GetMapping("/categories/edit/{id}")
+	public String editCategory(@PathVariable(name = "id") Integer id, Model model,
+			RedirectAttributes ra) {
+		try {
+			Category category = service.get(id);
+			List<Category> listCategories = service.listCategoriesUsedInForm();
+			
+			model.addAttribute("category", category);
+			model.addAttribute("listCategories", listCategories);
+			model.addAttribute("pageTitle", "Edit Category (ID: " + id + ")");
+			
+			return "categories/category_form";			
+		} catch (CategoryNotFoundException ex) {
+			ra.addFlashAttribute("message", ex.getMessage());
+			return "redirect:/categories";
+		}
+	}
+	
+	
+	
+}
+	
+
+
+
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/38/509b2f778eb3001d19bbb001c1a81c20 b/.metadata/.plugins/org.eclipse.core.resources/.history/38/509b2f778eb3001d19bbb001c1a81c20
deleted file mode 100644
index 9290942b..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/38/509b2f778eb3001d19bbb001c1a81c20
+++ /dev/null
@@ -1,35 +0,0 @@
-*.icon-white{color: white}
-*.icon-silver{color: silver}
-*.icon-green{color: green}
-*.icon-dark{color: gray}
-*.icon-red{color: red}
-
-
-
-@media screen and (max-width: 768px) {
-	/* small screen eg:mobile*/
-	
-	div.full-details{ display: none;}
-	div.less-details{ display: block;}
-	
-}
-
-@media screen and (min-width: 768px) and (max-width: 1024px) {
-	/* medium screen eg:tablet*/
-	
-	div.full-details{ display: block;}
-	div.less-details{ display: none;}
-	
-	th, td .hideable-column{display: none;}
-	
-}
-
-
-@media screen and (min-width: 1024px) {
-	/* large screen eg:laptop*/
-	
-	div.less-details{ display: none;}
-	
-	th, td .hideable-column{display: table-cell;}
-	
-}
\ No newline at end of file
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/38/6011d82931b7001d19ef99be8d31e273 b/.metadata/.plugins/org.eclipse.core.resources/.history/38/6011d82931b7001d19ef99be8d31e273
deleted file mode 100644
index 13060d50..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/38/6011d82931b7001d19ef99be8d31e273
+++ /dev/null
@@ -1,59 +0,0 @@
-package com.shopme.admin.category;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
-import org.junit.jupiter.api.Test;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.autoconfigure.jdbc.AutoConfigureTestDatabase;
-import org.springframework.boot.test.autoconfigure.jdbc.AutoConfigureTestDatabase.Replace;
-import org.springframework.boot.test.autoconfigure.orm.jpa.DataJpaTest;
-import org.springframework.test.annotation.Rollback;
-
-import com.shopme.common.entity.Category;
-
-/*
- * Unit Test for CategoryRepository
- * 
- * objective:
- * 1. test the methods in repository 
- * 2. populate the database with records
- * 
-*/
-
-@DataJpaTest
-@AutoConfigureTestDatabase(replace = Replace.NONE)
-@Rollback(false)
-public class CategoryRepositoryTests {
-	
-	@Autowired
-	private CategoryRepository repo;
-	
-	@Test
-	public void testCreateRootCategory() {
-//		Category category = new Category("Computers");
-		Category category = new Category("Electronics");
-		Category savedCategory = repo.save(category);
-		
-		assertThat(savedCategory.getId()).isGreaterThan(0);
-		
-	}
-	
-	@Test
-	public void testCreateSubCategory() {
-		
-		// ID for root category "Computer" is 1
-		Category parent = new Category(1);
-		
-//		Category subCategory = new Category("Desktops", parent);
-		Category laptops = new Category("Laptops", parent);
-		Category components = new Category("Computer Components", parent);
-		
-		
-		
-		Category savedCategory = repo.save(subCategory);
-		
-		assertThat(savedCategory.getId()).isGreaterThan(0);
-	}
-	
-	
-}
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/38/706b056189b3001d19bbb001c1a81c20 b/.metadata/.plugins/org.eclipse.core.resources/.history/38/706b056189b3001d19bbb001c1a81c20
deleted file mode 100644
index 326826e3..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/38/706b056189b3001d19bbb001c1a81c20
+++ /dev/null
@@ -1,27 +0,0 @@
-*.icon-white{color: white}
-*.icon-silver{color: silver}
-*.icon-green{color: green}
-*.icon-dark{color: gray}
-*.icon-red{color: red}
-
-
-@media screen and (max-width: 768px) {
-	/* small screen */
-	
-	div.full-details{ display: none;}
-	div.less-details{ display: block;}
-	
-}
-
-@media screen and (min-width: 768px) and (max-width: 1024px) {
-	/* medium screen */
-	
-	div.full-details{ display: block;}
-	div.less-details{ display: none;}
-}
-
-
-@media screen and (min-width: 1024px) {
-	/* large screen */
-	
-}
\ No newline at end of file
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/3a/70c3eae345b4001d1d079a924effdc9e b/.metadata/.plugins/org.eclipse.core.resources/.history/3a/70c3eae345b4001d1d079a924effdc9e
deleted file mode 100644
index 9223f895..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/3a/70c3eae345b4001d1d079a924effdc9e
+++ /dev/null
@@ -1,49 +0,0 @@
-<!DOCTYPE html>
-<html xmlns:th="http://www.thymeleaf.org">
-
-<head th:fragment="page_head(title)">
-	<meta http-equiv="Content-Type" content="text/html; charset= UTF-8">
-	<meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0">
-	<title>[[${title}]]</title>
-	
-	<link rel="stylesheet" type="text/css" th:href="@{/fontawesome/all.css}" />
-	<link rel="stylesheet" type="text/css" th:href="@{/style.css}" />
-	<link rel="stylesheet" type="text/css" th:href="@{/webjars/bootstrap/css/bootstrap.min.css}" />
-	
-	<script type="text/javascript" th:src="@{/webjars/jquery/jquery.min.js}"></script>
-	<script type="text/javascript" th:src="@{/webjars/bootstrap/js/bootstrap.min.js}"></script>
-</head>
-
-<body>
-	
-	
-		<div th:fragment="footer" class="text-center">
-				<p>Shopme Control Panel - Copyright &copy; Shopme</p>
-		</div>
-	
-	
-		<!-- purpose: make code more succinct and readable 
-		project is easier to maintain
-		
-		use thymeleaf fragments -->
-
-	<!-- if  ${removeTag} == 'tag' then the <th> parent tag will be removed.  if ${removeTag} == 'none' then keep the <th> parent tag-->
-	<th th:fragment="column_link(fieldName, columnLabel, removeTag)" th:remove="${removeTag}">
-		<!-- follow the sort order of another sortField; if the other field is sortDir="asc", then the newly selected column will be sortDir="asc" too -->
-		<a class="text-white"
-		   th:href="@{'/users/page/' + ${currentPage} + '?sortField=' + ${fieldName} + '&sortDir=' + ${sortField != fieldName ? sortDir : reverseSortDir} + ${keyword != null ? '&keyword=' + keyword : ''}}">
-			[[${columnLabel}]]
-		</a>
-		
-		<span th:if="${sortField == fieldName}"
-		th:class="${sortDir == 'asc' ? 'fas fa-sort-up' : 'fas fa-sort-down'}"></span>
-	</th>
-	
-	
-	<a th:fragment="page_link(pageNum, label)"
-	   class="page-link"
-	   th:href= "@{'/users/page/' + ${pageNum} + '?sortField=' + ${sortField} + '&sortDir=' + ${sortDir} + ${keyword != null ? '&keyword=' + keyword : ''}}">[[${label}]]</a>
-	
-	
-</body>
-</html>
\ No newline at end of file
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/3a/8096942951b3001d1e75aa5ef0815903 b/.metadata/.plugins/org.eclipse.core.resources/.history/3a/8096942951b3001d1e75aa5ef0815903
deleted file mode 100644
index c2a37d3b..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/3a/8096942951b3001d1e75aa5ef0815903
+++ /dev/null
@@ -1,177 +0,0 @@
-package com.shopme.admin.user;
-
-import java.io.IOException;
-import java.util.List;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.domain.Page;
-import org.springframework.data.repository.query.Param;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
-import org.springframework.util.StringUtils;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.ModelAttribute;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.multipart.MultipartFile;
-import org.springframework.web.servlet.mvc.support.RedirectAttributes;
-
-import com.fasterxml.jackson.annotation.ObjectIdGenerators.StringIdGenerator;
-import com.shopme.admin.FileUploadUtil;
-import com.shopme.common.entity.Role;
-import com.shopme.common.entity.User;
-
-@Controller
-public class UserController {
-
-	@Autowired
-	private UserService service;
-
-	@GetMapping("/users")
-	public String listFirstPage(Model model) {
-		
-		
-		//default values for path variable and URL parameters
-		return listByPage(1, model, "firstName", "asc", null);
-	}
-
-	@GetMapping("/users/page/{pageNum}")
-	public String listByPage(@PathVariable(name = "pageNum") int pageNum, Model model,
-			@Param("sortField") String sortField, @Param("sortDir") String sortDir,
-			@Param("keyword") String keyword) {
-		
-		System.out.println("sort field: " + sortField);
-		System.out.println("sort order: " + sortDir);
-		
-		Page<User> page = service.listByPage(pageNum, sortField, sortDir, keyword);
-		List<User> listUsers = page.getContent();
-
-		
-		long startCount = (pageNum - 1) * UserService.USERS_PER_PAGE + 1;
-		long endCount = startCount + UserService.USERS_PER_PAGE - 1;
-		if(endCount > page.getTotalElements()) {
-			endCount = page.getTotalElements();
-		}
-		
-		String reverseSortDir = sortDir.equals("asc") ? "desc" : "asc";
-		
-		model.addAttribute("currentPage", pageNum);
-		model.addAttribute("totalPages", page.getTotalPages());
-		model.addAttribute("startCount", startCount);
-		model.addAttribute("endCount", endCount);
-		model.addAttribute("totalItems", page.getTotalElements());
-		model.addAttribute("listUsers", listUsers);
-		model.addAttribute("sortField", sortField);
-		model.addAttribute("sortDir", sortDir);
-		model.addAttribute("reverseSortDir", reverseSortDir);
-		model.addAttribute("keyword", keyword);
-		
-
-		return "users";
-
-	}
-
-	@GetMapping("/users/new")
-	public String newUser(Model model) {
-
-		List<Role> listRoles = service.listRoles();
-
-		User user = new User();
-		user.setEnabled(true);
-
-		model.addAttribute("user", user);
-		model.addAttribute("listRoles", listRoles);
-		model.addAttribute("pageTitle", "Create New User");
-
-		return "user_form";
-
-	}
-
-	// using @RequestParam, we can get the image file input, the input has the
-	// property name="image"
-	@PostMapping("/users/save")
-	public String saveUser(@ModelAttribute("user") User user, RedirectAttributes redirectAttributes,
-			@RequestParam("image") MultipartFile multipartFile) throws IOException {
-
-		if (!multipartFile.isEmpty()) {
-
-			String fileName = StringUtils.cleanPath(multipartFile.getOriginalFilename());
-			user.setPhotos(fileName);
-
-			User savedUser = service.save(user);
-
-			String uploadDir = "user-photos/" + savedUser.getId();
-
-			FileUploadUtil.cleanDir(uploadDir);
-			FileUploadUtil.saveFile(uploadDir, fileName, multipartFile);
-		} else {
-
-			// set photo to null for getPhotosImagePath() method's conditional statement in
-			// User class
-			if (user.getPhotos().isEmpty())
-				user.setPhotos(null);
-			service.save(user);
-		}
-
-		redirectAttributes.addFlashAttribute("message", "the user has been saved successfully");
-
-		// POST/REDIRECT/GET web design
-		return getRedirectURLtoAffectedUser(user);
-	}
-
-	private String getRedirectURLtoAffectedUser(User user) {
-		
-		//after user is saved display the user instead of the entire user list
-		//email is a unique field to identify each user.
-		String firstPartOfEmail = user.getEmail().split("@")[0];
-		return "redirect:/users/page/1?sortField=id&sortDir=asc&keyword=" + firstPartOfEmail;
-	}
-
-	@GetMapping("/users/edit/{id}")
-	public String editUser(@PathVariable(name = "id") Integer id, RedirectAttributes redirectAttributes, Model model) {
-		try {
-			User user = service.get(id);
-			List<Role> listRoles = service.listRoles();
-
-			model.addAttribute("user", user);
-			model.addAttribute("pageTitle", "Edit User (ID: " + id + ")");
-			model.addAttribute("listRoles", listRoles);
-
-			return "user_form";
-		} catch (UserNotFoundException ex) {
-			redirectAttributes.addFlashAttribute("message", ex.getMessage());
-
-			return "redirect:/users";
-		}
-
-	}
-
-	@GetMapping("/users/delete/{id}")
-	public String deleteUser(@PathVariable(name = "id") Integer id, RedirectAttributes redirectAttributes,
-			Model model) {
-		try {
-			service.delete(id);
-			redirectAttributes.addFlashAttribute("message", "The user ID " + id + " has been deleted successfully.");
-
-		} catch (UserNotFoundException ex) {
-			redirectAttributes.addFlashAttribute("message", ex.getMessage());
-
-		}
-
-		return "redirect:/users";
-	}
-
-	@GetMapping("/users/{id}/enabled/{status}")
-	public String updateUserEnabledStatus(@PathVariable(name = "id") Integer id,
-			@PathVariable(name = "status") boolean enabled, RedirectAttributes redirectAttributes) {
-
-		service.updateUserEnabledStatus(id, enabled);
-		String status = enabled ? "enabled" : "disabled";
-		String message = "The user id " + id + " has been " + status;
-		redirectAttributes.addFlashAttribute("message", message);
-
-		return "redirect:/users";
-	}
-
-}
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/3a/b0337b518eb3001d19bbb001c1a81c20 b/.metadata/.plugins/org.eclipse.core.resources/.history/3a/b0337b518eb3001d19bbb001c1a81c20
deleted file mode 100644
index ea64857a..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/3a/b0337b518eb3001d19bbb001c1a81c20
+++ /dev/null
@@ -1,276 +0,0 @@
-<!DOCTYPE html>
-<html xmlns:th="http://www.thymeleaf.org">
-
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset= UTF-8">
-<meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0">
-<title>Manage Users</title>
-
-<link rel="stylesheet" type="text/css" th:href="@{/webjars/bootstrap/css/bootstrap.min.css}" />
-<link rel="stylesheet" type="text/css" th:href="@{/fontawesome/all.css}" />
-<link rel="stylesheet" type="text/css" th:href="@{/style.css}" />
-	
-<script type="text/javascript" th:src="@{/webjars/jquery/jquery.min.js}"></script>
-<script type="text/javascript" th:src="@{/webjars/bootstrap/js/bootstrap.min.js}"></script>
-</head>
-
-<body>
-	<div class="container-fluid">
-		<div>
-			<nav class="navbar navbar-expand-lg bg-dark navbar-dark">
-				<a class="navbar-brand" th:href="@{/}"> <img
-					th:src="@{/images/ShopmeAdminSmall.png}" />
-				</a>
-				<!--hamburger toggler for mobile devices(responsive)-->
-				<button class="navbar-toggler" type="button" data-toggle="collapse"
-					data-target="#topNavbar">
-					<span class="navbar-toggler-icon"></span>
-				</button>
-				<div class="collapse navbar-collapse" id="topNavbar">
-					<ul class="navbar-nav">
-						<li class="nav-item"><a class="nav-link" th:href="@{/users}">Users</a>
-						</li>
-						<li class="nav-item"><a class="nav-link"
-							th:href="@{/categories}">Categories</a></li>
-						<li class="nav-item"><a class="nav-link" th:href="@{/brands}">Brands</a>
-						</li>
-						<li class="nav-item"><a class="nav-link"
-							th:href="@{/products}">Products</a></li>
-						<li class="nav-item"><a class="nav-link"
-							th:href="@{/customers}">Customers</a></li>
-						<li class="nav-item"><a class="nav-link"
-							th:href="@{/shipping}">Shipping</a></li>
-						<li class="nav-item"><a class="nav-link" th:href="@{/orders}">Orders</a>
-						</li>
-						<li class="nav-item"><a class="nav-link" th:href="@{/report}">Sales
-								Report</a></li>
-						<li class="nav-item"><a class="nav-link"
-							th:href="@{/articles}">Articles</a></li>
-						<li class="nav-item"><a class="nav-link" th:href="@{/menus}">Menus</a>
-						</li>
-						<li class="nav-item"><a class="nav-link"
-							th:href="@{/settings}">Settings</a></li>
-					</ul>
-				</div>
-
-			</nav>
-		</div>
-
-		<div>
-			<h2>Manage Users</h2>
-			<a th:href="@{/users/new}" class="fas fa-user-plus fa-2x icon-dark mr-2"></a>
-			
-			<a th:href="@{/users/export/csv}" class="fas fa-file-csv fa-2x icon-dark mr-2"></a>
-		</div>
-		
-		
-		
-		<!-- only display success message when a new user is created -->
-		<div th:if="${message != null}" class="alert alert-success text-center">
-			[[${message}]]
-		</div>
-			
-		<div>
-			<form th:action="@{/users/page/1}" class="form-inline m-3">
-				
-				<input type="hidden" name="sortField" th:value="${sortField}" />
-				<input type="hidden" name="sortDir" th:value="${sortDir}" />
-				Filter:&nbsp;
-				<input type="search" name="keyword" th:value="${keyword}" class="form-control" required/>
-				&nbsp;&nbsp;
-				<button type="submit" class="btn btn-primary">
-					<i class="fas fa-search"></i>
-				</button>
-				&nbsp;&nbsp;
-				<button type="button" class="btn btn-secondary" onclick="clearFilter()">
-					<i class="fas fa-eraser"></i>
-				</button>
-			</form>
-		
-		</div>
-
-			<!-- css class to display this table in large screens only , refer to static/style.css for more info-->
-			<div class="full-details">
-				<table class="table table-bordered table-striped table-hover table-responsive-xL">
-					<thead class="thead-dark">
-						<tr>
-							<!-- refer to templates/fragments.html for fragment code-->
-							<th th:replace="fragments :: column_link('id', 'User ID')"/>
-							<th>Photos</th>
-							<th th:replace="fragments :: column_link('email', 'Email')"/>
-							<th th:replace="fragments :: column_link('firstName', 'First Name')"/>
-							<th th:replace="fragments :: column_link('lastName', 'Last Name')"/>
-							<th>Roles</th>
-							<th th:replace="fragments :: column_link('enabled', 'Enabled')"/>
-							<th></th>
-						</tr>
-					</thead>
-					<tbody>
-						<tr th:each="user : ${listUsers}">
-							<td class="hideable-column">[[${user.id}]]</td>
-							<td>
-								<span th:if="${user.photos == null}" class="fas fa-portrait fa-3x icon-dark"></span>
-								<img th:if="${user.photos != null}" th:src="@{${user.photosImagePath}}"
-								style="width: 100px"/>
-							</td>
-							<td>[[${user.email}]]</td>
-							<td>[[${user.firstName}]]</td>
-							<td>[[${user.lastName}]]</td>
-							<td>[[${user.roles}]]</td>
-							
-							<td>
-								<a th:if="${user.enabled == true}" class="fas fa-check-circle fa-2x icon-green" 
-								th:href="@{'/users/' + ${user.id} + '/enabled/false'}"
-								title="Disable this user"></a>
-								
-								<a th:if="${user.enabled == false}" class="fas fa-circle fa-2x icon-silver"
-								 th:href="@{'/users/' + ${user.id} + '/enabled/true'}"
-								 title="Enable this user"></a>
-							</td>
-							<td>
-									<a class="fas fa-edit fa-2x icon-green" th:href="@{'/users/edit/' + ${user.id}}"
-									title="edit this user"></a>
-									&nbsp; 
-									<a class="fas fa-trash fa-2x icon-dark link-delete" th:href="@{'/users/delete/' + ${user.id}}"
-									title="delete this user" th:userId="${user.id}"></a>
-							</td>
-						</tr>
-					</tbody>
-				</table>
-			</div>
-			
-			
-			<!-- css class to display this <div> on mobile screens only, refer to /static/style.css for more info-->
-			<div class="less-details">
-				
-				<div th:each="user : ${listUsers}" class="row m-1">
-					
-					<div class="col-4">
-						
-						<span th:if="${user.photos == null}" class="fas fa-portrait fa-3x icon-dark"></span>
-								<img th:if="${user.photos != null}" th:src="@{${user.photosImagePath}}"
-								style="width: 100px"/>
-					</div>
-					
-					<div class="col-8">
-						<div>[[${user.fullName}]]</div>
-						<div>[[${user.roles}]]</div>
-						<div class="mt-2">
-							<a th:if="${user.enabled == true}" class="fas fa-check-circle fa-2x icon-green" 
-								th:href="@{'/users/' + ${user.id} + '/enabled/false'}"
-								title="Disable this user"></a>
-								
-							<a th:if="${user.enabled == false}" class="fas fa-circle fa-2x icon-silver"
-								 th:href="@{'/users/' + ${user.id} + '/enabled/true'}"
-								 title="Enable this user"></a>
-						
-									&nbsp;
-							<a class="fas fa-edit fa-2x icon-green" th:href="@{'/users/edit/' + ${user.id}}"
-									title="edit this user"></a>
-									&nbsp; 
-							<a class="fas fa-trash fa-2x icon-dark link-delete" th:href="@{'/users/delete/' + ${user.id}}"
-									title="delete this user" th:userId="${user.id}"></a>
-						</div>
-					</div>
-					<div>&nbsp;</div>
-				</div>
-			</div>
-			
-			
-			<!-- IF -->
-			<div class="text-center m-1" th:if="${totalItems > 0}">
-				<span>Showing Users # [[${startCount}]] to [[${endCount}]] of [[${totalItems}]]</span>
-			</div>
-			
-			<!-- ELSE -->
-			<div class="text-center m-1" th:unless="${totalItems > 0}">
-				<span>No users found</span>
-			</div>
-			
-			<!-- only display pagination when there are users; else, no users no pagination -->
-			<div th:if="${totalPages > 1}">
-				<nav>
-					  <ul class="pagination justify-content-center flex-wrap">
-					  
-					  	<li th:class=" ${currentPage > 1 ? 'page-item' : 'page-item disabled'}">
-					  		<a th:replace="fragments :: page_link(1, 'First')"></a>
-				    	</li>
-					  
-					    <li th:class=" ${currentPage > 1 ? 'page-item' : 'page-item disabled'}">
-					    	<a th:replace="fragments :: page_link(${currentPage - 1 }, 'previous')"></a>
-				    	</li>
-					    	
-					    <!-- org.thymeleaf.expression.Numbers class, An object of this class is usually available in variable evaluation expressions with the name #numbers. -->
-					    <li th:class="${currentPage != i ? 'page-item' : 'page-item active'}" 
-					    	th:each="i : ${#numbers.sequence(1, totalPages)}">
-					    	<a th:replace="fragments :: page_link(${i}, ${i})"></a>
-					    </li>
-					    
-					    <li  th:class=" ${currentPage < totalPages ? 'page-item' : 'page-item disabled'}">
-					    	<a th:replace="fragments :: page_link(${currentPage + 1}, 'Next')"></a>
-					    </li>
-					    
-					    <li th:class=" ${currentPage < totalPages ? 'page-item' : 'page-item disabled'}">
-							<a th:replace="fragments :: page_link(${totalPages}, 'Last')"></a>		
-					    </li>
-					  </ul>
-				</nav>
-			</div>
-			
-			
-			
-			<div class="modal fade text-center" id="confirmModal">
-				<div class="modal-dialog">
-					<div class="modal-content">
-					
-						<div class="modal-header">
-							<h4 class="modal-title">Delete Confirmation</h4>
-							<button type="button" class="close" data-dismiss="modal">&times;</button>
-						</div>
-						
-						<div class="modal-body">
-							<span id="confirmText"></span>
-						</div>
-						
-						<div class="modal-footer">
-							<a class="btn btn-success" href="" id="yesButton">Yes</a>
-							<button type="button" class="btn btn-danger" data-dismiss="modal">Close</button>
-						</div>
-					</div>
-				</div>
-			</div>
-			
-			
-			<div class="text-center">
-				<p>Shopme Control Panel - Copyright &copy; Shopme</p>
-			</div>
-
-
-	</div>
-	
-<script type="text/javascript">
-
-//confirmation modal dialogue for delete user
-$(document).ready(function(){
-	$(".link-delete").on("click", function(e){
-		//stop the <a> tag default behaviour and pop out a confirmation modal dialogue
-		e.preventDefault();
-		//alert($(this).attr("href"));
-		link = $(this);
-		userId = link.attr("userId");
-		$("#yesButton").attr("href", link.attr("href"));
-		$("#confirmText").text("Are you sure you want to delete this user ID " + userId + "?");
-		$("#confirmModal").modal();
-	});
-});
-
-	function clearFilter(){
-		window.location = "[[@{/users}]]";
-	}
-
-
-</script>
-	
-</body>
-
-</html>
\ No newline at end of file
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/3b/908f7a8326b3001d1e75aa5ef0815903 b/.metadata/.plugins/org.eclipse.core.resources/.history/3b/908f7a8326b3001d1e75aa5ef0815903
deleted file mode 100644
index e4dd5019..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/3b/908f7a8326b3001d1e75aa5ef0815903
+++ /dev/null
@@ -1,200 +0,0 @@
-package com.shopme.admin.user;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
-import java.util.List;
-
-import org.hibernate.internal.build.AllowSysOut;
-import org.hibernate.query.sqm.mutation.internal.TableKeyExpressionCollector;
-import org.junit.jupiter.api.Test;
-import org.springframework.aot.nativex.NativeConfigurationWriter;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.autoconfigure.jdbc.AutoConfigureTestDatabase;
-import org.springframework.boot.test.autoconfigure.jdbc.AutoConfigureTestDatabase.Replace;
-import org.springframework.boot.test.autoconfigure.orm.jpa.DataJpaTest;
-import org.springframework.boot.test.autoconfigure.orm.jpa.TestEntityManager;
-import org.springframework.data.domain.Page;
-import org.springframework.data.domain.PageRequest;
-import org.springframework.data.domain.Pageable;
-import org.springframework.test.annotation.Rollback;
-
-import com.shopme.common.entity.Role;
-import com.shopme.common.entity.User;
-
-@DataJpaTest(showSql = false)
-//configure to run on real database(MySQL) instead of a test database
-@AutoConfigureTestDatabase(replace = Replace.NONE)
-/*
- * Datajpatest will rollback the transaction after executing the test method
- * everytime, so that the transaction will not be committed. if we want to
- * commit the transaction(aka "save the record"), we can disable rollback by
- * setting it to false. Now, all transactions will be committed
- */
-@Rollback(false)
-public class UserRepositoryTests {
-
-	@Autowired
-	private UserRepository repo;
-
-	@Autowired
-	private TestEntityManager entityManager;
-
-	// On the very first execution of testCreateUser() method; hibernate will create
-	// the users table & users_roles table
-	@Test
-	public void testCreateUserWithOneRole() {
-
-		Role roleAdmin = entityManager.find(Role.class, 1);
-		User userChow = new User("chow@gmail.com", "password", "chow", "seng fung");
-		userChow.addRoles(roleAdmin);
-		User savedUser = repo.save(userChow);
-		assertThat(savedUser.getId()).isGreaterThan(0);
-
-	}
-
-	@Test
-	public void testCreateUserWithTwoRole() {
-
-		User userRavi = new User("ravi@gmail.com", "ravipass", "ravi", "kumar");
-		Role roleEditor = new Role(3);
-		Role roleAssistant = new Role(5);
-
-		userRavi.addRoles(roleEditor);
-		userRavi.addRoles(roleAssistant);
-
-		User savedUser = repo.save(userRavi);
-		assertThat(savedUser.getId()).isGreaterThan(0);
-	}
-
-	@Test
-	public void testListAllUsers() {
-		Iterable<User> listUsers = repo.findAll();
-
-		// use method reference instead of lambda expression here
-		listUsers.forEach(System.out::println);
-
-	}
-
-	@Test
-	public void testGetUserById() {
-
-		User userChow = repo.findById(1).get();
-		System.out.println(userChow);
-		// use method reference instead of lambda expression here
-		assertThat(userChow).isNotNull();
-	}
-
-	@Test
-	public void testUpdateUserDetails() {
-		
-		User userChow = repo.findById(1).get();
-		userChow.setEnabled(true);
-		userChow.setEmail("chow22@gmail.com");
-		
-		repo.save(userChow);
-	}
-	
-	@Test
-	public void testUpdateUserRoles() {
-		
-		User userRavi = repo.findById(4).get();
-		Role roleEditor = new Role(3);
-		Role roleSalesperson= new Role(2);
-		
-		//change role from editor to salesperson
-		
-		/* take note of overriding/implementing the hashcode and equals method in roles
-		 * class. need to override those two methods for remove() to work.
-		 *  The remove() method removes an element "e" such that Objects.equals(o, e),
-		 *  this will invoke the overwritten equals() method in Role Class. 
-		 * */
-		userRavi.getRoles().remove(roleEditor);
-		userRavi.addRoles(roleSalesperson);
-		
-		repo.save(userRavi);
-	}
-	
-	@Test
-	public void testDeleteUser() {
-		
-		Integer userId = 4;
-		repo.deleteById(userId);
-	}
-	
-	
-	@Test
-	public void testGetUserByEmail() {
-		String email = "ravi@gmail.com";
-		User user = repo.getUserByEmail(email);
-		
-		assertThat(user).isNotNull();
-	}
-	
-	/*
-	 * count the number of records in database with a particular id.
-	 * return value should be 1,
-	 * because id is unique.
-	 * 
-	 * use countById() method to test whether a user exists. 
-	 */
-	@Test
-	public void testCountById() {
-		
-		Integer userId = 1;
-		Long countById = repo.countById(userId);
-		
-		assertThat(countById).isNotNull().isGreaterThan(0).isEqualTo(1);
-	}
-	
-	@Test	
-	public void testDisableUser() {
-		Integer userId = 1;
-		
-		repo.updateEnabledStatus(userId, false);
-	}
-
-	@Test	
-	public void testEnableUser() {
-		Integer userId = 1;
-		
-		repo.updateEnabledStatus(userId, true);
-	}
-	
-	@Test
-	public void testListFirstPage() {
-		int pageNumber = 0; // the first page number always start with 0, change pageNumber to 1 to get the second page, 2 for thid page and so forth
-		int pageSize = 4; // no of elements
-		
-		Pageable pageable = PageRequest.of(pageNumber, pageSize);
-		Page<User> page = repo.findAll(pageable);
-		
-		List<User> listUsers = page.getContent();
-		
-		listUsers.forEach(System.out::println);
-		
-		assertThat(listUsers.size()).isEqualTo(pageSize);
-	}
-	
-	
-	@Test 
-	public void testSearchUsers() {
-		
-		String keyword = "bruce";
-		
-		
-		int pageNumber = 0; // the first page number always start with 0, change pageNumber to 1 to get the second page, 2 for thid page and so forth
-		int pageSize = 4; // no of elements
-		
-		Pageable pageable = PageRequest.of(pageNumber, pageSize);
-		Page<User> page = repo.findAll(pageable);
-		
-		List<User> listUsers = page.getContent();
-		
-		listUsers.forEach(System.out::println);
-		
-		
-	}
-	
-	
-}
-
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/3c/907eac1f13b4001d128fb79045552177 b/.metadata/.plugins/org.eclipse.core.resources/.history/3c/907eac1f13b4001d128fb79045552177
deleted file mode 100644
index ad973fe3..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/3c/907eac1f13b4001d128fb79045552177
+++ /dev/null
@@ -1,68 +0,0 @@
-package com.shopme.admin.security;
-
-import java.util.Collection;
-import java.util.Set;
-
-import org.springframework.security.core.GrantedAuthority;
-import org.springframework.security.core.userdetails.UserDetails;
-
-import com.shopme.common.entity.User;
-
-
-/*
- *  Think of it as a wrapper class for  Type User
- * 
- * */
-public class ShopmeUserDetails implements UserDetails {
-
-	private User user;
-	
-	public ShopmeUserDetails(User user) {
-		this.user = user;
-	}
-
-	@Override
-	public Collection<? extends GrantedAuthority> getAuthorities() {
-
-		Set<Role> roles = user.getRoles();
-		
-		return null;
-	}
-
-	@Override
-	public String getPassword() {
-		// TODO Auto-generated method stub
-		return null;
-	}
-
-	@Override
-	public String getUsername() {
-		// TODO Auto-generated method stub
-		return null;
-	}
-
-	@Override
-	public boolean isAccountNonExpired() {
-		// TODO Auto-generated method stub
-		return false;
-	}
-
-	@Override
-	public boolean isAccountNonLocked() {
-		// TODO Auto-generated method stub
-		return false;
-	}
-
-	@Override
-	public boolean isCredentialsNonExpired() {
-		// TODO Auto-generated method stub
-		return false;
-	}
-
-	@Override
-	public boolean isEnabled() {
-		// TODO Auto-generated method stub
-		return false;
-	}
-
-}
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/3c/c08e70cc52b4001d1d079a924effdc9e b/.metadata/.plugins/org.eclipse.core.resources/.history/3c/c08e70cc52b4001d1d079a924effdc9e
deleted file mode 100644
index 4519c95e..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/3c/c08e70cc52b4001d1d079a924effdc9e
+++ /dev/null
@@ -1,22 +0,0 @@
-$(document).ready(function(){
-		$("#logoutLink").on("click", function(e){
-			e.preventDefault(); /* stop the hyperlink default behaviour  */
-			
-			/* use  the form to  log out and navigate to the url path /logout  
-			
-			 NOTE: spring security requires a POST request form to logout in order to obtain the csrf token, 
-			 		the csrf token is a hidden property in the form
-			*/
-			document.logoutForm.submit();
-		});
-		
-		customizeDropDownMenu();
-	});
-	
-	
-function customizeDropDownMenu() {
-	
-	$(".dropdown > a")
-	
-}
-	
\ No newline at end of file
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/3c/f0e9afc917b4001d128fb79045552177 b/.metadata/.plugins/org.eclipse.core.resources/.history/3c/f0e9afc917b4001d128fb79045552177
deleted file mode 100644
index e773b580..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/3c/f0e9afc917b4001d128fb79045552177
+++ /dev/null
@@ -1,61 +0,0 @@
-package com.shopme.admin.security;
-
-import org.aspectj.weaver.ast.And;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.security.config.annotation.web.builders.HttpSecurity;
-import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
-import org.springframework.security.config.annotation.web.configuration.WebSecurityConfiguration;
-import org.springframework.security.config.annotation.web.configuration.WebSecurityCustomizer;
-import org.springframework.security.core.userdetails.UserDetailsService;
-import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
-import org.springframework.security.crypto.password.PasswordEncoder;
-import org.springframework.security.web.SecurityFilterChain;
-
-@Configuration
-@EnableWebSecurity
-public class WebSecurityConfig {
-
-	/*
-	 * refer to this link: https://www.codejava.net/frameworks/spring-boot/fix-
-	 * websecurityconfigureradapter-deprecated
-	 * 
-	 */
-	
-	@Bean
-	public UserDetailsService  UserDetailsService()	{
-		return ShopmeUserDetailsService();
-	}
-	
-	
-
-	@Bean
-	public PasswordEncoder PasswordEncoder() {
-		return new BCryptPasswordEncoder();
-	}
-
-	@Bean
-	public SecurityFilterChain filterChain(HttpSecurity http) throws Exception {
-
-		// any request need to be authenticated (require login)
-		// custom login page at "/login" - handler method in MainController class
-		http.authorizeHttpRequests()
-			.anyRequest().authenticated()
-			.and()
-			.formLogin()
-				.loginPage("/login")
-				.usernameParameter("email")
-				.permitAll();
-
-		return http.build();
-	}
-
-	//NOTE: antMatchers() changed to requestMatchers()
-	//stack: https://stackoverflow.com/questions/74907533/the-method-antmatchersstring-is-undefined-for-the-type
-	@Bean
-	public WebSecurityCustomizer webSecurityCustomizer() {
-		//permit access to the assets in the following directories
-		return (web) -> web.ignoring().requestMatchers("/images/**", "/js/**", "/webjars/**");
-	}
-
-}
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/3d/a0658ce279b3001d19bbb001c1a81c20 b/.metadata/.plugins/org.eclipse.core.resources/.history/3d/a0658ce279b3001d19bbb001c1a81c20
deleted file mode 100644
index 1d35e7d4..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/3d/a0658ce279b3001d19bbb001c1a81c20
+++ /dev/null
@@ -1,25 +0,0 @@
-package com.shopme.admin.user;
-
-import java.io.IOException;
-import java.text.DateFormat;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-
-import jakarta.servlet.http.HttpServletResponse;
-
-public class AbstractExporter {
-
-	public void setResponseHeader(HttpServletResponse response, String contentType, 
-			String extension, String prefix) throws IOException {
-		DateFormat dateFormatter = new SimpleDateFormat("yyyy-MM-dd_HH-mm-ss");
-		String timestamp = dateFormatter.format(new Date());
-		String fileName = prefix + timestamp + extension;
-		
-		response.setContentType(contentType);
-		
-		String headerKey = "Content-Disposition";
-		String headerValue = "attachment; filename=" + fileName;
-		response.setHeader(headerKey, headerValue);
-		
-	}	
-}
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/3d/c041215f3fb3001d1e75aa5ef0815903 b/.metadata/.plugins/org.eclipse.core.resources/.history/3d/c041215f3fb3001d1e75aa5ef0815903
deleted file mode 100644
index b71406e6..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/3d/c041215f3fb3001d1e75aa5ef0815903
+++ /dev/null
@@ -1,53 +0,0 @@
-package com.shopme.admin.user;
-
-import org.springframework.data.domain.Page;
-import org.springframework.data.domain.Pageable;
-import org.springframework.data.jpa.repository.Modifying;
-import org.springframework.data.jpa.repository.Query;
-import org.springframework.data.repository.CrudRepository;
-import org.springframework.data.repository.PagingAndSortingRepository;
-import org.springframework.data.repository.query.Param;
-import org.springframework.stereotype.Repository;
-
-import com.shopme.common.entity.User;
-
-@Repository
-public interface UserRepository extends CrudRepository<User, Integer>, PagingAndSortingRepository<User, Integer> {
-
-	/*
-	 * JPQL statement. It should be noted that as compared to native SQL, JPQL does
-	 * not interact with database tables, records, and fields - but with Java
-	 * classes and instances.
-	 * 
-	 * JPA kicks in as the mediator and transpiles JPQL queries to SQL queries for execution.
-	 * 
-	 * If your database can change or varies from development to production, as long as 
-	 * they're both relational - JPQL works wonders and you can 
-	 * write JPQL queries to create generic logic that can be used over and over again.
-	 */
-	@Query("SELECT u FROM User u WHERE u.email = :email")
-	public User getUserByEmail(@Param("email") String email);
-	
-	// countById() declaration follows the JPA specification
-	//to check the existence of a user
-	public Long countById(Integer id);
-	
-	
-	//for filtering users by keyword
-	/*
-	 * @Query("SELECT u FROM User u WHERE u.firstName LIKE %?1% OR u.lastName LIKE %?1%"
-	 * + " OR u.email LIKE %?1%")
-	 * 
-	 * the above query does not work when we search for user with keyword "nam ha minh".
-	 * 
-	 * Instead we should concatenate the fields separated by space
-	 */
-	public Page<User> findAll(String keyword, Pageable pageable);
-	
-	
-	//change user enabled status
-	//need @Modifying annotation for update/delete operation
-	@Query("UPDATE User u SET u.enabled = ?2 WHERE u.id = ?1")
-	@Modifying
-	public void updateEnabledStatus(Integer id, boolean enabled);
-}
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/3e/1097dea54fb3001d1e75aa5ef0815903 b/.metadata/.plugins/org.eclipse.core.resources/.history/3e/1097dea54fb3001d1e75aa5ef0815903
deleted file mode 100644
index 1e92ab6a..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/3e/1097dea54fb3001d1e75aa5ef0815903
+++ /dev/null
@@ -1,170 +0,0 @@
-package com.shopme.admin.user;
-
-import java.io.IOException;
-import java.util.List;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.domain.Page;
-import org.springframework.data.repository.query.Param;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
-import org.springframework.util.StringUtils;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.ModelAttribute;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.multipart.MultipartFile;
-import org.springframework.web.servlet.mvc.support.RedirectAttributes;
-
-import com.fasterxml.jackson.annotation.ObjectIdGenerators.StringIdGenerator;
-import com.shopme.admin.FileUploadUtil;
-import com.shopme.common.entity.Role;
-import com.shopme.common.entity.User;
-
-@Controller
-public class UserController {
-
-	@Autowired
-	private UserService service;
-
-	@GetMapping("/users")
-	public String listFirstPage(Model model) {
-		return listByPage(1, model, "firstName", "asc", null);
-	}
-
-	@GetMapping("/users/page/{pageNum}")
-	public String listByPage(@PathVariable(name = "pageNum") int pageNum, Model model,
-			@Param("sortField") String sortField, @Param("sortDir") String sortDir,
-			@Param("keyword") String keyword) {
-		
-		System.out.println("sort field: " + sortField);
-		System.out.println("sort order: " + sortDir);
-		
-		Page<User> page = service.listByPage(pageNum, sortField, sortDir, keyword);
-		List<User> listUsers = page.getContent();
-
-		
-		long startCount = (pageNum - 1) * UserService.USERS_PER_PAGE + 1;
-		long endCount = startCount + UserService.USERS_PER_PAGE - 1;
-		if(endCount > page.getTotalElements()) {
-			endCount = page.getTotalElements();
-		}
-		
-		String reverseSortDir = sortDir.equals("asc") ? "desc" : "asc";
-		
-		model.addAttribute("currentPage", pageNum);
-		model.addAttribute("totalPages", page.getTotalPages());
-		model.addAttribute("startCount", startCount);
-		model.addAttribute("endCount", endCount);
-		model.addAttribute("totalItems", page.getTotalElements());
-		model.addAttribute("listUsers", listUsers);
-		model.addAttribute("sortField", sortField);
-		model.addAttribute("sortDir", sortDir);
-		model.addAttribute("reverseSortDir", reverseSortDir);
-		model.addAttribute("keyword", keyword);
-		
-
-		return "users";
-
-	}
-
-	@GetMapping("/users/new")
-	public String newUser(Model model) {
-
-		List<Role> listRoles = service.listRoles();
-
-		User user = new User();
-		user.setEnabled(true);
-
-		model.addAttribute("user", user);
-		model.addAttribute("listRoles", listRoles);
-		model.addAttribute("pageTitle", "Create New User");
-
-		return "user_form";
-
-	}
-
-	// using @RequestParam, we can get the image file input, the input has the
-	// property name="image"
-	@PostMapping("/users/save")
-	public String saveUser(@ModelAttribute("user") User user, RedirectAttributes redirectAttributes,
-			@RequestParam("image") MultipartFile multipartFile) throws IOException {
-
-		if (!multipartFile.isEmpty()) {
-
-			String fileName = StringUtils.cleanPath(multipartFile.getOriginalFilename());
-			user.setPhotos(fileName);
-
-			User savedUser = service.save(user);
-
-			String uploadDir = "user-photos/" + savedUser.getId();
-
-			FileUploadUtil.cleanDir(uploadDir);
-			FileUploadUtil.saveFile(uploadDir, fileName, multipartFile);
-		} else {
-
-			// set photo to null for getPhotosImagePath() method's conditional statement in
-			// User class
-			if (user.getPhotos().isEmpty())
-				user.setPhotos(null);
-			service.save(user);
-		}
-
-		redirectAttributes.addFlashAttribute("message", "the user has been saved successfully");
-
-		// POST/REDIRECT/GET web design
-		
-		//after user is saved display the user
-		//email is unique field, so 
-		
-		return "redirect:/users";
-	}
-
-	@GetMapping("/users/edit/{id}")
-	public String editUser(@PathVariable(name = "id") Integer id, RedirectAttributes redirectAttributes, Model model) {
-		try {
-			User user = service.get(id);
-			List<Role> listRoles = service.listRoles();
-
-			model.addAttribute("user", user);
-			model.addAttribute("pageTitle", "Edit User (ID: " + id + ")");
-			model.addAttribute("listRoles", listRoles);
-
-			return "user_form";
-		} catch (UserNotFoundException ex) {
-			redirectAttributes.addFlashAttribute("message", ex.getMessage());
-
-			return "redirect:/users";
-		}
-
-	}
-
-	@GetMapping("/users/delete/{id}")
-	public String deleteUser(@PathVariable(name = "id") Integer id, RedirectAttributes redirectAttributes,
-			Model model) {
-		try {
-			service.delete(id);
-			redirectAttributes.addFlashAttribute("message", "The user ID " + id + " has been deleted successfully.");
-
-		} catch (UserNotFoundException ex) {
-			redirectAttributes.addFlashAttribute("message", ex.getMessage());
-
-		}
-
-		return "redirect:/users";
-	}
-
-	@GetMapping("/users/{id}/enabled/{status}")
-	public String updateUserEnabledStatus(@PathVariable(name = "id") Integer id,
-			@PathVariable(name = "status") boolean enabled, RedirectAttributes redirectAttributes) {
-
-		service.updateUserEnabledStatus(id, enabled);
-		String status = enabled ? "enabled" : "disabled";
-		String message = "The user id " + id + " has been " + status;
-		redirectAttributes.addFlashAttribute("message", message);
-
-		return "redirect:/users";
-	}
-
-}
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/3f/00f9bacf9bb9001d10d0f9513979f945 b/.metadata/.plugins/org.eclipse.core.resources/.history/3f/00f9bacf9bb9001d10d0f9513979f945
new file mode 100644
index 00000000..7a325648
--- /dev/null
+++ b/.metadata/.plugins/org.eclipse.core.resources/.history/3f/00f9bacf9bb9001d10d0f9513979f945
@@ -0,0 +1,115 @@
+<!DOCTYPE html>
+<html xmlns:th="http://www.thymeleaf.org">
+
+<head th:replace="fragments :: page_head(${pageTitle})"/>
+
+<body>
+	<div class="container-fluid">
+
+	<!-- navigation bar -->
+	<div th:replace="navigation :: menu"></div>
+
+	<div>
+		<h2>Manage Categories | [[${pageTitle}]]</h2>
+	</div>
+
+			<form th:action="@{/categories/save}" method="post" style="max-width:500px; margin: 0 auto"
+			enctype="multipart/form-data"
+			th:object="${category}" >
+			<input type="hidden" th:field="*{id}" />
+			<div class="border border-secondary rounded p-3">
+				<div class="form-group row">
+					<label class="col-sm-4 col-form-label">Category Name:</label>
+					<div class="col-sm-8">
+						<input type="text" class="form-control" th:field="*{name}" required minlength="3" maxlength="128" />
+					</div>
+				</div>
+				
+				<div class="form-group row">
+					<label class="col-sm-4 col-form-label">Alias:</label>
+					<div class="col-sm-8">
+						<input type="text" class="form-control" th:field="*{alias}" required minlength="3" maxlength="64" />
+					</div>
+				</div>
+				
+				<div class="form-group row">
+					<label class="col-sm-4 col-form-label">Parent Category:</label>
+					<div class="col-sm-8">
+						<select class="form-control" th:field="*{parent}">
+							<option value="0">[No Parent]</option>
+							
+							<th:block th:each="cat : ${listCategories}">
+								<option th:value="${cat.id}">[[${cat.name}]]</option>
+							</th:block>
+						</select>
+					</div>
+				</div>
+				
+				<div class="form-group row">
+					<label class="col-sm-4 col-form-label">Image:</label>
+					<div class="col-sm-8">
+						<input type="hidden" th:field="*{image}"/>
+						<input type="file" id="fileImage" name="fileImage" accept="image/png, image/jpeg"
+						 th:required="${category.imagepath == null}"  required class="mb-2" />
+						
+					<div class="mt-2">
+						<img id="thumbnail" alt="Image preview" th:src="@{/images/image-thumbnail.png}"
+						 class="img-fluid" />
+					</div>	 
+						 
+					</div>	
+				</div>
+				
+				<div class="form-group row">
+					<label class="col-sm-4 col-form-label">Enabled:</label>
+					<div class="col-sm-8">
+						<input type="checkbox" th:field="*{enabled}" />
+					</div>
+				</div>
+				
+				<div class="text-center">
+					<input type="submit" value="Save" class="btn btn-primary m-3" />
+					<input type="button" value="Cancel" class="btn btn-secondary" id="buttonCancel" />
+				</div>
+			</div>
+			</form>
+			
+			<div class="modal fade text-center" id="modalDialog">
+				<div class="modal-dialog">
+					<div class="modal-content">
+					
+						<div class="modal-header">
+							<h4 class="modal-title" id="modalTitle">Warning</h4>
+							<button type="button" class="close" data-dismiss="modal">&times;</button>
+						</div>
+						
+						<div class="modal-body">
+							<span id="modalBody"></span>
+						</div>
+						
+						<div class="modal-footer">
+							<button type="button" class="btn btn-danger" data-dismiss="modal">Close</button>
+						</div>
+					</div>
+				</div>
+			</div>
+			
+			
+		<!-- footer -->
+		<div th:replace="fragments :: footer"></div>
+
+	</div>
+			
+<!-- jquery for  cancel button return to users listing-->
+<script type="text/javascript">
+	
+	/*for cancel button in /js/common_form.js*/
+	moduleURL = "[[@{/categories}]]";
+	
+</script>
+
+<script th:src="@{/js/common_form.js}"></script>
+
+</body>
+
+</html>
\ No newline at end of file
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/3f/c0955a2d2eb4001d1d079a924effdc9e b/.metadata/.plugins/org.eclipse.core.resources/.history/3f/c0955a2d2eb4001d1d079a924effdc9e
deleted file mode 100644
index 10f404e9..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/3f/c0955a2d2eb4001d1d079a924effdc9e
+++ /dev/null
@@ -1,94 +0,0 @@
-<!DOCTYPE html>
-<html xmlns:th="http://www.thymeleaf.org"
-	  xmlns:sec="https://www.thymeleaf.org/thymeleaf-extras-springsecurity5">
-
-<head>
-	<meta http-equiv="Content-Type" content="text/html; charset= UTF-8">
-	<meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0">
-	<title>Home - Shopme Admin</title>
-	
-	<link rel="stylesheet" type="text/css" th:href="@{/fontawesome/all.css}" />
-	<link rel="stylesheet" type="text/css" th:href="@{/style.css}" />
-	<link rel="stylesheet" type="text/css" th:href="@{/webjars/bootstrap/css/bootstrap.min.css}" />
-	
-	<script type="text/javascript" th:src="@{/webjars/jquery/jquery.min.js}"></script>
-	<script type="text/javascript" th:src="@{/webjars/bootstrap/js/bootstrap.min.js}"></script>
-</head>
-
-<body>
-	<div class="container-fluid">
-		<div>
-			<nav class="navbar navbar-expand-lg bg-dark navbar-dark">
-				<a class="navbar-brand" th:href="@{/}">
-					<img th:src="@{/images/ShopmeAdminSmall.png}"/>
-				</a>
-				<!--hamburger toggler for mobile devices(responsive)-->
-				<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#topNavbar">
-					<span class="navbar-toggler-icon"></span>
-				</button>
-				<div class="collapse navbar-collapse" id="topNavbar">
-					<ul class="navbar-nav">
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/users}">Users</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/categories}">Categories</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/brands}">Brands</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/products}">Products</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/customers}">Customers</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/shipping}">Shipping</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/orders}">Orders</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/report}">Sales Report</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/articles}">Articles</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/menus}">Menus</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/settings}">Settings</a>
-						</li>
-						<li>
-							<span class="fas fa-user fa-2x icon-silver"></span>
-						</li>
-						<li class="nav-item dropdown">
-								<!-- principal refers to user; display username -->
-							<a class="nav-link dropdown-toggle" sec:authentication="principal.fullname" data-toggle="dropdown"></a>
-							<div class="dropdown-menu">
-								<a class="dropdown-item">Logout</a>
-							</div>
-							
-						</li>
-					</ul>
-				</div>
-				
-			</nav>
-		</div>
-
-		<div>
-			<h1>Shopme Control Panel</h1>
-		<div />
-
-		<div>
-			<p>Shopme Control Panel - Copyright &copy; Shopme</p>
-		<div />
-
-
-	</div>
-
-</body>
-
-</html>
\ No newline at end of file
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/4/8069acbb2db4001d1d079a924effdc9e b/.metadata/.plugins/org.eclipse.core.resources/.history/4/8069acbb2db4001d1d079a924effdc9e
deleted file mode 100644
index 54dcf8f5..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/4/8069acbb2db4001d1d079a924effdc9e
+++ /dev/null
@@ -1,94 +0,0 @@
-<!DOCTYPE html>
-<html xmlns:th="http://www.thymeleaf.org"
-	  xmlns:sec="https://www.thymeleaf.org/thymeleaf-extras-springsecurity5">
-
-<head>
-	<meta http-equiv="Content-Type" content="text/html; charset= UTF-8">
-	<meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0">
-	<title>Home - Shopme Admin</title>
-	
-	<link rel="stylesheet" type="text/css" th:href="@{/fontawesome/all.css}" />
-	<link rel="stylesheet" type="text/css" th:href="@{/style.css}" />
-	<link rel="stylesheet" type="text/css" th:href="@{/webjars/bootstrap/css/bootstrap.min.css}" />
-	
-	<script type="text/javascript" th:src="@{/webjars/jquery/jquery.min.js}"></script>
-	<script type="text/javascript" th:src="@{/webjars/bootstrap/js/bootstrap.min.js}"></script>
-</head>
-
-<body>
-	<div class="container-fluid">
-		<div>
-			<nav class="navbar navbar-expand-lg bg-dark navbar-dark">
-				<a class="navbar-brand" th:href="@{/}">
-					<img th:src="@{/images/ShopmeAdminSmall.png}"/>
-				</a>
-				<!--hamburger toggler for mobile devices(responsive)-->
-				<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#topNavbar">
-					<span class="navbar-toggler-icon"></span>
-				</button>
-				<div class="collapse navbar-collapse" id="topNavbar">
-					<ul class="navbar-nav">
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/users}">Users</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/categories}">Categories</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/brands}">Brands</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/products}">Products</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/customers}">Customers</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/shipping}">Shipping</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/orders}">Orders</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/report}">Sales Report</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/articles}">Articles</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/menus}">Menus</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/settings}">Settings</a>
-						</li>
-						<li>
-							<span class="fas fa-user fa-2x icon-silver"></span>
-						</li>
-						<li class="nav-item dropdown">
-								<!-- principal refers to user; display username -->
-							<a class="nav-link dropdown-toggle" sec:authentication="principal.fullname" data-toggle="dropdown"></a>
-							<div class="dropdown-menu">
-							
-							</div>
-							
-						</li>
-					</ul>
-				</div>
-				
-			</nav>
-		</div>
-
-		<div>
-			<h1>Shopme Control Panel</h1>
-		<div />
-
-		<div>
-			<p>Shopme Control Panel - Copyright &copy; Shopme</p>
-		<div />
-
-
-	</div>
-
-</body>
-
-</html>
\ No newline at end of file
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/4/b01cd6ac67b3001d19bbb001c1a81c20 b/.metadata/.plugins/org.eclipse.core.resources/.history/4/b01cd6ac67b3001d19bbb001c1a81c20
deleted file mode 100644
index e38d47de..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/4/b01cd6ac67b3001d19bbb001c1a81c20
+++ /dev/null
@@ -1,185 +0,0 @@
-package com.shopme.admin.user;
-
-import java.io.IOException;
-import java.util.List;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.domain.Page;
-import org.springframework.data.repository.query.Param;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
-import org.springframework.util.StringUtils;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.ModelAttribute;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.multipart.MultipartFile;
-import org.springframework.web.servlet.mvc.support.RedirectAttributes;
-
-import com.fasterxml.jackson.annotation.ObjectIdGenerators.StringIdGenerator;
-import com.shopme.admin.FileUploadUtil;
-import com.shopme.common.entity.Role;
-import com.shopme.common.entity.User;
-
-@Controller
-public class UserController {
-
-	@Autowired
-	private UserService service;
-
-	@GetMapping("/users")
-	public String listFirstPage(Model model) {
-		
-		//NOTE: these are the default values for path variable and URL parameters
-		return listByPage(1, model, "firstName", "asc", null);
-	}
-
-	@GetMapping("/users/page/{pageNum}")
-	public String listByPage(@PathVariable(name = "pageNum") int pageNum, Model model,
-			@Param("sortField") String sortField, @Param("sortDir") String sortDir,
-			@Param("keyword") String keyword) {
-		
-		System.out.println("sort field: " + sortField);
-		System.out.println("sort order: " + sortDir);
-		
-		Page<User> page = service.listByPage(pageNum, sortField, sortDir, keyword);
-		List<User> listUsers = page.getContent();
-
-		
-		long startCount = (pageNum - 1) * UserService.USERS_PER_PAGE + 1;
-		long endCount = startCount + UserService.USERS_PER_PAGE - 1;
-		if(endCount > page.getTotalElements()) {
-			endCount = page.getTotalElements();
-		}
-		
-		String reverseSortDir = sortDir.equals("asc") ? "desc" : "asc";
-		
-		model.addAttribute("currentPage", pageNum);
-		model.addAttribute("totalPages", page.getTotalPages());
-		model.addAttribute("startCount", startCount);
-		model.addAttribute("endCount", endCount);
-		model.addAttribute("totalItems", page.getTotalElements());
-		model.addAttribute("listUsers", listUsers);
-		model.addAttribute("sortField", sortField);
-		model.addAttribute("sortDir", sortDir);
-		model.addAttribute("reverseSortDir", reverseSortDir);
-		model.addAttribute("keyword", keyword);
-		
-
-		return "users";
-
-	}
-
-	@GetMapping("/users/new")
-	public String newUser(Model model) {
-
-		List<Role> listRoles = service.listRoles();
-
-		User user = new User();
-		user.setEnabled(true);
-
-		model.addAttribute("user", user);
-		model.addAttribute("listRoles", listRoles);
-		model.addAttribute("pageTitle", "Create New User");
-
-		return "user_form";
-
-	}
-
-	// using @RequestParam, we can get the image file input, the input has the
-	// property name="image"
-	@PostMapping("/users/save")
-	public String saveUser(@ModelAttribute("user") User user, RedirectAttributes redirectAttributes,
-			@RequestParam("image") MultipartFile multipartFile) throws IOException {
-
-		if (!multipartFile.isEmpty()) {
-
-			String fileName = StringUtils.cleanPath(multipartFile.getOriginalFilename());
-			user.setPhotos(fileName);
-
-			User savedUser = service.save(user);
-
-			String uploadDir = "user-photos/" + savedUser.getId();
-
-			FileUploadUtil.cleanDir(uploadDir);
-			FileUploadUtil.saveFile(uploadDir, fileName, multipartFile);
-		} else {
-
-			// set photo to null for getPhotosImagePath() method's conditional statement in
-			// User class
-			if (user.getPhotos().isEmpty())
-				user.setPhotos(null);
-			service.save(user);
-		}
-
-		redirectAttributes.addFlashAttribute("message", "the user has been saved successfully");
-
-		// POST/REDIRECT/GET web design
-		return getRedirectURLtoAffectedUser(user);
-	}
-
-	private String getRedirectURLtoAffectedUser(User user) {
-		
-		//after user is saved display the user instead of the entire user list
-		//email is a unique field to identify each user.
-		String firstPartOfEmail = user.getEmail().split("@")[0];
-		return "redirect:/users/page/1?sortField=id&sortDir=asc&keyword=" + firstPartOfEmail;
-	}
-
-	@GetMapping("/users/edit/{id}")
-	public String editUser(@PathVariable(name = "id") Integer id, RedirectAttributes redirectAttributes, Model model) {
-		try {
-			User user = service.get(id);
-			List<Role> listRoles = service.listRoles();
-
-			model.addAttribute("user", user);
-			model.addAttribute("pageTitle", "Edit User (ID: " + id + ")");
-			model.addAttribute("listRoles", listRoles);
-
-			return "user_form";
-		} catch (UserNotFoundException ex) {
-			redirectAttributes.addFlashAttribute("message", ex.getMessage());
-
-			return "redirect:/users";
-		}
-
-	}
-
-	@GetMapping("/users/delete/{id}")
-	public String deleteUser(@PathVariable(name = "id") Integer id, RedirectAttributes redirectAttributes,
-			Model model) {
-		try {
-			service.delete(id);
-			redirectAttributes.addFlashAttribute("message", "The user ID " + id + " has been deleted successfully.");
-
-		} catch (UserNotFoundException ex) {
-			redirectAttributes.addFlashAttribute("message", ex.getMessage());
-
-		}
-
-		return "redirect:/users";
-	}
-
-	@GetMapping("/users/{id}/enabled/{status}")
-	public String updateUserEnabledStatus(@PathVariable(name = "id") Integer id,
-			@PathVariable(name = "status") boolean enabled, RedirectAttributes redirectAttributes) {
-
-		service.updateUserEnabledStatus(id, enabled);
-		String status = enabled ? "enabled" : "disabled";
-		String message = "The user id " + id + " has been " + status;
-		redirectAttributes.addFlashAttribute("message", message);
-
-		return "redirect:/users";
-	}
-
-	@GetMapping("/users/export/csv")
-	public void exportToCSV() {
-		
-		
-		
-		UserCsvExporter exporter = new UserCsvExporter();
-	}
-	
-	
-}
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/40/20d456cec4b4001d1dd58082704b0bec b/.metadata/.plugins/org.eclipse.core.resources/.history/40/20d456cec4b4001d1dd58082704b0bec
deleted file mode 100644
index 0f13c89d..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/40/20d456cec4b4001d1dd58082704b0bec
+++ /dev/null
@@ -1,198 +0,0 @@
-<!DOCTYPE html>
-<html xmlns:th="http://www.thymeleaf.org">
-
-<head th:replace="fragments :: page_head(${pageTitle})"/>
-
-<body>
-	<div class="container-fluid">
-
-	<!-- navigation bar -->
-	<div th:replace="navigation :: menu"></div>
-
-	<div>
-		<h2>Manage Users | [[${pageTitle}]]</h2>
-	</div>
-
-			<form th:action="@{/users/save}" method="post" style="max-width:700px; margin: 0 auto"
-			enctype="multipart/form-data"
-			th:object="${user}" onsubmit="return checkEmailUnique(this);">
-			<input type="hidden" th:field="*{id}" />
-			<div class="border border-secondary rounded p-3">
-				<div class="form-group row">
-					<label class="col-sm-4 col-form-label">E-mail:</label>
-					<div class="col-sm-8">
-						<input type="email" class="form-control" th:field="*{email}" required minlength="8" maxlength="128" />
-					</div>
-				</div>
-				
-				<div class="form-group row">
-					<label class="col-sm-4 col-form-label">First Name:</label>
-					<div class="col-sm-8">
-						<input type="text" class="form-control" th:field="*{firstName}" required minlength="2" maxlength="45" />
-					</div>
-				</div>
-				
-				<div class="form-group row">
-					<label class="col-sm-4 col-form-label">Last Name:</label>
-					<div class="col-sm-8">
-						<input type="text" class="form-control" th:field="*{lastName}" required minlength="2" maxlength="45" />
-					</div>
-				</div>
-				
-				<div class="form-group row">
-					<label class="col-sm-4 col-form-label">Password:</label>
-					<div class="col-sm-8">
-					
-						<input th:if="${user.id == null}" type="password" class="form-control" th:field="*{password}" required minlength="8" maxlength="20" />
-						
-						<input th:if="${user.id != null}" type="password" class="form-control" th:field="*{password}" minlength="8" maxlength="20" />
-						
-					</div>
-				</div>
-				
-				<div class="form-group row">
-					<label class="col-sm-4 col-form-label">Roles:</label>
-					<div class="col-sm-8">
-						<th:block th:each="role: ${listRoles}">
-							<input type="checkbox" th:field="*{roles}"
-								th:text="${role.name}"
-								th:value="${role.id}"
-								class="m-2"
-							/>
-							- <small>[[${role.description}]]</small>
-							<br/>
-						</th:block>
-					</div>
-				</div>
-				
-				<div class="form-group row">
-					<label class="col-sm-4 col-form-label">Enabled:</label>
-					<div class="col-sm-8">
-						<input type="checkbox" th:field="*{enabled}" />
-					</div>
-				</div>
-				
-				<div class="form-group row">
-					<label class="col-sm-4 col-form-label">Photos:</label>
-					<div class="col-sm-8">
-						<input type="hidden" th:field="*{photos}"/>
-						<input type="file" id="fileImage" name="image" accept="image/png, image/jpeg"
-						class="mb-2" />
-						<img id="thumbnail" alt="Photos preview" th:src="@{${user.photosImagePath}}"
-						 class="img-fluid" />
-					</div>	
-				</div>
-				
-				
-				<div class="text-center">
-					<input type="submit" value="Save" class="btn btn-primary m-3" />
-					<input type="button" value="Cancel" class="btn btn-secondary" id="buttonCancel" />
-				</div>
-			</div>
-			</form>
-			
-			<div class="modal fade text-center" id="modalDialog">
-				<div class="modal-dialog">
-					<div class="modal-content">
-					
-						<div class="modal-header">
-							<h4 class="modal-title" id="modalTitle">Warning</h4>
-							<button type="button" class="close" data-dismiss="modal">&times;</button>
-						</div>
-						
-						<div class="modal-body">
-							<span id="modalBody"></span>
-						</div>
-						
-						<div class="modal-footer">
-							<button type="button" class="btn btn-danger" data-dismiss="modal">Close</button>
-						</div>
-					</div>
-				</div>
-			</div>
-			
-			
-		<!-- footer -->
-		<div th:replace="fragments :: footer"></div>
-
-	</div>
-			
-<!-- jquery for  cancel button return to users listing-->
-<script type="text/javascript">
-	$(document).ready(function() {
-		$("#buttonCancel").on("click", function(){
-			window.location = "[[@{/users}]]";
-		});
-		
-		/* display uploaded image in image tag, ensure file size is not more than 1MB */
-		$("#fileImage").change(function() {
-			fileSize = this.files[0].size;
-			
-			//more than 1 MEGABYTE = 1024 * 1024 = 1048576 bytes
-			//prevent the form from being submitted to the server
-			if(fileSize > 1048576) {
-				this.setCustomValidity("you must chose an image  less than 1MB!")
-				this.reportValidity();
-				
-			}else {
-				this.setCustomValidity("");
-				showImageThumbnail(this);
-			}
-			
-		});
-		
-	});
-	
-	function showImageThumbnail(fileInput){
-		
-		var file = fileInput.files[0];
-		var reader = new FileReader();
-		
-		reader.onload = function(e){
-			$("#thumbnail").attr("src", e.target.result);
-		};
-		
-		reader.readAsDataURL(file);
-	}
-	
-	/* check whether the new user email is unique before creating user. */
-	function checkEmailUnique(form) {
-		
-		url = "[[@{/users/check_email}]]";
-		userEmail = $("#email").val();
-		userId = $("#id").val();
-		csrfValue = $("input[name='_csrf']").val();
-		params = {id: userId, email: userEmail, _csrf: csrfValue};
-		
-		
-		$.post(url, params, function(response){
-			
-			if(response == "OK") {
-				//submit the form when email is unique
-				form.submit();
-			} else if (response == "Duplicated") {
-				showModalDialog("Warning", "there is another user with the email "+ userEmail);
-			}else {
-				showModalDialog("Error", "unkown response from server");
-			}
-			
-		}).fail(function(){
-			showModalDialog("Error", "could not connect to server");
-		});
-		
-		/* onsubmit = "return false", (stops the submission of form) */
-		return false;
-	}
-	
-	
-	function showModalDialog(title, message) {
-		$("#modalTitle").val(title);
-		$("#modalBody").val(message);
-		$("#modalDialog").modal();
-	}
-	
-	
-</script>
-</body>
-
-</html>
\ No newline at end of file
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/40/50109a0e40b3001d1e75aa5ef0815903 b/.metadata/.plugins/org.eclipse.core.resources/.history/40/50109a0e40b3001d1e75aa5ef0815903
deleted file mode 100644
index a3938bbc..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/40/50109a0e40b3001d1e75aa5ef0815903
+++ /dev/null
@@ -1,54 +0,0 @@
-package com.shopme.admin.user;
-
-import org.springframework.data.domain.Page;
-import org.springframework.data.domain.Pageable;
-import org.springframework.data.jpa.repository.Modifying;
-import org.springframework.data.jpa.repository.Query;
-import org.springframework.data.repository.CrudRepository;
-import org.springframework.data.repository.PagingAndSortingRepository;
-import org.springframework.data.repository.query.Param;
-import org.springframework.stereotype.Repository;
-
-import com.shopme.common.entity.User;
-
-@Repository
-public interface UserRepository extends CrudRepository<User, Integer>, PagingAndSortingRepository<User, Integer> {
-
-	/*
-	 * JPQL statement. It should be noted that as compared to native SQL, JPQL does
-	 * not interact with database tables, records, and fields - but with Java
-	 * classes and instances.
-	 * 
-	 * JPA kicks in as the mediator and transpiles JPQL queries to SQL queries for execution.
-	 * 
-	 * If your database can change or varies from development to production, as long as 
-	 * they're both relational - JPQL works wonders and you can 
-	 * write JPQL queries to create generic logic that can be used over and over again.
-	 */
-	@Query("SELECT u FROM User u WHERE u.email = :email")
-	public User getUserByEmail(@Param("email") String email);
-	
-	// countById() declaration follows the JPA specification
-	//to check the existence of a user
-	public Long countById(Integer id);
-	
-	
-	//for filtering users by keyword
-	/*
-	 * @Query("SELECT u FROM User u WHERE u.firstName LIKE %?1% OR u.lastName LIKE %?1%"
-	 * + " OR u.email LIKE %?1%")
-	 * 
-	 * the above query does not work when we search for user with keyword "nam ha minh".
-	 * 
-	 * Instead we should concatenate the fields separated by space as the query below
-	 */
-	 @Query("SELECT u FROM User u WHERE  CONCAT(u.id, ' ', u.email, ' ', u.firstName, ' ', u.email) LIKE %?1%")
-	public Page<User> findAll(String keyword, Pageable pageable);
-	
-	
-	//change user enabled status
-	//need @Modifying annotation for update/delete operation
-	@Query("UPDATE User u SET u.enabled = ?2 WHERE u.id = ?1")
-	@Modifying
-	public void updateEnabledStatus(Integer id, boolean enabled);
-}
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/40/901814860ab4001d128fb79045552177 b/.metadata/.plugins/org.eclipse.core.resources/.history/40/901814860ab4001d128fb79045552177
deleted file mode 100644
index 64b6b6d1..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/40/901814860ab4001d128fb79045552177
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<html xmlns:th="http://www.thymeleaf.org">
-
-<head>
-	<meta http-equiv="Content-Type" content="text/html; charset= UTF-8">
-	<meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0">
-	<title>Login - Shopme Admin</title>
-	<link rel="stylesheet" type="text/css" th:href="@{/webjars/bootstrap/css/bootstrap.min.css}" />
-</head>
-
-<body>
-	<div class="container-fluid text-center">
-		
-		<div>
-			<img th:src="@{/images/ShopmeAdminBig.png}" />
-		</div>
-		
-		<form th:action="@{/login}" method="post" style="max-width:350px; margin: 0 auto">
-		
-			<div class="border border-secondary rounded p-3">
-				<p>Access to Shopme Control Panel </p>
-				
-				<p>
-					<input type="email" name="email" class="form-control" placeholder="email" required />
-					
-				
-				</p>
-			</div>
-		
-		</form>
-
-		<div>
-			<p>Shopme Control Panel - Copyright &copy; Shopme</p>
-		</div>
-
-	</div>
-
-</body>
-
-</html>
\ No newline at end of file
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/41/304b56b34ab4001d1d079a924effdc9e b/.metadata/.plugins/org.eclipse.core.resources/.history/41/304b56b34ab4001d1d079a924effdc9e
deleted file mode 100644
index b2b52ff5..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/41/304b56b34ab4001d1d079a924effdc9e
+++ /dev/null
@@ -1,80 +0,0 @@
-package com.shopme.admin.security;
-
-import org.aspectj.weaver.ast.And;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.security.authentication.dao.DaoAuthenticationProvider;
-import org.springframework.security.config.annotation.web.builders.HttpSecurity;
-import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
-import org.springframework.security.config.annotation.web.configuration.WebSecurityConfiguration;
-import org.springframework.security.config.annotation.web.configuration.WebSecurityCustomizer;
-import org.springframework.security.core.userdetails.UserDetailsService;
-import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
-import org.springframework.security.crypto.password.PasswordEncoder;
-import org.springframework.security.web.SecurityFilterChain;
-
-@Configuration
-@EnableWebSecurity
-public class WebSecurityConfig {
-
-	/*
-	 * refer to this link: https://www.codejava.net/frameworks/spring-boot/fix-
-	 * websecurityconfigureradapter-deprecated
-	 * 
-	 */
-	
-	
-	 /* This bean will be called by spring security when performing authentication*/ 
-	@Bean
-	public UserDetailsService  userDetailsService()	{
-		return new ShopmeUserDetailsService();
-	}
-	
-
-	@Bean
-	public PasswordEncoder passwordEncoder() {
-		return new BCryptPasswordEncoder();
-	}
-
-	
-	@Bean
-	public DaoAuthenticationProvider authenticationProvider() {
-	    DaoAuthenticationProvider authProvider = new DaoAuthenticationProvider();
-	     
-	    authProvider.setUserDetailsService(userDetailsService());
-	    authProvider.setPasswordEncoder(passwordEncoder());
-	 
-	    return authProvider;
-	}
-	
-	
-	@Bean
-	public SecurityFilterChain filterChain(HttpSecurity http) throws Exception {
-
-		// any request need to be authenticated (require login)
-		// custom login page at "/login" - handler method in MainController class
-		http.authorizeHttpRequests()
-			.anyRequest().authenticated()
-			.and()
-			.formLogin()
-				.loginPage("/login")
-				.usernameParameter("email")
-				.permitAll()
-			.and().logout().permitAll()
-			.and().rememberMe().key("AbcDefgHijKlmnOpqrs_1234567890"); // set a random key used for the md5 hash algorithm
-		
-		http.authenticationProvider(authenticationProvider());
-		
-		
-		return http.build();
-	}
-
-	//NOTE: antMatchers() changed to requestMatchers()
-	//stack: https://stackoverflow.com/questions/74907533/the-method-antmatchersstring-is-undefined-for-the-type
-	@Bean
-	public WebSecurityCustomizer webSecurityCustomizer() {
-		//permit access to the assets in the following directories
-		return (web) -> web.ignoring().requestMatchers("/images/**", "/js/**", "/webjars/**");
-	}
-
-}
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/43/20d7994922b4001d1216d7fff398b3d6 b/.metadata/.plugins/org.eclipse.core.resources/.history/43/20d7994922b4001d1216d7fff398b3d6
deleted file mode 100644
index 326b2fc6..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/43/20d7994922b4001d1216d7fff398b3d6
+++ /dev/null
@@ -1,77 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-	<parent>
-		<groupId>org.springframework.boot</groupId>
-		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>3.0.2</version>
-		<relativePath /> <!-- lookup parent from repository -->
-	</parent>
-	<groupId>com.shopme</groupId>
-	<artifactId>ShopmeWebParent</artifactId>
-	<version>0.0.1-SNAPSHOT</version>
-	<name>ShopmeWebParent</name>
-	<packaging>pom</packaging>
-	<description>parent spring web project</description>
-	<properties>
-		<java.version>15</java.version>
-	</properties>
-	<modules>
-		<module>ShopmeBackEnd</module>
-		<module>ShopmeFrontEnd</module>
-	</modules>
-	<dependencies>
-		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-web</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-security</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-thymeleaf</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>mysql</groupId>
-			<artifactId>mysql-connector-java</artifactId>
-			<scope>runtime</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-data-jpa</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-test</artifactId>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.webjars</groupId>
-			<artifactId>bootstrap</artifactId>
-			<version>4.3.1</version>
-		</dependency>
-		<dependency>
-			<groupId>org.webjars</groupId>
-			<artifactId>jquery</artifactId>
-			<version>3.4.1</version>
-		</dependency>
-		<!--dependency for discovery and reference of webjars (bootstrap & jquery)-->
-		<dependency>
-			<groupId>org.webjars</groupId>
-			<artifactId>webjars-locator-core</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>com.shopme</groupId>
-			<artifactId>ShopmeCommon</artifactId>
-			<version>0.0.1-SNAPSHOT</version>
-		</dependency>
-		<dependency>
-			<groupId>org.thymeleaf.extras</groupId>
-			<artifactId>thymeleaf-extras-springsecurity6</artifactId>
-			<version>3.1.1.RELEASE</version>
-		</dependency>
-	</dependencies>
-</project>
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/43/306fff2b05b4001d128fb79045552177 b/.metadata/.plugins/org.eclipse.core.resources/.history/43/306fff2b05b4001d128fb79045552177
deleted file mode 100644
index 528181af..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/43/306fff2b05b4001d128fb79045552177
+++ /dev/null
@@ -1,28 +0,0 @@
-<!DOCTYPE html>
-<html xmlns:th="http://www.thymeleaf.org">
-
-<head>
-	<meta http-equiv="Content-Type" content="text/html; charset= UTF-8">
-	<meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0">
-	<title>Login - Shopme Admin</title>
-	<link rel="stylesheet" type="text/css" th:href="@{/webjars/bootstrap/css/bootstrap.min.css}" />
-</head>
-
-<body>
-	<div class="container-fluid">
-		
-
-		<div>
-			<h1>Shopme Control Panel</h1>
-		</div>
-
-		<div>
-			<p>Shopme Control Panel - Copyright &copy; Shopme</p>
-		</div>
-
-
-	</div>
-
-</body>
-
-</html>
\ No newline at end of file
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/44/706177d2dbb4001d1dd58082704b0bec b/.metadata/.plugins/org.eclipse.core.resources/.history/44/706177d2dbb4001d1dd58082704b0bec
deleted file mode 100644
index 93eddcea..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/44/706177d2dbb4001d1dd58082704b0bec
+++ /dev/null
@@ -1,80 +0,0 @@
-<!DOCTYPE html>
-<html xmlns:th="http://www.thymeleaf.org">
-
-<body>
-
-	<div th:fragment="menu">
-		<!--   
-			use  the form to  log out and navigate to the url path /logout  
-		
-		    NOTE: spring security requires a POST request form to logout in order to obtain the csrf token, 
-		 		the csrf token is a hidden property in the form -->
-		 
-		<form th:action="@{/logout}" method="post" th:hidden="true" name="logoutForm">
-			<input type="submit"/>
-		</form>
-		<nav class="navbar navbar-expand-lg bg-dark navbar-dark">
-			<a class="navbar-brand" th:href="@{/}">
-				<img th:src="@{/images/ShopmeAdminSmall.png}"/>
-			</a>
-			<!--hamburger toggler for mobile devices(responsive)-->
-			<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#topNavbar">
-				<span class="navbar-toggler-icon"></span>
-			</button>
-			<div class="collapse navbar-collapse" id="topNavbar">
-				<ul class="navbar-nav">
-					<li class="nav-item">
-						<a class="nav-link" th:href="@{/users}">Users</a>
-					</li>
-					<li class="nav-item">
-						<a class="nav-link" th:href="@{/categories}">Categories</a>
-					</li>
-					<li class="nav-item">
-						<a class="nav-link" th:href="@{/brands}">Brands</a>
-					</li>
-					<li class="nav-item">
-						<a class="nav-link" th:href="@{/products}">Products</a>
-					</li>
-					<li class="nav-item">
-						<a class="nav-link" th:href="@{/customers}">Customers</a>
-					</li>
-					<li class="nav-item">
-						<a class="nav-link" th:href="@{/shipping}">Shipping</a>
-					</li>
-					<li class="nav-item">
-						<a class="nav-link" th:href="@{/orders}">Orders</a>
-					</li>
-					<li class="nav-item">
-						<a class="nav-link" th:href="@{/report}">Sales Report</a>
-					</li>
-					<li class="nav-item">
-						<a class="nav-link" th:href="@{/articles}">Articles</a>
-					</li>
-					<li class="nav-item">
-						<a class="nav-link" th:href="@{/menus}">Menus</a>
-					</li>
-					<li class="nav-item">
-						<a class="nav-link" th:href="@{/settings}">Settings</a>
-					</li>
-					<li>
-						<span class="fas fa-user fa-2x icon-silver"></span>
-					</li>
-					<li class="nav-item dropdown">
-							<!-- principal refers to user; display username -->
-						<a class="nav-link dropdown-toggle" sec:authentication="principal.fullname" 
-						data-toggle="dropdown"
-						th:href="@{/account}"></a>
-						<div class="dropdown-menu">
-							<a class="dropdown-item" id="logoutLink" href="">Logout</a>
-						</div>
-						
-					</li>
-				</ul>
-			</div>
-			
-		</nav>
-	</div>
-	
-	
-</body>
-</html>
\ No newline at end of file
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/45/e055d03f43b4001d1d079a924effdc9e b/.metadata/.plugins/org.eclipse.core.resources/.history/45/e055d03f43b4001d1d079a924effdc9e
deleted file mode 100644
index 31a2392c..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/45/e055d03f43b4001d1d079a924effdc9e
+++ /dev/null
@@ -1,121 +0,0 @@
-<!DOCTYPE html>
-<html xmlns:th="http://www.thymeleaf.org"
-	  xmlns:sec="https://www.thymeleaf.org/thymeleaf-extras-springsecurity5">
-
-<head>
-	<meta http-equiv="Content-Type" content="text/html; charset= UTF-8">
-	<meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0">
-	<title>Home - Shopme Admin</title>
-	
-	<link rel="stylesheet" type="text/css" th:href="@{/fontawesome/all.css}" />
-	<link rel="stylesheet" type="text/css" th:href="@{/style.css}" />
-	<link rel="stylesheet" type="text/css" th:href="@{/webjars/bootstrap/css/bootstrap.min.css}" />
-	
-	<script type="text/javascript" th:src="@{/webjars/jquery/jquery.min.js}"></script>
-	<script type="text/javascript" th:src="@{/webjars/bootstrap/js/bootstrap.min.js}"></script>
-</head>
-
-<body>
-	<div class="container-fluid">
-		<div>
-			<!--   
-				use  the form to  log out and navigate to the url path /logout  
-			
-			    NOTE: spring security requires a POST request form to logout in order to obtain the csrf token, 
-			 		the csrf token is a hidden property in the form -->
-			 
-			<form th:action="@{/logout}" method="post" th:hidden="true" name="logoutForm">
-				<input type="submit"/>
-			</form>
-			<nav class="navbar navbar-expand-lg bg-dark navbar-dark">
-				<a class="navbar-brand" th:href="@{/}">
-					<img th:src="@{/images/ShopmeAdminSmall.png}"/>
-				</a>
-				<!--hamburger toggler for mobile devices(responsive)-->
-				<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#topNavbar">
-					<span class="navbar-toggler-icon"></span>
-				</button>
-				<div class="collapse navbar-collapse" id="topNavbar">
-					<ul class="navbar-nav">
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/users}">Users</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/categories}">Categories</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/brands}">Brands</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/products}">Products</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/customers}">Customers</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/shipping}">Shipping</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/orders}">Orders</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/report}">Sales Report</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/articles}">Articles</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/menus}">Menus</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/settings}">Settings</a>
-						</li>
-						<li>
-							<span class="fas fa-user fa-2x icon-silver"></span>
-						</li>
-						<li class="nav-item dropdown">
-								<!-- principal refers to user; display username -->
-							<a class="nav-link dropdown-toggle" sec:authentication="principal.fullname" data-toggle="dropdown"></a>
-							<div class="dropdown-menu">
-								<a class="dropdown-item" id="logoutLink" href="">Logout</a>
-							</div>
-							
-						</li>
-					</ul>
-				</div>
-				
-			</nav>
-		</div>
-
-		<div>
-			<h1>Shopme Control Panel</h1>
-		</div>
-
-		<div>
-			<p>Shopme Control Panel - Copyright &copy; Shopme</p>
-		</div>
-
-
-	</div>
-	
-<script type="text/javascript">
-
-	$(document).ready(function(){
-		$("#logoutLink").on("click", function(e){
-			e.preventDefault(); /* stop the hyperlink default behaviour  */
-			
-			
-			/* use  the form to  log out and navigate to the url path /logout  
-			
-			 NOTE: spring security requires a POST request form to logout in order to obtain the csrf token, 
-			 		the csrf token is a hidden property in the form
-			*/
-			document.logoutForm.submit();
-		});
-	});
-
-</script>
-
-</body>
-
-</html>
\ No newline at end of file
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/45/e0f3b6178db3001d19bbb001c1a81c20 b/.metadata/.plugins/org.eclipse.core.resources/.history/45/e0f3b6178db3001d19bbb001c1a81c20
deleted file mode 100644
index e3cf9d4f..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/45/e0f3b6178db3001d19bbb001c1a81c20
+++ /dev/null
@@ -1,276 +0,0 @@
-<!DOCTYPE html>
-<html xmlns:th="http://www.thymeleaf.org">
-
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset= UTF-8">
-<meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0">
-<title>Manage Users</title>
-
-<link rel="stylesheet" type="text/css" th:href="@{/webjars/bootstrap/css/bootstrap.min.css}" />
-<link rel="stylesheet" type="text/css" th:href="@{/fontawesome/all.css}" />
-<link rel="stylesheet" type="text/css" th:href="@{/style.css}" />
-	
-<script type="text/javascript" th:src="@{/webjars/jquery/jquery.min.js}"></script>
-<script type="text/javascript" th:src="@{/webjars/bootstrap/js/bootstrap.min.js}"></script>
-</head>
-
-<body>
-	<div class="container-fluid">
-		<div>
-			<nav class="navbar navbar-expand-lg bg-dark navbar-dark">
-				<a class="navbar-brand" th:href="@{/}"> <img
-					th:src="@{/images/ShopmeAdminSmall.png}" />
-				</a>
-				<!--hamburger toggler for mobile devices(responsive)-->
-				<button class="navbar-toggler" type="button" data-toggle="collapse"
-					data-target="#topNavbar">
-					<span class="navbar-toggler-icon"></span>
-				</button>
-				<div class="collapse navbar-collapse" id="topNavbar">
-					<ul class="navbar-nav">
-						<li class="nav-item"><a class="nav-link" th:href="@{/users}">Users</a>
-						</li>
-						<li class="nav-item"><a class="nav-link"
-							th:href="@{/categories}">Categories</a></li>
-						<li class="nav-item"><a class="nav-link" th:href="@{/brands}">Brands</a>
-						</li>
-						<li class="nav-item"><a class="nav-link"
-							th:href="@{/products}">Products</a></li>
-						<li class="nav-item"><a class="nav-link"
-							th:href="@{/customers}">Customers</a></li>
-						<li class="nav-item"><a class="nav-link"
-							th:href="@{/shipping}">Shipping</a></li>
-						<li class="nav-item"><a class="nav-link" th:href="@{/orders}">Orders</a>
-						</li>
-						<li class="nav-item"><a class="nav-link" th:href="@{/report}">Sales
-								Report</a></li>
-						<li class="nav-item"><a class="nav-link"
-							th:href="@{/articles}">Articles</a></li>
-						<li class="nav-item"><a class="nav-link" th:href="@{/menus}">Menus</a>
-						</li>
-						<li class="nav-item"><a class="nav-link"
-							th:href="@{/settings}">Settings</a></li>
-					</ul>
-				</div>
-
-			</nav>
-		</div>
-
-		<div>
-			<h2>Manage Users</h2>
-			<a th:href="@{/users/new}" class="fas fa-user-plus fa-2x icon-dark mr-2"></a>
-			
-			<a th:href="@{/users/export/csv}" class="fas fa-file-csv fa-2x icon-dark mr-2"></a>
-		</div>
-		
-		
-		
-		<!-- only display success message when a new user is created -->
-		<div th:if="${message != null}" class="alert alert-success text-center">
-			[[${message}]]
-		</div>
-			
-		<div>
-			<form th:action="@{/users/page/1}" class="form-inline m-3">
-				
-				<input type="hidden" name="sortField" th:value="${sortField}" />
-				<input type="hidden" name="sortDir" th:value="${sortDir}" />
-				Filter:&nbsp;
-				<input type="search" name="keyword" th:value="${keyword}" class="form-control" required/>
-				&nbsp;&nbsp;
-				<button type="submit" class="btn btn-primary">
-					<i class="fas fa-search"></i>
-				</button>
-				&nbsp;&nbsp;
-				<button type="button" class="btn btn-secondary" onclick="clearFilter()">
-					<i class="fas fa-eraser"></i>
-				</button>
-			</form>
-		
-		</div>
-
-			<!-- css class to display this table in large screens only , refer to static/style.css for more info-->
-			<div class="full-details">
-				<table class="table table-bordered table-striped table-hover table-responsive-xL">
-					<thead class="thead-dark">
-						<tr>
-							<!-- refer to templates/fragments.html for fragment code-->
-							<th th:replace="fragments :: column_link('id', 'User ID')"/>
-							<th>Photos</th>
-							<th th:replace="fragments :: column_link('email', 'Email')"/>
-							<th th:replace="fragments :: column_link('firstName', 'First Name')"/>
-							<th th:replace="fragments :: column_link('lastName', 'Last Name')"/>
-							<th>Roles</th>
-							<th th:replace="fragments :: column_link('enabled', 'Enabled')"/>
-							<th></th>
-						</tr>
-					</thead>
-					<tbody>
-						<tr th:each="user : ${listUsers}">
-							<td>[[${user.id}]]</td>
-							<td>
-								<span th:if="${user.photos == null}" class="fas fa-portrait fa-3x icon-dark"></span>
-								<img th:if="${user.photos != null}" th:src="@{${user.photosImagePath}}"
-								style="width: 100px"/>
-							</td>
-							<td>[[${user.email}]]</td>
-							<td>[[${user.firstName}]]</td>
-							<td>[[${user.lastName}]]</td>
-							<td>[[${user.roles}]]</td>
-							
-							<td>
-								<a th:if="${user.enabled == true}" class="fas fa-check-circle fa-2x icon-green" 
-								th:href="@{'/users/' + ${user.id} + '/enabled/false'}"
-								title="Disable this user"></a>
-								
-								<a th:if="${user.enabled == false}" class="fas fa-circle fa-2x icon-silver"
-								 th:href="@{'/users/' + ${user.id} + '/enabled/true'}"
-								 title="Enable this user"></a>
-							</td>
-							<td>
-									<a class="fas fa-edit fa-2x icon-green" th:href="@{'/users/edit/' + ${user.id}}"
-									title="edit this user"></a>
-									&nbsp; 
-									<a class="fas fa-trash fa-2x icon-dark link-delete" th:href="@{'/users/delete/' + ${user.id}}"
-									title="delete this user" th:userId="${user.id}"></a>
-							</td>
-						</tr>
-					</tbody>
-				</table>
-			</div>
-			
-			
-			<!-- css class to display this <div> on mobile screens only, refer to /static/style.css for more info-->
-			<div class="less-details">
-				
-				<div th:each="user : ${listUsers}" class="row m-1">
-					
-					<div class="col-4">
-						
-						<span th:if="${user.photos == null}" class="fas fa-portrait fa-3x icon-dark"></span>
-								<img th:if="${user.photos != null}" th:src="@{${user.photosImagePath}}"
-								style="width: 100px"/>
-					</div>
-					
-					<div class="col-8">
-						<div>[[${user.fullName}]]</div>
-						<div>[[${user.roles}]]</div>
-						<div>
-							<a th:if="${user.enabled == true}" class="fas fa-check-circle fa-2x icon-green" 
-								th:href="@{'/users/' + ${user.id} + '/enabled/false'}"
-								title="Disable this user"></a>
-								&nbsp;
-							<a th:if="${user.enabled == false}" class="fas fa-circle fa-2x icon-silver"
-								 th:href="@{'/users/' + ${user.id} + '/enabled/true'}"
-								 title="Enable this user"></a>
-						
-						
-							<a class="fas fa-edit fa-2x icon-green" th:href="@{'/users/edit/' + ${user.id}}"
-									title="edit this user"></a>
-									&nbsp; 
-							<a class="fas fa-trash fa-2x icon-dark link-delete" th:href="@{'/users/delete/' + ${user.id}}"
-									title="delete this user" th:userId="${user.id}"></a>
-						</div>
-					</div>
-					<div>&nbsp;</div>
-				</div>
-			</div>
-			
-			
-			<!-- IF -->
-			<div class="text-center m-1" th:if="${totalItems > 0}">
-				<span>Showing Users # [[${startCount}]] to [[${endCount}]] of [[${totalItems}]]</span>
-			</div>
-			
-			<!-- ELSE -->
-			<div class="text-center m-1" th:unless="${totalItems > 0}">
-				<span>No users found</span>
-			</div>
-			
-			<!-- only display pagination when there are users; else, no users no pagination -->
-			<div th:if="${totalPages > 1}">
-				<nav>
-					  <ul class="pagination justify-content-center flex-wrap">
-					  
-					  	<li th:class=" ${currentPage > 1 ? 'page-item' : 'page-item disabled'}">
-					  		<a th:replace="fragments :: page_link(1, 'First')"></a>
-				    	</li>
-					  
-					    <li th:class=" ${currentPage > 1 ? 'page-item' : 'page-item disabled'}">
-					    	<a th:replace="fragments :: page_link(${currentPage - 1 }, 'previous')"></a>
-				    	</li>
-					    	
-					    <!-- org.thymeleaf.expression.Numbers class, An object of this class is usually available in variable evaluation expressions with the name #numbers. -->
-					    <li th:class="${currentPage != i ? 'page-item' : 'page-item active'}" 
-					    	th:each="i : ${#numbers.sequence(1, totalPages)}">
-					    	<a th:replace="fragments :: page_link(${i}, ${i})"></a>
-					    </li>
-					    
-					    <li  th:class=" ${currentPage < totalPages ? 'page-item' : 'page-item disabled'}">
-					    	<a th:replace="fragments :: page_link(${currentPage + 1}, 'Next')"></a>
-					    </li>
-					    
-					    <li th:class=" ${currentPage < totalPages ? 'page-item' : 'page-item disabled'}">
-							<a th:replace="fragments :: page_link(${totalPages}, 'Last')"></a>		
-					    </li>
-					  </ul>
-				</nav>
-			</div>
-			
-			
-			
-			<div class="modal fade text-center" id="confirmModal">
-				<div class="modal-dialog">
-					<div class="modal-content">
-					
-						<div class="modal-header">
-							<h4 class="modal-title">Delete Confirmation</h4>
-							<button type="button" class="close" data-dismiss="modal">&times;</button>
-						</div>
-						
-						<div class="modal-body">
-							<span id="confirmText"></span>
-						</div>
-						
-						<div class="modal-footer">
-							<a class="btn btn-success" href="" id="yesButton">Yes</a>
-							<button type="button" class="btn btn-danger" data-dismiss="modal">Close</button>
-						</div>
-					</div>
-				</div>
-			</div>
-			
-			
-			<div class="text-center">
-				<p>Shopme Control Panel - Copyright &copy; Shopme</p>
-			</div>
-
-
-	</div>
-	
-<script type="text/javascript">
-
-//confirmation modal dialogue for delete user
-$(document).ready(function(){
-	$(".link-delete").on("click", function(e){
-		//stop the <a> tag default behaviour and pop out a confirmation modal dialogue
-		e.preventDefault();
-		//alert($(this).attr("href"));
-		link = $(this);
-		userId = link.attr("userId");
-		$("#yesButton").attr("href", link.attr("href"));
-		$("#confirmText").text("Are you sure you want to delete this user ID " + userId + "?");
-		$("#confirmModal").modal();
-	});
-});
-
-	function clearFilter(){
-		window.location = "[[@{/users}]]";
-	}
-
-
-</script>
-	
-</body>
-
-</html>
\ No newline at end of file
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/46/d0234a8526b8001d1d97982e354adf88 b/.metadata/.plugins/org.eclipse.core.resources/.history/46/d0234a8526b8001d1d97982e354adf88
deleted file mode 100644
index 9c910862..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/46/d0234a8526b8001d1d97982e354adf88
+++ /dev/null
@@ -1,21 +0,0 @@
-package com.shopme.admin.category;
-
-import java.util.List;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import com.shopme.common.entity.Category;
-
-@Service
-public class CategoryService {
-
-	@Autowired
-	private CategoryRepository repo;
-	
-	public List<Category> listAll(){
-		return (List<Category>) repo.findAll();
-	}
-	
-	
-}
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/47/4012e31f3fb3001d1e75aa5ef0815903 b/.metadata/.plugins/org.eclipse.core.resources/.history/47/4012e31f3fb3001d1e75aa5ef0815903
deleted file mode 100644
index d98fd941..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/47/4012e31f3fb3001d1e75aa5ef0815903
+++ /dev/null
@@ -1,47 +0,0 @@
-package com.shopme.admin.user;
-
-import org.springframework.data.domain.Page;
-import org.springframework.data.domain.Pageable;
-import org.springframework.data.jpa.repository.Modifying;
-import org.springframework.data.jpa.repository.Query;
-import org.springframework.data.repository.CrudRepository;
-import org.springframework.data.repository.PagingAndSortingRepository;
-import org.springframework.data.repository.query.Param;
-import org.springframework.stereotype.Repository;
-
-import com.shopme.common.entity.User;
-
-@Repository
-public interface UserRepository extends CrudRepository<User, Integer>, PagingAndSortingRepository<User, Integer> {
-
-	/*
-	 * JPQL statement. It should be noted that as compared to native SQL, JPQL does
-	 * not interact with database tables, records, and fields - but with Java
-	 * classes and instances.
-	 * 
-	 * JPA kicks in as the mediator and transpiles JPQL queries to SQL queries for execution.
-	 * 
-	 * If your database can change or varies from development to production, as long as 
-	 * they're both relational - JPQL works wonders and you can 
-	 * write JPQL queries to create generic logic that can be used over and over again.
-	 */
-	@Query("SELECT u FROM User u WHERE u.email = :email")
-	public User getUserByEmail(@Param("email") String email);
-	
-	// countById() declaration follows the JPA specification
-	//to check the existence of a user
-	public Long countById(Integer id);
-	
-	
-	//for filtering users by keyword
-	@Query("SELECT u FROM User u WHERE u.firstName LIKE %?1% OR u.lastName LIKE %?1%"
-			+ " OR u.email LIKE %?1%")
-	public Page<User> findAll(String keyword, Pageable pageable);
-	
-	
-	//change user enabled status
-	//need @Modifying annotation for update/delete operation
-	@Query("UPDATE User u SET u.enabled = ?2 WHERE u.id = ?1")
-	@Modifying
-	public void updateEnabledStatus(Integer id, boolean enabled);
-}
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/47/905601da44b4001d1d079a924effdc9e b/.metadata/.plugins/org.eclipse.core.resources/.history/47/905601da44b4001d1d079a924effdc9e
deleted file mode 100644
index 31d03d89..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/47/905601da44b4001d1d079a924effdc9e
+++ /dev/null
@@ -1,236 +0,0 @@
-<!DOCTYPE html>
-<html xmlns:th="http://www.thymeleaf.org">
-
-<head th:replace="fragments :: page_head('Users - Shopme Admin')"/>
-
-<body>
-	<div class="container-fluid">
-		s
-		<div th:replace="fragments :: menu"></div>
-
-		<div>
-			<h2>Manage Users</h2>
-			<a th:href="@{/users/new}" class="fas fa-user-plus fa-2x icon-dark mr-2"></a>
-			
-			<a th:href="@{/users/export/csv}" class="fas fa-file-csv fa-2x icon-dark mr-2"></a>
-		</div>
-		
-		
-		
-		<!-- only display success message when a new user is created -->
-		<div th:if="${message != null}" class="alert alert-success text-center">
-			[[${message}]]
-		</div>
-			
-		<div>
-			<form th:action="@{/users/page/1}" class="form-inline m-3">
-				
-				<input type="hidden" name="sortField" th:value="${sortField}" />
-				<input type="hidden" name="sortDir" th:value="${sortDir}" />
-				Filter:&nbsp;
-				<input type="search" name="keyword" th:value="${keyword}" class="form-control" required/>
-				&nbsp;&nbsp;
-				<button type="submit" class="btn btn-primary">
-					<i class="fas fa-search"></i>
-				</button>
-				&nbsp;&nbsp;
-				<button type="button" class="btn btn-secondary" onclick="clearFilter()">
-					<i class="fas fa-eraser"></i>
-				</button>
-			</form>
-		
-		</div>
-
-			<!-- css class to display this table in large screens only , refer to static/style.css for more info-->
-			<div class="full-details">
-				<table class="table table-bordered table-striped table-hover table-responsive-xL">
-					<thead class="thead-dark">
-						<tr>
-							<!-- refer to templates/fragments.html for fragment code-->
-							
-							<th class="hideable-column">
-								<th th:replace="fragments :: column_link('id', 'User ID', 'tag')"/>
-							</th>
-							
-							<th>Photos</th>
-							
-							<th class="hideable-column">
-								<th th:replace="fragments :: column_link('email', 'Email', 'tag')"/>
-							</th>
-							
-							<th th:replace="fragments :: column_link('firstName', 'First Name', 'none')"/>
-							<th th:replace="fragments :: column_link('lastName', 'Last Name', 'none')"/>
-							<th>Roles</th>
-							<th th:replace="fragments :: column_link('enabled', 'Enabled', 'none')"/>
-							<th></th>
-						</tr>
-					</thead>
-					<tbody>
-						<tr th:each="user : ${listUsers}">
-							<td class="hideable-column">[[${user.id}]]</td>
-							<td>
-								<span th:if="${user.photos == null}" class="fas fa-portrait fa-3x icon-dark"></span>
-								<img th:if="${user.photos != null}" th:src="@{${user.photosImagePath}}"
-								style="width: 100px"/>
-							</td>
-							<td class="hideable-column">[[${user.email}]]</td>
-							<td>[[${user.firstName}]]</td>
-							<td>[[${user.lastName}]]</td>
-							<td>[[${user.roles}]]</td>
-							
-							<td>
-								<a th:if="${user.enabled == true}" class="fas fa-check-circle fa-2x icon-green" 
-								th:href="@{'/users/' + ${user.id} + '/enabled/false'}"
-								title="Disable this user"></a>
-								
-								<a th:if="${user.enabled == false}" class="fas fa-circle fa-2x icon-silver"
-								 th:href="@{'/users/' + ${user.id} + '/enabled/true'}"
-								 title="Enable this user"></a>
-							</td>
-							<td>
-									<a class="fas fa-edit fa-2x icon-green" th:href="@{'/users/edit/' + ${user.id}}"
-									title="edit this user"></a>
-									&nbsp; 
-									<a class="fas fa-trash fa-2x icon-dark link-delete" th:href="@{'/users/delete/' + ${user.id}}"
-									title="delete this user" th:userId="${user.id}"></a>
-							</td>
-						</tr>
-					</tbody>
-				</table>
-			</div>
-			
-			
-			<!-- css class to display this <div> on mobile screens only, refer to /static/style.css for more info-->
-			<div class="less-details">
-				
-				<div th:each="user : ${listUsers}" class="row m-1">
-					
-					<div class="col-4">
-						
-						<span th:if="${user.photos == null}" class="fas fa-portrait fa-3x icon-dark"></span>
-								<img th:if="${user.photos != null}" th:src="@{${user.photosImagePath}}"
-								style="width: 100px"/>
-					</div>
-					
-					<div class="col-8">
-						<div>[[${user.fullName}]]</div>
-						<div>[[${user.roles}]]</div>
-						<div class="mt-2">
-							<a th:if="${user.enabled == true}" class="fas fa-check-circle fa-2x icon-green" 
-								th:href="@{'/users/' + ${user.id} + '/enabled/false'}"
-								title="Disable this user"></a>
-								
-							<a th:if="${user.enabled == false}" class="fas fa-circle fa-2x icon-silver"
-								 th:href="@{'/users/' + ${user.id} + '/enabled/true'}"
-								 title="Enable this user"></a>
-						
-									&nbsp;
-							<a class="fas fa-edit fa-2x icon-green" th:href="@{'/users/edit/' + ${user.id}}"
-									title="edit this user"></a>
-									&nbsp; 
-							<a class="fas fa-trash fa-2x icon-dark link-delete" th:href="@{'/users/delete/' + ${user.id}}"
-									title="delete this user" th:userId="${user.id}"></a>
-						</div>
-					</div>
-					<div>&nbsp;</div>
-				</div>
-			</div>
-			
-			
-			<!-- IF -->
-			<div class="text-center m-1" th:if="${totalItems > 0}">
-				<span>Showing Users # [[${startCount}]] to [[${endCount}]] of [[${totalItems}]]</span>
-			</div>
-			
-			<!-- ELSE -->
-			<div class="text-center m-1" th:unless="${totalItems > 0}">
-				<span>No users found</span>
-			</div>
-			
-			<!-- only display pagination when there are users; else, no users no pagination -->
-			<div th:if="${totalPages > 1}">
-				<nav>
-					  <ul class="pagination justify-content-center flex-wrap">
-					  
-					  	<li th:class=" ${currentPage > 1 ? 'page-item' : 'page-item disabled'}">
-					  		<a th:replace="fragments :: page_link(1, 'First')"></a>
-				    	</li>
-					  
-					    <li th:class=" ${currentPage > 1 ? 'page-item' : 'page-item disabled'}">
-					    	<a th:replace="fragments :: page_link(${currentPage - 1 }, 'previous')"></a>
-				    	</li>
-					    	
-					    <!-- org.thymeleaf.expression.Numbers class, An object of this class is usually available in variable evaluation expressions with the name #numbers. -->
-					    <li th:class="${currentPage != i ? 'page-item' : 'page-item active'}" 
-					    	th:each="i : ${#numbers.sequence(1, totalPages)}">
-					    	<a th:replace="fragments :: page_link(${i}, ${i})"></a>
-					    </li>
-					    
-					    <li  th:class=" ${currentPage < totalPages ? 'page-item' : 'page-item disabled'}">
-					    	<a th:replace="fragments :: page_link(${currentPage + 1}, 'Next')"></a>
-					    </li>
-					    
-					    <li th:class=" ${currentPage < totalPages ? 'page-item' : 'page-item disabled'}">
-							<a th:replace="fragments :: page_link(${totalPages}, 'Last')"></a>		
-					    </li>
-					  </ul>
-				</nav>
-			</div>
-			
-			
-			
-			<div class="modal fade text-center" id="confirmModal">
-				<div class="modal-dialog">
-					<div class="modal-content">
-					
-						<div class="modal-header">
-							<h4 class="modal-title">Delete Confirmation</h4>
-							<button type="button" class="close" data-dismiss="modal">&times;</button>
-						</div>
-						
-						<div class="modal-body">
-							<span id="confirmText"></span>
-						</div>
-						
-						<div class="modal-footer">
-							<a class="btn btn-success" href="" id="yesButton">Yes</a>
-							<button type="button" class="btn btn-danger" data-dismiss="modal">Close</button>
-						</div>
-					</div>
-				</div>
-			</div>
-			
-			
-			<div class="text-center">
-				<p>Shopme Control Panel - Copyright &copy; Shopme</p>
-			</div>
-
-
-	</div>
-	
-<script type="text/javascript">
-
-//confirmation modal dialogue for delete user
-$(document).ready(function(){
-	$(".link-delete").on("click", function(e){
-		//stop the <a> tag default behaviour and pop out a confirmation modal dialogue
-		e.preventDefault();
-		//alert($(this).attr("href"));
-		link = $(this);
-		userId = link.attr("userId");
-		$("#yesButton").attr("href", link.attr("href"));
-		$("#confirmText").text("Are you sure you want to delete this user ID " + userId + "?");
-		$("#confirmModal").modal();
-	});
-});
-
-	function clearFilter(){
-		window.location = "[[@{/users}]]";
-	}
-
-
-</script>
-	
-</body>
-
-</html>
\ No newline at end of file
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/47/e08542708ab3001d19bbb001c1a81c20 b/.metadata/.plugins/org.eclipse.core.resources/.history/47/e08542708ab3001d19bbb001c1a81c20
deleted file mode 100644
index 08e94f07..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/47/e08542708ab3001d19bbb001c1a81c20
+++ /dev/null
@@ -1,248 +0,0 @@
-<!DOCTYPE html>
-<html xmlns:th="http://www.thymeleaf.org">
-
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset= UTF-8">
-<meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0">
-<title>Manage Users</title>
-
-<link rel="stylesheet" type="text/css" th:href="@{/webjars/bootstrap/css/bootstrap.min.css}" />
-<link rel="stylesheet" type="text/css" th:href="@{/fontawesome/all.css}" />
-<link rel="stylesheet" type="text/css" th:href="@{/style.css}" />
-	
-<script type="text/javascript" th:src="@{/webjars/jquery/jquery.min.js}"></script>
-<script type="text/javascript" th:src="@{/webjars/bootstrap/js/bootstrap.min.js}"></script>
-</head>
-
-<body>
-	<div class="container-fluid">
-		<div>
-			<nav class="navbar navbar-expand-lg bg-dark navbar-dark">
-				<a class="navbar-brand" th:href="@{/}"> <img
-					th:src="@{/images/ShopmeAdminSmall.png}" />
-				</a>
-				<!--hamburger toggler for mobile devices(responsive)-->
-				<button class="navbar-toggler" type="button" data-toggle="collapse"
-					data-target="#topNavbar">
-					<span class="navbar-toggler-icon"></span>
-				</button>
-				<div class="collapse navbar-collapse" id="topNavbar">
-					<ul class="navbar-nav">
-						<li class="nav-item"><a class="nav-link" th:href="@{/users}">Users</a>
-						</li>
-						<li class="nav-item"><a class="nav-link"
-							th:href="@{/categories}">Categories</a></li>
-						<li class="nav-item"><a class="nav-link" th:href="@{/brands}">Brands</a>
-						</li>
-						<li class="nav-item"><a class="nav-link"
-							th:href="@{/products}">Products</a></li>
-						<li class="nav-item"><a class="nav-link"
-							th:href="@{/customers}">Customers</a></li>
-						<li class="nav-item"><a class="nav-link"
-							th:href="@{/shipping}">Shipping</a></li>
-						<li class="nav-item"><a class="nav-link" th:href="@{/orders}">Orders</a>
-						</li>
-						<li class="nav-item"><a class="nav-link" th:href="@{/report}">Sales
-								Report</a></li>
-						<li class="nav-item"><a class="nav-link"
-							th:href="@{/articles}">Articles</a></li>
-						<li class="nav-item"><a class="nav-link" th:href="@{/menus}">Menus</a>
-						</li>
-						<li class="nav-item"><a class="nav-link"
-							th:href="@{/settings}">Settings</a></li>
-					</ul>
-				</div>
-
-			</nav>
-		</div>
-
-		<div>
-			<h2>Manage Users</h2>
-			<a th:href="@{/users/new}" class="fas fa-user-plus fa-2x icon-dark mr-2"></a>
-			
-			<a th:href="@{/users/export/csv}" class="fas fa-file-csv fa-2x icon-dark mr-2"></a>
-		</div>
-		
-		
-		
-		<!-- only display success message when a new user is created -->
-		<div th:if="${message != null}" class="alert alert-success text-center">
-			[[${message}]]
-		</div>
-			
-		<div>
-			<form th:action="@{/users/page/1}" class="form-inline m-3">
-				
-				<input type="hidden" name="sortField" th:value="${sortField}" />
-				<input type="hidden" name="sortDir" th:value="${sortDir}" />
-				Filter:&nbsp;
-				<input type="search" name="keyword" th:value="${keyword}" class="form-control" required/>
-				&nbsp;&nbsp;
-				<button type="submit" class="btn btn-primary">
-					<i class="fas fa-search"></i>
-				</button>
-				&nbsp;&nbsp;
-				<button type="button" class="btn btn-secondary" onclick="clearFilter()">
-					<i class="fas fa-eraser"></i>
-				</button>
-			</form>
-		
-		</div>
-
-
-			<div class="full-details">
-				<table class="table table-bordered table-striped table-hover table-responsive-xL">
-					<thead class="thead-dark">
-						<tr>
-							<!-- refer to templates/fragments.html for fragment code-->
-							<th th:replace="fragments :: column_link('id', 'User ID')"/>
-							<th>Photos</th>
-							<th th:replace="fragments :: column_link('email', 'Email')"/>
-							<th th:replace="fragments :: column_link('firstName', 'First Name')"/>
-							<th th:replace="fragments :: column_link('lastName', 'Last Name')"/>
-							<th>Roles</th>
-							<th th:replace="fragments :: column_link('enabled', 'Enabled')"/>
-							<th></th>
-						</tr>
-					</thead>
-					<tbody>
-						<tr th:each="user : ${listUsers}">
-							<td>[[${user.id}]]</td>
-							<td>
-								<span th:if="${user.photos == null}" class="fas fa-portrait fa-3x icon-dark"></span>
-								<img th:if="${user.photos != null}" th:src="@{${user.photosImagePath}}"
-								style="width: 100px"/>
-							</td>
-							<td>[[${user.email}]]</td>
-							<td>[[${user.firstName}]]</td>
-							<td>[[${user.lastName}]]</td>
-							<td>[[${user.roles}]]</td>
-							
-							<td>
-								<a th:if="${user.enabled == true}" class="fas fa-check-circle fa-2x icon-green" 
-								th:href="@{'/users/' + ${user.id} + '/enabled/false'}"
-								title="Disable this user"></a>
-								
-								<a th:if="${user.enabled == false}" class="fas fa-circle fa-2x icon-silver"
-								 th:href="@{'/users/' + ${user.id} + '/enabled/true'}"
-								 title="Enable this user"></a>
-							</td>
-							<td>
-									<a class="fas fa-edit fa-2x icon-green" th:href="@{'/users/edit/' + ${user.id}}"
-									title="edit this user"></a>
-									&nbsp; 
-									<a class="fas fa-trash fa-2x icon-dark link-delete" th:href="@{'/users/delete/' + ${user.id}}"
-									title="delete this user" th:userId="${user.id}"></a>
-							</td>
-						</tr>
-					</tbody>
-				</table>
-			</div>
-			
-			
-			<!-- display this on mobile screens only -->
-			<div class="less-details">
-				
-				<div th:each="user : ${listUsers}" class="row">
-				
-				</div>
-			</div>
-			
-			
-			<!-- IF -->
-			<div class="text-center m-1" th:if="${totalItems > 0}">
-				<span>Showing Users # [[${startCount}]] to [[${endCount}]] of [[${totalItems}]]</span>
-			</div>
-			
-			<!-- ELSE -->
-			<div class="text-center m-1" th:unless="${totalItems > 0}">
-				<span>No users found</span>
-			</div>
-			
-			<!-- only display pagination when there are users; else, no users no pagination -->
-			<div th:if="${totalPages > 1}">
-				<nav>
-					  <ul class="pagination justify-content-center">
-					  
-					  	<li th:class=" ${currentPage > 1 ? 'page-item' : 'page-item disabled'}">
-					  		<a th:replace="fragments :: page_link(1, 'First')"></a>
-				    	</li>
-					  
-					    <li th:class=" ${currentPage > 1 ? 'page-item' : 'page-item disabled'}">
-					    	<a th:replace="fragments :: page_link(${currentPage - 1 }, 'previous')"></a>
-				    	</li>
-					    	
-					    <!-- org.thymeleaf.expression.Numbers class, An object of this class is usually available in variable evaluation expressions with the name #numbers. -->
-					    <li th:class="${currentPage != i ? 'page-item' : 'page-item active'}" 
-					    	th:each="i : ${#numbers.sequence(1, totalPages)}">
-					    	<a th:replace="fragments :: page_link(${i}, ${i})"></a>
-					    </li>
-					    
-					    <li  th:class=" ${currentPage < totalPages ? 'page-item' : 'page-item disabled'}">
-					    	<a th:replace="fragments :: page_link(${currentPage + 1}, 'Next')"></a>
-					    </li>
-					    
-					    <li th:class=" ${currentPage < totalPages ? 'page-item' : 'page-item disabled'}">
-							<a th:replace="fragments :: page_link(${totalPages}, 'Last')"></a>		
-					    </li>
-					  </ul>
-				</nav>
-			</div>
-			
-			
-			
-			<div class="modal fade text-center" id="confirmModal">
-				<div class="modal-dialog">
-					<div class="modal-content">
-					
-						<div class="modal-header">
-							<h4 class="modal-title">Delete Confirmation</h4>
-							<button type="button" class="close" data-dismiss="modal">&times;</button>
-						</div>
-						
-						<div class="modal-body">
-							<span id="confirmText"></span>
-						</div>
-						
-						<div class="modal-footer">
-							<a class="btn btn-success" href="" id="yesButton">Yes</a>
-							<button type="button" class="btn btn-danger" data-dismiss="modal">Close</button>
-						</div>
-					</div>
-				</div>
-			</div>
-			
-			
-			<div class="text-center">
-				<p>Shopme Control Panel - Copyright &copy; Shopme</p>
-			</div>
-
-
-	</div>
-	
-<script type="text/javascript">
-
-//confirmation modal dialogue for delete user
-$(document).ready(function(){
-	$(".link-delete").on("click", function(e){
-		//stop the <a> tag default behaviour and pop out a confirmation modal dialogue
-		e.preventDefault();
-		//alert($(this).attr("href"));
-		link = $(this);
-		userId = link.attr("userId");
-		$("#yesButton").attr("href", link.attr("href"));
-		$("#confirmText").text("Are you sure you want to delete this user ID " + userId + "?");
-		$("#confirmModal").modal();
-	});
-});
-
-	function clearFilter(){
-		window.location = "[[@{/users}]]";
-	}
-
-
-</script>
-	
-</body>
-
-</html>
\ No newline at end of file
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/48/2004d58f32b4001d1d079a924effdc9e b/.metadata/.plugins/org.eclipse.core.resources/.history/48/2004d58f32b4001d1d079a924effdc9e
deleted file mode 100644
index 143676e5..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/48/2004d58f32b4001d1d079a924effdc9e
+++ /dev/null
@@ -1,51 +0,0 @@
-<!DOCTYPE html>
-<html xmlns:th="http://www.thymeleaf.org">
-
-<head>
-	<meta http-equiv="Content-Type" content="text/html; charset= UTF-8">
-	<meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0">
-	<title>Login - Shopme Admin</title>
-	<link rel="stylesheet" type="text/css" th:href="@{/webjars/bootstrap/css/bootstrap.min.css}" />
-</head>
-
-<body>
-	<div class="container-fluid text-center">
-		
-		<div>
-			<img th:src="@{/images/ShopmeAdminBig.png}" />
-		</div>
-		
-		<form th:action="@{/login}" method="post" style="max-width:350px; margin: 0 auto">
-			
-			<!--  ?error param will appear at the end of url if there is error with email or password  -->
-			<div th:if="${param.error}">
-				<p class="text-danger">[[${session.SPRING_SECURITY_LAST_EXCEPTION.message}]]</p>
-			</div>
-			
-			<div class="border border-secondary rounded p-3">
-				<p>Access to Shopme Control Panel </p>
-				
-				<p>
-					<input type="email" name="email" class="form-control" placeholder="Email" required />
-				</p>
-				
-				<p>
-					<input type="password" name="password" class="form-control" placeholder="Password" required />
-				</p>
-				
-				<p>
-					<input type="submit" value="Login" class="btn btn-primary" />
-				</p>
-			</div>
-		
-		</form>
-
-		<div>
-			<p>Shopme Control Panel - Copyright &copy; Shopme</p>
-		</div>
-
-	</div>
-
-</body>
-
-</html>
\ No newline at end of file
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/48/7063b4dd29b8001d1d97982e354adf88 b/.metadata/.plugins/org.eclipse.core.resources/.history/48/7063b4dd29b8001d1d97982e354adf88
deleted file mode 100644
index 0d2fd684..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/48/7063b4dd29b8001d1d97982e354adf88
+++ /dev/null
@@ -1,65 +0,0 @@
-package com.shopme.admin.category;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Set;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import com.shopme.common.entity.Category;
-
-@Service
-public class CategoryService {
-
-	@Autowired
-	private CategoryRepository repo;
-	
-	public List<Category> listAll(){
-		return (List<Category>) repo.findAll();
-	}
-	
-	public List<Category> listCategoriesUsedInForm(){
-		
-		List<Category> categoriesUsedInForm = new ArrayList<>();
-		
-		Iterable<Category> categoriesInDB = repo.findAll();
-		
-		for (Category category : categoriesInDB) {
-
-			// root category
-			if (category.getParent() == null) {
-				System.out.println(category.getName());
-
-				category.getChildren().forEach(subCategory -> {
-
-					System.out.println("--" + subCategory.getName());
-					listChildren(subCategory, 1);
-				});
-			}
-
-		}
-		
-		
-		return categoriesUsedInForm;
-	}
-	
-	private void listChildren(Category parent, int subLevel) {
-
-		int newSubLevel = subLevel + 1;
-		Set<Category> children = parent.getChildren();
-
-		for (Category subCategory : children) {
-
-			for (int i = 0; i < newSubLevel; i++) {
-				System.out.print("--");
-			}
-
-			System.out.println(subCategory.getName());
-
-			printChildren(subCategory, newSubLevel);
-		}
-
-	}
-	
-}
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/49/706a0d7889b3001d19bbb001c1a81c20 b/.metadata/.plugins/org.eclipse.core.resources/.history/49/706a0d7889b3001d19bbb001c1a81c20
deleted file mode 100644
index a9e38c41..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/49/706a0d7889b3001d19bbb001c1a81c20
+++ /dev/null
@@ -1,29 +0,0 @@
-*.icon-white{color: white}
-*.icon-silver{color: silver}
-*.icon-green{color: green}
-*.icon-dark{color: gray}
-*.icon-red{color: red}
-
-
-@media screen and (max-width: 768px) {
-	/* small screen */
-	
-	div.full-details{ display: none;}
-	div.less-details{ display: block;}
-	
-}
-
-@media screen and (min-width: 768px) and (max-width: 1024px) {
-	/* medium screen */
-	
-	div.full-details{ display: block;}
-	div.less-details{ display: none;}
-}
-
-
-@media screen and (min-width: 1024px) {
-	/* large screen */
-	
-	div.less-details{ display: block;}
-	
-}
\ No newline at end of file
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/49/8051ea5144b4001d1d079a924effdc9e b/.metadata/.plugins/org.eclipse.core.resources/.history/49/8051ea5144b4001d1d079a924effdc9e
deleted file mode 100644
index 7296ca15..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/49/8051ea5144b4001d1d079a924effdc9e
+++ /dev/null
@@ -1,9 +0,0 @@
-<!DOCTYPE html>
-<html xmlns:th="http://www.thymeleaf.org">
-
-<body>
-
-	
-	
-</body>
-</html>
\ No newline at end of file
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/4a/8032bec417b4001d128fb79045552177 b/.metadata/.plugins/org.eclipse.core.resources/.history/4a/8032bec417b4001d128fb79045552177
deleted file mode 100644
index c116d38f..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/4a/8032bec417b4001d128fb79045552177
+++ /dev/null
@@ -1,53 +0,0 @@
-package com.shopme.admin.security;
-
-import org.aspectj.weaver.ast.And;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.security.config.annotation.web.builders.HttpSecurity;
-import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
-import org.springframework.security.config.annotation.web.configuration.WebSecurityConfiguration;
-import org.springframework.security.config.annotation.web.configuration.WebSecurityCustomizer;
-import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
-import org.springframework.security.crypto.password.PasswordEncoder;
-import org.springframework.security.web.SecurityFilterChain;
-
-@Configuration
-@EnableWebSecurity
-public class WebSecurityConfig {
-
-	/*
-	 * refer to this link: https://www.codejava.net/frameworks/spring-boot/fix-
-	 * websecurityconfigureradapter-deprecated
-	 * 
-	 */
-
-	@Bean
-	public PasswordEncoder PasswordEncoder() {
-		return new BCryptPasswordEncoder();
-	}
-
-	@Bean
-	public SecurityFilterChain filterChain(HttpSecurity http) throws Exception {
-
-		// any request need to be authenticated (require login)
-		// custom login page at "/login" - handler method in MainController class
-		http.authorizeHttpRequests()
-			.anyRequest().authenticated()
-			.and()
-			.formLogin()
-				.loginPage("/login")
-				.usernameParameter("email")
-				.permitAll();
-
-		return http.build();
-	}
-
-	//NOTE: antMatchers() changed to requestMatchers()
-	//stack: https://stackoverflow.com/questions/74907533/the-method-antmatchersstring-is-undefined-for-the-type
-	@Bean
-	public WebSecurityCustomizer webSecurityCustomizer() {
-		//permit access to the assets in the following directories
-		return (web) -> web.ignoring().requestMatchers("/images/**", "/js/**", "/webjars/**");
-	}
-
-}
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/4a/c0538aaa6eb3001d19bbb001c1a81c20 b/.metadata/.plugins/org.eclipse.core.resources/.history/4a/c0538aaa6eb3001d19bbb001c1a81c20
deleted file mode 100644
index 824c4fd0..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/4a/c0538aaa6eb3001d19bbb001c1a81c20
+++ /dev/null
@@ -1,23 +0,0 @@
-package com.shopme.admin.user;
-
-import java.text.DateFormat;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.List;
-
-import com.shopme.common.entity.User;
-
-import jakarta.servlet.http.HttpServletResponse;
-
-public class UserCsvExporter {
-
-	public void export(List<User> user, HttpServletResponse response) {
-		
-		DateFormat dateFormatter = new SimpleDateFormat("yyyy-MM-dd_HH-mm-ss");
-		String timeStamp = dateFormatter.format(new Date());
-		String fileName = "users_" + timeStamp + ".csv";
-		
-	
-	}
-	
-}
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/4b/206f600a0db4001d128fb79045552177 b/.metadata/.plugins/org.eclipse.core.resources/.history/4b/206f600a0db4001d128fb79045552177
deleted file mode 100644
index ce145eba..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/4b/206f600a0db4001d128fb79045552177
+++ /dev/null
@@ -1,57 +0,0 @@
-package com.shopme.admin.security;
-
-import java.util.Collection;
-
-import org.springframework.security.core.GrantedAuthority;
-import org.springframework.security.core.userdetails.UserDetails;
-
-import com.shopme.common.entity.User;
-
-public class ShopmeUserDetails implements UserDetails {
-
-	private User user;
-	
-	
-	@Override
-	public Collection<? extends GrantedAuthority> getAuthorities() {
-		// TODO Auto-generated method stub
-		return null;
-	}
-
-	@Override
-	public String getPassword() {
-		// TODO Auto-generated method stub
-		return null;
-	}
-
-	@Override
-	public String getUsername() {
-		// TODO Auto-generated method stub
-		return null;
-	}
-
-	@Override
-	public boolean isAccountNonExpired() {
-		// TODO Auto-generated method stub
-		return false;
-	}
-
-	@Override
-	public boolean isAccountNonLocked() {
-		// TODO Auto-generated method stub
-		return false;
-	}
-
-	@Override
-	public boolean isCredentialsNonExpired() {
-		// TODO Auto-generated method stub
-		return false;
-	}
-
-	@Override
-	public boolean isEnabled() {
-		// TODO Auto-generated method stub
-		return false;
-	}
-
-}
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/4b/70f421b24bb4001d1d079a924effdc9e b/.metadata/.plugins/org.eclipse.core.resources/.history/4b/70f421b24bb4001d1d079a924effdc9e
deleted file mode 100644
index a9015c4d..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/4b/70f421b24bb4001d1d079a924effdc9e
+++ /dev/null
@@ -1,88 +0,0 @@
-package com.shopme.admin.security;
-
-import org.aspectj.weaver.ast.And;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.security.authentication.dao.DaoAuthenticationProvider;
-import org.springframework.security.config.annotation.web.builders.HttpSecurity;
-import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
-import org.springframework.security.config.annotation.web.configuration.WebSecurityConfiguration;
-import org.springframework.security.config.annotation.web.configuration.WebSecurityCustomizer;
-import org.springframework.security.core.userdetails.UserDetailsService;
-import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
-import org.springframework.security.crypto.password.PasswordEncoder;
-import org.springframework.security.web.SecurityFilterChain;
-
-@Configuration
-@EnableWebSecurity
-public class WebSecurityConfig {
-
-	/*
-	 * refer to this link: https://www.codejava.net/frameworks/spring-boot/fix-
-	 * websecurityconfigureradapter-deprecated
-	 * 
-	 */
-	
-	
-	 /* This bean will be called by spring security when performing authentication*/ 
-	@Bean
-	public UserDetailsService  userDetailsService()	{
-		return new ShopmeUserDetailsService();
-	}
-	
-
-	@Bean
-	public PasswordEncoder passwordEncoder() {
-		return new BCryptPasswordEncoder();
-	}
-
-	
-	@Bean
-	public DaoAuthenticationProvider authenticationProvider() {
-	    DaoAuthenticationProvider authProvider = new DaoAuthenticationProvider();
-	     
-	    authProvider.setUserDetailsService(userDetailsService());
-	    authProvider.setPasswordEncoder(passwordEncoder());
-	 
-	    return authProvider;
-	}
-	
-	
-	@Bean
-	public SecurityFilterChain filterChain(HttpSecurity http) throws Exception {
-
-		// any request need to be authenticated (require login)
-		// custom login page at "/login" - handler method in MainController class
-		http.authorizeHttpRequests()
-			.anyRequest().authenticated()
-			.and()
-			.formLogin()
-				.loginPage("/login")
-				.usernameParameter("email")
-				.permitAll()
-			.and().logout().permitAll()
-			.and().rememberMe().key("AbcDefgHijKlmnOpqrs_1234567890")
-			.tokenValiditySeconds(7 * 24 * 60 * 60);  // cookie expires after one week
-		
-		/*
-		 * set a fix key used for the md5 hash algorithm to encrypt cookie content each
-		 * time the application is restarted, a new key will be generated; this key will
-		 * be used to encrypt the cookie content so, in order for the cookie to be
-		 * permanent; a fix key is needed.
-		 */
-		
-		http.authenticationProvider(authenticationProvider());
-		
-		
-		return http.build();
-	}
-
-	//NOTE: antMatchers() changed to requestMatchers()
-	//stack: https://stackoverflow.com/questions/74907533/the-method-antmatchersstring-is-undefined-for-the-type
-	@Bean
-	public WebSecurityCustomizer webSecurityCustomizer() {
-		//permit access to the assets in the following directories
-		return (web) -> web.ignoring().requestMatchers("/images/**", "/js/**", "/webjars/**");
-	}
-
-}
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/4b/a05021d70eb4001d128fb79045552177 b/.metadata/.plugins/org.eclipse.core.resources/.history/4b/a05021d70eb4001d128fb79045552177
deleted file mode 100644
index 853877f2..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/4b/a05021d70eb4001d128fb79045552177
+++ /dev/null
@@ -1,60 +0,0 @@
-package com.shopme.admin.security;
-
-import java.util.Collection;
-
-import org.springframework.security.core.GrantedAuthority;
-import org.springframework.security.core.userdetails.UserDetails;
-
-import com.shopme.common.entity.User;
-
-public class ShopmeUserDetails implements UserDetails {
-
-	private User user;
-	
-	public ShopmeUserDetails(User user) {
-		this.user = user;
-	}
-
-	@Override
-	public Collection<? extends GrantedAuthority> getAuthorities() {
-		// TODO Auto-generated method stub
-		return null;
-	}
-
-	@Override
-	public String getPassword() {
-		// TODO Auto-generated method stub
-		return null;
-	}
-
-	@Override
-	public String getUsername() {
-		// TODO Auto-generated method stub
-		return null;
-	}
-
-	@Override
-	public boolean isAccountNonExpired() {
-		// TODO Auto-generated method stub
-		return false;
-	}
-
-	@Override
-	public boolean isAccountNonLocked() {
-		// TODO Auto-generated method stub
-		return false;
-	}
-
-	@Override
-	public boolean isCredentialsNonExpired() {
-		// TODO Auto-generated method stub
-		return false;
-	}
-
-	@Override
-	public boolean isEnabled() {
-		// TODO Auto-generated method stub
-		return false;
-	}
-
-}
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/4c/60e897468bb3001d19bbb001c1a81c20 b/.metadata/.plugins/org.eclipse.core.resources/.history/4c/60e897468bb3001d19bbb001c1a81c20
deleted file mode 100644
index 9388982a..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/4c/60e897468bb3001d19bbb001c1a81c20
+++ /dev/null
@@ -1,259 +0,0 @@
-<!DOCTYPE html>
-<html xmlns:th="http://www.thymeleaf.org">
-
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset= UTF-8">
-<meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0">
-<title>Manage Users</title>
-
-<link rel="stylesheet" type="text/css" th:href="@{/webjars/bootstrap/css/bootstrap.min.css}" />
-<link rel="stylesheet" type="text/css" th:href="@{/fontawesome/all.css}" />
-<link rel="stylesheet" type="text/css" th:href="@{/style.css}" />
-	
-<script type="text/javascript" th:src="@{/webjars/jquery/jquery.min.js}"></script>
-<script type="text/javascript" th:src="@{/webjars/bootstrap/js/bootstrap.min.js}"></script>
-</head>
-
-<body>
-	<div class="container-fluid">
-		<div>
-			<nav class="navbar navbar-expand-lg bg-dark navbar-dark">
-				<a class="navbar-brand" th:href="@{/}"> <img
-					th:src="@{/images/ShopmeAdminSmall.png}" />
-				</a>
-				<!--hamburger toggler for mobile devices(responsive)-->
-				<button class="navbar-toggler" type="button" data-toggle="collapse"
-					data-target="#topNavbar">
-					<span class="navbar-toggler-icon"></span>
-				</button>
-				<div class="collapse navbar-collapse" id="topNavbar">
-					<ul class="navbar-nav">
-						<li class="nav-item"><a class="nav-link" th:href="@{/users}">Users</a>
-						</li>
-						<li class="nav-item"><a class="nav-link"
-							th:href="@{/categories}">Categories</a></li>
-						<li class="nav-item"><a class="nav-link" th:href="@{/brands}">Brands</a>
-						</li>
-						<li class="nav-item"><a class="nav-link"
-							th:href="@{/products}">Products</a></li>
-						<li class="nav-item"><a class="nav-link"
-							th:href="@{/customers}">Customers</a></li>
-						<li class="nav-item"><a class="nav-link"
-							th:href="@{/shipping}">Shipping</a></li>
-						<li class="nav-item"><a class="nav-link" th:href="@{/orders}">Orders</a>
-						</li>
-						<li class="nav-item"><a class="nav-link" th:href="@{/report}">Sales
-								Report</a></li>
-						<li class="nav-item"><a class="nav-link"
-							th:href="@{/articles}">Articles</a></li>
-						<li class="nav-item"><a class="nav-link" th:href="@{/menus}">Menus</a>
-						</li>
-						<li class="nav-item"><a class="nav-link"
-							th:href="@{/settings}">Settings</a></li>
-					</ul>
-				</div>
-
-			</nav>
-		</div>
-
-		<div>
-			<h2>Manage Users</h2>
-			<a th:href="@{/users/new}" class="fas fa-user-plus fa-2x icon-dark mr-2"></a>
-			
-			<a th:href="@{/users/export/csv}" class="fas fa-file-csv fa-2x icon-dark mr-2"></a>
-		</div>
-		
-		
-		
-		<!-- only display success message when a new user is created -->
-		<div th:if="${message != null}" class="alert alert-success text-center">
-			[[${message}]]
-		</div>
-			
-		<div>
-			<form th:action="@{/users/page/1}" class="form-inline m-3">
-				
-				<input type="hidden" name="sortField" th:value="${sortField}" />
-				<input type="hidden" name="sortDir" th:value="${sortDir}" />
-				Filter:&nbsp;
-				<input type="search" name="keyword" th:value="${keyword}" class="form-control" required/>
-				&nbsp;&nbsp;
-				<button type="submit" class="btn btn-primary">
-					<i class="fas fa-search"></i>
-				</button>
-				&nbsp;&nbsp;
-				<button type="button" class="btn btn-secondary" onclick="clearFilter()">
-					<i class="fas fa-eraser"></i>
-				</button>
-			</form>
-		
-		</div>
-
-
-			<div class="full-details">
-				<table class="table table-bordered table-striped table-hover table-responsive-xL">
-					<thead class="thead-dark">
-						<tr>
-							<!-- refer to templates/fragments.html for fragment code-->
-							<th th:replace="fragments :: column_link('id', 'User ID')"/>
-							<th>Photos</th>
-							<th th:replace="fragments :: column_link('email', 'Email')"/>
-							<th th:replace="fragments :: column_link('firstName', 'First Name')"/>
-							<th th:replace="fragments :: column_link('lastName', 'Last Name')"/>
-							<th>Roles</th>
-							<th th:replace="fragments :: column_link('enabled', 'Enabled')"/>
-							<th></th>
-						</tr>
-					</thead>
-					<tbody>
-						<tr th:each="user : ${listUsers}">
-							<td>[[${user.id}]]</td>
-							<td>
-								<span th:if="${user.photos == null}" class="fas fa-portrait fa-3x icon-dark"></span>
-								<img th:if="${user.photos != null}" th:src="@{${user.photosImagePath}}"
-								style="width: 100px"/>
-							</td>
-							<td>[[${user.email}]]</td>
-							<td>[[${user.firstName}]]</td>
-							<td>[[${user.lastName}]]</td>
-							<td>[[${user.roles}]]</td>
-							
-							<td>
-								<a th:if="${user.enabled == true}" class="fas fa-check-circle fa-2x icon-green" 
-								th:href="@{'/users/' + ${user.id} + '/enabled/false'}"
-								title="Disable this user"></a>
-								
-								<a th:if="${user.enabled == false}" class="fas fa-circle fa-2x icon-silver"
-								 th:href="@{'/users/' + ${user.id} + '/enabled/true'}"
-								 title="Enable this user"></a>
-							</td>
-							<td>
-									<a class="fas fa-edit fa-2x icon-green" th:href="@{'/users/edit/' + ${user.id}}"
-									title="edit this user"></a>
-									&nbsp; 
-									<a class="fas fa-trash fa-2x icon-dark link-delete" th:href="@{'/users/delete/' + ${user.id}}"
-									title="delete this user" th:userId="${user.id}"></a>
-							</td>
-						</tr>
-					</tbody>
-				</table>
-			</div>
-			
-			
-			<!-- display this on mobile screens only, refer to /static/style.css for more info-->
-			<div class="less-details">
-				
-				<div th:each="user : ${listUsers}" class="row m-1">
-					
-					<div class="col">
-						
-						<span th:if="${user.photos == null}" class="fas fa-portrait fa-3x icon-dark"></span>
-								<img th:if="${user.photos != null}" th:src="@{${user.photosImagePath}}"
-								style="width: 100px"/>
-					</div>
-						<div class="col">
-						
-						
-						</div>
-					<div>&nbsp;</div>
-				</div>
-			</div>
-			
-			
-			<!-- IF -->
-			<div class="text-center m-1" th:if="${totalItems > 0}">
-				<span>Showing Users # [[${startCount}]] to [[${endCount}]] of [[${totalItems}]]</span>
-			</div>
-			
-			<!-- ELSE -->
-			<div class="text-center m-1" th:unless="${totalItems > 0}">
-				<span>No users found</span>
-			</div>
-			
-			<!-- only display pagination when there are users; else, no users no pagination -->
-			<div th:if="${totalPages > 1}">
-				<nav>
-					  <ul class="pagination justify-content-center">
-					  
-					  	<li th:class=" ${currentPage > 1 ? 'page-item' : 'page-item disabled'}">
-					  		<a th:replace="fragments :: page_link(1, 'First')"></a>
-				    	</li>
-					  
-					    <li th:class=" ${currentPage > 1 ? 'page-item' : 'page-item disabled'}">
-					    	<a th:replace="fragments :: page_link(${currentPage - 1 }, 'previous')"></a>
-				    	</li>
-					    	
-					    <!-- org.thymeleaf.expression.Numbers class, An object of this class is usually available in variable evaluation expressions with the name #numbers. -->
-					    <li th:class="${currentPage != i ? 'page-item' : 'page-item active'}" 
-					    	th:each="i : ${#numbers.sequence(1, totalPages)}">
-					    	<a th:replace="fragments :: page_link(${i}, ${i})"></a>
-					    </li>
-					    
-					    <li  th:class=" ${currentPage < totalPages ? 'page-item' : 'page-item disabled'}">
-					    	<a th:replace="fragments :: page_link(${currentPage + 1}, 'Next')"></a>
-					    </li>
-					    
-					    <li th:class=" ${currentPage < totalPages ? 'page-item' : 'page-item disabled'}">
-							<a th:replace="fragments :: page_link(${totalPages}, 'Last')"></a>		
-					    </li>
-					  </ul>
-				</nav>
-			</div>
-			
-			
-			
-			<div class="modal fade text-center" id="confirmModal">
-				<div class="modal-dialog">
-					<div class="modal-content">
-					
-						<div class="modal-header">
-							<h4 class="modal-title">Delete Confirmation</h4>
-							<button type="button" class="close" data-dismiss="modal">&times;</button>
-						</div>
-						
-						<div class="modal-body">
-							<span id="confirmText"></span>
-						</div>
-						
-						<div class="modal-footer">
-							<a class="btn btn-success" href="" id="yesButton">Yes</a>
-							<button type="button" class="btn btn-danger" data-dismiss="modal">Close</button>
-						</div>
-					</div>
-				</div>
-			</div>
-			
-			
-			<div class="text-center">
-				<p>Shopme Control Panel - Copyright &copy; Shopme</p>
-			</div>
-
-
-	</div>
-	
-<script type="text/javascript">
-
-//confirmation modal dialogue for delete user
-$(document).ready(function(){
-	$(".link-delete").on("click", function(e){
-		//stop the <a> tag default behaviour and pop out a confirmation modal dialogue
-		e.preventDefault();
-		//alert($(this).attr("href"));
-		link = $(this);
-		userId = link.attr("userId");
-		$("#yesButton").attr("href", link.attr("href"));
-		$("#confirmText").text("Are you sure you want to delete this user ID " + userId + "?");
-		$("#confirmModal").modal();
-	});
-});
-
-	function clearFilter(){
-		window.location = "[[@{/users}]]";
-	}
-
-
-</script>
-	
-</body>
-
-</html>
\ No newline at end of file
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/4c/e0424e858eb3001d19bbb001c1a81c20 b/.metadata/.plugins/org.eclipse.core.resources/.history/4c/e0424e858eb3001d19bbb001c1a81c20
deleted file mode 100644
index 95d58fe1..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/4c/e0424e858eb3001d19bbb001c1a81c20
+++ /dev/null
@@ -1,36 +0,0 @@
-*.icon-white{color: white}
-*.icon-silver{color: silver}
-*.icon-green{color: green}
-*.icon-dark{color: gray}
-*.icon-red{color: red}
-
-
-
-@media screen and (max-width: 768px) {
-	/* small screen eg:mobile*/
-	
-	div.full-details{ display: none;}
-	div.less-details{ display: block;}
-	
-}
-
-@media screen and (min-width: 768px) and (max-width: 1024px) {
-	/* medium screen eg:tablet*/
-	
-	div.full-details{ display: block;}
-	div.less-details{ display: none;}
-	
-	/*hide the columns id and email when in tablet screen*/
-	th, td .hideable-column{display: none;}
-	
-}
-
-
-@media screen and (min-width: 1024px) {
-	/* large screen eg:laptop*/
-	
-	div.less-details{ display: none;}
-	
-	th, td .hideable-column{display: table-cell;}
-	
-}
\ No newline at end of file
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/4d/f0975d174bb4001d1d079a924effdc9e b/.metadata/.plugins/org.eclipse.core.resources/.history/4d/f0975d174bb4001d1d079a924effdc9e
deleted file mode 100644
index 4863f9b7..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/4d/f0975d174bb4001d1d079a924effdc9e
+++ /dev/null
@@ -1,83 +0,0 @@
-package com.shopme.admin.security;
-
-import org.aspectj.weaver.ast.And;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.security.authentication.dao.DaoAuthenticationProvider;
-import org.springframework.security.config.annotation.web.builders.HttpSecurity;
-import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
-import org.springframework.security.config.annotation.web.configuration.WebSecurityConfiguration;
-import org.springframework.security.config.annotation.web.configuration.WebSecurityCustomizer;
-import org.springframework.security.core.userdetails.UserDetailsService;
-import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
-import org.springframework.security.crypto.password.PasswordEncoder;
-import org.springframework.security.web.SecurityFilterChain;
-
-@Configuration
-@EnableWebSecurity
-public class WebSecurityConfig {
-
-	/*
-	 * refer to this link: https://www.codejava.net/frameworks/spring-boot/fix-
-	 * websecurityconfigureradapter-deprecated
-	 * 
-	 */
-	
-	
-	 /* This bean will be called by spring security when performing authentication*/ 
-	@Bean
-	public UserDetailsService  userDetailsService()	{
-		return new ShopmeUserDetailsService();
-	}
-	
-
-	@Bean
-	public PasswordEncoder passwordEncoder() {
-		return new BCryptPasswordEncoder();
-	}
-
-	
-	@Bean
-	public DaoAuthenticationProvider authenticationProvider() {
-	    DaoAuthenticationProvider authProvider = new DaoAuthenticationProvider();
-	     
-	    authProvider.setUserDetailsService(userDetailsService());
-	    authProvider.setPasswordEncoder(passwordEncoder());
-	 
-	    return authProvider;
-	}
-	
-	
-	@Bean
-	public SecurityFilterChain filterChain(HttpSecurity http) throws Exception {
-
-		// any request need to be authenticated (require login)
-		// custom login page at "/login" - handler method in MainController class
-		http.authorizeHttpRequests()
-			.anyRequest().authenticated()
-			.and()
-			.formLogin()
-				.loginPage("/login")
-				.usernameParameter("email")
-				.permitAll()
-			.and().logout().permitAll()
-			.and().rememberMe().key("AbcDefgHijKlmnOpqrs_1234567890"); 
-				// set a fix key used for the md5 hash algorithm to encrypt cookie content
-				//each time the application is restarted, a new key will be generated; this key will be used to encrypt the cookie
-				//so, in order for the cookie to be  a fix key
-		
-		http.authenticationProvider(authenticationProvider());
-		
-		
-		return http.build();
-	}
-
-	//NOTE: antMatchers() changed to requestMatchers()
-	//stack: https://stackoverflow.com/questions/74907533/the-method-antmatchersstring-is-undefined-for-the-type
-	@Bean
-	public WebSecurityCustomizer webSecurityCustomizer() {
-		//permit access to the assets in the following directories
-		return (web) -> web.ignoring().requestMatchers("/images/**", "/js/**", "/webjars/**");
-	}
-
-}
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/4e/2090b97177b3001d19bbb001c1a81c20 b/.metadata/.plugins/org.eclipse.core.resources/.history/4e/2090b97177b3001d19bbb001c1a81c20
deleted file mode 100644
index 3201937e..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/4e/2090b97177b3001d19bbb001c1a81c20
+++ /dev/null
@@ -1,96 +0,0 @@
-package com.shopme.admin.user.export;
-
-import java.io.IOException;
-import java.util.List;
-
-import javax.servlet.ServletOutputStream;
-import javax.servlet.http.HttpServletResponse;
-
-import org.apache.poi.ss.usermodel.CellStyle;
-import org.apache.poi.xssf.usermodel.XSSFCell;
-import org.apache.poi.xssf.usermodel.XSSFCellStyle;
-import org.apache.poi.xssf.usermodel.XSSFFont;
-import org.apache.poi.xssf.usermodel.XSSFRow;
-import org.apache.poi.xssf.usermodel.XSSFSheet;
-import org.apache.poi.xssf.usermodel.XSSFWorkbook;
-
-import com.shopme.admin.AbstractExporter;
-import com.shopme.common.entity.User;
-
-public class UserExcelExporter extends AbstractExporter {
-	private XSSFWorkbook workbook;
-	private XSSFSheet sheet;
-	
-	public UserExcelExporter() {
-		workbook = new XSSFWorkbook();
-	}
-	
-	private void writeHeaderLine() {
-		sheet = workbook.createSheet("Users");
-		XSSFRow row = sheet.createRow(0);
-		
-		XSSFCellStyle cellStyle = workbook.createCellStyle();
-		XSSFFont font = workbook.createFont();
-		font.setBold(true);
-		font.setFontHeight(16);
-		cellStyle.setFont(font);
-		
-		createCell(row, 0, "User Id", cellStyle);
-		createCell(row, 1, "E-mail", cellStyle);
-		createCell(row, 2, "First Name", cellStyle);
-		createCell(row, 3, "Last Name", cellStyle);
-		createCell(row, 4, "Roles", cellStyle);
-		createCell(row, 5, "Enabled", cellStyle);
-		
-	}
-	
-	private void createCell(XSSFRow row, int columnIndex, Object value, CellStyle style) {
-		XSSFCell cell = row.createCell(columnIndex);
-		sheet.autoSizeColumn(columnIndex);
-		
-		if (value instanceof Integer) {
-			cell.setCellValue((Integer) value);
-		} else if (value instanceof Boolean) {
-			cell.setCellValue((Boolean) value);
-		} else {
-			cell.setCellValue((String) value);
-		}
-		
-		cell.setCellStyle(style);		
-	}
-	
-	public void export(List<User> listUsers, HttpServletResponse response) throws IOException {
-		super.setResponseHeader(response, "application/octet-stream", ".xlsx", "users_");
-	
-		writeHeaderLine();
-		writeDataLines(listUsers);
-		
-		ServletOutputStream outputStream = response.getOutputStream();
-		workbook.write(outputStream);
-		workbook.close();
-		outputStream.close();
-		
-		
-	}
-
-	private void writeDataLines(List<User> listUsers) {
-		int rowIndex = 1;
-		
-		XSSFCellStyle cellStyle = workbook.createCellStyle();
-		XSSFFont font = workbook.createFont();
-		font.setFontHeight(14);
-		cellStyle.setFont(font);
-		
-		for (User user : listUsers) {
-			XSSFRow row = sheet.createRow(rowIndex++);
-			int columnIndex = 0;
-			
-			createCell(row, columnIndex++, user.getId(), cellStyle);
-			createCell(row, columnIndex++, user.getEmail(), cellStyle);
-			createCell(row, columnIndex++, user.getFirstName(), cellStyle);
-			createCell(row, columnIndex++, user.getLastName(), cellStyle);
-			createCell(row, columnIndex++, user.getRoles().toString(), cellStyle);
-			createCell(row, columnIndex++, user.isEnabled(), cellStyle);
-		}
-	}
-}
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/4e/20d64f1515b4001d128fb79045552177 b/.metadata/.plugins/org.eclipse.core.resources/.history/4e/20d64f1515b4001d128fb79045552177
deleted file mode 100644
index caa3ad58..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/4e/20d64f1515b4001d128fb79045552177
+++ /dev/null
@@ -1,25 +0,0 @@
-package com.shopme.admin.security;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.core.userdetails.UserDetails;
-import org.springframework.security.core.userdetails.UserDetailsService;
-import org.springframework.security.core.userdetails.UsernameNotFoundException;
-
-import com.shopme.admin.user.UserRepository;
-
-public class ShopmeUserDetailsService implements UserDetailsService {
-
-	
-	@Autowired
-	private UserRepository userRepo;
-	
-	
-	
-	
-	@Override
-	public UserDetails loadUserByUsername(String email) throws UsernameNotFoundException {
-		// TODO Auto-generated method stub
-		return null;
-	}
-
-}
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/4e/906bce7365b3001d19bbb001c1a81c20 b/.metadata/.plugins/org.eclipse.core.resources/.history/4e/906bce7365b3001d19bbb001c1a81c20
deleted file mode 100644
index b681cda2..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/4e/906bce7365b3001d19bbb001c1a81c20
+++ /dev/null
@@ -1,183 +0,0 @@
-package com.shopme.admin.user;
-
-import java.io.IOException;
-import java.util.List;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.domain.Page;
-import org.springframework.data.repository.query.Param;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
-import org.springframework.util.StringUtils;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.ModelAttribute;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.multipart.MultipartFile;
-import org.springframework.web.servlet.mvc.support.RedirectAttributes;
-
-import com.fasterxml.jackson.annotation.ObjectIdGenerators.StringIdGenerator;
-import com.shopme.admin.FileUploadUtil;
-import com.shopme.common.entity.Role;
-import com.shopme.common.entity.User;
-
-@Controller
-public class UserController {
-
-	@Autowired
-	private UserService service;
-
-	@GetMapping("/users")
-	public String listFirstPage(Model model) {
-		
-		//NOTE: these are the default values for path variable and URL parameters
-		return listByPage(1, model, "firstName", "asc", null);
-	}
-
-	@GetMapping("/users/page/{pageNum}")
-	public String listByPage(@PathVariable(name = "pageNum") int pageNum, Model model,
-			@Param("sortField") String sortField, @Param("sortDir") String sortDir,
-			@Param("keyword") String keyword) {
-		
-		System.out.println("sort field: " + sortField);
-		System.out.println("sort order: " + sortDir);
-		
-		Page<User> page = service.listByPage(pageNum, sortField, sortDir, keyword);
-		List<User> listUsers = page.getContent();
-
-		
-		long startCount = (pageNum - 1) * UserService.USERS_PER_PAGE + 1;
-		long endCount = startCount + UserService.USERS_PER_PAGE - 1;
-		if(endCount > page.getTotalElements()) {
-			endCount = page.getTotalElements();
-		}
-		
-		String reverseSortDir = sortDir.equals("asc") ? "desc" : "asc";
-		
-		model.addAttribute("currentPage", pageNum);
-		model.addAttribute("totalPages", page.getTotalPages());
-		model.addAttribute("startCount", startCount);
-		model.addAttribute("endCount", endCount);
-		model.addAttribute("totalItems", page.getTotalElements());
-		model.addAttribute("listUsers", listUsers);
-		model.addAttribute("sortField", sortField);
-		model.addAttribute("sortDir", sortDir);
-		model.addAttribute("reverseSortDir", reverseSortDir);
-		model.addAttribute("keyword", keyword);
-		
-
-		return "users";
-
-	}
-
-	@GetMapping("/users/new")
-	public String newUser(Model model) {
-
-		List<Role> listRoles = service.listRoles();
-
-		User user = new User();
-		user.setEnabled(true);
-
-		model.addAttribute("user", user);
-		model.addAttribute("listRoles", listRoles);
-		model.addAttribute("pageTitle", "Create New User");
-
-		return "user_form";
-
-	}
-
-	// using @RequestParam, we can get the image file input, the input has the
-	// property name="image"
-	@PostMapping("/users/save")
-	public String saveUser(@ModelAttribute("user") User user, RedirectAttributes redirectAttributes,
-			@RequestParam("image") MultipartFile multipartFile) throws IOException {
-
-		if (!multipartFile.isEmpty()) {
-
-			String fileName = StringUtils.cleanPath(multipartFile.getOriginalFilename());
-			user.setPhotos(fileName);
-
-			User savedUser = service.save(user);
-
-			String uploadDir = "user-photos/" + savedUser.getId();
-
-			FileUploadUtil.cleanDir(uploadDir);
-			FileUploadUtil.saveFile(uploadDir, fileName, multipartFile);
-		} else {
-
-			// set photo to null for getPhotosImagePath() method's conditional statement in
-			// User class
-			if (user.getPhotos().isEmpty())
-				user.setPhotos(null);
-			service.save(user);
-		}
-
-		redirectAttributes.addFlashAttribute("message", "the user has been saved successfully");
-
-		// POST/REDIRECT/GET web design
-		return getRedirectURLtoAffectedUser(user);
-	}
-
-	private String getRedirectURLtoAffectedUser(User user) {
-		
-		//after user is saved display the user instead of the entire user list
-		//email is a unique field to identify each user.
-		String firstPartOfEmail = user.getEmail().split("@")[0];
-		return "redirect:/users/page/1?sortField=id&sortDir=asc&keyword=" + firstPartOfEmail;
-	}
-
-	@GetMapping("/users/edit/{id}")
-	public String editUser(@PathVariable(name = "id") Integer id, RedirectAttributes redirectAttributes, Model model) {
-		try {
-			User user = service.get(id);
-			List<Role> listRoles = service.listRoles();
-
-			model.addAttribute("user", user);
-			model.addAttribute("pageTitle", "Edit User (ID: " + id + ")");
-			model.addAttribute("listRoles", listRoles);
-
-			return "user_form";
-		} catch (UserNotFoundException ex) {
-			redirectAttributes.addFlashAttribute("message", ex.getMessage());
-
-			return "redirect:/users";
-		}
-
-	}
-
-	@GetMapping("/users/delete/{id}")
-	public String deleteUser(@PathVariable(name = "id") Integer id, RedirectAttributes redirectAttributes,
-			Model model) {
-		try {
-			service.delete(id);
-			redirectAttributes.addFlashAttribute("message", "The user ID " + id + " has been deleted successfully.");
-
-		} catch (UserNotFoundException ex) {
-			redirectAttributes.addFlashAttribute("message", ex.getMessage());
-
-		}
-
-		return "redirect:/users";
-	}
-
-	@GetMapping("/users/{id}/enabled/{status}")
-	public String updateUserEnabledStatus(@PathVariable(name = "id") Integer id,
-			@PathVariable(name = "status") boolean enabled, RedirectAttributes redirectAttributes) {
-
-		service.updateUserEnabledStatus(id, enabled);
-		String status = enabled ? "enabled" : "disabled";
-		String message = "The user id " + id + " has been " + status;
-		redirectAttributes.addFlashAttribute("message", message);
-
-		return "redirect:/users";
-	}
-
-	@GetMapping("/users/export/csv")
-	public void exportToCSV() {
-		
-		UserCsvExporter exporter = new UserCsvExporter();
-	}
-	
-	
-}
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/4e/b0eb0b3477b3001d19bbb001c1a81c20 b/.metadata/.plugins/org.eclipse.core.resources/.history/4e/b0eb0b3477b3001d19bbb001c1a81c20
deleted file mode 100644
index edf23be8..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/4e/b0eb0b3477b3001d19bbb001c1a81c20
+++ /dev/null
@@ -1,192 +0,0 @@
-package com.shopme.admin.user;
-
-import java.io.IOException;
-import java.util.List;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.domain.Page;
-import org.springframework.data.repository.query.Param;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
-import org.springframework.util.StringUtils;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.ModelAttribute;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.multipart.MultipartFile;
-import org.springframework.web.servlet.mvc.support.RedirectAttributes;
-
-import com.fasterxml.jackson.annotation.ObjectIdGenerators.StringIdGenerator;
-import com.shopme.admin.FileUploadUtil;
-import com.shopme.common.entity.Role;
-import com.shopme.common.entity.User;
-
-import jakarta.servlet.http.HttpServletResponse;
-
-@Controller
-public class UserController {
-
-	@Autowired
-	private UserService service;
-
-	@GetMapping("/users")
-	public String listFirstPage(Model model) {
-
-		// NOTE: these are the default values for path variable and URL parameters
-		return listByPage(1, model, "firstName", "asc", null);
-	}
-
-	@GetMapping("/users/page/{pageNum}")
-	public String listByPage(@PathVariable(name = "pageNum") int pageNum, Model model,
-			@Param("sortField") String sortField, @Param("sortDir") String sortDir, @Param("keyword") String keyword) {
-
-		System.out.println("sort field: " + sortField);
-		System.out.println("sort order: " + sortDir);
-
-		Page<User> page = service.listByPage(pageNum, sortField, sortDir, keyword);
-		List<User> listUsers = page.getContent();
-
-		long startCount = (pageNum - 1) * UserService.USERS_PER_PAGE + 1;
-		long endCount = startCount + UserService.USERS_PER_PAGE - 1;
-		if (endCount > page.getTotalElements()) {
-			endCount = page.getTotalElements();
-		}
-
-		String reverseSortDir = sortDir.equals("asc") ? "desc" : "asc";
-
-		model.addAttribute("currentPage", pageNum);
-		model.addAttribute("totalPages", page.getTotalPages());
-		model.addAttribute("startCount", startCount);
-		model.addAttribute("endCount", endCount);
-		model.addAttribute("totalItems", page.getTotalElements());
-		model.addAttribute("listUsers", listUsers);
-		model.addAttribute("sortField", sortField);
-		model.addAttribute("sortDir", sortDir);
-		model.addAttribute("reverseSortDir", reverseSortDir);
-		model.addAttribute("keyword", keyword);
-
-		return "users";
-
-	}
-
-	@GetMapping("/users/new")
-	public String newUser(Model model) {
-
-		List<Role> listRoles = service.listRoles();
-
-		User user = new User();
-		user.setEnabled(true);
-
-		model.addAttribute("user", user);
-		model.addAttribute("listRoles", listRoles);
-		model.addAttribute("pageTitle", "Create New User");
-
-		return "user_form";
-
-	}
-
-	// using @RequestParam, we can get the image file input, the input has the
-	// property name="image"
-	@PostMapping("/users/save")
-	public String saveUser(@ModelAttribute("user") User user, RedirectAttributes redirectAttributes,
-			@RequestParam("image") MultipartFile multipartFile) throws IOException {
-
-		if (!multipartFile.isEmpty()) {
-
-			String fileName = StringUtils.cleanPath(multipartFile.getOriginalFilename());
-			user.setPhotos(fileName);
-
-			User savedUser = service.save(user);
-
-			String uploadDir = "user-photos/" + savedUser.getId();
-
-			FileUploadUtil.cleanDir(uploadDir);
-			FileUploadUtil.saveFile(uploadDir, fileName, multipartFile);
-		} else {
-
-			// set photo to null for getPhotosImagePath() method's conditional statement in
-			// User class
-			if (user.getPhotos().isEmpty())
-				user.setPhotos(null);
-			service.save(user);
-		}
-
-		redirectAttributes.addFlashAttribute("message", "the user has been saved successfully");
-
-		// POST/REDIRECT/GET web design
-		return getRedirectURLtoAffectedUser(user);
-	}
-
-	private String getRedirectURLtoAffectedUser(User user) {
-
-		// after user is saved display the user instead of the entire user list
-		// email is a unique field to identify each user.
-		String firstPartOfEmail = user.getEmail().split("@")[0];
-		return "redirect:/users/page/1?sortField=id&sortDir=asc&keyword=" + firstPartOfEmail;
-	}
-
-	@GetMapping("/users/edit/{id}")
-	public String editUser(@PathVariable(name = "id") Integer id, RedirectAttributes redirectAttributes, Model model) {
-		try {
-			User user = service.get(id);
-			List<Role> listRoles = service.listRoles();
-
-			model.addAttribute("user", user);
-			model.addAttribute("pageTitle", "Edit User (ID: " + id + ")");
-			model.addAttribute("listRoles", listRoles);
-
-			return "user_form";
-		} catch (UserNotFoundException ex) {
-			redirectAttributes.addFlashAttribute("message", ex.getMessage());
-
-			return "redirect:/users";
-		}
-
-	}
-
-	@GetMapping("/users/delete/{id}")
-	public String deleteUser(@PathVariable(name = "id") Integer id, RedirectAttributes redirectAttributes,
-			Model model) {
-		try {
-			service.delete(id);
-			redirectAttributes.addFlashAttribute("message", "The user ID " + id + " has been deleted successfully.");
-
-		} catch (UserNotFoundException ex) {
-			redirectAttributes.addFlashAttribute("message", ex.getMessage());
-
-		}
-
-		return "redirect:/users";
-	}
-
-	@GetMapping("/users/{id}/enabled/{status}")
-	public String updateUserEnabledStatus(@PathVariable(name = "id") Integer id,
-			@PathVariable(name = "status") boolean enabled, RedirectAttributes redirectAttributes) {
-
-		service.updateUserEnabledStatus(id, enabled);
-		String status = enabled ? "enabled" : "disabled";
-		String message = "The user id " + id + " has been " + status;
-		redirectAttributes.addFlashAttribute("message", message);
-
-		return "redirect:/users";
-	}
-
-	@GetMapping("/users/export/csv")
-	public void exportToCSV(HttpServletResponse response) throws IOException {
-
-		List<User> listUsers = service.listAll();
-		UserCsvExporter exporter = new UserCsvExporter();
-		exporter.export(listUsers, response);
-	}
-	
-	@GetMapping("/users/export/excel")
-	public void exportToExcel(HttpServletResponse response) throws IOException {
-
-		List<User> listUsers = service.listAll();
-	}
-	
-	
-	
-
-}
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/4e/f03cfeb246b4001d1d079a924effdc9e b/.metadata/.plugins/org.eclipse.core.resources/.history/4e/f03cfeb246b4001d1d079a924effdc9e
deleted file mode 100644
index 6bcdfb2e..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/4e/f03cfeb246b4001d1d079a924effdc9e
+++ /dev/null
@@ -1,31 +0,0 @@
-<!DOCTYPE html>
-<html xmlns:th="http://www.thymeleaf.org"
-	  xmlns:sec="https://www.thymeleaf.org/thymeleaf-extras-springsecurity5">
-
-<head th:replace="fragments :: page_head('Home - Shopme Admin')"/>
-
-<body>
-	<div class="container-fluid">
-			
-			<!-- navigation bar -->
-		<div th:replace="navigation :: menu"></div>
-
-		<div>
-			<h1>Shopme Control Panel</h1>
-		</div>
-
-		<!-- footer -->
-		<div th:replace="fragments :: footer"></div>
-
-
-	</div>
-	
-<script type="text/javascript">
-
-	
-
-</script>
-
-</body>
-
-</html>
\ No newline at end of file
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/5/30f248120cb9001d11addcb4256c67f9 b/.metadata/.plugins/org.eclipse.core.resources/.history/5/30f248120cb9001d11addcb4256c67f9
new file mode 100644
index 00000000..ee7e5ca1
--- /dev/null
+++ b/.metadata/.plugins/org.eclipse.core.resources/.history/5/30f248120cb9001d11addcb4256c67f9
@@ -0,0 +1,206 @@
+<!DOCTYPE html>
+<html xmlns:th="http://www.thymeleaf.org">
+
+<head th:replace="fragments :: page_head('Categories - Shopme Admin')"/>
+
+<body>
+	<div class="container-fluid">
+		
+		<!-- navigation bar -->
+		<div th:replace="navigation :: menu"></div>
+
+		<div>
+			<h2>Manage Categories</h2>
+			<a th:href="@{/categories/new}" class="fas fa-folder-plus fa-2x icon-dark mr-2"></a>
+			
+			<a th:href="@{/categories/export/csv}" class="fas fa-file-csv fa-2x icon-dark mr-2"></a>
+		</div>
+		
+		<!-- redirect message from controller -->
+		<div th:if="${message != null}" class="alert alert-success text-center">
+			[[${message}]]
+		</div>
+		
+			
+		<div>
+			<form th:action="@{/categories/page/1}" class="form-inline m-3">
+				
+				Filter:&nbsp;
+				<input type="search" name="keyword" th:value="${keyword}" class="form-control" required/>
+				&nbsp;&nbsp;
+				<button type="submit" class="btn btn-primary">
+					<i class="fas fa-search"></i>
+				</button>
+				&nbsp;&nbsp;
+				<button type="button" class="btn btn-secondary" onclick="clearFilter()">
+					<i class="fas fa-eraser"></i>
+				</button>
+			</form>
+		
+		</div>
+
+			<!-- css class to display this table in large screens only , refer to static/style.css for more info-->
+			<div class="full-details">
+				<table class="table table-bordered table-striped table-hover table-responsive-xL">
+					<thead class="thead-dark">
+						<tr>
+							<th>ID</th>
+							<th>Category Image</th>
+							<th>Category Name</th>
+							<th>Alias</th>
+							<th>Enabled</th>
+							<th></th>
+						</tr>
+					</thead>
+					<tbody>
+						<tr th:each="cat : ${listCategories}">
+							<td>[[${cat.id}]]</td>
+							<td>	
+								<img th:src="@{${cat.imagePath}"/>
+							</td>
+							<td>[[${cat.name}]]</td>
+							<td>[[${cat.alias}]]</td>
+							<td>
+								<div th:replace="fragments :: category_status"></div>
+							</td>
+							<td>
+								<div th:replace="fragments :: category_actions"></div>
+							</td>
+						</tr>
+					</tbody>
+				</table>
+			</div>
+			
+			
+			<!-- css class to display this <div> on mobile screens only, refer to /static/style.css for more info-->
+			<div class="less-details">
+				
+				<div th:each="user : ${listUsers}" class="row m-1">
+					
+					<div class="col-4">
+						
+						<span th:if="${user.photos == null}" class="fas fa-portrait fa-3x icon-dark"></span>
+								<img th:if="${user.photos != null}" th:src="@{${user.photosImagePath}}"
+								style="width: 100px"/>
+					</div>
+					
+					<div class="col-8">
+						<div>[[${user.fullName}]]</div>
+						<div>[[${user.roles}]]</div>
+						<div class="mt-2">
+							<a th:if="${user.enabled == true}" class="fas fa-check-circle fa-2x icon-green" 
+								th:href="@{'/users/' + ${user.id} + '/enabled/false'}"
+								title="Disable this user"></a>
+								
+							<a th:if="${user.enabled == false}" class="fas fa-circle fa-2x icon-silver"
+								 th:href="@{'/users/' + ${user.id} + '/enabled/true'}"
+								 title="Enable this user"></a>
+						
+									&nbsp;
+							<a class="fas fa-edit fa-2x icon-green" th:href="@{'/users/edit/' + ${user.id}}"
+									title="edit this user"></a>
+									&nbsp; 
+							<a class="fas fa-trash fa-2x icon-dark link-delete" th:href="@{'/users/delete/' + ${user.id}}"
+									title="delete this user" th:userId="${user.id}"></a>
+						</div>
+					</div>
+					<div>&nbsp;</div>
+				</div>
+			</div>
+			
+			
+			<!-- IF -->
+			<div class="text-center m-1" th:if="${totalItems > 0}">
+				<span>Showing Users # [[${startCount}]] to [[${endCount}]] of [[${totalItems}]]</span>
+			</div>
+			
+			<!-- ELSE -->
+			<div class="text-center m-1" th:unless="${totalItems > 0}">
+				<span>No users found</span>
+			</div>
+			
+			<!-- only display pagination when there are users; else, no users no pagination -->
+			<div th:if="${totalPages > 1}">
+				<nav>
+					  <ul class="pagination justify-content-center flex-wrap">
+					  
+					  	<li th:class=" ${currentPage > 1 ? 'page-item' : 'page-item disabled'}">
+					  		<a th:replace="fragments :: page_link(1, 'First')"></a>
+				    	</li>
+					  
+					    <li th:class=" ${currentPage > 1 ? 'page-item' : 'page-item disabled'}">
+					    	<a th:replace="fragments :: page_link(${currentPage - 1 }, 'previous')"></a>
+				    	</li>
+					    	
+					    <!-- org.thymeleaf.expression.Numbers class, An object of this class is usually available in variable evaluation expressions with the name #numbers. -->
+					    <li th:class="${currentPage != i ? 'page-item' : 'page-item active'}" 
+					    	th:each="i : ${#numbers.sequence(1, totalPages)}">
+					    	<a th:replace="fragments :: page_link(${i}, ${i})"></a>
+					    </li>
+					    
+					    <li  th:class=" ${currentPage < totalPages ? 'page-item' : 'page-item disabled'}">
+					    	<a th:replace="fragments :: page_link(${currentPage + 1}, 'Next')"></a>
+					    </li>
+					    
+					    <li th:class=" ${currentPage < totalPages ? 'page-item' : 'page-item disabled'}">
+							<a th:replace="fragments :: page_link(${totalPages}, 'Last')"></a>		
+					    </li>
+					  </ul>
+				</nav>
+			</div>
+			
+			
+			
+			<div class="modal fade text-center" id="confirmModal">
+				<div class="modal-dialog">
+					<div class="modal-content">
+					
+						<div class="modal-header">
+							<h4 class="modal-title">Delete Confirmation</h4>
+							<button type="button" class="close" data-dismiss="modal">&times;</button>
+						</div>
+						
+						<div class="modal-body">
+							<span id="confirmText"></span>
+						</div>
+						
+						<div class="modal-footer">
+							<a class="btn btn-success" href="" id="yesButton">Yes</a>
+							<button type="button" class="btn btn-danger" data-dismiss="modal">Close</button>
+						</div>
+					</div>
+				</div>
+			</div>
+			
+			<!-- footer -->
+			<div th:replace="fragments :: footer"></div>
+
+
+	</div>
+	
+<script type="text/javascript">
+
+//confirmation modal dialogue for delete user
+$(document).ready(function(){
+	$(".link-delete").on("click", function(e){
+		//stop the <a> tag default behaviour and pop out a confirmation modal dialogue
+		e.preventDefault();
+		//alert($(this).attr("href"));
+		link = $(this);
+		userId = link.attr("userId");
+		$("#yesButton").attr("href", link.attr("href"));
+		$("#confirmText").text("Are you sure you want to delete this user ID " + userId + "?");
+		$("#confirmModal").modal();
+	});
+});
+
+	function clearFilter(){
+		window.location = "[[@{/users}]]";
+	}
+
+
+</script>
+	
+</body>
+
+</html>
\ No newline at end of file
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/50/80ac0abf0bb9001d11addcb4256c67f9 b/.metadata/.plugins/org.eclipse.core.resources/.history/50/80ac0abf0bb9001d11addcb4256c67f9
new file mode 100644
index 00000000..5ba9b5cf
--- /dev/null
+++ b/.metadata/.plugins/org.eclipse.core.resources/.history/50/80ac0abf0bb9001d11addcb4256c67f9
@@ -0,0 +1,161 @@
+package com.shopme.common.entity;
+
+import java.util.HashSet;
+import java.util.Set;
+
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.OneToMany;
+import jakarta.persistence.OneToOne;
+import jakarta.persistence.Table;
+
+@Entity
+@Table(name = "categories")
+public class Category {
+
+	@Id
+	@GeneratedValue(strategy = GenerationType.IDENTITY)
+	private Integer id;
+
+	@Column(length = 128, nullable = false, unique = true)
+	private String name;
+
+	@Column(length = 64, nullable = false, unique = true)
+	private String alias;
+
+	@Column(length = 128, nullable = false)
+	private String image;
+
+	private boolean enabled;
+
+	@OneToOne
+	@JoinColumn(name = "parent_id")
+	private Category parent;
+
+	@OneToMany(mappedBy = "parent")
+	private Set<Category> children = new HashSet<>();
+
+	public Category() {
+	}
+
+	public Category(Integer id) {
+		this.id = id;
+	}
+
+	public static Category copyIdAndName(Category category) {
+
+		Category copyCategory = new Category();
+		copyCategory.setName(category.getName());
+		copyCategory.setId(category.getId());
+
+		return copyCategory;
+	}
+
+	public static Category copyIdAndName(Integer id, String name) {
+
+		Category copyCategory = new Category();
+		copyCategory.setName(name);
+		copyCategory.setId(id);
+
+		return copyCategory;
+	}
+
+	/* create a copy of a category object in order to append the -- symbol to denote hierarchy level
+	 * */
+	public static Category copyFull(Category category) {
+
+		Category copyCategory = new Category();
+		copyCategory.setName(category.getName());
+		copyCategory.setId(category.getId());
+		copyCategory.setImage(category.getImage());
+		copyCategory.setAlias(category.getAlias());
+		copyCategory.setEnabled(category.isEnabled());
+
+		return copyCategory;
+	}
+	
+	/* create a copy of a category object in order to append the -- symbol to denote hierarchy level
+	 * */
+	public static Category copyFull(Category category, String name) {
+
+		Category copyCategory = Category.copyFull(category);
+		copyCategory.setName(name);
+
+		return copyCategory;
+	}
+	
+	
+
+	public Category(String name) {
+		this.name = name;
+		this.alias = name;
+		this.image = "default.png";
+
+	}
+
+	public Category(String name, Category parent) {
+		this(name);
+		this.parent = parent;
+	}
+
+	public Integer getId() {
+		return id;
+	}
+
+	public void setId(Integer id) {
+		this.id = id;
+	}
+
+	public String getName() {
+		return name;
+	}
+
+	public void setName(String name) {
+		this.name = name;
+	}
+
+	public String getAlias() {
+		return alias;
+	}
+
+	public void setAlias(String alias) {
+		this.alias = alias;
+	}
+
+	public String getImage() {
+		return image;
+	}
+
+	public void setImage(String image) {
+		this.image = image;
+	}
+
+	public boolean isEnabled() {
+		return enabled;
+	}
+
+	public void setEnabled(boolean enabled) {
+		this.enabled = enabled;
+	}
+
+	public Category getParent() {
+		return parent;
+	}
+
+	public void setParent(Category parent) {
+		this.parent = parent;
+	}
+
+	public Set<Category> getChildren() {
+		return children;
+	}
+
+	public void setChildren(Set<Category> children) {
+		this.children = children;
+	}
+
+}
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/50/e0fc5c199ab9001d10d0f9513979f945 b/.metadata/.plugins/org.eclipse.core.resources/.history/50/e0fc5c199ab9001d10d0f9513979f945
new file mode 100644
index 00000000..b86d3076
--- /dev/null
+++ b/.metadata/.plugins/org.eclipse.core.resources/.history/50/e0fc5c199ab9001d10d0f9513979f945
@@ -0,0 +1,94 @@
+package com.shopme.admin.category;
+
+import java.io.IOException;
+import java.util.List;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.scheduling.support.SimpleTriggerContext;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
+import org.springframework.util.StringUtils;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.ModelAttribute;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.multipart.MultipartFile;
+import org.springframework.web.servlet.mvc.support.RedirectAttributes;
+
+import com.shopme.admin.FileUploadUtil;
+import com.shopme.common.entity.Category;
+
+@Controller
+public class CategoryController {
+	
+	@Autowired
+	private CategoryService service;
+	
+	@GetMapping("/categories")
+	public String listAll(Model model) {
+		
+		List<Category> listCategories = service.listAll();
+		model.addAttribute("listCategories", listCategories);
+		
+		return "categories/categories";
+	}
+	
+	
+	@GetMapping("/categories/new")
+	public String newCategory(Model model) {
+		
+		List<Category> listCategories = service.listCategoriesUsedInForm();
+		
+		model.addAttribute("category", new Category());
+		model.addAttribute("listCategories", listCategories);
+		model.addAttribute("pageTitle", "Create New Category");
+		
+		return "categories/category_form";
+	
+	}
+	
+	@PostMapping("/categories/save")
+	public String saveCategory(@ModelAttribute("category") Category category, 
+			RedirectAttributes redirectAttributes,
+			@RequestParam("fileImage") MultipartFile multipartFile) throws IOException {
+		
+		String fileName = StringUtils.cleanPath(multipartFile.getOriginalFilename());
+		category.setImage(fileName);
+		
+		Category savedCategory = service.save(category);
+		String uploadDir = "../category-images/" + savedCategory.getId();
+		FileUploadUtil.saveFile(uploadDir, fileName, multipartFile);
+		
+		
+		redirectAttributes.addFlashAttribute("message", "the category have been saved successfully");
+		
+		
+		return "redirect:/categories";
+	}
+
+	
+	@GetMapping("/categories/edit/{id}")
+	public String editCategory(@PathVariable(name = "id") Integer id, Model model,
+			RedirectAttributes ra) {
+		try {
+			Category category = service.get(id);
+			List<Category> listCategories = service.listCategoriesUsedInForm();
+			
+			model.addAttribute("category", category);
+			model.addAttribute("listCategories", listCategories);
+			model.addAttribute("pageTitle", "Edit Category (ID: " + id + ")");
+			
+			return "categories/category_form";			
+		} catch (CategoryNotFoundException ex) {
+			ra.addFlashAttribute("message", ex.getMessage());
+			return "redirect:/categories";
+		}
+	}
+	
+	
+	
+}
+	
+
+
+
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/51/1032ce610db9001d11addcb4256c67f9 b/.metadata/.plugins/org.eclipse.core.resources/.history/51/1032ce610db9001d11addcb4256c67f9
new file mode 100644
index 00000000..56a32ccb
--- /dev/null
+++ b/.metadata/.plugins/org.eclipse.core.resources/.history/51/1032ce610db9001d11addcb4256c67f9
@@ -0,0 +1,206 @@
+<!DOCTYPE html>
+<html xmlns:th="http://www.thymeleaf.org">
+
+<head th:replace="fragments :: page_head('Categories - Shopme Admin')"/>
+
+<body>
+	<div class="container-fluid">
+		
+		<!-- navigation bar -->
+		<div th:replace="navigation :: menu"></div>
+
+		<div>
+			<h2>Manage Categories</h2>
+			<a th:href="@{/categories/new}" class="fas fa-folder-plus fa-2x icon-dark mr-2"></a>
+			
+			<a th:href="@{/categories/export/csv}" class="fas fa-file-csv fa-2x icon-dark mr-2"></a>
+		</div>
+		
+		<!-- redirect message from controller -->
+		<div th:if="${message != null}" class="alert alert-success text-center">
+			[[${message}]]
+		</div>
+		
+			
+		<div>
+			<form th:action="@{/categories/page/1}" class="form-inline m-3">
+				
+				Filter:&nbsp;
+				<input type="search" name="keyword" th:value="${keyword}" class="form-control" required/>
+				&nbsp;&nbsp;
+				<button type="submit" class="btn btn-primary">
+					<i class="fas fa-search"></i>
+				</button>
+				&nbsp;&nbsp;
+				<button type="button" class="btn btn-secondary" onclick="clearFilter()">
+					<i class="fas fa-eraser"></i>
+				</button>
+			</form>
+		
+		</div>
+
+			<!-- css class to display this table in large screens only , refer to static/style.css for more info-->
+			<div class="full-details">
+				<table class="table table-bordered table-striped table-hover table-responsive-xL">
+					<thead class="thead-dark">
+						<tr>
+							<th>ID</th>
+							<th>Category Image</th>
+							<th>Category Name</th>
+							<th>Alias</th>
+							<th>Enabled</th>
+							<th></th>
+						</tr>
+					</thead>
+					<tbody>
+						<tr th:each="cat : ${listCategories}">
+							<td>[[${cat.id}]]</td>
+							<td>	
+								<img th:src="@{${cat.imagePath}}" style="width: 100px;" class="image-fluid"/>
+							</td>
+							<td>[[${cat.name}]]</td>
+							<td>[[${cat.alias}]]</td>
+							<td>
+								<div th:replace="fragments :: category_status"></div>
+							</td>
+							<td>
+								<div th:replace="fragments :: category_actions"></div>
+							</td>
+						</tr>
+					</tbody>
+				</table>
+			</div>
+			
+			
+			<!-- css class to display this <div> on mobile screens only, refer to /static/style.css for more info-->
+			<div class="less-details">
+				
+				<div th:each="user : ${listUsers}" class="row m-1">
+					
+					<div class="col-4">
+						
+						<span th:if="${user.photos == null}" class="fas fa-portrait fa-3x icon-dark"></span>
+								<img th:if="${user.photos != null}" th:src="@{${user.photosImagePath}}"
+								style="width: 100px"/>
+					</div>
+					
+					<div class="col-8">
+						<div>[[${user.fullName}]]</div>
+						<div>[[${user.roles}]]</div>
+						<div class="mt-2">
+							<a th:if="${user.enabled == true}" class="fas fa-check-circle fa-2x icon-green" 
+								th:href="@{'/users/' + ${user.id} + '/enabled/false'}"
+								title="Disable this user"></a>
+								
+							<a th:if="${user.enabled == false}" class="fas fa-circle fa-2x icon-silver"
+								 th:href="@{'/users/' + ${user.id} + '/enabled/true'}"
+								 title="Enable this user"></a>
+						
+									&nbsp;
+							<a class="fas fa-edit fa-2x icon-green" th:href="@{'/users/edit/' + ${user.id}}"
+									title="edit this user"></a>
+									&nbsp; 
+							<a class="fas fa-trash fa-2x icon-dark link-delete" th:href="@{'/users/delete/' + ${user.id}}"
+									title="delete this user" th:userId="${user.id}"></a>
+						</div>
+					</div>
+					<div>&nbsp;</div>
+				</div>
+			</div>
+			
+			
+			<!-- IF -->
+			<div class="text-center m-1" th:if="${totalItems > 0}">
+				<span>Showing Users # [[${startCount}]] to [[${endCount}]] of [[${totalItems}]]</span>
+			</div>
+			
+			<!-- ELSE -->
+			<div class="text-center m-1" th:unless="${totalItems > 0}">
+				<span>No users found</span>
+			</div>
+			
+			<!-- only display pagination when there are users; else, no users no pagination -->
+			<div th:if="${totalPages > 1}">
+				<nav>
+					  <ul class="pagination justify-content-center flex-wrap">
+					  
+					  	<li th:class=" ${currentPage > 1 ? 'page-item' : 'page-item disabled'}">
+					  		<a th:replace="fragments :: page_link(1, 'First')"></a>
+				    	</li>
+					  
+					    <li th:class=" ${currentPage > 1 ? 'page-item' : 'page-item disabled'}">
+					    	<a th:replace="fragments :: page_link(${currentPage - 1 }, 'previous')"></a>
+				    	</li>
+					    	
+					    <!-- org.thymeleaf.expression.Numbers class, An object of this class is usually available in variable evaluation expressions with the name #numbers. -->
+					    <li th:class="${currentPage != i ? 'page-item' : 'page-item active'}" 
+					    	th:each="i : ${#numbers.sequence(1, totalPages)}">
+					    	<a th:replace="fragments :: page_link(${i}, ${i})"></a>
+					    </li>
+					    
+					    <li  th:class=" ${currentPage < totalPages ? 'page-item' : 'page-item disabled'}">
+					    	<a th:replace="fragments :: page_link(${currentPage + 1}, 'Next')"></a>
+					    </li>
+					    
+					    <li th:class=" ${currentPage < totalPages ? 'page-item' : 'page-item disabled'}">
+							<a th:replace="fragments :: page_link(${totalPages}, 'Last')"></a>		
+					    </li>
+					  </ul>
+				</nav>
+			</div>
+			
+			
+			
+			<div class="modal fade text-center" id="confirmModal">
+				<div class="modal-dialog">
+					<div class="modal-content">
+					
+						<div class="modal-header">
+							<h4 class="modal-title">Delete Confirmation</h4>
+							<button type="button" class="close" data-dismiss="modal">&times;</button>
+						</div>
+						
+						<div class="modal-body">
+							<span id="confirmText"></span>
+						</div>
+						
+						<div class="modal-footer">
+							<a class="btn btn-success" href="" id="yesButton">Yes</a>
+							<button type="button" class="btn btn-danger" data-dismiss="modal">Close</button>
+						</div>
+					</div>
+				</div>
+			</div>
+			
+			<!-- footer -->
+			<div th:replace="fragments :: footer"></div>
+
+
+	</div>
+	
+<script type="text/javascript">
+
+//confirmation modal dialogue for delete user
+$(document).ready(function(){
+	$(".link-delete").on("click", function(e){
+		//stop the <a> tag default behaviour and pop out a confirmation modal dialogue
+		e.preventDefault();
+		//alert($(this).attr("href"));
+		link = $(this);
+		userId = link.attr("userId");
+		$("#yesButton").attr("href", link.attr("href"));
+		$("#confirmText").text("Are you sure you want to delete this user ID " + userId + "?");
+		$("#confirmModal").modal();
+	});
+});
+
+	function clearFilter(){
+		window.location = "[[@{/users}]]";
+	}
+
+
+</script>
+	
+</body>
+
+</html>
\ No newline at end of file
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/51/40822ea552b4001d1d079a924effdc9e b/.metadata/.plugins/org.eclipse.core.resources/.history/51/40822ea552b4001d1d079a924effdc9e
deleted file mode 100644
index b46b772c..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/51/40822ea552b4001d1d079a924effdc9e
+++ /dev/null
@@ -1,20 +0,0 @@
-$(document).ready(function(){
-		$("#logoutLink").on("click", function(e){
-			e.preventDefault(); /* stop the hyperlink default behaviour  */
-			
-			/* use  the form to  log out and navigate to the url path /logout  
-			
-			 NOTE: spring security requires a POST request form to logout in order to obtain the csrf token, 
-			 		the csrf token is a hidden property in the form
-			*/
-			document.logoutForm.submit();
-		});
-		
-		customizeDropDownMenu();
-	});
-	
-function customizeDropDownMenu() {
-	
-	
-}
-	
\ No newline at end of file
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/51/408addd452b4001d1d079a924effdc9e b/.metadata/.plugins/org.eclipse.core.resources/.history/51/408addd452b4001d1d079a924effdc9e
deleted file mode 100644
index 94dadb40..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/51/408addd452b4001d1d079a924effdc9e
+++ /dev/null
@@ -1,22 +0,0 @@
-$(document).ready(function(){
-		$("#logoutLink").on("click", function(e){
-			e.preventDefault(); /* stop the hyperlink default behaviour  */
-			
-			/* use  the form to  log out and navigate to the url path /logout  
-			
-			 NOTE: spring security requires a POST request form to logout in order to obtain the csrf token, 
-			 		the csrf token is a hidden property in the form
-			*/
-			document.logoutForm.submit();
-		});
-		
-		customizeDropDownMenu();
-	});
-	
-	
-function customizeDropDownMenu() {
-	
-	$(".dropdown > a").click()
-	
-}
-	
\ No newline at end of file
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/51/60301fde8db3001d19bbb001c1a81c20 b/.metadata/.plugins/org.eclipse.core.resources/.history/51/60301fde8db3001d19bbb001c1a81c20
deleted file mode 100644
index 0bab05ad..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/51/60301fde8db3001d19bbb001c1a81c20
+++ /dev/null
@@ -1,33 +0,0 @@
-*.icon-white{color: white}
-*.icon-silver{color: silver}
-*.icon-green{color: green}
-*.icon-dark{color: gray}
-*.icon-red{color: red}
-
-
-
-@media screen and (max-width: 768px) {
-	/* small screen eg:mobile*/
-	
-	div.full-details{ display: none;}
-	div.less-details{ display: block;}
-	
-}
-
-@media screen and (min-width: 768px) and (max-width: 1024px) {
-	/* medium screen eg:tablet*/
-	
-	div.full-details{ display: block;}
-	div.less-details{ display: none;}
-	
-	th, td .hidable-column{display: none;}
-	
-}
-
-
-@media screen and (min-width: 1024px) {
-	/* large screen eg:laptop*/
-	
-	div.less-details{ display: none;}
-	
-}
\ No newline at end of file
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/52/6009e6e94ab4001d1d079a924effdc9e b/.metadata/.plugins/org.eclipse.core.resources/.history/52/6009e6e94ab4001d1d079a924effdc9e
deleted file mode 100644
index 6b7cc469..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/52/6009e6e94ab4001d1d079a924effdc9e
+++ /dev/null
@@ -1,81 +0,0 @@
-package com.shopme.admin.security;
-
-import org.aspectj.weaver.ast.And;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.security.authentication.dao.DaoAuthenticationProvider;
-import org.springframework.security.config.annotation.web.builders.HttpSecurity;
-import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
-import org.springframework.security.config.annotation.web.configuration.WebSecurityConfiguration;
-import org.springframework.security.config.annotation.web.configuration.WebSecurityCustomizer;
-import org.springframework.security.core.userdetails.UserDetailsService;
-import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
-import org.springframework.security.crypto.password.PasswordEncoder;
-import org.springframework.security.web.SecurityFilterChain;
-
-@Configuration
-@EnableWebSecurity
-public class WebSecurityConfig {
-
-	/*
-	 * refer to this link: https://www.codejava.net/frameworks/spring-boot/fix-
-	 * websecurityconfigureradapter-deprecated
-	 * 
-	 */
-	
-	
-	 /* This bean will be called by spring security when performing authentication*/ 
-	@Bean
-	public UserDetailsService  userDetailsService()	{
-		return new ShopmeUserDetailsService();
-	}
-	
-
-	@Bean
-	public PasswordEncoder passwordEncoder() {
-		return new BCryptPasswordEncoder();
-	}
-
-	
-	@Bean
-	public DaoAuthenticationProvider authenticationProvider() {
-	    DaoAuthenticationProvider authProvider = new DaoAuthenticationProvider();
-	     
-	    authProvider.setUserDetailsService(userDetailsService());
-	    authProvider.setPasswordEncoder(passwordEncoder());
-	 
-	    return authProvider;
-	}
-	
-	
-	@Bean
-	public SecurityFilterChain filterChain(HttpSecurity http) throws Exception {
-
-		// any request need to be authenticated (require login)
-		// custom login page at "/login" - handler method in MainController class
-		http.authorizeHttpRequests()
-			.anyRequest().authenticated()
-			.and()
-			.formLogin()
-				.loginPage("/login")
-				.usernameParameter("email")
-				.permitAll()
-			.and().logout().permitAll()
-			.and().rememberMe().key("AbcDefgHijKlmnOpqrs_1234567890"); 
-				// set a fix key used for the md5 hash algorithm to encrypt cookie content
-		
-		http.authenticationProvider(authenticationProvider());
-		
-		
-		return http.build();
-	}
-
-	//NOTE: antMatchers() changed to requestMatchers()
-	//stack: https://stackoverflow.com/questions/74907533/the-method-antmatchersstring-is-undefined-for-the-type
-	@Bean
-	public WebSecurityCustomizer webSecurityCustomizer() {
-		//permit access to the assets in the following directories
-		return (web) -> web.ignoring().requestMatchers("/images/**", "/js/**", "/webjars/**");
-	}
-
-}
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/43/20f2666066b7001d19ef99be8d31e273 b/.metadata/.plugins/org.eclipse.core.resources/.history/52/e07f7eb8c4b9001d10d0f9513979f945
similarity index 78%
rename from .metadata/.plugins/org.eclipse.core.resources/.history/43/20f2666066b7001d19ef99be8d31e273
rename to .metadata/.plugins/org.eclipse.core.resources/.history/52/e07f7eb8c4b9001d10d0f9513979f945
index 839672aa..0dc26190 100644
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/43/20f2666066b7001d19ef99be8d31e273
+++ b/.metadata/.plugins/org.eclipse.core.resources/.history/52/e07f7eb8c4b9001d10d0f9513979f945
@@ -46,5 +46,27 @@
 	   th:href= "@{'/users/page/' + ${pageNum} + '?sortField=' + ${sortField} + '&sortDir=' + ${sortDir} + ${keyword != null ? '&keyword=' + keyword : ''}}">[[${label}]]</a>
 	
 	
+	<div th:fragment="category_status">
+	
+		  <!--  <a  href="" class="fas fa-check-circle fa-2x icon-green" 
+				
+				title="Disable this category"></a> -->
+								
+								
+			<a href="" class="fas fa-circle fa-2x icon-silver"
+				
+				title="Enable this category"></a> 
+	</div>	
+	
+	<div th:fragment="category_actions">	
+					
+			<a href="" class="fas fa-edit fa-2x icon-green" 
+					title="edit this category"></a>
+					&nbsp; 
+			<a href="" class="fas fa-trash fa-2x icon-dark link-delete" 
+					title="delete this category"></a>	 		
+	</div>	
+	
+	
 </body>
 </html>
\ No newline at end of file
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/53/70cf4a9763b3001d19bbb001c1a81c20 b/.metadata/.plugins/org.eclipse.core.resources/.history/53/70cf4a9763b3001d19bbb001c1a81c20
deleted file mode 100644
index ee067bc5..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/53/70cf4a9763b3001d19bbb001c1a81c20
+++ /dev/null
@@ -1,179 +0,0 @@
-package com.shopme.admin.user;
-
-import java.io.IOException;
-import java.util.List;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.domain.Page;
-import org.springframework.data.repository.query.Param;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
-import org.springframework.util.StringUtils;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.ModelAttribute;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.multipart.MultipartFile;
-import org.springframework.web.servlet.mvc.support.RedirectAttributes;
-
-import com.fasterxml.jackson.annotation.ObjectIdGenerators.StringIdGenerator;
-import com.shopme.admin.FileUploadUtil;
-import com.shopme.common.entity.Role;
-import com.shopme.common.entity.User;
-
-@Controller
-public class UserController {
-
-	@Autowired
-	private UserService service;
-
-	@GetMapping("/users")
-	public String listFirstPage(Model model) {
-		
-		//NOTE: these are the default values for path variable and URL parameters
-		return listByPage(1, model, "firstName", "asc", null);
-	}
-
-	@GetMapping("/users/page/{pageNum}")
-	public String listByPage(@PathVariable(name = "pageNum") int pageNum, Model model,
-			@Param("sortField") String sortField, @Param("sortDir") String sortDir,
-			@Param("keyword") String keyword) {
-		
-		System.out.println("sort field: " + sortField);
-		System.out.println("sort order: " + sortDir);
-		
-		Page<User> page = service.listByPage(pageNum, sortField, sortDir, keyword);
-		List<User> listUsers = page.getContent();
-
-		
-		long startCount = (pageNum - 1) * UserService.USERS_PER_PAGE + 1;
-		long endCount = startCount + UserService.USERS_PER_PAGE - 1;
-		if(endCount > page.getTotalElements()) {
-			endCount = page.getTotalElements();
-		}
-		
-		String reverseSortDir = sortDir.equals("asc") ? "desc" : "asc";
-		
-		model.addAttribute("currentPage", pageNum);
-		model.addAttribute("totalPages", page.getTotalPages());
-		model.addAttribute("startCount", startCount);
-		model.addAttribute("endCount", endCount);
-		model.addAttribute("totalItems", page.getTotalElements());
-		model.addAttribute("listUsers", listUsers);
-		model.addAttribute("sortField", sortField);
-		model.addAttribute("sortDir", sortDir);
-		model.addAttribute("reverseSortDir", reverseSortDir);
-		model.addAttribute("keyword", keyword);
-		
-
-		return "users";
-
-	}
-
-	@GetMapping("/users/new")
-	public String newUser(Model model) {
-
-		List<Role> listRoles = service.listRoles();
-
-		User user = new User();
-		user.setEnabled(true);
-
-		model.addAttribute("user", user);
-		model.addAttribute("listRoles", listRoles);
-		model.addAttribute("pageTitle", "Create New User");
-
-		return "user_form";
-
-	}
-
-	// using @RequestParam, we can get the image file input, the input has the
-	// property name="image"
-	@PostMapping("/users/save")
-	public String saveUser(@ModelAttribute("user") User user, RedirectAttributes redirectAttributes,
-			@RequestParam("image") MultipartFile multipartFile) throws IOException {
-
-		if (!multipartFile.isEmpty()) {
-
-			String fileName = StringUtils.cleanPath(multipartFile.getOriginalFilename());
-			user.setPhotos(fileName);
-
-			User savedUser = service.save(user);
-
-			String uploadDir = "user-photos/" + savedUser.getId();
-
-			FileUploadUtil.cleanDir(uploadDir);
-			FileUploadUtil.saveFile(uploadDir, fileName, multipartFile);
-		} else {
-
-			// set photo to null for getPhotosImagePath() method's conditional statement in
-			// User class
-			if (user.getPhotos().isEmpty())
-				user.setPhotos(null);
-			service.save(user);
-		}
-
-		redirectAttributes.addFlashAttribute("message", "the user has been saved successfully");
-
-		// POST/REDIRECT/GET web design
-		return getRedirectURLtoAffectedUser(user);
-	}
-
-	private String getRedirectURLtoAffectedUser(User user) {
-		
-		//after user is saved display the user instead of the entire user list
-		//email is a unique field to identify each user.
-		String firstPartOfEmail = user.getEmail().split("@")[0];
-		return "redirect:/users/page/1?sortField=id&sortDir=asc&keyword=" + firstPartOfEmail;
-	}
-
-	@GetMapping("/users/edit/{id}")
-	public String editUser(@PathVariable(name = "id") Integer id, RedirectAttributes redirectAttributes, Model model) {
-		try {
-			User user = service.get(id);
-			List<Role> listRoles = service.listRoles();
-
-			model.addAttribute("user", user);
-			model.addAttribute("pageTitle", "Edit User (ID: " + id + ")");
-			model.addAttribute("listRoles", listRoles);
-
-			return "user_form";
-		} catch (UserNotFoundException ex) {
-			redirectAttributes.addFlashAttribute("message", ex.getMessage());
-
-			return "redirect:/users";
-		}
-
-	}
-
-	@GetMapping("/users/delete/{id}")
-	public String deleteUser(@PathVariable(name = "id") Integer id, RedirectAttributes redirectAttributes,
-			Model model) {
-		try {
-			service.delete(id);
-			redirectAttributes.addFlashAttribute("message", "The user ID " + id + " has been deleted successfully.");
-
-		} catch (UserNotFoundException ex) {
-			redirectAttributes.addFlashAttribute("message", ex.getMessage());
-
-		}
-
-		return "redirect:/users";
-	}
-
-	@GetMapping("/users/{id}/enabled/{status}")
-	public String updateUserEnabledStatus(@PathVariable(name = "id") Integer id,
-			@PathVariable(name = "status") boolean enabled, RedirectAttributes redirectAttributes) {
-
-		service.updateUserEnabledStatus(id, enabled);
-		String status = enabled ? "enabled" : "disabled";
-		String message = "The user id " + id + " has been " + status;
-		redirectAttributes.addFlashAttribute("message", message);
-
-		return "redirect:/users";
-	}
-
-	@GetMapping("/users/export/csv")
-	
-	
-}
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/53/b0adeb7853b4001d1d079a924effdc9e b/.metadata/.plugins/org.eclipse.core.resources/.history/53/b0adeb7853b4001d1d079a924effdc9e
deleted file mode 100644
index b13801b8..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/53/b0adeb7853b4001d1d079a924effdc9e
+++ /dev/null
@@ -1,183 +0,0 @@
-package com.shopme.admin.user;
-
-import java.io.IOException;
-import java.util.List;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.domain.Page;
-import org.springframework.data.repository.query.Param;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
-import org.springframework.util.StringUtils;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.ModelAttribute;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.multipart.MultipartFile;
-import org.springframework.web.servlet.mvc.support.RedirectAttributes;
-
-import com.fasterxml.jackson.annotation.ObjectIdGenerators.StringIdGenerator;
-import com.shopme.admin.FileUploadUtil;
-import com.shopme.common.entity.Role;
-import com.shopme.common.entity.User;
-
-import jakarta.servlet.http.HttpServletResponse;
-
-@Controller
-public class UserController {
-
-	@Autowired
-	private UserService service;
-
-	@GetMapping("/users")
-	public String listFirstPage(Model model) {
-
-		// NOTE: these are the default values for path variable and URL parameters
-		return listByPage(1, model, "firstName", "asc", null);
-	}
-
-	@GetMapping("/users/page/{pageNum}")
-	public String listByPage(@PathVariable(name = "pageNum") int pageNum, Model model,
-			@Param("sortField") String sortField, @Param("sortDir") String sortDir, @Param("keyword") String keyword) {
-
-		System.out.println("sort field: " + sortField);
-		System.out.println("sort order: " + sortDir);
-
-		Page<User> page = service.listByPage(pageNum, sortField, sortDir, keyword);
-		List<User> listUsers = page.getContent();
-
-		long startCount = (pageNum - 1) * UserService.USERS_PER_PAGE + 1;
-		long endCount = startCount + UserService.USERS_PER_PAGE - 1;
-		if (endCount > page.getTotalElements()) {
-			endCount = page.getTotalElements();
-		}
-
-		String reverseSortDir = sortDir.equals("asc") ? "desc" : "asc";
-
-		model.addAttribute("currentPage", pageNum);
-		model.addAttribute("totalPages", page.getTotalPages());
-		model.addAttribute("startCount", startCount);
-		model.addAttribute("endCount", endCount);
-		model.addAttribute("totalItems", page.getTotalElements());
-		model.addAttribute("listUsers", listUsers);
-		model.addAttribute("sortField", sortField);
-		model.addAttribute("sortDir", sortDir);
-		model.addAttribute("reverseSortDir", reverseSortDir);
-		model.addAttribute("keyword", keyword);
-
-		return "users";
-
-	}
-
-	@GetMapping("/users/new")
-	public String newUser(Model model) {
-
-		List<Role> listRoles = service.listRoles();
-
-		User user = new User();
-		user.setEnabled(true);
-
-		model.addAttribute("user", user);
-		model.addAttribute("listRoles", listRoles);
-		model.addAttribute("pageTitle", "Create New User");
-
-		return "user_form";
-
-	}
-
-	// using @RequestParam, we can get the image file input, the input has the
-	// property name="image"
-	@PostMapping("/users/save")
-	public String saveUser(@ModelAttribute("user") User user, RedirectAttributes redirectAttributes,
-			@RequestParam("image") MultipartFile multipartFile) throws IOException {
-
-		if (!multipartFile.isEmpty()) {
-
-			String fileName = StringUtils.cleanPath(multipartFile.getOriginalFilename());
-			user.setPhotos(fileName);
-
-			User savedUser = service.save(user);
-
-			String uploadDir = "user-photos/" + savedUser.getId();
-
-			FileUploadUtil.cleanDir(uploadDir);
-			FileUploadUtil.saveFile(uploadDir, fileName, multipartFile);
-		} else {
-
-			// set photo to null for getPhotosImagePath() method's conditional statement in
-			// User class
-			if (user.getPhotos().isEmpty())
-				user.setPhotos(null);
-			service.save(user);
-		}
-
-		redirectAttributes.addFlashAttribute("message", "the user has been saved successfully");
-
-		// POST/REDIRECT/GET web design
-		return getRedirectURLtoAffectedUser(user);
-	}
-
-	private String getRedirectURLtoAffectedUser(User user) {
-
-		// after user is saved display the user instead of the entire user list
-		// email is a unique field to identify each user.
-		String firstPartOfEmail = user.getEmail().split("@")[0];
-		return "redirect:/users/page/1?sortField=id&sortDir=asc&keyword=" + firstPartOfEmail;
-	}
-
-	@GetMapping("/users/edit/{id}")
-	public String editUser(@PathVariable(name = "id") Integer id, RedirectAttributes redirectAttributes, Model model) {
-		try {
-			User user = service.get(id);
-			List<Role> listRoles = service.listRoles();
-
-			model.addAttribute("user", user);
-			model.addAttribute("pageTitle", "Edit User (ID: " + id + ")");
-			model.addAttribute("listRoles", listRoles);
-
-			return "user_form";
-		} catch (UserNotFoundException ex) {
-			redirectAttributes.addFlashAttribute("message", ex.getMessage());
-
-			return "redirect:/users";
-		}
-
-	}
-
-	@GetMapping("/users/delete/{id}")
-	public String deleteUser(@PathVariable(name = "id") Integer id, RedirectAttributes redirectAttributes,
-			Model model) {
-		try {
-			service.delete(id);
-			redirectAttributes.addFlashAttribute("message", "The user ID " + id + " has been deleted successfully.");
-
-		} catch (UserNotFoundException ex) {
-			redirectAttributes.addFlashAttribute("message", ex.getMessage());
-
-		}
-
-		return "redirect:/users";
-	}
-
-	@GetMapping("/users/{id}/enabled/{status}")
-	public String updateUserEnabledStatus(@PathVariable(name = "id") Integer id,
-			@PathVariable(name = "status") boolean enabled, RedirectAttributes redirectAttributes) {
-
-		service.updateUserEnabledStatus(id, enabled);
-		String status = enabled ? "enabled" : "disabled";
-		String message = "The user id " + id + " has been " + status;
-		redirectAttributes.addFlashAttribute("message", message);
-
-		return "redirect:/users";
-	}
-
-	@GetMapping("/users/export/csv")
-	public void exportToCSV(HttpServletResponse response) throws IOException {
-
-		List<User> listUsers = service.listAll();
-		UserCsvExporter exporter = new UserCsvExporter();
-		exporter.export(listUsers, response);
-	}
-
-}
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/53/e04cd8f530b7001d19ef99be8d31e273 b/.metadata/.plugins/org.eclipse.core.resources/.history/53/e04cd8f530b7001d19ef99be8d31e273
deleted file mode 100644
index 474462f6..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/53/e04cd8f530b7001d19ef99be8d31e273
+++ /dev/null
@@ -1,55 +0,0 @@
-package com.shopme.admin.category;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
-import org.junit.jupiter.api.Test;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.autoconfigure.jdbc.AutoConfigureTestDatabase;
-import org.springframework.boot.test.autoconfigure.jdbc.AutoConfigureTestDatabase.Replace;
-import org.springframework.boot.test.autoconfigure.orm.jpa.DataJpaTest;
-import org.springframework.test.annotation.Rollback;
-
-import com.shopme.common.entity.Category;
-
-/*
- * Unit Test for CategoryRepository
- * 
- * objective:
- * 1. test the methods in repository 
- * 2. populate the database with records
- * 
-*/
-
-@DataJpaTest
-@AutoConfigureTestDatabase(replace = Replace.NONE)
-@Rollback(false)
-public class CategoryRepositoryTests {
-	
-	@Autowired
-	private CategoryRepository repo;
-	
-	@Test
-	public void testCreateRootCategory() {
-//		Category category = new Category("Computers");
-		Category category = new Category("Electronics");
-		Category savedCategory = repo.save(category);
-		
-		assertThat(savedCategory.getId()).isGreaterThan(0);
-		
-	}
-	
-	@Test
-	public void testCreateSubCategory() {
-		
-		// ID for root category "Computer" is 1
-		Category parent = new Category(1);
-		
-		Category subCategory = new Category("Desktops", parent);
-		
-		Category savedCategory = repo.save(subCategory);
-		
-		assertThat(savedCategory.getId()).isGreaterThan(0);
-	}
-	
-	
-}
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/55/f031650788b3001d19bbb001c1a81c20 b/.metadata/.plugins/org.eclipse.core.resources/.history/55/f031650788b3001d19bbb001c1a81c20
deleted file mode 100644
index 62efbf7c..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/55/f031650788b3001d19bbb001c1a81c20
+++ /dev/null
@@ -1,19 +0,0 @@
-*.icon-white{color: white}
-*.icon-silver{color: silver}
-*.icon-green{color: green}
-*.icon-dark{color: gray}
-*.icon-red{color: red}
-
-
-@media screen and (max-width: 768px) {
-	/* small screen */
-}
-
-@media screen and (min-width: 768px) and (max-width: 1024px) {
-	/* small screen */
-}
-
-
-@media screen and (mini-width: 1024px) {
-	/* small screen */
-}
\ No newline at end of file
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/56/40106cd745b4001d1d079a924effdc9e b/.metadata/.plugins/org.eclipse.core.resources/.history/56/40106cd745b4001d1d079a924effdc9e
deleted file mode 100644
index ddd3ad9c..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/56/40106cd745b4001d1d079a924effdc9e
+++ /dev/null
@@ -1,49 +0,0 @@
-<!DOCTYPE html>
-<html xmlns:th="http://www.thymeleaf.org">
-
-<head th:fragment="page_head(title)">
-	<meta http-equiv="Content-Type" content="text/html; charset= UTF-8">
-	<meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0">
-	<title>[[${title}]]</title>
-	
-	<link rel="stylesheet" type="text/css" th:href="@{/fontawesome/all.css}" />
-	<link rel="stylesheet" type="text/css" th:href="@{/style.css}" />
-	<link rel="stylesheet" type="text/css" th:href="@{/webjars/bootstrap/css/bootstrap.min.css}" />
-	
-	<script type="text/javascript" th:src="@{/webjars/jquery/jquery.min.js}"></script>
-	<script type="text/javascript" th:src="@{/webjars/bootstrap/js/bootstrap.min.js}"></script>
-</head>
-
-<body>
-	
-	
-		<div class="text-center">
-				<p>Shopme Control Panel - Copyright &copy; Shopme</p>
-		</div>
-	
-	
-		<!-- purpose: make code more succinct and readable 
-		project is easier to maintain
-		
-		use thymeleaf fragments -->
-
-	<!-- if  ${removeTag} == 'tag' then the <th> parent tag will be removed.  if ${removeTag} == 'none' then keep the <th> parent tag-->
-	<th th:fragment="column_link(fieldName, columnLabel, removeTag)" th:remove="${removeTag}">
-		<!-- follow the sort order of another sortField; if the other field is sortDir="asc", then the newly selected column will be sortDir="asc" too -->
-		<a class="text-white"
-		   th:href="@{'/users/page/' + ${currentPage} + '?sortField=' + ${fieldName} + '&sortDir=' + ${sortField != fieldName ? sortDir : reverseSortDir} + ${keyword != null ? '&keyword=' + keyword : ''}}">
-			[[${columnLabel}]]
-		</a>
-		
-		<span th:if="${sortField == fieldName}"
-		th:class="${sortDir == 'asc' ? 'fas fa-sort-up' : 'fas fa-sort-down'}"></span>
-	</th>
-	
-	
-	<a th:fragment="page_link(pageNum, label)"
-	   class="page-link"
-	   th:href= "@{'/users/page/' + ${pageNum} + '?sortField=' + ${sortField} + '&sortDir=' + ${sortDir} + ${keyword != null ? '&keyword=' + keyword : ''}}">[[${label}]]</a>
-	
-	
-</body>
-</html>
\ No newline at end of file
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/57/f0bed4e38bb3001d19bbb001c1a81c20 b/.metadata/.plugins/org.eclipse.core.resources/.history/57/f0bed4e38bb3001d19bbb001c1a81c20
deleted file mode 100644
index 5946588f..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/57/f0bed4e38bb3001d19bbb001c1a81c20
+++ /dev/null
@@ -1,259 +0,0 @@
-<!DOCTYPE html>
-<html xmlns:th="http://www.thymeleaf.org">
-
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset= UTF-8">
-<meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0">
-<title>Manage Users</title>
-
-<link rel="stylesheet" type="text/css" th:href="@{/webjars/bootstrap/css/bootstrap.min.css}" />
-<link rel="stylesheet" type="text/css" th:href="@{/fontawesome/all.css}" />
-<link rel="stylesheet" type="text/css" th:href="@{/style.css}" />
-	
-<script type="text/javascript" th:src="@{/webjars/jquery/jquery.min.js}"></script>
-<script type="text/javascript" th:src="@{/webjars/bootstrap/js/bootstrap.min.js}"></script>
-</head>
-
-<body>
-	<div class="container-fluid">
-		<div>
-			<nav class="navbar navbar-expand-lg bg-dark navbar-dark">
-				<a class="navbar-brand" th:href="@{/}"> <img
-					th:src="@{/images/ShopmeAdminSmall.png}" />
-				</a>
-				<!--hamburger toggler for mobile devices(responsive)-->
-				<button class="navbar-toggler" type="button" data-toggle="collapse"
-					data-target="#topNavbar">
-					<span class="navbar-toggler-icon"></span>
-				</button>
-				<div class="collapse navbar-collapse" id="topNavbar">
-					<ul class="navbar-nav">
-						<li class="nav-item"><a class="nav-link" th:href="@{/users}">Users</a>
-						</li>
-						<li class="nav-item"><a class="nav-link"
-							th:href="@{/categories}">Categories</a></li>
-						<li class="nav-item"><a class="nav-link" th:href="@{/brands}">Brands</a>
-						</li>
-						<li class="nav-item"><a class="nav-link"
-							th:href="@{/products}">Products</a></li>
-						<li class="nav-item"><a class="nav-link"
-							th:href="@{/customers}">Customers</a></li>
-						<li class="nav-item"><a class="nav-link"
-							th:href="@{/shipping}">Shipping</a></li>
-						<li class="nav-item"><a class="nav-link" th:href="@{/orders}">Orders</a>
-						</li>
-						<li class="nav-item"><a class="nav-link" th:href="@{/report}">Sales
-								Report</a></li>
-						<li class="nav-item"><a class="nav-link"
-							th:href="@{/articles}">Articles</a></li>
-						<li class="nav-item"><a class="nav-link" th:href="@{/menus}">Menus</a>
-						</li>
-						<li class="nav-item"><a class="nav-link"
-							th:href="@{/settings}">Settings</a></li>
-					</ul>
-				</div>
-
-			</nav>
-		</div>
-
-		<div>
-			<h2>Manage Users</h2>
-			<a th:href="@{/users/new}" class="fas fa-user-plus fa-2x icon-dark mr-2"></a>
-			
-			<a th:href="@{/users/export/csv}" class="fas fa-file-csv fa-2x icon-dark mr-2"></a>
-		</div>
-		
-		
-		
-		<!-- only display success message when a new user is created -->
-		<div th:if="${message != null}" class="alert alert-success text-center">
-			[[${message}]]
-		</div>
-			
-		<div>
-			<form th:action="@{/users/page/1}" class="form-inline m-3">
-				
-				<input type="hidden" name="sortField" th:value="${sortField}" />
-				<input type="hidden" name="sortDir" th:value="${sortDir}" />
-				Filter:&nbsp;
-				<input type="search" name="keyword" th:value="${keyword}" class="form-control" required/>
-				&nbsp;&nbsp;
-				<button type="submit" class="btn btn-primary">
-					<i class="fas fa-search"></i>
-				</button>
-				&nbsp;&nbsp;
-				<button type="button" class="btn btn-secondary" onclick="clearFilter()">
-					<i class="fas fa-eraser"></i>
-				</button>
-			</form>
-		
-		</div>
-
-
-			<div class="full-details">
-				<table class="table table-bordered table-striped table-hover table-responsive-xL">
-					<thead class="thead-dark">
-						<tr>
-							<!-- refer to templates/fragments.html for fragment code-->
-							<th th:replace="fragments :: column_link('id', 'User ID')"/>
-							<th>Photos</th>
-							<th th:replace="fragments :: column_link('email', 'Email')"/>
-							<th th:replace="fragments :: column_link('firstName', 'First Name')"/>
-							<th th:replace="fragments :: column_link('lastName', 'Last Name')"/>
-							<th>Roles</th>
-							<th th:replace="fragments :: column_link('enabled', 'Enabled')"/>
-							<th></th>
-						</tr>
-					</thead>
-					<tbody>
-						<tr th:each="user : ${listUsers}">
-							<td>[[${user.id}]]</td>
-							<td>
-								<span th:if="${user.photos == null}" class="fas fa-portrait fa-3x icon-dark"></span>
-								<img th:if="${user.photos != null}" th:src="@{${user.photosImagePath}}"
-								style="width: 100px"/>
-							</td>
-							<td>[[${user.email}]]</td>
-							<td>[[${user.firstName}]]</td>
-							<td>[[${user.lastName}]]</td>
-							<td>[[${user.roles}]]</td>
-							
-							<td>
-								<a th:if="${user.enabled == true}" class="fas fa-check-circle fa-2x icon-green" 
-								th:href="@{'/users/' + ${user.id} + '/enabled/false'}"
-								title="Disable this user"></a>
-								
-								<a th:if="${user.enabled == false}" class="fas fa-circle fa-2x icon-silver"
-								 th:href="@{'/users/' + ${user.id} + '/enabled/true'}"
-								 title="Enable this user"></a>
-							</td>
-							<td>
-									<a class="fas fa-edit fa-2x icon-green" th:href="@{'/users/edit/' + ${user.id}}"
-									title="edit this user"></a>
-									&nbsp; 
-									<a class="fas fa-trash fa-2x icon-dark link-delete" th:href="@{'/users/delete/' + ${user.id}}"
-									title="delete this user" th:userId="${user.id}"></a>
-							</td>
-						</tr>
-					</tbody>
-				</table>
-			</div>
-			
-			
-			<!-- display this on mobile screens only, refer to /static/style.css for more info-->
-			<div class="less-details">
-				
-				<div th:each="user : ${listUsers}" class="row m-1">
-					
-					<div class="col">
-						
-						<span th:if="${user.photos == null}" class="fas fa-portrait fa-3x icon-dark"></span>
-								<img th:if="${user.photos != null}" th:src="@{${user.photosImagePath}}"
-								style="width: 100px"/>
-					</div>
-						<div class="col">
-							<div>[[${user.fullName}]]</div>
-							<div>[[${user.roles}]]</div>
-						</div>
-					<div>&nbsp;</div>
-				</div>
-			</div>
-			
-			
-			<!-- IF -->
-			<div class="text-center m-1" th:if="${totalItems > 0}">
-				<span>Showing Users # [[${startCount}]] to [[${endCount}]] of [[${totalItems}]]</span>
-			</div>
-			
-			<!-- ELSE -->
-			<div class="text-center m-1" th:unless="${totalItems > 0}">
-				<span>No users found</span>
-			</div>
-			
-			<!-- only display pagination when there are users; else, no users no pagination -->
-			<div th:if="${totalPages > 1}">
-				<nav>
-					  <ul class="pagination justify-content-center">
-					  
-					  	<li th:class=" ${currentPage > 1 ? 'page-item' : 'page-item disabled'}">
-					  		<a th:replace="fragments :: page_link(1, 'First')"></a>
-				    	</li>
-					  
-					    <li th:class=" ${currentPage > 1 ? 'page-item' : 'page-item disabled'}">
-					    	<a th:replace="fragments :: page_link(${currentPage - 1 }, 'previous')"></a>
-				    	</li>
-					    	
-					    <!-- org.thymeleaf.expression.Numbers class, An object of this class is usually available in variable evaluation expressions with the name #numbers. -->
-					    <li th:class="${currentPage != i ? 'page-item' : 'page-item active'}" 
-					    	th:each="i : ${#numbers.sequence(1, totalPages)}">
-					    	<a th:replace="fragments :: page_link(${i}, ${i})"></a>
-					    </li>
-					    
-					    <li  th:class=" ${currentPage < totalPages ? 'page-item' : 'page-item disabled'}">
-					    	<a th:replace="fragments :: page_link(${currentPage + 1}, 'Next')"></a>
-					    </li>
-					    
-					    <li th:class=" ${currentPage < totalPages ? 'page-item' : 'page-item disabled'}">
-							<a th:replace="fragments :: page_link(${totalPages}, 'Last')"></a>		
-					    </li>
-					  </ul>
-				</nav>
-			</div>
-			
-			
-			
-			<div class="modal fade text-center" id="confirmModal">
-				<div class="modal-dialog">
-					<div class="modal-content">
-					
-						<div class="modal-header">
-							<h4 class="modal-title">Delete Confirmation</h4>
-							<button type="button" class="close" data-dismiss="modal">&times;</button>
-						</div>
-						
-						<div class="modal-body">
-							<span id="confirmText"></span>
-						</div>
-						
-						<div class="modal-footer">
-							<a class="btn btn-success" href="" id="yesButton">Yes</a>
-							<button type="button" class="btn btn-danger" data-dismiss="modal">Close</button>
-						</div>
-					</div>
-				</div>
-			</div>
-			
-			
-			<div class="text-center">
-				<p>Shopme Control Panel - Copyright &copy; Shopme</p>
-			</div>
-
-
-	</div>
-	
-<script type="text/javascript">
-
-//confirmation modal dialogue for delete user
-$(document).ready(function(){
-	$(".link-delete").on("click", function(e){
-		//stop the <a> tag default behaviour and pop out a confirmation modal dialogue
-		e.preventDefault();
-		//alert($(this).attr("href"));
-		link = $(this);
-		userId = link.attr("userId");
-		$("#yesButton").attr("href", link.attr("href"));
-		$("#confirmText").text("Are you sure you want to delete this user ID " + userId + "?");
-		$("#confirmModal").modal();
-	});
-});
-
-	function clearFilter(){
-		window.location = "[[@{/users}]]";
-	}
-
-
-</script>
-	
-</body>
-
-</html>
\ No newline at end of file
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/59/50f6512d46b4001d1d079a924effdc9e b/.metadata/.plugins/org.eclipse.core.resources/.history/59/50f6512d46b4001d1d079a924effdc9e
deleted file mode 100644
index 5b4f0b08..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/59/50f6512d46b4001d1d079a924effdc9e
+++ /dev/null
@@ -1,43 +0,0 @@
-<!DOCTYPE html>
-<html xmlns:th="http://www.thymeleaf.org"
-	  xmlns:sec="https://www.thymeleaf.org/thymeleaf-extras-springsecurity5">
-
-<head th:replace="fragments :: page_head('Home - Shopme Admin')"/>
-
-<body>
-	<div class="container-fluid">
-			
-			<!-- navigation bar -->
-		<div th:replace="navigation :: menu"></div>
-
-		<div>
-			<h1>Shopme Control Panel</h1>
-		</div>
-
-		<!-- footer -->
-			<div th:replace="fragments :: footer"></div>
-
-
-	</div>
-	
-<script type="text/javascript">
-
-	$(document).ready(function(){
-		$("#logoutLink").on("click", function(e){
-			e.preventDefault(); /* stop the hyperlink default behaviour  */
-			
-			
-			/* use  the form to  log out and navigate to the url path /logout  
-			
-			 NOTE: spring security requires a POST request form to logout in order to obtain the csrf token, 
-			 		the csrf token is a hidden property in the form
-			*/
-			document.logoutForm.submit();
-		});
-	});
-
-</script>
-
-</body>
-
-</html>
\ No newline at end of file
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/5b/80d228f58cb3001d19bbb001c1a81c20 b/.metadata/.plugins/org.eclipse.core.resources/.history/5b/80d228f58cb3001d19bbb001c1a81c20
deleted file mode 100644
index eba3c84d..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/5b/80d228f58cb3001d19bbb001c1a81c20
+++ /dev/null
@@ -1,267 +0,0 @@
-<!DOCTYPE html>
-<html xmlns:th="http://www.thymeleaf.org">
-
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset= UTF-8">
-<meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0">
-<title>Manage Users</title>
-
-<link rel="stylesheet" type="text/css" th:href="@{/webjars/bootstrap/css/bootstrap.min.css}" />
-<link rel="stylesheet" type="text/css" th:href="@{/fontawesome/all.css}" />
-<link rel="stylesheet" type="text/css" th:href="@{/style.css}" />
-	
-<script type="text/javascript" th:src="@{/webjars/jquery/jquery.min.js}"></script>
-<script type="text/javascript" th:src="@{/webjars/bootstrap/js/bootstrap.min.js}"></script>
-</head>
-
-<body>
-	<div class="container-fluid">
-		<div>
-			<nav class="navbar navbar-expand-lg bg-dark navbar-dark">
-				<a class="navbar-brand" th:href="@{/}"> <img
-					th:src="@{/images/ShopmeAdminSmall.png}" />
-				</a>
-				<!--hamburger toggler for mobile devices(responsive)-->
-				<button class="navbar-toggler" type="button" data-toggle="collapse"
-					data-target="#topNavbar">
-					<span class="navbar-toggler-icon"></span>
-				</button>
-				<div class="collapse navbar-collapse" id="topNavbar">
-					<ul class="navbar-nav">
-						<li class="nav-item"><a class="nav-link" th:href="@{/users}">Users</a>
-						</li>
-						<li class="nav-item"><a class="nav-link"
-							th:href="@{/categories}">Categories</a></li>
-						<li class="nav-item"><a class="nav-link" th:href="@{/brands}">Brands</a>
-						</li>
-						<li class="nav-item"><a class="nav-link"
-							th:href="@{/products}">Products</a></li>
-						<li class="nav-item"><a class="nav-link"
-							th:href="@{/customers}">Customers</a></li>
-						<li class="nav-item"><a class="nav-link"
-							th:href="@{/shipping}">Shipping</a></li>
-						<li class="nav-item"><a class="nav-link" th:href="@{/orders}">Orders</a>
-						</li>
-						<li class="nav-item"><a class="nav-link" th:href="@{/report}">Sales
-								Report</a></li>
-						<li class="nav-item"><a class="nav-link"
-							th:href="@{/articles}">Articles</a></li>
-						<li class="nav-item"><a class="nav-link" th:href="@{/menus}">Menus</a>
-						</li>
-						<li class="nav-item"><a class="nav-link"
-							th:href="@{/settings}">Settings</a></li>
-					</ul>
-				</div>
-
-			</nav>
-		</div>
-
-		<div>
-			<h2>Manage Users</h2>
-			<a th:href="@{/users/new}" class="fas fa-user-plus fa-2x icon-dark mr-2"></a>
-			
-			<a th:href="@{/users/export/csv}" class="fas fa-file-csv fa-2x icon-dark mr-2"></a>
-		</div>
-		
-		
-		
-		<!-- only display success message when a new user is created -->
-		<div th:if="${message != null}" class="alert alert-success text-center">
-			[[${message}]]
-		</div>
-			
-		<div>
-			<form th:action="@{/users/page/1}" class="form-inline m-3">
-				
-				<input type="hidden" name="sortField" th:value="${sortField}" />
-				<input type="hidden" name="sortDir" th:value="${sortDir}" />
-				Filter:&nbsp;
-				<input type="search" name="keyword" th:value="${keyword}" class="form-control" required/>
-				&nbsp;&nbsp;
-				<button type="submit" class="btn btn-primary">
-					<i class="fas fa-search"></i>
-				</button>
-				&nbsp;&nbsp;
-				<button type="button" class="btn btn-secondary" onclick="clearFilter()">
-					<i class="fas fa-eraser"></i>
-				</button>
-			</form>
-		
-		</div>
-
-			<!-- css class to display this table in large screens only , refer to static/style.css for more info-->
-			<div class="full-details">
-				<table class="table table-bordered table-striped table-hover table-responsive-xL">
-					<thead class="thead-dark">
-						<tr>
-							<!-- refer to templates/fragments.html for fragment code-->
-							<th th:replace="fragments :: column_link('id', 'User ID')"/>
-							<th>Photos</th>
-							<th th:replace="fragments :: column_link('email', 'Email')"/>
-							<th th:replace="fragments :: column_link('firstName', 'First Name')"/>
-							<th th:replace="fragments :: column_link('lastName', 'Last Name')"/>
-							<th>Roles</th>
-							<th th:replace="fragments :: column_link('enabled', 'Enabled')"/>
-							<th></th>
-						</tr>
-					</thead>
-					<tbody>
-						<tr th:each="user : ${listUsers}">
-							<td>[[${user.id}]]</td>
-							<td>
-								<span th:if="${user.photos == null}" class="fas fa-portrait fa-3x icon-dark"></span>
-								<img th:if="${user.photos != null}" th:src="@{${user.photosImagePath}}"
-								style="width: 100px"/>
-							</td>
-							<td>[[${user.email}]]</td>
-							<td>[[${user.firstName}]]</td>
-							<td>[[${user.lastName}]]</td>
-							<td>[[${user.roles}]]</td>
-							
-							<td>
-								<a th:if="${user.enabled == true}" class="fas fa-check-circle fa-2x icon-green" 
-								th:href="@{'/users/' + ${user.id} + '/enabled/false'}"
-								title="Disable this user"></a>
-								
-								<a th:if="${user.enabled == false}" class="fas fa-circle fa-2x icon-silver"
-								 th:href="@{'/users/' + ${user.id} + '/enabled/true'}"
-								 title="Enable this user"></a>
-							</td>
-							<td>
-									<a class="fas fa-edit fa-2x icon-green" th:href="@{'/users/edit/' + ${user.id}}"
-									title="edit this user"></a>
-									&nbsp; 
-									<a class="fas fa-trash fa-2x icon-dark link-delete" th:href="@{'/users/delete/' + ${user.id}}"
-									title="delete this user" th:userId="${user.id}"></a>
-							</td>
-						</tr>
-					</tbody>
-				</table>
-			</div>
-			
-			
-			<!-- css class to display this <div> on mobile screens only, refer to /static/style.css for more info-->
-			<div class="less-details">
-				
-				<div th:each="user : ${listUsers}" class="row m-1">
-					
-					<div class="col-4">
-						
-						<span th:if="${user.photos == null}" class="fas fa-portrait fa-3x icon-dark"></span>
-								<img th:if="${user.photos != null}" th:src="@{${user.photosImagePath}}"
-								style="width: 100px"/>
-					</div>
-					
-					<div class="col-8">
-						<div>[[${user.fullName}]]</div>
-						<div>[[${user.roles}]]</div>
-						<div>
-							<a class="fas fa-edit fa-2x icon-green" th:href="@{'/users/edit/' + ${user.id}}"
-									title="edit this user"></a>
-									&nbsp; 
-									<a class="fas fa-trash fa-2x icon-dark link-delete" th:href="@{'/users/delete/' + ${user.id}}"
-									title="delete this user" th:userId="${user.id}"></a>
-						</div>
-					</div>
-					<div>&nbsp;</div>
-				</div>
-			</div>
-			
-			
-			<!-- IF -->
-			<div class="text-center m-1" th:if="${totalItems > 0}">
-				<span>Showing Users # [[${startCount}]] to [[${endCount}]] of [[${totalItems}]]</span>
-			</div>
-			
-			<!-- ELSE -->
-			<div class="text-center m-1" th:unless="${totalItems > 0}">
-				<span>No users found</span>
-			</div>
-			
-			<!-- only display pagination when there are users; else, no users no pagination -->
-			<div th:if="${totalPages > 1}">
-				<nav>
-					  <ul class="pagination justify-content-center flex-wrap">
-					  
-					  	<li th:class=" ${currentPage > 1 ? 'page-item' : 'page-item disabled'}">
-					  		<a th:replace="fragments :: page_link(1, 'First')"></a>
-				    	</li>
-					  
-					    <li th:class=" ${currentPage > 1 ? 'page-item' : 'page-item disabled'}">
-					    	<a th:replace="fragments :: page_link(${currentPage - 1 }, 'previous')"></a>
-				    	</li>
-					    	
-					    <!-- org.thymeleaf.expression.Numbers class, An object of this class is usually available in variable evaluation expressions with the name #numbers. -->
-					    <li th:class="${currentPage != i ? 'page-item' : 'page-item active'}" 
-					    	th:each="i : ${#numbers.sequence(1, totalPages)}">
-					    	<a th:replace="fragments :: page_link(${i}, ${i})"></a>
-					    </li>
-					    
-					    <li  th:class=" ${currentPage < totalPages ? 'page-item' : 'page-item disabled'}">
-					    	<a th:replace="fragments :: page_link(${currentPage + 1}, 'Next')"></a>
-					    </li>
-					    
-					    <li th:class=" ${currentPage < totalPages ? 'page-item' : 'page-item disabled'}">
-							<a th:replace="fragments :: page_link(${totalPages}, 'Last')"></a>		
-					    </li>
-					  </ul>
-				</nav>
-			</div>
-			
-			
-			
-			<div class="modal fade text-center" id="confirmModal">
-				<div class="modal-dialog">
-					<div class="modal-content">
-					
-						<div class="modal-header">
-							<h4 class="modal-title">Delete Confirmation</h4>
-							<button type="button" class="close" data-dismiss="modal">&times;</button>
-						</div>
-						
-						<div class="modal-body">
-							<span id="confirmText"></span>
-						</div>
-						
-						<div class="modal-footer">
-							<a class="btn btn-success" href="" id="yesButton">Yes</a>
-							<button type="button" class="btn btn-danger" data-dismiss="modal">Close</button>
-						</div>
-					</div>
-				</div>
-			</div>
-			
-			
-			<div class="text-center">
-				<p>Shopme Control Panel - Copyright &copy; Shopme</p>
-			</div>
-
-
-	</div>
-	
-<script type="text/javascript">
-
-//confirmation modal dialogue for delete user
-$(document).ready(function(){
-	$(".link-delete").on("click", function(e){
-		//stop the <a> tag default behaviour and pop out a confirmation modal dialogue
-		e.preventDefault();
-		//alert($(this).attr("href"));
-		link = $(this);
-		userId = link.attr("userId");
-		$("#yesButton").attr("href", link.attr("href"));
-		$("#confirmText").text("Are you sure you want to delete this user ID " + userId + "?");
-		$("#confirmModal").modal();
-	});
-});
-
-	function clearFilter(){
-		window.location = "[[@{/users}]]";
-	}
-
-
-</script>
-	
-</body>
-
-</html>
\ No newline at end of file
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/5b/f0a15f9a52b4001d1d079a924effdc9e b/.metadata/.plugins/org.eclipse.core.resources/.history/5b/f0a15f9a52b4001d1d079a924effdc9e
deleted file mode 100644
index 11331458..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/5b/f0a15f9a52b4001d1d079a924effdc9e
+++ /dev/null
@@ -1,12 +0,0 @@
-$(document).ready(function(){
-		$("#logoutLink").on("click", function(e){
-			e.preventDefault(); /* stop the hyperlink default behaviour  */
-			
-			/* use  the form to  log out and navigate to the url path /logout  
-			
-			 NOTE: spring security requires a POST request form to logout in order to obtain the csrf token, 
-			 		the csrf token is a hidden property in the form
-			*/
-			document.logoutForm.submit();
-		});
-	});
\ No newline at end of file
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/5c/50bcd2b388b3001d19bbb001c1a81c20 b/.metadata/.plugins/org.eclipse.core.resources/.history/5c/50bcd2b388b3001d19bbb001c1a81c20
deleted file mode 100644
index 200a327a..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/5c/50bcd2b388b3001d19bbb001c1a81c20
+++ /dev/null
@@ -1,25 +0,0 @@
-*.icon-white{color: white}
-*.icon-silver{color: silver}
-*.icon-green{color: green}
-*.icon-dark{color: gray}
-*.icon-red{color: red}
-
-
-@media screen and (max-width: 768px) {
-	/* small screen */
-	
-	div.full-details{ display: none}
-}
-
-@media screen and (min-width: 768px) and (max-width: 1024px) {
-	/* medium screen */
-	
-	div.full-details{ display: none}
-}
-
-
-@media screen and (mini-width: 1024px) {
-	/* large screen */
-	
-	div.full-details{ display: none}
-}
\ No newline at end of file
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/5c/90785f2614b4001d128fb79045552177 b/.metadata/.plugins/org.eclipse.core.resources/.history/5c/90785f2614b4001d128fb79045552177
deleted file mode 100644
index e15da191..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/5c/90785f2614b4001d128fb79045552177
+++ /dev/null
@@ -1,76 +0,0 @@
-package com.shopme.admin.security;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-import java.util.Set;
-
-import org.springframework.security.core.GrantedAuthority;
-import org.springframework.security.core.authority.SimpleGrantedAuthority;
-import org.springframework.security.core.userdetails.UserDetails;
-
-import com.shopme.common.entity.Role;
-import com.shopme.common.entity.User;
-
-/*
- *  Think of it as a wrapper class for  Type User
- * 
- * */
-public class ShopmeUserDetails implements UserDetails {
-
-	private User user;
-
-	public ShopmeUserDetails(User user) {
-		this.user = user;
-	}
-
-	/* get a list of assigned roles to user */
-	@Override
-	public Collection<? extends GrantedAuthority> getAuthorities() {
-
-		Set<Role> roles = user.getRoles();
-
-		List<SimpleGrantedAuthority> authorities = new ArrayList<>();
-
-		for (Role role : roles) {
-			authorities.add(new SimpleGrantedAuthority(role.getName()));
-		}
-
-		return authorities;
-	}
-
-	@Override
-	public String getPassword() {
-		return user.getPassword();
-	}
-
-	@Override
-	public String getUsername() {
-		return user.getEmail();
-	}
-
-	// "true" means account not expired
-	@Override
-	public boolean isAccountNonExpired() {
-		return true;
-	}
-
-	@Override
-	public boolean isAccountNonLocked() {
-		// TODO Auto-generated method stub
-		return false;
-	}
-
-	@Override
-	public boolean isCredentialsNonExpired() {
-		// TODO Auto-generated method stub
-		return false;
-	}
-
-	@Override
-	public boolean isEnabled() {
-		// TODO Auto-generated method stub
-		return false;
-	}
-
-}
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/5d/1077a16019b4001d128fb79045552177 b/.metadata/.plugins/org.eclipse.core.resources/.history/5d/1077a16019b4001d128fb79045552177
deleted file mode 100644
index 3b8d77e4..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/5d/1077a16019b4001d128fb79045552177
+++ /dev/null
@@ -1,51 +0,0 @@
-<!DOCTYPE html>
-<html xmlns:th="http://www.thymeleaf.org">
-
-<head>
-	<meta http-equiv="Content-Type" content="text/html; charset= UTF-8">
-	<meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0">
-	<title>Login - Shopme Admin</title>
-	<link rel="stylesheet" type="text/css" th:href="@{/webjars/bootstrap/css/bootstrap.min.css}" />
-</head>
-
-<body>
-	<div class="container-fluid text-center">
-		
-		<div>
-			<img th:src="@{/images/ShopmeAdminBig.png}" />
-		</div>
-		
-		<form th:action="@{/login}" method="post" style="max-width:350px; margin: 0 auto">
-			
-			<div th:if="${param.error}">
-			
-			
-			</div>
-			
-			<div class="border border-secondary rounded p-3">
-				<p>Access to Shopme Control Panel </p>
-				
-				<p>
-					<input type="email" name="email" class="form-control" placeholder="Email" required />
-				</p>
-				
-				<p>
-					<input type="password" name="password" class="form-control" placeholder="Password" required />
-				</p>
-				
-				<p>
-					<input type="submit" value="Login" class="btn btn-primary" />
-				</p>
-			</div>
-		
-		</form>
-
-		<div>
-			<p>Shopme Control Panel - Copyright &copy; Shopme</p>
-		</div>
-
-	</div>
-
-</body>
-
-</html>
\ No newline at end of file
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/5d/20b6400f78b3001d19bbb001c1a81c20 b/.metadata/.plugins/org.eclipse.core.resources/.history/5d/20b6400f78b3001d19bbb001c1a81c20
deleted file mode 100644
index b11647a2..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/5d/20b6400f78b3001d19bbb001c1a81c20
+++ /dev/null
@@ -1,25 +0,0 @@
-package com.shopme.admin.user;
-
-import java.io.IOException;
-import java.text.DateFormat;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-
-import javax.servlet.http.HttpServletResponse;
-
-public class AbstractExporter {
-
-	public void setResponseHeader(HttpServletResponse response, String contentType, 
-			String extension, String prefix) throws IOException {
-		DateFormat dateFormatter = new SimpleDateFormat("yyyy-MM-dd_HH-mm-ss");
-		String timestamp = dateFormatter.format(new Date());
-		String fileName = prefix + timestamp + extension;
-		
-		response.setContentType(contentType);
-		
-		String headerKey = "Content-Disposition";
-		String headerValue = "attachment; filename=" + fileName;
-		response.setHeader(headerKey, headerValue);
-		
-	}	
-}
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/5d/f032d91259b7001d19ef99be8d31e273 b/.metadata/.plugins/org.eclipse.core.resources/.history/5d/f032d91259b7001d19ef99be8d31e273
deleted file mode 100644
index 7df7a190..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/5d/f032d91259b7001d19ef99be8d31e273
+++ /dev/null
@@ -1,18 +0,0 @@
-package com.shopme.admin.category;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.GetMapping;
-
-@Controller
-public class CategoryController {
-	
-	@Autowired
-	private CategoryService service;
-	
-	@GetMapping("/categories")
-	public String listAll(Model model) {
-		
-	}
-}
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/5e/108b0ae80ab9001d11addcb4256c67f9 b/.metadata/.plugins/org.eclipse.core.resources/.history/5e/108b0ae80ab9001d11addcb4256c67f9
new file mode 100644
index 00000000..f51ab93c
--- /dev/null
+++ b/.metadata/.plugins/org.eclipse.core.resources/.history/5e/108b0ae80ab9001d11addcb4256c67f9
@@ -0,0 +1,57 @@
+package com.shopme.admin;
+
+import java.nio.file.Path;
+import java.nio.file.Paths;
+
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
+
+@Configuration
+public class MvcConfig implements WebMvcConfigurer {
+
+	
+	/*
+	 * In short, we can tell Spring MVC to map a given URL (e.g. "/user-photos") 
+	 * to any directory (e.g. D:/ShopmeProject/ShopmeBackend/user-photos) 
+	 * and expose the resources (images, js, css...) in this directory to 
+	 * the web clients (browsers) - that's the primary purpose
+	 *  of using resource handlers in Spring MVC.
+	 * 
+	 * Because the assets are not located in the src/main/resources/static folder
+	 * */
+	
+	@Override
+	public void addResourceHandlers(ResourceHandlerRegistry registry) {
+
+		String dirName = "user-photos";
+		
+		Path userPhotoDir = Paths.get(dirName);
+		
+		String userPhotosPath = userPhotoDir.toFile().getAbsolutePath();
+		
+		
+		// add /** to allow all files under this directory to be available to client
+		
+		registry.addResourceHandler("/" + dirName + "/**")
+		.addResourceLocations("file:/" + userPhotosPath + "/");
+		
+		
+		String categoryImagesDir = "category-images";
+		
+		Path userPhotoDir = Paths.get(dirName);
+		
+		String userPhotosPath = userPhotoDir.toFile().getAbsolutePath();
+		
+		
+		// add /** to allow all files under this directory to be available to client
+		
+		registry.addResourceHandler("/" + dirName + "/**")
+		.addResourceLocations("file:/" + userPhotosPath + "/");
+		
+	}
+	
+	
+	
+	
+}
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/5e/2088ad0c78b3001d19bbb001c1a81c20 b/.metadata/.plugins/org.eclipse.core.resources/.history/5e/2088ad0c78b3001d19bbb001c1a81c20
deleted file mode 100644
index 506f3563..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/5e/2088ad0c78b3001d19bbb001c1a81c20
+++ /dev/null
@@ -1,5 +0,0 @@
-package com.shopme.admin.user;
-
-public class AbstractExporter {
-
-}
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/5e/301eb89b6fb3001d19bbb001c1a81c20 b/.metadata/.plugins/org.eclipse.core.resources/.history/5e/301eb89b6fb3001d19bbb001c1a81c20
deleted file mode 100644
index 23f12080..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/5e/301eb89b6fb3001d19bbb001c1a81c20
+++ /dev/null
@@ -1,36 +0,0 @@
-package com.shopme.admin.user;
-
-import java.io.IOException;
-import java.text.DateFormat;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.List;
-
-import org.supercsv.io.CsvBeanWriter;
-import org.supercsv.io.ICsvBeanWriter;
-import org.supercsv.prefs.CsvPreference;
-
-import com.shopme.common.entity.User;
-
-import jakarta.servlet.http.HttpServletResponse;
-
-public class UserCsvExporter {
-
-	public void export(List<User> user, HttpServletResponse response) throws IOException {
-		
-		DateFormat dateFormatter = new SimpleDateFormat("yyyy-MM-dd_HH-mm-ss");
-		String timeStamp = dateFormatter.format(new Date());
-		String fileName = "users_" + timeStamp + ".csv";
-		
-		response.setContentType("text/csv");
-		
-		String headerKey = "Content-Disposition";
-		String headerValue = "attachment; filename=" + fileName;
-		response.setHeader(headerKey, headerValue);	
-		
-		ICsvBeanWriter csvWriter = new CsvBeanWriter(response.getWriter(), CsvPreference.STANDARD_PREFERENCE);
-		
-		
-	}
-	
-}
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/5f/8066b7e227b3001d1e75aa5ef0815903 b/.metadata/.plugins/org.eclipse.core.resources/.history/5f/8066b7e227b3001d1e75aa5ef0815903
deleted file mode 100644
index fde794d6..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/5f/8066b7e227b3001d1e75aa5ef0815903
+++ /dev/null
@@ -1,140 +0,0 @@
-package com.shopme.admin.user;
-
-import java.util.List;
-import java.util.NoSuchElementException;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.domain.Page;
-import org.springframework.data.domain.PageRequest;
-import org.springframework.data.domain.Pageable;
-import org.springframework.data.domain.Sort;
-import org.springframework.security.crypto.password.PasswordEncoder;
-import org.springframework.stereotype.Service;
-
-import com.shopme.common.entity.Role;
-import com.shopme.common.entity.User;
-
-import jakarta.transaction.Transactional;
-
-@Service
-@Transactional
-public class UserService {
-
-	public static final int USERS_PER_PAGE = 4;
-	
-	@Autowired
-	private UserRepository userRepo;
-
-	@Autowired
-	private RoleRepository roleRepo;
-
-	@Autowired
-	private PasswordEncoder passwordEncoder;
-
-	public List<User> listAll() {
-		
-		return (List<User>) userRepo.findAll();
-	}
-	
-	
-	public Page<User> listByPage(int pageNum, String sortField, String sortDir, String keyword) {
-		
-		Sort sort = Sort.by(sortField);
-		
-		sort = sortDir.equals("asc") ? sort.ascending() : sort.descending();
-		
-		//page number start with 0 for pageable, so need to minus 1.
-		Pageable pageable = PageRequest.of(pageNum - 1, USERS_PER_PAGE, sort);
-		
-		if(keyword != null) {
-			return userRepo.findAll(keyword, pageable);
-		}
-		
-		
-		return userRepo.findAll(pageable);
-	}
-	
-
-	public List<Role> listRoles() {
-
-		return (List<Role>) roleRepo.findAll();
-	}
-
-	public User save(User user) {
-
-		boolean isUpdatingUser = (user.getId() != null);
-
-		if (isUpdatingUser) {
-
-			User existingUser = userRepo.findById(user.getId()).get();
-
-			if (user.getPassword().isEmpty()) {
-				/*
-				 * if we do not set the user password to existing user password, password field
-				 * will be an empty string. When the user object is saved to database, the empty
-				 * string will replace the encoded password.
-				 */
-				user.setPassword(existingUser.getPassword());
-			} else {
-				encodePassword(user);
-			}
-
-		} else {
-			encodePassword(user);
-		}
-
-		return userRepo.save(user);
-	}
-
-	private void encodePassword(User user) {
-
-		String encodedPassword = passwordEncoder.encode(user.getPassword());
-		user.setPassword(encodedPassword);
-	}
-
-	public boolean isEmailUnique(Integer id, String email) {
-		User userByEmail = userRepo.getUserByEmail(email);
-
-		if (userByEmail == null)
-			return true;
-
-		boolean isCreatingNew = (id == null);
-
-		if (isCreatingNew) {
-			if (userByEmail != null)
-				return false;
-		} else {
-			if (userByEmail.getId() != id) {
-				return false;
-			}
-		}
-
-		return true;
-	}
-
-	public User get(Integer id) throws UserNotFoundException {
-		try {
-			return userRepo.findById(id).get();
-		} catch (NoSuchElementException ex) {
-			throw new UserNotFoundException("could not find any user with id: " + id);
-		}
-	}
-
-	public void delete(Integer id) throws UserNotFoundException {
-
-		Long countById = userRepo.countById(id);
-
-		if (countById == null || countById == 0) {
-			throw new UserNotFoundException("could not find any user with id: " + id);
-		}
-		
-		userRepo.deleteById(id);
-	}
-	
-	public void updateUserEnabledStatus(Integer id, boolean enabled) {
-		
-		 userRepo.updateEnabledStatus(id, enabled);
-	}
-	
-
-}
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/5f/90b02f8d28b3001d1e75aa5ef0815903 b/.metadata/.plugins/org.eclipse.core.resources/.history/5f/90b02f8d28b3001d1e75aa5ef0815903
deleted file mode 100644
index 9f2cf770..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/5f/90b02f8d28b3001d1e75aa5ef0815903
+++ /dev/null
@@ -1,165 +0,0 @@
-package com.shopme.admin.user;
-
-import java.io.IOException;
-import java.util.List;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.domain.Page;
-import org.springframework.data.repository.query.Param;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
-import org.springframework.util.StringUtils;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.ModelAttribute;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.multipart.MultipartFile;
-import org.springframework.web.servlet.mvc.support.RedirectAttributes;
-
-import com.fasterxml.jackson.annotation.ObjectIdGenerators.StringIdGenerator;
-import com.shopme.admin.FileUploadUtil;
-import com.shopme.common.entity.Role;
-import com.shopme.common.entity.User;
-
-@Controller
-public class UserController {
-
-	@Autowired
-	private UserService service;
-
-	@GetMapping("/users")
-	public String listFirstPage(Model model) {
-		return listByPage(1, model, "firstName", "asc", null);
-	}
-
-	@GetMapping("/users/page/{pageNum}")
-	public String listByPage(@PathVariable(name = "pageNum") int pageNum, Model model,
-			@Param("sortField") String sortField, @Param("sortDir") String sortDir,
-			@Param("keyword") String keyword) {
-		
-		System.out.println("sort field: " + sortField);
-		System.out.println("sort order: " + sortDir);
-		
-		Page<User> page = service.listByPage(pageNum, sortField, sortDir, keyword);
-		List<User> listUsers = page.getContent();
-
-		
-		long startCount = (pageNum - 1) * UserService.USERS_PER_PAGE + 1;
-		long endCount = startCount + UserService.USERS_PER_PAGE - 1;
-		if(endCount > page.getTotalElements()) {
-			endCount = page.getTotalElements();
-		}
-		
-		String reverseSortDir = sortDir.equals("asc") ? "desc" : "asc";
-		
-		model.addAttribute("currentPage", pageNum);
-		model.addAttribute("totalPages", page.getTotalPages());
-		model.addAttribute("startCount", startCount);
-		model.addAttribute("endCount", endCount);
-		model.addAttribute("totalItems", page.getTotalElements());
-		model.addAttribute("listUsers", listUsers);
-		model.addAttribute("sortField", sortField);
-		model.addAttribute("sortDir", sortDir);
-		model.addAttribute("reverseSortDir", reverseSortDir);
-		
-
-		return "users";
-
-	}
-
-	@GetMapping("/users/new")
-	public String newUser(Model model) {
-
-		List<Role> listRoles = service.listRoles();
-
-		User user = new User();
-		user.setEnabled(true);
-
-		model.addAttribute("user", user);
-		model.addAttribute("listRoles", listRoles);
-		model.addAttribute("pageTitle", "Create New User");
-
-		return "user_form";
-
-	}
-
-	// using @RequestParam, we can get the image file input, the input has the
-	// property name="image"
-	@PostMapping("/users/save")
-	public String saveUser(@ModelAttribute("user") User user, RedirectAttributes redirectAttributes,
-			@RequestParam("image") MultipartFile multipartFile) throws IOException {
-
-		if (!multipartFile.isEmpty()) {
-
-			String fileName = StringUtils.cleanPath(multipartFile.getOriginalFilename());
-			user.setPhotos(fileName);
-
-			User savedUser = service.save(user);
-
-			String uploadDir = "user-photos/" + savedUser.getId();
-
-			FileUploadUtil.cleanDir(uploadDir);
-			FileUploadUtil.saveFile(uploadDir, fileName, multipartFile);
-		} else {
-
-			// set photo to null for getPhotosImagePath() method's conditional statement in
-			// User class
-			if (user.getPhotos().isEmpty())
-				user.setPhotos(null);
-			service.save(user);
-		}
-
-		redirectAttributes.addFlashAttribute("message", "the user has been saved successfully");
-
-		// POST/REDIRECT/GET web design
-		return "redirect:/users";
-	}
-
-	@GetMapping("/users/edit/{id}")
-	public String editUser(@PathVariable(name = "id") Integer id, RedirectAttributes redirectAttributes, Model model) {
-		try {
-			User user = service.get(id);
-			List<Role> listRoles = service.listRoles();
-
-			model.addAttribute("user", user);
-			model.addAttribute("pageTitle", "Edit User (ID: " + id + ")");
-			model.addAttribute("listRoles", listRoles);
-
-			return "user_form";
-		} catch (UserNotFoundException ex) {
-			redirectAttributes.addFlashAttribute("message", ex.getMessage());
-
-			return "redirect:/users";
-		}
-
-	}
-
-	@GetMapping("/users/delete/{id}")
-	public String deleteUser(@PathVariable(name = "id") Integer id, RedirectAttributes redirectAttributes,
-			Model model) {
-		try {
-			service.delete(id);
-			redirectAttributes.addFlashAttribute("message", "The user ID " + id + " has been deleted successfully.");
-
-		} catch (UserNotFoundException ex) {
-			redirectAttributes.addFlashAttribute("message", ex.getMessage());
-
-		}
-
-		return "redirect:/users";
-	}
-
-	@GetMapping("/users/{id}/enabled/{status}")
-	public String updateUserEnabledStatus(@PathVariable(name = "id") Integer id,
-			@PathVariable(name = "status") boolean enabled, RedirectAttributes redirectAttributes) {
-
-		service.updateUserEnabledStatus(id, enabled);
-		String status = enabled ? "enabled" : "disabled";
-		String message = "The user id " + id + " has been " + status;
-		redirectAttributes.addFlashAttribute("message", message);
-
-		return "redirect:/users";
-	}
-
-}
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/60/002d439a15b4001d128fb79045552177 b/.metadata/.plugins/org.eclipse.core.resources/.history/60/002d439a15b4001d128fb79045552177
deleted file mode 100644
index 20b3c7cc..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/60/002d439a15b4001d128fb79045552177
+++ /dev/null
@@ -1,27 +0,0 @@
-package com.shopme.admin.security;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.core.userdetails.UserDetails;
-import org.springframework.security.core.userdetails.UserDetailsService;
-import org.springframework.security.core.userdetails.UsernameNotFoundException;
-
-import com.shopme.admin.user.UserRepository;
-import com.shopme.common.entity.User;
-
-public class ShopmeUserDetailsService implements UserDetailsService {
-
-	
-	@Autowired
-	private UserRepository userRepo;
-	
-	
-	@Override
-	public UserDetails loadUserByUsername(String email) throws UsernameNotFoundException {
-
-		User user = userRepo.getUserByEmail(email);
-		
-		
-		return null;
-	}
-
-}
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/60/108a688d08b4001d128fb79045552177 b/.metadata/.plugins/org.eclipse.core.resources/.history/60/108a688d08b4001d128fb79045552177
deleted file mode 100644
index cf78f7f0..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/60/108a688d08b4001d128fb79045552177
+++ /dev/null
@@ -1,46 +0,0 @@
-package com.shopme.admin.security;
-
-import org.aspectj.weaver.ast.And;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.security.config.annotation.web.builders.HttpSecurity;
-import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
-import org.springframework.security.config.annotation.web.configuration.WebSecurityConfiguration;
-import org.springframework.security.config.annotation.web.configuration.WebSecurityCustomizer;
-import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
-import org.springframework.security.crypto.password.PasswordEncoder;
-import org.springframework.security.web.SecurityFilterChain;
-
-@Configuration
-@EnableWebSecurity
-public class WebSecurityConfig  {
-
-	/*
-	 *  refer to this link: https://www.codejava.net/frameworks/spring-boot/fix-websecurityconfigureradapter-deprecated
-	 * 
-	 */	
-	
-	@Bean
-	public PasswordEncoder PasswordEncoder() {
-		return new BCryptPasswordEncoder();
-	}
-	
-	@Bean
-	public SecurityFilterChain filterChain(HttpSecurity http) throws Exception {
-		
-		// any request need to be authenticated (require login)
-		//custom login page at "/login" - handler method in MainController class
-		http.authorizeHttpRequests().anyRequest().authenticated()
-			.and().formLogin().loginPage("/login").permitAll();
-		
-		return http.build();
-	}
-	
-	@Bean
-    public WebSecurityCustomizer webSecurityCustomizer() {
-        return (web) -> web.ignoring().antMatchers("/images/**", "/js/**", "/webjars/**");
-    }
-	
-	
-	
-}
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/60/8086e27076b3001d19bbb001c1a81c20 b/.metadata/.plugins/org.eclipse.core.resources/.history/60/8086e27076b3001d19bbb001c1a81c20
deleted file mode 100644
index 46f89966..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/60/8086e27076b3001d19bbb001c1a81c20
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-	
-	<parent>
-		<groupId>com.shopme</groupId>
-		<artifactId>ShopmeWebParent</artifactId>
-		<version>0.0.1-SNAPSHOT</version>
-	</parent>
-	
-	<artifactId>ShopmeBackEnd</artifactId>
-	
-	<name>ShopmeBackEnd</name>
-	<description>Shopme Admin project</description>
-	<properties>
-		<java.version>15</java.version>
-	</properties>
-	<dependencies>
-
-	<dependency>
-	   <groupId>org.springframework.boot</groupId>
-		<artifactId>spring-boot-devtools</artifactId>
-    </dependency>
-
-     <!--for exporting user list to csv-->
-	<dependency>
-		<groupId>net.sf.supercsv</groupId>
-		<artifactId>super-csv</artifactId>
-		<version>2.4.0</version>
-	</dependency>
-	
-	</dependencies>
-	<build>
-		<plugins>
-			<plugin>
-				<groupId>org.springframework.boot</groupId>
-				<artifactId>spring-boot-maven-plugin</artifactId>
-			</plugin>
-		</plugins>
-	</build>
-</project>
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/60/e01e499931b7001d19ef99be8d31e273 b/.metadata/.plugins/org.eclipse.core.resources/.history/60/e01e499931b7001d19ef99be8d31e273
deleted file mode 100644
index fc22c5e1..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/60/e01e499931b7001d19ef99be8d31e273
+++ /dev/null
@@ -1,64 +0,0 @@
-package com.shopme.admin.category;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
-import java.util.List;
-
-import org.junit.jupiter.api.Test;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.autoconfigure.jdbc.AutoConfigureTestDatabase;
-import org.springframework.boot.test.autoconfigure.jdbc.AutoConfigureTestDatabase.Replace;
-import org.springframework.boot.test.autoconfigure.orm.jpa.DataJpaTest;
-import org.springframework.test.annotation.Rollback;
-
-import com.shopme.common.entity.Category;
-
-/*
- * Unit Test for CategoryRepository
- * 
- * objective:
- * 1. test the methods in repository 
- * 2. populate the database with records
- * 
-*/
-
-@DataJpaTest
-@AutoConfigureTestDatabase(replace = Replace.NONE)
-@Rollback(false)
-public class CategoryRepositoryTests {
-
-	@Autowired
-	private CategoryRepository repo;
-
-	@Test
-	public void testCreateRootCategory() {
-//		Category category = new Category("Computers");
-		Category category = new Category("Electronics");
-		Category savedCategory = repo.save(category);
-
-		assertThat(savedCategory.getId()).isGreaterThan(0);
-
-	}
-
-	@Test
-	public void testCreateSubCategory() {
-
-		// ID for root category "Computer" is 1
-//		Category parent = new Category(1);
-
-//		Category subCategory = new Category("Desktops", parent);
-//		Category savedCategory = repo.save(subCategory);
-//		assertThat(savedCategory.getId()).isGreaterThan(0);
-
-		Category laptops = new Category("Laptops", parent);
-		Category components = new Category("Computer Components", parent);
-
-		repo.saveAll(List.of(laptops, components));
-		
-		// ID for root category "Electronics" is 2
-		Category parent = new Category(2);
-
-
-	}
-
-}
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/61/c0fb6cd46eb3001d19bbb001c1a81c20 b/.metadata/.plugins/org.eclipse.core.resources/.history/61/c0fb6cd46eb3001d19bbb001c1a81c20
deleted file mode 100644
index 6080b408..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/61/c0fb6cd46eb3001d19bbb001c1a81c20
+++ /dev/null
@@ -1,29 +0,0 @@
-package com.shopme.admin.user;
-
-import java.text.DateFormat;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.List;
-
-import com.shopme.common.entity.User;
-
-import jakarta.servlet.http.HttpServletResponse;
-
-public class UserCsvExporter {
-
-	public void export(List<User> user, HttpServletResponse response) {
-		
-		DateFormat dateFormatter = new SimpleDateFormat("yyyy-MM-dd_HH-mm-ss");
-		String timeStamp = dateFormatter.format(new Date());
-		String fileName = "users_" + timeStamp + ".csv";
-		
-		response.setContentType("text/csv");
-		
-		String headerKey = "Content-Disposition";
-		String headerValue = "attachment; filename=" + fileName;
-		response.setHeader(fileName, headerValue);
-		
-		
-	}
-	
-}
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/62/40d7570d8bb3001d19bbb001c1a81c20 b/.metadata/.plugins/org.eclipse.core.resources/.history/62/40d7570d8bb3001d19bbb001c1a81c20
deleted file mode 100644
index 0b89258b..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/62/40d7570d8bb3001d19bbb001c1a81c20
+++ /dev/null
@@ -1,255 +0,0 @@
-<!DOCTYPE html>
-<html xmlns:th="http://www.thymeleaf.org">
-
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset= UTF-8">
-<meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0">
-<title>Manage Users</title>
-
-<link rel="stylesheet" type="text/css" th:href="@{/webjars/bootstrap/css/bootstrap.min.css}" />
-<link rel="stylesheet" type="text/css" th:href="@{/fontawesome/all.css}" />
-<link rel="stylesheet" type="text/css" th:href="@{/style.css}" />
-	
-<script type="text/javascript" th:src="@{/webjars/jquery/jquery.min.js}"></script>
-<script type="text/javascript" th:src="@{/webjars/bootstrap/js/bootstrap.min.js}"></script>
-</head>
-
-<body>
-	<div class="container-fluid">
-		<div>
-			<nav class="navbar navbar-expand-lg bg-dark navbar-dark">
-				<a class="navbar-brand" th:href="@{/}"> <img
-					th:src="@{/images/ShopmeAdminSmall.png}" />
-				</a>
-				<!--hamburger toggler for mobile devices(responsive)-->
-				<button class="navbar-toggler" type="button" data-toggle="collapse"
-					data-target="#topNavbar">
-					<span class="navbar-toggler-icon"></span>
-				</button>
-				<div class="collapse navbar-collapse" id="topNavbar">
-					<ul class="navbar-nav">
-						<li class="nav-item"><a class="nav-link" th:href="@{/users}">Users</a>
-						</li>
-						<li class="nav-item"><a class="nav-link"
-							th:href="@{/categories}">Categories</a></li>
-						<li class="nav-item"><a class="nav-link" th:href="@{/brands}">Brands</a>
-						</li>
-						<li class="nav-item"><a class="nav-link"
-							th:href="@{/products}">Products</a></li>
-						<li class="nav-item"><a class="nav-link"
-							th:href="@{/customers}">Customers</a></li>
-						<li class="nav-item"><a class="nav-link"
-							th:href="@{/shipping}">Shipping</a></li>
-						<li class="nav-item"><a class="nav-link" th:href="@{/orders}">Orders</a>
-						</li>
-						<li class="nav-item"><a class="nav-link" th:href="@{/report}">Sales
-								Report</a></li>
-						<li class="nav-item"><a class="nav-link"
-							th:href="@{/articles}">Articles</a></li>
-						<li class="nav-item"><a class="nav-link" th:href="@{/menus}">Menus</a>
-						</li>
-						<li class="nav-item"><a class="nav-link"
-							th:href="@{/settings}">Settings</a></li>
-					</ul>
-				</div>
-
-			</nav>
-		</div>
-
-		<div>
-			<h2>Manage Users</h2>
-			<a th:href="@{/users/new}" class="fas fa-user-plus fa-2x icon-dark mr-2"></a>
-			
-			<a th:href="@{/users/export/csv}" class="fas fa-file-csv fa-2x icon-dark mr-2"></a>
-		</div>
-		
-		
-		
-		<!-- only display success message when a new user is created -->
-		<div th:if="${message != null}" class="alert alert-success text-center">
-			[[${message}]]
-		</div>
-			
-		<div>
-			<form th:action="@{/users/page/1}" class="form-inline m-3">
-				
-				<input type="hidden" name="sortField" th:value="${sortField}" />
-				<input type="hidden" name="sortDir" th:value="${sortDir}" />
-				Filter:&nbsp;
-				<input type="search" name="keyword" th:value="${keyword}" class="form-control" required/>
-				&nbsp;&nbsp;
-				<button type="submit" class="btn btn-primary">
-					<i class="fas fa-search"></i>
-				</button>
-				&nbsp;&nbsp;
-				<button type="button" class="btn btn-secondary" onclick="clearFilter()">
-					<i class="fas fa-eraser"></i>
-				</button>
-			</form>
-		
-		</div>
-
-
-			<div class="full-details">
-				<table class="table table-bordered table-striped table-hover table-responsive-xL">
-					<thead class="thead-dark">
-						<tr>
-							<!-- refer to templates/fragments.html for fragment code-->
-							<th th:replace="fragments :: column_link('id', 'User ID')"/>
-							<th>Photos</th>
-							<th th:replace="fragments :: column_link('email', 'Email')"/>
-							<th th:replace="fragments :: column_link('firstName', 'First Name')"/>
-							<th th:replace="fragments :: column_link('lastName', 'Last Name')"/>
-							<th>Roles</th>
-							<th th:replace="fragments :: column_link('enabled', 'Enabled')"/>
-							<th></th>
-						</tr>
-					</thead>
-					<tbody>
-						<tr th:each="user : ${listUsers}">
-							<td>[[${user.id}]]</td>
-							<td>
-								<span th:if="${user.photos == null}" class="fas fa-portrait fa-3x icon-dark"></span>
-								<img th:if="${user.photos != null}" th:src="@{${user.photosImagePath}}"
-								style="width: 100px"/>
-							</td>
-							<td>[[${user.email}]]</td>
-							<td>[[${user.firstName}]]</td>
-							<td>[[${user.lastName}]]</td>
-							<td>[[${user.roles}]]</td>
-							
-							<td>
-								<a th:if="${user.enabled == true}" class="fas fa-check-circle fa-2x icon-green" 
-								th:href="@{'/users/' + ${user.id} + '/enabled/false'}"
-								title="Disable this user"></a>
-								
-								<a th:if="${user.enabled == false}" class="fas fa-circle fa-2x icon-silver"
-								 th:href="@{'/users/' + ${user.id} + '/enabled/true'}"
-								 title="Enable this user"></a>
-							</td>
-							<td>
-									<a class="fas fa-edit fa-2x icon-green" th:href="@{'/users/edit/' + ${user.id}}"
-									title="edit this user"></a>
-									&nbsp; 
-									<a class="fas fa-trash fa-2x icon-dark link-delete" th:href="@{'/users/delete/' + ${user.id}}"
-									title="delete this user" th:userId="${user.id}"></a>
-							</td>
-						</tr>
-					</tbody>
-				</table>
-			</div>
-			
-			
-			<!-- display this on mobile screens only, refer to /static/style.css for more info-->
-			<div class="less-details">
-				
-				<div th:each="user : ${listUsers}" class="row m-1">
-					
-					<div class="col">
-						
-						<span th:if="${user.photos == null}" class="fas fa-portrait fa-3x icon-dark"></span>
-								<img th:if="${user.photos != null}" th:src="@{${user.photosImagePath}}"
-								style="width: 100px"/>
-					</div>
-						
-				</div>
-			</div>
-			
-			
-			<!-- IF -->
-			<div class="text-center m-1" th:if="${totalItems > 0}">
-				<span>Showing Users # [[${startCount}]] to [[${endCount}]] of [[${totalItems}]]</span>
-			</div>
-			
-			<!-- ELSE -->
-			<div class="text-center m-1" th:unless="${totalItems > 0}">
-				<span>No users found</span>
-			</div>
-			
-			<!-- only display pagination when there are users; else, no users no pagination -->
-			<div th:if="${totalPages > 1}">
-				<nav>
-					  <ul class="pagination justify-content-center">
-					  
-					  	<li th:class=" ${currentPage > 1 ? 'page-item' : 'page-item disabled'}">
-					  		<a th:replace="fragments :: page_link(1, 'First')"></a>
-				    	</li>
-					  
-					    <li th:class=" ${currentPage > 1 ? 'page-item' : 'page-item disabled'}">
-					    	<a th:replace="fragments :: page_link(${currentPage - 1 }, 'previous')"></a>
-				    	</li>
-					    	
-					    <!-- org.thymeleaf.expression.Numbers class, An object of this class is usually available in variable evaluation expressions with the name #numbers. -->
-					    <li th:class="${currentPage != i ? 'page-item' : 'page-item active'}" 
-					    	th:each="i : ${#numbers.sequence(1, totalPages)}">
-					    	<a th:replace="fragments :: page_link(${i}, ${i})"></a>
-					    </li>
-					    
-					    <li  th:class=" ${currentPage < totalPages ? 'page-item' : 'page-item disabled'}">
-					    	<a th:replace="fragments :: page_link(${currentPage + 1}, 'Next')"></a>
-					    </li>
-					    
-					    <li th:class=" ${currentPage < totalPages ? 'page-item' : 'page-item disabled'}">
-							<a th:replace="fragments :: page_link(${totalPages}, 'Last')"></a>		
-					    </li>
-					  </ul>
-				</nav>
-			</div>
-			
-			
-			
-			<div class="modal fade text-center" id="confirmModal">
-				<div class="modal-dialog">
-					<div class="modal-content">
-					
-						<div class="modal-header">
-							<h4 class="modal-title">Delete Confirmation</h4>
-							<button type="button" class="close" data-dismiss="modal">&times;</button>
-						</div>
-						
-						<div class="modal-body">
-							<span id="confirmText"></span>
-						</div>
-						
-						<div class="modal-footer">
-							<a class="btn btn-success" href="" id="yesButton">Yes</a>
-							<button type="button" class="btn btn-danger" data-dismiss="modal">Close</button>
-						</div>
-					</div>
-				</div>
-			</div>
-			
-			
-			<div class="text-center">
-				<p>Shopme Control Panel - Copyright &copy; Shopme</p>
-			</div>
-
-
-	</div>
-	
-<script type="text/javascript">
-
-//confirmation modal dialogue for delete user
-$(document).ready(function(){
-	$(".link-delete").on("click", function(e){
-		//stop the <a> tag default behaviour and pop out a confirmation modal dialogue
-		e.preventDefault();
-		//alert($(this).attr("href"));
-		link = $(this);
-		userId = link.attr("userId");
-		$("#yesButton").attr("href", link.attr("href"));
-		$("#confirmText").text("Are you sure you want to delete this user ID " + userId + "?");
-		$("#confirmModal").modal();
-	});
-});
-
-	function clearFilter(){
-		window.location = "[[@{/users}]]";
-	}
-
-
-</script>
-	
-</body>
-
-</html>
\ No newline at end of file
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/62/50a7cf0558b4001d1d079a924effdc9e b/.metadata/.plugins/org.eclipse.core.resources/.history/62/50a7cf0558b4001d1d079a924effdc9e
deleted file mode 100644
index ae2a4bf4..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/62/50a7cf0558b4001d1d079a924effdc9e
+++ /dev/null
@@ -1,24 +0,0 @@
-$(document).ready(function(){
-		$("#logoutLink").on("click", function(e){
-			e.preventDefault(); /* stop the hyperlink default behaviour  */
-			
-			/* use  the form to  log out and navigate to the url path /logout  
-			
-			 NOTE: spring security requires a POST request form to logout in order to obtain the csrf token, 
-			 		the csrf token is a hidden property in the form
-			*/
-			document.logoutForm.submit();
-		});
-		
-		customizeDropDownMenu();
-	});
-	
-	
-function customizeDropDownMenu() {
-	
-	$(".dropdown > a").click(function() {
-		location.href = this.href;
-	});
-	
-}
-	
\ No newline at end of file
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/62/903f78c950b3001d1e75aa5ef0815903 b/.metadata/.plugins/org.eclipse.core.resources/.history/62/903f78c950b3001d1e75aa5ef0815903
deleted file mode 100644
index a71799e8..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/62/903f78c950b3001d1e75aa5ef0815903
+++ /dev/null
@@ -1,172 +0,0 @@
-package com.shopme.admin.user;
-
-import java.io.IOException;
-import java.util.List;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.domain.Page;
-import org.springframework.data.repository.query.Param;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
-import org.springframework.util.StringUtils;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.ModelAttribute;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.multipart.MultipartFile;
-import org.springframework.web.servlet.mvc.support.RedirectAttributes;
-
-import com.fasterxml.jackson.annotation.ObjectIdGenerators.StringIdGenerator;
-import com.shopme.admin.FileUploadUtil;
-import com.shopme.common.entity.Role;
-import com.shopme.common.entity.User;
-
-@Controller
-public class UserController {
-
-	@Autowired
-	private UserService service;
-
-	@GetMapping("/users")
-	public String listFirstPage(Model model) {
-		return listByPage(1, model, "firstName", "asc", null);
-	}
-
-	@GetMapping("/users/page/{pageNum}")
-	public String listByPage(@PathVariable(name = "pageNum") int pageNum, Model model,
-			@Param("sortField") String sortField, @Param("sortDir") String sortDir,
-			@Param("keyword") String keyword) {
-		
-		System.out.println("sort field: " + sortField);
-		System.out.println("sort order: " + sortDir);
-		
-		Page<User> page = service.listByPage(pageNum, sortField, sortDir, keyword);
-		List<User> listUsers = page.getContent();
-
-		
-		long startCount = (pageNum - 1) * UserService.USERS_PER_PAGE + 1;
-		long endCount = startCount + UserService.USERS_PER_PAGE - 1;
-		if(endCount > page.getTotalElements()) {
-			endCount = page.getTotalElements();
-		}
-		
-		String reverseSortDir = sortDir.equals("asc") ? "desc" : "asc";
-		
-		model.addAttribute("currentPage", pageNum);
-		model.addAttribute("totalPages", page.getTotalPages());
-		model.addAttribute("startCount", startCount);
-		model.addAttribute("endCount", endCount);
-		model.addAttribute("totalItems", page.getTotalElements());
-		model.addAttribute("listUsers", listUsers);
-		model.addAttribute("sortField", sortField);
-		model.addAttribute("sortDir", sortDir);
-		model.addAttribute("reverseSortDir", reverseSortDir);
-		model.addAttribute("keyword", keyword);
-		
-
-		return "users";
-
-	}
-
-	@GetMapping("/users/new")
-	public String newUser(Model model) {
-
-		List<Role> listRoles = service.listRoles();
-
-		User user = new User();
-		user.setEnabled(true);
-
-		model.addAttribute("user", user);
-		model.addAttribute("listRoles", listRoles);
-		model.addAttribute("pageTitle", "Create New User");
-
-		return "user_form";
-
-	}
-
-	// using @RequestParam, we can get the image file input, the input has the
-	// property name="image"
-	@PostMapping("/users/save")
-	public String saveUser(@ModelAttribute("user") User user, RedirectAttributes redirectAttributes,
-			@RequestParam("image") MultipartFile multipartFile) throws IOException {
-
-		if (!multipartFile.isEmpty()) {
-
-			String fileName = StringUtils.cleanPath(multipartFile.getOriginalFilename());
-			user.setPhotos(fileName);
-
-			User savedUser = service.save(user);
-
-			String uploadDir = "user-photos/" + savedUser.getId();
-
-			FileUploadUtil.cleanDir(uploadDir);
-			FileUploadUtil.saveFile(uploadDir, fileName, multipartFile);
-		} else {
-
-			// set photo to null for getPhotosImagePath() method's conditional statement in
-			// User class
-			if (user.getPhotos().isEmpty())
-				user.setPhotos(null);
-			service.save(user);
-		}
-
-		redirectAttributes.addFlashAttribute("message", "the user has been saved successfully");
-
-		// POST/REDIRECT/GET web design
-		
-		//after user is saved display the user instead of the entire user list
-		//email is a unique field to identify each user.
-		
-		
-		String firstPartOfEmail = user.getEmail().split("@")[0];
-		return "redirect:/users/page/1?sortField=id&sortDir=asc&keyword=" + firstPartOfEmail;
-	}
-
-	@GetMapping("/users/edit/{id}")
-	public String editUser(@PathVariable(name = "id") Integer id, RedirectAttributes redirectAttributes, Model model) {
-		try {
-			User user = service.get(id);
-			List<Role> listRoles = service.listRoles();
-
-			model.addAttribute("user", user);
-			model.addAttribute("pageTitle", "Edit User (ID: " + id + ")");
-			model.addAttribute("listRoles", listRoles);
-
-			return "user_form";
-		} catch (UserNotFoundException ex) {
-			redirectAttributes.addFlashAttribute("message", ex.getMessage());
-
-			return "redirect:/users";
-		}
-
-	}
-
-	@GetMapping("/users/delete/{id}")
-	public String deleteUser(@PathVariable(name = "id") Integer id, RedirectAttributes redirectAttributes,
-			Model model) {
-		try {
-			service.delete(id);
-			redirectAttributes.addFlashAttribute("message", "The user ID " + id + " has been deleted successfully.");
-
-		} catch (UserNotFoundException ex) {
-			redirectAttributes.addFlashAttribute("message", ex.getMessage());
-
-		}
-
-		return "redirect:/users";
-	}
-
-	@GetMapping("/users/{id}/enabled/{status}")
-	public String updateUserEnabledStatus(@PathVariable(name = "id") Integer id,
-			@PathVariable(name = "status") boolean enabled, RedirectAttributes redirectAttributes) {
-
-		service.updateUserEnabledStatus(id, enabled);
-		String status = enabled ? "enabled" : "disabled";
-		String message = "The user id " + id + " has been " + status;
-		redirectAttributes.addFlashAttribute("message", message);
-
-		return "redirect:/users";
-	}
-
-}
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/63/6035509e29b8001d1d97982e354adf88 b/.metadata/.plugins/org.eclipse.core.resources/.history/63/6035509e29b8001d1d97982e354adf88
deleted file mode 100644
index 3d0101eb..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/63/6035509e29b8001d1d97982e354adf88
+++ /dev/null
@@ -1,65 +0,0 @@
-package com.shopme.admin.category;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Set;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import com.shopme.common.entity.Category;
-
-@Service
-public class CategoryService {
-
-	@Autowired
-	private CategoryRepository repo;
-	
-	public List<Category> listAll(){
-		return (List<Category>) repo.findAll();
-	}
-	
-	public List<Category> listCategoriesUsedInForm(){
-		
-		List<Category> categoriesUsedInForm = new ArrayList<>();
-		
-		Iterable<Category> categoriesInDB = repo.findAll();
-		
-		for (Category category : categoriesInDB) {
-
-			// root category
-			if (category.getParent() == null) {
-				System.out.println(category.getName());
-
-				category.getChildren().forEach(subCategory -> {
-
-					System.out.println("--" + subCategory.getName());
-					printChildren(subCategory, 1);
-				});
-			}
-
-		}
-		
-		
-		return categoriesUsedInForm;
-	}
-	
-	private void printChildren(Category parent, int subLevel) {
-
-		int newSubLevel = subLevel + 1;
-		Set<Category> children = parent.getChildren();
-
-		for (Category subCategory : children) {
-
-			for (int i = 0; i < newSubLevel; i++) {
-				System.out.print("--");
-			}
-
-			System.out.println(subCategory.getName());
-
-			printChildren(subCategory, newSubLevel);
-		}
-
-	}
-	
-}
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/63/7021ca408eb3001d19bbb001c1a81c20 b/.metadata/.plugins/org.eclipse.core.resources/.history/63/7021ca408eb3001d19bbb001c1a81c20
deleted file mode 100644
index 4a855f8b..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/63/7021ca408eb3001d19bbb001c1a81c20
+++ /dev/null
@@ -1,276 +0,0 @@
-<!DOCTYPE html>
-<html xmlns:th="http://www.thymeleaf.org">
-
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset= UTF-8">
-<meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0">
-<title>Manage Users</title>
-
-<link rel="stylesheet" type="text/css" th:href="@{/webjars/bootstrap/css/bootstrap.min.css}" />
-<link rel="stylesheet" type="text/css" th:href="@{/fontawesome/all.css}" />
-<link rel="stylesheet" type="text/css" th:href="@{/style.css}" />
-	
-<script type="text/javascript" th:src="@{/webjars/jquery/jquery.min.js}"></script>
-<script type="text/javascript" th:src="@{/webjars/bootstrap/js/bootstrap.min.js}"></script>
-</head>
-
-<body>
-	<div class="container-fluid">
-		<div>
-			<nav class="navbar navbar-expand-lg bg-dark navbar-dark">
-				<a class="navbar-brand" th:href="@{/}"> <img
-					th:src="@{/images/ShopmeAdminSmall.png}" />
-				</a>
-				<!--hamburger toggler for mobile devices(responsive)-->
-				<button class="navbar-toggler" type="button" data-toggle="collapse"
-					data-target="#topNavbar">
-					<span class="navbar-toggler-icon"></span>
-				</button>
-				<div class="collapse navbar-collapse" id="topNavbar">
-					<ul class="navbar-nav">
-						<li class="nav-item"><a class="nav-link" th:href="@{/users}">Users</a>
-						</li>
-						<li class="nav-item"><a class="nav-link"
-							th:href="@{/categories}">Categories</a></li>
-						<li class="nav-item"><a class="nav-link" th:href="@{/brands}">Brands</a>
-						</li>
-						<li class="nav-item"><a class="nav-link"
-							th:href="@{/products}">Products</a></li>
-						<li class="nav-item"><a class="nav-link"
-							th:href="@{/customers}">Customers</a></li>
-						<li class="nav-item"><a class="nav-link"
-							th:href="@{/shipping}">Shipping</a></li>
-						<li class="nav-item"><a class="nav-link" th:href="@{/orders}">Orders</a>
-						</li>
-						<li class="nav-item"><a class="nav-link" th:href="@{/report}">Sales
-								Report</a></li>
-						<li class="nav-item"><a class="nav-link"
-							th:href="@{/articles}">Articles</a></li>
-						<li class="nav-item"><a class="nav-link" th:href="@{/menus}">Menus</a>
-						</li>
-						<li class="nav-item"><a class="nav-link"
-							th:href="@{/settings}">Settings</a></li>
-					</ul>
-				</div>
-
-			</nav>
-		</div>
-
-		<div>
-			<h2>Manage Users</h2>
-			<a th:href="@{/users/new}" class="fas fa-user-plus fa-2x icon-dark mr-2"></a>
-			
-			<a th:href="@{/users/export/csv}" class="fas fa-file-csv fa-2x icon-dark mr-2"></a>
-		</div>
-		
-		
-		
-		<!-- only display success message when a new user is created -->
-		<div th:if="${message != null}" class="alert alert-success text-center">
-			[[${message}]]
-		</div>
-			
-		<div>
-			<form th:action="@{/users/page/1}" class="form-inline m-3">
-				
-				<input type="hidden" name="sortField" th:value="${sortField}" />
-				<input type="hidden" name="sortDir" th:value="${sortDir}" />
-				Filter:&nbsp;
-				<input type="search" name="keyword" th:value="${keyword}" class="form-control" required/>
-				&nbsp;&nbsp;
-				<button type="submit" class="btn btn-primary">
-					<i class="fas fa-search"></i>
-				</button>
-				&nbsp;&nbsp;
-				<button type="button" class="btn btn-secondary" onclick="clearFilter()">
-					<i class="fas fa-eraser"></i>
-				</button>
-			</form>
-		
-		</div>
-
-			<!-- css class to display this table in large screens only , refer to static/style.css for more info-->
-			<div class="full-details">
-				<table class="table table-bordered table-striped table-hover table-responsive-xL">
-					<thead class="thead-dark">
-						<tr>
-							<!-- refer to templates/fragments.html for fragment code-->
-							<th th:replace="fragments :: column_link('id', 'User ID')"/>
-							<th>Photos</th>
-							<th th:replace="fragments :: column_link('email', 'Email')"/>
-							<th th:replace="fragments :: column_link('firstName', 'First Name')"/>
-							<th th:replace="fragments :: column_link('lastName', 'Last Name')"/>
-							<th>Roles</th>
-							<th th:replace="fragments :: column_link('enabled', 'Enabled')"/>
-							<th></th>
-						</tr>
-					</thead>
-					<tbody>
-						<tr th:each="user : ${listUsers}">
-							<td>[[${user.id}]]</td>
-							<td>
-								<span th:if="${user.photos == null}" class="fas fa-portrait fa-3x icon-dark"></span>
-								<img th:if="${user.photos != null}" th:src="@{${user.photosImagePath}}"
-								style="width: 100px"/>
-							</td>
-							<td>[[${user.email}]]</td>
-							<td>[[${user.firstName}]]</td>
-							<td>[[${user.lastName}]]</td>
-							<td>[[${user.roles}]]</td>
-							
-							<td>
-								<a th:if="${user.enabled == true}" class="fas fa-check-circle fa-2x icon-green" 
-								th:href="@{'/users/' + ${user.id} + '/enabled/false'}"
-								title="Disable this user"></a>
-								
-								<a th:if="${user.enabled == false}" class="fas fa-circle fa-2x icon-silver"
-								 th:href="@{'/users/' + ${user.id} + '/enabled/true'}"
-								 title="Enable this user"></a>
-							</td>
-							<td>
-									<a class="fas fa-edit fa-2x icon-green" th:href="@{'/users/edit/' + ${user.id}}"
-									title="edit this user"></a>
-									&nbsp; 
-									<a class="fas fa-trash fa-2x icon-dark link-delete" th:href="@{'/users/delete/' + ${user.id}}"
-									title="delete this user" th:userId="${user.id}"></a>
-							</td>
-						</tr>
-					</tbody>
-				</table>
-			</div>
-			
-			
-			<!-- css class to display this <div> on mobile screens only, refer to /static/style.css for more info-->
-			<div class="less-details">
-				
-				<div th:each="user : ${listUsers}" class="row m-1">
-					
-					<div class="col-4">
-						
-						<span th:if="${user.photos == null}" class="fas fa-portrait fa-3x icon-dark"></span>
-								<img th:if="${user.photos != null}" th:src="@{${user.photosImagePath}}"
-								style="width: 100px"/>
-					</div>
-					
-					<div class="col-8">
-						<div>[[${user.fullName}]]</div>
-						<div>[[${user.roles}]]</div>
-						<div class="mt-2">
-							<a th:if="${user.enabled == true}" class="fas fa-check-circle fa-2x icon-green" 
-								th:href="@{'/users/' + ${user.id} + '/enabled/false'}"
-								title="Disable this user"></a>
-								
-							<a th:if="${user.enabled == false}" class="fas fa-circle fa-2x icon-silver"
-								 th:href="@{'/users/' + ${user.id} + '/enabled/true'}"
-								 title="Enable this user"></a>
-						
-									&nbsp;
-							<a class="fas fa-edit fa-2x icon-green" th:href="@{'/users/edit/' + ${user.id}}"
-									title="edit this user"></a>
-									&nbsp; 
-							<a class="fas fa-trash fa-2x icon-dark link-delete" th:href="@{'/users/delete/' + ${user.id}}"
-									title="delete this user" th:userId="${user.id}"></a>
-						</div>
-					</div>
-					<div>&nbsp;</div>
-				</div>
-			</div>
-			
-			
-			<!-- IF -->
-			<div class="text-center m-1" th:if="${totalItems > 0}">
-				<span>Showing Users # [[${startCount}]] to [[${endCount}]] of [[${totalItems}]]</span>
-			</div>
-			
-			<!-- ELSE -->
-			<div class="text-center m-1" th:unless="${totalItems > 0}">
-				<span>No users found</span>
-			</div>
-			
-			<!-- only display pagination when there are users; else, no users no pagination -->
-			<div th:if="${totalPages > 1}">
-				<nav>
-					  <ul class="pagination justify-content-center flex-wrap">
-					  
-					  	<li th:class=" ${currentPage > 1 ? 'page-item' : 'page-item disabled'}">
-					  		<a th:replace="fragments :: page_link(1, 'First')"></a>
-				    	</li>
-					  
-					    <li th:class=" ${currentPage > 1 ? 'page-item' : 'page-item disabled'}">
-					    	<a th:replace="fragments :: page_link(${currentPage - 1 }, 'previous')"></a>
-				    	</li>
-					    	
-					    <!-- org.thymeleaf.expression.Numbers class, An object of this class is usually available in variable evaluation expressions with the name #numbers. -->
-					    <li th:class="${currentPage != i ? 'page-item' : 'page-item active'}" 
-					    	th:each="i : ${#numbers.sequence(1, totalPages)}">
-					    	<a th:replace="fragments :: page_link(${i}, ${i})"></a>
-					    </li>
-					    
-					    <li  th:class=" ${currentPage < totalPages ? 'page-item' : 'page-item disabled'}">
-					    	<a th:replace="fragments :: page_link(${currentPage + 1}, 'Next')"></a>
-					    </li>
-					    
-					    <li th:class=" ${currentPage < totalPages ? 'page-item' : 'page-item disabled'}">
-							<a th:replace="fragments :: page_link(${totalPages}, 'Last')"></a>		
-					    </li>
-					  </ul>
-				</nav>
-			</div>
-			
-			
-			
-			<div class="modal fade text-center" id="confirmModal">
-				<div class="modal-dialog">
-					<div class="modal-content">
-					
-						<div class="modal-header">
-							<h4 class="modal-title">Delete Confirmation</h4>
-							<button type="button" class="close" data-dismiss="modal">&times;</button>
-						</div>
-						
-						<div class="modal-body">
-							<span id="confirmText"></span>
-						</div>
-						
-						<div class="modal-footer">
-							<a class="btn btn-success" href="" id="yesButton">Yes</a>
-							<button type="button" class="btn btn-danger" data-dismiss="modal">Close</button>
-						</div>
-					</div>
-				</div>
-			</div>
-			
-			
-			<div class="text-center">
-				<p>Shopme Control Panel - Copyright &copy; Shopme</p>
-			</div>
-
-
-	</div>
-	
-<script type="text/javascript">
-
-//confirmation modal dialogue for delete user
-$(document).ready(function(){
-	$(".link-delete").on("click", function(e){
-		//stop the <a> tag default behaviour and pop out a confirmation modal dialogue
-		e.preventDefault();
-		//alert($(this).attr("href"));
-		link = $(this);
-		userId = link.attr("userId");
-		$("#yesButton").attr("href", link.attr("href"));
-		$("#confirmText").text("Are you sure you want to delete this user ID " + userId + "?");
-		$("#confirmModal").modal();
-	});
-});
-
-	function clearFilter(){
-		window.location = "[[@{/users}]]";
-	}
-
-
-</script>
-	
-</body>
-
-</html>
\ No newline at end of file
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/64/203640a29bb9001d10d0f9513979f945 b/.metadata/.plugins/org.eclipse.core.resources/.history/64/203640a29bb9001d10d0f9513979f945
new file mode 100644
index 00000000..4dd231f4
--- /dev/null
+++ b/.metadata/.plugins/org.eclipse.core.resources/.history/64/203640a29bb9001d10d0f9513979f945
@@ -0,0 +1,115 @@
+<!DOCTYPE html>
+<html xmlns:th="http://www.thymeleaf.org">
+
+<head th:replace="fragments :: page_head(${pageTitle})"/>
+
+<body>
+	<div class="container-fluid">
+
+	<!-- navigation bar -->
+	<div th:replace="navigation :: menu"></div>
+
+	<div>
+		<h2>Manage Categories | [[${pageTitle}]]</h2>
+	</div>
+
+			<form th:action="@{/categories/save}" method="post" style="max-width:500px; margin: 0 auto"
+			enctype="multipart/form-data"
+			th:object="${category}" >
+			<input type="hidden" th:field="*{id}" />
+			<div class="border border-secondary rounded p-3">
+				<div class="form-group row">
+					<label class="col-sm-4 col-form-label">Category Name:</label>
+					<div class="col-sm-8">
+						<input type="text" class="form-control" th:field="*{name}" required minlength="3" maxlength="128" />
+					</div>
+				</div>
+				
+				<div class="form-group row">
+					<label class="col-sm-4 col-form-label">Alias:</label>
+					<div class="col-sm-8">
+						<input type="text" class="form-control" th:field="*{alias}" required minlength="3" maxlength="64" />
+					</div>
+				</div>
+				
+				<div class="form-group row">
+					<label class="col-sm-4 col-form-label">Parent Category:</label>
+					<div class="col-sm-8">
+						<select class="form-control" th:field="*{parent}">
+							<option value="0">[No Parent]</option>
+							
+							<th:block th:each="cat : ${listCategories}">
+								<option th:value="${cat.id}">[[${cat.name}]]</option>
+							</th:block>
+						</select>
+					</div>
+				</div>
+				
+				<div class="form-group row">
+					<label class="col-sm-4 col-form-label">Image:</label>
+					<div class="col-sm-8">
+						<input type="hidden" th:field="*{image}"/>
+						<input type="file" id="fileImage" name="fileImage" accept="image/png, image/jpeg"
+						 required class="mb-2" />
+						
+					<div class="mt-2">
+						<img id="thumbnail" alt="Image preview" th:src="@{/images/image-thumbnail.png}"
+						 class="img-fluid" />
+					</div>	 
+						 
+					</div>	
+				</div>
+				
+				<div class="form-group row">
+					<label class="col-sm-4 col-form-label">Enabled:</label>
+					<div class="col-sm-8">
+						<input type="checkbox" th:field="*{enabled}" />
+					</div>
+				</div>
+				
+				<div class="text-center">
+					<input type="submit" value="Save" class="btn btn-primary m-3" />
+					<input type="button" value="Cancel" class="btn btn-secondary" id="buttonCancel" />
+				</div>
+			</div>
+			</form>
+			
+			<div class="modal fade text-center" id="modalDialog">
+				<div class="modal-dialog">
+					<div class="modal-content">
+					
+						<div class="modal-header">
+							<h4 class="modal-title" id="modalTitle">Warning</h4>
+							<button type="button" class="close" data-dismiss="modal">&times;</button>
+						</div>
+						
+						<div class="modal-body">
+							<span id="modalBody"></span>
+						</div>
+						
+						<div class="modal-footer">
+							<button type="button" class="btn btn-danger" data-dismiss="modal">Close</button>
+						</div>
+					</div>
+				</div>
+			</div>
+			
+			
+		<!-- footer -->
+		<div th:replace="fragments :: footer"></div>
+
+	</div>
+			
+<!-- jquery for  cancel button return to users listing-->
+<script type="text/javascript">
+	
+	/*for cancel button in /js/common_form.js*/
+	moduleURL = "[[@{/categories}]]";
+	
+</script>
+
+<script th:src="@{/js/common_form.js}"></script>
+
+</body>
+
+</html>
\ No newline at end of file
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/65/f0e214be9cb9001d10d0f9513979f945 b/.metadata/.plugins/org.eclipse.core.resources/.history/65/f0e214be9cb9001d10d0f9513979f945
new file mode 100644
index 00000000..3844263e
--- /dev/null
+++ b/.metadata/.plugins/org.eclipse.core.resources/.history/65/f0e214be9cb9001d10d0f9513979f945
@@ -0,0 +1,105 @@
+package com.shopme.admin.category;
+
+import java.io.IOException;
+import java.util.List;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.scheduling.support.SimpleTriggerContext;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
+import org.springframework.util.StringUtils;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.ModelAttribute;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.multipart.MultipartFile;
+import org.springframework.web.servlet.mvc.support.RedirectAttributes;
+
+import com.shopme.admin.FileUploadUtil;
+import com.shopme.common.entity.Category;
+
+@Controller
+public class CategoryController {
+	
+	@Autowired
+	private CategoryService service;
+	
+	@GetMapping("/categories")
+	public String listAll(Model model) {
+		
+		List<Category> listCategories = service.listAll();
+		model.addAttribute("listCategories", listCategories);
+		
+		return "categories/categories";
+	}
+	
+	
+	@GetMapping("/categories/new")
+	public String newCategory(Model model) {
+		
+		List<Category> listCategories = service.listCategoriesUsedInForm();
+		
+		model.addAttribute("category", new Category());
+		model.addAttribute("listCategories", listCategories);
+		model.addAttribute("pageTitle", "Create New Category");
+		
+		return "categories/category_form";
+	
+	}
+	
+	@PostMapping("/categories/save")
+	public String saveCategory(@ModelAttribute("category") Category category, 
+			RedirectAttributes redirectAttributes,
+			@RequestParam("fileImage") MultipartFile multipartFile) throws IOException {
+		
+		if(!multipartFile.isEmpty()) {
+			
+		}
+		else {
+			service.save(category);
+		}
+		
+		String fileName = StringUtils.cleanPath(multipartFile.getOriginalFilename());
+		category.setImage(fileName);
+		
+		Category savedCategory = service.save(category);
+		String uploadDir = "../category-images/" + savedCategory.getId();
+		
+		FileUploadUtil.cleanDir(uploadDir);
+		FileUploadUtil.saveFile(uploadDir, fileName, multipartFile);
+		
+		
+		
+		redirectAttributes.addFlashAttribute("message", "the category have been saved successfully");
+		
+		
+		return "redirect:/categories";
+	}
+
+	
+	@GetMapping("/categories/edit/{id}")
+	public String editCategory(@PathVariable(name = "id") Integer id, Model model,
+			RedirectAttributes ra) {
+		try {
+			Category category = service.get(id);
+			List<Category> listCategories = service.listCategoriesUsedInForm();
+			
+			model.addAttribute("category", category);
+			model.addAttribute("listCategories", listCategories);
+			model.addAttribute("pageTitle", "Edit Category (ID: " + id + ")");
+			
+			return "categories/category_form";			
+		} catch (CategoryNotFoundException ex) {
+			ra.addFlashAttribute("message", ex.getMessage());
+			return "redirect:/categories";
+		}
+	}
+	
+	
+	
+}
+	
+
+
+
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/66/101d4cd017b4001d128fb79045552177 b/.metadata/.plugins/org.eclipse.core.resources/.history/66/101d4cd017b4001d128fb79045552177
deleted file mode 100644
index cd3b69b6..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/66/101d4cd017b4001d128fb79045552177
+++ /dev/null
@@ -1,60 +0,0 @@
-package com.shopme.admin.security;
-
-import org.aspectj.weaver.ast.And;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.security.config.annotation.web.builders.HttpSecurity;
-import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
-import org.springframework.security.config.annotation.web.configuration.WebSecurityConfiguration;
-import org.springframework.security.config.annotation.web.configuration.WebSecurityCustomizer;
-import org.springframework.security.core.userdetails.UserDetailsService;
-import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
-import org.springframework.security.crypto.password.PasswordEncoder;
-import org.springframework.security.web.SecurityFilterChain;
-
-@Configuration
-@EnableWebSecurity
-public class WebSecurityConfig {
-
-	/*
-	 * refer to this link: https://www.codejava.net/frameworks/spring-boot/fix-
-	 * websecurityconfigureradapter-deprecated
-	 * 
-	 */
-	
-	@Bean
-	public UserDetailsService  UserDetailsService()	{
-		return new ShopmeUserDetailsService();
-	}
-	
-
-	@Bean
-	public PasswordEncoder PasswordEncoder() {
-		return new BCryptPasswordEncoder();
-	}
-
-	@Bean
-	public SecurityFilterChain filterChain(HttpSecurity http) throws Exception {
-
-		// any request need to be authenticated (require login)
-		// custom login page at "/login" - handler method in MainController class
-		http.authorizeHttpRequests()
-			.anyRequest().authenticated()
-			.and()
-			.formLogin()
-				.loginPage("/login")
-				.usernameParameter("email")
-				.permitAll();
-
-		return http.build();
-	}
-
-	//NOTE: antMatchers() changed to requestMatchers()
-	//stack: https://stackoverflow.com/questions/74907533/the-method-antmatchersstring-is-undefined-for-the-type
-	@Bean
-	public WebSecurityCustomizer webSecurityCustomizer() {
-		//permit access to the assets in the following directories
-		return (web) -> web.ignoring().requestMatchers("/images/**", "/js/**", "/webjars/**");
-	}
-
-}
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/66/9077a96465b3001d19bbb001c1a81c20 b/.metadata/.plugins/org.eclipse.core.resources/.history/66/9077a96465b3001d19bbb001c1a81c20
deleted file mode 100644
index c9e5fbd5..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/66/9077a96465b3001d19bbb001c1a81c20
+++ /dev/null
@@ -1,9 +0,0 @@
-package com.shopme.admin.user;
-
-public class UserCsvExporter {
-
-	public void export() {
-	
-	}
-	
-}
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/66/a0cf551b08b4001d128fb79045552177 b/.metadata/.plugins/org.eclipse.core.resources/.history/66/a0cf551b08b4001d128fb79045552177
deleted file mode 100644
index bbfab156..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/66/a0cf551b08b4001d128fb79045552177
+++ /dev/null
@@ -1,47 +0,0 @@
-package com.shopme.admin.security;
-
-import org.aspectj.weaver.ast.And;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.security.config.annotation.web.builders.HttpSecurity;
-import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
-import org.springframework.security.config.annotation.web.configuration.WebSecurityConfiguration;
-import org.springframework.security.config.annotation.web.configuration.WebSecurityCustomizer;
-import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
-import org.springframework.security.crypto.password.PasswordEncoder;
-import org.springframework.security.web.SecurityFilterChain;
-
-@Configuration
-@EnableWebSecurity
-public class WebSecurityConfig  {
-
-	/*
-	 *  refer to this link: https://www.codejava.net/frameworks/spring-boot/fix-websecurityconfigureradapter-deprecated
-	 * 
-	 */	
-	
-	@Bean
-	public PasswordEncoder PasswordEncoder() {
-		return new BCryptPasswordEncoder();
-	}
-	
-	@Bean
-	public SecurityFilterChain filterChain(HttpSecurity http) throws Exception {
-		
-		// any request need to be authenticated (require login)
-		//custom login page at "/login" - handler method in MainController class
-		http.authorizeHttpRequests().anyRequest().authenticated()
-			.and().formLogin().loginPage("/login").permitAll();
-		
-		return http.build();
-	}
-	
-	
-	@Bean
-    public WebSecurityCustomizer webSecurityCustomizer() {
-//        return (web) -> web.ignoring().antMatchers("/images/**", "/js/**", "/webjars/**");
-    }
-	
-	
-	
-}
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/68/702b80538eb3001d19bbb001c1a81c20 b/.metadata/.plugins/org.eclipse.core.resources/.history/68/702b80538eb3001d19bbb001c1a81c20
deleted file mode 100644
index 489d0443..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/68/702b80538eb3001d19bbb001c1a81c20
+++ /dev/null
@@ -1,35 +0,0 @@
-*.icon-white{color: white}
-*.icon-silver{color: silver}
-*.icon-green{color: green}
-*.icon-dark{color: gray}
-*.icon-red{color: red}
-
-
-
-@media screen and (max-width: 768px) {
-	/* small screen eg:mobile*/
-	
-	div.full-details{ display: none;}
-	div.less-details{ display: block;}
-	
-}
-
-@media screen and (min-width: 768px) and (max-width: 1024px) {
-	/* medium screen eg:tablet*/
-	
-	div.full-details{ display: block;}
-	div.less-details{ display: none;}
-	
-	th, td .hidable-column{display: none;}
-	
-}
-
-
-@media screen and (min-width: 1024px) {
-	/* large screen eg:laptop*/
-	
-	div.less-details{ display: none;}
-	
-	th, td .hidable-column{display: table-cell;}
-	
-}
\ No newline at end of file
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/68/a0b09ae879b3001d19bbb001c1a81c20 b/.metadata/.plugins/org.eclipse.core.resources/.history/68/a0b09ae879b3001d19bbb001c1a81c20
deleted file mode 100644
index c23d0172..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/68/a0b09ae879b3001d19bbb001c1a81c20
+++ /dev/null
@@ -1,37 +0,0 @@
-package com.shopme.admin.user;
-
-import java.io.IOException;
-import java.text.DateFormat;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.List;
-
-import org.supercsv.io.CsvBeanWriter;
-import org.supercsv.io.ICsvBeanWriter;
-import org.supercsv.prefs.CsvPreference;
-
-import com.shopme.common.entity.User;
-
-import jakarta.servlet.http.HttpServletResponse;
-
-public class UserCsvExporter extends AbstractExporter {
-
-	public void export(List<User> listUsers, HttpServletResponse response) throws IOException {
-		
-		super.setResponseHeader(response, ".csv", "text/csv");
-		
-		ICsvBeanWriter csvWriter = new CsvBeanWriter(response.getWriter(), CsvPreference.STANDARD_PREFERENCE);
-		
-		String[] csvHeader = {"User ID", "E-mail", "First Name", "Last Name", "Roles", "Enabled"};
-		String[] fieldMapping = {"id", "email", "firstName", "lastName", "roles", "enabled"};
-		
-		csvWriter.writeHeader(csvHeader);
-		
-		for (User user : listUsers) {
-			csvWriter.write(user, fieldMapping);
-		}
-		
-		csvWriter.close();
-	}
-	
-}
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/68/e0ba267953b4001d1d079a924effdc9e b/.metadata/.plugins/org.eclipse.core.resources/.history/68/e0ba267953b4001d1d079a924effdc9e
deleted file mode 100644
index 50e0421e..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/68/e0ba267953b4001d1d079a924effdc9e
+++ /dev/null
@@ -1,45 +0,0 @@
-package com.shopme.admin.user;
-
-import java.io.IOException;
-import java.text.DateFormat;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.List;
-
-import org.supercsv.io.CsvBeanWriter;
-import org.supercsv.io.ICsvBeanWriter;
-import org.supercsv.prefs.CsvPreference;
-
-import com.shopme.common.entity.User;
-
-import jakarta.servlet.http.HttpServletResponse;
-
-public class UserCsvExporter  {
-
-	public void export(List<User> listUsers, HttpServletResponse response) throws IOException {
-		
-		DateFormat dateFormatter = new SimpleDateFormat("yyyy-MM-dd_HH-mm-ss");
-		String timestamp = dateFormatter.format(new Date());
-		String fileName = "users_" + timestamp + ".csv";
-		
-		response.setContentType("text/csv");
-		
-		String headerKey = "Content-Disposition";
-		String headerValue = "attachment; filename=" + fileName;
-		response.setHeader(headerKey, headerValue);
-		
-		ICsvBeanWriter csvWriter = new CsvBeanWriter(response.getWriter(), CsvPreference.STANDARD_PREFERENCE);
-		
-		String[] csvHeader = {"User ID", "E-mail", "First Name", "Last Name", "Roles", "Enabled"};
-		String[] fieldMapping = {"id", "email", "firstName", "lastName", "roles", "enabled"};
-		
-		csvWriter.writeHeader(csvHeader);
-		
-		for (User user : listUsers) {
-			csvWriter.write(user, fieldMapping);
-		}
-		
-		csvWriter.close();
-	}
-	
-}
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/6a/a0ac5efe26b3001d1e75aa5ef0815903 b/.metadata/.plugins/org.eclipse.core.resources/.history/6a/a0ac5efe26b3001d1e75aa5ef0815903
deleted file mode 100644
index 680a3f3c..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/6a/a0ac5efe26b3001d1e75aa5ef0815903
+++ /dev/null
@@ -1,46 +0,0 @@
-package com.shopme.admin.user;
-
-import org.springframework.data.domain.Page;
-import org.springframework.data.domain.Pageable;
-import org.springframework.data.jpa.repository.Modifying;
-import org.springframework.data.jpa.repository.Query;
-import org.springframework.data.repository.CrudRepository;
-import org.springframework.data.repository.PagingAndSortingRepository;
-import org.springframework.data.repository.query.Param;
-import org.springframework.stereotype.Repository;
-
-import com.shopme.common.entity.User;
-
-@Repository
-public interface UserRepository extends CrudRepository<User, Integer>, PagingAndSortingRepository<User, Integer> {
-
-	/*
-	 * JPQL statement. It should be noted that as compared to native SQL, JPQL does
-	 * not interact with database tables, records, and fields - but with Java
-	 * classes and instances.
-	 * 
-	 * JPA kicks in as the mediator and transpiles JPQL queries to SQL queries for execution.
-	 * 
-	 * If your database can change or varies from development to production, as long as 
-	 * they're both relational - JPQL works wonders and you can 
-	 * write JPQL queries to create generic logic that can be used over and over again.
-	 */
-	@Query("SELECT u FROM User u WHERE u.email = :email")
-	public User getUserByEmail(@Param("email") String email);
-	
-	// countById() declaration follows the JPA specification
-	//to check the existence of a user
-	public Long countById(Integer id);
-	
-	
-	//for filtering users by keyword
-	@Query("SELECT u FROM User u WHERE u.firstName LIKE %?1%")
-	public Page<User> findAll(String keyword, Pageable pageable);
-	
-	
-	//change user enabled status
-	//need @Modifying annotation for update/delete operation
-	@Query("UPDATE User u SET u.enabled = ?2 WHERE u.id = ?1")
-	@Modifying
-	public void updateEnabledStatus(Integer id, boolean enabled);
-}
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/6b/00ddff6014b4001d128fb79045552177 b/.metadata/.plugins/org.eclipse.core.resources/.history/6b/00ddff6014b4001d128fb79045552177
deleted file mode 100644
index 3d75e2ab..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/6b/00ddff6014b4001d128fb79045552177
+++ /dev/null
@@ -1,76 +0,0 @@
-package com.shopme.admin.security;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-import java.util.Set;
-
-import org.springframework.security.core.GrantedAuthority;
-import org.springframework.security.core.authority.SimpleGrantedAuthority;
-import org.springframework.security.core.userdetails.UserDetails;
-
-import com.shopme.common.entity.Role;
-import com.shopme.common.entity.User;
-
-/*
- *  Think of it as a wrapper class for  Type User
- * 
- * */
-public class ShopmeUserDetails implements UserDetails {
-
-	private User user;
-
-	public ShopmeUserDetails(User user) {
-		this.user = user;
-	}
-
-	/* get a list of assigned roles to user */
-	@Override
-	public Collection<? extends GrantedAuthority> getAuthorities() {
-
-		Set<Role> roles = user.getRoles();
-
-		List<SimpleGrantedAuthority> authorities = new ArrayList<>();
-
-		for (Role role : roles) {
-			authorities.add(new SimpleGrantedAuthority(role.getName()));
-		}
-
-		return authorities;
-	}
-
-	@Override
-	public String getPassword() {
-		return user.getPassword();
-	}
-
-	@Override
-	public String getUsername() {
-		return user.getEmail();
-	}
-
-	// "true" means account not expired
-	@Override
-	public boolean isAccountNonExpired() {
-		return true;
-	}
-
-	@Override
-	public boolean isAccountNonLocked() {
-		// TODO Auto-generated method stub
-		return true;
-	}
-
-	@Override
-	public boolean isCredentialsNonExpired() {
-		// TODO Auto-generated method stub
-		return true;
-	}
-
-	@Override
-	public boolean isEnabled() {
-		// TODO Auto-generated method stub
-		return user.isEnabled();
-	}
-
-}
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/6b/10aa2f7444b4001d1d079a924effdc9e b/.metadata/.plugins/org.eclipse.core.resources/.history/6b/10aa2f7444b4001d1d079a924effdc9e
deleted file mode 100644
index adf75865..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/6b/10aa2f7444b4001d1d079a924effdc9e
+++ /dev/null
@@ -1,48 +0,0 @@
-<!DOCTYPE html>
-<html xmlns:th="http://www.thymeleaf.org">
-
-<body>
-
-	<div>
-		<nav class="navbar navbar-expand-lg bg-dark navbar-dark">
-			<a class="navbar-brand" th:href="@{/}"> <img
-				th:src="@{/images/ShopmeAdminSmall.png}" />
-			</a>
-			<!--hamburger toggler for mobile devices(responsive)-->
-			<button class="navbar-toggler" type="button" data-toggle="collapse"
-				data-target="#topNavbar">
-				<span class="navbar-toggler-icon"></span>
-			</button>
-			<div class="collapse navbar-collapse" id="topNavbar">
-				<ul class="navbar-nav">
-					<li class="nav-item"><a class="nav-link" th:href="@{/users}">Users</a>
-					</li>
-					<li class="nav-item"><a class="nav-link"
-						th:href="@{/categories}">Categories</a></li>
-					<li class="nav-item"><a class="nav-link" th:href="@{/brands}">Brands</a>
-					</li>
-					<li class="nav-item"><a class="nav-link"
-						th:href="@{/products}">Products</a></li>
-					<li class="nav-item"><a class="nav-link"
-						th:href="@{/customers}">Customers</a></li>
-					<li class="nav-item"><a class="nav-link"
-						th:href="@{/shipping}">Shipping</a></li>
-					<li class="nav-item"><a class="nav-link" th:href="@{/orders}">Orders</a>
-					</li>
-					<li class="nav-item"><a class="nav-link" th:href="@{/report}">Sales
-							Report</a></li>
-					<li class="nav-item"><a class="nav-link"
-						th:href="@{/articles}">Articles</a></li>
-					<li class="nav-item"><a class="nav-link" th:href="@{/menus}">Menus</a>
-					</li>
-					<li class="nav-item"><a class="nav-link"
-						th:href="@{/settings}">Settings</a></li>
-				</ul>
-			</div>
-
-		</nav>
-	</div>
-	
-	
-</body>
-</html>
\ No newline at end of file
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/6c/00a2efd39bb9001d10d0f9513979f945 b/.metadata/.plugins/org.eclipse.core.resources/.history/6c/00a2efd39bb9001d10d0f9513979f945
new file mode 100644
index 00000000..c630a54e
--- /dev/null
+++ b/.metadata/.plugins/org.eclipse.core.resources/.history/6c/00a2efd39bb9001d10d0f9513979f945
@@ -0,0 +1,115 @@
+<!DOCTYPE html>
+<html xmlns:th="http://www.thymeleaf.org">
+
+<head th:replace="fragments :: page_head(${pageTitle})"/>
+
+<body>
+	<div class="container-fluid">
+
+	<!-- navigation bar -->
+	<div th:replace="navigation :: menu"></div>
+
+	<div>
+		<h2>Manage Categories | [[${pageTitle}]]</h2>
+	</div>
+
+			<form th:action="@{/categories/save}" method="post" style="max-width:500px; margin: 0 auto"
+			enctype="multipart/form-data"
+			th:object="${category}" >
+			<input type="hidden" th:field="*{id}" />
+			<div class="border border-secondary rounded p-3">
+				<div class="form-group row">
+					<label class="col-sm-4 col-form-label">Category Name:</label>
+					<div class="col-sm-8">
+						<input type="text" class="form-control" th:field="*{name}" required minlength="3" maxlength="128" />
+					</div>
+				</div>
+				
+				<div class="form-group row">
+					<label class="col-sm-4 col-form-label">Alias:</label>
+					<div class="col-sm-8">
+						<input type="text" class="form-control" th:field="*{alias}" required minlength="3" maxlength="64" />
+					</div>
+				</div>
+				
+				<div class="form-group row">
+					<label class="col-sm-4 col-form-label">Parent Category:</label>
+					<div class="col-sm-8">
+						<select class="form-control" th:field="*{parent}">
+							<option value="0">[No Parent]</option>
+							
+							<th:block th:each="cat : ${listCategories}">
+								<option th:value="${cat.id}">[[${cat.name}]]</option>
+							</th:block>
+						</select>
+					</div>
+				</div>
+				
+				<div class="form-group row">
+					<label class="col-sm-4 col-form-label">Image:</label>
+					<div class="col-sm-8">
+						<input type="hidden" th:field="*{image}"/>
+						<input type="file" id="fileImage" name="fileImage" accept="image/png, image/jpeg"
+						 th:required="${category.imagepath == null}"  required class="mb-2" />
+						
+					<div class="mt-2">
+						<img id="thumbnail" alt="Image preview" th:src="@{${category.imagePath}}"
+						 class="img-fluid" />
+					</div>	 
+						 
+					</div>	
+				</div>
+				
+				<div class="form-group row">
+					<label class="col-sm-4 col-form-label">Enabled:</label>
+					<div class="col-sm-8">
+						<input type="checkbox" th:field="*{enabled}" />
+					</div>
+				</div>
+				
+				<div class="text-center">
+					<input type="submit" value="Save" class="btn btn-primary m-3" />
+					<input type="button" value="Cancel" class="btn btn-secondary" id="buttonCancel" />
+				</div>
+			</div>
+			</form>
+			
+			<div class="modal fade text-center" id="modalDialog">
+				<div class="modal-dialog">
+					<div class="modal-content">
+					
+						<div class="modal-header">
+							<h4 class="modal-title" id="modalTitle">Warning</h4>
+							<button type="button" class="close" data-dismiss="modal">&times;</button>
+						</div>
+						
+						<div class="modal-body">
+							<span id="modalBody"></span>
+						</div>
+						
+						<div class="modal-footer">
+							<button type="button" class="btn btn-danger" data-dismiss="modal">Close</button>
+						</div>
+					</div>
+				</div>
+			</div>
+			
+			
+		<!-- footer -->
+		<div th:replace="fragments :: footer"></div>
+
+	</div>
+			
+<!-- jquery for  cancel button return to users listing-->
+<script type="text/javascript">
+	
+	/*for cancel button in /js/common_form.js*/
+	moduleURL = "[[@{/categories}]]";
+	
+</script>
+
+<script th:src="@{/js/common_form.js}"></script>
+
+</body>
+
+</html>
\ No newline at end of file
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/6c/80f96fae0ab4001d128fb79045552177 b/.metadata/.plugins/org.eclipse.core.resources/.history/6c/80f96fae0ab4001d128fb79045552177
deleted file mode 100644
index a9a2eae3..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/6c/80f96fae0ab4001d128fb79045552177
+++ /dev/null
@@ -1,42 +0,0 @@
-<!DOCTYPE html>
-<html xmlns:th="http://www.thymeleaf.org">
-
-<head>
-	<meta http-equiv="Content-Type" content="text/html; charset= UTF-8">
-	<meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0">
-	<title>Login - Shopme Admin</title>
-	<link rel="stylesheet" type="text/css" th:href="@{/webjars/bootstrap/css/bootstrap.min.css}" />
-</head>
-
-<body>
-	<div class="container-fluid text-center">
-		
-		<div>
-			<img th:src="@{/images/ShopmeAdminBig.png}" />
-		</div>
-		
-		<form th:action="@{/login}" method="post" style="max-width:350px; margin: 0 auto">
-		
-			<div class="border border-secondary rounded p-3">
-				<p>Access to Shopme Control Panel </p>
-				
-				<p>
-					<input type="email" name="email" class="form-control" placeholder="email" required />
-				</p>
-				
-				<p>
-					<input type="password" name="password" class="form-control" placeholder="Password" required />
-				</p>
-			</div>
-		
-		</form>
-
-		<div>
-			<p>Shopme Control Panel - Copyright &copy; Shopme</p>
-		</div>
-
-	</div>
-
-</body>
-
-</html>
\ No newline at end of file
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/6c/c05bcd4989b3001d19bbb001c1a81c20 b/.metadata/.plugins/org.eclipse.core.resources/.history/6c/c05bcd4989b3001d19bbb001c1a81c20
deleted file mode 100644
index 2bdd6aa8..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/6c/c05bcd4989b3001d19bbb001c1a81c20
+++ /dev/null
@@ -1,24 +0,0 @@
-*.icon-white{color: white}
-*.icon-silver{color: silver}
-*.icon-green{color: green}
-*.icon-dark{color: gray}
-*.icon-red{color: red}
-
-
-@media screen and (max-width: 768px) {
-	/* small screen */
-	
-	div.full-details{ display: none;}
-}
-
-@media screen and (min-width: 768px) and (max-width: 1024px) {
-	/* medium screen */
-	
-	div.full-details{ display: block;}
-}
-
-
-@media screen and (min-width: 1024px) {
-	/* large screen */
-	
-}
\ No newline at end of file
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/6d/90d922cd67b3001d19bbb001c1a81c20 b/.metadata/.plugins/org.eclipse.core.resources/.history/6d/90d922cd67b3001d19bbb001c1a81c20
deleted file mode 100644
index 017ea2e3..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/6d/90d922cd67b3001d19bbb001c1a81c20
+++ /dev/null
@@ -1,186 +0,0 @@
-package com.shopme.admin.user;
-
-import java.io.IOException;
-import java.util.List;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.domain.Page;
-import org.springframework.data.repository.query.Param;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
-import org.springframework.util.StringUtils;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.ModelAttribute;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.multipart.MultipartFile;
-import org.springframework.web.servlet.mvc.support.RedirectAttributes;
-
-import com.fasterxml.jackson.annotation.ObjectIdGenerators.StringIdGenerator;
-import com.shopme.admin.FileUploadUtil;
-import com.shopme.common.entity.Role;
-import com.shopme.common.entity.User;
-
-@Controller
-public class UserController {
-
-	@Autowired
-	private UserService service;
-
-	@GetMapping("/users")
-	public String listFirstPage(Model model) {
-		
-		//NOTE: these are the default values for path variable and URL parameters
-		return listByPage(1, model, "firstName", "asc", null);
-	}
-
-	@GetMapping("/users/page/{pageNum}")
-	public String listByPage(@PathVariable(name = "pageNum") int pageNum, Model model,
-			@Param("sortField") String sortField, @Param("sortDir") String sortDir,
-			@Param("keyword") String keyword) {
-		
-		System.out.println("sort field: " + sortField);
-		System.out.println("sort order: " + sortDir);
-		
-		Page<User> page = service.listByPage(pageNum, sortField, sortDir, keyword);
-		List<User> listUsers = page.getContent();
-
-		
-		long startCount = (pageNum - 1) * UserService.USERS_PER_PAGE + 1;
-		long endCount = startCount + UserService.USERS_PER_PAGE - 1;
-		if(endCount > page.getTotalElements()) {
-			endCount = page.getTotalElements();
-		}
-		
-		String reverseSortDir = sortDir.equals("asc") ? "desc" : "asc";
-		
-		model.addAttribute("currentPage", pageNum);
-		model.addAttribute("totalPages", page.getTotalPages());
-		model.addAttribute("startCount", startCount);
-		model.addAttribute("endCount", endCount);
-		model.addAttribute("totalItems", page.getTotalElements());
-		model.addAttribute("listUsers", listUsers);
-		model.addAttribute("sortField", sortField);
-		model.addAttribute("sortDir", sortDir);
-		model.addAttribute("reverseSortDir", reverseSortDir);
-		model.addAttribute("keyword", keyword);
-		
-
-		return "users";
-
-	}
-
-	@GetMapping("/users/new")
-	public String newUser(Model model) {
-
-		List<Role> listRoles = service.listRoles();
-
-		User user = new User();
-		user.setEnabled(true);
-
-		model.addAttribute("user", user);
-		model.addAttribute("listRoles", listRoles);
-		model.addAttribute("pageTitle", "Create New User");
-
-		return "user_form";
-
-	}
-
-	// using @RequestParam, we can get the image file input, the input has the
-	// property name="image"
-	@PostMapping("/users/save")
-	public String saveUser(@ModelAttribute("user") User user, RedirectAttributes redirectAttributes,
-			@RequestParam("image") MultipartFile multipartFile) throws IOException {
-
-		if (!multipartFile.isEmpty()) {
-
-			String fileName = StringUtils.cleanPath(multipartFile.getOriginalFilename());
-			user.setPhotos(fileName);
-
-			User savedUser = service.save(user);
-
-			String uploadDir = "user-photos/" + savedUser.getId();
-
-			FileUploadUtil.cleanDir(uploadDir);
-			FileUploadUtil.saveFile(uploadDir, fileName, multipartFile);
-		} else {
-
-			// set photo to null for getPhotosImagePath() method's conditional statement in
-			// User class
-			if (user.getPhotos().isEmpty())
-				user.setPhotos(null);
-			service.save(user);
-		}
-
-		redirectAttributes.addFlashAttribute("message", "the user has been saved successfully");
-
-		// POST/REDIRECT/GET web design
-		return getRedirectURLtoAffectedUser(user);
-	}
-
-	private String getRedirectURLtoAffectedUser(User user) {
-		
-		//after user is saved display the user instead of the entire user list
-		//email is a unique field to identify each user.
-		String firstPartOfEmail = user.getEmail().split("@")[0];
-		return "redirect:/users/page/1?sortField=id&sortDir=asc&keyword=" + firstPartOfEmail;
-	}
-
-	@GetMapping("/users/edit/{id}")
-	public String editUser(@PathVariable(name = "id") Integer id, RedirectAttributes redirectAttributes, Model model) {
-		try {
-			User user = service.get(id);
-			List<Role> listRoles = service.listRoles();
-
-			model.addAttribute("user", user);
-			model.addAttribute("pageTitle", "Edit User (ID: " + id + ")");
-			model.addAttribute("listRoles", listRoles);
-
-			return "user_form";
-		} catch (UserNotFoundException ex) {
-			redirectAttributes.addFlashAttribute("message", ex.getMessage());
-
-			return "redirect:/users";
-		}
-
-	}
-
-	@GetMapping("/users/delete/{id}")
-	public String deleteUser(@PathVariable(name = "id") Integer id, RedirectAttributes redirectAttributes,
-			Model model) {
-		try {
-			service.delete(id);
-			redirectAttributes.addFlashAttribute("message", "The user ID " + id + " has been deleted successfully.");
-
-		} catch (UserNotFoundException ex) {
-			redirectAttributes.addFlashAttribute("message", ex.getMessage());
-
-		}
-
-		return "redirect:/users";
-	}
-
-	@GetMapping("/users/{id}/enabled/{status}")
-	public String updateUserEnabledStatus(@PathVariable(name = "id") Integer id,
-			@PathVariable(name = "status") boolean enabled, RedirectAttributes redirectAttributes) {
-
-		service.updateUserEnabledStatus(id, enabled);
-		String status = enabled ? "enabled" : "disabled";
-		String message = "The user id " + id + " has been " + status;
-		redirectAttributes.addFlashAttribute("message", message);
-
-		return "redirect:/users";
-	}
-
-	@GetMapping("/users/export/csv")
-	public void exportToCSV() {
-		
-		  List<User> listUsers = service.listAll();
-		  
-		  
-		UserCsvExporter exporter = new UserCsvExporter();
-	}
-	
-	
-}
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/6d/b01162862fb4001d1d079a924effdc9e b/.metadata/.plugins/org.eclipse.core.resources/.history/6d/b01162862fb4001d1d079a924effdc9e
deleted file mode 100644
index c23d32f8..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/6d/b01162862fb4001d1d079a924effdc9e
+++ /dev/null
@@ -1,103 +0,0 @@
-<!DOCTYPE html>
-<html xmlns:th="http://www.thymeleaf.org"
-	  xmlns:sec="https://www.thymeleaf.org/thymeleaf-extras-springsecurity5">
-
-<head>
-	<meta http-equiv="Content-Type" content="text/html; charset= UTF-8">
-	<meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0">
-	<title>Home - Shopme Admin</title>
-	
-	<link rel="stylesheet" type="text/css" th:href="@{/fontawesome/all.css}" />
-	<link rel="stylesheet" type="text/css" th:href="@{/style.css}" />
-	<link rel="stylesheet" type="text/css" th:href="@{/webjars/bootstrap/css/bootstrap.min.css}" />
-	
-	<script type="text/javascript" th:src="@{/webjars/jquery/jquery.min.js}"></script>
-	<script type="text/javascript" th:src="@{/webjars/bootstrap/js/bootstrap.min.js}"></script>
-</head>
-
-<body>
-	<div class="container-fluid">
-		<div>
-			<form th:action="@{/logout}" method="post" th:hidden="true" name="logoutForm">
-				<input type="submit"/>
-			</form>
-			<nav class="navbar navbar-expand-lg bg-dark navbar-dark">
-				<a class="navbar-brand" th:href="@{/}">
-					<img th:src="@{/images/ShopmeAdminSmall.png}"/>
-				</a>
-				<!--hamburger toggler for mobile devices(responsive)-->
-				<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#topNavbar">
-					<span class="navbar-toggler-icon"></span>
-				</button>
-				<div class="collapse navbar-collapse" id="topNavbar">
-					<ul class="navbar-nav">
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/users}">Users</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/categories}">Categories</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/brands}">Brands</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/products}">Products</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/customers}">Customers</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/shipping}">Shipping</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/orders}">Orders</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/report}">Sales Report</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/articles}">Articles</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/menus}">Menus</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/settings}">Settings</a>
-						</li>
-						<li>
-							<span class="fas fa-user fa-2x icon-silver"></span>
-						</li>
-						<li class="nav-item dropdown">
-								<!-- principal refers to user; display username -->
-							<a class="nav-link dropdown-toggle" sec:authentication="principal.fullname" data-toggle="dropdown"></a>
-							<div class="dropdown-menu">
-								<a class="dropdown-item" id="logoutLink" href="">Logout</a>
-							</div>
-							
-						</li>
-					</ul>
-				</div>
-				
-			</nav>
-		</div>
-
-		<div>
-			<h1>Shopme Control Panel</h1>
-		<div />
-
-		<div>
-			<p>Shopme Control Panel - Copyright &copy; Shopme</p>
-		<div />
-
-
-	</div>
-	
-<script type="text/javascript">
-
-
-
-</script>
-
-</body>
-
-</html>
\ No newline at end of file
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/6f/009c60c918b4001d128fb79045552177 b/.metadata/.plugins/org.eclipse.core.resources/.history/6f/009c60c918b4001d128fb79045552177
deleted file mode 100644
index 5544b20b..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/6f/009c60c918b4001d128fb79045552177
+++ /dev/null
@@ -1,75 +0,0 @@
-package com.shopme.admin.security;
-
-import org.aspectj.weaver.ast.And;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.security.authentication.dao.DaoAuthenticationProvider;
-import org.springframework.security.config.annotation.web.builders.HttpSecurity;
-import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
-import org.springframework.security.config.annotation.web.configuration.WebSecurityConfiguration;
-import org.springframework.security.config.annotation.web.configuration.WebSecurityCustomizer;
-import org.springframework.security.core.userdetails.UserDetailsService;
-import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
-import org.springframework.security.crypto.password.PasswordEncoder;
-import org.springframework.security.web.SecurityFilterChain;
-
-@Configuration
-@EnableWebSecurity
-public class WebSecurityConfig {
-
-	/*
-	 * refer to this link: https://www.codejava.net/frameworks/spring-boot/fix-
-	 * websecurityconfigureradapter-deprecated
-	 * 
-	 */
-	
-	
-	 /* This bean will be called by spring security when performing authentication*/ 
-	@Bean
-	public UserDetailsService  userDetailsService()	{
-		return new ShopmeUserDetailsService();
-	}
-	
-
-	@Bean
-	public PasswordEncoder passwordEncoder() {
-		return new BCryptPasswordEncoder();
-	}
-
-	
-	@Bean
-	public DaoAuthenticationProvider authenticationProvider() {
-	    DaoAuthenticationProvider authProvider = new DaoAuthenticationProvider();
-	     
-	    authProvider.setUserDetailsService(userDetailsService());
-	    authProvider.setPasswordEncoder(passwordEncoder());
-	 
-	    return authProvider;
-	}
-	
-	
-	@Bean
-	public SecurityFilterChain filterChain(HttpSecurity http) throws Exception {
-
-		// any request need to be authenticated (require login)
-		// custom login page at "/login" - handler method in MainController class
-		http.authorizeHttpRequests()
-			.anyRequest().authenticated()
-			.and()
-			.formLogin()
-				.loginPage("/login")
-				.usernameParameter("email")
-				.permitAll();
-
-		return http.build();
-	}
-
-	//NOTE: antMatchers() changed to requestMatchers()
-	//stack: https://stackoverflow.com/questions/74907533/the-method-antmatchersstring-is-undefined-for-the-type
-	@Bean
-	public WebSecurityCustomizer webSecurityCustomizer() {
-		//permit access to the assets in the following directories
-		return (web) -> web.ignoring().requestMatchers("/images/**", "/js/**", "/webjars/**");
-	}
-
-}
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/6f/00a00e3415b4001d128fb79045552177 b/.metadata/.plugins/org.eclipse.core.resources/.history/6f/00a00e3415b4001d128fb79045552177
deleted file mode 100644
index c3d5c2cf..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/6f/00a00e3415b4001d128fb79045552177
+++ /dev/null
@@ -1,28 +0,0 @@
-package com.shopme.admin.security;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.core.userdetails.UserDetails;
-import org.springframework.security.core.userdetails.UserDetailsService;
-import org.springframework.security.core.userdetails.UsernameNotFoundException;
-
-import com.shopme.admin.user.UserRepository;
-import com.shopme.common.entity.User;
-
-public class ShopmeUserDetailsService implements UserDetailsService {
-
-	
-	@Autowired
-	private UserRepository userRepo;
-	
-	
-	
-	
-	@Override
-	public UserDetails loadUserByUsername(String email) throws UsernameNotFoundException {
-
-		User user = 
-		
-		return null;
-	}
-
-}
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/7/5097a69e8ab3001d19bbb001c1a81c20 b/.metadata/.plugins/org.eclipse.core.resources/.history/7/5097a69e8ab3001d19bbb001c1a81c20
deleted file mode 100644
index c9736522..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/7/5097a69e8ab3001d19bbb001c1a81c20
+++ /dev/null
@@ -1,255 +0,0 @@
-<!DOCTYPE html>
-<html xmlns:th="http://www.thymeleaf.org">
-
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset= UTF-8">
-<meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0">
-<title>Manage Users</title>
-
-<link rel="stylesheet" type="text/css" th:href="@{/webjars/bootstrap/css/bootstrap.min.css}" />
-<link rel="stylesheet" type="text/css" th:href="@{/fontawesome/all.css}" />
-<link rel="stylesheet" type="text/css" th:href="@{/style.css}" />
-	
-<script type="text/javascript" th:src="@{/webjars/jquery/jquery.min.js}"></script>
-<script type="text/javascript" th:src="@{/webjars/bootstrap/js/bootstrap.min.js}"></script>
-</head>
-
-<body>
-	<div class="container-fluid">
-		<div>
-			<nav class="navbar navbar-expand-lg bg-dark navbar-dark">
-				<a class="navbar-brand" th:href="@{/}"> <img
-					th:src="@{/images/ShopmeAdminSmall.png}" />
-				</a>
-				<!--hamburger toggler for mobile devices(responsive)-->
-				<button class="navbar-toggler" type="button" data-toggle="collapse"
-					data-target="#topNavbar">
-					<span class="navbar-toggler-icon"></span>
-				</button>
-				<div class="collapse navbar-collapse" id="topNavbar">
-					<ul class="navbar-nav">
-						<li class="nav-item"><a class="nav-link" th:href="@{/users}">Users</a>
-						</li>
-						<li class="nav-item"><a class="nav-link"
-							th:href="@{/categories}">Categories</a></li>
-						<li class="nav-item"><a class="nav-link" th:href="@{/brands}">Brands</a>
-						</li>
-						<li class="nav-item"><a class="nav-link"
-							th:href="@{/products}">Products</a></li>
-						<li class="nav-item"><a class="nav-link"
-							th:href="@{/customers}">Customers</a></li>
-						<li class="nav-item"><a class="nav-link"
-							th:href="@{/shipping}">Shipping</a></li>
-						<li class="nav-item"><a class="nav-link" th:href="@{/orders}">Orders</a>
-						</li>
-						<li class="nav-item"><a class="nav-link" th:href="@{/report}">Sales
-								Report</a></li>
-						<li class="nav-item"><a class="nav-link"
-							th:href="@{/articles}">Articles</a></li>
-						<li class="nav-item"><a class="nav-link" th:href="@{/menus}">Menus</a>
-						</li>
-						<li class="nav-item"><a class="nav-link"
-							th:href="@{/settings}">Settings</a></li>
-					</ul>
-				</div>
-
-			</nav>
-		</div>
-
-		<div>
-			<h2>Manage Users</h2>
-			<a th:href="@{/users/new}" class="fas fa-user-plus fa-2x icon-dark mr-2"></a>
-			
-			<a th:href="@{/users/export/csv}" class="fas fa-file-csv fa-2x icon-dark mr-2"></a>
-		</div>
-		
-		
-		
-		<!-- only display success message when a new user is created -->
-		<div th:if="${message != null}" class="alert alert-success text-center">
-			[[${message}]]
-		</div>
-			
-		<div>
-			<form th:action="@{/users/page/1}" class="form-inline m-3">
-				
-				<input type="hidden" name="sortField" th:value="${sortField}" />
-				<input type="hidden" name="sortDir" th:value="${sortDir}" />
-				Filter:&nbsp;
-				<input type="search" name="keyword" th:value="${keyword}" class="form-control" required/>
-				&nbsp;&nbsp;
-				<button type="submit" class="btn btn-primary">
-					<i class="fas fa-search"></i>
-				</button>
-				&nbsp;&nbsp;
-				<button type="button" class="btn btn-secondary" onclick="clearFilter()">
-					<i class="fas fa-eraser"></i>
-				</button>
-			</form>
-		
-		</div>
-
-
-			<div class="full-details">
-				<table class="table table-bordered table-striped table-hover table-responsive-xL">
-					<thead class="thead-dark">
-						<tr>
-							<!-- refer to templates/fragments.html for fragment code-->
-							<th th:replace="fragments :: column_link('id', 'User ID')"/>
-							<th>Photos</th>
-							<th th:replace="fragments :: column_link('email', 'Email')"/>
-							<th th:replace="fragments :: column_link('firstName', 'First Name')"/>
-							<th th:replace="fragments :: column_link('lastName', 'Last Name')"/>
-							<th>Roles</th>
-							<th th:replace="fragments :: column_link('enabled', 'Enabled')"/>
-							<th></th>
-						</tr>
-					</thead>
-					<tbody>
-						<tr th:each="user : ${listUsers}">
-							<td>[[${user.id}]]</td>
-							<td>
-								<span th:if="${user.photos == null}" class="fas fa-portrait fa-3x icon-dark"></span>
-								<img th:if="${user.photos != null}" th:src="@{${user.photosImagePath}}"
-								style="width: 100px"/>
-							</td>
-							<td>[[${user.email}]]</td>
-							<td>[[${user.firstName}]]</td>
-							<td>[[${user.lastName}]]</td>
-							<td>[[${user.roles}]]</td>
-							
-							<td>
-								<a th:if="${user.enabled == true}" class="fas fa-check-circle fa-2x icon-green" 
-								th:href="@{'/users/' + ${user.id} + '/enabled/false'}"
-								title="Disable this user"></a>
-								
-								<a th:if="${user.enabled == false}" class="fas fa-circle fa-2x icon-silver"
-								 th:href="@{'/users/' + ${user.id} + '/enabled/true'}"
-								 title="Enable this user"></a>
-							</td>
-							<td>
-									<a class="fas fa-edit fa-2x icon-green" th:href="@{'/users/edit/' + ${user.id}}"
-									title="edit this user"></a>
-									&nbsp; 
-									<a class="fas fa-trash fa-2x icon-dark link-delete" th:href="@{'/users/delete/' + ${user.id}}"
-									title="delete this user" th:userId="${user.id}"></a>
-							</td>
-						</tr>
-					</tbody>
-				</table>
-			</div>
-			
-			
-			<!-- display this on mobile screens only, refer to /static/style.css-->
-			<div class="less-details">
-				
-				<div th:each="user : ${listUsers}" class="row">
-					
-					<div class="col">
-						
-						<span th:if="${user.photos == null}" class="fas fa-portrait fa-3x icon-dark"></span>
-								<img th:if="${user.photos != null}" th:src="@{${user.photosImagePath}}"
-								style="width: 100px"/>
-					</div>
-						
-				</div>
-			</div>
-			
-			
-			<!-- IF -->
-			<div class="text-center m-1" th:if="${totalItems > 0}">
-				<span>Showing Users # [[${startCount}]] to [[${endCount}]] of [[${totalItems}]]</span>
-			</div>
-			
-			<!-- ELSE -->
-			<div class="text-center m-1" th:unless="${totalItems > 0}">
-				<span>No users found</span>
-			</div>
-			
-			<!-- only display pagination when there are users; else, no users no pagination -->
-			<div th:if="${totalPages > 1}">
-				<nav>
-					  <ul class="pagination justify-content-center">
-					  
-					  	<li th:class=" ${currentPage > 1 ? 'page-item' : 'page-item disabled'}">
-					  		<a th:replace="fragments :: page_link(1, 'First')"></a>
-				    	</li>
-					  
-					    <li th:class=" ${currentPage > 1 ? 'page-item' : 'page-item disabled'}">
-					    	<a th:replace="fragments :: page_link(${currentPage - 1 }, 'previous')"></a>
-				    	</li>
-					    	
-					    <!-- org.thymeleaf.expression.Numbers class, An object of this class is usually available in variable evaluation expressions with the name #numbers. -->
-					    <li th:class="${currentPage != i ? 'page-item' : 'page-item active'}" 
-					    	th:each="i : ${#numbers.sequence(1, totalPages)}">
-					    	<a th:replace="fragments :: page_link(${i}, ${i})"></a>
-					    </li>
-					    
-					    <li  th:class=" ${currentPage < totalPages ? 'page-item' : 'page-item disabled'}">
-					    	<a th:replace="fragments :: page_link(${currentPage + 1}, 'Next')"></a>
-					    </li>
-					    
-					    <li th:class=" ${currentPage < totalPages ? 'page-item' : 'page-item disabled'}">
-							<a th:replace="fragments :: page_link(${totalPages}, 'Last')"></a>		
-					    </li>
-					  </ul>
-				</nav>
-			</div>
-			
-			
-			
-			<div class="modal fade text-center" id="confirmModal">
-				<div class="modal-dialog">
-					<div class="modal-content">
-					
-						<div class="modal-header">
-							<h4 class="modal-title">Delete Confirmation</h4>
-							<button type="button" class="close" data-dismiss="modal">&times;</button>
-						</div>
-						
-						<div class="modal-body">
-							<span id="confirmText"></span>
-						</div>
-						
-						<div class="modal-footer">
-							<a class="btn btn-success" href="" id="yesButton">Yes</a>
-							<button type="button" class="btn btn-danger" data-dismiss="modal">Close</button>
-						</div>
-					</div>
-				</div>
-			</div>
-			
-			
-			<div class="text-center">
-				<p>Shopme Control Panel - Copyright &copy; Shopme</p>
-			</div>
-
-
-	</div>
-	
-<script type="text/javascript">
-
-//confirmation modal dialogue for delete user
-$(document).ready(function(){
-	$(".link-delete").on("click", function(e){
-		//stop the <a> tag default behaviour and pop out a confirmation modal dialogue
-		e.preventDefault();
-		//alert($(this).attr("href"));
-		link = $(this);
-		userId = link.attr("userId");
-		$("#yesButton").attr("href", link.attr("href"));
-		$("#confirmText").text("Are you sure you want to delete this user ID " + userId + "?");
-		$("#confirmModal").modal();
-	});
-});
-
-	function clearFilter(){
-		window.location = "[[@{/users}]]";
-	}
-
-
-</script>
-	
-</body>
-
-</html>
\ No newline at end of file
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/7/700c3f2d29b8001d1d97982e354adf88 b/.metadata/.plugins/org.eclipse.core.resources/.history/7/700c3f2d29b8001d1d97982e354adf88
deleted file mode 100644
index 470ed56b..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/7/700c3f2d29b8001d1d97982e354adf88
+++ /dev/null
@@ -1,31 +0,0 @@
-package com.shopme.admin.category;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import com.shopme.common.entity.Category;
-
-@Service
-public class CategoryService {
-
-	@Autowired
-	private CategoryRepository repo;
-	
-	public List<Category> listAll(){
-		return (List<Category>) repo.findAll();
-	}
-	
-	public List<Category> listCategoriesUsedInForm(){
-		
-		List<Category> categoriesUsedInForm = new ArrayList<>();
-		
-		
-		
-		
-		
-		return (List<Category>) repo.findAll();
-	}
-}
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/7/80a0f9b919b4001d128fb79045552177 b/.metadata/.plugins/org.eclipse.core.resources/.history/7/80a0f9b919b4001d128fb79045552177
deleted file mode 100644
index 9bafef44..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/7/80a0f9b919b4001d128fb79045552177
+++ /dev/null
@@ -1,51 +0,0 @@
-<!DOCTYPE html>
-<html xmlns:th="http://www.thymeleaf.org">
-
-<head>
-	<meta http-equiv="Content-Type" content="text/html; charset= UTF-8">
-	<meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0">
-	<title>Login - Shopme Admin</title>
-	<link rel="stylesheet" type="text/css" th:href="@{/webjars/bootstrap/css/bootstrap.min.css}" />
-</head>
-
-<body>
-	<div class="container-fluid text-center">
-		
-		<div>
-			<img th:src="@{/images/ShopmeAdminBig.png}" />
-		</div>
-		
-		<form th:action="@{/login}" method="post" style="max-width:350px; margin: 0 auto">
-			
-			<!--  ?error param will appear at the end of url if there is error with email or password  -->
-			<div th:if="${param.error}">
-				<p class="text-danger">[[${session.SPRING_SECURITY_LAST_EXCEPTION_MESSAGE}]]</p>
-			</div>
-			
-			<div class="border border-secondary rounded p-3">
-				<p>Access to Shopme Control Panel </p>
-				
-				<p>
-					<input type="email" name="email" class="form-control" placeholder="Email" required />
-				</p>
-				
-				<p>
-					<input type="password" name="password" class="form-control" placeholder="Password" required />
-				</p>
-				
-				<p>
-					<input type="submit" value="Login" class="btn btn-primary" />
-				</p>
-			</div>
-		
-		</form>
-
-		<div>
-			<p>Shopme Control Panel - Copyright &copy; Shopme</p>
-		</div>
-
-	</div>
-
-</body>
-
-</html>
\ No newline at end of file
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/71/30c143c944b4001d1d079a924effdc9e b/.metadata/.plugins/org.eclipse.core.resources/.history/71/30c143c944b4001d1d079a924effdc9e
deleted file mode 100644
index 83af8627..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/71/30c143c944b4001d1d079a924effdc9e
+++ /dev/null
@@ -1,236 +0,0 @@
-<!DOCTYPE html>
-<html xmlns:th="http://www.thymeleaf.org">
-
-<head th:replace="fragments :: page_head('Users - Shopme Admin')"/>
-
-<body>
-	<div class="container-fluid">
-		
-		<div th:replace="fragments :: menu"></div>
-
-		<div>
-			<h2>Manage Users</h2>
-			<a th:href="@{/users/new}" class="fas fa-user-plus fa-2x icon-dark mr-2"></a>
-			
-			<a th:href="@{/users/export/csv}" class="fas fa-file-csv fa-2x icon-dark mr-2"></a>
-		</div>
-		
-		
-		
-		<!-- only display success message when a new user is created -->
-		<div th:if="${message != null}" class="alert alert-success text-center">
-			[[${message}]]
-		</div>
-			
-		<div>
-			<form th:action="@{/users/page/1}" class="form-inline m-3">
-				
-				<input type="hidden" name="sortField" th:value="${sortField}" />
-				<input type="hidden" name="sortDir" th:value="${sortDir}" />
-				Filter:&nbsp;
-				<input type="search" name="keyword" th:value="${keyword}" class="form-control" required/>
-				&nbsp;&nbsp;
-				<button type="submit" class="btn btn-primary">
-					<i class="fas fa-search"></i>
-				</button>
-				&nbsp;&nbsp;
-				<button type="button" class="btn btn-secondary" onclick="clearFilter()">
-					<i class="fas fa-eraser"></i>
-				</button>
-			</form>
-		
-		</div>
-
-			<!-- css class to display this table in large screens only , refer to static/style.css for more info-->
-			<div class="full-details">
-				<table class="table table-bordered table-striped table-hover table-responsive-xL">
-					<thead class="thead-dark">
-						<tr>
-							<!-- refer to templates/fragments.html for fragment code-->
-							
-							<th class="hideable-column">
-								<th th:replace="fragments :: column_link('id', 'User ID', 'tag')"/>
-							</th>
-							
-							<th>Photos</th>
-							
-							<th class="hideable-column">
-								<th th:replace="fragments :: column_link('email', 'Email', 'tag')"/>
-							</th>
-							
-							<th th:replace="fragments :: column_link('firstName', 'First Name', 'none')"/>
-							<th th:replace="fragments :: column_link('lastName', 'Last Name', 'none')"/>
-							<th>Roles</th>
-							<th th:replace="fragments :: column_link('enabled', 'Enabled', 'none')"/>
-							<th></th>
-						</tr>
-					</thead>
-					<tbody>
-						<tr th:each="user : ${listUsers}">
-							<td class="hideable-column">[[${user.id}]]</td>
-							<td>
-								<span th:if="${user.photos == null}" class="fas fa-portrait fa-3x icon-dark"></span>
-								<img th:if="${user.photos != null}" th:src="@{${user.photosImagePath}}"
-								style="width: 100px"/>
-							</td>
-							<td class="hideable-column">[[${user.email}]]</td>
-							<td>[[${user.firstName}]]</td>
-							<td>[[${user.lastName}]]</td>
-							<td>[[${user.roles}]]</td>
-							
-							<td>
-								<a th:if="${user.enabled == true}" class="fas fa-check-circle fa-2x icon-green" 
-								th:href="@{'/users/' + ${user.id} + '/enabled/false'}"
-								title="Disable this user"></a>
-								
-								<a th:if="${user.enabled == false}" class="fas fa-circle fa-2x icon-silver"
-								 th:href="@{'/users/' + ${user.id} + '/enabled/true'}"
-								 title="Enable this user"></a>
-							</td>
-							<td>
-									<a class="fas fa-edit fa-2x icon-green" th:href="@{'/users/edit/' + ${user.id}}"
-									title="edit this user"></a>
-									&nbsp; 
-									<a class="fas fa-trash fa-2x icon-dark link-delete" th:href="@{'/users/delete/' + ${user.id}}"
-									title="delete this user" th:userId="${user.id}"></a>
-							</td>
-						</tr>
-					</tbody>
-				</table>
-			</div>
-			
-			
-			<!-- css class to display this <div> on mobile screens only, refer to /static/style.css for more info-->
-			<div class="less-details">
-				
-				<div th:each="user : ${listUsers}" class="row m-1">
-					
-					<div class="col-4">
-						
-						<span th:if="${user.photos == null}" class="fas fa-portrait fa-3x icon-dark"></span>
-								<img th:if="${user.photos != null}" th:src="@{${user.photosImagePath}}"
-								style="width: 100px"/>
-					</div>
-					
-					<div class="col-8">
-						<div>[[${user.fullName}]]</div>
-						<div>[[${user.roles}]]</div>
-						<div class="mt-2">
-							<a th:if="${user.enabled == true}" class="fas fa-check-circle fa-2x icon-green" 
-								th:href="@{'/users/' + ${user.id} + '/enabled/false'}"
-								title="Disable this user"></a>
-								
-							<a th:if="${user.enabled == false}" class="fas fa-circle fa-2x icon-silver"
-								 th:href="@{'/users/' + ${user.id} + '/enabled/true'}"
-								 title="Enable this user"></a>
-						
-									&nbsp;
-							<a class="fas fa-edit fa-2x icon-green" th:href="@{'/users/edit/' + ${user.id}}"
-									title="edit this user"></a>
-									&nbsp; 
-							<a class="fas fa-trash fa-2x icon-dark link-delete" th:href="@{'/users/delete/' + ${user.id}}"
-									title="delete this user" th:userId="${user.id}"></a>
-						</div>
-					</div>
-					<div>&nbsp;</div>
-				</div>
-			</div>
-			
-			
-			<!-- IF -->
-			<div class="text-center m-1" th:if="${totalItems > 0}">
-				<span>Showing Users # [[${startCount}]] to [[${endCount}]] of [[${totalItems}]]</span>
-			</div>
-			
-			<!-- ELSE -->
-			<div class="text-center m-1" th:unless="${totalItems > 0}">
-				<span>No users found</span>
-			</div>
-			
-			<!-- only display pagination when there are users; else, no users no pagination -->
-			<div th:if="${totalPages > 1}">
-				<nav>
-					  <ul class="pagination justify-content-center flex-wrap">
-					  
-					  	<li th:class=" ${currentPage > 1 ? 'page-item' : 'page-item disabled'}">
-					  		<a th:replace="fragments :: page_link(1, 'First')"></a>
-				    	</li>
-					  
-					    <li th:class=" ${currentPage > 1 ? 'page-item' : 'page-item disabled'}">
-					    	<a th:replace="fragments :: page_link(${currentPage - 1 }, 'previous')"></a>
-				    	</li>
-					    	
-					    <!-- org.thymeleaf.expression.Numbers class, An object of this class is usually available in variable evaluation expressions with the name #numbers. -->
-					    <li th:class="${currentPage != i ? 'page-item' : 'page-item active'}" 
-					    	th:each="i : ${#numbers.sequence(1, totalPages)}">
-					    	<a th:replace="fragments :: page_link(${i}, ${i})"></a>
-					    </li>
-					    
-					    <li  th:class=" ${currentPage < totalPages ? 'page-item' : 'page-item disabled'}">
-					    	<a th:replace="fragments :: page_link(${currentPage + 1}, 'Next')"></a>
-					    </li>
-					    
-					    <li th:class=" ${currentPage < totalPages ? 'page-item' : 'page-item disabled'}">
-							<a th:replace="fragments :: page_link(${totalPages}, 'Last')"></a>		
-					    </li>
-					  </ul>
-				</nav>
-			</div>
-			
-			
-			
-			<div class="modal fade text-center" id="confirmModal">
-				<div class="modal-dialog">
-					<div class="modal-content">
-					
-						<div class="modal-header">
-							<h4 class="modal-title">Delete Confirmation</h4>
-							<button type="button" class="close" data-dismiss="modal">&times;</button>
-						</div>
-						
-						<div class="modal-body">
-							<span id="confirmText"></span>
-						</div>
-						
-						<div class="modal-footer">
-							<a class="btn btn-success" href="" id="yesButton">Yes</a>
-							<button type="button" class="btn btn-danger" data-dismiss="modal">Close</button>
-						</div>
-					</div>
-				</div>
-			</div>
-			
-			
-			<div class="text-center">
-				<p>Shopme Control Panel - Copyright &copy; Shopme</p>
-			</div>
-
-
-	</div>
-	
-<script type="text/javascript">
-
-//confirmation modal dialogue for delete user
-$(document).ready(function(){
-	$(".link-delete").on("click", function(e){
-		//stop the <a> tag default behaviour and pop out a confirmation modal dialogue
-		e.preventDefault();
-		//alert($(this).attr("href"));
-		link = $(this);
-		userId = link.attr("userId");
-		$("#yesButton").attr("href", link.attr("href"));
-		$("#confirmText").text("Are you sure you want to delete this user ID " + userId + "?");
-		$("#confirmModal").modal();
-	});
-});
-
-	function clearFilter(){
-		window.location = "[[@{/users}]]";
-	}
-
-
-</script>
-	
-</body>
-
-</html>
\ No newline at end of file
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/71/60ae73ff8fb3001d19bbb001c1a81c20 b/.metadata/.plugins/org.eclipse.core.resources/.history/71/60ae73ff8fb3001d19bbb001c1a81c20
deleted file mode 100644
index 4865826d..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/71/60ae73ff8fb3001d19bbb001c1a81c20
+++ /dev/null
@@ -1,280 +0,0 @@
-<!DOCTYPE html>
-<html xmlns:th="http://www.thymeleaf.org">
-
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset= UTF-8">
-<meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0">
-<title>Manage Users</title>
-
-<link rel="stylesheet" type="text/css" th:href="@{/webjars/bootstrap/css/bootstrap.min.css}" />
-<link rel="stylesheet" type="text/css" th:href="@{/fontawesome/all.css}" />
-<link rel="stylesheet" type="text/css" th:href="@{/style.css}" />
-	
-<script type="text/javascript" th:src="@{/webjars/jquery/jquery.min.js}"></script>
-<script type="text/javascript" th:src="@{/webjars/bootstrap/js/bootstrap.min.js}"></script>
-</head>
-
-<body>
-	<div class="container-fluid">
-		<div>
-			<nav class="navbar navbar-expand-lg bg-dark navbar-dark">
-				<a class="navbar-brand" th:href="@{/}"> <img
-					th:src="@{/images/ShopmeAdminSmall.png}" />
-				</a>
-				<!--hamburger toggler for mobile devices(responsive)-->
-				<button class="navbar-toggler" type="button" data-toggle="collapse"
-					data-target="#topNavbar">
-					<span class="navbar-toggler-icon"></span>
-				</button>
-				<div class="collapse navbar-collapse" id="topNavbar">
-					<ul class="navbar-nav">
-						<li class="nav-item"><a class="nav-link" th:href="@{/users}">Users</a>
-						</li>
-						<li class="nav-item"><a class="nav-link"
-							th:href="@{/categories}">Categories</a></li>
-						<li class="nav-item"><a class="nav-link" th:href="@{/brands}">Brands</a>
-						</li>
-						<li class="nav-item"><a class="nav-link"
-							th:href="@{/products}">Products</a></li>
-						<li class="nav-item"><a class="nav-link"
-							th:href="@{/customers}">Customers</a></li>
-						<li class="nav-item"><a class="nav-link"
-							th:href="@{/shipping}">Shipping</a></li>
-						<li class="nav-item"><a class="nav-link" th:href="@{/orders}">Orders</a>
-						</li>
-						<li class="nav-item"><a class="nav-link" th:href="@{/report}">Sales
-								Report</a></li>
-						<li class="nav-item"><a class="nav-link"
-							th:href="@{/articles}">Articles</a></li>
-						<li class="nav-item"><a class="nav-link" th:href="@{/menus}">Menus</a>
-						</li>
-						<li class="nav-item"><a class="nav-link"
-							th:href="@{/settings}">Settings</a></li>
-					</ul>
-				</div>
-
-			</nav>
-		</div>
-
-		<div>
-			<h2>Manage Users</h2>
-			<a th:href="@{/users/new}" class="fas fa-user-plus fa-2x icon-dark mr-2"></a>
-			
-			<a th:href="@{/users/export/csv}" class="fas fa-file-csv fa-2x icon-dark mr-2"></a>
-		</div>
-		
-		
-		
-		<!-- only display success message when a new user is created -->
-		<div th:if="${message != null}" class="alert alert-success text-center">
-			[[${message}]]
-		</div>
-			
-		<div>
-			<form th:action="@{/users/page/1}" class="form-inline m-3">
-				
-				<input type="hidden" name="sortField" th:value="${sortField}" />
-				<input type="hidden" name="sortDir" th:value="${sortDir}" />
-				Filter:&nbsp;
-				<input type="search" name="keyword" th:value="${keyword}" class="form-control" required/>
-				&nbsp;&nbsp;
-				<button type="submit" class="btn btn-primary">
-					<i class="fas fa-search"></i>
-				</button>
-				&nbsp;&nbsp;
-				<button type="button" class="btn btn-secondary" onclick="clearFilter()">
-					<i class="fas fa-eraser"></i>
-				</button>
-			</form>
-		
-		</div>
-
-			<!-- css class to display this table in large screens only , refer to static/style.css for more info-->
-			<div class="full-details">
-				<table class="table table-bordered table-striped table-hover table-responsive-xL">
-					<thead class="thead-dark">
-						<tr>
-							<!-- refer to templates/fragments.html for fragment code-->
-							
-							<th class="hideable-column">
-								<th th:replace="fragments :: column_link('id', 'User ID', 'tag')"/>
-							</th>
-							
-							<th>Photos</th>
-							<th th:replace="fragments :: column_link('email', 'Email')"/>
-							<th th:replace="fragments :: column_link('firstName', 'First Name' , 'none')"/>
-							<th th:replace="fragments :: column_link('lastName', 'Last Name')"/>
-							<th>Roles</th>
-							<th th:replace="fragments :: column_link('enabled', 'Enabled')"/>
-							<th></th>
-						</tr>
-					</thead>
-					<tbody>
-						<tr th:each="user : ${listUsers}">
-							<td class="hideable-column">[[${user.id}]]</td>
-							<td>
-								<span th:if="${user.photos == null}" class="fas fa-portrait fa-3x icon-dark"></span>
-								<img th:if="${user.photos != null}" th:src="@{${user.photosImagePath}}"
-								style="width: 100px"/>
-							</td>
-							<td class="hideable-column">[[${user.email}]]</td>
-							<td>[[${user.firstName}]]</td>
-							<td>[[${user.lastName}]]</td>
-							<td>[[${user.roles}]]</td>
-							
-							<td>
-								<a th:if="${user.enabled == true}" class="fas fa-check-circle fa-2x icon-green" 
-								th:href="@{'/users/' + ${user.id} + '/enabled/false'}"
-								title="Disable this user"></a>
-								
-								<a th:if="${user.enabled == false}" class="fas fa-circle fa-2x icon-silver"
-								 th:href="@{'/users/' + ${user.id} + '/enabled/true'}"
-								 title="Enable this user"></a>
-							</td>
-							<td>
-									<a class="fas fa-edit fa-2x icon-green" th:href="@{'/users/edit/' + ${user.id}}"
-									title="edit this user"></a>
-									&nbsp; 
-									<a class="fas fa-trash fa-2x icon-dark link-delete" th:href="@{'/users/delete/' + ${user.id}}"
-									title="delete this user" th:userId="${user.id}"></a>
-							</td>
-						</tr>
-					</tbody>
-				</table>
-			</div>
-			
-			
-			<!-- css class to display this <div> on mobile screens only, refer to /static/style.css for more info-->
-			<div class="less-details">
-				
-				<div th:each="user : ${listUsers}" class="row m-1">
-					
-					<div class="col-4">
-						
-						<span th:if="${user.photos == null}" class="fas fa-portrait fa-3x icon-dark"></span>
-								<img th:if="${user.photos != null}" th:src="@{${user.photosImagePath}}"
-								style="width: 100px"/>
-					</div>
-					
-					<div class="col-8">
-						<div>[[${user.fullName}]]</div>
-						<div>[[${user.roles}]]</div>
-						<div class="mt-2">
-							<a th:if="${user.enabled == true}" class="fas fa-check-circle fa-2x icon-green" 
-								th:href="@{'/users/' + ${user.id} + '/enabled/false'}"
-								title="Disable this user"></a>
-								
-							<a th:if="${user.enabled == false}" class="fas fa-circle fa-2x icon-silver"
-								 th:href="@{'/users/' + ${user.id} + '/enabled/true'}"
-								 title="Enable this user"></a>
-						
-									&nbsp;
-							<a class="fas fa-edit fa-2x icon-green" th:href="@{'/users/edit/' + ${user.id}}"
-									title="edit this user"></a>
-									&nbsp; 
-							<a class="fas fa-trash fa-2x icon-dark link-delete" th:href="@{'/users/delete/' + ${user.id}}"
-									title="delete this user" th:userId="${user.id}"></a>
-						</div>
-					</div>
-					<div>&nbsp;</div>
-				</div>
-			</div>
-			
-			
-			<!-- IF -->
-			<div class="text-center m-1" th:if="${totalItems > 0}">
-				<span>Showing Users # [[${startCount}]] to [[${endCount}]] of [[${totalItems}]]</span>
-			</div>
-			
-			<!-- ELSE -->
-			<div class="text-center m-1" th:unless="${totalItems > 0}">
-				<span>No users found</span>
-			</div>
-			
-			<!-- only display pagination when there are users; else, no users no pagination -->
-			<div th:if="${totalPages > 1}">
-				<nav>
-					  <ul class="pagination justify-content-center flex-wrap">
-					  
-					  	<li th:class=" ${currentPage > 1 ? 'page-item' : 'page-item disabled'}">
-					  		<a th:replace="fragments :: page_link(1, 'First')"></a>
-				    	</li>
-					  
-					    <li th:class=" ${currentPage > 1 ? 'page-item' : 'page-item disabled'}">
-					    	<a th:replace="fragments :: page_link(${currentPage - 1 }, 'previous')"></a>
-				    	</li>
-					    	
-					    <!-- org.thymeleaf.expression.Numbers class, An object of this class is usually available in variable evaluation expressions with the name #numbers. -->
-					    <li th:class="${currentPage != i ? 'page-item' : 'page-item active'}" 
-					    	th:each="i : ${#numbers.sequence(1, totalPages)}">
-					    	<a th:replace="fragments :: page_link(${i}, ${i})"></a>
-					    </li>
-					    
-					    <li  th:class=" ${currentPage < totalPages ? 'page-item' : 'page-item disabled'}">
-					    	<a th:replace="fragments :: page_link(${currentPage + 1}, 'Next')"></a>
-					    </li>
-					    
-					    <li th:class=" ${currentPage < totalPages ? 'page-item' : 'page-item disabled'}">
-							<a th:replace="fragments :: page_link(${totalPages}, 'Last')"></a>		
-					    </li>
-					  </ul>
-				</nav>
-			</div>
-			
-			
-			
-			<div class="modal fade text-center" id="confirmModal">
-				<div class="modal-dialog">
-					<div class="modal-content">
-					
-						<div class="modal-header">
-							<h4 class="modal-title">Delete Confirmation</h4>
-							<button type="button" class="close" data-dismiss="modal">&times;</button>
-						</div>
-						
-						<div class="modal-body">
-							<span id="confirmText"></span>
-						</div>
-						
-						<div class="modal-footer">
-							<a class="btn btn-success" href="" id="yesButton">Yes</a>
-							<button type="button" class="btn btn-danger" data-dismiss="modal">Close</button>
-						</div>
-					</div>
-				</div>
-			</div>
-			
-			
-			<div class="text-center">
-				<p>Shopme Control Panel - Copyright &copy; Shopme</p>
-			</div>
-
-
-	</div>
-	
-<script type="text/javascript">
-
-//confirmation modal dialogue for delete user
-$(document).ready(function(){
-	$(".link-delete").on("click", function(e){
-		//stop the <a> tag default behaviour and pop out a confirmation modal dialogue
-		e.preventDefault();
-		//alert($(this).attr("href"));
-		link = $(this);
-		userId = link.attr("userId");
-		$("#yesButton").attr("href", link.attr("href"));
-		$("#confirmText").text("Are you sure you want to delete this user ID " + userId + "?");
-		$("#confirmModal").modal();
-	});
-});
-
-	function clearFilter(){
-		window.location = "[[@{/users}]]";
-	}
-
-
-</script>
-	
-</body>
-
-</html>
\ No newline at end of file
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/71/704c7b9c46b4001d1d079a924effdc9e b/.metadata/.plugins/org.eclipse.core.resources/.history/71/704c7b9c46b4001d1d079a924effdc9e
deleted file mode 100644
index b28fdd7f..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/71/704c7b9c46b4001d1d079a924effdc9e
+++ /dev/null
@@ -1,43 +0,0 @@
-<!DOCTYPE html>
-<html xmlns:th="http://www.thymeleaf.org"
-	  xmlns:sec="https://www.thymeleaf.org/thymeleaf-extras-springsecurity5">
-
-<head th:replace="fragments :: page_head('Home - Shopme Admin')"/>
-
-<body>
-	<div class="container-fluid">
-			
-			<!-- navigation bar -->
-		<div th:replace="navigation :: menu"></div>
-
-		<div>
-			<h1>Shopme Control Panel</h1>
-		</div>
-
-		<!-- footer -->
-		<div th:replace="fragments :: footer"></div>
-
-
-	</div>
-	
-<script type="text/javascript">
-
-	$(document).ready(function(){
-		$("#logoutLink").on("click", function(e){
-			e.preventDefault(); /* stop the hyperlink default behaviour  */
-			
-			
-			/* use  the form to  log out and navigate to the url path /logout  
-			
-			 NOTE: spring security requires a POST request form to logout in order to obtain the csrf token, 
-			 		the csrf token is a hidden property in the form
-			*/
-			document.logoutForm.submit();
-		});
-	});
-
-</script>
-
-</body>
-
-</html>
\ No newline at end of file
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/71/e0ecd92d29b8001d1d97982e354adf88 b/.metadata/.plugins/org.eclipse.core.resources/.history/71/e0ecd92d29b8001d1d97982e354adf88
deleted file mode 100644
index b1f51691..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/71/e0ecd92d29b8001d1d97982e354adf88
+++ /dev/null
@@ -1,31 +0,0 @@
-package com.shopme.admin.category;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import com.shopme.common.entity.Category;
-
-@Service
-public class CategoryService {
-
-	@Autowired
-	private CategoryRepository repo;
-	
-	public List<Category> listAll(){
-		return (List<Category>) repo.findAll();
-	}
-	
-	public List<Category> listCategoriesUsedInForm(){
-		
-		List<Category> categoriesUsedInForm = new ArrayList<>();
-		
-		Iterable<Category> categoriesInDB = repo.findAll();
-		
-		
-		
-		return (List<Category>) repo.findAll();
-	}
-}
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/72/30533bea77b3001d19bbb001c1a81c20 b/.metadata/.plugins/org.eclipse.core.resources/.history/72/30533bea77b3001d19bbb001c1a81c20
deleted file mode 100644
index a9a17122..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/72/30533bea77b3001d19bbb001c1a81c20
+++ /dev/null
@@ -1,96 +0,0 @@
-package com.shopme.admin.user;
-
-import java.io.IOException;
-import java.util.List;
-
-import jakarta.servlet.ServletOutputStream;
-import jakarta.servlet.http.HttpServletResponse;
-
-import org.apache.poi.ss.usermodel.CellStyle;
-import org.apache.poi.xssf.usermodel.XSSFCell;
-import org.apache.poi.xssf.usermodel.XSSFCellStyle;
-import org.apache.poi.xssf.usermodel.XSSFFont;
-import org.apache.poi.xssf.usermodel.XSSFRow;
-import org.apache.poi.xssf.usermodel.XSSFSheet;
-import org.apache.poi.xssf.usermodel.XSSFWorkbook;
-
-import com.shopme.admin.AbstractExporter;
-import com.shopme.common.entity.User;
-
-public class UserExcelExporter extends AbstractExporter {
-	private XSSFWorkbook workbook;
-	private XSSFSheet sheet;
-	
-	public UserExcelExporter() {
-		workbook = new XSSFWorkbook();
-	}
-	
-	private void writeHeaderLine() {
-		sheet = workbook.createSheet("Users");
-		XSSFRow row = sheet.createRow(0);
-		
-		XSSFCellStyle cellStyle = workbook.createCellStyle();
-		XSSFFont font = workbook.createFont();
-		font.setBold(true);
-		font.setFontHeight(16);
-		cellStyle.setFont(font);
-		
-		createCell(row, 0, "User Id", cellStyle);
-		createCell(row, 1, "E-mail", cellStyle);
-		createCell(row, 2, "First Name", cellStyle);
-		createCell(row, 3, "Last Name", cellStyle);
-		createCell(row, 4, "Roles", cellStyle);
-		createCell(row, 5, "Enabled", cellStyle);
-		
-	}
-	
-	private void createCell(XSSFRow row, int columnIndex, Object value, CellStyle style) {
-		XSSFCell cell = row.createCell(columnIndex);
-		sheet.autoSizeColumn(columnIndex);
-		
-		if (value instanceof Integer) {
-			cell.setCellValue((Integer) value);
-		} else if (value instanceof Boolean) {
-			cell.setCellValue((Boolean) value);
-		} else {
-			cell.setCellValue((String) value);
-		}
-		
-		cell.setCellStyle(style);		
-	}
-	
-	public void export(List<User> listUsers, HttpServletResponse response) throws IOException {
-		super.setResponseHeader(response, "application/octet-stream", ".xlsx", "users_");
-	
-		writeHeaderLine();
-		writeDataLines(listUsers);
-		
-		ServletOutputStream outputStream = response.getOutputStream();
-		workbook.write(outputStream);
-		workbook.close();
-		outputStream.close();
-		
-		
-	}
-
-	private void writeDataLines(List<User> listUsers) {
-		int rowIndex = 1;
-		
-		XSSFCellStyle cellStyle = workbook.createCellStyle();
-		XSSFFont font = workbook.createFont();
-		font.setFontHeight(14);
-		cellStyle.setFont(font);
-		
-		for (User user : listUsers) {
-			XSSFRow row = sheet.createRow(rowIndex++);
-			int columnIndex = 0;
-			
-			createCell(row, columnIndex++, user.getId(), cellStyle);
-			createCell(row, columnIndex++, user.getEmail(), cellStyle);
-			createCell(row, columnIndex++, user.getFirstName(), cellStyle);
-			createCell(row, columnIndex++, user.getLastName(), cellStyle);
-			createCell(row, columnIndex++, user.getRoles().toString(), cellStyle);
-			createCell(row, columnIndex++, user.isEnabled(), cellStyle);
-		}
-	}
-}
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/72/608e101b9cb9001d10d0f9513979f945 b/.metadata/.plugins/org.eclipse.core.resources/.history/72/608e101b9cb9001d10d0f9513979f945
new file mode 100644
index 00000000..9a1c0c0c
--- /dev/null
+++ b/.metadata/.plugins/org.eclipse.core.resources/.history/72/608e101b9cb9001d10d0f9513979f945
@@ -0,0 +1,170 @@
+package com.shopme.common.entity;
+
+import java.util.HashSet;
+import java.util.Set;
+
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.OneToMany;
+import jakarta.persistence.OneToOne;
+import jakarta.persistence.Table;
+import jakarta.persistence.Transient;
+
+@Entity
+@Table(name = "categories")
+public class Category {
+
+	@Id
+	@GeneratedValue(strategy = GenerationType.IDENTITY)
+	private Integer id;
+
+	@Column(length = 128, nullable = false, unique = true)
+	private String name;
+
+	@Column(length = 64, nullable = false, unique = true)
+	private String alias;
+
+	@Column(length = 128, nullable = false)
+	private String image;
+
+	private boolean enabled;
+
+	@OneToOne
+	@JoinColumn(name = "parent_id")
+	private Category parent;
+
+	@OneToMany(mappedBy = "parent")
+	private Set<Category> children = new HashSet<>();
+
+	public Category() {
+	}
+
+	public Category(Integer id) {
+		this.id = id;
+	}
+
+	public static Category copyIdAndName(Category category) {
+
+		Category copyCategory = new Category();
+		copyCategory.setName(category.getName());
+		copyCategory.setId(category.getId());
+
+		return copyCategory;
+	}
+
+	public static Category copyIdAndName(Integer id, String name) {
+
+		Category copyCategory = new Category();
+		copyCategory.setName(name);
+		copyCategory.setId(id);
+
+		return copyCategory;
+	}
+
+	/* create a copy of a category object in order to append the -- symbol to denote hierarchy level
+	 * */
+	public static Category copyFull(Category category) {
+
+		Category copyCategory = new Category();
+		copyCategory.setName(category.getName());
+		copyCategory.setId(category.getId());
+		copyCategory.setImage(category.getImage());
+		copyCategory.setAlias(category.getAlias());
+		copyCategory.setEnabled(category.isEnabled());
+
+		return copyCategory;
+	}
+	
+	/* create a copy of a category object in order to append the -- symbol to denote hierarchy level
+	 * */
+	public static Category copyFull(Category category, String name) {
+
+		Category copyCategory = Category.copyFull(category);
+		copyCategory.setName(name);
+
+		return copyCategory;
+	}
+	
+	
+
+	public Category(String name) {
+		this.name = name;
+		this.alias = name;
+		this.image = "default.png";
+
+	}
+
+	public Category(String name, Category parent) {
+		this(name);
+		this.parent = parent;
+	}
+
+	public Integer getId() {
+		return id;
+	}
+
+	public void setId(Integer id) {
+		this.id = id;
+	}
+
+	public String getName() {
+		return name;
+	}
+
+	public void setName(String name) {
+		this.name = name;
+	}
+
+	public String getAlias() {
+		return alias;
+	}
+
+	public void setAlias(String alias) {
+		this.alias = alias;
+	}
+
+	public String getImage() {
+		return image;
+	}
+
+	public void setImage(String image) {
+		this.image = image;
+	}
+
+	public boolean isEnabled() {
+		return enabled;
+	}
+
+	public void setEnabled(boolean enabled) {
+		this.enabled = enabled;
+	}
+
+	public Category getParent() {
+		return parent;
+	}
+
+	public void setParent(Category parent) {
+		this.parent = parent;
+	}
+
+	public Set<Category> getChildren() {
+		return children;
+	}
+
+	public void setChildren(Set<Category> children) {
+		this.children = children;
+	}
+
+	@Transient
+	public String getImagePath() {
+		
+		if(this.id == null) return "/images/image-thumbnail.pnh";
+		
+		return "/category-images/" + this.id + "/" + this.image;
+	}
+	
+}
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/72/a0042b0f0fb4001d128fb79045552177 b/.metadata/.plugins/org.eclipse.core.resources/.history/72/a0042b0f0fb4001d128fb79045552177
deleted file mode 100644
index 6e8f8abe..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/72/a0042b0f0fb4001d128fb79045552177
+++ /dev/null
@@ -1,65 +0,0 @@
-package com.shopme.admin.security;
-
-import java.util.Collection;
-
-import org.springframework.security.core.GrantedAuthority;
-import org.springframework.security.core.userdetails.UserDetails;
-
-import com.shopme.common.entity.User;
-
-
-/*
- *  Think of it as a wrapper class for  Type User
- * 
- * */
-public class ShopmeUserDetails implements UserDetails {
-
-	private User user;
-	
-	public ShopmeUserDetails(User user) {
-		this.user = user;
-	}
-
-	@Override
-	public Collection<? extends GrantedAuthority> getAuthorities() {
-		// TODO Auto-generated method stub
-		return null;
-	}
-
-	@Override
-	public String getPassword() {
-		// TODO Auto-generated method stub
-		return null;
-	}
-
-	@Override
-	public String getUsername() {
-		// TODO Auto-generated method stub
-		return null;
-	}
-
-	@Override
-	public boolean isAccountNonExpired() {
-		// TODO Auto-generated method stub
-		return false;
-	}
-
-	@Override
-	public boolean isAccountNonLocked() {
-		// TODO Auto-generated method stub
-		return false;
-	}
-
-	@Override
-	public boolean isCredentialsNonExpired() {
-		// TODO Auto-generated method stub
-		return false;
-	}
-
-	@Override
-	public boolean isEnabled() {
-		// TODO Auto-generated method stub
-		return false;
-	}
-
-}
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/72/e0fea88230b7001d19ef99be8d31e273 b/.metadata/.plugins/org.eclipse.core.resources/.history/72/e0fea88230b7001d19ef99be8d31e273
deleted file mode 100644
index 9c9d0e0d..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/72/e0fea88230b7001d19ef99be8d31e273
+++ /dev/null
@@ -1,53 +0,0 @@
-package com.shopme.admin.category;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
-import org.junit.jupiter.api.Test;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.autoconfigure.jdbc.AutoConfigureTestDatabase;
-import org.springframework.boot.test.autoconfigure.jdbc.AutoConfigureTestDatabase.Replace;
-import org.springframework.boot.test.autoconfigure.orm.jpa.DataJpaTest;
-import org.springframework.test.annotation.Rollback;
-
-import com.shopme.common.entity.Category;
-
-/*
- * Unit Test for CategoryRepository
- * 
- * objective:
- * 1. test the methods in repository 
- * 2. populate the database with records
- * 
-*/
-
-@DataJpaTest
-@AutoConfigureTestDatabase(replace = Replace.NONE)
-@Rollback(false)
-public class CategoryRepositoryTests {
-	
-	@Autowired
-	private CategoryRepository repo;
-	
-	@Test
-	public void testCreateRootCategory() {
-//		Category category = new Category("Computers");
-		Category category = new Category("Electronics");
-		Category savedCategory = repo.save(category);
-		
-		assertThat(savedCategory.getId()).isGreaterThan(0);
-		
-	}
-	
-	@Test
-	public void testCreateSubCategory() {
-		
-		// ID for root category "Computer" is 1
-		Category parent = new Category(1);
-		
-		Category subCategory = new Category("Desktops", parent);
-		
-		
-	}
-	
-	
-}
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/73/20e058778cb3001d19bbb001c1a81c20 b/.metadata/.plugins/org.eclipse.core.resources/.history/73/20e058778cb3001d19bbb001c1a81c20
deleted file mode 100644
index f35f43ba..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/73/20e058778cb3001d19bbb001c1a81c20
+++ /dev/null
@@ -1,259 +0,0 @@
-<!DOCTYPE html>
-<html xmlns:th="http://www.thymeleaf.org">
-
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset= UTF-8">
-<meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0">
-<title>Manage Users</title>
-
-<link rel="stylesheet" type="text/css" th:href="@{/webjars/bootstrap/css/bootstrap.min.css}" />
-<link rel="stylesheet" type="text/css" th:href="@{/fontawesome/all.css}" />
-<link rel="stylesheet" type="text/css" th:href="@{/style.css}" />
-	
-<script type="text/javascript" th:src="@{/webjars/jquery/jquery.min.js}"></script>
-<script type="text/javascript" th:src="@{/webjars/bootstrap/js/bootstrap.min.js}"></script>
-</head>
-
-<body>
-	<div class="container-fluid">
-		<div>
-			<nav class="navbar navbar-expand-lg bg-dark navbar-dark">
-				<a class="navbar-brand" th:href="@{/}"> <img
-					th:src="@{/images/ShopmeAdminSmall.png}" />
-				</a>
-				<!--hamburger toggler for mobile devices(responsive)-->
-				<button class="navbar-toggler" type="button" data-toggle="collapse"
-					data-target="#topNavbar">
-					<span class="navbar-toggler-icon"></span>
-				</button>
-				<div class="collapse navbar-collapse" id="topNavbar">
-					<ul class="navbar-nav">
-						<li class="nav-item"><a class="nav-link" th:href="@{/users}">Users</a>
-						</li>
-						<li class="nav-item"><a class="nav-link"
-							th:href="@{/categories}">Categories</a></li>
-						<li class="nav-item"><a class="nav-link" th:href="@{/brands}">Brands</a>
-						</li>
-						<li class="nav-item"><a class="nav-link"
-							th:href="@{/products}">Products</a></li>
-						<li class="nav-item"><a class="nav-link"
-							th:href="@{/customers}">Customers</a></li>
-						<li class="nav-item"><a class="nav-link"
-							th:href="@{/shipping}">Shipping</a></li>
-						<li class="nav-item"><a class="nav-link" th:href="@{/orders}">Orders</a>
-						</li>
-						<li class="nav-item"><a class="nav-link" th:href="@{/report}">Sales
-								Report</a></li>
-						<li class="nav-item"><a class="nav-link"
-							th:href="@{/articles}">Articles</a></li>
-						<li class="nav-item"><a class="nav-link" th:href="@{/menus}">Menus</a>
-						</li>
-						<li class="nav-item"><a class="nav-link"
-							th:href="@{/settings}">Settings</a></li>
-					</ul>
-				</div>
-
-			</nav>
-		</div>
-
-		<div>
-			<h2>Manage Users</h2>
-			<a th:href="@{/users/new}" class="fas fa-user-plus fa-2x icon-dark mr-2"></a>
-			
-			<a th:href="@{/users/export/csv}" class="fas fa-file-csv fa-2x icon-dark mr-2"></a>
-		</div>
-		
-		
-		
-		<!-- only display success message when a new user is created -->
-		<div th:if="${message != null}" class="alert alert-success text-center">
-			[[${message}]]
-		</div>
-			
-		<div>
-			<form th:action="@{/users/page/1}" class="form-inline m-3">
-				
-				<input type="hidden" name="sortField" th:value="${sortField}" />
-				<input type="hidden" name="sortDir" th:value="${sortDir}" />
-				Filter:&nbsp;
-				<input type="search" name="keyword" th:value="${keyword}" class="form-control" required/>
-				&nbsp;&nbsp;
-				<button type="submit" class="btn btn-primary">
-					<i class="fas fa-search"></i>
-				</button>
-				&nbsp;&nbsp;
-				<button type="button" class="btn btn-secondary" onclick="clearFilter()">
-					<i class="fas fa-eraser"></i>
-				</button>
-			</form>
-		
-		</div>
-
-			<!-- css class to display this table in large screens only , refer to static/style.css for more info-->
-			<div class="full-details">
-				<table class="table table-bordered table-striped table-hover table-responsive-xL">
-					<thead class="thead-dark">
-						<tr>
-							<!-- refer to templates/fragments.html for fragment code-->
-							<th th:replace="fragments :: column_link('id', 'User ID')"/>
-							<th>Photos</th>
-							<th th:replace="fragments :: column_link('email', 'Email')"/>
-							<th th:replace="fragments :: column_link('firstName', 'First Name')"/>
-							<th th:replace="fragments :: column_link('lastName', 'Last Name')"/>
-							<th>Roles</th>
-							<th th:replace="fragments :: column_link('enabled', 'Enabled')"/>
-							<th></th>
-						</tr>
-					</thead>
-					<tbody>
-						<tr th:each="user : ${listUsers}">
-							<td>[[${user.id}]]</td>
-							<td>
-								<span th:if="${user.photos == null}" class="fas fa-portrait fa-3x icon-dark"></span>
-								<img th:if="${user.photos != null}" th:src="@{${user.photosImagePath}}"
-								style="width: 100px"/>
-							</td>
-							<td>[[${user.email}]]</td>
-							<td>[[${user.firstName}]]</td>
-							<td>[[${user.lastName}]]</td>
-							<td>[[${user.roles}]]</td>
-							
-							<td>
-								<a th:if="${user.enabled == true}" class="fas fa-check-circle fa-2x icon-green" 
-								th:href="@{'/users/' + ${user.id} + '/enabled/false'}"
-								title="Disable this user"></a>
-								
-								<a th:if="${user.enabled == false}" class="fas fa-circle fa-2x icon-silver"
-								 th:href="@{'/users/' + ${user.id} + '/enabled/true'}"
-								 title="Enable this user"></a>
-							</td>
-							<td>
-									<a class="fas fa-edit fa-2x icon-green" th:href="@{'/users/edit/' + ${user.id}}"
-									title="edit this user"></a>
-									&nbsp; 
-									<a class="fas fa-trash fa-2x icon-dark link-delete" th:href="@{'/users/delete/' + ${user.id}}"
-									title="delete this user" th:userId="${user.id}"></a>
-							</td>
-						</tr>
-					</tbody>
-				</table>
-			</div>
-			
-			
-			<!-- css class to display this <div> on mobile screens only, refer to /static/style.css for more info-->
-			<div class="less-details">
-				
-				<div th:each="user : ${listUsers}" class="row m-1">
-					
-					<div class="col-4">
-						
-						<span th:if="${user.photos == null}" class="fas fa-portrait fa-3x icon-dark"></span>
-								<img th:if="${user.photos != null}" th:src="@{${user.photosImagePath}}"
-								style="width: 100px"/>
-					</div>
-						<div class="col">
-							<div>[[${user.fullName}]]</div>
-							<div>[[${user.roles}]]</div>
-						</div>
-					<div>&nbsp;</div>
-				</div>
-			</div>
-			
-			
-			<!-- IF -->
-			<div class="text-center m-1" th:if="${totalItems > 0}">
-				<span>Showing Users # [[${startCount}]] to [[${endCount}]] of [[${totalItems}]]</span>
-			</div>
-			
-			<!-- ELSE -->
-			<div class="text-center m-1" th:unless="${totalItems > 0}">
-				<span>No users found</span>
-			</div>
-			
-			<!-- only display pagination when there are users; else, no users no pagination -->
-			<div th:if="${totalPages > 1}">
-				<nav>
-					  <ul class="pagination justify-content-center flex-wrap">
-					  
-					  	<li th:class=" ${currentPage > 1 ? 'page-item' : 'page-item disabled'}">
-					  		<a th:replace="fragments :: page_link(1, 'First')"></a>
-				    	</li>
-					  
-					    <li th:class=" ${currentPage > 1 ? 'page-item' : 'page-item disabled'}">
-					    	<a th:replace="fragments :: page_link(${currentPage - 1 }, 'previous')"></a>
-				    	</li>
-					    	
-					    <!-- org.thymeleaf.expression.Numbers class, An object of this class is usually available in variable evaluation expressions with the name #numbers. -->
-					    <li th:class="${currentPage != i ? 'page-item' : 'page-item active'}" 
-					    	th:each="i : ${#numbers.sequence(1, totalPages)}">
-					    	<a th:replace="fragments :: page_link(${i}, ${i})"></a>
-					    </li>
-					    
-					    <li  th:class=" ${currentPage < totalPages ? 'page-item' : 'page-item disabled'}">
-					    	<a th:replace="fragments :: page_link(${currentPage + 1}, 'Next')"></a>
-					    </li>
-					    
-					    <li th:class=" ${currentPage < totalPages ? 'page-item' : 'page-item disabled'}">
-							<a th:replace="fragments :: page_link(${totalPages}, 'Last')"></a>		
-					    </li>
-					  </ul>
-				</nav>
-			</div>
-			
-			
-			
-			<div class="modal fade text-center" id="confirmModal">
-				<div class="modal-dialog">
-					<div class="modal-content">
-					
-						<div class="modal-header">
-							<h4 class="modal-title">Delete Confirmation</h4>
-							<button type="button" class="close" data-dismiss="modal">&times;</button>
-						</div>
-						
-						<div class="modal-body">
-							<span id="confirmText"></span>
-						</div>
-						
-						<div class="modal-footer">
-							<a class="btn btn-success" href="" id="yesButton">Yes</a>
-							<button type="button" class="btn btn-danger" data-dismiss="modal">Close</button>
-						</div>
-					</div>
-				</div>
-			</div>
-			
-			
-			<div class="text-center">
-				<p>Shopme Control Panel - Copyright &copy; Shopme</p>
-			</div>
-
-
-	</div>
-	
-<script type="text/javascript">
-
-//confirmation modal dialogue for delete user
-$(document).ready(function(){
-	$(".link-delete").on("click", function(e){
-		//stop the <a> tag default behaviour and pop out a confirmation modal dialogue
-		e.preventDefault();
-		//alert($(this).attr("href"));
-		link = $(this);
-		userId = link.attr("userId");
-		$("#yesButton").attr("href", link.attr("href"));
-		$("#confirmText").text("Are you sure you want to delete this user ID " + userId + "?");
-		$("#confirmModal").modal();
-	});
-});
-
-	function clearFilter(){
-		window.location = "[[@{/users}]]";
-	}
-
-
-</script>
-	
-</body>
-
-</html>
\ No newline at end of file
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/73/30823fce2db4001d1d079a924effdc9e b/.metadata/.plugins/org.eclipse.core.resources/.history/73/30823fce2db4001d1d079a924effdc9e
deleted file mode 100644
index 4a24c5bb..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/73/30823fce2db4001d1d079a924effdc9e
+++ /dev/null
@@ -1,94 +0,0 @@
-<!DOCTYPE html>
-<html xmlns:th="http://www.thymeleaf.org"
-	  xmlns:sec="https://www.thymeleaf.org/thymeleaf-extras-springsecurity5">
-
-<head>
-	<meta http-equiv="Content-Type" content="text/html; charset= UTF-8">
-	<meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0">
-	<title>Home - Shopme Admin</title>
-	
-	<link rel="stylesheet" type="text/css" th:href="@{/fontawesome/all.css}" />
-	<link rel="stylesheet" type="text/css" th:href="@{/style.css}" />
-	<link rel="stylesheet" type="text/css" th:href="@{/webjars/bootstrap/css/bootstrap.min.css}" />
-	
-	<script type="text/javascript" th:src="@{/webjars/jquery/jquery.min.js}"></script>
-	<script type="text/javascript" th:src="@{/webjars/bootstrap/js/bootstrap.min.js}"></script>
-</head>
-
-<body>
-	<div class="container-fluid">
-		<div>
-			<nav class="navbar navbar-expand-lg bg-dark navbar-dark">
-				<a class="navbar-brand" th:href="@{/}">
-					<img th:src="@{/images/ShopmeAdminSmall.png}"/>
-				</a>
-				<!--hamburger toggler for mobile devices(responsive)-->
-				<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#topNavbar">
-					<span class="navbar-toggler-icon"></span>
-				</button>
-				<div class="collapse navbar-collapse" id="topNavbar">
-					<ul class="navbar-nav">
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/users}">Users</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/categories}">Categories</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/brands}">Brands</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/products}">Products</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/customers}">Customers</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/shipping}">Shipping</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/orders}">Orders</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/report}">Sales Report</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/articles}">Articles</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/menus}">Menus</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/settings}">Settings</a>
-						</li>
-						<li>
-							<span class="fas fa-user fa-2x icon-silver"></span>
-						</li>
-						<li class="nav-item dropdown">
-								<!-- principal refers to user; display username -->
-							<a class="nav-link dropdown-toggle" sec:authentication="principal.fullname" data-toggle="dropdown"></a>
-							<div class="dropdown-menu">
-								
-							</div>
-							
-						</li>
-					</ul>
-				</div>
-				
-			</nav>
-		</div>
-
-		<div>
-			<h1>Shopme Control Panel</h1>
-		<div />
-
-		<div>
-			<p>Shopme Control Panel - Copyright &copy; Shopme</p>
-		<div />
-
-
-	</div>
-
-</body>
-
-</html>
\ No newline at end of file
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/73/7006a91423b4001d1216d7fff398b3d6 b/.metadata/.plugins/org.eclipse.core.resources/.history/73/7006a91423b4001d1216d7fff398b3d6
deleted file mode 100644
index dc498f0a..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/73/7006a91423b4001d1216d7fff398b3d6
+++ /dev/null
@@ -1,85 +0,0 @@
-package com.shopme.admin.security;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-import java.util.Set;
-
-import org.aspectj.weaver.patterns.ThisOrTargetAnnotationPointcut;
-import org.springframework.security.core.GrantedAuthority;
-import org.springframework.security.core.authority.SimpleGrantedAuthority;
-import org.springframework.security.core.userdetails.UserDetails;
-
-import com.shopme.common.entity.Role;
-import com.shopme.common.entity.User;
-
-/*
- *  Think of it as a wrapper class for  Type User
- *  
- *  ShopmeUserDetailsService will use this dao class
- * 
- * */
-public class ShopmeUserDetails implements UserDetails {
-
-	private User user;
-
-	public ShopmeUserDetails(User user) {
-		this.user = user;
-	}
-
-	/* get a list of assigned roles to user */
-	@Override
-	public Collection<? extends GrantedAuthority> getAuthorities() {
-
-		Set<Role> roles = user.getRoles();
-
-		List<SimpleGrantedAuthority> authorities = new ArrayList<>();
-
-		for (Role role : roles) {
-			authorities.add(new SimpleGrantedAuthority(role.getName()));
-		}
-
-		return authorities;
-	}
-
-	@Override
-	public String getPassword() {
-		return user.getPassword();
-	}
-
-	@Override
-	public String getUsername() {
-		return user.getEmail();
-	}
-
-	// "true" means account not expired
-	@Override
-	public boolean isAccountNonExpired() {
-		return true;
-	}
-
-	@Override
-	public boolean isAccountNonLocked() {
-		// TODO Auto-generated method stub
-		return true;
-	}
-
-	@Override
-	public boolean isCredentialsNonExpired() {
-		// TODO Auto-generated method stub
-		return true;
-	}
-
-	@Override
-	public boolean isEnabled() {
-		// TODO Auto-generated method stub
-		return user.isEnabled();
-	}
-	
-	public String getFullname() {
-		
-		return this.user.getFirstName() + " " + this.user.getLastName();
-	}
-	
-
-}
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/74/003b84ca45b4001d1d079a924effdc9e b/.metadata/.plugins/org.eclipse.core.resources/.history/74/003b84ca45b4001d1d079a924effdc9e
deleted file mode 100644
index c9ef4bdf..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/74/003b84ca45b4001d1d079a924effdc9e
+++ /dev/null
@@ -1,43 +0,0 @@
-<!DOCTYPE html>
-<html xmlns:th="http://www.thymeleaf.org">
-
-<head th:fragment="page_head(title)">
-	<meta http-equiv="Content-Type" content="text/html; charset= UTF-8">
-	<meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0">
-	<title>[[${title}]]</title>
-	
-	<link rel="stylesheet" type="text/css" th:href="@{/fontawesome/all.css}" />
-	<link rel="stylesheet" type="text/css" th:href="@{/style.css}" />
-	<link rel="stylesheet" type="text/css" th:href="@{/webjars/bootstrap/css/bootstrap.min.css}" />
-	
-	<script type="text/javascript" th:src="@{/webjars/jquery/jquery.min.js}"></script>
-	<script type="text/javascript" th:src="@{/webjars/bootstrap/js/bootstrap.min.js}"></script>
-</head>
-
-<body>
-
-		<!-- purpose: make code more succinct and readable 
-		project is easier to maintain
-		
-		use thymeleaf fragments -->
-
-	<!-- if  ${removeTag} == 'tag' then the <th> parent tag will be removed.  if ${removeTag} == 'none' then keep the <th> parent tag-->
-	<th th:fragment="column_link(fieldName, columnLabel, removeTag)" th:remove="${removeTag}">
-		<!-- follow the sort order of another sortField; if the other field is sortDir="asc", then the newly selected column will be sortDir="asc" too -->
-		<a class="text-white"
-		   th:href="@{'/users/page/' + ${currentPage} + '?sortField=' + ${fieldName} + '&sortDir=' + ${sortField != fieldName ? sortDir : reverseSortDir} + ${keyword != null ? '&keyword=' + keyword : ''}}">
-			[[${columnLabel}]]
-		</a>
-		
-		<span th:if="${sortField == fieldName}"
-		th:class="${sortDir == 'asc' ? 'fas fa-sort-up' : 'fas fa-sort-down'}"></span>
-	</th>
-	
-	
-	<a th:fragment="page_link(pageNum, label)"
-	   class="page-link"
-	   th:href= "@{'/users/page/' + ${pageNum} + '?sortField=' + ${sortField} + '&sortDir=' + ${sortDir} + ${keyword != null ? '&keyword=' + keyword : ''}}">[[${label}]]</a>
-	
-	
-</body>
-</html>
\ No newline at end of file
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/75/50205b4b8cb3001d19bbb001c1a81c20 b/.metadata/.plugins/org.eclipse.core.resources/.history/75/50205b4b8cb3001d19bbb001c1a81c20
deleted file mode 100644
index 194ee8c0..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/75/50205b4b8cb3001d19bbb001c1a81c20
+++ /dev/null
@@ -1,259 +0,0 @@
-<!DOCTYPE html>
-<html xmlns:th="http://www.thymeleaf.org">
-
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset= UTF-8">
-<meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0">
-<title>Manage Users</title>
-
-<link rel="stylesheet" type="text/css" th:href="@{/webjars/bootstrap/css/bootstrap.min.css}" />
-<link rel="stylesheet" type="text/css" th:href="@{/fontawesome/all.css}" />
-<link rel="stylesheet" type="text/css" th:href="@{/style.css}" />
-	
-<script type="text/javascript" th:src="@{/webjars/jquery/jquery.min.js}"></script>
-<script type="text/javascript" th:src="@{/webjars/bootstrap/js/bootstrap.min.js}"></script>
-</head>
-
-<body>
-	<div class="container-fluid">
-		<div>
-			<nav class="navbar navbar-expand-lg bg-dark navbar-dark">
-				<a class="navbar-brand" th:href="@{/}"> <img
-					th:src="@{/images/ShopmeAdminSmall.png}" />
-				</a>
-				<!--hamburger toggler for mobile devices(responsive)-->
-				<button class="navbar-toggler" type="button" data-toggle="collapse"
-					data-target="#topNavbar">
-					<span class="navbar-toggler-icon"></span>
-				</button>
-				<div class="collapse navbar-collapse" id="topNavbar">
-					<ul class="navbar-nav">
-						<li class="nav-item"><a class="nav-link" th:href="@{/users}">Users</a>
-						</li>
-						<li class="nav-item"><a class="nav-link"
-							th:href="@{/categories}">Categories</a></li>
-						<li class="nav-item"><a class="nav-link" th:href="@{/brands}">Brands</a>
-						</li>
-						<li class="nav-item"><a class="nav-link"
-							th:href="@{/products}">Products</a></li>
-						<li class="nav-item"><a class="nav-link"
-							th:href="@{/customers}">Customers</a></li>
-						<li class="nav-item"><a class="nav-link"
-							th:href="@{/shipping}">Shipping</a></li>
-						<li class="nav-item"><a class="nav-link" th:href="@{/orders}">Orders</a>
-						</li>
-						<li class="nav-item"><a class="nav-link" th:href="@{/report}">Sales
-								Report</a></li>
-						<li class="nav-item"><a class="nav-link"
-							th:href="@{/articles}">Articles</a></li>
-						<li class="nav-item"><a class="nav-link" th:href="@{/menus}">Menus</a>
-						</li>
-						<li class="nav-item"><a class="nav-link"
-							th:href="@{/settings}">Settings</a></li>
-					</ul>
-				</div>
-
-			</nav>
-		</div>
-
-		<div>
-			<h2>Manage Users</h2>
-			<a th:href="@{/users/new}" class="fas fa-user-plus fa-2x icon-dark mr-2"></a>
-			
-			<a th:href="@{/users/export/csv}" class="fas fa-file-csv fa-2x icon-dark mr-2"></a>
-		</div>
-		
-		
-		
-		<!-- only display success message when a new user is created -->
-		<div th:if="${message != null}" class="alert alert-success text-center">
-			[[${message}]]
-		</div>
-			
-		<div>
-			<form th:action="@{/users/page/1}" class="form-inline m-3">
-				
-				<input type="hidden" name="sortField" th:value="${sortField}" />
-				<input type="hidden" name="sortDir" th:value="${sortDir}" />
-				Filter:&nbsp;
-				<input type="search" name="keyword" th:value="${keyword}" class="form-control" required/>
-				&nbsp;&nbsp;
-				<button type="submit" class="btn btn-primary">
-					<i class="fas fa-search"></i>
-				</button>
-				&nbsp;&nbsp;
-				<button type="button" class="btn btn-secondary" onclick="clearFilter()">
-					<i class="fas fa-eraser"></i>
-				</button>
-			</form>
-		
-		</div>
-
-
-			<div class="full-details">
-				<table class="table table-bordered table-striped table-hover table-responsive-xL">
-					<thead class="thead-dark">
-						<tr>
-							<!-- refer to templates/fragments.html for fragment code-->
-							<th th:replace="fragments :: column_link('id', 'User ID')"/>
-							<th>Photos</th>
-							<th th:replace="fragments :: column_link('email', 'Email')"/>
-							<th th:replace="fragments :: column_link('firstName', 'First Name')"/>
-							<th th:replace="fragments :: column_link('lastName', 'Last Name')"/>
-							<th>Roles</th>
-							<th th:replace="fragments :: column_link('enabled', 'Enabled')"/>
-							<th></th>
-						</tr>
-					</thead>
-					<tbody>
-						<tr th:each="user : ${listUsers}">
-							<td>[[${user.id}]]</td>
-							<td>
-								<span th:if="${user.photos == null}" class="fas fa-portrait fa-3x icon-dark"></span>
-								<img th:if="${user.photos != null}" th:src="@{${user.photosImagePath}}"
-								style="width: 100px"/>
-							</td>
-							<td>[[${user.email}]]</td>
-							<td>[[${user.firstName}]]</td>
-							<td>[[${user.lastName}]]</td>
-							<td>[[${user.roles}]]</td>
-							
-							<td>
-								<a th:if="${user.enabled == true}" class="fas fa-check-circle fa-2x icon-green" 
-								th:href="@{'/users/' + ${user.id} + '/enabled/false'}"
-								title="Disable this user"></a>
-								
-								<a th:if="${user.enabled == false}" class="fas fa-circle fa-2x icon-silver"
-								 th:href="@{'/users/' + ${user.id} + '/enabled/true'}"
-								 title="Enable this user"></a>
-							</td>
-							<td>
-									<a class="fas fa-edit fa-2x icon-green" th:href="@{'/users/edit/' + ${user.id}}"
-									title="edit this user"></a>
-									&nbsp; 
-									<a class="fas fa-trash fa-2x icon-dark link-delete" th:href="@{'/users/delete/' + ${user.id}}"
-									title="delete this user" th:userId="${user.id}"></a>
-							</td>
-						</tr>
-					</tbody>
-				</table>
-			</div>
-			
-			
-			<!-- display this on mobile screens only, refer to /static/style.css for more info-->
-			<div class="less-details">
-				
-				<div th:each="user : ${listUsers}" class="row m-1">
-					
-					<div class="col">
-						
-						<span th:if="${user.photos == null}" class="fas fa-portrait fa-3x icon-dark"></span>
-								<img th:if="${user.photos != null}" th:src="@{${user.photosImagePath}}"
-								style="width: 100px"/>
-					</div>
-						<div class="col">
-							<div>[[${user.fullName}]]</div>
-							<div>[[${user.roles}]]</div>
-						</div>
-					<div>&nbsp;</div>
-				</div>
-			</div>
-			
-			
-			<!-- IF -->
-			<div class="text-center m-1" th:if="${totalItems > 0}">
-				<span>Showing Users # [[${startCount}]] to [[${endCount}]] of [[${totalItems}]]</span>
-			</div>
-			
-			<!-- ELSE -->
-			<div class="text-center m-1" th:unless="${totalItems > 0}">
-				<span>No users found</span>
-			</div>
-			
-			<!-- only display pagination when there are users; else, no users no pagination -->
-			<div th:if="${totalPages > 1}">
-				<nav>
-					  <ul class="pagination justify-content-center flex-wrap">
-					  
-					  	<li th:class=" ${currentPage > 1 ? 'page-item' : 'page-item disabled'}">
-					  		<a th:replace="fragments :: page_link(1, 'First')"></a>
-				    	</li>
-					  
-					    <li th:class=" ${currentPage > 1 ? 'page-item' : 'page-item disabled'}">
-					    	<a th:replace="fragments :: page_link(${currentPage - 1 }, 'previous')"></a>
-				    	</li>
-					    	
-					    <!-- org.thymeleaf.expression.Numbers class, An object of this class is usually available in variable evaluation expressions with the name #numbers. -->
-					    <li th:class="${currentPage != i ? 'page-item' : 'page-item active'}" 
-					    	th:each="i : ${#numbers.sequence(1, totalPages)}">
-					    	<a th:replace="fragments :: page_link(${i}, ${i})"></a>
-					    </li>
-					    
-					    <li  th:class=" ${currentPage < totalPages ? 'page-item' : 'page-item disabled'}">
-					    	<a th:replace="fragments :: page_link(${currentPage + 1}, 'Next')"></a>
-					    </li>
-					    
-					    <li th:class=" ${currentPage < totalPages ? 'page-item' : 'page-item disabled'}">
-							<a th:replace="fragments :: page_link(${totalPages}, 'Last')"></a>		
-					    </li>
-					  </ul>
-				</nav>
-			</div>
-			
-			
-			
-			<div class="modal fade text-center" id="confirmModal">
-				<div class="modal-dialog">
-					<div class="modal-content">
-					
-						<div class="modal-header">
-							<h4 class="modal-title">Delete Confirmation</h4>
-							<button type="button" class="close" data-dismiss="modal">&times;</button>
-						</div>
-						
-						<div class="modal-body">
-							<span id="confirmText"></span>
-						</div>
-						
-						<div class="modal-footer">
-							<a class="btn btn-success" href="" id="yesButton">Yes</a>
-							<button type="button" class="btn btn-danger" data-dismiss="modal">Close</button>
-						</div>
-					</div>
-				</div>
-			</div>
-			
-			
-			<div class="text-center">
-				<p>Shopme Control Panel - Copyright &copy; Shopme</p>
-			</div>
-
-
-	</div>
-	
-<script type="text/javascript">
-
-//confirmation modal dialogue for delete user
-$(document).ready(function(){
-	$(".link-delete").on("click", function(e){
-		//stop the <a> tag default behaviour and pop out a confirmation modal dialogue
-		e.preventDefault();
-		//alert($(this).attr("href"));
-		link = $(this);
-		userId = link.attr("userId");
-		$("#yesButton").attr("href", link.attr("href"));
-		$("#confirmText").text("Are you sure you want to delete this user ID " + userId + "?");
-		$("#confirmModal").modal();
-	});
-});
-
-	function clearFilter(){
-		window.location = "[[@{/users}]]";
-	}
-
-
-</script>
-	
-</body>
-
-</html>
\ No newline at end of file
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/77/002f11cf9cb9001d10d0f9513979f945 b/.metadata/.plugins/org.eclipse.core.resources/.history/77/002f11cf9cb9001d10d0f9513979f945
new file mode 100644
index 00000000..e457fabc
--- /dev/null
+++ b/.metadata/.plugins/org.eclipse.core.resources/.history/77/002f11cf9cb9001d10d0f9513979f945
@@ -0,0 +1,105 @@
+package com.shopme.admin.category;
+
+import java.io.IOException;
+import java.util.List;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.scheduling.support.SimpleTriggerContext;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
+import org.springframework.util.StringUtils;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.ModelAttribute;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.multipart.MultipartFile;
+import org.springframework.web.servlet.mvc.support.RedirectAttributes;
+
+import com.shopme.admin.FileUploadUtil;
+import com.shopme.common.entity.Category;
+
+@Controller
+public class CategoryController {
+	
+	@Autowired
+	private CategoryService service;
+	
+	@GetMapping("/categories")
+	public String listAll(Model model) {
+		
+		List<Category> listCategories = service.listAll();
+		model.addAttribute("listCategories", listCategories);
+		
+		return "categories/categories";
+	}
+	
+	
+	@GetMapping("/categories/new")
+	public String newCategory(Model model) {
+		
+		List<Category> listCategories = service.listCategoriesUsedInForm();
+		
+		model.addAttribute("category", new Category());
+		model.addAttribute("listCategories", listCategories);
+		model.addAttribute("pageTitle", "Create New Category");
+		
+		return "categories/category_form";
+	
+	}
+	
+	@PostMapping("/categories/save")
+	public String saveCategory(@ModelAttribute("category") Category category, 
+			RedirectAttributes redirectAttributes,
+			@RequestParam("fileImage") MultipartFile multipartFile) throws IOException {
+		
+		if(!multipartFile.isEmpty()) {
+			String fileName = StringUtils.cleanPath(multipartFile.getOriginalFilename());
+			category.setImage(fileName);
+			
+			Category savedCategory = service.save(category);
+			String uploadDir = "../category-images/" + savedCategory.getId();
+			
+			FileUploadUtil.cleanDir(uploadDir);
+			FileUploadUtil.saveFile(uploadDir, fileName, multipartFile);
+		}
+		else {
+			service.save(category);
+		}
+		
+		
+		
+		
+		
+		redirectAttributes.addFlashAttribute("message", "the category have been saved successfully");
+		
+		
+		return "redirect:/categories";
+	}
+
+	
+	@GetMapping("/categories/edit/{id}")
+	public String editCategory(@PathVariable(name = "id") Integer id, Model model,
+			RedirectAttributes ra) {
+		try {
+			Category category = service.get(id);
+			List<Category> listCategories = service.listCategoriesUsedInForm();
+			
+			model.addAttribute("category", category);
+			model.addAttribute("listCategories", listCategories);
+			model.addAttribute("pageTitle", "Edit Category (ID: " + id + ")");
+			
+			return "categories/category_form";			
+		} catch (CategoryNotFoundException ex) {
+			ra.addFlashAttribute("message", ex.getMessage());
+			return "redirect:/categories";
+		}
+	}
+	
+	
+	
+}
+	
+
+
+
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/77/7041e35289b3001d19bbb001c1a81c20 b/.metadata/.plugins/org.eclipse.core.resources/.history/77/7041e35289b3001d19bbb001c1a81c20
deleted file mode 100644
index 3e90a3be..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/77/7041e35289b3001d19bbb001c1a81c20
+++ /dev/null
@@ -1,26 +0,0 @@
-*.icon-white{color: white}
-*.icon-silver{color: silver}
-*.icon-green{color: green}
-*.icon-dark{color: gray}
-*.icon-red{color: red}
-
-
-@media screen and (max-width: 768px) {
-	/* small screen */
-	
-	div.full-details{ display: none;}
-	div.less-details{ display: block;}
-	
-}
-
-@media screen and (min-width: 768px) and (max-width: 1024px) {
-	/* medium screen */
-	
-	div.full-details{ display: block;}
-}
-
-
-@media screen and (min-width: 1024px) {
-	/* large screen */
-	
-}
\ No newline at end of file
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/78/2054eb1f46b4001d1d079a924effdc9e b/.metadata/.plugins/org.eclipse.core.resources/.history/78/2054eb1f46b4001d1d079a924effdc9e
deleted file mode 100644
index 403c54dc..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/78/2054eb1f46b4001d1d079a924effdc9e
+++ /dev/null
@@ -1,235 +0,0 @@
-<!DOCTYPE html>
-<html xmlns:th="http://www.thymeleaf.org">
-
-<head th:replace="fragments :: page_head('Users - Shopme Admin')"/>
-
-<body>
-	<div class="container-fluid">
-		
-		<!-- navigation BAR -->
-		<div th:replace="navigation :: menu"></div>
-
-		<div>
-			<h2>Manage Users</h2>
-			<a th:href="@{/users/new}" class="fas fa-user-plus fa-2x icon-dark mr-2"></a>
-			
-			<a th:href="@{/users/export/csv}" class="fas fa-file-csv fa-2x icon-dark mr-2"></a>
-		</div>
-		
-		
-		
-		<!-- only display success message when a new user is created -->
-		<div th:if="${message != null}" class="alert alert-success text-center">
-			[[${message}]]
-		</div>
-			
-		<div>
-			<form th:action="@{/users/page/1}" class="form-inline m-3">
-				
-				<input type="hidden" name="sortField" th:value="${sortField}" />
-				<input type="hidden" name="sortDir" th:value="${sortDir}" />
-				Filter:&nbsp;
-				<input type="search" name="keyword" th:value="${keyword}" class="form-control" required/>
-				&nbsp;&nbsp;
-				<button type="submit" class="btn btn-primary">
-					<i class="fas fa-search"></i>
-				</button>
-				&nbsp;&nbsp;
-				<button type="button" class="btn btn-secondary" onclick="clearFilter()">
-					<i class="fas fa-eraser"></i>
-				</button>
-			</form>
-		
-		</div>
-
-			<!-- css class to display this table in large screens only , refer to static/style.css for more info-->
-			<div class="full-details">
-				<table class="table table-bordered table-striped table-hover table-responsive-xL">
-					<thead class="thead-dark">
-						<tr>
-							<!-- refer to templates/fragments.html for fragment code-->
-							
-							<th class="hideable-column">
-								<th th:replace="fragments :: column_link('id', 'User ID', 'tag')"/>
-							</th>
-							
-							<th>Photos</th>
-							
-							<th class="hideable-column">
-								<th th:replace="fragments :: column_link('email', 'Email', 'tag')"/>
-							</th>
-							
-							<th th:replace="fragments :: column_link('firstName', 'First Name', 'none')"/>
-							<th th:replace="fragments :: column_link('lastName', 'Last Name', 'none')"/>
-							<th>Roles</th>
-							<th th:replace="fragments :: column_link('enabled', 'Enabled', 'none')"/>
-							<th></th>
-						</tr>
-					</thead>
-					<tbody>
-						<tr th:each="user : ${listUsers}">
-							<td class="hideable-column">[[${user.id}]]</td>
-							<td>
-								<span th:if="${user.photos == null}" class="fas fa-portrait fa-3x icon-dark"></span>
-								<img th:if="${user.photos != null}" th:src="@{${user.photosImagePath}}"
-								style="width: 100px"/>
-							</td>
-							<td class="hideable-column">[[${user.email}]]</td>
-							<td>[[${user.firstName}]]</td>
-							<td>[[${user.lastName}]]</td>
-							<td>[[${user.roles}]]</td>
-							
-							<td>
-								<a th:if="${user.enabled == true}" class="fas fa-check-circle fa-2x icon-green" 
-								th:href="@{'/users/' + ${user.id} + '/enabled/false'}"
-								title="Disable this user"></a>
-								
-								<a th:if="${user.enabled == false}" class="fas fa-circle fa-2x icon-silver"
-								 th:href="@{'/users/' + ${user.id} + '/enabled/true'}"
-								 title="Enable this user"></a>
-							</td>
-							<td>
-									<a class="fas fa-edit fa-2x icon-green" th:href="@{'/users/edit/' + ${user.id}}"
-									title="edit this user"></a>
-									&nbsp; 
-									<a class="fas fa-trash fa-2x icon-dark link-delete" th:href="@{'/users/delete/' + ${user.id}}"
-									title="delete this user" th:userId="${user.id}"></a>
-							</td>
-						</tr>
-					</tbody>
-				</table>
-			</div>
-			
-			
-			<!-- css class to display this <div> on mobile screens only, refer to /static/style.css for more info-->
-			<div class="less-details">
-				
-				<div th:each="user : ${listUsers}" class="row m-1">
-					
-					<div class="col-4">
-						
-						<span th:if="${user.photos == null}" class="fas fa-portrait fa-3x icon-dark"></span>
-								<img th:if="${user.photos != null}" th:src="@{${user.photosImagePath}}"
-								style="width: 100px"/>
-					</div>
-					
-					<div class="col-8">
-						<div>[[${user.fullName}]]</div>
-						<div>[[${user.roles}]]</div>
-						<div class="mt-2">
-							<a th:if="${user.enabled == true}" class="fas fa-check-circle fa-2x icon-green" 
-								th:href="@{'/users/' + ${user.id} + '/enabled/false'}"
-								title="Disable this user"></a>
-								
-							<a th:if="${user.enabled == false}" class="fas fa-circle fa-2x icon-silver"
-								 th:href="@{'/users/' + ${user.id} + '/enabled/true'}"
-								 title="Enable this user"></a>
-						
-									&nbsp;
-							<a class="fas fa-edit fa-2x icon-green" th:href="@{'/users/edit/' + ${user.id}}"
-									title="edit this user"></a>
-									&nbsp; 
-							<a class="fas fa-trash fa-2x icon-dark link-delete" th:href="@{'/users/delete/' + ${user.id}}"
-									title="delete this user" th:userId="${user.id}"></a>
-						</div>
-					</div>
-					<div>&nbsp;</div>
-				</div>
-			</div>
-			
-			
-			<!-- IF -->
-			<div class="text-center m-1" th:if="${totalItems > 0}">
-				<span>Showing Users # [[${startCount}]] to [[${endCount}]] of [[${totalItems}]]</span>
-			</div>
-			
-			<!-- ELSE -->
-			<div class="text-center m-1" th:unless="${totalItems > 0}">
-				<span>No users found</span>
-			</div>
-			
-			<!-- only display pagination when there are users; else, no users no pagination -->
-			<div th:if="${totalPages > 1}">
-				<nav>
-					  <ul class="pagination justify-content-center flex-wrap">
-					  
-					  	<li th:class=" ${currentPage > 1 ? 'page-item' : 'page-item disabled'}">
-					  		<a th:replace="fragments :: page_link(1, 'First')"></a>
-				    	</li>
-					  
-					    <li th:class=" ${currentPage > 1 ? 'page-item' : 'page-item disabled'}">
-					    	<a th:replace="fragments :: page_link(${currentPage - 1 }, 'previous')"></a>
-				    	</li>
-					    	
-					    <!-- org.thymeleaf.expression.Numbers class, An object of this class is usually available in variable evaluation expressions with the name #numbers. -->
-					    <li th:class="${currentPage != i ? 'page-item' : 'page-item active'}" 
-					    	th:each="i : ${#numbers.sequence(1, totalPages)}">
-					    	<a th:replace="fragments :: page_link(${i}, ${i})"></a>
-					    </li>
-					    
-					    <li  th:class=" ${currentPage < totalPages ? 'page-item' : 'page-item disabled'}">
-					    	<a th:replace="fragments :: page_link(${currentPage + 1}, 'Next')"></a>
-					    </li>
-					    
-					    <li th:class=" ${currentPage < totalPages ? 'page-item' : 'page-item disabled'}">
-							<a th:replace="fragments :: page_link(${totalPages}, 'Last')"></a>		
-					    </li>
-					  </ul>
-				</nav>
-			</div>
-			
-			
-			
-			<div class="modal fade text-center" id="confirmModal">
-				<div class="modal-dialog">
-					<div class="modal-content">
-					
-						<div class="modal-header">
-							<h4 class="modal-title">Delete Confirmation</h4>
-							<button type="button" class="close" data-dismiss="modal">&times;</button>
-						</div>
-						
-						<div class="modal-body">
-							<span id="confirmText"></span>
-						</div>
-						
-						<div class="modal-footer">
-							<a class="btn btn-success" href="" id="yesButton">Yes</a>
-							<button type="button" class="btn btn-danger" data-dismiss="modal">Close</button>
-						</div>
-					</div>
-				</div>
-			</div>
-			
-			<!-- footer -->
-			<div th:replace="fragments :: footer"></div>
-
-
-	</div>
-	
-<script type="text/javascript">
-
-//confirmation modal dialogue for delete user
-$(document).ready(function(){
-	$(".link-delete").on("click", function(e){
-		//stop the <a> tag default behaviour and pop out a confirmation modal dialogue
-		e.preventDefault();
-		//alert($(this).attr("href"));
-		link = $(this);
-		userId = link.attr("userId");
-		$("#yesButton").attr("href", link.attr("href"));
-		$("#confirmText").text("Are you sure you want to delete this user ID " + userId + "?");
-		$("#confirmModal").modal();
-	});
-});
-
-	function clearFilter(){
-		window.location = "[[@{/users}]]";
-	}
-
-
-</script>
-	
-</body>
-
-</html>
\ No newline at end of file
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/78/70b8eb0595b6001d1567bacd2f52a0b7 b/.metadata/.plugins/org.eclipse.core.resources/.history/78/70b8eb0595b6001d1567bacd2f52a0b7
deleted file mode 100644
index fa008be1..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/78/70b8eb0595b6001d1567bacd2f52a0b7
+++ /dev/null
@@ -1,5 +0,0 @@
-package com.shopme.common.entity;
-
-public class Category {
-
-}
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/79/a0f704090cb9001d11addcb4256c67f9 b/.metadata/.plugins/org.eclipse.core.resources/.history/79/a0f704090cb9001d11addcb4256c67f9
new file mode 100644
index 00000000..cd372d8a
--- /dev/null
+++ b/.metadata/.plugins/org.eclipse.core.resources/.history/79/a0f704090cb9001d11addcb4256c67f9
@@ -0,0 +1,206 @@
+<!DOCTYPE html>
+<html xmlns:th="http://www.thymeleaf.org">
+
+<head th:replace="fragments :: page_head('Categories - Shopme Admin')"/>
+
+<body>
+	<div class="container-fluid">
+		
+		<!-- navigation bar -->
+		<div th:replace="navigation :: menu"></div>
+
+		<div>
+			<h2>Manage Categories</h2>
+			<a th:href="@{/categories/new}" class="fas fa-folder-plus fa-2x icon-dark mr-2"></a>
+			
+			<a th:href="@{/categories/export/csv}" class="fas fa-file-csv fa-2x icon-dark mr-2"></a>
+		</div>
+		
+		<!-- redirect message from controller -->
+		<div th:if="${message != null}" class="alert alert-success text-center">
+			[[${message}]]
+		</div>
+		
+			
+		<div>
+			<form th:action="@{/categories/page/1}" class="form-inline m-3">
+				
+				Filter:&nbsp;
+				<input type="search" name="keyword" th:value="${keyword}" class="form-control" required/>
+				&nbsp;&nbsp;
+				<button type="submit" class="btn btn-primary">
+					<i class="fas fa-search"></i>
+				</button>
+				&nbsp;&nbsp;
+				<button type="button" class="btn btn-secondary" onclick="clearFilter()">
+					<i class="fas fa-eraser"></i>
+				</button>
+			</form>
+		
+		</div>
+
+			<!-- css class to display this table in large screens only , refer to static/style.css for more info-->
+			<div class="full-details">
+				<table class="table table-bordered table-striped table-hover table-responsive-xL">
+					<thead class="thead-dark">
+						<tr>
+							<th>ID</th>
+							<th>Category Image</th>
+							<th>Category Name</th>
+							<th>Alias</th>
+							<th>Enabled</th>
+							<th></th>
+						</tr>
+					</thead>
+					<tbody>
+						<tr th:each="cat : ${listCategories}">
+							<td>[[${cat.id}]]</td>
+							<td>	
+								<img th:src="@{}"/>
+							</td>
+							<td>[[${cat.name}]]</td>
+							<td>[[${cat.alias}]]</td>
+							<td>
+								<div th:replace="fragments :: category_status"></div>
+							</td>
+							<td>
+								<div th:replace="fragments :: category_actions"></div>
+							</td>
+						</tr>
+					</tbody>
+				</table>
+			</div>
+			
+			
+			<!-- css class to display this <div> on mobile screens only, refer to /static/style.css for more info-->
+			<div class="less-details">
+				
+				<div th:each="user : ${listUsers}" class="row m-1">
+					
+					<div class="col-4">
+						
+						<span th:if="${user.photos == null}" class="fas fa-portrait fa-3x icon-dark"></span>
+								<img th:if="${user.photos != null}" th:src="@{${user.photosImagePath}}"
+								style="width: 100px"/>
+					</div>
+					
+					<div class="col-8">
+						<div>[[${user.fullName}]]</div>
+						<div>[[${user.roles}]]</div>
+						<div class="mt-2">
+							<a th:if="${user.enabled == true}" class="fas fa-check-circle fa-2x icon-green" 
+								th:href="@{'/users/' + ${user.id} + '/enabled/false'}"
+								title="Disable this user"></a>
+								
+							<a th:if="${user.enabled == false}" class="fas fa-circle fa-2x icon-silver"
+								 th:href="@{'/users/' + ${user.id} + '/enabled/true'}"
+								 title="Enable this user"></a>
+						
+									&nbsp;
+							<a class="fas fa-edit fa-2x icon-green" th:href="@{'/users/edit/' + ${user.id}}"
+									title="edit this user"></a>
+									&nbsp; 
+							<a class="fas fa-trash fa-2x icon-dark link-delete" th:href="@{'/users/delete/' + ${user.id}}"
+									title="delete this user" th:userId="${user.id}"></a>
+						</div>
+					</div>
+					<div>&nbsp;</div>
+				</div>
+			</div>
+			
+			
+			<!-- IF -->
+			<div class="text-center m-1" th:if="${totalItems > 0}">
+				<span>Showing Users # [[${startCount}]] to [[${endCount}]] of [[${totalItems}]]</span>
+			</div>
+			
+			<!-- ELSE -->
+			<div class="text-center m-1" th:unless="${totalItems > 0}">
+				<span>No users found</span>
+			</div>
+			
+			<!-- only display pagination when there are users; else, no users no pagination -->
+			<div th:if="${totalPages > 1}">
+				<nav>
+					  <ul class="pagination justify-content-center flex-wrap">
+					  
+					  	<li th:class=" ${currentPage > 1 ? 'page-item' : 'page-item disabled'}">
+					  		<a th:replace="fragments :: page_link(1, 'First')"></a>
+				    	</li>
+					  
+					    <li th:class=" ${currentPage > 1 ? 'page-item' : 'page-item disabled'}">
+					    	<a th:replace="fragments :: page_link(${currentPage - 1 }, 'previous')"></a>
+				    	</li>
+					    	
+					    <!-- org.thymeleaf.expression.Numbers class, An object of this class is usually available in variable evaluation expressions with the name #numbers. -->
+					    <li th:class="${currentPage != i ? 'page-item' : 'page-item active'}" 
+					    	th:each="i : ${#numbers.sequence(1, totalPages)}">
+					    	<a th:replace="fragments :: page_link(${i}, ${i})"></a>
+					    </li>
+					    
+					    <li  th:class=" ${currentPage < totalPages ? 'page-item' : 'page-item disabled'}">
+					    	<a th:replace="fragments :: page_link(${currentPage + 1}, 'Next')"></a>
+					    </li>
+					    
+					    <li th:class=" ${currentPage < totalPages ? 'page-item' : 'page-item disabled'}">
+							<a th:replace="fragments :: page_link(${totalPages}, 'Last')"></a>		
+					    </li>
+					  </ul>
+				</nav>
+			</div>
+			
+			
+			
+			<div class="modal fade text-center" id="confirmModal">
+				<div class="modal-dialog">
+					<div class="modal-content">
+					
+						<div class="modal-header">
+							<h4 class="modal-title">Delete Confirmation</h4>
+							<button type="button" class="close" data-dismiss="modal">&times;</button>
+						</div>
+						
+						<div class="modal-body">
+							<span id="confirmText"></span>
+						</div>
+						
+						<div class="modal-footer">
+							<a class="btn btn-success" href="" id="yesButton">Yes</a>
+							<button type="button" class="btn btn-danger" data-dismiss="modal">Close</button>
+						</div>
+					</div>
+				</div>
+			</div>
+			
+			<!-- footer -->
+			<div th:replace="fragments :: footer"></div>
+
+
+	</div>
+	
+<script type="text/javascript">
+
+//confirmation modal dialogue for delete user
+$(document).ready(function(){
+	$(".link-delete").on("click", function(e){
+		//stop the <a> tag default behaviour and pop out a confirmation modal dialogue
+		e.preventDefault();
+		//alert($(this).attr("href"));
+		link = $(this);
+		userId = link.attr("userId");
+		$("#yesButton").attr("href", link.attr("href"));
+		$("#confirmText").text("Are you sure you want to delete this user ID " + userId + "?");
+		$("#confirmModal").modal();
+	});
+});
+
+	function clearFilter(){
+		window.location = "[[@{/users}]]";
+	}
+
+
+</script>
+	
+</body>
+
+</html>
\ No newline at end of file
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/7a/10dec5814fb3001d1e75aa5ef0815903 b/.metadata/.plugins/org.eclipse.core.resources/.history/7a/10dec5814fb3001d1e75aa5ef0815903
deleted file mode 100644
index eab4337a..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/7a/10dec5814fb3001d1e75aa5ef0815903
+++ /dev/null
@@ -1,166 +0,0 @@
-package com.shopme.admin.user;
-
-import java.io.IOException;
-import java.util.List;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.domain.Page;
-import org.springframework.data.repository.query.Param;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
-import org.springframework.util.StringUtils;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.ModelAttribute;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.multipart.MultipartFile;
-import org.springframework.web.servlet.mvc.support.RedirectAttributes;
-
-import com.fasterxml.jackson.annotation.ObjectIdGenerators.StringIdGenerator;
-import com.shopme.admin.FileUploadUtil;
-import com.shopme.common.entity.Role;
-import com.shopme.common.entity.User;
-
-@Controller
-public class UserController {
-
-	@Autowired
-	private UserService service;
-
-	@GetMapping("/users")
-	public String listFirstPage(Model model) {
-		return listByPage(1, model, "firstName", "asc", null);
-	}
-
-	@GetMapping("/users/page/{pageNum}")
-	public String listByPage(@PathVariable(name = "pageNum") int pageNum, Model model,
-			@Param("sortField") String sortField, @Param("sortDir") String sortDir,
-			@Param("keyword") String keyword) {
-		
-		System.out.println("sort field: " + sortField);
-		System.out.println("sort order: " + sortDir);
-		
-		Page<User> page = service.listByPage(pageNum, sortField, sortDir, keyword);
-		List<User> listUsers = page.getContent();
-
-		
-		long startCount = (pageNum - 1) * UserService.USERS_PER_PAGE + 1;
-		long endCount = startCount + UserService.USERS_PER_PAGE - 1;
-		if(endCount > page.getTotalElements()) {
-			endCount = page.getTotalElements();
-		}
-		
-		String reverseSortDir = sortDir.equals("asc") ? "desc" : "asc";
-		
-		model.addAttribute("currentPage", pageNum);
-		model.addAttribute("totalPages", page.getTotalPages());
-		model.addAttribute("startCount", startCount);
-		model.addAttribute("endCount", endCount);
-		model.addAttribute("totalItems", page.getTotalElements());
-		model.addAttribute("listUsers", listUsers);
-		model.addAttribute("sortField", sortField);
-		model.addAttribute("sortDir", sortDir);
-		model.addAttribute("reverseSortDir", reverseSortDir);
-		model.addAttribute("keyword", keyword);
-		
-
-		return "users";
-
-	}
-
-	@GetMapping("/users/new")
-	public String newUser(Model model) {
-
-		List<Role> listRoles = service.listRoles();
-
-		User user = new User();
-		user.setEnabled(true);
-
-		model.addAttribute("user", user);
-		model.addAttribute("listRoles", listRoles);
-		model.addAttribute("pageTitle", "Create New User");
-
-		return "user_form";
-
-	}
-
-	// using @RequestParam, we can get the image file input, the input has the
-	// property name="image"
-	@PostMapping("/users/save")
-	public String saveUser(@ModelAttribute("user") User user, RedirectAttributes redirectAttributes,
-			@RequestParam("image") MultipartFile multipartFile) throws IOException {
-
-		if (!multipartFile.isEmpty()) {
-
-			String fileName = StringUtils.cleanPath(multipartFile.getOriginalFilename());
-			user.setPhotos(fileName);
-
-			User savedUser = service.save(user);
-
-			String uploadDir = "user-photos/" + savedUser.getId();
-
-			FileUploadUtil.cleanDir(uploadDir);
-			FileUploadUtil.saveFile(uploadDir, fileName, multipartFile);
-		} else {
-
-			// set photo to null for getPhotosImagePath() method's conditional statement in
-			// User class
-			if (user.getPhotos().isEmpty())
-				user.setPhotos(null);
-			service.save(user);
-		}
-
-		redirectAttributes.addFlashAttribute("message", "the user has been saved successfully");
-
-		// POST/REDIRECT/GET web design
-		return "redirect:/users";
-	}
-
-	@GetMapping("/users/edit/{id}")
-	public String editUser(@PathVariable(name = "id") Integer id, RedirectAttributes redirectAttributes, Model model) {
-		try {
-			User user = service.get(id);
-			List<Role> listRoles = service.listRoles();
-
-			model.addAttribute("user", user);
-			model.addAttribute("pageTitle", "Edit User (ID: " + id + ")");
-			model.addAttribute("listRoles", listRoles);
-
-			return "user_form";
-		} catch (UserNotFoundException ex) {
-			redirectAttributes.addFlashAttribute("message", ex.getMessage());
-
-			return "redirect:/users";
-		}
-
-	}
-
-	@GetMapping("/users/delete/{id}")
-	public String deleteUser(@PathVariable(name = "id") Integer id, RedirectAttributes redirectAttributes,
-			Model model) {
-		try {
-			service.delete(id);
-			redirectAttributes.addFlashAttribute("message", "The user ID " + id + " has been deleted successfully.");
-
-		} catch (UserNotFoundException ex) {
-			redirectAttributes.addFlashAttribute("message", ex.getMessage());
-
-		}
-
-		return "redirect:/users";
-	}
-
-	@GetMapping("/users/{id}/enabled/{status}")
-	public String updateUserEnabledStatus(@PathVariable(name = "id") Integer id,
-			@PathVariable(name = "status") boolean enabled, RedirectAttributes redirectAttributes) {
-
-		service.updateUserEnabledStatus(id, enabled);
-		String status = enabled ? "enabled" : "disabled";
-		String message = "The user id " + id + " has been " + status;
-		redirectAttributes.addFlashAttribute("message", message);
-
-		return "redirect:/users";
-	}
-
-}
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/7a/20c90d6730b4001d1d079a924effdc9e b/.metadata/.plugins/org.eclipse.core.resources/.history/7a/20c90d6730b4001d1d079a924effdc9e
deleted file mode 100644
index 0e9acc08..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/7a/20c90d6730b4001d1d079a924effdc9e
+++ /dev/null
@@ -1,109 +0,0 @@
-<!DOCTYPE html>
-<html xmlns:th="http://www.thymeleaf.org"
-	  xmlns:sec="https://www.thymeleaf.org/thymeleaf-extras-springsecurity5">
-
-<head>
-	<meta http-equiv="Content-Type" content="text/html; charset= UTF-8">
-	<meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0">
-	<title>Home - Shopme Admin</title>
-	
-	<link rel="stylesheet" type="text/css" th:href="@{/fontawesome/all.css}" />
-	<link rel="stylesheet" type="text/css" th:href="@{/style.css}" />
-	<link rel="stylesheet" type="text/css" th:href="@{/webjars/bootstrap/css/bootstrap.min.css}" />
-	
-	<script type="text/javascript" th:src="@{/webjars/jquery/jquery.min.js}"></script>
-	<script type="text/javascript" th:src="@{/webjars/bootstrap/js/bootstrap.min.js}"></script>
-</head>
-
-<body>
-	<div class="container-fluid">
-		<div>
-			<form th:action="@{/logout}" method="post" th:hidden="true" name="logoutForm">
-				<input type="submit"/>
-			</form>
-			<nav class="navbar navbar-expand-lg bg-dark navbar-dark">
-				<a class="navbar-brand" th:href="@{/}">
-					<img th:src="@{/images/ShopmeAdminSmall.png}"/>
-				</a>
-				<!--hamburger toggler for mobile devices(responsive)-->
-				<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#topNavbar">
-					<span class="navbar-toggler-icon"></span>
-				</button>
-				<div class="collapse navbar-collapse" id="topNavbar">
-					<ul class="navbar-nav">
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/users}">Users</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/categories}">Categories</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/brands}">Brands</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/products}">Products</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/customers}">Customers</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/shipping}">Shipping</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/orders}">Orders</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/report}">Sales Report</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/articles}">Articles</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/menus}">Menus</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/settings}">Settings</a>
-						</li>
-						<li>
-							<span class="fas fa-user fa-2x icon-silver"></span>
-						</li>
-						<li class="nav-item dropdown">
-								<!-- principal refers to user; display username -->
-							<a class="nav-link dropdown-toggle" sec:authentication="principal.fullname" data-toggle="dropdown"></a>
-							<div class="dropdown-menu">
-								<a class="dropdown-item" id="logoutLink" href="">Logout</a>
-							</div>
-							
-						</li>
-					</ul>
-				</div>
-				
-			</nav>
-		</div>
-
-		<div>
-			<h1>Shopme Control Panel</h1>
-		</div>
-
-		<div>
-			<p>Shopme Control Panel - Copyright &copy; Shopme</p>
-		</div>
-
-
-	</div>
-	
-<script type="text/javascript">
-
-	$(document).ready(function(){
-		$("#logoutLink").on("click" function(e){
-			e.preventDefault(); /* stop the hyperlink default behaviour  */
-			
-			document.logoutForm.submit();
-		});
-	});
-
-</script>
-
-</body>
-
-</html>
\ No newline at end of file
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/7c/506847b452b4001d1d079a924effdc9e b/.metadata/.plugins/org.eclipse.core.resources/.history/7c/506847b452b4001d1d079a924effdc9e
deleted file mode 100644
index 476e5561..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/7c/506847b452b4001d1d079a924effdc9e
+++ /dev/null
@@ -1,21 +0,0 @@
-$(document).ready(function(){
-		$("#logoutLink").on("click", function(e){
-			e.preventDefault(); /* stop the hyperlink default behaviour  */
-			
-			/* use  the form to  log out and navigate to the url path /logout  
-			
-			 NOTE: spring security requires a POST request form to logout in order to obtain the csrf token, 
-			 		the csrf token is a hidden property in the form
-			*/
-			document.logoutForm.submit();
-		});
-		
-		customizeDropDownMenu();
-	});
-	
-	
-function customizeDropDownMenu() {
-	
-	
-}
-	
\ No newline at end of file
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/7d/005d698c1db4001d128fb79045552177 b/.metadata/.plugins/org.eclipse.core.resources/.history/7d/005d698c1db4001d128fb79045552177
deleted file mode 100644
index 405ed235..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/7d/005d698c1db4001d128fb79045552177
+++ /dev/null
@@ -1,201 +0,0 @@
-package com.shopme.admin.user;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
-import java.util.List;
-
-import org.hibernate.internal.build.AllowSysOut;
-import org.hibernate.query.sqm.mutation.internal.TableKeyExpressionCollector;
-import org.junit.jupiter.api.Test;
-import org.springframework.aot.nativex.NativeConfigurationWriter;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.autoconfigure.jdbc.AutoConfigureTestDatabase;
-import org.springframework.boot.test.autoconfigure.jdbc.AutoConfigureTestDatabase.Replace;
-import org.springframework.boot.test.autoconfigure.orm.jpa.DataJpaTest;
-import org.springframework.boot.test.autoconfigure.orm.jpa.TestEntityManager;
-import org.springframework.data.domain.Page;
-import org.springframework.data.domain.PageRequest;
-import org.springframework.data.domain.Pageable;
-import org.springframework.test.annotation.Rollback;
-
-import com.shopme.common.entity.Role;
-import com.shopme.common.entity.User;
-
-@DataJpaTest(showSql = false)
-//configure to run on real database(MySQL) instead of a test database
-@AutoConfigureTestDatabase(replace = Replace.NONE)
-/*
- * Datajpatest will rollback the transaction after executing the test method
- * everytime, so that the transaction will not be committed. if we want to
- * commit the transaction(aka "save the record"), we can disable rollback by
- * setting it to false. Now, all transactions will be committed
- */
-@Rollback(false)
-public class UserRepositoryTests {
-
-	@Autowired
-	private UserRepository repo;
-
-	@Autowired
-	private TestEntityManager entityManager;
-
-	// On the very first execution of testCreateUser() method; hibernate will create
-	// the users table & users_roles table
-	@Test
-	public void testCreateUserWithOneRole() {
-
-		Role roleAdmin = entityManager.find(Role.class, 1);
-		User userChow = new User("chow@gmail.com", "password", "chow", "seng fung");
-		userChow.addRoles(roleAdmin);
-		User savedUser = repo.save(userChow);
-		assertThat(savedUser.getId()).isGreaterThan(0);
-
-	}
-
-	@Test
-	public void testCreateUserWithTwoRole() {
-
-		User userRavi = new User("ravi@gmail.com", "ravipass", "ravi", "kumar");
-		Role roleEditor = new Role(3);
-		Role roleAssistant = new Role(5);
-
-		userRavi.addRoles(roleEditor);
-		userRavi.addRoles(roleAssistant);
-
-		User savedUser = repo.save(userRavi);
-		assertThat(savedUser.getId()).isGreaterThan(0);
-	}
-
-	@Test
-	public void testListAllUsers() {
-		Iterable<User> listUsers = repo.findAll();
-
-		// use method reference instead of lambda expression here
-		listUsers.forEach(System.out::println);
-
-	}
-
-	@Test
-	public void testGetUserById() {
-
-		User userChow = repo.findById(1).get();
-		System.out.println(userChow);
-		// use method reference instead of lambda expression here
-		assertThat(userChow).isNotNull();
-	}
-
-	@Test
-	public void testUpdateUserDetails() {
-		
-		User userChow = repo.findById(1).get();
-		userChow.setEnabled(true);
-		userChow.setEmail("chow22@gmail.com");
-		
-		repo.save(userChow);
-	}
-	
-	@Test
-	public void testUpdateUserRoles() {
-		
-		User userRavi = repo.findById(4).get();
-		Role roleEditor = new Role(3);
-		Role roleSalesperson= new Role(2);
-		
-		//change role from editor to salesperson
-		
-		/* take note of overriding/implementing the hashcode and equals method in roles
-		 * class. need to override those two methods for remove() to work.
-		 *  The remove() method removes an element "e" such that Objects.equals(o, e),
-		 *  this will invoke the overwritten equals() method in Role Class. 
-		 * */
-		userRavi.getRoles().remove(roleEditor);
-		userRavi.addRoles(roleSalesperson);
-		
-		repo.save(userRavi);
-	}
-	
-	@Test
-	public void testDeleteUser() {
-		
-		Integer userId = 4;
-		repo.deleteById(userId);
-	}
-	
-	
-	@Test
-	public void testGetUserByEmail() {
-		String email = "ravi@gmail.com";
-		User user = repo.getUserByEmail(email);
-		
-		assertThat(user).isNotNull();
-	}
-	
-	/*
-	 * count the number of records in database with a particular id.
-	 * return value should be 1,
-	 * because id is unique.
-	 * 
-	 * use countById() method to test whether a user exists. 
-	 */
-	@Test
-	public void testCountById() {
-		
-		Integer userId = 1;
-		Long countById = repo.countById(userId);
-		
-		assertThat(countById).isNotNull().isGreaterThan(0).isEqualTo(1);
-	}
-	
-	@Test	
-	public void testDisableUser() {
-		Integer userId = 1;
-		
-		repo.updateEnabledStatus(userId, false);
-	}
-
-	@Test	
-	public void testEnableUser() {
-		Integer userId = 1;
-		
-		repo.updateEnabledStatus(userId, true);
-	}
-	
-	@Test
-	public void testListFirstPage() {
-		int pageNumber = 0; // the first page number always start with 0, change pageNumber to 1 to get the second page, 2 for thid page and so forth
-		int pageSize = 4; // no of elements
-		
-		Pageable pageable = PageRequest.of(pageNumber, pageSize);
-		Page<User> page = repo.findAll(pageable);
-		
-		List<User> listUsers = page.getContent();
-		
-		listUsers.forEach(System.out::println);
-		
-		assertThat(listUsers.size()).isEqualTo(pageSize);
-	}
-	
-	
-	@Test 
-	public void testSearchUsers() {
-		
-		String keyword = "bruce";
-		
-		
-		int pageNumber = 0; // the first page number always start with 0, change pageNumber to 1 to get the second page, 2 for thid page and so forth
-		int pageSize = 4; // no of elements
-		
-		Pageable pageable = PageRequest.of(pageNumber, pageSize);
-		Page<User> page = repo.findAll(keyword, pageable);
-		
-		List<User> listUsers = page.getContent();
-		
-		listUsers.forEach(System.out::println);
-		
-		assertThat(listUsers.size()).isGreaterThan(0);
-		
-	}
-	
-	
-}
-
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/7d/10c9e4380bb9001d11addcb4256c67f9 b/.metadata/.plugins/org.eclipse.core.resources/.history/7d/10c9e4380bb9001d11addcb4256c67f9
new file mode 100644
index 00000000..ca3bdf11
--- /dev/null
+++ b/.metadata/.plugins/org.eclipse.core.resources/.history/7d/10c9e4380bb9001d11addcb4256c67f9
@@ -0,0 +1,49 @@
+package com.shopme.admin;
+
+import java.nio.file.Path;
+import java.nio.file.Paths;
+
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
+
+@Configuration
+public class MvcConfig implements WebMvcConfigurer {
+
+	
+	/*
+	 * In short, we can tell Spring MVC to map a given URL (e.g. "/user-photos") 
+	 * to any directory (e.g. D:/ShopmeProject/ShopmeBackend/user-photos) 
+	 * and expose the resources (images, js, css...) in this directory to 
+	 * the web clients (browsers) - that's the primary purpose
+	 *  of using resource handlers in Spring MVC.
+	 * 
+	 * Because the assets are not located in the src/main/resources/static folder
+	 * */
+	
+	@Override
+	public void addResourceHandlers(ResourceHandlerRegistry registry) {
+
+		String dirName = "user-photos";
+		Path userPhotoDir = Paths.get(dirName);
+		String userPhotosPath = userPhotoDir.toFile().getAbsolutePath();
+		
+		// add /** to allow all files under this directory to be available to client
+		registry.addResourceHandler("/" + dirName + "/**")
+		.addResourceLocations("file:/" + userPhotosPath + "/");
+		
+		
+		String categoryImagesDirName = "category-images";
+		Path categoryImagesDir = Paths.get(categoryImagesDirName);
+		String categoryImagesPath = categoryImagesDir.toFile().getAbsolutePath();
+		
+		// add /** to allow all files under this directory to be available to client
+		registry.addResourceHandler("/" + categoryImagesDirName + "/**")
+		.addResourceLocations("file:/" + userPhotosPath + "/");
+		
+	}
+	
+	
+	
+	
+}
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/7d/2008510750b3001d1e75aa5ef0815903 b/.metadata/.plugins/org.eclipse.core.resources/.history/7d/2008510750b3001d1e75aa5ef0815903
deleted file mode 100644
index 18b3cfd0..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/7d/2008510750b3001d1e75aa5ef0815903
+++ /dev/null
@@ -1,172 +0,0 @@
-package com.shopme.admin.user;
-
-import java.io.IOException;
-import java.util.List;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.domain.Page;
-import org.springframework.data.repository.query.Param;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
-import org.springframework.util.StringUtils;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.ModelAttribute;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.multipart.MultipartFile;
-import org.springframework.web.servlet.mvc.support.RedirectAttributes;
-
-import com.fasterxml.jackson.annotation.ObjectIdGenerators.StringIdGenerator;
-import com.shopme.admin.FileUploadUtil;
-import com.shopme.common.entity.Role;
-import com.shopme.common.entity.User;
-
-@Controller
-public class UserController {
-
-	@Autowired
-	private UserService service;
-
-	@GetMapping("/users")
-	public String listFirstPage(Model model) {
-		return listByPage(1, model, "firstName", "asc", null);
-	}
-
-	@GetMapping("/users/page/{pageNum}")
-	public String listByPage(@PathVariable(name = "pageNum") int pageNum, Model model,
-			@Param("sortField") String sortField, @Param("sortDir") String sortDir,
-			@Param("keyword") String keyword) {
-		
-		System.out.println("sort field: " + sortField);
-		System.out.println("sort order: " + sortDir);
-		
-		Page<User> page = service.listByPage(pageNum, sortField, sortDir, keyword);
-		List<User> listUsers = page.getContent();
-
-		
-		long startCount = (pageNum - 1) * UserService.USERS_PER_PAGE + 1;
-		long endCount = startCount + UserService.USERS_PER_PAGE - 1;
-		if(endCount > page.getTotalElements()) {
-			endCount = page.getTotalElements();
-		}
-		
-		String reverseSortDir = sortDir.equals("asc") ? "desc" : "asc";
-		
-		model.addAttribute("currentPage", pageNum);
-		model.addAttribute("totalPages", page.getTotalPages());
-		model.addAttribute("startCount", startCount);
-		model.addAttribute("endCount", endCount);
-		model.addAttribute("totalItems", page.getTotalElements());
-		model.addAttribute("listUsers", listUsers);
-		model.addAttribute("sortField", sortField);
-		model.addAttribute("sortDir", sortDir);
-		model.addAttribute("reverseSortDir", reverseSortDir);
-		model.addAttribute("keyword", keyword);
-		
-
-		return "users";
-
-	}
-
-	@GetMapping("/users/new")
-	public String newUser(Model model) {
-
-		List<Role> listRoles = service.listRoles();
-
-		User user = new User();
-		user.setEnabled(true);
-
-		model.addAttribute("user", user);
-		model.addAttribute("listRoles", listRoles);
-		model.addAttribute("pageTitle", "Create New User");
-
-		return "user_form";
-
-	}
-
-	// using @RequestParam, we can get the image file input, the input has the
-	// property name="image"
-	@PostMapping("/users/save")
-	public String saveUser(@ModelAttribute("user") User user, RedirectAttributes redirectAttributes,
-			@RequestParam("image") MultipartFile multipartFile) throws IOException {
-
-		if (!multipartFile.isEmpty()) {
-
-			String fileName = StringUtils.cleanPath(multipartFile.getOriginalFilename());
-			user.setPhotos(fileName);
-
-			User savedUser = service.save(user);
-
-			String uploadDir = "user-photos/" + savedUser.getId();
-
-			FileUploadUtil.cleanDir(uploadDir);
-			FileUploadUtil.saveFile(uploadDir, fileName, multipartFile);
-		} else {
-
-			// set photo to null for getPhotosImagePath() method's conditional statement in
-			// User class
-			if (user.getPhotos().isEmpty())
-				user.setPhotos(null);
-			service.save(user);
-		}
-
-		redirectAttributes.addFlashAttribute("message", "the user has been saved successfully");
-
-		// POST/REDIRECT/GET web design
-		
-		//after user is saved display the user instead of the entire user list
-		//email is a unique field to identify each user.
-		
-		//get first part of email
-		String firstPartOfEmail = user.getEmail().split("@")[0];
-		return "redirect:/users/page/1?sortField=id&sortDir=asc&keyword=";
-	}
-
-	@GetMapping("/users/edit/{id}")
-	public String editUser(@PathVariable(name = "id") Integer id, RedirectAttributes redirectAttributes, Model model) {
-		try {
-			User user = service.get(id);
-			List<Role> listRoles = service.listRoles();
-
-			model.addAttribute("user", user);
-			model.addAttribute("pageTitle", "Edit User (ID: " + id + ")");
-			model.addAttribute("listRoles", listRoles);
-
-			return "user_form";
-		} catch (UserNotFoundException ex) {
-			redirectAttributes.addFlashAttribute("message", ex.getMessage());
-
-			return "redirect:/users";
-		}
-
-	}
-
-	@GetMapping("/users/delete/{id}")
-	public String deleteUser(@PathVariable(name = "id") Integer id, RedirectAttributes redirectAttributes,
-			Model model) {
-		try {
-			service.delete(id);
-			redirectAttributes.addFlashAttribute("message", "The user ID " + id + " has been deleted successfully.");
-
-		} catch (UserNotFoundException ex) {
-			redirectAttributes.addFlashAttribute("message", ex.getMessage());
-
-		}
-
-		return "redirect:/users";
-	}
-
-	@GetMapping("/users/{id}/enabled/{status}")
-	public String updateUserEnabledStatus(@PathVariable(name = "id") Integer id,
-			@PathVariable(name = "status") boolean enabled, RedirectAttributes redirectAttributes) {
-
-		service.updateUserEnabledStatus(id, enabled);
-		String status = enabled ? "enabled" : "disabled";
-		String message = "The user id " + id + " has been " + status;
-		redirectAttributes.addFlashAttribute("message", message);
-
-		return "redirect:/users";
-	}
-
-}
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/7d/b012c7ec6db3001d19bbb001c1a81c20 b/.metadata/.plugins/org.eclipse.core.resources/.history/7d/b012c7ec6db3001d19bbb001c1a81c20
deleted file mode 100644
index 02baf860..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/7d/b012c7ec6db3001d19bbb001c1a81c20
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.shopme.admin.user;
-
-import java.text.DateFormat;
-import java.text.SimpleDateFormat;
-import java.util.List;
-
-import com.shopme.common.entity.User;
-
-import jakarta.servlet.http.HttpServletResponse;
-
-public class UserCsvExporter {
-
-	public void export(List<User> user, HttpServletResponse response) {
-		
-		DateFormat dateFormatter = new SimpleDateFormat("yyyy-MM-dd_HH-mm-ss");
-		
-	
-	}
-	
-}
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/7e/00e11d2245b4001d1d079a924effdc9e b/.metadata/.plugins/org.eclipse.core.resources/.history/7e/00e11d2245b4001d1d079a924effdc9e
deleted file mode 100644
index 97dce6a5..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/7e/00e11d2245b4001d1d079a924effdc9e
+++ /dev/null
@@ -1,78 +0,0 @@
-<!DOCTYPE html>
-<html xmlns:th="http://www.thymeleaf.org">
-
-<body>
-
-	<div>
-			<!--   
-				use  the form to  log out and navigate to the url path /logout  
-			
-			    NOTE: spring security requires a POST request form to logout in order to obtain the csrf token, 
-			 		the csrf token is a hidden property in the form -->
-			 
-			<form th:action="@{/logout}" method="post" th:hidden="true" name="logoutForm">
-				<input type="submit"/>
-			</form>
-			<nav class="navbar navbar-expand-lg bg-dark navbar-dark">
-				<a class="navbar-brand" th:href="@{/}">
-					<img th:src="@{/images/ShopmeAdminSmall.png}"/>
-				</a>
-				<!--hamburger toggler for mobile devices(responsive)-->
-				<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#topNavbar">
-					<span class="navbar-toggler-icon"></span>
-				</button>
-				<div class="collapse navbar-collapse" id="topNavbar">
-					<ul class="navbar-nav">
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/users}">Users</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/categories}">Categories</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/brands}">Brands</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/products}">Products</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/customers}">Customers</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/shipping}">Shipping</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/orders}">Orders</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/report}">Sales Report</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/articles}">Articles</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/menus}">Menus</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/settings}">Settings</a>
-						</li>
-						<li>
-							<span class="fas fa-user fa-2x icon-silver"></span>
-						</li>
-						<li class="nav-item dropdown">
-								<!-- principal refers to user; display username -->
-							<a class="nav-link dropdown-toggle" sec:authentication="principal.fullname" data-toggle="dropdown"></a>
-							<div class="dropdown-menu">
-								<a class="dropdown-item" id="logoutLink" href="">Logout</a>
-							</div>
-							
-						</li>
-					</ul>
-				</div>
-				
-			</nav>
-		</div>
-	
-	
-</body>
-</html>
\ No newline at end of file
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/7e/50c942418db3001d19bbb001c1a81c20 b/.metadata/.plugins/org.eclipse.core.resources/.history/7e/50c942418db3001d19bbb001c1a81c20
deleted file mode 100644
index 14e7197e..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/7e/50c942418db3001d19bbb001c1a81c20
+++ /dev/null
@@ -1,276 +0,0 @@
-<!DOCTYPE html>
-<html xmlns:th="http://www.thymeleaf.org">
-
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset= UTF-8">
-<meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0">
-<title>Manage Users</title>
-
-<link rel="stylesheet" type="text/css" th:href="@{/webjars/bootstrap/css/bootstrap.min.css}" />
-<link rel="stylesheet" type="text/css" th:href="@{/fontawesome/all.css}" />
-<link rel="stylesheet" type="text/css" th:href="@{/style.css}" />
-	
-<script type="text/javascript" th:src="@{/webjars/jquery/jquery.min.js}"></script>
-<script type="text/javascript" th:src="@{/webjars/bootstrap/js/bootstrap.min.js}"></script>
-</head>
-
-<body>
-	<div class="container-fluid">
-		<div>
-			<nav class="navbar navbar-expand-lg bg-dark navbar-dark">
-				<a class="navbar-brand" th:href="@{/}"> <img
-					th:src="@{/images/ShopmeAdminSmall.png}" />
-				</a>
-				<!--hamburger toggler for mobile devices(responsive)-->
-				<button class="navbar-toggler" type="button" data-toggle="collapse"
-					data-target="#topNavbar">
-					<span class="navbar-toggler-icon"></span>
-				</button>
-				<div class="collapse navbar-collapse" id="topNavbar">
-					<ul class="navbar-nav">
-						<li class="nav-item"><a class="nav-link" th:href="@{/users}">Users</a>
-						</li>
-						<li class="nav-item"><a class="nav-link"
-							th:href="@{/categories}">Categories</a></li>
-						<li class="nav-item"><a class="nav-link" th:href="@{/brands}">Brands</a>
-						</li>
-						<li class="nav-item"><a class="nav-link"
-							th:href="@{/products}">Products</a></li>
-						<li class="nav-item"><a class="nav-link"
-							th:href="@{/customers}">Customers</a></li>
-						<li class="nav-item"><a class="nav-link"
-							th:href="@{/shipping}">Shipping</a></li>
-						<li class="nav-item"><a class="nav-link" th:href="@{/orders}">Orders</a>
-						</li>
-						<li class="nav-item"><a class="nav-link" th:href="@{/report}">Sales
-								Report</a></li>
-						<li class="nav-item"><a class="nav-link"
-							th:href="@{/articles}">Articles</a></li>
-						<li class="nav-item"><a class="nav-link" th:href="@{/menus}">Menus</a>
-						</li>
-						<li class="nav-item"><a class="nav-link"
-							th:href="@{/settings}">Settings</a></li>
-					</ul>
-				</div>
-
-			</nav>
-		</div>
-
-		<div>
-			<h2>Manage Users</h2>
-			<a th:href="@{/users/new}" class="fas fa-user-plus fa-2x icon-dark mr-2"></a>
-			
-			<a th:href="@{/users/export/csv}" class="fas fa-file-csv fa-2x icon-dark mr-2"></a>
-		</div>
-		
-		
-		
-		<!-- only display success message when a new user is created -->
-		<div th:if="${message != null}" class="alert alert-success text-center">
-			[[${message}]]
-		</div>
-			
-		<div>
-			<form th:action="@{/users/page/1}" class="form-inline m-3">
-				
-				<input type="hidden" name="sortField" th:value="${sortField}" />
-				<input type="hidden" name="sortDir" th:value="${sortDir}" />
-				Filter:&nbsp;
-				<input type="search" name="keyword" th:value="${keyword}" class="form-control" required/>
-				&nbsp;&nbsp;
-				<button type="submit" class="btn btn-primary">
-					<i class="fas fa-search"></i>
-				</button>
-				&nbsp;&nbsp;
-				<button type="button" class="btn btn-secondary" onclick="clearFilter()">
-					<i class="fas fa-eraser"></i>
-				</button>
-			</form>
-		
-		</div>
-
-			<!-- css class to display this table in large screens only , refer to static/style.css for more info-->
-			<div class="full-details">
-				<table class="table table-bordered table-striped table-hover table-responsive-xL">
-					<thead class="thead-dark">
-						<tr>
-							<!-- refer to templates/fragments.html for fragment code-->
-							<th th:replace="fragments :: column_link('id', 'User ID')"/>
-							<th>Photos</th>
-							<th th:replace="fragments :: column_link('email', 'Email')"/>
-							<th th:replace="fragments :: column_link('firstName', 'First Name')"/>
-							<th th:replace="fragments :: column_link('lastName', 'Last Name')"/>
-							<th>Roles</th>
-							<th th:replace="fragments :: column_link('enabled', 'Enabled')"/>
-							<th></th>
-						</tr>
-					</thead>
-					<tbody>
-						<tr th:each="user : ${listUsers}">
-							<td>[[${user.id}]]</td>
-							<td>
-								<span th:if="${user.photos == null}" class="fas fa-portrait fa-3x icon-dark"></span>
-								<img th:if="${user.photos != null}" th:src="@{${user.photosImagePath}}"
-								style="width: 100px"/>
-							</td>
-							<td>[[${user.email}]]</td>
-							<td>[[${user.firstName}]]</td>
-							<td>[[${user.lastName}]]</td>
-							<td>[[${user.roles}]]</td>
-							
-							<td>
-								<a th:if="${user.enabled == true}" class="fas fa-check-circle fa-2x icon-green" 
-								th:href="@{'/users/' + ${user.id} + '/enabled/false'}"
-								title="Disable this user"></a>
-								
-								<a th:if="${user.enabled == false}" class="fas fa-circle fa-2x icon-silver"
-								 th:href="@{'/users/' + ${user.id} + '/enabled/true'}"
-								 title="Enable this user"></a>
-							</td>
-							<td>
-									<a class="fas fa-edit fa-2x icon-green" th:href="@{'/users/edit/' + ${user.id}}"
-									title="edit this user"></a>
-									&nbsp; 
-									<a class="fas fa-trash fa-2x icon-dark link-delete" th:href="@{'/users/delete/' + ${user.id}}"
-									title="delete this user" th:userId="${user.id}"></a>
-							</td>
-						</tr>
-					</tbody>
-				</table>
-			</div>
-			
-			
-			<!-- css class to display this <div> on mobile screens only, refer to /static/style.css for more info-->
-			<div class="less-details">
-				
-				<div th:each="user : ${listUsers}" class="row m-1">
-					
-					<div class="col-4">
-						
-						<span th:if="${user.photos == null}" class="fas fa-portrait fa-3x icon-dark"></span>
-								<img th:if="${user.photos != null}" th:src="@{${user.photosImagePath}}"
-								style="width: 100px"/>
-					</div>
-					
-					<div class="col-8">
-						<div>[[${user.fullName}]]</div>
-						<div>[[${user.roles}]]</div>
-						<div>
-							<a th:if="${user.enabled == true}" class="fas fa-check-circle fa-2x icon-green" 
-								th:href="@{'/users/' + ${user.id} + '/enabled/false'}"
-								title="Disable this user"></a>
-								
-							<a th:if="${user.enabled == false}" class="fas fa-circle fa-2x icon-silver"
-								 th:href="@{'/users/' + ${user.id} + '/enabled/true'}"
-								 title="Enable this user"></a>
-						
-									&nbsp;
-							<a class="fas fa-edit fa-2x icon-green" th:href="@{'/users/edit/' + ${user.id}}"
-									title="edit this user"></a>
-									&nbsp; 
-							<a class="fas fa-trash fa-2x icon-dark link-delete" th:href="@{'/users/delete/' + ${user.id}}"
-									title="delete this user" th:userId="${user.id}"></a>
-						</div>
-					</div>
-					<div>&nbsp;</div>
-				</div>
-			</div>
-			
-			
-			<!-- IF -->
-			<div class="text-center m-1" th:if="${totalItems > 0}">
-				<span>Showing Users # [[${startCount}]] to [[${endCount}]] of [[${totalItems}]]</span>
-			</div>
-			
-			<!-- ELSE -->
-			<div class="text-center m-1" th:unless="${totalItems > 0}">
-				<span>No users found</span>
-			</div>
-			
-			<!-- only display pagination when there are users; else, no users no pagination -->
-			<div th:if="${totalPages > 1}">
-				<nav>
-					  <ul class="pagination justify-content-center flex-wrap">
-					  
-					  	<li th:class=" ${currentPage > 1 ? 'page-item' : 'page-item disabled'}">
-					  		<a th:replace="fragments :: page_link(1, 'First')"></a>
-				    	</li>
-					  
-					    <li th:class=" ${currentPage > 1 ? 'page-item' : 'page-item disabled'}">
-					    	<a th:replace="fragments :: page_link(${currentPage - 1 }, 'previous')"></a>
-				    	</li>
-					    	
-					    <!-- org.thymeleaf.expression.Numbers class, An object of this class is usually available in variable evaluation expressions with the name #numbers. -->
-					    <li th:class="${currentPage != i ? 'page-item' : 'page-item active'}" 
-					    	th:each="i : ${#numbers.sequence(1, totalPages)}">
-					    	<a th:replace="fragments :: page_link(${i}, ${i})"></a>
-					    </li>
-					    
-					    <li  th:class=" ${currentPage < totalPages ? 'page-item' : 'page-item disabled'}">
-					    	<a th:replace="fragments :: page_link(${currentPage + 1}, 'Next')"></a>
-					    </li>
-					    
-					    <li th:class=" ${currentPage < totalPages ? 'page-item' : 'page-item disabled'}">
-							<a th:replace="fragments :: page_link(${totalPages}, 'Last')"></a>		
-					    </li>
-					  </ul>
-				</nav>
-			</div>
-			
-			
-			
-			<div class="modal fade text-center" id="confirmModal">
-				<div class="modal-dialog">
-					<div class="modal-content">
-					
-						<div class="modal-header">
-							<h4 class="modal-title">Delete Confirmation</h4>
-							<button type="button" class="close" data-dismiss="modal">&times;</button>
-						</div>
-						
-						<div class="modal-body">
-							<span id="confirmText"></span>
-						</div>
-						
-						<div class="modal-footer">
-							<a class="btn btn-success" href="" id="yesButton">Yes</a>
-							<button type="button" class="btn btn-danger" data-dismiss="modal">Close</button>
-						</div>
-					</div>
-				</div>
-			</div>
-			
-			
-			<div class="text-center">
-				<p>Shopme Control Panel - Copyright &copy; Shopme</p>
-			</div>
-
-
-	</div>
-	
-<script type="text/javascript">
-
-//confirmation modal dialogue for delete user
-$(document).ready(function(){
-	$(".link-delete").on("click", function(e){
-		//stop the <a> tag default behaviour and pop out a confirmation modal dialogue
-		e.preventDefault();
-		//alert($(this).attr("href"));
-		link = $(this);
-		userId = link.attr("userId");
-		$("#yesButton").attr("href", link.attr("href"));
-		$("#confirmText").text("Are you sure you want to delete this user ID " + userId + "?");
-		$("#confirmModal").modal();
-	});
-});
-
-	function clearFilter(){
-		window.location = "[[@{/users}]]";
-	}
-
-
-</script>
-	
-</body>
-
-</html>
\ No newline at end of file
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/7e/c0cfed9b15b4001d128fb79045552177 b/.metadata/.plugins/org.eclipse.core.resources/.history/7e/c0cfed9b15b4001d128fb79045552177
deleted file mode 100644
index f27705a1..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/7e/c0cfed9b15b4001d128fb79045552177
+++ /dev/null
@@ -1,29 +0,0 @@
-package com.shopme.admin.security;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.core.userdetails.UserDetails;
-import org.springframework.security.core.userdetails.UserDetailsService;
-import org.springframework.security.core.userdetails.UsernameNotFoundException;
-
-import com.shopme.admin.user.UserRepository;
-import com.shopme.common.entity.User;
-
-public class ShopmeUserDetailsService implements UserDetailsService {
-
-	
-	@Autowired
-	private UserRepository userRepo;
-	
-	
-	@Override
-	public UserDetails loadUserByUsername(String email) throws UsernameNotFoundException {
-
-		User user = userRepo.getUserByEmail(email);
-		
-		if( user != null) {
-			return new ShopmeUserDetails(user);
-		}
-		return null;
-	}
-
-}
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/7f/30ccc0e405b4001d128fb79045552177 b/.metadata/.plugins/org.eclipse.core.resources/.history/7f/30ccc0e405b4001d128fb79045552177
deleted file mode 100644
index c8eb64a1..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/7f/30ccc0e405b4001d128fb79045552177
+++ /dev/null
@@ -1,26 +0,0 @@
-<!DOCTYPE html>
-<html xmlns:th="http://www.thymeleaf.org">
-
-<head>
-	<meta http-equiv="Content-Type" content="text/html; charset= UTF-8">
-	<meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0">
-	<title>Login - Shopme Admin</title>
-	<link rel="stylesheet" type="text/css" th:href="@{/webjars/bootstrap/css/bootstrap.min.css}" />
-</head>
-
-<body>
-	<div class="container-fluid">
-		
-		<div>
-			<h1>Custom login page</h1>
-		</div>
-
-		<div>
-			<p>Shopme Control Panel - Copyright &copy; Shopme</p>
-		</div>
-
-	</div>
-
-</body>
-
-</html>
\ No newline at end of file
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/8/70f66b968ab3001d19bbb001c1a81c20 b/.metadata/.plugins/org.eclipse.core.resources/.history/8/70f66b968ab3001d19bbb001c1a81c20
deleted file mode 100644
index ce52e493..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/8/70f66b968ab3001d19bbb001c1a81c20
+++ /dev/null
@@ -1,255 +0,0 @@
-<!DOCTYPE html>
-<html xmlns:th="http://www.thymeleaf.org">
-
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset= UTF-8">
-<meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0">
-<title>Manage Users</title>
-
-<link rel="stylesheet" type="text/css" th:href="@{/webjars/bootstrap/css/bootstrap.min.css}" />
-<link rel="stylesheet" type="text/css" th:href="@{/fontawesome/all.css}" />
-<link rel="stylesheet" type="text/css" th:href="@{/style.css}" />
-	
-<script type="text/javascript" th:src="@{/webjars/jquery/jquery.min.js}"></script>
-<script type="text/javascript" th:src="@{/webjars/bootstrap/js/bootstrap.min.js}"></script>
-</head>
-
-<body>
-	<div class="container-fluid">
-		<div>
-			<nav class="navbar navbar-expand-lg bg-dark navbar-dark">
-				<a class="navbar-brand" th:href="@{/}"> <img
-					th:src="@{/images/ShopmeAdminSmall.png}" />
-				</a>
-				<!--hamburger toggler for mobile devices(responsive)-->
-				<button class="navbar-toggler" type="button" data-toggle="collapse"
-					data-target="#topNavbar">
-					<span class="navbar-toggler-icon"></span>
-				</button>
-				<div class="collapse navbar-collapse" id="topNavbar">
-					<ul class="navbar-nav">
-						<li class="nav-item"><a class="nav-link" th:href="@{/users}">Users</a>
-						</li>
-						<li class="nav-item"><a class="nav-link"
-							th:href="@{/categories}">Categories</a></li>
-						<li class="nav-item"><a class="nav-link" th:href="@{/brands}">Brands</a>
-						</li>
-						<li class="nav-item"><a class="nav-link"
-							th:href="@{/products}">Products</a></li>
-						<li class="nav-item"><a class="nav-link"
-							th:href="@{/customers}">Customers</a></li>
-						<li class="nav-item"><a class="nav-link"
-							th:href="@{/shipping}">Shipping</a></li>
-						<li class="nav-item"><a class="nav-link" th:href="@{/orders}">Orders</a>
-						</li>
-						<li class="nav-item"><a class="nav-link" th:href="@{/report}">Sales
-								Report</a></li>
-						<li class="nav-item"><a class="nav-link"
-							th:href="@{/articles}">Articles</a></li>
-						<li class="nav-item"><a class="nav-link" th:href="@{/menus}">Menus</a>
-						</li>
-						<li class="nav-item"><a class="nav-link"
-							th:href="@{/settings}">Settings</a></li>
-					</ul>
-				</div>
-
-			</nav>
-		</div>
-
-		<div>
-			<h2>Manage Users</h2>
-			<a th:href="@{/users/new}" class="fas fa-user-plus fa-2x icon-dark mr-2"></a>
-			
-			<a th:href="@{/users/export/csv}" class="fas fa-file-csv fa-2x icon-dark mr-2"></a>
-		</div>
-		
-		
-		
-		<!-- only display success message when a new user is created -->
-		<div th:if="${message != null}" class="alert alert-success text-center">
-			[[${message}]]
-		</div>
-			
-		<div>
-			<form th:action="@{/users/page/1}" class="form-inline m-3">
-				
-				<input type="hidden" name="sortField" th:value="${sortField}" />
-				<input type="hidden" name="sortDir" th:value="${sortDir}" />
-				Filter:&nbsp;
-				<input type="search" name="keyword" th:value="${keyword}" class="form-control" required/>
-				&nbsp;&nbsp;
-				<button type="submit" class="btn btn-primary">
-					<i class="fas fa-search"></i>
-				</button>
-				&nbsp;&nbsp;
-				<button type="button" class="btn btn-secondary" onclick="clearFilter()">
-					<i class="fas fa-eraser"></i>
-				</button>
-			</form>
-		
-		</div>
-
-
-			<div class="full-details">
-				<table class="table table-bordered table-striped table-hover table-responsive-xL">
-					<thead class="thead-dark">
-						<tr>
-							<!-- refer to templates/fragments.html for fragment code-->
-							<th th:replace="fragments :: column_link('id', 'User ID')"/>
-							<th>Photos</th>
-							<th th:replace="fragments :: column_link('email', 'Email')"/>
-							<th th:replace="fragments :: column_link('firstName', 'First Name')"/>
-							<th th:replace="fragments :: column_link('lastName', 'Last Name')"/>
-							<th>Roles</th>
-							<th th:replace="fragments :: column_link('enabled', 'Enabled')"/>
-							<th></th>
-						</tr>
-					</thead>
-					<tbody>
-						<tr th:each="user : ${listUsers}">
-							<td>[[${user.id}]]</td>
-							<td>
-								<span th:if="${user.photos == null}" class="fas fa-portrait fa-3x icon-dark"></span>
-								<img th:if="${user.photos != null}" th:src="@{${user.photosImagePath}}"
-								style="width: 100px"/>
-							</td>
-							<td>[[${user.email}]]</td>
-							<td>[[${user.firstName}]]</td>
-							<td>[[${user.lastName}]]</td>
-							<td>[[${user.roles}]]</td>
-							
-							<td>
-								<a th:if="${user.enabled == true}" class="fas fa-check-circle fa-2x icon-green" 
-								th:href="@{'/users/' + ${user.id} + '/enabled/false'}"
-								title="Disable this user"></a>
-								
-								<a th:if="${user.enabled == false}" class="fas fa-circle fa-2x icon-silver"
-								 th:href="@{'/users/' + ${user.id} + '/enabled/true'}"
-								 title="Enable this user"></a>
-							</td>
-							<td>
-									<a class="fas fa-edit fa-2x icon-green" th:href="@{'/users/edit/' + ${user.id}}"
-									title="edit this user"></a>
-									&nbsp; 
-									<a class="fas fa-trash fa-2x icon-dark link-delete" th:href="@{'/users/delete/' + ${user.id}}"
-									title="delete this user" th:userId="${user.id}"></a>
-							</td>
-						</tr>
-					</tbody>
-				</table>
-			</div>
-			
-			
-			<!-- display this on mobile screens only -->
-			<div class="less-details">
-				
-				<div th:each="user : ${listUsers}" class="row">
-					
-					<div class="col">
-						
-						<span th:if="${user.photos == null}" class="fas fa-portrait fa-3x icon-dark"></span>
-								<img th:if="${user.photos != null}" th:src="@{${user.photosImagePath}}"
-								style="width: 100px"/>
-					</div>
-						
-				</div>
-			</div>
-			
-			
-			<!-- IF -->
-			<div class="text-center m-1" th:if="${totalItems > 0}">
-				<span>Showing Users # [[${startCount}]] to [[${endCount}]] of [[${totalItems}]]</span>
-			</div>
-			
-			<!-- ELSE -->
-			<div class="text-center m-1" th:unless="${totalItems > 0}">
-				<span>No users found</span>
-			</div>
-			
-			<!-- only display pagination when there are users; else, no users no pagination -->
-			<div th:if="${totalPages > 1}">
-				<nav>
-					  <ul class="pagination justify-content-center">
-					  
-					  	<li th:class=" ${currentPage > 1 ? 'page-item' : 'page-item disabled'}">
-					  		<a th:replace="fragments :: page_link(1, 'First')"></a>
-				    	</li>
-					  
-					    <li th:class=" ${currentPage > 1 ? 'page-item' : 'page-item disabled'}">
-					    	<a th:replace="fragments :: page_link(${currentPage - 1 }, 'previous')"></a>
-				    	</li>
-					    	
-					    <!-- org.thymeleaf.expression.Numbers class, An object of this class is usually available in variable evaluation expressions with the name #numbers. -->
-					    <li th:class="${currentPage != i ? 'page-item' : 'page-item active'}" 
-					    	th:each="i : ${#numbers.sequence(1, totalPages)}">
-					    	<a th:replace="fragments :: page_link(${i}, ${i})"></a>
-					    </li>
-					    
-					    <li  th:class=" ${currentPage < totalPages ? 'page-item' : 'page-item disabled'}">
-					    	<a th:replace="fragments :: page_link(${currentPage + 1}, 'Next')"></a>
-					    </li>
-					    
-					    <li th:class=" ${currentPage < totalPages ? 'page-item' : 'page-item disabled'}">
-							<a th:replace="fragments :: page_link(${totalPages}, 'Last')"></a>		
-					    </li>
-					  </ul>
-				</nav>
-			</div>
-			
-			
-			
-			<div class="modal fade text-center" id="confirmModal">
-				<div class="modal-dialog">
-					<div class="modal-content">
-					
-						<div class="modal-header">
-							<h4 class="modal-title">Delete Confirmation</h4>
-							<button type="button" class="close" data-dismiss="modal">&times;</button>
-						</div>
-						
-						<div class="modal-body">
-							<span id="confirmText"></span>
-						</div>
-						
-						<div class="modal-footer">
-							<a class="btn btn-success" href="" id="yesButton">Yes</a>
-							<button type="button" class="btn btn-danger" data-dismiss="modal">Close</button>
-						</div>
-					</div>
-				</div>
-			</div>
-			
-			
-			<div class="text-center">
-				<p>Shopme Control Panel - Copyright &copy; Shopme</p>
-			</div>
-
-
-	</div>
-	
-<script type="text/javascript">
-
-//confirmation modal dialogue for delete user
-$(document).ready(function(){
-	$(".link-delete").on("click", function(e){
-		//stop the <a> tag default behaviour and pop out a confirmation modal dialogue
-		e.preventDefault();
-		//alert($(this).attr("href"));
-		link = $(this);
-		userId = link.attr("userId");
-		$("#yesButton").attr("href", link.attr("href"));
-		$("#confirmText").text("Are you sure you want to delete this user ID " + userId + "?");
-		$("#confirmModal").modal();
-	});
-});
-
-	function clearFilter(){
-		window.location = "[[@{/users}]]";
-	}
-
-
-</script>
-	
-</body>
-
-</html>
\ No newline at end of file
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/8/b0648b9832b4001d1d079a924effdc9e b/.metadata/.plugins/org.eclipse.core.resources/.history/8/b0648b9832b4001d1d079a924effdc9e
deleted file mode 100644
index fa0f2d2b..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/8/b0648b9832b4001d1d079a924effdc9e
+++ /dev/null
@@ -1,56 +0,0 @@
-<!DOCTYPE html>
-<html xmlns:th="http://www.thymeleaf.org">
-
-<head>
-	<meta http-equiv="Content-Type" content="text/html; charset= UTF-8">
-	<meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0">
-	<title>Login - Shopme Admin</title>
-	<link rel="stylesheet" type="text/css" th:href="@{/webjars/bootstrap/css/bootstrap.min.css}" />
-</head>
-
-<body>
-	<div class="container-fluid text-center">
-		
-		<div>
-			<img th:src="@{/images/ShopmeAdminBig.png}" />
-		</div>
-		
-		<form th:action="@{/login}" method="post" style="max-width:350px; margin: 0 auto">
-			
-			<!--  ?error param will appear at the end of url if there is error with email or password  -->
-			<div th:if="${param.error}">
-				<p class="text-danger">[[${session.SPRING_SECURITY_LAST_EXCEPTION.message}]]</p>
-			</div>
-			
-			<div th:if="${param.logout}">
-				<p class="text-danger">[[${session.SPRING_SECURITY_LAST_EXCEPTION.message}]]</p>
-			</div>
-			
-			
-			<div class="border border-secondary rounded p-3">
-				<p>Access to Shopme Control Panel </p>
-				
-				<p>
-					<input type="email" name="email" class="form-control" placeholder="Email" required />
-				</p>
-				
-				<p>
-					<input type="password" name="password" class="form-control" placeholder="Password" required />
-				</p>
-				
-				<p>
-					<input type="submit" value="Login" class="btn btn-primary" />
-				</p>
-			</div>
-		
-		</form>
-
-		<div>
-			<p>Shopme Control Panel - Copyright &copy; Shopme</p>
-		</div>
-
-	</div>
-
-</body>
-
-</html>
\ No newline at end of file
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/8/d0b8b48963b3001d19bbb001c1a81c20 b/.metadata/.plugins/org.eclipse.core.resources/.history/8/d0b8b48963b3001d19bbb001c1a81c20
deleted file mode 100644
index c4e504ce..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/8/d0b8b48963b3001d19bbb001c1a81c20
+++ /dev/null
@@ -1,176 +0,0 @@
-package com.shopme.admin.user;
-
-import java.io.IOException;
-import java.util.List;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.domain.Page;
-import org.springframework.data.repository.query.Param;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
-import org.springframework.util.StringUtils;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.ModelAttribute;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.multipart.MultipartFile;
-import org.springframework.web.servlet.mvc.support.RedirectAttributes;
-
-import com.fasterxml.jackson.annotation.ObjectIdGenerators.StringIdGenerator;
-import com.shopme.admin.FileUploadUtil;
-import com.shopme.common.entity.Role;
-import com.shopme.common.entity.User;
-
-@Controller
-public class UserController {
-
-	@Autowired
-	private UserService service;
-
-	@GetMapping("/users")
-	public String listFirstPage(Model model) {
-		
-		//NOTE: these are the default values for path variable and URL parameters
-		return listByPage(1, model, "firstName", "asc", null);
-	}
-
-	@GetMapping("/users/page/{pageNum}")
-	public String listByPage(@PathVariable(name = "pageNum") int pageNum, Model model,
-			@Param("sortField") String sortField, @Param("sortDir") String sortDir,
-			@Param("keyword") String keyword) {
-		
-		System.out.println("sort field: " + sortField);
-		System.out.println("sort order: " + sortDir);
-		
-		Page<User> page = service.listByPage(pageNum, sortField, sortDir, keyword);
-		List<User> listUsers = page.getContent();
-
-		
-		long startCount = (pageNum - 1) * UserService.USERS_PER_PAGE + 1;
-		long endCount = startCount + UserService.USERS_PER_PAGE - 1;
-		if(endCount > page.getTotalElements()) {
-			endCount = page.getTotalElements();
-		}
-		
-		String reverseSortDir = sortDir.equals("asc") ? "desc" : "asc";
-		
-		model.addAttribute("currentPage", pageNum);
-		model.addAttribute("totalPages", page.getTotalPages());
-		model.addAttribute("startCount", startCount);
-		model.addAttribute("endCount", endCount);
-		model.addAttribute("totalItems", page.getTotalElements());
-		model.addAttribute("listUsers", listUsers);
-		model.addAttribute("sortField", sortField);
-		model.addAttribute("sortDir", sortDir);
-		model.addAttribute("reverseSortDir", reverseSortDir);
-		model.addAttribute("keyword", keyword);
-		
-
-		return "users";
-
-	}
-
-	@GetMapping("/users/new")
-	public String newUser(Model model) {
-
-		List<Role> listRoles = service.listRoles();
-
-		User user = new User();
-		user.setEnabled(true);
-
-		model.addAttribute("user", user);
-		model.addAttribute("listRoles", listRoles);
-		model.addAttribute("pageTitle", "Create New User");
-
-		return "user_form";
-
-	}
-
-	// using @RequestParam, we can get the image file input, the input has the
-	// property name="image"
-	@PostMapping("/users/save")
-	public String saveUser(@ModelAttribute("user") User user, RedirectAttributes redirectAttributes,
-			@RequestParam("image") MultipartFile multipartFile) throws IOException {
-
-		if (!multipartFile.isEmpty()) {
-
-			String fileName = StringUtils.cleanPath(multipartFile.getOriginalFilename());
-			user.setPhotos(fileName);
-
-			User savedUser = service.save(user);
-
-			String uploadDir = "user-photos/" + savedUser.getId();
-
-			FileUploadUtil.cleanDir(uploadDir);
-			FileUploadUtil.saveFile(uploadDir, fileName, multipartFile);
-		} else {
-
-			// set photo to null for getPhotosImagePath() method's conditional statement in
-			// User class
-			if (user.getPhotos().isEmpty())
-				user.setPhotos(null);
-			service.save(user);
-		}
-
-		redirectAttributes.addFlashAttribute("message", "the user has been saved successfully");
-
-		// POST/REDIRECT/GET web design
-		return getRedirectURLtoAffectedUser(user);
-	}
-
-	private String getRedirectURLtoAffectedUser(User user) {
-		
-		//after user is saved display the user instead of the entire user list
-		//email is a unique field to identify each user.
-		String firstPartOfEmail = user.getEmail().split("@")[0];
-		return "redirect:/users/page/1?sortField=id&sortDir=asc&keyword=" + firstPartOfEmail;
-	}
-
-	@GetMapping("/users/edit/{id}")
-	public String editUser(@PathVariable(name = "id") Integer id, RedirectAttributes redirectAttributes, Model model) {
-		try {
-			User user = service.get(id);
-			List<Role> listRoles = service.listRoles();
-
-			model.addAttribute("user", user);
-			model.addAttribute("pageTitle", "Edit User (ID: " + id + ")");
-			model.addAttribute("listRoles", listRoles);
-
-			return "user_form";
-		} catch (UserNotFoundException ex) {
-			redirectAttributes.addFlashAttribute("message", ex.getMessage());
-
-			return "redirect:/users";
-		}
-
-	}
-
-	@GetMapping("/users/delete/{id}")
-	public String deleteUser(@PathVariable(name = "id") Integer id, RedirectAttributes redirectAttributes,
-			Model model) {
-		try {
-			service.delete(id);
-			redirectAttributes.addFlashAttribute("message", "The user ID " + id + " has been deleted successfully.");
-
-		} catch (UserNotFoundException ex) {
-			redirectAttributes.addFlashAttribute("message", ex.getMessage());
-
-		}
-
-		return "redirect:/users";
-	}
-
-	@GetMapping("/users/{id}/enabled/{status}")
-	public String updateUserEnabledStatus(@PathVariable(name = "id") Integer id,
-			@PathVariable(name = "status") boolean enabled, RedirectAttributes redirectAttributes) {
-
-		service.updateUserEnabledStatus(id, enabled);
-		String status = enabled ? "enabled" : "disabled";
-		String message = "The user id " + id + " has been " + status;
-		redirectAttributes.addFlashAttribute("message", message);
-
-		return "redirect:/users";
-	}
-
-}
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/80/10222fe71eb3001d1e75aa5ef0815903 b/.metadata/.plugins/org.eclipse.core.resources/.history/80/10222fe71eb3001d1e75aa5ef0815903
deleted file mode 100644
index 24488001..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/80/10222fe71eb3001d1e75aa5ef0815903
+++ /dev/null
@@ -1,45 +0,0 @@
-package com.shopme.admin.user;
-
-import org.springframework.data.domain.Page;
-import org.springframework.data.domain.Pageable;
-import org.springframework.data.jpa.repository.Modifying;
-import org.springframework.data.jpa.repository.Query;
-import org.springframework.data.repository.CrudRepository;
-import org.springframework.data.repository.PagingAndSortingRepository;
-import org.springframework.data.repository.query.Param;
-import org.springframework.stereotype.Repository;
-
-import com.shopme.common.entity.User;
-
-@Repository
-public interface UserRepository extends CrudRepository<User, Integer>, PagingAndSortingRepository<User, Integer> {
-
-	/*
-	 * JPQL statement. It should be noted that as compared to native SQL, JPQL does
-	 * not interact with database tables, records, and fields - but with Java
-	 * classes and instances.
-	 * 
-	 * JPA kicks in as the mediator and transpiles JPQL queries to SQL queries for execution.
-	 * 
-	 * If your database can change or varies from development to production, as long as 
-	 * they're both relational - JPQL works wonders and you can 
-	 * write JPQL queries to create generic logic that can be used over and over again.
-	 */
-	@Query("SELECT u FROM User u WHERE u.email = :email")
-	public User getUserByEmail(@Param("email") String email);
-	
-	// countById() declaration follows the JPA specification
-	//to check the existence of a user
-	public Long countById(Integer id);
-	
-	
-	public Page<User> findAll(String keyword, Pageable pageable);
-	
-	
-	
-	//change user enabled status
-	//need @Modifying annotation for update/delete operation
-	@Query("UPDATE User u SET u.enabled = ?2 WHERE u.id = ?1")
-	@Modifying
-	public void updateEnabledStatus(Integer id, boolean enabled);
-}
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/81/20e535847ab3001d19bbb001c1a81c20 b/.metadata/.plugins/org.eclipse.core.resources/.history/81/20e535847ab3001d19bbb001c1a81c20
deleted file mode 100644
index c9a99a93..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/81/20e535847ab3001d19bbb001c1a81c20
+++ /dev/null
@@ -1,37 +0,0 @@
-package com.shopme.admin.user;
-
-import java.io.IOException;
-import java.text.DateFormat;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.List;
-
-import org.supercsv.io.CsvBeanWriter;
-import org.supercsv.io.ICsvBeanWriter;
-import org.supercsv.prefs.CsvPreference;
-
-import com.shopme.common.entity.User;
-
-import jakarta.servlet.http.HttpServletResponse;
-
-public class UserCsvExporter extends AbstractExporter {
-
-	public void export(List<User> listUsers, HttpServletResponse response) throws IOException {
-		
-		
-		
-		ICsvBeanWriter csvWriter = new CsvBeanWriter(response.getWriter(), CsvPreference.STANDARD_PREFERENCE);
-		
-		String[] csvHeader = {"User ID", "E-mail", "First Name", "Last Name", "Roles", "Enabled"};
-		String[] fieldMapping = {"id", "email", "firstName", "lastName", "roles", "enabled"};
-		
-		csvWriter.writeHeader(csvHeader);
-		
-		for (User user : listUsers) {
-			csvWriter.write(user, fieldMapping);
-		}
-		
-		csvWriter.close();
-	}
-	
-}
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/81/30090d538cb3001d19bbb001c1a81c20 b/.metadata/.plugins/org.eclipse.core.resources/.history/81/30090d538cb3001d19bbb001c1a81c20
deleted file mode 100644
index 2d10bd2b..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/81/30090d538cb3001d19bbb001c1a81c20
+++ /dev/null
@@ -1,259 +0,0 @@
-<!DOCTYPE html>
-<html xmlns:th="http://www.thymeleaf.org">
-
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset= UTF-8">
-<meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0">
-<title>Manage Users</title>
-
-<link rel="stylesheet" type="text/css" th:href="@{/webjars/bootstrap/css/bootstrap.min.css}" />
-<link rel="stylesheet" type="text/css" th:href="@{/fontawesome/all.css}" />
-<link rel="stylesheet" type="text/css" th:href="@{/style.css}" />
-	
-<script type="text/javascript" th:src="@{/webjars/jquery/jquery.min.js}"></script>
-<script type="text/javascript" th:src="@{/webjars/bootstrap/js/bootstrap.min.js}"></script>
-</head>
-
-<body>
-	<div class="container-fluid">
-		<div>
-			<nav class="navbar navbar-expand-lg bg-dark navbar-dark">
-				<a class="navbar-brand" th:href="@{/}"> <img
-					th:src="@{/images/ShopmeAdminSmall.png}" />
-				</a>
-				<!--hamburger toggler for mobile devices(responsive)-->
-				<button class="navbar-toggler" type="button" data-toggle="collapse"
-					data-target="#topNavbar">
-					<span class="navbar-toggler-icon"></span>
-				</button>
-				<div class="collapse navbar-collapse" id="topNavbar">
-					<ul class="navbar-nav">
-						<li class="nav-item"><a class="nav-link" th:href="@{/users}">Users</a>
-						</li>
-						<li class="nav-item"><a class="nav-link"
-							th:href="@{/categories}">Categories</a></li>
-						<li class="nav-item"><a class="nav-link" th:href="@{/brands}">Brands</a>
-						</li>
-						<li class="nav-item"><a class="nav-link"
-							th:href="@{/products}">Products</a></li>
-						<li class="nav-item"><a class="nav-link"
-							th:href="@{/customers}">Customers</a></li>
-						<li class="nav-item"><a class="nav-link"
-							th:href="@{/shipping}">Shipping</a></li>
-						<li class="nav-item"><a class="nav-link" th:href="@{/orders}">Orders</a>
-						</li>
-						<li class="nav-item"><a class="nav-link" th:href="@{/report}">Sales
-								Report</a></li>
-						<li class="nav-item"><a class="nav-link"
-							th:href="@{/articles}">Articles</a></li>
-						<li class="nav-item"><a class="nav-link" th:href="@{/menus}">Menus</a>
-						</li>
-						<li class="nav-item"><a class="nav-link"
-							th:href="@{/settings}">Settings</a></li>
-					</ul>
-				</div>
-
-			</nav>
-		</div>
-
-		<div>
-			<h2>Manage Users</h2>
-			<a th:href="@{/users/new}" class="fas fa-user-plus fa-2x icon-dark mr-2"></a>
-			
-			<a th:href="@{/users/export/csv}" class="fas fa-file-csv fa-2x icon-dark mr-2"></a>
-		</div>
-		
-		
-		
-		<!-- only display success message when a new user is created -->
-		<div th:if="${message != null}" class="alert alert-success text-center">
-			[[${message}]]
-		</div>
-			
-		<div>
-			<form th:action="@{/users/page/1}" class="form-inline m-3">
-				
-				<input type="hidden" name="sortField" th:value="${sortField}" />
-				<input type="hidden" name="sortDir" th:value="${sortDir}" />
-				Filter:&nbsp;
-				<input type="search" name="keyword" th:value="${keyword}" class="form-control" required/>
-				&nbsp;&nbsp;
-				<button type="submit" class="btn btn-primary">
-					<i class="fas fa-search"></i>
-				</button>
-				&nbsp;&nbsp;
-				<button type="button" class="btn btn-secondary" onclick="clearFilter()">
-					<i class="fas fa-eraser"></i>
-				</button>
-			</form>
-		
-		</div>
-
-			<!-- css class to display this table in large screens only , refer to static/style.css for more info-->
-			<div class="full-details">
-				<table class="table table-bordered table-striped table-hover table-responsive-xL">
-					<thead class="thead-dark">
-						<tr>
-							<!-- refer to templates/fragments.html for fragment code-->
-							<th th:replace="fragments :: column_link('id', 'User ID')"/>
-							<th>Photos</th>
-							<th th:replace="fragments :: column_link('email', 'Email')"/>
-							<th th:replace="fragments :: column_link('firstName', 'First Name')"/>
-							<th th:replace="fragments :: column_link('lastName', 'Last Name')"/>
-							<th>Roles</th>
-							<th th:replace="fragments :: column_link('enabled', 'Enabled')"/>
-							<th></th>
-						</tr>
-					</thead>
-					<tbody>
-						<tr th:each="user : ${listUsers}">
-							<td>[[${user.id}]]</td>
-							<td>
-								<span th:if="${user.photos == null}" class="fas fa-portrait fa-3x icon-dark"></span>
-								<img th:if="${user.photos != null}" th:src="@{${user.photosImagePath}}"
-								style="width: 100px"/>
-							</td>
-							<td>[[${user.email}]]</td>
-							<td>[[${user.firstName}]]</td>
-							<td>[[${user.lastName}]]</td>
-							<td>[[${user.roles}]]</td>
-							
-							<td>
-								<a th:if="${user.enabled == true}" class="fas fa-check-circle fa-2x icon-green" 
-								th:href="@{'/users/' + ${user.id} + '/enabled/false'}"
-								title="Disable this user"></a>
-								
-								<a th:if="${user.enabled == false}" class="fas fa-circle fa-2x icon-silver"
-								 th:href="@{'/users/' + ${user.id} + '/enabled/true'}"
-								 title="Enable this user"></a>
-							</td>
-							<td>
-									<a class="fas fa-edit fa-2x icon-green" th:href="@{'/users/edit/' + ${user.id}}"
-									title="edit this user"></a>
-									&nbsp; 
-									<a class="fas fa-trash fa-2x icon-dark link-delete" th:href="@{'/users/delete/' + ${user.id}}"
-									title="delete this user" th:userId="${user.id}"></a>
-							</td>
-						</tr>
-					</tbody>
-				</table>
-			</div>
-			
-			
-			<!-- display this on mobile screens only, refer to /static/style.css for more info-->
-			<div class="less-details">
-				
-				<div th:each="user : ${listUsers}" class="row m-1">
-					
-					<div class="col">
-						
-						<span th:if="${user.photos == null}" class="fas fa-portrait fa-3x icon-dark"></span>
-								<img th:if="${user.photos != null}" th:src="@{${user.photosImagePath}}"
-								style="width: 100px"/>
-					</div>
-						<div class="col">
-							<div>[[${user.fullName}]]</div>
-							<div>[[${user.roles}]]</div>
-						</div>
-					<div>&nbsp;</div>
-				</div>
-			</div>
-			
-			
-			<!-- IF -->
-			<div class="text-center m-1" th:if="${totalItems > 0}">
-				<span>Showing Users # [[${startCount}]] to [[${endCount}]] of [[${totalItems}]]</span>
-			</div>
-			
-			<!-- ELSE -->
-			<div class="text-center m-1" th:unless="${totalItems > 0}">
-				<span>No users found</span>
-			</div>
-			
-			<!-- only display pagination when there are users; else, no users no pagination -->
-			<div th:if="${totalPages > 1}">
-				<nav>
-					  <ul class="pagination justify-content-center flex-wrap">
-					  
-					  	<li th:class=" ${currentPage > 1 ? 'page-item' : 'page-item disabled'}">
-					  		<a th:replace="fragments :: page_link(1, 'First')"></a>
-				    	</li>
-					  
-					    <li th:class=" ${currentPage > 1 ? 'page-item' : 'page-item disabled'}">
-					    	<a th:replace="fragments :: page_link(${currentPage - 1 }, 'previous')"></a>
-				    	</li>
-					    	
-					    <!-- org.thymeleaf.expression.Numbers class, An object of this class is usually available in variable evaluation expressions with the name #numbers. -->
-					    <li th:class="${currentPage != i ? 'page-item' : 'page-item active'}" 
-					    	th:each="i : ${#numbers.sequence(1, totalPages)}">
-					    	<a th:replace="fragments :: page_link(${i}, ${i})"></a>
-					    </li>
-					    
-					    <li  th:class=" ${currentPage < totalPages ? 'page-item' : 'page-item disabled'}">
-					    	<a th:replace="fragments :: page_link(${currentPage + 1}, 'Next')"></a>
-					    </li>
-					    
-					    <li th:class=" ${currentPage < totalPages ? 'page-item' : 'page-item disabled'}">
-							<a th:replace="fragments :: page_link(${totalPages}, 'Last')"></a>		
-					    </li>
-					  </ul>
-				</nav>
-			</div>
-			
-			
-			
-			<div class="modal fade text-center" id="confirmModal">
-				<div class="modal-dialog">
-					<div class="modal-content">
-					
-						<div class="modal-header">
-							<h4 class="modal-title">Delete Confirmation</h4>
-							<button type="button" class="close" data-dismiss="modal">&times;</button>
-						</div>
-						
-						<div class="modal-body">
-							<span id="confirmText"></span>
-						</div>
-						
-						<div class="modal-footer">
-							<a class="btn btn-success" href="" id="yesButton">Yes</a>
-							<button type="button" class="btn btn-danger" data-dismiss="modal">Close</button>
-						</div>
-					</div>
-				</div>
-			</div>
-			
-			
-			<div class="text-center">
-				<p>Shopme Control Panel - Copyright &copy; Shopme</p>
-			</div>
-
-
-	</div>
-	
-<script type="text/javascript">
-
-//confirmation modal dialogue for delete user
-$(document).ready(function(){
-	$(".link-delete").on("click", function(e){
-		//stop the <a> tag default behaviour and pop out a confirmation modal dialogue
-		e.preventDefault();
-		//alert($(this).attr("href"));
-		link = $(this);
-		userId = link.attr("userId");
-		$("#yesButton").attr("href", link.attr("href"));
-		$("#confirmText").text("Are you sure you want to delete this user ID " + userId + "?");
-		$("#confirmModal").modal();
-	});
-});
-
-	function clearFilter(){
-		window.location = "[[@{/users}]]";
-	}
-
-
-</script>
-	
-</body>
-
-</html>
\ No newline at end of file
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/81/e029fefe87b3001d19bbb001c1a81c20 b/.metadata/.plugins/org.eclipse.core.resources/.history/81/e029fefe87b3001d19bbb001c1a81c20
deleted file mode 100644
index 1ce84fd6..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/81/e029fefe87b3001d19bbb001c1a81c20
+++ /dev/null
@@ -1,19 +0,0 @@
-*.icon-white{color: white}
-*.icon-silver{color: silver}
-*.icon-green{color: green}
-*.icon-dark{color: gray}
-*.icon-red{color: red}
-
-
-@media screen and (max-width: 768px) {
-	/* small screen */
-}
-
-@media screen and (min-width: 768px) and (max-width: px) {
-	/* small screen */
-}
-
-
-@media screen and (max-width: 768px) {
-	/* small screen */
-}
\ No newline at end of file
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/81/f0e3cb253cb4001d1d079a924effdc9e b/.metadata/.plugins/org.eclipse.core.resources/.history/81/f0e3cb253cb4001d1d079a924effdc9e
deleted file mode 100644
index ac4a18fe..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/81/f0e3cb253cb4001d1d079a924effdc9e
+++ /dev/null
@@ -1,48 +0,0 @@
-<!DOCTYPE html>
-<html xmlns:th="http://www.thymeleaf.org">
-<head>
-<meta charset="ISO-8859-1">
-<title>Insert title here</title>
-</head>
-<body>
-
-		<!-- purpose: make code more succinct and readable 
-		project is easier to maintain
-		
-		use thymeleaf fragments -->
-
-	<!-- if  ${removeTag} == 'tag' then the <th> parent tag will be removed.  if ${removeTag} == 'none' then keep the <th> parent tag-->
-	<th th:fragment="column_link(fieldName, columnLabel, removeTag)" th:remove="${removeTag}">
-		<!-- follow the sort order of another sortField; if the other field is sortDir="asc", then the newly selected column will be sortDir="asc" too -->
-		<a class="text-white"
-		   th:href="@{'/users/page/' + ${currentPage} + '?sortField=' + ${fieldName} + '&sortDir=' + ${sortField != fieldName ? sortDir : reverseSortDir} + ${keyword != null ? '&keyword=' + keyword : ''}}">
-			[[${columnLabel}]]
-		</a>
-		
-		<span th:if="${sortField == fieldName}"
-		th:class="${sortDir == 'asc' ? 'fas fa-sort-up' : 'fas fa-sort-down'}"></span>
-	</th>
-	
-	
-	<a th:fragment="page_link(pageNum, label)"
-	   class="page-link"
-	   th:href= "@{'/users/page/' + ${pageNum} + '?sortField=' + ${sortField} + '&sortDir=' + ${sortDir} + ${keyword != null ? '&keyword=' + keyword : ''}}">[[${label}]]</a>
-	
-	
-	<head>
-	<meta http-equiv="Content-Type" content="text/html; charset= UTF-8">
-	<meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0">
-	<title>Home - Shopme Admin</title>
-	
-	<link rel="stylesheet" type="text/css" th:href="@{/fontawesome/all.css}" />
-	<link rel="stylesheet" type="text/css" th:href="@{/style.css}" />
-	<link rel="stylesheet" type="text/css" th:href="@{/webjars/bootstrap/css/bootstrap.min.css}" />
-	
-	<script type="text/javascript" th:src="@{/webjars/jquery/jquery.min.js}"></script>
-	<script type="text/javascript" th:src="@{/webjars/bootstrap/js/bootstrap.min.js}"></script>
-	</head>
-	
-	
-	
-</body>
-</html>
\ No newline at end of file
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/c8/10df271846b4001d1d079a924effdc9e b/.metadata/.plugins/org.eclipse.core.resources/.history/82/a04758690db9001d11addcb4256c67f9
similarity index 70%
rename from .metadata/.plugins/org.eclipse.core.resources/.history/c8/10df271846b4001d1d079a924effdc9e
rename to .metadata/.plugins/org.eclipse.core.resources/.history/82/a04758690db9001d11addcb4256c67f9
index d5147a2b..c05f24fb 100644
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/c8/10df271846b4001d1d079a924effdc9e
+++ b/.metadata/.plugins/org.eclipse.core.resources/.history/82/a04758690db9001d11addcb4256c67f9
@@ -1,32 +1,30 @@
 <!DOCTYPE html>
 <html xmlns:th="http://www.thymeleaf.org">
 
-<head th:replace="fragments :: page_head('Users - Shopme Admin')"/>
+<head th:replace="fragments :: page_head('Categories - Shopme Admin')"/>
 
 <body>
 	<div class="container-fluid">
 		
+		<!-- navigation bar -->
 		<div th:replace="navigation :: menu"></div>
 
 		<div>
-			<h2>Manage Users</h2>
-			<a th:href="@{/users/new}" class="fas fa-user-plus fa-2x icon-dark mr-2"></a>
+			<h2>Manage Categories</h2>
+			<a th:href="@{/categories/new}" class="fas fa-folder-plus fa-2x icon-dark mr-2"></a>
 			
-			<a th:href="@{/users/export/csv}" class="fas fa-file-csv fa-2x icon-dark mr-2"></a>
+			<a th:href="@{/categories/export/csv}" class="fas fa-file-csv fa-2x icon-dark mr-2"></a>
 		</div>
 		
-		
-		
-		<!-- only display success message when a new user is created -->
+		<!-- redirect message from controller -->
 		<div th:if="${message != null}" class="alert alert-success text-center">
 			[[${message}]]
 		</div>
+		
 			
 		<div>
-			<form th:action="@{/users/page/1}" class="form-inline m-3">
+			<form th:action="@{/categories/page/1}" class="form-inline m-3">
 				
-				<input type="hidden" name="sortField" th:value="${sortField}" />
-				<input type="hidden" name="sortDir" th:value="${sortDir}" />
 				Filter:&nbsp;
 				<input type="search" name="keyword" th:value="${keyword}" class="form-control" required/>
 				&nbsp;&nbsp;
@@ -46,53 +44,27 @@
 				<table class="table table-bordered table-striped table-hover table-responsive-xL">
 					<thead class="thead-dark">
 						<tr>
-							<!-- refer to templates/fragments.html for fragment code-->
-							
-							<th class="hideable-column">
-								<th th:replace="fragments :: column_link('id', 'User ID', 'tag')"/>
-							</th>
-							
-							<th>Photos</th>
-							
-							<th class="hideable-column">
-								<th th:replace="fragments :: column_link('email', 'Email', 'tag')"/>
-							</th>
-							
-							<th th:replace="fragments :: column_link('firstName', 'First Name', 'none')"/>
-							<th th:replace="fragments :: column_link('lastName', 'Last Name', 'none')"/>
-							<th>Roles</th>
-							<th th:replace="fragments :: column_link('enabled', 'Enabled', 'none')"/>
+							<th>ID</th>
+							<th>Category Image</th>
+							<th>Category Name</th>
+							<th>Alias</th>
+							<th>Enabled</th>
 							<th></th>
 						</tr>
 					</thead>
 					<tbody>
-						<tr th:each="user : ${listUsers}">
-							<td class="hideable-column">[[${user.id}]]</td>
-							<td>
-								<span th:if="${user.photos == null}" class="fas fa-portrait fa-3x icon-dark"></span>
-								<img th:if="${user.photos != null}" th:src="@{${user.photosImagePath}}"
-								style="width: 100px"/>
+						<tr th:each="cat : ${listCategories}">
+							<td>[[${cat.id}]]</td>
+							<td>	
+								<img th:src="@{${cat.imagePath}}"  class="image-fluid"/>
 							</td>
-							<td class="hideable-column">[[${user.email}]]</td>
-							<td>[[${user.firstName}]]</td>
-							<td>[[${user.lastName}]]</td>
-							<td>[[${user.roles}]]</td>
-							
+							<td>[[${cat.name}]]</td>
+							<td>[[${cat.alias}]]</td>
 							<td>
-								<a th:if="${user.enabled == true}" class="fas fa-check-circle fa-2x icon-green" 
-								th:href="@{'/users/' + ${user.id} + '/enabled/false'}"
-								title="Disable this user"></a>
-								
-								<a th:if="${user.enabled == false}" class="fas fa-circle fa-2x icon-silver"
-								 th:href="@{'/users/' + ${user.id} + '/enabled/true'}"
-								 title="Enable this user"></a>
+								<div th:replace="fragments :: category_status"></div>
 							</td>
 							<td>
-									<a class="fas fa-edit fa-2x icon-green" th:href="@{'/users/edit/' + ${user.id}}"
-									title="edit this user"></a>
-									&nbsp; 
-									<a class="fas fa-trash fa-2x icon-dark link-delete" th:href="@{'/users/delete/' + ${user.id}}"
-									title="delete this user" th:userId="${user.id}"></a>
+								<div th:replace="fragments :: category_actions"></div>
 							</td>
 						</tr>
 					</tbody>
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/82/f014bb9426b8001d1d97982e354adf88 b/.metadata/.plugins/org.eclipse.core.resources/.history/82/f014bb9426b8001d1d97982e354adf88
deleted file mode 100644
index eefcbe0d..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/82/f014bb9426b8001d1d97982e354adf88
+++ /dev/null
@@ -1,26 +0,0 @@
-package com.shopme.admin.category;
-
-import java.util.List;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import com.shopme.common.entity.Category;
-
-@Service
-public class CategoryService {
-
-	@Autowired
-	private CategoryRepository repo;
-	
-	public List<Category> listAll(){
-		return (List<Category>) repo.findAll();
-	}
-	
-	public List<Category> listCategoriesUsedInForm(){
-		
-		
-		
-		return (List<Category>) repo.findAll();
-	}
-}
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/83/a0defe7a45b4001d1d079a924effdc9e b/.metadata/.plugins/org.eclipse.core.resources/.history/83/a0defe7a45b4001d1d079a924effdc9e
deleted file mode 100644
index 83af8627..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/83/a0defe7a45b4001d1d079a924effdc9e
+++ /dev/null
@@ -1,236 +0,0 @@
-<!DOCTYPE html>
-<html xmlns:th="http://www.thymeleaf.org">
-
-<head th:replace="fragments :: page_head('Users - Shopme Admin')"/>
-
-<body>
-	<div class="container-fluid">
-		
-		<div th:replace="fragments :: menu"></div>
-
-		<div>
-			<h2>Manage Users</h2>
-			<a th:href="@{/users/new}" class="fas fa-user-plus fa-2x icon-dark mr-2"></a>
-			
-			<a th:href="@{/users/export/csv}" class="fas fa-file-csv fa-2x icon-dark mr-2"></a>
-		</div>
-		
-		
-		
-		<!-- only display success message when a new user is created -->
-		<div th:if="${message != null}" class="alert alert-success text-center">
-			[[${message}]]
-		</div>
-			
-		<div>
-			<form th:action="@{/users/page/1}" class="form-inline m-3">
-				
-				<input type="hidden" name="sortField" th:value="${sortField}" />
-				<input type="hidden" name="sortDir" th:value="${sortDir}" />
-				Filter:&nbsp;
-				<input type="search" name="keyword" th:value="${keyword}" class="form-control" required/>
-				&nbsp;&nbsp;
-				<button type="submit" class="btn btn-primary">
-					<i class="fas fa-search"></i>
-				</button>
-				&nbsp;&nbsp;
-				<button type="button" class="btn btn-secondary" onclick="clearFilter()">
-					<i class="fas fa-eraser"></i>
-				</button>
-			</form>
-		
-		</div>
-
-			<!-- css class to display this table in large screens only , refer to static/style.css for more info-->
-			<div class="full-details">
-				<table class="table table-bordered table-striped table-hover table-responsive-xL">
-					<thead class="thead-dark">
-						<tr>
-							<!-- refer to templates/fragments.html for fragment code-->
-							
-							<th class="hideable-column">
-								<th th:replace="fragments :: column_link('id', 'User ID', 'tag')"/>
-							</th>
-							
-							<th>Photos</th>
-							
-							<th class="hideable-column">
-								<th th:replace="fragments :: column_link('email', 'Email', 'tag')"/>
-							</th>
-							
-							<th th:replace="fragments :: column_link('firstName', 'First Name', 'none')"/>
-							<th th:replace="fragments :: column_link('lastName', 'Last Name', 'none')"/>
-							<th>Roles</th>
-							<th th:replace="fragments :: column_link('enabled', 'Enabled', 'none')"/>
-							<th></th>
-						</tr>
-					</thead>
-					<tbody>
-						<tr th:each="user : ${listUsers}">
-							<td class="hideable-column">[[${user.id}]]</td>
-							<td>
-								<span th:if="${user.photos == null}" class="fas fa-portrait fa-3x icon-dark"></span>
-								<img th:if="${user.photos != null}" th:src="@{${user.photosImagePath}}"
-								style="width: 100px"/>
-							</td>
-							<td class="hideable-column">[[${user.email}]]</td>
-							<td>[[${user.firstName}]]</td>
-							<td>[[${user.lastName}]]</td>
-							<td>[[${user.roles}]]</td>
-							
-							<td>
-								<a th:if="${user.enabled == true}" class="fas fa-check-circle fa-2x icon-green" 
-								th:href="@{'/users/' + ${user.id} + '/enabled/false'}"
-								title="Disable this user"></a>
-								
-								<a th:if="${user.enabled == false}" class="fas fa-circle fa-2x icon-silver"
-								 th:href="@{'/users/' + ${user.id} + '/enabled/true'}"
-								 title="Enable this user"></a>
-							</td>
-							<td>
-									<a class="fas fa-edit fa-2x icon-green" th:href="@{'/users/edit/' + ${user.id}}"
-									title="edit this user"></a>
-									&nbsp; 
-									<a class="fas fa-trash fa-2x icon-dark link-delete" th:href="@{'/users/delete/' + ${user.id}}"
-									title="delete this user" th:userId="${user.id}"></a>
-							</td>
-						</tr>
-					</tbody>
-				</table>
-			</div>
-			
-			
-			<!-- css class to display this <div> on mobile screens only, refer to /static/style.css for more info-->
-			<div class="less-details">
-				
-				<div th:each="user : ${listUsers}" class="row m-1">
-					
-					<div class="col-4">
-						
-						<span th:if="${user.photos == null}" class="fas fa-portrait fa-3x icon-dark"></span>
-								<img th:if="${user.photos != null}" th:src="@{${user.photosImagePath}}"
-								style="width: 100px"/>
-					</div>
-					
-					<div class="col-8">
-						<div>[[${user.fullName}]]</div>
-						<div>[[${user.roles}]]</div>
-						<div class="mt-2">
-							<a th:if="${user.enabled == true}" class="fas fa-check-circle fa-2x icon-green" 
-								th:href="@{'/users/' + ${user.id} + '/enabled/false'}"
-								title="Disable this user"></a>
-								
-							<a th:if="${user.enabled == false}" class="fas fa-circle fa-2x icon-silver"
-								 th:href="@{'/users/' + ${user.id} + '/enabled/true'}"
-								 title="Enable this user"></a>
-						
-									&nbsp;
-							<a class="fas fa-edit fa-2x icon-green" th:href="@{'/users/edit/' + ${user.id}}"
-									title="edit this user"></a>
-									&nbsp; 
-							<a class="fas fa-trash fa-2x icon-dark link-delete" th:href="@{'/users/delete/' + ${user.id}}"
-									title="delete this user" th:userId="${user.id}"></a>
-						</div>
-					</div>
-					<div>&nbsp;</div>
-				</div>
-			</div>
-			
-			
-			<!-- IF -->
-			<div class="text-center m-1" th:if="${totalItems > 0}">
-				<span>Showing Users # [[${startCount}]] to [[${endCount}]] of [[${totalItems}]]</span>
-			</div>
-			
-			<!-- ELSE -->
-			<div class="text-center m-1" th:unless="${totalItems > 0}">
-				<span>No users found</span>
-			</div>
-			
-			<!-- only display pagination when there are users; else, no users no pagination -->
-			<div th:if="${totalPages > 1}">
-				<nav>
-					  <ul class="pagination justify-content-center flex-wrap">
-					  
-					  	<li th:class=" ${currentPage > 1 ? 'page-item' : 'page-item disabled'}">
-					  		<a th:replace="fragments :: page_link(1, 'First')"></a>
-				    	</li>
-					  
-					    <li th:class=" ${currentPage > 1 ? 'page-item' : 'page-item disabled'}">
-					    	<a th:replace="fragments :: page_link(${currentPage - 1 }, 'previous')"></a>
-				    	</li>
-					    	
-					    <!-- org.thymeleaf.expression.Numbers class, An object of this class is usually available in variable evaluation expressions with the name #numbers. -->
-					    <li th:class="${currentPage != i ? 'page-item' : 'page-item active'}" 
-					    	th:each="i : ${#numbers.sequence(1, totalPages)}">
-					    	<a th:replace="fragments :: page_link(${i}, ${i})"></a>
-					    </li>
-					    
-					    <li  th:class=" ${currentPage < totalPages ? 'page-item' : 'page-item disabled'}">
-					    	<a th:replace="fragments :: page_link(${currentPage + 1}, 'Next')"></a>
-					    </li>
-					    
-					    <li th:class=" ${currentPage < totalPages ? 'page-item' : 'page-item disabled'}">
-							<a th:replace="fragments :: page_link(${totalPages}, 'Last')"></a>		
-					    </li>
-					  </ul>
-				</nav>
-			</div>
-			
-			
-			
-			<div class="modal fade text-center" id="confirmModal">
-				<div class="modal-dialog">
-					<div class="modal-content">
-					
-						<div class="modal-header">
-							<h4 class="modal-title">Delete Confirmation</h4>
-							<button type="button" class="close" data-dismiss="modal">&times;</button>
-						</div>
-						
-						<div class="modal-body">
-							<span id="confirmText"></span>
-						</div>
-						
-						<div class="modal-footer">
-							<a class="btn btn-success" href="" id="yesButton">Yes</a>
-							<button type="button" class="btn btn-danger" data-dismiss="modal">Close</button>
-						</div>
-					</div>
-				</div>
-			</div>
-			
-			
-			<div class="text-center">
-				<p>Shopme Control Panel - Copyright &copy; Shopme</p>
-			</div>
-
-
-	</div>
-	
-<script type="text/javascript">
-
-//confirmation modal dialogue for delete user
-$(document).ready(function(){
-	$(".link-delete").on("click", function(e){
-		//stop the <a> tag default behaviour and pop out a confirmation modal dialogue
-		e.preventDefault();
-		//alert($(this).attr("href"));
-		link = $(this);
-		userId = link.attr("userId");
-		$("#yesButton").attr("href", link.attr("href"));
-		$("#confirmText").text("Are you sure you want to delete this user ID " + userId + "?");
-		$("#confirmModal").modal();
-	});
-});
-
-	function clearFilter(){
-		window.location = "[[@{/users}]]";
-	}
-
-
-</script>
-	
-</body>
-
-</html>
\ No newline at end of file
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/84/104d26af4db3001d1e75aa5ef0815903 b/.metadata/.plugins/org.eclipse.core.resources/.history/84/104d26af4db3001d1e75aa5ef0815903
deleted file mode 100644
index 391ecaf7..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/84/104d26af4db3001d1e75aa5ef0815903
+++ /dev/null
@@ -1,34 +0,0 @@
-<!DOCTYPE html>
-<html xmlns:th="http://www.thymeleaf.org">
-<head>
-<meta charset="ISO-8859-1">
-<title>Insert title here</title>
-</head>
-<body>
-
-		<!-- purpose: make code more succinct and readable 
-		project is easier to maintain
-		
-		use thymeleaf fragments -->
-
-
-	<th th:fragment="column_link(fieldName, columnLabel)">
-		<!-- follow the sort order of another sortField; if the other field is sortDir="asc", then the newly selected column will be sortDir="asc" too -->
-		<a class="text-white"
-		   th:href="@{'/users/page/' + ${currentPage} + '?sortField=' + ${fieldName} + '&sortDir=' + ${sortField != fieldName ? sortDir : reverseSortDir} + ${keyword != null ? '&keyword=' + keyword : ''}}">
-			[[${columnLabel}]]
-		</a>
-		
-		<span th:if="${sortField == fieldName}"
-		th:class="${sortDir == 'asc' ? 'fas fa-sort-up' : 'fas fa-sort-down'}"></span>
-	</th>
-	
-	
-	<a th:fragment="page_link(pageNum, label)"
-	   class="page-link"
-	   th:href= "@{'/users/page/' + ${pageNum} + '?sortField=' + ${sortField} + '&sortDir=' + ${sortDir} + ${keyword != null ? '&keyword=' + keyword : ''}}"></a>
-	
-	
-	
-</body>
-</html>
\ No newline at end of file
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/84/907fd54243b4001d1d079a924effdc9e b/.metadata/.plugins/org.eclipse.core.resources/.history/84/907fd54243b4001d1d079a924effdc9e
deleted file mode 100644
index 655697f1..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/84/907fd54243b4001d1d079a924effdc9e
+++ /dev/null
@@ -1,110 +0,0 @@
-<!DOCTYPE html>
-<html xmlns:th="http://www.thymeleaf.org"
-	  xmlns:sec="https://www.thymeleaf.org/thymeleaf-extras-springsecurity5">
-
-<head th:replace="fragments :: page_head('Home - Shopme Admin')"   />
-
-<body>
-	<div class="container-fluid">
-		<div>
-			<!--   
-				use  the form to  log out and navigate to the url path /logout  
-			
-			    NOTE: spring security requires a POST request form to logout in order to obtain the csrf token, 
-			 		the csrf token is a hidden property in the form -->
-			 
-			<form th:action="@{/logout}" method="post" th:hidden="true" name="logoutForm">
-				<input type="submit"/>
-			</form>
-			<nav class="navbar navbar-expand-lg bg-dark navbar-dark">
-				<a class="navbar-brand" th:href="@{/}">
-					<img th:src="@{/images/ShopmeAdminSmall.png}"/>
-				</a>
-				<!--hamburger toggler for mobile devices(responsive)-->
-				<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#topNavbar">
-					<span class="navbar-toggler-icon"></span>
-				</button>
-				<div class="collapse navbar-collapse" id="topNavbar">
-					<ul class="navbar-nav">
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/users}">Users</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/categories}">Categories</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/brands}">Brands</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/products}">Products</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/customers}">Customers</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/shipping}">Shipping</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/orders}">Orders</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/report}">Sales Report</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/articles}">Articles</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/menus}">Menus</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/settings}">Settings</a>
-						</li>
-						<li>
-							<span class="fas fa-user fa-2x icon-silver"></span>
-						</li>
-						<li class="nav-item dropdown">
-								<!-- principal refers to user; display username -->
-							<a class="nav-link dropdown-toggle" sec:authentication="principal.fullname" data-toggle="dropdown"></a>
-							<div class="dropdown-menu">
-								<a class="dropdown-item" id="logoutLink" href="">Logout</a>
-							</div>
-							
-						</li>
-					</ul>
-				</div>
-				
-			</nav>
-		</div>
-
-		<div>
-			<h1>Shopme Control Panel</h1>
-		</div>
-
-		<div>
-			<p>Shopme Control Panel - Copyright &copy; Shopme</p>
-		</div>
-
-
-	</div>
-	
-<script type="text/javascript">
-
-	$(document).ready(function(){
-		$("#logoutLink").on("click", function(e){
-			e.preventDefault(); /* stop the hyperlink default behaviour  */
-			
-			
-			/* use  the form to  log out and navigate to the url path /logout  
-			
-			 NOTE: spring security requires a POST request form to logout in order to obtain the csrf token, 
-			 		the csrf token is a hidden property in the form
-			*/
-			document.logoutForm.submit();
-		});
-	});
-
-</script>
-
-</body>
-
-</html>
\ No newline at end of file
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/85/40872ffc8cb3001d19bbb001c1a81c20 b/.metadata/.plugins/org.eclipse.core.resources/.history/85/40872ffc8cb3001d19bbb001c1a81c20
deleted file mode 100644
index a46cbeed..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/85/40872ffc8cb3001d19bbb001c1a81c20
+++ /dev/null
@@ -1,276 +0,0 @@
-<!DOCTYPE html>
-<html xmlns:th="http://www.thymeleaf.org">
-
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset= UTF-8">
-<meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0">
-<title>Manage Users</title>
-
-<link rel="stylesheet" type="text/css" th:href="@{/webjars/bootstrap/css/bootstrap.min.css}" />
-<link rel="stylesheet" type="text/css" th:href="@{/fontawesome/all.css}" />
-<link rel="stylesheet" type="text/css" th:href="@{/style.css}" />
-	
-<script type="text/javascript" th:src="@{/webjars/jquery/jquery.min.js}"></script>
-<script type="text/javascript" th:src="@{/webjars/bootstrap/js/bootstrap.min.js}"></script>
-</head>
-
-<body>
-	<div class="container-fluid">
-		<div>
-			<nav class="navbar navbar-expand-lg bg-dark navbar-dark">
-				<a class="navbar-brand" th:href="@{/}"> <img
-					th:src="@{/images/ShopmeAdminSmall.png}" />
-				</a>
-				<!--hamburger toggler for mobile devices(responsive)-->
-				<button class="navbar-toggler" type="button" data-toggle="collapse"
-					data-target="#topNavbar">
-					<span class="navbar-toggler-icon"></span>
-				</button>
-				<div class="collapse navbar-collapse" id="topNavbar">
-					<ul class="navbar-nav">
-						<li class="nav-item"><a class="nav-link" th:href="@{/users}">Users</a>
-						</li>
-						<li class="nav-item"><a class="nav-link"
-							th:href="@{/categories}">Categories</a></li>
-						<li class="nav-item"><a class="nav-link" th:href="@{/brands}">Brands</a>
-						</li>
-						<li class="nav-item"><a class="nav-link"
-							th:href="@{/products}">Products</a></li>
-						<li class="nav-item"><a class="nav-link"
-							th:href="@{/customers}">Customers</a></li>
-						<li class="nav-item"><a class="nav-link"
-							th:href="@{/shipping}">Shipping</a></li>
-						<li class="nav-item"><a class="nav-link" th:href="@{/orders}">Orders</a>
-						</li>
-						<li class="nav-item"><a class="nav-link" th:href="@{/report}">Sales
-								Report</a></li>
-						<li class="nav-item"><a class="nav-link"
-							th:href="@{/articles}">Articles</a></li>
-						<li class="nav-item"><a class="nav-link" th:href="@{/menus}">Menus</a>
-						</li>
-						<li class="nav-item"><a class="nav-link"
-							th:href="@{/settings}">Settings</a></li>
-					</ul>
-				</div>
-
-			</nav>
-		</div>
-
-		<div>
-			<h2>Manage Users</h2>
-			<a th:href="@{/users/new}" class="fas fa-user-plus fa-2x icon-dark mr-2"></a>
-			
-			<a th:href="@{/users/export/csv}" class="fas fa-file-csv fa-2x icon-dark mr-2"></a>
-		</div>
-		
-		
-		
-		<!-- only display success message when a new user is created -->
-		<div th:if="${message != null}" class="alert alert-success text-center">
-			[[${message}]]
-		</div>
-			
-		<div>
-			<form th:action="@{/users/page/1}" class="form-inline m-3">
-				
-				<input type="hidden" name="sortField" th:value="${sortField}" />
-				<input type="hidden" name="sortDir" th:value="${sortDir}" />
-				Filter:&nbsp;
-				<input type="search" name="keyword" th:value="${keyword}" class="form-control" required/>
-				&nbsp;&nbsp;
-				<button type="submit" class="btn btn-primary">
-					<i class="fas fa-search"></i>
-				</button>
-				&nbsp;&nbsp;
-				<button type="button" class="btn btn-secondary" onclick="clearFilter()">
-					<i class="fas fa-eraser"></i>
-				</button>
-			</form>
-		
-		</div>
-
-			<!-- css class to display this table in large screens only , refer to static/style.css for more info-->
-			<div class="full-details">
-				<table class="table table-bordered table-striped table-hover table-responsive-xL">
-					<thead class="thead-dark">
-						<tr>
-							<!-- refer to templates/fragments.html for fragment code-->
-							<th th:replace="fragments :: column_link('id', 'User ID')"/>
-							<th>Photos</th>
-							<th th:replace="fragments :: column_link('email', 'Email')"/>
-							<th th:replace="fragments :: column_link('firstName', 'First Name')"/>
-							<th th:replace="fragments :: column_link('lastName', 'Last Name')"/>
-							<th>Roles</th>
-							<th th:replace="fragments :: column_link('enabled', 'Enabled')"/>
-							<th></th>
-						</tr>
-					</thead>
-					<tbody>
-						<tr th:each="user : ${listUsers}">
-							<td>[[${user.id}]]</td>
-							<td>
-								<span th:if="${user.photos == null}" class="fas fa-portrait fa-3x icon-dark"></span>
-								<img th:if="${user.photos != null}" th:src="@{${user.photosImagePath}}"
-								style="width: 100px"/>
-							</td>
-							<td>[[${user.email}]]</td>
-							<td>[[${user.firstName}]]</td>
-							<td>[[${user.lastName}]]</td>
-							<td>[[${user.roles}]]</td>
-							
-							<td>
-								<a th:if="${user.enabled == true}" class="fas fa-check-circle fa-2x icon-green" 
-								th:href="@{'/users/' + ${user.id} + '/enabled/false'}"
-								title="Disable this user"></a>
-								
-								<a th:if="${user.enabled == false}" class="fas fa-circle fa-2x icon-silver"
-								 th:href="@{'/users/' + ${user.id} + '/enabled/true'}"
-								 title="Enable this user"></a>
-							</td>
-							<td>
-									<a class="fas fa-edit fa-2x icon-green" th:href="@{'/users/edit/' + ${user.id}}"
-									title="edit this user"></a>
-									&nbsp; 
-									<a class="fas fa-trash fa-2x icon-dark link-delete" th:href="@{'/users/delete/' + ${user.id}}"
-									title="delete this user" th:userId="${user.id}"></a>
-							</td>
-						</tr>
-					</tbody>
-				</table>
-			</div>
-			
-			
-			<!-- css class to display this <div> on mobile screens only, refer to /static/style.css for more info-->
-			<div class="less-details">
-				
-				<div th:each="user : ${listUsers}" class="row m-1">
-					
-					<div class="col-4">
-						
-						<span th:if="${user.photos == null}" class="fas fa-portrait fa-3x icon-dark"></span>
-								<img th:if="${user.photos != null}" th:src="@{${user.photosImagePath}}"
-								style="width: 100px"/>
-					</div>
-					
-					<div class="col-8">
-						<div>[[${user.fullName}]]</div>
-						<div>[[${user.roles}]]</div>
-						<div>
-							<a th:if="${user.enabled == true}" class="fas fa-check-circle fa-2x icon-green" 
-								th:href="@{'/users/' + ${user.id} + '/enabled/false'}"
-								title="Disable this user"></a>
-								
-								<a th:if="${user.enabled == false}" class="fas fa-circle fa-2x icon-silver"
-								 th:href="@{'/users/' + ${user.id} + '/enabled/true'}"
-								 title="Enable this user"></a>
-						
-						
-							<a class="fas fa-edit fa-2x icon-green" th:href="@{'/users/edit/' + ${user.id}}"
-									title="edit this user"></a>
-									&nbsp; 
-									<a class="fas fa-trash fa-2x icon-dark link-delete" th:href="@{'/users/delete/' + ${user.id}}"
-									title="delete this user" th:userId="${user.id}"></a>
-						</div>
-					</div>
-					<div>&nbsp;</div>
-				</div>
-			</div>
-			
-			
-			<!-- IF -->
-			<div class="text-center m-1" th:if="${totalItems > 0}">
-				<span>Showing Users # [[${startCount}]] to [[${endCount}]] of [[${totalItems}]]</span>
-			</div>
-			
-			<!-- ELSE -->
-			<div class="text-center m-1" th:unless="${totalItems > 0}">
-				<span>No users found</span>
-			</div>
-			
-			<!-- only display pagination when there are users; else, no users no pagination -->
-			<div th:if="${totalPages > 1}">
-				<nav>
-					  <ul class="pagination justify-content-center flex-wrap">
-					  
-					  	<li th:class=" ${currentPage > 1 ? 'page-item' : 'page-item disabled'}">
-					  		<a th:replace="fragments :: page_link(1, 'First')"></a>
-				    	</li>
-					  
-					    <li th:class=" ${currentPage > 1 ? 'page-item' : 'page-item disabled'}">
-					    	<a th:replace="fragments :: page_link(${currentPage - 1 }, 'previous')"></a>
-				    	</li>
-					    	
-					    <!-- org.thymeleaf.expression.Numbers class, An object of this class is usually available in variable evaluation expressions with the name #numbers. -->
-					    <li th:class="${currentPage != i ? 'page-item' : 'page-item active'}" 
-					    	th:each="i : ${#numbers.sequence(1, totalPages)}">
-					    	<a th:replace="fragments :: page_link(${i}, ${i})"></a>
-					    </li>
-					    
-					    <li  th:class=" ${currentPage < totalPages ? 'page-item' : 'page-item disabled'}">
-					    	<a th:replace="fragments :: page_link(${currentPage + 1}, 'Next')"></a>
-					    </li>
-					    
-					    <li th:class=" ${currentPage < totalPages ? 'page-item' : 'page-item disabled'}">
-							<a th:replace="fragments :: page_link(${totalPages}, 'Last')"></a>		
-					    </li>
-					  </ul>
-				</nav>
-			</div>
-			
-			
-			
-			<div class="modal fade text-center" id="confirmModal">
-				<div class="modal-dialog">
-					<div class="modal-content">
-					
-						<div class="modal-header">
-							<h4 class="modal-title">Delete Confirmation</h4>
-							<button type="button" class="close" data-dismiss="modal">&times;</button>
-						</div>
-						
-						<div class="modal-body">
-							<span id="confirmText"></span>
-						</div>
-						
-						<div class="modal-footer">
-							<a class="btn btn-success" href="" id="yesButton">Yes</a>
-							<button type="button" class="btn btn-danger" data-dismiss="modal">Close</button>
-						</div>
-					</div>
-				</div>
-			</div>
-			
-			
-			<div class="text-center">
-				<p>Shopme Control Panel - Copyright &copy; Shopme</p>
-			</div>
-
-
-	</div>
-	
-<script type="text/javascript">
-
-//confirmation modal dialogue for delete user
-$(document).ready(function(){
-	$(".link-delete").on("click", function(e){
-		//stop the <a> tag default behaviour and pop out a confirmation modal dialogue
-		e.preventDefault();
-		//alert($(this).attr("href"));
-		link = $(this);
-		userId = link.attr("userId");
-		$("#yesButton").attr("href", link.attr("href"));
-		$("#confirmText").text("Are you sure you want to delete this user ID " + userId + "?");
-		$("#confirmModal").modal();
-	});
-});
-
-	function clearFilter(){
-		window.location = "[[@{/users}]]";
-	}
-
-
-</script>
-	
-</body>
-
-</html>
\ No newline at end of file
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/85/d073f39b30b7001d19ef99be8d31e273 b/.metadata/.plugins/org.eclipse.core.resources/.history/85/d073f39b30b7001d19ef99be8d31e273
deleted file mode 100644
index c05c5d0a..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/85/d073f39b30b7001d19ef99be8d31e273
+++ /dev/null
@@ -1,54 +0,0 @@
-package com.shopme.admin.category;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
-import org.junit.jupiter.api.Test;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.autoconfigure.jdbc.AutoConfigureTestDatabase;
-import org.springframework.boot.test.autoconfigure.jdbc.AutoConfigureTestDatabase.Replace;
-import org.springframework.boot.test.autoconfigure.orm.jpa.DataJpaTest;
-import org.springframework.test.annotation.Rollback;
-
-import com.shopme.common.entity.Category;
-
-/*
- * Unit Test for CategoryRepository
- * 
- * objective:
- * 1. test the methods in repository 
- * 2. populate the database with records
- * 
-*/
-
-@DataJpaTest
-@AutoConfigureTestDatabase(replace = Replace.NONE)
-@Rollback(false)
-public class CategoryRepositoryTests {
-	
-	@Autowired
-	private CategoryRepository repo;
-	
-	@Test
-	public void testCreateRootCategory() {
-//		Category category = new Category("Computers");
-		Category category = new Category("Electronics");
-		Category savedCategory = repo.save(category);
-		
-		assertThat(savedCategory.getId()).isGreaterThan(0);
-		
-	}
-	
-	@Test
-	public void testCreateSubCategory() {
-		
-		// ID for root category "Computer" is 1
-		Category parent = new Category(1);
-		
-		Category subCategory = new Category("Desktops", parent);
-		
-		Category savedCategory = repo.save(subCategory);
-		
-	}
-	
-	
-}
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/87/30b6e61a70b3001d19bbb001c1a81c20 b/.metadata/.plugins/org.eclipse.core.resources/.history/87/30b6e61a70b3001d19bbb001c1a81c20
deleted file mode 100644
index a6d2547b..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/87/30b6e61a70b3001d19bbb001c1a81c20
+++ /dev/null
@@ -1,45 +0,0 @@
-package com.shopme.admin.user;
-
-import java.io.IOException;
-import java.text.DateFormat;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.List;
-
-import org.supercsv.io.CsvBeanWriter;
-import org.supercsv.io.ICsvBeanWriter;
-import org.supercsv.prefs.CsvPreference;
-
-import com.shopme.common.entity.User;
-
-import jakarta.servlet.http.HttpServletResponse;
-
-public class UserCsvExporter {
-
-	public void export(List<User> listUsers, HttpServletResponse response) throws IOException {
-		
-		DateFormat dateFormatter = new SimpleDateFormat("yyyy-MM-dd_HH-mm-ss");
-		String timeStamp = dateFormatter.format(new Date());
-		String fileName = "users_" + timeStamp + ".csv";
-		
-		response.setContentType("text/csv");
-		
-		String headerKey = "Content-Disposition";
-		String headerValue = "attachment; filename=" + fileName;
-		response.setHeader(headerKey, headerValue);	
-		
-		ICsvBeanWriter csvWriter = new CsvBeanWriter(response.getWriter(), CsvPreference.STANDARD_PREFERENCE);
-		
-		String[] csvHeader = {"User ID", "E-mail", "First Name", "Last Name", "Roles", "Enabled"};
-//		String[] fieldMapping = {"id", "email", "firstName", "lastName", "roles", "enabled"};
-		
-		csvWriter.writeHeader(csvHeader);
-		
-//		for (User user : listUsers) {
-//			csvWriter.write(user, fieldMapping);
-//		}
-		
-		csvWriter.close();
-	}
-	
-}
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/87/803456f817b4001d128fb79045552177 b/.metadata/.plugins/org.eclipse.core.resources/.history/87/803456f817b4001d128fb79045552177
deleted file mode 100644
index 37a50410..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/87/803456f817b4001d128fb79045552177
+++ /dev/null
@@ -1,62 +0,0 @@
-package com.shopme.admin.security;
-
-import org.aspectj.weaver.ast.And;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.security.config.annotation.web.builders.HttpSecurity;
-import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
-import org.springframework.security.config.annotation.web.configuration.WebSecurityConfiguration;
-import org.springframework.security.config.annotation.web.configuration.WebSecurityCustomizer;
-import org.springframework.security.core.userdetails.UserDetailsService;
-import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
-import org.springframework.security.crypto.password.PasswordEncoder;
-import org.springframework.security.web.SecurityFilterChain;
-
-@Configuration
-@EnableWebSecurity
-public class WebSecurityConfig {
-
-	/*
-	 * refer to this link: https://www.codejava.net/frameworks/spring-boot/fix-
-	 * websecurityconfigureradapter-deprecated
-	 * 
-	 */
-	
-	
-	
-	@Bean
-	public UserDetailsService  UserDetailsService()	{
-		return new ShopmeUserDetailsService();
-	}
-	
-
-	@Bean
-	public PasswordEncoder PasswordEncoder() {
-		return new BCryptPasswordEncoder();
-	}
-
-	@Bean
-	public SecurityFilterChain filterChain(HttpSecurity http) throws Exception {
-
-		// any request need to be authenticated (require login)
-		// custom login page at "/login" - handler method in MainController class
-		http.authorizeHttpRequests()
-			.anyRequest().authenticated()
-			.and()
-			.formLogin()
-				.loginPage("/login")
-				.usernameParameter("email")
-				.permitAll();
-
-		return http.build();
-	}
-
-	//NOTE: antMatchers() changed to requestMatchers()
-	//stack: https://stackoverflow.com/questions/74907533/the-method-antmatchersstring-is-undefined-for-the-type
-	@Bean
-	public WebSecurityCustomizer webSecurityCustomizer() {
-		//permit access to the assets in the following directories
-		return (web) -> web.ignoring().requestMatchers("/images/**", "/js/**", "/webjars/**");
-	}
-
-}
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/88/702044d746b4001d1d079a924effdc9e b/.metadata/.plugins/org.eclipse.core.resources/.history/89/8084aaecc4b9001d10d0f9513979f945
similarity index 76%
rename from .metadata/.plugins/org.eclipse.core.resources/.history/88/702044d746b4001d1d079a924effdc9e
rename to .metadata/.plugins/org.eclipse.core.resources/.history/89/8084aaecc4b9001d10d0f9513979f945
index b809a7c4..963c580c 100644
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/88/702044d746b4001d1d079a924effdc9e
+++ b/.metadata/.plugins/org.eclipse.core.resources/.history/89/8084aaecc4b9001d10d0f9513979f945
@@ -12,6 +12,7 @@
 	
 	<script type="text/javascript" th:src="@{/webjars/jquery/jquery.min.js}"></script>
 	<script type="text/javascript" th:src="@{/webjars/bootstrap/js/bootstrap.min.js}"></script>
+	<script type="text/javascript" th:src="@{/js/common.js}"></script>
 </head>
 
 <body>
@@ -45,5 +46,27 @@
 	   th:href= "@{'/users/page/' + ${pageNum} + '?sortField=' + ${sortField} + '&sortDir=' + ${sortDir} + ${keyword != null ? '&keyword=' + keyword : ''}}">[[${label}]]</a>
 	
 	
+	<div th:fragment="category_status">
+	
+		  <!--  <a  href="" class="fas fa-check-circle fa-2x icon-green" 
+				
+				title="Disable this category"></a> -->
+								
+								
+			<a href="" class="fas fa-circle fa-2x icon-silver"
+				
+				title="Enable this category"></a> 
+	</div>	
+	
+	<div th:fragment="category_actions(id)">	
+					
+			<a href="" class="fas fa-edit fa-2x icon-green" 
+					title="edit this category"></a>
+					&nbsp; 
+			<a href="" class="fas fa-trash fa-2x icon-dark link-delete" 
+					title="delete this category"></a>	 		
+	</div>	
+	
+	
 </body>
 </html>
\ No newline at end of file
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/8b/10ad72ea0ab4001d128fb79045552177 b/.metadata/.plugins/org.eclipse.core.resources/.history/8b/10ad72ea0ab4001d128fb79045552177
deleted file mode 100644
index c0dd229d..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/8b/10ad72ea0ab4001d128fb79045552177
+++ /dev/null
@@ -1,46 +0,0 @@
-<!DOCTYPE html>
-<html xmlns:th="http://www.thymeleaf.org">
-
-<head>
-	<meta http-equiv="Content-Type" content="text/html; charset= UTF-8">
-	<meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0">
-	<title>Login - Shopme Admin</title>
-	<link rel="stylesheet" type="text/css" th:href="@{/webjars/bootstrap/css/bootstrap.min.css}" />
-</head>
-
-<body>
-	<div class="container-fluid text-center">
-		
-		<div>
-			<img th:src="@{/images/ShopmeAdminBig.png}" />
-		</div>
-		
-		<form th:action="@{/login}" method="post" style="max-width:350px; margin: 0 auto">
-		
-			<div class="border border-secondary rounded p-3">
-				<p>Access to Shopme Control Panel </p>
-				
-				<p>
-					<input type="email" name="email" class="form-control" placeholder="Email" required />
-				</p>
-				
-				<p>
-					<input type="password" name="password" class="form-control" placeholder="Password" required />
-				</p>
-				
-				<p>
-					<input type="submit" value="Login" class="form-control" placeholder="Password" required />
-				</p>
-			</div>
-		
-		</form>
-
-		<div>
-			<p>Shopme Control Panel - Copyright &copy; Shopme</p>
-		</div>
-
-	</div>
-
-</body>
-
-</html>
\ No newline at end of file
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/8d/405a2b7314b4001d128fb79045552177 b/.metadata/.plugins/org.eclipse.core.resources/.history/8d/405a2b7314b4001d128fb79045552177
deleted file mode 100644
index 9615a63a..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/8d/405a2b7314b4001d128fb79045552177
+++ /dev/null
@@ -1,78 +0,0 @@
-package com.shopme.admin.security;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-import java.util.Set;
-
-import org.springframework.security.core.GrantedAuthority;
-import org.springframework.security.core.authority.SimpleGrantedAuthority;
-import org.springframework.security.core.userdetails.UserDetails;
-
-import com.shopme.common.entity.Role;
-import com.shopme.common.entity.User;
-
-/*
- *  Think of it as a wrapper class for  Type User
- *  
- *  ShopmeUserDetailsService will use this class
- * 
- * */
-public class ShopmeUserDetails implements UserDetails {
-
-	private User user;
-
-	public ShopmeUserDetails(User user) {
-		this.user = user;
-	}
-
-	/* get a list of assigned roles to user */
-	@Override
-	public Collection<? extends GrantedAuthority> getAuthorities() {
-
-		Set<Role> roles = user.getRoles();
-
-		List<SimpleGrantedAuthority> authorities = new ArrayList<>();
-
-		for (Role role : roles) {
-			authorities.add(new SimpleGrantedAuthority(role.getName()));
-		}
-
-		return authorities;
-	}
-
-	@Override
-	public String getPassword() {
-		return user.getPassword();
-	}
-
-	@Override
-	public String getUsername() {
-		return user.getEmail();
-	}
-
-	// "true" means account not expired
-	@Override
-	public boolean isAccountNonExpired() {
-		return true;
-	}
-
-	@Override
-	public boolean isAccountNonLocked() {
-		// TODO Auto-generated method stub
-		return true;
-	}
-
-	@Override
-	public boolean isCredentialsNonExpired() {
-		// TODO Auto-generated method stub
-		return true;
-	}
-
-	@Override
-	public boolean isEnabled() {
-		// TODO Auto-generated method stub
-		return user.isEnabled();
-	}
-
-}
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/8d/f07d881529b8001d1d97982e354adf88 b/.metadata/.plugins/org.eclipse.core.resources/.history/8d/f07d881529b8001d1d97982e354adf88
deleted file mode 100644
index 8a20817c..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/8d/f07d881529b8001d1d97982e354adf88
+++ /dev/null
@@ -1,24 +0,0 @@
-package com.shopme.admin.category;
-
-import java.util.List;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import com.shopme.common.entity.Category;
-
-@Service
-public class CategoryService {
-
-	@Autowired
-	private CategoryRepository repo;
-	
-	public List<Category> listAll(){
-		return (List<Category>) repo.findAll();
-	}
-	
-	public List<Category> listCategoriesUsedInForm(){
-		
-		return (List<Category>) repo.findAll();
-	}
-}
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/8e/607be6510cb4001d128fb79045552177 b/.metadata/.plugins/org.eclipse.core.resources/.history/8e/607be6510cb4001d128fb79045552177
deleted file mode 100644
index e69de29b..00000000
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/8e/807173e642b4001d1d079a924effdc9e b/.metadata/.plugins/org.eclipse.core.resources/.history/8e/807173e642b4001d1d079a924effdc9e
deleted file mode 100644
index 46a050bd..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/8e/807173e642b4001d1d079a924effdc9e
+++ /dev/null
@@ -1,43 +0,0 @@
-<!DOCTYPE html>
-<html xmlns:th="http://www.thymeleaf.org">
-
-<head th:fragment="page_head">
-	<meta http-equiv="Content-Type" content="text/html; charset= UTF-8">
-	<meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0">
-	<title>Home - Shopme Admin</title>
-	
-	<link rel="stylesheet" type="text/css" th:href="@{/fontawesome/all.css}" />
-	<link rel="stylesheet" type="text/css" th:href="@{/style.css}" />
-	<link rel="stylesheet" type="text/css" th:href="@{/webjars/bootstrap/css/bootstrap.min.css}" />
-	
-	<script type="text/javascript" th:src="@{/webjars/jquery/jquery.min.js}"></script>
-	<script type="text/javascript" th:src="@{/webjars/bootstrap/js/bootstrap.min.js}"></script>
-</head>
-
-<body>
-
-		<!-- purpose: make code more succinct and readable 
-		project is easier to maintain
-		
-		use thymeleaf fragments -->
-
-	<!-- if  ${removeTag} == 'tag' then the <th> parent tag will be removed.  if ${removeTag} == 'none' then keep the <th> parent tag-->
-	<th th:fragment="column_link(fieldName, columnLabel, removeTag)" th:remove="${removeTag}">
-		<!-- follow the sort order of another sortField; if the other field is sortDir="asc", then the newly selected column will be sortDir="asc" too -->
-		<a class="text-white"
-		   th:href="@{'/users/page/' + ${currentPage} + '?sortField=' + ${fieldName} + '&sortDir=' + ${sortField != fieldName ? sortDir : reverseSortDir} + ${keyword != null ? '&keyword=' + keyword : ''}}">
-			[[${columnLabel}]]
-		</a>
-		
-		<span th:if="${sortField == fieldName}"
-		th:class="${sortDir == 'asc' ? 'fas fa-sort-up' : 'fas fa-sort-down'}"></span>
-	</th>
-	
-	
-	<a th:fragment="page_link(pageNum, label)"
-	   class="page-link"
-	   th:href= "@{'/users/page/' + ${pageNum} + '?sortField=' + ${sortField} + '&sortDir=' + ${sortDir} + ${keyword != null ? '&keyword=' + keyword : ''}}">[[${label}]]</a>
-	
-	
-</body>
-</html>
\ No newline at end of file
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/8e/a0b2ca7131b4001d1d079a924effdc9e b/.metadata/.plugins/org.eclipse.core.resources/.history/8e/a0b2ca7131b4001d1d079a924effdc9e
deleted file mode 100644
index 9d962edd..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/8e/a0b2ca7131b4001d1d079a924effdc9e
+++ /dev/null
@@ -1,119 +0,0 @@
-<!DOCTYPE html>
-<html xmlns:th="http://www.thymeleaf.org"
-	  xmlns:sec="https://www.thymeleaf.org/thymeleaf-extras-springsecurity5">
-
-<head>
-	<meta http-equiv="Content-Type" content="text/html; charset= UTF-8">
-	<meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0">
-	<title>Home - Shopme Admin</title>
-	
-	<link rel="stylesheet" type="text/css" th:href="@{/fontawesome/all.css}" />
-	<link rel="stylesheet" type="text/css" th:href="@{/style.css}" />
-	<link rel="stylesheet" type="text/css" th:href="@{/webjars/bootstrap/css/bootstrap.min.css}" />
-	
-	<script type="text/javascript" th:src="@{/webjars/jquery/jquery.min.js}"></script>
-	<script type="text/javascript" th:src="@{/webjars/bootstrap/js/bootstrap.min.js}"></script>
-</head>
-
-<body>
-	<div class="container-fluid">
-		<div>
-			<!--   
-				use  the form to  log out and navigate to the url path /logout  
-			
-			    NOTE: spring security requires a POST request form to logout in order to obtain the csrf token, 
-			 		the csrf token is a hidden property in the form -->
-			 
-			<form th:action="@{/logout}" method="post" th:hidden="true" name="logoutForm">
-				<input type="submit"/>
-			</form>
-			<nav class="navbar navbar-expand-lg bg-dark navbar-dark">
-				<a class="navbar-brand" th:href="@{/}">
-					<img th:src="@{/images/ShopmeAdminSmall.png}"/>
-				</a>
-				<!--hamburger toggler for mobile devices(responsive)-->
-				<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#topNavbar">
-					<span class="navbar-toggler-icon"></span>
-				</button>
-				<div class="collapse navbar-collapse" id="topNavbar">
-					<ul class="navbar-nav">
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/users}">Users</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/categories}">Categories</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/brands}">Brands</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/products}">Products</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/customers}">Customers</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/shipping}">Shipping</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/orders}">Orders</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/report}">Sales Report</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/articles}">Articles</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/menus}">Menus</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/settings}">Settings</a>
-						</li>
-						<li>
-							<span class="fas fa-user fa-2x icon-silver"></span>
-						</li>
-						<li class="nav-item dropdown">
-								<!-- principal refers to user; display username -->
-							<a class="nav-link dropdown-toggle" sec:authentication="principal.fullname" data-toggle="dropdown"></a>
-							<div class="dropdown-menu">
-								<a class="dropdown-item" id="logoutLink" href="">Logout</a>
-							</div>
-							
-						</li>
-					</ul>
-				</div>
-				
-			</nav>
-		</div>
-
-		<div>
-			<h1>Shopme Control Panel</h1>
-		</div>
-
-		<div>
-			<p>Shopme Control Panel - Copyright &copy; Shopme</p>
-		</div>
-
-
-	</div>
-	
-<script type="text/javascript">
-
-	$(document).ready(function(){
-		$("#logoutLink").on("click" function(e){
-			e.preventDefault(); /* stop the hyperlink default behaviour  */
-			/* use  the form to  log out and navigate to the url path /logout  
-			
-			 NOTE: spring security requires a POST request form to logout in order to obtain the csrf token, 
-			 		the csrf token is a hidden property in the form
-			*/
-			document.logoutForm.submit();
-		});
-	});
-
-</script>
-
-</body>
-
-</html>
\ No newline at end of file
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/8f/20c53fc544b4001d1d079a924effdc9e b/.metadata/.plugins/org.eclipse.core.resources/.history/8f/20c53fc544b4001d1d079a924effdc9e
deleted file mode 100644
index fb1c9477..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/8f/20c53fc544b4001d1d079a924effdc9e
+++ /dev/null
@@ -1,273 +0,0 @@
-<!DOCTYPE html>
-<html xmlns:th="http://www.thymeleaf.org">
-
-<head th:replace="fragments :: page_head('Users - Shopme Admin')"/>
-
-<body>
-	<div class="container-fluid">
-		<div>
-			<nav class="navbar navbar-expand-lg bg-dark navbar-dark">
-				<a class="navbar-brand" th:href="@{/}"> <img
-					th:src="@{/images/ShopmeAdminSmall.png}" />
-				</a>
-				<!--hamburger toggler for mobile devices(responsive)-->
-				<button class="navbar-toggler" type="button" data-toggle="collapse"
-					data-target="#topNavbar">
-					<span class="navbar-toggler-icon"></span>
-				</button>
-				<div class="collapse navbar-collapse" id="topNavbar">
-					<ul class="navbar-nav">
-						<li class="nav-item"><a class="nav-link" th:href="@{/users}">Users</a>
-						</li>
-						<li class="nav-item"><a class="nav-link"
-							th:href="@{/categories}">Categories</a></li>
-						<li class="nav-item"><a class="nav-link" th:href="@{/brands}">Brands</a>
-						</li>
-						<li class="nav-item"><a class="nav-link"
-							th:href="@{/products}">Products</a></li>
-						<li class="nav-item"><a class="nav-link"
-							th:href="@{/customers}">Customers</a></li>
-						<li class="nav-item"><a class="nav-link"
-							th:href="@{/shipping}">Shipping</a></li>
-						<li class="nav-item"><a class="nav-link" th:href="@{/orders}">Orders</a>
-						</li>
-						<li class="nav-item"><a class="nav-link" th:href="@{/report}">Sales
-								Report</a></li>
-						<li class="nav-item"><a class="nav-link"
-							th:href="@{/articles}">Articles</a></li>
-						<li class="nav-item"><a class="nav-link" th:href="@{/menus}">Menus</a>
-						</li>
-						<li class="nav-item"><a class="nav-link"
-							th:href="@{/settings}">Settings</a></li>
-					</ul>
-				</div>
-
-			</nav>
-		</div>
-
-		<div>
-			<h2>Manage Users</h2>
-			<a th:href="@{/users/new}" class="fas fa-user-plus fa-2x icon-dark mr-2"></a>
-			
-			<a th:href="@{/users/export/csv}" class="fas fa-file-csv fa-2x icon-dark mr-2"></a>
-		</div>
-		
-		
-		
-		<!-- only display success message when a new user is created -->
-		<div th:if="${message != null}" class="alert alert-success text-center">
-			[[${message}]]
-		</div>
-			
-		<div>
-			<form th:action="@{/users/page/1}" class="form-inline m-3">
-				
-				<input type="hidden" name="sortField" th:value="${sortField}" />
-				<input type="hidden" name="sortDir" th:value="${sortDir}" />
-				Filter:&nbsp;
-				<input type="search" name="keyword" th:value="${keyword}" class="form-control" required/>
-				&nbsp;&nbsp;
-				<button type="submit" class="btn btn-primary">
-					<i class="fas fa-search"></i>
-				</button>
-				&nbsp;&nbsp;
-				<button type="button" class="btn btn-secondary" onclick="clearFilter()">
-					<i class="fas fa-eraser"></i>
-				</button>
-			</form>
-		
-		</div>
-
-			<!-- css class to display this table in large screens only , refer to static/style.css for more info-->
-			<div class="full-details">
-				<table class="table table-bordered table-striped table-hover table-responsive-xL">
-					<thead class="thead-dark">
-						<tr>
-							<!-- refer to templates/fragments.html for fragment code-->
-							
-							<th class="hideable-column">
-								<th th:replace="fragments :: column_link('id', 'User ID', 'tag')"/>
-							</th>
-							
-							<th>Photos</th>
-							
-							<th class="hideable-column">
-								<th th:replace="fragments :: column_link('email', 'Email', 'tag')"/>
-							</th>
-							
-							<th th:replace="fragments :: column_link('firstName', 'First Name', 'none')"/>
-							<th th:replace="fragments :: column_link('lastName', 'Last Name', 'none')"/>
-							<th>Roles</th>
-							<th th:replace="fragments :: column_link('enabled', 'Enabled', 'none')"/>
-							<th></th>
-						</tr>
-					</thead>
-					<tbody>
-						<tr th:each="user : ${listUsers}">
-							<td class="hideable-column">[[${user.id}]]</td>
-							<td>
-								<span th:if="${user.photos == null}" class="fas fa-portrait fa-3x icon-dark"></span>
-								<img th:if="${user.photos != null}" th:src="@{${user.photosImagePath}}"
-								style="width: 100px"/>
-							</td>
-							<td class="hideable-column">[[${user.email}]]</td>
-							<td>[[${user.firstName}]]</td>
-							<td>[[${user.lastName}]]</td>
-							<td>[[${user.roles}]]</td>
-							
-							<td>
-								<a th:if="${user.enabled == true}" class="fas fa-check-circle fa-2x icon-green" 
-								th:href="@{'/users/' + ${user.id} + '/enabled/false'}"
-								title="Disable this user"></a>
-								
-								<a th:if="${user.enabled == false}" class="fas fa-circle fa-2x icon-silver"
-								 th:href="@{'/users/' + ${user.id} + '/enabled/true'}"
-								 title="Enable this user"></a>
-							</td>
-							<td>
-									<a class="fas fa-edit fa-2x icon-green" th:href="@{'/users/edit/' + ${user.id}}"
-									title="edit this user"></a>
-									&nbsp; 
-									<a class="fas fa-trash fa-2x icon-dark link-delete" th:href="@{'/users/delete/' + ${user.id}}"
-									title="delete this user" th:userId="${user.id}"></a>
-							</td>
-						</tr>
-					</tbody>
-				</table>
-			</div>
-			
-			
-			<!-- css class to display this <div> on mobile screens only, refer to /static/style.css for more info-->
-			<div class="less-details">
-				
-				<div th:each="user : ${listUsers}" class="row m-1">
-					
-					<div class="col-4">
-						
-						<span th:if="${user.photos == null}" class="fas fa-portrait fa-3x icon-dark"></span>
-								<img th:if="${user.photos != null}" th:src="@{${user.photosImagePath}}"
-								style="width: 100px"/>
-					</div>
-					
-					<div class="col-8">
-						<div>[[${user.fullName}]]</div>
-						<div>[[${user.roles}]]</div>
-						<div class="mt-2">
-							<a th:if="${user.enabled == true}" class="fas fa-check-circle fa-2x icon-green" 
-								th:href="@{'/users/' + ${user.id} + '/enabled/false'}"
-								title="Disable this user"></a>
-								
-							<a th:if="${user.enabled == false}" class="fas fa-circle fa-2x icon-silver"
-								 th:href="@{'/users/' + ${user.id} + '/enabled/true'}"
-								 title="Enable this user"></a>
-						
-									&nbsp;
-							<a class="fas fa-edit fa-2x icon-green" th:href="@{'/users/edit/' + ${user.id}}"
-									title="edit this user"></a>
-									&nbsp; 
-							<a class="fas fa-trash fa-2x icon-dark link-delete" th:href="@{'/users/delete/' + ${user.id}}"
-									title="delete this user" th:userId="${user.id}"></a>
-						</div>
-					</div>
-					<div>&nbsp;</div>
-				</div>
-			</div>
-			
-			
-			<!-- IF -->
-			<div class="text-center m-1" th:if="${totalItems > 0}">
-				<span>Showing Users # [[${startCount}]] to [[${endCount}]] of [[${totalItems}]]</span>
-			</div>
-			
-			<!-- ELSE -->
-			<div class="text-center m-1" th:unless="${totalItems > 0}">
-				<span>No users found</span>
-			</div>
-			
-			<!-- only display pagination when there are users; else, no users no pagination -->
-			<div th:if="${totalPages > 1}">
-				<nav>
-					  <ul class="pagination justify-content-center flex-wrap">
-					  
-					  	<li th:class=" ${currentPage > 1 ? 'page-item' : 'page-item disabled'}">
-					  		<a th:replace="fragments :: page_link(1, 'First')"></a>
-				    	</li>
-					  
-					    <li th:class=" ${currentPage > 1 ? 'page-item' : 'page-item disabled'}">
-					    	<a th:replace="fragments :: page_link(${currentPage - 1 }, 'previous')"></a>
-				    	</li>
-					    	
-					    <!-- org.thymeleaf.expression.Numbers class, An object of this class is usually available in variable evaluation expressions with the name #numbers. -->
-					    <li th:class="${currentPage != i ? 'page-item' : 'page-item active'}" 
-					    	th:each="i : ${#numbers.sequence(1, totalPages)}">
-					    	<a th:replace="fragments :: page_link(${i}, ${i})"></a>
-					    </li>
-					    
-					    <li  th:class=" ${currentPage < totalPages ? 'page-item' : 'page-item disabled'}">
-					    	<a th:replace="fragments :: page_link(${currentPage + 1}, 'Next')"></a>
-					    </li>
-					    
-					    <li th:class=" ${currentPage < totalPages ? 'page-item' : 'page-item disabled'}">
-							<a th:replace="fragments :: page_link(${totalPages}, 'Last')"></a>		
-					    </li>
-					  </ul>
-				</nav>
-			</div>
-			
-			
-			
-			<div class="modal fade text-center" id="confirmModal">
-				<div class="modal-dialog">
-					<div class="modal-content">
-					
-						<div class="modal-header">
-							<h4 class="modal-title">Delete Confirmation</h4>
-							<button type="button" class="close" data-dismiss="modal">&times;</button>
-						</div>
-						
-						<div class="modal-body">
-							<span id="confirmText"></span>
-						</div>
-						
-						<div class="modal-footer">
-							<a class="btn btn-success" href="" id="yesButton">Yes</a>
-							<button type="button" class="btn btn-danger" data-dismiss="modal">Close</button>
-						</div>
-					</div>
-				</div>
-			</div>
-			
-			
-			<div class="text-center">
-				<p>Shopme Control Panel - Copyright &copy; Shopme</p>
-			</div>
-
-
-	</div>
-	
-<script type="text/javascript">
-
-//confirmation modal dialogue for delete user
-$(document).ready(function(){
-	$(".link-delete").on("click", function(e){
-		//stop the <a> tag default behaviour and pop out a confirmation modal dialogue
-		e.preventDefault();
-		//alert($(this).attr("href"));
-		link = $(this);
-		userId = link.attr("userId");
-		$("#yesButton").attr("href", link.attr("href"));
-		$("#confirmText").text("Are you sure you want to delete this user ID " + userId + "?");
-		$("#confirmModal").modal();
-	});
-});
-
-	function clearFilter(){
-		window.location = "[[@{/users}]]";
-	}
-
-
-</script>
-	
-</body>
-
-</html>
\ No newline at end of file
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/8f/30b7300706b4001d128fb79045552177 b/.metadata/.plugins/org.eclipse.core.resources/.history/8f/30b7300706b4001d128fb79045552177
deleted file mode 100644
index 3937d2de..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/8f/30b7300706b4001d128fb79045552177
+++ /dev/null
@@ -1,26 +0,0 @@
-<!DOCTYPE html>
-<html xmlns:th="http://www.thymeleaf.org">
-
-<head>
-	<meta http-equiv="Content-Type" content="text/html; charset= UTF-8">
-	<meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0">
-	<title>Login - Shopme Admin</title>
-	<link rel="stylesheet" type="text/css" th:href="@{/webjars/bootstrap/css/bootstrap.min.css}" />
-</head>
-
-<body>
-	<div class="container-fluid">
-		
-		<div>
-			<img th:src="@{}" />
-		</div>
-
-		<div>
-			<p>Shopme Control Panel - Copyright &copy; Shopme</p>
-		</div>
-
-	</div>
-
-</body>
-
-</html>
\ No newline at end of file
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/8f/c00291c731b4001d1d079a924effdc9e b/.metadata/.plugins/org.eclipse.core.resources/.history/8f/c00291c731b4001d1d079a924effdc9e
deleted file mode 100644
index b6aee643..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/8f/c00291c731b4001d1d079a924effdc9e
+++ /dev/null
@@ -1,78 +0,0 @@
-package com.shopme.admin.security;
-
-import org.aspectj.weaver.ast.And;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.security.authentication.dao.DaoAuthenticationProvider;
-import org.springframework.security.config.annotation.web.builders.HttpSecurity;
-import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
-import org.springframework.security.config.annotation.web.configuration.WebSecurityConfiguration;
-import org.springframework.security.config.annotation.web.configuration.WebSecurityCustomizer;
-import org.springframework.security.core.userdetails.UserDetailsService;
-import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
-import org.springframework.security.crypto.password.PasswordEncoder;
-import org.springframework.security.web.SecurityFilterChain;
-
-@Configuration
-@EnableWebSecurity
-public class WebSecurityConfig {
-
-	/*
-	 * refer to this link: https://www.codejava.net/frameworks/spring-boot/fix-
-	 * websecurityconfigureradapter-deprecated
-	 * 
-	 */
-	
-	
-	 /* This bean will be called by spring security when performing authentication*/ 
-	@Bean
-	public UserDetailsService  userDetailsService()	{
-		return new ShopmeUserDetailsService();
-	}
-	
-
-	@Bean
-	public PasswordEncoder passwordEncoder() {
-		return new BCryptPasswordEncoder();
-	}
-
-	
-	@Bean
-	public DaoAuthenticationProvider authenticationProvider() {
-	    DaoAuthenticationProvider authProvider = new DaoAuthenticationProvider();
-	     
-	    authProvider.setUserDetailsService(userDetailsService());
-	    authProvider.setPasswordEncoder(passwordEncoder());
-	 
-	    return authProvider;
-	}
-	
-	
-	@Bean
-	public SecurityFilterChain filterChain(HttpSecurity http) throws Exception {
-
-		// any request need to be authenticated (require login)
-		// custom login page at "/login" - handler method in MainController class
-		http.authorizeHttpRequests()
-			.anyRequest().authenticated()
-			.and()
-			.formLogin()
-				.loginPage("/login")
-				.usernameParameter("email")
-				.permitAll();
-		
-		http.authenticationProvider(authenticationProvider());
-		
-		
-		return http.build();
-	}
-
-	//NOTE: antMatchers() changed to requestMatchers()
-	//stack: https://stackoverflow.com/questions/74907533/the-method-antmatchersstring-is-undefined-for-the-type
-	@Bean
-	public WebSecurityCustomizer webSecurityCustomizer() {
-		//permit access to the assets in the following directories
-		return (web) -> web.ignoring().requestMatchers("/images/**", "/js/**", "/webjars/**");
-	}
-
-}
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/8f/f02059fa89b3001d19bbb001c1a81c20 b/.metadata/.plugins/org.eclipse.core.resources/.history/8f/f02059fa89b3001d19bbb001c1a81c20
deleted file mode 100644
index 81fd3378..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/8f/f02059fa89b3001d19bbb001c1a81c20
+++ /dev/null
@@ -1,244 +0,0 @@
-<!DOCTYPE html>
-<html xmlns:th="http://www.thymeleaf.org">
-
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset= UTF-8">
-<meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0">
-<title>Manage Users</title>
-
-<link rel="stylesheet" type="text/css" th:href="@{/webjars/bootstrap/css/bootstrap.min.css}" />
-<link rel="stylesheet" type="text/css" th:href="@{/fontawesome/all.css}" />
-<link rel="stylesheet" type="text/css" th:href="@{/style.css}" />
-	
-<script type="text/javascript" th:src="@{/webjars/jquery/jquery.min.js}"></script>
-<script type="text/javascript" th:src="@{/webjars/bootstrap/js/bootstrap.min.js}"></script>
-</head>
-
-<body>
-	<div class="container-fluid">
-		<div>
-			<nav class="navbar navbar-expand-lg bg-dark navbar-dark">
-				<a class="navbar-brand" th:href="@{/}"> <img
-					th:src="@{/images/ShopmeAdminSmall.png}" />
-				</a>
-				<!--hamburger toggler for mobile devices(responsive)-->
-				<button class="navbar-toggler" type="button" data-toggle="collapse"
-					data-target="#topNavbar">
-					<span class="navbar-toggler-icon"></span>
-				</button>
-				<div class="collapse navbar-collapse" id="topNavbar">
-					<ul class="navbar-nav">
-						<li class="nav-item"><a class="nav-link" th:href="@{/users}">Users</a>
-						</li>
-						<li class="nav-item"><a class="nav-link"
-							th:href="@{/categories}">Categories</a></li>
-						<li class="nav-item"><a class="nav-link" th:href="@{/brands}">Brands</a>
-						</li>
-						<li class="nav-item"><a class="nav-link"
-							th:href="@{/products}">Products</a></li>
-						<li class="nav-item"><a class="nav-link"
-							th:href="@{/customers}">Customers</a></li>
-						<li class="nav-item"><a class="nav-link"
-							th:href="@{/shipping}">Shipping</a></li>
-						<li class="nav-item"><a class="nav-link" th:href="@{/orders}">Orders</a>
-						</li>
-						<li class="nav-item"><a class="nav-link" th:href="@{/report}">Sales
-								Report</a></li>
-						<li class="nav-item"><a class="nav-link"
-							th:href="@{/articles}">Articles</a></li>
-						<li class="nav-item"><a class="nav-link" th:href="@{/menus}">Menus</a>
-						</li>
-						<li class="nav-item"><a class="nav-link"
-							th:href="@{/settings}">Settings</a></li>
-					</ul>
-				</div>
-
-			</nav>
-		</div>
-
-		<div>
-			<h2>Manage Users</h2>
-			<a th:href="@{/users/new}" class="fas fa-user-plus fa-2x icon-dark mr-2"></a>
-			
-			<a th:href="@{/users/export/csv}" class="fas fa-file-csv fa-2x icon-dark mr-2"></a>
-		</div>
-		
-		
-		
-		<!-- only display success message when a new user is created -->
-		<div th:if="${message != null}" class="alert alert-success text-center">
-			[[${message}]]
-		</div>
-			
-		<div>
-			<form th:action="@{/users/page/1}" class="form-inline m-3">
-				
-				<input type="hidden" name="sortField" th:value="${sortField}" />
-				<input type="hidden" name="sortDir" th:value="${sortDir}" />
-				Filter:&nbsp;
-				<input type="search" name="keyword" th:value="${keyword}" class="form-control" required/>
-				&nbsp;&nbsp;
-				<button type="submit" class="btn btn-primary">
-					<i class="fas fa-search"></i>
-				</button>
-				&nbsp;&nbsp;
-				<button type="button" class="btn btn-secondary" onclick="clearFilter()">
-					<i class="fas fa-eraser"></i>
-				</button>
-			</form>
-		
-		</div>
-
-
-			<div class="full-details">
-				<table class="table table-bordered table-striped table-hover table-responsive-xL">
-					<thead class="thead-dark">
-						<tr>
-							<!-- refer to templates/fragments.html for fragment code-->
-							<th th:replace="fragments :: column_link('id', 'User ID')"/>
-							<th>Photos</th>
-							<th th:replace="fragments :: column_link('email', 'Email')"/>
-							<th th:replace="fragments :: column_link('firstName', 'First Name')"/>
-							<th th:replace="fragments :: column_link('lastName', 'Last Name')"/>
-							<th>Roles</th>
-							<th th:replace="fragments :: column_link('enabled', 'Enabled')"/>
-							<th></th>
-						</tr>
-					</thead>
-					<tbody>
-						<tr th:each="user : ${listUsers}">
-							<td>[[${user.id}]]</td>
-							<td>
-								<span th:if="${user.photos == null}" class="fas fa-portrait fa-3x icon-dark"></span>
-								<img th:if="${user.photos != null}" th:src="@{${user.photosImagePath}}"
-								style="width: 100px"/>
-							</td>
-							<td>[[${user.email}]]</td>
-							<td>[[${user.firstName}]]</td>
-							<td>[[${user.lastName}]]</td>
-							<td>[[${user.roles}]]</td>
-							
-							<td>
-								<a th:if="${user.enabled == true}" class="fas fa-check-circle fa-2x icon-green" 
-								th:href="@{'/users/' + ${user.id} + '/enabled/false'}"
-								title="Disable this user"></a>
-								
-								<a th:if="${user.enabled == false}" class="fas fa-circle fa-2x icon-silver"
-								 th:href="@{'/users/' + ${user.id} + '/enabled/true'}"
-								 title="Enable this user"></a>
-							</td>
-							<td>
-									<a class="fas fa-edit fa-2x icon-green" th:href="@{'/users/edit/' + ${user.id}}"
-									title="edit this user"></a>
-									&nbsp; 
-									<a class="fas fa-trash fa-2x icon-dark link-delete" th:href="@{'/users/delete/' + ${user.id}}"
-									title="delete this user" th:userId="${user.id}"></a>
-							</td>
-						</tr>
-					</tbody>
-				</table>
-			</div>
-			
-			
-			<div class="less-details">
-				<h2>Showing user list on small screen</h2>
-			</div>
-			
-			
-			<!-- IF -->
-			<div class="text-center m-1" th:if="${totalItems > 0}">
-				<span>Showing Users # [[${startCount}]] to [[${endCount}]] of [[${totalItems}]]</span>
-			</div>
-			
-			<!-- ELSE -->
-			<div class="text-center m-1" th:unless="${totalItems > 0}">
-				<span>No users found</span>
-			</div>
-			
-			<!-- only display pagination when there are users; else, no users no pagination -->
-			<div th:if="${totalPages > 1}">
-				<nav>
-					  <ul class="pagination justify-content-center">
-					  
-					  	<li th:class=" ${currentPage > 1 ? 'page-item' : 'page-item disabled'}">
-					  		<a th:replace="fragments :: page_link(1, 'First')"></a>
-				    	</li>
-					  
-					    <li th:class=" ${currentPage > 1 ? 'page-item' : 'page-item disabled'}">
-					    	<a th:replace="fragments :: page_link(${currentPage - 1 }, 'previous')"></a>
-				    	</li>
-					    	
-					    <!-- org.thymeleaf.expression.Numbers class, An object of this class is usually available in variable evaluation expressions with the name #numbers. -->
-					    <li th:class="${currentPage != i ? 'page-item' : 'page-item active'}" 
-					    	th:each="i : ${#numbers.sequence(1, totalPages)}">
-					    	<a th:replace="fragments :: page_link(${i}, ${i})"></a>
-					    </li>
-					    
-					    <li  th:class=" ${currentPage < totalPages ? 'page-item' : 'page-item disabled'}">
-					    	<a th:replace="fragments :: page_link(${currentPage + 1}, 'Next')"></a>
-					    </li>
-					    
-					    <li th:class=" ${currentPage < totalPages ? 'page-item' : 'page-item disabled'}">
-							<a th:replace="fragments :: page_link(${totalPages}, 'Last')"></a>		
-					    </li>
-					  </ul>
-				</nav>
-			</div>
-			
-			
-			
-			<div class="modal fade text-center" id="confirmModal">
-				<div class="modal-dialog">
-					<div class="modal-content">
-					
-						<div class="modal-header">
-							<h4 class="modal-title">Delete Confirmation</h4>
-							<button type="button" class="close" data-dismiss="modal">&times;</button>
-						</div>
-						
-						<div class="modal-body">
-							<span id="confirmText"></span>
-						</div>
-						
-						<div class="modal-footer">
-							<a class="btn btn-success" href="" id="yesButton">Yes</a>
-							<button type="button" class="btn btn-danger" data-dismiss="modal">Close</button>
-						</div>
-					</div>
-				</div>
-			</div>
-			
-			
-			<div class="text-center">
-				<p>Shopme Control Panel - Copyright &copy; Shopme</p>
-			</div>
-
-
-	</div>
-	
-<script type="text/javascript">
-
-//confirmation modal dialogue for delete user
-$(document).ready(function(){
-	$(".link-delete").on("click", function(e){
-		//stop the <a> tag default behaviour and pop out a confirmation modal dialogue
-		e.preventDefault();
-		//alert($(this).attr("href"));
-		link = $(this);
-		userId = link.attr("userId");
-		$("#yesButton").attr("href", link.attr("href"));
-		$("#confirmText").text("Are you sure you want to delete this user ID " + userId + "?");
-		$("#confirmModal").modal();
-	});
-});
-
-	function clearFilter(){
-		window.location = "[[@{/users}]]";
-	}
-
-
-</script>
-	
-</body>
-
-</html>
\ No newline at end of file
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/9/20d367bd43b4001d1d079a924effdc9e b/.metadata/.plugins/org.eclipse.core.resources/.history/9/20d367bd43b4001d1d079a924effdc9e
deleted file mode 100644
index a9ed860a..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/9/20d367bd43b4001d1d079a924effdc9e
+++ /dev/null
@@ -1,273 +0,0 @@
-<!DOCTYPE html>
-<html xmlns:th="http://www.thymeleaf.org">
-
-<head th:replace="fragments :: page_head('Home - Shopme Admin')"/>
-
-<body>
-	<div class="container-fluid">
-		<div>
-			<nav class="navbar navbar-expand-lg bg-dark navbar-dark">
-				<a class="navbar-brand" th:href="@{/}"> <img
-					th:src="@{/images/ShopmeAdminSmall.png}" />
-				</a>
-				<!--hamburger toggler for mobile devices(responsive)-->
-				<button class="navbar-toggler" type="button" data-toggle="collapse"
-					data-target="#topNavbar">
-					<span class="navbar-toggler-icon"></span>
-				</button>
-				<div class="collapse navbar-collapse" id="topNavbar">
-					<ul class="navbar-nav">
-						<li class="nav-item"><a class="nav-link" th:href="@{/users}">Users</a>
-						</li>
-						<li class="nav-item"><a class="nav-link"
-							th:href="@{/categories}">Categories</a></li>
-						<li class="nav-item"><a class="nav-link" th:href="@{/brands}">Brands</a>
-						</li>
-						<li class="nav-item"><a class="nav-link"
-							th:href="@{/products}">Products</a></li>
-						<li class="nav-item"><a class="nav-link"
-							th:href="@{/customers}">Customers</a></li>
-						<li class="nav-item"><a class="nav-link"
-							th:href="@{/shipping}">Shipping</a></li>
-						<li class="nav-item"><a class="nav-link" th:href="@{/orders}">Orders</a>
-						</li>
-						<li class="nav-item"><a class="nav-link" th:href="@{/report}">Sales
-								Report</a></li>
-						<li class="nav-item"><a class="nav-link"
-							th:href="@{/articles}">Articles</a></li>
-						<li class="nav-item"><a class="nav-link" th:href="@{/menus}">Menus</a>
-						</li>
-						<li class="nav-item"><a class="nav-link"
-							th:href="@{/settings}">Settings</a></li>
-					</ul>
-				</div>
-
-			</nav>
-		</div>
-
-		<div>
-			<h2>Manage Users</h2>
-			<a th:href="@{/users/new}" class="fas fa-user-plus fa-2x icon-dark mr-2"></a>
-			
-			<a th:href="@{/users/export/csv}" class="fas fa-file-csv fa-2x icon-dark mr-2"></a>
-		</div>
-		
-		
-		
-		<!-- only display success message when a new user is created -->
-		<div th:if="${message != null}" class="alert alert-success text-center">
-			[[${message}]]
-		</div>
-			
-		<div>
-			<form th:action="@{/users/page/1}" class="form-inline m-3">
-				
-				<input type="hidden" name="sortField" th:value="${sortField}" />
-				<input type="hidden" name="sortDir" th:value="${sortDir}" />
-				Filter:&nbsp;
-				<input type="search" name="keyword" th:value="${keyword}" class="form-control" required/>
-				&nbsp;&nbsp;
-				<button type="submit" class="btn btn-primary">
-					<i class="fas fa-search"></i>
-				</button>
-				&nbsp;&nbsp;
-				<button type="button" class="btn btn-secondary" onclick="clearFilter()">
-					<i class="fas fa-eraser"></i>
-				</button>
-			</form>
-		
-		</div>
-
-			<!-- css class to display this table in large screens only , refer to static/style.css for more info-->
-			<div class="full-details">
-				<table class="table table-bordered table-striped table-hover table-responsive-xL">
-					<thead class="thead-dark">
-						<tr>
-							<!-- refer to templates/fragments.html for fragment code-->
-							
-							<th class="hideable-column">
-								<th th:replace="fragments :: column_link('id', 'User ID', 'tag')"/>
-							</th>
-							
-							<th>Photos</th>
-							
-							<th class="hideable-column">
-								<th th:replace="fragments :: column_link('email', 'Email', 'tag')"/>
-							</th>
-							
-							<th th:replace="fragments :: column_link('firstName', 'First Name', 'none')"/>
-							<th th:replace="fragments :: column_link('lastName', 'Last Name', 'none')"/>
-							<th>Roles</th>
-							<th th:replace="fragments :: column_link('enabled', 'Enabled', 'none')"/>
-							<th></th>
-						</tr>
-					</thead>
-					<tbody>
-						<tr th:each="user : ${listUsers}">
-							<td class="hideable-column">[[${user.id}]]</td>
-							<td>
-								<span th:if="${user.photos == null}" class="fas fa-portrait fa-3x icon-dark"></span>
-								<img th:if="${user.photos != null}" th:src="@{${user.photosImagePath}}"
-								style="width: 100px"/>
-							</td>
-							<td class="hideable-column">[[${user.email}]]</td>
-							<td>[[${user.firstName}]]</td>
-							<td>[[${user.lastName}]]</td>
-							<td>[[${user.roles}]]</td>
-							
-							<td>
-								<a th:if="${user.enabled == true}" class="fas fa-check-circle fa-2x icon-green" 
-								th:href="@{'/users/' + ${user.id} + '/enabled/false'}"
-								title="Disable this user"></a>
-								
-								<a th:if="${user.enabled == false}" class="fas fa-circle fa-2x icon-silver"
-								 th:href="@{'/users/' + ${user.id} + '/enabled/true'}"
-								 title="Enable this user"></a>
-							</td>
-							<td>
-									<a class="fas fa-edit fa-2x icon-green" th:href="@{'/users/edit/' + ${user.id}}"
-									title="edit this user"></a>
-									&nbsp; 
-									<a class="fas fa-trash fa-2x icon-dark link-delete" th:href="@{'/users/delete/' + ${user.id}}"
-									title="delete this user" th:userId="${user.id}"></a>
-							</td>
-						</tr>
-					</tbody>
-				</table>
-			</div>
-			
-			
-			<!-- css class to display this <div> on mobile screens only, refer to /static/style.css for more info-->
-			<div class="less-details">
-				
-				<div th:each="user : ${listUsers}" class="row m-1">
-					
-					<div class="col-4">
-						
-						<span th:if="${user.photos == null}" class="fas fa-portrait fa-3x icon-dark"></span>
-								<img th:if="${user.photos != null}" th:src="@{${user.photosImagePath}}"
-								style="width: 100px"/>
-					</div>
-					
-					<div class="col-8">
-						<div>[[${user.fullName}]]</div>
-						<div>[[${user.roles}]]</div>
-						<div class="mt-2">
-							<a th:if="${user.enabled == true}" class="fas fa-check-circle fa-2x icon-green" 
-								th:href="@{'/users/' + ${user.id} + '/enabled/false'}"
-								title="Disable this user"></a>
-								
-							<a th:if="${user.enabled == false}" class="fas fa-circle fa-2x icon-silver"
-								 th:href="@{'/users/' + ${user.id} + '/enabled/true'}"
-								 title="Enable this user"></a>
-						
-									&nbsp;
-							<a class="fas fa-edit fa-2x icon-green" th:href="@{'/users/edit/' + ${user.id}}"
-									title="edit this user"></a>
-									&nbsp; 
-							<a class="fas fa-trash fa-2x icon-dark link-delete" th:href="@{'/users/delete/' + ${user.id}}"
-									title="delete this user" th:userId="${user.id}"></a>
-						</div>
-					</div>
-					<div>&nbsp;</div>
-				</div>
-			</div>
-			
-			
-			<!-- IF -->
-			<div class="text-center m-1" th:if="${totalItems > 0}">
-				<span>Showing Users # [[${startCount}]] to [[${endCount}]] of [[${totalItems}]]</span>
-			</div>
-			
-			<!-- ELSE -->
-			<div class="text-center m-1" th:unless="${totalItems > 0}">
-				<span>No users found</span>
-			</div>
-			
-			<!-- only display pagination when there are users; else, no users no pagination -->
-			<div th:if="${totalPages > 1}">
-				<nav>
-					  <ul class="pagination justify-content-center flex-wrap">
-					  
-					  	<li th:class=" ${currentPage > 1 ? 'page-item' : 'page-item disabled'}">
-					  		<a th:replace="fragments :: page_link(1, 'First')"></a>
-				    	</li>
-					  
-					    <li th:class=" ${currentPage > 1 ? 'page-item' : 'page-item disabled'}">
-					    	<a th:replace="fragments :: page_link(${currentPage - 1 }, 'previous')"></a>
-				    	</li>
-					    	
-					    <!-- org.thymeleaf.expression.Numbers class, An object of this class is usually available in variable evaluation expressions with the name #numbers. -->
-					    <li th:class="${currentPage != i ? 'page-item' : 'page-item active'}" 
-					    	th:each="i : ${#numbers.sequence(1, totalPages)}">
-					    	<a th:replace="fragments :: page_link(${i}, ${i})"></a>
-					    </li>
-					    
-					    <li  th:class=" ${currentPage < totalPages ? 'page-item' : 'page-item disabled'}">
-					    	<a th:replace="fragments :: page_link(${currentPage + 1}, 'Next')"></a>
-					    </li>
-					    
-					    <li th:class=" ${currentPage < totalPages ? 'page-item' : 'page-item disabled'}">
-							<a th:replace="fragments :: page_link(${totalPages}, 'Last')"></a>		
-					    </li>
-					  </ul>
-				</nav>
-			</div>
-			
-			
-			
-			<div class="modal fade text-center" id="confirmModal">
-				<div class="modal-dialog">
-					<div class="modal-content">
-					
-						<div class="modal-header">
-							<h4 class="modal-title">Delete Confirmation</h4>
-							<button type="button" class="close" data-dismiss="modal">&times;</button>
-						</div>
-						
-						<div class="modal-body">
-							<span id="confirmText"></span>
-						</div>
-						
-						<div class="modal-footer">
-							<a class="btn btn-success" href="" id="yesButton">Yes</a>
-							<button type="button" class="btn btn-danger" data-dismiss="modal">Close</button>
-						</div>
-					</div>
-				</div>
-			</div>
-			
-			
-			<div class="text-center">
-				<p>Shopme Control Panel - Copyright &copy; Shopme</p>
-			</div>
-
-
-	</div>
-	
-<script type="text/javascript">
-
-//confirmation modal dialogue for delete user
-$(document).ready(function(){
-	$(".link-delete").on("click", function(e){
-		//stop the <a> tag default behaviour and pop out a confirmation modal dialogue
-		e.preventDefault();
-		//alert($(this).attr("href"));
-		link = $(this);
-		userId = link.attr("userId");
-		$("#yesButton").attr("href", link.attr("href"));
-		$("#confirmText").text("Are you sure you want to delete this user ID " + userId + "?");
-		$("#confirmModal").modal();
-	});
-});
-
-	function clearFilter(){
-		window.location = "[[@{/users}]]";
-	}
-
-
-</script>
-	
-</body>
-
-</html>
\ No newline at end of file
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/9/30e7716d2eb4001d1d079a924effdc9e b/.metadata/.plugins/org.eclipse.core.resources/.history/9/30e7716d2eb4001d1d079a924effdc9e
deleted file mode 100644
index 6c25acd2..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/9/30e7716d2eb4001d1d079a924effdc9e
+++ /dev/null
@@ -1,97 +0,0 @@
-<!DOCTYPE html>
-<html xmlns:th="http://www.thymeleaf.org"
-	  xmlns:sec="https://www.thymeleaf.org/thymeleaf-extras-springsecurity5">
-
-<head>
-	<meta http-equiv="Content-Type" content="text/html; charset= UTF-8">
-	<meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0">
-	<title>Home - Shopme Admin</title>
-	
-	<link rel="stylesheet" type="text/css" th:href="@{/fontawesome/all.css}" />
-	<link rel="stylesheet" type="text/css" th:href="@{/style.css}" />
-	<link rel="stylesheet" type="text/css" th:href="@{/webjars/bootstrap/css/bootstrap.min.css}" />
-	
-	<script type="text/javascript" th:src="@{/webjars/jquery/jquery.min.js}"></script>
-	<script type="text/javascript" th:src="@{/webjars/bootstrap/js/bootstrap.min.js}"></script>
-</head>
-
-<body>
-	<div class="container-fluid">
-		<div>
-			<form th:action="@{/}">
-			
-			</form>
-			<nav class="navbar navbar-expand-lg bg-dark navbar-dark">
-				<a class="navbar-brand" th:href="@{/}">
-					<img th:src="@{/images/ShopmeAdminSmall.png}"/>
-				</a>
-				<!--hamburger toggler for mobile devices(responsive)-->
-				<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#topNavbar">
-					<span class="navbar-toggler-icon"></span>
-				</button>
-				<div class="collapse navbar-collapse" id="topNavbar">
-					<ul class="navbar-nav">
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/users}">Users</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/categories}">Categories</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/brands}">Brands</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/products}">Products</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/customers}">Customers</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/shipping}">Shipping</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/orders}">Orders</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/report}">Sales Report</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/articles}">Articles</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/menus}">Menus</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/settings}">Settings</a>
-						</li>
-						<li>
-							<span class="fas fa-user fa-2x icon-silver"></span>
-						</li>
-						<li class="nav-item dropdown">
-								<!-- principal refers to user; display username -->
-							<a class="nav-link dropdown-toggle" sec:authentication="principal.fullname" data-toggle="dropdown"></a>
-							<div class="dropdown-menu">
-								<a class="dropdown-item" href="">Logout</a>
-							</div>
-							
-						</li>
-					</ul>
-				</div>
-				
-			</nav>
-		</div>
-
-		<div>
-			<h1>Shopme Control Panel</h1>
-		<div />
-
-		<div>
-			<p>Shopme Control Panel - Copyright &copy; Shopme</p>
-		<div />
-
-
-	</div>
-
-</body>
-
-</html>
\ No newline at end of file
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/9/701a355e89b9001d14fea12e82c90085 b/.metadata/.plugins/org.eclipse.core.resources/.history/9/701a355e89b9001d14fea12e82c90085
new file mode 100644
index 00000000..8fde603c
--- /dev/null
+++ b/.metadata/.plugins/org.eclipse.core.resources/.history/9/701a355e89b9001d14fea12e82c90085
@@ -0,0 +1,118 @@
+package com.shopme.admin.category;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Set;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import com.shopme.common.entity.Category;
+
+@Service
+public class CategoryService {
+
+	@Autowired
+	private CategoryRepository repo;
+
+	public List<Category> listAll() {
+
+		List<Category> rootCategories = repo.findRootCategories();
+
+		return listHierarchicalCategories(rootCategories);
+	}
+
+	private List<Category> listHierarchicalCategories(List<Category> rootCategories) {
+
+		List<Category> hierarchicalCategories = new ArrayList<>();
+
+		for (Category rootCategory : rootCategories) {
+			hierarchicalCategories.add(Category.copyFull(rootCategory));
+
+			Set<Category> children = rootCategory.getChildren();
+
+			for (Category subCategory : children) {
+				String name = "--" + subCategory.getName();
+				hierarchicalCategories.add(Category.copyFull(subCategory, name));
+				
+				listHierarchicalCategories(hierarchicalCategories, subCategory, 1);
+			}
+		}
+
+		return hierarchicalCategories;
+
+	}
+
+	// recursive method
+	private void listHierarchicalCategories(List<Category> hierarchicalCategories, Category parent, int subLevel) {
+
+		Set<Category> children = parent.getChildren();
+		int newSubLevel = subLevel + 1;
+
+		for (Category subCategory : children) {
+
+			String name = "";
+			for (int i = 0; i < newSubLevel; i++) {
+				name += "--";
+			}
+
+			name += subCategory.getName();
+			hierarchicalCategories.add(Category.copyFull(subCategory, name));
+
+			listHierarchicalCategories(hierarchicalCategories, subCategory, newSubLevel);
+
+		}
+
+	}
+
+	public Category save(Category category) {
+		return repo.save(category);
+	}
+
+	public List<Category> listCategoriesUsedInForm() {
+
+		List<Category> categoriesUsedInForm = new ArrayList<>();
+
+		Iterable<Category> categoriesInDB = repo.findAll();
+
+		for (Category category : categoriesInDB) {
+
+			// root category
+			if (category.getParent() == null) {
+				categoriesUsedInForm.add(Category.copyIdAndName(category));
+
+				category.getChildren().forEach(subCategory -> {
+					String name = "--" + subCategory.getName();
+
+					categoriesUsedInForm.add(Category.copyIdAndName(subCategory.getId(), name));
+					listSubCategoriesUsedInForm(categoriesUsedInForm, subCategory, 1);
+				});
+			}
+
+		}
+
+		return categoriesUsedInForm;
+	}
+
+	// recursive method
+	private void listSubCategoriesUsedInForm(List<Category> categoriesUsedInForm, Category parent, int subLevel) {
+
+		int newSubLevel = subLevel + 1;
+		Set<Category> children = parent.getChildren();
+
+		for (Category subCategory : children) {
+
+			String name = "";
+			for (int i = 0; i < newSubLevel; i++) {
+				name += "--";
+			}
+
+			name += subCategory.getName();
+			categoriesUsedInForm.add(Category.copyIdAndName(subCategory.getId(), name));
+
+			listSubCategoriesUsedInForm(categoriesUsedInForm, subCategory, newSubLevel);
+		}
+
+	}
+
+}
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/9/905937d722b4001d1216d7fff398b3d6 b/.metadata/.plugins/org.eclipse.core.resources/.history/9/905937d722b4001d1216d7fff398b3d6
deleted file mode 100644
index 9d81efaf..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/9/905937d722b4001d1216d7fff398b3d6
+++ /dev/null
@@ -1,81 +0,0 @@
-package com.shopme.admin.security;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-import java.util.Set;
-
-import org.springframework.security.core.GrantedAuthority;
-import org.springframework.security.core.authority.SimpleGrantedAuthority;
-import org.springframework.security.core.userdetails.UserDetails;
-
-import com.shopme.common.entity.Role;
-import com.shopme.common.entity.User;
-
-/*
- *  Think of it as a wrapper class for  Type User
- *  
- *  ShopmeUserDetailsService will use this dao class
- * 
- * */
-public class ShopmeUserDetails implements UserDetails {
-
-	private User user;
-
-	public ShopmeUserDetails(User user) {
-		this.user = user;
-	}
-
-	/* get a list of assigned roles to user */
-	@Override
-	public Collection<? extends GrantedAuthority> getAuthorities() {
-
-		Set<Role> roles = user.getRoles();
-
-		List<SimpleGrantedAuthority> authorities = new ArrayList<>();
-
-		for (Role role : roles) {
-			authorities.add(new SimpleGrantedAuthority(role.getName()));
-		}
-
-		return authorities;
-	}
-
-	@Override
-	public String getPassword() {
-		return user.getPassword();
-	}
-
-	@Override
-	public String getUsername() {
-		return user.getEmail();
-	}
-
-	// "true" means account not expired
-	@Override
-	public boolean isAccountNonExpired() {
-		return true;
-	}
-
-	@Override
-	public boolean isAccountNonLocked() {
-		// TODO Auto-generated method stub
-		return true;
-	}
-
-	@Override
-	public boolean isCredentialsNonExpired() {
-		// TODO Auto-generated method stub
-		return true;
-	}
-
-	@Override
-	public boolean isEnabled() {
-		// TODO Auto-generated method stub
-		return user.isEnabled();
-	}
-	
-	
-	
-
-}
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/9/a01aad2f15b4001d128fb79045552177 b/.metadata/.plugins/org.eclipse.core.resources/.history/9/a01aad2f15b4001d128fb79045552177
deleted file mode 100644
index 9f07bd11..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/9/a01aad2f15b4001d128fb79045552177
+++ /dev/null
@@ -1,27 +0,0 @@
-package com.shopme.admin.security;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.core.userdetails.UserDetails;
-import org.springframework.security.core.userdetails.UserDetailsService;
-import org.springframework.security.core.userdetails.UsernameNotFoundException;
-
-import com.shopme.admin.user.UserRepository;
-
-public class ShopmeUserDetailsService implements UserDetailsService {
-
-	
-	@Autowired
-	private UserRepository userRepo;
-	
-	
-	
-	
-	@Override
-	public UserDetails loadUserByUsername(String email) throws UsernameNotFoundException {
-
-		
-		
-		return null;
-	}
-
-}
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/90/901a290114b4001d128fb79045552177 b/.metadata/.plugins/org.eclipse.core.resources/.history/90/901a290114b4001d128fb79045552177
deleted file mode 100644
index a88c7614..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/90/901a290114b4001d128fb79045552177
+++ /dev/null
@@ -1,76 +0,0 @@
-package com.shopme.admin.security;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-import java.util.Set;
-
-import org.springframework.security.core.GrantedAuthority;
-import org.springframework.security.core.authority.SimpleGrantedAuthority;
-import org.springframework.security.core.userdetails.UserDetails;
-
-import com.shopme.common.entity.Role;
-import com.shopme.common.entity.User;
-
-/*
- *  Think of it as a wrapper class for  Type User
- * 
- * */
-public class ShopmeUserDetails implements UserDetails {
-
-	private User user;
-
-	public ShopmeUserDetails(User user) {
-		this.user = user;
-	}
-
-	/* get a list of assigned roles to user */
-	@Override
-	public Collection<? extends GrantedAuthority> getAuthorities() {
-
-		Set<Role> roles = user.getRoles();
-
-		List<SimpleGrantedAuthority> authorities = new ArrayList<>();
-
-		for (Role role : roles) {
-			authorities.add(new SimpleGrantedAuthority(role.getName()));
-		}
-
-		return authorities;
-	}
-
-	@Override
-	public String getPassword() {
-		return user.getPassword();
-	}
-
-	@Override
-	public String getUsername() {
-		return user.getEmail();
-	}
-
-	@Override
-	public boolean isAccountNonExpired() {
-		// TODO Auto-generated method stub
-		return false;
-	}
-
-	@Override
-	public boolean isAccountNonLocked() {
-		// TODO Auto-generated method stub
-		return false;
-	}
-
-	@Override
-	public boolean isCredentialsNonExpired() {
-		// TODO Auto-generated method stub
-		return false;
-	}
-
-	@Override
-	public boolean isEnabled() {
-		// TODO Auto-generated method stub
-		return false;
-	}
-
-}
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/92/60d5b1d29cb9001d10d0f9513979f945 b/.metadata/.plugins/org.eclipse.core.resources/.history/92/60d5b1d29cb9001d10d0f9513979f945
new file mode 100644
index 00000000..83ca8f2a
--- /dev/null
+++ b/.metadata/.plugins/org.eclipse.core.resources/.history/92/60d5b1d29cb9001d10d0f9513979f945
@@ -0,0 +1,99 @@
+package com.shopme.admin.category;
+
+import java.io.IOException;
+import java.util.List;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.scheduling.support.SimpleTriggerContext;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
+import org.springframework.util.StringUtils;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.ModelAttribute;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.multipart.MultipartFile;
+import org.springframework.web.servlet.mvc.support.RedirectAttributes;
+
+import com.shopme.admin.FileUploadUtil;
+import com.shopme.common.entity.Category;
+
+@Controller
+public class CategoryController {
+	
+	@Autowired
+	private CategoryService service;
+	
+	@GetMapping("/categories")
+	public String listAll(Model model) {
+		
+		List<Category> listCategories = service.listAll();
+		model.addAttribute("listCategories", listCategories);
+		
+		return "categories/categories";
+	}
+	
+	
+	@GetMapping("/categories/new")
+	public String newCategory(Model model) {
+		
+		List<Category> listCategories = service.listCategoriesUsedInForm();
+		
+		model.addAttribute("category", new Category());
+		model.addAttribute("listCategories", listCategories);
+		model.addAttribute("pageTitle", "Create New Category");
+		
+		return "categories/category_form";
+	
+	}
+	
+	@PostMapping("/categories/save")
+	public String saveCategory(@ModelAttribute("category") Category category, 
+			RedirectAttributes redirectAttributes,
+			@RequestParam("fileImage") MultipartFile multipartFile) throws IOException {
+		
+		if(!multipartFile.isEmpty()) {
+			String fileName = StringUtils.cleanPath(multipartFile.getOriginalFilename());
+			category.setImage(fileName);
+			
+			Category savedCategory = service.save(category);
+			String uploadDir = "../category-images/" + savedCategory.getId();
+			
+			FileUploadUtil.cleanDir(uploadDir);
+			FileUploadUtil.saveFile(uploadDir, fileName, multipartFile);
+		}
+		else {
+			service.save(category);
+		}
+		
+		redirectAttributes.addFlashAttribute("message", "the category have been saved successfully");
+		return "redirect:/categories";
+	}
+
+	
+	@GetMapping("/categories/edit/{id}")
+	public String editCategory(@PathVariable(name = "id") Integer id, Model model,
+			RedirectAttributes ra) {
+		try {
+			Category category = service.get(id);
+			List<Category> listCategories = service.listCategoriesUsedInForm();
+			
+			model.addAttribute("category", category);
+			model.addAttribute("listCategories", listCategories);
+			model.addAttribute("pageTitle", "Edit Category (ID: " + id + ")");
+			
+			return "categories/category_form";			
+		} catch (CategoryNotFoundException ex) {
+			ra.addFlashAttribute("message", ex.getMessage());
+			return "redirect:/categories";
+		}
+	}
+	
+	
+	
+}
+	
+
+
+
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/93/00d1020b0ab4001d128fb79045552177 b/.metadata/.plugins/org.eclipse.core.resources/.history/93/00d1020b0ab4001d128fb79045552177
deleted file mode 100644
index a7b3c72e..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/93/00d1020b0ab4001d128fb79045552177
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<html xmlns:th="http://www.thymeleaf.org">
-
-<head>
-	<meta http-equiv="Content-Type" content="text/html; charset= UTF-8">
-	<meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0">
-	<title>Login - Shopme Admin</title>
-	<link rel="stylesheet" type="text/css" th:href="@{/webjars/bootstrap/css/bootstrap.min.css}" />
-</head>
-
-<body>
-	<div class="container-fluid text-center">
-		
-		<div>
-			<img th:src="@{/images/ShopmeAdminBig.png}" />
-		</div>
-		
-		<form th:action="@{/login}" method="post">
-		
-			<div class="border border-secondary rounded">
-				<p>Access to Shopme Control Panel </p>
-				
-				<p>
-					<input type="email" name="email" class="form-control" required />
-				
-				</p>
-			</div>
-		
-		</form>
-
-		<div>
-			<p>Shopme Control Panel - Copyright &copy; Shopme</p>
-		</div>
-
-	</div>
-
-</body>
-
-</html>
\ No newline at end of file
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/93/206313010bb9001d11addcb4256c67f9 b/.metadata/.plugins/org.eclipse.core.resources/.history/93/206313010bb9001d11addcb4256c67f9
new file mode 100644
index 00000000..31815102
--- /dev/null
+++ b/.metadata/.plugins/org.eclipse.core.resources/.history/93/206313010bb9001d11addcb4256c67f9
@@ -0,0 +1,57 @@
+package com.shopme.admin;
+
+import java.nio.file.Path;
+import java.nio.file.Paths;
+
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
+
+@Configuration
+public class MvcConfig implements WebMvcConfigurer {
+
+	
+	/*
+	 * In short, we can tell Spring MVC to map a given URL (e.g. "/user-photos") 
+	 * to any directory (e.g. D:/ShopmeProject/ShopmeBackend/user-photos) 
+	 * and expose the resources (images, js, css...) in this directory to 
+	 * the web clients (browsers) - that's the primary purpose
+	 *  of using resource handlers in Spring MVC.
+	 * 
+	 * Because the assets are not located in the src/main/resources/static folder
+	 * */
+	
+	@Override
+	public void addResourceHandlers(ResourceHandlerRegistry registry) {
+
+		String dirName = "user-photos";
+		
+		Path userPhotoDir = Paths.get(dirName);
+		
+		String userPhotosPath = userPhotoDir.toFile().getAbsolutePath();
+		
+		
+		// add /** to allow all files under this directory to be available to client
+		
+		registry.addResourceHandler("/" + dirName + "/**")
+		.addResourceLocations("file:/" + userPhotosPath + "/");
+		
+		
+		String categoryImagesName = "category-images";
+		
+		Path categoryImagesDir = Paths.get(categoryImagesName);
+		
+		String userPhotosPath = userPhotoDir.toFile().getAbsolutePath();
+		
+		
+		// add /** to allow all files under this directory to be available to client
+		
+		registry.addResourceHandler("/" + dirName + "/**")
+		.addResourceLocations("file:/" + userPhotosPath + "/");
+		
+	}
+	
+	
+	
+	
+}
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/93/e0daf1a94bb4001d1d079a924effdc9e b/.metadata/.plugins/org.eclipse.core.resources/.history/93/e0daf1a94bb4001d1d079a924effdc9e
deleted file mode 100644
index 20df00dd..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/93/e0daf1a94bb4001d1d079a924effdc9e
+++ /dev/null
@@ -1,88 +0,0 @@
-package com.shopme.admin.security;
-
-import org.aspectj.weaver.ast.And;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.security.authentication.dao.DaoAuthenticationProvider;
-import org.springframework.security.config.annotation.web.builders.HttpSecurity;
-import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
-import org.springframework.security.config.annotation.web.configuration.WebSecurityConfiguration;
-import org.springframework.security.config.annotation.web.configuration.WebSecurityCustomizer;
-import org.springframework.security.core.userdetails.UserDetailsService;
-import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
-import org.springframework.security.crypto.password.PasswordEncoder;
-import org.springframework.security.web.SecurityFilterChain;
-
-@Configuration
-@EnableWebSecurity
-public class WebSecurityConfig {
-
-	/*
-	 * refer to this link: https://www.codejava.net/frameworks/spring-boot/fix-
-	 * websecurityconfigureradapter-deprecated
-	 * 
-	 */
-	
-	
-	 /* This bean will be called by spring security when performing authentication*/ 
-	@Bean
-	public UserDetailsService  userDetailsService()	{
-		return new ShopmeUserDetailsService();
-	}
-	
-
-	@Bean
-	public PasswordEncoder passwordEncoder() {
-		return new BCryptPasswordEncoder();
-	}
-
-	
-	@Bean
-	public DaoAuthenticationProvider authenticationProvider() {
-	    DaoAuthenticationProvider authProvider = new DaoAuthenticationProvider();
-	     
-	    authProvider.setUserDetailsService(userDetailsService());
-	    authProvider.setPasswordEncoder(passwordEncoder());
-	 
-	    return authProvider;
-	}
-	
-	
-	@Bean
-	public SecurityFilterChain filterChain(HttpSecurity http) throws Exception {
-
-		// any request need to be authenticated (require login)
-		// custom login page at "/login" - handler method in MainController class
-		http.authorizeHttpRequests()
-			.anyRequest().authenticated()
-			.and()
-			.formLogin()
-				.loginPage("/login")
-				.usernameParameter("email")
-				.permitAll()
-			.and().logout().permitAll()
-			.and().rememberMe().key("AbcDefgHijKlmnOpqrs_1234567890")
-			.tokenValiditySeconds(7 * 24 * 60 * 60); 
-		
-		/*
-		 * set a fix key used for the md5 hash algorithm to encrypt cookie content each
-		 * time the application is restarted, a new key will be generated; this key will
-		 * be used to encrypt the cookie content so, in order for the cookie to be
-		 * permanent; a fix key is needed.
-		 */
-		
-		http.authenticationProvider(authenticationProvider());
-		
-		
-		return http.build();
-	}
-
-	//NOTE: antMatchers() changed to requestMatchers()
-	//stack: https://stackoverflow.com/questions/74907533/the-method-antmatchersstring-is-undefined-for-the-type
-	@Bean
-	public WebSecurityCustomizer webSecurityCustomizer() {
-		//permit access to the assets in the following directories
-		return (web) -> web.ignoring().requestMatchers("/images/**", "/js/**", "/webjars/**");
-	}
-
-}
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/94/a0f199e608b4001d128fb79045552177 b/.metadata/.plugins/org.eclipse.core.resources/.history/94/a0f199e608b4001d128fb79045552177
deleted file mode 100644
index b290357d..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/94/a0f199e608b4001d128fb79045552177
+++ /dev/null
@@ -1,44 +0,0 @@
-package com.shopme.admin.security;
-
-import org.aspectj.weaver.ast.And;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.security.config.annotation.web.builders.HttpSecurity;
-import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
-import org.springframework.security.config.annotation.web.configuration.WebSecurityConfiguration;
-import org.springframework.security.config.annotation.web.configuration.WebSecurityCustomizer;
-import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
-import org.springframework.security.crypto.password.PasswordEncoder;
-import org.springframework.security.web.SecurityFilterChain;
-
-@Configuration
-@EnableWebSecurity
-public class WebSecurityConfig {
-
-	/*
-	 * refer to this link: https://www.codejava.net/frameworks/spring-boot/fix-
-	 * websecurityconfigureradapter-deprecated
-	 * 
-	 */
-
-	@Bean
-	public PasswordEncoder PasswordEncoder() {
-		return new BCryptPasswordEncoder();
-	}
-
-	@Bean
-	public SecurityFilterChain filterChain(HttpSecurity http) throws Exception {
-
-		// any request need to be authenticated (require login)
-		// custom login page at "/login" - handler method in MainController class
-		http.authorizeHttpRequests().anyRequest().authenticated().and().formLogin().loginPage("/login").permitAll();
-
-		return http.build();
-	}
-
-	@Bean
-	public WebSecurityCustomizer webSecurityCustomizer() {
-		return (web) -> web.ignoring().antMatchers("/images/**", "/js/**", "/webjars/**");
-	}
-
-}
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/95/00649a3019b4001d128fb79045552177 b/.metadata/.plugins/org.eclipse.core.resources/.history/95/00649a3019b4001d128fb79045552177
deleted file mode 100644
index e9764c34..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/95/00649a3019b4001d128fb79045552177
+++ /dev/null
@@ -1,50 +0,0 @@
-<!DOCTYPE html>
-<html xmlns:th="http://www.thymeleaf.org">
-
-<head>
-	<meta http-equiv="Content-Type" content="text/html; charset= UTF-8">
-	<meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0">
-	<title>Login - Shopme Admin</title>
-	<link rel="stylesheet" type="text/css" th:href="@{/webjars/bootstrap/css/bootstrap.min.css}" />
-</head>
-
-<body>
-	<div class="container-fluid text-center">
-		
-		<div>
-			<img th:src="@{/images/ShopmeAdminBig.png}" />
-		</div>
-		
-		<form th:action="@{/login}" method="post" style="max-width:350px; margin: 0 auto">
-			
-			<div>
-			
-			</div>
-			
-			<div class="border border-secondary rounded p-3">
-				<p>Access to Shopme Control Panel </p>
-				
-				<p>
-					<input type="email" name="email" class="form-control" placeholder="Email" required />
-				</p>
-				
-				<p>
-					<input type="password" name="password" class="form-control" placeholder="Password" required />
-				</p>
-				
-				<p>
-					<input type="submit" value="Login" class="btn btn-primary" />
-				</p>
-			</div>
-		
-		</form>
-
-		<div>
-			<p>Shopme Control Panel - Copyright &copy; Shopme</p>
-		</div>
-
-	</div>
-
-</body>
-
-</html>
\ No newline at end of file
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/95/40e0093562b3001d19bbb001c1a81c20 b/.metadata/.plugins/org.eclipse.core.resources/.history/95/40e0093562b3001d19bbb001c1a81c20
deleted file mode 100644
index 7314e367..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/95/40e0093562b3001d19bbb001c1a81c20
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-	
-	<parent>
-		<groupId>com.shopme</groupId>
-		<artifactId>ShopmeWebParent</artifactId>
-		<version>0.0.1-SNAPSHOT</version>
-	</parent>
-	
-	<artifactId>ShopmeBackEnd</artifactId>
-	
-	<name>ShopmeBackEnd</name>
-	<description>Shopme Admin project</description>
-	<properties>
-		<java.version>15</java.version>
-	</properties>
-	<dependencies>
-
-	<dependency>
-	   <groupId>org.springframework.boot</groupId>
-		<artifactId>spring-boot-devtools</artifactId>
-    </dependency>
-
-	<dependency>
-		<groupId>net.sf.supercsv</groupId>
-		<artifactId>super-csv</artifactId>
-		<version>2.4.0</version>
-	</dependency>
-	
-	</dependencies>
-	<build>
-		<plugins>
-			<plugin>
-				<groupId>org.springframework.boot</groupId>
-				<artifactId>spring-boot-maven-plugin</artifactId>
-			</plugin>
-		</plugins>
-	</build>
-</project>
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/95/a08782086eb3001d19bbb001c1a81c20 b/.metadata/.plugins/org.eclipse.core.resources/.history/95/a08782086eb3001d19bbb001c1a81c20
deleted file mode 100644
index 523bee72..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/95/a08782086eb3001d19bbb001c1a81c20
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.shopme.admin.user;
-
-import java.text.DateFormat;
-import java.text.SimpleDateFormat;
-import java.util.List;
-
-import com.shopme.common.entity.User;
-
-import jakarta.servlet.http.HttpServletResponse;
-
-public class UserCsvExporter {
-
-	public void export(List<User> user, HttpServletResponse response) {
-		
-		DateFormat dateFormatter = new SimpleDateFormat("yyyy-MM-dd_HH-mm-ss");
-		String timeStamp = dateFormatter.format(new Date());
-	
-	}
-	
-}
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/96/705b30598fb3001d19bbb001c1a81c20 b/.metadata/.plugins/org.eclipse.core.resources/.history/96/705b30598fb3001d19bbb001c1a81c20
deleted file mode 100644
index a18316d7..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/96/705b30598fb3001d19bbb001c1a81c20
+++ /dev/null
@@ -1,33 +0,0 @@
-<!DOCTYPE html>
-<html xmlns:th="http://www.thymeleaf.org">
-<head>
-<meta charset="ISO-8859-1">
-<title>Insert title here</title>
-</head>
-<body>
-
-		<!-- purpose: make code more succinct and readable 
-		project is easier to maintain
-		
-		use thymeleaf fragments -->
-
-
-	<th th:fragment="column_link(fieldName, columnLabel, removeTag)">
-		<!-- follow the sort order of another sortField; if the other field is sortDir="asc", then the newly selected column will be sortDir="asc" too -->
-		<a class="text-white"
-		   th:href="@{'/users/page/' + ${currentPage} + '?sortField=' + ${fieldName} + '&sortDir=' + ${sortField != fieldName ? sortDir : reverseSortDir} + ${keyword != null ? '&keyword=' + keyword : ''}}">
-			[[${columnLabel}]]
-		</a>
-		
-		<span th:if="${sortField == fieldName}"
-		th:class="${sortDir == 'asc' ? 'fas fa-sort-up' : 'fas fa-sort-down'}"></span>
-	</th>
-	
-	
-	<a th:fragment="page_link(pageNum, label)"
-	   class="page-link"
-	   th:href= "@{'/users/page/' + ${pageNum} + '?sortField=' + ${sortField} + '&sortDir=' + ${sortDir} + ${keyword != null ? '&keyword=' + keyword : ''}}">[[${label}]]</a>
-	
-	
-</body>
-</html>
\ No newline at end of file
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/96/f00d31aa23b4001d1216d7fff398b3d6 b/.metadata/.plugins/org.eclipse.core.resources/.history/96/f00d31aa23b4001d1216d7fff398b3d6
deleted file mode 100644
index a47b01d9..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/96/f00d31aa23b4001d1216d7fff398b3d6
+++ /dev/null
@@ -1,90 +0,0 @@
-<!DOCTYPE html>
-<html xmlns:th="http://www.thymeleaf.org"
-	  xmlns:sec="https://www.thymeleaf.org/thymeleaf-extras-springsecurity5">
-
-<head>
-	<meta http-equiv="Content-Type" content="text/html; charset= UTF-8">
-	<meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0">
-	<title>Home - Shopme Admin</title>
-	
-	<link rel="stylesheet" type="text/css" th:href="@{/fontawesome/all.css}" />
-	<link rel="stylesheet" type="text/css" th:href="@{/style.css}" />
-	<link rel="stylesheet" type="text/css" th:href="@{/webjars/bootstrap/css/bootstrap.min.css}" />
-	
-	<script type="text/javascript" th:src="@{/webjars/jquery/jquery.min.js}"></script>
-	<script type="text/javascript" th:src="@{/webjars/bootstrap/js/bootstrap.min.js}"></script>
-</head>
-
-<body>
-	<div class="container-fluid">
-		<div>
-			<nav class="navbar navbar-expand-lg bg-dark navbar-dark">
-				<a class="navbar-brand" th:href="@{/}">
-					<img th:src="@{/images/ShopmeAdminSmall.png}"/>
-				</a>
-				<!--hamburger toggler for mobile devices(responsive)-->
-				<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#topNavbar">
-					<span class="navbar-toggler-icon"></span>
-				</button>
-				<div class="collapse navbar-collapse" id="topNavbar">
-					<ul class="navbar-nav">
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/users}">Users</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/categories}">Categories</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/brands}">Brands</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/products}">Products</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/customers}">Customers</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/shipping}">Shipping</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/orders}">Orders</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/report}">Sales Report</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/articles}">Articles</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/menus}">Menus</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/settings}">Settings</a>
-						</li>
-						<li>
-							<span class="fas fa-user fa-2x icon-silver"></span>
-						</li>
-						<li class="nav-item dropdown">
-													<!-- principal refers to user; display username -->
-							<a class="nav-link" sec:authentication="principal.fullname"></a>
-						</li>
-					</ul>
-				</div>
-				
-			</nav>
-		</div>
-
-		<div>
-			<h1>Shopme Control Panel</h1>
-		<div />
-
-		<div>
-			<p>Shopme Control Panel - Copyright &copy; Shopme</p>
-		<div />
-
-
-	</div>
-
-</body>
-
-</html>
\ No newline at end of file
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/97/0037727629b8001d1d97982e354adf88 b/.metadata/.plugins/org.eclipse.core.resources/.history/97/0037727629b8001d1d97982e354adf88
deleted file mode 100644
index d7d60b1a..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/97/0037727629b8001d1d97982e354adf88
+++ /dev/null
@@ -1,46 +0,0 @@
-package com.shopme.admin.category;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import com.shopme.common.entity.Category;
-
-@Service
-public class CategoryService {
-
-	@Autowired
-	private CategoryRepository repo;
-	
-	public List<Category> listAll(){
-		return (List<Category>) repo.findAll();
-	}
-	
-	public List<Category> listCategoriesUsedInForm(){
-		
-		List<Category> categoriesUsedInForm = new ArrayList<>();
-		
-		Iterable<Category> categoriesInDB = repo.findAll();
-		
-		for (Category category : categories) {
-
-			// root category
-			if (category.getParent() == null) {
-				System.out.println(category.getName());
-
-				category.getChildren().forEach(subCategory -> {
-
-					System.out.println("--" + subCategory.getName());
-					printChildren(subCategory, 1);
-				});
-			}
-
-		}
-		
-		
-		
-		return categoriesUsedInForm;
-	}
-}
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/97/20628b6c0ab4001d128fb79045552177 b/.metadata/.plugins/org.eclipse.core.resources/.history/97/20628b6c0ab4001d128fb79045552177
deleted file mode 100644
index 69df4b17..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/97/20628b6c0ab4001d128fb79045552177
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<html xmlns:th="http://www.thymeleaf.org">
-
-<head>
-	<meta http-equiv="Content-Type" content="text/html; charset= UTF-8">
-	<meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0">
-	<title>Login - Shopme Admin</title>
-	<link rel="stylesheet" type="text/css" th:href="@{/webjars/bootstrap/css/bootstrap.min.css}" />
-</head>
-
-<body>
-	<div class="container-fluid text-center">
-		
-		<div>
-			<img th:src="@{/images/ShopmeAdminBig.png}" />
-		</div>
-		
-		<form th:action="@{/login}" method="post" style="max-width:350px; margin: 0 auto">
-		
-			<div class="border border-secondary rounded">
-				<p>Access to Shopme Control Panel </p>
-				
-				<p>
-					<input type="email" name="email" class="form-control" required />
-					
-				
-				</p>
-			</div>
-		
-		</form>
-
-		<div>
-			<p>Shopme Control Panel - Copyright &copy; Shopme</p>
-		</div>
-
-	</div>
-
-</body>
-
-</html>
\ No newline at end of file
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/97/e068239826b3001d1e75aa5ef0815903 b/.metadata/.plugins/org.eclipse.core.resources/.history/97/e068239826b3001d1e75aa5ef0815903
deleted file mode 100644
index 3bc232b6..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/97/e068239826b3001d1e75aa5ef0815903
+++ /dev/null
@@ -1,200 +0,0 @@
-package com.shopme.admin.user;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
-import java.util.List;
-
-import org.hibernate.internal.build.AllowSysOut;
-import org.hibernate.query.sqm.mutation.internal.TableKeyExpressionCollector;
-import org.junit.jupiter.api.Test;
-import org.springframework.aot.nativex.NativeConfigurationWriter;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.autoconfigure.jdbc.AutoConfigureTestDatabase;
-import org.springframework.boot.test.autoconfigure.jdbc.AutoConfigureTestDatabase.Replace;
-import org.springframework.boot.test.autoconfigure.orm.jpa.DataJpaTest;
-import org.springframework.boot.test.autoconfigure.orm.jpa.TestEntityManager;
-import org.springframework.data.domain.Page;
-import org.springframework.data.domain.PageRequest;
-import org.springframework.data.domain.Pageable;
-import org.springframework.test.annotation.Rollback;
-
-import com.shopme.common.entity.Role;
-import com.shopme.common.entity.User;
-
-@DataJpaTest(showSql = false)
-//configure to run on real database(MySQL) instead of a test database
-@AutoConfigureTestDatabase(replace = Replace.NONE)
-/*
- * Datajpatest will rollback the transaction after executing the test method
- * everytime, so that the transaction will not be committed. if we want to
- * commit the transaction(aka "save the record"), we can disable rollback by
- * setting it to false. Now, all transactions will be committed
- */
-@Rollback(false)
-public class UserRepositoryTests {
-
-	@Autowired
-	private UserRepository repo;
-
-	@Autowired
-	private TestEntityManager entityManager;
-
-	// On the very first execution of testCreateUser() method; hibernate will create
-	// the users table & users_roles table
-	@Test
-	public void testCreateUserWithOneRole() {
-
-		Role roleAdmin = entityManager.find(Role.class, 1);
-		User userChow = new User("chow@gmail.com", "password", "chow", "seng fung");
-		userChow.addRoles(roleAdmin);
-		User savedUser = repo.save(userChow);
-		assertThat(savedUser.getId()).isGreaterThan(0);
-
-	}
-
-	@Test
-	public void testCreateUserWithTwoRole() {
-
-		User userRavi = new User("ravi@gmail.com", "ravipass", "ravi", "kumar");
-		Role roleEditor = new Role(3);
-		Role roleAssistant = new Role(5);
-
-		userRavi.addRoles(roleEditor);
-		userRavi.addRoles(roleAssistant);
-
-		User savedUser = repo.save(userRavi);
-		assertThat(savedUser.getId()).isGreaterThan(0);
-	}
-
-	@Test
-	public void testListAllUsers() {
-		Iterable<User> listUsers = repo.findAll();
-
-		// use method reference instead of lambda expression here
-		listUsers.forEach(System.out::println);
-
-	}
-
-	@Test
-	public void testGetUserById() {
-
-		User userChow = repo.findById(1).get();
-		System.out.println(userChow);
-		// use method reference instead of lambda expression here
-		assertThat(userChow).isNotNull();
-	}
-
-	@Test
-	public void testUpdateUserDetails() {
-		
-		User userChow = repo.findById(1).get();
-		userChow.setEnabled(true);
-		userChow.setEmail("chow22@gmail.com");
-		
-		repo.save(userChow);
-	}
-	
-	@Test
-	public void testUpdateUserRoles() {
-		
-		User userRavi = repo.findById(4).get();
-		Role roleEditor = new Role(3);
-		Role roleSalesperson= new Role(2);
-		
-		//change role from editor to salesperson
-		
-		/* take note of overriding/implementing the hashcode and equals method in roles
-		 * class. need to override those two methods for remove() to work.
-		 *  The remove() method removes an element "e" such that Objects.equals(o, e),
-		 *  this will invoke the overwritten equals() method in Role Class. 
-		 * */
-		userRavi.getRoles().remove(roleEditor);
-		userRavi.addRoles(roleSalesperson);
-		
-		repo.save(userRavi);
-	}
-	
-	@Test
-	public void testDeleteUser() {
-		
-		Integer userId = 4;
-		repo.deleteById(userId);
-	}
-	
-	
-	@Test
-	public void testGetUserByEmail() {
-		String email = "ravi@gmail.com";
-		User user = repo.getUserByEmail(email);
-		
-		assertThat(user).isNotNull();
-	}
-	
-	/*
-	 * count the number of records in database with a particular id.
-	 * return value should be 1,
-	 * because id is unique.
-	 * 
-	 * use countById() method to test whether a user exists. 
-	 */
-	@Test
-	public void testCountById() {
-		
-		Integer userId = 1;
-		Long countById = repo.countById(userId);
-		
-		assertThat(countById).isNotNull().isGreaterThan(0).isEqualTo(1);
-	}
-	
-	@Test	
-	public void testDisableUser() {
-		Integer userId = 1;
-		
-		repo.updateEnabledStatus(userId, false);
-	}
-
-	@Test	
-	public void testEnableUser() {
-		Integer userId = 1;
-		
-		repo.updateEnabledStatus(userId, true);
-	}
-	
-	@Test
-	public void testListFirstPage() {
-		int pageNumber = 0; // the first page number always start with 0, change pageNumber to 1 to get the second page, 2 for thid page and so forth
-		int pageSize = 4; // no of elements
-		
-		Pageable pageable = PageRequest.of(pageNumber, pageSize);
-		Page<User> page = repo.findAll(pageable);
-		
-		List<User> listUsers = page.getContent();
-		
-		listUsers.forEach(System.out::println);
-		
-		assertThat(listUsers.size()).isEqualTo(pageSize);
-	}
-	
-	
-	@Test 
-	public void testSearchUsers() {
-		
-		String keyword = "bruce";
-		
-		
-		int pageNumber = 0; // the first page number always start with 0, change pageNumber to 1 to get the second page, 2 for thid page and so forth
-		int pageSize = 4; // no of elements
-		
-		Pageable pageable = PageRequest.of(pageNumber, pageSize);
-		Page<User> page = repo.findAll(keyword, pageable);
-		
-		List<User> listUsers = page.getContent();
-		
-		listUsers.forEach(System.out::println);
-		
-		
-	}
-	
-	
-}
-
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/98/707ba5ce58b7001d19ef99be8d31e273 b/.metadata/.plugins/org.eclipse.core.resources/.history/98/707ba5ce58b7001d19ef99be8d31e273
deleted file mode 100644
index 7a5ec799..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/98/707ba5ce58b7001d19ef99be8d31e273
+++ /dev/null
@@ -1,8 +0,0 @@
-package com.shopme.admin.category;
-
-import org.springframework.stereotype.Controller;
-
-@Controller
-public class CategoryController {
-	
-}
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/99/d01a1f7029b8001d1d97982e354adf88 b/.metadata/.plugins/org.eclipse.core.resources/.history/99/d01a1f7029b8001d1d97982e354adf88
deleted file mode 100644
index 8f6ad9ea..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/99/d01a1f7029b8001d1d97982e354adf88
+++ /dev/null
@@ -1,33 +0,0 @@
-package com.shopme.admin.category;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import com.shopme.common.entity.Category;
-
-@Service
-public class CategoryService {
-
-	@Autowired
-	private CategoryRepository repo;
-	
-	public List<Category> listAll(){
-		return (List<Category>) repo.findAll();
-	}
-	
-	public List<Category> listCategoriesUsedInForm(){
-		
-		List<Category> categoriesUsedInForm = new ArrayList<>();
-		
-		Iterable<Category> categoriesInDB = repo.findAll();
-		
-		
-		
-		
-		
-		return (List<Category>) repo.findAll();
-	}
-}
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/9a/10dcae6728b3001d1e75aa5ef0815903 b/.metadata/.plugins/org.eclipse.core.resources/.history/9a/10dcae6728b3001d1e75aa5ef0815903
deleted file mode 100644
index 15ca0afa..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/9a/10dcae6728b3001d1e75aa5ef0815903
+++ /dev/null
@@ -1,165 +0,0 @@
-package com.shopme.admin.user;
-
-import java.io.IOException;
-import java.util.List;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.domain.Page;
-import org.springframework.data.repository.query.Param;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
-import org.springframework.util.StringUtils;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.ModelAttribute;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.multipart.MultipartFile;
-import org.springframework.web.servlet.mvc.support.RedirectAttributes;
-
-import com.fasterxml.jackson.annotation.ObjectIdGenerators.StringIdGenerator;
-import com.shopme.admin.FileUploadUtil;
-import com.shopme.common.entity.Role;
-import com.shopme.common.entity.User;
-
-@Controller
-public class UserController {
-
-	@Autowired
-	private UserService service;
-
-	@GetMapping("/users")
-	public String listFirstPage(Model model) {
-		return listByPage(1, model, "firstName", "asc");
-	}
-
-	@GetMapping("/users/page/{pageNum}")
-	public String listByPage(@PathVariable(name = "pageNum") int pageNum, Model model,
-			@Param("sortField") String sortField, @Param("sortDir") String sortDir,
-			@Param("keyword") String keyword) {
-		
-		System.out.println("sort field: " + sortField);
-		System.out.println("sort order: " + sortDir);
-		
-		Page<User> page = service.listByPage(pageNum, sortField, sortDir);
-		List<User> listUsers = page.getContent();
-
-		
-		long startCount = (pageNum - 1) * UserService.USERS_PER_PAGE + 1;
-		long endCount = startCount + UserService.USERS_PER_PAGE - 1;
-		if(endCount > page.getTotalElements()) {
-			endCount = page.getTotalElements();
-		}
-		
-		String reverseSortDir = sortDir.equals("asc") ? "desc" : "asc";
-		
-		model.addAttribute("currentPage", pageNum);
-		model.addAttribute("totalPages", page.getTotalPages());
-		model.addAttribute("startCount", startCount);
-		model.addAttribute("endCount", endCount);
-		model.addAttribute("totalItems", page.getTotalElements());
-		model.addAttribute("listUsers", listUsers);
-		model.addAttribute("sortField", sortField);
-		model.addAttribute("sortDir", sortDir);
-		model.addAttribute("reverseSortDir", reverseSortDir);
-		
-
-		return "users";
-
-	}
-
-	@GetMapping("/users/new")
-	public String newUser(Model model) {
-
-		List<Role> listRoles = service.listRoles();
-
-		User user = new User();
-		user.setEnabled(true);
-
-		model.addAttribute("user", user);
-		model.addAttribute("listRoles", listRoles);
-		model.addAttribute("pageTitle", "Create New User");
-
-		return "user_form";
-
-	}
-
-	// using @RequestParam, we can get the image file input, the input has the
-	// property name="image"
-	@PostMapping("/users/save")
-	public String saveUser(@ModelAttribute("user") User user, RedirectAttributes redirectAttributes,
-			@RequestParam("image") MultipartFile multipartFile) throws IOException {
-
-		if (!multipartFile.isEmpty()) {
-
-			String fileName = StringUtils.cleanPath(multipartFile.getOriginalFilename());
-			user.setPhotos(fileName);
-
-			User savedUser = service.save(user);
-
-			String uploadDir = "user-photos/" + savedUser.getId();
-
-			FileUploadUtil.cleanDir(uploadDir);
-			FileUploadUtil.saveFile(uploadDir, fileName, multipartFile);
-		} else {
-
-			// set photo to null for getPhotosImagePath() method's conditional statement in
-			// User class
-			if (user.getPhotos().isEmpty())
-				user.setPhotos(null);
-			service.save(user);
-		}
-
-		redirectAttributes.addFlashAttribute("message", "the user has been saved successfully");
-
-		// POST/REDIRECT/GET web design
-		return "redirect:/users";
-	}
-
-	@GetMapping("/users/edit/{id}")
-	public String editUser(@PathVariable(name = "id") Integer id, RedirectAttributes redirectAttributes, Model model) {
-		try {
-			User user = service.get(id);
-			List<Role> listRoles = service.listRoles();
-
-			model.addAttribute("user", user);
-			model.addAttribute("pageTitle", "Edit User (ID: " + id + ")");
-			model.addAttribute("listRoles", listRoles);
-
-			return "user_form";
-		} catch (UserNotFoundException ex) {
-			redirectAttributes.addFlashAttribute("message", ex.getMessage());
-
-			return "redirect:/users";
-		}
-
-	}
-
-	@GetMapping("/users/delete/{id}")
-	public String deleteUser(@PathVariable(name = "id") Integer id, RedirectAttributes redirectAttributes,
-			Model model) {
-		try {
-			service.delete(id);
-			redirectAttributes.addFlashAttribute("message", "The user ID " + id + " has been deleted successfully.");
-
-		} catch (UserNotFoundException ex) {
-			redirectAttributes.addFlashAttribute("message", ex.getMessage());
-
-		}
-
-		return "redirect:/users";
-	}
-
-	@GetMapping("/users/{id}/enabled/{status}")
-	public String updateUserEnabledStatus(@PathVariable(name = "id") Integer id,
-			@PathVariable(name = "status") boolean enabled, RedirectAttributes redirectAttributes) {
-
-		service.updateUserEnabledStatus(id, enabled);
-		String status = enabled ? "enabled" : "disabled";
-		String message = "The user id " + id + " has been " + status;
-		redirectAttributes.addFlashAttribute("message", message);
-
-		return "redirect:/users";
-	}
-
-}
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/9a/80a0fd5f1ab4001d128fb79045552177 b/.metadata/.plugins/org.eclipse.core.resources/.history/9a/80a0fd5f1ab4001d128fb79045552177
deleted file mode 100644
index 675d3dbe..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/9a/80a0fd5f1ab4001d128fb79045552177
+++ /dev/null
@@ -1,154 +0,0 @@
-package com.shopme.common.entity;
-
-import java.util.HashSet;
-import java.util.Set;
-
-import org.hibernate.grammars.hql.HqlParser.NthSideClauseContext;
-
-import jakarta.persistence.Column;
-import jakarta.persistence.Entity;
-import jakarta.persistence.GeneratedValue;
-import jakarta.persistence.GenerationType;
-import jakarta.persistence.Id;
-import jakarta.persistence.JoinColumn;
-import jakarta.persistence.JoinTable;
-import jakarta.persistence.ManyToMany;
-import jakarta.persistence.Table;
-import jakarta.persistence.Transient;
-
-@Entity
-@Table(name = "users")
-public class User {
-
-	@Id
-	@GeneratedValue(strategy = GenerationType.IDENTITY)
-	private Integer id;
-
-	@Column(length = 128, nullable = false, unique = true)
-	private String email;
-
-	@Column(length = 64, nullable = false)
-	private String password;
-
-	@Column(name = "first_name", length = 45, nullable = false)
-	private String firstName;
-
-	@Column(name = "last_name", length = 45, nullable = false)
-	private String lastName;
-
-	@Column(length = 64)
-	private String photos;
-
-	private boolean enabled;
-
-	// intermediate table
-
-	@ManyToMany
-	@JoinTable(name = "users_roles", joinColumns = @JoinColumn(name = "user_id"), inverseJoinColumns = @JoinColumn(name = "role_id"))
-	private Set<Role> roles = new HashSet<>();
-
-	public User() {
-
-	}
-
-	public User(String email, String password, String firstName, String lastName) {
-		this.email = email;
-		this.password = password;
-		this.firstName = firstName;
-		this.lastName = lastName;
-	}
-
-	public Integer getId() {
-		return id;
-	}
-
-	public void setId(Integer id) {
-		this.id = id;
-	}
-
-	public String getEmail() {
-		return email;
-	}
-
-	public void setEmail(String email) {
-		this.email = email;
-	}
-
-	public String getPassword() {
-		return password;
-	}
-
-	public void setPassword(String password) {
-		this.password = password;
-	}
-
-	public String getFirstName() {
-		return firstName;
-	}
-
-	public void setFirstName(String firstName) {
-		this.firstName = firstName;
-	}
-
-	public String getLastName() {
-		return lastName;
-	}
-
-	public void setLastName(String lastName) {
-		this.lastName = lastName;
-	}
-
-	public String getPhotos() {
-		return photos;
-	}
-
-	public void setPhotos(String photos) {
-		this.photos = photos;
-	}
-
-	public boolean isEnabled() {
-		return enabled;
-	}
-
-	public void setEnabled(boolean enabled) {
-		this.enabled = enabled;
-	}
-
-	public Set<Role> getRoles() {
-		return roles;
-	}
-
-	public void setRoles(Set<Role> roles) {
-		this.roles = roles;
-	}
-
-	public void addRoles(Role role) {
-		this.roles.add(role);
-	}
-
-	@Override
-	public String toString() {
-		return "User [id=" + id + ", email=" + email + ", firstName=" + firstName + ", lastName=" + lastName
-				+ ", roles=" + roles + "]";
-	}
-
-	// Transient annotation to indicate this getter method is not mapped to any
-	// field in database
-	@Transient
-	public String getPhotosImagePath() {
-
-		if(id == null || photos == null) return "/images/default-user.png";
-		
-		return "/user-photos/" + this.id + "/" + this.photos;
-
-	}
-	
-	// Transient annotation to indicate this getter method is not mapped to any
-	// field in database
-	@Transient
-	public String getFullName() {
-		
-		return firstName + " " + lastName;
-	}
-
-}
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/9b/70bb9c9d19b4001d128fb79045552177 b/.metadata/.plugins/org.eclipse.core.resources/.history/9b/70bb9c9d19b4001d128fb79045552177
deleted file mode 100644
index 74a6b6fa..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/9b/70bb9c9d19b4001d128fb79045552177
+++ /dev/null
@@ -1,52 +0,0 @@
-<!DOCTYPE html>
-<html xmlns:th="http://www.thymeleaf.org">
-
-<head>
-	<meta http-equiv="Content-Type" content="text/html; charset= UTF-8">
-	<meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0">
-	<title>Login - Shopme Admin</title>
-	<link rel="stylesheet" type="text/css" th:href="@{/webjars/bootstrap/css/bootstrap.min.css}" />
-</head>
-
-<body>
-	<div class="container-fluid text-center">
-		
-		<div>
-			<img th:src="@{/images/ShopmeAdminBig.png}" />
-		</div>
-		
-		<form th:action="@{/login}" method="post" style="max-width:350px; margin: 0 auto">
-			
-			<!--  ?error param will appear at the end of url if there is error with email or password  -->
-			<div th:if="${param.error}">
-			
-			
-			</div>
-			
-			<div class="border border-secondary rounded p-3">
-				<p>Access to Shopme Control Panel </p>
-				
-				<p>
-					<input type="email" name="email" class="form-control" placeholder="Email" required />
-				</p>
-				
-				<p>
-					<input type="password" name="password" class="form-control" placeholder="Password" required />
-				</p>
-				
-				<p>
-					<input type="submit" value="Login" class="btn btn-primary" />
-				</p>
-			</div>
-		
-		</form>
-
-		<div>
-			<p>Shopme Control Panel - Copyright &copy; Shopme</p>
-		</div>
-
-	</div>
-
-</body>
-
-</html>
\ No newline at end of file
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/9b/801d865948b4001d1d079a924effdc9e b/.metadata/.plugins/org.eclipse.core.resources/.history/9b/801d865948b4001d1d079a924effdc9e
deleted file mode 100644
index 730fd1a7..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/9b/801d865948b4001d1d079a924effdc9e
+++ /dev/null
@@ -1,61 +0,0 @@
-<!DOCTYPE html>
-<html xmlns:th="http://www.thymeleaf.org">
-
-<head>
-	<meta http-equiv="Content-Type" content="text/html; charset= UTF-8">
-	<meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0">
-	<title>Login - Shopme Admin</title>
-	<link rel="stylesheet" type="text/css" th:href="@{/webjars/bootstrap/css/bootstrap.min.css}" />
-</head>
-
-<body>
-	<div class="container-fluid text-center">
-		
-		<div>
-			<img th:src="@{/images/ShopmeAdminBig.png}" />
-		</div>
-		
-		<form th:action="@{/login}" method="post" style="max-width:350px; margin: 0 auto">
-			
-			<!--  ?error param will appear at the end of url if there is error with email or password  -->
-			<div th:if="${param.error}">
-				<p class="text-danger">[[${session.SPRING_SECURITY_LAST_EXCEPTION.message}]]</p>
-			</div>
-			
-			<!--  ?logout param will appear at the end of url after user logged out  -->
-			<div th:if="${param.logout}">
-				<p class="text-warning">you have been logged out</p>
-			</div>
-			
-			<div class="border border-secondary rounded p-3">
-				<p>Access to Shopme Control Panel </p>
-				
-				<p>
-					<input type="email" name="email" class="form-control" placeholder="Email" required />
-				</p>
-				
-				<p>
-					<input type="password" name="password" class="form-control" placeholder="Password" required />
-				</p>
-				
-				<p>
-					
-				
-				</p>
-				
-				<p>
-					<input type="submit" value="Login" class="btn btn-primary" />
-				</p>
-			</div>
-		
-		</form>
-
-		<div>
-			<p>Shopme Control Panel - Copyright &copy; Shopme</p>
-		</div>
-
-	</div>
-
-</body>
-
-</html>
\ No newline at end of file
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/9c/30c5862105b4001d128fb79045552177 b/.metadata/.plugins/org.eclipse.core.resources/.history/9c/30c5862105b4001d128fb79045552177
deleted file mode 100644
index 37d92c92..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/9c/30c5862105b4001d128fb79045552177
+++ /dev/null
@@ -1,76 +0,0 @@
-<!DOCTYPE html>
-<html xmlns:th="http://www.thymeleaf.org">
-
-<head>
-	<meta http-equiv="Content-Type" content="text/html; charset= UTF-8">
-	<meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0">
-	<title>Login - Shopme Admin</title>
-	<link rel="stylesheet" type="text/css" th:href="@{/webjars/bootstrap/css/bootstrap.min.css}" />
-</head>
-
-<body>
-	<div class="container-fluid">
-		<div>
-			<nav class="navbar navbar-expand-lg bg-dark navbar-dark">
-				<a class="navbar-brand" th:href="@{/}">
-					<img th:src="@{/images/ShopmeAdminSmall.png}"/>
-				</a>
-				<!--hamburger toggler for mobile devices(responsive)-->
-				<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#topNavbar">
-					<span class="navbar-toggler-icon"></span>
-				</button>
-				<div class="collapse navbar-collapse" id="topNavbar">
-					<ul class="navbar-nav">
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/users}">Users</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/categories}">Categories</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/brands}">Brands</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/products}">Products</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/customers}">Customers</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/shipping}">Shipping</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/orders}">Orders</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/report}">Sales Report</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/articles}">Articles</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/menus}">Menus</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/settings}">Settings</a>
-						</li>
-					</ul>
-				</div>
-				
-			</nav>
-		</div>
-
-		<div>
-			<h1>Shopme Control Panel</h1>
-		<div />
-
-		<div>
-			<p>Shopme Control Panel - Copyright &copy; Shopme</p>
-		<div />
-
-
-	</div>
-
-</body>
-
-</html>
\ No newline at end of file
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/9c/b0c857a743b4001d1d079a924effdc9e b/.metadata/.plugins/org.eclipse.core.resources/.history/9c/b0c857a743b4001d1d079a924effdc9e
deleted file mode 100644
index b38e4a99..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/9c/b0c857a743b4001d1d079a924effdc9e
+++ /dev/null
@@ -1,284 +0,0 @@
-<!DOCTYPE html>
-<html xmlns:th="http://www.thymeleaf.org">
-
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset= UTF-8">
-<meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0">
-<title>Manage Users</title>
-
-<link rel="stylesheet" type="text/css" th:href="@{/webjars/bootstrap/css/bootstrap.min.css}" />
-<link rel="stylesheet" type="text/css" th:href="@{/fontawesome/all.css}" />
-<link rel="stylesheet" type="text/css" th:href="@{/style.css}" />
-	
-<script type="text/javascript" th:src="@{/webjars/jquery/jquery.min.js}"></script>
-<script type="text/javascript" th:src="@{/webjars/bootstrap/js/bootstrap.min.js}"></script>
-</head>
-
-<body>
-	<div class="container-fluid">
-		<div>
-			<nav class="navbar navbar-expand-lg bg-dark navbar-dark">
-				<a class="navbar-brand" th:href="@{/}"> <img
-					th:src="@{/images/ShopmeAdminSmall.png}" />
-				</a>
-				<!--hamburger toggler for mobile devices(responsive)-->
-				<button class="navbar-toggler" type="button" data-toggle="collapse"
-					data-target="#topNavbar">
-					<span class="navbar-toggler-icon"></span>
-				</button>
-				<div class="collapse navbar-collapse" id="topNavbar">
-					<ul class="navbar-nav">
-						<li class="nav-item"><a class="nav-link" th:href="@{/users}">Users</a>
-						</li>
-						<li class="nav-item"><a class="nav-link"
-							th:href="@{/categories}">Categories</a></li>
-						<li class="nav-item"><a class="nav-link" th:href="@{/brands}">Brands</a>
-						</li>
-						<li class="nav-item"><a class="nav-link"
-							th:href="@{/products}">Products</a></li>
-						<li class="nav-item"><a class="nav-link"
-							th:href="@{/customers}">Customers</a></li>
-						<li class="nav-item"><a class="nav-link"
-							th:href="@{/shipping}">Shipping</a></li>
-						<li class="nav-item"><a class="nav-link" th:href="@{/orders}">Orders</a>
-						</li>
-						<li class="nav-item"><a class="nav-link" th:href="@{/report}">Sales
-								Report</a></li>
-						<li class="nav-item"><a class="nav-link"
-							th:href="@{/articles}">Articles</a></li>
-						<li class="nav-item"><a class="nav-link" th:href="@{/menus}">Menus</a>
-						</li>
-						<li class="nav-item"><a class="nav-link"
-							th:href="@{/settings}">Settings</a></li>
-					</ul>
-				</div>
-
-			</nav>
-		</div>
-
-		<div>
-			<h2>Manage Users</h2>
-			<a th:href="@{/users/new}" class="fas fa-user-plus fa-2x icon-dark mr-2"></a>
-			
-			<a th:href="@{/users/export/csv}" class="fas fa-file-csv fa-2x icon-dark mr-2"></a>
-		</div>
-		
-		
-		
-		<!-- only display success message when a new user is created -->
-		<div th:if="${message != null}" class="alert alert-success text-center">
-			[[${message}]]
-		</div>
-			
-		<div>
-			<form th:action="@{/users/page/1}" class="form-inline m-3">
-				
-				<input type="hidden" name="sortField" th:value="${sortField}" />
-				<input type="hidden" name="sortDir" th:value="${sortDir}" />
-				Filter:&nbsp;
-				<input type="search" name="keyword" th:value="${keyword}" class="form-control" required/>
-				&nbsp;&nbsp;
-				<button type="submit" class="btn btn-primary">
-					<i class="fas fa-search"></i>
-				</button>
-				&nbsp;&nbsp;
-				<button type="button" class="btn btn-secondary" onclick="clearFilter()">
-					<i class="fas fa-eraser"></i>
-				</button>
-			</form>
-		
-		</div>
-
-			<!-- css class to display this table in large screens only , refer to static/style.css for more info-->
-			<div class="full-details">
-				<table class="table table-bordered table-striped table-hover table-responsive-xL">
-					<thead class="thead-dark">
-						<tr>
-							<!-- refer to templates/fragments.html for fragment code-->
-							
-							<th class="hideable-column">
-								<th th:replace="fragments :: column_link('id', 'User ID', 'tag')"/>
-							</th>
-							
-							<th>Photos</th>
-							
-							<th class="hideable-column">
-								<th th:replace="fragments :: column_link('email', 'Email', 'tag')"/>
-							</th>
-							
-							<th th:replace="fragments :: column_link('firstName', 'First Name', 'none')"/>
-							<th th:replace="fragments :: column_link('lastName', 'Last Name', 'none')"/>
-							<th>Roles</th>
-							<th th:replace="fragments :: column_link('enabled', 'Enabled', 'none')"/>
-							<th></th>
-						</tr>
-					</thead>
-					<tbody>
-						<tr th:each="user : ${listUsers}">
-							<td class="hideable-column">[[${user.id}]]</td>
-							<td>
-								<span th:if="${user.photos == null}" class="fas fa-portrait fa-3x icon-dark"></span>
-								<img th:if="${user.photos != null}" th:src="@{${user.photosImagePath}}"
-								style="width: 100px"/>
-							</td>
-							<td class="hideable-column">[[${user.email}]]</td>
-							<td>[[${user.firstName}]]</td>
-							<td>[[${user.lastName}]]</td>
-							<td>[[${user.roles}]]</td>
-							
-							<td>
-								<a th:if="${user.enabled == true}" class="fas fa-check-circle fa-2x icon-green" 
-								th:href="@{'/users/' + ${user.id} + '/enabled/false'}"
-								title="Disable this user"></a>
-								
-								<a th:if="${user.enabled == false}" class="fas fa-circle fa-2x icon-silver"
-								 th:href="@{'/users/' + ${user.id} + '/enabled/true'}"
-								 title="Enable this user"></a>
-							</td>
-							<td>
-									<a class="fas fa-edit fa-2x icon-green" th:href="@{'/users/edit/' + ${user.id}}"
-									title="edit this user"></a>
-									&nbsp; 
-									<a class="fas fa-trash fa-2x icon-dark link-delete" th:href="@{'/users/delete/' + ${user.id}}"
-									title="delete this user" th:userId="${user.id}"></a>
-							</td>
-						</tr>
-					</tbody>
-				</table>
-			</div>
-			
-			
-			<!-- css class to display this <div> on mobile screens only, refer to /static/style.css for more info-->
-			<div class="less-details">
-				
-				<div th:each="user : ${listUsers}" class="row m-1">
-					
-					<div class="col-4">
-						
-						<span th:if="${user.photos == null}" class="fas fa-portrait fa-3x icon-dark"></span>
-								<img th:if="${user.photos != null}" th:src="@{${user.photosImagePath}}"
-								style="width: 100px"/>
-					</div>
-					
-					<div class="col-8">
-						<div>[[${user.fullName}]]</div>
-						<div>[[${user.roles}]]</div>
-						<div class="mt-2">
-							<a th:if="${user.enabled == true}" class="fas fa-check-circle fa-2x icon-green" 
-								th:href="@{'/users/' + ${user.id} + '/enabled/false'}"
-								title="Disable this user"></a>
-								
-							<a th:if="${user.enabled == false}" class="fas fa-circle fa-2x icon-silver"
-								 th:href="@{'/users/' + ${user.id} + '/enabled/true'}"
-								 title="Enable this user"></a>
-						
-									&nbsp;
-							<a class="fas fa-edit fa-2x icon-green" th:href="@{'/users/edit/' + ${user.id}}"
-									title="edit this user"></a>
-									&nbsp; 
-							<a class="fas fa-trash fa-2x icon-dark link-delete" th:href="@{'/users/delete/' + ${user.id}}"
-									title="delete this user" th:userId="${user.id}"></a>
-						</div>
-					</div>
-					<div>&nbsp;</div>
-				</div>
-			</div>
-			
-			
-			<!-- IF -->
-			<div class="text-center m-1" th:if="${totalItems > 0}">
-				<span>Showing Users # [[${startCount}]] to [[${endCount}]] of [[${totalItems}]]</span>
-			</div>
-			
-			<!-- ELSE -->
-			<div class="text-center m-1" th:unless="${totalItems > 0}">
-				<span>No users found</span>
-			</div>
-			
-			<!-- only display pagination when there are users; else, no users no pagination -->
-			<div th:if="${totalPages > 1}">
-				<nav>
-					  <ul class="pagination justify-content-center flex-wrap">
-					  
-					  	<li th:class=" ${currentPage > 1 ? 'page-item' : 'page-item disabled'}">
-					  		<a th:replace="fragments :: page_link(1, 'First')"></a>
-				    	</li>
-					  
-					    <li th:class=" ${currentPage > 1 ? 'page-item' : 'page-item disabled'}">
-					    	<a th:replace="fragments :: page_link(${currentPage - 1 }, 'previous')"></a>
-				    	</li>
-					    	
-					    <!-- org.thymeleaf.expression.Numbers class, An object of this class is usually available in variable evaluation expressions with the name #numbers. -->
-					    <li th:class="${currentPage != i ? 'page-item' : 'page-item active'}" 
-					    	th:each="i : ${#numbers.sequence(1, totalPages)}">
-					    	<a th:replace="fragments :: page_link(${i}, ${i})"></a>
-					    </li>
-					    
-					    <li  th:class=" ${currentPage < totalPages ? 'page-item' : 'page-item disabled'}">
-					    	<a th:replace="fragments :: page_link(${currentPage + 1}, 'Next')"></a>
-					    </li>
-					    
-					    <li th:class=" ${currentPage < totalPages ? 'page-item' : 'page-item disabled'}">
-							<a th:replace="fragments :: page_link(${totalPages}, 'Last')"></a>		
-					    </li>
-					  </ul>
-				</nav>
-			</div>
-			
-			
-			
-			<div class="modal fade text-center" id="confirmModal">
-				<div class="modal-dialog">
-					<div class="modal-content">
-					
-						<div class="modal-header">
-							<h4 class="modal-title">Delete Confirmation</h4>
-							<button type="button" class="close" data-dismiss="modal">&times;</button>
-						</div>
-						
-						<div class="modal-body">
-							<span id="confirmText"></span>
-						</div>
-						
-						<div class="modal-footer">
-							<a class="btn btn-success" href="" id="yesButton">Yes</a>
-							<button type="button" class="btn btn-danger" data-dismiss="modal">Close</button>
-						</div>
-					</div>
-				</div>
-			</div>
-			
-			
-			<div class="text-center">
-				<p>Shopme Control Panel - Copyright &copy; Shopme</p>
-			</div>
-
-
-	</div>
-	
-<script type="text/javascript">
-
-//confirmation modal dialogue for delete user
-$(document).ready(function(){
-	$(".link-delete").on("click", function(e){
-		//stop the <a> tag default behaviour and pop out a confirmation modal dialogue
-		e.preventDefault();
-		//alert($(this).attr("href"));
-		link = $(this);
-		userId = link.attr("userId");
-		$("#yesButton").attr("href", link.attr("href"));
-		$("#confirmText").text("Are you sure you want to delete this user ID " + userId + "?");
-		$("#confirmModal").modal();
-	});
-});
-
-	function clearFilter(){
-		window.location = "[[@{/users}]]";
-	}
-
-
-</script>
-	
-</body>
-
-</html>
\ No newline at end of file
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/9e/704397fd22b4001d1216d7fff398b3d6 b/.metadata/.plugins/org.eclipse.core.resources/.history/9e/704397fd22b4001d1216d7fff398b3d6
deleted file mode 100644
index 5502069e..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/9e/704397fd22b4001d1216d7fff398b3d6
+++ /dev/null
@@ -1,84 +0,0 @@
-package com.shopme.admin.security;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-import java.util.Set;
-
-import org.springframework.security.core.GrantedAuthority;
-import org.springframework.security.core.authority.SimpleGrantedAuthority;
-import org.springframework.security.core.userdetails.UserDetails;
-
-import com.shopme.common.entity.Role;
-import com.shopme.common.entity.User;
-
-/*
- *  Think of it as a wrapper class for  Type User
- *  
- *  ShopmeUserDetailsService will use this dao class
- * 
- * */
-public class ShopmeUserDetails implements UserDetails {
-
-	private User user;
-
-	public ShopmeUserDetails(User user) {
-		this.user = user;
-	}
-
-	/* get a list of assigned roles to user */
-	@Override
-	public Collection<? extends GrantedAuthority> getAuthorities() {
-
-		Set<Role> roles = user.getRoles();
-
-		List<SimpleGrantedAuthority> authorities = new ArrayList<>();
-
-		for (Role role : roles) {
-			authorities.add(new SimpleGrantedAuthority(role.getName()));
-		}
-
-		return authorities;
-	}
-
-	@Override
-	public String getPassword() {
-		return user.getPassword();
-	}
-
-	@Override
-	public String getUsername() {
-		return user.getEmail();
-	}
-
-	// "true" means account not expired
-	@Override
-	public boolean isAccountNonExpired() {
-		return true;
-	}
-
-	@Override
-	public boolean isAccountNonLocked() {
-		// TODO Auto-generated method stub
-		return true;
-	}
-
-	@Override
-	public boolean isCredentialsNonExpired() {
-		// TODO Auto-generated method stub
-		return true;
-	}
-
-	@Override
-	public boolean isEnabled() {
-		// TODO Auto-generated method stub
-		return user.isEnabled();
-	}
-	
-	public String getFullname() {
-		
-		return this.user.getFirstName() + " " + user.getLastName();
-	}
-	
-
-}
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/9f/10f4a31f08b4001d128fb79045552177 b/.metadata/.plugins/org.eclipse.core.resources/.history/9f/10f4a31f08b4001d128fb79045552177
deleted file mode 100644
index 243ffe0c..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/9f/10f4a31f08b4001d128fb79045552177
+++ /dev/null
@@ -1,47 +0,0 @@
-package com.shopme.admin.security;
-
-import org.aspectj.weaver.ast.And;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.security.config.annotation.web.builders.HttpSecurity;
-import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
-import org.springframework.security.config.annotation.web.configuration.WebSecurityConfiguration;
-import org.springframework.security.config.annotation.web.configuration.WebSecurityCustomizer;
-import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
-import org.springframework.security.crypto.password.PasswordEncoder;
-import org.springframework.security.web.SecurityFilterChain;
-
-@Configuration
-@EnableWebSecurity
-public class WebSecurityConfig  {
-
-	/*
-	 *  refer to this link: https://www.codejava.net/frameworks/spring-boot/fix-websecurityconfigureradapter-deprecated
-	 * 
-	 */	
-	
-	@Bean
-	public PasswordEncoder PasswordEncoder() {
-		return new BCryptPasswordEncoder();
-	}
-	
-	@Bean
-	public SecurityFilterChain filterChain(HttpSecurity http) throws Exception {
-		
-		// any request need to be authenticated (require login)
-		//custom login page at "/login" - handler method in MainController class
-		http.authorizeHttpRequests().anyRequest().authenticated()
-			.and().formLogin().loginPage("/login").permitAll();
-		
-		return http.build();
-	}
-	
-	
-	@Bean
-    public WebSecurityCustomizer webSecurityCustomizer() {
-        web.ignoring().antMatchers("/images/**", "/js/**", "/webjars/**");
-    }
-	
-	
-	
-}
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/9f/90a9b2ba14b4001d128fb79045552177 b/.metadata/.plugins/org.eclipse.core.resources/.history/9f/90a9b2ba14b4001d128fb79045552177
deleted file mode 100644
index e69de29b..00000000
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/a/b0fcdeff76b3001d19bbb001c1a81c20 b/.metadata/.plugins/org.eclipse.core.resources/.history/a/b0fcdeff76b3001d19bbb001c1a81c20
deleted file mode 100644
index b13801b8..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/a/b0fcdeff76b3001d19bbb001c1a81c20
+++ /dev/null
@@ -1,183 +0,0 @@
-package com.shopme.admin.user;
-
-import java.io.IOException;
-import java.util.List;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.domain.Page;
-import org.springframework.data.repository.query.Param;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
-import org.springframework.util.StringUtils;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.ModelAttribute;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.multipart.MultipartFile;
-import org.springframework.web.servlet.mvc.support.RedirectAttributes;
-
-import com.fasterxml.jackson.annotation.ObjectIdGenerators.StringIdGenerator;
-import com.shopme.admin.FileUploadUtil;
-import com.shopme.common.entity.Role;
-import com.shopme.common.entity.User;
-
-import jakarta.servlet.http.HttpServletResponse;
-
-@Controller
-public class UserController {
-
-	@Autowired
-	private UserService service;
-
-	@GetMapping("/users")
-	public String listFirstPage(Model model) {
-
-		// NOTE: these are the default values for path variable and URL parameters
-		return listByPage(1, model, "firstName", "asc", null);
-	}
-
-	@GetMapping("/users/page/{pageNum}")
-	public String listByPage(@PathVariable(name = "pageNum") int pageNum, Model model,
-			@Param("sortField") String sortField, @Param("sortDir") String sortDir, @Param("keyword") String keyword) {
-
-		System.out.println("sort field: " + sortField);
-		System.out.println("sort order: " + sortDir);
-
-		Page<User> page = service.listByPage(pageNum, sortField, sortDir, keyword);
-		List<User> listUsers = page.getContent();
-
-		long startCount = (pageNum - 1) * UserService.USERS_PER_PAGE + 1;
-		long endCount = startCount + UserService.USERS_PER_PAGE - 1;
-		if (endCount > page.getTotalElements()) {
-			endCount = page.getTotalElements();
-		}
-
-		String reverseSortDir = sortDir.equals("asc") ? "desc" : "asc";
-
-		model.addAttribute("currentPage", pageNum);
-		model.addAttribute("totalPages", page.getTotalPages());
-		model.addAttribute("startCount", startCount);
-		model.addAttribute("endCount", endCount);
-		model.addAttribute("totalItems", page.getTotalElements());
-		model.addAttribute("listUsers", listUsers);
-		model.addAttribute("sortField", sortField);
-		model.addAttribute("sortDir", sortDir);
-		model.addAttribute("reverseSortDir", reverseSortDir);
-		model.addAttribute("keyword", keyword);
-
-		return "users";
-
-	}
-
-	@GetMapping("/users/new")
-	public String newUser(Model model) {
-
-		List<Role> listRoles = service.listRoles();
-
-		User user = new User();
-		user.setEnabled(true);
-
-		model.addAttribute("user", user);
-		model.addAttribute("listRoles", listRoles);
-		model.addAttribute("pageTitle", "Create New User");
-
-		return "user_form";
-
-	}
-
-	// using @RequestParam, we can get the image file input, the input has the
-	// property name="image"
-	@PostMapping("/users/save")
-	public String saveUser(@ModelAttribute("user") User user, RedirectAttributes redirectAttributes,
-			@RequestParam("image") MultipartFile multipartFile) throws IOException {
-
-		if (!multipartFile.isEmpty()) {
-
-			String fileName = StringUtils.cleanPath(multipartFile.getOriginalFilename());
-			user.setPhotos(fileName);
-
-			User savedUser = service.save(user);
-
-			String uploadDir = "user-photos/" + savedUser.getId();
-
-			FileUploadUtil.cleanDir(uploadDir);
-			FileUploadUtil.saveFile(uploadDir, fileName, multipartFile);
-		} else {
-
-			// set photo to null for getPhotosImagePath() method's conditional statement in
-			// User class
-			if (user.getPhotos().isEmpty())
-				user.setPhotos(null);
-			service.save(user);
-		}
-
-		redirectAttributes.addFlashAttribute("message", "the user has been saved successfully");
-
-		// POST/REDIRECT/GET web design
-		return getRedirectURLtoAffectedUser(user);
-	}
-
-	private String getRedirectURLtoAffectedUser(User user) {
-
-		// after user is saved display the user instead of the entire user list
-		// email is a unique field to identify each user.
-		String firstPartOfEmail = user.getEmail().split("@")[0];
-		return "redirect:/users/page/1?sortField=id&sortDir=asc&keyword=" + firstPartOfEmail;
-	}
-
-	@GetMapping("/users/edit/{id}")
-	public String editUser(@PathVariable(name = "id") Integer id, RedirectAttributes redirectAttributes, Model model) {
-		try {
-			User user = service.get(id);
-			List<Role> listRoles = service.listRoles();
-
-			model.addAttribute("user", user);
-			model.addAttribute("pageTitle", "Edit User (ID: " + id + ")");
-			model.addAttribute("listRoles", listRoles);
-
-			return "user_form";
-		} catch (UserNotFoundException ex) {
-			redirectAttributes.addFlashAttribute("message", ex.getMessage());
-
-			return "redirect:/users";
-		}
-
-	}
-
-	@GetMapping("/users/delete/{id}")
-	public String deleteUser(@PathVariable(name = "id") Integer id, RedirectAttributes redirectAttributes,
-			Model model) {
-		try {
-			service.delete(id);
-			redirectAttributes.addFlashAttribute("message", "The user ID " + id + " has been deleted successfully.");
-
-		} catch (UserNotFoundException ex) {
-			redirectAttributes.addFlashAttribute("message", ex.getMessage());
-
-		}
-
-		return "redirect:/users";
-	}
-
-	@GetMapping("/users/{id}/enabled/{status}")
-	public String updateUserEnabledStatus(@PathVariable(name = "id") Integer id,
-			@PathVariable(name = "status") boolean enabled, RedirectAttributes redirectAttributes) {
-
-		service.updateUserEnabledStatus(id, enabled);
-		String status = enabled ? "enabled" : "disabled";
-		String message = "The user id " + id + " has been " + status;
-		redirectAttributes.addFlashAttribute("message", message);
-
-		return "redirect:/users";
-	}
-
-	@GetMapping("/users/export/csv")
-	public void exportToCSV(HttpServletResponse response) throws IOException {
-
-		List<User> listUsers = service.listAll();
-		UserCsvExporter exporter = new UserCsvExporter();
-		exporter.export(listUsers, response);
-	}
-
-}
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/a0/80be9e140bb9001d11addcb4256c67f9 b/.metadata/.plugins/org.eclipse.core.resources/.history/a0/80be9e140bb9001d11addcb4256c67f9
new file mode 100644
index 00000000..5ef21c55
--- /dev/null
+++ b/.metadata/.plugins/org.eclipse.core.resources/.history/a0/80be9e140bb9001d11addcb4256c67f9
@@ -0,0 +1,57 @@
+package com.shopme.admin;
+
+import java.nio.file.Path;
+import java.nio.file.Paths;
+
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
+
+@Configuration
+public class MvcConfig implements WebMvcConfigurer {
+
+	
+	/*
+	 * In short, we can tell Spring MVC to map a given URL (e.g. "/user-photos") 
+	 * to any directory (e.g. D:/ShopmeProject/ShopmeBackend/user-photos) 
+	 * and expose the resources (images, js, css...) in this directory to 
+	 * the web clients (browsers) - that's the primary purpose
+	 *  of using resource handlers in Spring MVC.
+	 * 
+	 * Because the assets are not located in the src/main/resources/static folder
+	 * */
+	
+	@Override
+	public void addResourceHandlers(ResourceHandlerRegistry registry) {
+
+		String dirName = "user-photos";
+		
+		Path userPhotoDir = Paths.get(dirName);
+		
+		String userPhotosPath = userPhotoDir.toFile().getAbsolutePath();
+		
+		
+		// add /** to allow all files under this directory to be available to client
+		
+		registry.addResourceHandler("/" + dirName + "/**")
+		.addResourceLocations("file:/" + userPhotosPath + "/");
+		
+		
+		String categoryImagesDirName = "category-images";
+		
+		Path categoryImagesDir = Paths.get(categoryImagesDirName);
+		
+		String userPhotosPath = userPhotoDir.toFile().getAbsolutePath();
+		
+		
+		// add /** to allow all files under this directory to be available to client
+		
+		registry.addResourceHandler("/" + dirName + "/**")
+		.addResourceLocations("file:/" + userPhotosPath + "/");
+		
+	}
+	
+	
+	
+	
+}
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/a0/d0b274b789b9001d14fea12e82c90085 b/.metadata/.plugins/org.eclipse.core.resources/.history/a0/d0b274b789b9001d14fea12e82c90085
new file mode 100644
index 00000000..d86849ef
--- /dev/null
+++ b/.metadata/.plugins/org.eclipse.core.resources/.history/a0/d0b274b789b9001d14fea12e82c90085
@@ -0,0 +1,125 @@
+package com.shopme.admin.category;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Set;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.repository.support.Repositories;
+import org.springframework.stereotype.Service;
+
+import com.shopme.common.entity.Category;
+
+@Service
+public class CategoryService {
+
+	@Autowired
+	private CategoryRepository repo;
+
+	public List<Category> listAll() {
+
+		List<Category> rootCategories = repo.findRootCategories();
+
+		return listHierarchicalCategories(rootCategories);
+	}
+
+	private List<Category> listHierarchicalCategories(List<Category> rootCategories) {
+
+		List<Category> hierarchicalCategories = new ArrayList<>();
+
+		for (Category rootCategory : rootCategories) {
+			hierarchicalCategories.add(Category.copyFull(rootCategory));
+
+			Set<Category> children = rootCategory.getChildren();
+
+			for (Category subCategory : children) {
+				String name = "--" + subCategory.getName();
+				hierarchicalCategories.add(Category.copyFull(subCategory, name));
+				
+				listHierarchicalCategories(hierarchicalCategories, subCategory, 1);
+			}
+		}
+
+		return hierarchicalCategories;
+
+	}
+
+	// recursive method
+	private void listHierarchicalCategories(List<Category> hierarchicalCategories, Category parent, int subLevel) {
+
+		Set<Category> children = parent.getChildren();
+		int newSubLevel = subLevel + 1;
+
+		for (Category subCategory : children) {
+
+			String name = "";
+			for (int i = 0; i < newSubLevel; i++) {
+				name += "--";
+			}
+
+			name += subCategory.getName();
+			hierarchicalCategories.add(Category.copyFull(subCategory, name));
+
+			listHierarchicalCategories(hierarchicalCategories, subCategory, newSubLevel);
+
+		}
+
+	}
+
+	public Category save(Category category) {
+		return repo.save(category);
+	}
+
+	public List<Category> listCategoriesUsedInForm() {
+
+		List<Category> categoriesUsedInForm = new ArrayList<>();
+
+		Iterable<Category> categoriesInDB = repo.findAll();
+
+		for (Category category : categoriesInDB) {
+
+			// root category
+			if (category.getParent() == null) {
+				categoriesUsedInForm.add(Category.copyIdAndName(category));
+
+				category.getChildren().forEach(subCategory -> {
+					String name = "--" + subCategory.getName();
+
+					categoriesUsedInForm.add(Category.copyIdAndName(subCategory.getId(), name));
+					listSubCategoriesUsedInForm(categoriesUsedInForm, subCategory, 1);
+				});
+			}
+
+		}
+
+		return categoriesUsedInForm;
+	}
+
+	// recursive method
+	private void listSubCategoriesUsedInForm(List<Category> categoriesUsedInForm, Category parent, int subLevel) {
+
+		int newSubLevel = subLevel + 1;
+		Set<Category> children = parent.getChildren();
+
+		for (Category subCategory : children) {
+
+			String name = "";
+			for (int i = 0; i < newSubLevel; i++) {
+				name += "--";
+			}
+			name += subCategory.getName();
+			categoriesUsedInForm.add(Category.copyIdAndName(subCategory.getId(), name));
+
+			listSubCategoriesUsedInForm(categoriesUsedInForm, subCategory, newSubLevel);
+		}
+
+	}
+	
+	
+	public Category get(Integer id) throws CategoryNotFoundException {
+
+		repo.findById(id).get();
+		
+	}
+
+}
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/a0/f050330b88b3001d19bbb001c1a81c20 b/.metadata/.plugins/org.eclipse.core.resources/.history/a0/f050330b88b3001d19bbb001c1a81c20
deleted file mode 100644
index a90799e7..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/a0/f050330b88b3001d19bbb001c1a81c20
+++ /dev/null
@@ -1,19 +0,0 @@
-*.icon-white{color: white}
-*.icon-silver{color: silver}
-*.icon-green{color: green}
-*.icon-dark{color: gray}
-*.icon-red{color: red}
-
-
-@media screen and (max-width: 768px) {
-	/* small screen */
-}
-
-@media screen and (min-width: 768px) and (max-width: 1024px) {
-	/* medium screen */
-}
-
-
-@media screen and (mini-width: 1024px) {
-	/* small screen */
-}
\ No newline at end of file
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/a1/e080e5b889b9001d14fea12e82c90085 b/.metadata/.plugins/org.eclipse.core.resources/.history/a1/e080e5b889b9001d14fea12e82c90085
new file mode 100644
index 00000000..a974ed92
--- /dev/null
+++ b/.metadata/.plugins/org.eclipse.core.resources/.history/a1/e080e5b889b9001d14fea12e82c90085
@@ -0,0 +1,131 @@
+package com.shopme.admin.category;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.NoSuchElementException;
+import java.util.Set;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.repository.support.Repositories;
+import org.springframework.stereotype.Service;
+
+import com.shopme.common.entity.Category;
+
+@Service
+public class CategoryService {
+
+	@Autowired
+	private CategoryRepository repo;
+
+	public List<Category> listAll() {
+
+		List<Category> rootCategories = repo.findRootCategories();
+
+		return listHierarchicalCategories(rootCategories);
+	}
+
+	private List<Category> listHierarchicalCategories(List<Category> rootCategories) {
+
+		List<Category> hierarchicalCategories = new ArrayList<>();
+
+		for (Category rootCategory : rootCategories) {
+			hierarchicalCategories.add(Category.copyFull(rootCategory));
+
+			Set<Category> children = rootCategory.getChildren();
+
+			for (Category subCategory : children) {
+				String name = "--" + subCategory.getName();
+				hierarchicalCategories.add(Category.copyFull(subCategory, name));
+
+				listHierarchicalCategories(hierarchicalCategories, subCategory, 1);
+			}
+		}
+
+		return hierarchicalCategories;
+
+	}
+
+	// recursive method
+	private void listHierarchicalCategories(List<Category> hierarchicalCategories, Category parent, int subLevel) {
+
+		Set<Category> children = parent.getChildren();
+		int newSubLevel = subLevel + 1;
+
+		for (Category subCategory : children) {
+
+			String name = "";
+			for (int i = 0; i < newSubLevel; i++) {
+				name += "--";
+			}
+
+			name += subCategory.getName();
+			hierarchicalCategories.add(Category.copyFull(subCategory, name));
+
+			listHierarchicalCategories(hierarchicalCategories, subCategory, newSubLevel);
+
+		}
+
+	}
+
+	public Category save(Category category) {
+		return repo.save(category);
+	}
+
+	public List<Category> listCategoriesUsedInForm() {
+
+		List<Category> categoriesUsedInForm = new ArrayList<>();
+
+		Iterable<Category> categoriesInDB = repo.findAll();
+
+		for (Category category : categoriesInDB) {
+
+			// root category
+			if (category.getParent() == null) {
+				categoriesUsedInForm.add(Category.copyIdAndName(category));
+
+				category.getChildren().forEach(subCategory -> {
+					String name = "--" + subCategory.getName();
+
+					categoriesUsedInForm.add(Category.copyIdAndName(subCategory.getId(), name));
+					listSubCategoriesUsedInForm(categoriesUsedInForm, subCategory, 1);
+				});
+			}
+
+		}
+
+		return categoriesUsedInForm;
+	}
+
+	// recursive method
+	private void listSubCategoriesUsedInForm(List<Category> categoriesUsedInForm, Category parent, int subLevel) {
+
+		int newSubLevel = subLevel + 1;
+		Set<Category> children = parent.getChildren();
+
+		for (Category subCategory : children) {
+
+			String name = "";
+			for (int i = 0; i < newSubLevel; i++) {
+				name += "--";
+			}
+			name += subCategory.getName();
+			categoriesUsedInForm.add(Category.copyIdAndName(subCategory.getId(), name));
+
+			listSubCategoriesUsedInForm(categoriesUsedInForm, subCategory, newSubLevel);
+		}
+
+	}
+
+	public Category get(Integer id) throws CategoryNotFoundException {
+
+		try {
+			return repo.findById(id).get();
+
+		} catch (NoSuchElementException ex) {
+
+			throw new CategoryNotFoundException("could not find any category with the integer: " + id);
+		}
+S
+	}
+
+}
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/a2/0075215705b4001d128fb79045552177 b/.metadata/.plugins/org.eclipse.core.resources/.history/a2/0075215705b4001d128fb79045552177
deleted file mode 100644
index e13fda86..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/a2/0075215705b4001d128fb79045552177
+++ /dev/null
@@ -1,22 +0,0 @@
-package com.shopme.admin;
-
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.GetMapping;
-
-@Controller
-public class MainController {
-
-	@GetMapping("")
-	public String viewHomePage() {
-		return "index";
-	}
-	
-	
-	@GetMapping("/login")
-	public String viewHomePage() {
-		return "index";
-	}
-	
-	
-	
-}
\ No newline at end of file
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/a2/90bce4387ab3001d19bbb001c1a81c20 b/.metadata/.plugins/org.eclipse.core.resources/.history/a2/90bce4387ab3001d19bbb001c1a81c20
deleted file mode 100644
index d59113e5..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/a2/90bce4387ab3001d19bbb001c1a81c20
+++ /dev/null
@@ -1,37 +0,0 @@
-//package com.shopme.admin.user;
-//
-//import java.io.IOException;
-//import java.text.DateFormat;
-//import java.text.SimpleDateFormat;
-//import java.util.Date;
-//import java.util.List;
-//
-//import org.supercsv.io.CsvBeanWriter;
-//import org.supercsv.io.ICsvBeanWriter;
-//import org.supercsv.prefs.CsvPreference;
-//
-//import com.shopme.common.entity.User;
-//
-//import jakarta.servlet.http.HttpServletResponse;
-//
-//public class UserCsvExporter extends AbstractExporter {
-//
-//	public void export(List<User> listUsers, HttpServletResponse response) throws IOException {
-//		
-//		
-//		
-//		ICsvBeanWriter csvWriter = new CsvBeanWriter(response.getWriter(), CsvPreference.STANDARD_PREFERENCE);
-//		
-//		String[] csvHeader = {"User ID", "E-mail", "First Name", "Last Name", "Roles", "Enabled"};
-//		String[] fieldMapping = {"id", "email", "firstName", "lastName", "roles", "enabled"};
-//		
-//		csvWriter.writeHeader(csvHeader);
-//		
-//		for (User user : listUsers) {
-//			csvWriter.write(user, fieldMapping);
-//		}
-//		
-//		csvWriter.close();
-//	}
-//	
-//}
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/a2/b09926430db9001d11addcb4256c67f9 b/.metadata/.plugins/org.eclipse.core.resources/.history/a2/b09926430db9001d11addcb4256c67f9
new file mode 100644
index 00000000..52608403
--- /dev/null
+++ b/.metadata/.plugins/org.eclipse.core.resources/.history/a2/b09926430db9001d11addcb4256c67f9
@@ -0,0 +1,206 @@
+<!DOCTYPE html>
+<html xmlns:th="http://www.thymeleaf.org">
+
+<head th:replace="fragments :: page_head('Categories - Shopme Admin')"/>
+
+<body>
+	<div class="container-fluid">
+		
+		<!-- navigation bar -->
+		<div th:replace="navigation :: menu"></div>
+
+		<div>
+			<h2>Manage Categories</h2>
+			<a th:href="@{/categories/new}" class="fas fa-folder-plus fa-2x icon-dark mr-2"></a>
+			
+			<a th:href="@{/categories/export/csv}" class="fas fa-file-csv fa-2x icon-dark mr-2"></a>
+		</div>
+		
+		<!-- redirect message from controller -->
+		<div th:if="${message != null}" class="alert alert-success text-center">
+			[[${message}]]
+		</div>
+		
+			
+		<div>
+			<form th:action="@{/categories/page/1}" class="form-inline m-3">
+				
+				Filter:&nbsp;
+				<input type="search" name="keyword" th:value="${keyword}" class="form-control" required/>
+				&nbsp;&nbsp;
+				<button type="submit" class="btn btn-primary">
+					<i class="fas fa-search"></i>
+				</button>
+				&nbsp;&nbsp;
+				<button type="button" class="btn btn-secondary" onclick="clearFilter()">
+					<i class="fas fa-eraser"></i>
+				</button>
+			</form>
+		
+		</div>
+
+			<!-- css class to display this table in large screens only , refer to static/style.css for more info-->
+			<div class="full-details">
+				<table class="table table-bordered table-striped table-hover table-responsive-xL">
+					<thead class="thead-dark">
+						<tr>
+							<th>ID</th>
+							<th>Category Image</th>
+							<th>Category Name</th>
+							<th>Alias</th>
+							<th>Enabled</th>
+							<th></th>
+						</tr>
+					</thead>
+					<tbody>
+						<tr th:each="cat : ${listCategories}">
+							<td>[[${cat.id}]]</td>
+							<td>	
+								<img th:src="@{${cat.imagePath}}" style="width: 100px;"/>
+							</td>
+							<td>[[${cat.name}]]</td>
+							<td>[[${cat.alias}]]</td>
+							<td>
+								<div th:replace="fragments :: category_status"></div>
+							</td>
+							<td>
+								<div th:replace="fragments :: category_actions"></div>
+							</td>
+						</tr>
+					</tbody>
+				</table>
+			</div>
+			
+			
+			<!-- css class to display this <div> on mobile screens only, refer to /static/style.css for more info-->
+			<div class="less-details">
+				
+				<div th:each="user : ${listUsers}" class="row m-1">
+					
+					<div class="col-4">
+						
+						<span th:if="${user.photos == null}" class="fas fa-portrait fa-3x icon-dark"></span>
+								<img th:if="${user.photos != null}" th:src="@{${user.photosImagePath}}"
+								style="width: 100px"/>
+					</div>
+					
+					<div class="col-8">
+						<div>[[${user.fullName}]]</div>
+						<div>[[${user.roles}]]</div>
+						<div class="mt-2">
+							<a th:if="${user.enabled == true}" class="fas fa-check-circle fa-2x icon-green" 
+								th:href="@{'/users/' + ${user.id} + '/enabled/false'}"
+								title="Disable this user"></a>
+								
+							<a th:if="${user.enabled == false}" class="fas fa-circle fa-2x icon-silver"
+								 th:href="@{'/users/' + ${user.id} + '/enabled/true'}"
+								 title="Enable this user"></a>
+						
+									&nbsp;
+							<a class="fas fa-edit fa-2x icon-green" th:href="@{'/users/edit/' + ${user.id}}"
+									title="edit this user"></a>
+									&nbsp; 
+							<a class="fas fa-trash fa-2x icon-dark link-delete" th:href="@{'/users/delete/' + ${user.id}}"
+									title="delete this user" th:userId="${user.id}"></a>
+						</div>
+					</div>
+					<div>&nbsp;</div>
+				</div>
+			</div>
+			
+			
+			<!-- IF -->
+			<div class="text-center m-1" th:if="${totalItems > 0}">
+				<span>Showing Users # [[${startCount}]] to [[${endCount}]] of [[${totalItems}]]</span>
+			</div>
+			
+			<!-- ELSE -->
+			<div class="text-center m-1" th:unless="${totalItems > 0}">
+				<span>No users found</span>
+			</div>
+			
+			<!-- only display pagination when there are users; else, no users no pagination -->
+			<div th:if="${totalPages > 1}">
+				<nav>
+					  <ul class="pagination justify-content-center flex-wrap">
+					  
+					  	<li th:class=" ${currentPage > 1 ? 'page-item' : 'page-item disabled'}">
+					  		<a th:replace="fragments :: page_link(1, 'First')"></a>
+				    	</li>
+					  
+					    <li th:class=" ${currentPage > 1 ? 'page-item' : 'page-item disabled'}">
+					    	<a th:replace="fragments :: page_link(${currentPage - 1 }, 'previous')"></a>
+				    	</li>
+					    	
+					    <!-- org.thymeleaf.expression.Numbers class, An object of this class is usually available in variable evaluation expressions with the name #numbers. -->
+					    <li th:class="${currentPage != i ? 'page-item' : 'page-item active'}" 
+					    	th:each="i : ${#numbers.sequence(1, totalPages)}">
+					    	<a th:replace="fragments :: page_link(${i}, ${i})"></a>
+					    </li>
+					    
+					    <li  th:class=" ${currentPage < totalPages ? 'page-item' : 'page-item disabled'}">
+					    	<a th:replace="fragments :: page_link(${currentPage + 1}, 'Next')"></a>
+					    </li>
+					    
+					    <li th:class=" ${currentPage < totalPages ? 'page-item' : 'page-item disabled'}">
+							<a th:replace="fragments :: page_link(${totalPages}, 'Last')"></a>		
+					    </li>
+					  </ul>
+				</nav>
+			</div>
+			
+			
+			
+			<div class="modal fade text-center" id="confirmModal">
+				<div class="modal-dialog">
+					<div class="modal-content">
+					
+						<div class="modal-header">
+							<h4 class="modal-title">Delete Confirmation</h4>
+							<button type="button" class="close" data-dismiss="modal">&times;</button>
+						</div>
+						
+						<div class="modal-body">
+							<span id="confirmText"></span>
+						</div>
+						
+						<div class="modal-footer">
+							<a class="btn btn-success" href="" id="yesButton">Yes</a>
+							<button type="button" class="btn btn-danger" data-dismiss="modal">Close</button>
+						</div>
+					</div>
+				</div>
+			</div>
+			
+			<!-- footer -->
+			<div th:replace="fragments :: footer"></div>
+
+
+	</div>
+	
+<script type="text/javascript">
+
+//confirmation modal dialogue for delete user
+$(document).ready(function(){
+	$(".link-delete").on("click", function(e){
+		//stop the <a> tag default behaviour and pop out a confirmation modal dialogue
+		e.preventDefault();
+		//alert($(this).attr("href"));
+		link = $(this);
+		userId = link.attr("userId");
+		$("#yesButton").attr("href", link.attr("href"));
+		$("#confirmText").text("Are you sure you want to delete this user ID " + userId + "?");
+		$("#confirmModal").modal();
+	});
+});
+
+	function clearFilter(){
+		window.location = "[[@{/users}]]";
+	}
+
+
+</script>
+	
+</body>
+
+</html>
\ No newline at end of file
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/a3/305a51c407b4001d128fb79045552177 b/.metadata/.plugins/org.eclipse.core.resources/.history/a3/305a51c407b4001d128fb79045552177
deleted file mode 100644
index cf78f7f0..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/a3/305a51c407b4001d128fb79045552177
+++ /dev/null
@@ -1,46 +0,0 @@
-package com.shopme.admin.security;
-
-import org.aspectj.weaver.ast.And;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.security.config.annotation.web.builders.HttpSecurity;
-import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
-import org.springframework.security.config.annotation.web.configuration.WebSecurityConfiguration;
-import org.springframework.security.config.annotation.web.configuration.WebSecurityCustomizer;
-import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
-import org.springframework.security.crypto.password.PasswordEncoder;
-import org.springframework.security.web.SecurityFilterChain;
-
-@Configuration
-@EnableWebSecurity
-public class WebSecurityConfig  {
-
-	/*
-	 *  refer to this link: https://www.codejava.net/frameworks/spring-boot/fix-websecurityconfigureradapter-deprecated
-	 * 
-	 */	
-	
-	@Bean
-	public PasswordEncoder PasswordEncoder() {
-		return new BCryptPasswordEncoder();
-	}
-	
-	@Bean
-	public SecurityFilterChain filterChain(HttpSecurity http) throws Exception {
-		
-		// any request need to be authenticated (require login)
-		//custom login page at "/login" - handler method in MainController class
-		http.authorizeHttpRequests().anyRequest().authenticated()
-			.and().formLogin().loginPage("/login").permitAll();
-		
-		return http.build();
-	}
-	
-	@Bean
-    public WebSecurityCustomizer webSecurityCustomizer() {
-        return (web) -> web.ignoring().antMatchers("/images/**", "/js/**", "/webjars/**");
-    }
-	
-	
-	
-}
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/a3/40e365e952b4001d1d079a924effdc9e b/.metadata/.plugins/org.eclipse.core.resources/.history/a3/40e365e952b4001d1d079a924effdc9e
deleted file mode 100644
index ac620dd0..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/a3/40e365e952b4001d1d079a924effdc9e
+++ /dev/null
@@ -1,24 +0,0 @@
-$(document).ready(function(){
-		$("#logoutLink").on("click", function(e){
-			e.preventDefault(); /* stop the hyperlink default behaviour  */
-			
-			/* use  the form to  log out and navigate to the url path /logout  
-			
-			 NOTE: spring security requires a POST request form to logout in order to obtain the csrf token, 
-			 		the csrf token is a hidden property in the form
-			*/
-			document.logoutForm.submit();
-		});
-		
-		customizeDropDownMenu();
-	});
-	
-	
-function customizeDropDownMenu() {
-	
-	$(".dropdown > a").click(function() {
-		
-	});
-	
-}
-	
\ No newline at end of file
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/a3/d0c01bc38db3001d19bbb001c1a81c20 b/.metadata/.plugins/org.eclipse.core.resources/.history/a3/d0c01bc38db3001d19bbb001c1a81c20
deleted file mode 100644
index b770ed39..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/a3/d0c01bc38db3001d19bbb001c1a81c20
+++ /dev/null
@@ -1,30 +0,0 @@
-*.icon-white{color: white}
-*.icon-silver{color: silver}
-*.icon-green{color: green}
-*.icon-dark{color: gray}
-*.icon-red{color: red}
-
-
-
-@media screen and (max-width: 768px) {
-	/* small screen eg:mobile*/
-	
-	div.full-details{ display: none;}
-	div.less-details{ display: block;}
-	
-}
-
-@media screen and (min-width: 768px) and (max-width: 1024px) {
-	/* medium screen eg:tablet*/
-	
-	div.full-details{ display: block;}
-	div.less-details{ display: none;}
-}
-
-
-@media screen and (min-width: 1024px) {
-	/* large screen eg:laptop*/
-	
-	div.less-details{ display: none;}
-	
-}
\ No newline at end of file
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/a4/00428b3522b4001d1216d7fff398b3d6 b/.metadata/.plugins/org.eclipse.core.resources/.history/a4/00428b3522b4001d1216d7fff398b3d6
deleted file mode 100644
index 62fc5091..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/a4/00428b3522b4001d1216d7fff398b3d6
+++ /dev/null
@@ -1,77 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-	<parent>
-		<groupId>org.springframework.boot</groupId>
-		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>3.0.2</version>
-		<relativePath /> <!-- lookup parent from repository -->
-	</parent>
-	<groupId>com.shopme</groupId>
-	<artifactId>ShopmeWebParent</artifactId>
-	<version>0.0.1-SNAPSHOT</version>
-	<name>ShopmeWebParent</name>
-	<packaging>pom</packaging>
-	<description>parent spring web project</description>
-	<properties>
-		<java.version>15</java.version>
-	</properties>
-	<modules>
-		<module>ShopmeBackEnd</module>
-		<module>ShopmeFrontEnd</module>
-	</modules>
-	<dependencies>
-		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-web</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-security</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-thymeleaf</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>mysql</groupId>
-			<artifactId>mysql-connector-java</artifactId>
-			<scope>runtime</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-data-jpa</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-test</artifactId>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.webjars</groupId>
-			<artifactId>bootstrap</artifactId>
-			<version>4.3.1</version>
-		</dependency>
-		<dependency>
-			<groupId>org.webjars</groupId>
-			<artifactId>jquery</artifactId>
-			<version>3.4.1</version>
-		</dependency>
-		<!--dependency for discovery and reference of webjars (bootstrap & jquery)-->
-		<dependency>
-			<groupId>org.webjars</groupId>
-			<artifactId>webjars-locator-core</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>com.shopme</groupId>
-			<artifactId>ShopmeCommon</artifactId>
-			<version>0.0.1-SNAPSHOT</version>
-		</dependency>
-		<dependency>
-			<groupId>org.thymeleaf.extras</groupId>
-			<artifactId>thymeleaf-extras-springsecurity5</artifactId>
-			<version>3.0.4.RELEASE</version>
-		</dependency>
-	</dependencies>
-</project>
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/a4/20dd130a0ab4001d128fb79045552177 b/.metadata/.plugins/org.eclipse.core.resources/.history/a4/20dd130a0ab4001d128fb79045552177
deleted file mode 100644
index 8c229541..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/a4/20dd130a0ab4001d128fb79045552177
+++ /dev/null
@@ -1,34 +0,0 @@
-<!DOCTYPE html>
-<html xmlns:th="http://www.thymeleaf.org">
-
-<head>
-	<meta http-equiv="Content-Type" content="text/html; charset= UTF-8">
-	<meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0">
-	<title>Login - Shopme Admin</title>
-	<link rel="stylesheet" type="text/css" th:href="@{/webjars/bootstrap/css/bootstrap.min.css}" />
-</head>
-
-<body>
-	<div class="container-fluid text-center">
-		
-		<div>
-			<img th:src="@{/images/ShopmeAdminBig.png}" />
-		</div>
-		
-		<form th:action="@{/login}" method="post">
-		
-			<div class="border border-secondary rounded">
-				<p>Access to Shopme Control Panel </p>
-			</div>
-		
-		</form>
-
-		<div>
-			<p>Shopme Control Panel - Copyright &copy; Shopme</p>
-		</div>
-
-	</div>
-
-</body>
-
-</html>
\ No newline at end of file
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/a4/70c991c507b4001d128fb79045552177 b/.metadata/.plugins/org.eclipse.core.resources/.history/a4/70c991c507b4001d128fb79045552177
deleted file mode 100644
index a838b3fc..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/a4/70c991c507b4001d128fb79045552177
+++ /dev/null
@@ -1,46 +0,0 @@
-package com.shopme.admin.security;
-
-import org.aspectj.weaver.ast.And;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.security.config.annotation.web.builders.HttpSecurity;
-import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
-import org.springframework.security.config.annotation.web.configuration.WebSecurityConfiguration;
-import org.springframework.security.config.annotation.web.configuration.WebSecurityCustomizer;
-import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
-import org.springframework.security.crypto.password.PasswordEncoder;
-import org.springframework.security.web.SecurityFilterChain;
-
-@Configuration
-@EnableWebSecurity
-public class WebSecurityConfig  {
-
-	/*
-	 *  refer to this link: https://www.codejava.net/frameworks/spring-boot/fix-websecurityconfigureradapter-deprecated
-	 * 
-	 */	
-	
-	@Bean
-	public PasswordEncoder PasswordEncoder() {
-		return new BCryptPasswordEncoder();
-	}
-	
-	@Bean
-	public SecurityFilterChain filterChain(HttpSecurity http) throws Exception {
-		
-		// any request need to be authenticated (require login)
-		//custom login page at "/login" - handler method in MainController class
-		http.authorizeHttpRequests().anyRequest().authenticated()
-			.and().formLogin().loginPage("/login").permitAll();
-		
-		return http.build();
-	}
-	
-	@Bean
-    public WebSecurityCustomizer webSecurityCustomizer() {
-//        return (web) -> web.ignoring().antMatchers("/images/**", "/js/**", "/webjars/**");
-    }
-	
-	
-	
-}
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/a4/90a54ebdc4b9001d10d0f9513979f945 b/.metadata/.plugins/org.eclipse.core.resources/.history/a4/90a54ebdc4b9001d10d0f9513979f945
new file mode 100644
index 00000000..56a32ccb
--- /dev/null
+++ b/.metadata/.plugins/org.eclipse.core.resources/.history/a4/90a54ebdc4b9001d10d0f9513979f945
@@ -0,0 +1,206 @@
+<!DOCTYPE html>
+<html xmlns:th="http://www.thymeleaf.org">
+
+<head th:replace="fragments :: page_head('Categories - Shopme Admin')"/>
+
+<body>
+	<div class="container-fluid">
+		
+		<!-- navigation bar -->
+		<div th:replace="navigation :: menu"></div>
+
+		<div>
+			<h2>Manage Categories</h2>
+			<a th:href="@{/categories/new}" class="fas fa-folder-plus fa-2x icon-dark mr-2"></a>
+			
+			<a th:href="@{/categories/export/csv}" class="fas fa-file-csv fa-2x icon-dark mr-2"></a>
+		</div>
+		
+		<!-- redirect message from controller -->
+		<div th:if="${message != null}" class="alert alert-success text-center">
+			[[${message}]]
+		</div>
+		
+			
+		<div>
+			<form th:action="@{/categories/page/1}" class="form-inline m-3">
+				
+				Filter:&nbsp;
+				<input type="search" name="keyword" th:value="${keyword}" class="form-control" required/>
+				&nbsp;&nbsp;
+				<button type="submit" class="btn btn-primary">
+					<i class="fas fa-search"></i>
+				</button>
+				&nbsp;&nbsp;
+				<button type="button" class="btn btn-secondary" onclick="clearFilter()">
+					<i class="fas fa-eraser"></i>
+				</button>
+			</form>
+		
+		</div>
+
+			<!-- css class to display this table in large screens only , refer to static/style.css for more info-->
+			<div class="full-details">
+				<table class="table table-bordered table-striped table-hover table-responsive-xL">
+					<thead class="thead-dark">
+						<tr>
+							<th>ID</th>
+							<th>Category Image</th>
+							<th>Category Name</th>
+							<th>Alias</th>
+							<th>Enabled</th>
+							<th></th>
+						</tr>
+					</thead>
+					<tbody>
+						<tr th:each="cat : ${listCategories}">
+							<td>[[${cat.id}]]</td>
+							<td>	
+								<img th:src="@{${cat.imagePath}}" style="width: 100px;" class="image-fluid"/>
+							</td>
+							<td>[[${cat.name}]]</td>
+							<td>[[${cat.alias}]]</td>
+							<td>
+								<div th:replace="fragments :: category_status"></div>
+							</td>
+							<td>
+								<div th:replace="fragments :: category_actions"></div>
+							</td>
+						</tr>
+					</tbody>
+				</table>
+			</div>
+			
+			
+			<!-- css class to display this <div> on mobile screens only, refer to /static/style.css for more info-->
+			<div class="less-details">
+				
+				<div th:each="user : ${listUsers}" class="row m-1">
+					
+					<div class="col-4">
+						
+						<span th:if="${user.photos == null}" class="fas fa-portrait fa-3x icon-dark"></span>
+								<img th:if="${user.photos != null}" th:src="@{${user.photosImagePath}}"
+								style="width: 100px"/>
+					</div>
+					
+					<div class="col-8">
+						<div>[[${user.fullName}]]</div>
+						<div>[[${user.roles}]]</div>
+						<div class="mt-2">
+							<a th:if="${user.enabled == true}" class="fas fa-check-circle fa-2x icon-green" 
+								th:href="@{'/users/' + ${user.id} + '/enabled/false'}"
+								title="Disable this user"></a>
+								
+							<a th:if="${user.enabled == false}" class="fas fa-circle fa-2x icon-silver"
+								 th:href="@{'/users/' + ${user.id} + '/enabled/true'}"
+								 title="Enable this user"></a>
+						
+									&nbsp;
+							<a class="fas fa-edit fa-2x icon-green" th:href="@{'/users/edit/' + ${user.id}}"
+									title="edit this user"></a>
+									&nbsp; 
+							<a class="fas fa-trash fa-2x icon-dark link-delete" th:href="@{'/users/delete/' + ${user.id}}"
+									title="delete this user" th:userId="${user.id}"></a>
+						</div>
+					</div>
+					<div>&nbsp;</div>
+				</div>
+			</div>
+			
+			
+			<!-- IF -->
+			<div class="text-center m-1" th:if="${totalItems > 0}">
+				<span>Showing Users # [[${startCount}]] to [[${endCount}]] of [[${totalItems}]]</span>
+			</div>
+			
+			<!-- ELSE -->
+			<div class="text-center m-1" th:unless="${totalItems > 0}">
+				<span>No users found</span>
+			</div>
+			
+			<!-- only display pagination when there are users; else, no users no pagination -->
+			<div th:if="${totalPages > 1}">
+				<nav>
+					  <ul class="pagination justify-content-center flex-wrap">
+					  
+					  	<li th:class=" ${currentPage > 1 ? 'page-item' : 'page-item disabled'}">
+					  		<a th:replace="fragments :: page_link(1, 'First')"></a>
+				    	</li>
+					  
+					    <li th:class=" ${currentPage > 1 ? 'page-item' : 'page-item disabled'}">
+					    	<a th:replace="fragments :: page_link(${currentPage - 1 }, 'previous')"></a>
+				    	</li>
+					    	
+					    <!-- org.thymeleaf.expression.Numbers class, An object of this class is usually available in variable evaluation expressions with the name #numbers. -->
+					    <li th:class="${currentPage != i ? 'page-item' : 'page-item active'}" 
+					    	th:each="i : ${#numbers.sequence(1, totalPages)}">
+					    	<a th:replace="fragments :: page_link(${i}, ${i})"></a>
+					    </li>
+					    
+					    <li  th:class=" ${currentPage < totalPages ? 'page-item' : 'page-item disabled'}">
+					    	<a th:replace="fragments :: page_link(${currentPage + 1}, 'Next')"></a>
+					    </li>
+					    
+					    <li th:class=" ${currentPage < totalPages ? 'page-item' : 'page-item disabled'}">
+							<a th:replace="fragments :: page_link(${totalPages}, 'Last')"></a>		
+					    </li>
+					  </ul>
+				</nav>
+			</div>
+			
+			
+			
+			<div class="modal fade text-center" id="confirmModal">
+				<div class="modal-dialog">
+					<div class="modal-content">
+					
+						<div class="modal-header">
+							<h4 class="modal-title">Delete Confirmation</h4>
+							<button type="button" class="close" data-dismiss="modal">&times;</button>
+						</div>
+						
+						<div class="modal-body">
+							<span id="confirmText"></span>
+						</div>
+						
+						<div class="modal-footer">
+							<a class="btn btn-success" href="" id="yesButton">Yes</a>
+							<button type="button" class="btn btn-danger" data-dismiss="modal">Close</button>
+						</div>
+					</div>
+				</div>
+			</div>
+			
+			<!-- footer -->
+			<div th:replace="fragments :: footer"></div>
+
+
+	</div>
+	
+<script type="text/javascript">
+
+//confirmation modal dialogue for delete user
+$(document).ready(function(){
+	$(".link-delete").on("click", function(e){
+		//stop the <a> tag default behaviour and pop out a confirmation modal dialogue
+		e.preventDefault();
+		//alert($(this).attr("href"));
+		link = $(this);
+		userId = link.attr("userId");
+		$("#yesButton").attr("href", link.attr("href"));
+		$("#confirmText").text("Are you sure you want to delete this user ID " + userId + "?");
+		$("#confirmModal").modal();
+	});
+});
+
+	function clearFilter(){
+		window.location = "[[@{/users}]]";
+	}
+
+
+</script>
+	
+</body>
+
+</html>
\ No newline at end of file
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/a4/a01985cd6eb3001d19bbb001c1a81c20 b/.metadata/.plugins/org.eclipse.core.resources/.history/a4/a01985cd6eb3001d19bbb001c1a81c20
deleted file mode 100644
index 98ecc6e4..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/a4/a01985cd6eb3001d19bbb001c1a81c20
+++ /dev/null
@@ -1,30 +0,0 @@
-package com.shopme.admin.user;
-
-import java.text.DateFormat;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.List;
-
-import com.shopme.common.entity.User;
-
-import jakarta.servlet.http.HttpServletResponse;
-
-public class UserCsvExporter {
-
-	public void export(List<User> user, HttpServletResponse response) {
-		
-		DateFormat dateFormatter = new SimpleDateFormat("yyyy-MM-dd_HH-mm-ss");
-		String timeStamp = dateFormatter.format(new Date());
-		String fileName = "users_" + timeStamp + ".csv";
-		
-		response.setContentType("text/csv");
-		
-		String headerKey = "Content-Disposition";
-		
-		String headerValue = "attachment; filename=" + fileName;
-		
-		
-		
-	}
-	
-}
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/a5/00d4374165b3001d19bbb001c1a81c20 b/.metadata/.plugins/org.eclipse.core.resources/.history/a5/00d4374165b3001d19bbb001c1a81c20
deleted file mode 100644
index 6b0e33ec..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/a5/00d4374165b3001d19bbb001c1a81c20
+++ /dev/null
@@ -1,5 +0,0 @@
-package com.shopme.admin.user;
-
-public class UserCsvExporter {
-
-}
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/a7/f054629629b8001d1d97982e354adf88 b/.metadata/.plugins/org.eclipse.core.resources/.history/a7/f054629629b8001d1d97982e354adf88
deleted file mode 100644
index 0f4d36cc..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/a7/f054629629b8001d1d97982e354adf88
+++ /dev/null
@@ -1,45 +0,0 @@
-package com.shopme.admin.category;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import com.shopme.common.entity.Category;
-
-@Service
-public class CategoryService {
-
-	@Autowired
-	private CategoryRepository repo;
-	
-	public List<Category> listAll(){
-		return (List<Category>) repo.findAll();
-	}
-	
-	public List<Category> listCategoriesUsedInForm(){
-		
-		List<Category> categoriesUsedInForm = new ArrayList<>();
-		
-		Iterable<Category> categoriesInDB = repo.findAll();
-		
-		for (Category category : categoriesInDB) {
-
-			// root category
-			if (category.getParent() == null) {
-				System.out.println(category.getName());
-
-				category.getChildren().forEach(subCategory -> {
-
-					System.out.println("--" + subCategory.getName());
-					printChildren(subCategory, 1);
-				});
-			}
-
-		}
-		
-		
-		return categoriesUsedInForm;
-	}
-}
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/a8/f01d1d7953b4001d1d079a924effdc9e b/.metadata/.plugins/org.eclipse.core.resources/.history/a8/f01d1d7953b4001d1d079a924effdc9e
deleted file mode 100644
index 50e0421e..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/a8/f01d1d7953b4001d1d079a924effdc9e
+++ /dev/null
@@ -1,45 +0,0 @@
-package com.shopme.admin.user;
-
-import java.io.IOException;
-import java.text.DateFormat;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.List;
-
-import org.supercsv.io.CsvBeanWriter;
-import org.supercsv.io.ICsvBeanWriter;
-import org.supercsv.prefs.CsvPreference;
-
-import com.shopme.common.entity.User;
-
-import jakarta.servlet.http.HttpServletResponse;
-
-public class UserCsvExporter  {
-
-	public void export(List<User> listUsers, HttpServletResponse response) throws IOException {
-		
-		DateFormat dateFormatter = new SimpleDateFormat("yyyy-MM-dd_HH-mm-ss");
-		String timestamp = dateFormatter.format(new Date());
-		String fileName = "users_" + timestamp + ".csv";
-		
-		response.setContentType("text/csv");
-		
-		String headerKey = "Content-Disposition";
-		String headerValue = "attachment; filename=" + fileName;
-		response.setHeader(headerKey, headerValue);
-		
-		ICsvBeanWriter csvWriter = new CsvBeanWriter(response.getWriter(), CsvPreference.STANDARD_PREFERENCE);
-		
-		String[] csvHeader = {"User ID", "E-mail", "First Name", "Last Name", "Roles", "Enabled"};
-		String[] fieldMapping = {"id", "email", "firstName", "lastName", "roles", "enabled"};
-		
-		csvWriter.writeHeader(csvHeader);
-		
-		for (User user : listUsers) {
-			csvWriter.write(user, fieldMapping);
-		}
-		
-		csvWriter.close();
-	}
-	
-}
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/a9/7091d16a3cb4001d1d079a924effdc9e b/.metadata/.plugins/org.eclipse.core.resources/.history/a9/7091d16a3cb4001d1d079a924effdc9e
deleted file mode 100644
index db751af4..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/a9/7091d16a3cb4001d1d079a924effdc9e
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<html xmlns:th="http://www.thymeleaf.org">
-<head th:fragment="header">
-	<meta http-equiv="Content-Type" content="text/html; charset= UTF-8">
-	<meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0">
-	<title>Home - Shopme Admin</title>
-	
-	<link rel="stylesheet" type="text/css" th:href="@{/fontawesome/all.css}" />
-	<link rel="stylesheet" type="text/css" th:href="@{/style.css}" />
-	<link rel="stylesheet" type="text/css" th:href="@{/webjars/bootstrap/css/bootstrap.min.css}" />
-	
-	<script type="text/javascript" th:src="@{/webjars/jquery/jquery.min.js}"></script>
-	<script type="text/javascript" th:src="@{/webjars/bootstrap/js/bootstrap.min.js}"></script>
-	</head>
-<body>
-
-		<!-- purpose: make code more succinct and readable 
-		project is easier to maintain
-		
-		use thymeleaf fragments -->
-
-	<!-- if  ${removeTag} == 'tag' then the <th> parent tag will be removed.  if ${removeTag} == 'none' then keep the <th> parent tag-->
-	<th th:fragment="column_link(fieldName, columnLabel, removeTag)" th:remove="${removeTag}">
-		<!-- follow the sort order of another sortField; if the other field is sortDir="asc", then the newly selected column will be sortDir="asc" too -->
-		<a class="text-white"
-		   th:href="@{'/users/page/' + ${currentPage} + '?sortField=' + ${fieldName} + '&sortDir=' + ${sortField != fieldName ? sortDir : reverseSortDir} + ${keyword != null ? '&keyword=' + keyword : ''}}">
-			[[${columnLabel}]]
-		</a>
-		
-		<span th:if="${sortField == fieldName}"
-		th:class="${sortDir == 'asc' ? 'fas fa-sort-up' : 'fas fa-sort-down'}"></span>
-	</th>
-	
-	
-	<a th:fragment="page_link(pageNum, label)"
-	   class="page-link"
-	   th:href= "@{'/users/page/' + ${pageNum} + '?sortField=' + ${sortField} + '&sortDir=' + ${sortDir} + ${keyword != null ? '&keyword=' + keyword : ''}}">[[${label}]]</a>
-	
-	
-</body>
-</html>
\ No newline at end of file
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/aa/10fe246c2cb3001d1e75aa5ef0815903 b/.metadata/.plugins/org.eclipse.core.resources/.history/aa/10fe246c2cb3001d1e75aa5ef0815903
deleted file mode 100644
index 74a87d1b..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/aa/10fe246c2cb3001d1e75aa5ef0815903
+++ /dev/null
@@ -1,46 +0,0 @@
-package com.shopme.admin.user;
-
-import org.springframework.data.domain.Page;
-import org.springframework.data.domain.Pageable;
-import org.springframework.data.jpa.repository.Modifying;
-import org.springframework.data.jpa.repository.Query;
-import org.springframework.data.repository.CrudRepository;
-import org.springframework.data.repository.PagingAndSortingRepository;
-import org.springframework.data.repository.query.Param;
-import org.springframework.stereotype.Repository;
-
-import com.shopme.common.entity.User;
-
-@Repository
-public interface UserRepository extends CrudRepository<User, Integer>, PagingAndSortingRepository<User, Integer> {
-
-	/*
-	 * JPQL statement. It should be noted that as compared to native SQL, JPQL does
-	 * not interact with database tables, records, and fields - but with Java
-	 * classes and instances.
-	 * 
-	 * JPA kicks in as the mediator and transpiles JPQL queries to SQL queries for execution.
-	 * 
-	 * If your database can change or varies from development to production, as long as 
-	 * they're both relational - JPQL works wonders and you can 
-	 * write JPQL queries to create generic logic that can be used over and over again.
-	 */
-	@Query("SELECT u FROM User u WHERE u.email = :email")
-	public User getUserByEmail(@Param("email") String email);
-	
-	// countById() declaration follows the JPA specification
-	//to check the existence of a user
-	public Long countById(Integer id);
-	
-	
-	//for filtering users by keyword
-	@Query("SELECT u FROM User u WHERE u.firstName LIKE %?1% OR u.lastName LIKE %?1%")
-	public Page<User> findAll(String keyword, Pageable pageable);
-	
-	
-	//change user enabled status
-	//need @Modifying annotation for update/delete operation
-	@Query("UPDATE User u SET u.enabled = ?2 WHERE u.id = ?1")
-	@Modifying
-	public void updateEnabledStatus(Integer id, boolean enabled);
-}
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/aa/90defb6c07b4001d128fb79045552177 b/.metadata/.plugins/org.eclipse.core.resources/.history/aa/90defb6c07b4001d128fb79045552177
deleted file mode 100644
index 807e802d..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/aa/90defb6c07b4001d128fb79045552177
+++ /dev/null
@@ -1,45 +0,0 @@
-package com.shopme.admin.security;
-
-import org.aspectj.weaver.ast.And;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.security.config.annotation.web.builders.HttpSecurity;
-import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
-import org.springframework.security.config.annotation.web.configuration.WebSecurityConfiguration;
-import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
-import org.springframework.security.crypto.password.PasswordEncoder;
-import org.springframework.security.web.SecurityFilterChain;
-
-@Configuration
-@EnableWebSecurity
-public class WebSecurityConfig  {
-
-	/*
-	 *  refer to this link: https://www.codejava.net/frameworks/spring-boot/fix-websecurityconfigureradapter-deprecated
-	 * 
-	 */	
-	
-	@Bean
-	public PasswordEncoder PasswordEncoder() {
-		return new BCryptPasswordEncoder();
-	}
-	
-	@Bean
-	public SecurityFilterChain filterChain(HttpSecurity http) throws Exception {
-		
-		// any request need to be authenticated (require login)
-		//custom login page at "/login" - handler method in MainController class
-		http.authorizeHttpRequests().anyRequest().authenticated()
-			.and().formLogin().loginPage("/login").permitAll();
-		
-		return http.build();
-	}
-	
-	@Bean
-    public WebSecurityCustomizer webSecurityCustomizer() {
-        return (web) -> web.ignoring().antMatchers("/images/**", "/js/**", "/webjars/**");
-    }
-	
-	
-	
-}
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/aa/b0c03a8090b3001d19bbb001c1a81c20 b/.metadata/.plugins/org.eclipse.core.resources/.history/aa/b0c03a8090b3001d19bbb001c1a81c20
deleted file mode 100644
index 6fa7c395..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/aa/b0c03a8090b3001d19bbb001c1a81c20
+++ /dev/null
@@ -1,33 +0,0 @@
-<!DOCTYPE html>
-<html xmlns:th="http://www.thymeleaf.org">
-<head>
-<meta charset="ISO-8859-1">
-<title>Insert title here</title>
-</head>
-<body>
-
-		<!-- purpose: make code more succinct and readable 
-		project is easier to maintain
-		
-		use thymeleaf fragments -->
-
-	<!-- if  ${removeTag} == 'tag' then the th parent tag will be removed.  if ${removeTag} == 'none'-->
-	<th th:fragment="column_link(fieldName, columnLabel, removeTag)" th:remove="${removeTag}">
-		<!-- follow the sort order of another sortField; if the other field is sortDir="asc", then the newly selected column will be sortDir="asc" too -->
-		<a class="text-white"
-		   th:href="@{'/users/page/' + ${currentPage} + '?sortField=' + ${fieldName} + '&sortDir=' + ${sortField != fieldName ? sortDir : reverseSortDir} + ${keyword != null ? '&keyword=' + keyword : ''}}">
-			[[${columnLabel}]]
-		</a>
-		
-		<span th:if="${sortField == fieldName}"
-		th:class="${sortDir == 'asc' ? 'fas fa-sort-up' : 'fas fa-sort-down'}"></span>
-	</th>
-	
-	
-	<a th:fragment="page_link(pageNum, label)"
-	   class="page-link"
-	   th:href= "@{'/users/page/' + ${pageNum} + '?sortField=' + ${sortField} + '&sortDir=' + ${sortDir} + ${keyword != null ? '&keyword=' + keyword : ''}}">[[${label}]]</a>
-	
-	
-</body>
-</html>
\ No newline at end of file
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/aa/b0d2431b62b3001d19bbb001c1a81c20 b/.metadata/.plugins/org.eclipse.core.resources/.history/aa/b0d2431b62b3001d19bbb001c1a81c20
deleted file mode 100644
index 580da4d9..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/aa/b0d2431b62b3001d19bbb001c1a81c20
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-	
-	<parent>
-		<groupId>com.shopme</groupId>
-		<artifactId>ShopmeWebParent</artifactId>
-		<version>0.0.1-SNAPSHOT</version>
-	</parent>
-	
-	<artifactId>ShopmeBackEnd</artifactId>
-	
-	<name>ShopmeBackEnd</name>
-	<description>Shopme Admin project</description>
-	<properties>
-		<java.version>15</java.version>
-	</properties>
-	<dependencies>
-
-	<dependency>
-	   <groupId>org.springframework.boot</groupId>
-		<artifactId>spring-boot-devtools</artifactId>
-    </dependency>
-
-	<dependency>
-		<groupId>org.springframework.boot</groupId>
-		<artifactId>spring-boot-devtools</artifactId>
-	</dependency>
-	</dependencies>
-	<build>
-		<plugins>
-			<plugin>
-				<groupId>org.springframework.boot</groupId>
-				<artifactId>spring-boot-maven-plugin</artifactId>
-			</plugin>
-		</plugins>
-	</build>
-</project>
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/ab/e05be7918eb3001d19bbb001c1a81c20 b/.metadata/.plugins/org.eclipse.core.resources/.history/ab/e05be7918eb3001d19bbb001c1a81c20
deleted file mode 100644
index 5a8e8c95..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/ab/e05be7918eb3001d19bbb001c1a81c20
+++ /dev/null
@@ -1,36 +0,0 @@
-*.icon-white{color: white}
-*.icon-silver{color: silver}
-*.icon-green{color: green}
-*.icon-dark{color: gray}
-*.icon-red{color: red}
-
-
-
-@media screen and (max-width: 768px) {
-	/* small screen eg:mobile*/
-	
-	div.full-details{ display: none;}
-	div.less-details{ display: block;}
-	
-}
-
-@media screen and (min-width: 768px) and (max-width: 1024px) {
-	/* medium screen eg:tablet*/
-	
-	div.full-details{ display: block;}
-	div.less-details{ display: none;}
-	
-	/*hide the columns id and email when in tablet screen size*/
-	th, td .hideable-column{display: none;}
-	
-}
-
-
-@media screen and (min-width: 1024px) {
-	/* large screen eg:laptop*/
-	
-	div.less-details{ display: none;}
-	
-	th, td .hideable-column{display: table-cell;}
-	
-}
\ No newline at end of file
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/ab/f069cc9731b7001d19ef99be8d31e273 b/.metadata/.plugins/org.eclipse.core.resources/.history/ab/f069cc9731b7001d19ef99be8d31e273
deleted file mode 100644
index 0d6c7159..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/ab/f069cc9731b7001d19ef99be8d31e273
+++ /dev/null
@@ -1,60 +0,0 @@
-package com.shopme.admin.category;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
-import java.util.List;
-
-import org.junit.jupiter.api.Test;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.autoconfigure.jdbc.AutoConfigureTestDatabase;
-import org.springframework.boot.test.autoconfigure.jdbc.AutoConfigureTestDatabase.Replace;
-import org.springframework.boot.test.autoconfigure.orm.jpa.DataJpaTest;
-import org.springframework.test.annotation.Rollback;
-
-import com.shopme.common.entity.Category;
-
-/*
- * Unit Test for CategoryRepository
- * 
- * objective:
- * 1. test the methods in repository 
- * 2. populate the database with records
- * 
-*/
-
-@DataJpaTest
-@AutoConfigureTestDatabase(replace = Replace.NONE)
-@Rollback(false)
-public class CategoryRepositoryTests {
-
-	@Autowired
-	private CategoryRepository repo;
-
-	@Test
-	public void testCreateRootCategory() {
-//		Category category = new Category("Computers");
-		Category category = new Category("Electronics");
-		Category savedCategory = repo.save(category);
-
-		assertThat(savedCategory.getId()).isGreaterThan(0);
-
-	}
-
-	@Test
-	public void testCreateSubCategory() {
-
-		// ID for root category "Computer" is 1
-		Category parent = new Category(1);
-
-//		Category subCategory = new Category("Desktops", parent);
-//		Category savedCategory = repo.save(subCategory);
-//		assertThat(savedCategory.getId()).isGreaterThan(0);
-
-		Category laptops = new Category("Laptops", parent);
-		Category components = new Category("Computer Components", parent);
-
-		repo.saveAll(List.of(laptops, components));
-
-	}
-
-}
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/ac/20fe4c553cb4001d1d079a924effdc9e b/.metadata/.plugins/org.eclipse.core.resources/.history/ac/20fe4c553cb4001d1d079a924effdc9e
deleted file mode 100644
index a6879fb6..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/ac/20fe4c553cb4001d1d079a924effdc9e
+++ /dev/null
@@ -1,48 +0,0 @@
-<!DOCTYPE html>
-<html xmlns:th="http://www.thymeleaf.org">
-<head>
-<meta charset="ISO-8859-1">
-<title>Insert title here</title>
-</head>
-<body>
-
-		<!-- purpose: make code more succinct and readable 
-		project is easier to maintain
-		
-		use thymeleaf fragments -->
-
-	<!-- if  ${removeTag} == 'tag' then the <th> parent tag will be removed.  if ${removeTag} == 'none' then keep the <th> parent tag-->
-	<th th:fragment="column_link(fieldName, columnLabel, removeTag)" th:remove="${removeTag}">
-		<!-- follow the sort order of another sortField; if the other field is sortDir="asc", then the newly selected column will be sortDir="asc" too -->
-		<a class="text-white"
-		   th:href="@{'/users/page/' + ${currentPage} + '?sortField=' + ${fieldName} + '&sortDir=' + ${sortField != fieldName ? sortDir : reverseSortDir} + ${keyword != null ? '&keyword=' + keyword : ''}}">
-			[[${columnLabel}]]
-		</a>
-		
-		<span th:if="${sortField == fieldName}"
-		th:class="${sortDir == 'asc' ? 'fas fa-sort-up' : 'fas fa-sort-down'}"></span>
-	</th>
-	
-	
-	<a th:fragment="page_link(pageNum, label)"
-	   class="page-link"
-	   th:href= "@{'/users/page/' + ${pageNum} + '?sortField=' + ${sortField} + '&sortDir=' + ${sortDir} + ${keyword != null ? '&keyword=' + keyword : ''}}">[[${label}]]</a>
-	
-	
-	<head th:fragment="header">
-	<meta http-equiv="Content-Type" content="text/html; charset= UTF-8">
-	<meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0">
-	<title>Home - Shopme Admin</title>
-	
-	<link rel="stylesheet" type="text/css" th:href="@{/fontawesome/all.css}" />
-	<link rel="stylesheet" type="text/css" th:href="@{/style.css}" />
-	<link rel="stylesheet" type="text/css" th:href="@{/webjars/bootstrap/css/bootstrap.min.css}" />
-	
-	<script type="text/javascript" th:src="@{/webjars/jquery/jquery.min.js}"></script>
-	<script type="text/javascript" th:src="@{/webjars/bootstrap/js/bootstrap.min.js}"></script>
-	</head>
-	
-	
-	
-</body>
-</html>
\ No newline at end of file
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/ad/70b3b06226b3001d1e75aa5ef0815903 b/.metadata/.plugins/org.eclipse.core.resources/.history/ad/70b3b06226b3001d1e75aa5ef0815903
deleted file mode 100644
index 03b4af5d..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/ad/70b3b06226b3001d1e75aa5ef0815903
+++ /dev/null
@@ -1,188 +0,0 @@
-package com.shopme.admin.user;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
-import java.util.List;
-
-import org.hibernate.internal.build.AllowSysOut;
-import org.hibernate.query.sqm.mutation.internal.TableKeyExpressionCollector;
-import org.junit.jupiter.api.Test;
-import org.springframework.aot.nativex.NativeConfigurationWriter;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.autoconfigure.jdbc.AutoConfigureTestDatabase;
-import org.springframework.boot.test.autoconfigure.jdbc.AutoConfigureTestDatabase.Replace;
-import org.springframework.boot.test.autoconfigure.orm.jpa.DataJpaTest;
-import org.springframework.boot.test.autoconfigure.orm.jpa.TestEntityManager;
-import org.springframework.data.domain.Page;
-import org.springframework.data.domain.PageRequest;
-import org.springframework.data.domain.Pageable;
-import org.springframework.test.annotation.Rollback;
-
-import com.shopme.common.entity.Role;
-import com.shopme.common.entity.User;
-
-@DataJpaTest(showSql = false)
-//configure to run on real database(MySQL) instead of a test database
-@AutoConfigureTestDatabase(replace = Replace.NONE)
-/*
- * Datajpatest will rollback the transaction after executing the test method
- * everytime, so that the transaction will not be committed. if we want to
- * commit the transaction(aka "save the record"), we can disable rollback by
- * setting it to false. Now, all transactions will be committed
- */
-@Rollback(false)
-public class UserRepositoryTests {
-
-	@Autowired
-	private UserRepository repo;
-
-	@Autowired
-	private TestEntityManager entityManager;
-
-	// On the very first execution of testCreateUser() method; hibernate will create
-	// the users table & users_roles table
-	@Test
-	public void testCreateUserWithOneRole() {
-
-		Role roleAdmin = entityManager.find(Role.class, 1);
-		User userChow = new User("chow@gmail.com", "password", "chow", "seng fung");
-		userChow.addRoles(roleAdmin);
-		User savedUser = repo.save(userChow);
-		assertThat(savedUser.getId()).isGreaterThan(0);
-
-	}
-
-	@Test
-	public void testCreateUserWithTwoRole() {
-
-		User userRavi = new User("ravi@gmail.com", "ravipass", "ravi", "kumar");
-		Role roleEditor = new Role(3);
-		Role roleAssistant = new Role(5);
-
-		userRavi.addRoles(roleEditor);
-		userRavi.addRoles(roleAssistant);
-
-		User savedUser = repo.save(userRavi);
-		assertThat(savedUser.getId()).isGreaterThan(0);
-	}
-
-	@Test
-	public void testListAllUsers() {
-		Iterable<User> listUsers = repo.findAll();
-
-		// use method reference instead of lambda expression here
-		listUsers.forEach(System.out::println);
-
-	}
-
-	@Test
-	public void testGetUserById() {
-
-		User userChow = repo.findById(1).get();
-		System.out.println(userChow);
-		// use method reference instead of lambda expression here
-		assertThat(userChow).isNotNull();
-	}
-
-	@Test
-	public void testUpdateUserDetails() {
-		
-		User userChow = repo.findById(1).get();
-		userChow.setEnabled(true);
-		userChow.setEmail("chow22@gmail.com");
-		
-		repo.save(userChow);
-	}
-	
-	@Test
-	public void testUpdateUserRoles() {
-		
-		User userRavi = repo.findById(4).get();
-		Role roleEditor = new Role(3);
-		Role roleSalesperson= new Role(2);
-		
-		//change role from editor to salesperson
-		
-		/* take note of overriding/implementing the hashcode and equals method in roles
-		 * class. need to override those two methods for remove() to work.
-		 *  The remove() method removes an element "e" such that Objects.equals(o, e),
-		 *  this will invoke the overwritten equals() method in Role Class. 
-		 * */
-		userRavi.getRoles().remove(roleEditor);
-		userRavi.addRoles(roleSalesperson);
-		
-		repo.save(userRavi);
-	}
-	
-	@Test
-	public void testDeleteUser() {
-		
-		Integer userId = 4;
-		repo.deleteById(userId);
-	}
-	
-	
-	@Test
-	public void testGetUserByEmail() {
-		String email = "ravi@gmail.com";
-		User user = repo.getUserByEmail(email);
-		
-		assertThat(user).isNotNull();
-	}
-	
-	/*
-	 * count the number of records in database with a particular id.
-	 * return value should be 1,
-	 * because id is unique.
-	 * 
-	 * use countById() method to test whether a user exists. 
-	 */
-	@Test
-	public void testCountById() {
-		
-		Integer userId = 1;
-		Long countById = repo.countById(userId);
-		
-		assertThat(countById).isNotNull().isGreaterThan(0).isEqualTo(1);
-	}
-	
-	@Test	
-	public void testDisableUser() {
-		Integer userId = 1;
-		
-		repo.updateEnabledStatus(userId, false);
-	}
-
-	@Test	
-	public void testEnableUser() {
-		Integer userId = 1;
-		
-		repo.updateEnabledStatus(userId, true);
-	}
-	
-	@Test
-	public void testListFirstPage() {
-		int pageNumber = 0; // the first page number always start with 0, change pageNumber to 1 to get the second page, 2 for thid page and so forth
-		int pageSize = 4; // no of elements
-		
-		Pageable pageable = PageRequest.of(pageNumber, pageSize);
-		Page<User> page = repo.findAll(pageable);
-		
-		List<User> listUsers = page.getContent();
-		
-		listUsers.forEach(System.out::println);
-		
-		assertThat(listUsers.size()).isEqualTo(pageSize);
-	}
-	
-	
-	@Test 
-	public void testSearchUsers() {
-		
-		
-		
-	}
-	
-	
-}
-
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/ad/905aed061fb3001d1e75aa5ef0815903 b/.metadata/.plugins/org.eclipse.core.resources/.history/ad/905aed061fb3001d1e75aa5ef0815903
deleted file mode 100644
index 3b6397db..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/ad/905aed061fb3001d1e75aa5ef0815903
+++ /dev/null
@@ -1,47 +0,0 @@
-package com.shopme.admin.user;
-
-import org.springframework.data.domain.Page;
-import org.springframework.data.domain.Pageable;
-import org.springframework.data.jpa.repository.Modifying;
-import org.springframework.data.jpa.repository.Query;
-import org.springframework.data.repository.CrudRepository;
-import org.springframework.data.repository.PagingAndSortingRepository;
-import org.springframework.data.repository.query.Param;
-import org.springframework.stereotype.Repository;
-
-import com.shopme.common.entity.User;
-
-@Repository
-public interface UserRepository extends CrudRepository<User, Integer>, PagingAndSortingRepository<User, Integer> {
-
-	/*
-	 * JPQL statement. It should be noted that as compared to native SQL, JPQL does
-	 * not interact with database tables, records, and fields - but with Java
-	 * classes and instances.
-	 * 
-	 * JPA kicks in as the mediator and transpiles JPQL queries to SQL queries for execution.
-	 * 
-	 * If your database can change or varies from development to production, as long as 
-	 * they're both relational - JPQL works wonders and you can 
-	 * write JPQL queries to create generic logic that can be used over and over again.
-	 */
-	@Query("SELECT u FROM User u WHERE u.email = :email")
-	public User getUserByEmail(@Param("email") String email);
-	
-	// countById() declaration follows the JPA specification
-	//to check the existence of a user
-	public Long countById(Integer id);
-	
-	
-	
-	
-	public Page<User> findAll(String keyword, Pageable pageable);
-	
-	
-	
-	//change user enabled status
-	//need @Modifying annotation for update/delete operation
-	@Query("UPDATE User u SET u.enabled = ?2 WHERE u.id = ?1")
-	@Modifying
-	public void updateEnabledStatus(Integer id, boolean enabled);
-}
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/af/00455c320bb9001d11addcb4256c67f9 b/.metadata/.plugins/org.eclipse.core.resources/.history/af/00455c320bb9001d11addcb4256c67f9
new file mode 100644
index 00000000..005ceaee
--- /dev/null
+++ b/.metadata/.plugins/org.eclipse.core.resources/.history/af/00455c320bb9001d11addcb4256c67f9
@@ -0,0 +1,57 @@
+package com.shopme.admin;
+
+import java.nio.file.Path;
+import java.nio.file.Paths;
+
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
+
+@Configuration
+public class MvcConfig implements WebMvcConfigurer {
+
+	
+	/*
+	 * In short, we can tell Spring MVC to map a given URL (e.g. "/user-photos") 
+	 * to any directory (e.g. D:/ShopmeProject/ShopmeBackend/user-photos) 
+	 * and expose the resources (images, js, css...) in this directory to 
+	 * the web clients (browsers) - that's the primary purpose
+	 *  of using resource handlers in Spring MVC.
+	 * 
+	 * Because the assets are not located in the src/main/resources/static folder
+	 * */
+	
+	@Override
+	public void addResourceHandlers(ResourceHandlerRegistry registry) {
+
+		String dirName = "user-photos";
+		
+		Path userPhotoDir = Paths.get(dirName);
+		
+		String userPhotosPath = userPhotoDir.toFile().getAbsolutePath();
+		
+		
+		// add /** to allow all files under this directory to be available to client
+		
+		registry.addResourceHandler("/" + dirName + "/**")
+		.addResourceLocations("file:/" + userPhotosPath + "/");
+		
+		
+		String categoryImagesDirName = "category-images";
+		
+		Path categoryImagesDir = Paths.get(categoryImagesDirName);
+		
+		String categoryImagesPath = categoryImagesDir.toFile().getAbsolutePath();
+		
+		
+		// add /** to allow all files under this directory to be available to client
+		
+		registry.addResourceHandler("/" + categoryImagesDirName + "/**")
+		.addResourceLocations("file:/" + userPhotosPath + "/");
+		
+	}
+	
+	
+	
+	
+}
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/af/e034e9314ab4001d1d079a924effdc9e b/.metadata/.plugins/org.eclipse.core.resources/.history/af/e034e9314ab4001d1d079a924effdc9e
deleted file mode 100644
index ad9dde00..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/af/e034e9314ab4001d1d079a924effdc9e
+++ /dev/null
@@ -1,80 +0,0 @@
-package com.shopme.admin.security;
-
-import org.aspectj.weaver.ast.And;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.security.authentication.dao.DaoAuthenticationProvider;
-import org.springframework.security.config.annotation.web.builders.HttpSecurity;
-import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
-import org.springframework.security.config.annotation.web.configuration.WebSecurityConfiguration;
-import org.springframework.security.config.annotation.web.configuration.WebSecurityCustomizer;
-import org.springframework.security.core.userdetails.UserDetailsService;
-import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
-import org.springframework.security.crypto.password.PasswordEncoder;
-import org.springframework.security.web.SecurityFilterChain;
-
-@Configuration
-@EnableWebSecurity
-public class WebSecurityConfig {
-
-	/*
-	 * refer to this link: https://www.codejava.net/frameworks/spring-boot/fix-
-	 * websecurityconfigureradapter-deprecated
-	 * 
-	 */
-	
-	
-	 /* This bean will be called by spring security when performing authentication*/ 
-	@Bean
-	public UserDetailsService  userDetailsService()	{
-		return new ShopmeUserDetailsService();
-	}
-	
-
-	@Bean
-	public PasswordEncoder passwordEncoder() {
-		return new BCryptPasswordEncoder();
-	}
-
-	
-	@Bean
-	public DaoAuthenticationProvider authenticationProvider() {
-	    DaoAuthenticationProvider authProvider = new DaoAuthenticationProvider();
-	     
-	    authProvider.setUserDetailsService(userDetailsService());
-	    authProvider.setPasswordEncoder(passwordEncoder());
-	 
-	    return authProvider;
-	}
-	
-	
-	@Bean
-	public SecurityFilterChain filterChain(HttpSecurity http) throws Exception {
-
-		// any request need to be authenticated (require login)
-		// custom login page at "/login" - handler method in MainController class
-		http.authorizeHttpRequests()
-			.anyRequest().authenticated()
-			.and()
-			.formLogin()
-				.loginPage("/login")
-				.usernameParameter("email")
-				.permitAll()
-			.and().logout().permitAll()
-			.and().rememberMe().key("AbcDefgHijKlmnOpqrs_1234567890");
-		
-		http.authenticationProvider(authenticationProvider());
-		
-		
-		return http.build();
-	}
-
-	//NOTE: antMatchers() changed to requestMatchers()
-	//stack: https://stackoverflow.com/questions/74907533/the-method-antmatchersstring-is-undefined-for-the-type
-	@Bean
-	public WebSecurityCustomizer webSecurityCustomizer() {
-		//permit access to the assets in the following directories
-		return (web) -> web.ignoring().requestMatchers("/images/**", "/js/**", "/webjars/**");
-	}
-
-}
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/af/e094f98e09b4001d128fb79045552177 b/.metadata/.plugins/org.eclipse.core.resources/.history/af/e094f98e09b4001d128fb79045552177
deleted file mode 100644
index 8783eb85..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/af/e094f98e09b4001d128fb79045552177
+++ /dev/null
@@ -1,31 +0,0 @@
-<!DOCTYPE html>
-<html xmlns:th="http://www.thymeleaf.org">
-
-<head>
-	<meta http-equiv="Content-Type" content="text/html; charset= UTF-8">
-	<meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0">
-	<title>Login - Shopme Admin</title>
-	<link rel="stylesheet" type="text/css" th:href="@{/webjars/bootstrap/css/bootstrap.min.css}" />
-</head>
-
-<body>
-	<div class="container-fluid">
-		
-		<div>
-			<img th:src="@{/images/ShopmeAdminBig.png}" />
-		</div>
-		
-		<form th:action="@{/login}">
-		
-		
-		</form>
-
-		<div>
-			<p>Shopme Control Panel - Copyright &copy; Shopme</p>
-		</div>
-
-	</div>
-
-</body>
-
-</html>
\ No newline at end of file
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/b/5019036f90b3001d19bbb001c1a81c20 b/.metadata/.plugins/org.eclipse.core.resources/.history/b/5019036f90b3001d19bbb001c1a81c20
deleted file mode 100644
index 75d38d20..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/b/5019036f90b3001d19bbb001c1a81c20
+++ /dev/null
@@ -1,33 +0,0 @@
-<!DOCTYPE html>
-<html xmlns:th="http://www.thymeleaf.org">
-<head>
-<meta charset="ISO-8859-1">
-<title>Insert title here</title>
-</head>
-<body>
-
-		<!-- purpose: make code more succinct and readable 
-		project is easier to maintain
-		
-		use thymeleaf fragments -->
-
-
-	<th th:fragment="column_link(fieldName, columnLabel, removeTag)" th:remove="${removeTag}">
-		<!-- follow the sort order of another sortField; if the other field is sortDir="asc", then the newly selected column will be sortDir="asc" too -->
-		<a class="text-white"
-		   th:href="@{'/users/page/' + ${currentPage} + '?sortField=' + ${fieldName} + '&sortDir=' + ${sortField != fieldName ? sortDir : reverseSortDir} + ${keyword != null ? '&keyword=' + keyword : ''}}">
-			[[${columnLabel}]]
-		</a>
-		
-		<span th:if="${sortField == fieldName}"
-		th:class="${sortDir == 'asc' ? 'fas fa-sort-up' : 'fas fa-sort-down'}"></span>
-	</th>
-	
-	
-	<a th:fragment="page_link(pageNum, label)"
-	   class="page-link"
-	   th:href= "@{'/users/page/' + ${pageNum} + '?sortField=' + ${sortField} + '&sortDir=' + ${sortDir} + ${keyword != null ? '&keyword=' + keyword : ''}}">[[${label}]]</a>
-	
-	
-</body>
-</html>
\ No newline at end of file
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/b/90c543e50ab4001d128fb79045552177 b/.metadata/.plugins/org.eclipse.core.resources/.history/b/90c543e50ab4001d128fb79045552177
deleted file mode 100644
index af13283c..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/b/90c543e50ab4001d128fb79045552177
+++ /dev/null
@@ -1,42 +0,0 @@
-<!DOCTYPE html>
-<html xmlns:th="http://www.thymeleaf.org">
-
-<head>
-	<meta http-equiv="Content-Type" content="text/html; charset= UTF-8">
-	<meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0">
-	<title>Login - Shopme Admin</title>
-	<link rel="stylesheet" type="text/css" th:href="@{/webjars/bootstrap/css/bootstrap.min.css}" />
-</head>
-
-<body>
-	<div class="container-fluid text-center">
-		
-		<div>
-			<img th:src="@{/images/ShopmeAdminBig.png}" />
-		</div>
-		
-		<form th:action="@{/login}" method="post" style="max-width:350px; margin: 0 auto">
-		
-			<div class="border border-secondary rounded p-3">
-				<p>Access to Shopme Control Panel </p>
-				
-				<p>
-					<input type="email" name="email" class="form-control" placeholder="Email" required />
-				</p>
-				
-				<p>
-					<input type="password" name="password" class="form-control" placeholder="Password" required />
-				</p>
-			</div>
-		
-		</form>
-
-		<div>
-			<p>Shopme Control Panel - Copyright &copy; Shopme</p>
-		</div>
-
-	</div>
-
-</body>
-
-</html>
\ No newline at end of file
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/b0/201948c40cb4001d128fb79045552177 b/.metadata/.plugins/org.eclipse.core.resources/.history/b0/201948c40cb4001d128fb79045552177
deleted file mode 100644
index 1a46bc4d..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/b0/201948c40cb4001d128fb79045552177
+++ /dev/null
@@ -1,52 +0,0 @@
-package com.shopme.admin.security;
-
-import java.util.Collection;
-
-import org.springframework.security.core.GrantedAuthority;
-import org.springframework.security.core.userdetails.UserDetails;
-
-public class ShopmeUserDetails implements UserDetails {
-
-	@Override
-	public Collection<? extends GrantedAuthority> getAuthorities() {
-		// TODO Auto-generated method stub
-		return null;
-	}
-
-	@Override
-	public String getPassword() {
-		// TODO Auto-generated method stub
-		return null;
-	}
-
-	@Override
-	public String getUsername() {
-		// TODO Auto-generated method stub
-		return null;
-	}
-
-	@Override
-	public boolean isAccountNonExpired() {
-		// TODO Auto-generated method stub
-		return false;
-	}
-
-	@Override
-	public boolean isAccountNonLocked() {
-		// TODO Auto-generated method stub
-		return false;
-	}
-
-	@Override
-	public boolean isCredentialsNonExpired() {
-		// TODO Auto-generated method stub
-		return false;
-	}
-
-	@Override
-	public boolean isEnabled() {
-		// TODO Auto-generated method stub
-		return false;
-	}
-
-}
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/b0/90ce18bf2fb4001d1d079a924effdc9e b/.metadata/.plugins/org.eclipse.core.resources/.history/b0/90ce18bf2fb4001d1d079a924effdc9e
deleted file mode 100644
index d461f540..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/b0/90ce18bf2fb4001d1d079a924effdc9e
+++ /dev/null
@@ -1,105 +0,0 @@
-<!DOCTYPE html>
-<html xmlns:th="http://www.thymeleaf.org"
-	  xmlns:sec="https://www.thymeleaf.org/thymeleaf-extras-springsecurity5">
-
-<head>
-	<meta http-equiv="Content-Type" content="text/html; charset= UTF-8">
-	<meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0">
-	<title>Home - Shopme Admin</title>
-	
-	<link rel="stylesheet" type="text/css" th:href="@{/fontawesome/all.css}" />
-	<link rel="stylesheet" type="text/css" th:href="@{/style.css}" />
-	<link rel="stylesheet" type="text/css" th:href="@{/webjars/bootstrap/css/bootstrap.min.css}" />
-	
-	<script type="text/javascript" th:src="@{/webjars/jquery/jquery.min.js}"></script>
-	<script type="text/javascript" th:src="@{/webjars/bootstrap/js/bootstrap.min.js}"></script>
-</head>
-
-<body>
-	<div class="container-fluid">
-		<div>
-			<form th:action="@{/logout}" method="post" th:hidden="true" name="logoutForm">
-				<input type="submit"/>
-			</form>
-			<nav class="navbar navbar-expand-lg bg-dark navbar-dark">
-				<a class="navbar-brand" th:href="@{/}">
-					<img th:src="@{/images/ShopmeAdminSmall.png}"/>
-				</a>
-				<!--hamburger toggler for mobile devices(responsive)-->
-				<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#topNavbar">
-					<span class="navbar-toggler-icon"></span>
-				</button>
-				<div class="collapse navbar-collapse" id="topNavbar">
-					<ul class="navbar-nav">
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/users}">Users</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/categories}">Categories</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/brands}">Brands</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/products}">Products</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/customers}">Customers</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/shipping}">Shipping</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/orders}">Orders</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/report}">Sales Report</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/articles}">Articles</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/menus}">Menus</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/settings}">Settings</a>
-						</li>
-						<li>
-							<span class="fas fa-user fa-2x icon-silver"></span>
-						</li>
-						<li class="nav-item dropdown">
-								<!-- principal refers to user; display username -->
-							<a class="nav-link dropdown-toggle" sec:authentication="principal.fullname" data-toggle="dropdown"></a>
-							<div class="dropdown-menu">
-								<a class="dropdown-item" id="logoutLink" href="">Logout</a>
-							</div>
-							
-						</li>
-					</ul>
-				</div>
-				
-			</nav>
-		</div>
-
-		<div>
-			<h1>Shopme Control Panel</h1>
-		</div>
-
-		<div>
-			<p>Shopme Control Panel - Copyright &copy; Shopme</p>
-		</div>
-
-
-	</div>
-	
-<script type="text/javascript">
-
-	$(document).ready(function(){
-		
-	})
-
-</script>
-
-</body>
-
-</html>
\ No newline at end of file
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/b2/30758cd46fb3001d19bbb001c1a81c20 b/.metadata/.plugins/org.eclipse.core.resources/.history/b2/30758cd46fb3001d19bbb001c1a81c20
deleted file mode 100644
index c202012b..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/b2/30758cd46fb3001d19bbb001c1a81c20
+++ /dev/null
@@ -1,45 +0,0 @@
-package com.shopme.admin.user;
-
-import java.io.IOException;
-import java.text.DateFormat;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.List;
-
-import org.supercsv.io.CsvBeanWriter;
-import org.supercsv.io.ICsvBeanWriter;
-import org.supercsv.prefs.CsvPreference;
-
-import com.shopme.common.entity.User;
-
-import jakarta.servlet.http.HttpServletResponse;
-
-public class UserCsvExporter {
-
-	public void export(List<User> listUsers, HttpServletResponse response) throws IOException {
-		
-		DateFormat dateFormatter = new SimpleDateFormat("yyyy-MM-dd_HH-mm-ss");
-		String timeStamp = dateFormatter.format(new Date());
-		String fileName = "users_" + timeStamp + ".csv";
-		
-		response.setContentType("text/csv");
-		
-		String headerKey = "Content-Disposition";
-		String headerValue = "attachment; filename=" + fileName;
-		response.setHeader(headerKey, headerValue);	
-		
-		ICsvBeanWriter csvWriter = new CsvBeanWriter(response.getWriter(), CsvPreference.STANDARD_PREFERENCE);
-		
-		String[] csvHeader = {"User ID", "E-mail", "First Name", "Last Name", "Roles", "Enabled"};
-		String[] fieldMapping = {"id", "email", "firstName", "lastName", "roles", "enabled"};
-		
-		csvWriter.writeHeader(csvHeader);
-		
-		for (User user : listUsers) {
-			csvWriter.write(user, fieldMapping);
-		}
-		
-		csvWriter.close();
-	}
-	
-}
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/b2/502f91bd8eb3001d19bbb001c1a81c20 b/.metadata/.plugins/org.eclipse.core.resources/.history/b2/502f91bd8eb3001d19bbb001c1a81c20
deleted file mode 100644
index 0159db81..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/b2/502f91bd8eb3001d19bbb001c1a81c20
+++ /dev/null
@@ -1,35 +0,0 @@
-*.icon-white{color: white}
-*.icon-silver{color: silver}
-*.icon-green{color: green}
-*.icon-dark{color: gray}
-*.icon-red{color: red}
-
-
-
-@media screen and (max-width: 768px) {
-	/* small screen eg:mobile*/
-	
-	div.full-details{ display: none;}
-	div.less-details{ display: block;}
-	
-}
-
-@media screen and (min-width: 768px) and (max-width: 1024px) {
-	/* medium screen eg:tablet*/
-	
-	div.full-details{ display: block;}
-	div.less-details{ display: none;}
-	
-	/*hide the columns id and email when in tablet screen size*/
-	th, td .hideable-column{display: none;}
-}
-
-
-@media screen and (min-width: 1024px) {
-	/* large screen eg:laptop*/
-	
-	div.less-details{ display: none;}
-	
-	th, td .hideable-column{display: table-cell;}
-	
-}
\ No newline at end of file
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/b2/80d1616f48b4001d1d079a924effdc9e b/.metadata/.plugins/org.eclipse.core.resources/.history/b2/80d1616f48b4001d1d079a924effdc9e
deleted file mode 100644
index 597547b0..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/b2/80d1616f48b4001d1d079a924effdc9e
+++ /dev/null
@@ -1,60 +0,0 @@
-<!DOCTYPE html>
-<html xmlns:th="http://www.thymeleaf.org">
-
-<head>
-	<meta http-equiv="Content-Type" content="text/html; charset= UTF-8">
-	<meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0">
-	<title>Login - Shopme Admin</title>
-	<link rel="stylesheet" type="text/css" th:href="@{/webjars/bootstrap/css/bootstrap.min.css}" />
-</head>
-
-<body>
-	<div class="container-fluid text-center">
-		
-		<div>
-			<img th:src="@{/images/ShopmeAdminBig.png}" />
-		</div>
-		
-		<form th:action="@{/login}" method="post" style="max-width:350px; margin: 0 auto">
-			
-			<!--  ?error param will appear at the end of url if there is error with email or password  -->
-			<div th:if="${param.error}">
-				<p class="text-danger">[[${session.SPRING_SECURITY_LAST_EXCEPTION.message}]]</p>
-			</div>
-			
-			<!--  ?logout param will appear at the end of url after user logged out  -->
-			<div th:if="${param.logout}">
-				<p class="text-warning">you have been logged out</p>
-			</div>
-			
-			<div class="border border-secondary rounded p-3">
-				<p>Access to Shopme Control Panel </p>
-				
-				<p>
-					<input type="email" name="email" class="form-control" placeholder="Email" required />
-				</p>
-				
-				<p>
-					<input type="password" name="password" class="form-control" placeholder="Password" required />
-				</p>
-				
-				<p>
-					<input type="checkbox" name="remember-me"/>
-				</p>
-				
-				<p>
-					<input type="submit" value="Login" class="btn btn-primary" />
-				</p>
-			</div>
-		
-		</form>
-
-		<div>
-			<p>Shopme Control Panel - Copyright &copy; Shopme</p>
-		</div>
-
-	</div>
-
-</body>
-
-</html>
\ No newline at end of file
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/b3/00b62c5e89b9001d14fea12e82c90085 b/.metadata/.plugins/org.eclipse.core.resources/.history/b3/00b62c5e89b9001d14fea12e82c90085
new file mode 100644
index 00000000..a16b1ae3
--- /dev/null
+++ b/.metadata/.plugins/org.eclipse.core.resources/.history/b3/00b62c5e89b9001d14fea12e82c90085
@@ -0,0 +1,5 @@
+package com.shopme.admin.category;
+
+public class CategoryNotFoundException extends Exception {
+
+}
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/b3/106feb9c64b3001d19bbb001c1a81c20 b/.metadata/.plugins/org.eclipse.core.resources/.history/b3/106feb9c64b3001d19bbb001c1a81c20
deleted file mode 100644
index 55dfe291..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/b3/106feb9c64b3001d19bbb001c1a81c20
+++ /dev/null
@@ -1,182 +0,0 @@
-package com.shopme.admin.user;
-
-import java.io.IOException;
-import java.util.List;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.domain.Page;
-import org.springframework.data.repository.query.Param;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
-import org.springframework.util.StringUtils;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.ModelAttribute;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.multipart.MultipartFile;
-import org.springframework.web.servlet.mvc.support.RedirectAttributes;
-
-import com.fasterxml.jackson.annotation.ObjectIdGenerators.StringIdGenerator;
-import com.shopme.admin.FileUploadUtil;
-import com.shopme.common.entity.Role;
-import com.shopme.common.entity.User;
-
-@Controller
-public class UserController {
-
-	@Autowired
-	private UserService service;
-
-	@GetMapping("/users")
-	public String listFirstPage(Model model) {
-		
-		//NOTE: these are the default values for path variable and URL parameters
-		return listByPage(1, model, "firstName", "asc", null);
-	}
-
-	@GetMapping("/users/page/{pageNum}")
-	public String listByPage(@PathVariable(name = "pageNum") int pageNum, Model model,
-			@Param("sortField") String sortField, @Param("sortDir") String sortDir,
-			@Param("keyword") String keyword) {
-		
-		System.out.println("sort field: " + sortField);
-		System.out.println("sort order: " + sortDir);
-		
-		Page<User> page = service.listByPage(pageNum, sortField, sortDir, keyword);
-		List<User> listUsers = page.getContent();
-
-		
-		long startCount = (pageNum - 1) * UserService.USERS_PER_PAGE + 1;
-		long endCount = startCount + UserService.USERS_PER_PAGE - 1;
-		if(endCount > page.getTotalElements()) {
-			endCount = page.getTotalElements();
-		}
-		
-		String reverseSortDir = sortDir.equals("asc") ? "desc" : "asc";
-		
-		model.addAttribute("currentPage", pageNum);
-		model.addAttribute("totalPages", page.getTotalPages());
-		model.addAttribute("startCount", startCount);
-		model.addAttribute("endCount", endCount);
-		model.addAttribute("totalItems", page.getTotalElements());
-		model.addAttribute("listUsers", listUsers);
-		model.addAttribute("sortField", sortField);
-		model.addAttribute("sortDir", sortDir);
-		model.addAttribute("reverseSortDir", reverseSortDir);
-		model.addAttribute("keyword", keyword);
-		
-
-		return "users";
-
-	}
-
-	@GetMapping("/users/new")
-	public String newUser(Model model) {
-
-		List<Role> listRoles = service.listRoles();
-
-		User user = new User();
-		user.setEnabled(true);
-
-		model.addAttribute("user", user);
-		model.addAttribute("listRoles", listRoles);
-		model.addAttribute("pageTitle", "Create New User");
-
-		return "user_form";
-
-	}
-
-	// using @RequestParam, we can get the image file input, the input has the
-	// property name="image"
-	@PostMapping("/users/save")
-	public String saveUser(@ModelAttribute("user") User user, RedirectAttributes redirectAttributes,
-			@RequestParam("image") MultipartFile multipartFile) throws IOException {
-
-		if (!multipartFile.isEmpty()) {
-
-			String fileName = StringUtils.cleanPath(multipartFile.getOriginalFilename());
-			user.setPhotos(fileName);
-
-			User savedUser = service.save(user);
-
-			String uploadDir = "user-photos/" + savedUser.getId();
-
-			FileUploadUtil.cleanDir(uploadDir);
-			FileUploadUtil.saveFile(uploadDir, fileName, multipartFile);
-		} else {
-
-			// set photo to null for getPhotosImagePath() method's conditional statement in
-			// User class
-			if (user.getPhotos().isEmpty())
-				user.setPhotos(null);
-			service.save(user);
-		}
-
-		redirectAttributes.addFlashAttribute("message", "the user has been saved successfully");
-
-		// POST/REDIRECT/GET web design
-		return getRedirectURLtoAffectedUser(user);
-	}
-
-	private String getRedirectURLtoAffectedUser(User user) {
-		
-		//after user is saved display the user instead of the entire user list
-		//email is a unique field to identify each user.
-		String firstPartOfEmail = user.getEmail().split("@")[0];
-		return "redirect:/users/page/1?sortField=id&sortDir=asc&keyword=" + firstPartOfEmail;
-	}
-
-	@GetMapping("/users/edit/{id}")
-	public String editUser(@PathVariable(name = "id") Integer id, RedirectAttributes redirectAttributes, Model model) {
-		try {
-			User user = service.get(id);
-			List<Role> listRoles = service.listRoles();
-
-			model.addAttribute("user", user);
-			model.addAttribute("pageTitle", "Edit User (ID: " + id + ")");
-			model.addAttribute("listRoles", listRoles);
-
-			return "user_form";
-		} catch (UserNotFoundException ex) {
-			redirectAttributes.addFlashAttribute("message", ex.getMessage());
-
-			return "redirect:/users";
-		}
-
-	}
-
-	@GetMapping("/users/delete/{id}")
-	public String deleteUser(@PathVariable(name = "id") Integer id, RedirectAttributes redirectAttributes,
-			Model model) {
-		try {
-			service.delete(id);
-			redirectAttributes.addFlashAttribute("message", "The user ID " + id + " has been deleted successfully.");
-
-		} catch (UserNotFoundException ex) {
-			redirectAttributes.addFlashAttribute("message", ex.getMessage());
-
-		}
-
-		return "redirect:/users";
-	}
-
-	@GetMapping("/users/{id}/enabled/{status}")
-	public String updateUserEnabledStatus(@PathVariable(name = "id") Integer id,
-			@PathVariable(name = "status") boolean enabled, RedirectAttributes redirectAttributes) {
-
-		service.updateUserEnabledStatus(id, enabled);
-		String status = enabled ? "enabled" : "disabled";
-		String message = "The user id " + id + " has been " + status;
-		redirectAttributes.addFlashAttribute("message", message);
-
-		return "redirect:/users";
-	}
-
-	@GetMapping("/users/export/csv")
-	public void exportToCSV() {
-		
-	}
-	
-	
-}
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/b3/2022f27313b4001d128fb79045552177 b/.metadata/.plugins/org.eclipse.core.resources/.history/b3/2022f27313b4001d128fb79045552177
deleted file mode 100644
index d97b124b..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/b3/2022f27313b4001d128fb79045552177
+++ /dev/null
@@ -1,76 +0,0 @@
-package com.shopme.admin.security;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-import java.util.Set;
-
-import org.springframework.security.core.GrantedAuthority;
-import org.springframework.security.core.authority.SimpleGrantedAuthority;
-import org.springframework.security.core.userdetails.UserDetails;
-
-import com.shopme.common.entity.Role;
-import com.shopme.common.entity.User;
-
-
-/*
- *  Think of it as a wrapper class for  Type User
- * 
- * */
-public class ShopmeUserDetails implements UserDetails {
-
-	private User user;
-	
-	public ShopmeUserDetails(User user) {
-		this.user = user;
-	}
-
-	@Override
-	public Collection<? extends GrantedAuthority> getAuthorities() {
-
-		Set<Role> roles = user.getRoles();
-		
-		List<SimpleGrantedAuthority> authorities = new ArrayList<>();
-		
-		
-		
-		return null;
-	}
-
-	@Override
-	public String getPassword() {
-		// TODO Auto-generated method stub
-		return null;
-	}
-
-	@Override
-	public String getUsername() {
-		// TODO Auto-generated method stub
-		return null;
-	}
-
-	@Override
-	public boolean isAccountNonExpired() {
-		// TODO Auto-generated method stub
-		return false;
-	}
-
-	@Override
-	public boolean isAccountNonLocked() {
-		// TODO Auto-generated method stub
-		return false;
-	}
-
-	@Override
-	public boolean isCredentialsNonExpired() {
-		// TODO Auto-generated method stub
-		return false;
-	}
-
-	@Override
-	public boolean isEnabled() {
-		// TODO Auto-generated method stub
-		return false;
-	}
-
-}
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/b3/20d90aeb30b4001d1d079a924effdc9e b/.metadata/.plugins/org.eclipse.core.resources/.history/b3/20d90aeb30b4001d1d079a924effdc9e
deleted file mode 100644
index 75abab76..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/b3/20d90aeb30b4001d1d079a924effdc9e
+++ /dev/null
@@ -1,113 +0,0 @@
-<!DOCTYPE html>
-<html xmlns:th="http://www.thymeleaf.org"
-	  xmlns:sec="https://www.thymeleaf.org/thymeleaf-extras-springsecurity5">
-
-<head>
-	<meta http-equiv="Content-Type" content="text/html; charset= UTF-8">
-	<meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0">
-	<title>Home - Shopme Admin</title>
-	
-	<link rel="stylesheet" type="text/css" th:href="@{/fontawesome/all.css}" />
-	<link rel="stylesheet" type="text/css" th:href="@{/style.css}" />
-	<link rel="stylesheet" type="text/css" th:href="@{/webjars/bootstrap/css/bootstrap.min.css}" />
-	
-	<script type="text/javascript" th:src="@{/webjars/jquery/jquery.min.js}"></script>
-	<script type="text/javascript" th:src="@{/webjars/bootstrap/js/bootstrap.min.js}"></script>
-</head>
-
-<body>
-	<div class="container-fluid">
-		<div>
-			<form th:action="@{/logout}" method="post" th:hidden="true" name="logoutForm">
-				<input type="submit"/>
-			</form>
-			<nav class="navbar navbar-expand-lg bg-dark navbar-dark">
-				<a class="navbar-brand" th:href="@{/}">
-					<img th:src="@{/images/ShopmeAdminSmall.png}"/>
-				</a>
-				<!--hamburger toggler for mobile devices(responsive)-->
-				<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#topNavbar">
-					<span class="navbar-toggler-icon"></span>
-				</button>
-				<div class="collapse navbar-collapse" id="topNavbar">
-					<ul class="navbar-nav">
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/users}">Users</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/categories}">Categories</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/brands}">Brands</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/products}">Products</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/customers}">Customers</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/shipping}">Shipping</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/orders}">Orders</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/report}">Sales Report</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/articles}">Articles</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/menus}">Menus</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/settings}">Settings</a>
-						</li>
-						<li>
-							<span class="fas fa-user fa-2x icon-silver"></span>
-						</li>
-						<li class="nav-item dropdown">
-								<!-- principal refers to user; display username -->
-							<a class="nav-link dropdown-toggle" sec:authentication="principal.fullname" data-toggle="dropdown"></a>
-							<div class="dropdown-menu">
-								<a class="dropdown-item" id="logoutLink" href="">Logout</a>
-							</div>
-							
-						</li>
-					</ul>
-				</div>
-				
-			</nav>
-		</div>
-
-		<div>
-			<h1>Shopme Control Panel</h1>
-		</div>
-
-		<div>
-			<p>Shopme Control Panel - Copyright &copy; Shopme</p>
-		</div>
-
-
-	</div>
-	
-<script type="text/javascript">
-
-	$(document).ready(function(){
-		$("#logoutLink").on("click" function(e){
-			e.preventDefault(); /* stop the hyperlink default behaviour  */
-			/* use  the form to  log out and navigate to the url path /logout  
-			
-			 NOTE: spring security requires a POST request form to logout in order to obtain the csrf token, 
-			 		the csrf token is a hidden property in the form
-			*/
-			document.logoutForm.submit();
-		});
-	});
-
-</script>
-
-</body>
-
-</html>
\ No newline at end of file
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/b3/50bb53b3f9b8001d11addcb4256c67f9 b/.metadata/.plugins/org.eclipse.core.resources/.history/b3/50bb53b3f9b8001d11addcb4256c67f9
new file mode 100644
index 00000000..a2b41655
--- /dev/null
+++ b/.metadata/.plugins/org.eclipse.core.resources/.history/b3/50bb53b3f9b8001d11addcb4256c67f9
@@ -0,0 +1,44 @@
+package com.shopme.admin;
+
+import java.nio.file.Path;
+import java.nio.file.Paths;
+
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
+
+@Configuration
+public class MvcConfig implements WebMvcConfigurer {
+
+	
+	/*
+	 * In short, we can tell Spring MVC to map a given URL (e.g. "/user-photos") 
+	 * to any directory (e.g. D:/ShopmeProject/ShopmeBackend/user-photos) 
+	 * and expose the resources (images, js, css...) in this directory to 
+	 * the web clients (browsers) - that's the primary purpose
+	 *  of using resource handlers in Spring MVC.
+	 * 
+	 * Because the assests are not locoated in the src/main/resources/static folder
+	 * */
+	
+	@Override
+	public void addResourceHandlers(ResourceHandlerRegistry registry) {
+
+		String dirName = "user-photos";
+		
+		Path userPhotoDir = Paths.get(dirName);
+		
+		String userPhotosPath = userPhotoDir.toFile().getAbsolutePath();
+		
+		
+		// add /** to allow all files under this directory to be available to client
+		
+		registry.addResourceHandler("/" + dirName + "/**")
+		.addResourceLocations("file:/" + userPhotosPath + "/");
+		
+	}
+	
+	
+	
+	
+}
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/b3/90606b370ab4001d128fb79045552177 b/.metadata/.plugins/org.eclipse.core.resources/.history/b3/90606b370ab4001d128fb79045552177
deleted file mode 100644
index 3b7f777e..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/b3/90606b370ab4001d128fb79045552177
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<html xmlns:th="http://www.thymeleaf.org">
-
-<head>
-	<meta http-equiv="Content-Type" content="text/html; charset= UTF-8">
-	<meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0">
-	<title>Login - Shopme Admin</title>
-	<link rel="stylesheet" type="text/css" th:href="@{/webjars/bootstrap/css/bootstrap.min.css}" />
-</head>
-
-<body>
-	<div class="container-fluid text-center">
-		
-		<div>
-			<img th:src="@{/images/ShopmeAdminBig.png}" />
-		</div>
-		
-		<form th:action="@{/login}" method="post" style="max-width:350px">
-		
-			<div class="border border-secondary rounded">
-				<p>Access to Shopme Control Panel </p>
-				
-				<p>
-					<input type="email" name="email" class="form-control" required />
-					
-				
-				</p>
-			</div>
-		
-		</form>
-
-		<div>
-			<p>Shopme Control Panel - Copyright &copy; Shopme</p>
-		</div>
-
-	</div>
-
-</body>
-
-</html>
\ No newline at end of file
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/b4/a06330e515b4001d128fb79045552177 b/.metadata/.plugins/org.eclipse.core.resources/.history/b4/a06330e515b4001d128fb79045552177
deleted file mode 100644
index 708b0769..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/b4/a06330e515b4001d128fb79045552177
+++ /dev/null
@@ -1,37 +0,0 @@
-package com.shopme.admin.security;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.core.userdetails.UserDetails;
-import org.springframework.security.core.userdetails.UserDetailsService;
-import org.springframework.security.core.userdetails.UsernameNotFoundException;
-
-import com.shopme.admin.user.UserRepository;
-import com.shopme.common.entity.User;
-
-/*
- * This class will be called by spring security when performing authentication service
- * 
- * 
- * */
-
-
-public class ShopmeUserDetailsService implements UserDetailsService {
-
-	
-	@Autowired
-	private UserRepository userRepo;
-	
-	
-	@Override
-	public UserDetails loadUserByUsername(String email) throws UsernameNotFoundException {
-
-		User user = userRepo.getUserByEmail(email);
-		
-		if( user != null) {
-			return new ShopmeUserDetails(user);
-		}
-		
-		return null;
-	}
-
-}
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/b4/d06240968eb9001d14fea12e82c90085 b/.metadata/.plugins/org.eclipse.core.resources/.history/b4/d06240968eb9001d14fea12e82c90085
new file mode 100644
index 00000000..6f9eea2e
--- /dev/null
+++ b/.metadata/.plugins/org.eclipse.core.resources/.history/b4/d06240968eb9001d14fea12e82c90085
@@ -0,0 +1,73 @@
+package com.shopme.admin.category;
+
+import java.io.IOException;
+import java.util.List;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.scheduling.support.SimpleTriggerContext;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
+import org.springframework.util.StringUtils;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.ModelAttribute;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.multipart.MultipartFile;
+import org.springframework.web.servlet.mvc.support.RedirectAttributes;
+
+import com.shopme.admin.FileUploadUtil;
+import com.shopme.common.entity.Category;
+
+@Controller
+public class CategoryController {
+	
+	@Autowired
+	private CategoryService service;
+	
+	@GetMapping("/categories")
+	public String listAll(Model model) {
+		
+		List<Category> listCategories = service.listAll();
+		model.addAttribute("listCategories", listCategories);
+		
+		return "categories/categories";
+	}
+	
+	
+	@GetMapping("/categories/new")
+	public String newCategory(Model model) {
+		
+		List<Category> listCategories = service.listCategoriesUsedInForm();
+		
+		model.addAttribute("category", new Category());
+		model.addAttribute("listCategories", listCategories);
+		model.addAttribute("pageTitle", "Create New Category");
+		
+		return "categories/category_form";
+	
+	}
+	
+	@PostMapping("/categories/save")
+	public String saveCategory(@ModelAttribute("category") Category category, 
+			RedirectAttributes redirectAttributes,
+			@RequestParam("fileImage") MultipartFile multipartFile) throws IOException {
+		
+		String fileName = StringUtils.cleanPath(multipartFile.getOriginalFilename());
+		category.setImage(fileName);
+		
+		Category savedCategory = service.save(category);
+		String uploadDir = "../category-images/" + savedCategory.getId();
+		FileUploadUtil.saveFile(uploadDir, fileName, multipartFile);
+		
+		
+		redirectAttributes.addFlashAttribute("message", "the category have been saved successfully");
+		
+		
+		return "redirect:/categories";
+	}
+	
+}
+	
+
+
+
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/b6/00e34ba164b3001d19bbb001c1a81c20 b/.metadata/.plugins/org.eclipse.core.resources/.history/b6/00e34ba164b3001d19bbb001c1a81c20
deleted file mode 100644
index e69de29b..00000000
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/b7/60d76c6845b4001d1d079a924effdc9e b/.metadata/.plugins/org.eclipse.core.resources/.history/b7/60d76c6845b4001d1d079a924effdc9e
deleted file mode 100644
index 94950f4f..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/b7/60d76c6845b4001d1d079a924effdc9e
+++ /dev/null
@@ -1,43 +0,0 @@
-<!DOCTYPE html>
-<html xmlns:th="http://www.thymeleaf.org"
-	  xmlns:sec="https://www.thymeleaf.org/thymeleaf-extras-springsecurity5">
-
-<head th:replace="fragments :: page_head('Home - Shopme Admin')"/>
-
-<body>
-	<div class="container-fluid">
-			
-		<div th:replace="fragments :: menu"></div>
-
-		<div>
-			<h1>Shopme Control Panel</h1>
-		</div>
-
-		<div>
-			<p>Shopme Control Panel - Copyright &copy; Shopme</p>
-		</div>
-
-
-	</div>
-	
-<script type="text/javascript">
-
-	$(document).ready(function(){
-		$("#logoutLink").on("click", function(e){
-			e.preventDefault(); /* stop the hyperlink default behaviour  */
-			
-			
-			/* use  the form to  log out and navigate to the url path /logout  
-			
-			 NOTE: spring security requires a POST request form to logout in order to obtain the csrf token, 
-			 		the csrf token is a hidden property in the form
-			*/
-			document.logoutForm.submit();
-		});
-	});
-
-</script>
-
-</body>
-
-</html>
\ No newline at end of file
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/b8/108d750f0db4001d128fb79045552177 b/.metadata/.plugins/org.eclipse.core.resources/.history/b8/108d750f0db4001d128fb79045552177
deleted file mode 100644
index e09cae02..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/b8/108d750f0db4001d128fb79045552177
+++ /dev/null
@@ -1,63 +0,0 @@
-package com.shopme.admin.security;
-
-import java.util.Collection;
-
-import org.springframework.security.core.GrantedAuthority;
-import org.springframework.security.core.userdetails.UserDetails;
-
-import com.shopme.common.entity.User;
-
-public class ShopmeUserDetails implements UserDetails {
-
-	private User user;
-	
-	
-	
-	
-	public ShopmeUserDetails(User user) {
-		this.user = user;
-	}
-
-	@Override
-	public Collection<? extends GrantedAuthority> getAuthorities() {
-		// TODO Auto-generated method stub
-		return null;
-	}
-
-	@Override
-	public String getPassword() {
-		// TODO Auto-generated method stub
-		return null;
-	}
-
-	@Override
-	public String getUsername() {
-		// TODO Auto-generated method stub
-		return null;
-	}
-
-	@Override
-	public boolean isAccountNonExpired() {
-		// TODO Auto-generated method stub
-		return false;
-	}
-
-	@Override
-	public boolean isAccountNonLocked() {
-		// TODO Auto-generated method stub
-		return false;
-	}
-
-	@Override
-	public boolean isCredentialsNonExpired() {
-		// TODO Auto-generated method stub
-		return false;
-	}
-
-	@Override
-	public boolean isEnabled() {
-		// TODO Auto-generated method stub
-		return false;
-	}
-
-}
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/b8/80ca171445b4001d1d079a924effdc9e b/.metadata/.plugins/org.eclipse.core.resources/.history/b8/80ca171445b4001d1d079a924effdc9e
deleted file mode 100644
index da304a1c..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/b8/80ca171445b4001d1d079a924effdc9e
+++ /dev/null
@@ -1,48 +0,0 @@
-<!DOCTYPE html>
-<html xmlns:th="http://www.thymeleaf.org">
-
-<body>
-
-	<div th:fragment="menu">
-		<nav class="navbar navbar-expand-lg bg-dark navbar-dark">
-			<a class="navbar-brand" th:href="@{/}"> <img
-				th:src="@{/images/ShopmeAdminSmall.png}" />
-			</a>
-			<!--hamburger toggler for mobile devices(responsive)-->
-			<button class="navbar-toggler" type="button" data-toggle="collapse"
-				data-target="#topNavbar">
-				<span class="navbar-toggler-icon"></span>
-			</button>
-			<div class="collapse navbar-collapse" id="topNavbar">
-				<ul class="navbar-nav">
-					<li class="nav-item"><a class="nav-link" th:href="@{/users}">Users</a>
-					</li>
-					<li class="nav-item"><a class="nav-link"
-						th:href="@{/categories}">Categories</a></li>
-					<li class="nav-item"><a class="nav-link" th:href="@{/brands}">Brands</a>
-					</li>
-					<li class="nav-item"><a class="nav-link"
-						th:href="@{/products}">Products</a></li>
-					<li class="nav-item"><a class="nav-link"
-						th:href="@{/customers}">Customers</a></li>
-					<li class="nav-item"><a class="nav-link"
-						th:href="@{/shipping}">Shipping</a></li>
-					<li class="nav-item"><a class="nav-link" th:href="@{/orders}">Orders</a>
-					</li>
-					<li class="nav-item"><a class="nav-link" th:href="@{/report}">Sales
-							Report</a></li>
-					<li class="nav-item"><a class="nav-link"
-						th:href="@{/articles}">Articles</a></li>
-					<li class="nav-item"><a class="nav-link" th:href="@{/menus}">Menus</a>
-					</li>
-					<li class="nav-item"><a class="nav-link"
-						th:href="@{/settings}">Settings</a></li>
-				</ul>
-			</div>
-
-		</nav>
-	</div>
-	
-	
-</body>
-</html>
\ No newline at end of file
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/b8/e03289ef31b7001d19ef99be8d31e273 b/.metadata/.plugins/org.eclipse.core.resources/.history/b8/e03289ef31b7001d19ef99be8d31e273
deleted file mode 100644
index 4585f982..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/b8/e03289ef31b7001d19ef99be8d31e273
+++ /dev/null
@@ -1,65 +0,0 @@
-package com.shopme.admin.category;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
-import java.util.List;
-
-import org.junit.jupiter.api.Test;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.autoconfigure.jdbc.AutoConfigureTestDatabase;
-import org.springframework.boot.test.autoconfigure.jdbc.AutoConfigureTestDatabase.Replace;
-import org.springframework.boot.test.autoconfigure.orm.jpa.DataJpaTest;
-import org.springframework.test.annotation.Rollback;
-
-import com.shopme.common.entity.Category;
-
-/*
- * Unit Test for CategoryRepository
- * 
- * objective:
- * 1. test the methods in repository 
- * 2. populate the database with records
- * 
-*/
-
-@DataJpaTest
-@AutoConfigureTestDatabase(replace = Replace.NONE)
-@Rollback(false)
-public class CategoryRepositoryTests {
-
-	@Autowired
-	private CategoryRepository repo;
-
-	@Test
-	public void testCreateRootCategory() {
-//		Category category = new Category("Computers");
-		Category category = new Category("Electronics");
-		Category savedCategory = repo.save(category);
-
-		assertThat(savedCategory.getId()).isGreaterThan(0);
-
-	}
-
-	@Test
-	public void testCreateSubCategory() {
-
-		// ID for root category "Computer" is 1
-//		Category parent = new Category(1);
-
-//		Category subCategory = new Category("Desktops", parent);
-//		Category savedCategory = repo.save(subCategory);
-//		assertThat(savedCategory.getId()).isGreaterThan(0);
-
-		Category laptops = new Category("Laptops", parent);
-		Category components = new Category("Computer Components", parent);
-
-		repo.saveAll(List.of(laptops, components));
-		
-		// ID for root category "Electronics" is 2
-		Category parent = new Category(2);
-
-		
-
-	}
-
-}
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/b9/809e93f40ab9001d11addcb4256c67f9 b/.metadata/.plugins/org.eclipse.core.resources/.history/b9/809e93f40ab9001d11addcb4256c67f9
new file mode 100644
index 00000000..507b300b
--- /dev/null
+++ b/.metadata/.plugins/org.eclipse.core.resources/.history/b9/809e93f40ab9001d11addcb4256c67f9
@@ -0,0 +1,57 @@
+package com.shopme.admin;
+
+import java.nio.file.Path;
+import java.nio.file.Paths;
+
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
+
+@Configuration
+public class MvcConfig implements WebMvcConfigurer {
+
+	
+	/*
+	 * In short, we can tell Spring MVC to map a given URL (e.g. "/user-photos") 
+	 * to any directory (e.g. D:/ShopmeProject/ShopmeBackend/user-photos) 
+	 * and expose the resources (images, js, css...) in this directory to 
+	 * the web clients (browsers) - that's the primary purpose
+	 *  of using resource handlers in Spring MVC.
+	 * 
+	 * Because the assets are not located in the src/main/resources/static folder
+	 * */
+	
+	@Override
+	public void addResourceHandlers(ResourceHandlerRegistry registry) {
+
+		String dirName = "user-photos";
+		
+		Path userPhotoDir = Paths.get(dirName);
+		
+		String userPhotosPath = userPhotoDir.toFile().getAbsolutePath();
+		
+		
+		// add /** to allow all files under this directory to be available to client
+		
+		registry.addResourceHandler("/" + dirName + "/**")
+		.addResourceLocations("file:/" + userPhotosPath + "/");
+		
+		
+		String categoryImagesName = "category-images";
+		
+		Path userPhotoDir = Paths.get(dirName);
+		
+		String userPhotosPath = userPhotoDir.toFile().getAbsolutePath();
+		
+		
+		// add /** to allow all files under this directory to be available to client
+		
+		registry.addResourceHandler("/" + dirName + "/**")
+		.addResourceLocations("file:/" + userPhotosPath + "/");
+		
+	}
+	
+	
+	
+	
+}
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/b9/a0408e0d77b3001d19bbb001c1a81c20 b/.metadata/.plugins/org.eclipse.core.resources/.history/b9/a0408e0d77b3001d19bbb001c1a81c20
deleted file mode 100644
index b344552f..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/b9/a0408e0d77b3001d19bbb001c1a81c20
+++ /dev/null
@@ -1,192 +0,0 @@
-package com.shopme.admin.user;
-
-import java.io.IOException;
-import java.util.List;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.domain.Page;
-import org.springframework.data.repository.query.Param;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
-import org.springframework.util.StringUtils;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.ModelAttribute;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.multipart.MultipartFile;
-import org.springframework.web.servlet.mvc.support.RedirectAttributes;
-
-import com.fasterxml.jackson.annotation.ObjectIdGenerators.StringIdGenerator;
-import com.shopme.admin.FileUploadUtil;
-import com.shopme.common.entity.Role;
-import com.shopme.common.entity.User;
-
-import jakarta.servlet.http.HttpServletResponse;
-
-@Controller
-public class UserController {
-
-	@Autowired
-	private UserService service;
-
-	@GetMapping("/users")
-	public String listFirstPage(Model model) {
-
-		// NOTE: these are the default values for path variable and URL parameters
-		return listByPage(1, model, "firstName", "asc", null);
-	}
-
-	@GetMapping("/users/page/{pageNum}")
-	public String listByPage(@PathVariable(name = "pageNum") int pageNum, Model model,
-			@Param("sortField") String sortField, @Param("sortDir") String sortDir, @Param("keyword") String keyword) {
-
-		System.out.println("sort field: " + sortField);
-		System.out.println("sort order: " + sortDir);
-
-		Page<User> page = service.listByPage(pageNum, sortField, sortDir, keyword);
-		List<User> listUsers = page.getContent();
-
-		long startCount = (pageNum - 1) * UserService.USERS_PER_PAGE + 1;
-		long endCount = startCount + UserService.USERS_PER_PAGE - 1;
-		if (endCount > page.getTotalElements()) {
-			endCount = page.getTotalElements();
-		}
-
-		String reverseSortDir = sortDir.equals("asc") ? "desc" : "asc";
-
-		model.addAttribute("currentPage", pageNum);
-		model.addAttribute("totalPages", page.getTotalPages());
-		model.addAttribute("startCount", startCount);
-		model.addAttribute("endCount", endCount);
-		model.addAttribute("totalItems", page.getTotalElements());
-		model.addAttribute("listUsers", listUsers);
-		model.addAttribute("sortField", sortField);
-		model.addAttribute("sortDir", sortDir);
-		model.addAttribute("reverseSortDir", reverseSortDir);
-		model.addAttribute("keyword", keyword);
-
-		return "users";
-
-	}
-
-	@GetMapping("/users/new")
-	public String newUser(Model model) {
-
-		List<Role> listRoles = service.listRoles();
-
-		User user = new User();
-		user.setEnabled(true);
-
-		model.addAttribute("user", user);
-		model.addAttribute("listRoles", listRoles);
-		model.addAttribute("pageTitle", "Create New User");
-
-		return "user_form";
-
-	}
-
-	// using @RequestParam, we can get the image file input, the input has the
-	// property name="image"
-	@PostMapping("/users/save")
-	public String saveUser(@ModelAttribute("user") User user, RedirectAttributes redirectAttributes,
-			@RequestParam("image") MultipartFile multipartFile) throws IOException {
-
-		if (!multipartFile.isEmpty()) {
-
-			String fileName = StringUtils.cleanPath(multipartFile.getOriginalFilename());
-			user.setPhotos(fileName);
-
-			User savedUser = service.save(user);
-
-			String uploadDir = "user-photos/" + savedUser.getId();
-
-			FileUploadUtil.cleanDir(uploadDir);
-			FileUploadUtil.saveFile(uploadDir, fileName, multipartFile);
-		} else {
-
-			// set photo to null for getPhotosImagePath() method's conditional statement in
-			// User class
-			if (user.getPhotos().isEmpty())
-				user.setPhotos(null);
-			service.save(user);
-		}
-
-		redirectAttributes.addFlashAttribute("message", "the user has been saved successfully");
-
-		// POST/REDIRECT/GET web design
-		return getRedirectURLtoAffectedUser(user);
-	}
-
-	private String getRedirectURLtoAffectedUser(User user) {
-
-		// after user is saved display the user instead of the entire user list
-		// email is a unique field to identify each user.
-		String firstPartOfEmail = user.getEmail().split("@")[0];
-		return "redirect:/users/page/1?sortField=id&sortDir=asc&keyword=" + firstPartOfEmail;
-	}
-
-	@GetMapping("/users/edit/{id}")
-	public String editUser(@PathVariable(name = "id") Integer id, RedirectAttributes redirectAttributes, Model model) {
-		try {
-			User user = service.get(id);
-			List<Role> listRoles = service.listRoles();
-
-			model.addAttribute("user", user);
-			model.addAttribute("pageTitle", "Edit User (ID: " + id + ")");
-			model.addAttribute("listRoles", listRoles);
-
-			return "user_form";
-		} catch (UserNotFoundException ex) {
-			redirectAttributes.addFlashAttribute("message", ex.getMessage());
-
-			return "redirect:/users";
-		}
-
-	}
-
-	@GetMapping("/users/delete/{id}")
-	public String deleteUser(@PathVariable(name = "id") Integer id, RedirectAttributes redirectAttributes,
-			Model model) {
-		try {
-			service.delete(id);
-			redirectAttributes.addFlashAttribute("message", "The user ID " + id + " has been deleted successfully.");
-
-		} catch (UserNotFoundException ex) {
-			redirectAttributes.addFlashAttribute("message", ex.getMessage());
-
-		}
-
-		return "redirect:/users";
-	}
-
-	@GetMapping("/users/{id}/enabled/{status}")
-	public String updateUserEnabledStatus(@PathVariable(name = "id") Integer id,
-			@PathVariable(name = "status") boolean enabled, RedirectAttributes redirectAttributes) {
-
-		service.updateUserEnabledStatus(id, enabled);
-		String status = enabled ? "enabled" : "disabled";
-		String message = "The user id " + id + " has been " + status;
-		redirectAttributes.addFlashAttribute("message", message);
-
-		return "redirect:/users";
-	}
-
-	@GetMapping("/users/export/csv")
-	public void exportToCSV(HttpServletResponse response) throws IOException {
-
-		List<User> listUsers = service.listAll();
-		UserCsvExporter exporter = new UserCsvExporter();
-		exporter.export(listUsers, response);
-	}
-	
-	@GetMapping("/users/export/csv")
-	public void exportToCSV(HttpServletResponse response) throws IOException {
-
-		List<User> listUsers = service.listAll();
-	}
-	
-	
-	
-
-}
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/b9/f0caad0d45b4001d1d079a924effdc9e b/.metadata/.plugins/org.eclipse.core.resources/.history/b9/f0caad0d45b4001d1d079a924effdc9e
deleted file mode 100644
index a4ca3cd0..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/b9/f0caad0d45b4001d1d079a924effdc9e
+++ /dev/null
@@ -1,110 +0,0 @@
-<!DOCTYPE html>
-<html xmlns:th="http://www.thymeleaf.org"
-	  xmlns:sec="https://www.thymeleaf.org/thymeleaf-extras-springsecurity5">
-
-<head th:replace="fragments :: page_head('Home - Shopme Admin')"/>
-
-<body>
-	<div class="container-fluid">
-		<div>
-			<!--   
-				use  the form to  log out and navigate to the url path /logout  
-			
-			    NOTE: spring security requires a POST request form to logout in order to obtain the csrf token, 
-			 		the csrf token is a hidden property in the form -->
-			 
-			<form th:action="@{/logout}" method="post" th:hidden="true" name="logoutForm">
-				<input type="submit"/>
-			</form>
-			<nav class="navbar navbar-expand-lg bg-dark navbar-dark">
-				<a class="navbar-brand" th:href="@{/}">
-					<img th:src="@{/images/ShopmeAdminSmall.png}"/>
-				</a>
-				<!--hamburger toggler for mobile devices(responsive)-->
-				<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#topNavbar">
-					<span class="navbar-toggler-icon"></span>
-				</button>
-				<div class="collapse navbar-collapse" id="topNavbar">
-					<ul class="navbar-nav">
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/users}">Users</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/categories}">Categories</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/brands}">Brands</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/products}">Products</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/customers}">Customers</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/shipping}">Shipping</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/orders}">Orders</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/report}">Sales Report</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/articles}">Articles</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/menus}">Menus</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/settings}">Settings</a>
-						</li>
-						<li>
-							<span class="fas fa-user fa-2x icon-silver"></span>
-						</li>
-						<li class="nav-item dropdown">
-								<!-- principal refers to user; display username -->
-							<a class="nav-link dropdown-toggle" sec:authentication="principal.fullname" data-toggle="dropdown"></a>
-							<div class="dropdown-menu">
-								<a class="dropdown-item" id="logoutLink" href="">Logout</a>
-							</div>
-							
-						</li>
-					</ul>
-				</div>
-				
-			</nav>
-		</div>
-
-		<div>
-			<h1>Shopme Control Panel</h1>
-		</div>
-
-		<div>
-			<p>Shopme Control Panel - Copyright &copy; Shopme</p>
-		</div>
-
-
-	</div>
-	
-<script type="text/javascript">
-
-	$(document).ready(function(){
-		$("#logoutLink").on("click", function(e){
-			e.preventDefault(); /* stop the hyperlink default behaviour  */
-			
-			
-			/* use  the form to  log out and navigate to the url path /logout  
-			
-			 NOTE: spring security requires a POST request form to logout in order to obtain the csrf token, 
-			 		the csrf token is a hidden property in the form
-			*/
-			document.logoutForm.submit();
-		});
-	});
-
-</script>
-
-</body>
-
-</html>
\ No newline at end of file
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/ba/201cb23830b4001d1d079a924effdc9e b/.metadata/.plugins/org.eclipse.core.resources/.history/ba/201cb23830b4001d1d079a924effdc9e
deleted file mode 100644
index f9c58010..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/ba/201cb23830b4001d1d079a924effdc9e
+++ /dev/null
@@ -1,107 +0,0 @@
-<!DOCTYPE html>
-<html xmlns:th="http://www.thymeleaf.org"
-	  xmlns:sec="https://www.thymeleaf.org/thymeleaf-extras-springsecurity5">
-
-<head>
-	<meta http-equiv="Content-Type" content="text/html; charset= UTF-8">
-	<meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0">
-	<title>Home - Shopme Admin</title>
-	
-	<link rel="stylesheet" type="text/css" th:href="@{/fontawesome/all.css}" />
-	<link rel="stylesheet" type="text/css" th:href="@{/style.css}" />
-	<link rel="stylesheet" type="text/css" th:href="@{/webjars/bootstrap/css/bootstrap.min.css}" />
-	
-	<script type="text/javascript" th:src="@{/webjars/jquery/jquery.min.js}"></script>
-	<script type="text/javascript" th:src="@{/webjars/bootstrap/js/bootstrap.min.js}"></script>
-</head>
-
-<body>
-	<div class="container-fluid">
-		<div>
-			<form th:action="@{/logout}" method="post" th:hidden="true" name="logoutForm">
-				<input type="submit"/>
-			</form>
-			<nav class="navbar navbar-expand-lg bg-dark navbar-dark">
-				<a class="navbar-brand" th:href="@{/}">
-					<img th:src="@{/images/ShopmeAdminSmall.png}"/>
-				</a>
-				<!--hamburger toggler for mobile devices(responsive)-->
-				<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#topNavbar">
-					<span class="navbar-toggler-icon"></span>
-				</button>
-				<div class="collapse navbar-collapse" id="topNavbar">
-					<ul class="navbar-nav">
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/users}">Users</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/categories}">Categories</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/brands}">Brands</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/products}">Products</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/customers}">Customers</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/shipping}">Shipping</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/orders}">Orders</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/report}">Sales Report</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/articles}">Articles</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/menus}">Menus</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/settings}">Settings</a>
-						</li>
-						<li>
-							<span class="fas fa-user fa-2x icon-silver"></span>
-						</li>
-						<li class="nav-item dropdown">
-								<!-- principal refers to user; display username -->
-							<a class="nav-link dropdown-toggle" sec:authentication="principal.fullname" data-toggle="dropdown"></a>
-							<div class="dropdown-menu">
-								<a class="dropdown-item" id="logoutLink" href="">Logout</a>
-							</div>
-							
-						</li>
-					</ul>
-				</div>
-				
-			</nav>
-		</div>
-
-		<div>
-			<h1>Shopme Control Panel</h1>
-		</div>
-
-		<div>
-			<p>Shopme Control Panel - Copyright &copy; Shopme</p>
-		</div>
-
-
-	</div>
-	
-<script type="text/javascript">
-
-	$(document).ready(function(){
-		$("#logoutLink").on("click" function(e){
-			e.preventDefault(); /* stop the hyperlink default behaviour  */
-		});
-	});
-
-</script>
-
-</body>
-
-</html>
\ No newline at end of file
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/ba/407cb60c8db3001d19bbb001c1a81c20 b/.metadata/.plugins/org.eclipse.core.resources/.history/ba/407cb60c8db3001d19bbb001c1a81c20
deleted file mode 100644
index e0f98970..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/ba/407cb60c8db3001d19bbb001c1a81c20
+++ /dev/null
@@ -1,276 +0,0 @@
-<!DOCTYPE html>
-<html xmlns:th="http://www.thymeleaf.org">
-
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset= UTF-8">
-<meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0">
-<title>Manage Users</title>
-
-<link rel="stylesheet" type="text/css" th:href="@{/webjars/bootstrap/css/bootstrap.min.css}" />
-<link rel="stylesheet" type="text/css" th:href="@{/fontawesome/all.css}" />
-<link rel="stylesheet" type="text/css" th:href="@{/style.css}" />
-	
-<script type="text/javascript" th:src="@{/webjars/jquery/jquery.min.js}"></script>
-<script type="text/javascript" th:src="@{/webjars/bootstrap/js/bootstrap.min.js}"></script>
-</head>
-
-<body>
-	<div class="container-fluid">
-		<div>
-			<nav class="navbar navbar-expand-lg bg-dark navbar-dark">
-				<a class="navbar-brand" th:href="@{/}"> <img
-					th:src="@{/images/ShopmeAdminSmall.png}" />
-				</a>
-				<!--hamburger toggler for mobile devices(responsive)-->
-				<button class="navbar-toggler" type="button" data-toggle="collapse"
-					data-target="#topNavbar">
-					<span class="navbar-toggler-icon"></span>
-				</button>
-				<div class="collapse navbar-collapse" id="topNavbar">
-					<ul class="navbar-nav">
-						<li class="nav-item"><a class="nav-link" th:href="@{/users}">Users</a>
-						</li>
-						<li class="nav-item"><a class="nav-link"
-							th:href="@{/categories}">Categories</a></li>
-						<li class="nav-item"><a class="nav-link" th:href="@{/brands}">Brands</a>
-						</li>
-						<li class="nav-item"><a class="nav-link"
-							th:href="@{/products}">Products</a></li>
-						<li class="nav-item"><a class="nav-link"
-							th:href="@{/customers}">Customers</a></li>
-						<li class="nav-item"><a class="nav-link"
-							th:href="@{/shipping}">Shipping</a></li>
-						<li class="nav-item"><a class="nav-link" th:href="@{/orders}">Orders</a>
-						</li>
-						<li class="nav-item"><a class="nav-link" th:href="@{/report}">Sales
-								Report</a></li>
-						<li class="nav-item"><a class="nav-link"
-							th:href="@{/articles}">Articles</a></li>
-						<li class="nav-item"><a class="nav-link" th:href="@{/menus}">Menus</a>
-						</li>
-						<li class="nav-item"><a class="nav-link"
-							th:href="@{/settings}">Settings</a></li>
-					</ul>
-				</div>
-
-			</nav>
-		</div>
-
-		<div>
-			<h2>Manage Users</h2>
-			<a th:href="@{/users/new}" class="fas fa-user-plus fa-2x icon-dark mr-2"></a>
-			
-			<a th:href="@{/users/export/csv}" class="fas fa-file-csv fa-2x icon-dark mr-2"></a>
-		</div>
-		
-		
-		
-		<!-- only display success message when a new user is created -->
-		<div th:if="${message != null}" class="alert alert-success text-center">
-			[[${message}]]
-		</div>
-			
-		<div>
-			<form th:action="@{/users/page/1}" class="form-inline m-3">
-				
-				<input type="hidden" name="sortField" th:value="${sortField}" />
-				<input type="hidden" name="sortDir" th:value="${sortDir}" />
-				Filter:&nbsp;
-				<input type="search" name="keyword" th:value="${keyword}" class="form-control" required/>
-				&nbsp;&nbsp;
-				<button type="submit" class="btn btn-primary">
-					<i class="fas fa-search"></i>
-				</button>
-				&nbsp;&nbsp;
-				<button type="button" class="btn btn-secondary" onclick="clearFilter()">
-					<i class="fas fa-eraser"></i>
-				</button>
-			</form>
-		
-		</div>
-
-			<!-- css class to display this table in large screens only , refer to static/style.css for more info-->
-			<div class="full-details">
-				<table class="table table-bordered table-striped table-hover table-responsive-xL">
-					<thead class="thead-dark">
-						<tr>
-							<!-- refer to templates/fragments.html for fragment code-->
-							<th th:replace="fragments :: column_link('id', 'User ID')"/>
-							<th>Photos</th>
-							<th th:replace="fragments :: column_link('email', 'Email')"/>
-							<th th:replace="fragments :: column_link('firstName', 'First Name')"/>
-							<th th:replace="fragments :: column_link('lastName', 'Last Name')"/>
-							<th>Roles</th>
-							<th th:replace="fragments :: column_link('enabled', 'Enabled')"/>
-							<th></th>
-						</tr>
-					</thead>
-					<tbody>
-						<tr th:each="user : ${listUsers}">
-							<td>[[${user.id}]]</td>
-							<td>
-								<span th:if="${user.photos == null}" class="fas fa-portrait fa-3x icon-dark"></span>
-								<img th:if="${user.photos != null}" th:src="@{${user.photosImagePath}}"
-								style="width: 100px"/>
-							</td>
-							<td>[[${user.email}]]</td>
-							<td>[[${user.firstName}]]</td>
-							<td>[[${user.lastName}]]</td>
-							<td>[[${user.roles}]]</td>
-							
-							<td>
-								<a th:if="${user.enabled == true}" class="fas fa-check-circle fa-2x icon-green" 
-								th:href="@{'/users/' + ${user.id} + '/enabled/false'}"
-								title="Disable this user"></a>
-								
-								<a th:if="${user.enabled == false}" class="fas fa-circle fa-2x icon-silver"
-								 th:href="@{'/users/' + ${user.id} + '/enabled/true'}"
-								 title="Enable this user"></a>
-							</td>
-							<td>
-									<a class="fas fa-edit fa-2x icon-green" th:href="@{'/users/edit/' + ${user.id}}"
-									title="edit this user"></a>
-									&nbsp; 
-									<a class="fas fa-trash fa-2x icon-dark link-delete" th:href="@{'/users/delete/' + ${user.id}}"
-									title="delete this user" th:userId="${user.id}"></a>
-							</td>
-						</tr>
-					</tbody>
-				</table>
-			</div>
-			
-			
-			<!-- css class to display this <div> on mobile screens only, refer to /static/style.css for more info-->
-			<div class="less-details">
-				
-				<div th:each="user : ${listUsers}" class="row m-1">
-					
-					<div class="col-4">
-						
-						<span th:if="${user.photos == null}" class="fas fa-portrait fa-3x icon-dark"></span>
-								<img th:if="${user.photos != null}" th:src="@{${user.photosImagePath}}"
-								style="width: 100px"/>
-					</div>
-					
-					<div class="col-8">
-						<div>[[${user.fullName}]]</div>
-						<div>[[${user.roles}]]</div>
-						<div>
-							<a th:if="${user.enabled == true}" class="fas fa-check-circle fa-2x icon-green" 
-								th:href="@{'/users/' + ${user.id} + '/enabled/false'}"
-								title="Disable this user"></a>
-								
-							<a th:if="${user.enabled == false}" class="fas fa-circle fa-2x icon-silver"
-								 th:href="@{'/users/' + ${user.id} + '/enabled/true'}"
-								 title="Enable this user"></a>
-						
-						
-							<a class="fas fa-edit fa-2x icon-green" th:href="@{'/users/edit/' + ${user.id}}"
-									title="edit this user"></a>
-									&nbsp; 
-							<a class="fas fa-trash fa-2x icon-dark link-delete" th:href="@{'/users/delete/' + ${user.id}}"
-									title="delete this user" th:userId="${user.id}"></a>
-						</div>
-					</div>
-					<div>&nbsp;</div>
-				</div>
-			</div>
-			
-			
-			<!-- IF -->
-			<div class="text-center m-1" th:if="${totalItems > 0}">
-				<span>Showing Users # [[${startCount}]] to [[${endCount}]] of [[${totalItems}]]</span>
-			</div>
-			
-			<!-- ELSE -->
-			<div class="text-center m-1" th:unless="${totalItems > 0}">
-				<span>No users found</span>
-			</div>
-			
-			<!-- only display pagination when there are users; else, no users no pagination -->
-			<div th:if="${totalPages > 1}">
-				<nav>
-					  <ul class="pagination justify-content-center flex-wrap">
-					  
-					  	<li th:class=" ${currentPage > 1 ? 'page-item' : 'page-item disabled'}">
-					  		<a th:replace="fragments :: page_link(1, 'First')"></a>
-				    	</li>
-					  
-					    <li th:class=" ${currentPage > 1 ? 'page-item' : 'page-item disabled'}">
-					    	<a th:replace="fragments :: page_link(${currentPage - 1 }, 'previous')"></a>
-				    	</li>
-					    	
-					    <!-- org.thymeleaf.expression.Numbers class, An object of this class is usually available in variable evaluation expressions with the name #numbers. -->
-					    <li th:class="${currentPage != i ? 'page-item' : 'page-item active'}" 
-					    	th:each="i : ${#numbers.sequence(1, totalPages)}">
-					    	<a th:replace="fragments :: page_link(${i}, ${i})"></a>
-					    </li>
-					    
-					    <li  th:class=" ${currentPage < totalPages ? 'page-item' : 'page-item disabled'}">
-					    	<a th:replace="fragments :: page_link(${currentPage + 1}, 'Next')"></a>
-					    </li>
-					    
-					    <li th:class=" ${currentPage < totalPages ? 'page-item' : 'page-item disabled'}">
-							<a th:replace="fragments :: page_link(${totalPages}, 'Last')"></a>		
-					    </li>
-					  </ul>
-				</nav>
-			</div>
-			
-			
-			
-			<div class="modal fade text-center" id="confirmModal">
-				<div class="modal-dialog">
-					<div class="modal-content">
-					
-						<div class="modal-header">
-							<h4 class="modal-title">Delete Confirmation</h4>
-							<button type="button" class="close" data-dismiss="modal">&times;</button>
-						</div>
-						
-						<div class="modal-body">
-							<span id="confirmText"></span>
-						</div>
-						
-						<div class="modal-footer">
-							<a class="btn btn-success" href="" id="yesButton">Yes</a>
-							<button type="button" class="btn btn-danger" data-dismiss="modal">Close</button>
-						</div>
-					</div>
-				</div>
-			</div>
-			
-			
-			<div class="text-center">
-				<p>Shopme Control Panel - Copyright &copy; Shopme</p>
-			</div>
-
-
-	</div>
-	
-<script type="text/javascript">
-
-//confirmation modal dialogue for delete user
-$(document).ready(function(){
-	$(".link-delete").on("click", function(e){
-		//stop the <a> tag default behaviour and pop out a confirmation modal dialogue
-		e.preventDefault();
-		//alert($(this).attr("href"));
-		link = $(this);
-		userId = link.attr("userId");
-		$("#yesButton").attr("href", link.attr("href"));
-		$("#confirmText").text("Are you sure you want to delete this user ID " + userId + "?");
-		$("#confirmModal").modal();
-	});
-});
-
-	function clearFilter(){
-		window.location = "[[@{/users}]]";
-	}
-
-
-</script>
-	
-</body>
-
-</html>
\ No newline at end of file
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/bb/a01ea16b09b4001d128fb79045552177 b/.metadata/.plugins/org.eclipse.core.resources/.history/bb/a01ea16b09b4001d128fb79045552177
deleted file mode 100644
index 34fbcff9..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/bb/a01ea16b09b4001d128fb79045552177
+++ /dev/null
@@ -1,26 +0,0 @@
-<!DOCTYPE html>
-<html xmlns:th="http://www.thymeleaf.org">
-
-<head>
-	<meta http-equiv="Content-Type" content="text/html; charset= UTF-8">
-	<meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0">
-	<title>Login - Shopme Admin</title>
-	<link rel="stylesheet" type="text/css" th:href="@{/webjars/bootstrap/css/bootstrap.min.css}" />
-</head>
-
-<body>
-	<div class="container-fluid">
-		
-		<div>
-			<img th:src="@{/images/ShopmeAdminSmall.png}" />
-		</div>
-
-		<div>
-			<p>Shopme Control Panel - Copyright &copy; Shopme</p>
-		</div>
-
-	</div>
-
-</body>
-
-</html>
\ No newline at end of file
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/bb/b082793ea7b5001d12b59aa089645058 b/.metadata/.plugins/org.eclipse.core.resources/.history/bb/b082793ea7b5001d12b59aa089645058
deleted file mode 100644
index c46239ed..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/bb/b082793ea7b5001d12b59aa089645058
+++ /dev/null
@@ -1,88 +0,0 @@
-package com.shopme.admin.security;
-
-import org.aspectj.weaver.ast.And;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.security.authentication.dao.DaoAuthenticationProvider;
-import org.springframework.security.config.annotation.web.builders.HttpSecurity;
-import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
-import org.springframework.security.config.annotation.web.configuration.WebSecurityConfiguration;
-import org.springframework.security.config.annotation.web.configuration.WebSecurityCustomizer;
-import org.springframework.security.core.userdetails.UserDetailsService;
-import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
-import org.springframework.security.crypto.password.PasswordEncoder;
-import org.springframework.security.web.SecurityFilterChain;
-
-@Configuration
-@EnableWebSecurity
-public class WebSecurityConfig {
-
-	/*
-	 * refer to this link: https://www.codejava.net/frameworks/spring-boot/fix-
-	 * websecurityconfigureradapter-deprecated
-	 * 
-	 */
-	
-	
-	 /* This bean will be called by spring security when performing authentication*/ 
-	@Bean
-	public UserDetailsService  userDetailsService()	{
-		return new ShopmeUserDetailsService();
-	}
-	
-
-	@Bean
-	public PasswordEncoder passwordEncoder() {
-		return new BCryptPasswordEncoder();
-	}
-
-	
-	@Bean
-	public DaoAuthenticationProvider authenticationProvider() {
-	    DaoAuthenticationProvider authProvider = new DaoAuthenticationProvider();
-	     
-	    authProvider.setUserDetailsService(userDetailsService());
-	    authProvider.setPasswordEncoder(passwordEncoder());
-	 
-	    return authProvider;
-	}
-	
-	
-	@Bean
-	public SecurityFilterChain filterChain(HttpSecurity http) throws Exception {
-
-		// any request need to be authenticated (require login)
-		// custom login page at "/login" - handler method in MainController class
-		http.authorizeHttpRequests()
-			.anyRequest().authenticated()
-			.and()
-			.formLogin()
-				.loginPage("/login")
-				.usernameParameter("email")
-				.permitAll()
-			.and().logout().permitAll()
-			.and().rememberMe().key("AbcDefgHijKlmnOpqrs_1234567890")
-			.tokenValiditySeconds(7 * 24 * 60 * 60);  // cookie is valid for one week
-		
-		/*
-		 * set a fix key used for the md5 hash algorithm to encrypt cookie content each
-		 * time the application is restarted, a new key will be generated; this key will
-		 * be used to encrypt the cookie content so, in order for the cookie to be
-		 * permanent; a fix key is needed.
-		 */
-		
-		http.authenticationProvider(authenticationProvider());
-		
-		
-		return http.build();
-	}
-
-	//NOTE: antMatchers() changed to requestMatchers()
-	//stack: https://stackoverflow.com/questions/74907533/the-method-antmatchersstring-is-undefined-for-the-type
-	@Bean
-	public WebSecurityCustomizer webSecurityCustomizer() {
-		//permit access to the assets in the following directories
-		return (web) -> web.ignoring().requestMatchers("/images/**", "/js/**", "/webjars/**");
-	}
-
-}
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/73/10123b0946b4001d1d079a924effdc9e b/.metadata/.plugins/org.eclipse.core.resources/.history/bb/b09cc4330db9001d11addcb4256c67f9
similarity index 70%
rename from .metadata/.plugins/org.eclipse.core.resources/.history/73/10123b0946b4001d1d079a924effdc9e
rename to .metadata/.plugins/org.eclipse.core.resources/.history/bb/b09cc4330db9001d11addcb4256c67f9
index 00c4c4c5..21853c41 100644
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/73/10123b0946b4001d1d079a924effdc9e
+++ b/.metadata/.plugins/org.eclipse.core.resources/.history/bb/b09cc4330db9001d11addcb4256c67f9
@@ -1,32 +1,30 @@
 <!DOCTYPE html>
 <html xmlns:th="http://www.thymeleaf.org">
 
-<head th:replace="fragments :: page_head('Users - Shopme Admin')"/>
+<head th:replace="fragments :: page_head('Categories - Shopme Admin')"/>
 
 <body>
 	<div class="container-fluid">
 		
+		<!-- navigation bar -->
 		<div th:replace="navigation :: menu"></div>
 
 		<div>
-			<h2>Manage Users</h2>
-			<a th:href="@{/users/new}" class="fas fa-user-plus fa-2x icon-dark mr-2"></a>
+			<h2>Manage Categories</h2>
+			<a th:href="@{/categories/new}" class="fas fa-folder-plus fa-2x icon-dark mr-2"></a>
 			
-			<a th:href="@{/users/export/csv}" class="fas fa-file-csv fa-2x icon-dark mr-2"></a>
+			<a th:href="@{/categories/export/csv}" class="fas fa-file-csv fa-2x icon-dark mr-2"></a>
 		</div>
 		
-		
-		
-		<!-- only display success message when a new user is created -->
+		<!-- redirect message from controller -->
 		<div th:if="${message != null}" class="alert alert-success text-center">
 			[[${message}]]
 		</div>
+		
 			
 		<div>
-			<form th:action="@{/users/page/1}" class="form-inline m-3">
+			<form th:action="@{/categories/page/1}" class="form-inline m-3">
 				
-				<input type="hidden" name="sortField" th:value="${sortField}" />
-				<input type="hidden" name="sortDir" th:value="${sortDir}" />
 				Filter:&nbsp;
 				<input type="search" name="keyword" th:value="${keyword}" class="form-control" required/>
 				&nbsp;&nbsp;
@@ -46,53 +44,27 @@
 				<table class="table table-bordered table-striped table-hover table-responsive-xL">
 					<thead class="thead-dark">
 						<tr>
-							<!-- refer to templates/fragments.html for fragment code-->
-							
-							<th class="hideable-column">
-								<th th:replace="fragments :: column_link('id', 'User ID', 'tag')"/>
-							</th>
-							
-							<th>Photos</th>
-							
-							<th class="hideable-column">
-								<th th:replace="fragments :: column_link('email', 'Email', 'tag')"/>
-							</th>
-							
-							<th th:replace="fragments :: column_link('firstName', 'First Name', 'none')"/>
-							<th th:replace="fragments :: column_link('lastName', 'Last Name', 'none')"/>
-							<th>Roles</th>
-							<th th:replace="fragments :: column_link('enabled', 'Enabled', 'none')"/>
+							<th>ID</th>
+							<th>Category Image</th>
+							<th>Category Name</th>
+							<th>Alias</th>
+							<th>Enabled</th>
 							<th></th>
 						</tr>
 					</thead>
 					<tbody>
-						<tr th:each="user : ${listUsers}">
-							<td class="hideable-column">[[${user.id}]]</td>
-							<td>
-								<span th:if="${user.photos == null}" class="fas fa-portrait fa-3x icon-dark"></span>
-								<img th:if="${user.photos != null}" th:src="@{${user.photosImagePath}}"
-								style="width: 100px"/>
+						<tr th:each="cat : ${listCategories}">
+							<td>[[${cat.id}]]</td>
+							<td>	
+								<img th:src="@{${cat.imagePath}}" style="width: 100px"/>
 							</td>
-							<td class="hideable-column">[[${user.email}]]</td>
-							<td>[[${user.firstName}]]</td>
-							<td>[[${user.lastName}]]</td>
-							<td>[[${user.roles}]]</td>
-							
+							<td>[[${cat.name}]]</td>
+							<td>[[${cat.alias}]]</td>
 							<td>
-								<a th:if="${user.enabled == true}" class="fas fa-check-circle fa-2x icon-green" 
-								th:href="@{'/users/' + ${user.id} + '/enabled/false'}"
-								title="Disable this user"></a>
-								
-								<a th:if="${user.enabled == false}" class="fas fa-circle fa-2x icon-silver"
-								 th:href="@{'/users/' + ${user.id} + '/enabled/true'}"
-								 title="Enable this user"></a>
+								<div th:replace="fragments :: category_status"></div>
 							</td>
 							<td>
-									<a class="fas fa-edit fa-2x icon-green" th:href="@{'/users/edit/' + ${user.id}}"
-									title="edit this user"></a>
-									&nbsp; 
-									<a class="fas fa-trash fa-2x icon-dark link-delete" th:href="@{'/users/delete/' + ${user.id}}"
-									title="delete this user" th:userId="${user.id}"></a>
+								<div th:replace="fragments :: category_actions"></div>
 							</td>
 						</tr>
 					</tbody>
@@ -200,7 +172,7 @@
 				</div>
 			</div>
 			
-			
+			<!-- footer -->
 			<div th:replace="fragments :: footer"></div>
 
 
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/bc/d0e126368ab3001d19bbb001c1a81c20 b/.metadata/.plugins/org.eclipse.core.resources/.history/bc/d0e126368ab3001d19bbb001c1a81c20
deleted file mode 100644
index 4cf966f8..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/bc/d0e126368ab3001d19bbb001c1a81c20
+++ /dev/null
@@ -1,248 +0,0 @@
-<!DOCTYPE html>
-<html xmlns:th="http://www.thymeleaf.org">
-
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset= UTF-8">
-<meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0">
-<title>Manage Users</title>
-
-<link rel="stylesheet" type="text/css" th:href="@{/webjars/bootstrap/css/bootstrap.min.css}" />
-<link rel="stylesheet" type="text/css" th:href="@{/fontawesome/all.css}" />
-<link rel="stylesheet" type="text/css" th:href="@{/style.css}" />
-	
-<script type="text/javascript" th:src="@{/webjars/jquery/jquery.min.js}"></script>
-<script type="text/javascript" th:src="@{/webjars/bootstrap/js/bootstrap.min.js}"></script>
-</head>
-
-<body>
-	<div class="container-fluid">
-		<div>
-			<nav class="navbar navbar-expand-lg bg-dark navbar-dark">
-				<a class="navbar-brand" th:href="@{/}"> <img
-					th:src="@{/images/ShopmeAdminSmall.png}" />
-				</a>
-				<!--hamburger toggler for mobile devices(responsive)-->
-				<button class="navbar-toggler" type="button" data-toggle="collapse"
-					data-target="#topNavbar">
-					<span class="navbar-toggler-icon"></span>
-				</button>
-				<div class="collapse navbar-collapse" id="topNavbar">
-					<ul class="navbar-nav">
-						<li class="nav-item"><a class="nav-link" th:href="@{/users}">Users</a>
-						</li>
-						<li class="nav-item"><a class="nav-link"
-							th:href="@{/categories}">Categories</a></li>
-						<li class="nav-item"><a class="nav-link" th:href="@{/brands}">Brands</a>
-						</li>
-						<li class="nav-item"><a class="nav-link"
-							th:href="@{/products}">Products</a></li>
-						<li class="nav-item"><a class="nav-link"
-							th:href="@{/customers}">Customers</a></li>
-						<li class="nav-item"><a class="nav-link"
-							th:href="@{/shipping}">Shipping</a></li>
-						<li class="nav-item"><a class="nav-link" th:href="@{/orders}">Orders</a>
-						</li>
-						<li class="nav-item"><a class="nav-link" th:href="@{/report}">Sales
-								Report</a></li>
-						<li class="nav-item"><a class="nav-link"
-							th:href="@{/articles}">Articles</a></li>
-						<li class="nav-item"><a class="nav-link" th:href="@{/menus}">Menus</a>
-						</li>
-						<li class="nav-item"><a class="nav-link"
-							th:href="@{/settings}">Settings</a></li>
-					</ul>
-				</div>
-
-			</nav>
-		</div>
-
-		<div>
-			<h2>Manage Users</h2>
-			<a th:href="@{/users/new}" class="fas fa-user-plus fa-2x icon-dark mr-2"></a>
-			
-			<a th:href="@{/users/export/csv}" class="fas fa-file-csv fa-2x icon-dark mr-2"></a>
-		</div>
-		
-		
-		
-		<!-- only display success message when a new user is created -->
-		<div th:if="${message != null}" class="alert alert-success text-center">
-			[[${message}]]
-		</div>
-			
-		<div>
-			<form th:action="@{/users/page/1}" class="form-inline m-3">
-				
-				<input type="hidden" name="sortField" th:value="${sortField}" />
-				<input type="hidden" name="sortDir" th:value="${sortDir}" />
-				Filter:&nbsp;
-				<input type="search" name="keyword" th:value="${keyword}" class="form-control" required/>
-				&nbsp;&nbsp;
-				<button type="submit" class="btn btn-primary">
-					<i class="fas fa-search"></i>
-				</button>
-				&nbsp;&nbsp;
-				<button type="button" class="btn btn-secondary" onclick="clearFilter()">
-					<i class="fas fa-eraser"></i>
-				</button>
-			</form>
-		
-		</div>
-
-
-			<div class="full-details">
-				<table class="table table-bordered table-striped table-hover table-responsive-xL">
-					<thead class="thead-dark">
-						<tr>
-							<!-- refer to templates/fragments.html for fragment code-->
-							<th th:replace="fragments :: column_link('id', 'User ID')"/>
-							<th>Photos</th>
-							<th th:replace="fragments :: column_link('email', 'Email')"/>
-							<th th:replace="fragments :: column_link('firstName', 'First Name')"/>
-							<th th:replace="fragments :: column_link('lastName', 'Last Name')"/>
-							<th>Roles</th>
-							<th th:replace="fragments :: column_link('enabled', 'Enabled')"/>
-							<th></th>
-						</tr>
-					</thead>
-					<tbody>
-						<tr th:each="user : ${listUsers}">
-							<td>[[${user.id}]]</td>
-							<td>
-								<span th:if="${user.photos == null}" class="fas fa-portrait fa-3x icon-dark"></span>
-								<img th:if="${user.photos != null}" th:src="@{${user.photosImagePath}}"
-								style="width: 100px"/>
-							</td>
-							<td>[[${user.email}]]</td>
-							<td>[[${user.firstName}]]</td>
-							<td>[[${user.lastName}]]</td>
-							<td>[[${user.roles}]]</td>
-							
-							<td>
-								<a th:if="${user.enabled == true}" class="fas fa-check-circle fa-2x icon-green" 
-								th:href="@{'/users/' + ${user.id} + '/enabled/false'}"
-								title="Disable this user"></a>
-								
-								<a th:if="${user.enabled == false}" class="fas fa-circle fa-2x icon-silver"
-								 th:href="@{'/users/' + ${user.id} + '/enabled/true'}"
-								 title="Enable this user"></a>
-							</td>
-							<td>
-									<a class="fas fa-edit fa-2x icon-green" th:href="@{'/users/edit/' + ${user.id}}"
-									title="edit this user"></a>
-									&nbsp; 
-									<a class="fas fa-trash fa-2x icon-dark link-delete" th:href="@{'/users/delete/' + ${user.id}}"
-									title="delete this user" th:userId="${user.id}"></a>
-							</td>
-						</tr>
-					</tbody>
-				</table>
-			</div>
-			
-			
-			<!-- display this on mobile screens only -->
-			<div class="less-details">
-				
-				<div th:each="user : ${listUsers}">
-				
-				</div>
-			</div>
-			
-			
-			<!-- IF -->
-			<div class="text-center m-1" th:if="${totalItems > 0}">
-				<span>Showing Users # [[${startCount}]] to [[${endCount}]] of [[${totalItems}]]</span>
-			</div>
-			
-			<!-- ELSE -->
-			<div class="text-center m-1" th:unless="${totalItems > 0}">
-				<span>No users found</span>
-			</div>
-			
-			<!-- only display pagination when there are users; else, no users no pagination -->
-			<div th:if="${totalPages > 1}">
-				<nav>
-					  <ul class="pagination justify-content-center">
-					  
-					  	<li th:class=" ${currentPage > 1 ? 'page-item' : 'page-item disabled'}">
-					  		<a th:replace="fragments :: page_link(1, 'First')"></a>
-				    	</li>
-					  
-					    <li th:class=" ${currentPage > 1 ? 'page-item' : 'page-item disabled'}">
-					    	<a th:replace="fragments :: page_link(${currentPage - 1 }, 'previous')"></a>
-				    	</li>
-					    	
-					    <!-- org.thymeleaf.expression.Numbers class, An object of this class is usually available in variable evaluation expressions with the name #numbers. -->
-					    <li th:class="${currentPage != i ? 'page-item' : 'page-item active'}" 
-					    	th:each="i : ${#numbers.sequence(1, totalPages)}">
-					    	<a th:replace="fragments :: page_link(${i}, ${i})"></a>
-					    </li>
-					    
-					    <li  th:class=" ${currentPage < totalPages ? 'page-item' : 'page-item disabled'}">
-					    	<a th:replace="fragments :: page_link(${currentPage + 1}, 'Next')"></a>
-					    </li>
-					    
-					    <li th:class=" ${currentPage < totalPages ? 'page-item' : 'page-item disabled'}">
-							<a th:replace="fragments :: page_link(${totalPages}, 'Last')"></a>		
-					    </li>
-					  </ul>
-				</nav>
-			</div>
-			
-			
-			
-			<div class="modal fade text-center" id="confirmModal">
-				<div class="modal-dialog">
-					<div class="modal-content">
-					
-						<div class="modal-header">
-							<h4 class="modal-title">Delete Confirmation</h4>
-							<button type="button" class="close" data-dismiss="modal">&times;</button>
-						</div>
-						
-						<div class="modal-body">
-							<span id="confirmText"></span>
-						</div>
-						
-						<div class="modal-footer">
-							<a class="btn btn-success" href="" id="yesButton">Yes</a>
-							<button type="button" class="btn btn-danger" data-dismiss="modal">Close</button>
-						</div>
-					</div>
-				</div>
-			</div>
-			
-			
-			<div class="text-center">
-				<p>Shopme Control Panel - Copyright &copy; Shopme</p>
-			</div>
-
-
-	</div>
-	
-<script type="text/javascript">
-
-//confirmation modal dialogue for delete user
-$(document).ready(function(){
-	$(".link-delete").on("click", function(e){
-		//stop the <a> tag default behaviour and pop out a confirmation modal dialogue
-		e.preventDefault();
-		//alert($(this).attr("href"));
-		link = $(this);
-		userId = link.attr("userId");
-		$("#yesButton").attr("href", link.attr("href"));
-		$("#confirmText").text("Are you sure you want to delete this user ID " + userId + "?");
-		$("#confirmModal").modal();
-	});
-});
-
-	function clearFilter(){
-		window.location = "[[@{/users}]]";
-	}
-
-
-</script>
-	
-</body>
-
-</html>
\ No newline at end of file
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/bd/1073eed609b4001d128fb79045552177 b/.metadata/.plugins/org.eclipse.core.resources/.history/bd/1073eed609b4001d128fb79045552177
deleted file mode 100644
index 21847db6..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/bd/1073eed609b4001d128fb79045552177
+++ /dev/null
@@ -1,34 +0,0 @@
-<!DOCTYPE html>
-<html xmlns:th="http://www.thymeleaf.org">
-
-<head>
-	<meta http-equiv="Content-Type" content="text/html; charset= UTF-8">
-	<meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0">
-	<title>Login - Shopme Admin</title>
-	<link rel="stylesheet" type="text/css" th:href="@{/webjars/bootstrap/css/bootstrap.min.css}" />
-</head>
-
-<body>
-	<div class="container-fluid text-center">
-		
-		<div>
-			<img th:src="@{/images/ShopmeAdminBig.png}" />
-		</div>
-		
-		<form th:action="@{/login}" method="post">
-		
-			<div>
-				<p>Access to Shopme Control Panel </p>
-			</div>
-		
-		</form>
-
-		<div>
-			<p>Shopme Control Panel - Copyright &copy; Shopme</p>
-		</div>
-
-	</div>
-
-</body>
-
-</html>
\ No newline at end of file
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/bd/70e9cb0488b3001d19bbb001c1a81c20 b/.metadata/.plugins/org.eclipse.core.resources/.history/bd/70e9cb0488b3001d19bbb001c1a81c20
deleted file mode 100644
index 874d337d..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/bd/70e9cb0488b3001d19bbb001c1a81c20
+++ /dev/null
@@ -1,19 +0,0 @@
-*.icon-white{color: white}
-*.icon-silver{color: silver}
-*.icon-green{color: green}
-*.icon-dark{color: gray}
-*.icon-red{color: red}
-
-
-@media screen and (max-width: 768px) {
-	/* small screen */
-}
-
-@media screen and (min-width: 768px) and (max-width: 1024px) {
-	/* small screen */
-}
-
-
-@media screen and (max-width: 768px) {
-	/* small screen */
-}
\ No newline at end of file
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/be/1016e13515b4001d128fb79045552177 b/.metadata/.plugins/org.eclipse.core.resources/.history/be/1016e13515b4001d128fb79045552177
deleted file mode 100644
index e44e1c15..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/be/1016e13515b4001d128fb79045552177
+++ /dev/null
@@ -1,28 +0,0 @@
-package com.shopme.admin.security;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.core.userdetails.UserDetails;
-import org.springframework.security.core.userdetails.UserDetailsService;
-import org.springframework.security.core.userdetails.UsernameNotFoundException;
-
-import com.shopme.admin.user.UserRepository;
-import com.shopme.common.entity.User;
-
-public class ShopmeUserDetailsService implements UserDetailsService {
-
-	
-	@Autowired
-	private UserRepository userRepo;
-	
-	
-	
-	
-	@Override
-	public UserDetails loadUserByUsername(String email) throws UsernameNotFoundException {
-
-		User user = userRepo.getUserByEmail(email);
-		
-		return null;
-	}
-
-}
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/be/1091f08413b4001d128fb79045552177 b/.metadata/.plugins/org.eclipse.core.resources/.history/be/1091f08413b4001d128fb79045552177
deleted file mode 100644
index dc2e8f6a..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/be/1091f08413b4001d128fb79045552177
+++ /dev/null
@@ -1,77 +0,0 @@
-package com.shopme.admin.security;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-import java.util.Set;
-
-import org.springframework.security.core.GrantedAuthority;
-import org.springframework.security.core.authority.SimpleGrantedAuthority;
-import org.springframework.security.core.userdetails.UserDetails;
-
-import com.shopme.common.entity.Role;
-import com.shopme.common.entity.User;
-
-/*
- *  Think of it as a wrapper class for  Type User
- * 
- * */
-public class ShopmeUserDetails implements UserDetails {
-
-	private User user;
-
-	public ShopmeUserDetails(User user) {
-		this.user = user;
-	}
-
-	@Override
-	public Collection<? extends GrantedAuthority> getAuthorities() {
-
-		Set<Role> roles = user.getRoles();
-
-		List<SimpleGrantedAuthority> authorities = new ArrayList<>();
-
-		for (Role role : roles) {
-			authorities.add(new SimpleGrantedAuthority(role.getName()));
-		}
-
-		return null;
-	}
-
-	@Override
-	public String getPassword() {
-		// TODO Auto-generated method stub
-		return null;
-	}
-
-	@Override
-	public String getUsername() {
-		// TODO Auto-generated method stub
-		return null;
-	}
-
-	@Override
-	public boolean isAccountNonExpired() {
-		// TODO Auto-generated method stub
-		return false;
-	}
-
-	@Override
-	public boolean isAccountNonLocked() {
-		// TODO Auto-generated method stub
-		return false;
-	}
-
-	@Override
-	public boolean isCredentialsNonExpired() {
-		// TODO Auto-generated method stub
-		return false;
-	}
-
-	@Override
-	public boolean isEnabled() {
-		// TODO Auto-generated method stub
-		return false;
-	}
-
-}
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/be/60cfa01049b4001d1d079a924effdc9e b/.metadata/.plugins/org.eclipse.core.resources/.history/be/60cfa01049b4001d1d079a924effdc9e
deleted file mode 100644
index e5ae31d0..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/be/60cfa01049b4001d1d079a924effdc9e
+++ /dev/null
@@ -1,79 +0,0 @@
-package com.shopme.admin.security;
-
-import org.aspectj.weaver.ast.And;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.security.authentication.dao.DaoAuthenticationProvider;
-import org.springframework.security.config.annotation.web.builders.HttpSecurity;
-import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
-import org.springframework.security.config.annotation.web.configuration.WebSecurityConfiguration;
-import org.springframework.security.config.annotation.web.configuration.WebSecurityCustomizer;
-import org.springframework.security.core.userdetails.UserDetailsService;
-import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
-import org.springframework.security.crypto.password.PasswordEncoder;
-import org.springframework.security.web.SecurityFilterChain;
-
-@Configuration
-@EnableWebSecurity
-public class WebSecurityConfig {
-
-	/*
-	 * refer to this link: https://www.codejava.net/frameworks/spring-boot/fix-
-	 * websecurityconfigureradapter-deprecated
-	 * 
-	 */
-	
-	
-	 /* This bean will be called by spring security when performing authentication*/ 
-	@Bean
-	public UserDetailsService  userDetailsService()	{
-		return new ShopmeUserDetailsService();
-	}
-	
-
-	@Bean
-	public PasswordEncoder passwordEncoder() {
-		return new BCryptPasswordEncoder();
-	}
-
-	
-	@Bean
-	public DaoAuthenticationProvider authenticationProvider() {
-	    DaoAuthenticationProvider authProvider = new DaoAuthenticationProvider();
-	     
-	    authProvider.setUserDetailsService(userDetailsService());
-	    authProvider.setPasswordEncoder(passwordEncoder());
-	 
-	    return authProvider;
-	}
-	
-	
-	@Bean
-	public SecurityFilterChain filterChain(HttpSecurity http) throws Exception {
-
-		// any request need to be authenticated (require login)
-		// custom login page at "/login" - handler method in MainController class
-		http.authorizeHttpRequests()
-			.anyRequest().authenticated()
-			.and()
-			.formLogin()
-				.loginPage("/login")
-				.usernameParameter("email")
-				.permitAll()
-			.and().logout().permitAll();
-		
-		http.authenticationProvider(authenticationProvider());
-		
-		
-		return http.build();
-	}
-
-	//NOTE: antMatchers() changed to requestMatchers()
-	//stack: https://stackoverflow.com/questions/74907533/the-method-antmatchersstring-is-undefined-for-the-type
-	@Bean
-	public WebSecurityCustomizer webSecurityCustomizer() {
-		//permit access to the assets in the following directories
-		return (web) -> web.ignoring().requestMatchers("/images/**", "/js/**", "/webjars/**");
-	}
-
-}
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/bf/d0cf087746b4001d1d079a924effdc9e b/.metadata/.plugins/org.eclipse.core.resources/.history/bf/d0cf087746b4001d1d079a924effdc9e
deleted file mode 100644
index e69de29b..00000000
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/bf/e0fcb99288b3001d19bbb001c1a81c20 b/.metadata/.plugins/org.eclipse.core.resources/.history/bf/e0fcb99288b3001d19bbb001c1a81c20
deleted file mode 100644
index 88d518eb..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/bf/e0fcb99288b3001d19bbb001c1a81c20
+++ /dev/null
@@ -1,21 +0,0 @@
-*.icon-white{color: white}
-*.icon-silver{color: silver}
-*.icon-green{color: green}
-*.icon-dark{color: gray}
-*.icon-red{color: red}
-
-
-@media screen and (max-width: 768px) {
-	/* small screen */
-	
-	div.full-details{ display: none}
-}
-
-@media screen and (min-width: 768px) and (max-width: 1024px) {
-	/* medium screen */
-}
-
-
-@media screen and (mini-width: 1024px) {
-	/* large screen */
-}
\ No newline at end of file
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/c/70f8274a45b4001d1d079a924effdc9e b/.metadata/.plugins/org.eclipse.core.resources/.history/c/70f8274a45b4001d1d079a924effdc9e
deleted file mode 100644
index 595a5061..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/c/70f8274a45b4001d1d079a924effdc9e
+++ /dev/null
@@ -1,42 +0,0 @@
-<!DOCTYPE html>
-<html xmlns:th="http://www.thymeleaf.org"
-	  xmlns:sec="https://www.thymeleaf.org/thymeleaf-extras-springsecurity5">
-
-<head th:replace="fragments :: page_head('Home - Shopme Admin')"/>
-
-<body>
-	<div class="container-fluid">
-		
-
-		<div>
-			<h1>Shopme Control Panel</h1>
-		</div>
-
-		<div>
-			<p>Shopme Control Panel - Copyright &copy; Shopme</p>
-		</div>
-
-
-	</div>
-	
-<script type="text/javascript">
-
-	$(document).ready(function(){
-		$("#logoutLink").on("click", function(e){
-			e.preventDefault(); /* stop the hyperlink default behaviour  */
-			
-			
-			/* use  the form to  log out and navigate to the url path /logout  
-			
-			 NOTE: spring security requires a POST request form to logout in order to obtain the csrf token, 
-			 		the csrf token is a hidden property in the form
-			*/
-			document.logoutForm.submit();
-		});
-	});
-
-</script>
-
-</body>
-
-</html>
\ No newline at end of file
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/c0/6012d27558b7001d19ef99be8d31e273 b/.metadata/.plugins/org.eclipse.core.resources/.history/c0/6012d27558b7001d19ef99be8d31e273
deleted file mode 100644
index 904bf6e3..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/c0/6012d27558b7001d19ef99be8d31e273
+++ /dev/null
@@ -1,5 +0,0 @@
-package com.shopme.admin.category;
-
-public class CategoryService {
-
-}
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/c0/907f9e8014b4001d128fb79045552177 b/.metadata/.plugins/org.eclipse.core.resources/.history/c0/907f9e8014b4001d128fb79045552177
deleted file mode 100644
index 9ee39645..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/c0/907f9e8014b4001d128fb79045552177
+++ /dev/null
@@ -1,78 +0,0 @@
-package com.shopme.admin.security;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-import java.util.Set;
-
-import org.springframework.security.core.GrantedAuthority;
-import org.springframework.security.core.authority.SimpleGrantedAuthority;
-import org.springframework.security.core.userdetails.UserDetails;
-
-import com.shopme.common.entity.Role;
-import com.shopme.common.entity.User;
-
-/*
- *  Think of it as a wrapper class for  Type User
- *  
- *  ShopmeUserDetailsService will use this repo class
- * 
- * */
-public class ShopmeUserDetails implements UserDetails {
-
-	private User user;
-
-	public ShopmeUserDetails(User user) {
-		this.user = user;
-	}
-
-	/* get a list of assigned roles to user */
-	@Override
-	public Collection<? extends GrantedAuthority> getAuthorities() {
-
-		Set<Role> roles = user.getRoles();
-
-		List<SimpleGrantedAuthority> authorities = new ArrayList<>();
-
-		for (Role role : roles) {
-			authorities.add(new SimpleGrantedAuthority(role.getName()));
-		}
-
-		return authorities;
-	}
-
-	@Override
-	public String getPassword() {
-		return user.getPassword();
-	}
-
-	@Override
-	public String getUsername() {
-		return user.getEmail();
-	}
-
-	// "true" means account not expired
-	@Override
-	public boolean isAccountNonExpired() {
-		return true;
-	}
-
-	@Override
-	public boolean isAccountNonLocked() {
-		// TODO Auto-generated method stub
-		return true;
-	}
-
-	@Override
-	public boolean isCredentialsNonExpired() {
-		// TODO Auto-generated method stub
-		return true;
-	}
-
-	@Override
-	public boolean isEnabled() {
-		// TODO Auto-generated method stub
-		return user.isEnabled();
-	}
-
-}
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/c0/f0fb70a663b3001d19bbb001c1a81c20 b/.metadata/.plugins/org.eclipse.core.resources/.history/c0/f0fb70a663b3001d19bbb001c1a81c20
deleted file mode 100644
index bc9f7e15..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/c0/f0fb70a663b3001d19bbb001c1a81c20
+++ /dev/null
@@ -1,180 +0,0 @@
-package com.shopme.admin.user;
-
-import java.io.IOException;
-import java.util.List;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.domain.Page;
-import org.springframework.data.repository.query.Param;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
-import org.springframework.util.StringUtils;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.ModelAttribute;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.multipart.MultipartFile;
-import org.springframework.web.servlet.mvc.support.RedirectAttributes;
-
-import com.fasterxml.jackson.annotation.ObjectIdGenerators.StringIdGenerator;
-import com.shopme.admin.FileUploadUtil;
-import com.shopme.common.entity.Role;
-import com.shopme.common.entity.User;
-
-@Controller
-public class UserController {
-
-	@Autowired
-	private UserService service;
-
-	@GetMapping("/users")
-	public String listFirstPage(Model model) {
-		
-		//NOTE: these are the default values for path variable and URL parameters
-		return listByPage(1, model, "firstName", "asc", null);
-	}
-
-	@GetMapping("/users/page/{pageNum}")
-	public String listByPage(@PathVariable(name = "pageNum") int pageNum, Model model,
-			@Param("sortField") String sortField, @Param("sortDir") String sortDir,
-			@Param("keyword") String keyword) {
-		
-		System.out.println("sort field: " + sortField);
-		System.out.println("sort order: " + sortDir);
-		
-		Page<User> page = service.listByPage(pageNum, sortField, sortDir, keyword);
-		List<User> listUsers = page.getContent();
-
-		
-		long startCount = (pageNum - 1) * UserService.USERS_PER_PAGE + 1;
-		long endCount = startCount + UserService.USERS_PER_PAGE - 1;
-		if(endCount > page.getTotalElements()) {
-			endCount = page.getTotalElements();
-		}
-		
-		String reverseSortDir = sortDir.equals("asc") ? "desc" : "asc";
-		
-		model.addAttribute("currentPage", pageNum);
-		model.addAttribute("totalPages", page.getTotalPages());
-		model.addAttribute("startCount", startCount);
-		model.addAttribute("endCount", endCount);
-		model.addAttribute("totalItems", page.getTotalElements());
-		model.addAttribute("listUsers", listUsers);
-		model.addAttribute("sortField", sortField);
-		model.addAttribute("sortDir", sortDir);
-		model.addAttribute("reverseSortDir", reverseSortDir);
-		model.addAttribute("keyword", keyword);
-		
-
-		return "users";
-
-	}
-
-	@GetMapping("/users/new")
-	public String newUser(Model model) {
-
-		List<Role> listRoles = service.listRoles();
-
-		User user = new User();
-		user.setEnabled(true);
-
-		model.addAttribute("user", user);
-		model.addAttribute("listRoles", listRoles);
-		model.addAttribute("pageTitle", "Create New User");
-
-		return "user_form";
-
-	}
-
-	// using @RequestParam, we can get the image file input, the input has the
-	// property name="image"
-	@PostMapping("/users/save")
-	public String saveUser(@ModelAttribute("user") User user, RedirectAttributes redirectAttributes,
-			@RequestParam("image") MultipartFile multipartFile) throws IOException {
-
-		if (!multipartFile.isEmpty()) {
-
-			String fileName = StringUtils.cleanPath(multipartFile.getOriginalFilename());
-			user.setPhotos(fileName);
-
-			User savedUser = service.save(user);
-
-			String uploadDir = "user-photos/" + savedUser.getId();
-
-			FileUploadUtil.cleanDir(uploadDir);
-			FileUploadUtil.saveFile(uploadDir, fileName, multipartFile);
-		} else {
-
-			// set photo to null for getPhotosImagePath() method's conditional statement in
-			// User class
-			if (user.getPhotos().isEmpty())
-				user.setPhotos(null);
-			service.save(user);
-		}
-
-		redirectAttributes.addFlashAttribute("message", "the user has been saved successfully");
-
-		// POST/REDIRECT/GET web design
-		return getRedirectURLtoAffectedUser(user);
-	}
-
-	private String getRedirectURLtoAffectedUser(User user) {
-		
-		//after user is saved display the user instead of the entire user list
-		//email is a unique field to identify each user.
-		String firstPartOfEmail = user.getEmail().split("@")[0];
-		return "redirect:/users/page/1?sortField=id&sortDir=asc&keyword=" + firstPartOfEmail;
-	}
-
-	@GetMapping("/users/edit/{id}")
-	public String editUser(@PathVariable(name = "id") Integer id, RedirectAttributes redirectAttributes, Model model) {
-		try {
-			User user = service.get(id);
-			List<Role> listRoles = service.listRoles();
-
-			model.addAttribute("user", user);
-			model.addAttribute("pageTitle", "Edit User (ID: " + id + ")");
-			model.addAttribute("listRoles", listRoles);
-
-			return "user_form";
-		} catch (UserNotFoundException ex) {
-			redirectAttributes.addFlashAttribute("message", ex.getMessage());
-
-			return "redirect:/users";
-		}
-
-	}
-
-	@GetMapping("/users/delete/{id}")
-	public String deleteUser(@PathVariable(name = "id") Integer id, RedirectAttributes redirectAttributes,
-			Model model) {
-		try {
-			service.delete(id);
-			redirectAttributes.addFlashAttribute("message", "The user ID " + id + " has been deleted successfully.");
-
-		} catch (UserNotFoundException ex) {
-			redirectAttributes.addFlashAttribute("message", ex.getMessage());
-
-		}
-
-		return "redirect:/users";
-	}
-
-	@GetMapping("/users/{id}/enabled/{status}")
-	public String updateUserEnabledStatus(@PathVariable(name = "id") Integer id,
-			@PathVariable(name = "status") boolean enabled, RedirectAttributes redirectAttributes) {
-
-		service.updateUserEnabledStatus(id, enabled);
-		String status = enabled ? "enabled" : "disabled";
-		String message = "The user id " + id + " has been " + status;
-		redirectAttributes.addFlashAttribute("message", message);
-
-		return "redirect:/users";
-	}
-
-	@GetMapping("/users/export/csv")
-	public String 
-	
-	
-}
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/c1/0098c52651b3001d1e75aa5ef0815903 b/.metadata/.plugins/org.eclipse.core.resources/.history/c1/0098c52651b3001d1e75aa5ef0815903
deleted file mode 100644
index 14a26e1b..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/c1/0098c52651b3001d1e75aa5ef0815903
+++ /dev/null
@@ -1,174 +0,0 @@
-package com.shopme.admin.user;
-
-import java.io.IOException;
-import java.util.List;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.domain.Page;
-import org.springframework.data.repository.query.Param;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
-import org.springframework.util.StringUtils;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.ModelAttribute;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.multipart.MultipartFile;
-import org.springframework.web.servlet.mvc.support.RedirectAttributes;
-
-import com.fasterxml.jackson.annotation.ObjectIdGenerators.StringIdGenerator;
-import com.shopme.admin.FileUploadUtil;
-import com.shopme.common.entity.Role;
-import com.shopme.common.entity.User;
-
-@Controller
-public class UserController {
-
-	@Autowired
-	private UserService service;
-
-	@GetMapping("/users")
-	public String listFirstPage(Model model) {
-		return listByPage(1, model, "firstName", "asc", null);
-	}
-
-	@GetMapping("/users/page/{pageNum}")
-	public String listByPage(@PathVariable(name = "pageNum") int pageNum, Model model,
-			@Param("sortField") String sortField, @Param("sortDir") String sortDir,
-			@Param("keyword") String keyword) {
-		
-		System.out.println("sort field: " + sortField);
-		System.out.println("sort order: " + sortDir);
-		
-		Page<User> page = service.listByPage(pageNum, sortField, sortDir, keyword);
-		List<User> listUsers = page.getContent();
-
-		
-		long startCount = (pageNum - 1) * UserService.USERS_PER_PAGE + 1;
-		long endCount = startCount + UserService.USERS_PER_PAGE - 1;
-		if(endCount > page.getTotalElements()) {
-			endCount = page.getTotalElements();
-		}
-		
-		String reverseSortDir = sortDir.equals("asc") ? "desc" : "asc";
-		
-		model.addAttribute("currentPage", pageNum);
-		model.addAttribute("totalPages", page.getTotalPages());
-		model.addAttribute("startCount", startCount);
-		model.addAttribute("endCount", endCount);
-		model.addAttribute("totalItems", page.getTotalElements());
-		model.addAttribute("listUsers", listUsers);
-		model.addAttribute("sortField", sortField);
-		model.addAttribute("sortDir", sortDir);
-		model.addAttribute("reverseSortDir", reverseSortDir);
-		model.addAttribute("keyword", keyword);
-		
-
-		return "users";
-
-	}
-
-	@GetMapping("/users/new")
-	public String newUser(Model model) {
-
-		List<Role> listRoles = service.listRoles();
-
-		User user = new User();
-		user.setEnabled(true);
-
-		model.addAttribute("user", user);
-		model.addAttribute("listRoles", listRoles);
-		model.addAttribute("pageTitle", "Create New User");
-
-		return "user_form";
-
-	}
-
-	// using @RequestParam, we can get the image file input, the input has the
-	// property name="image"
-	@PostMapping("/users/save")
-	public String saveUser(@ModelAttribute("user") User user, RedirectAttributes redirectAttributes,
-			@RequestParam("image") MultipartFile multipartFile) throws IOException {
-
-		if (!multipartFile.isEmpty()) {
-
-			String fileName = StringUtils.cleanPath(multipartFile.getOriginalFilename());
-			user.setPhotos(fileName);
-
-			User savedUser = service.save(user);
-
-			String uploadDir = "user-photos/" + savedUser.getId();
-
-			FileUploadUtil.cleanDir(uploadDir);
-			FileUploadUtil.saveFile(uploadDir, fileName, multipartFile);
-		} else {
-
-			// set photo to null for getPhotosImagePath() method's conditional statement in
-			// User class
-			if (user.getPhotos().isEmpty())
-				user.setPhotos(null);
-			service.save(user);
-		}
-
-		redirectAttributes.addFlashAttribute("message", "the user has been saved successfully");
-
-		// POST/REDIRECT/GET web design
-		return getRedirectURLtoAffectedUser(user);
-	}
-
-	private String getRedirectURLtoAffectedUser(User user) {
-		
-		//after user is saved display the user instead of the entire user list
-		//email is a unique field to identify each user.
-		String firstPartOfEmail = user.getEmail().split("@")[0];
-		return "redirect:/users/page/1?sortField=id&sortDir=asc&keyword=" + firstPartOfEmail;
-	}
-
-	@GetMapping("/users/edit/{id}")
-	public String editUser(@PathVariable(name = "id") Integer id, RedirectAttributes redirectAttributes, Model model) {
-		try {
-			User user = service.get(id);
-			List<Role> listRoles = service.listRoles();
-
-			model.addAttribute("user", user);
-			model.addAttribute("pageTitle", "Edit User (ID: " + id + ")");
-			model.addAttribute("listRoles", listRoles);
-
-			return "user_form";
-		} catch (UserNotFoundException ex) {
-			redirectAttributes.addFlashAttribute("message", ex.getMessage());
-
-			return "redirect:/users";
-		}
-
-	}
-
-	@GetMapping("/users/delete/{id}")
-	public String deleteUser(@PathVariable(name = "id") Integer id, RedirectAttributes redirectAttributes,
-			Model model) {
-		try {
-			service.delete(id);
-			redirectAttributes.addFlashAttribute("message", "The user ID " + id + " has been deleted successfully.");
-
-		} catch (UserNotFoundException ex) {
-			redirectAttributes.addFlashAttribute("message", ex.getMessage());
-
-		}
-
-		return "redirect:/users";
-	}
-
-	@GetMapping("/users/{id}/enabled/{status}")
-	public String updateUserEnabledStatus(@PathVariable(name = "id") Integer id,
-			@PathVariable(name = "status") boolean enabled, RedirectAttributes redirectAttributes) {
-
-		service.updateUserEnabledStatus(id, enabled);
-		String status = enabled ? "enabled" : "disabled";
-		String message = "The user id " + id + " has been " + status;
-		redirectAttributes.addFlashAttribute("message", message);
-
-		return "redirect:/users";
-	}
-
-}
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/c1/8075fcea15b4001d128fb79045552177 b/.metadata/.plugins/org.eclipse.core.resources/.history/c1/8075fcea15b4001d128fb79045552177
deleted file mode 100644
index 31adc275..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/c1/8075fcea15b4001d128fb79045552177
+++ /dev/null
@@ -1,33 +0,0 @@
-package com.shopme.admin.security;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.core.userdetails.UserDetails;
-import org.springframework.security.core.userdetails.UserDetailsService;
-import org.springframework.security.core.userdetails.UsernameNotFoundException;
-
-import com.shopme.admin.user.UserRepository;
-import com.shopme.common.entity.User;
-
-/*
- * This class will be called by spring security when performing authentication 
- * 
- * */
-
-public class ShopmeUserDetailsService implements UserDetailsService {
-
-	@Autowired
-	private UserRepository userRepo;
-
-	@Override
-	public UserDetails loadUserByUsername(String email) throws UsernameNotFoundException {
-
-		User user = userRepo.getUserByEmail(email);
-
-		if (user != null) {
-			return new ShopmeUserDetails(user);
-		}
-
-		throw new UsernameNotFoundException("could not find user with the email" + email);
-	}
-
-}
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/c2/30a222260ab4001d128fb79045552177 b/.metadata/.plugins/org.eclipse.core.resources/.history/c2/30a222260ab4001d128fb79045552177
deleted file mode 100644
index 540461dc..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/c2/30a222260ab4001d128fb79045552177
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<html xmlns:th="http://www.thymeleaf.org">
-
-<head>
-	<meta http-equiv="Content-Type" content="text/html; charset= UTF-8">
-	<meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0">
-	<title>Login - Shopme Admin</title>
-	<link rel="stylesheet" type="text/css" th:href="@{/webjars/bootstrap/css/bootstrap.min.css}" />
-</head>
-
-<body>
-	<div class="container-fluid text-center">
-		
-		<div>
-			<img th:src="@{/images/ShopmeAdminBig.png}" />
-		</div>
-		
-		<form th:action="@{/login}" method="post">
-		
-			<div class="border border-secondary rounded">
-				<p>Access to Shopme Control Panel </p>
-				
-				<p>
-					<input type="email" name="email" class="form-control" required />
-					
-				
-				</p>
-			</div>
-		
-		</form>
-
-		<div>
-			<p>Shopme Control Panel - Copyright &copy; Shopme</p>
-		</div>
-
-	</div>
-
-</body>
-
-</html>
\ No newline at end of file
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/c2/30ae20482eb4001d1d079a924effdc9e b/.metadata/.plugins/org.eclipse.core.resources/.history/c2/30ae20482eb4001d1d079a924effdc9e
deleted file mode 100644
index c274e0b8..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/c2/30ae20482eb4001d1d079a924effdc9e
+++ /dev/null
@@ -1,97 +0,0 @@
-<!DOCTYPE html>
-<html xmlns:th="http://www.thymeleaf.org"
-	  xmlns:sec="https://www.thymeleaf.org/thymeleaf-extras-springsecurity5">
-
-<head>
-	<meta http-equiv="Content-Type" content="text/html; charset= UTF-8">
-	<meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0">
-	<title>Home - Shopme Admin</title>
-	
-	<link rel="stylesheet" type="text/css" th:href="@{/fontawesome/all.css}" />
-	<link rel="stylesheet" type="text/css" th:href="@{/style.css}" />
-	<link rel="stylesheet" type="text/css" th:href="@{/webjars/bootstrap/css/bootstrap.min.css}" />
-	
-	<script type="text/javascript" th:src="@{/webjars/jquery/jquery.min.js}"></script>
-	<script type="text/javascript" th:src="@{/webjars/bootstrap/js/bootstrap.min.js}"></script>
-</head>
-
-<body>
-	<div class="container-fluid">
-		<div>
-			<form th:action="">
-			
-			</form>
-			<nav class="navbar navbar-expand-lg bg-dark navbar-dark">
-				<a class="navbar-brand" th:href="@{/}">
-					<img th:src="@{/images/ShopmeAdminSmall.png}"/>
-				</a>
-				<!--hamburger toggler for mobile devices(responsive)-->
-				<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#topNavbar">
-					<span class="navbar-toggler-icon"></span>
-				</button>
-				<div class="collapse navbar-collapse" id="topNavbar">
-					<ul class="navbar-nav">
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/users}">Users</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/categories}">Categories</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/brands}">Brands</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/products}">Products</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/customers}">Customers</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/shipping}">Shipping</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/orders}">Orders</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/report}">Sales Report</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/articles}">Articles</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/menus}">Menus</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/settings}">Settings</a>
-						</li>
-						<li>
-							<span class="fas fa-user fa-2x icon-silver"></span>
-						</li>
-						<li class="nav-item dropdown">
-								<!-- principal refers to user; display username -->
-							<a class="nav-link dropdown-toggle" sec:authentication="principal.fullname" data-toggle="dropdown"></a>
-							<div class="dropdown-menu">
-								<a class="dropdown-item" href="">Logout</a>
-							</div>
-							
-						</li>
-					</ul>
-				</div>
-				
-			</nav>
-		</div>
-
-		<div>
-			<h1>Shopme Control Panel</h1>
-		<div />
-
-		<div>
-			<p>Shopme Control Panel - Copyright &copy; Shopme</p>
-		<div />
-
-
-	</div>
-
-</body>
-
-</html>
\ No newline at end of file
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/c2/d0b655fa8fb3001d19bbb001c1a81c20 b/.metadata/.plugins/org.eclipse.core.resources/.history/c2/d0b655fa8fb3001d19bbb001c1a81c20
deleted file mode 100644
index 14a9d30d..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/c2/d0b655fa8fb3001d19bbb001c1a81c20
+++ /dev/null
@@ -1,280 +0,0 @@
-<!DOCTYPE html>
-<html xmlns:th="http://www.thymeleaf.org">
-
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset= UTF-8">
-<meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0">
-<title>Manage Users</title>
-
-<link rel="stylesheet" type="text/css" th:href="@{/webjars/bootstrap/css/bootstrap.min.css}" />
-<link rel="stylesheet" type="text/css" th:href="@{/fontawesome/all.css}" />
-<link rel="stylesheet" type="text/css" th:href="@{/style.css}" />
-	
-<script type="text/javascript" th:src="@{/webjars/jquery/jquery.min.js}"></script>
-<script type="text/javascript" th:src="@{/webjars/bootstrap/js/bootstrap.min.js}"></script>
-</head>
-
-<body>
-	<div class="container-fluid">
-		<div>
-			<nav class="navbar navbar-expand-lg bg-dark navbar-dark">
-				<a class="navbar-brand" th:href="@{/}"> <img
-					th:src="@{/images/ShopmeAdminSmall.png}" />
-				</a>
-				<!--hamburger toggler for mobile devices(responsive)-->
-				<button class="navbar-toggler" type="button" data-toggle="collapse"
-					data-target="#topNavbar">
-					<span class="navbar-toggler-icon"></span>
-				</button>
-				<div class="collapse navbar-collapse" id="topNavbar">
-					<ul class="navbar-nav">
-						<li class="nav-item"><a class="nav-link" th:href="@{/users}">Users</a>
-						</li>
-						<li class="nav-item"><a class="nav-link"
-							th:href="@{/categories}">Categories</a></li>
-						<li class="nav-item"><a class="nav-link" th:href="@{/brands}">Brands</a>
-						</li>
-						<li class="nav-item"><a class="nav-link"
-							th:href="@{/products}">Products</a></li>
-						<li class="nav-item"><a class="nav-link"
-							th:href="@{/customers}">Customers</a></li>
-						<li class="nav-item"><a class="nav-link"
-							th:href="@{/shipping}">Shipping</a></li>
-						<li class="nav-item"><a class="nav-link" th:href="@{/orders}">Orders</a>
-						</li>
-						<li class="nav-item"><a class="nav-link" th:href="@{/report}">Sales
-								Report</a></li>
-						<li class="nav-item"><a class="nav-link"
-							th:href="@{/articles}">Articles</a></li>
-						<li class="nav-item"><a class="nav-link" th:href="@{/menus}">Menus</a>
-						</li>
-						<li class="nav-item"><a class="nav-link"
-							th:href="@{/settings}">Settings</a></li>
-					</ul>
-				</div>
-
-			</nav>
-		</div>
-
-		<div>
-			<h2>Manage Users</h2>
-			<a th:href="@{/users/new}" class="fas fa-user-plus fa-2x icon-dark mr-2"></a>
-			
-			<a th:href="@{/users/export/csv}" class="fas fa-file-csv fa-2x icon-dark mr-2"></a>
-		</div>
-		
-		
-		
-		<!-- only display success message when a new user is created -->
-		<div th:if="${message != null}" class="alert alert-success text-center">
-			[[${message}]]
-		</div>
-			
-		<div>
-			<form th:action="@{/users/page/1}" class="form-inline m-3">
-				
-				<input type="hidden" name="sortField" th:value="${sortField}" />
-				<input type="hidden" name="sortDir" th:value="${sortDir}" />
-				Filter:&nbsp;
-				<input type="search" name="keyword" th:value="${keyword}" class="form-control" required/>
-				&nbsp;&nbsp;
-				<button type="submit" class="btn btn-primary">
-					<i class="fas fa-search"></i>
-				</button>
-				&nbsp;&nbsp;
-				<button type="button" class="btn btn-secondary" onclick="clearFilter()">
-					<i class="fas fa-eraser"></i>
-				</button>
-			</form>
-		
-		</div>
-
-			<!-- css class to display this table in large screens only , refer to static/style.css for more info-->
-			<div class="full-details">
-				<table class="table table-bordered table-striped table-hover table-responsive-xL">
-					<thead class="thead-dark">
-						<tr>
-							<!-- refer to templates/fragments.html for fragment code-->
-							
-							<th class="hideable-column">
-								<th th:replace="fragments :: column_link('id', 'User ID', 'tag')"/>
-							</th>
-							
-							<th>Photos</th>
-							<th th:replace="fragments :: column_link('email', 'Email')"/>
-							<th th:replace="fragments :: column_link('firstName', 'First Name')"/>
-							<th th:replace="fragments :: column_link('lastName', 'Last Name')"/>
-							<th>Roles</th>
-							<th th:replace="fragments :: column_link('enabled', 'Enabled')"/>
-							<th></th>
-						</tr>
-					</thead>
-					<tbody>
-						<tr th:each="user : ${listUsers}">
-							<td class="hideable-column">[[${user.id}]]</td>
-							<td>
-								<span th:if="${user.photos == null}" class="fas fa-portrait fa-3x icon-dark"></span>
-								<img th:if="${user.photos != null}" th:src="@{${user.photosImagePath}}"
-								style="width: 100px"/>
-							</td>
-							<td class="hideable-column">[[${user.email}]]</td>
-							<td>[[${user.firstName}]]</td>
-							<td>[[${user.lastName}]]</td>
-							<td>[[${user.roles}]]</td>
-							
-							<td>
-								<a th:if="${user.enabled == true}" class="fas fa-check-circle fa-2x icon-green" 
-								th:href="@{'/users/' + ${user.id} + '/enabled/false'}"
-								title="Disable this user"></a>
-								
-								<a th:if="${user.enabled == false}" class="fas fa-circle fa-2x icon-silver"
-								 th:href="@{'/users/' + ${user.id} + '/enabled/true'}"
-								 title="Enable this user"></a>
-							</td>
-							<td>
-									<a class="fas fa-edit fa-2x icon-green" th:href="@{'/users/edit/' + ${user.id}}"
-									title="edit this user"></a>
-									&nbsp; 
-									<a class="fas fa-trash fa-2x icon-dark link-delete" th:href="@{'/users/delete/' + ${user.id}}"
-									title="delete this user" th:userId="${user.id}"></a>
-							</td>
-						</tr>
-					</tbody>
-				</table>
-			</div>
-			
-			
-			<!-- css class to display this <div> on mobile screens only, refer to /static/style.css for more info-->
-			<div class="less-details">
-				
-				<div th:each="user : ${listUsers}" class="row m-1">
-					
-					<div class="col-4">
-						
-						<span th:if="${user.photos == null}" class="fas fa-portrait fa-3x icon-dark"></span>
-								<img th:if="${user.photos != null}" th:src="@{${user.photosImagePath}}"
-								style="width: 100px"/>
-					</div>
-					
-					<div class="col-8">
-						<div>[[${user.fullName}]]</div>
-						<div>[[${user.roles}]]</div>
-						<div class="mt-2">
-							<a th:if="${user.enabled == true}" class="fas fa-check-circle fa-2x icon-green" 
-								th:href="@{'/users/' + ${user.id} + '/enabled/false'}"
-								title="Disable this user"></a>
-								
-							<a th:if="${user.enabled == false}" class="fas fa-circle fa-2x icon-silver"
-								 th:href="@{'/users/' + ${user.id} + '/enabled/true'}"
-								 title="Enable this user"></a>
-						
-									&nbsp;
-							<a class="fas fa-edit fa-2x icon-green" th:href="@{'/users/edit/' + ${user.id}}"
-									title="edit this user"></a>
-									&nbsp; 
-							<a class="fas fa-trash fa-2x icon-dark link-delete" th:href="@{'/users/delete/' + ${user.id}}"
-									title="delete this user" th:userId="${user.id}"></a>
-						</div>
-					</div>
-					<div>&nbsp;</div>
-				</div>
-			</div>
-			
-			
-			<!-- IF -->
-			<div class="text-center m-1" th:if="${totalItems > 0}">
-				<span>Showing Users # [[${startCount}]] to [[${endCount}]] of [[${totalItems}]]</span>
-			</div>
-			
-			<!-- ELSE -->
-			<div class="text-center m-1" th:unless="${totalItems > 0}">
-				<span>No users found</span>
-			</div>
-			
-			<!-- only display pagination when there are users; else, no users no pagination -->
-			<div th:if="${totalPages > 1}">
-				<nav>
-					  <ul class="pagination justify-content-center flex-wrap">
-					  
-					  	<li th:class=" ${currentPage > 1 ? 'page-item' : 'page-item disabled'}">
-					  		<a th:replace="fragments :: page_link(1, 'First')"></a>
-				    	</li>
-					  
-					    <li th:class=" ${currentPage > 1 ? 'page-item' : 'page-item disabled'}">
-					    	<a th:replace="fragments :: page_link(${currentPage - 1 }, 'previous')"></a>
-				    	</li>
-					    	
-					    <!-- org.thymeleaf.expression.Numbers class, An object of this class is usually available in variable evaluation expressions with the name #numbers. -->
-					    <li th:class="${currentPage != i ? 'page-item' : 'page-item active'}" 
-					    	th:each="i : ${#numbers.sequence(1, totalPages)}">
-					    	<a th:replace="fragments :: page_link(${i}, ${i})"></a>
-					    </li>
-					    
-					    <li  th:class=" ${currentPage < totalPages ? 'page-item' : 'page-item disabled'}">
-					    	<a th:replace="fragments :: page_link(${currentPage + 1}, 'Next')"></a>
-					    </li>
-					    
-					    <li th:class=" ${currentPage < totalPages ? 'page-item' : 'page-item disabled'}">
-							<a th:replace="fragments :: page_link(${totalPages}, 'Last')"></a>		
-					    </li>
-					  </ul>
-				</nav>
-			</div>
-			
-			
-			
-			<div class="modal fade text-center" id="confirmModal">
-				<div class="modal-dialog">
-					<div class="modal-content">
-					
-						<div class="modal-header">
-							<h4 class="modal-title">Delete Confirmation</h4>
-							<button type="button" class="close" data-dismiss="modal">&times;</button>
-						</div>
-						
-						<div class="modal-body">
-							<span id="confirmText"></span>
-						</div>
-						
-						<div class="modal-footer">
-							<a class="btn btn-success" href="" id="yesButton">Yes</a>
-							<button type="button" class="btn btn-danger" data-dismiss="modal">Close</button>
-						</div>
-					</div>
-				</div>
-			</div>
-			
-			
-			<div class="text-center">
-				<p>Shopme Control Panel - Copyright &copy; Shopme</p>
-			</div>
-
-
-	</div>
-	
-<script type="text/javascript">
-
-//confirmation modal dialogue for delete user
-$(document).ready(function(){
-	$(".link-delete").on("click", function(e){
-		//stop the <a> tag default behaviour and pop out a confirmation modal dialogue
-		e.preventDefault();
-		//alert($(this).attr("href"));
-		link = $(this);
-		userId = link.attr("userId");
-		$("#yesButton").attr("href", link.attr("href"));
-		$("#confirmText").text("Are you sure you want to delete this user ID " + userId + "?");
-		$("#confirmModal").modal();
-	});
-});
-
-	function clearFilter(){
-		window.location = "[[@{/users}]]";
-	}
-
-
-</script>
-	
-</body>
-
-</html>
\ No newline at end of file
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/c5/50dda86d8cb3001d19bbb001c1a81c20 b/.metadata/.plugins/org.eclipse.core.resources/.history/c5/50dda86d8cb3001d19bbb001c1a81c20
deleted file mode 100644
index 002a123e..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/c5/50dda86d8cb3001d19bbb001c1a81c20
+++ /dev/null
@@ -1,259 +0,0 @@
-<!DOCTYPE html>
-<html xmlns:th="http://www.thymeleaf.org">
-
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset= UTF-8">
-<meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0">
-<title>Manage Users</title>
-
-<link rel="stylesheet" type="text/css" th:href="@{/webjars/bootstrap/css/bootstrap.min.css}" />
-<link rel="stylesheet" type="text/css" th:href="@{/fontawesome/all.css}" />
-<link rel="stylesheet" type="text/css" th:href="@{/style.css}" />
-	
-<script type="text/javascript" th:src="@{/webjars/jquery/jquery.min.js}"></script>
-<script type="text/javascript" th:src="@{/webjars/bootstrap/js/bootstrap.min.js}"></script>
-</head>
-
-<body>
-	<div class="container-fluid">
-		<div>
-			<nav class="navbar navbar-expand-lg bg-dark navbar-dark">
-				<a class="navbar-brand" th:href="@{/}"> <img
-					th:src="@{/images/ShopmeAdminSmall.png}" />
-				</a>
-				<!--hamburger toggler for mobile devices(responsive)-->
-				<button class="navbar-toggler" type="button" data-toggle="collapse"
-					data-target="#topNavbar">
-					<span class="navbar-toggler-icon"></span>
-				</button>
-				<div class="collapse navbar-collapse" id="topNavbar">
-					<ul class="navbar-nav">
-						<li class="nav-item"><a class="nav-link" th:href="@{/users}">Users</a>
-						</li>
-						<li class="nav-item"><a class="nav-link"
-							th:href="@{/categories}">Categories</a></li>
-						<li class="nav-item"><a class="nav-link" th:href="@{/brands}">Brands</a>
-						</li>
-						<li class="nav-item"><a class="nav-link"
-							th:href="@{/products}">Products</a></li>
-						<li class="nav-item"><a class="nav-link"
-							th:href="@{/customers}">Customers</a></li>
-						<li class="nav-item"><a class="nav-link"
-							th:href="@{/shipping}">Shipping</a></li>
-						<li class="nav-item"><a class="nav-link" th:href="@{/orders}">Orders</a>
-						</li>
-						<li class="nav-item"><a class="nav-link" th:href="@{/report}">Sales
-								Report</a></li>
-						<li class="nav-item"><a class="nav-link"
-							th:href="@{/articles}">Articles</a></li>
-						<li class="nav-item"><a class="nav-link" th:href="@{/menus}">Menus</a>
-						</li>
-						<li class="nav-item"><a class="nav-link"
-							th:href="@{/settings}">Settings</a></li>
-					</ul>
-				</div>
-
-			</nav>
-		</div>
-
-		<div>
-			<h2>Manage Users</h2>
-			<a th:href="@{/users/new}" class="fas fa-user-plus fa-2x icon-dark mr-2"></a>
-			
-			<a th:href="@{/users/export/csv}" class="fas fa-file-csv fa-2x icon-dark mr-2"></a>
-		</div>
-		
-		
-		
-		<!-- only display success message when a new user is created -->
-		<div th:if="${message != null}" class="alert alert-success text-center">
-			[[${message}]]
-		</div>
-			
-		<div>
-			<form th:action="@{/users/page/1}" class="form-inline m-3">
-				
-				<input type="hidden" name="sortField" th:value="${sortField}" />
-				<input type="hidden" name="sortDir" th:value="${sortDir}" />
-				Filter:&nbsp;
-				<input type="search" name="keyword" th:value="${keyword}" class="form-control" required/>
-				&nbsp;&nbsp;
-				<button type="submit" class="btn btn-primary">
-					<i class="fas fa-search"></i>
-				</button>
-				&nbsp;&nbsp;
-				<button type="button" class="btn btn-secondary" onclick="clearFilter()">
-					<i class="fas fa-eraser"></i>
-				</button>
-			</form>
-		
-		</div>
-
-			<!-- css class to display this table in large screens only , refer to static/style.css for more info-->
-			<div class="full-details">
-				<table class="table table-bordered table-striped table-hover table-responsive-xL">
-					<thead class="thead-dark">
-						<tr>
-							<!-- refer to templates/fragments.html for fragment code-->
-							<th th:replace="fragments :: column_link('id', 'User ID')"/>
-							<th>Photos</th>
-							<th th:replace="fragments :: column_link('email', 'Email')"/>
-							<th th:replace="fragments :: column_link('firstName', 'First Name')"/>
-							<th th:replace="fragments :: column_link('lastName', 'Last Name')"/>
-							<th>Roles</th>
-							<th th:replace="fragments :: column_link('enabled', 'Enabled')"/>
-							<th></th>
-						</tr>
-					</thead>
-					<tbody>
-						<tr th:each="user : ${listUsers}">
-							<td>[[${user.id}]]</td>
-							<td>
-								<span th:if="${user.photos == null}" class="fas fa-portrait fa-3x icon-dark"></span>
-								<img th:if="${user.photos != null}" th:src="@{${user.photosImagePath}}"
-								style="width: 100px"/>
-							</td>
-							<td>[[${user.email}]]</td>
-							<td>[[${user.firstName}]]</td>
-							<td>[[${user.lastName}]]</td>
-							<td>[[${user.roles}]]</td>
-							
-							<td>
-								<a th:if="${user.enabled == true}" class="fas fa-check-circle fa-2x icon-green" 
-								th:href="@{'/users/' + ${user.id} + '/enabled/false'}"
-								title="Disable this user"></a>
-								
-								<a th:if="${user.enabled == false}" class="fas fa-circle fa-2x icon-silver"
-								 th:href="@{'/users/' + ${user.id} + '/enabled/true'}"
-								 title="Enable this user"></a>
-							</td>
-							<td>
-									<a class="fas fa-edit fa-2x icon-green" th:href="@{'/users/edit/' + ${user.id}}"
-									title="edit this user"></a>
-									&nbsp; 
-									<a class="fas fa-trash fa-2x icon-dark link-delete" th:href="@{'/users/delete/' + ${user.id}}"
-									title="delete this user" th:userId="${user.id}"></a>
-							</td>
-						</tr>
-					</tbody>
-				</table>
-			</div>
-			
-			
-			<!-- css class to display this <div> on mobile screens only, refer to /static/style.css for more info-->
-			<div class="less-details">
-				
-				<div th:each="user : ${listUsers}" class="row m-1">
-					
-					<div class="col">
-						
-						<span th:if="${user.photos == null}" class="fas fa-portrait fa-3x icon-dark"></span>
-								<img th:if="${user.photos != null}" th:src="@{${user.photosImagePath}}"
-								style="width: 100px"/>
-					</div>
-						<div class="col">
-							<div>[[${user.fullName}]]</div>
-							<div>[[${user.roles}]]</div>
-						</div>
-					<div>&nbsp;</div>
-				</div>
-			</div>
-			
-			
-			<!-- IF -->
-			<div class="text-center m-1" th:if="${totalItems > 0}">
-				<span>Showing Users # [[${startCount}]] to [[${endCount}]] of [[${totalItems}]]</span>
-			</div>
-			
-			<!-- ELSE -->
-			<div class="text-center m-1" th:unless="${totalItems > 0}">
-				<span>No users found</span>
-			</div>
-			
-			<!-- only display pagination when there are users; else, no users no pagination -->
-			<div th:if="${totalPages > 1}">
-				<nav>
-					  <ul class="pagination justify-content-center flex-wrap">
-					  
-					  	<li th:class=" ${currentPage > 1 ? 'page-item' : 'page-item disabled'}">
-					  		<a th:replace="fragments :: page_link(1, 'First')"></a>
-				    	</li>
-					  
-					    <li th:class=" ${currentPage > 1 ? 'page-item' : 'page-item disabled'}">
-					    	<a th:replace="fragments :: page_link(${currentPage - 1 }, 'previous')"></a>
-				    	</li>
-					    	
-					    <!-- org.thymeleaf.expression.Numbers class, An object of this class is usually available in variable evaluation expressions with the name #numbers. -->
-					    <li th:class="${currentPage != i ? 'page-item' : 'page-item active'}" 
-					    	th:each="i : ${#numbers.sequence(1, totalPages)}">
-					    	<a th:replace="fragments :: page_link(${i}, ${i})"></a>
-					    </li>
-					    
-					    <li  th:class=" ${currentPage < totalPages ? 'page-item' : 'page-item disabled'}">
-					    	<a th:replace="fragments :: page_link(${currentPage + 1}, 'Next')"></a>
-					    </li>
-					    
-					    <li th:class=" ${currentPage < totalPages ? 'page-item' : 'page-item disabled'}">
-							<a th:replace="fragments :: page_link(${totalPages}, 'Last')"></a>		
-					    </li>
-					  </ul>
-				</nav>
-			</div>
-			
-			
-			
-			<div class="modal fade text-center" id="confirmModal">
-				<div class="modal-dialog">
-					<div class="modal-content">
-					
-						<div class="modal-header">
-							<h4 class="modal-title">Delete Confirmation</h4>
-							<button type="button" class="close" data-dismiss="modal">&times;</button>
-						</div>
-						
-						<div class="modal-body">
-							<span id="confirmText"></span>
-						</div>
-						
-						<div class="modal-footer">
-							<a class="btn btn-success" href="" id="yesButton">Yes</a>
-							<button type="button" class="btn btn-danger" data-dismiss="modal">Close</button>
-						</div>
-					</div>
-				</div>
-			</div>
-			
-			
-			<div class="text-center">
-				<p>Shopme Control Panel - Copyright &copy; Shopme</p>
-			</div>
-
-
-	</div>
-	
-<script type="text/javascript">
-
-//confirmation modal dialogue for delete user
-$(document).ready(function(){
-	$(".link-delete").on("click", function(e){
-		//stop the <a> tag default behaviour and pop out a confirmation modal dialogue
-		e.preventDefault();
-		//alert($(this).attr("href"));
-		link = $(this);
-		userId = link.attr("userId");
-		$("#yesButton").attr("href", link.attr("href"));
-		$("#confirmText").text("Are you sure you want to delete this user ID " + userId + "?");
-		$("#confirmModal").modal();
-	});
-});
-
-	function clearFilter(){
-		window.location = "[[@{/users}]]";
-	}
-
-
-</script>
-	
-</body>
-
-</html>
\ No newline at end of file
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/c6/50e87de10ab9001d11addcb4256c67f9 b/.metadata/.plugins/org.eclipse.core.resources/.history/c6/50e87de10ab9001d11addcb4256c67f9
new file mode 100644
index 00000000..03d14327
--- /dev/null
+++ b/.metadata/.plugins/org.eclipse.core.resources/.history/c6/50e87de10ab9001d11addcb4256c67f9
@@ -0,0 +1,44 @@
+package com.shopme.admin;
+
+import java.nio.file.Path;
+import java.nio.file.Paths;
+
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
+
+@Configuration
+public class MvcConfig implements WebMvcConfigurer {
+
+	
+	/*
+	 * In short, we can tell Spring MVC to map a given URL (e.g. "/user-photos") 
+	 * to any directory (e.g. D:/ShopmeProject/ShopmeBackend/user-photos) 
+	 * and expose the resources (images, js, css...) in this directory to 
+	 * the web clients (browsers) - that's the primary purpose
+	 *  of using resource handlers in Spring MVC.
+	 * 
+	 * Because the assets are not located in the src/main/resources/static folder
+	 * */
+	
+	@Override
+	public void addResourceHandlers(ResourceHandlerRegistry registry) {
+
+		String dirName = "user-photos";
+		
+		Path userPhotoDir = Paths.get(dirName);
+		
+		String userPhotosPath = userPhotoDir.toFile().getAbsolutePath();
+		
+		
+		// add /** to allow all files under this directory to be available to client
+		
+		registry.addResourceHandler("/" + dirName + "/**")
+		.addResourceLocations("file:/" + userPhotosPath + "/");
+		
+	}
+	
+	
+	
+	
+}
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/c6/90bdcfbd4fb3001d1e75aa5ef0815903 b/.metadata/.plugins/org.eclipse.core.resources/.history/c6/90bdcfbd4fb3001d1e75aa5ef0815903
deleted file mode 100644
index fa2d6307..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/c6/90bdcfbd4fb3001d1e75aa5ef0815903
+++ /dev/null
@@ -1,170 +0,0 @@
-package com.shopme.admin.user;
-
-import java.io.IOException;
-import java.util.List;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.domain.Page;
-import org.springframework.data.repository.query.Param;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
-import org.springframework.util.StringUtils;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.ModelAttribute;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.multipart.MultipartFile;
-import org.springframework.web.servlet.mvc.support.RedirectAttributes;
-
-import com.fasterxml.jackson.annotation.ObjectIdGenerators.StringIdGenerator;
-import com.shopme.admin.FileUploadUtil;
-import com.shopme.common.entity.Role;
-import com.shopme.common.entity.User;
-
-@Controller
-public class UserController {
-
-	@Autowired
-	private UserService service;
-
-	@GetMapping("/users")
-	public String listFirstPage(Model model) {
-		return listByPage(1, model, "firstName", "asc", null);
-	}
-
-	@GetMapping("/users/page/{pageNum}")
-	public String listByPage(@PathVariable(name = "pageNum") int pageNum, Model model,
-			@Param("sortField") String sortField, @Param("sortDir") String sortDir,
-			@Param("keyword") String keyword) {
-		
-		System.out.println("sort field: " + sortField);
-		System.out.println("sort order: " + sortDir);
-		
-		Page<User> page = service.listByPage(pageNum, sortField, sortDir, keyword);
-		List<User> listUsers = page.getContent();
-
-		
-		long startCount = (pageNum - 1) * UserService.USERS_PER_PAGE + 1;
-		long endCount = startCount + UserService.USERS_PER_PAGE - 1;
-		if(endCount > page.getTotalElements()) {
-			endCount = page.getTotalElements();
-		}
-		
-		String reverseSortDir = sortDir.equals("asc") ? "desc" : "asc";
-		
-		model.addAttribute("currentPage", pageNum);
-		model.addAttribute("totalPages", page.getTotalPages());
-		model.addAttribute("startCount", startCount);
-		model.addAttribute("endCount", endCount);
-		model.addAttribute("totalItems", page.getTotalElements());
-		model.addAttribute("listUsers", listUsers);
-		model.addAttribute("sortField", sortField);
-		model.addAttribute("sortDir", sortDir);
-		model.addAttribute("reverseSortDir", reverseSortDir);
-		model.addAttribute("keyword", keyword);
-		
-
-		return "users";
-
-	}
-
-	@GetMapping("/users/new")
-	public String newUser(Model model) {
-
-		List<Role> listRoles = service.listRoles();
-
-		User user = new User();
-		user.setEnabled(true);
-
-		model.addAttribute("user", user);
-		model.addAttribute("listRoles", listRoles);
-		model.addAttribute("pageTitle", "Create New User");
-
-		return "user_form";
-
-	}
-
-	// using @RequestParam, we can get the image file input, the input has the
-	// property name="image"
-	@PostMapping("/users/save")
-	public String saveUser(@ModelAttribute("user") User user, RedirectAttributes redirectAttributes,
-			@RequestParam("image") MultipartFile multipartFile) throws IOException {
-
-		if (!multipartFile.isEmpty()) {
-
-			String fileName = StringUtils.cleanPath(multipartFile.getOriginalFilename());
-			user.setPhotos(fileName);
-
-			User savedUser = service.save(user);
-
-			String uploadDir = "user-photos/" + savedUser.getId();
-
-			FileUploadUtil.cleanDir(uploadDir);
-			FileUploadUtil.saveFile(uploadDir, fileName, multipartFile);
-		} else {
-
-			// set photo to null for getPhotosImagePath() method's conditional statement in
-			// User class
-			if (user.getPhotos().isEmpty())
-				user.setPhotos(null);
-			service.save(user);
-		}
-
-		redirectAttributes.addFlashAttribute("message", "the user has been saved successfully");
-
-		// POST/REDIRECT/GET web design
-		
-		//after user is saved display the user instead of the entire user list
-		//email is unique field, so 
-		
-		return "redirect:/users";
-	}
-
-	@GetMapping("/users/edit/{id}")
-	public String editUser(@PathVariable(name = "id") Integer id, RedirectAttributes redirectAttributes, Model model) {
-		try {
-			User user = service.get(id);
-			List<Role> listRoles = service.listRoles();
-
-			model.addAttribute("user", user);
-			model.addAttribute("pageTitle", "Edit User (ID: " + id + ")");
-			model.addAttribute("listRoles", listRoles);
-
-			return "user_form";
-		} catch (UserNotFoundException ex) {
-			redirectAttributes.addFlashAttribute("message", ex.getMessage());
-
-			return "redirect:/users";
-		}
-
-	}
-
-	@GetMapping("/users/delete/{id}")
-	public String deleteUser(@PathVariable(name = "id") Integer id, RedirectAttributes redirectAttributes,
-			Model model) {
-		try {
-			service.delete(id);
-			redirectAttributes.addFlashAttribute("message", "The user ID " + id + " has been deleted successfully.");
-
-		} catch (UserNotFoundException ex) {
-			redirectAttributes.addFlashAttribute("message", ex.getMessage());
-
-		}
-
-		return "redirect:/users";
-	}
-
-	@GetMapping("/users/{id}/enabled/{status}")
-	public String updateUserEnabledStatus(@PathVariable(name = "id") Integer id,
-			@PathVariable(name = "status") boolean enabled, RedirectAttributes redirectAttributes) {
-
-		service.updateUserEnabledStatus(id, enabled);
-		String status = enabled ? "enabled" : "disabled";
-		String message = "The user id " + id + " has been " + status;
-		redirectAttributes.addFlashAttribute("message", message);
-
-		return "redirect:/users";
-	}
-
-}
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/c7/a0c13e9f27b3001d1e75aa5ef0815903 b/.metadata/.plugins/org.eclipse.core.resources/.history/c7/a0c13e9f27b3001d1e75aa5ef0815903
deleted file mode 100644
index 5609cff0..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/c7/a0c13e9f27b3001d1e75aa5ef0815903
+++ /dev/null
@@ -1,135 +0,0 @@
-package com.shopme.admin.user;
-
-import java.util.List;
-import java.util.NoSuchElementException;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.domain.Page;
-import org.springframework.data.domain.PageRequest;
-import org.springframework.data.domain.Pageable;
-import org.springframework.data.domain.Sort;
-import org.springframework.security.crypto.password.PasswordEncoder;
-import org.springframework.stereotype.Service;
-
-import com.shopme.common.entity.Role;
-import com.shopme.common.entity.User;
-
-import jakarta.transaction.Transactional;
-
-@Service
-@Transactional
-public class UserService {
-
-	public static final int USERS_PER_PAGE = 4;
-	
-	@Autowired
-	private UserRepository userRepo;
-
-	@Autowired
-	private RoleRepository roleRepo;
-
-	@Autowired
-	private PasswordEncoder passwordEncoder;
-
-	public List<User> listAll() {
-		
-		return (List<User>) userRepo.findAll();
-	}
-	
-	
-	public Page<User> listByPage(int pageNum, String sortField, String sortDir) {
-		
-		Sort sort = Sort.by(sortField);
-		
-		sort = sortDir.equals("asc") ? sort.ascending() : sort.descending();
-		
-		//page number start with 0 for pageable, so need to minus 1.
-		Pageable pageable = PageRequest.of(pageNum - 1, USERS_PER_PAGE, sort);
-		
-		return userRepo.findAll(pageable);
-	}
-	
-
-	public List<Role> listRoles() {
-
-		return (List<Role>) roleRepo.findAll();
-	}
-
-	public User save(User user) {
-
-		boolean isUpdatingUser = (user.getId() != null);
-
-		if (isUpdatingUser) {
-
-			User existingUser = userRepo.findById(user.getId()).get();
-
-			if (user.getPassword().isEmpty()) {
-				/*
-				 * if we do not set the user password to existing user password, password field
-				 * will be an empty string. When the user object is saved to database, the empty
-				 * string will replace the encoded password.
-				 */
-				user.setPassword(existingUser.getPassword());
-			} else {
-				encodePassword(user);
-			}
-
-		} else {
-			encodePassword(user);
-		}
-
-		return userRepo.save(user);
-	}
-
-	private void encodePassword(User user) {
-
-		String encodedPassword = passwordEncoder.encode(user.getPassword());
-		user.setPassword(encodedPassword);
-	}
-
-	public boolean isEmailUnique(Integer id, String email) {
-		User userByEmail = userRepo.getUserByEmail(email);
-
-		if (userByEmail == null)
-			return true;
-
-		boolean isCreatingNew = (id == null);
-
-		if (isCreatingNew) {
-			if (userByEmail != null)
-				return false;
-		} else {
-			if (userByEmail.getId() != id) {
-				return false;
-			}
-		}
-
-		return true;
-	}
-
-	public User get(Integer id) throws UserNotFoundException {
-		try {
-			return userRepo.findById(id).get();
-		} catch (NoSuchElementException ex) {
-			throw new UserNotFoundException("could not find any user with id: " + id);
-		}
-	}
-
-	public void delete(Integer id) throws UserNotFoundException {
-
-		Long countById = userRepo.countById(id);
-
-		if (countById == null || countById == 0) {
-			throw new UserNotFoundException("could not find any user with id: " + id);
-		}
-		
-		userRepo.deleteById(id);
-	}
-	
-	public void updateUserEnabledStatus(Integer id, boolean enabled) {
-		
-		 userRepo.updateEnabledStatus(id, enabled);
-	}
-	
-
-}
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/c7/d08911957ab3001d19bbb001c1a81c20 b/.metadata/.plugins/org.eclipse.core.resources/.history/c7/d08911957ab3001d19bbb001c1a81c20
deleted file mode 100644
index 55f1aca0..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/c7/d08911957ab3001d19bbb001c1a81c20
+++ /dev/null
@@ -1,96 +0,0 @@
-package com.shopme.admin.user;
-
-import java.io.IOException;
-import java.util.List;
-
-import jakarta.servlet.ServletOutputStream;
-import jakarta.servlet.http.HttpServletResponse;
-
-import org.apache.poi.ss.usermodel.CellStyle;
-import org.apache.poi.xssf.usermodel.XSSFCell;
-import org.apache.poi.xssf.usermodel.XSSFCellStyle;
-import org.apache.poi.xssf.usermodel.XSSFFont;
-import org.apache.poi.xssf.usermodel.XSSFRow;
-import org.apache.poi.xssf.usermodel.XSSFSheet;
-import org.apache.poi.xssf.usermodel.XSSFWorkbook;
-
-import com.shopme.admin.user.AbstractExporter;
-import com.shopme.common.entity.User;
-
-public class UserExcelExporter extends AbstractExporter {
-	private XSSFWorkbook workbook;
-	private XSSFSheet sheet;
-	
-	public UserExcelExporter() {
-		workbook = new XSSFWorkbook();
-	}
-	
-	private void writeHeaderLine() {
-		sheet = workbook.createSheet("Users");
-		XSSFRow row = sheet.createRow(0);
-		
-		XSSFCellStyle cellStyle = workbook.createCellStyle();
-		XSSFFont font = workbook.createFont();
-		font.setBold(true);
-		font.setFontHeight(16);
-		cellStyle.setFont(font);
-		
-		createCell(row, 0, "User Id", cellStyle);
-		createCell(row, 1, "E-mail", cellStyle);
-		createCell(row, 2, "First Name", cellStyle);
-		createCell(row, 3, "Last Name", cellStyle);
-		createCell(row, 4, "Roles", cellStyle);
-		createCell(row, 5, "Enabled", cellStyle);
-		
-	}
-	
-	private void createCell(XSSFRow row, int columnIndex, Object value, CellStyle style) {
-		XSSFCell cell = row.createCell(columnIndex);
-		sheet.autoSizeColumn(columnIndex);
-		
-		if (value instanceof Integer) {
-			cell.setCellValue((Integer) value);
-		} else if (value instanceof Boolean) {
-			cell.setCellValue((Boolean) value);
-		} else {
-			cell.setCellValue((String) value);
-		}
-		
-		cell.setCellStyle(style);		
-	}
-	
-	public void export(List<User> listUsers, HttpServletResponse response) throws IOException {
-		super.setResponseHeader(response, "application/octet-stream", ".xlsx", "users_");
-	
-		writeHeaderLine();
-		writeDataLines(listUsers);
-		
-		ServletOutputStream outputStream = response.getOutputStream();
-		workbook.write(outputStream);
-		workbook.close();
-		outputStream.close();
-		
-		
-	}
-
-	private void writeDataLines(List<User> listUsers) {
-		int rowIndex = 1;
-		
-		XSSFCellStyle cellStyle = workbook.createCellStyle();
-		XSSFFont font = workbook.createFont();
-		font.setFontHeight(14);
-		cellStyle.setFont(font);
-		
-		for (User user : listUsers) {
-			XSSFRow row = sheet.createRow(rowIndex++);
-			int columnIndex = 0;
-			
-			createCell(row, columnIndex++, user.getId(), cellStyle);
-			createCell(row, columnIndex++, user.getEmail(), cellStyle);
-			createCell(row, columnIndex++, user.getFirstName(), cellStyle);
-			createCell(row, columnIndex++, user.getLastName(), cellStyle);
-			createCell(row, columnIndex++, user.getRoles().toString(), cellStyle);
-			createCell(row, columnIndex++, user.isEnabled(), cellStyle);
-		}
-	}
-}
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/c8/10893fbf32b4001d1d079a924effdc9e b/.metadata/.plugins/org.eclipse.core.resources/.history/c8/10893fbf32b4001d1d079a924effdc9e
deleted file mode 100644
index 104f2230..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/c8/10893fbf32b4001d1d079a924effdc9e
+++ /dev/null
@@ -1,56 +0,0 @@
-<!DOCTYPE html>
-<html xmlns:th="http://www.thymeleaf.org">
-
-<head>
-	<meta http-equiv="Content-Type" content="text/html; charset= UTF-8">
-	<meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0">
-	<title>Login - Shopme Admin</title>
-	<link rel="stylesheet" type="text/css" th:href="@{/webjars/bootstrap/css/bootstrap.min.css}" />
-</head>
-
-<body>
-	<div class="container-fluid text-center">
-		
-		<div>
-			<img th:src="@{/images/ShopmeAdminBig.png}" />
-		</div>
-		
-		<form th:action="@{/login}" method="post" style="max-width:350px; margin: 0 auto">
-			
-			<!--  ?error param will appear at the end of url if there is error with email or password  -->
-			<div th:if="${param.error}">
-				<p class="text-danger">[[${session.SPRING_SECURITY_LAST_EXCEPTION.message}]]</p>
-			</div>
-			
-			<!--  ?logout param will appear at the end of url if there is error with email or password  -->
-			<div th:if="${param.logout}">
-				<p class="text-warning">you have been logged out</p>
-			</div>
-			
-			<div class="border border-secondary rounded p-3">
-				<p>Access to Shopme Control Panel </p>
-				
-				<p>
-					<input type="email" name="email" class="form-control" placeholder="Email" required />
-				</p>
-				
-				<p>
-					<input type="password" name="password" class="form-control" placeholder="Password" required />
-				</p>
-				
-				<p>
-					<input type="submit" value="Login" class="btn btn-primary" />
-				</p>
-			</div>
-		
-		</form>
-
-		<div>
-			<p>Shopme Control Panel - Copyright &copy; Shopme</p>
-		</div>
-
-	</div>
-
-</body>
-
-</html>
\ No newline at end of file
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/c8/b0d8891350b3001d1e75aa5ef0815903 b/.metadata/.plugins/org.eclipse.core.resources/.history/c8/b0d8891350b3001d1e75aa5ef0815903
deleted file mode 100644
index 26457903..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/c8/b0d8891350b3001d1e75aa5ef0815903
+++ /dev/null
@@ -1,172 +0,0 @@
-package com.shopme.admin.user;
-
-import java.io.IOException;
-import java.util.List;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.domain.Page;
-import org.springframework.data.repository.query.Param;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
-import org.springframework.util.StringUtils;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.ModelAttribute;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.multipart.MultipartFile;
-import org.springframework.web.servlet.mvc.support.RedirectAttributes;
-
-import com.fasterxml.jackson.annotation.ObjectIdGenerators.StringIdGenerator;
-import com.shopme.admin.FileUploadUtil;
-import com.shopme.common.entity.Role;
-import com.shopme.common.entity.User;
-
-@Controller
-public class UserController {
-
-	@Autowired
-	private UserService service;
-
-	@GetMapping("/users")
-	public String listFirstPage(Model model) {
-		return listByPage(1, model, "firstName", "asc", null);
-	}
-
-	@GetMapping("/users/page/{pageNum}")
-	public String listByPage(@PathVariable(name = "pageNum") int pageNum, Model model,
-			@Param("sortField") String sortField, @Param("sortDir") String sortDir,
-			@Param("keyword") String keyword) {
-		
-		System.out.println("sort field: " + sortField);
-		System.out.println("sort order: " + sortDir);
-		
-		Page<User> page = service.listByPage(pageNum, sortField, sortDir, keyword);
-		List<User> listUsers = page.getContent();
-
-		
-		long startCount = (pageNum - 1) * UserService.USERS_PER_PAGE + 1;
-		long endCount = startCount + UserService.USERS_PER_PAGE - 1;
-		if(endCount > page.getTotalElements()) {
-			endCount = page.getTotalElements();
-		}
-		
-		String reverseSortDir = sortDir.equals("asc") ? "desc" : "asc";
-		
-		model.addAttribute("currentPage", pageNum);
-		model.addAttribute("totalPages", page.getTotalPages());
-		model.addAttribute("startCount", startCount);
-		model.addAttribute("endCount", endCount);
-		model.addAttribute("totalItems", page.getTotalElements());
-		model.addAttribute("listUsers", listUsers);
-		model.addAttribute("sortField", sortField);
-		model.addAttribute("sortDir", sortDir);
-		model.addAttribute("reverseSortDir", reverseSortDir);
-		model.addAttribute("keyword", keyword);
-		
-
-		return "users";
-
-	}
-
-	@GetMapping("/users/new")
-	public String newUser(Model model) {
-
-		List<Role> listRoles = service.listRoles();
-
-		User user = new User();
-		user.setEnabled(true);
-
-		model.addAttribute("user", user);
-		model.addAttribute("listRoles", listRoles);
-		model.addAttribute("pageTitle", "Create New User");
-
-		return "user_form";
-
-	}
-
-	// using @RequestParam, we can get the image file input, the input has the
-	// property name="image"
-	@PostMapping("/users/save")
-	public String saveUser(@ModelAttribute("user") User user, RedirectAttributes redirectAttributes,
-			@RequestParam("image") MultipartFile multipartFile) throws IOException {
-
-		if (!multipartFile.isEmpty()) {
-
-			String fileName = StringUtils.cleanPath(multipartFile.getOriginalFilename());
-			user.setPhotos(fileName);
-
-			User savedUser = service.save(user);
-
-			String uploadDir = "user-photos/" + savedUser.getId();
-
-			FileUploadUtil.cleanDir(uploadDir);
-			FileUploadUtil.saveFile(uploadDir, fileName, multipartFile);
-		} else {
-
-			// set photo to null for getPhotosImagePath() method's conditional statement in
-			// User class
-			if (user.getPhotos().isEmpty())
-				user.setPhotos(null);
-			service.save(user);
-		}
-
-		redirectAttributes.addFlashAttribute("message", "the user has been saved successfully");
-
-		// POST/REDIRECT/GET web design
-		
-		//after user is saved display the user instead of the entire user list
-		//email is a unique field to identify each user.
-		
-		
-		String firstPartOfEmail = user.getEmail().split("@")[0];
-		return "redirect:/users/page/1?sortField=id&sortDir=asc&keyword=";
-	}
-
-	@GetMapping("/users/edit/{id}")
-	public String editUser(@PathVariable(name = "id") Integer id, RedirectAttributes redirectAttributes, Model model) {
-		try {
-			User user = service.get(id);
-			List<Role> listRoles = service.listRoles();
-
-			model.addAttribute("user", user);
-			model.addAttribute("pageTitle", "Edit User (ID: " + id + ")");
-			model.addAttribute("listRoles", listRoles);
-
-			return "user_form";
-		} catch (UserNotFoundException ex) {
-			redirectAttributes.addFlashAttribute("message", ex.getMessage());
-
-			return "redirect:/users";
-		}
-
-	}
-
-	@GetMapping("/users/delete/{id}")
-	public String deleteUser(@PathVariable(name = "id") Integer id, RedirectAttributes redirectAttributes,
-			Model model) {
-		try {
-			service.delete(id);
-			redirectAttributes.addFlashAttribute("message", "The user ID " + id + " has been deleted successfully.");
-
-		} catch (UserNotFoundException ex) {
-			redirectAttributes.addFlashAttribute("message", ex.getMessage());
-
-		}
-
-		return "redirect:/users";
-	}
-
-	@GetMapping("/users/{id}/enabled/{status}")
-	public String updateUserEnabledStatus(@PathVariable(name = "id") Integer id,
-			@PathVariable(name = "status") boolean enabled, RedirectAttributes redirectAttributes) {
-
-		service.updateUserEnabledStatus(id, enabled);
-		String status = enabled ? "enabled" : "disabled";
-		String message = "The user id " + id + " has been " + status;
-		redirectAttributes.addFlashAttribute("message", message);
-
-		return "redirect:/users";
-	}
-
-}
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/c9/5097760b8fb3001d19bbb001c1a81c20 b/.metadata/.plugins/org.eclipse.core.resources/.history/c9/5097760b8fb3001d19bbb001c1a81c20
deleted file mode 100644
index 63bba920..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/c9/5097760b8fb3001d19bbb001c1a81c20
+++ /dev/null
@@ -1,33 +0,0 @@
-<!DOCTYPE html>
-<html xmlns:th="http://www.thymeleaf.org">
-<head>
-<meta charset="ISO-8859-1">
-<title>Insert title here</title>
-</head>
-<body>
-
-		<!-- purpose: make code more succinct and readable 
-		project is easier to maintain
-		
-		use thymeleaf fragments -->
-
-
-	<th th:fragment="column_link(fieldName, columnLabel)">
-		<!-- follow the sort order of another sortField; if the other field is sortDir="asc", then the newly selected column will be sortDir="asc" too -->
-		<a class="text-white"
-		   th:href="@{'/users/page/' + ${currentPage} + '?sortField=' + ${fieldName} + '&sortDir=' + ${sortField != fieldName ? sortDir : reverseSortDir} + ${keyword != null ? '&keyword=' + keyword : ''}}">
-			[[${columnLabel}]]
-		</a>
-		
-		<span th:if="${sortField == fieldName}"
-		th:class="${sortDir == 'asc' ? 'fas fa-sort-up' : 'fas fa-sort-down'}"></span>
-	</th>
-	
-	
-	<a th:fragment="page_link(pageNum, label)"
-	   class="page-link"
-	   th:href= "@{'/users/page/' + ${pageNum} + '?sortField=' + ${sortField} + '&sortDir=' + ${sortDir} + ${keyword != null ? '&keyword=' + keyword : ''}}">[[${label}]]</a>
-	
-	
-</body>
-</html>
\ No newline at end of file
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/c9/906ec83b09b4001d128fb79045552177 b/.metadata/.plugins/org.eclipse.core.resources/.history/c9/906ec83b09b4001d128fb79045552177
deleted file mode 100644
index 5fd8c0f0..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/c9/906ec83b09b4001d128fb79045552177
+++ /dev/null
@@ -1,47 +0,0 @@
-package com.shopme.admin.security;
-
-import org.aspectj.weaver.ast.And;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.security.config.annotation.web.builders.HttpSecurity;
-import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
-import org.springframework.security.config.annotation.web.configuration.WebSecurityConfiguration;
-import org.springframework.security.config.annotation.web.configuration.WebSecurityCustomizer;
-import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
-import org.springframework.security.crypto.password.PasswordEncoder;
-import org.springframework.security.web.SecurityFilterChain;
-
-@Configuration
-@EnableWebSecurity
-public class WebSecurityConfig {
-
-	/*
-	 * refer to this link: https://www.codejava.net/frameworks/spring-boot/fix-
-	 * websecurityconfigureradapter-deprecated
-	 * 
-	 */
-
-	@Bean
-	public PasswordEncoder PasswordEncoder() {
-		return new BCryptPasswordEncoder();
-	}
-
-	@Bean
-	public SecurityFilterChain filterChain(HttpSecurity http) throws Exception {
-
-		// any request need to be authenticated (require login)
-		// custom login page at "/login" - handler method in MainController class
-		http.authorizeHttpRequests().anyRequest().authenticated().and().formLogin().loginPage("/login").permitAll();
-
-		return http.build();
-	}
-
-	//NOTE: antMatchers() changed to requestMatchers()
-	//stack: https://stackoverflow.com/questions/74907533/the-method-antmatchersstring-is-undefined-for-the-type
-	@Bean
-	public WebSecurityCustomizer webSecurityCustomizer() {
-		//permit access to the assests in the following directories
-		return (web) -> web.ignoring().requestMatchers("/images/**", "/js/**", "/webjars/**");
-	}
-
-}
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/c9/a02b182f0db9001d11addcb4256c67f9 b/.metadata/.plugins/org.eclipse.core.resources/.history/c9/a02b182f0db9001d11addcb4256c67f9
new file mode 100644
index 00000000..52608403
--- /dev/null
+++ b/.metadata/.plugins/org.eclipse.core.resources/.history/c9/a02b182f0db9001d11addcb4256c67f9
@@ -0,0 +1,206 @@
+<!DOCTYPE html>
+<html xmlns:th="http://www.thymeleaf.org">
+
+<head th:replace="fragments :: page_head('Categories - Shopme Admin')"/>
+
+<body>
+	<div class="container-fluid">
+		
+		<!-- navigation bar -->
+		<div th:replace="navigation :: menu"></div>
+
+		<div>
+			<h2>Manage Categories</h2>
+			<a th:href="@{/categories/new}" class="fas fa-folder-plus fa-2x icon-dark mr-2"></a>
+			
+			<a th:href="@{/categories/export/csv}" class="fas fa-file-csv fa-2x icon-dark mr-2"></a>
+		</div>
+		
+		<!-- redirect message from controller -->
+		<div th:if="${message != null}" class="alert alert-success text-center">
+			[[${message}]]
+		</div>
+		
+			
+		<div>
+			<form th:action="@{/categories/page/1}" class="form-inline m-3">
+				
+				Filter:&nbsp;
+				<input type="search" name="keyword" th:value="${keyword}" class="form-control" required/>
+				&nbsp;&nbsp;
+				<button type="submit" class="btn btn-primary">
+					<i class="fas fa-search"></i>
+				</button>
+				&nbsp;&nbsp;
+				<button type="button" class="btn btn-secondary" onclick="clearFilter()">
+					<i class="fas fa-eraser"></i>
+				</button>
+			</form>
+		
+		</div>
+
+			<!-- css class to display this table in large screens only , refer to static/style.css for more info-->
+			<div class="full-details">
+				<table class="table table-bordered table-striped table-hover table-responsive-xL">
+					<thead class="thead-dark">
+						<tr>
+							<th>ID</th>
+							<th>Category Image</th>
+							<th>Category Name</th>
+							<th>Alias</th>
+							<th>Enabled</th>
+							<th></th>
+						</tr>
+					</thead>
+					<tbody>
+						<tr th:each="cat : ${listCategories}">
+							<td>[[${cat.id}]]</td>
+							<td>	
+								<img th:src="@{${cat.imagePath}}" style="width: 100px;"/>
+							</td>
+							<td>[[${cat.name}]]</td>
+							<td>[[${cat.alias}]]</td>
+							<td>
+								<div th:replace="fragments :: category_status"></div>
+							</td>
+							<td>
+								<div th:replace="fragments :: category_actions"></div>
+							</td>
+						</tr>
+					</tbody>
+				</table>
+			</div>
+			
+			
+			<!-- css class to display this <div> on mobile screens only, refer to /static/style.css for more info-->
+			<div class="less-details">
+				
+				<div th:each="user : ${listUsers}" class="row m-1">
+					
+					<div class="col-4">
+						
+						<span th:if="${user.photos == null}" class="fas fa-portrait fa-3x icon-dark"></span>
+								<img th:if="${user.photos != null}" th:src="@{${user.photosImagePath}}"
+								style="width: 100px"/>
+					</div>
+					
+					<div class="col-8">
+						<div>[[${user.fullName}]]</div>
+						<div>[[${user.roles}]]</div>
+						<div class="mt-2">
+							<a th:if="${user.enabled == true}" class="fas fa-check-circle fa-2x icon-green" 
+								th:href="@{'/users/' + ${user.id} + '/enabled/false'}"
+								title="Disable this user"></a>
+								
+							<a th:if="${user.enabled == false}" class="fas fa-circle fa-2x icon-silver"
+								 th:href="@{'/users/' + ${user.id} + '/enabled/true'}"
+								 title="Enable this user"></a>
+						
+									&nbsp;
+							<a class="fas fa-edit fa-2x icon-green" th:href="@{'/users/edit/' + ${user.id}}"
+									title="edit this user"></a>
+									&nbsp; 
+							<a class="fas fa-trash fa-2x icon-dark link-delete" th:href="@{'/users/delete/' + ${user.id}}"
+									title="delete this user" th:userId="${user.id}"></a>
+						</div>
+					</div>
+					<div>&nbsp;</div>
+				</div>
+			</div>
+			
+			
+			<!-- IF -->
+			<div class="text-center m-1" th:if="${totalItems > 0}">
+				<span>Showing Users # [[${startCount}]] to [[${endCount}]] of [[${totalItems}]]</span>
+			</div>
+			
+			<!-- ELSE -->
+			<div class="text-center m-1" th:unless="${totalItems > 0}">
+				<span>No users found</span>
+			</div>
+			
+			<!-- only display pagination when there are users; else, no users no pagination -->
+			<div th:if="${totalPages > 1}">
+				<nav>
+					  <ul class="pagination justify-content-center flex-wrap">
+					  
+					  	<li th:class=" ${currentPage > 1 ? 'page-item' : 'page-item disabled'}">
+					  		<a th:replace="fragments :: page_link(1, 'First')"></a>
+				    	</li>
+					  
+					    <li th:class=" ${currentPage > 1 ? 'page-item' : 'page-item disabled'}">
+					    	<a th:replace="fragments :: page_link(${currentPage - 1 }, 'previous')"></a>
+				    	</li>
+					    	
+					    <!-- org.thymeleaf.expression.Numbers class, An object of this class is usually available in variable evaluation expressions with the name #numbers. -->
+					    <li th:class="${currentPage != i ? 'page-item' : 'page-item active'}" 
+					    	th:each="i : ${#numbers.sequence(1, totalPages)}">
+					    	<a th:replace="fragments :: page_link(${i}, ${i})"></a>
+					    </li>
+					    
+					    <li  th:class=" ${currentPage < totalPages ? 'page-item' : 'page-item disabled'}">
+					    	<a th:replace="fragments :: page_link(${currentPage + 1}, 'Next')"></a>
+					    </li>
+					    
+					    <li th:class=" ${currentPage < totalPages ? 'page-item' : 'page-item disabled'}">
+							<a th:replace="fragments :: page_link(${totalPages}, 'Last')"></a>		
+					    </li>
+					  </ul>
+				</nav>
+			</div>
+			
+			
+			
+			<div class="modal fade text-center" id="confirmModal">
+				<div class="modal-dialog">
+					<div class="modal-content">
+					
+						<div class="modal-header">
+							<h4 class="modal-title">Delete Confirmation</h4>
+							<button type="button" class="close" data-dismiss="modal">&times;</button>
+						</div>
+						
+						<div class="modal-body">
+							<span id="confirmText"></span>
+						</div>
+						
+						<div class="modal-footer">
+							<a class="btn btn-success" href="" id="yesButton">Yes</a>
+							<button type="button" class="btn btn-danger" data-dismiss="modal">Close</button>
+						</div>
+					</div>
+				</div>
+			</div>
+			
+			<!-- footer -->
+			<div th:replace="fragments :: footer"></div>
+
+
+	</div>
+	
+<script type="text/javascript">
+
+//confirmation modal dialogue for delete user
+$(document).ready(function(){
+	$(".link-delete").on("click", function(e){
+		//stop the <a> tag default behaviour and pop out a confirmation modal dialogue
+		e.preventDefault();
+		//alert($(this).attr("href"));
+		link = $(this);
+		userId = link.attr("userId");
+		$("#yesButton").attr("href", link.attr("href"));
+		$("#confirmText").text("Are you sure you want to delete this user ID " + userId + "?");
+		$("#confirmModal").modal();
+	});
+});
+
+	function clearFilter(){
+		window.location = "[[@{/users}]]";
+	}
+
+
+</script>
+	
+</body>
+
+</html>
\ No newline at end of file
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/ca/102755e41eb3001d1e75aa5ef0815903 b/.metadata/.plugins/org.eclipse.core.resources/.history/ca/102755e41eb3001d1e75aa5ef0815903
deleted file mode 100644
index 423fd5f7..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/ca/102755e41eb3001d1e75aa5ef0815903
+++ /dev/null
@@ -1,43 +0,0 @@
-package com.shopme.admin.user;
-
-import org.springframework.stereotype.Repository;
-import org.springframework.data.jpa.repository.Modifying;
-import org.springframework.data.jpa.repository.Query;
-import org.springframework.data.repository.CrudRepository;
-import org.springframework.data.repository.PagingAndSortingRepository;
-import org.springframework.data.repository.query.Param;
-
-import com.shopme.common.entity.User;
-
-@Repository
-public interface UserRepository extends CrudRepository<User, Integer>, PagingAndSortingRepository<User, Integer> {
-
-	/*
-	 * JPQL statement. It should be noted that as compared to native SQL, JPQL does
-	 * not interact with database tables, records, and fields - but with Java
-	 * classes and instances.
-	 * 
-	 * JPA kicks in as the mediator and transpiles JPQL queries to SQL queries for execution.
-	 * 
-	 * If your database can change or varies from development to production, as long as 
-	 * they're both relational - JPQL works wonders and you can 
-	 * write JPQL queries to create generic logic that can be used over and over again.
-	 */
-	@Query("SELECT u FROM User u WHERE u.email = :email")
-	public User getUserByEmail(@Param("email") String email);
-	
-	// countById() declaration follows the JPA specification
-	//to check the existence of a user
-	public Long countById(Integer id);
-	
-	
-	public Page<User> findAll(String keyword, Pageable pageable);
-	
-	
-	
-	//change user enabled status
-	//need @Modifying annotation for update/delete operation
-	@Query("UPDATE User u SET u.enabled = ?2 WHERE u.id = ?1")
-	@Modifying
-	public void updateEnabledStatus(Integer id, boolean enabled);
-}
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/ca/604b29758bb3001d19bbb001c1a81c20 b/.metadata/.plugins/org.eclipse.core.resources/.history/ca/604b29758bb3001d19bbb001c1a81c20
deleted file mode 100644
index 19166f23..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/ca/604b29758bb3001d19bbb001c1a81c20
+++ /dev/null
@@ -1,152 +0,0 @@
-package com.shopme.common.entity;
-
-import java.util.HashSet;
-import java.util.Set;
-
-import org.hibernate.grammars.hql.HqlParser.NthSideClauseContext;
-
-import jakarta.persistence.Column;
-import jakarta.persistence.Entity;
-import jakarta.persistence.GeneratedValue;
-import jakarta.persistence.GenerationType;
-import jakarta.persistence.Id;
-import jakarta.persistence.JoinColumn;
-import jakarta.persistence.JoinTable;
-import jakarta.persistence.ManyToMany;
-import jakarta.persistence.Table;
-import jakarta.persistence.Transient;
-
-@Entity
-@Table(name = "users")
-public class User {
-
-	@Id
-	@GeneratedValue(strategy = GenerationType.IDENTITY)
-	private Integer id;
-
-	@Column(length = 128, nullable = false, unique = true)
-	private String email;
-
-	@Column(length = 64, nullable = false)
-	private String password;
-
-	@Column(name = "first_name", length = 45, nullable = false)
-	private String firstName;
-
-	@Column(name = "last_name", length = 45, nullable = false)
-	private String lastName;
-
-	@Column(length = 64)
-	private String photos;
-
-	private boolean enabled;
-
-	// intermediate table
-
-	@ManyToMany
-	@JoinTable(name = "users_roles", joinColumns = @JoinColumn(name = "user_id"), inverseJoinColumns = @JoinColumn(name = "role_id"))
-	private Set<Role> roles = new HashSet<>();
-
-	public User() {
-
-	}
-
-	public User(String email, String password, String firstName, String lastName) {
-		this.email = email;
-		this.password = password;
-		this.firstName = firstName;
-		this.lastName = lastName;
-	}
-
-	public Integer getId() {
-		return id;
-	}
-
-	public void setId(Integer id) {
-		this.id = id;
-	}
-
-	public String getEmail() {
-		return email;
-	}
-
-	public void setEmail(String email) {
-		this.email = email;
-	}
-
-	public String getPassword() {
-		return password;
-	}
-
-	public void setPassword(String password) {
-		this.password = password;
-	}
-
-	public String getFirstName() {
-		return firstName;
-	}
-
-	public void setFirstName(String firstName) {
-		this.firstName = firstName;
-	}
-
-	public String getLastName() {
-		return lastName;
-	}
-
-	public void setLastName(String lastName) {
-		this.lastName = lastName;
-	}
-
-	public String getPhotos() {
-		return photos;
-	}
-
-	public void setPhotos(String photos) {
-		this.photos = photos;
-	}
-
-	public boolean isEnabled() {
-		return enabled;
-	}
-
-	public void setEnabled(boolean enabled) {
-		this.enabled = enabled;
-	}
-
-	public Set<Role> getRoles() {
-		return roles;
-	}
-
-	public void setRoles(Set<Role> roles) {
-		this.roles = roles;
-	}
-
-	public void addRoles(Role role) {
-		this.roles.add(role);
-	}
-
-	@Override
-	public String toString() {
-		return "User [id=" + id + ", email=" + email + ", firstName=" + firstName + ", lastName=" + lastName
-				+ ", roles=" + roles + "]";
-	}
-
-	// Transient annotation to indicate this getter method is not mapped to any
-	// field in database
-	@Transient
-	public String getPhotosImagePath() {
-
-		if(id == null || photos == null) return "/images/default-user.png";
-		
-		return "/user-photos/" + this.id + "/" + this.photos;
-
-	}
-	
-	@Transient
-	public String getFullName() {
-		
-		return firstName + lastName;
-	}
-
-}
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/cb/d072480590b3001d19bbb001c1a81c20 b/.metadata/.plugins/org.eclipse.core.resources/.history/cb/d072480590b3001d19bbb001c1a81c20
deleted file mode 100644
index bc55b891..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/cb/d072480590b3001d19bbb001c1a81c20
+++ /dev/null
@@ -1,280 +0,0 @@
-<!DOCTYPE html>
-<html xmlns:th="http://www.thymeleaf.org">
-
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset= UTF-8">
-<meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0">
-<title>Manage Users</title>
-
-<link rel="stylesheet" type="text/css" th:href="@{/webjars/bootstrap/css/bootstrap.min.css}" />
-<link rel="stylesheet" type="text/css" th:href="@{/fontawesome/all.css}" />
-<link rel="stylesheet" type="text/css" th:href="@{/style.css}" />
-	
-<script type="text/javascript" th:src="@{/webjars/jquery/jquery.min.js}"></script>
-<script type="text/javascript" th:src="@{/webjars/bootstrap/js/bootstrap.min.js}"></script>
-</head>
-
-<body>
-	<div class="container-fluid">
-		<div>
-			<nav class="navbar navbar-expand-lg bg-dark navbar-dark">
-				<a class="navbar-brand" th:href="@{/}"> <img
-					th:src="@{/images/ShopmeAdminSmall.png}" />
-				</a>
-				<!--hamburger toggler for mobile devices(responsive)-->
-				<button class="navbar-toggler" type="button" data-toggle="collapse"
-					data-target="#topNavbar">
-					<span class="navbar-toggler-icon"></span>
-				</button>
-				<div class="collapse navbar-collapse" id="topNavbar">
-					<ul class="navbar-nav">
-						<li class="nav-item"><a class="nav-link" th:href="@{/users}">Users</a>
-						</li>
-						<li class="nav-item"><a class="nav-link"
-							th:href="@{/categories}">Categories</a></li>
-						<li class="nav-item"><a class="nav-link" th:href="@{/brands}">Brands</a>
-						</li>
-						<li class="nav-item"><a class="nav-link"
-							th:href="@{/products}">Products</a></li>
-						<li class="nav-item"><a class="nav-link"
-							th:href="@{/customers}">Customers</a></li>
-						<li class="nav-item"><a class="nav-link"
-							th:href="@{/shipping}">Shipping</a></li>
-						<li class="nav-item"><a class="nav-link" th:href="@{/orders}">Orders</a>
-						</li>
-						<li class="nav-item"><a class="nav-link" th:href="@{/report}">Sales
-								Report</a></li>
-						<li class="nav-item"><a class="nav-link"
-							th:href="@{/articles}">Articles</a></li>
-						<li class="nav-item"><a class="nav-link" th:href="@{/menus}">Menus</a>
-						</li>
-						<li class="nav-item"><a class="nav-link"
-							th:href="@{/settings}">Settings</a></li>
-					</ul>
-				</div>
-
-			</nav>
-		</div>
-
-		<div>
-			<h2>Manage Users</h2>
-			<a th:href="@{/users/new}" class="fas fa-user-plus fa-2x icon-dark mr-2"></a>
-			
-			<a th:href="@{/users/export/csv}" class="fas fa-file-csv fa-2x icon-dark mr-2"></a>
-		</div>
-		
-		
-		
-		<!-- only display success message when a new user is created -->
-		<div th:if="${message != null}" class="alert alert-success text-center">
-			[[${message}]]
-		</div>
-			
-		<div>
-			<form th:action="@{/users/page/1}" class="form-inline m-3">
-				
-				<input type="hidden" name="sortField" th:value="${sortField}" />
-				<input type="hidden" name="sortDir" th:value="${sortDir}" />
-				Filter:&nbsp;
-				<input type="search" name="keyword" th:value="${keyword}" class="form-control" required/>
-				&nbsp;&nbsp;
-				<button type="submit" class="btn btn-primary">
-					<i class="fas fa-search"></i>
-				</button>
-				&nbsp;&nbsp;
-				<button type="button" class="btn btn-secondary" onclick="clearFilter()">
-					<i class="fas fa-eraser"></i>
-				</button>
-			</form>
-		
-		</div>
-
-			<!-- css class to display this table in large screens only , refer to static/style.css for more info-->
-			<div class="full-details">
-				<table class="table table-bordered table-striped table-hover table-responsive-xL">
-					<thead class="thead-dark">
-						<tr>
-							<!-- refer to templates/fragments.html for fragment code-->
-							
-							<th class="hideable-column">
-								<th th:replace="fragments :: column_link('id', 'User ID', 'tag')"/>
-							</th>
-							
-							<th>Photos</th>
-							<th th:replace="fragments :: column_link('email', 'Email')"/>
-							<th th:replace="fragments :: column_link('firstName', 'First Name', 'none')"/>
-							<th th:replace="fragments :: column_link('lastName', 'Last Name')"/>
-							<th>Roles</th>
-							<th th:replace="fragments :: column_link('enabled', 'Enabled')"/>
-							<th></th>
-						</tr>
-					</thead>
-					<tbody>
-						<tr th:each="user : ${listUsers}">
-							<td class="hideable-column">[[${user.id}]]</td>
-							<td>
-								<span th:if="${user.photos == null}" class="fas fa-portrait fa-3x icon-dark"></span>
-								<img th:if="${user.photos != null}" th:src="@{${user.photosImagePath}}"
-								style="width: 100px"/>
-							</td>
-							<td class="hideable-column">[[${user.email}]]</td>
-							<td>[[${user.firstName}]]</td>
-							<td>[[${user.lastName}]]</td>
-							<td>[[${user.roles}]]</td>
-							
-							<td>
-								<a th:if="${user.enabled == true}" class="fas fa-check-circle fa-2x icon-green" 
-								th:href="@{'/users/' + ${user.id} + '/enabled/false'}"
-								title="Disable this user"></a>
-								
-								<a th:if="${user.enabled == false}" class="fas fa-circle fa-2x icon-silver"
-								 th:href="@{'/users/' + ${user.id} + '/enabled/true'}"
-								 title="Enable this user"></a>
-							</td>
-							<td>
-									<a class="fas fa-edit fa-2x icon-green" th:href="@{'/users/edit/' + ${user.id}}"
-									title="edit this user"></a>
-									&nbsp; 
-									<a class="fas fa-trash fa-2x icon-dark link-delete" th:href="@{'/users/delete/' + ${user.id}}"
-									title="delete this user" th:userId="${user.id}"></a>
-							</td>
-						</tr>
-					</tbody>
-				</table>
-			</div>
-			
-			
-			<!-- css class to display this <div> on mobile screens only, refer to /static/style.css for more info-->
-			<div class="less-details">
-				
-				<div th:each="user : ${listUsers}" class="row m-1">
-					
-					<div class="col-4">
-						
-						<span th:if="${user.photos == null}" class="fas fa-portrait fa-3x icon-dark"></span>
-								<img th:if="${user.photos != null}" th:src="@{${user.photosImagePath}}"
-								style="width: 100px"/>
-					</div>
-					
-					<div class="col-8">
-						<div>[[${user.fullName}]]</div>
-						<div>[[${user.roles}]]</div>
-						<div class="mt-2">
-							<a th:if="${user.enabled == true}" class="fas fa-check-circle fa-2x icon-green" 
-								th:href="@{'/users/' + ${user.id} + '/enabled/false'}"
-								title="Disable this user"></a>
-								
-							<a th:if="${user.enabled == false}" class="fas fa-circle fa-2x icon-silver"
-								 th:href="@{'/users/' + ${user.id} + '/enabled/true'}"
-								 title="Enable this user"></a>
-						
-									&nbsp;
-							<a class="fas fa-edit fa-2x icon-green" th:href="@{'/users/edit/' + ${user.id}}"
-									title="edit this user"></a>
-									&nbsp; 
-							<a class="fas fa-trash fa-2x icon-dark link-delete" th:href="@{'/users/delete/' + ${user.id}}"
-									title="delete this user" th:userId="${user.id}"></a>
-						</div>
-					</div>
-					<div>&nbsp;</div>
-				</div>
-			</div>
-			
-			
-			<!-- IF -->
-			<div class="text-center m-1" th:if="${totalItems > 0}">
-				<span>Showing Users # [[${startCount}]] to [[${endCount}]] of [[${totalItems}]]</span>
-			</div>
-			
-			<!-- ELSE -->
-			<div class="text-center m-1" th:unless="${totalItems > 0}">
-				<span>No users found</span>
-			</div>
-			
-			<!-- only display pagination when there are users; else, no users no pagination -->
-			<div th:if="${totalPages > 1}">
-				<nav>
-					  <ul class="pagination justify-content-center flex-wrap">
-					  
-					  	<li th:class=" ${currentPage > 1 ? 'page-item' : 'page-item disabled'}">
-					  		<a th:replace="fragments :: page_link(1, 'First')"></a>
-				    	</li>
-					  
-					    <li th:class=" ${currentPage > 1 ? 'page-item' : 'page-item disabled'}">
-					    	<a th:replace="fragments :: page_link(${currentPage - 1 }, 'previous')"></a>
-				    	</li>
-					    	
-					    <!-- org.thymeleaf.expression.Numbers class, An object of this class is usually available in variable evaluation expressions with the name #numbers. -->
-					    <li th:class="${currentPage != i ? 'page-item' : 'page-item active'}" 
-					    	th:each="i : ${#numbers.sequence(1, totalPages)}">
-					    	<a th:replace="fragments :: page_link(${i}, ${i})"></a>
-					    </li>
-					    
-					    <li  th:class=" ${currentPage < totalPages ? 'page-item' : 'page-item disabled'}">
-					    	<a th:replace="fragments :: page_link(${currentPage + 1}, 'Next')"></a>
-					    </li>
-					    
-					    <li th:class=" ${currentPage < totalPages ? 'page-item' : 'page-item disabled'}">
-							<a th:replace="fragments :: page_link(${totalPages}, 'Last')"></a>		
-					    </li>
-					  </ul>
-				</nav>
-			</div>
-			
-			
-			
-			<div class="modal fade text-center" id="confirmModal">
-				<div class="modal-dialog">
-					<div class="modal-content">
-					
-						<div class="modal-header">
-							<h4 class="modal-title">Delete Confirmation</h4>
-							<button type="button" class="close" data-dismiss="modal">&times;</button>
-						</div>
-						
-						<div class="modal-body">
-							<span id="confirmText"></span>
-						</div>
-						
-						<div class="modal-footer">
-							<a class="btn btn-success" href="" id="yesButton">Yes</a>
-							<button type="button" class="btn btn-danger" data-dismiss="modal">Close</button>
-						</div>
-					</div>
-				</div>
-			</div>
-			
-			
-			<div class="text-center">
-				<p>Shopme Control Panel - Copyright &copy; Shopme</p>
-			</div>
-
-
-	</div>
-	
-<script type="text/javascript">
-
-//confirmation modal dialogue for delete user
-$(document).ready(function(){
-	$(".link-delete").on("click", function(e){
-		//stop the <a> tag default behaviour and pop out a confirmation modal dialogue
-		e.preventDefault();
-		//alert($(this).attr("href"));
-		link = $(this);
-		userId = link.attr("userId");
-		$("#yesButton").attr("href", link.attr("href"));
-		$("#confirmText").text("Are you sure you want to delete this user ID " + userId + "?");
-		$("#confirmModal").modal();
-	});
-});
-
-	function clearFilter(){
-		window.location = "[[@{/users}]]";
-	}
-
-
-</script>
-	
-</body>
-
-</html>
\ No newline at end of file
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/cc/0016730230b4001d1d079a924effdc9e b/.metadata/.plugins/org.eclipse.core.resources/.history/cc/0016730230b4001d1d079a924effdc9e
deleted file mode 100644
index c6c708ec..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/cc/0016730230b4001d1d079a924effdc9e
+++ /dev/null
@@ -1,107 +0,0 @@
-<!DOCTYPE html>
-<html xmlns:th="http://www.thymeleaf.org"
-	  xmlns:sec="https://www.thymeleaf.org/thymeleaf-extras-springsecurity5">
-
-<head>
-	<meta http-equiv="Content-Type" content="text/html; charset= UTF-8">
-	<meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0">
-	<title>Home - Shopme Admin</title>
-	
-	<link rel="stylesheet" type="text/css" th:href="@{/fontawesome/all.css}" />
-	<link rel="stylesheet" type="text/css" th:href="@{/style.css}" />
-	<link rel="stylesheet" type="text/css" th:href="@{/webjars/bootstrap/css/bootstrap.min.css}" />
-	
-	<script type="text/javascript" th:src="@{/webjars/jquery/jquery.min.js}"></script>
-	<script type="text/javascript" th:src="@{/webjars/bootstrap/js/bootstrap.min.js}"></script>
-</head>
-
-<body>
-	<div class="container-fluid">
-		<div>
-			<form th:action="@{/logout}" method="post" th:hidden="true" name="logoutForm">
-				<input type="submit"/>
-			</form>
-			<nav class="navbar navbar-expand-lg bg-dark navbar-dark">
-				<a class="navbar-brand" th:href="@{/}">
-					<img th:src="@{/images/ShopmeAdminSmall.png}"/>
-				</a>
-				<!--hamburger toggler for mobile devices(responsive)-->
-				<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#topNavbar">
-					<span class="navbar-toggler-icon"></span>
-				</button>
-				<div class="collapse navbar-collapse" id="topNavbar">
-					<ul class="navbar-nav">
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/users}">Users</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/categories}">Categories</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/brands}">Brands</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/products}">Products</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/customers}">Customers</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/shipping}">Shipping</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/orders}">Orders</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/report}">Sales Report</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/articles}">Articles</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/menus}">Menus</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/settings}">Settings</a>
-						</li>
-						<li>
-							<span class="fas fa-user fa-2x icon-silver"></span>
-						</li>
-						<li class="nav-item dropdown">
-								<!-- principal refers to user; display username -->
-							<a class="nav-link dropdown-toggle" sec:authentication="principal.fullname" data-toggle="dropdown"></a>
-							<div class="dropdown-menu">
-								<a class="dropdown-item" id="logoutLink" href="">Logout</a>
-							</div>
-							
-						</li>
-					</ul>
-				</div>
-				
-			</nav>
-		</div>
-
-		<div>
-			<h1>Shopme Control Panel</h1>
-		</div>
-
-		<div>
-			<p>Shopme Control Panel - Copyright &copy; Shopme</p>
-		</div>
-
-
-	</div>
-	
-<script type="text/javascript">
-
-	$(document).ready(function(){
-		$("#logoutLink").on("click" function(e){
-			
-		});
-	});
-
-</script>
-
-</body>
-
-</html>
\ No newline at end of file
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/cc/60803d1f95b6001d1567bacd2f52a0b7 b/.metadata/.plugins/org.eclipse.core.resources/.history/cc/60803d1f95b6001d1567bacd2f52a0b7
deleted file mode 100644
index c854eacc..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/cc/60803d1f95b6001d1567bacd2f52a0b7
+++ /dev/null
@@ -1,6 +0,0 @@
-package com.shopme.common.entity;
-
-public class Category {
-	
-	
-}
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/cc/e05739b68fb3001d19bbb001c1a81c20 b/.metadata/.plugins/org.eclipse.core.resources/.history/cc/e05739b68fb3001d19bbb001c1a81c20
deleted file mode 100644
index 486fe671..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/cc/e05739b68fb3001d19bbb001c1a81c20
+++ /dev/null
@@ -1,280 +0,0 @@
-<!DOCTYPE html>
-<html xmlns:th="http://www.thymeleaf.org">
-
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset= UTF-8">
-<meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0">
-<title>Manage Users</title>
-
-<link rel="stylesheet" type="text/css" th:href="@{/webjars/bootstrap/css/bootstrap.min.css}" />
-<link rel="stylesheet" type="text/css" th:href="@{/fontawesome/all.css}" />
-<link rel="stylesheet" type="text/css" th:href="@{/style.css}" />
-	
-<script type="text/javascript" th:src="@{/webjars/jquery/jquery.min.js}"></script>
-<script type="text/javascript" th:src="@{/webjars/bootstrap/js/bootstrap.min.js}"></script>
-</head>
-
-<body>
-	<div class="container-fluid">
-		<div>
-			<nav class="navbar navbar-expand-lg bg-dark navbar-dark">
-				<a class="navbar-brand" th:href="@{/}"> <img
-					th:src="@{/images/ShopmeAdminSmall.png}" />
-				</a>
-				<!--hamburger toggler for mobile devices(responsive)-->
-				<button class="navbar-toggler" type="button" data-toggle="collapse"
-					data-target="#topNavbar">
-					<span class="navbar-toggler-icon"></span>
-				</button>
-				<div class="collapse navbar-collapse" id="topNavbar">
-					<ul class="navbar-nav">
-						<li class="nav-item"><a class="nav-link" th:href="@{/users}">Users</a>
-						</li>
-						<li class="nav-item"><a class="nav-link"
-							th:href="@{/categories}">Categories</a></li>
-						<li class="nav-item"><a class="nav-link" th:href="@{/brands}">Brands</a>
-						</li>
-						<li class="nav-item"><a class="nav-link"
-							th:href="@{/products}">Products</a></li>
-						<li class="nav-item"><a class="nav-link"
-							th:href="@{/customers}">Customers</a></li>
-						<li class="nav-item"><a class="nav-link"
-							th:href="@{/shipping}">Shipping</a></li>
-						<li class="nav-item"><a class="nav-link" th:href="@{/orders}">Orders</a>
-						</li>
-						<li class="nav-item"><a class="nav-link" th:href="@{/report}">Sales
-								Report</a></li>
-						<li class="nav-item"><a class="nav-link"
-							th:href="@{/articles}">Articles</a></li>
-						<li class="nav-item"><a class="nav-link" th:href="@{/menus}">Menus</a>
-						</li>
-						<li class="nav-item"><a class="nav-link"
-							th:href="@{/settings}">Settings</a></li>
-					</ul>
-				</div>
-
-			</nav>
-		</div>
-
-		<div>
-			<h2>Manage Users</h2>
-			<a th:href="@{/users/new}" class="fas fa-user-plus fa-2x icon-dark mr-2"></a>
-			
-			<a th:href="@{/users/export/csv}" class="fas fa-file-csv fa-2x icon-dark mr-2"></a>
-		</div>
-		
-		
-		
-		<!-- only display success message when a new user is created -->
-		<div th:if="${message != null}" class="alert alert-success text-center">
-			[[${message}]]
-		</div>
-			
-		<div>
-			<form th:action="@{/users/page/1}" class="form-inline m-3">
-				
-				<input type="hidden" name="sortField" th:value="${sortField}" />
-				<input type="hidden" name="sortDir" th:value="${sortDir}" />
-				Filter:&nbsp;
-				<input type="search" name="keyword" th:value="${keyword}" class="form-control" required/>
-				&nbsp;&nbsp;
-				<button type="submit" class="btn btn-primary">
-					<i class="fas fa-search"></i>
-				</button>
-				&nbsp;&nbsp;
-				<button type="button" class="btn btn-secondary" onclick="clearFilter()">
-					<i class="fas fa-eraser"></i>
-				</button>
-			</form>
-		
-		</div>
-
-			<!-- css class to display this table in large screens only , refer to static/style.css for more info-->
-			<div class="full-details">
-				<table class="table table-bordered table-striped table-hover table-responsive-xL">
-					<thead class="thead-dark">
-						<tr>
-							<!-- refer to templates/fragments.html for fragment code-->
-							
-							<th class="hideable-column">
-								<th th:replace="fragments :: column_link('id', 'User ID')"/>
-							</th>
-							
-							<th>Photos</th>
-							<th th:replace="fragments :: column_link('email', 'Email')"/>
-							<th th:replace="fragments :: column_link('firstName', 'First Name')"/>
-							<th th:replace="fragments :: column_link('lastName', 'Last Name')"/>
-							<th>Roles</th>
-							<th th:replace="fragments :: column_link('enabled', 'Enabled')"/>
-							<th></th>
-						</tr>
-					</thead>
-					<tbody>
-						<tr th:each="user : ${listUsers}">
-							<td class="hideable-column">[[${user.id}]]</td>
-							<td>
-								<span th:if="${user.photos == null}" class="fas fa-portrait fa-3x icon-dark"></span>
-								<img th:if="${user.photos != null}" th:src="@{${user.photosImagePath}}"
-								style="width: 100px"/>
-							</td>
-							<td class="hideable-column">[[${user.email}]]</td>
-							<td>[[${user.firstName}]]</td>
-							<td>[[${user.lastName}]]</td>
-							<td>[[${user.roles}]]</td>
-							
-							<td>
-								<a th:if="${user.enabled == true}" class="fas fa-check-circle fa-2x icon-green" 
-								th:href="@{'/users/' + ${user.id} + '/enabled/false'}"
-								title="Disable this user"></a>
-								
-								<a th:if="${user.enabled == false}" class="fas fa-circle fa-2x icon-silver"
-								 th:href="@{'/users/' + ${user.id} + '/enabled/true'}"
-								 title="Enable this user"></a>
-							</td>
-							<td>
-									<a class="fas fa-edit fa-2x icon-green" th:href="@{'/users/edit/' + ${user.id}}"
-									title="edit this user"></a>
-									&nbsp; 
-									<a class="fas fa-trash fa-2x icon-dark link-delete" th:href="@{'/users/delete/' + ${user.id}}"
-									title="delete this user" th:userId="${user.id}"></a>
-							</td>
-						</tr>
-					</tbody>
-				</table>
-			</div>
-			
-			
-			<!-- css class to display this <div> on mobile screens only, refer to /static/style.css for more info-->
-			<div class="less-details">
-				
-				<div th:each="user : ${listUsers}" class="row m-1">
-					
-					<div class="col-4">
-						
-						<span th:if="${user.photos == null}" class="fas fa-portrait fa-3x icon-dark"></span>
-								<img th:if="${user.photos != null}" th:src="@{${user.photosImagePath}}"
-								style="width: 100px"/>
-					</div>
-					
-					<div class="col-8">
-						<div>[[${user.fullName}]]</div>
-						<div>[[${user.roles}]]</div>
-						<div class="mt-2">
-							<a th:if="${user.enabled == true}" class="fas fa-check-circle fa-2x icon-green" 
-								th:href="@{'/users/' + ${user.id} + '/enabled/false'}"
-								title="Disable this user"></a>
-								
-							<a th:if="${user.enabled == false}" class="fas fa-circle fa-2x icon-silver"
-								 th:href="@{'/users/' + ${user.id} + '/enabled/true'}"
-								 title="Enable this user"></a>
-						
-									&nbsp;
-							<a class="fas fa-edit fa-2x icon-green" th:href="@{'/users/edit/' + ${user.id}}"
-									title="edit this user"></a>
-									&nbsp; 
-							<a class="fas fa-trash fa-2x icon-dark link-delete" th:href="@{'/users/delete/' + ${user.id}}"
-									title="delete this user" th:userId="${user.id}"></a>
-						</div>
-					</div>
-					<div>&nbsp;</div>
-				</div>
-			</div>
-			
-			
-			<!-- IF -->
-			<div class="text-center m-1" th:if="${totalItems > 0}">
-				<span>Showing Users # [[${startCount}]] to [[${endCount}]] of [[${totalItems}]]</span>
-			</div>
-			
-			<!-- ELSE -->
-			<div class="text-center m-1" th:unless="${totalItems > 0}">
-				<span>No users found</span>
-			</div>
-			
-			<!-- only display pagination when there are users; else, no users no pagination -->
-			<div th:if="${totalPages > 1}">
-				<nav>
-					  <ul class="pagination justify-content-center flex-wrap">
-					  
-					  	<li th:class=" ${currentPage > 1 ? 'page-item' : 'page-item disabled'}">
-					  		<a th:replace="fragments :: page_link(1, 'First')"></a>
-				    	</li>
-					  
-					    <li th:class=" ${currentPage > 1 ? 'page-item' : 'page-item disabled'}">
-					    	<a th:replace="fragments :: page_link(${currentPage - 1 }, 'previous')"></a>
-				    	</li>
-					    	
-					    <!-- org.thymeleaf.expression.Numbers class, An object of this class is usually available in variable evaluation expressions with the name #numbers. -->
-					    <li th:class="${currentPage != i ? 'page-item' : 'page-item active'}" 
-					    	th:each="i : ${#numbers.sequence(1, totalPages)}">
-					    	<a th:replace="fragments :: page_link(${i}, ${i})"></a>
-					    </li>
-					    
-					    <li  th:class=" ${currentPage < totalPages ? 'page-item' : 'page-item disabled'}">
-					    	<a th:replace="fragments :: page_link(${currentPage + 1}, 'Next')"></a>
-					    </li>
-					    
-					    <li th:class=" ${currentPage < totalPages ? 'page-item' : 'page-item disabled'}">
-							<a th:replace="fragments :: page_link(${totalPages}, 'Last')"></a>		
-					    </li>
-					  </ul>
-				</nav>
-			</div>
-			
-			
-			
-			<div class="modal fade text-center" id="confirmModal">
-				<div class="modal-dialog">
-					<div class="modal-content">
-					
-						<div class="modal-header">
-							<h4 class="modal-title">Delete Confirmation</h4>
-							<button type="button" class="close" data-dismiss="modal">&times;</button>
-						</div>
-						
-						<div class="modal-body">
-							<span id="confirmText"></span>
-						</div>
-						
-						<div class="modal-footer">
-							<a class="btn btn-success" href="" id="yesButton">Yes</a>
-							<button type="button" class="btn btn-danger" data-dismiss="modal">Close</button>
-						</div>
-					</div>
-				</div>
-			</div>
-			
-			
-			<div class="text-center">
-				<p>Shopme Control Panel - Copyright &copy; Shopme</p>
-			</div>
-
-
-	</div>
-	
-<script type="text/javascript">
-
-//confirmation modal dialogue for delete user
-$(document).ready(function(){
-	$(".link-delete").on("click", function(e){
-		//stop the <a> tag default behaviour and pop out a confirmation modal dialogue
-		e.preventDefault();
-		//alert($(this).attr("href"));
-		link = $(this);
-		userId = link.attr("userId");
-		$("#yesButton").attr("href", link.attr("href"));
-		$("#confirmText").text("Are you sure you want to delete this user ID " + userId + "?");
-		$("#confirmModal").modal();
-	});
-});
-
-	function clearFilter(){
-		window.location = "[[@{/users}]]";
-	}
-
-
-</script>
-	
-</body>
-
-</html>
\ No newline at end of file
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/cd/a0236b5915b4001d128fb79045552177 b/.metadata/.plugins/org.eclipse.core.resources/.history/cd/a0236b5915b4001d128fb79045552177
deleted file mode 100644
index 638a04fb..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/cd/a0236b5915b4001d128fb79045552177
+++ /dev/null
@@ -1,30 +0,0 @@
-package com.shopme.admin.security;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.core.userdetails.UserDetails;
-import org.springframework.security.core.userdetails.UserDetailsService;
-import org.springframework.security.core.userdetails.UsernameNotFoundException;
-
-import com.shopme.admin.user.UserRepository;
-import com.shopme.common.entity.User;
-
-public class ShopmeUserDetailsService implements UserDetailsService {
-
-	
-	@Autowired
-	private UserRepository userRepo;
-	
-	
-	
-	
-	@Override
-	public UserDetails loadUserByUsername(String email) throws UsernameNotFoundException {
-
-		User user = userRepo.getUserByEmail(email);
-		
-		
-		
-		return null;
-	}
-
-}
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/cf/00f9645b2fb4001d1d079a924effdc9e b/.metadata/.plugins/org.eclipse.core.resources/.history/cf/00f9645b2fb4001d1d079a924effdc9e
deleted file mode 100644
index 88616c1a..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/cf/00f9645b2fb4001d1d079a924effdc9e
+++ /dev/null
@@ -1,97 +0,0 @@
-<!DOCTYPE html>
-<html xmlns:th="http://www.thymeleaf.org"
-	  xmlns:sec="https://www.thymeleaf.org/thymeleaf-extras-springsecurity5">
-
-<head>
-	<meta http-equiv="Content-Type" content="text/html; charset= UTF-8">
-	<meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0">
-	<title>Home - Shopme Admin</title>
-	
-	<link rel="stylesheet" type="text/css" th:href="@{/fontawesome/all.css}" />
-	<link rel="stylesheet" type="text/css" th:href="@{/style.css}" />
-	<link rel="stylesheet" type="text/css" th:href="@{/webjars/bootstrap/css/bootstrap.min.css}" />
-	
-	<script type="text/javascript" th:src="@{/webjars/jquery/jquery.min.js}"></script>
-	<script type="text/javascript" th:src="@{/webjars/bootstrap/js/bootstrap.min.js}"></script>
-</head>
-
-<body>
-	<div class="container-fluid">
-		<div>
-			<form th:action="@{/logout}" method="post" th:hidden="true" name="logoutForm">
-				<input type="submit"/>
-			</form>
-			<nav class="navbar navbar-expand-lg bg-dark navbar-dark">
-				<a class="navbar-brand" th:href="@{/}">
-					<img th:src="@{/images/ShopmeAdminSmall.png}"/>
-				</a>
-				<!--hamburger toggler for mobile devices(responsive)-->
-				<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#topNavbar">
-					<span class="navbar-toggler-icon"></span>
-				</button>
-				<div class="collapse navbar-collapse" id="topNavbar">
-					<ul class="navbar-nav">
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/users}">Users</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/categories}">Categories</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/brands}">Brands</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/products}">Products</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/customers}">Customers</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/shipping}">Shipping</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/orders}">Orders</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/report}">Sales Report</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/articles}">Articles</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/menus}">Menus</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/settings}">Settings</a>
-						</li>
-						<li>
-							<span class="fas fa-user fa-2x icon-silver"></span>
-						</li>
-						<li class="nav-item dropdown">
-								<!-- principal refers to user; display username -->
-							<a class="nav-link dropdown-toggle" sec:authentication="principal.fullname" data-toggle="dropdown"></a>
-							<div class="dropdown-menu">
-								<a class="dropdown-item" id="logoutLink" href="">Logout</a>
-							</div>
-							
-						</li>
-					</ul>
-				</div>
-				
-			</nav>
-		</div>
-
-		<div>
-			<h1>Shopme Control Panel</h1>
-		<div />
-
-		<div>
-			<p>Shopme Control Panel - Copyright &copy; Shopme</p>
-		<div />
-
-
-	</div>
-
-</body>
-
-</html>
\ No newline at end of file
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/d/60f7769746b4001d1d079a924effdc9e b/.metadata/.plugins/org.eclipse.core.resources/.history/d/60f7769746b4001d1d079a924effdc9e
deleted file mode 100644
index aff46f43..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/d/60f7769746b4001d1d079a924effdc9e
+++ /dev/null
@@ -1,13 +0,0 @@
-$(document).ready(function(){
-		$("#logoutLink").on("click", function(e){
-			e.preventDefault(); /* stop the hyperlink default behaviour  */
-			
-			
-			/* use  the form to  log out and navigate to the url path /logout  
-			
-			 NOTE: spring security requires a POST request form to logout in order to obtain the csrf token, 
-			 		the csrf token is a hidden property in the form
-			*/
-			document.logoutForm.submit();
-		});
-	});
\ No newline at end of file
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/d0/60a431662ab8001d1d97982e354adf88 b/.metadata/.plugins/org.eclipse.core.resources/.history/d0/60a431662ab8001d1d97982e354adf88
deleted file mode 100644
index 4192c9b1..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/d0/60a431662ab8001d1d97982e354adf88
+++ /dev/null
@@ -1,67 +0,0 @@
-package com.shopme.admin.category;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Set;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import com.shopme.common.entity.Category;
-
-@Service
-public class CategoryService {
-
-	@Autowired
-	private CategoryRepository repo;
-	
-	public List<Category> listAll(){
-		return (List<Category>) repo.findAll();
-	}
-	
-	public List<Category> listCategoriesUsedInForm(){
-		
-		List<Category> categoriesUsedInForm = new ArrayList<>();
-		
-		Iterable<Category> categoriesInDB = repo.findAll();
-		
-		for (Category category : categoriesInDB) {
-
-			// root category
-			if (category.getParent() == null) {
-				categoriesUsedInForm.add(new Category(category.getName()));
-
-				category.getChildren().forEach(subCategory -> {
-					String name = "--" + subCategory.getName();
-					
-					categoriesUsedInForm.add(new Category(name));
-					listChildren(subCategory, 1);
-				});
-			}
-
-		}
-		
-		
-		return categoriesUsedInForm;
-	}
-	
-	private void listChildren(Category parent, int subLevel) {
-
-		int newSubLevel = subLevel + 1;
-		Set<Category> children = parent.getChildren();
-
-		for (Category subCategory : children) {
-			
-			String name = "";
-			for (int i = 0; i < newSubLevel; i++) {
-				System.out.print("--");
-			}
-
-			System.out.println(subCategory.getName());
-
-			printChildren(subCategory, newSubLevel);
-		}
-
-	}
-	
-}
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/d1/8058478c8db3001d19bbb001c1a81c20 b/.metadata/.plugins/org.eclipse.core.resources/.history/d1/8058478c8db3001d19bbb001c1a81c20
deleted file mode 100644
index 441bbd53..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/d1/8058478c8db3001d19bbb001c1a81c20
+++ /dev/null
@@ -1,30 +0,0 @@
-*.icon-white{color: white}
-*.icon-silver{color: silver}
-*.icon-green{color: green}
-*.icon-dark{color: gray}
-*.icon-red{color: red}
-
-
-
-@media screen and (max-width: 768px) {
-	/* small screen */
-	
-	div.full-details{ display: none;}
-	div.less-details{ display: block;}
-	
-}
-
-@media screen and (min-width: 768px) and (max-width: 1024px) {
-	/* medium screen */
-	
-	div.full-details{ display: block;}
-	div.less-details{ display: none;}
-}
-
-
-@media screen and (min-width: 1024px) {
-	/* large screen */
-	
-	div.less-details{ display: none;}
-	
-}
\ No newline at end of file
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/d1/b0a66ec86fb3001d19bbb001c1a81c20 b/.metadata/.plugins/org.eclipse.core.resources/.history/d1/b0a66ec86fb3001d19bbb001c1a81c20
deleted file mode 100644
index e71c5b2e..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/d1/b0a66ec86fb3001d19bbb001c1a81c20
+++ /dev/null
@@ -1,183 +0,0 @@
-package com.shopme.admin.user;
-
-import java.io.IOException;
-import java.util.List;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.domain.Page;
-import org.springframework.data.repository.query.Param;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
-import org.springframework.util.StringUtils;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.ModelAttribute;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.multipart.MultipartFile;
-import org.springframework.web.servlet.mvc.support.RedirectAttributes;
-
-import com.fasterxml.jackson.annotation.ObjectIdGenerators.StringIdGenerator;
-import com.shopme.admin.FileUploadUtil;
-import com.shopme.common.entity.Role;
-import com.shopme.common.entity.User;
-
-import jakarta.servlet.http.HttpServletResponse;
-
-@Controller
-public class UserController {
-
-	@Autowired
-	private UserService service;
-
-	@GetMapping("/users")
-	public String listFirstPage(Model model) {
-
-		// NOTE: these are the default values for path variable and URL parameters
-		return listByPage(1, model, "firstName", "asc", null);
-	}
-
-	@GetMapping("/users/page/{pageNum}")
-	public String listByPage(@PathVariable(name = "pageNum") int pageNum, Model model,
-			@Param("sortField") String sortField, @Param("sortDir") String sortDir, @Param("keyword") String keyword) {
-
-		System.out.println("sort field: " + sortField);
-		System.out.println("sort order: " + sortDir);
-
-		Page<User> page = service.listByPage(pageNum, sortField, sortDir, keyword);
-		List<User> listUsers = page.getContent();
-
-		long startCount = (pageNum - 1) * UserService.USERS_PER_PAGE + 1;
-		long endCount = startCount + UserService.USERS_PER_PAGE - 1;
-		if (endCount > page.getTotalElements()) {
-			endCount = page.getTotalElements();
-		}
-
-		String reverseSortDir = sortDir.equals("asc") ? "desc" : "asc";
-
-		model.addAttribute("currentPage", pageNum);
-		model.addAttribute("totalPages", page.getTotalPages());
-		model.addAttribute("startCount", startCount);
-		model.addAttribute("endCount", endCount);
-		model.addAttribute("totalItems", page.getTotalElements());
-		model.addAttribute("listUsers", listUsers);
-		model.addAttribute("sortField", sortField);
-		model.addAttribute("sortDir", sortDir);
-		model.addAttribute("reverseSortDir", reverseSortDir);
-		model.addAttribute("keyword", keyword);
-
-		return "users";
-
-	}
-
-	@GetMapping("/users/new")
-	public String newUser(Model model) {
-
-		List<Role> listRoles = service.listRoles();
-
-		User user = new User();
-		user.setEnabled(true);
-
-		model.addAttribute("user", user);
-		model.addAttribute("listRoles", listRoles);
-		model.addAttribute("pageTitle", "Create New User");
-
-		return "user_form";
-
-	}
-
-	// using @RequestParam, we can get the image file input, the input has the
-	// property name="image"
-	@PostMapping("/users/save")
-	public String saveUser(@ModelAttribute("user") User user, RedirectAttributes redirectAttributes,
-			@RequestParam("image") MultipartFile multipartFile) throws IOException {
-
-		if (!multipartFile.isEmpty()) {
-
-			String fileName = StringUtils.cleanPath(multipartFile.getOriginalFilename());
-			user.setPhotos(fileName);
-
-			User savedUser = service.save(user);
-
-			String uploadDir = "user-photos/" + savedUser.getId();
-
-			FileUploadUtil.cleanDir(uploadDir);
-			FileUploadUtil.saveFile(uploadDir, fileName, multipartFile);
-		} else {
-
-			// set photo to null for getPhotosImagePath() method's conditional statement in
-			// User class
-			if (user.getPhotos().isEmpty())
-				user.setPhotos(null);
-			service.save(user);
-		}
-
-		redirectAttributes.addFlashAttribute("message", "the user has been saved successfully");
-
-		// POST/REDIRECT/GET web design
-		return getRedirectURLtoAffectedUser(user);
-	}
-
-	private String getRedirectURLtoAffectedUser(User user) {
-
-		// after user is saved display the user instead of the entire user list
-		// email is a unique field to identify each user.
-		String firstPartOfEmail = user.getEmail().split("@")[0];
-		return "redirect:/users/page/1?sortField=id&sortDir=asc&keyword=" + firstPartOfEmail;
-	}
-
-	@GetMapping("/users/edit/{id}")
-	public String editUser(@PathVariable(name = "id") Integer id, RedirectAttributes redirectAttributes, Model model) {
-		try {
-			User user = service.get(id);
-			List<Role> listRoles = service.listRoles();
-
-			model.addAttribute("user", user);
-			model.addAttribute("pageTitle", "Edit User (ID: " + id + ")");
-			model.addAttribute("listRoles", listRoles);
-
-			return "user_form";
-		} catch (UserNotFoundException ex) {
-			redirectAttributes.addFlashAttribute("message", ex.getMessage());
-
-			return "redirect:/users";
-		}
-
-	}
-
-	@GetMapping("/users/delete/{id}")
-	public String deleteUser(@PathVariable(name = "id") Integer id, RedirectAttributes redirectAttributes,
-			Model model) {
-		try {
-			service.delete(id);
-			redirectAttributes.addFlashAttribute("message", "The user ID " + id + " has been deleted successfully.");
-
-		} catch (UserNotFoundException ex) {
-			redirectAttributes.addFlashAttribute("message", ex.getMessage());
-
-		}
-
-		return "redirect:/users";
-	}
-
-	@GetMapping("/users/{id}/enabled/{status}")
-	public String updateUserEnabledStatus(@PathVariable(name = "id") Integer id,
-			@PathVariable(name = "status") boolean enabled, RedirectAttributes redirectAttributes) {
-
-		service.updateUserEnabledStatus(id, enabled);
-		String status = enabled ? "enabled" : "disabled";
-		String message = "The user id " + id + " has been " + status;
-		redirectAttributes.addFlashAttribute("message", message);
-
-		return "redirect:/users";
-	}
-
-	@GetMapping("/users/export/csv")
-	public void exportToCSV(HttpServletResponse response) {
-
-		List<User> listUsers = service.listAll();
-		UserCsvExporter exporter = new UserCsvExporter();
-		exporter.export(listUsers, response);
-	}
-
-}
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/50/20b47da458b7001d19ef99be8d31e273 b/.metadata/.plugins/org.eclipse.core.resources/.history/d1/c01df74389b9001d14fea12e82c90085
similarity index 100%
rename from .metadata/.plugins/org.eclipse.core.resources/.history/50/20b47da458b7001d19ef99be8d31e273
rename to .metadata/.plugins/org.eclipse.core.resources/.history/d1/c01df74389b9001d14fea12e82c90085
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/d1/f004ae5018b4001d128fb79045552177 b/.metadata/.plugins/org.eclipse.core.resources/.history/d1/f004ae5018b4001d128fb79045552177
deleted file mode 100644
index 770efa14..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/d1/f004ae5018b4001d128fb79045552177
+++ /dev/null
@@ -1,74 +0,0 @@
-package com.shopme.admin.security;
-
-import org.aspectj.weaver.ast.And;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.security.config.annotation.web.builders.HttpSecurity;
-import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
-import org.springframework.security.config.annotation.web.configuration.WebSecurityConfiguration;
-import org.springframework.security.config.annotation.web.configuration.WebSecurityCustomizer;
-import org.springframework.security.core.userdetails.UserDetailsService;
-import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
-import org.springframework.security.crypto.password.PasswordEncoder;
-import org.springframework.security.web.SecurityFilterChain;
-
-@Configuration
-@EnableWebSecurity
-public class WebSecurityConfig {
-
-	/*
-	 * refer to this link: https://www.codejava.net/frameworks/spring-boot/fix-
-	 * websecurityconfigureradapter-deprecated
-	 * 
-	 */
-	
-	
-	 /* This bean will be called by spring security when performing authentication*/ 
-	@Bean
-	public UserDetailsService  userDetailsService()	{
-		return new ShopmeUserDetailsService();
-	}
-	
-
-	@Bean
-	public PasswordEncoder passwordEncoder() {
-		return new BCryptPasswordEncoder();
-	}
-
-	
-	@Bean
-	public DaoAuthenticationProvider authenticationProvider() {
-	    DaoAuthenticationProvider authProvider = new DaoAuthenticationProvider();
-	     
-	    authProvider.setUserDetailsService(userDetailsService());
-	    authProvider.setPasswordEncoder(passwordEncoder());
-	 
-	    return authProvider;
-	}
-	
-	
-	@Bean
-	public SecurityFilterChain filterChain(HttpSecurity http) throws Exception {
-
-		// any request need to be authenticated (require login)
-		// custom login page at "/login" - handler method in MainController class
-		http.authorizeHttpRequests()
-			.anyRequest().authenticated()
-			.and()
-			.formLogin()
-				.loginPage("/login")
-				.usernameParameter("email")
-				.permitAll();
-
-		return http.build();
-	}
-
-	//NOTE: antMatchers() changed to requestMatchers()
-	//stack: https://stackoverflow.com/questions/74907533/the-method-antmatchersstring-is-undefined-for-the-type
-	@Bean
-	public WebSecurityCustomizer webSecurityCustomizer() {
-		//permit access to the assets in the following directories
-		return (web) -> web.ignoring().requestMatchers("/images/**", "/js/**", "/webjars/**");
-	}
-
-}
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/d2/10b58f2b13b4001d128fb79045552177 b/.metadata/.plugins/org.eclipse.core.resources/.history/d2/10b58f2b13b4001d128fb79045552177
deleted file mode 100644
index d106392d..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/d2/10b58f2b13b4001d128fb79045552177
+++ /dev/null
@@ -1,75 +0,0 @@
-package com.shopme.admin.security;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-import java.util.Set;
-
-import org.springframework.security.core.GrantedAuthority;
-import org.springframework.security.core.authority.SimpleGrantedAuthority;
-import org.springframework.security.core.userdetails.UserDetails;
-
-import com.shopme.common.entity.User;
-
-
-/*
- *  Think of it as a wrapper class for  Type User
- * 
- * */
-public class ShopmeUserDetails implements UserDetails {
-
-	private User user;
-	
-	public ShopmeUserDetails(User user) {
-		this.user = user;
-	}
-
-	@Override
-	public Collection<? extends GrantedAuthority> getAuthorities() {
-
-		Set<Role> roles = user.getRoles();
-		
-		List<SimpleGrantedAuthority> authorities = new ArrayList<>();
-		
-		
-		
-		return null;
-	}
-
-	@Override
-	public String getPassword() {
-		// TODO Auto-generated method stub
-		return null;
-	}
-
-	@Override
-	public String getUsername() {
-		// TODO Auto-generated method stub
-		return null;
-	}
-
-	@Override
-	public boolean isAccountNonExpired() {
-		// TODO Auto-generated method stub
-		return false;
-	}
-
-	@Override
-	public boolean isAccountNonLocked() {
-		// TODO Auto-generated method stub
-		return false;
-	}
-
-	@Override
-	public boolean isCredentialsNonExpired() {
-		// TODO Auto-generated method stub
-		return false;
-	}
-
-	@Override
-	public boolean isEnabled() {
-		// TODO Auto-generated method stub
-		return false;
-	}
-
-}
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/d2/e04f181f4ab4001d1d079a924effdc9e b/.metadata/.plugins/org.eclipse.core.resources/.history/d2/e04f181f4ab4001d1d079a924effdc9e
deleted file mode 100644
index f3444e49..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/d2/e04f181f4ab4001d1d079a924effdc9e
+++ /dev/null
@@ -1,80 +0,0 @@
-package com.shopme.admin.security;
-
-import org.aspectj.weaver.ast.And;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.security.authentication.dao.DaoAuthenticationProvider;
-import org.springframework.security.config.annotation.web.builders.HttpSecurity;
-import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
-import org.springframework.security.config.annotation.web.configuration.WebSecurityConfiguration;
-import org.springframework.security.config.annotation.web.configuration.WebSecurityCustomizer;
-import org.springframework.security.core.userdetails.UserDetailsService;
-import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
-import org.springframework.security.crypto.password.PasswordEncoder;
-import org.springframework.security.web.SecurityFilterChain;
-
-@Configuration
-@EnableWebSecurity
-public class WebSecurityConfig {
-
-	/*
-	 * refer to this link: https://www.codejava.net/frameworks/spring-boot/fix-
-	 * websecurityconfigureradapter-deprecated
-	 * 
-	 */
-	
-	
-	 /* This bean will be called by spring security when performing authentication*/ 
-	@Bean
-	public UserDetailsService  userDetailsService()	{
-		return new ShopmeUserDetailsService();
-	}
-	
-
-	@Bean
-	public PasswordEncoder passwordEncoder() {
-		return new BCryptPasswordEncoder();
-	}
-
-	
-	@Bean
-	public DaoAuthenticationProvider authenticationProvider() {
-	    DaoAuthenticationProvider authProvider = new DaoAuthenticationProvider();
-	     
-	    authProvider.setUserDetailsService(userDetailsService());
-	    authProvider.setPasswordEncoder(passwordEncoder());
-	 
-	    return authProvider;
-	}
-	
-	
-	@Bean
-	public SecurityFilterChain filterChain(HttpSecurity http) throws Exception {
-
-		// any request need to be authenticated (require login)
-		// custom login page at "/login" - handler method in MainController class
-		http.authorizeHttpRequests()
-			.anyRequest().authenticated()
-			.and()
-			.formLogin()
-				.loginPage("/login")
-				.usernameParameter("email")
-				.permitAll()
-			.and().logout().permitAll()
-			.and().rememberMe();
-		
-		http.authenticationProvider(authenticationProvider());
-		
-		
-		return http.build();
-	}
-
-	//NOTE: antMatchers() changed to requestMatchers()
-	//stack: https://stackoverflow.com/questions/74907533/the-method-antmatchersstring-is-undefined-for-the-type
-	@Bean
-	public WebSecurityCustomizer webSecurityCustomizer() {
-		//permit access to the assets in the following directories
-		return (web) -> web.ignoring().requestMatchers("/images/**", "/js/**", "/webjars/**");
-	}
-
-}
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/d3/20f8735279b3001d19bbb001c1a81c20 b/.metadata/.plugins/org.eclipse.core.resources/.history/d3/20f8735279b3001d19bbb001c1a81c20
deleted file mode 100644
index c202012b..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/d3/20f8735279b3001d19bbb001c1a81c20
+++ /dev/null
@@ -1,45 +0,0 @@
-package com.shopme.admin.user;
-
-import java.io.IOException;
-import java.text.DateFormat;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.List;
-
-import org.supercsv.io.CsvBeanWriter;
-import org.supercsv.io.ICsvBeanWriter;
-import org.supercsv.prefs.CsvPreference;
-
-import com.shopme.common.entity.User;
-
-import jakarta.servlet.http.HttpServletResponse;
-
-public class UserCsvExporter {
-
-	public void export(List<User> listUsers, HttpServletResponse response) throws IOException {
-		
-		DateFormat dateFormatter = new SimpleDateFormat("yyyy-MM-dd_HH-mm-ss");
-		String timeStamp = dateFormatter.format(new Date());
-		String fileName = "users_" + timeStamp + ".csv";
-		
-		response.setContentType("text/csv");
-		
-		String headerKey = "Content-Disposition";
-		String headerValue = "attachment; filename=" + fileName;
-		response.setHeader(headerKey, headerValue);	
-		
-		ICsvBeanWriter csvWriter = new CsvBeanWriter(response.getWriter(), CsvPreference.STANDARD_PREFERENCE);
-		
-		String[] csvHeader = {"User ID", "E-mail", "First Name", "Last Name", "Roles", "Enabled"};
-		String[] fieldMapping = {"id", "email", "firstName", "lastName", "roles", "enabled"};
-		
-		csvWriter.writeHeader(csvHeader);
-		
-		for (User user : listUsers) {
-			csvWriter.write(user, fieldMapping);
-		}
-		
-		csvWriter.close();
-	}
-	
-}
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/d4/20ed746a0bb9001d11addcb4256c67f9 b/.metadata/.plugins/org.eclipse.core.resources/.history/d4/20ed746a0bb9001d11addcb4256c67f9
new file mode 100644
index 00000000..fd7737c4
--- /dev/null
+++ b/.metadata/.plugins/org.eclipse.core.resources/.history/d4/20ed746a0bb9001d11addcb4256c67f9
@@ -0,0 +1,49 @@
+package com.shopme.admin;
+
+import java.nio.file.Path;
+import java.nio.file.Paths;
+
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
+
+@Configuration
+public class MvcConfig implements WebMvcConfigurer {
+
+	
+	/*
+	 * In short, we can tell Spring MVC to map a given URL (e.g. "/user-photos") 
+	 * to any directory (e.g. D:/ShopmeProject/ShopmeBackend/user-photos) 
+	 * and expose the resources (images, js, css...) in this directory to 
+	 * the web clients (browsers) - that's the primary purpose
+	 *  of using resource handlers in Spring MVC.
+	 * 
+	 * Because the assets are not located in the src/main/resources/static folder
+	 * */
+	
+	@Override
+	public void addResourceHandlers(ResourceHandlerRegistry registry) {
+
+		String dirName = "user-photos";
+		Path userPhotoDir = Paths.get(dirName);
+		String userPhotosPath = userPhotoDir.toFile().getAbsolutePath();
+		
+		// add /** to allow all files under this directory to be available to client
+		registry.addResourceHandler("/" + dirName + "/**")
+		.addResourceLocations("file:/" + userPhotosPath + "/");
+		
+		
+		String categoryImagesDirName = "../category-images";
+		Path categoryImagesDir = Paths.get(categoryImagesDirName);
+		String categoryImagesPath = categoryImagesDir.toFile().getAbsolutePath();
+		
+		// add /** to allow all files under this directory to be available to client
+		registry.addResourceHandler("/" + categoryImagesDirName + "/**")
+		.addResourceLocations("file:/" + categoryImagesPath + "/");
+		
+	}
+	
+	
+	
+	
+}
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/d6/0043d24058b7001d19ef99be8d31e273 b/.metadata/.plugins/org.eclipse.core.resources/.history/d6/0043d24058b7001d19ef99be8d31e273
deleted file mode 100644
index e69de29b..00000000
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/d6/103199e777b3001d19bbb001c1a81c20 b/.metadata/.plugins/org.eclipse.core.resources/.history/d6/103199e777b3001d19bbb001c1a81c20
deleted file mode 100644
index e69de29b..00000000
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/d6/708b80b158b7001d19ef99be8d31e273 b/.metadata/.plugins/org.eclipse.core.resources/.history/d6/708b80b158b7001d19ef99be8d31e273
deleted file mode 100644
index 77b4d7c5..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/d6/708b80b158b7001d19ef99be8d31e273
+++ /dev/null
@@ -1,5 +0,0 @@
-package com.shopme.admin.category;
-
-public class CategoryController {
-
-}
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/d6/b0e4102362b3001d19bbb001c1a81c20 b/.metadata/.plugins/org.eclipse.core.resources/.history/d6/b0e4102362b3001d19bbb001c1a81c20
deleted file mode 100644
index 18e9ec8a..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/d6/b0e4102362b3001d19bbb001c1a81c20
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-	
-	<parent>
-		<groupId>com.shopme</groupId>
-		<artifactId>ShopmeWebParent</artifactId>
-		<version>0.0.1-SNAPSHOT</version>
-	</parent>
-	
-	<artifactId>ShopmeBackEnd</artifactId>
-	
-	<name>ShopmeBackEnd</name>
-	<description>Shopme Admin project</description>
-	<properties>
-		<java.version>15</java.version>
-	</properties>
-	<dependencies>
-
-	<dependency>
-	   <groupId>org.springframework.boot</groupId>
-		<artifactId>spring-boot-devtools</artifactId>
-    </dependency>
-
-	<dependency>
-		<groupId>net.sf.supercsv</groupId>
-		<artifactId>super-csv</artifactId>
-		<version>2.4.0</version>
-	</dependency>
-	</dependencies>
-	<build>
-		<plugins>
-			<plugin>
-				<groupId>org.springframework.boot</groupId>
-				<artifactId>spring-boot-maven-plugin</artifactId>
-			</plugin>
-		</plugins>
-	</build>
-</project>
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/d7/504869938bb3001d19bbb001c1a81c20 b/.metadata/.plugins/org.eclipse.core.resources/.history/d7/504869938bb3001d19bbb001c1a81c20
deleted file mode 100644
index 68b336b9..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/d7/504869938bb3001d19bbb001c1a81c20
+++ /dev/null
@@ -1,152 +0,0 @@
-package com.shopme.common.entity;
-
-import java.util.HashSet;
-import java.util.Set;
-
-import org.hibernate.grammars.hql.HqlParser.NthSideClauseContext;
-
-import jakarta.persistence.Column;
-import jakarta.persistence.Entity;
-import jakarta.persistence.GeneratedValue;
-import jakarta.persistence.GenerationType;
-import jakarta.persistence.Id;
-import jakarta.persistence.JoinColumn;
-import jakarta.persistence.JoinTable;
-import jakarta.persistence.ManyToMany;
-import jakarta.persistence.Table;
-import jakarta.persistence.Transient;
-
-@Entity
-@Table(name = "users")
-public class User {
-
-	@Id
-	@GeneratedValue(strategy = GenerationType.IDENTITY)
-	private Integer id;
-
-	@Column(length = 128, nullable = false, unique = true)
-	private String email;
-
-	@Column(length = 64, nullable = false)
-	private String password;
-
-	@Column(name = "first_name", length = 45, nullable = false)
-	private String firstName;
-
-	@Column(name = "last_name", length = 45, nullable = false)
-	private String lastName;
-
-	@Column(length = 64)
-	private String photos;
-
-	private boolean enabled;
-
-	// intermediate table
-
-	@ManyToMany
-	@JoinTable(name = "users_roles", joinColumns = @JoinColumn(name = "user_id"), inverseJoinColumns = @JoinColumn(name = "role_id"))
-	private Set<Role> roles = new HashSet<>();
-
-	public User() {
-
-	}
-
-	public User(String email, String password, String firstName, String lastName) {
-		this.email = email;
-		this.password = password;
-		this.firstName = firstName;
-		this.lastName = lastName;
-	}
-
-	public Integer getId() {
-		return id;
-	}
-
-	public void setId(Integer id) {
-		this.id = id;
-	}
-
-	public String getEmail() {
-		return email;
-	}
-
-	public void setEmail(String email) {
-		this.email = email;
-	}
-
-	public String getPassword() {
-		return password;
-	}
-
-	public void setPassword(String password) {
-		this.password = password;
-	}
-
-	public String getFirstName() {
-		return firstName;
-	}
-
-	public void setFirstName(String firstName) {
-		this.firstName = firstName;
-	}
-
-	public String getLastName() {
-		return lastName;
-	}
-
-	public void setLastName(String lastName) {
-		this.lastName = lastName;
-	}
-
-	public String getPhotos() {
-		return photos;
-	}
-
-	public void setPhotos(String photos) {
-		this.photos = photos;
-	}
-
-	public boolean isEnabled() {
-		return enabled;
-	}
-
-	public void setEnabled(boolean enabled) {
-		this.enabled = enabled;
-	}
-
-	public Set<Role> getRoles() {
-		return roles;
-	}
-
-	public void setRoles(Set<Role> roles) {
-		this.roles = roles;
-	}
-
-	public void addRoles(Role role) {
-		this.roles.add(role);
-	}
-
-	@Override
-	public String toString() {
-		return "User [id=" + id + ", email=" + email + ", firstName=" + firstName + ", lastName=" + lastName
-				+ ", roles=" + roles + "]";
-	}
-
-	// Transient annotation to indicate this getter method is not mapped to any
-	// field in database
-	@Transient
-	public String getPhotosImagePath() {
-
-		if(id == null || photos == null) return "/images/default-user.png";
-		
-		return "/user-photos/" + this.id + "/" + this.photos;
-
-	}
-	
-	@Transient
-	public String getFullName() {
-		
-		return firstName + " " + lastName;
-	}
-
-}
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/d7/80e75d1919b4001d128fb79045552177 b/.metadata/.plugins/org.eclipse.core.resources/.history/d7/80e75d1919b4001d128fb79045552177
deleted file mode 100644
index f2d85bc5..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/d7/80e75d1919b4001d128fb79045552177
+++ /dev/null
@@ -1,46 +0,0 @@
-<!DOCTYPE html>
-<html xmlns:th="http://www.thymeleaf.org">
-
-<head>
-	<meta http-equiv="Content-Type" content="text/html; charset= UTF-8">
-	<meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0">
-	<title>Login - Shopme Admin</title>
-	<link rel="stylesheet" type="text/css" th:href="@{/webjars/bootstrap/css/bootstrap.min.css}" />
-</head>
-
-<body>
-	<div class="container-fluid text-center">
-		
-		<div>
-			<img th:src="@{/images/ShopmeAdminBig.png}" />
-		</div>
-		
-		<form th:action="@{/login}" method="post" style="max-width:350px; margin: 0 auto">
-		
-			<div class="border border-secondary rounded p-3">
-				<p>Access to Shopme Control Panel </p>
-				
-				<p>
-					<input type="email" name="email" class="form-control" placeholder="Email" required />
-				</p>
-				
-				<p>
-					<input type="password" name="password" class="form-control" placeholder="Password" required />
-				</p>
-				
-				<p>
-					<input type="submit" value="Login" class="btn btn-primary" />
-				</p>
-			</div>
-		
-		</form>
-
-		<div>
-			<p>Shopme Control Panel - Copyright &copy; Shopme</p>
-		</div>
-
-	</div>
-
-</body>
-
-</html>
\ No newline at end of file
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/d7/e02bee562ab8001d1d97982e354adf88 b/.metadata/.plugins/org.eclipse.core.resources/.history/d7/e02bee562ab8001d1d97982e354adf88
deleted file mode 100644
index ddb4cb84..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/d7/e02bee562ab8001d1d97982e354adf88
+++ /dev/null
@@ -1,66 +0,0 @@
-package com.shopme.admin.category;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Set;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import com.shopme.common.entity.Category;
-
-@Service
-public class CategoryService {
-
-	@Autowired
-	private CategoryRepository repo;
-	
-	public List<Category> listAll(){
-		return (List<Category>) repo.findAll();
-	}
-	
-	public List<Category> listCategoriesUsedInForm(){
-		
-		List<Category> categoriesUsedInForm = new ArrayList<>();
-		
-		Iterable<Category> categoriesInDB = repo.findAll();
-		
-		for (Category category : categoriesInDB) {
-
-			// root category
-			if (category.getParent() == null) {
-				categoriesUsedInForm.add(new Category(category.getName()));
-
-				category.getChildren().forEach(subCategory -> {
-					String name = "--" + subCategory.getName();
-					
-					categoriesUsedInForm.add(new Category(name));
-					listChildren(subCategory, 1);
-				});
-			}
-
-		}
-		
-		
-		return categoriesUsedInForm;
-	}
-	
-	private void listChildren(Category parent, int subLevel) {
-
-		int newSubLevel = subLevel + 1;
-		Set<Category> children = parent.getChildren();
-
-		for (Category subCategory : children) {
-
-			for (int i = 0; i < newSubLevel; i++) {
-				System.out.print("--");
-			}
-
-			System.out.println(subCategory.getName());
-
-			printChildren(subCategory, newSubLevel);
-		}
-
-	}
-	
-}
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/dc/105183183cb4001d1d079a924effdc9e b/.metadata/.plugins/org.eclipse.core.resources/.history/dc/105183183cb4001d1d079a924effdc9e
deleted file mode 100644
index dd31d49c..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/dc/105183183cb4001d1d079a924effdc9e
+++ /dev/null
@@ -1,33 +0,0 @@
-<!DOCTYPE html>
-<html xmlns:th="http://www.thymeleaf.org">
-<head>
-<meta charset="ISO-8859-1">
-<title>Insert title here</title>
-</head>
-<body>
-
-		<!-- purpose: make code more succinct and readable 
-		project is easier to maintain
-		
-		use thymeleaf fragments -->
-
-	<!-- if  ${removeTag} == 'tag' then the <th> parent tag will be removed.  if ${removeTag} == 'none' then keep the <th> parent tag-->
-	<th th:fragment="column_link(fieldName, columnLabel, removeTag)" th:remove="${removeTag}">
-		<!-- follow the sort order of another sortField; if the other field is sortDir="asc", then the newly selected column will be sortDir="asc" too -->
-		<a class="text-white"
-		   th:href="@{'/users/page/' + ${currentPage} + '?sortField=' + ${fieldName} + '&sortDir=' + ${sortField != fieldName ? sortDir : reverseSortDir} + ${keyword != null ? '&keyword=' + keyword : ''}}">
-			[[${columnLabel}]]
-		</a>
-		
-		<span th:if="${sortField == fieldName}"
-		th:class="${sortDir == 'asc' ? 'fas fa-sort-up' : 'fas fa-sort-down'}"></span>
-	</th>
-	
-	
-	<a th:fragment="page_link(pageNum, label)"
-	   class="page-link"
-	   th:href= "@{'/users/page/' + ${pageNum} + '?sortField=' + ${sortField} + '&sortDir=' + ${sortDir} + ${keyword != null ? '&keyword=' + keyword : ''}}">[[${label}]]</a>
-	
-	
-</body>
-</html>
\ No newline at end of file
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/dc/109984ba32b4001d1d079a924effdc9e b/.metadata/.plugins/org.eclipse.core.resources/.history/dc/109984ba32b4001d1d079a924effdc9e
deleted file mode 100644
index ef039d72..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/dc/109984ba32b4001d1d079a924effdc9e
+++ /dev/null
@@ -1,55 +0,0 @@
-<!DOCTYPE html>
-<html xmlns:th="http://www.thymeleaf.org">
-
-<head>
-	<meta http-equiv="Content-Type" content="text/html; charset= UTF-8">
-	<meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0">
-	<title>Login - Shopme Admin</title>
-	<link rel="stylesheet" type="text/css" th:href="@{/webjars/bootstrap/css/bootstrap.min.css}" />
-</head>
-
-<body>
-	<div class="container-fluid text-center">
-		
-		<div>
-			<img th:src="@{/images/ShopmeAdminBig.png}" />
-		</div>
-		
-		<form th:action="@{/login}" method="post" style="max-width:350px; margin: 0 auto">
-			
-			<!--  ?error param will appear at the end of url if there is error with email or password  -->
-			<div th:if="${param.error}">
-				<p class="text-danger">[[${session.SPRING_SECURITY_LAST_EXCEPTION.message}]]</p>
-			</div>
-			
-			<div th:if="${param.logout}">
-				<p class="text-warning">you have been logged out</p>
-			</div>
-			
-			<div class="border border-secondary rounded p-3">
-				<p>Access to Shopme Control Panel </p>
-				
-				<p>
-					<input type="email" name="email" class="form-control" placeholder="Email" required />
-				</p>
-				
-				<p>
-					<input type="password" name="password" class="form-control" placeholder="Password" required />
-				</p>
-				
-				<p>
-					<input type="submit" value="Login" class="btn btn-primary" />
-				</p>
-			</div>
-		
-		</form>
-
-		<div>
-			<p>Shopme Control Panel - Copyright &copy; Shopme</p>
-		</div>
-
-	</div>
-
-</body>
-
-</html>
\ No newline at end of file
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/de/600d53ca8bb3001d19bbb001c1a81c20 b/.metadata/.plugins/org.eclipse.core.resources/.history/de/600d53ca8bb3001d19bbb001c1a81c20
deleted file mode 100644
index 021c2d66..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/de/600d53ca8bb3001d19bbb001c1a81c20
+++ /dev/null
@@ -1,259 +0,0 @@
-<!DOCTYPE html>
-<html xmlns:th="http://www.thymeleaf.org">
-
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset= UTF-8">
-<meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0">
-<title>Manage Users</title>
-
-<link rel="stylesheet" type="text/css" th:href="@{/webjars/bootstrap/css/bootstrap.min.css}" />
-<link rel="stylesheet" type="text/css" th:href="@{/fontawesome/all.css}" />
-<link rel="stylesheet" type="text/css" th:href="@{/style.css}" />
-	
-<script type="text/javascript" th:src="@{/webjars/jquery/jquery.min.js}"></script>
-<script type="text/javascript" th:src="@{/webjars/bootstrap/js/bootstrap.min.js}"></script>
-</head>
-
-<body>
-	<div class="container-fluid">
-		<div>
-			<nav class="navbar navbar-expand-lg bg-dark navbar-dark">
-				<a class="navbar-brand" th:href="@{/}"> <img
-					th:src="@{/images/ShopmeAdminSmall.png}" />
-				</a>
-				<!--hamburger toggler for mobile devices(responsive)-->
-				<button class="navbar-toggler" type="button" data-toggle="collapse"
-					data-target="#topNavbar">
-					<span class="navbar-toggler-icon"></span>
-				</button>
-				<div class="collapse navbar-collapse" id="topNavbar">
-					<ul class="navbar-nav">
-						<li class="nav-item"><a class="nav-link" th:href="@{/users}">Users</a>
-						</li>
-						<li class="nav-item"><a class="nav-link"
-							th:href="@{/categories}">Categories</a></li>
-						<li class="nav-item"><a class="nav-link" th:href="@{/brands}">Brands</a>
-						</li>
-						<li class="nav-item"><a class="nav-link"
-							th:href="@{/products}">Products</a></li>
-						<li class="nav-item"><a class="nav-link"
-							th:href="@{/customers}">Customers</a></li>
-						<li class="nav-item"><a class="nav-link"
-							th:href="@{/shipping}">Shipping</a></li>
-						<li class="nav-item"><a class="nav-link" th:href="@{/orders}">Orders</a>
-						</li>
-						<li class="nav-item"><a class="nav-link" th:href="@{/report}">Sales
-								Report</a></li>
-						<li class="nav-item"><a class="nav-link"
-							th:href="@{/articles}">Articles</a></li>
-						<li class="nav-item"><a class="nav-link" th:href="@{/menus}">Menus</a>
-						</li>
-						<li class="nav-item"><a class="nav-link"
-							th:href="@{/settings}">Settings</a></li>
-					</ul>
-				</div>
-
-			</nav>
-		</div>
-
-		<div>
-			<h2>Manage Users</h2>
-			<a th:href="@{/users/new}" class="fas fa-user-plus fa-2x icon-dark mr-2"></a>
-			
-			<a th:href="@{/users/export/csv}" class="fas fa-file-csv fa-2x icon-dark mr-2"></a>
-		</div>
-		
-		
-		
-		<!-- only display success message when a new user is created -->
-		<div th:if="${message != null}" class="alert alert-success text-center">
-			[[${message}]]
-		</div>
-			
-		<div>
-			<form th:action="@{/users/page/1}" class="form-inline m-3">
-				
-				<input type="hidden" name="sortField" th:value="${sortField}" />
-				<input type="hidden" name="sortDir" th:value="${sortDir}" />
-				Filter:&nbsp;
-				<input type="search" name="keyword" th:value="${keyword}" class="form-control" required/>
-				&nbsp;&nbsp;
-				<button type="submit" class="btn btn-primary">
-					<i class="fas fa-search"></i>
-				</button>
-				&nbsp;&nbsp;
-				<button type="button" class="btn btn-secondary" onclick="clearFilter()">
-					<i class="fas fa-eraser"></i>
-				</button>
-			</form>
-		
-		</div>
-
-
-			<div class="full-details">
-				<table class="table table-bordered table-striped table-hover table-responsive-xL">
-					<thead class="thead-dark">
-						<tr>
-							<!-- refer to templates/fragments.html for fragment code-->
-							<th th:replace="fragments :: column_link('id', 'User ID')"/>
-							<th>Photos</th>
-							<th th:replace="fragments :: column_link('email', 'Email')"/>
-							<th th:replace="fragments :: column_link('firstName', 'First Name')"/>
-							<th th:replace="fragments :: column_link('lastName', 'Last Name')"/>
-							<th>Roles</th>
-							<th th:replace="fragments :: column_link('enabled', 'Enabled')"/>
-							<th></th>
-						</tr>
-					</thead>
-					<tbody>
-						<tr th:each="user : ${listUsers}">
-							<td>[[${user.id}]]</td>
-							<td>
-								<span th:if="${user.photos == null}" class="fas fa-portrait fa-3x icon-dark"></span>
-								<img th:if="${user.photos != null}" th:src="@{${user.photosImagePath}}"
-								style="width: 100px"/>
-							</td>
-							<td>[[${user.email}]]</td>
-							<td>[[${user.firstName}]]</td>
-							<td>[[${user.lastName}]]</td>
-							<td>[[${user.roles}]]</td>
-							
-							<td>
-								<a th:if="${user.enabled == true}" class="fas fa-check-circle fa-2x icon-green" 
-								th:href="@{'/users/' + ${user.id} + '/enabled/false'}"
-								title="Disable this user"></a>
-								
-								<a th:if="${user.enabled == false}" class="fas fa-circle fa-2x icon-silver"
-								 th:href="@{'/users/' + ${user.id} + '/enabled/true'}"
-								 title="Enable this user"></a>
-							</td>
-							<td>
-									<a class="fas fa-edit fa-2x icon-green" th:href="@{'/users/edit/' + ${user.id}}"
-									title="edit this user"></a>
-									&nbsp; 
-									<a class="fas fa-trash fa-2x icon-dark link-delete" th:href="@{'/users/delete/' + ${user.id}}"
-									title="delete this user" th:userId="${user.id}"></a>
-							</td>
-						</tr>
-					</tbody>
-				</table>
-			</div>
-			
-			
-			<!-- display this on mobile screens only, refer to /static/style.css for more info-->
-			<div class="less-details">
-				
-				<div th:each="user : ${listUsers}" class="row m-1">
-					
-					<div class="col">
-						
-						<span th:if="${user.photos == null}" class="fas fa-portrait fa-3x icon-dark"></span>
-								<img th:if="${user.photos != null}" th:src="@{${user.photosImagePath}}"
-								style="width: 100px"/>
-					</div>
-						<div class="col">
-							<div>[[${user.fullName}]]</div>
-						
-						</div>
-					<div>&nbsp;</div>
-				</div>
-			</div>
-			
-			
-			<!-- IF -->
-			<div class="text-center m-1" th:if="${totalItems > 0}">
-				<span>Showing Users # [[${startCount}]] to [[${endCount}]] of [[${totalItems}]]</span>
-			</div>
-			
-			<!-- ELSE -->
-			<div class="text-center m-1" th:unless="${totalItems > 0}">
-				<span>No users found</span>
-			</div>
-			
-			<!-- only display pagination when there are users; else, no users no pagination -->
-			<div th:if="${totalPages > 1}">
-				<nav>
-					  <ul class="pagination justify-content-center">
-					  
-					  	<li th:class=" ${currentPage > 1 ? 'page-item' : 'page-item disabled'}">
-					  		<a th:replace="fragments :: page_link(1, 'First')"></a>
-				    	</li>
-					  
-					    <li th:class=" ${currentPage > 1 ? 'page-item' : 'page-item disabled'}">
-					    	<a th:replace="fragments :: page_link(${currentPage - 1 }, 'previous')"></a>
-				    	</li>
-					    	
-					    <!-- org.thymeleaf.expression.Numbers class, An object of this class is usually available in variable evaluation expressions with the name #numbers. -->
-					    <li th:class="${currentPage != i ? 'page-item' : 'page-item active'}" 
-					    	th:each="i : ${#numbers.sequence(1, totalPages)}">
-					    	<a th:replace="fragments :: page_link(${i}, ${i})"></a>
-					    </li>
-					    
-					    <li  th:class=" ${currentPage < totalPages ? 'page-item' : 'page-item disabled'}">
-					    	<a th:replace="fragments :: page_link(${currentPage + 1}, 'Next')"></a>
-					    </li>
-					    
-					    <li th:class=" ${currentPage < totalPages ? 'page-item' : 'page-item disabled'}">
-							<a th:replace="fragments :: page_link(${totalPages}, 'Last')"></a>		
-					    </li>
-					  </ul>
-				</nav>
-			</div>
-			
-			
-			
-			<div class="modal fade text-center" id="confirmModal">
-				<div class="modal-dialog">
-					<div class="modal-content">
-					
-						<div class="modal-header">
-							<h4 class="modal-title">Delete Confirmation</h4>
-							<button type="button" class="close" data-dismiss="modal">&times;</button>
-						</div>
-						
-						<div class="modal-body">
-							<span id="confirmText"></span>
-						</div>
-						
-						<div class="modal-footer">
-							<a class="btn btn-success" href="" id="yesButton">Yes</a>
-							<button type="button" class="btn btn-danger" data-dismiss="modal">Close</button>
-						</div>
-					</div>
-				</div>
-			</div>
-			
-			
-			<div class="text-center">
-				<p>Shopme Control Panel - Copyright &copy; Shopme</p>
-			</div>
-
-
-	</div>
-	
-<script type="text/javascript">
-
-//confirmation modal dialogue for delete user
-$(document).ready(function(){
-	$(".link-delete").on("click", function(e){
-		//stop the <a> tag default behaviour and pop out a confirmation modal dialogue
-		e.preventDefault();
-		//alert($(this).attr("href"));
-		link = $(this);
-		userId = link.attr("userId");
-		$("#yesButton").attr("href", link.attr("href"));
-		$("#confirmText").text("Are you sure you want to delete this user ID " + userId + "?");
-		$("#confirmModal").modal();
-	});
-});
-
-	function clearFilter(){
-		window.location = "[[@{/users}]]";
-	}
-
-
-</script>
-	
-</body>
-
-</html>
\ No newline at end of file
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/de/706bf4e217b4001d128fb79045552177 b/.metadata/.plugins/org.eclipse.core.resources/.history/de/706bf4e217b4001d128fb79045552177
deleted file mode 100644
index 4c593801..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/de/706bf4e217b4001d128fb79045552177
+++ /dev/null
@@ -1,33 +0,0 @@
-package com.shopme.admin.security;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.core.userdetails.UserDetails;
-import org.springframework.security.core.userdetails.UserDetailsService;
-import org.springframework.security.core.userdetails.UsernameNotFoundException;
-
-import com.shopme.admin.user.UserRepository;
-import com.shopme.common.entity.User;
-
-/*
- * This class will be called by spring security when performing authentication 
- * 
- * */
-
-public class ShopmeUserDetailsService implements UserDetailsService {
-
-	@Autowired
-	private UserRepository userRepo;
-
-	@Override
-	public UserDetails loadUserByUsername(String email) throws UsernameNotFoundException {
-
-		User user = userRepo.getUserByEmail(email);
-
-		if (user != null) {
-			return new ShopmeUserDetails(user);
-		}
-
-		throw new UsernameNotFoundException("could not find user with the email: " + email);
-	}
-
-}
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/de/a08ccb6607b4001d128fb79045552177 b/.metadata/.plugins/org.eclipse.core.resources/.history/de/a08ccb6607b4001d128fb79045552177
deleted file mode 100644
index 3b9f292f..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/de/a08ccb6607b4001d128fb79045552177
+++ /dev/null
@@ -1,40 +0,0 @@
-package com.shopme.admin.security;
-
-import org.aspectj.weaver.ast.And;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.security.config.annotation.web.builders.HttpSecurity;
-import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
-import org.springframework.security.config.annotation.web.configuration.WebSecurityConfiguration;
-import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
-import org.springframework.security.crypto.password.PasswordEncoder;
-import org.springframework.security.web.SecurityFilterChain;
-
-@Configuration
-@EnableWebSecurity
-public class WebSecurityConfig  {
-
-	/*
-	 *  refer to this link: https://www.codejava.net/frameworks/spring-boot/fix-websecurityconfigureradapter-deprecated
-	 * 
-	 */	
-	
-	@Bean
-	public PasswordEncoder PasswordEncoder() {
-		return new BCryptPasswordEncoder();
-	}
-	
-	@Bean
-	public SecurityFilterChain filterChain(HttpSecurity http) throws Exception {
-		
-		// any request need to be authenticated (require login)
-		//custom login page at "/login" - handler method in MainController class
-		http.authorizeHttpRequests().anyRequest().authenticated()
-			.and().formLogin().loginPage("/login").permitAll();
-		
-		return http.build();
-	}
-	
-	
-	
-}
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/de/a0aa74c108b4001d128fb79045552177 b/.metadata/.plugins/org.eclipse.core.resources/.history/de/a0aa74c108b4001d128fb79045552177
deleted file mode 100644
index 7077ed09..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/de/a0aa74c108b4001d128fb79045552177
+++ /dev/null
@@ -1,45 +0,0 @@
-package com.shopme.admin.security;
-
-import org.aspectj.weaver.ast.And;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.security.config.annotation.web.builders.HttpSecurity;
-import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
-import org.springframework.security.config.annotation.web.configuration.WebSecurityConfiguration;
-import org.springframework.security.config.annotation.web.configuration.WebSecurityCustomizer;
-import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
-import org.springframework.security.crypto.password.PasswordEncoder;
-import org.springframework.security.web.SecurityFilterChain;
-
-@Configuration
-@EnableWebSecurity
-public class WebSecurityConfig  {
-
-	/*
-	 *  refer to this link: https://www.codejava.net/frameworks/spring-boot/fix-websecurityconfigureradapter-deprecated
-	 * 
-	 */	
-	
-	@Bean
-	public PasswordEncoder PasswordEncoder() {
-		return new BCryptPasswordEncoder();
-	}
-	
-	@Bean
-	public SecurityFilterChain filterChain(HttpSecurity http) throws Exception {
-		
-		// any request need to be authenticated (require login)
-		//custom login page at "/login" - handler method in MainController class
-		http.authorizeHttpRequests().anyRequest().authenticated()
-			.and().formLogin().loginPage("/login").permitAll();
-		
-		return http.build();
-	}
-	
-	 @Bean
-	    public WebSecurityCustomizer webSecurityCustomizer() {
-	        return (web) -> web.ignoring().antMatchers("/images/**", "/js/**", "/webjars/**");
-	    }
-	
-	
-}
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/df/10e4e6a80ab4001d128fb79045552177 b/.metadata/.plugins/org.eclipse.core.resources/.history/df/10e4e6a80ab4001d128fb79045552177
deleted file mode 100644
index aa6713c0..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/df/10e4e6a80ab4001d128fb79045552177
+++ /dev/null
@@ -1,38 +0,0 @@
-<!DOCTYPE html>
-<html xmlns:th="http://www.thymeleaf.org">
-
-<head>
-	<meta http-equiv="Content-Type" content="text/html; charset= UTF-8">
-	<meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0">
-	<title>Login - Shopme Admin</title>
-	<link rel="stylesheet" type="text/css" th:href="@{/webjars/bootstrap/css/bootstrap.min.css}" />
-</head>
-
-<body>
-	<div class="container-fluid text-center">
-		
-		<div>
-			<img th:src="@{/images/ShopmeAdminBig.png}" />
-		</div>
-		
-		<form th:action="@{/login}" method="post" style="max-width:350px; margin: 0 auto">
-		
-			<div class="border border-secondary rounded p-3">
-				<p>Access to Shopme Control Panel </p>
-				
-				<p>
-					<input type="email" name="email" class="form-control" placeholder="email" required />
-				</p>
-			</div>
-		
-		</form>
-
-		<div>
-			<p>Shopme Control Panel - Copyright &copy; Shopme</p>
-		</div>
-
-	</div>
-
-</body>
-
-</html>
\ No newline at end of file
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/df/f0ed6f8589b3001d19bbb001c1a81c20 b/.metadata/.plugins/org.eclipse.core.resources/.history/df/f0ed6f8589b3001d19bbb001c1a81c20
deleted file mode 100644
index 7da64b30..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/df/f0ed6f8589b3001d19bbb001c1a81c20
+++ /dev/null
@@ -1,29 +0,0 @@
-*.icon-white{color: white}
-*.icon-silver{color: silver}
-*.icon-green{color: green}
-*.icon-dark{color: gray}
-*.icon-red{color: red}
-
-
-@media screen and (max-width: 768px) {
-	/* small screen */
-	
-	div.full-details{ display: none;}
-	div.less-details{ display: block;}
-	
-}
-
-@media screen and (min-width: 768px) and (max-width: 1024px) {
-	/* medium screen */
-	
-	div.full-details{ display: block;}
-	div.less-details{ display: none;}
-}
-
-
-@media screen and (min-width: 1024px) {
-	/* large screen */
-	
-	div.less-details{ display: none;}
-	
-}
\ No newline at end of file
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/e/60441aee22b4001d1216d7fff398b3d6 b/.metadata/.plugins/org.eclipse.core.resources/.history/e/60441aee22b4001d1216d7fff398b3d6
deleted file mode 100644
index f5a2b676..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/e/60441aee22b4001d1216d7fff398b3d6
+++ /dev/null
@@ -1,83 +0,0 @@
-package com.shopme.admin.security;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-import java.util.Set;
-
-import org.springframework.security.core.GrantedAuthority;
-import org.springframework.security.core.authority.SimpleGrantedAuthority;
-import org.springframework.security.core.userdetails.UserDetails;
-
-import com.shopme.common.entity.Role;
-import com.shopme.common.entity.User;
-
-/*
- *  Think of it as a wrapper class for  Type User
- *  
- *  ShopmeUserDetailsService will use this dao class
- * 
- * */
-public class ShopmeUserDetails implements UserDetails {
-
-	private User user;
-
-	public ShopmeUserDetails(User user) {
-		this.user = user;
-	}
-
-	/* get a list of assigned roles to user */
-	@Override
-	public Collection<? extends GrantedAuthority> getAuthorities() {
-
-		Set<Role> roles = user.getRoles();
-
-		List<SimpleGrantedAuthority> authorities = new ArrayList<>();
-
-		for (Role role : roles) {
-			authorities.add(new SimpleGrantedAuthority(role.getName()));
-		}
-
-		return authorities;
-	}
-
-	@Override
-	public String getPassword() {
-		return user.getPassword();
-	}
-
-	@Override
-	public String getUsername() {
-		return user.getEmail();
-	}
-
-	// "true" means account not expired
-	@Override
-	public boolean isAccountNonExpired() {
-		return true;
-	}
-
-	@Override
-	public boolean isAccountNonLocked() {
-		// TODO Auto-generated method stub
-		return true;
-	}
-
-	@Override
-	public boolean isCredentialsNonExpired() {
-		// TODO Auto-generated method stub
-		return true;
-	}
-
-	@Override
-	public boolean isEnabled() {
-		// TODO Auto-generated method stub
-		return user.isEnabled();
-	}
-	
-	public String getFullname() {
-		
-	}
-	
-
-}
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/e1/00b75c4a27b3001d1e75aa5ef0815903 b/.metadata/.plugins/org.eclipse.core.resources/.history/e1/00b75c4a27b3001d1e75aa5ef0815903
deleted file mode 100644
index f7921cc0..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/e1/00b75c4a27b3001d1e75aa5ef0815903
+++ /dev/null
@@ -1,46 +0,0 @@
-package com.shopme.admin.user;
-
-import org.springframework.data.domain.Page;
-import org.springframework.data.domain.Pageable;
-import org.springframework.data.jpa.repository.Modifying;
-import org.springframework.data.jpa.repository.Query;
-import org.springframework.data.repository.CrudRepository;
-import org.springframework.data.repository.PagingAndSortingRepository;
-import org.springframework.data.repository.query.Param;
-import org.springframework.stereotype.Repository;
-
-import com.shopme.common.entity.User;
-
-@Repository
-public interface UserRepository extends CrudRepository<User, Integer>, PagingAndSortingRepository<User, Integer> {
-
-	/*
-	 * JPQL statement. It should be noted that as compared to native SQL, JPQL does
-	 * not interact with database tables, records, and fields - but with Java
-	 * classes and instances.
-	 * 
-	 * JPA kicks in as the mediator and transpiles JPQL queries to SQL queries for execution.
-	 * 
-	 * If your database can change or varies from development to production, as long as 
-	 * they're both relational - JPQL works wonders and you can 
-	 * write JPQL queries to create generic logic that can be used over and over again.
-	 */
-	@Query("SELECT u FROM User u WHERE u.email = :email")
-	public User getUserByEmail(@Param("email") String email);
-	
-	// countById() declaration follows the JPA specification
-	//to check the existence of a user
-	public Long countById(Integer id);
-	
-	
-	//for filtering users by keyword
-	@Query("SELECT u FROM User u WHERE u.firstName OR u.lastName LIKE %?1%")
-	public Page<User> findAll(String keyword, Pageable pageable);
-	
-	
-	//change user enabled status
-	//need @Modifying annotation for update/delete operation
-	@Query("UPDATE User u SET u.enabled = ?2 WHERE u.id = ?1")
-	@Modifying
-	public void updateEnabledStatus(Integer id, boolean enabled);
-}
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/e1/40cb9cc822b4001d1216d7fff398b3d6 b/.metadata/.plugins/org.eclipse.core.resources/.history/e1/40cb9cc822b4001d1216d7fff398b3d6
deleted file mode 100644
index d137072f..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/e1/40cb9cc822b4001d1216d7fff398b3d6
+++ /dev/null
@@ -1,78 +0,0 @@
-package com.shopme.admin.security;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-import java.util.Set;
-
-import org.springframework.security.core.GrantedAuthority;
-import org.springframework.security.core.authority.SimpleGrantedAuthority;
-import org.springframework.security.core.userdetails.UserDetails;
-
-import com.shopme.common.entity.Role;
-import com.shopme.common.entity.User;
-
-/*
- *  Think of it as a wrapper class for  Type User
- *  
- *  ShopmeUserDetailsService will use this dao class
- * 
- * */
-public class ShopmeUserDetails implements UserDetails {
-
-	private User user;
-
-	public ShopmeUserDetails(User user) {
-		this.user = user;
-	}
-
-	/* get a list of assigned roles to user */
-	@Override
-	public Collection<? extends GrantedAuthority> getAuthorities() {
-
-		Set<Role> roles = user.getRoles();
-
-		List<SimpleGrantedAuthority> authorities = new ArrayList<>();
-
-		for (Role role : roles) {
-			authorities.add(new SimpleGrantedAuthority(role.getName()));
-		}
-
-		return authorities;
-	}
-
-	@Override
-	public String getPassword() {
-		return user.getPassword();
-	}
-
-	@Override
-	public String getUsername() {
-		return user.getEmail();
-	}
-
-	// "true" means account not expired
-	@Override
-	public boolean isAccountNonExpired() {
-		return true;
-	}
-
-	@Override
-	public boolean isAccountNonLocked() {
-		// TODO Auto-generated method stub
-		return true;
-	}
-
-	@Override
-	public boolean isCredentialsNonExpired() {
-		// TODO Auto-generated method stub
-		return true;
-	}
-
-	@Override
-	public boolean isEnabled() {
-		// TODO Auto-generated method stub
-		return user.isEnabled();
-	}
-
-}
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/e1/807ac24248b4001d1d079a924effdc9e b/.metadata/.plugins/org.eclipse.core.resources/.history/e1/807ac24248b4001d1d079a924effdc9e
deleted file mode 100644
index 2916b7a5..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/e1/807ac24248b4001d1d079a924effdc9e
+++ /dev/null
@@ -1,56 +0,0 @@
-<!DOCTYPE html>
-<html xmlns:th="http://www.thymeleaf.org">
-
-<head>
-	<meta http-equiv="Content-Type" content="text/html; charset= UTF-8">
-	<meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0">
-	<title>Login - Shopme Admin</title>
-	<link rel="stylesheet" type="text/css" th:href="@{/webjars/bootstrap/css/bootstrap.min.css}" />
-</head>
-
-<body>
-	<div class="container-fluid text-center">
-		
-		<div>
-			<img th:src="@{/images/ShopmeAdminBig.png}" />
-		</div>
-		
-		<form th:action="@{/login}" method="post" style="max-width:350px; margin: 0 auto">
-			
-			<!--  ?error param will appear at the end of url if there is error with email or password  -->
-			<div th:if="${param.error}">
-				<p class="text-danger">[[${session.SPRING_SECURITY_LAST_EXCEPTION.message}]]</p>
-			</div>
-			
-			<!--  ?logout param will appear at the end of url after user logged out  -->
-			<div th:if="${param.logout}">
-				<p class="text-warning">you have been logged out</p>
-			</div>
-			
-			<div class="border border-secondary rounded p-3">
-				<p>Access to Shopme Control Panel </p>
-				
-				<p>
-					<input type="email" name="email" class="form-control" placeholder="Email" required />
-				</p>
-				
-				<p>
-					<input type="password" name="password" class="form-control" placeholder="Password" required />
-				</p>
-				
-				<p>
-					<input type="submit" value="Login" class="btn btn-primary" />
-				</p>
-			</div>
-		
-		</form>
-
-		<div>
-			<p>Shopme Control Panel - Copyright &copy; Shopme</p>
-		</div>
-
-	</div>
-
-</body>
-
-</html>
\ No newline at end of file
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/e1/d06f43cf8cb3001d19bbb001c1a81c20 b/.metadata/.plugins/org.eclipse.core.resources/.history/e1/d06f43cf8cb3001d19bbb001c1a81c20
deleted file mode 100644
index 098e7e9b..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/e1/d06f43cf8cb3001d19bbb001c1a81c20
+++ /dev/null
@@ -1,260 +0,0 @@
-<!DOCTYPE html>
-<html xmlns:th="http://www.thymeleaf.org">
-
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset= UTF-8">
-<meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0">
-<title>Manage Users</title>
-
-<link rel="stylesheet" type="text/css" th:href="@{/webjars/bootstrap/css/bootstrap.min.css}" />
-<link rel="stylesheet" type="text/css" th:href="@{/fontawesome/all.css}" />
-<link rel="stylesheet" type="text/css" th:href="@{/style.css}" />
-	
-<script type="text/javascript" th:src="@{/webjars/jquery/jquery.min.js}"></script>
-<script type="text/javascript" th:src="@{/webjars/bootstrap/js/bootstrap.min.js}"></script>
-</head>
-
-<body>
-	<div class="container-fluid">
-		<div>
-			<nav class="navbar navbar-expand-lg bg-dark navbar-dark">
-				<a class="navbar-brand" th:href="@{/}"> <img
-					th:src="@{/images/ShopmeAdminSmall.png}" />
-				</a>
-				<!--hamburger toggler for mobile devices(responsive)-->
-				<button class="navbar-toggler" type="button" data-toggle="collapse"
-					data-target="#topNavbar">
-					<span class="navbar-toggler-icon"></span>
-				</button>
-				<div class="collapse navbar-collapse" id="topNavbar">
-					<ul class="navbar-nav">
-						<li class="nav-item"><a class="nav-link" th:href="@{/users}">Users</a>
-						</li>
-						<li class="nav-item"><a class="nav-link"
-							th:href="@{/categories}">Categories</a></li>
-						<li class="nav-item"><a class="nav-link" th:href="@{/brands}">Brands</a>
-						</li>
-						<li class="nav-item"><a class="nav-link"
-							th:href="@{/products}">Products</a></li>
-						<li class="nav-item"><a class="nav-link"
-							th:href="@{/customers}">Customers</a></li>
-						<li class="nav-item"><a class="nav-link"
-							th:href="@{/shipping}">Shipping</a></li>
-						<li class="nav-item"><a class="nav-link" th:href="@{/orders}">Orders</a>
-						</li>
-						<li class="nav-item"><a class="nav-link" th:href="@{/report}">Sales
-								Report</a></li>
-						<li class="nav-item"><a class="nav-link"
-							th:href="@{/articles}">Articles</a></li>
-						<li class="nav-item"><a class="nav-link" th:href="@{/menus}">Menus</a>
-						</li>
-						<li class="nav-item"><a class="nav-link"
-							th:href="@{/settings}">Settings</a></li>
-					</ul>
-				</div>
-
-			</nav>
-		</div>
-
-		<div>
-			<h2>Manage Users</h2>
-			<a th:href="@{/users/new}" class="fas fa-user-plus fa-2x icon-dark mr-2"></a>
-			
-			<a th:href="@{/users/export/csv}" class="fas fa-file-csv fa-2x icon-dark mr-2"></a>
-		</div>
-		
-		
-		
-		<!-- only display success message when a new user is created -->
-		<div th:if="${message != null}" class="alert alert-success text-center">
-			[[${message}]]
-		</div>
-			
-		<div>
-			<form th:action="@{/users/page/1}" class="form-inline m-3">
-				
-				<input type="hidden" name="sortField" th:value="${sortField}" />
-				<input type="hidden" name="sortDir" th:value="${sortDir}" />
-				Filter:&nbsp;
-				<input type="search" name="keyword" th:value="${keyword}" class="form-control" required/>
-				&nbsp;&nbsp;
-				<button type="submit" class="btn btn-primary">
-					<i class="fas fa-search"></i>
-				</button>
-				&nbsp;&nbsp;
-				<button type="button" class="btn btn-secondary" onclick="clearFilter()">
-					<i class="fas fa-eraser"></i>
-				</button>
-			</form>
-		
-		</div>
-
-			<!-- css class to display this table in large screens only , refer to static/style.css for more info-->
-			<div class="full-details">
-				<table class="table table-bordered table-striped table-hover table-responsive-xL">
-					<thead class="thead-dark">
-						<tr>
-							<!-- refer to templates/fragments.html for fragment code-->
-							<th th:replace="fragments :: column_link('id', 'User ID')"/>
-							<th>Photos</th>
-							<th th:replace="fragments :: column_link('email', 'Email')"/>
-							<th th:replace="fragments :: column_link('firstName', 'First Name')"/>
-							<th th:replace="fragments :: column_link('lastName', 'Last Name')"/>
-							<th>Roles</th>
-							<th th:replace="fragments :: column_link('enabled', 'Enabled')"/>
-							<th></th>
-						</tr>
-					</thead>
-					<tbody>
-						<tr th:each="user : ${listUsers}">
-							<td>[[${user.id}]]</td>
-							<td>
-								<span th:if="${user.photos == null}" class="fas fa-portrait fa-3x icon-dark"></span>
-								<img th:if="${user.photos != null}" th:src="@{${user.photosImagePath}}"
-								style="width: 100px"/>
-							</td>
-							<td>[[${user.email}]]</td>
-							<td>[[${user.firstName}]]</td>
-							<td>[[${user.lastName}]]</td>
-							<td>[[${user.roles}]]</td>
-							
-							<td>
-								<a th:if="${user.enabled == true}" class="fas fa-check-circle fa-2x icon-green" 
-								th:href="@{'/users/' + ${user.id} + '/enabled/false'}"
-								title="Disable this user"></a>
-								
-								<a th:if="${user.enabled == false}" class="fas fa-circle fa-2x icon-silver"
-								 th:href="@{'/users/' + ${user.id} + '/enabled/true'}"
-								 title="Enable this user"></a>
-							</td>
-							<td>
-									<a class="fas fa-edit fa-2x icon-green" th:href="@{'/users/edit/' + ${user.id}}"
-									title="edit this user"></a>
-									&nbsp; 
-									<a class="fas fa-trash fa-2x icon-dark link-delete" th:href="@{'/users/delete/' + ${user.id}}"
-									title="delete this user" th:userId="${user.id}"></a>
-							</td>
-						</tr>
-					</tbody>
-				</table>
-			</div>
-			
-			
-			<!-- css class to display this <div> on mobile screens only, refer to /static/style.css for more info-->
-			<div class="less-details">
-				
-				<div th:each="user : ${listUsers}" class="row m-1">
-					
-					<div class="col-4">
-						
-						<span th:if="${user.photos == null}" class="fas fa-portrait fa-3x icon-dark"></span>
-								<img th:if="${user.photos != null}" th:src="@{${user.photosImagePath}}"
-								style="width: 100px"/>
-					</div>
-					
-					<div class="col-8">
-						<div>[[${user.fullName}]]</div>
-						<div>[[${user.roles}]]</div>
-					</div>
-					<div>&nbsp;</div>
-				</div>
-			</div>
-			
-			
-			<!-- IF -->
-			<div class="text-center m-1" th:if="${totalItems > 0}">
-				<span>Showing Users # [[${startCount}]] to [[${endCount}]] of [[${totalItems}]]</span>
-			</div>
-			
-			<!-- ELSE -->
-			<div class="text-center m-1" th:unless="${totalItems > 0}">
-				<span>No users found</span>
-			</div>
-			
-			<!-- only display pagination when there are users; else, no users no pagination -->
-			<div th:if="${totalPages > 1}">
-				<nav>
-					  <ul class="pagination justify-content-center flex-wrap">
-					  
-					  	<li th:class=" ${currentPage > 1 ? 'page-item' : 'page-item disabled'}">
-					  		<a th:replace="fragments :: page_link(1, 'First')"></a>
-				    	</li>
-					  
-					    <li th:class=" ${currentPage > 1 ? 'page-item' : 'page-item disabled'}">
-					    	<a th:replace="fragments :: page_link(${currentPage - 1 }, 'previous')"></a>
-				    	</li>
-					    	
-					    <!-- org.thymeleaf.expression.Numbers class, An object of this class is usually available in variable evaluation expressions with the name #numbers. -->
-					    <li th:class="${currentPage != i ? 'page-item' : 'page-item active'}" 
-					    	th:each="i : ${#numbers.sequence(1, totalPages)}">
-					    	<a th:replace="fragments :: page_link(${i}, ${i})"></a>
-					    </li>
-					    
-					    <li  th:class=" ${currentPage < totalPages ? 'page-item' : 'page-item disabled'}">
-					    	<a th:replace="fragments :: page_link(${currentPage + 1}, 'Next')"></a>
-					    </li>
-					    
-					    <li th:class=" ${currentPage < totalPages ? 'page-item' : 'page-item disabled'}">
-							<a th:replace="fragments :: page_link(${totalPages}, 'Last')"></a>		
-					    </li>
-					  </ul>
-				</nav>
-			</div>
-			
-			
-			
-			<div class="modal fade text-center" id="confirmModal">
-				<div class="modal-dialog">
-					<div class="modal-content">
-					
-						<div class="modal-header">
-							<h4 class="modal-title">Delete Confirmation</h4>
-							<button type="button" class="close" data-dismiss="modal">&times;</button>
-						</div>
-						
-						<div class="modal-body">
-							<span id="confirmText"></span>
-						</div>
-						
-						<div class="modal-footer">
-							<a class="btn btn-success" href="" id="yesButton">Yes</a>
-							<button type="button" class="btn btn-danger" data-dismiss="modal">Close</button>
-						</div>
-					</div>
-				</div>
-			</div>
-			
-			
-			<div class="text-center">
-				<p>Shopme Control Panel - Copyright &copy; Shopme</p>
-			</div>
-
-
-	</div>
-	
-<script type="text/javascript">
-
-//confirmation modal dialogue for delete user
-$(document).ready(function(){
-	$(".link-delete").on("click", function(e){
-		//stop the <a> tag default behaviour and pop out a confirmation modal dialogue
-		e.preventDefault();
-		//alert($(this).attr("href"));
-		link = $(this);
-		userId = link.attr("userId");
-		$("#yesButton").attr("href", link.attr("href"));
-		$("#confirmText").text("Are you sure you want to delete this user ID " + userId + "?");
-		$("#confirmModal").modal();
-	});
-});
-
-	function clearFilter(){
-		window.location = "[[@{/users}]]";
-	}
-
-
-</script>
-	
-</body>
-
-</html>
\ No newline at end of file
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/e2/50718c6c30b7001d19ef99be8d31e273 b/.metadata/.plugins/org.eclipse.core.resources/.history/e2/50718c6c30b7001d19ef99be8d31e273
deleted file mode 100644
index 424960dc..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/e2/50718c6c30b7001d19ef99be8d31e273
+++ /dev/null
@@ -1,52 +0,0 @@
-package com.shopme.admin.category;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
-import org.junit.jupiter.api.Test;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.autoconfigure.jdbc.AutoConfigureTestDatabase;
-import org.springframework.boot.test.autoconfigure.jdbc.AutoConfigureTestDatabase.Replace;
-import org.springframework.boot.test.autoconfigure.orm.jpa.DataJpaTest;
-import org.springframework.test.annotation.Rollback;
-
-import com.shopme.common.entity.Category;
-
-/*
- * Unit Test for CategoryRepository
- * 
- * objective:
- * 1. test the methods in repository 
- * 2. populate the database with records
- * 
-*/
-
-@DataJpaTest
-@AutoConfigureTestDatabase(replace = Replace.NONE)
-@Rollback(false)
-public class CategoryRepositoryTests {
-	
-	@Autowired
-	private CategoryRepository repo;
-	
-	@Test
-	public void testCreateRootCategory() {
-//		Category category = new Category("Computers");
-		Category category = new Category("Electronics");
-		Category savedCategory = repo.save(category);
-		
-		assertThat(savedCategory.getId()).isGreaterThan(0);
-		
-	}
-	
-	@Test
-	public void testCreateSubCategory() {
-		
-		// ID for root category "Computer" is 1
-		Category parent = new Category(1);
-		
-		
-		
-	}
-	
-	
-}
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/e2/80ee15b446b4001d1d079a924effdc9e b/.metadata/.plugins/org.eclipse.core.resources/.history/e2/80ee15b446b4001d1d079a924effdc9e
deleted file mode 100644
index fcdadd3d..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/e2/80ee15b446b4001d1d079a924effdc9e
+++ /dev/null
@@ -1,25 +0,0 @@
-<!DOCTYPE html>
-<html xmlns:th="http://www.thymeleaf.org"
-	  xmlns:sec="https://www.thymeleaf.org/thymeleaf-extras-springsecurity5">
-
-<head th:replace="fragments :: page_head('Home - Shopme Admin')"/>
-
-<body>
-	<div class="container-fluid">
-			
-			<!-- navigation bar -->
-		<div th:replace="navigation :: menu"></div>
-
-		<div>
-			<h1>Shopme Control Panel</h1>
-		</div>
-
-		<!-- footer -->
-		<div th:replace="fragments :: footer"></div>
-
-
-	</div>
-
-</body>
-
-</html>
\ No newline at end of file
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/e3/70c888e529b8001d1d97982e354adf88 b/.metadata/.plugins/org.eclipse.core.resources/.history/e3/70c888e529b8001d1d97982e354adf88
deleted file mode 100644
index 618cc9ba..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/e3/70c888e529b8001d1d97982e354adf88
+++ /dev/null
@@ -1,65 +0,0 @@
-package com.shopme.admin.category;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Set;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import com.shopme.common.entity.Category;
-
-@Service
-public class CategoryService {
-
-	@Autowired
-	private CategoryRepository repo;
-	
-	public List<Category> listAll(){
-		return (List<Category>) repo.findAll();
-	}
-	
-	public List<Category> listCategoriesUsedInForm(){
-		
-		List<Category> categoriesUsedInForm = new ArrayList<>();
-		
-		Iterable<Category> categoriesInDB = repo.findAll();
-		
-		for (Category category : categoriesInDB) {
-
-			// root category
-			if (category.getParent() == null) {
-				categoriesUsedInForm.add(new Category());
-
-				category.getChildren().forEach(subCategory -> {
-
-					System.out.println("--" + subCategory.getName());
-					listChildren(subCategory, 1);
-				});
-			}
-
-		}
-		
-		
-		return categoriesUsedInForm;
-	}
-	
-	private void listChildren(Category parent, int subLevel) {
-
-		int newSubLevel = subLevel + 1;
-		Set<Category> children = parent.getChildren();
-
-		for (Category subCategory : children) {
-
-			for (int i = 0; i < newSubLevel; i++) {
-				System.out.print("--");
-			}
-
-			System.out.println(subCategory.getName());
-
-			printChildren(subCategory, newSubLevel);
-		}
-
-	}
-	
-}
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/e3/80e252f114b4001d128fb79045552177 b/.metadata/.plugins/org.eclipse.core.resources/.history/e3/80e252f114b4001d128fb79045552177
deleted file mode 100644
index 06f1b45a..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/e3/80e252f114b4001d128fb79045552177
+++ /dev/null
@@ -1,15 +0,0 @@
-package com.shopme.admin.security;
-
-import org.springframework.security.core.userdetails.UserDetails;
-import org.springframework.security.core.userdetails.UserDetailsService;
-import org.springframework.security.core.userdetails.UsernameNotFoundException;
-
-public class ShopmeUserDetailsService implements UserDetailsService {
-
-	@Override
-	public UserDetails loadUserByUsername(String username) throws UsernameNotFoundException {
-		// TODO Auto-generated method stub
-		return null;
-	}
-
-}
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/e4/0070c4df4db3001d1e75aa5ef0815903 b/.metadata/.plugins/org.eclipse.core.resources/.history/e4/0070c4df4db3001d1e75aa5ef0815903
deleted file mode 100644
index 73028453..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/e4/0070c4df4db3001d1e75aa5ef0815903
+++ /dev/null
@@ -1,34 +0,0 @@
-<!DOCTYPE html>
-<html xmlns:th="http://www.thymeleaf.org">
-<head>
-<meta charset="ISO-8859-1">
-<title>Insert title here</title>
-</head>
-<body>
-
-		<!-- purpose: make code more succinct and readable 
-		project is easier to maintain
-		
-		use thymeleaf fragments -->
-
-
-	<th th:fragment="column_link(fieldName, columnLabel)">
-		<!-- follow the sort order of another sortField; if the other field is sortDir="asc", then the newly selected column will be sortDir="asc" too -->
-		<a class="text-white"
-		   th:href="@{'/users/page/' + ${currentPage} + '?sortField=' + ${fieldName} + '&sortDir=' + ${sortField != fieldName ? sortDir : reverseSortDir} + ${keyword != null ? '&keyword=' + keyword : ''}}">
-			[[${columnLabel}]]
-		</a>
-		
-		<span th:if="${sortField == fieldName}"
-		th:class="${sortDir == 'asc' ? 'fas fa-sort-up' : 'fas fa-sort-down'}"></span>
-	</th>
-	
-	
-	<a th:fragment="page_link(pageNum, label)"
-	   class="page-link"
-	   th:href= "@{'/users/page/' + ${pageNum} + '?sortField=' + ${sortField} + '&sortDir=' + ${sortDir} + ${keyword != null ? '&keyword=' + keyword : ''}}">[[${label}]]</a>
-	
-	
-	
-</body>
-</html>
\ No newline at end of file
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/e4/3097e08a7ab3001d19bbb001c1a81c20 b/.metadata/.plugins/org.eclipse.core.resources/.history/e4/3097e08a7ab3001d19bbb001c1a81c20
deleted file mode 100644
index 34cbe8f4..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/e4/3097e08a7ab3001d19bbb001c1a81c20
+++ /dev/null
@@ -1,25 +0,0 @@
-package com.shopme.admin.user;
-
-import java.io.IOException;
-import java.text.DateFormat;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-
-import jakarta.servlet.http.HttpServletResponse;
-	
-public class AbstractExporter {
-
-	public void setResponseHeader(HttpServletResponse response, String contentType, 
-			String extension, String prefix) throws IOException {
-		DateFormat dateFormatter = new SimpleDateFormat("yyyy-MM-dd_HH-mm-ss");
-		String timestamp = dateFormatter.format(new Date());
-		String fileName = prefix + timestamp + extension;
-		
-		response.setContentType(contentType);
-		
-		String headerKey = "Content-Disposition";
-		String headerValue = "attachment; filename=" + fileName;
-		response.setHeader(headerKey, headerValue);
-		
-	}	
-}
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/e5/202235c515b4001d128fb79045552177 b/.metadata/.plugins/org.eclipse.core.resources/.history/e5/202235c515b4001d128fb79045552177
deleted file mode 100644
index 3f86f8f9..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/e5/202235c515b4001d128fb79045552177
+++ /dev/null
@@ -1,30 +0,0 @@
-package com.shopme.admin.security;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.core.userdetails.UserDetails;
-import org.springframework.security.core.userdetails.UserDetailsService;
-import org.springframework.security.core.userdetails.UsernameNotFoundException;
-
-import com.shopme.admin.user.UserRepository;
-import com.shopme.common.entity.User;
-
-public class ShopmeUserDetailsService implements UserDetailsService {
-
-	
-	@Autowired
-	private UserRepository userRepo;
-	
-	
-	@Override
-	public UserDetails loadUserByUsername(String email) throws UsernameNotFoundException {
-
-		User user = userRepo.getUserByEmail(email);
-		
-		if( user != null) {
-			return new ShopmeUserDetails(user);
-		}
-		
-		return null;
-	}
-
-}
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/e5/70248e9346b4001d1d079a924effdc9e b/.metadata/.plugins/org.eclipse.core.resources/.history/e5/70248e9346b4001d1d079a924effdc9e
deleted file mode 100644
index f2f1df2e..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/e5/70248e9346b4001d1d079a924effdc9e
+++ /dev/null
@@ -1,3 +0,0 @@
-/**
- * 
- */
\ No newline at end of file
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/e5/904253ae32b4001d1d079a924effdc9e b/.metadata/.plugins/org.eclipse.core.resources/.history/e5/904253ae32b4001d1d079a924effdc9e
deleted file mode 100644
index 2e5c843c..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/e5/904253ae32b4001d1d079a924effdc9e
+++ /dev/null
@@ -1,56 +0,0 @@
-<!DOCTYPE html>
-<html xmlns:th="http://www.thymeleaf.org">
-
-<head>
-	<meta http-equiv="Content-Type" content="text/html; charset= UTF-8">
-	<meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0">
-	<title>Login - Shopme Admin</title>
-	<link rel="stylesheet" type="text/css" th:href="@{/webjars/bootstrap/css/bootstrap.min.css}" />
-</head>
-
-<body>
-	<div class="container-fluid text-center">
-		
-		<div>
-			<img th:src="@{/images/ShopmeAdminBig.png}" />
-		</div>
-		
-		<form th:action="@{/login}" method="post" style="max-width:350px; margin: 0 auto">
-			
-			<!--  ?error param will appear at the end of url if there is error with email or password  -->
-			<div th:if="${param.error}">
-				<p class="text-danger">[[${session.SPRING_SECURITY_LAST_EXCEPTION.message}]]</p>
-			</div>
-			
-			<div th:if="${param.logout}">
-				<p class="text-warning">you have been logged out</p>
-			</div>
-			
-			
-			<div class="border border-secondary rounded p-3">
-				<p>Access to Shopme Control Panel </p>
-				
-				<p>
-					<input type="email" name="email" class="form-control" placeholder="Email" required />
-				</p>
-				
-				<p>
-					<input type="password" name="password" class="form-control" placeholder="Password" required />
-				</p>
-				
-				<p>
-					<input type="submit" value="Login" class="btn btn-primary" />
-				</p>
-			</div>
-		
-		</form>
-
-		<div>
-			<p>Shopme Control Panel - Copyright &copy; Shopme</p>
-		</div>
-
-	</div>
-
-</body>
-
-</html>
\ No newline at end of file
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/e6/e04f667f23b4001d1216d7fff398b3d6 b/.metadata/.plugins/org.eclipse.core.resources/.history/e6/e04f667f23b4001d1216d7fff398b3d6
deleted file mode 100644
index 5d8efaad..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/e6/e04f667f23b4001d1216d7fff398b3d6
+++ /dev/null
@@ -1,90 +0,0 @@
-<!DOCTYPE html>
-<html xmlns:th="http://www.thymeleaf.org"
-	  xmlns:sec="https://www.thymeleaf.org/thymeleaf-extras-springsecurity5">
-
-<head>
-	<meta http-equiv="Content-Type" content="text/html; charset= UTF-8">
-	<meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0">
-	<title>Home - Shopme Admin</title>
-	
-	<link rel="stylesheet" type="text/css" th:href="@{/fontawesome/all.css}" />
-	<link rel="stylesheet" type="text/css" th:href="@{/style.css}" />
-	<link rel="stylesheet" type="text/css" th:href="@{/webjars/bootstrap/css/bootstrap.min.css}" />
-	
-	<script type="text/javascript" th:src="@{/webjars/jquery/jquery.min.js}"></script>
-	<script type="text/javascript" th:src="@{/webjars/bootstrap/js/bootstrap.min.js}"></script>
-</head>
-
-<body>
-	<div class="container-fluid">
-		<div>
-			<nav class="navbar navbar-expand-lg bg-dark navbar-dark">
-				<a class="navbar-brand" th:href="@{/}">
-					<img th:src="@{/images/ShopmeAdminSmall.png}"/>
-				</a>
-				<!--hamburger toggler for mobile devices(responsive)-->
-				<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#topNavbar">
-					<span class="navbar-toggler-icon"></span>
-				</button>
-				<div class="collapse navbar-collapse" id="topNavbar">
-					<ul class="navbar-nav">
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/users}">Users</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/categories}">Categories</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/brands}">Brands</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/products}">Products</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/customers}">Customers</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/shipping}">Shipping</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/orders}">Orders</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/report}">Sales Report</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/articles}">Articles</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/menus}">Menus</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/settings}">Settings</a>
-						</li>
-						<li>
-							<span class="fas fa-user fa-2x icon-silver"></span>
-						</li>
-						<li class="nav-item">
-													<!-- principal refers to user; display username -->
-							<a class="nav-link" sec:authentication="principal.fullname"></a>
-						</li>
-					</ul>
-				</div>
-				
-			</nav>
-		</div>
-
-		<div>
-			<h1>Shopme Control Panel</h1>
-		<div />
-
-		<div>
-			<p>Shopme Control Panel - Copyright &copy; Shopme</p>
-		<div />
-
-
-	</div>
-
-</body>
-
-</html>
\ No newline at end of file
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/e7/10eb047e58b7001d19ef99be8d31e273 b/.metadata/.plugins/org.eclipse.core.resources/.history/e7/10eb047e58b7001d19ef99be8d31e273
deleted file mode 100644
index a936067f..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/e7/10eb047e58b7001d19ef99be8d31e273
+++ /dev/null
@@ -1,19 +0,0 @@
-package com.shopme.admin.category;
-
-import java.util.List;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import com.shopme.common.entity.Category;
-
-@Service
-public class CategoryService {
-
-	@Autowired
-	private CategoryRepository repo;
-	
-	public List<Category> listAll(){
-		return (List<Category>) repo.findAll();
-	}
-}
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/e7/80b1ab606fb3001d19bbb001c1a81c20 b/.metadata/.plugins/org.eclipse.core.resources/.history/e7/80b1ab606fb3001d19bbb001c1a81c20
deleted file mode 100644
index 6903d834..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/e7/80b1ab606fb3001d19bbb001c1a81c20
+++ /dev/null
@@ -1,35 +0,0 @@
-package com.shopme.admin.user;
-
-import java.io.IOException;
-import java.text.DateFormat;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.List;
-
-import org.supercsv.io.CsvBeanWriter;
-import org.supercsv.io.ICsvBeanWriter;
-import org.supercsv.prefs.CsvPreference;
-
-import com.shopme.common.entity.User;
-
-import jakarta.servlet.http.HttpServletResponse;
-
-public class UserCsvExporter {
-
-	public void export(List<User> user, HttpServletResponse response) throws IOException {
-		
-		DateFormat dateFormatter = new SimpleDateFormat("yyyy-MM-dd_HH-mm-ss");
-		String timeStamp = dateFormatter.format(new Date());
-		String fileName = "users_" + timeStamp + ".csv";
-		
-		response.setContentType("text/csv");
-		
-		String headerKey = "Content-Disposition";
-		String headerValue = "attachment; filename=" + fileName;
-		response.setHeader(headerKey, headerValue);	
-		
-		
-		ICsvBeanWriter csvWriter = new CsvBeanWriter(response.getWriter(), CsvPreference.STANDARD_PREFERENCE);
-	}
-	
-}
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/e7/f0faa33e2fb4001d1d079a924effdc9e b/.metadata/.plugins/org.eclipse.core.resources/.history/e7/f0faa33e2fb4001d1d079a924effdc9e
deleted file mode 100644
index e59de66a..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/e7/f0faa33e2fb4001d1d079a924effdc9e
+++ /dev/null
@@ -1,97 +0,0 @@
-<!DOCTYPE html>
-<html xmlns:th="http://www.thymeleaf.org"
-	  xmlns:sec="https://www.thymeleaf.org/thymeleaf-extras-springsecurity5">
-
-<head>
-	<meta http-equiv="Content-Type" content="text/html; charset= UTF-8">
-	<meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0">
-	<title>Home - Shopme Admin</title>
-	
-	<link rel="stylesheet" type="text/css" th:href="@{/fontawesome/all.css}" />
-	<link rel="stylesheet" type="text/css" th:href="@{/style.css}" />
-	<link rel="stylesheet" type="text/css" th:href="@{/webjars/bootstrap/css/bootstrap.min.css}" />
-	
-	<script type="text/javascript" th:src="@{/webjars/jquery/jquery.min.js}"></script>
-	<script type="text/javascript" th:src="@{/webjars/bootstrap/js/bootstrap.min.js}"></script>
-</head>
-
-<body>
-	<div class="container-fluid">
-		<div>
-			<form th:action="@{/logout}" method="post" th:hidden="true" name="logoutForm">
-				<input type="submit"/>
-			</form>
-			<nav class="navbar navbar-expand-lg bg-dark navbar-dark">
-				<a class="navbar-brand" th:href="@{/}">
-					<img th:src="@{/images/ShopmeAdminSmall.png}"/>
-				</a>
-				<!--hamburger toggler for mobile devices(responsive)-->
-				<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#topNavbar">
-					<span class="navbar-toggler-icon"></span>
-				</button>
-				<div class="collapse navbar-collapse" id="topNavbar">
-					<ul class="navbar-nav">
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/users}">Users</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/categories}">Categories</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/brands}">Brands</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/products}">Products</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/customers}">Customers</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/shipping}">Shipping</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/orders}">Orders</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/report}">Sales Report</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/articles}">Articles</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/menus}">Menus</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/settings}">Settings</a>
-						</li>
-						<li>
-							<span class="fas fa-user fa-2x icon-silver"></span>
-						</li>
-						<li class="nav-item dropdown">
-								<!-- principal refers to user; display username -->
-							<a class="nav-link dropdown-toggle" sec:authentication="principal.fullname" data-toggle="dropdown"></a>
-							<div class="dropdown-menu">
-								<a class="dropdown-item" href="">Logout</a>
-							</div>
-							
-						</li>
-					</ul>
-				</div>
-				
-			</nav>
-		</div>
-
-		<div>
-			<h1>Shopme Control Panel</h1>
-		<div />
-
-		<div>
-			<p>Shopme Control Panel - Copyright &copy; Shopme</p>
-		<div />
-
-
-	</div>
-
-</body>
-
-</html>
\ No newline at end of file
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/e8/b01b4c432eb4001d1d079a924effdc9e b/.metadata/.plugins/org.eclipse.core.resources/.history/e8/b01b4c432eb4001d1d079a924effdc9e
deleted file mode 100644
index 4fc4af2b..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/e8/b01b4c432eb4001d1d079a924effdc9e
+++ /dev/null
@@ -1,97 +0,0 @@
-<!DOCTYPE html>
-<html xmlns:th="http://www.thymeleaf.org"
-	  xmlns:sec="https://www.thymeleaf.org/thymeleaf-extras-springsecurity5">
-
-<head>
-	<meta http-equiv="Content-Type" content="text/html; charset= UTF-8">
-	<meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0">
-	<title>Home - Shopme Admin</title>
-	
-	<link rel="stylesheet" type="text/css" th:href="@{/fontawesome/all.css}" />
-	<link rel="stylesheet" type="text/css" th:href="@{/style.css}" />
-	<link rel="stylesheet" type="text/css" th:href="@{/webjars/bootstrap/css/bootstrap.min.css}" />
-	
-	<script type="text/javascript" th:src="@{/webjars/jquery/jquery.min.js}"></script>
-	<script type="text/javascript" th:src="@{/webjars/bootstrap/js/bootstrap.min.js}"></script>
-</head>
-
-<body>
-	<div class="container-fluid">
-		<div>
-			<form>
-			
-			</form>
-			<nav class="navbar navbar-expand-lg bg-dark navbar-dark">
-				<a class="navbar-brand" th:href="@{/}">
-					<img th:src="@{/images/ShopmeAdminSmall.png}"/>
-				</a>
-				<!--hamburger toggler for mobile devices(responsive)-->
-				<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#topNavbar">
-					<span class="navbar-toggler-icon"></span>
-				</button>
-				<div class="collapse navbar-collapse" id="topNavbar">
-					<ul class="navbar-nav">
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/users}">Users</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/categories}">Categories</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/brands}">Brands</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/products}">Products</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/customers}">Customers</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/shipping}">Shipping</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/orders}">Orders</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/report}">Sales Report</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/articles}">Articles</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/menus}">Menus</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/settings}">Settings</a>
-						</li>
-						<li>
-							<span class="fas fa-user fa-2x icon-silver"></span>
-						</li>
-						<li class="nav-item dropdown">
-								<!-- principal refers to user; display username -->
-							<a class="nav-link dropdown-toggle" sec:authentication="principal.fullname" data-toggle="dropdown"></a>
-							<div class="dropdown-menu">
-								<a class="dropdown-item" href="">Logout</a>
-							</div>
-							
-						</li>
-					</ul>
-				</div>
-				
-			</nav>
-		</div>
-
-		<div>
-			<h1>Shopme Control Panel</h1>
-		<div />
-
-		<div>
-			<p>Shopme Control Panel - Copyright &copy; Shopme</p>
-		<div />
-
-
-	</div>
-
-</body>
-
-</html>
\ No newline at end of file
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/e9/405628396fb3001d19bbb001c1a81c20 b/.metadata/.plugins/org.eclipse.core.resources/.history/e9/405628396fb3001d19bbb001c1a81c20
deleted file mode 100644
index 26788f6e..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/e9/405628396fb3001d19bbb001c1a81c20
+++ /dev/null
@@ -1,30 +0,0 @@
-package com.shopme.admin.user;
-
-import java.text.DateFormat;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.List;
-
-import com.shopme.common.entity.User;
-
-import jakarta.servlet.http.HttpServletResponse;
-
-public class UserCsvExporter {
-
-	public void export(List<User> user, HttpServletResponse response) {
-		
-		DateFormat dateFormatter = new SimpleDateFormat("yyyy-MM-dd_HH-mm-ss");
-		String timeStamp = dateFormatter.format(new Date());
-		String fileName = "users_" + timeStamp + ".csv";
-		
-		response.setContentType("text/csv");
-		
-		String headerKey = "Content-Disposition";
-		String headerValue = "attachment; filename=" + fileName;
-		response.setHeader(headerKey, headerValue);	
-		
-		
-		
-	}
-	
-}
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/e9/9077d2f64fb3001d1e75aa5ef0815903 b/.metadata/.plugins/org.eclipse.core.resources/.history/e9/9077d2f64fb3001d1e75aa5ef0815903
deleted file mode 100644
index 18c1a1fd..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/e9/9077d2f64fb3001d1e75aa5ef0815903
+++ /dev/null
@@ -1,170 +0,0 @@
-package com.shopme.admin.user;
-
-import java.io.IOException;
-import java.util.List;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.domain.Page;
-import org.springframework.data.repository.query.Param;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
-import org.springframework.util.StringUtils;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.ModelAttribute;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.multipart.MultipartFile;
-import org.springframework.web.servlet.mvc.support.RedirectAttributes;
-
-import com.fasterxml.jackson.annotation.ObjectIdGenerators.StringIdGenerator;
-import com.shopme.admin.FileUploadUtil;
-import com.shopme.common.entity.Role;
-import com.shopme.common.entity.User;
-
-@Controller
-public class UserController {
-
-	@Autowired
-	private UserService service;
-
-	@GetMapping("/users")
-	public String listFirstPage(Model model) {
-		return listByPage(1, model, "firstName", "asc", null);
-	}
-
-	@GetMapping("/users/page/{pageNum}")
-	public String listByPage(@PathVariable(name = "pageNum") int pageNum, Model model,
-			@Param("sortField") String sortField, @Param("sortDir") String sortDir,
-			@Param("keyword") String keyword) {
-		
-		System.out.println("sort field: " + sortField);
-		System.out.println("sort order: " + sortDir);
-		
-		Page<User> page = service.listByPage(pageNum, sortField, sortDir, keyword);
-		List<User> listUsers = page.getContent();
-
-		
-		long startCount = (pageNum - 1) * UserService.USERS_PER_PAGE + 1;
-		long endCount = startCount + UserService.USERS_PER_PAGE - 1;
-		if(endCount > page.getTotalElements()) {
-			endCount = page.getTotalElements();
-		}
-		
-		String reverseSortDir = sortDir.equals("asc") ? "desc" : "asc";
-		
-		model.addAttribute("currentPage", pageNum);
-		model.addAttribute("totalPages", page.getTotalPages());
-		model.addAttribute("startCount", startCount);
-		model.addAttribute("endCount", endCount);
-		model.addAttribute("totalItems", page.getTotalElements());
-		model.addAttribute("listUsers", listUsers);
-		model.addAttribute("sortField", sortField);
-		model.addAttribute("sortDir", sortDir);
-		model.addAttribute("reverseSortDir", reverseSortDir);
-		model.addAttribute("keyword", keyword);
-		
-
-		return "users";
-
-	}
-
-	@GetMapping("/users/new")
-	public String newUser(Model model) {
-
-		List<Role> listRoles = service.listRoles();
-
-		User user = new User();
-		user.setEnabled(true);
-
-		model.addAttribute("user", user);
-		model.addAttribute("listRoles", listRoles);
-		model.addAttribute("pageTitle", "Create New User");
-
-		return "user_form";
-
-	}
-
-	// using @RequestParam, we can get the image file input, the input has the
-	// property name="image"
-	@PostMapping("/users/save")
-	public String saveUser(@ModelAttribute("user") User user, RedirectAttributes redirectAttributes,
-			@RequestParam("image") MultipartFile multipartFile) throws IOException {
-
-		if (!multipartFile.isEmpty()) {
-
-			String fileName = StringUtils.cleanPath(multipartFile.getOriginalFilename());
-			user.setPhotos(fileName);
-
-			User savedUser = service.save(user);
-
-			String uploadDir = "user-photos/" + savedUser.getId();
-
-			FileUploadUtil.cleanDir(uploadDir);
-			FileUploadUtil.saveFile(uploadDir, fileName, multipartFile);
-		} else {
-
-			// set photo to null for getPhotosImagePath() method's conditional statement in
-			// User class
-			if (user.getPhotos().isEmpty())
-				user.setPhotos(null);
-			service.save(user);
-		}
-
-		redirectAttributes.addFlashAttribute("message", "the user has been saved successfully");
-
-		// POST/REDIRECT/GET web design
-		
-		//after user is saved display the user instead of the entire user list
-		//email is a unique field to identify each user.
-		
-		return "redirect:/users";
-	}
-
-	@GetMapping("/users/edit/{id}")
-	public String editUser(@PathVariable(name = "id") Integer id, RedirectAttributes redirectAttributes, Model model) {
-		try {
-			User user = service.get(id);
-			List<Role> listRoles = service.listRoles();
-
-			model.addAttribute("user", user);
-			model.addAttribute("pageTitle", "Edit User (ID: " + id + ")");
-			model.addAttribute("listRoles", listRoles);
-
-			return "user_form";
-		} catch (UserNotFoundException ex) {
-			redirectAttributes.addFlashAttribute("message", ex.getMessage());
-
-			return "redirect:/users";
-		}
-
-	}
-
-	@GetMapping("/users/delete/{id}")
-	public String deleteUser(@PathVariable(name = "id") Integer id, RedirectAttributes redirectAttributes,
-			Model model) {
-		try {
-			service.delete(id);
-			redirectAttributes.addFlashAttribute("message", "The user ID " + id + " has been deleted successfully.");
-
-		} catch (UserNotFoundException ex) {
-			redirectAttributes.addFlashAttribute("message", ex.getMessage());
-
-		}
-
-		return "redirect:/users";
-	}
-
-	@GetMapping("/users/{id}/enabled/{status}")
-	public String updateUserEnabledStatus(@PathVariable(name = "id") Integer id,
-			@PathVariable(name = "status") boolean enabled, RedirectAttributes redirectAttributes) {
-
-		service.updateUserEnabledStatus(id, enabled);
-		String status = enabled ? "enabled" : "disabled";
-		String message = "The user id " + id + " has been " + status;
-		redirectAttributes.addFlashAttribute("message", message);
-
-		return "redirect:/users";
-	}
-
-}
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/e9/a0fd2c5579b3001d19bbb001c1a81c20 b/.metadata/.plugins/org.eclipse.core.resources/.history/e9/a0fd2c5579b3001d19bbb001c1a81c20
deleted file mode 100644
index 16222dac..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/e9/a0fd2c5579b3001d19bbb001c1a81c20
+++ /dev/null
@@ -1,37 +0,0 @@
-package com.shopme.admin.user;
-
-import java.io.IOException;
-import java.text.DateFormat;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.List;
-
-import org.supercsv.io.CsvBeanWriter;
-import org.supercsv.io.ICsvBeanWriter;
-import org.supercsv.prefs.CsvPreference;
-
-import com.shopme.common.entity.User;
-
-import jakarta.servlet.http.HttpServletResponse;
-
-public class UserCsvExporter extends AbstractExporter {
-
-	public void export(List<User> listUsers, HttpServletResponse response) throws IOException {
-		
-		super.setResponseHeader(response, ".csv" , "text/csv");
-		
-		ICsvBeanWriter csvWriter = new CsvBeanWriter(response.getWriter(), CsvPreference.STANDARD_PREFERENCE);
-		
-		String[] csvHeader = {"User ID", "E-mail", "First Name", "Last Name", "Roles", "Enabled"};
-		String[] fieldMapping = {"id", "email", "firstName", "lastName", "roles", "enabled"};
-		
-		csvWriter.writeHeader(csvHeader);
-		
-		for (User user : listUsers) {
-			csvWriter.write(user, fieldMapping);
-		}
-		
-		csvWriter.close();
-	}
-	
-}
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/e9/c02c4d5f8cb3001d19bbb001c1a81c20 b/.metadata/.plugins/org.eclipse.core.resources/.history/e9/c02c4d5f8cb3001d19bbb001c1a81c20
deleted file mode 100644
index d1668cb6..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/e9/c02c4d5f8cb3001d19bbb001c1a81c20
+++ /dev/null
@@ -1,259 +0,0 @@
-<!DOCTYPE html>
-<html xmlns:th="http://www.thymeleaf.org">
-
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset= UTF-8">
-<meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0">
-<title>Manage Users</title>
-
-<link rel="stylesheet" type="text/css" th:href="@{/webjars/bootstrap/css/bootstrap.min.css}" />
-<link rel="stylesheet" type="text/css" th:href="@{/fontawesome/all.css}" />
-<link rel="stylesheet" type="text/css" th:href="@{/style.css}" />
-	
-<script type="text/javascript" th:src="@{/webjars/jquery/jquery.min.js}"></script>
-<script type="text/javascript" th:src="@{/webjars/bootstrap/js/bootstrap.min.js}"></script>
-</head>
-
-<body>
-	<div class="container-fluid">
-		<div>
-			<nav class="navbar navbar-expand-lg bg-dark navbar-dark">
-				<a class="navbar-brand" th:href="@{/}"> <img
-					th:src="@{/images/ShopmeAdminSmall.png}" />
-				</a>
-				<!--hamburger toggler for mobile devices(responsive)-->
-				<button class="navbar-toggler" type="button" data-toggle="collapse"
-					data-target="#topNavbar">
-					<span class="navbar-toggler-icon"></span>
-				</button>
-				<div class="collapse navbar-collapse" id="topNavbar">
-					<ul class="navbar-nav">
-						<li class="nav-item"><a class="nav-link" th:href="@{/users}">Users</a>
-						</li>
-						<li class="nav-item"><a class="nav-link"
-							th:href="@{/categories}">Categories</a></li>
-						<li class="nav-item"><a class="nav-link" th:href="@{/brands}">Brands</a>
-						</li>
-						<li class="nav-item"><a class="nav-link"
-							th:href="@{/products}">Products</a></li>
-						<li class="nav-item"><a class="nav-link"
-							th:href="@{/customers}">Customers</a></li>
-						<li class="nav-item"><a class="nav-link"
-							th:href="@{/shipping}">Shipping</a></li>
-						<li class="nav-item"><a class="nav-link" th:href="@{/orders}">Orders</a>
-						</li>
-						<li class="nav-item"><a class="nav-link" th:href="@{/report}">Sales
-								Report</a></li>
-						<li class="nav-item"><a class="nav-link"
-							th:href="@{/articles}">Articles</a></li>
-						<li class="nav-item"><a class="nav-link" th:href="@{/menus}">Menus</a>
-						</li>
-						<li class="nav-item"><a class="nav-link"
-							th:href="@{/settings}">Settings</a></li>
-					</ul>
-				</div>
-
-			</nav>
-		</div>
-
-		<div>
-			<h2>Manage Users</h2>
-			<a th:href="@{/users/new}" class="fas fa-user-plus fa-2x icon-dark mr-2"></a>
-			
-			<a th:href="@{/users/export/csv}" class="fas fa-file-csv fa-2x icon-dark mr-2"></a>
-		</div>
-		
-		
-		
-		<!-- only display success message when a new user is created -->
-		<div th:if="${message != null}" class="alert alert-success text-center">
-			[[${message}]]
-		</div>
-			
-		<div>
-			<form th:action="@{/users/page/1}" class="form-inline m-3">
-				
-				<input type="hidden" name="sortField" th:value="${sortField}" />
-				<input type="hidden" name="sortDir" th:value="${sortDir}" />
-				Filter:&nbsp;
-				<input type="search" name="keyword" th:value="${keyword}" class="form-control" required/>
-				&nbsp;&nbsp;
-				<button type="submit" class="btn btn-primary">
-					<i class="fas fa-search"></i>
-				</button>
-				&nbsp;&nbsp;
-				<button type="button" class="btn btn-secondary" onclick="clearFilter()">
-					<i class="fas fa-eraser"></i>
-				</button>
-			</form>
-		
-		</div>
-
-			<!-- css class to display this table in large screens only , refer to static/style.css for more info-->
-			<div class="full-details">
-				<table class="table table-bordered table-striped table-hover table-responsive-xL">
-					<thead class="thead-dark">
-						<tr>
-							<!-- refer to templates/fragments.html for fragment code-->
-							<th th:replace="fragments :: column_link('id', 'User ID')"/>
-							<th>Photos</th>
-							<th th:replace="fragments :: column_link('email', 'Email')"/>
-							<th th:replace="fragments :: column_link('firstName', 'First Name')"/>
-							<th th:replace="fragments :: column_link('lastName', 'Last Name')"/>
-							<th>Roles</th>
-							<th th:replace="fragments :: column_link('enabled', 'Enabled')"/>
-							<th></th>
-						</tr>
-					</thead>
-					<tbody>
-						<tr th:each="user : ${listUsers}">
-							<td>[[${user.id}]]</td>
-							<td>
-								<span th:if="${user.photos == null}" class="fas fa-portrait fa-3x icon-dark"></span>
-								<img th:if="${user.photos != null}" th:src="@{${user.photosImagePath}}"
-								style="width: 100px"/>
-							</td>
-							<td>[[${user.email}]]</td>
-							<td>[[${user.firstName}]]</td>
-							<td>[[${user.lastName}]]</td>
-							<td>[[${user.roles}]]</td>
-							
-							<td>
-								<a th:if="${user.enabled == true}" class="fas fa-check-circle fa-2x icon-green" 
-								th:href="@{'/users/' + ${user.id} + '/enabled/false'}"
-								title="Disable this user"></a>
-								
-								<a th:if="${user.enabled == false}" class="fas fa-circle fa-2x icon-silver"
-								 th:href="@{'/users/' + ${user.id} + '/enabled/true'}"
-								 title="Enable this user"></a>
-							</td>
-							<td>
-									<a class="fas fa-edit fa-2x icon-green" th:href="@{'/users/edit/' + ${user.id}}"
-									title="edit this user"></a>
-									&nbsp; 
-									<a class="fas fa-trash fa-2x icon-dark link-delete" th:href="@{'/users/delete/' + ${user.id}}"
-									title="delete this user" th:userId="${user.id}"></a>
-							</td>
-						</tr>
-					</tbody>
-				</table>
-			</div>
-			
-			
-			<!-- css class to display this on mobile screens only, refer to /static/style.css for more info-->
-			<div class="less-details">
-				
-				<div th:each="user : ${listUsers}" class="row m-1">
-					
-					<div class="col">
-						
-						<span th:if="${user.photos == null}" class="fas fa-portrait fa-3x icon-dark"></span>
-								<img th:if="${user.photos != null}" th:src="@{${user.photosImagePath}}"
-								style="width: 100px"/>
-					</div>
-						<div class="col">
-							<div>[[${user.fullName}]]</div>
-							<div>[[${user.roles}]]</div>
-						</div>
-					<div>&nbsp;</div>
-				</div>
-			</div>
-			
-			
-			<!-- IF -->
-			<div class="text-center m-1" th:if="${totalItems > 0}">
-				<span>Showing Users # [[${startCount}]] to [[${endCount}]] of [[${totalItems}]]</span>
-			</div>
-			
-			<!-- ELSE -->
-			<div class="text-center m-1" th:unless="${totalItems > 0}">
-				<span>No users found</span>
-			</div>
-			
-			<!-- only display pagination when there are users; else, no users no pagination -->
-			<div th:if="${totalPages > 1}">
-				<nav>
-					  <ul class="pagination justify-content-center flex-wrap">
-					  
-					  	<li th:class=" ${currentPage > 1 ? 'page-item' : 'page-item disabled'}">
-					  		<a th:replace="fragments :: page_link(1, 'First')"></a>
-				    	</li>
-					  
-					    <li th:class=" ${currentPage > 1 ? 'page-item' : 'page-item disabled'}">
-					    	<a th:replace="fragments :: page_link(${currentPage - 1 }, 'previous')"></a>
-				    	</li>
-					    	
-					    <!-- org.thymeleaf.expression.Numbers class, An object of this class is usually available in variable evaluation expressions with the name #numbers. -->
-					    <li th:class="${currentPage != i ? 'page-item' : 'page-item active'}" 
-					    	th:each="i : ${#numbers.sequence(1, totalPages)}">
-					    	<a th:replace="fragments :: page_link(${i}, ${i})"></a>
-					    </li>
-					    
-					    <li  th:class=" ${currentPage < totalPages ? 'page-item' : 'page-item disabled'}">
-					    	<a th:replace="fragments :: page_link(${currentPage + 1}, 'Next')"></a>
-					    </li>
-					    
-					    <li th:class=" ${currentPage < totalPages ? 'page-item' : 'page-item disabled'}">
-							<a th:replace="fragments :: page_link(${totalPages}, 'Last')"></a>		
-					    </li>
-					  </ul>
-				</nav>
-			</div>
-			
-			
-			
-			<div class="modal fade text-center" id="confirmModal">
-				<div class="modal-dialog">
-					<div class="modal-content">
-					
-						<div class="modal-header">
-							<h4 class="modal-title">Delete Confirmation</h4>
-							<button type="button" class="close" data-dismiss="modal">&times;</button>
-						</div>
-						
-						<div class="modal-body">
-							<span id="confirmText"></span>
-						</div>
-						
-						<div class="modal-footer">
-							<a class="btn btn-success" href="" id="yesButton">Yes</a>
-							<button type="button" class="btn btn-danger" data-dismiss="modal">Close</button>
-						</div>
-					</div>
-				</div>
-			</div>
-			
-			
-			<div class="text-center">
-				<p>Shopme Control Panel - Copyright &copy; Shopme</p>
-			</div>
-
-
-	</div>
-	
-<script type="text/javascript">
-
-//confirmation modal dialogue for delete user
-$(document).ready(function(){
-	$(".link-delete").on("click", function(e){
-		//stop the <a> tag default behaviour and pop out a confirmation modal dialogue
-		e.preventDefault();
-		//alert($(this).attr("href"));
-		link = $(this);
-		userId = link.attr("userId");
-		$("#yesButton").attr("href", link.attr("href"));
-		$("#confirmText").text("Are you sure you want to delete this user ID " + userId + "?");
-		$("#confirmModal").modal();
-	});
-});
-
-	function clearFilter(){
-		window.location = "[[@{/users}]]";
-	}
-
-
-</script>
-	
-</body>
-
-</html>
\ No newline at end of file
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/ea/30b639fd8ab3001d19bbb001c1a81c20 b/.metadata/.plugins/org.eclipse.core.resources/.history/ea/30b639fd8ab3001d19bbb001c1a81c20
deleted file mode 100644
index a767d4d3..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/ea/30b639fd8ab3001d19bbb001c1a81c20
+++ /dev/null
@@ -1,255 +0,0 @@
-<!DOCTYPE html>
-<html xmlns:th="http://www.thymeleaf.org">
-
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset= UTF-8">
-<meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0">
-<title>Manage Users</title>
-
-<link rel="stylesheet" type="text/css" th:href="@{/webjars/bootstrap/css/bootstrap.min.css}" />
-<link rel="stylesheet" type="text/css" th:href="@{/fontawesome/all.css}" />
-<link rel="stylesheet" type="text/css" th:href="@{/style.css}" />
-	
-<script type="text/javascript" th:src="@{/webjars/jquery/jquery.min.js}"></script>
-<script type="text/javascript" th:src="@{/webjars/bootstrap/js/bootstrap.min.js}"></script>
-</head>
-
-<body>
-	<div class="container-fluid">
-		<div>
-			<nav class="navbar navbar-expand-lg bg-dark navbar-dark">
-				<a class="navbar-brand" th:href="@{/}"> <img
-					th:src="@{/images/ShopmeAdminSmall.png}" />
-				</a>
-				<!--hamburger toggler for mobile devices(responsive)-->
-				<button class="navbar-toggler" type="button" data-toggle="collapse"
-					data-target="#topNavbar">
-					<span class="navbar-toggler-icon"></span>
-				</button>
-				<div class="collapse navbar-collapse" id="topNavbar">
-					<ul class="navbar-nav">
-						<li class="nav-item"><a class="nav-link" th:href="@{/users}">Users</a>
-						</li>
-						<li class="nav-item"><a class="nav-link"
-							th:href="@{/categories}">Categories</a></li>
-						<li class="nav-item"><a class="nav-link" th:href="@{/brands}">Brands</a>
-						</li>
-						<li class="nav-item"><a class="nav-link"
-							th:href="@{/products}">Products</a></li>
-						<li class="nav-item"><a class="nav-link"
-							th:href="@{/customers}">Customers</a></li>
-						<li class="nav-item"><a class="nav-link"
-							th:href="@{/shipping}">Shipping</a></li>
-						<li class="nav-item"><a class="nav-link" th:href="@{/orders}">Orders</a>
-						</li>
-						<li class="nav-item"><a class="nav-link" th:href="@{/report}">Sales
-								Report</a></li>
-						<li class="nav-item"><a class="nav-link"
-							th:href="@{/articles}">Articles</a></li>
-						<li class="nav-item"><a class="nav-link" th:href="@{/menus}">Menus</a>
-						</li>
-						<li class="nav-item"><a class="nav-link"
-							th:href="@{/settings}">Settings</a></li>
-					</ul>
-				</div>
-
-			</nav>
-		</div>
-
-		<div>
-			<h2>Manage Users</h2>
-			<a th:href="@{/users/new}" class="fas fa-user-plus fa-2x icon-dark mr-2"></a>
-			
-			<a th:href="@{/users/export/csv}" class="fas fa-file-csv fa-2x icon-dark mr-2"></a>
-		</div>
-		
-		
-		
-		<!-- only display success message when a new user is created -->
-		<div th:if="${message != null}" class="alert alert-success text-center">
-			[[${message}]]
-		</div>
-			
-		<div>
-			<form th:action="@{/users/page/1}" class="form-inline m-3">
-				
-				<input type="hidden" name="sortField" th:value="${sortField}" />
-				<input type="hidden" name="sortDir" th:value="${sortDir}" />
-				Filter:&nbsp;
-				<input type="search" name="keyword" th:value="${keyword}" class="form-control" required/>
-				&nbsp;&nbsp;
-				<button type="submit" class="btn btn-primary">
-					<i class="fas fa-search"></i>
-				</button>
-				&nbsp;&nbsp;
-				<button type="button" class="btn btn-secondary" onclick="clearFilter()">
-					<i class="fas fa-eraser"></i>
-				</button>
-			</form>
-		
-		</div>
-
-
-			<div class="full-details">
-				<table class="table table-bordered table-striped table-hover table-responsive-xL">
-					<thead class="thead-dark">
-						<tr>
-							<!-- refer to templates/fragments.html for fragment code-->
-							<th th:replace="fragments :: column_link('id', 'User ID')"/>
-							<th>Photos</th>
-							<th th:replace="fragments :: column_link('email', 'Email')"/>
-							<th th:replace="fragments :: column_link('firstName', 'First Name')"/>
-							<th th:replace="fragments :: column_link('lastName', 'Last Name')"/>
-							<th>Roles</th>
-							<th th:replace="fragments :: column_link('enabled', 'Enabled')"/>
-							<th></th>
-						</tr>
-					</thead>
-					<tbody>
-						<tr th:each="user : ${listUsers}">
-							<td>[[${user.id}]]</td>
-							<td>
-								<span th:if="${user.photos == null}" class="fas fa-portrait fa-3x icon-dark"></span>
-								<img th:if="${user.photos != null}" th:src="@{${user.photosImagePath}}"
-								style="width: 100px"/>
-							</td>
-							<td>[[${user.email}]]</td>
-							<td>[[${user.firstName}]]</td>
-							<td>[[${user.lastName}]]</td>
-							<td>[[${user.roles}]]</td>
-							
-							<td>
-								<a th:if="${user.enabled == true}" class="fas fa-check-circle fa-2x icon-green" 
-								th:href="@{'/users/' + ${user.id} + '/enabled/false'}"
-								title="Disable this user"></a>
-								
-								<a th:if="${user.enabled == false}" class="fas fa-circle fa-2x icon-silver"
-								 th:href="@{'/users/' + ${user.id} + '/enabled/true'}"
-								 title="Enable this user"></a>
-							</td>
-							<td>
-									<a class="fas fa-edit fa-2x icon-green" th:href="@{'/users/edit/' + ${user.id}}"
-									title="edit this user"></a>
-									&nbsp; 
-									<a class="fas fa-trash fa-2x icon-dark link-delete" th:href="@{'/users/delete/' + ${user.id}}"
-									title="delete this user" th:userId="${user.id}"></a>
-							</td>
-						</tr>
-					</tbody>
-				</table>
-			</div>
-			
-			
-			<!-- display this on mobile screens only, refer to /static/style.css for more info-->
-			<div class="less-details">
-				
-				<div th:each="user : ${listUsers}" class="row">
-					
-					<div class="col">
-						
-						<span th:if="${user.photos == null}" class="fas fa-portrait fa-3x icon-dark"></span>
-								<img th:if="${user.photos != null}" th:src="@{${user.photosImagePath}}"
-								style="width: 100px"/>
-					</div>
-						
-				</div>
-			</div>
-			
-			
-			<!-- IF -->
-			<div class="text-center m-1" th:if="${totalItems > 0}">
-				<span>Showing Users # [[${startCount}]] to [[${endCount}]] of [[${totalItems}]]</span>
-			</div>
-			
-			<!-- ELSE -->
-			<div class="text-center m-1" th:unless="${totalItems > 0}">
-				<span>No users found</span>
-			</div>
-			
-			<!-- only display pagination when there are users; else, no users no pagination -->
-			<div th:if="${totalPages > 1}">
-				<nav>
-					  <ul class="pagination justify-content-center">
-					  
-					  	<li th:class=" ${currentPage > 1 ? 'page-item' : 'page-item disabled'}">
-					  		<a th:replace="fragments :: page_link(1, 'First')"></a>
-				    	</li>
-					  
-					    <li th:class=" ${currentPage > 1 ? 'page-item' : 'page-item disabled'}">
-					    	<a th:replace="fragments :: page_link(${currentPage - 1 }, 'previous')"></a>
-				    	</li>
-					    	
-					    <!-- org.thymeleaf.expression.Numbers class, An object of this class is usually available in variable evaluation expressions with the name #numbers. -->
-					    <li th:class="${currentPage != i ? 'page-item' : 'page-item active'}" 
-					    	th:each="i : ${#numbers.sequence(1, totalPages)}">
-					    	<a th:replace="fragments :: page_link(${i}, ${i})"></a>
-					    </li>
-					    
-					    <li  th:class=" ${currentPage < totalPages ? 'page-item' : 'page-item disabled'}">
-					    	<a th:replace="fragments :: page_link(${currentPage + 1}, 'Next')"></a>
-					    </li>
-					    
-					    <li th:class=" ${currentPage < totalPages ? 'page-item' : 'page-item disabled'}">
-							<a th:replace="fragments :: page_link(${totalPages}, 'Last')"></a>		
-					    </li>
-					  </ul>
-				</nav>
-			</div>
-			
-			
-			
-			<div class="modal fade text-center" id="confirmModal">
-				<div class="modal-dialog">
-					<div class="modal-content">
-					
-						<div class="modal-header">
-							<h4 class="modal-title">Delete Confirmation</h4>
-							<button type="button" class="close" data-dismiss="modal">&times;</button>
-						</div>
-						
-						<div class="modal-body">
-							<span id="confirmText"></span>
-						</div>
-						
-						<div class="modal-footer">
-							<a class="btn btn-success" href="" id="yesButton">Yes</a>
-							<button type="button" class="btn btn-danger" data-dismiss="modal">Close</button>
-						</div>
-					</div>
-				</div>
-			</div>
-			
-			
-			<div class="text-center">
-				<p>Shopme Control Panel - Copyright &copy; Shopme</p>
-			</div>
-
-
-	</div>
-	
-<script type="text/javascript">
-
-//confirmation modal dialogue for delete user
-$(document).ready(function(){
-	$(".link-delete").on("click", function(e){
-		//stop the <a> tag default behaviour and pop out a confirmation modal dialogue
-		e.preventDefault();
-		//alert($(this).attr("href"));
-		link = $(this);
-		userId = link.attr("userId");
-		$("#yesButton").attr("href", link.attr("href"));
-		$("#confirmText").text("Are you sure you want to delete this user ID " + userId + "?");
-		$("#confirmModal").modal();
-	});
-});
-
-	function clearFilter(){
-		window.location = "[[@{/users}]]";
-	}
-
-
-</script>
-	
-</body>
-
-</html>
\ No newline at end of file
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/ea/60ec048909b4001d128fb79045552177 b/.metadata/.plugins/org.eclipse.core.resources/.history/ea/60ec048909b4001d128fb79045552177
deleted file mode 100644
index 73a9cbc2..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/ea/60ec048909b4001d128fb79045552177
+++ /dev/null
@@ -1,26 +0,0 @@
-<!DOCTYPE html>
-<html xmlns:th="http://www.thymeleaf.org">
-
-<head>
-	<meta http-equiv="Content-Type" content="text/html; charset= UTF-8">
-	<meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0">
-	<title>Login - Shopme Admin</title>
-	<link rel="stylesheet" type="text/css" th:href="@{/webjars/bootstrap/css/bootstrap.min.css}" />
-</head>
-
-<body>
-	<div class="container-fluid">
-		
-		<div>
-			<img th:src="@{/images/ShopmeAdminBig.png}" />
-		</div>
-
-		<div>
-			<p>Shopme Control Panel - Copyright &copy; Shopme</p>
-		</div>
-
-	</div>
-
-</body>
-
-</html>
\ No newline at end of file
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/ea/90ac8fe513b4001d128fb79045552177 b/.metadata/.plugins/org.eclipse.core.resources/.history/ea/90ac8fe513b4001d128fb79045552177
deleted file mode 100644
index 821edba9..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/ea/90ac8fe513b4001d128fb79045552177
+++ /dev/null
@@ -1,77 +0,0 @@
-package com.shopme.admin.security;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-import java.util.Set;
-
-import org.springframework.security.core.GrantedAuthority;
-import org.springframework.security.core.authority.SimpleGrantedAuthority;
-import org.springframework.security.core.userdetails.UserDetails;
-
-import com.shopme.common.entity.Role;
-import com.shopme.common.entity.User;
-
-/*
- *  Think of it as a wrapper class for  Type User
- * 
- * */
-public class ShopmeUserDetails implements UserDetails {
-
-	private User user;
-
-	public ShopmeUserDetails(User user) {
-		this.user = user;
-	}
-
-	/* get a list of assigned roles to user */
-	@Override
-	public Collection<? extends GrantedAuthority> getAuthorities() {
-
-		Set<Role> roles = user.getRoles();
-
-		List<SimpleGrantedAuthority> authorities = new ArrayList<>();
-
-		for (Role role : roles) {
-			authorities.add(new SimpleGrantedAuthority(role.getName()));
-		}
-
-		return authorities;
-	}
-
-	@Override
-	public String getPassword() {
-		return user.getPassword();
-	}
-
-	@Override
-	public String getUsername() {
-		// TODO Auto-generated method stub
-		return null;
-	}
-
-	@Override
-	public boolean isAccountNonExpired() {
-		// TODO Auto-generated method stub
-		return false;
-	}
-
-	@Override
-	public boolean isAccountNonLocked() {
-		// TODO Auto-generated method stub
-		return false;
-	}
-
-	@Override
-	public boolean isCredentialsNonExpired() {
-		// TODO Auto-generated method stub
-		return false;
-	}
-
-	@Override
-	public boolean isEnabled() {
-		// TODO Auto-generated method stub
-		return false;
-	}
-
-}
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/ea/b0a69c3d77b3001d19bbb001c1a81c20 b/.metadata/.plugins/org.eclipse.core.resources/.history/ea/b0a69c3d77b3001d19bbb001c1a81c20
deleted file mode 100644
index e69de29b..00000000
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/eb/10ae64c54bb4001d1d079a924effdc9e b/.metadata/.plugins/org.eclipse.core.resources/.history/eb/10ae64c54bb4001d1d079a924effdc9e
deleted file mode 100644
index c46239ed..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/eb/10ae64c54bb4001d1d079a924effdc9e
+++ /dev/null
@@ -1,88 +0,0 @@
-package com.shopme.admin.security;
-
-import org.aspectj.weaver.ast.And;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.security.authentication.dao.DaoAuthenticationProvider;
-import org.springframework.security.config.annotation.web.builders.HttpSecurity;
-import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
-import org.springframework.security.config.annotation.web.configuration.WebSecurityConfiguration;
-import org.springframework.security.config.annotation.web.configuration.WebSecurityCustomizer;
-import org.springframework.security.core.userdetails.UserDetailsService;
-import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
-import org.springframework.security.crypto.password.PasswordEncoder;
-import org.springframework.security.web.SecurityFilterChain;
-
-@Configuration
-@EnableWebSecurity
-public class WebSecurityConfig {
-
-	/*
-	 * refer to this link: https://www.codejava.net/frameworks/spring-boot/fix-
-	 * websecurityconfigureradapter-deprecated
-	 * 
-	 */
-	
-	
-	 /* This bean will be called by spring security when performing authentication*/ 
-	@Bean
-	public UserDetailsService  userDetailsService()	{
-		return new ShopmeUserDetailsService();
-	}
-	
-
-	@Bean
-	public PasswordEncoder passwordEncoder() {
-		return new BCryptPasswordEncoder();
-	}
-
-	
-	@Bean
-	public DaoAuthenticationProvider authenticationProvider() {
-	    DaoAuthenticationProvider authProvider = new DaoAuthenticationProvider();
-	     
-	    authProvider.setUserDetailsService(userDetailsService());
-	    authProvider.setPasswordEncoder(passwordEncoder());
-	 
-	    return authProvider;
-	}
-	
-	
-	@Bean
-	public SecurityFilterChain filterChain(HttpSecurity http) throws Exception {
-
-		// any request need to be authenticated (require login)
-		// custom login page at "/login" - handler method in MainController class
-		http.authorizeHttpRequests()
-			.anyRequest().authenticated()
-			.and()
-			.formLogin()
-				.loginPage("/login")
-				.usernameParameter("email")
-				.permitAll()
-			.and().logout().permitAll()
-			.and().rememberMe().key("AbcDefgHijKlmnOpqrs_1234567890")
-			.tokenValiditySeconds(7 * 24 * 60 * 60);  // cookie is valid for one week
-		
-		/*
-		 * set a fix key used for the md5 hash algorithm to encrypt cookie content each
-		 * time the application is restarted, a new key will be generated; this key will
-		 * be used to encrypt the cookie content so, in order for the cookie to be
-		 * permanent; a fix key is needed.
-		 */
-		
-		http.authenticationProvider(authenticationProvider());
-		
-		
-		return http.build();
-	}
-
-	//NOTE: antMatchers() changed to requestMatchers()
-	//stack: https://stackoverflow.com/questions/74907533/the-method-antmatchersstring-is-undefined-for-the-type
-	@Bean
-	public WebSecurityCustomizer webSecurityCustomizer() {
-		//permit access to the assets in the following directories
-		return (web) -> web.ignoring().requestMatchers("/images/**", "/js/**", "/webjars/**");
-	}
-
-}
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/ec/90c1dee550b3001d1e75aa5ef0815903 b/.metadata/.plugins/org.eclipse.core.resources/.history/ec/90c1dee550b3001d1e75aa5ef0815903
deleted file mode 100644
index b273ec64..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/ec/90c1dee550b3001d1e75aa5ef0815903
+++ /dev/null
@@ -1,176 +0,0 @@
-package com.shopme.admin.user;
-
-import java.io.IOException;
-import java.util.List;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.domain.Page;
-import org.springframework.data.repository.query.Param;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
-import org.springframework.util.StringUtils;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.ModelAttribute;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.multipart.MultipartFile;
-import org.springframework.web.servlet.mvc.support.RedirectAttributes;
-
-import com.fasterxml.jackson.annotation.ObjectIdGenerators.StringIdGenerator;
-import com.shopme.admin.FileUploadUtil;
-import com.shopme.common.entity.Role;
-import com.shopme.common.entity.User;
-
-@Controller
-public class UserController {
-
-	@Autowired
-	private UserService service;
-
-	@GetMapping("/users")
-	public String listFirstPage(Model model) {
-		return listByPage(1, model, "firstName", "asc", null);
-	}
-
-	@GetMapping("/users/page/{pageNum}")
-	public String listByPage(@PathVariable(name = "pageNum") int pageNum, Model model,
-			@Param("sortField") String sortField, @Param("sortDir") String sortDir,
-			@Param("keyword") String keyword) {
-		
-		System.out.println("sort field: " + sortField);
-		System.out.println("sort order: " + sortDir);
-		
-		Page<User> page = service.listByPage(pageNum, sortField, sortDir, keyword);
-		List<User> listUsers = page.getContent();
-
-		
-		long startCount = (pageNum - 1) * UserService.USERS_PER_PAGE + 1;
-		long endCount = startCount + UserService.USERS_PER_PAGE - 1;
-		if(endCount > page.getTotalElements()) {
-			endCount = page.getTotalElements();
-		}
-		
-		String reverseSortDir = sortDir.equals("asc") ? "desc" : "asc";
-		
-		model.addAttribute("currentPage", pageNum);
-		model.addAttribute("totalPages", page.getTotalPages());
-		model.addAttribute("startCount", startCount);
-		model.addAttribute("endCount", endCount);
-		model.addAttribute("totalItems", page.getTotalElements());
-		model.addAttribute("listUsers", listUsers);
-		model.addAttribute("sortField", sortField);
-		model.addAttribute("sortDir", sortDir);
-		model.addAttribute("reverseSortDir", reverseSortDir);
-		model.addAttribute("keyword", keyword);
-		
-
-		return "users";
-
-	}
-
-	@GetMapping("/users/new")
-	public String newUser(Model model) {
-
-		List<Role> listRoles = service.listRoles();
-
-		User user = new User();
-		user.setEnabled(true);
-
-		model.addAttribute("user", user);
-		model.addAttribute("listRoles", listRoles);
-		model.addAttribute("pageTitle", "Create New User");
-
-		return "user_form";
-
-	}
-
-	// using @RequestParam, we can get the image file input, the input has the
-	// property name="image"
-	@PostMapping("/users/save")
-	public String saveUser(@ModelAttribute("user") User user, RedirectAttributes redirectAttributes,
-			@RequestParam("image") MultipartFile multipartFile) throws IOException {
-
-		if (!multipartFile.isEmpty()) {
-
-			String fileName = StringUtils.cleanPath(multipartFile.getOriginalFilename());
-			user.setPhotos(fileName);
-
-			User savedUser = service.save(user);
-
-			String uploadDir = "user-photos/" + savedUser.getId();
-
-			FileUploadUtil.cleanDir(uploadDir);
-			FileUploadUtil.saveFile(uploadDir, fileName, multipartFile);
-		} else {
-
-			// set photo to null for getPhotosImagePath() method's conditional statement in
-			// User class
-			if (user.getPhotos().isEmpty())
-				user.setPhotos(null);
-			service.save(user);
-		}
-
-		redirectAttributes.addFlashAttribute("message", "the user has been saved successfully");
-
-		// POST/REDIRECT/GET web design
-		
-		//after user is saved display the user instead of the entire user list
-		//email is a unique field to identify each user.
-		
-		
-		return getRedirectURLtoAffectedUser(user);
-	}
-
-	private String getRedirectURLtoAffectedUser(User user) {
-		String firstPartOfEmail = user.getEmail().split("@")[0];
-		return "redirect:/users/page/1?sortField=id&sortDir=asc&keyword=" + firstPartOfEmail;
-	}
-
-	@GetMapping("/users/edit/{id}")
-	public String editUser(@PathVariable(name = "id") Integer id, RedirectAttributes redirectAttributes, Model model) {
-		try {
-			User user = service.get(id);
-			List<Role> listRoles = service.listRoles();
-
-			model.addAttribute("user", user);
-			model.addAttribute("pageTitle", "Edit User (ID: " + id + ")");
-			model.addAttribute("listRoles", listRoles);
-
-			return "user_form";
-		} catch (UserNotFoundException ex) {
-			redirectAttributes.addFlashAttribute("message", ex.getMessage());
-
-			return "redirect:/users";
-		}
-
-	}
-
-	@GetMapping("/users/delete/{id}")
-	public String deleteUser(@PathVariable(name = "id") Integer id, RedirectAttributes redirectAttributes,
-			Model model) {
-		try {
-			service.delete(id);
-			redirectAttributes.addFlashAttribute("message", "The user ID " + id + " has been deleted successfully.");
-
-		} catch (UserNotFoundException ex) {
-			redirectAttributes.addFlashAttribute("message", ex.getMessage());
-
-		}
-
-		return "redirect:/users";
-	}
-
-	@GetMapping("/users/{id}/enabled/{status}")
-	public String updateUserEnabledStatus(@PathVariable(name = "id") Integer id,
-			@PathVariable(name = "status") boolean enabled, RedirectAttributes redirectAttributes) {
-
-		service.updateUserEnabledStatus(id, enabled);
-		String status = enabled ? "enabled" : "disabled";
-		String message = "The user id " + id + " has been " + status;
-		redirectAttributes.addFlashAttribute("message", message);
-
-		return "redirect:/users";
-	}
-
-}
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/ec/90c634d727b3001d1e75aa5ef0815903 b/.metadata/.plugins/org.eclipse.core.resources/.history/ec/90c634d727b3001d1e75aa5ef0815903
deleted file mode 100644
index e73086f5..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/ec/90c634d727b3001d1e75aa5ef0815903
+++ /dev/null
@@ -1,135 +0,0 @@
-package com.shopme.admin.user;
-
-import java.util.List;
-import java.util.NoSuchElementException;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.domain.Page;
-import org.springframework.data.domain.PageRequest;
-import org.springframework.data.domain.Pageable;
-import org.springframework.data.domain.Sort;
-import org.springframework.security.crypto.password.PasswordEncoder;
-import org.springframework.stereotype.Service;
-
-import com.shopme.common.entity.Role;
-import com.shopme.common.entity.User;
-
-import jakarta.transaction.Transactional;
-
-@Service
-@Transactional
-public class UserService {
-
-	public static final int USERS_PER_PAGE = 4;
-	
-	@Autowired
-	private UserRepository userRepo;
-
-	@Autowired
-	private RoleRepository roleRepo;
-
-	@Autowired
-	private PasswordEncoder passwordEncoder;
-
-	public List<User> listAll() {
-		
-		return (List<User>) userRepo.findAll();
-	}
-	
-	
-	public Page<User> listByPage(int pageNum, String sortField, String sortDir, String keyword) {
-		
-		Sort sort = Sort.by(sortField);
-		
-		sort = sortDir.equals("asc") ? sort.ascending() : sort.descending();
-		
-		//page number start with 0 for pageable, so need to minus 1.
-		Pageable pageable = PageRequest.of(pageNum - 1, USERS_PER_PAGE, sort);
-		
-		return userRepo.findAll(pageable);
-	}
-	
-
-	public List<Role> listRoles() {
-
-		return (List<Role>) roleRepo.findAll();
-	}
-
-	public User save(User user) {
-
-		boolean isUpdatingUser = (user.getId() != null);
-
-		if (isUpdatingUser) {
-
-			User existingUser = userRepo.findById(user.getId()).get();
-
-			if (user.getPassword().isEmpty()) {
-				/*
-				 * if we do not set the user password to existing user password, password field
-				 * will be an empty string. When the user object is saved to database, the empty
-				 * string will replace the encoded password.
-				 */
-				user.setPassword(existingUser.getPassword());
-			} else {
-				encodePassword(user);
-			}
-
-		} else {
-			encodePassword(user);
-		}
-
-		return userRepo.save(user);
-	}
-
-	private void encodePassword(User user) {
-
-		String encodedPassword = passwordEncoder.encode(user.getPassword());
-		user.setPassword(encodedPassword);
-	}
-
-	public boolean isEmailUnique(Integer id, String email) {
-		User userByEmail = userRepo.getUserByEmail(email);
-
-		if (userByEmail == null)
-			return true;
-
-		boolean isCreatingNew = (id == null);
-
-		if (isCreatingNew) {
-			if (userByEmail != null)
-				return false;
-		} else {
-			if (userByEmail.getId() != id) {
-				return false;
-			}
-		}
-
-		return true;
-	}
-
-	public User get(Integer id) throws UserNotFoundException {
-		try {
-			return userRepo.findById(id).get();
-		} catch (NoSuchElementException ex) {
-			throw new UserNotFoundException("could not find any user with id: " + id);
-		}
-	}
-
-	public void delete(Integer id) throws UserNotFoundException {
-
-		Long countById = userRepo.countById(id);
-
-		if (countById == null || countById == 0) {
-			throw new UserNotFoundException("could not find any user with id: " + id);
-		}
-		
-		userRepo.deleteById(id);
-	}
-	
-	public void updateUserEnabledStatus(Integer id, boolean enabled) {
-		
-		 userRepo.updateEnabledStatus(id, enabled);
-	}
-	
-
-}
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/ec/e0885ba629b8001d1d97982e354adf88 b/.metadata/.plugins/org.eclipse.core.resources/.history/ec/e0885ba629b8001d1d97982e354adf88
deleted file mode 100644
index f48db5e4..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/ec/e0885ba629b8001d1d97982e354adf88
+++ /dev/null
@@ -1,65 +0,0 @@
-package com.shopme.admin.category;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Set;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import com.shopme.common.entity.Category;
-
-@Service
-public class CategoryService {
-
-	@Autowired
-	private CategoryRepository repo;
-	
-	public List<Category> listAll(){
-		return (List<Category>) repo.findAll();
-	}
-	
-	public List<Category> listCategoriesUsedInForm(){
-		
-		List<Category> categoriesUsedInForm = new ArrayList<>();
-		
-		Iterable<Category> categoriesInDB = repo.findAll();
-		
-		for (Category category : categoriesInDB) {
-
-			// root category
-			if (category.getParent() == null) {
-				System.out.println(category.getName());
-
-				category.getChildren().forEach(subCategory -> {
-
-					System.out.println("--" + subCategory.getName());
-					printChildren(subCategory, 1);
-				});
-			}
-
-		}
-		
-		
-		return categoriesUsedInForm;
-	}
-	
-	private void listChildren(Category parent, int subLevel) {
-
-		int newSubLevel = subLevel + 1;
-		Set<Category> children = parent.getChildren();
-
-		for (Category subCategory : children) {
-
-			for (int i = 0; i < newSubLevel; i++) {
-				System.out.print("--");
-			}
-
-			System.out.println(subCategory.getName());
-
-			printChildren(subCategory, newSubLevel);
-		}
-
-	}
-	
-}
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/ed/20e1d36f30b4001d1d079a924effdc9e b/.metadata/.plugins/org.eclipse.core.resources/.history/ed/20e1d36f30b4001d1d079a924effdc9e
deleted file mode 100644
index 9a9ce2fe..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/ed/20e1d36f30b4001d1d079a924effdc9e
+++ /dev/null
@@ -1,112 +0,0 @@
-<!DOCTYPE html>
-<html xmlns:th="http://www.thymeleaf.org"
-	  xmlns:sec="https://www.thymeleaf.org/thymeleaf-extras-springsecurity5">
-
-<head>
-	<meta http-equiv="Content-Type" content="text/html; charset= UTF-8">
-	<meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0">
-	<title>Home - Shopme Admin</title>
-	
-	<link rel="stylesheet" type="text/css" th:href="@{/fontawesome/all.css}" />
-	<link rel="stylesheet" type="text/css" th:href="@{/style.css}" />
-	<link rel="stylesheet" type="text/css" th:href="@{/webjars/bootstrap/css/bootstrap.min.css}" />
-	
-	<script type="text/javascript" th:src="@{/webjars/jquery/jquery.min.js}"></script>
-	<script type="text/javascript" th:src="@{/webjars/bootstrap/js/bootstrap.min.js}"></script>
-</head>
-
-<body>
-	<div class="container-fluid">
-		<div>
-			<form th:action="@{/logout}" method="post" th:hidden="true" name="logoutForm">
-				<input type="submit"/>
-			</form>
-			<nav class="navbar navbar-expand-lg bg-dark navbar-dark">
-				<a class="navbar-brand" th:href="@{/}">
-					<img th:src="@{/images/ShopmeAdminSmall.png}"/>
-				</a>
-				<!--hamburger toggler for mobile devices(responsive)-->
-				<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#topNavbar">
-					<span class="navbar-toggler-icon"></span>
-				</button>
-				<div class="collapse navbar-collapse" id="topNavbar">
-					<ul class="navbar-nav">
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/users}">Users</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/categories}">Categories</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/brands}">Brands</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/products}">Products</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/customers}">Customers</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/shipping}">Shipping</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/orders}">Orders</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/report}">Sales Report</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/articles}">Articles</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/menus}">Menus</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/settings}">Settings</a>
-						</li>
-						<li>
-							<span class="fas fa-user fa-2x icon-silver"></span>
-						</li>
-						<li class="nav-item dropdown">
-								<!-- principal refers to user; display username -->
-							<a class="nav-link dropdown-toggle" sec:authentication="principal.fullname" data-toggle="dropdown"></a>
-							<div class="dropdown-menu">
-								<a class="dropdown-item" id="logoutLink" href="">Logout</a>
-							</div>
-							
-						</li>
-					</ul>
-				</div>
-				
-			</nav>
-		</div>
-
-		<div>
-			<h1>Shopme Control Panel</h1>
-		</div>
-
-		<div>
-			<p>Shopme Control Panel - Copyright &copy; Shopme</p>
-		</div>
-
-
-	</div>
-	
-<script type="text/javascript">
-
-	$(document).ready(function(){
-		$("#logoutLink").on("click" function(e){
-			e.preventDefault(); /* stop the hyperlink default behaviour  */
-			/* use  the form to  log out and navigate to the url path /logout  
-			
-			 NOTE: spring security requires POST to logout
-			*/
-			document.logoutForm.submit();
-		});
-	});
-
-</script>
-
-</body>
-
-</html>
\ No newline at end of file
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/ed/702b1e3144b4001d1d079a924effdc9e b/.metadata/.plugins/org.eclipse.core.resources/.history/ed/702b1e3144b4001d1d079a924effdc9e
deleted file mode 100644
index c9ef4bdf..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/ed/702b1e3144b4001d1d079a924effdc9e
+++ /dev/null
@@ -1,43 +0,0 @@
-<!DOCTYPE html>
-<html xmlns:th="http://www.thymeleaf.org">
-
-<head th:fragment="page_head(title)">
-	<meta http-equiv="Content-Type" content="text/html; charset= UTF-8">
-	<meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0">
-	<title>[[${title}]]</title>
-	
-	<link rel="stylesheet" type="text/css" th:href="@{/fontawesome/all.css}" />
-	<link rel="stylesheet" type="text/css" th:href="@{/style.css}" />
-	<link rel="stylesheet" type="text/css" th:href="@{/webjars/bootstrap/css/bootstrap.min.css}" />
-	
-	<script type="text/javascript" th:src="@{/webjars/jquery/jquery.min.js}"></script>
-	<script type="text/javascript" th:src="@{/webjars/bootstrap/js/bootstrap.min.js}"></script>
-</head>
-
-<body>
-
-		<!-- purpose: make code more succinct and readable 
-		project is easier to maintain
-		
-		use thymeleaf fragments -->
-
-	<!-- if  ${removeTag} == 'tag' then the <th> parent tag will be removed.  if ${removeTag} == 'none' then keep the <th> parent tag-->
-	<th th:fragment="column_link(fieldName, columnLabel, removeTag)" th:remove="${removeTag}">
-		<!-- follow the sort order of another sortField; if the other field is sortDir="asc", then the newly selected column will be sortDir="asc" too -->
-		<a class="text-white"
-		   th:href="@{'/users/page/' + ${currentPage} + '?sortField=' + ${fieldName} + '&sortDir=' + ${sortField != fieldName ? sortDir : reverseSortDir} + ${keyword != null ? '&keyword=' + keyword : ''}}">
-			[[${columnLabel}]]
-		</a>
-		
-		<span th:if="${sortField == fieldName}"
-		th:class="${sortDir == 'asc' ? 'fas fa-sort-up' : 'fas fa-sort-down'}"></span>
-	</th>
-	
-	
-	<a th:fragment="page_link(pageNum, label)"
-	   class="page-link"
-	   th:href= "@{'/users/page/' + ${pageNum} + '?sortField=' + ${sortField} + '&sortDir=' + ${sortDir} + ${keyword != null ? '&keyword=' + keyword : ''}}">[[${label}]]</a>
-	
-	
-</body>
-</html>
\ No newline at end of file
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/ed/f0208a5d45b4001d1d079a924effdc9e b/.metadata/.plugins/org.eclipse.core.resources/.history/ed/f0208a5d45b4001d1d079a924effdc9e
deleted file mode 100644
index 0bedde0d..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/ed/f0208a5d45b4001d1d079a924effdc9e
+++ /dev/null
@@ -1,43 +0,0 @@
-<!DOCTYPE html>
-<html xmlns:th="http://www.thymeleaf.org"
-	  xmlns:sec="https://www.thymeleaf.org/thymeleaf-extras-springsecurity5">
-
-<head th:replace="fragments :: page_head('Home - Shopme Admin')"/>
-
-<body>
-	<div class="container-fluid">
-			
-		<head th:replace="fragments :: page_head('Users - Shopme Admin')"/>
-
-		<div>
-			<h1>Shopme Control Panel</h1>
-		</div>
-
-		<div>
-			<p>Shopme Control Panel - Copyright &copy; Shopme</p>
-		</div>
-
-
-	</div>
-	
-<script type="text/javascript">
-
-	$(document).ready(function(){
-		$("#logoutLink").on("click", function(e){
-			e.preventDefault(); /* stop the hyperlink default behaviour  */
-			
-			
-			/* use  the form to  log out and navigate to the url path /logout  
-			
-			 NOTE: spring security requires a POST request form to logout in order to obtain the csrf token, 
-			 		the csrf token is a hidden property in the form
-			*/
-			document.logoutForm.submit();
-		});
-	});
-
-</script>
-
-</body>
-
-</html>
\ No newline at end of file
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/ef/a06dadaf2db4001d1d079a924effdc9e b/.metadata/.plugins/org.eclipse.core.resources/.history/ef/a06dadaf2db4001d1d079a924effdc9e
deleted file mode 100644
index 18d0dc5b..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/ef/a06dadaf2db4001d1d079a924effdc9e
+++ /dev/null
@@ -1,94 +0,0 @@
-<!DOCTYPE html>
-<html xmlns:th="http://www.thymeleaf.org"
-	  xmlns:sec="https://www.thymeleaf.org/thymeleaf-extras-springsecurity5">
-
-<head>
-	<meta http-equiv="Content-Type" content="text/html; charset= UTF-8">
-	<meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0">
-	<title>Home - Shopme Admin</title>
-	
-	<link rel="stylesheet" type="text/css" th:href="@{/fontawesome/all.css}" />
-	<link rel="stylesheet" type="text/css" th:href="@{/style.css}" />
-	<link rel="stylesheet" type="text/css" th:href="@{/webjars/bootstrap/css/bootstrap.min.css}" />
-	
-	<script type="text/javascript" th:src="@{/webjars/jquery/jquery.min.js}"></script>
-	<script type="text/javascript" th:src="@{/webjars/bootstrap/js/bootstrap.min.js}"></script>
-</head>
-
-<body>
-	<div class="container-fluid">
-		<div>
-			<nav class="navbar navbar-expand-lg bg-dark navbar-dark">
-				<a class="navbar-brand" th:href="@{/}">
-					<img th:src="@{/images/ShopmeAdminSmall.png}"/>
-				</a>
-				<!--hamburger toggler for mobile devices(responsive)-->
-				<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#topNavbar">
-					<span class="navbar-toggler-icon"></span>
-				</button>
-				<div class="collapse navbar-collapse" id="topNavbar">
-					<ul class="navbar-nav">
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/users}">Users</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/categories}">Categories</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/brands}">Brands</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/products}">Products</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/customers}">Customers</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/shipping}">Shipping</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/orders}">Orders</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/report}">Sales Report</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/articles}">Articles</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/menus}">Menus</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link" th:href="@{/settings}">Settings</a>
-						</li>
-						<li>
-							<span class="fas fa-user fa-2x icon-silver"></span>
-						</li>
-						<li class="nav-item dropdown">
-								<!-- principal refers to user; display username -->
-							<a class="nav-link dropdown-toggle" sec:authentication="principal.fullname"></a>
-							<div>
-							
-							</div>
-							
-						</li>
-					</ul>
-				</div>
-				
-			</nav>
-		</div>
-
-		<div>
-			<h1>Shopme Control Panel</h1>
-		<div />
-
-		<div>
-			<p>Shopme Control Panel - Copyright &copy; Shopme</p>
-		<div />
-
-
-	</div>
-
-</body>
-
-</html>
\ No newline at end of file
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/ef/d0b0ce3c52b4001d1d079a924effdc9e b/.metadata/.plugins/org.eclipse.core.resources/.history/ef/d0b0ce3c52b4001d1d079a924effdc9e
deleted file mode 100644
index b956e340..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/ef/d0b0ce3c52b4001d1d079a924effdc9e
+++ /dev/null
@@ -1,80 +0,0 @@
-<!DOCTYPE html>
-<html xmlns:th="http://www.thymeleaf.org">
-
-<body>
-
-	<div th:fragment="menu">
-		<!--   
-			use  the form to  log out and navigate to the url path /logout  
-		
-		    NOTE: spring security requires a POST request form to logout in order to obtain the csrf token, 
-		 		the csrf token is a hidden property in the form -->
-		 
-		<form th:action="@{/logout}" method="post" th:hidden="true" name="logoutForm">
-			<input type="submit"/>
-		</form>
-		<nav class="navbar navbar-expand-lg bg-dark navbar-dark">
-			<a class="navbar-brand" th:href="@{/}">
-				<img th:src="@{/images/ShopmeAdminSmall.png}"/>
-			</a>
-			<!--hamburger toggler for mobile devices(responsive)-->
-			<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#topNavbar">
-				<span class="navbar-toggler-icon"></span>
-			</button>
-			<div class="collapse navbar-collapse" id="topNavbar">
-				<ul class="navbar-nav">
-					<li class="nav-item">
-						<a class="nav-link" th:href="@{/users}">Users</a>
-					</li>
-					<li class="nav-item">
-						<a class="nav-link" th:href="@{/categories}">Categories</a>
-					</li>
-					<li class="nav-item">
-						<a class="nav-link" th:href="@{/brands}">Brands</a>
-					</li>
-					<li class="nav-item">
-						<a class="nav-link" th:href="@{/products}">Products</a>
-					</li>
-					<li class="nav-item">
-						<a class="nav-link" th:href="@{/customers}">Customers</a>
-					</li>
-					<li class="nav-item">
-						<a class="nav-link" th:href="@{/shipping}">Shipping</a>
-					</li>
-					<li class="nav-item">
-						<a class="nav-link" th:href="@{/orders}">Orders</a>
-					</li>
-					<li class="nav-item">
-						<a class="nav-link" th:href="@{/report}">Sales Report</a>
-					</li>
-					<li class="nav-item">
-						<a class="nav-link" th:href="@{/articles}">Articles</a>
-					</li>
-					<li class="nav-item">
-						<a class="nav-link" th:href="@{/menus}">Menus</a>
-					</li>
-					<li class="nav-item">
-						<a class="nav-link" th:href="@{/settings}">Settings</a>
-					</li>
-					<li>
-						<span class="fas fa-user fa-2x icon-silver"></span>
-					</li>
-					<li class="nav-item dropdown">
-							<!-- principal refers to user; display username -->
-						<a class="nav-link dropdown-toggle" sec:authentication="principal.fullname" 
-						data-toggle="dropdown"
-						th:href="@{}"></a>
-						<div class="dropdown-menu">
-							<a class="dropdown-item" id="logoutLink" href="">Logout</a>
-						</div>
-						
-					</li>
-				</ul>
-			</div>
-			
-		</nav>
-	</div>
-	
-	
-</body>
-</html>
\ No newline at end of file
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/ef/f09a572513b4001d128fb79045552177 b/.metadata/.plugins/org.eclipse.core.resources/.history/ef/f09a572513b4001d128fb79045552177
deleted file mode 100644
index 751d0516..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/ef/f09a572513b4001d128fb79045552177
+++ /dev/null
@@ -1,72 +0,0 @@
-package com.shopme.admin.security;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-import java.util.Set;
-
-import org.springframework.security.core.GrantedAuthority;
-import org.springframework.security.core.authority.SimpleGrantedAuthority;
-import org.springframework.security.core.userdetails.UserDetails;
-
-import com.shopme.common.entity.User;
-
-
-/*
- *  Think of it as a wrapper class for  Type User
- * 
- * */
-public class ShopmeUserDetails implements UserDetails {
-
-	private User user;
-	
-	public ShopmeUserDetails(User user) {
-		this.user = user;
-	}
-
-	@Override
-	public Collection<? extends GrantedAuthority> getAuthorities() {
-
-		Set<Role> roles = user.getRoles();
-		
-		List<SimpleGrantedAuthority> authorities = new ArrayList<>();
-		return null;
-	}
-
-	@Override
-	public String getPassword() {
-		// TODO Auto-generated method stub
-		return null;
-	}
-
-	@Override
-	public String getUsername() {
-		// TODO Auto-generated method stub
-		return null;
-	}
-
-	@Override
-	public boolean isAccountNonExpired() {
-		// TODO Auto-generated method stub
-		return false;
-	}
-
-	@Override
-	public boolean isAccountNonLocked() {
-		// TODO Auto-generated method stub
-		return false;
-	}
-
-	@Override
-	public boolean isCredentialsNonExpired() {
-		// TODO Auto-generated method stub
-		return false;
-	}
-
-	@Override
-	public boolean isEnabled() {
-		// TODO Auto-generated method stub
-		return false;
-	}
-
-}
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/f/b06ee8221eb4001d1216d7fff398b3d6 b/.metadata/.plugins/org.eclipse.core.resources/.history/f/b06ee8221eb4001d1216d7fff398b3d6
deleted file mode 100644
index 405ed235..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/f/b06ee8221eb4001d1216d7fff398b3d6
+++ /dev/null
@@ -1,201 +0,0 @@
-package com.shopme.admin.user;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
-import java.util.List;
-
-import org.hibernate.internal.build.AllowSysOut;
-import org.hibernate.query.sqm.mutation.internal.TableKeyExpressionCollector;
-import org.junit.jupiter.api.Test;
-import org.springframework.aot.nativex.NativeConfigurationWriter;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.autoconfigure.jdbc.AutoConfigureTestDatabase;
-import org.springframework.boot.test.autoconfigure.jdbc.AutoConfigureTestDatabase.Replace;
-import org.springframework.boot.test.autoconfigure.orm.jpa.DataJpaTest;
-import org.springframework.boot.test.autoconfigure.orm.jpa.TestEntityManager;
-import org.springframework.data.domain.Page;
-import org.springframework.data.domain.PageRequest;
-import org.springframework.data.domain.Pageable;
-import org.springframework.test.annotation.Rollback;
-
-import com.shopme.common.entity.Role;
-import com.shopme.common.entity.User;
-
-@DataJpaTest(showSql = false)
-//configure to run on real database(MySQL) instead of a test database
-@AutoConfigureTestDatabase(replace = Replace.NONE)
-/*
- * Datajpatest will rollback the transaction after executing the test method
- * everytime, so that the transaction will not be committed. if we want to
- * commit the transaction(aka "save the record"), we can disable rollback by
- * setting it to false. Now, all transactions will be committed
- */
-@Rollback(false)
-public class UserRepositoryTests {
-
-	@Autowired
-	private UserRepository repo;
-
-	@Autowired
-	private TestEntityManager entityManager;
-
-	// On the very first execution of testCreateUser() method; hibernate will create
-	// the users table & users_roles table
-	@Test
-	public void testCreateUserWithOneRole() {
-
-		Role roleAdmin = entityManager.find(Role.class, 1);
-		User userChow = new User("chow@gmail.com", "password", "chow", "seng fung");
-		userChow.addRoles(roleAdmin);
-		User savedUser = repo.save(userChow);
-		assertThat(savedUser.getId()).isGreaterThan(0);
-
-	}
-
-	@Test
-	public void testCreateUserWithTwoRole() {
-
-		User userRavi = new User("ravi@gmail.com", "ravipass", "ravi", "kumar");
-		Role roleEditor = new Role(3);
-		Role roleAssistant = new Role(5);
-
-		userRavi.addRoles(roleEditor);
-		userRavi.addRoles(roleAssistant);
-
-		User savedUser = repo.save(userRavi);
-		assertThat(savedUser.getId()).isGreaterThan(0);
-	}
-
-	@Test
-	public void testListAllUsers() {
-		Iterable<User> listUsers = repo.findAll();
-
-		// use method reference instead of lambda expression here
-		listUsers.forEach(System.out::println);
-
-	}
-
-	@Test
-	public void testGetUserById() {
-
-		User userChow = repo.findById(1).get();
-		System.out.println(userChow);
-		// use method reference instead of lambda expression here
-		assertThat(userChow).isNotNull();
-	}
-
-	@Test
-	public void testUpdateUserDetails() {
-		
-		User userChow = repo.findById(1).get();
-		userChow.setEnabled(true);
-		userChow.setEmail("chow22@gmail.com");
-		
-		repo.save(userChow);
-	}
-	
-	@Test
-	public void testUpdateUserRoles() {
-		
-		User userRavi = repo.findById(4).get();
-		Role roleEditor = new Role(3);
-		Role roleSalesperson= new Role(2);
-		
-		//change role from editor to salesperson
-		
-		/* take note of overriding/implementing the hashcode and equals method in roles
-		 * class. need to override those two methods for remove() to work.
-		 *  The remove() method removes an element "e" such that Objects.equals(o, e),
-		 *  this will invoke the overwritten equals() method in Role Class. 
-		 * */
-		userRavi.getRoles().remove(roleEditor);
-		userRavi.addRoles(roleSalesperson);
-		
-		repo.save(userRavi);
-	}
-	
-	@Test
-	public void testDeleteUser() {
-		
-		Integer userId = 4;
-		repo.deleteById(userId);
-	}
-	
-	
-	@Test
-	public void testGetUserByEmail() {
-		String email = "ravi@gmail.com";
-		User user = repo.getUserByEmail(email);
-		
-		assertThat(user).isNotNull();
-	}
-	
-	/*
-	 * count the number of records in database with a particular id.
-	 * return value should be 1,
-	 * because id is unique.
-	 * 
-	 * use countById() method to test whether a user exists. 
-	 */
-	@Test
-	public void testCountById() {
-		
-		Integer userId = 1;
-		Long countById = repo.countById(userId);
-		
-		assertThat(countById).isNotNull().isGreaterThan(0).isEqualTo(1);
-	}
-	
-	@Test	
-	public void testDisableUser() {
-		Integer userId = 1;
-		
-		repo.updateEnabledStatus(userId, false);
-	}
-
-	@Test	
-	public void testEnableUser() {
-		Integer userId = 1;
-		
-		repo.updateEnabledStatus(userId, true);
-	}
-	
-	@Test
-	public void testListFirstPage() {
-		int pageNumber = 0; // the first page number always start with 0, change pageNumber to 1 to get the second page, 2 for thid page and so forth
-		int pageSize = 4; // no of elements
-		
-		Pageable pageable = PageRequest.of(pageNumber, pageSize);
-		Page<User> page = repo.findAll(pageable);
-		
-		List<User> listUsers = page.getContent();
-		
-		listUsers.forEach(System.out::println);
-		
-		assertThat(listUsers.size()).isEqualTo(pageSize);
-	}
-	
-	
-	@Test 
-	public void testSearchUsers() {
-		
-		String keyword = "bruce";
-		
-		
-		int pageNumber = 0; // the first page number always start with 0, change pageNumber to 1 to get the second page, 2 for thid page and so forth
-		int pageSize = 4; // no of elements
-		
-		Pageable pageable = PageRequest.of(pageNumber, pageSize);
-		Page<User> page = repo.findAll(keyword, pageable);
-		
-		List<User> listUsers = page.getContent();
-		
-		listUsers.forEach(System.out::println);
-		
-		assertThat(listUsers.size()).isGreaterThan(0);
-		
-	}
-	
-	
-}
-
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/f/d06a80f74fb3001d1e75aa5ef0815903 b/.metadata/.plugins/org.eclipse.core.resources/.history/f/d06a80f74fb3001d1e75aa5ef0815903
deleted file mode 100644
index 51e08620..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/f/d06a80f74fb3001d1e75aa5ef0815903
+++ /dev/null
@@ -1,172 +0,0 @@
-package com.shopme.admin.user;
-
-import java.io.IOException;
-import java.util.List;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.domain.Page;
-import org.springframework.data.repository.query.Param;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
-import org.springframework.util.StringUtils;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.ModelAttribute;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.multipart.MultipartFile;
-import org.springframework.web.servlet.mvc.support.RedirectAttributes;
-
-import com.fasterxml.jackson.annotation.ObjectIdGenerators.StringIdGenerator;
-import com.shopme.admin.FileUploadUtil;
-import com.shopme.common.entity.Role;
-import com.shopme.common.entity.User;
-
-@Controller
-public class UserController {
-
-	@Autowired
-	private UserService service;
-
-	@GetMapping("/users")
-	public String listFirstPage(Model model) {
-		return listByPage(1, model, "firstName", "asc", null);
-	}
-
-	@GetMapping("/users/page/{pageNum}")
-	public String listByPage(@PathVariable(name = "pageNum") int pageNum, Model model,
-			@Param("sortField") String sortField, @Param("sortDir") String sortDir,
-			@Param("keyword") String keyword) {
-		
-		System.out.println("sort field: " + sortField);
-		System.out.println("sort order: " + sortDir);
-		
-		Page<User> page = service.listByPage(pageNum, sortField, sortDir, keyword);
-		List<User> listUsers = page.getContent();
-
-		
-		long startCount = (pageNum - 1) * UserService.USERS_PER_PAGE + 1;
-		long endCount = startCount + UserService.USERS_PER_PAGE - 1;
-		if(endCount > page.getTotalElements()) {
-			endCount = page.getTotalElements();
-		}
-		
-		String reverseSortDir = sortDir.equals("asc") ? "desc" : "asc";
-		
-		model.addAttribute("currentPage", pageNum);
-		model.addAttribute("totalPages", page.getTotalPages());
-		model.addAttribute("startCount", startCount);
-		model.addAttribute("endCount", endCount);
-		model.addAttribute("totalItems", page.getTotalElements());
-		model.addAttribute("listUsers", listUsers);
-		model.addAttribute("sortField", sortField);
-		model.addAttribute("sortDir", sortDir);
-		model.addAttribute("reverseSortDir", reverseSortDir);
-		model.addAttribute("keyword", keyword);
-		
-
-		return "users";
-
-	}
-
-	@GetMapping("/users/new")
-	public String newUser(Model model) {
-
-		List<Role> listRoles = service.listRoles();
-
-		User user = new User();
-		user.setEnabled(true);
-
-		model.addAttribute("user", user);
-		model.addAttribute("listRoles", listRoles);
-		model.addAttribute("pageTitle", "Create New User");
-
-		return "user_form";
-
-	}
-
-	// using @RequestParam, we can get the image file input, the input has the
-	// property name="image"
-	@PostMapping("/users/save")
-	public String saveUser(@ModelAttribute("user") User user, RedirectAttributes redirectAttributes,
-			@RequestParam("image") MultipartFile multipartFile) throws IOException {
-
-		if (!multipartFile.isEmpty()) {
-
-			String fileName = StringUtils.cleanPath(multipartFile.getOriginalFilename());
-			user.setPhotos(fileName);
-
-			User savedUser = service.save(user);
-
-			String uploadDir = "user-photos/" + savedUser.getId();
-
-			FileUploadUtil.cleanDir(uploadDir);
-			FileUploadUtil.saveFile(uploadDir, fileName, multipartFile);
-		} else {
-
-			// set photo to null for getPhotosImagePath() method's conditional statement in
-			// User class
-			if (user.getPhotos().isEmpty())
-				user.setPhotos(null);
-			service.save(user);
-		}
-
-		redirectAttributes.addFlashAttribute("message", "the user has been saved successfully");
-
-		// POST/REDIRECT/GET web design
-		
-		//after user is saved display the user instead of the entire user list
-		//email is a unique field to identify each user.
-		
-		//get first part of email
-		String firstPartOfEmail = user.getEmail().split('@')[0]
-		return "redirect:/users/page/1?sortField=id&sortDir=asc&keyword=";
-	}
-
-	@GetMapping("/users/edit/{id}")
-	public String editUser(@PathVariable(name = "id") Integer id, RedirectAttributes redirectAttributes, Model model) {
-		try {
-			User user = service.get(id);
-			List<Role> listRoles = service.listRoles();
-
-			model.addAttribute("user", user);
-			model.addAttribute("pageTitle", "Edit User (ID: " + id + ")");
-			model.addAttribute("listRoles", listRoles);
-
-			return "user_form";
-		} catch (UserNotFoundException ex) {
-			redirectAttributes.addFlashAttribute("message", ex.getMessage());
-
-			return "redirect:/users";
-		}
-
-	}
-
-	@GetMapping("/users/delete/{id}")
-	public String deleteUser(@PathVariable(name = "id") Integer id, RedirectAttributes redirectAttributes,
-			Model model) {
-		try {
-			service.delete(id);
-			redirectAttributes.addFlashAttribute("message", "The user ID " + id + " has been deleted successfully.");
-
-		} catch (UserNotFoundException ex) {
-			redirectAttributes.addFlashAttribute("message", ex.getMessage());
-
-		}
-
-		return "redirect:/users";
-	}
-
-	@GetMapping("/users/{id}/enabled/{status}")
-	public String updateUserEnabledStatus(@PathVariable(name = "id") Integer id,
-			@PathVariable(name = "status") boolean enabled, RedirectAttributes redirectAttributes) {
-
-		service.updateUserEnabledStatus(id, enabled);
-		String status = enabled ? "enabled" : "disabled";
-		String message = "The user id " + id + " has been " + status;
-		redirectAttributes.addFlashAttribute("message", message);
-
-		return "redirect:/users";
-	}
-
-}
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/f2/00008b1c23b4001d1216d7fff398b3d6 b/.metadata/.plugins/org.eclipse.core.resources/.history/f2/00008b1c23b4001d1216d7fff398b3d6
deleted file mode 100644
index f5d8e598..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/f2/00008b1c23b4001d1216d7fff398b3d6
+++ /dev/null
@@ -1,86 +0,0 @@
-package com.shopme.admin.security;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-import java.util.Set;
-
-import org.aspectj.weaver.patterns.ThisOrTargetAnnotationPointcut;
-import org.springframework.security.core.GrantedAuthority;
-import org.springframework.security.core.authority.SimpleGrantedAuthority;
-import org.springframework.security.core.userdetails.UserDetails;
-
-import com.shopme.common.entity.Role;
-import com.shopme.common.entity.User;
-
-/*
- *  Think of it as a wrapper class for  Type User
- *  
- *  ShopmeUserDetailsService will use this dao class
- * 
- * 	this is for spring security
- * */
-public class ShopmeUserDetails implements UserDetails {
-
-	private User user;
-
-	public ShopmeUserDetails(User user) {
-		this.user = user;
-	}
-
-	/* get a list of assigned roles to user */
-	@Override
-	public Collection<? extends GrantedAuthority> getAuthorities() {
-
-		Set<Role> roles = user.getRoles();
-
-		List<SimpleGrantedAuthority> authorities = new ArrayList<>();
-
-		for (Role role : roles) {
-			authorities.add(new SimpleGrantedAuthority(role.getName()));
-		}
-
-		return authorities;
-	}
-
-	@Override
-	public String getPassword() {
-		return user.getPassword();
-	}
-
-	@Override
-	public String getUsername() {
-		return user.getEmail();
-	}
-
-	// "true" means account not expired
-	@Override
-	public boolean isAccountNonExpired() {
-		return true;
-	}
-
-	@Override
-	public boolean isAccountNonLocked() {
-		// TODO Auto-generated method stub
-		return true;
-	}
-
-	@Override
-	public boolean isCredentialsNonExpired() {
-		// TODO Auto-generated method stub
-		return true;
-	}
-
-	@Override
-	public boolean isEnabled() {
-		// TODO Auto-generated method stub
-		return user.isEnabled();
-	}
-	
-	public String getFullname() {
-		
-		return this.user.getFirstName() + " " + this.user.getLastName();
-	}
-	
-
-}
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/f3/b09f042d40b3001d1e75aa5ef0815903 b/.metadata/.plugins/org.eclipse.core.resources/.history/f3/b09f042d40b3001d1e75aa5ef0815903
deleted file mode 100644
index 7f2245b4..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/f3/b09f042d40b3001d1e75aa5ef0815903
+++ /dev/null
@@ -1,54 +0,0 @@
-package com.shopme.admin.user;
-
-import org.springframework.data.domain.Page;
-import org.springframework.data.domain.Pageable;
-import org.springframework.data.jpa.repository.Modifying;
-import org.springframework.data.jpa.repository.Query;
-import org.springframework.data.repository.CrudRepository;
-import org.springframework.data.repository.PagingAndSortingRepository;
-import org.springframework.data.repository.query.Param;
-import org.springframework.stereotype.Repository;
-
-import com.shopme.common.entity.User;
-
-@Repository
-public interface UserRepository extends CrudRepository<User, Integer>, PagingAndSortingRepository<User, Integer> {
-
-	/*
-	 * JPQL statement. It should be noted that as compared to native SQL, JPQL does
-	 * not interact with database tables, records, and fields - but with Java
-	 * classes and instances.
-	 * 
-	 * JPA kicks in as the mediator and transpiles JPQL queries to SQL queries for execution.
-	 * 
-	 * If your database can change or varies from development to production, as long as 
-	 * they're both relational - JPQL works wonders and you can 
-	 * write JPQL queries to create generic logic that can be used over and over again.
-	 */
-	@Query("SELECT u FROM User u WHERE u.email = :email")
-	public User getUserByEmail(@Param("email") String email);
-	
-	// countById() declaration follows the JPA specification
-	//to check the existence of a user
-	public Long countById(Integer id);
-	
-	
-	//for filtering users by keyword
-	/*
-	 * @Query("SELECT u FROM User u WHERE u.firstName LIKE %?1% OR u.lastName LIKE %?1%"
-	 * + " OR u.email LIKE %?1%")
-	 * 
-	 * the above query does not work when we search for user with keyword "nam ha minh".
-	 * 
-	 * Instead we should concatenate the fields separated by space as the query below
-	 */
-	 @Query("SELECT u FROM User u WHERE  CONCAT(u.id, ' ', u.email, ' ', u.firstName, ' ', u.lastName) LIKE %?1%")
-	public Page<User> findAll(String keyword, Pageable pageable);
-	
-	
-	//change user enabled status
-	//need @Modifying annotation for update/delete operation
-	@Query("UPDATE User u SET u.enabled = ?2 WHERE u.id = ?1")
-	@Modifying
-	public void updateEnabledStatus(Integer id, boolean enabled);
-}
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/f3/c0855db0f9b8001d11addcb4256c67f9 b/.metadata/.plugins/org.eclipse.core.resources/.history/f3/c0855db0f9b8001d11addcb4256c67f9
new file mode 100644
index 00000000..c7fff7fd
--- /dev/null
+++ b/.metadata/.plugins/org.eclipse.core.resources/.history/f3/c0855db0f9b8001d11addcb4256c67f9
@@ -0,0 +1,44 @@
+package com.shopme.admin;
+
+import java.nio.file.Path;
+import java.nio.file.Paths;
+
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
+
+@Configuration
+public class MvcConfig implements WebMvcConfigurer {
+
+	
+	/*
+	 * In short, we can tell Spring MVC to map a given URL (e.g. "/user-photos") 
+	 * to any directory (e.g. D:/ShopmeProject/ShopmeBackend/user-photos) 
+	 * and expose the resources (images, js, css...) in this directory to 
+	 * the web clients (browsers) - that's the primary purpose
+	 *  of using resource handlers in Spring MVC.
+	 * 
+	 * Because the resources are not locoated in the src/main/resources/static folder
+	 * */
+	
+	@Override
+	public void addResourceHandlers(ResourceHandlerRegistry registry) {
+
+		String dirName = "user-photos";
+		
+		Path userPhotoDir = Paths.get(dirName);
+		
+		String userPhotosPath = userPhotoDir.toFile().getAbsolutePath();
+		
+		
+		// add /** to allow all files under this directory to be available to client
+		
+		registry.addResourceHandler("/" + dirName + "/**")
+		.addResourceLocations("file:/" + userPhotosPath + "/");
+		
+	}
+	
+	
+	
+	
+}
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/f3/d049481d55b4001d1d079a924effdc9e b/.metadata/.plugins/org.eclipse.core.resources/.history/f3/d049481d55b4001d1d079a924effdc9e
deleted file mode 100644
index e572aaae..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/f3/d049481d55b4001d1d079a924effdc9e
+++ /dev/null
@@ -1,140 +0,0 @@
-package com.shopme.admin.user;
-
-import java.util.List;
-import java.util.NoSuchElementException;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.domain.Page;
-import org.springframework.data.domain.PageRequest;
-import org.springframework.data.domain.Pageable;
-import org.springframework.data.domain.Sort;
-import org.springframework.security.crypto.password.PasswordEncoder;
-import org.springframework.stereotype.Service;
-
-import com.shopme.common.entity.Role;
-import com.shopme.common.entity.User;
-
-import jakarta.transaction.Transactional;
-
-@Service
-@Transactional
-public class UserService {
-
-	public static final int USERS_PER_PAGE = 4;
-	
-	@Autowired
-	private UserRepository userRepo;
-
-	@Autowired
-	private RoleRepository roleRepo;
-
-	@Autowired
-	private PasswordEncoder passwordEncoder;
-
-	public List<User> listAll() {
-		
-		return (List<User>) userRepo.findAll(Sort.by("firstName").ascending());
-	}
-	
-	
-	public Page<User> listByPage(int pageNum, String sortField, String sortDir, String keyword) {
-		
-		Sort sort = Sort.by(sortField);
-		
-		sort = sortDir.equals("asc") ? sort.ascending() : sort.descending();
-		
-		//page number start with 0 for pageable, so need to minus 1.
-		Pageable pageable = PageRequest.of(pageNum - 1, USERS_PER_PAGE, sort);
-		
-		//keyword for filtering users
-		if(keyword != null) {
-			return userRepo.findAll(keyword, pageable);
-		}
-		
-		return userRepo.findAll(pageable);
-	}
-	
-
-	public List<Role> listRoles() {
-
-		return (List<Role>) roleRepo.findAll();
-	}
-
-	public User save(User user) {
-
-		boolean isUpdatingUser = (user.getId() != null);
-
-		if (isUpdatingUser) {
-
-			User existingUser = userRepo.findById(user.getId()).get();
-
-			if (user.getPassword().isEmpty()) {
-				/*
-				 * if we do not set the user password to existing user password, password field
-				 * will be an empty string. When the user object is saved to database, the empty
-				 * string will replace the encoded password.
-				 */
-				user.setPassword(existingUser.getPassword());
-			} else {
-				encodePassword(user);
-			}
-
-		} else {
-			encodePassword(user);
-		}
-
-		return userRepo.save(user);
-	}
-
-	private void encodePassword(User user) {
-
-		String encodedPassword = passwordEncoder.encode(user.getPassword());
-		user.setPassword(encodedPassword);
-	}
-
-	public boolean isEmailUnique(Integer id, String email) {
-		User userByEmail = userRepo.getUserByEmail(email);
-
-		if (userByEmail == null)
-			return true;
-
-		boolean isCreatingNew = (id == null);
-
-		if (isCreatingNew) {
-			if (userByEmail != null)
-				return false;
-		} else {
-			if (userByEmail.getId() != id) {
-				return false;
-			}
-		}
-
-		return true;
-	}
-
-	public User get(Integer id) throws UserNotFoundException {
-		try {
-			return userRepo.findById(id).get();
-		} catch (NoSuchElementException ex) {
-			throw new UserNotFoundException("could not find any user with id: " + id);
-		}
-	}
-
-	public void delete(Integer id) throws UserNotFoundException {
-
-		Long countById = userRepo.countById(id);
-
-		if (countById == null || countById == 0) {
-			throw new UserNotFoundException("could not find any user with id: " + id);
-		}
-		
-		userRepo.deleteById(id);
-	}
-	
-	public void updateUserEnabledStatus(Integer id, boolean enabled) {
-		
-		 userRepo.updateEnabledStatus(id, enabled);
-	}
-	
-
-}
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/f5/7021e99d8fb3001d19bbb001c1a81c20 b/.metadata/.plugins/org.eclipse.core.resources/.history/f5/7021e99d8fb3001d19bbb001c1a81c20
deleted file mode 100644
index 1985e883..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/f5/7021e99d8fb3001d19bbb001c1a81c20
+++ /dev/null
@@ -1,276 +0,0 @@
-<!DOCTYPE html>
-<html xmlns:th="http://www.thymeleaf.org">
-
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset= UTF-8">
-<meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0">
-<title>Manage Users</title>
-
-<link rel="stylesheet" type="text/css" th:href="@{/webjars/bootstrap/css/bootstrap.min.css}" />
-<link rel="stylesheet" type="text/css" th:href="@{/fontawesome/all.css}" />
-<link rel="stylesheet" type="text/css" th:href="@{/style.css}" />
-	
-<script type="text/javascript" th:src="@{/webjars/jquery/jquery.min.js}"></script>
-<script type="text/javascript" th:src="@{/webjars/bootstrap/js/bootstrap.min.js}"></script>
-</head>
-
-<body>
-	<div class="container-fluid">
-		<div>
-			<nav class="navbar navbar-expand-lg bg-dark navbar-dark">
-				<a class="navbar-brand" th:href="@{/}"> <img
-					th:src="@{/images/ShopmeAdminSmall.png}" />
-				</a>
-				<!--hamburger toggler for mobile devices(responsive)-->
-				<button class="navbar-toggler" type="button" data-toggle="collapse"
-					data-target="#topNavbar">
-					<span class="navbar-toggler-icon"></span>
-				</button>
-				<div class="collapse navbar-collapse" id="topNavbar">
-					<ul class="navbar-nav">
-						<li class="nav-item"><a class="nav-link" th:href="@{/users}">Users</a>
-						</li>
-						<li class="nav-item"><a class="nav-link"
-							th:href="@{/categories}">Categories</a></li>
-						<li class="nav-item"><a class="nav-link" th:href="@{/brands}">Brands</a>
-						</li>
-						<li class="nav-item"><a class="nav-link"
-							th:href="@{/products}">Products</a></li>
-						<li class="nav-item"><a class="nav-link"
-							th:href="@{/customers}">Customers</a></li>
-						<li class="nav-item"><a class="nav-link"
-							th:href="@{/shipping}">Shipping</a></li>
-						<li class="nav-item"><a class="nav-link" th:href="@{/orders}">Orders</a>
-						</li>
-						<li class="nav-item"><a class="nav-link" th:href="@{/report}">Sales
-								Report</a></li>
-						<li class="nav-item"><a class="nav-link"
-							th:href="@{/articles}">Articles</a></li>
-						<li class="nav-item"><a class="nav-link" th:href="@{/menus}">Menus</a>
-						</li>
-						<li class="nav-item"><a class="nav-link"
-							th:href="@{/settings}">Settings</a></li>
-					</ul>
-				</div>
-
-			</nav>
-		</div>
-
-		<div>
-			<h2>Manage Users</h2>
-			<a th:href="@{/users/new}" class="fas fa-user-plus fa-2x icon-dark mr-2"></a>
-			
-			<a th:href="@{/users/export/csv}" class="fas fa-file-csv fa-2x icon-dark mr-2"></a>
-		</div>
-		
-		
-		
-		<!-- only display success message when a new user is created -->
-		<div th:if="${message != null}" class="alert alert-success text-center">
-			[[${message}]]
-		</div>
-			
-		<div>
-			<form th:action="@{/users/page/1}" class="form-inline m-3">
-				
-				<input type="hidden" name="sortField" th:value="${sortField}" />
-				<input type="hidden" name="sortDir" th:value="${sortDir}" />
-				Filter:&nbsp;
-				<input type="search" name="keyword" th:value="${keyword}" class="form-control" required/>
-				&nbsp;&nbsp;
-				<button type="submit" class="btn btn-primary">
-					<i class="fas fa-search"></i>
-				</button>
-				&nbsp;&nbsp;
-				<button type="button" class="btn btn-secondary" onclick="clearFilter()">
-					<i class="fas fa-eraser"></i>
-				</button>
-			</form>
-		
-		</div>
-
-			<!-- css class to display this table in large screens only , refer to static/style.css for more info-->
-			<div class="full-details">
-				<table class="table table-bordered table-striped table-hover table-responsive-xL">
-					<thead class="thead-dark">
-						<tr>
-							<!-- refer to templates/fragments.html for fragment code-->
-							<th th:replace="fragments :: column_link('id', 'User ID')"/>
-							<th>Photos</th>
-							<th th:replace="fragments :: column_link('email', 'Email')"/>
-							<th th:replace="fragments :: column_link('firstName', 'First Name')"/>
-							<th th:replace="fragments :: column_link('lastName', 'Last Name')"/>
-							<th>Roles</th>
-							<th th:replace="fragments :: column_link('enabled', 'Enabled')"/>
-							<th></th>
-						</tr>
-					</thead>
-					<tbody>
-						<tr th:each="user : ${listUsers}">
-							<td class="hideable-column">[[${user.id}]]</td>
-							<td>
-								<span th:if="${user.photos == null}" class="fas fa-portrait fa-3x icon-dark"></span>
-								<img th:if="${user.photos != null}" th:src="@{${user.photosImagePath}}"
-								style="width: 100px"/>
-							</td>
-							<td class="hideable-column">[[${user.email}]]</td>
-							<td>[[${user.firstName}]]</td>
-							<td>[[${user.lastName}]]</td>
-							<td>[[${user.roles}]]</td>
-							
-							<td>
-								<a th:if="${user.enabled == true}" class="fas fa-check-circle fa-2x icon-green" 
-								th:href="@{'/users/' + ${user.id} + '/enabled/false'}"
-								title="Disable this user"></a>
-								
-								<a th:if="${user.enabled == false}" class="fas fa-circle fa-2x icon-silver"
-								 th:href="@{'/users/' + ${user.id} + '/enabled/true'}"
-								 title="Enable this user"></a>
-							</td>
-							<td>
-									<a class="fas fa-edit fa-2x icon-green" th:href="@{'/users/edit/' + ${user.id}}"
-									title="edit this user"></a>
-									&nbsp; 
-									<a class="fas fa-trash fa-2x icon-dark link-delete" th:href="@{'/users/delete/' + ${user.id}}"
-									title="delete this user" th:userId="${user.id}"></a>
-							</td>
-						</tr>
-					</tbody>
-				</table>
-			</div>
-			
-			
-			<!-- css class to display this <div> on mobile screens only, refer to /static/style.css for more info-->
-			<div class="less-details">
-				
-				<div th:each="user : ${listUsers}" class="row m-1">
-					
-					<div class="col-4">
-						
-						<span th:if="${user.photos == null}" class="fas fa-portrait fa-3x icon-dark"></span>
-								<img th:if="${user.photos != null}" th:src="@{${user.photosImagePath}}"
-								style="width: 100px"/>
-					</div>
-					
-					<div class="col-8">
-						<div>[[${user.fullName}]]</div>
-						<div>[[${user.roles}]]</div>
-						<div class="mt-2">
-							<a th:if="${user.enabled == true}" class="fas fa-check-circle fa-2x icon-green" 
-								th:href="@{'/users/' + ${user.id} + '/enabled/false'}"
-								title="Disable this user"></a>
-								
-							<a th:if="${user.enabled == false}" class="fas fa-circle fa-2x icon-silver"
-								 th:href="@{'/users/' + ${user.id} + '/enabled/true'}"
-								 title="Enable this user"></a>
-						
-									&nbsp;
-							<a class="fas fa-edit fa-2x icon-green" th:href="@{'/users/edit/' + ${user.id}}"
-									title="edit this user"></a>
-									&nbsp; 
-							<a class="fas fa-trash fa-2x icon-dark link-delete" th:href="@{'/users/delete/' + ${user.id}}"
-									title="delete this user" th:userId="${user.id}"></a>
-						</div>
-					</div>
-					<div>&nbsp;</div>
-				</div>
-			</div>
-			
-			
-			<!-- IF -->
-			<div class="text-center m-1" th:if="${totalItems > 0}">
-				<span>Showing Users # [[${startCount}]] to [[${endCount}]] of [[${totalItems}]]</span>
-			</div>
-			
-			<!-- ELSE -->
-			<div class="text-center m-1" th:unless="${totalItems > 0}">
-				<span>No users found</span>
-			</div>
-			
-			<!-- only display pagination when there are users; else, no users no pagination -->
-			<div th:if="${totalPages > 1}">
-				<nav>
-					  <ul class="pagination justify-content-center flex-wrap">
-					  
-					  	<li th:class=" ${currentPage > 1 ? 'page-item' : 'page-item disabled'}">
-					  		<a th:replace="fragments :: page_link(1, 'First')"></a>
-				    	</li>
-					  
-					    <li th:class=" ${currentPage > 1 ? 'page-item' : 'page-item disabled'}">
-					    	<a th:replace="fragments :: page_link(${currentPage - 1 }, 'previous')"></a>
-				    	</li>
-					    	
-					    <!-- org.thymeleaf.expression.Numbers class, An object of this class is usually available in variable evaluation expressions with the name #numbers. -->
-					    <li th:class="${currentPage != i ? 'page-item' : 'page-item active'}" 
-					    	th:each="i : ${#numbers.sequence(1, totalPages)}">
-					    	<a th:replace="fragments :: page_link(${i}, ${i})"></a>
-					    </li>
-					    
-					    <li  th:class=" ${currentPage < totalPages ? 'page-item' : 'page-item disabled'}">
-					    	<a th:replace="fragments :: page_link(${currentPage + 1}, 'Next')"></a>
-					    </li>
-					    
-					    <li th:class=" ${currentPage < totalPages ? 'page-item' : 'page-item disabled'}">
-							<a th:replace="fragments :: page_link(${totalPages}, 'Last')"></a>		
-					    </li>
-					  </ul>
-				</nav>
-			</div>
-			
-			
-			
-			<div class="modal fade text-center" id="confirmModal">
-				<div class="modal-dialog">
-					<div class="modal-content">
-					
-						<div class="modal-header">
-							<h4 class="modal-title">Delete Confirmation</h4>
-							<button type="button" class="close" data-dismiss="modal">&times;</button>
-						</div>
-						
-						<div class="modal-body">
-							<span id="confirmText"></span>
-						</div>
-						
-						<div class="modal-footer">
-							<a class="btn btn-success" href="" id="yesButton">Yes</a>
-							<button type="button" class="btn btn-danger" data-dismiss="modal">Close</button>
-						</div>
-					</div>
-				</div>
-			</div>
-			
-			
-			<div class="text-center">
-				<p>Shopme Control Panel - Copyright &copy; Shopme</p>
-			</div>
-
-
-	</div>
-	
-<script type="text/javascript">
-
-//confirmation modal dialogue for delete user
-$(document).ready(function(){
-	$(".link-delete").on("click", function(e){
-		//stop the <a> tag default behaviour and pop out a confirmation modal dialogue
-		e.preventDefault();
-		//alert($(this).attr("href"));
-		link = $(this);
-		userId = link.attr("userId");
-		$("#yesButton").attr("href", link.attr("href"));
-		$("#confirmText").text("Are you sure you want to delete this user ID " + userId + "?");
-		$("#confirmModal").modal();
-	});
-});
-
-	function clearFilter(){
-		window.location = "[[@{/users}]]";
-	}
-
-
-</script>
-	
-</body>
-
-</html>
\ No newline at end of file
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/f5/908378240bb9001d11addcb4256c67f9 b/.metadata/.plugins/org.eclipse.core.resources/.history/f5/908378240bb9001d11addcb4256c67f9
new file mode 100644
index 00000000..f291266f
--- /dev/null
+++ b/.metadata/.plugins/org.eclipse.core.resources/.history/f5/908378240bb9001d11addcb4256c67f9
@@ -0,0 +1,57 @@
+package com.shopme.admin;
+
+import java.nio.file.Path;
+import java.nio.file.Paths;
+
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
+
+@Configuration
+public class MvcConfig implements WebMvcConfigurer {
+
+	
+	/*
+	 * In short, we can tell Spring MVC to map a given URL (e.g. "/user-photos") 
+	 * to any directory (e.g. D:/ShopmeProject/ShopmeBackend/user-photos) 
+	 * and expose the resources (images, js, css...) in this directory to 
+	 * the web clients (browsers) - that's the primary purpose
+	 *  of using resource handlers in Spring MVC.
+	 * 
+	 * Because the assets are not located in the src/main/resources/static folder
+	 * */
+	
+	@Override
+	public void addResourceHandlers(ResourceHandlerRegistry registry) {
+
+		String dirName = "user-photos";
+		
+		Path userPhotoDir = Paths.get(dirName);
+		
+		String userPhotosPath = userPhotoDir.toFile().getAbsolutePath();
+		
+		
+		// add /** to allow all files under this directory to be available to client
+		
+		registry.addResourceHandler("/" + dirName + "/**")
+		.addResourceLocations("file:/" + userPhotosPath + "/");
+		
+		
+		String categoryImagesDirName = "category-images";
+		
+		Path categoryImagesDir = Paths.get(categoryImagesDirName);
+		
+		String categoryImagesPath = categoryImagesDir.toFile().getAbsolutePath();
+		
+		
+		// add /** to allow all files under this directory to be available to client
+		
+		registry.addResourceHandler("/" + dirName + "/**")
+		.addResourceLocations("file:/" + userPhotosPath + "/");
+		
+	}
+	
+	
+	
+	
+}
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/f5/a0f4b03622b3001d1e75aa5ef0815903 b/.metadata/.plugins/org.eclipse.core.resources/.history/f5/a0f4b03622b3001d1e75aa5ef0815903
deleted file mode 100644
index 8f1839e2..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/f5/a0f4b03622b3001d1e75aa5ef0815903
+++ /dev/null
@@ -1,47 +0,0 @@
-package com.shopme.admin.user;
-
-import org.springframework.data.domain.Page;
-import org.springframework.data.domain.Pageable;
-import org.springframework.data.jpa.repository.Modifying;
-import org.springframework.data.jpa.repository.Query;
-import org.springframework.data.repository.CrudRepository;
-import org.springframework.data.repository.PagingAndSortingRepository;
-import org.springframework.data.repository.query.Param;
-import org.springframework.stereotype.Repository;
-
-import com.shopme.common.entity.User;
-
-@Repository
-public interface UserRepository extends CrudRepository<User, Integer>, PagingAndSortingRepository<User, Integer> {
-
-	/*
-	 * JPQL statement. It should be noted that as compared to native SQL, JPQL does
-	 * not interact with database tables, records, and fields - but with Java
-	 * classes and instances.
-	 * 
-	 * JPA kicks in as the mediator and transpiles JPQL queries to SQL queries for execution.
-	 * 
-	 * If your database can change or varies from development to production, as long as 
-	 * they're both relational - JPQL works wonders and you can 
-	 * write JPQL queries to create generic logic that can be used over and over again.
-	 */
-	@Query("SELECT u FROM User u WHERE u.email = :email")
-	public User getUserByEmail(@Param("email") String email);
-	
-	// countById() declaration follows the JPA specification
-	//to check the existence of a user
-	public Long countById(Integer id);
-	
-	
-	//for filtering users by keyword
-	
-	public Page<User> findAll(String keyword, Pageable pageable);
-	
-	
-	
-	//change user enabled status
-	//need @Modifying annotation for update/delete operation
-	@Query("UPDATE User u SET u.enabled = ?2 WHERE u.id = ?1")
-	@Modifying
-	public void updateEnabledStatus(Integer id, boolean enabled);
-}
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/f5/f0dcbe471fb4001d1216d7fff398b3d6 b/.metadata/.plugins/org.eclipse.core.resources/.history/f5/f0dcbe471fb4001d1216d7fff398b3d6
deleted file mode 100644
index afedf5ac..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/f5/f0dcbe471fb4001d1216d7fff398b3d6
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-	<parent>
-		<groupId>org.springframework.boot</groupId>
-		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>3.0.2</version>
-		<relativePath /> <!-- lookup parent from repository -->
-	</parent>
-	<groupId>com.shopme</groupId>
-	<artifactId>ShopmeWebParent</artifactId>
-	<version>0.0.1-SNAPSHOT</version>
-	<name>ShopmeWebParent</name>
-	<packaging>pom</packaging>
-	<description>parent spring web project</description>
-	<properties>
-		<java.version>15</java.version>
-	</properties>
-	<modules>
-		<module>ShopmeBackEnd</module>
-		<module>ShopmeFrontEnd</module>
-	</modules>
-	<dependencies>
-		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-web</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-security</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-thymeleaf</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.thymeleaf.extras</groupId>			
-			<artifactId>thymeleaf-extras-springsecurity5</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>mysql</groupId>
-			<artifactId>mysql-connector-java</artifactId>
-			<scope>runtime</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-data-jpa</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-test</artifactId>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.webjars</groupId>
-			<artifactId>bootstrap</artifactId>
-			<version>4.3.1</version>
-		</dependency>
-		<dependency>
-			<groupId>org.webjars</groupId>
-			<artifactId>jquery</artifactId>
-			<version>3.4.1</version>
-		</dependency>
-		<!--dependency for discovery and reference of webjars (bootstrap & jquery)-->
-		<dependency>
-			<groupId>org.webjars</groupId>
-			<artifactId>webjars-locator-core</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>com.shopme</groupId>
-			<artifactId>ShopmeCommon</artifactId>
-			<version>0.0.1-SNAPSHOT</version>
-		</dependency>
-	</dependencies>
-</project>
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/f6/005325560bb4001d128fb79045552177 b/.metadata/.plugins/org.eclipse.core.resources/.history/f6/005325560bb4001d128fb79045552177
deleted file mode 100644
index 2c9a38b0..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/f6/005325560bb4001d128fb79045552177
+++ /dev/null
@@ -1,47 +0,0 @@
-package com.shopme.admin.security;
-
-import org.aspectj.weaver.ast.And;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.security.config.annotation.web.builders.HttpSecurity;
-import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
-import org.springframework.security.config.annotation.web.configuration.WebSecurityConfiguration;
-import org.springframework.security.config.annotation.web.configuration.WebSecurityCustomizer;
-import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
-import org.springframework.security.crypto.password.PasswordEncoder;
-import org.springframework.security.web.SecurityFilterChain;
-
-@Configuration
-@EnableWebSecurity
-public class WebSecurityConfig {
-
-	/*
-	 * refer to this link: https://www.codejava.net/frameworks/spring-boot/fix-
-	 * websecurityconfigureradapter-deprecated
-	 * 
-	 */
-
-	@Bean
-	public PasswordEncoder PasswordEncoder() {
-		return new BCryptPasswordEncoder();
-	}
-
-	@Bean
-	public SecurityFilterChain filterChain(HttpSecurity http) throws Exception {
-
-		// any request need to be authenticated (require login)
-		// custom login page at "/login" - handler method in MainController class
-		http.authorizeHttpRequests().anyRequest().authenticated().and().formLogin().loginPage("/login").permitAll();
-
-		return http.build();
-	}
-
-	//NOTE: antMatchers() changed to requestMatchers()
-	//stack: https://stackoverflow.com/questions/74907533/the-method-antmatchersstring-is-undefined-for-the-type
-	@Bean
-	public WebSecurityCustomizer webSecurityCustomizer() {
-		//permit access to the assets in the following directories
-		return (web) -> web.ignoring().requestMatchers("/images/**", "/js/**", "/webjars/**");
-	}
-
-}
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/f6/10c1b4964fb3001d1e75aa5ef0815903 b/.metadata/.plugins/org.eclipse.core.resources/.history/f6/10c1b4964fb3001d1e75aa5ef0815903
deleted file mode 100644
index bfd1578f..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/f6/10c1b4964fb3001d1e75aa5ef0815903
+++ /dev/null
@@ -1,169 +0,0 @@
-package com.shopme.admin.user;
-
-import java.io.IOException;
-import java.util.List;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.domain.Page;
-import org.springframework.data.repository.query.Param;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
-import org.springframework.util.StringUtils;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.ModelAttribute;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.multipart.MultipartFile;
-import org.springframework.web.servlet.mvc.support.RedirectAttributes;
-
-import com.fasterxml.jackson.annotation.ObjectIdGenerators.StringIdGenerator;
-import com.shopme.admin.FileUploadUtil;
-import com.shopme.common.entity.Role;
-import com.shopme.common.entity.User;
-
-@Controller
-public class UserController {
-
-	@Autowired
-	private UserService service;
-
-	@GetMapping("/users")
-	public String listFirstPage(Model model) {
-		return listByPage(1, model, "firstName", "asc", null);
-	}
-
-	@GetMapping("/users/page/{pageNum}")
-	public String listByPage(@PathVariable(name = "pageNum") int pageNum, Model model,
-			@Param("sortField") String sortField, @Param("sortDir") String sortDir,
-			@Param("keyword") String keyword) {
-		
-		System.out.println("sort field: " + sortField);
-		System.out.println("sort order: " + sortDir);
-		
-		Page<User> page = service.listByPage(pageNum, sortField, sortDir, keyword);
-		List<User> listUsers = page.getContent();
-
-		
-		long startCount = (pageNum - 1) * UserService.USERS_PER_PAGE + 1;
-		long endCount = startCount + UserService.USERS_PER_PAGE - 1;
-		if(endCount > page.getTotalElements()) {
-			endCount = page.getTotalElements();
-		}
-		
-		String reverseSortDir = sortDir.equals("asc") ? "desc" : "asc";
-		
-		model.addAttribute("currentPage", pageNum);
-		model.addAttribute("totalPages", page.getTotalPages());
-		model.addAttribute("startCount", startCount);
-		model.addAttribute("endCount", endCount);
-		model.addAttribute("totalItems", page.getTotalElements());
-		model.addAttribute("listUsers", listUsers);
-		model.addAttribute("sortField", sortField);
-		model.addAttribute("sortDir", sortDir);
-		model.addAttribute("reverseSortDir", reverseSortDir);
-		model.addAttribute("keyword", keyword);
-		
-
-		return "users";
-
-	}
-
-	@GetMapping("/users/new")
-	public String newUser(Model model) {
-
-		List<Role> listRoles = service.listRoles();
-
-		User user = new User();
-		user.setEnabled(true);
-
-		model.addAttribute("user", user);
-		model.addAttribute("listRoles", listRoles);
-		model.addAttribute("pageTitle", "Create New User");
-
-		return "user_form";
-
-	}
-
-	// using @RequestParam, we can get the image file input, the input has the
-	// property name="image"
-	@PostMapping("/users/save")
-	public String saveUser(@ModelAttribute("user") User user, RedirectAttributes redirectAttributes,
-			@RequestParam("image") MultipartFile multipartFile) throws IOException {
-
-		if (!multipartFile.isEmpty()) {
-
-			String fileName = StringUtils.cleanPath(multipartFile.getOriginalFilename());
-			user.setPhotos(fileName);
-
-			User savedUser = service.save(user);
-
-			String uploadDir = "user-photos/" + savedUser.getId();
-
-			FileUploadUtil.cleanDir(uploadDir);
-			FileUploadUtil.saveFile(uploadDir, fileName, multipartFile);
-		} else {
-
-			// set photo to null for getPhotosImagePath() method's conditional statement in
-			// User class
-			if (user.getPhotos().isEmpty())
-				user.setPhotos(null);
-			service.save(user);
-		}
-
-		redirectAttributes.addFlashAttribute("message", "the user has been saved successfully");
-
-		// POST/REDIRECT/GET web design
-		
-		//email is unique field
-		
-		return "redirect:/users";
-	}
-
-	@GetMapping("/users/edit/{id}")
-	public String editUser(@PathVariable(name = "id") Integer id, RedirectAttributes redirectAttributes, Model model) {
-		try {
-			User user = service.get(id);
-			List<Role> listRoles = service.listRoles();
-
-			model.addAttribute("user", user);
-			model.addAttribute("pageTitle", "Edit User (ID: " + id + ")");
-			model.addAttribute("listRoles", listRoles);
-
-			return "user_form";
-		} catch (UserNotFoundException ex) {
-			redirectAttributes.addFlashAttribute("message", ex.getMessage());
-
-			return "redirect:/users";
-		}
-
-	}
-
-	@GetMapping("/users/delete/{id}")
-	public String deleteUser(@PathVariable(name = "id") Integer id, RedirectAttributes redirectAttributes,
-			Model model) {
-		try {
-			service.delete(id);
-			redirectAttributes.addFlashAttribute("message", "The user ID " + id + " has been deleted successfully.");
-
-		} catch (UserNotFoundException ex) {
-			redirectAttributes.addFlashAttribute("message", ex.getMessage());
-
-		}
-
-		return "redirect:/users";
-	}
-
-	@GetMapping("/users/{id}/enabled/{status}")
-	public String updateUserEnabledStatus(@PathVariable(name = "id") Integer id,
-			@PathVariable(name = "status") boolean enabled, RedirectAttributes redirectAttributes) {
-
-		service.updateUserEnabledStatus(id, enabled);
-		String status = enabled ? "enabled" : "disabled";
-		String message = "The user id " + id + " has been " + status;
-		redirectAttributes.addFlashAttribute("message", message);
-
-		return "redirect:/users";
-	}
-
-}
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/f7/a069a6d41eb3001d1e75aa5ef0815903 b/.metadata/.plugins/org.eclipse.core.resources/.history/f7/a069a6d41eb3001d1e75aa5ef0815903
deleted file mode 100644
index 8dee822e..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/f7/a069a6d41eb3001d1e75aa5ef0815903
+++ /dev/null
@@ -1,43 +0,0 @@
-package com.shopme.admin.user;
-
-import org.springframework.stereotype.Repository;
-import org.springframework.data.jpa.repository.Modifying;
-import org.springframework.data.jpa.repository.Query;
-import org.springframework.data.repository.CrudRepository;
-import org.springframework.data.repository.PagingAndSortingRepository;
-import org.springframework.data.repository.query.Param;
-
-import com.shopme.common.entity.User;
-
-@Repository
-public interface UserRepository extends CrudRepository<User, Integer>, PagingAndSortingRepository<User, Integer> {
-
-	/*
-	 * JPQL statement. It should be noted that as compared to native SQL, JPQL does
-	 * not interact with database tables, records, and fields - but with Java
-	 * classes and instances.
-	 * 
-	 * JPA kicks in as the mediator and transpiles JPQL queries to SQL queries for execution.
-	 * 
-	 * If your database can change or varies from development to production, as long as 
-	 * they're both relational - JPQL works wonders and you can 
-	 * write JPQL queries to create generic logic that can be used over and over again.
-	 */
-	@Query("SELECT u FROM User u WHERE u.email = :email")
-	public User getUserByEmail(@Param("email") String email);
-	
-	// countById() declaration follows the JPA specification
-	//to check the existence of a user
-	public Long countById(Integer id);
-	
-	
-	
-	
-	
-	
-	//change user enabled status
-	//need @Modifying annotation for update/delete operation
-	@Query("UPDATE User u SET u.enabled = ?2 WHERE u.id = ?1")
-	@Modifying
-	public void updateEnabledStatus(Integer id, boolean enabled);
-}
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/f7/b0482e6205b4001d128fb79045552177 b/.metadata/.plugins/org.eclipse.core.resources/.history/f7/b0482e6205b4001d128fb79045552177
deleted file mode 100644
index 805b6244..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/f7/b0482e6205b4001d128fb79045552177
+++ /dev/null
@@ -1,22 +0,0 @@
-package com.shopme.admin;
-
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.GetMapping;
-
-@Controller
-public class MainController {
-
-	@GetMapping("")
-	public String viewHomePage() {
-		return "index";
-	}
-	
-	
-	@GetMapping("/login")
-	public String viewHomePage() {
-		return "login";
-	}
-	
-	
-	
-}
\ No newline at end of file
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/f7/f002f60395b6001d1567bacd2f52a0b7 b/.metadata/.plugins/org.eclipse.core.resources/.history/f7/f002f60395b6001d1567bacd2f52a0b7
deleted file mode 100644
index e69de29b..00000000
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/f8/702e38b788b3001d19bbb001c1a81c20 b/.metadata/.plugins/org.eclipse.core.resources/.history/f8/702e38b788b3001d19bbb001c1a81c20
deleted file mode 100644
index b58c9d5b..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/f8/702e38b788b3001d19bbb001c1a81c20
+++ /dev/null
@@ -1,24 +0,0 @@
-*.icon-white{color: white}
-*.icon-silver{color: silver}
-*.icon-green{color: green}
-*.icon-dark{color: gray}
-*.icon-red{color: red}
-
-
-@media screen and (max-width: 768px) {
-	/* small screen */
-	
-	div.full-details{ display: none;}
-}
-
-@media screen and (min-width: 768px) and (max-width: 1024px) {
-	/* medium screen */
-	
-	div.full-details{ display: block;}
-}
-
-
-@media screen and (mini-width: 1024px) {
-	/* large screen */
-	
-}
\ No newline at end of file
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/fb/206591a677b3001d19bbb001c1a81c20 b/.metadata/.plugins/org.eclipse.core.resources/.history/fb/206591a677b3001d19bbb001c1a81c20
deleted file mode 100644
index cddcf6c1..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/fb/206591a677b3001d19bbb001c1a81c20
+++ /dev/null
@@ -1,5 +0,0 @@
-package com.shopme.admin.user;
-
-public class UserExcelExporter {
-
-}
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/fb/5005f1a93fb3001d1e75aa5ef0815903 b/.metadata/.plugins/org.eclipse.core.resources/.history/fb/5005f1a93fb3001d1e75aa5ef0815903
deleted file mode 100644
index 396906ae..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/fb/5005f1a93fb3001d1e75aa5ef0815903
+++ /dev/null
@@ -1,55 +0,0 @@
-package com.shopme.admin.user;
-
-import org.springframework.data.domain.Page;
-import org.springframework.data.domain.Pageable;
-import org.springframework.data.jpa.repository.Modifying;
-import org.springframework.data.jpa.repository.Query;
-import org.springframework.data.repository.CrudRepository;
-import org.springframework.data.repository.PagingAndSortingRepository;
-import org.springframework.data.repository.query.Param;
-import org.springframework.stereotype.Repository;
-
-import com.shopme.common.entity.User;
-
-@Repository
-public interface UserRepository extends CrudRepository<User, Integer>, PagingAndSortingRepository<User, Integer> {
-
-	/*
-	 * JPQL statement. It should be noted that as compared to native SQL, JPQL does
-	 * not interact with database tables, records, and fields - but with Java
-	 * classes and instances.
-	 * 
-	 * JPA kicks in as the mediator and transpiles JPQL queries to SQL queries for execution.
-	 * 
-	 * If your database can change or varies from development to production, as long as 
-	 * they're both relational - JPQL works wonders and you can 
-	 * write JPQL queries to create generic logic that can be used over and over again.
-	 */
-	@Query("SELECT u FROM User u WHERE u.email = :email")
-	public User getUserByEmail(@Param("email") String email);
-	
-	// countById() declaration follows the JPA specification
-	//to check the existence of a user
-	public Long countById(Integer id);
-	
-	
-	//for filtering users by keyword
-	/*
-	 * @Query("SELECT u FROM User u WHERE u.firstName LIKE %?1% OR u.lastName LIKE %?1%"
-	 * + " OR u.email LIKE %?1%")
-	 * 
-	 * the above query does not work when we search for user with keyword "nam ha minh".
-	 * 
-	 * Instead we should concatenate the fields separated by space as the query below
-	 */
-	 @Query("SELECT u FROM User u WHERE  CONCAT(u.id, ' ', u.firstName LIKE %?1% OR u.lastName LIKE %?1%"
-			  + " u.email) LIKE %?1%")
-	public Page<User> findAll(String keyword, Pageable pageable);
-	
-	
-	//change user enabled status
-	//need @Modifying annotation for update/delete operation
-	@Query("UPDATE User u SET u.enabled = ?2 WHERE u.id = ?1")
-	@Modifying
-	public void updateEnabledStatus(Integer id, boolean enabled);
-}
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/fc/60f4622f59b7001d19ef99be8d31e273 b/.metadata/.plugins/org.eclipse.core.resources/.history/fc/60f4622f59b7001d19ef99be8d31e273
deleted file mode 100644
index a6042913..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/fc/60f4622f59b7001d19ef99be8d31e273
+++ /dev/null
@@ -1,21 +0,0 @@
-package com.shopme.admin.category;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.GetMapping;
-
-@Controller
-public class CategoryController {
-	
-	@Autowired
-	private CategoryService service;
-	
-	@GetMapping("/categories")
-	public String listAll(Model model) {
-		
-		
-		
-		return "categories/categories";
-	}
-}
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/fd/60b12c109ab9001d10d0f9513979f945 b/.metadata/.plugins/org.eclipse.core.resources/.history/fd/60b12c109ab9001d10d0f9513979f945
new file mode 100644
index 00000000..5683c984
--- /dev/null
+++ b/.metadata/.plugins/org.eclipse.core.resources/.history/fd/60b12c109ab9001d10d0f9513979f945
@@ -0,0 +1,79 @@
+package com.shopme.admin.category;
+
+import java.io.IOException;
+import java.util.List;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.scheduling.support.SimpleTriggerContext;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
+import org.springframework.util.StringUtils;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.ModelAttribute;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.multipart.MultipartFile;
+import org.springframework.web.servlet.mvc.support.RedirectAttributes;
+
+import com.shopme.admin.FileUploadUtil;
+import com.shopme.common.entity.Category;
+
+@Controller
+public class CategoryController {
+	
+	@Autowired
+	private CategoryService service;
+	
+	@GetMapping("/categories")
+	public String listAll(Model model) {
+		
+		List<Category> listCategories = service.listAll();
+		model.addAttribute("listCategories", listCategories);
+		
+		return "categories/categories";
+	}
+	
+	
+	@GetMapping("/categories/new")
+	public String newCategory(Model model) {
+		
+		List<Category> listCategories = service.listCategoriesUsedInForm();
+		
+		model.addAttribute("category", new Category());
+		model.addAttribute("listCategories", listCategories);
+		model.addAttribute("pageTitle", "Create New Category");
+		
+		return "categories/category_form";
+	
+	}
+	
+	@PostMapping("/categories/save")
+	public String saveCategory(@ModelAttribute("category") Category category, 
+			RedirectAttributes redirectAttributes,
+			@RequestParam("fileImage") MultipartFile multipartFile) throws IOException {
+		
+		String fileName = StringUtils.cleanPath(multipartFile.getOriginalFilename());
+		category.setImage(fileName);
+		
+		Category savedCategory = service.save(category);
+		String uploadDir = "../category-images/" + savedCategory.getId();
+		FileUploadUtil.saveFile(uploadDir, fileName, multipartFile);
+		
+		
+		redirectAttributes.addFlashAttribute("message", "the category have been saved successfully");
+		
+		
+		return "redirect:/categories";
+	}
+
+	
+	@GetMapping("/categories/edit/{id}")
+	public String editCategory(@Pa)
+	
+	
+	
+}
+	
+
+
+
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/fd/a0484b0150b3001d1e75aa5ef0815903 b/.metadata/.plugins/org.eclipse.core.resources/.history/fd/a0484b0150b3001d1e75aa5ef0815903
deleted file mode 100644
index 98f70453..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/fd/a0484b0150b3001d1e75aa5ef0815903
+++ /dev/null
@@ -1,172 +0,0 @@
-package com.shopme.admin.user;
-
-import java.io.IOException;
-import java.util.List;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.domain.Page;
-import org.springframework.data.repository.query.Param;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
-import org.springframework.util.StringUtils;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.ModelAttribute;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.multipart.MultipartFile;
-import org.springframework.web.servlet.mvc.support.RedirectAttributes;
-
-import com.fasterxml.jackson.annotation.ObjectIdGenerators.StringIdGenerator;
-import com.shopme.admin.FileUploadUtil;
-import com.shopme.common.entity.Role;
-import com.shopme.common.entity.User;
-
-@Controller
-public class UserController {
-
-	@Autowired
-	private UserService service;
-
-	@GetMapping("/users")
-	public String listFirstPage(Model model) {
-		return listByPage(1, model, "firstName", "asc", null);
-	}
-
-	@GetMapping("/users/page/{pageNum}")
-	public String listByPage(@PathVariable(name = "pageNum") int pageNum, Model model,
-			@Param("sortField") String sortField, @Param("sortDir") String sortDir,
-			@Param("keyword") String keyword) {
-		
-		System.out.println("sort field: " + sortField);
-		System.out.println("sort order: " + sortDir);
-		
-		Page<User> page = service.listByPage(pageNum, sortField, sortDir, keyword);
-		List<User> listUsers = page.getContent();
-
-		
-		long startCount = (pageNum - 1) * UserService.USERS_PER_PAGE + 1;
-		long endCount = startCount + UserService.USERS_PER_PAGE - 1;
-		if(endCount > page.getTotalElements()) {
-			endCount = page.getTotalElements();
-		}
-		
-		String reverseSortDir = sortDir.equals("asc") ? "desc" : "asc";
-		
-		model.addAttribute("currentPage", pageNum);
-		model.addAttribute("totalPages", page.getTotalPages());
-		model.addAttribute("startCount", startCount);
-		model.addAttribute("endCount", endCount);
-		model.addAttribute("totalItems", page.getTotalElements());
-		model.addAttribute("listUsers", listUsers);
-		model.addAttribute("sortField", sortField);
-		model.addAttribute("sortDir", sortDir);
-		model.addAttribute("reverseSortDir", reverseSortDir);
-		model.addAttribute("keyword", keyword);
-		
-
-		return "users";
-
-	}
-
-	@GetMapping("/users/new")
-	public String newUser(Model model) {
-
-		List<Role> listRoles = service.listRoles();
-
-		User user = new User();
-		user.setEnabled(true);
-
-		model.addAttribute("user", user);
-		model.addAttribute("listRoles", listRoles);
-		model.addAttribute("pageTitle", "Create New User");
-
-		return "user_form";
-
-	}
-
-	// using @RequestParam, we can get the image file input, the input has the
-	// property name="image"
-	@PostMapping("/users/save")
-	public String saveUser(@ModelAttribute("user") User user, RedirectAttributes redirectAttributes,
-			@RequestParam("image") MultipartFile multipartFile) throws IOException {
-
-		if (!multipartFile.isEmpty()) {
-
-			String fileName = StringUtils.cleanPath(multipartFile.getOriginalFilename());
-			user.setPhotos(fileName);
-
-			User savedUser = service.save(user);
-
-			String uploadDir = "user-photos/" + savedUser.getId();
-
-			FileUploadUtil.cleanDir(uploadDir);
-			FileUploadUtil.saveFile(uploadDir, fileName, multipartFile);
-		} else {
-
-			// set photo to null for getPhotosImagePath() method's conditional statement in
-			// User class
-			if (user.getPhotos().isEmpty())
-				user.setPhotos(null);
-			service.save(user);
-		}
-
-		redirectAttributes.addFlashAttribute("message", "the user has been saved successfully");
-
-		// POST/REDIRECT/GET web design
-		
-		//after user is saved display the user instead of the entire user list
-		//email is a unique field to identify each user.
-		
-		//get first part of email
-		String firstPartOfEmail = user.getEmail().split('@')[0];
-		return "redirect:/users/page/1?sortField=id&sortDir=asc&keyword=";
-	}
-
-	@GetMapping("/users/edit/{id}")
-	public String editUser(@PathVariable(name = "id") Integer id, RedirectAttributes redirectAttributes, Model model) {
-		try {
-			User user = service.get(id);
-			List<Role> listRoles = service.listRoles();
-
-			model.addAttribute("user", user);
-			model.addAttribute("pageTitle", "Edit User (ID: " + id + ")");
-			model.addAttribute("listRoles", listRoles);
-
-			return "user_form";
-		} catch (UserNotFoundException ex) {
-			redirectAttributes.addFlashAttribute("message", ex.getMessage());
-
-			return "redirect:/users";
-		}
-
-	}
-
-	@GetMapping("/users/delete/{id}")
-	public String deleteUser(@PathVariable(name = "id") Integer id, RedirectAttributes redirectAttributes,
-			Model model) {
-		try {
-			service.delete(id);
-			redirectAttributes.addFlashAttribute("message", "The user ID " + id + " has been deleted successfully.");
-
-		} catch (UserNotFoundException ex) {
-			redirectAttributes.addFlashAttribute("message", ex.getMessage());
-
-		}
-
-		return "redirect:/users";
-	}
-
-	@GetMapping("/users/{id}/enabled/{status}")
-	public String updateUserEnabledStatus(@PathVariable(name = "id") Integer id,
-			@PathVariable(name = "status") boolean enabled, RedirectAttributes redirectAttributes) {
-
-		service.updateUserEnabledStatus(id, enabled);
-		String status = enabled ? "enabled" : "disabled";
-		String message = "The user id " + id + " has been " + status;
-		redirectAttributes.addFlashAttribute("message", message);
-
-		return "redirect:/users";
-	}
-
-}
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/ff/60fd0a2f2ab8001d1d97982e354adf88 b/.metadata/.plugins/org.eclipse.core.resources/.history/ff/60fd0a2f2ab8001d1d97982e354adf88
deleted file mode 100644
index c9573d0f..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/ff/60fd0a2f2ab8001d1d97982e354adf88
+++ /dev/null
@@ -1,66 +0,0 @@
-package com.shopme.admin.category;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Set;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import com.shopme.common.entity.Category;
-
-@Service
-public class CategoryService {
-
-	@Autowired
-	private CategoryRepository repo;
-	
-	public List<Category> listAll(){
-		return (List<Category>) repo.findAll();
-	}
-	
-	public List<Category> listCategoriesUsedInForm(){
-		
-		List<Category> categoriesUsedInForm = new ArrayList<>();
-		
-		Iterable<Category> categoriesInDB = repo.findAll();
-		
-		for (Category category : categoriesInDB) {
-
-			// root category
-			if (category.getParent() == null) {
-				categoriesUsedInForm.add(new Category(category.getName()));
-
-				category.getChildren().forEach(subCategory -> {
-					String name = "--" + subCategory.getName();
-					
-					System.out.println("--" + subCategory.getName());
-					listChildren(subCategory, 1);
-				});
-			}
-
-		}
-		
-		
-		return categoriesUsedInForm;
-	}
-	
-	private void listChildren(Category parent, int subLevel) {
-
-		int newSubLevel = subLevel + 1;
-		Set<Category> children = parent.getChildren();
-
-		for (Category subCategory : children) {
-
-			for (int i = 0; i < newSubLevel; i++) {
-				System.out.print("--");
-			}
-
-			System.out.println(subCategory.getName());
-
-			printChildren(subCategory, newSubLevel);
-		}
-
-	}
-	
-}
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/ff/90534f2672b3001d19bbb001c1a81c20 b/.metadata/.plugins/org.eclipse.core.resources/.history/ff/90534f2672b3001d19bbb001c1a81c20
deleted file mode 100644
index c02445e7..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/ff/90534f2672b3001d19bbb001c1a81c20
+++ /dev/null
@@ -1,140 +0,0 @@
-package com.shopme.admin.user;
-
-import java.util.List;
-import java.util.NoSuchElementException;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.domain.Page;
-import org.springframework.data.domain.PageRequest;
-import org.springframework.data.domain.Pageable;
-import org.springframework.data.domain.Sort;
-import org.springframework.security.crypto.password.PasswordEncoder;
-import org.springframework.stereotype.Service;
-
-import com.shopme.common.entity.Role;
-import com.shopme.common.entity.User;
-
-import jakarta.transaction.Transactional;
-
-@Service
-@Transactional
-public class UserService {
-
-	public static final int USERS_PER_PAGE = 4;
-	
-	@Autowired
-	private UserRepository userRepo;
-
-	@Autowired
-	private RoleRepository roleRepo;
-
-	@Autowired
-	private PasswordEncoder passwordEncoder;
-
-	public List<User> listAll() {
-		
-		return (List<User>) userRepo.findAll();
-	}
-	
-	
-	public Page<User> listByPage(int pageNum, String sortField, String sortDir, String keyword) {
-		
-		Sort sort = Sort.by(sortField);
-		
-		sort = sortDir.equals("asc") ? sort.ascending() : sort.descending();
-		
-		//page number start with 0 for pageable, so need to minus 1.
-		Pageable pageable = PageRequest.of(pageNum - 1, USERS_PER_PAGE, sort);
-		
-		//keyword for filtering users
-		if(keyword != null) {
-			return userRepo.findAll(keyword, pageable);
-		}
-		
-		return userRepo.findAll(pageable);
-	}
-	
-
-	public List<Role> listRoles() {
-
-		return (List<Role>) roleRepo.findAll();
-	}
-
-	public User save(User user) {
-
-		boolean isUpdatingUser = (user.getId() != null);
-
-		if (isUpdatingUser) {
-
-			User existingUser = userRepo.findById(user.getId()).get();
-
-			if (user.getPassword().isEmpty()) {
-				/*
-				 * if we do not set the user password to existing user password, password field
-				 * will be an empty string. When the user object is saved to database, the empty
-				 * string will replace the encoded password.
-				 */
-				user.setPassword(existingUser.getPassword());
-			} else {
-				encodePassword(user);
-			}
-
-		} else {
-			encodePassword(user);
-		}
-
-		return userRepo.save(user);
-	}
-
-	private void encodePassword(User user) {
-
-		String encodedPassword = passwordEncoder.encode(user.getPassword());
-		user.setPassword(encodedPassword);
-	}
-
-	public boolean isEmailUnique(Integer id, String email) {
-		User userByEmail = userRepo.getUserByEmail(email);
-
-		if (userByEmail == null)
-			return true;
-
-		boolean isCreatingNew = (id == null);
-
-		if (isCreatingNew) {
-			if (userByEmail != null)
-				return false;
-		} else {
-			if (userByEmail.getId() != id) {
-				return false;
-			}
-		}
-
-		return true;
-	}
-
-	public User get(Integer id) throws UserNotFoundException {
-		try {
-			return userRepo.findById(id).get();
-		} catch (NoSuchElementException ex) {
-			throw new UserNotFoundException("could not find any user with id: " + id);
-		}
-	}
-
-	public void delete(Integer id) throws UserNotFoundException {
-
-		Long countById = userRepo.countById(id);
-
-		if (countById == null || countById == 0) {
-			throw new UserNotFoundException("could not find any user with id: " + id);
-		}
-		
-		userRepo.deleteById(id);
-	}
-	
-	public void updateUserEnabledStatus(Integer id, boolean enabled) {
-		
-		 userRepo.updateEnabledStatus(id, enabled);
-	}
-	
-
-}
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/ff/b03e3cf80bb9001d11addcb4256c67f9 b/.metadata/.plugins/org.eclipse.core.resources/.history/ff/b03e3cf80bb9001d11addcb4256c67f9
new file mode 100644
index 00000000..a6a3a54d
--- /dev/null
+++ b/.metadata/.plugins/org.eclipse.core.resources/.history/ff/b03e3cf80bb9001d11addcb4256c67f9
@@ -0,0 +1,204 @@
+<!DOCTYPE html>
+<html xmlns:th="http://www.thymeleaf.org">
+
+<head th:replace="fragments :: page_head('Categories - Shopme Admin')"/>
+
+<body>
+	<div class="container-fluid">
+		
+		<!-- navigation bar -->
+		<div th:replace="navigation :: menu"></div>
+
+		<div>
+			<h2>Manage Categories</h2>
+			<a th:href="@{/categories/new}" class="fas fa-folder-plus fa-2x icon-dark mr-2"></a>
+			
+			<a th:href="@{/categories/export/csv}" class="fas fa-file-csv fa-2x icon-dark mr-2"></a>
+		</div>
+		
+		<!-- redirect message from controller -->
+		<div th:if="${message != null}" class="alert alert-success text-center">
+			[[${message}]]
+		</div>
+		
+			
+		<div>
+			<form th:action="@{/categories/page/1}" class="form-inline m-3">
+				
+				Filter:&nbsp;
+				<input type="search" name="keyword" th:value="${keyword}" class="form-control" required/>
+				&nbsp;&nbsp;
+				<button type="submit" class="btn btn-primary">
+					<i class="fas fa-search"></i>
+				</button>
+				&nbsp;&nbsp;
+				<button type="button" class="btn btn-secondary" onclick="clearFilter()">
+					<i class="fas fa-eraser"></i>
+				</button>
+			</form>
+		
+		</div>
+
+			<!-- css class to display this table in large screens only , refer to static/style.css for more info-->
+			<div class="full-details">
+				<table class="table table-bordered table-striped table-hover table-responsive-xL">
+					<thead class="thead-dark">
+						<tr>
+							<th>ID</th>
+							<th>Category Image</th>
+							<th>Category Name</th>
+							<th>Alias</th>
+							<th>Enabled</th>
+							<th></th>
+						</tr>
+					</thead>
+					<tbody>
+						<tr th:each="cat : ${listCategories}">
+							<td>[[${cat.id}]]</td>
+							<td></td>
+							<td>[[${cat.name}]]</td>
+							<td>[[${cat.alias}]]</td>
+							<td>
+								<div th:replace="fragments :: category_status"></div>
+							</td>
+							<td>
+								<div th:replace="fragments :: category_actions"></div>
+							</td>
+						</tr>
+					</tbody>
+				</table>
+			</div>
+			
+			
+			<!-- css class to display this <div> on mobile screens only, refer to /static/style.css for more info-->
+			<div class="less-details">
+				
+				<div th:each="user : ${listUsers}" class="row m-1">
+					
+					<div class="col-4">
+						
+						<span th:if="${user.photos == null}" class="fas fa-portrait fa-3x icon-dark"></span>
+								<img th:if="${user.photos != null}" th:src="@{${user.photosImagePath}}"
+								style="width: 100px"/>
+					</div>
+					
+					<div class="col-8">
+						<div>[[${user.fullName}]]</div>
+						<div>[[${user.roles}]]</div>
+						<div class="mt-2">
+							<a th:if="${user.enabled == true}" class="fas fa-check-circle fa-2x icon-green" 
+								th:href="@{'/users/' + ${user.id} + '/enabled/false'}"
+								title="Disable this user"></a>
+								
+							<a th:if="${user.enabled == false}" class="fas fa-circle fa-2x icon-silver"
+								 th:href="@{'/users/' + ${user.id} + '/enabled/true'}"
+								 title="Enable this user"></a>
+						
+									&nbsp;
+							<a class="fas fa-edit fa-2x icon-green" th:href="@{'/users/edit/' + ${user.id}}"
+									title="edit this user"></a>
+									&nbsp; 
+							<a class="fas fa-trash fa-2x icon-dark link-delete" th:href="@{'/users/delete/' + ${user.id}}"
+									title="delete this user" th:userId="${user.id}"></a>
+						</div>
+					</div>
+					<div>&nbsp;</div>
+				</div>
+			</div>
+			
+			
+			<!-- IF -->
+			<div class="text-center m-1" th:if="${totalItems > 0}">
+				<span>Showing Users # [[${startCount}]] to [[${endCount}]] of [[${totalItems}]]</span>
+			</div>
+			
+			<!-- ELSE -->
+			<div class="text-center m-1" th:unless="${totalItems > 0}">
+				<span>No users found</span>
+			</div>
+			
+			<!-- only display pagination when there are users; else, no users no pagination -->
+			<div th:if="${totalPages > 1}">
+				<nav>
+					  <ul class="pagination justify-content-center flex-wrap">
+					  
+					  	<li th:class=" ${currentPage > 1 ? 'page-item' : 'page-item disabled'}">
+					  		<a th:replace="fragments :: page_link(1, 'First')"></a>
+				    	</li>
+					  
+					    <li th:class=" ${currentPage > 1 ? 'page-item' : 'page-item disabled'}">
+					    	<a th:replace="fragments :: page_link(${currentPage - 1 }, 'previous')"></a>
+				    	</li>
+					    	
+					    <!-- org.thymeleaf.expression.Numbers class, An object of this class is usually available in variable evaluation expressions with the name #numbers. -->
+					    <li th:class="${currentPage != i ? 'page-item' : 'page-item active'}" 
+					    	th:each="i : ${#numbers.sequence(1, totalPages)}">
+					    	<a th:replace="fragments :: page_link(${i}, ${i})"></a>
+					    </li>
+					    
+					    <li  th:class=" ${currentPage < totalPages ? 'page-item' : 'page-item disabled'}">
+					    	<a th:replace="fragments :: page_link(${currentPage + 1}, 'Next')"></a>
+					    </li>
+					    
+					    <li th:class=" ${currentPage < totalPages ? 'page-item' : 'page-item disabled'}">
+							<a th:replace="fragments :: page_link(${totalPages}, 'Last')"></a>		
+					    </li>
+					  </ul>
+				</nav>
+			</div>
+			
+			
+			
+			<div class="modal fade text-center" id="confirmModal">
+				<div class="modal-dialog">
+					<div class="modal-content">
+					
+						<div class="modal-header">
+							<h4 class="modal-title">Delete Confirmation</h4>
+							<button type="button" class="close" data-dismiss="modal">&times;</button>
+						</div>
+						
+						<div class="modal-body">
+							<span id="confirmText"></span>
+						</div>
+						
+						<div class="modal-footer">
+							<a class="btn btn-success" href="" id="yesButton">Yes</a>
+							<button type="button" class="btn btn-danger" data-dismiss="modal">Close</button>
+						</div>
+					</div>
+				</div>
+			</div>
+			
+			<!-- footer -->
+			<div th:replace="fragments :: footer"></div>
+
+
+	</div>
+	
+<script type="text/javascript">
+
+//confirmation modal dialogue for delete user
+$(document).ready(function(){
+	$(".link-delete").on("click", function(e){
+		//stop the <a> tag default behaviour and pop out a confirmation modal dialogue
+		e.preventDefault();
+		//alert($(this).attr("href"));
+		link = $(this);
+		userId = link.attr("userId");
+		$("#yesButton").attr("href", link.attr("href"));
+		$("#confirmText").text("Are you sure you want to delete this user ID " + userId + "?");
+		$("#confirmModal").modal();
+	});
+});
+
+	function clearFilter(){
+		window.location = "[[@{/users}]]";
+	}
+
+
+</script>
+	
+</body>
+
+</html>
\ No newline at end of file
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/ff/f0fd38de61b3001d19bbb001c1a81c20 b/.metadata/.plugins/org.eclipse.core.resources/.history/ff/f0fd38de61b3001d19bbb001c1a81c20
deleted file mode 100644
index f2202bba..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.history/ff/f0fd38de61b3001d19bbb001c1a81c20
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-	
-	<parent>
-		<groupId>com.shopme</groupId>
-		<artifactId>ShopmeWebParent</artifactId>
-		<version>0.0.1-SNAPSHOT</version>
-	</parent>
-	
-	<artifactId>ShopmeBackEnd</artifactId>
-	
-	<name>ShopmeBackEnd</name>
-	<description>Shopme Admin project</description>
-	<properties>
-		<java.version>15</java.version>
-	</properties>
-	<dependencies>
-
-
-   <dependency>
-	   
-	   
-   </dependency>
-
-
-	<dependency>
-		<groupId>org.springframework.boot</groupId>
-		<artifactId>spring-boot-devtools</artifactId>
-	</dependency>
-	</dependencies>
-	<build>
-		<plugins>
-			<plugin>
-				<groupId>org.springframework.boot</groupId>
-				<artifactId>spring-boot-maven-plugin</artifactId>
-			</plugin>
-		</plugins>
-	</build>
-</project>
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.projects/.org.eclipse.egit.core.cmp/.markers.snap b/.metadata/.plugins/org.eclipse.core.resources/.projects/.org.eclipse.egit.core.cmp/.markers.snap
deleted file mode 100644
index ed1969ba..00000000
Binary files a/.metadata/.plugins/org.eclipse.core.resources/.projects/.org.eclipse.egit.core.cmp/.markers.snap and /dev/null differ
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.projects/.org.eclipse.egit.core.cmp/.syncinfo.snap b/.metadata/.plugins/org.eclipse.core.resources/.projects/.org.eclipse.egit.core.cmp/.syncinfo.snap
deleted file mode 100644
index ed1969ba..00000000
Binary files a/.metadata/.plugins/org.eclipse.core.resources/.projects/.org.eclipse.egit.core.cmp/.syncinfo.snap and /dev/null differ
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.projects/ShopmeBackEnd/.indexes/e4/92/22/81/f2/4f/cb/history.index b/.metadata/.plugins/org.eclipse.core.resources/.projects/ShopmeBackEnd/.indexes/e4/92/22/81/f2/4f/cb/history.index
index bc01cb91..b1c39a65 100644
Binary files a/.metadata/.plugins/org.eclipse.core.resources/.projects/ShopmeBackEnd/.indexes/e4/92/22/81/f2/4f/cb/history.index and b/.metadata/.plugins/org.eclipse.core.resources/.projects/ShopmeBackEnd/.indexes/e4/92/22/81/f2/4f/cb/history.index differ
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.projects/ShopmeBackEnd/.indexes/e4/92/22/81/f2/4f/fe/history.index b/.metadata/.plugins/org.eclipse.core.resources/.projects/ShopmeBackEnd/.indexes/e4/92/22/81/f2/4f/fe/history.index
index 9f260361..a6fff6fe 100644
Binary files a/.metadata/.plugins/org.eclipse.core.resources/.projects/ShopmeBackEnd/.indexes/e4/92/22/81/f2/4f/fe/history.index and b/.metadata/.plugins/org.eclipse.core.resources/.projects/ShopmeBackEnd/.indexes/e4/92/22/81/f2/4f/fe/history.index differ
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.projects/ShopmeBackEnd/.indexes/e4/b9/22/81/f2/4f/40/history.index b/.metadata/.plugins/org.eclipse.core.resources/.projects/ShopmeBackEnd/.indexes/e4/b9/22/81/f2/4f/40/history.index
index 93f2ef77..07c95887 100644
Binary files a/.metadata/.plugins/org.eclipse.core.resources/.projects/ShopmeBackEnd/.indexes/e4/b9/22/81/f2/4f/40/history.index and b/.metadata/.plugins/org.eclipse.core.resources/.projects/ShopmeBackEnd/.indexes/e4/b9/22/81/f2/4f/40/history.index differ
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.projects/ShopmeBackEnd/.indexes/e4/b9/22/81/f2/4f/cb/4c/history.index b/.metadata/.plugins/org.eclipse.core.resources/.projects/ShopmeBackEnd/.indexes/e4/b9/22/81/f2/4f/cb/4c/history.index
deleted file mode 100644
index e70d604d..00000000
Binary files a/.metadata/.plugins/org.eclipse.core.resources/.projects/ShopmeBackEnd/.indexes/e4/b9/22/81/f2/4f/cb/4c/history.index and /dev/null differ
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.projects/ShopmeBackEnd/.indexes/e4/b9/22/81/f2/4f/cb/9c/history.index b/.metadata/.plugins/org.eclipse.core.resources/.projects/ShopmeBackEnd/.indexes/e4/b9/22/81/f2/4f/cb/9c/history.index
index 003d9f7c..c7df06b3 100644
Binary files a/.metadata/.plugins/org.eclipse.core.resources/.projects/ShopmeBackEnd/.indexes/e4/b9/22/81/f2/4f/cb/9c/history.index and b/.metadata/.plugins/org.eclipse.core.resources/.projects/ShopmeBackEnd/.indexes/e4/b9/22/81/f2/4f/cb/9c/history.index differ
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.projects/ShopmeBackEnd/.indexes/e4/b9/22/81/f2/4f/cb/history.index b/.metadata/.plugins/org.eclipse.core.resources/.projects/ShopmeBackEnd/.indexes/e4/b9/22/81/f2/4f/cb/history.index
index 833d8d98..5635e6ef 100644
Binary files a/.metadata/.plugins/org.eclipse.core.resources/.projects/ShopmeBackEnd/.indexes/e4/b9/22/81/f2/4f/cb/history.index and b/.metadata/.plugins/org.eclipse.core.resources/.projects/ShopmeBackEnd/.indexes/e4/b9/22/81/f2/4f/cb/history.index differ
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.projects/ShopmeBackEnd/.indexes/e4/b9/22/81/f2/4f/fe/history.index b/.metadata/.plugins/org.eclipse.core.resources/.projects/ShopmeBackEnd/.indexes/e4/b9/22/81/f2/4f/fe/history.index
index 26fa6bed..0a3ef37b 100644
Binary files a/.metadata/.plugins/org.eclipse.core.resources/.projects/ShopmeBackEnd/.indexes/e4/b9/22/81/f2/4f/fe/history.index and b/.metadata/.plugins/org.eclipse.core.resources/.projects/ShopmeBackEnd/.indexes/e4/b9/22/81/f2/4f/fe/history.index differ
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.projects/ShopmeBackEnd/.indexes/e4/b9/22/81/f2/4f/history.index b/.metadata/.plugins/org.eclipse.core.resources/.projects/ShopmeBackEnd/.indexes/e4/b9/22/81/f2/4f/history.index
index 13755961..bcb7b3f1 100644
Binary files a/.metadata/.plugins/org.eclipse.core.resources/.projects/ShopmeBackEnd/.indexes/e4/b9/22/81/f2/4f/history.index and b/.metadata/.plugins/org.eclipse.core.resources/.projects/ShopmeBackEnd/.indexes/e4/b9/22/81/f2/4f/history.index differ
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.projects/ShopmeBackEnd/.indexes/e4/b9/db/39/1c/history.index b/.metadata/.plugins/org.eclipse.core.resources/.projects/ShopmeBackEnd/.indexes/e4/b9/db/39/1c/history.index
index c64886b5..2489cc35 100644
Binary files a/.metadata/.plugins/org.eclipse.core.resources/.projects/ShopmeBackEnd/.indexes/e4/b9/db/39/1c/history.index and b/.metadata/.plugins/org.eclipse.core.resources/.projects/ShopmeBackEnd/.indexes/e4/b9/db/39/1c/history.index differ
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.projects/ShopmeBackEnd/.indexes/e4/b9/db/39/8/history.index b/.metadata/.plugins/org.eclipse.core.resources/.projects/ShopmeBackEnd/.indexes/e4/b9/db/39/8/history.index
index 8d1db367..6dcde96d 100644
Binary files a/.metadata/.plugins/org.eclipse.core.resources/.projects/ShopmeBackEnd/.indexes/e4/b9/db/39/8/history.index and b/.metadata/.plugins/org.eclipse.core.resources/.projects/ShopmeBackEnd/.indexes/e4/b9/db/39/8/history.index differ
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.projects/ShopmeBackEnd/.indexes/e4/b9/db/39/history.index b/.metadata/.plugins/org.eclipse.core.resources/.projects/ShopmeBackEnd/.indexes/e4/b9/db/39/history.index
index 391c83d5..66040e68 100644
Binary files a/.metadata/.plugins/org.eclipse.core.resources/.projects/ShopmeBackEnd/.indexes/e4/b9/db/39/history.index and b/.metadata/.plugins/org.eclipse.core.resources/.projects/ShopmeBackEnd/.indexes/e4/b9/db/39/history.index differ
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.projects/ShopmeBackEnd/.indexes/e4/b9/db/92/49/history.index b/.metadata/.plugins/org.eclipse.core.resources/.projects/ShopmeBackEnd/.indexes/e4/b9/db/92/49/history.index
index 4fb870bd..e23986bd 100644
Binary files a/.metadata/.plugins/org.eclipse.core.resources/.projects/ShopmeBackEnd/.indexes/e4/b9/db/92/49/history.index and b/.metadata/.plugins/org.eclipse.core.resources/.projects/ShopmeBackEnd/.indexes/e4/b9/db/92/49/history.index differ
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.projects/ShopmeBackEnd/.indexes/e4/b9/db/92/history.index b/.metadata/.plugins/org.eclipse.core.resources/.projects/ShopmeBackEnd/.indexes/e4/b9/db/92/history.index
deleted file mode 100644
index 75e7e711..00000000
Binary files a/.metadata/.plugins/org.eclipse.core.resources/.projects/ShopmeBackEnd/.indexes/e4/b9/db/92/history.index and /dev/null differ
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.projects/ShopmeBackEnd/.indexes/history.index b/.metadata/.plugins/org.eclipse.core.resources/.projects/ShopmeBackEnd/.indexes/history.index
deleted file mode 100644
index 7937a12b..00000000
Binary files a/.metadata/.plugins/org.eclipse.core.resources/.projects/ShopmeBackEnd/.indexes/history.index and /dev/null differ
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.projects/ShopmeBackEnd/.markers b/.metadata/.plugins/org.eclipse.core.resources/.projects/ShopmeBackEnd/.markers
index f1343ece..3842eae6 100644
Binary files a/.metadata/.plugins/org.eclipse.core.resources/.projects/ShopmeBackEnd/.markers and b/.metadata/.plugins/org.eclipse.core.resources/.projects/ShopmeBackEnd/.markers differ
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.projects/ShopmeBackEnd/.markers.snap b/.metadata/.plugins/org.eclipse.core.resources/.projects/ShopmeBackEnd/.markers.snap
deleted file mode 100644
index 61f6d940..00000000
Binary files a/.metadata/.plugins/org.eclipse.core.resources/.projects/ShopmeBackEnd/.markers.snap and /dev/null differ
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.projects/ShopmeBackEnd/.syncinfo.snap b/.metadata/.plugins/org.eclipse.core.resources/.projects/ShopmeBackEnd/.syncinfo.snap
deleted file mode 100644
index ed1969ba..00000000
Binary files a/.metadata/.plugins/org.eclipse.core.resources/.projects/ShopmeBackEnd/.syncinfo.snap and /dev/null differ
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.projects/ShopmeBackEnd/org.eclipse.jdt.core/state.dat b/.metadata/.plugins/org.eclipse.core.resources/.projects/ShopmeBackEnd/org.eclipse.jdt.core/state.dat
new file mode 100644
index 00000000..ff210426
Binary files /dev/null and b/.metadata/.plugins/org.eclipse.core.resources/.projects/ShopmeBackEnd/org.eclipse.jdt.core/state.dat differ
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.projects/ShopmeCommon/.indexes/e4/b9/22/81/f2/15/1d/history.index b/.metadata/.plugins/org.eclipse.core.resources/.projects/ShopmeCommon/.indexes/e4/b9/22/81/f2/15/1d/history.index
index 0b6a0bec..bb6636a8 100644
Binary files a/.metadata/.plugins/org.eclipse.core.resources/.projects/ShopmeCommon/.indexes/e4/b9/22/81/f2/15/1d/history.index and b/.metadata/.plugins/org.eclipse.core.resources/.projects/ShopmeCommon/.indexes/e4/b9/22/81/f2/15/1d/history.index differ
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.projects/ShopmeCommon/.markers.snap b/.metadata/.plugins/org.eclipse.core.resources/.projects/ShopmeCommon/.markers.snap
deleted file mode 100644
index 72e9d9b2..00000000
Binary files a/.metadata/.plugins/org.eclipse.core.resources/.projects/ShopmeCommon/.markers.snap and /dev/null differ
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.projects/ShopmeCommon/.syncinfo.snap b/.metadata/.plugins/org.eclipse.core.resources/.projects/ShopmeCommon/.syncinfo.snap
deleted file mode 100644
index ed1969ba..00000000
Binary files a/.metadata/.plugins/org.eclipse.core.resources/.projects/ShopmeCommon/.syncinfo.snap and /dev/null differ
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.projects/ShopmeCommon/org.eclipse.jdt.core/state.dat b/.metadata/.plugins/org.eclipse.core.resources/.projects/ShopmeCommon/org.eclipse.jdt.core/state.dat
new file mode 100644
index 00000000..2bcff084
Binary files /dev/null and b/.metadata/.plugins/org.eclipse.core.resources/.projects/ShopmeCommon/org.eclipse.jdt.core/state.dat differ
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.projects/ShopmeFrontEnd/.markers.snap b/.metadata/.plugins/org.eclipse.core.resources/.projects/ShopmeFrontEnd/.markers.snap
deleted file mode 100644
index ed1969ba..00000000
Binary files a/.metadata/.plugins/org.eclipse.core.resources/.projects/ShopmeFrontEnd/.markers.snap and /dev/null differ
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.projects/ShopmeFrontEnd/.syncinfo.snap b/.metadata/.plugins/org.eclipse.core.resources/.projects/ShopmeFrontEnd/.syncinfo.snap
deleted file mode 100644
index ed1969ba..00000000
Binary files a/.metadata/.plugins/org.eclipse.core.resources/.projects/ShopmeFrontEnd/.syncinfo.snap and /dev/null differ
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.projects/ShopmeFrontEnd/org.eclipse.jdt.core/state.dat b/.metadata/.plugins/org.eclipse.core.resources/.projects/ShopmeFrontEnd/org.eclipse.jdt.core/state.dat
new file mode 100644
index 00000000..49e90f59
Binary files /dev/null and b/.metadata/.plugins/org.eclipse.core.resources/.projects/ShopmeFrontEnd/org.eclipse.jdt.core/state.dat differ
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.projects/ShopmeProject/.markers.snap b/.metadata/.plugins/org.eclipse.core.resources/.projects/ShopmeProject/.markers.snap
deleted file mode 100644
index ed1969ba..00000000
Binary files a/.metadata/.plugins/org.eclipse.core.resources/.projects/ShopmeProject/.markers.snap and /dev/null differ
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.projects/ShopmeProject/.syncinfo.snap b/.metadata/.plugins/org.eclipse.core.resources/.projects/ShopmeProject/.syncinfo.snap
deleted file mode 100644
index ed1969ba..00000000
Binary files a/.metadata/.plugins/org.eclipse.core.resources/.projects/ShopmeProject/.syncinfo.snap and /dev/null differ
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.projects/ShopmeWebParent/.indexes/history.index b/.metadata/.plugins/org.eclipse.core.resources/.projects/ShopmeWebParent/.indexes/history.index
deleted file mode 100644
index df3029a8..00000000
Binary files a/.metadata/.plugins/org.eclipse.core.resources/.projects/ShopmeWebParent/.indexes/history.index and /dev/null differ
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.projects/ShopmeWebParent/.markers.snap b/.metadata/.plugins/org.eclipse.core.resources/.projects/ShopmeWebParent/.markers.snap
deleted file mode 100644
index ed1969ba..00000000
Binary files a/.metadata/.plugins/org.eclipse.core.resources/.projects/ShopmeWebParent/.markers.snap and /dev/null differ
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.projects/ShopmeWebParent/.syncinfo.snap b/.metadata/.plugins/org.eclipse.core.resources/.projects/ShopmeWebParent/.syncinfo.snap
deleted file mode 100644
index ed1969ba..00000000
Binary files a/.metadata/.plugins/org.eclipse.core.resources/.projects/ShopmeWebParent/.syncinfo.snap and /dev/null differ
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.root/.markers.snap b/.metadata/.plugins/org.eclipse.core.resources/.root/.markers.snap
deleted file mode 100644
index 811c8b39..00000000
Binary files a/.metadata/.plugins/org.eclipse.core.resources/.root/.markers.snap and /dev/null differ
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.root/45.tree b/.metadata/.plugins/org.eclipse.core.resources/.root/48.tree
similarity index 54%
rename from .metadata/.plugins/org.eclipse.core.resources/.root/45.tree
rename to .metadata/.plugins/org.eclipse.core.resources/.root/48.tree
index 81c5bc7f..46d69eda 100644
Binary files a/.metadata/.plugins/org.eclipse.core.resources/.root/45.tree and b/.metadata/.plugins/org.eclipse.core.resources/.root/48.tree differ
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.core.resources b/.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.core.resources
index 6f84be33..9495f12c 100644
Binary files a/.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.core.resources and b/.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.core.resources differ
diff --git a/.metadata/.plugins/org.eclipse.core.resources/45.snap b/.metadata/.plugins/org.eclipse.core.resources/45.snap
deleted file mode 100644
index 7d530d30..00000000
Binary files a/.metadata/.plugins/org.eclipse.core.resources/45.snap and /dev/null differ
diff --git a/.metadata/.plugins/org.eclipse.core.runtime/.settings/com.genuitec.eclipse.theming.ui.prefs b/.metadata/.plugins/org.eclipse.core.runtime/.settings/com.genuitec.eclipse.theming.ui.prefs
index f855fd21..7fbc20d3 100644
--- a/.metadata/.plugins/org.eclipse.core.runtime/.settings/com.genuitec.eclipse.theming.ui.prefs
+++ b/.metadata/.plugins/org.eclipse.core.runtime/.settings/com.genuitec.eclipse.theming.ui.prefs
@@ -5,7 +5,7 @@ eclipse.preferences.version=1
 iconcolormode=primary
 iconreplacement=true
 includeThemingInOomph=false
-last.download.attempt.time=1677664103725
-lastConfiguration=1677723961542
+last.download.attempt.time=1677829935538
+lastConfiguration=1677829870684
 newinstall=true
 workbench.theme=Dark Gray
diff --git a/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.debug.ui.prefs b/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.debug.ui.prefs
index 87935f9b..3489e73d 100644
--- a/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.debug.ui.prefs
+++ b/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.debug.ui.prefs
@@ -1,15 +1,5 @@
 Console.highWaterMark=88000
 eclipse.preferences.version=1
-org.eclipse.debug.ui.Color=218,29,67
-org.eclipse.debug.ui.MemoryHistoryKnownColor=233,235,237
-org.eclipse.debug.ui.MemoryHistoryUnknownColor=168,177,184
-org.eclipse.debug.ui.PREF_CHANGED_VALUE_BACKGROUND=145,77,111
 org.eclipse.debug.ui.PREF_LAUNCH_PERSPECTIVES=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?>\r\n<launchPerspectives/>\r\n
-org.eclipse.debug.ui.changedDebugElement=255,128,128
-org.eclipse.debug.ui.consoleBackground=25,29,31
-org.eclipse.debug.ui.errorColor=204,223,50
-org.eclipse.debug.ui.inColor=216,216,216
-org.eclipse.debug.ui.outColor=216,216,216
-overriddenByCSS=,org.eclipse.debug.ui.Color,org.eclipse.debug.ui.MemoryHistoryKnownColor,org.eclipse.debug.ui.MemoryHistoryUnknownColor,org.eclipse.debug.ui.PREF_CHANGED_VALUE_BACKGROUND,org.eclipse.debug.ui.changedDebugElement,org.eclipse.debug.ui.consoleBackground,org.eclipse.debug.ui.errorColor,org.eclipse.debug.ui.inColor,org.eclipse.debug.ui.outColor,
 pref_state_memento.org.eclipse.debug.ui.DebugVieworg.eclipse.debug.ui.DebugView=<?xml version\="1.0" encoding\="UTF-8"?>\r\n<DebugViewMemento org.eclipse.debug.ui.BREADCRUMB_DROPDOWN_AUTO_EXPAND\="false"/>
 preferredTargets=default,org.eclipse.lsp4e.debug.toggleBreakpointTarget\:default|org.eclipse.lsp4e.debug.toggleBreakpointTarget\:org.eclipse.lsp4e.debug.toggleBreakpointTarget|
diff --git a/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.jdt.ui.prefs b/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.jdt.ui.prefs
index fd7ca134..cf4a63e4 100644
--- a/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.jdt.ui.prefs
+++ b/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.jdt.ui.prefs
@@ -1,160 +1,10 @@
 content_assist_autoactivation_triggers_java=abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ._@
 content_assist_category_order=org.eclipse.jdt.ui.templateProposalCategory\:0\u0000org.eclipse.jdt.ui.swtProposalCategory\:1\u0000org.eclipse.jdt.ui.javaNoTypeProposalCategory\:2\u0000org.eclipse.jdt.ui.javaChainProposalCategory\:3\u0000org.eclipse.jdt.ui.javaTypeProposalCategory\:4\u0000org.eclipse.jdt.ui.textProposalCategory\:5\u0000org.eclipse.jdt.ui.javaAllProposalCategory\:6\u0000org.eclipse.jdt.ui.javaPostfixProposalCategory\:65542\u0000org.eclipse.pde.api.tools.ui.apitools_proposal_category\:8\u0000org.eclipse.lsp4e.jdt.ls-based-java-completion-computer\:9\u0000
-content_assist_completion_replacement_background=200,200,0
-content_assist_completion_replacement_foreground=194,0,0
 content_assist_disabled_computers=org.eclipse.jdt.ui.textProposalCategory\u0000org.eclipse.jdt.ui.javaPostfixProposalCategory\u0000org.eclipse.jdt.ui.javaNoTypeProposalCategory\u0000org.eclipse.jdt.ui.javaTypeProposalCategory\u0000org.eclipse.jdt.ui.javaChainProposalCategory\u0000
-content_assist_lru_history=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><history maxLHS\="100" maxRHS\="10"><lhs name\="java.lang.Enum"><rhs name\="jakarta.persistence.FetchType"/><rhs name\="jakarta.persistence.GenerationType"/><rhs name\="org.springframework.boot.test.autoconfigure.jdbc.AutoConfigureTestDatabase$Replace"/></lhs><lhs name\="java.lang.constant.Constable"><rhs name\="jakarta.persistence.FetchType"/><rhs name\="jakarta.persistence.GenerationType"/><rhs name\="org.springframework.boot.test.autoconfigure.jdbc.AutoConfigureTestDatabase$Replace"/></lhs><lhs name\="org.springframework.security.crypto.password.PasswordEncoder"><rhs name\="org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder"/></lhs><lhs name\="org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder"><rhs name\="org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder"/></lhs><lhs name\="java.lang.Exception"><rhs name\="com.shopme.admin.user.UserNotFoundException"/><rhs name\="java.io.IOException"/></lhs><lhs name\="java.lang.Throwable"><rhs name\="com.shopme.admin.user.UserNotFoundException"/><rhs name\="java.io.IOException"/></lhs><lhs name\="com.shopme.admin.user.UserNotFoundException"><rhs name\="com.shopme.admin.user.UserNotFoundException"/></lhs><lhs name\="java.nio.file.CopyOption"><rhs name\="java.nio.file.StandardCopyOption"/></lhs><lhs name\="java.io.IOException"><rhs name\="java.io.IOException"/></lhs><lhs name\="org.springframework.data.domain.Pageable"><rhs name\="org.springframework.data.domain.PageRequest"/></lhs><lhs name\="org.springframework.data.util.Streamable"><rhs name\="org.springframework.data.domain.Sort"/></lhs><lhs name\="java.lang.Iterable"><rhs name\="org.springframework.data.domain.Sort"/></lhs><lhs name\="java.util.function.Supplier"><rhs name\="org.springframework.data.domain.Sort"/></lhs><lhs name\="org.springframework.data.domain.Sort"><rhs name\="org.springframework.data.domain.Sort"/></lhs><lhs name\="java.text.Format"><rhs name\="java.text.SimpleDateFormat"/></lhs><lhs name\="java.lang.Cloneable"><rhs name\="java.text.SimpleDateFormat"/></lhs><lhs name\="java.text.DateFormat"><rhs name\="java.text.SimpleDateFormat"/></lhs><lhs name\="org.supercsv.io.ICsvWriter"><rhs name\="org.supercsv.io.CsvBeanWriter"/></lhs><lhs name\="java.io.Closeable"><rhs name\="org.supercsv.io.CsvBeanWriter"/></lhs><lhs name\="java.lang.AutoCloseable"><rhs name\="org.supercsv.io.CsvBeanWriter"/></lhs><lhs name\="java.io.Flushable"><rhs name\="org.supercsv.io.CsvBeanWriter"/></lhs><lhs name\="org.supercsv.io.ICsvBeanWriter"><rhs name\="org.supercsv.io.CsvBeanWriter"/></lhs><lhs name\="org.springframework.security.core.GrantedAuthority"><rhs name\="org.springframework.security.core.authority.SimpleGrantedAuthority"/></lhs><lhs name\="org.springframework.security.core.userdetails.UserDetails"><rhs name\="com.shopme.admin.security.ShopmeUserDetails"/></lhs><lhs name\="org.springframework.security.core.userdetails.UserDetailsService"><rhs name\="com.shopme.admin.security.ShopmeUserDetailsService"/></lhs></history>
+content_assist_lru_history=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><history maxLHS\="100" maxRHS\="10"><lhs name\="java.lang.Enum"><rhs name\="jakarta.persistence.FetchType"/><rhs name\="jakarta.persistence.GenerationType"/><rhs name\="org.springframework.boot.test.autoconfigure.jdbc.AutoConfigureTestDatabase$Replace"/></lhs><lhs name\="java.lang.constant.Constable"><rhs name\="jakarta.persistence.FetchType"/><rhs name\="jakarta.persistence.GenerationType"/><rhs name\="org.springframework.boot.test.autoconfigure.jdbc.AutoConfigureTestDatabase$Replace"/></lhs><lhs name\="org.springframework.security.crypto.password.PasswordEncoder"><rhs name\="org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder"/></lhs><lhs name\="org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder"><rhs name\="org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder"/></lhs><lhs name\="java.lang.Exception"><rhs name\="com.shopme.admin.user.UserNotFoundException"/><rhs name\="java.io.IOException"/></lhs><lhs name\="java.lang.Throwable"><rhs name\="com.shopme.admin.user.UserNotFoundException"/><rhs name\="java.io.IOException"/></lhs><lhs name\="com.shopme.admin.user.UserNotFoundException"><rhs name\="com.shopme.admin.user.UserNotFoundException"/></lhs><lhs name\="java.nio.file.CopyOption"><rhs name\="java.nio.file.StandardCopyOption"/></lhs><lhs name\="java.io.IOException"><rhs name\="java.io.IOException"/></lhs><lhs name\="org.springframework.data.domain.Pageable"><rhs name\="org.springframework.data.domain.PageRequest"/></lhs><lhs name\="org.springframework.data.util.Streamable"><rhs name\="org.springframework.data.domain.Sort"/></lhs><lhs name\="java.lang.Iterable"><rhs name\="org.springframework.data.domain.Sort"/></lhs><lhs name\="java.util.function.Supplier"><rhs name\="org.springframework.data.domain.Sort"/></lhs><lhs name\="org.springframework.data.domain.Sort"><rhs name\="org.springframework.data.domain.Sort"/></lhs><lhs name\="java.text.Format"><rhs name\="java.text.SimpleDateFormat"/></lhs><lhs name\="java.lang.Cloneable"><rhs name\="java.text.SimpleDateFormat"/></lhs><lhs name\="java.text.DateFormat"><rhs name\="java.text.SimpleDateFormat"/></lhs><lhs name\="org.supercsv.io.ICsvWriter"><rhs name\="org.supercsv.io.CsvBeanWriter"/></lhs><lhs name\="java.io.Closeable"><rhs name\="org.supercsv.io.CsvBeanWriter"/></lhs><lhs name\="java.lang.AutoCloseable"><rhs name\="org.supercsv.io.CsvBeanWriter"/></lhs><lhs name\="java.io.Flushable"><rhs name\="org.supercsv.io.CsvBeanWriter"/></lhs><lhs name\="org.supercsv.io.ICsvBeanWriter"><rhs name\="org.supercsv.io.CsvBeanWriter"/></lhs><lhs name\="org.springframework.security.core.GrantedAuthority"><rhs name\="org.springframework.security.core.authority.SimpleGrantedAuthority"/></lhs><lhs name\="org.springframework.security.core.userdetails.UserDetails"><rhs name\="com.shopme.admin.security.ShopmeUserDetails"/></lhs><lhs name\="org.springframework.security.core.userdetails.UserDetailsService"><rhs name\="com.shopme.admin.security.ShopmeUserDetailsService"/></lhs><lhs name\="com.shopme.common.entity.Category"><rhs name\="com.shopme.common.entity.Category"/></lhs></history>
 content_assist_number_of_computers=15
-content_assist_parameters_background=48,54,59
-content_assist_parameters_foreground=235,237,239
-content_assist_proposals_background=48,54,59
-content_assist_proposals_foreground=235,237,239
 eclipse.preferences.version=1
-java_bracket=216,216,216
-java_comment_task_tag=204,223,50
-java_default=216,216,216
-java_doc_default=98,151,85
-java_doc_keyword=132,185,119
-java_doc_link=132,185,119
-java_doc_tag=132,185,119
-java_keyword=204,120,50
-java_keyword_bold=false
-java_keyword_return=204,120,50
-java_keyword_return_bold=false
-java_multi_line_comment=98,151,85
-java_operator=216,216,216
-java_single_line_comment=128,128,128
-java_string=165,194,92
-matchingBracketsColor=244,245,246
 org.eclipse.jdt.ui.formatterprofiles.version=22
-overriddenByCSS=,content_assist_completion_replacement_background,content_assist_completion_replacement_foreground,content_assist_parameters_background,content_assist_parameters_foreground,content_assist_proposals_background,content_assist_proposals_foreground,java_bracket,java_comment_task_tag,java_default,java_doc_default,java_doc_keyword,java_doc_link,java_doc_tag,java_keyword,java_keyword_bold,java_keyword_return,java_keyword_return_bold,java_multi_line_comment,java_operator,java_single_line_comment,java_string,matchingBracketsColor,pf_coloring_argument,pf_coloring_assignment,pf_coloring_comment,pf_coloring_key,pf_coloring_value,semanticHighlighting.abstractClass.color,semanticHighlighting.abstractClass.enabled,semanticHighlighting.abstractMethodInvocation.bold,semanticHighlighting.abstractMethodInvocation.color,semanticHighlighting.abstractMethodInvocation.enabled,semanticHighlighting.abstractMethodInvocation.italic,semanticHighlighting.abstractMethodInvocation.strikethrough,semanticHighlighting.abstractMethodInvocation.underline,semanticHighlighting.annotation.bold,semanticHighlighting.annotation.color,semanticHighlighting.annotation.enabled,semanticHighlighting.annotation.italic,semanticHighlighting.annotation.strikethrough,semanticHighlighting.annotation.underline,semanticHighlighting.annotationElementReference.color,semanticHighlighting.annotationElementReference.enabled,semanticHighlighting.class.bold,semanticHighlighting.class.color,semanticHighlighting.class.enabled,semanticHighlighting.class.italic,semanticHighlighting.class.strikethrough,semanticHighlighting.class.underline,semanticHighlighting.deprecatedMember.bold,semanticHighlighting.deprecatedMember.color,semanticHighlighting.deprecatedMember.enabled,semanticHighlighting.deprecatedMember.italic,semanticHighlighting.deprecatedMember.strikethrough,semanticHighlighting.deprecatedMember.underline,semanticHighlighting.enum.bold,semanticHighlighting.enum.color,semanticHighlighting.enum.enabled,semanticHighlighting.enum.italic,semanticHighlighting.enum.strikethrough,semanticHighlighting.enum.underline,semanticHighlighting.field.bold,semanticHighlighting.field.color,semanticHighlighting.field.enabled,semanticHighlighting.field.italic,semanticHighlighting.field.strikethrough,semanticHighlighting.field.underline,semanticHighlighting.inheritedField.color,semanticHighlighting.inheritedMethodInvocation.bold,semanticHighlighting.inheritedMethodInvocation.color,semanticHighlighting.inheritedMethodInvocation.enabled,semanticHighlighting.inheritedMethodInvocation.italic,semanticHighlighting.inheritedMethodInvocation.strikethrough,semanticHighlighting.inheritedMethodInvocation.underline,semanticHighlighting.interface.bold,semanticHighlighting.interface.color,semanticHighlighting.interface.enabled,semanticHighlighting.interface.italic,semanticHighlighting.interface.strikethrough,semanticHighlighting.interface.underline,semanticHighlighting.localVariable.bold,semanticHighlighting.localVariable.color,semanticHighlighting.localVariable.enabled,semanticHighlighting.localVariable.italic,semanticHighlighting.localVariable.strikethrough,semanticHighlighting.localVariable.underline,semanticHighlighting.localVariableDeclaration.bold,semanticHighlighting.localVariableDeclaration.color,semanticHighlighting.localVariableDeclaration.enabled,semanticHighlighting.localVariableDeclaration.italic,semanticHighlighting.localVariableDeclaration.strikethrough,semanticHighlighting.localVariableDeclaration.underline,semanticHighlighting.method.bold,semanticHighlighting.method.color,semanticHighlighting.method.enabled,semanticHighlighting.method.italic,semanticHighlighting.method.strikethrough,semanticHighlighting.method.underline,semanticHighlighting.methodDeclarationName.bold,semanticHighlighting.methodDeclarationName.color,semanticHighlighting.methodDeclarationName.enabled,semanticHighlighting.methodDeclarationName.italic,semanticHighlighting.methodDeclarationName.strikethrough,semanticHighlighting.methodDeclarationName.underline,semanticHighlighting.number.bold,semanticHighlighting.number.color,semanticHighlighting.number.enabled,semanticHighlighting.number.italic,semanticHighlighting.number.strikethrough,semanticHighlighting.number.underline,semanticHighlighting.parameterVariable.bold,semanticHighlighting.parameterVariable.color,semanticHighlighting.parameterVariable.enabled,semanticHighlighting.parameterVariable.italic,semanticHighlighting.parameterVariable.strikethrough,semanticHighlighting.parameterVariable.underline,semanticHighlighting.restrictedKeywords.bold,semanticHighlighting.restrictedKeywords.color,semanticHighlighting.staticField.bold,semanticHighlighting.staticField.color,semanticHighlighting.staticField.enabled,semanticHighlighting.staticField.italic,semanticHighlighting.staticField.strikethrough,semanticHighlighting.staticField.underline,semanticHighlighting.staticFinalField.bold,semanticHighlighting.staticFinalField.color,semanticHighlighting.staticFinalField.enabled,semanticHighlighting.staticFinalField.italic,semanticHighlighting.staticFinalField.strikethrough,semanticHighlighting.staticFinalField.underline,semanticHighlighting.staticMethodInvocation.bold,semanticHighlighting.staticMethodInvocation.color,semanticHighlighting.staticMethodInvocation.enabled,semanticHighlighting.staticMethodInvocation.italic,semanticHighlighting.staticMethodInvocation.strikethrough,semanticHighlighting.staticMethodInvocation.underline,semanticHighlighting.typeArgument.bold,semanticHighlighting.typeArgument.color,semanticHighlighting.typeArgument.enabled,semanticHighlighting.typeArgument.italic,semanticHighlighting.typeArgument.strikethrough,semanticHighlighting.typeArgument.underline,semanticHighlighting.typeParameter.bold,semanticHighlighting.typeParameter.color,semanticHighlighting.typeParameter.enabled,semanticHighlighting.typeParameter.italic,semanticHighlighting.typeParameter.strikethrough,semanticHighlighting.typeParameter.underline,sourceHoverBackgroundColor,
-pf_coloring_argument=204,120,50
-pf_coloring_assignment=216,216,216
-pf_coloring_comment=128,128,128
-pf_coloring_key=216,216,216
-pf_coloring_value=165,194,92
-semanticHighlighting.abstractClass.color=62,171,230
-semanticHighlighting.abstractClass.enabled=true
-semanticHighlighting.abstractMethodInvocation.bold=false
-semanticHighlighting.abstractMethodInvocation.color=190,214,255
-semanticHighlighting.abstractMethodInvocation.enabled=true
-semanticHighlighting.abstractMethodInvocation.italic=false
-semanticHighlighting.abstractMethodInvocation.strikethrough=false
-semanticHighlighting.abstractMethodInvocation.underline=false
-semanticHighlighting.annotation.bold=false
-semanticHighlighting.annotation.color=187,181,41
-semanticHighlighting.annotation.enabled=true
-semanticHighlighting.annotation.italic=false
-semanticHighlighting.annotation.strikethrough=false
-semanticHighlighting.annotation.underline=false
-semanticHighlighting.annotationElementReference.color=235,75,100
-semanticHighlighting.annotationElementReference.enabled=true
-semanticHighlighting.class.bold=false
-semanticHighlighting.class.color=169,183,198
-semanticHighlighting.class.enabled=true
-semanticHighlighting.class.italic=false
-semanticHighlighting.class.strikethrough=false
-semanticHighlighting.class.underline=false
-semanticHighlighting.deprecatedMember.bold=false
-semanticHighlighting.deprecatedMember.color=210,82,82
-semanticHighlighting.deprecatedMember.enabled=true
-semanticHighlighting.deprecatedMember.italic=false
-semanticHighlighting.deprecatedMember.strikethrough=true
-semanticHighlighting.deprecatedMember.underline=false
-semanticHighlighting.enum.bold=false
-semanticHighlighting.enum.color=127,179,71
-semanticHighlighting.enum.enabled=true
-semanticHighlighting.enum.italic=false
-semanticHighlighting.enum.strikethrough=false
-semanticHighlighting.enum.underline=false
-semanticHighlighting.field.bold=false
-semanticHighlighting.field.color=190,214,255
-semanticHighlighting.field.enabled=true
-semanticHighlighting.field.italic=false
-semanticHighlighting.field.strikethrough=false
-semanticHighlighting.field.underline=false
-semanticHighlighting.inheritedField.color=143,143,191
-semanticHighlighting.inheritedMethodInvocation.bold=false
-semanticHighlighting.inheritedMethodInvocation.color=190,214,255
-semanticHighlighting.inheritedMethodInvocation.enabled=true
-semanticHighlighting.inheritedMethodInvocation.italic=false
-semanticHighlighting.inheritedMethodInvocation.strikethrough=false
-semanticHighlighting.inheritedMethodInvocation.underline=false
-semanticHighlighting.interface.bold=false
-semanticHighlighting.interface.color=152,118,170
-semanticHighlighting.interface.enabled=true
-semanticHighlighting.interface.italic=false
-semanticHighlighting.interface.strikethrough=false
-semanticHighlighting.interface.underline=false
-semanticHighlighting.localVariable.bold=false
-semanticHighlighting.localVariable.color=121,171,255
-semanticHighlighting.localVariable.enabled=true
-semanticHighlighting.localVariable.italic=false
-semanticHighlighting.localVariable.strikethrough=false
-semanticHighlighting.localVariable.underline=false
-semanticHighlighting.localVariableDeclaration.bold=false
-semanticHighlighting.localVariableDeclaration.color=190,214,255
-semanticHighlighting.localVariableDeclaration.enabled=true
-semanticHighlighting.localVariableDeclaration.italic=false
-semanticHighlighting.localVariableDeclaration.strikethrough=false
-semanticHighlighting.localVariableDeclaration.underline=false
-semanticHighlighting.method.bold=false
-semanticHighlighting.method.color=169,183,198
-semanticHighlighting.method.enabled=true
-semanticHighlighting.method.italic=false
-semanticHighlighting.method.strikethrough=false
-semanticHighlighting.method.underline=false
-semanticHighlighting.methodDeclarationName.bold=false
-semanticHighlighting.methodDeclarationName.color=255,198,109
-semanticHighlighting.methodDeclarationName.enabled=true
-semanticHighlighting.methodDeclarationName.italic=false
-semanticHighlighting.methodDeclarationName.strikethrough=false
-semanticHighlighting.methodDeclarationName.underline=false
-semanticHighlighting.number.bold=false
-semanticHighlighting.number.color=104,151,187
-semanticHighlighting.number.enabled=true
-semanticHighlighting.number.italic=false
-semanticHighlighting.number.strikethrough=false
-semanticHighlighting.number.underline=false
-semanticHighlighting.parameterVariable.bold=false
-semanticHighlighting.parameterVariable.color=121,171,255
-semanticHighlighting.parameterVariable.enabled=true
-semanticHighlighting.parameterVariable.italic=false
-semanticHighlighting.parameterVariable.strikethrough=false
-semanticHighlighting.parameterVariable.underline=false
-semanticHighlighting.restrictedKeywords.bold=false
-semanticHighlighting.restrictedKeywords.color=197,104,28
-semanticHighlighting.staticField.bold=false
-semanticHighlighting.staticField.color=239,192,144
-semanticHighlighting.staticField.enabled=true
-semanticHighlighting.staticField.italic=false
-semanticHighlighting.staticField.strikethrough=false
-semanticHighlighting.staticField.underline=false
-semanticHighlighting.staticFinalField.bold=false
-semanticHighlighting.staticFinalField.color=152,118,170
-semanticHighlighting.staticFinalField.enabled=true
-semanticHighlighting.staticFinalField.italic=false
-semanticHighlighting.staticFinalField.strikethrough=false
-semanticHighlighting.staticFinalField.underline=false
-semanticHighlighting.staticMethodInvocation.bold=false
-semanticHighlighting.staticMethodInvocation.color=190,214,255
-semanticHighlighting.staticMethodInvocation.enabled=true
-semanticHighlighting.staticMethodInvocation.italic=false
-semanticHighlighting.staticMethodInvocation.strikethrough=false
-semanticHighlighting.staticMethodInvocation.underline=false
-semanticHighlighting.typeArgument.bold=false
-semanticHighlighting.typeArgument.color=191,164,164
-semanticHighlighting.typeArgument.enabled=true
-semanticHighlighting.typeArgument.italic=false
-semanticHighlighting.typeArgument.strikethrough=false
-semanticHighlighting.typeArgument.underline=false
-semanticHighlighting.typeParameter.bold=false
-semanticHighlighting.typeParameter.color=191,164,164
-semanticHighlighting.typeParameter.enabled=true
-semanticHighlighting.typeParameter.italic=false
-semanticHighlighting.typeParameter.strikethrough=false
-semanticHighlighting.typeParameter.underline=false
-sourceHoverBackgroundColor=66,68,69
 spelling_locale_initialized=true
 typefilter_migrated_2=true
 useAnnotationsPrefPage=true
diff --git a/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.pde.ui.prefs b/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.pde.ui.prefs
deleted file mode 100644
index 715e4bd5..00000000
--- a/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.pde.ui.prefs
+++ /dev/null
@@ -1,20 +0,0 @@
-eclipse.preferences.version=1
-editor.color.default=216,216,216
-editor.color.externalized_string=165,194,92
-editor.color.externalized_string_italic=true
-editor.color.header_assignment=216,216,216
-editor.color.header_assignment_bold=true
-editor.color.header_attributes=121,171,255
-editor.color.header_key=204,120,50
-editor.color.header_key_bold=true
-editor.color.header_osgi=204,120,50
-editor.color.header_value=165,194,92
-editor.color.header_value_italic=true
-editor.color.instr=169,183,198
-editor.color.instr_bold=true
-editor.color.string=165,194,92
-editor.color.string_italic=true
-editor.color.tag=121,171,255
-editor.color.tag_bold=true
-editor.color.xml_comment=98,151,85
-overriddenByCSS=,editor.color.default,editor.color.externalized_string,editor.color.externalized_string_italic,editor.color.header_assignment,editor.color.header_assignment_bold,editor.color.header_attributes,editor.color.header_key,editor.color.header_key_bold,editor.color.header_osgi,editor.color.header_value,editor.color.header_value_italic,editor.color.instr,editor.color.instr_bold,editor.color.string,editor.color.string_italic,editor.color.tag,editor.color.tag_bold,editor.color.xml_comment,
diff --git a/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.editors.prefs b/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.editors.prefs
index 4911532b..cf8bb60f 100644
--- a/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.editors.prefs
+++ b/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.editors.prefs
@@ -1,47 +1,6 @@
 AbstractTextEditor.Color.Background=28,31,34
 AbstractTextEditor.Color.Background.SystemDefault=false
-AbstractTextEditor.Color.FindScope=66,68,69
-AbstractTextEditor.Color.Foreground=216,216,216
-AbstractTextEditor.Color.Foreground.SystemDefault=false
-AbstractTextEditor.Color.SelectionBackground=26,95,140
 AbstractTextEditor.Color.SelectionBackground.SystemDefault=false
-AbstractTextEditor.Color.SelectionForeground=146,157,165
 AbstractTextEditor.Color.SelectionForeground.SystemDefault=false
-LSP4EReadOccurrenceIndicationColor=26,95,140
-LSP4ETextOccurrenceIndicationColor=26,95,140
-LSP4EWriteOccurrenceIndicationColor=26,95,140
-PHPReadOccurrenceIndicationColor=65,65,4
-PHPWriteOccurrenceIndicationColor=65,65,4
 STS4BootMarkerIndicationColor=54,81,25
-TM4EMatchingPairColor=26,95,140
-TextOccurrenceIndicationColor=27, 98, 145
-asOccurencesIndicationColor=65,65,4
-breakpointIndicationColor=49,115,187
-currentIPColor=50,50,50
-currentLineColor=50,57,62
-deletionIndicationColor=210,82,82
 eclipse.preferences.version=1
-filteredSearchResultIndicationColor=26,95,140
-findBlockColor=255,165,0
-findIndicationColor=47,58,119
-hyperlinkColor=111,197,238
-hyperlinkColor.SystemDefault=false
-infoIndicationColor=86,194,170
-javaScriptOccurrenceIndicationColor=65,65,4
-lineNumberColor=208,208,208
-linked.slave.color=66,156,255
-matchingTagIndicationColor=65,65,4
-occurrenceIndicationColor=65,65,4
-org.eclipse.cdt.ui.occurrenceIndicationColor=65,65,4
-org.eclipse.cdt.ui.writeOccurrenceIndicationColor=65,65,4
-overriddenByCSS=,AbstractTextEditor.Color.FindScope,AbstractTextEditor.Color.Foreground,AbstractTextEditor.Color.Foreground.SystemDefault,AbstractTextEditor.Color.SelectionBackground,AbstractTextEditor.Color.SelectionForeground,LSP4EReadOccurrenceIndicationColor,LSP4ETextOccurrenceIndicationColor,LSP4EWriteOccurrenceIndicationColor,PHPReadOccurrenceIndicationColor,PHPWriteOccurrenceIndicationColor,TM4EMatchingPairColor,TextOccurrenceIndicationColor,asOccurencesIndicationColor,breakpointIndicationColor,currentIPColor,currentLineColor,deletionIndicationColor,filteredSearchResultIndicationColor,findBlockColor,findIndicationColor,hyperlinkColor,hyperlinkColor.SystemDefault,infoIndicationColor,javaScriptOccurrenceIndicationColor,lineNumberColor,linked.slave.color,matchingTagIndicationColor,occurrenceIndicationColor,org.eclipse.cdt.ui.occurrenceIndicationColor,org.eclipse.cdt.ui.writeOccurrenceIndicationColor,overrideIndicatorColor,printMarginColor,pydevOccurrenceIndicationColor,searchResultHighlighting,searchResultIndication,searchResultIndicationColor,searchResultTextStyle,secondaryIPColor,spellingIndicationColor,writeOccurrenceIndicationColor,
-overrideIndicatorColor=75,116,113
-printMarginColor=208,208,208
-pydevOccurrenceIndicationColor=65,65,4
-searchResultHighlighting=false
-searchResultIndication=true
-searchResultIndicationColor=66,68,69
-searchResultTextStyle=BOX
-secondaryIPColor=50,50,50
-spellingIndicationColor=253,170,211
-writeOccurrenceIndicationColor=65,65,4
diff --git a/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.genericeditor.prefs b/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.genericeditor.prefs
deleted file mode 100644
index 417e71e7..00000000
--- a/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.genericeditor.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-eclipse.preferences.version=1
-matchingBracketsColor=244,245,246
-overriddenByCSS=,matchingBracketsColor,
diff --git a/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.workbench.prefs b/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.workbench.prefs
index 102f7ca0..98e0ba1b 100644
--- a/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.workbench.prefs
+++ b/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.workbench.prefs
@@ -1,39 +1,7 @@
 //org.eclipse.ui.commands/state/org.eclipse.ui.navigator.resources.nested.changeProjectPresentation/org.eclipse.ui.commands.radioState=false
-ACTIVE_HYPERLINK_COLOR=255,200,0
-ATMARK_RULE=89,179,179
-ATTRIBUTE_DELIM=89,179,179
-ATTRIBUTE_NAME=89,179,179
-ATTRIBUTE_OPERATOR=89,179,179
-ATTRIBUTE_VALUE=89,179,179
-CLASS=89,179,179
-COMBINATOR=89,179,179
-COMMENT=75,113,227
-CONFLICTING_COLOR=232,14,64
-CONTENT_ASSIST_BACKGROUND_COLOR=46,52,56
-CONTENT_ASSIST_FOREGROUND_COLOR=233,235,237
-COUNTER_COLOR=0,208,255
 ColorsAndFontsPreferencePage.expandedCategories=Torg.eclipse.ui.presentation.default
 ColorsAndFontsPreferencePage.selectedElement=Forg.eclipse.ui.workbench.TAB_TEXT_FONT
-DECORATIONS_COLOR=181,152,86
-ERROR=255,96,96
-ERROR_COLOR=247,68,117
-HYPERLINK_COLOR=111,197,238
-ID=89,179,179
-INCOMING_COLOR=31,179,235
-MEDIA=242,0,255
-OUTGOING_COLOR=235,237,239
 PLUGINS_NOT_ACTIVATED_ON_STARTUP=;org.eclipse.m2e.discovery;
-PROPERTY_NAME=255,0,255
-PROPERTY_VALUE=242,0,255
-PSEUDO=89,179,179
-RESOLVED_COLOR=104,203,16
-SCRIPT_AREA_BORDER=227,113,75
-SELECTOR=89,179,179
-STRING=242,0,255
-UNIVERSAL=89,179,179
-URI=242,0,255
-cdataBorder=0,254,254
-cdataText=255,255,255
 com.genuitec.eclipse.themes.dark.org.eclipse.ui.workbench.ACTIVE_NOFOCUS_TAB_BG_END=44,49,53
 com.genuitec.eclipse.themes.dark.org.eclipse.ui.workbench.ACTIVE_NOFOCUS_TAB_BG_START=37,41,45
 com.genuitec.eclipse.themes.dark.org.eclipse.ui.workbench.ACTIVE_NOFOCUS_TAB_SELECTED_TEXT_COLOR=199,205,209
@@ -56,196 +24,37 @@ com.genuitec.eclipse.themes.dark.org.eclipse.ui.workbench.INACTIVE_TAB_UNSELECTE
 com.genuitec.eclipse.themes.dark.org.eclipse.ui.workbench.INACTIVE_UNSELECTED_TABS_COLOR_END=60,67,73
 com.genuitec.eclipse.themes.dark.org.eclipse.ui.workbench.INACTIVE_UNSELECTED_TABS_COLOR_START=44,49,53
 com.genuitec.eclipse.themes.dark.org.eclipse.ui.workbench.LINK_COLOR=111,197,238
-commentBorder=75,113,227
-commentText=75,113,227
-content_assist_parameters_background=46,52,56
-content_assist_parameters_foreground=233,235,237
-content_assist_proposals_background=46,52,56
-content_assist_proposals_foreground=233,235,237
-declBoder=0,254,254
-doctypeExternalId=110,124,135
-doctypeExternalPubref=0,254,254
-doctypeExtrenalSysref=106,213,160
-doctypeName=0,254,254
-dtdComment=115,130,140
-dtdData=186,92,92
-dtdDefault=255,255,255
-dtdKeyword=255,191,191
-dtdString=89,224,134
-dtdSymbol=255,191,191
-dtdTag=96,96,255
-dtdTagName=96,96,255
 eclipse.preferences.version=1
 editors=<?xml version\="1.0" encoding\="UTF-8"?>\r\n<editors>\r\n<descriptor id\="org.eclipse.jdt.ui.JARDescEditor" image\="$nl$/icons/full/obj16/jar_desc_obj.png" internal\="false" label\="JAR Export Wizard" launcher\="org.eclipse.jdt.internal.ui.jarpackager.OpenJarExportWizardEditorLauncher" openMode\="4" open_in_place\="false" plugin\="org.eclipse.jdt.ui"/>\r\n<descriptor id\="org.eclipse.ui.browser.editorSupport" image\="$nl$/icons/obj16/internal_browser.png" internal\="false" label\="Web Browser" launcher\="org.eclipse.ui.internal.browser.BrowserLauncher" openMode\="4" open_in_place\="false" plugin\="org.eclipse.ui.browser"/>\r\n<descriptor class\="org.eclipse.jdt.internal.ui.javaeditor.CompilationUnitEditor" id\="org.eclipse.jdt.ui.ModuleInfoEditor" image\="$nl$/icons/full/obj16/jcu_obj.png" internal\="true" label\="Module-Info Editor" openMode\="1" open_in_place\="false" plugin\="org.eclipse.jdt.ui"/>\r\n<descriptor class\="org.eclipse.buildship.ui.internal.editor.GradleEditor" id\="org.eclipse.buildship.ui.gradlebuildscripteditor" image\="icons/full/obj16/gradle_file.png" internal\="true" label\="Gradle Build Script Editor" openMode\="1" open_in_place\="false" plugin\="org.eclipse.buildship.ui"/>\r\n<descriptor class\="org.eclipse.m2e.editor.pom.MavenPomEditor" id\="org.eclipse.m2e.editor.MavenPomEditor" image\="icons/editor-pom.gif" internal\="true" label\="Maven POM Editor" openMode\="1" open_in_place\="false" plugin\="org.eclipse.m2e.editor"/>\r\n<descriptor class\="org.eclipse.jdt.internal.ui.javaeditor.ClassFileEditor" id\="org.eclipse.jdt.ui.ModuleInfoClassFileEditor" image\="$nl$/icons/full/obj16/classf_obj.png" internal\="true" label\="Module-Info Class File Viewer" openMode\="1" open_in_place\="false" plugin\="org.eclipse.jdt.ui"/>\r\n<descriptor class\="org.eclipse.jdt.internal.ui.javaeditor.ClassFileEditor" id\="org.eclipse.jdt.ui.ClassFileEditorNoSource" image\="$nl$/icons/full/obj16/classf_obj.png" internal\="true" label\="Class File Viewer" openMode\="1" open_in_place\="false" plugin\="org.eclipse.jdt.ui"/>\r\n<descriptor class\="org.eclipse.wst.server.ui.internal.editor.ServerEditor" id\="org.eclipse.wst.server.ui.editor" image\="icons/obj16/server.gif" internal\="true" label\="Server Editor" openMode\="1" open_in_place\="false" plugin\="org.eclipse.wst.server.ui"/>\r\n<descriptor class\="org.eclipse.jdt.internal.ui.javaeditor.ClassFileEditor" id\="org.eclipse.jdt.ui.ModuleInfoClassFileEditorNoSource" image\="$nl$/icons/full/obj16/classf_obj.png" internal\="true" label\="Module-Info Class File Viewer" openMode\="1" open_in_place\="false" plugin\="org.eclipse.jdt.ui"/>\r\n<descriptor class\="org.eclipse.jdt.internal.debug.ui.snippeteditor.JavaSnippetEditor" id\="org.eclipse.jdt.debug.ui.SnippetEditor" image\="$nl$/icons/full/obj16/jsbook_obj.png" internal\="true" label\="Scrapbook" openMode\="1" open_in_place\="false" plugin\="org.eclipse.jdt.debug.ui"/>\r\n<descriptor class\="org.eclipse.pde.internal.ui.samples.SampleEditor" id\="org.eclipse.pde.ui.sampleEditor" image\="$nl$/icons/obj16/build_exec.png" internal\="true" label\="Code Sample Editor" openMode\="1" open_in_place\="false" plugin\="org.eclipse.pde.ui"/>\r\n<descriptor class\="org.eclipse.ui.internal.genericeditor.ExtensionBasedTextEditor" id\="org.eclipse.ui.genericeditor.GenericEditor" image\="icons/full/obj16/generic_editor.png" internal\="true" label\="Generic Text Editor" openMode\="1" open_in_place\="false" plugin\="org.eclipse.ui.genericeditor"/>\r\n</editors>
-entityReference=212,0,255
 org.eclipse.compare.contentmergeviewer.TextMergeViewer=1|Consolas|18.0|0|WINDOWS|1|0|0|0|0|0|0|0|0|1|0|0|0|0|Consolas;
 org.eclipse.debug.ui.DetailPaneFont=1|Consolas|18.0|0|WINDOWS|1|0|0|0|0|0|0|0|0|1|0|0|0|0|Consolas;
 org.eclipse.debug.ui.MemoryViewTableFont=1|Consolas|18.0|0|WINDOWS|1|0|0|0|0|0|0|0|0|1|0|0|0|0|Consolas;
-org.eclipse.debug.ui.console.background=0,0,0
-org.eclipse.debug.ui.console.stream.err=255,127,127
-org.eclipse.debug.ui.console.stream.in=0,255,184
-org.eclipse.debug.ui.console.stream.out=255,255,255
 org.eclipse.debug.ui.consoleFont=1|Consolas|18.0|0|WINDOWS|1|0|0|0|0|0|0|0|0|1|0|0|0|0|Consolas;
 org.eclipse.egit.ui.CommitGraphHighlightFont=1|Segoe UI|18.0|0|WINDOWS|1|-36|0|0|0|400|0|0|0|0|3|2|1|34|Segoe UI;
 org.eclipse.egit.ui.CommitGraphNormalFont=1|Segoe UI|18.0|0|WINDOWS|1|-36|0|0|0|400|0|0|0|0|3|2|1|34|Segoe UI;
-org.eclipse.egit.ui.CommitMessageCommentColor=115,130,140
 org.eclipse.egit.ui.CommitMessageEditorFont=1|Consolas|18.0|0|WINDOWS|1|0|0|0|0|0|0|0|0|1|0|0|0|0|Consolas;
 org.eclipse.egit.ui.CommitMessageFont=1|Consolas|18.0|0|WINDOWS|1|0|0|0|0|0|0|0|0|1|0|0|0|0|Consolas;
-org.eclipse.egit.ui.DiffAddBackgroundColor=51,81,30
-org.eclipse.egit.ui.DiffAddForegroundColor=235,237,239
-org.eclipse.egit.ui.DiffHeadlineBackgroundColor=25,29,31
 org.eclipse.egit.ui.DiffHeadlineFont=1|Consolas|18.0|0|WINDOWS|1|0|0|0|0|0|0|0|0|1|0|0|0|0|Consolas;
-org.eclipse.egit.ui.DiffHeadlineForegroundColor=238,240,241
-org.eclipse.egit.ui.DiffHunkBackgroundColor=25,29,31
-org.eclipse.egit.ui.DiffHunkForegroundColor=241,242,244
-org.eclipse.egit.ui.DiffRemoveBackgroundColor=97,45,45
-org.eclipse.egit.ui.DiffRemoveForegroundColor=238,240,241
-org.eclipse.egit.ui.IgnoredResourceForegroundColor=157,167,175
-org.eclipse.egit.ui.UncommittedChangeBackgroundColor=25,29,31
-org.eclipse.egit.ui.UncommittedChangeForegroundColor=216,220,223
 org.eclipse.jdt.internal.ui.compare.JavaMergeViewer=1|Consolas|22.0|0|WINDOWS|1|0|0|0|0|0|0|0|0|1|0|0|0|0|Consolas;
 org.eclipse.jdt.internal.ui.compare.PropertiesFileMergeViewer=1|Consolas|18.0|0|WINDOWS|1|0|0|0|0|0|0|0|0|1|0|0|0|0|Consolas;
-org.eclipse.jdt.ui.ColoredLabels.inherited=143,143,191
 org.eclipse.jdt.ui.ColoredLabels.match_highlight=206,204,247
-org.eclipse.jdt.ui.ColoredLabels.writeaccess_highlight=255,128,128
-org.eclipse.jdt.ui.Javadoc.backgroundColor=48,54,59
-org.eclipse.jdt.ui.Javadoc.foregroundColor=235,237,239
 org.eclipse.jdt.ui.PropertiesFileEditor.textfont=1|Consolas|18.0|0|WINDOWS|1|0|0|0|0|0|0|0|0|1|0|0|0|0|Consolas;
-org.eclipse.jdt.ui.abstractMethodInvocationHighlighting=255,255,255
-org.eclipse.jdt.ui.annotationElementReferenceHighlighting=255,255,255
-org.eclipse.jdt.ui.annotationHighlighting=143,155,163
-org.eclipse.jdt.ui.autoboxingHighlighting=255,255,0
-org.eclipse.jdt.ui.classHighlighting=0,255,255
-org.eclipse.jdt.ui.content_assist_completion_replacement_background=123,123,0
-org.eclipse.jdt.ui.content_assist_completion_replacement_foreground=255,127,127
-org.eclipse.jdt.ui.content_assist_parameters_background=0,0,0
-org.eclipse.jdt.ui.content_assist_parameters_foreground=255,255,255
-org.eclipse.jdt.ui.deprecatedMemberHighlighting=255,255,255
 org.eclipse.jdt.ui.editors.textfont=1|Consolas|22.0|0|WINDOWS|1|0|0|0|0|0|0|0|0|1|0|0|0|0|Consolas;
-org.eclipse.jdt.ui.enumHighlighting=247,173,123
-org.eclipse.jdt.ui.fieldHighlighting=159,159,255
-org.eclipse.jdt.ui.inheritedMethodInvocationHighlighting=255,255,255
-org.eclipse.jdt.ui.interfaceHighlighting=125,158,255
-org.eclipse.jdt.ui.java_bracket=255,255,255
-org.eclipse.jdt.ui.java_comment_task_tag=73,93,111
-org.eclipse.jdt.ui.java_default=255,255,255
-org.eclipse.jdt.ui.java_doc_default=75,113,227
-org.eclipse.jdt.ui.java_doc_keyword=73,93,111
-org.eclipse.jdt.ui.java_doc_link=96,96,255
-org.eclipse.jdt.ui.java_doc_tag=104,104,130
-org.eclipse.jdt.ui.java_keyword=255,0,255
-org.eclipse.jdt.ui.java_keyword_return=255,0,255
-org.eclipse.jdt.ui.java_multi_line_comment=106,213,160
-org.eclipse.jdt.ui.java_operator=255,255,255
-org.eclipse.jdt.ui.java_single_line_comment=106,213,160
-org.eclipse.jdt.ui.java_string=212,0,255
 org.eclipse.jdt.ui.javadocfont=1|Segoe UI|18.0|0|WINDOWS|1|-36|0|0|0|400|0|0|0|0|3|2|1|34|Segoe UI;
-org.eclipse.jdt.ui.localVariableDeclarationHighlighting=246,144,144
-org.eclipse.jdt.ui.localVariableHighlighting=246,144,144
-org.eclipse.jdt.ui.matchingBracketsColor=255,0,255
-org.eclipse.jdt.ui.methodDeclarationHighlighting=255,255,255
-org.eclipse.jdt.ui.methodDeclarationNameHighlighting=255,255,255
-org.eclipse.jdt.ui.methodHighlighting=255,255,255
-org.eclipse.jdt.ui.numberHighlighting=212,0,255
-org.eclipse.jdt.ui.parameterVariableHighlighting=246,144,144
-org.eclipse.jdt.ui.pf_coloring_argument=255,0,255
-org.eclipse.jdt.ui.pf_coloring_assignment=255,255,255
-org.eclipse.jdt.ui.pf_coloring_comment=106,213,160
-org.eclipse.jdt.ui.pf_coloring_key=255,255,255
-org.eclipse.jdt.ui.pf_coloring_value=212,0,255
-org.eclipse.jdt.ui.staticFieldHighlighting=159,159,255
-org.eclipse.jdt.ui.staticFinalFieldHighlighting=159,159,255
-org.eclipse.jdt.ui.staticMethodInvocationHighlighting=255,255,255
-org.eclipse.jdt.ui.typeArgumentHighlighting=255,255,0
-org.eclipse.jdt.ui.typeParameterHighlighting=247,173,123
-org.eclipse.jdt.ui.typeVariableDeclarationHighlighting=247,173,123
-org.eclipse.jface.REVISION_NEWEST_COLOR=185,124,52
-org.eclipse.jface.REVISION_OLDEST_COLOR=25,29,31
 org.eclipse.jface.bannerfont=1|Segoe UI|18.0|1|WINDOWS|1|-36|0|0|0|700|0|0|0|0|3|2|1|34|Segoe UI;
 org.eclipse.jface.dialogfont=1|Segoe UI|18.0|0|WINDOWS|1|-36|0|0|0|400|0|0|0|0|3|2|1|34|Segoe UI;
 org.eclipse.jface.headerfont=1|Segoe UI|18.0|1|WINDOWS|1|-36|0|0|0|700|0|0|0|0|3|2|1|34|Segoe UI;
 org.eclipse.jface.textfont=1|Consolas|18.0|0|WINDOWS|1|0|0|0|0|0|0|0|0|1|0|0|0|0|Consolas;
 org.eclipse.mylyn.wikitext.ui.presentation.textFont=1|Consolas|18.0|0|WINDOWS|1|0|0|0|0|0|0|0|0|1|0|0|0|0|Consolas;
-org.eclipse.pde.genericeditor.extension.editor.color.attribute=196,138,114
-org.eclipse.pde.genericeditor.extension.editor.color.comment=93,134,75
-org.eclipse.pde.genericeditor.extension.editor.color.header=115,130,140
-org.eclipse.pde.genericeditor.extension.editor.color.quote=118,200,244
-org.eclipse.pde.genericeditor.extension.editor.color.tag=86,156,214
-org.eclipse.pde.genericeditor.extension.editor.color.text=207,212,216
 org.eclipse.pde.internal.ui.compare.ManifestContentMergeViewer=1|Consolas|18.0|0|WINDOWS|1|0|0|0|0|0|0|0|0|1|0|0|0|0|Consolas;
 org.eclipse.pde.internal.ui.compare.PluginContentMergeViewer=1|Consolas|18.0|0|WINDOWS|1|0|0|0|0|0|0|0|0|1|0|0|0|0|Consolas;
-org.eclipse.search.ui.match.highlight=73,83,90
 org.eclipse.ui.commands=<?xml version\="1.0" encoding\="UTF-8"?>\r\n<org.eclipse.ui.commands/>
-org.eclipse.ui.editors.backgroundColor=0,0,0
-org.eclipse.ui.editors.currentLineColor=7,8,8
-org.eclipse.ui.editors.findScope=62,70,76
-org.eclipse.ui.editors.foregroundColor=255,255,255
-org.eclipse.ui.editors.lineNumberRulerColor=120,135,145
-org.eclipse.ui.editors.printMarginColor=62,70,76
-org.eclipse.ui.showkeys.backgroundColor=182,190,195
 org.eclipse.ui.workbench.ACTIVE_NOFOCUS_TAB_BG_START=37,41,45
 org.eclipse.ui.workbench.ACTIVE_TAB_BG_START=37,41,45
 org.eclipse.ui.workbench.INACTIVE_TAB_BG_START=53,60,65
 org.eclipse.ui.workbench.TAB_TEXT_FONT=1|Segoe UI|16.0|0|WINDOWS|1|-32|0|0|0|400|0|0|0|0|3|2|1|34|Segoe UI;
 org.eclipse.ui.workbench.TREE_TABLE_FONT=1|Segoe UI|16.0|0|WINDOWS|1|-32|0|0|0|400|0|0|0|0|3|2|1|34|Segoe UI;
 org.eclipse.ui.workbench.texteditor.blockSelectionModeFont=1|Consolas|14.0|0|WINDOWS|1|-28|0|0|0|400|0|0|0|0|3|2|1|49|Consolas;
-org.eclipse.wst.jsdt.ui.abstractMethodInvocationHighlighting=255,255,255
-org.eclipse.wst.jsdt.ui.annotationElementReferenceHighlighting=255,255,255
-org.eclipse.wst.jsdt.ui.annotationHighlighting=143,155,163
-org.eclipse.wst.jsdt.ui.autoboxingHighlighting=255,255,0
-org.eclipse.wst.jsdt.ui.classHighlighting=0,255,255
-org.eclipse.wst.jsdt.ui.content_assist_completion_replacement_background=123,123,0
-org.eclipse.wst.jsdt.ui.content_assist_completion_replacement_foreground=255,127,127
-org.eclipse.wst.jsdt.ui.content_assist_parameters_background=0,0,0
-org.eclipse.wst.jsdt.ui.content_assist_parameters_foreground=255,255,255
-org.eclipse.wst.jsdt.ui.content_assist_proposals_background=0,0,0
-org.eclipse.wst.jsdt.ui.content_assist_proposals_foreground=255,255,255
-org.eclipse.wst.jsdt.ui.deprecatedMemberHighlighting=255,255,255
-org.eclipse.wst.jsdt.ui.enumHighlighting=247,173,123
-org.eclipse.wst.jsdt.ui.fieldHighlighting=159,159,255
-org.eclipse.wst.jsdt.ui.inheritedMethodInvocationHighlighting=255,255,255
-org.eclipse.wst.jsdt.ui.interfaceHighlighting=125,158,255
-org.eclipse.wst.jsdt.ui.java_bracket=255,255,255
-org.eclipse.wst.jsdt.ui.java_comment_task_tag=73,93,111
-org.eclipse.wst.jsdt.ui.java_default=255,255,255
-org.eclipse.wst.jsdt.ui.java_doc_default=75,113,227
-org.eclipse.wst.jsdt.ui.java_doc_keyword=73,93,111
-org.eclipse.wst.jsdt.ui.java_doc_link=96,96,255
-org.eclipse.wst.jsdt.ui.java_doc_tag=104,104,130
-org.eclipse.wst.jsdt.ui.java_keyword=255,0,255
-org.eclipse.wst.jsdt.ui.java_keyword_return=255,0,255
-org.eclipse.wst.jsdt.ui.java_multi_line_comment=106,213,160
-org.eclipse.wst.jsdt.ui.java_operator=255,255,255
-org.eclipse.wst.jsdt.ui.java_single_line_comment=106,213,160
-org.eclipse.wst.jsdt.ui.java_string=212,0,255
-org.eclipse.wst.jsdt.ui.localVariableDeclarationHighlighting=255,255,255
-org.eclipse.wst.jsdt.ui.localVariableHighlighting=255,255,255
-org.eclipse.wst.jsdt.ui.matchingBracketsColor=53,60,65
-org.eclipse.wst.jsdt.ui.methodDeclarationHighlighting=255,255,255
-org.eclipse.wst.jsdt.ui.methodDeclarationNameHighlighting=255,255,255
-org.eclipse.wst.jsdt.ui.methodHighlighting=255,255,255
-org.eclipse.wst.jsdt.ui.parameterVariableHighlighting=255,255,255
-org.eclipse.wst.jsdt.ui.pf_coloring_argument=255,0,255
-org.eclipse.wst.jsdt.ui.pf_coloring_assignment=255,255,255
-org.eclipse.wst.jsdt.ui.pf_coloring_comment=106,213,160
-org.eclipse.wst.jsdt.ui.pf_coloring_key=255,255,255
-org.eclipse.wst.jsdt.ui.pf_coloring_value=212,0,255
-org.eclipse.wst.jsdt.ui.staticFieldHighlighting=159,159,255
-org.eclipse.wst.jsdt.ui.staticFinalFieldHighlighting=255,255,255
-org.eclipse.wst.jsdt.ui.staticMethodInvocationHighlighting=255,255,255
-org.eclipse.wst.jsdt.ui.typeArgumentHighlighting=255,255,0
-org.eclipse.wst.jsdt.ui.typeParameterHighlighting=247,173,123
-org.eclipse.wst.jsdt.ui.typeVariableDeclarationHighlighting=247,173,123
 org.eclipse.wst.sse.ui.textfont=1|Consolas|18.0|0|WINDOWS|1|0|0|0|0|0|0|0|0|1|0|0|0|0|Consolas;
-org.springframework.ide.eclipse.boot.dash.AltTextDecorColor=173,216,230
-org.springframework.ide.eclipse.boot.dash.MutedTextDecorColor=205,210,214
-org.springframework.ide.eclipse.boot.dash.TextDecorColor=144,238,144
-org.springframework.tooling.ls.eclipse.commons.STS4BootMarkerIndicationColor=54,81,25
-overriddenByCSS=,ACTIVE_HYPERLINK_COLOR,ATMARK_RULE,ATTRIBUTE_DELIM,ATTRIBUTE_NAME,ATTRIBUTE_OPERATOR,ATTRIBUTE_VALUE,CLASS,COMBINATOR,COMMENT,CONFLICTING_COLOR,CONTENT_ASSIST_BACKGROUND_COLOR,CONTENT_ASSIST_FOREGROUND_COLOR,COUNTER_COLOR,DECORATIONS_COLOR,ERROR,ERROR_COLOR,HYPERLINK_COLOR,ID,INCOMING_COLOR,MEDIA,OUTGOING_COLOR,PROPERTY_NAME,PROPERTY_VALUE,PSEUDO,RESOLVED_COLOR,SCRIPT_AREA_BORDER,SELECTOR,STRING,UNIVERSAL,URI,cdataBorder,cdataText,commentBorder,commentText,content_assist_parameters_background,content_assist_parameters_foreground,content_assist_proposals_background,content_assist_proposals_foreground,declBoder,doctypeExternalId,doctypeExternalPubref,doctypeExtrenalSysref,doctypeName,dtdComment,dtdData,dtdDefault,dtdKeyword,dtdString,dtdSymbol,dtdTag,dtdTagName,entityReference,org.eclipse.debug.ui.console.background,org.eclipse.debug.ui.console.stream.err,org.eclipse.debug.ui.console.stream.in,org.eclipse.debug.ui.console.stream.out,org.eclipse.egit.ui.CommitMessageCommentColor,org.eclipse.egit.ui.DiffAddBackgroundColor,org.eclipse.egit.ui.DiffAddForegroundColor,org.eclipse.egit.ui.DiffHeadlineBackgroundColor,org.eclipse.egit.ui.DiffHeadlineForegroundColor,org.eclipse.egit.ui.DiffHunkBackgroundColor,org.eclipse.egit.ui.DiffHunkForegroundColor,org.eclipse.egit.ui.DiffRemoveBackgroundColor,org.eclipse.egit.ui.DiffRemoveForegroundColor,org.eclipse.egit.ui.IgnoredResourceForegroundColor,org.eclipse.egit.ui.UncommittedChangeBackgroundColor,org.eclipse.egit.ui.UncommittedChangeForegroundColor,org.eclipse.jdt.ui.ColoredLabels.inherited,org.eclipse.jdt.ui.ColoredLabels.writeaccess_highlight,org.eclipse.jdt.ui.Javadoc.backgroundColor,org.eclipse.jdt.ui.Javadoc.foregroundColor,org.eclipse.jdt.ui.abstractMethodInvocationHighlighting,org.eclipse.jdt.ui.annotationElementReferenceHighlighting,org.eclipse.jdt.ui.annotationHighlighting,org.eclipse.jdt.ui.autoboxingHighlighting,org.eclipse.jdt.ui.classHighlighting,org.eclipse.jdt.ui.content_assist_completion_replacement_background,org.eclipse.jdt.ui.content_assist_completion_replacement_foreground,org.eclipse.jdt.ui.content_assist_parameters_background,org.eclipse.jdt.ui.content_assist_parameters_foreground,org.eclipse.jdt.ui.deprecatedMemberHighlighting,org.eclipse.jdt.ui.enumHighlighting,org.eclipse.jdt.ui.fieldHighlighting,org.eclipse.jdt.ui.inheritedMethodInvocationHighlighting,org.eclipse.jdt.ui.interfaceHighlighting,org.eclipse.jdt.ui.java_bracket,org.eclipse.jdt.ui.java_comment_task_tag,org.eclipse.jdt.ui.java_default,org.eclipse.jdt.ui.java_doc_default,org.eclipse.jdt.ui.java_doc_keyword,org.eclipse.jdt.ui.java_doc_link,org.eclipse.jdt.ui.java_doc_tag,org.eclipse.jdt.ui.java_keyword,org.eclipse.jdt.ui.java_keyword_return,org.eclipse.jdt.ui.java_multi_line_comment,org.eclipse.jdt.ui.java_operator,org.eclipse.jdt.ui.java_single_line_comment,org.eclipse.jdt.ui.java_string,org.eclipse.jdt.ui.localVariableDeclarationHighlighting,org.eclipse.jdt.ui.localVariableHighlighting,org.eclipse.jdt.ui.matchingBracketsColor,org.eclipse.jdt.ui.methodDeclarationHighlighting,org.eclipse.jdt.ui.methodDeclarationNameHighlighting,org.eclipse.jdt.ui.methodHighlighting,org.eclipse.jdt.ui.numberHighlighting,org.eclipse.jdt.ui.parameterVariableHighlighting,org.eclipse.jdt.ui.pf_coloring_argument,org.eclipse.jdt.ui.pf_coloring_assignment,org.eclipse.jdt.ui.pf_coloring_comment,org.eclipse.jdt.ui.pf_coloring_key,org.eclipse.jdt.ui.pf_coloring_value,org.eclipse.jdt.ui.staticFieldHighlighting,org.eclipse.jdt.ui.staticFinalFieldHighlighting,org.eclipse.jdt.ui.staticMethodInvocationHighlighting,org.eclipse.jdt.ui.typeArgumentHighlighting,org.eclipse.jdt.ui.typeParameterHighlighting,org.eclipse.jdt.ui.typeVariableDeclarationHighlighting,org.eclipse.jface.REVISION_NEWEST_COLOR,org.eclipse.jface.REVISION_OLDEST_COLOR,org.eclipse.pde.genericeditor.extension.editor.color.attribute,org.eclipse.pde.genericeditor.extension.editor.color.comment,org.eclipse.pde.genericeditor.extension.editor.color.header,org.eclipse.pde.genericeditor.extension.editor.color.quote,org.eclipse.pde.genericeditor.extension.editor.color.tag,org.eclipse.pde.genericeditor.extension.editor.color.text,org.eclipse.search.ui.match.highlight,org.eclipse.ui.editors.backgroundColor,org.eclipse.ui.editors.currentLineColor,org.eclipse.ui.editors.findScope,org.eclipse.ui.editors.foregroundColor,org.eclipse.ui.editors.lineNumberRulerColor,org.eclipse.ui.editors.printMarginColor,org.eclipse.ui.showkeys.backgroundColor,org.eclipse.wst.jsdt.ui.abstractMethodInvocationHighlighting,org.eclipse.wst.jsdt.ui.annotationElementReferenceHighlighting,org.eclipse.wst.jsdt.ui.annotationHighlighting,org.eclipse.wst.jsdt.ui.autoboxingHighlighting,org.eclipse.wst.jsdt.ui.classHighlighting,org.eclipse.wst.jsdt.ui.content_assist_completion_replacement_background,org.eclipse.wst.jsdt.ui.content_assist_completion_replacement_foreground,org.eclipse.wst.jsdt.ui.content_assist_parameters_background,org.eclipse.wst.jsdt.ui.content_assist_parameters_foreground,org.eclipse.wst.jsdt.ui.content_assist_proposals_background,org.eclipse.wst.jsdt.ui.content_assist_proposals_foreground,org.eclipse.wst.jsdt.ui.deprecatedMemberHighlighting,org.eclipse.wst.jsdt.ui.enumHighlighting,org.eclipse.wst.jsdt.ui.fieldHighlighting,org.eclipse.wst.jsdt.ui.inheritedMethodInvocationHighlighting,org.eclipse.wst.jsdt.ui.interfaceHighlighting,org.eclipse.wst.jsdt.ui.java_bracket,org.eclipse.wst.jsdt.ui.java_comment_task_tag,org.eclipse.wst.jsdt.ui.java_default,org.eclipse.wst.jsdt.ui.java_doc_default,org.eclipse.wst.jsdt.ui.java_doc_keyword,org.eclipse.wst.jsdt.ui.java_doc_link,org.eclipse.wst.jsdt.ui.java_doc_tag,org.eclipse.wst.jsdt.ui.java_keyword,org.eclipse.wst.jsdt.ui.java_keyword_return,org.eclipse.wst.jsdt.ui.java_multi_line_comment,org.eclipse.wst.jsdt.ui.java_operator,org.eclipse.wst.jsdt.ui.java_single_line_comment,org.eclipse.wst.jsdt.ui.java_string,org.eclipse.wst.jsdt.ui.localVariableDeclarationHighlighting,org.eclipse.wst.jsdt.ui.localVariableHighlighting,org.eclipse.wst.jsdt.ui.matchingBracketsColor,org.eclipse.wst.jsdt.ui.methodDeclarationHighlighting,org.eclipse.wst.jsdt.ui.methodDeclarationNameHighlighting,org.eclipse.wst.jsdt.ui.methodHighlighting,org.eclipse.wst.jsdt.ui.parameterVariableHighlighting,org.eclipse.wst.jsdt.ui.pf_coloring_argument,org.eclipse.wst.jsdt.ui.pf_coloring_assignment,org.eclipse.wst.jsdt.ui.pf_coloring_comment,org.eclipse.wst.jsdt.ui.pf_coloring_key,org.eclipse.wst.jsdt.ui.pf_coloring_value,org.eclipse.wst.jsdt.ui.staticFieldHighlighting,org.eclipse.wst.jsdt.ui.staticFinalFieldHighlighting,org.eclipse.wst.jsdt.ui.staticMethodInvocationHighlighting,org.eclipse.wst.jsdt.ui.typeArgumentHighlighting,org.eclipse.wst.jsdt.ui.typeParameterHighlighting,org.eclipse.wst.jsdt.ui.typeVariableDeclarationHighlighting,org.springframework.ide.eclipse.boot.dash.AltTextDecorColor,org.springframework.ide.eclipse.boot.dash.MutedTextDecorColor,org.springframework.ide.eclipse.boot.dash.TextDecorColor,org.springframework.tooling.ls.eclipse.commons.STS4BootMarkerIndicationColor,piBorder,tagAttributeName,tagAttributeValue,tagBorder,tagName,
-piBorder=0,254,254
 resourcetypes=<?xml version\="1.0" encoding\="UTF-8"?>\r\n<editors version\="3.1">\r\n<info extension\="jardesc" name\="*">\r\n<editor id\="org.eclipse.jdt.ui.JARDescEditor"/>\r\n<defaultEditor id\="org.eclipse.jdt.ui.JARDescEditor"/>\r\n</info>\r\n<info extension\="html" name\="*">\r\n<editor id\="org.eclipse.ui.browser.editorSupport"/>\r\n</info>\r\n<info extension\="java" name\="module-info">\r\n<editor id\="org.eclipse.jdt.ui.ModuleInfoEditor"/>\r\n<defaultEditor id\="org.eclipse.jdt.ui.ModuleInfoEditor"/>\r\n</info>\r\n<info extension\="gradle" name\="*">\r\n<editor id\="org.eclipse.buildship.ui.gradlebuildscripteditor"/>\r\n</info>\r\n<info extension\="pom" name\="*">\r\n<editor id\="org.eclipse.m2e.editor.MavenPomEditor"/>\r\n<defaultEditor id\="org.eclipse.m2e.editor.MavenPomEditor"/>\r\n</info>\r\n<info extension\="xml" name\="pom">\r\n<editor id\="org.eclipse.m2e.editor.MavenPomEditor"/>\r\n<defaultEditor id\="org.eclipse.m2e.editor.MavenPomEditor"/>\r\n</info>\r\n<info extension\="shtml" name\="*">\r\n<editor id\="org.eclipse.ui.browser.editorSupport"/>\r\n</info>\r\n<info extension\="class" name\="module-info">\r\n<editor id\="org.eclipse.jdt.ui.ModuleInfoClassFileEditor"/>\r\n<defaultEditor id\="org.eclipse.jdt.ui.ModuleInfoClassFileEditor"/>\r\n</info>\r\n<info extension\="class without source" name\="*">\r\n<editor id\="org.eclipse.jdt.ui.ClassFileEditorNoSource"/>\r\n</info>\r\n<info extension\="server" name\="*">\r\n<editor id\="org.eclipse.wst.server.ui.editor"/>\r\n</info>\r\n<info extension\="class without source" name\="module-info">\r\n<editor id\="org.eclipse.jdt.ui.ModuleInfoClassFileEditorNoSource"/>\r\n<defaultEditor id\="org.eclipse.jdt.ui.ModuleInfoClassFileEditorNoSource"/>\r\n</info>\r\n<info extension\="htm" name\="*">\r\n<editor id\="org.eclipse.ui.browser.editorSupport"/>\r\n</info>\r\n<info extension\="jpage" name\="*">\r\n<editor id\="org.eclipse.jdt.debug.ui.SnippetEditor"/>\r\n</info>\r\n<info extension\="properties" name\="sample">\r\n<editor id\="org.eclipse.pde.ui.sampleEditor"/>\r\n<defaultEditor id\="org.eclipse.pde.ui.sampleEditor"/>\r\n</info>\r\n<info extension\="js" name\="*">\r\n<editor id\="org.eclipse.ui.genericeditor.GenericEditor"/>\r\n<defaultEditor id\="org.eclipse.ui.genericeditor.GenericEditor"/>\r\n</info>\r\n</editors>
-tagAttributeName=255,0,255
-tagAttributeValue=212,0,255
-tagBorder=0,254,254
-tagName=89,179,179
 terminal.views.view.font.definition=1|Consolas|18.0|0|WINDOWS|1|0|0|0|0|0|0|0|0|1|0|0|0|0|Consolas;
diff --git a/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.wst.css.ui.prefs b/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.wst.css.ui.prefs
index 0adaa824..b8ed20dd 100644
--- a/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.wst.css.ui.prefs
+++ b/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.wst.css.ui.prefs
@@ -1,24 +1,2 @@
-ATMARK_RULE=\#A9B7C6 | null | null | null | null | null
-ATTRIBUTE_DELIM=\#A9B7C6 | null | null | null | null | null
-ATTRIBUTE_NAME=\#A9B7C6 | null | null | null | null | null
-ATTRIBUTE_OPERATOR=\#A9B7C6 | null | null | null | null | null
-ATTRIBUTE_VALUE=\#A9B7C6 | null | null | null | null | null
-CLASS=\#A9B7C6 | null | null | null | null | null
-COLON=\#D8D8D8 | null | null | null | null | null
-COMBINATOR=\#A9B7C6 | null | null | null | null | null
-COMMENT=\#629755 | null | null | false | null | null
-CURLY_BRACE=\#D8D8D8 | null | null | null | null | null
-ID=\#A9B7C6 | null | null | null | null | null
-MEDIA=\#CC7832 | null | false | null | null | null
-NORMAL=\#D8D8D8 | null | null | null | null | null
-PROPERTY_NAME=\#BED6FF | null | null | null | null | null
-PROPERTY_VALUE=\#A5C25C | null | null | null | null | null
-PSEUDO=\#A9B7C6 | null | null | null | null | null
-SELECTOR=\#A9B7C6 | null | null | null | null | null
-SEMI_COLON=\#D8D8D8 | null | null | null | null | null
-STRING=\#A5C25C | null | null | null | null | null
-UNIVERSAL=\#A9B7C6 | null | null | null | null | null
-URI=\#A5C25C | null | null | null | null | null
 eclipse.preferences.version=1
 newFileTemplateName=New CSS File
-overriddenByCSS=,ATMARK_RULE,ATTRIBUTE_DELIM,ATTRIBUTE_NAME,ATTRIBUTE_OPERATOR,ATTRIBUTE_VALUE,CLASS,COLON,COMBINATOR,COMMENT,CURLY_BRACE,ID,MEDIA,NORMAL,PROPERTY_NAME,PROPERTY_VALUE,PSEUDO,SELECTOR,SEMI_COLON,STRING,UNIVERSAL,URI,
diff --git a/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.wst.dtd.ui.prefs b/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.wst.dtd.ui.prefs
deleted file mode 100644
index 093af652..00000000
--- a/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.wst.dtd.ui.prefs
+++ /dev/null
@@ -1,10 +0,0 @@
-dtdComment=\#629755 | null | null | false | null | null
-dtdData=\#D8D8D8 | null | null | null | null | null
-dtdDefault=\#D8D8D8 | null | null | null | null | null
-dtdKeyword=\#CC7832 | null | false | null | null | null
-dtdString=\#A5C25C | null | null | null | null | null
-dtdSymbol=\#BED6FF | null | null | null | null | null
-dtdTag=\#BED6FF | null | null | null | null | null
-dtdTagName=\#BED6FF | null | null | null | null | null
-eclipse.preferences.version=1
-overriddenByCSS=,dtdKeyword,dtdTag,dtdString,dtdTagName,dtdDefault,dtdData,dtdSymbol,dtdComment,
diff --git a/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.wst.html.ui.prefs b/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.wst.html.ui.prefs
index faffac4e..5421dd22 100644
--- a/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.wst.html.ui.prefs
+++ b/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.wst.html.ui.prefs
@@ -1,17 +1,2 @@
-commentBorder=\#629755 | null | null | false | null | null
-commentText=\#629755 | null | null | false | null | null
-declBoder=\#A9B7C6 | null | null | null | null | null
-doctypeExternalId=\#A9B7C6 | null | null | null | null | null
-doctypeExternalPubref=\#A9B7C6 | null | null | null | null | null
-doctypeExtrenalSysref=\#A9B7C6 | null | null | null | null | null
-doctypeName=\#A9B7C6 | null | null | null | null | null
 eclipse.preferences.version=1
-entityReference=\#CC7832 | null | false | null | null | null
 newFileTemplateName=New HTML File (5)
-overriddenByCSS=,commentBorder,commentText,declBoder,doctypeExternalId,doctypeExternalPubref,doctypeExtrenalSysref,doctypeName,entityReference,tagAttributeEquals,tagAttributeName,tagAttributeValue,tagBorder,tagName,xmlContent,
-tagAttributeEquals=\#D8D8D8 | null | null | null | null | null
-tagAttributeName=\#BED6FF | null | null | null | null | null
-tagAttributeValue=\#A5C25C | null | null | null | null | null
-tagBorder=\#79ABFF | null | null | null | null | null
-tagName=\#BED6FF | null | null | null | null | null
-xmlContent=\#D8D8D8 | null | null | null | null | null
diff --git a/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.wst.jsdt.ui.prefs b/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.wst.jsdt.ui.prefs
index 7efca663..0c7f140e 100644
--- a/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.wst.jsdt.ui.prefs
+++ b/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.wst.jsdt.ui.prefs
@@ -1,50 +1,11 @@
-CONTENT_ASSIST_BACKGROUND_COLOR=46,52,56
-CONTENT_ASSIST_FOREGROUND_COLOR=233,235,237
-content_assist_parameters_background=46,52,56
-content_assist_parameters_foreground=233,235,237
-content_assist_proposals_background=46,52,56
-content_assist_proposals_foreground=233,235,237
 eclipse.preferences.version=1
 fontPropagated=true
-java_bracket=216,216,216
-java_comment_task_tag=204,223,50
-java_default=216,216,216
-java_doc_default=98,151,85
-java_doc_keyword=132,185,119
-java_doc_link=132,185,119
-java_doc_tag=132,185,119
-java_keyword=204,120,50
-java_keyword_return=204,120,50
-java_multi_line_comment=98,151,85
-java_operator=216,216,216
-java_single_line_comment=128,128,128
-java_string=165,194,92
 org.eclipse.wst.jsdt.ui.editor.tab.width=
 org.eclipse.wst.jsdt.ui.formatterprofiles.version=11
 org.eclipse.wst.jsdt.ui.javadoclocations.migrated=true
 org.eclipse.wst.jsdt.ui.text.code_templates_migrated=true
 org.eclipse.wst.jsdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates/>
-overriddenByCSS=,CONTENT_ASSIST_BACKGROUND_COLOR,CONTENT_ASSIST_FOREGROUND_COLOR,content_assist_parameters_background,content_assist_parameters_foreground,content_assist_proposals_background,content_assist_proposals_foreground,java_bracket,java_comment_task_tag,java_default,java_doc_default,java_doc_keyword,java_doc_link,java_doc_tag,java_keyword,java_keyword_return,java_multi_line_comment,java_operator,java_single_line_comment,java_string,semanticHighlighting.localVariable.bold,semanticHighlighting.localVariable.color,semanticHighlighting.localVariable.enabled,semanticHighlighting.localVariable.italic,semanticHighlighting.localVariable.strikethrough,semanticHighlighting.localVariable.underline,semanticHighlighting.localVariableDeclaration.bold,semanticHighlighting.localVariableDeclaration.color,semanticHighlighting.localVariableDeclaration.enabled,semanticHighlighting.localVariableDeclaration.italic,semanticHighlighting.localVariableDeclaration.strikethrough,semanticHighlighting.localVariableDeclaration.underline,semanticHighlighting.methodDeclarationName.bold,semanticHighlighting.methodDeclarationName.color,semanticHighlighting.methodDeclarationName.enabled,semanticHighlighting.methodDeclarationName.italic,semanticHighlighting.methodDeclarationName.strikethrough,semanticHighlighting.methodDeclarationName.underline,tagName,
 proposalOrderMigrated=true
-semanticHighlighting.localVariable.bold=false
-semanticHighlighting.localVariable.color=121,171,255
-semanticHighlighting.localVariable.enabled=true
-semanticHighlighting.localVariable.italic=false
-semanticHighlighting.localVariable.strikethrough=false
-semanticHighlighting.localVariable.underline=false
-semanticHighlighting.localVariableDeclaration.bold=false
-semanticHighlighting.localVariableDeclaration.color=190,214,255
-semanticHighlighting.localVariableDeclaration.enabled=true
-semanticHighlighting.localVariableDeclaration.italic=false
-semanticHighlighting.localVariableDeclaration.strikethrough=false
-semanticHighlighting.localVariableDeclaration.underline=false
-semanticHighlighting.methodDeclarationName.bold=false
-semanticHighlighting.methodDeclarationName.color=255,198,109
-semanticHighlighting.methodDeclarationName.enabled=true
-semanticHighlighting.methodDeclarationName.italic=false
-semanticHighlighting.methodDeclarationName.strikethrough=false
-semanticHighlighting.methodDeclarationName.underline=false
 tabWidthPropagated=true
-tagName=169,183,198
 useAnnotationsPrefPage=true
 useQuickDiffPrefPage=true
diff --git a/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.wst.json.ui.prefs b/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.wst.json.ui.prefs
deleted file mode 100644
index d9391aa1..00000000
--- a/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.wst.json.ui.prefs
+++ /dev/null
@@ -1,10 +0,0 @@
-COLON=\#ffffff | null | false | false | false | false
-COMMA=\#ffffff | null | false | false | false | false
-CURLY_BRACE=\#ffffff | null | false | false | false | false
-OBJECT_KEY=\#bed6ff | null | false | false | false | false
-VALUE_BOOLEAN=\#03a8d8 | null | false | false | false | false
-VALUE_NULL=\#89969f | null | false | false | false | false
-VALUE_NUMBER=\#cb4f40 | null | false | false | false | false
-VALUE_STRING=\#ffc600 | null | true | true | false | false
-eclipse.preferences.version=1
-overriddenByCSS=,COLON,COMMA,CURLY_BRACE,OBJECT_KEY,VALUE_BOOLEAN,VALUE_NULL,VALUE_NUMBER,VALUE_STRING,
diff --git a/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.wst.sse.ui.prefs b/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.wst.sse.ui.prefs
index 216d3170..13319dc0 100644
--- a/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.wst.sse.ui.prefs
+++ b/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.wst.sse.ui.prefs
@@ -1,12 +1,5 @@
-content_assist_completion_replacement_background=200,200,0
-content_assist_completion_replacement_foreground=194,0,0
 content_assist_number_of_computers=17
-content_assist_parameters_background=48,54,59
-content_assist_parameters_foreground=235,237,239
-content_assist_proposals_background=48,54,59
-content_assist_proposals_foreground=235,237,239
 eclipse.preferences.version=1
 hoverModifiers=combinationHover|true|0;problemHover|false|0;documentationHover|false|0;annotationHover|true|Shift;
-overriddenByCSS=,content_assist_completion_replacement_background,content_assist_completion_replacement_foreground,content_assist_parameters_background,content_assist_parameters_foreground,content_assist_proposals_background,content_assist_proposals_foreground,
 useAnnotationsPrefPage=true
 useQuickDiffPrefPage=true
diff --git a/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.wst.xml.ui.prefs b/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.wst.xml.ui.prefs
deleted file mode 100644
index 1985d12d..00000000
--- a/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.wst.xml.ui.prefs
+++ /dev/null
@@ -1,21 +0,0 @@
-cdataBorder=\#A9B7C6 | null | null | null | null | null
-cdataText=\#D8D8D8 | null | null | null | null | null
-commentBorder=\#629755 | null | null | false | null | null
-commentText=\#629755 | null | null | false | null | null
-declBoder=\#A9B7C6 | null | null | null | null | null
-declBorder=\#A9B7C6 | null | null | null | null | null
-doctypeExternalId=\#A9B7C6 | null | null | null | null | null
-doctypeExternalPubref=\#A9B7C6 | null | null | null | null | null
-doctypeExtrenalSysref=\#A9B7C6 | null | null | null | null | null
-doctypeName=\#A9B7C6 | null | null | null | null | null
-eclipse.preferences.version=1
-entityReference=\#CC7832 | null | false | null | null | null
-overriddenByCSS=,cdataBorder,cdataText,commentBorder,commentText,declBoder,declBorder,doctypeExternalId,doctypeExternalPubref,doctypeExtrenalSysref,doctypeName,entityReference,piBorder,piContent,tagAttributeEquals,tagAttributeName,tagAttributeValue,tagBorder,tagName,xmlContent,
-piBorder=\#A9B7C6 | null | null | null | null | null
-piContent=\#D8D8D8 | null | null | null | null | null
-tagAttributeEquals=\#D8D8D8 | null | null | null | null | null
-tagAttributeName=\#BED6FF | null | null | null | null | null
-tagAttributeValue=\#A5C25C | null | null | null | null | null
-tagBorder=\#79ABFF | null | null | null | null | null
-tagName=\#BED6FF | null | null | null | null | null
-xmlContent=\#D8D8D8 | null | null | null | null | null
diff --git a/.metadata/.plugins/org.eclipse.debug.ui/launchConfigurationHistory.xml b/.metadata/.plugins/org.eclipse.debug.ui/launchConfigurationHistory.xml
index 1cb33417..a007491b 100644
--- a/.metadata/.plugins/org.eclipse.debug.ui/launchConfigurationHistory.xml
+++ b/.metadata/.plugins/org.eclipse.debug.ui/launchConfigurationHistory.xml
@@ -2,8 +2,8 @@
 <launchHistory>
     <launchGroup id="org.eclipse.debug.ui.launchGroup.debug">
         <mruHistory>
-            <launch memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;launchConfiguration local=&quot;true&quot; path=&quot;CategoryRepositoryTests.testListRootCategories&quot;/&gt;&#13;&#10;"/>
             <launch memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;launchConfiguration local=&quot;true&quot; path=&quot;ShopmeBackEnd - ShopmeBackEndApplication&quot;/&gt;&#13;&#10;"/>
+            <launch memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;launchConfiguration local=&quot;true&quot; path=&quot;CategoryRepositoryTests.testListRootCategories&quot;/&gt;&#13;&#10;"/>
             <launch memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;launchConfiguration local=&quot;true&quot; path=&quot;CategoryRepositoryTests.testPrintHierarchicalCategory&quot;/&gt;&#13;&#10;"/>
             <launch memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;launchConfiguration local=&quot;true&quot; path=&quot;CategoryRepositoryTests.testCreateSubCategory&quot;/&gt;&#13;&#10;"/>
             <launch memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;launchConfiguration local=&quot;true&quot; path=&quot;CategoryRepositoryTests.testGetCategory&quot;/&gt;&#13;&#10;"/>
@@ -25,8 +25,8 @@
     </launchGroup>
     <launchGroup id="org.eclipse.debug.ui.launchGroup.run">
         <mruHistory>
-            <launch memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;launchConfiguration local=&quot;true&quot; path=&quot;CategoryRepositoryTests.testListRootCategories&quot;/&gt;&#13;&#10;"/>
             <launch memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;launchConfiguration local=&quot;true&quot; path=&quot;ShopmeBackEnd - ShopmeBackEndApplication&quot;/&gt;&#13;&#10;"/>
+            <launch memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;launchConfiguration local=&quot;true&quot; path=&quot;CategoryRepositoryTests.testListRootCategories&quot;/&gt;&#13;&#10;"/>
             <launch memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;launchConfiguration local=&quot;true&quot; path=&quot;CategoryRepositoryTests.testPrintHierarchicalCategory&quot;/&gt;&#13;&#10;"/>
             <launch memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;launchConfiguration local=&quot;true&quot; path=&quot;CategoryRepositoryTests.testCreateSubCategory&quot;/&gt;&#13;&#10;"/>
             <launch memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;launchConfiguration local=&quot;true&quot; path=&quot;CategoryRepositoryTests.testGetCategory&quot;/&gt;&#13;&#10;"/>
diff --git a/.metadata/.plugins/org.eclipse.e4.workbench/workbench.xmi b/.metadata/.plugins/org.eclipse.e4.workbench/workbench.xmi
index b0d954df..735e4f2b 100644
--- a/.metadata/.plugins/org.eclipse.e4.workbench/workbench.xmi
+++ b/.metadata/.plugins/org.eclipse.e4.workbench/workbench.xmi
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="ASCII"?>
-<application:Application xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:advanced="http://www.eclipse.org/ui/2010/UIModel/application/ui/advanced" xmlns:application="http://www.eclipse.org/ui/2010/UIModel/application" xmlns:basic="http://www.eclipse.org/ui/2010/UIModel/application/ui/basic" xmlns:menu="http://www.eclipse.org/ui/2010/UIModel/application/ui/menu" xmi:id="_JQ9aQLjoEe25NdJK2M4KYw" elementId="org.eclipse.e4.legacy.ide.application" contributorURI="platform:/plugin/org.eclipse.platform" selectedElement="_JQ9aQbjoEe25NdJK2M4KYw" bindingContexts="_JQ-o6rjoEe25NdJK2M4KYw">
-  <persistedState key="memento" value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?>&#xD;&#xA;&lt;workbench>&#xD;&#xA;&lt;mruList>&#xD;&#xA;&lt;file factoryID=&quot;org.eclipse.ui.part.FileEditorInputFactory&quot; id=&quot;org.eclipse.jdt.ui.CompilationUnitEditor&quot; name=&quot;CategoryService.java&quot; tooltip=&quot;ShopmeBackEnd/src/main/java/com/shopme/admin/category/CategoryService.java&quot;>&#xD;&#xA;&lt;persistable path=&quot;/ShopmeBackEnd/src/main/java/com/shopme/admin/category/CategoryService.java&quot;/>&#xD;&#xA;&lt;/file>&#xD;&#xA;&lt;file factoryID=&quot;org.eclipse.ui.part.FileEditorInputFactory&quot; id=&quot;org.eclipse.jdt.ui.CompilationUnitEditor&quot; name=&quot;CategoryController.java&quot; tooltip=&quot;ShopmeBackEnd/src/main/java/com/shopme/admin/category/CategoryController.java&quot;>&#xD;&#xA;&lt;persistable path=&quot;/ShopmeBackEnd/src/main/java/com/shopme/admin/category/CategoryController.java&quot;/>&#xD;&#xA;&lt;/file>&#xD;&#xA;&lt;file factoryID=&quot;org.eclipse.ui.part.FileEditorInputFactory&quot; id=&quot;org.eclipse.jdt.ui.CompilationUnitEditor&quot; name=&quot;CategoryRepositoryTests.java&quot; tooltip=&quot;ShopmeBackEnd/src/test/java/com/shopme/admin/category/CategoryRepositoryTests.java&quot;>&#xD;&#xA;&lt;persistable path=&quot;/ShopmeBackEnd/src/test/java/com/shopme/admin/category/CategoryRepositoryTests.java&quot;/>&#xD;&#xA;&lt;/file>&#xD;&#xA;&lt;file factoryID=&quot;org.eclipse.ui.part.FileEditorInputFactory&quot; id=&quot;org.eclipse.wst.html.core.htmlsource.source&quot; name=&quot;category_form.html&quot; tooltip=&quot;ShopmeBackEnd/src/main/resources/templates/categories/category_form.html&quot;>&#xD;&#xA;&lt;persistable path=&quot;/ShopmeBackEnd/src/main/resources/templates/categories/category_form.html&quot;/>&#xD;&#xA;&lt;/file>&#xD;&#xA;&lt;file factoryID=&quot;org.eclipse.ui.part.FileEditorInputFactory&quot; id=&quot;org.eclipse.jdt.ui.CompilationUnitEditor&quot; name=&quot;Category.java&quot; tooltip=&quot;ShopmeCommon/src/main/java/com/shopme/common/entity/Category.java&quot;>&#xD;&#xA;&lt;persistable path=&quot;/ShopmeCommon/src/main/java/com/shopme/common/entity/Category.java&quot;/>&#xD;&#xA;&lt;/file>&#xD;&#xA;&lt;file factoryID=&quot;org.eclipse.ui.part.FileEditorInputFactory&quot; id=&quot;org.eclipse.ui.genericeditor.GenericEditor&quot; name=&quot;common_form.js&quot; tooltip=&quot;ShopmeBackEnd/src/main/resources/static/js/common_form.js&quot;>&#xD;&#xA;&lt;persistable path=&quot;/ShopmeBackEnd/src/main/resources/static/js/common_form.js&quot;/>&#xD;&#xA;&lt;/file>&#xD;&#xA;&lt;file factoryID=&quot;org.eclipse.ui.part.FileEditorInputFactory&quot; id=&quot;org.eclipse.ui.genericeditor.GenericEditor&quot; name=&quot;common.js&quot; tooltip=&quot;ShopmeBackEnd/src/main/resources/static/js/common.js&quot;>&#xD;&#xA;&lt;persistable path=&quot;/ShopmeBackEnd/src/main/resources/static/js/common.js&quot;/>&#xD;&#xA;&lt;/file>&#xD;&#xA;&lt;file factoryID=&quot;org.eclipse.ui.part.FileEditorInputFactory&quot; id=&quot;org.eclipse.wst.html.core.htmlsource.source&quot; name=&quot;categories.html&quot; tooltip=&quot;ShopmeBackEnd/src/main/resources/templates/categories/categories.html&quot;>&#xD;&#xA;&lt;persistable path=&quot;/ShopmeBackEnd/src/main/resources/templates/categories/categories.html&quot;/>&#xD;&#xA;&lt;/file>&#xD;&#xA;&lt;file factoryID=&quot;org.eclipse.ui.part.FileEditorInputFactory&quot; id=&quot;org.eclipse.wst.html.core.htmlsource.source&quot; name=&quot;users.html&quot; tooltip=&quot;ShopmeBackEnd/src/main/resources/templates/users/users.html&quot;>&#xD;&#xA;&lt;persistable path=&quot;/ShopmeBackEnd/src/main/resources/templates/users/users.html&quot;/>&#xD;&#xA;&lt;/file>&#xD;&#xA;&lt;file factoryID=&quot;org.eclipse.jdt.ui.ClassFileEditorInputFactory&quot; id=&quot;org.eclipse.jdt.ui.ClassFileEditor&quot; name=&quot;String.class&quot; tooltip=&quot;java.lang.String&quot;>&#xD;&#xA;&lt;persistable org.eclipse.jdt.ui.ClassFileIdentifier=&quot;=ShopmeBackEnd/C:\/Program Files\/Java\/STS4\/sts-4.17.2.RELEASE\/plugins\/org.eclipse.justj.openjdk.hotspot.jre.full.win32.x86_64_17.0.6.v20230125-1136\/jre\/lib\/jrt-fs.jar`java.base=/javadoc_location=/https:\/\/docs.oracle.com\/en\/java\/javase\/17\/docs\/api\/=/=/module=/true=/=/maven.pomderived=/true=/&amp;lt;java.lang(String.class&quot;/>&#xD;&#xA;&lt;/file>&#xD;&#xA;&lt;file factoryID=&quot;org.eclipse.ui.part.FileEditorInputFactory&quot; id=&quot;org.eclipse.jdt.ui.CompilationUnitEditor&quot; name=&quot;UserController.java&quot; tooltip=&quot;ShopmeBackEnd/src/main/java/com/shopme/admin/user/controller/UserController.java&quot;>&#xD;&#xA;&lt;persistable path=&quot;/ShopmeBackEnd/src/main/java/com/shopme/admin/user/controller/UserController.java&quot;/>&#xD;&#xA;&lt;/file>&#xD;&#xA;&lt;file factoryID=&quot;org.eclipse.ui.part.FileEditorInputFactory&quot; id=&quot;org.eclipse.wst.css.core.csssource.source&quot; name=&quot;style.css&quot; tooltip=&quot;ShopmeBackEnd/src/main/resources/static/style.css&quot;>&#xD;&#xA;&lt;persistable path=&quot;/ShopmeBackEnd/src/main/resources/static/style.css&quot;/>&#xD;&#xA;&lt;/file>&#xD;&#xA;&lt;file factoryID=&quot;org.eclipse.ui.part.FileEditorInputFactory&quot; id=&quot;org.eclipse.wst.html.core.htmlsource.source&quot; name=&quot;fragments.html&quot; tooltip=&quot;ShopmeBackEnd/src/main/resources/templates/fragments.html&quot;>&#xD;&#xA;&lt;persistable path=&quot;/ShopmeBackEnd/src/main/resources/templates/fragments.html&quot;/>&#xD;&#xA;&lt;/file>&#xD;&#xA;&lt;file factoryID=&quot;org.eclipse.ui.part.FileEditorInputFactory&quot; id=&quot;org.eclipse.jdt.ui.CompilationUnitEditor&quot; name=&quot;WebSecurityConfig.java&quot; tooltip=&quot;ShopmeBackEnd/src/main/java/com/shopme/admin/security/WebSecurityConfig.java&quot;>&#xD;&#xA;&lt;persistable path=&quot;/ShopmeBackEnd/src/main/java/com/shopme/admin/security/WebSecurityConfig.java&quot;/>&#xD;&#xA;&lt;/file>&#xD;&#xA;&lt;file factoryID=&quot;org.eclipse.jdt.ui.ClassFileEditorInputFactory&quot; id=&quot;org.eclipse.jdt.ui.ClassFileEditor&quot; name=&quot;System.class&quot; tooltip=&quot;java.lang.System&quot;>&#xD;&#xA;&lt;persistable org.eclipse.jdt.ui.ClassFileIdentifier=&quot;=ShopmeBackEnd/C:\/Program Files\/Java\/STS4\/sts-4.17.2.RELEASE\/plugins\/org.eclipse.justj.openjdk.hotspot.jre.full.win32.x86_64_17.0.6.v20230125-1136\/jre\/lib\/jrt-fs.jar`java.base=/javadoc_location=/https:\/\/docs.oracle.com\/en\/java\/javase\/17\/docs\/api\/=/=/module=/true=/=/maven.pomderived=/true=/&amp;lt;java.lang(System.class&quot;/>&#xD;&#xA;&lt;/file>&#xD;&#xA;&lt;file factoryID=&quot;org.eclipse.jdt.ui.ClassFileEditorInputFactory&quot; id=&quot;org.eclipse.jdt.ui.ClassFileEditor&quot; name=&quot;CrudRepository.class&quot; tooltip=&quot;org.springframework.data.repository.CrudRepository&quot;>&#xD;&#xA;&lt;persistable org.eclipse.jdt.ui.ClassFileIdentifier=&quot;=ShopmeBackEnd/C:\/Users\/User\/.m2\/repository\/org\/springframework\/data\/spring-data-commons\/3.0.1\/spring-data-commons-3.0.1.jar=/maven.pomderived=/true=/=/maven.groupId=/org.springframework.data=/=/maven.artifactId=/spring-data-commons=/=/maven.version=/3.0.1=/=/maven.scope=/compile=/=/maven.pomderived=/true=/&amp;lt;org.springframework.data.repository(CrudRepository.class&quot;/>&#xD;&#xA;&lt;/file>&#xD;&#xA;&lt;file factoryID=&quot;org.eclipse.ui.part.FileEditorInputFactory&quot; id=&quot;org.eclipse.jdt.ui.CompilationUnitEditor&quot; name=&quot;PasswordEncoderTest.java&quot; tooltip=&quot;ShopmeBackEnd/src/test/java/com/shopme/admin/user/PasswordEncoderTest.java&quot;>&#xD;&#xA;&lt;persistable path=&quot;/ShopmeBackEnd/src/test/java/com/shopme/admin/user/PasswordEncoderTest.java&quot;/>&#xD;&#xA;&lt;/file>&#xD;&#xA;&lt;file factoryID=&quot;org.eclipse.ui.part.FileEditorInputFactory&quot; id=&quot;org.eclipse.jdt.ui.CompilationUnitEditor&quot; name=&quot;RoleRepositoryTests.java&quot; tooltip=&quot;ShopmeBackEnd/src/test/java/com/shopme/admin/user/RoleRepositoryTests.java&quot;>&#xD;&#xA;&lt;persistable path=&quot;/ShopmeBackEnd/src/test/java/com/shopme/admin/user/RoleRepositoryTests.java&quot;/>&#xD;&#xA;&lt;/file>&#xD;&#xA;&lt;file factoryID=&quot;org.eclipse.ui.part.FileEditorInputFactory&quot; id=&quot;org.eclipse.jdt.ui.CompilationUnitEditor&quot; name=&quot;UserRepositoryTests.java&quot; tooltip=&quot;ShopmeBackEnd/src/test/java/com/shopme/admin/user/UserRepositoryTests.java&quot;>&#xD;&#xA;&lt;persistable path=&quot;/ShopmeBackEnd/src/test/java/com/shopme/admin/user/UserRepositoryTests.java&quot;/>&#xD;&#xA;&lt;/file>&#xD;&#xA;&lt;file factoryID=&quot;org.eclipse.ui.part.FileEditorInputFactory&quot; id=&quot;SpringBootPropertyEditor&quot; name=&quot;application.properties&quot; tooltip=&quot;ShopmeBackEnd/src/main/resources/application.properties&quot;>&#xD;&#xA;&lt;persistable path=&quot;/ShopmeBackEnd/src/main/resources/application.properties&quot;/>&#xD;&#xA;&lt;/file>&#xD;&#xA;&lt;file factoryID=&quot;org.eclipse.ui.part.FileEditorInputFactory&quot; id=&quot;org.eclipse.jdt.ui.CompilationUnitEditor&quot; name=&quot;UserRepository.java&quot; tooltip=&quot;ShopmeBackEnd/src/main/java/com/shopme/admin/user/UserRepository.java&quot;>&#xD;&#xA;&lt;persistable path=&quot;/ShopmeBackEnd/src/main/java/com/shopme/admin/user/UserRepository.java&quot;/>&#xD;&#xA;&lt;/file>&#xD;&#xA;&lt;file factoryID=&quot;org.eclipse.ui.part.FileEditorInputFactory&quot; id=&quot;org.eclipse.jdt.ui.CompilationUnitEditor&quot; name=&quot;CategoryRepository.java&quot; tooltip=&quot;ShopmeBackEnd/src/main/java/com/shopme/admin/category/CategoryRepository.java&quot;>&#xD;&#xA;&lt;persistable path=&quot;/ShopmeBackEnd/src/main/java/com/shopme/admin/category/CategoryRepository.java&quot;/>&#xD;&#xA;&lt;/file>&#xD;&#xA;&lt;file factoryID=&quot;org.eclipse.ui.part.FileEditorInputFactory&quot; id=&quot;org.eclipse.jdt.ui.CompilationUnitEditor&quot; name=&quot;CatgoryRepository.java&quot; tooltip=&quot;ShopmeBackEnd/src/main/java/com/shopme/admin/category/CatgoryRepository.java&quot;>&#xD;&#xA;&lt;persistable path=&quot;/ShopmeBackEnd/src/main/java/com/shopme/admin/category/CatgoryRepository.java&quot;/>&#xD;&#xA;&lt;/file>&#xD;&#xA;&lt;file factoryID=&quot;org.eclipse.ui.part.FileEditorInputFactory&quot; id=&quot;org.eclipse.jdt.ui.CompilationUnitEditor&quot; name=&quot;Category.java&quot; tooltip=&quot;ShopmeBackEnd/src/main/java/com/shopme/admin/category/Category.java&quot;>&#xD;&#xA;&lt;persistable path=&quot;/ShopmeBackEnd/src/main/java/com/shopme/admin/category/Category.java&quot;/>&#xD;&#xA;&lt;/file>&#xD;&#xA;&lt;file factoryID=&quot;org.eclipse.jdt.ui.ClassFileEditorInputFactory&quot; id=&quot;org.eclipse.jdt.ui.ClassFileEditor&quot; name=&quot;OneToMany.class&quot; tooltip=&quot;jakarta.persistence.OneToMany&quot;>&#xD;&#xA;&lt;persistable org.eclipse.jdt.ui.ClassFileIdentifier=&quot;=ShopmeCommon/C:\/Users\/User\/.m2\/repository\/jakarta\/persistence\/jakarta.persistence-api\/3.1.0\/jakarta.persistence-api-3.1.0.jar=/maven.pomderived=/true=/=/maven.groupId=/jakarta.persistence=/=/maven.artifactId=/jakarta.persistence-api=/=/maven.version=/3.1.0=/=/maven.scope=/compile=/=/maven.pomderived=/true=/&amp;lt;jakarta.persistence(OneToMany.class&quot;/>&#xD;&#xA;&lt;/file>&#xD;&#xA;&lt;file factoryID=&quot;org.eclipse.ui.part.FileEditorInputFactory&quot; id=&quot;org.eclipse.jdt.ui.CompilationUnitEditor&quot; name=&quot;Role.java&quot; tooltip=&quot;ShopmeCommon/src/main/java/com/shopme/common/entity/Role.java&quot;>&#xD;&#xA;&lt;persistable path=&quot;/ShopmeCommon/src/main/java/com/shopme/common/entity/Role.java&quot;/>&#xD;&#xA;&lt;/file>&#xD;&#xA;&lt;file factoryID=&quot;org.eclipse.ui.part.FileEditorInputFactory&quot; id=&quot;org.eclipse.jdt.ui.CompilationUnitEditor&quot; name=&quot;User.java&quot; tooltip=&quot;ShopmeCommon/src/main/java/com/shopme/common/entity/User.java&quot;>&#xD;&#xA;&lt;persistable path=&quot;/ShopmeCommon/src/main/java/com/shopme/common/entity/User.java&quot;/>&#xD;&#xA;&lt;/file>&#xD;&#xA;&lt;file factoryID=&quot;org.eclipse.ui.part.FileEditorInputFactory&quot; id=&quot;org.eclipse.jdt.ui.CompilationUnitEditor&quot; name=&quot;FileUploadUtil.java&quot; tooltip=&quot;ShopmeBackEnd/src/main/java/com/shopme/admin/FileUploadUtil.java&quot;>&#xD;&#xA;&lt;persistable path=&quot;/ShopmeBackEnd/src/main/java/com/shopme/admin/FileUploadUtil.java&quot;/>&#xD;&#xA;&lt;/file>&#xD;&#xA;&lt;file factoryID=&quot;org.eclipse.ui.part.FileEditorInputFactory&quot; id=&quot;org.eclipse.jdt.ui.ClassFileEditor&quot; name=&quot;FileUploadUtil.class&quot; tooltip=&quot;ShopmeWebParent/ShopmeBackEnd/target/classes/com/shopme/admin/FileUploadUtil.class&quot;>&#xD;&#xA;&lt;persistable path=&quot;/ShopmeWebParent/ShopmeBackEnd/target/classes/com/shopme/admin/FileUploadUtil.class&quot;/>&#xD;&#xA;&lt;/file>&#xD;&#xA;&lt;file factoryID=&quot;org.eclipse.ui.part.FileEditorInputFactory&quot; id=&quot;org.eclipse.jdt.ui.ClassFileEditor&quot; name=&quot;FileUploadUtil.class&quot; tooltip=&quot;ShopmeProject/ShopmeWebParent/ShopmeBackEnd/target/classes/com/shopme/admin/FileUploadUtil.class&quot;>&#xD;&#xA;&lt;persistable path=&quot;/ShopmeProject/ShopmeWebParent/ShopmeBackEnd/target/classes/com/shopme/admin/FileUploadUtil.class&quot;/>&#xD;&#xA;&lt;/file>&#xD;&#xA;&lt;file factoryID=&quot;org.eclipse.ui.part.FileEditorInputFactory&quot; id=&quot;org.eclipse.wst.html.core.htmlsource.source&quot; name=&quot;500.html&quot; tooltip=&quot;ShopmeBackEnd/src/main/resources/templates/error/500.html&quot;>&#xD;&#xA;&lt;persistable path=&quot;/ShopmeBackEnd/src/main/resources/templates/error/500.html&quot;/>&#xD;&#xA;&lt;/file>&#xD;&#xA;&lt;file factoryID=&quot;org.eclipse.ui.part.FileEditorInputFactory&quot; id=&quot;org.eclipse.wst.html.core.htmlsource.source&quot; name=&quot;403.html&quot; tooltip=&quot;ShopmeBackEnd/src/main/resources/templates/error/403.html&quot;>&#xD;&#xA;&lt;persistable path=&quot;/ShopmeBackEnd/src/main/resources/templates/error/403.html&quot;/>&#xD;&#xA;&lt;/file>&#xD;&#xA;&lt;file factoryID=&quot;org.eclipse.ui.part.FileEditorInputFactory&quot; id=&quot;org.eclipse.wst.html.core.htmlsource.source&quot; name=&quot;error.html&quot; tooltip=&quot;ShopmeBackEnd/src/main/resources/templates/error.html&quot;>&#xD;&#xA;&lt;persistable path=&quot;/ShopmeBackEnd/src/main/resources/templates/error.html&quot;/>&#xD;&#xA;&lt;/file>&#xD;&#xA;&lt;file factoryID=&quot;org.eclipse.ui.part.FileEditorInputFactory&quot; id=&quot;org.eclipse.wst.html.core.htmlsource.source&quot; name=&quot;404.html&quot; tooltip=&quot;ShopmeBackEnd/src/main/resources/templates/error/404.html&quot;>&#xD;&#xA;&lt;persistable path=&quot;/ShopmeBackEnd/src/main/resources/templates/error/404.html&quot;/>&#xD;&#xA;&lt;/file>&#xD;&#xA;&lt;file factoryID=&quot;org.eclipse.ui.part.FileEditorInputFactory&quot; id=&quot;org.eclipse.wst.html.core.htmlsource.source&quot; name=&quot;index.html&quot; tooltip=&quot;ShopmeBackEnd/src/main/resources/templates/index.html&quot;>&#xD;&#xA;&lt;persistable path=&quot;/ShopmeBackEnd/src/main/resources/templates/index.html&quot;/>&#xD;&#xA;&lt;/file>&#xD;&#xA;&lt;file factoryID=&quot;org.eclipse.ui.part.FileEditorInputFactory&quot; id=&quot;org.eclipse.wst.html.core.htmlsource.source&quot; name=&quot;account_form.html&quot; tooltip=&quot;ShopmeBackEnd/src/main/resources/templates/users/account_form.html&quot;>&#xD;&#xA;&lt;persistable path=&quot;/ShopmeBackEnd/src/main/resources/templates/users/account_form.html&quot;/>&#xD;&#xA;&lt;/file>&#xD;&#xA;&lt;file factoryID=&quot;org.eclipse.ui.part.FileEditorInputFactory&quot; id=&quot;org.eclipse.wst.html.core.htmlsource.source&quot; name=&quot;user_form.html&quot; tooltip=&quot;ShopmeBackEnd/src/main/resources/templates/users/user_form.html&quot;>&#xD;&#xA;&lt;persistable path=&quot;/ShopmeBackEnd/src/main/resources/templates/users/user_form.html&quot;/>&#xD;&#xA;&lt;/file>&#xD;&#xA;&lt;file factoryID=&quot;org.eclipse.ui.part.FileEditorInputFactory&quot; id=&quot;org.eclipse.jdt.ui.CompilationUnitEditor&quot; name=&quot;AccountController.java&quot; tooltip=&quot;ShopmeBackEnd/src/main/java/com/shopme/admin/user/controller/AccountController.java&quot;>&#xD;&#xA;&lt;persistable path=&quot;/ShopmeBackEnd/src/main/java/com/shopme/admin/user/controller/AccountController.java&quot;/>&#xD;&#xA;&lt;/file>&#xD;&#xA;&lt;file factoryID=&quot;org.eclipse.ui.part.FileEditorInputFactory&quot; id=&quot;org.eclipse.jdt.ui.CompilationUnitEditor&quot; name=&quot;UserNotFoundException.java&quot; tooltip=&quot;ShopmeBackEnd/src/main/java/com/shopme/admin/user/UserNotFoundException.java&quot;>&#xD;&#xA;&lt;persistable path=&quot;/ShopmeBackEnd/src/main/java/com/shopme/admin/user/UserNotFoundException.java&quot;/>&#xD;&#xA;&lt;/file>&#xD;&#xA;&lt;file factoryID=&quot;org.eclipse.ui.part.FileEditorInputFactory&quot; id=&quot;org.eclipse.wst.html.core.htmlsource.source&quot; name=&quot;navigation.html&quot; tooltip=&quot;ShopmeBackEnd/src/main/resources/templates/navigation.html&quot;>&#xD;&#xA;&lt;persistable path=&quot;/ShopmeBackEnd/src/main/resources/templates/navigation.html&quot;/>&#xD;&#xA;&lt;/file>&#xD;&#xA;&lt;file factoryID=&quot;org.eclipse.ui.part.FileEditorInputFactory&quot; id=&quot;org.eclipse.jdt.ui.CompilationUnitEditor&quot; name=&quot;UserService.java&quot; tooltip=&quot;ShopmeBackEnd/src/main/java/com/shopme/admin/user/UserService.java&quot;>&#xD;&#xA;&lt;persistable path=&quot;/ShopmeBackEnd/src/main/java/com/shopme/admin/user/UserService.java&quot;/>&#xD;&#xA;&lt;/file>&#xD;&#xA;&lt;file factoryID=&quot;org.eclipse.ui.part.FileEditorInputFactory&quot; id=&quot;org.eclipse.jdt.ui.CompilationUnitEditor&quot; name=&quot;ShopmeUserDetailsService.java&quot; tooltip=&quot;ShopmeBackEnd/src/main/java/com/shopme/admin/security/ShopmeUserDetailsService.java&quot;>&#xD;&#xA;&lt;persistable path=&quot;/ShopmeBackEnd/src/main/java/com/shopme/admin/security/ShopmeUserDetailsService.java&quot;/>&#xD;&#xA;&lt;/file>&#xD;&#xA;&lt;file factoryID=&quot;org.eclipse.ui.part.FileEditorInputFactory&quot; id=&quot;org.eclipse.jdt.ui.CompilationUnitEditor&quot; name=&quot;ShopmeUserDetails.java&quot; tooltip=&quot;ShopmeBackEnd/src/main/java/com/shopme/admin/security/ShopmeUserDetails.java&quot;>&#xD;&#xA;&lt;persistable path=&quot;/ShopmeBackEnd/src/main/java/com/shopme/admin/security/ShopmeUserDetails.java&quot;/>&#xD;&#xA;&lt;/file>&#xD;&#xA;&lt;file factoryID=&quot;org.eclipse.ui.part.FileEditorInputFactory&quot; id=&quot;org.eclipse.wst.html.core.htmlsource.source&quot; name=&quot;users.html&quot; tooltip=&quot;ShopmeBackEnd/src/main/resources/templates/users.html&quot;>&#xD;&#xA;&lt;persistable path=&quot;/ShopmeBackEnd/src/main/resources/templates/users.html&quot;/>&#xD;&#xA;&lt;/file>&#xD;&#xA;&lt;file factoryID=&quot;org.eclipse.ui.part.FileEditorInputFactory&quot; id=&quot;org.eclipse.jdt.ui.CompilationUnitEditor&quot; name=&quot;AccountController.java&quot; tooltip=&quot;ShopmeBackEnd/src/main/java/com/shopme/admin/user/AccountController.java&quot;>&#xD;&#xA;&lt;persistable path=&quot;/ShopmeBackEnd/src/main/java/com/shopme/admin/user/AccountController.java&quot;/>&#xD;&#xA;&lt;/file>&#xD;&#xA;&lt;file factoryID=&quot;org.eclipse.ui.part.FileEditorInputFactory&quot; id=&quot;org.eclipse.jdt.ui.CompilationUnitEditor&quot; name=&quot;UserController.java&quot; tooltip=&quot;ShopmeBackEnd/src/main/java/com/shopme/admin/user/UserController.java&quot;>&#xD;&#xA;&lt;persistable path=&quot;/ShopmeBackEnd/src/main/java/com/shopme/admin/user/UserController.java&quot;/>&#xD;&#xA;&lt;/file>&#xD;&#xA;&lt;file factoryID=&quot;org.eclipse.ui.part.FileEditorInputFactory&quot; id=&quot;org.eclipse.wst.html.core.htmlsource.source&quot; name=&quot;account_form.html&quot; tooltip=&quot;ShopmeBackEnd/src/main/resources/templates/account_form.html&quot;>&#xD;&#xA;&lt;persistable path=&quot;/ShopmeBackEnd/src/main/resources/templates/account_form.html&quot;/>&#xD;&#xA;&lt;/file>&#xD;&#xA;&lt;file factoryID=&quot;org.eclipse.jdt.ui.ClassFileEditorInputFactory&quot; id=&quot;org.eclipse.jdt.ui.ClassFileEditor&quot; name=&quot;Model.class&quot; tooltip=&quot;org.springframework.ui.Model&quot;>&#xD;&#xA;&lt;persistable org.eclipse.jdt.ui.ClassFileIdentifier=&quot;=ShopmeBackEnd/C:\/Users\/User\/.m2\/repository\/org\/springframework\/spring-context\/6.0.4\/spring-context-6.0.4.jar=/maven.pomderived=/true=/=/maven.groupId=/org.springframework=/=/maven.artifactId=/spring-context=/=/maven.version=/6.0.4=/=/maven.scope=/compile=/=/maven.pomderived=/true=/&amp;lt;org.springframework.ui(Model.class&quot;/>&#xD;&#xA;&lt;/file>&#xD;&#xA;&lt;file factoryID=&quot;org.eclipse.ui.part.FileEditorInputFactory&quot; id=&quot;org.eclipse.jdt.ui.CompilationUnitEditor&quot; name=&quot;UserCsvExporter.java&quot; tooltip=&quot;ShopmeBackEnd/src/main/java/com/shopme/admin/user/UserCsvExporter.java&quot;>&#xD;&#xA;&lt;persistable path=&quot;/ShopmeBackEnd/src/main/java/com/shopme/admin/user/UserCsvExporter.java&quot;/>&#xD;&#xA;&lt;/file>&#xD;&#xA;&lt;file factoryID=&quot;org.eclipse.ui.part.FileEditorInputFactory&quot; id=&quot;org.eclipse.wst.html.core.htmlsource.source&quot; name=&quot;user_form.html&quot; tooltip=&quot;ShopmeBackEnd/src/main/resources/templates/user_form.html&quot;>&#xD;&#xA;&lt;persistable path=&quot;/ShopmeBackEnd/src/main/resources/templates/user_form.html&quot;/>&#xD;&#xA;&lt;/file>&#xD;&#xA;&lt;file factoryID=&quot;org.eclipse.jdt.ui.ClassFileEditorInputFactory&quot; id=&quot;org.eclipse.jdt.ui.ClassFileEditor&quot; name=&quot;HttpSecurity.class&quot; tooltip=&quot;org.springframework.security.config.annotation.web.builders.HttpSecurity&quot;>&#xD;&#xA;&lt;persistable org.eclipse.jdt.ui.ClassFileIdentifier=&quot;=ShopmeBackEnd/C:\/Users\/User\/.m2\/repository\/org\/springframework\/security\/spring-security-config\/6.0.1\/spring-security-config-6.0.1.jar=/maven.pomderived=/true=/=/maven.groupId=/org.springframework.security=/=/maven.artifactId=/spring-security-config=/=/maven.version=/6.0.1=/=/maven.scope=/compile=/=/maven.pomderived=/true=/&amp;lt;org.springframework.security.config.annotation.web.builders(HttpSecurity.class&quot;/>&#xD;&#xA;&lt;/file>&#xD;&#xA;&lt;file factoryID=&quot;org.eclipse.ui.part.FileEditorInputFactory&quot; id=&quot;org.eclipse.m2e.editor.MavenPomEditor&quot; name=&quot;pom.xml&quot; tooltip=&quot;ShopmeWebParent/pom.xml&quot;>&#xD;&#xA;&lt;persistable path=&quot;/ShopmeWebParent/pom.xml&quot;/>&#xD;&#xA;&lt;/file>&#xD;&#xA;&lt;file factoryID=&quot;org.eclipse.ui.part.FileEditorInputFactory&quot; id=&quot;org.eclipse.m2e.editor.MavenPomEditor&quot; name=&quot;pom.xml&quot; tooltip=&quot;ShopmeBackEnd/pom.xml&quot;>&#xD;&#xA;&lt;persistable path=&quot;/ShopmeBackEnd/pom.xml&quot;/>&#xD;&#xA;&lt;/file>&#xD;&#xA;&lt;file factoryID=&quot;org.eclipse.ui.part.FileEditorInputFactory&quot; id=&quot;org.eclipse.jdt.ui.ClassFileEditor&quot; name=&quot;User.class&quot; tooltip=&quot;ShopmeProject/ShopmeCommon/target/classes/com/shopme/common/entity/User.class&quot;>&#xD;&#xA;&lt;persistable path=&quot;/ShopmeProject/ShopmeCommon/target/classes/com/shopme/common/entity/User.class&quot;/>&#xD;&#xA;&lt;/file>&#xD;&#xA;&lt;file factoryID=&quot;org.eclipse.jdt.ui.ClassFileEditorInputFactory&quot; id=&quot;org.eclipse.jdt.ui.ClassFileEditor&quot; name=&quot;SimpleGrantedAuthority.class&quot; tooltip=&quot;org.springframework.security.core.authority.SimpleGrantedAuthority&quot;>&#xD;&#xA;&lt;persistable org.eclipse.jdt.ui.ClassFileIdentifier=&quot;=ShopmeBackEnd/C:\/Users\/User\/.m2\/repository\/org\/springframework\/security\/spring-security-core\/6.0.1\/spring-security-core-6.0.1.jar=/maven.pomderived=/true=/=/maven.groupId=/org.springframework.security=/=/maven.artifactId=/spring-security-core=/=/maven.version=/6.0.1=/=/maven.scope=/compile=/=/maven.pomderived=/true=/&amp;lt;org.springframework.security.core.authority(SimpleGrantedAuthority.class&quot;/>&#xD;&#xA;&lt;/file>&#xD;&#xA;&lt;file factoryID=&quot;org.eclipse.ui.part.FileEditorInputFactory&quot; id=&quot;org.eclipse.jdt.ui.CompilationUnitEditor&quot; name=&quot;MainController.java&quot; tooltip=&quot;ShopmeBackEnd/src/main/java/com/shopme/admin/MainController.java&quot;>&#xD;&#xA;&lt;persistable path=&quot;/ShopmeBackEnd/src/main/java/com/shopme/admin/MainController.java&quot;/>&#xD;&#xA;&lt;/file>&#xD;&#xA;&lt;file factoryID=&quot;org.eclipse.ui.part.FileEditorInputFactory&quot; id=&quot;org.eclipse.wst.html.core.htmlsource.source&quot; name=&quot;login.html&quot; tooltip=&quot;ShopmeBackEnd/src/main/resources/templates/login.html&quot;>&#xD;&#xA;&lt;persistable path=&quot;/ShopmeBackEnd/src/main/resources/templates/login.html&quot;/>&#xD;&#xA;&lt;/file>&#xD;&#xA;&lt;file factoryID=&quot;org.eclipse.ui.part.FileEditorInputFactory&quot; id=&quot;org.eclipse.jdt.ui.CompilationUnitEditor&quot; name=&quot;MvcConfig.java&quot; tooltip=&quot;ShopmeBackEnd/src/main/java/com/shopme/admin/MvcConfig.java&quot;>&#xD;&#xA;&lt;persistable path=&quot;/ShopmeBackEnd/src/main/java/com/shopme/admin/MvcConfig.java&quot;/>&#xD;&#xA;&lt;/file>&#xD;&#xA;&lt;file factoryID=&quot;org.eclipse.ui.part.FileEditorInputFactory&quot; id=&quot;org.eclipse.jdt.ui.ClassFileEditor&quot; name=&quot;UserRepository.class&quot; tooltip=&quot;ShopmeProject/ShopmeWebParent/ShopmeBackEnd/target/classes/com/shopme/admin/user/UserRepository.class&quot;>&#xD;&#xA;&lt;persistable path=&quot;/ShopmeProject/ShopmeWebParent/ShopmeBackEnd/target/classes/com/shopme/admin/user/UserRepository.class&quot;/>&#xD;&#xA;&lt;/file>&#xD;&#xA;&lt;file factoryID=&quot;org.eclipse.ui.part.FileEditorInputFactory&quot; id=&quot;org.eclipse.jdt.ui.CompilationUnitEditor&quot; name=&quot;UserExcelExporter.java&quot; tooltip=&quot;ShopmeBackEnd/src/main/java/com/shopme/admin/user/UserExcelExporter.java&quot;>&#xD;&#xA;&lt;persistable path=&quot;/ShopmeBackEnd/src/main/java/com/shopme/admin/user/UserExcelExporter.java&quot;/>&#xD;&#xA;&lt;/file>&#xD;&#xA;&lt;file factoryID=&quot;org.eclipse.ui.part.FileEditorInputFactory&quot; id=&quot;org.eclipse.jdt.ui.CompilationUnitEditor&quot; name=&quot;AbstractExporter.java&quot; tooltip=&quot;ShopmeBackEnd/src/main/java/com/shopme/admin/user/AbstractExporter.java&quot;>&#xD;&#xA;&lt;persistable path=&quot;/ShopmeBackEnd/src/main/java/com/shopme/admin/user/AbstractExporter.java&quot;/>&#xD;&#xA;&lt;/file>&#xD;&#xA;&lt;file factoryID=&quot;org.eclipse.jdt.ui.ClassFileEditorInputFactory&quot; id=&quot;org.eclipse.jdt.ui.ClassFileEditor&quot; name=&quot;SimpleDateFormat.class&quot; tooltip=&quot;java.text.SimpleDateFormat&quot;>&#xD;&#xA;&lt;persistable org.eclipse.jdt.ui.ClassFileIdentifier=&quot;=ShopmeBackEnd/C:\/Program Files\/Java\/STS4\/sts-4.17.2.RELEASE\/plugins\/org.eclipse.justj.openjdk.hotspot.jre.full.win32.x86_64_17.0.6.v20230125-1136\/jre\/lib\/jrt-fs.jar`java.base=/javadoc_location=/https:\/\/docs.oracle.com\/en\/java\/javase\/17\/docs\/api\/=/=/maven.pomderived=/true=/&amp;lt;java.text(SimpleDateFormat.class&quot;/>&#xD;&#xA;&lt;/file>&#xD;&#xA;&lt;file factoryID=&quot;org.eclipse.jdt.ui.ClassFileEditorInputFactory&quot; id=&quot;org.eclipse.jdt.ui.ClassFileEditor&quot; name=&quot;DateFormat.class&quot; tooltip=&quot;java.text.DateFormat&quot;>&#xD;&#xA;&lt;persistable org.eclipse.jdt.ui.ClassFileIdentifier=&quot;=ShopmeBackEnd/C:\/Program Files\/Java\/STS4\/sts-4.17.2.RELEASE\/plugins\/org.eclipse.justj.openjdk.hotspot.jre.full.win32.x86_64_17.0.6.v20230125-1136\/jre\/lib\/jrt-fs.jar`java.base=/javadoc_location=/https:\/\/docs.oracle.com\/en\/java\/javase\/17\/docs\/api\/=/=/maven.pomderived=/true=/&amp;lt;java.text(DateFormat.class&quot;/>&#xD;&#xA;&lt;/file>&#xD;&#xA;&lt;file factoryID=&quot;org.eclipse.jdt.ui.ClassFileEditorInputFactory&quot; id=&quot;org.eclipse.jdt.ui.ClassFileEditor&quot; name=&quot;Iterable.class&quot; tooltip=&quot;java.lang.Iterable&quot;>&#xD;&#xA;&lt;persistable org.eclipse.jdt.ui.ClassFileIdentifier=&quot;=ShopmeBackEnd/C:\/Program Files\/Java\/STS4\/sts-4.17.2.RELEASE\/plugins\/org.eclipse.justj.openjdk.hotspot.jre.full.win32.x86_64_17.0.6.v20230125-1136\/jre\/lib\/jrt-fs.jar`java.base=/javadoc_location=/https:\/\/docs.oracle.com\/en\/java\/javase\/17\/docs\/api\/=/=/maven.pomderived=/true=/&amp;lt;java.lang(Iterable.class&quot;/>&#xD;&#xA;&lt;/file>&#xD;&#xA;&lt;file factoryID=&quot;org.eclipse.jdt.ui.ClassFileEditorInputFactory&quot; id=&quot;org.eclipse.jdt.ui.ClassFileEditor&quot; name=&quot;PagingAndSortingRepository.class&quot; tooltip=&quot;org.springframework.data.repository.PagingAndSortingRepository&quot;>&#xD;&#xA;&lt;persistable org.eclipse.jdt.ui.ClassFileIdentifier=&quot;=ShopmeBackEnd/C:\/Users\/User\/.m2\/repository\/org\/springframework\/data\/spring-data-commons\/3.0.1\/spring-data-commons-3.0.1.jar=/maven.pomderived=/true=/=/maven.groupId=/org.springframework.data=/=/maven.artifactId=/spring-data-commons=/=/maven.version=/3.0.1=/=/maven.scope=/compile=/=/maven.pomderived=/true=/&amp;lt;org.springframework.data.repository(PagingAndSortingRepository.class&quot;/>&#xD;&#xA;&lt;/file>&#xD;&#xA;&lt;file factoryID=&quot;org.eclipse.jdt.ui.ClassFileEditorInputFactory&quot; id=&quot;org.eclipse.jdt.ui.ClassFileEditor&quot; name=&quot;ResourceHandlerRegistration.class&quot; tooltip=&quot;org.springframework.web.servlet.config.annotation.ResourceHandlerRegistration&quot;>&#xD;&#xA;&lt;persistable org.eclipse.jdt.ui.ClassFileIdentifier=&quot;=ShopmeBackEnd/C:\/Users\/User\/.m2\/repository\/org\/springframework\/spring-webmvc\/6.0.4\/spring-webmvc-6.0.4.jar=/maven.pomderived=/true=/=/maven.groupId=/org.springframework=/=/maven.artifactId=/spring-webmvc=/=/maven.version=/6.0.4=/=/maven.scope=/compile=/=/maven.pomderived=/true=/&amp;lt;org.springframework.web.servlet.config.annotation(ResourceHandlerRegistration.class&quot;/>&#xD;&#xA;&lt;/file>&#xD;&#xA;&lt;file factoryID=&quot;org.eclipse.jdt.ui.ClassFileEditorInputFactory&quot; id=&quot;org.eclipse.jdt.ui.ClassFileEditor&quot; name=&quot;IOException.class&quot; tooltip=&quot;java.io.IOException&quot;>&#xD;&#xA;&lt;persistable org.eclipse.jdt.ui.ClassFileIdentifier=&quot;=ShopmeBackEnd/C:\/Program Files\/Java\/STS4\/sts-4.17.2.RELEASE\/plugins\/org.eclipse.justj.openjdk.hotspot.jre.full.win32.x86_64_17.0.6.v20230125-1136\/jre\/lib\/jrt-fs.jar`java.base=/javadoc_location=/https:\/\/docs.oracle.com\/en\/java\/javase\/17\/docs\/api\/=/=/maven.pomderived=/true=/&amp;lt;java.io(IOException.class&quot;/>&#xD;&#xA;&lt;/file>&#xD;&#xA;&lt;file factoryID=&quot;org.eclipse.jdt.ui.ClassFileEditorInputFactory&quot; id=&quot;org.eclipse.jdt.ui.ClassFileEditor&quot; name=&quot;Service.class&quot; tooltip=&quot;org.springframework.stereotype.Service&quot;>&#xD;&#xA;&lt;persistable org.eclipse.jdt.ui.ClassFileIdentifier=&quot;=ShopmeBackEnd/C:\/Users\/User\/.m2\/repository\/org\/springframework\/spring-context\/6.0.4\/spring-context-6.0.4.jar=/maven.pomderived=/true=/=/maven.groupId=/org.springframework=/=/maven.artifactId=/spring-context=/=/maven.version=/6.0.4=/=/maven.scope=/compile=/=/maven.pomderived=/true=/&amp;lt;org.springframework.stereotype(Service.class&quot;/>&#xD;&#xA;&lt;/file>&#xD;&#xA;&lt;file factoryID=&quot;org.eclipse.ui.part.FileEditorInputFactory&quot; id=&quot;org.eclipse.jdt.ui.CompilationUnitEditor&quot; name=&quot;UserRestController.java&quot; tooltip=&quot;ShopmeBackEnd/src/main/java/com/shopme/admin/user/UserRestController.java&quot;>&#xD;&#xA;&lt;persistable path=&quot;/ShopmeBackEnd/src/main/java/com/shopme/admin/user/UserRestController.java&quot;/>&#xD;&#xA;&lt;/file>&#xD;&#xA;&lt;file factoryID=&quot;org.eclipse.ui.part.FileEditorInputFactory&quot; id=&quot;org.eclipse.jdt.ui.CompilationUnitEditor&quot; name=&quot;UserRestController.java&quot; tooltip=&quot;ShopmeBackEnd/src/test/java/com/shopme/admin/user/UserRestController.java&quot;>&#xD;&#xA;&lt;persistable path=&quot;/ShopmeBackEnd/src/test/java/com/shopme/admin/user/UserRestController.java&quot;/>&#xD;&#xA;&lt;/file>&#xD;&#xA;&lt;file factoryID=&quot;org.eclipse.jdt.ui.ClassFileEditorInputFactory&quot; id=&quot;org.eclipse.jdt.ui.ClassFileEditor&quot; name=&quot;InputMismatchException.class&quot; tooltip=&quot;java.util.InputMismatchException&quot;>&#xD;&#xA;&lt;persistable org.eclipse.jdt.ui.ClassFileIdentifier=&quot;=ShopmeBackEnd/C:\/Program Files\/Java\/STS4\/sts-4.17.2.RELEASE\/plugins\/org.eclipse.justj.openjdk.hotspot.jre.full.win32.x86_64_17.0.6.v20230125-1136\/jre\/lib\/jrt-fs.jar`java.base=/javadoc_location=/https:\/\/docs.oracle.com\/en\/java\/javase\/17\/docs\/api\/=/=/maven.pomderived=/true=/&amp;lt;java.util(InputMismatchException.class&quot;/>&#xD;&#xA;&lt;/file>&#xD;&#xA;&lt;file factoryID=&quot;org.eclipse.jdt.ui.ClassFileEditorInputFactory&quot; id=&quot;org.eclipse.jdt.ui.ClassFileEditor&quot; name=&quot;PasswordEncoder.class&quot; tooltip=&quot;org.springframework.security.crypto.password.PasswordEncoder&quot;>&#xD;&#xA;&lt;persistable org.eclipse.jdt.ui.ClassFileIdentifier=&quot;=ShopmeBackEnd/C:\/Users\/User\/.m2\/repository\/org\/springframework\/security\/spring-security-crypto\/6.0.1\/spring-security-crypto-6.0.1.jar=/maven.pomderived=/true=/=/maven.groupId=/org.springframework.security=/=/maven.artifactId=/spring-security-crypto=/=/maven.version=/6.0.1=/=/maven.scope=/compile=/=/maven.pomderived=/true=/&amp;lt;org.springframework.security.crypto.password(PasswordEncoder.class&quot;/>&#xD;&#xA;&lt;/file>&#xD;&#xA;&lt;file factoryID=&quot;org.eclipse.ui.part.FileEditorInputFactory&quot; id=&quot;org.eclipse.jdt.ui.CompilationUnitEditor&quot; name=&quot;RoleRepository.java&quot; tooltip=&quot;ShopmeBackEnd/src/main/java/com/shopme/admin/user/RoleRepository.java&quot;>&#xD;&#xA;&lt;persistable path=&quot;/ShopmeBackEnd/src/main/java/com/shopme/admin/user/RoleRepository.java&quot;/>&#xD;&#xA;&lt;/file>&#xD;&#xA;&lt;file factoryID=&quot;org.eclipse.jdt.ui.ClassFileEditorInputFactory&quot; id=&quot;org.eclipse.jdt.ui.ClassFileEditor&quot; name=&quot;List.class&quot; tooltip=&quot;java.util.List&quot;>&#xD;&#xA;&lt;persistable org.eclipse.jdt.ui.ClassFileIdentifier=&quot;=ShopmeBackEnd/C:\/Program Files\/Java\/STS4\/sts-4.17.2.RELEASE\/plugins\/org.eclipse.justj.openjdk.hotspot.jre.full.win32.x86_64_17.0.6.v20230125-1136\/jre\/lib\/jrt-fs.jar`java.base=/javadoc_location=/https:\/\/docs.oracle.com\/en\/java\/javase\/17\/docs\/api\/=/=/maven.pomderived=/true=/&amp;lt;java.util(List.class&quot;/>&#xD;&#xA;&lt;/file>&#xD;&#xA;&lt;file factoryID=&quot;org.eclipse.ui.part.FileEditorInputFactory&quot; id=&quot;org.eclipse.m2e.editor.MavenPomEditor&quot; name=&quot;pom.xml&quot; tooltip=&quot;ShopmeProject/pom.xml&quot;>&#xD;&#xA;&lt;persistable path=&quot;/ShopmeProject/pom.xml&quot;/>&#xD;&#xA;&lt;/file>&#xD;&#xA;&lt;file factoryID=&quot;org.eclipse.ui.part.FileEditorInputFactory&quot; id=&quot;org.eclipse.m2e.editor.MavenPomEditor&quot; name=&quot;pom.xml&quot; tooltip=&quot;ShopmeCommon/pom.xml&quot;>&#xD;&#xA;&lt;persistable path=&quot;/ShopmeCommon/pom.xml&quot;/>&#xD;&#xA;&lt;/file>&#xD;&#xA;&lt;file factoryID=&quot;org.eclipse.jdt.ui.ClassFileEditorInputFactory&quot; id=&quot;org.eclipse.jdt.ui.ClassFileEditor&quot; name=&quot;AutoConfigureTestDatabase.class&quot; tooltip=&quot;org.springframework.boot.test.autoconfigure.jdbc.AutoConfigureTestDatabase&quot;>&#xD;&#xA;&lt;persistable org.eclipse.jdt.ui.ClassFileIdentifier=&quot;=ShopmeBackEnd/C:\/Users\/User\/.m2\/repository\/org\/springframework\/boot\/spring-boot-test-autoconfigure\/3.0.2\/spring-boot-test-autoconfigure-3.0.2.jar=/maven.pomderived=/true=/=/test=/true=/=/maven.groupId=/org.springframework.boot=/=/maven.artifactId=/spring-boot-test-autoconfigure=/=/maven.version=/3.0.2=/=/maven.scope=/test=/=/maven.pomderived=/true=/&amp;lt;org.springframework.boot.test.autoconfigure.jdbc(AutoConfigureTestDatabase.class&quot;/>&#xD;&#xA;&lt;/file>&#xD;&#xA;&lt;file factoryID=&quot;org.eclipse.jdt.ui.ClassFileEditorInputFactory&quot; id=&quot;org.eclipse.jdt.ui.ClassFileEditor&quot; name=&quot;Set.class&quot; tooltip=&quot;java.util.Set&quot;>&#xD;&#xA;&lt;persistable org.eclipse.jdt.ui.ClassFileIdentifier=&quot;=ShopmeCommon/C:\/Program Files\/Java\/STS4\/sts-4.17.2.RELEASE\/plugins\/org.eclipse.justj.openjdk.hotspot.jre.full.win32.x86_64_17.0.6.v20230125-1136\/jre\/lib\/jrt-fs.jar`java.base=/javadoc_location=/https:\/\/docs.oracle.com\/en\/java\/javase\/17\/docs\/api\/=/=/maven.pomderived=/true=/&amp;lt;java.util(Set.class&quot;/>&#xD;&#xA;&lt;/file>&#xD;&#xA;&lt;file factoryID=&quot;org.eclipse.ui.part.FileEditorInputFactory&quot; id=&quot;org.eclipse.jdt.ui.CompilationUnitEditor&quot; name=&quot;ShopmeBackEndApplication.java&quot; tooltip=&quot;ShopmeBackEnd/src/main/java/com/shopme/admin/ShopmeBackEndApplication.java&quot;>&#xD;&#xA;&lt;persistable path=&quot;/ShopmeBackEnd/src/main/java/com/shopme/admin/ShopmeBackEndApplication.java&quot;/>&#xD;&#xA;&lt;/file>&#xD;&#xA;&lt;file factoryID=&quot;org.eclipse.ui.part.FileEditorInputFactory&quot; id=&quot;org.eclipse.m2e.editor.MavenPomEditor&quot; name=&quot;pom.xml&quot; tooltip=&quot;ShopmeFrontEnd/pom.xml&quot;>&#xD;&#xA;&lt;persistable path=&quot;/ShopmeFrontEnd/pom.xml&quot;/>&#xD;&#xA;&lt;/file>&#xD;&#xA;&lt;file factoryID=&quot;org.eclipse.ui.ide.FileStoreEditorInputFactory&quot; id=&quot;org.eclipse.m2e.editor.MavenPomEditor&quot; name=&quot;jquery-3.4.1.pom&quot; tooltip=&quot;C:\Users\User\.m2\repository\org\webjars\jquery\3.4.1\jquery-3.4.1.pom&quot;>&#xD;&#xA;&lt;persistable uri=&quot;file:/C:/Users/User/.m2/repository/org/webjars/jquery/3.4.1/jquery-3.4.1.pom&quot;/>&#xD;&#xA;&lt;/file>&#xD;&#xA;&lt;file factoryID=&quot;org.eclipse.ui.part.FileEditorInputFactory&quot; id=&quot;org.eclipse.jdt.ui.CompilationUnitEditor&quot; name=&quot;MainController.java&quot; tooltip=&quot;ShopmeFrontEnd/src/main/java/com/shopme/site/MainController.java&quot;>&#xD;&#xA;&lt;persistable path=&quot;/ShopmeFrontEnd/src/main/java/com/shopme/site/MainController.java&quot;/>&#xD;&#xA;&lt;/file>&#xD;&#xA;&lt;file factoryID=&quot;org.eclipse.ui.part.FileEditorInputFactory&quot; id=&quot;org.eclipse.ui.genericeditor.GenericEditor&quot; name=&quot;index.html&quot; tooltip=&quot;ShopmeFrontEnd/src/main/resources/templates/index.html&quot;>&#xD;&#xA;&lt;persistable path=&quot;/ShopmeFrontEnd/src/main/resources/templates/index.html&quot;/>&#xD;&#xA;&lt;/file>&#xD;&#xA;&lt;file factoryID=&quot;org.eclipse.ui.part.FileEditorInputFactory&quot; id=&quot;SpringBootPropertyEditor&quot; name=&quot;application.properties&quot; tooltip=&quot;ShopmeFrontEnd/src/main/resources/application.properties&quot;>&#xD;&#xA;&lt;persistable path=&quot;/ShopmeFrontEnd/src/main/resources/application.properties&quot;/>&#xD;&#xA;&lt;/file>&#xD;&#xA;&lt;file factoryID=&quot;org.eclipse.ui.part.FileEditorInputFactory&quot; id=&quot;org.eclipse.jdt.ui.CompilationUnitEditor&quot; name=&quot;ShopmeFrontEndApplication.java&quot; tooltip=&quot;ShopmeFrontEnd/src/main/java/com/shopme/site/ShopmeFrontEndApplication.java&quot;>&#xD;&#xA;&lt;persistable path=&quot;/ShopmeFrontEnd/src/main/java/com/shopme/site/ShopmeFrontEndApplication.java&quot;/>&#xD;&#xA;&lt;/file>&#xD;&#xA;&lt;file factoryID=&quot;org.eclipse.ui.part.FileEditorInputFactory&quot; id=&quot;org.eclipse.ui.genericeditor.GenericEditor&quot; name=&quot;index.html&quot; tooltip=&quot;ShopmeWebParent/ShopmeBackEnd/src/main/resources/templates/index.html&quot;>&#xD;&#xA;&lt;persistable path=&quot;/ShopmeWebParent/ShopmeBackEnd/src/main/resources/templates/index.html&quot;/>&#xD;&#xA;&lt;/file>&#xD;&#xA;&lt;file factoryID=&quot;org.eclipse.ui.part.FileEditorInputFactory&quot; id=&quot;org.eclipse.m2e.editor.MavenPomEditor&quot; name=&quot;pom.xml&quot; tooltip=&quot;ShopmeWebParent/ShopmeBackEnd/pom.xml&quot;>&#xD;&#xA;&lt;persistable path=&quot;/ShopmeWebParent/ShopmeBackEnd/pom.xml&quot;/>&#xD;&#xA;&lt;/file>&#xD;&#xA;&lt;file factoryID=&quot;org.eclipse.jdt.ui.ClassFileEditorInputFactory&quot; id=&quot;org.eclipse.jdt.ui.ClassFileEditor&quot; name=&quot;ReflectionUtils.class&quot; tooltip=&quot;org.springframework.util.ReflectionUtils&quot;>&#xD;&#xA;&lt;persistable org.eclipse.jdt.ui.ClassFileIdentifier=&quot;=ShopmeBackEnd/C:\/Users\/User\/.m2\/repository\/org\/springframework\/spring-core\/6.0.4\/spring-core-6.0.4.jar=/maven.pomderived=/true=/=/maven.groupId=/org.springframework=/=/maven.artifactId=/spring-core=/=/maven.version=/6.0.4=/=/maven.scope=/compile=/=/maven.pomderived=/true=/&amp;lt;org.springframework.util(ReflectionUtils.class&quot;/>&#xD;&#xA;&lt;/file>&#xD;&#xA;&lt;file factoryID=&quot;org.eclipse.ui.part.FileEditorInputFactory&quot; id=&quot;org.eclipse.ui.genericeditor.GenericEditor&quot; name=&quot;useful.html&quot; tooltip=&quot;ShopmeBackEnd/src/main/resources/templates/useful.html&quot;>&#xD;&#xA;&lt;persistable path=&quot;/ShopmeBackEnd/src/main/resources/templates/useful.html&quot;/>&#xD;&#xA;&lt;/file>&#xD;&#xA;&lt;file factoryID=&quot;org.eclipse.jdt.ui.ClassFileEditorInputFactory&quot; id=&quot;org.eclipse.jdt.ui.ClassFileEditor&quot; name=&quot;Controller.class&quot; tooltip=&quot;org.springframework.stereotype.Controller&quot;>&#xD;&#xA;&lt;persistable org.eclipse.jdt.ui.ClassFileIdentifier=&quot;=ShopmeBackEnd/C:\/Users\/User\/.m2\/repository\/org\/springframework\/spring-context\/6.0.4\/spring-context-6.0.4.jar=/maven.pomderived=/true=/=/maven.groupId=/org.springframework=/=/maven.artifactId=/spring-context=/=/maven.version=/6.0.4=/=/maven.scope=/compile=/=/maven.pomderived=/true=/&amp;lt;org.springframework.stereotype(Controller.class&quot;/>&#xD;&#xA;&lt;/file>&#xD;&#xA;&lt;file factoryID=&quot;org.eclipse.ui.part.FileEditorInputFactory&quot; id=&quot;org.eclipse.jdt.ui.CompilationUnitEditor&quot; name=&quot;ShopmeCommonApplicationTests.java&quot; tooltip=&quot;ShopmeCommon/src/test/java/com/shopme/ShopmeCommonApplicationTests.java&quot;>&#xD;&#xA;&lt;persistable path=&quot;/ShopmeCommon/src/test/java/com/shopme/ShopmeCommonApplicationTests.java&quot;/>&#xD;&#xA;&lt;/file>&#xD;&#xA;&lt;file factoryID=&quot;org.eclipse.ui.part.FileEditorInputFactory&quot; id=&quot;org.eclipse.jdt.ui.CompilationUnitEditor&quot; name=&quot;ShopmeCommonApplication.java&quot; tooltip=&quot;ShopmeCommon/src/main/java/com/shopme/ShopmeCommonApplication.java&quot;>&#xD;&#xA;&lt;persistable path=&quot;/ShopmeCommon/src/main/java/com/shopme/ShopmeCommonApplication.java&quot;/>&#xD;&#xA;&lt;/file>&#xD;&#xA;&lt;file factoryID=&quot;org.eclipse.ui.part.FileEditorInputFactory&quot; id=&quot;org.eclipse.m2e.editor.MavenPomEditor&quot; name=&quot;pom.xml&quot; tooltip=&quot;ShopmeProject/ShopmeCommon/pom.xml&quot;>&#xD;&#xA;&lt;persistable path=&quot;/ShopmeProject/ShopmeCommon/pom.xml&quot;/>&#xD;&#xA;&lt;/file>&#xD;&#xA;&lt;/mruList>&#xD;&#xA;&lt;/workbench>"/>
+<application:Application xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:advanced="http://www.eclipse.org/ui/2010/UIModel/application/ui/advanced" xmlns:application="http://www.eclipse.org/ui/2010/UIModel/application" xmlns:basic="http://www.eclipse.org/ui/2010/UIModel/application/ui/basic" xmlns:menu="http://www.eclipse.org/ui/2010/UIModel/application/ui/menu" xmi:id="_ZFdcQarbEe2-M8nuGout-A" elementId="org.eclipse.e4.legacy.ide.application" contributorURI="platform:/plugin/org.eclipse.platform" selectedElement="_ZFeDUKrbEe2-M8nuGout-A" bindingContexts="_ZFeDWarbEe2-M8nuGout-A">
+  <persistedState key="memento" value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?>&#xD;&#xA;&lt;workbench>&#xD;&#xA;&lt;mruList>&#xD;&#xA;&lt;file factoryID=&quot;org.eclipse.ui.part.FileEditorInputFactory&quot; id=&quot;org.eclipse.wst.html.core.htmlsource.source&quot; name=&quot;fragments.html&quot; tooltip=&quot;ShopmeBackEnd/src/main/resources/templates/fragments.html&quot;>&#xD;&#xA;&lt;persistable path=&quot;/ShopmeBackEnd/src/main/resources/templates/fragments.html&quot;/>&#xD;&#xA;&lt;/file>&#xD;&#xA;&lt;file factoryID=&quot;org.eclipse.ui.part.FileEditorInputFactory&quot; id=&quot;org.eclipse.wst.html.core.htmlsource.source&quot; name=&quot;user_form.html&quot; tooltip=&quot;ShopmeBackEnd/src/main/resources/templates/users/user_form.html&quot;>&#xD;&#xA;&lt;persistable path=&quot;/ShopmeBackEnd/src/main/resources/templates/users/user_form.html&quot;/>&#xD;&#xA;&lt;/file>&#xD;&#xA;&lt;file factoryID=&quot;org.eclipse.ui.part.FileEditorInputFactory&quot; id=&quot;org.eclipse.jdt.ui.CompilationUnitEditor&quot; name=&quot;CategoryController.java&quot; tooltip=&quot;ShopmeBackEnd/src/main/java/com/shopme/admin/category/CategoryController.java&quot;>&#xD;&#xA;&lt;persistable path=&quot;/ShopmeBackEnd/src/main/java/com/shopme/admin/category/CategoryController.java&quot;/>&#xD;&#xA;&lt;/file>&#xD;&#xA;&lt;file factoryID=&quot;org.eclipse.ui.part.FileEditorInputFactory&quot; id=&quot;org.eclipse.wst.html.core.htmlsource.source&quot; name=&quot;category_form.html&quot; tooltip=&quot;ShopmeBackEnd/src/main/resources/templates/categories/category_form.html&quot;>&#xD;&#xA;&lt;persistable path=&quot;/ShopmeBackEnd/src/main/resources/templates/categories/category_form.html&quot;/>&#xD;&#xA;&lt;/file>&#xD;&#xA;&lt;file factoryID=&quot;org.eclipse.ui.part.FileEditorInputFactory&quot; id=&quot;org.eclipse.jdt.ui.CompilationUnitEditor&quot; name=&quot;Category.java&quot; tooltip=&quot;ShopmeCommon/src/main/java/com/shopme/common/entity/Category.java&quot;>&#xD;&#xA;&lt;persistable path=&quot;/ShopmeCommon/src/main/java/com/shopme/common/entity/Category.java&quot;/>&#xD;&#xA;&lt;/file>&#xD;&#xA;&lt;file factoryID=&quot;org.eclipse.jdt.ui.ClassFileEditorInputFactory&quot; id=&quot;org.eclipse.jdt.ui.ClassFileEditor&quot; name=&quot;Model.class&quot; tooltip=&quot;org.springframework.ui.Model&quot;>&#xD;&#xA;&lt;persistable org.eclipse.jdt.ui.ClassFileIdentifier=&quot;=ShopmeBackEnd/C:\/Users\/User\/.m2\/repository\/org\/springframework\/spring-context\/6.0.4\/spring-context-6.0.4.jar=/maven.pomderived=/true=/=/maven.groupId=/org.springframework=/=/maven.artifactId=/spring-context=/=/maven.version=/6.0.4=/=/maven.scope=/compile=/=/maven.pomderived=/true=/&amp;lt;org.springframework.ui(Model.class&quot;/>&#xD;&#xA;&lt;/file>&#xD;&#xA;&lt;file factoryID=&quot;org.eclipse.ui.part.FileEditorInputFactory&quot; id=&quot;org.eclipse.jdt.ui.CompilationUnitEditor&quot; name=&quot;CategoryNotFoundException.java&quot; tooltip=&quot;ShopmeBackEnd/src/main/java/com/shopme/admin/category/CategoryNotFoundException.java&quot;>&#xD;&#xA;&lt;persistable path=&quot;/ShopmeBackEnd/src/main/java/com/shopme/admin/category/CategoryNotFoundException.java&quot;/>&#xD;&#xA;&lt;/file>&#xD;&#xA;&lt;file factoryID=&quot;org.eclipse.ui.part.FileEditorInputFactory&quot; id=&quot;org.eclipse.jdt.ui.CompilationUnitEditor&quot; name=&quot;UserNotFoundException.java&quot; tooltip=&quot;ShopmeBackEnd/src/main/java/com/shopme/admin/user/UserNotFoundException.java&quot;>&#xD;&#xA;&lt;persistable path=&quot;/ShopmeBackEnd/src/main/java/com/shopme/admin/user/UserNotFoundException.java&quot;/>&#xD;&#xA;&lt;/file>&#xD;&#xA;&lt;file factoryID=&quot;org.eclipse.ui.part.FileEditorInputFactory&quot; id=&quot;org.eclipse.jdt.ui.CompilationUnitEditor&quot; name=&quot;MvcConfig.java&quot; tooltip=&quot;ShopmeBackEnd/src/main/java/com/shopme/admin/MvcConfig.java&quot;>&#xD;&#xA;&lt;persistable path=&quot;/ShopmeBackEnd/src/main/java/com/shopme/admin/MvcConfig.java&quot;/>&#xD;&#xA;&lt;/file>&#xD;&#xA;&lt;file factoryID=&quot;org.eclipse.ui.part.FileEditorInputFactory&quot; id=&quot;org.eclipse.jdt.ui.CompilationUnitEditor&quot; name=&quot;CategoryService.java&quot; tooltip=&quot;ShopmeBackEnd/src/main/java/com/shopme/admin/category/CategoryService.java&quot;>&#xD;&#xA;&lt;persistable path=&quot;/ShopmeBackEnd/src/main/java/com/shopme/admin/category/CategoryService.java&quot;/>&#xD;&#xA;&lt;/file>&#xD;&#xA;&lt;file factoryID=&quot;org.eclipse.ui.part.FileEditorInputFactory&quot; id=&quot;org.eclipse.jdt.ui.CompilationUnitEditor&quot; name=&quot;CategoryRepositoryTests.java&quot; tooltip=&quot;ShopmeBackEnd/src/test/java/com/shopme/admin/category/CategoryRepositoryTests.java&quot;>&#xD;&#xA;&lt;persistable path=&quot;/ShopmeBackEnd/src/test/java/com/shopme/admin/category/CategoryRepositoryTests.java&quot;/>&#xD;&#xA;&lt;/file>&#xD;&#xA;&lt;file factoryID=&quot;org.eclipse.ui.part.FileEditorInputFactory&quot; id=&quot;org.eclipse.ui.genericeditor.GenericEditor&quot; name=&quot;common_form.js&quot; tooltip=&quot;ShopmeBackEnd/src/main/resources/static/js/common_form.js&quot;>&#xD;&#xA;&lt;persistable path=&quot;/ShopmeBackEnd/src/main/resources/static/js/common_form.js&quot;/>&#xD;&#xA;&lt;/file>&#xD;&#xA;&lt;file factoryID=&quot;org.eclipse.ui.part.FileEditorInputFactory&quot; id=&quot;org.eclipse.ui.genericeditor.GenericEditor&quot; name=&quot;common.js&quot; tooltip=&quot;ShopmeBackEnd/src/main/resources/static/js/common.js&quot;>&#xD;&#xA;&lt;persistable path=&quot;/ShopmeBackEnd/src/main/resources/static/js/common.js&quot;/>&#xD;&#xA;&lt;/file>&#xD;&#xA;&lt;file factoryID=&quot;org.eclipse.ui.part.FileEditorInputFactory&quot; id=&quot;org.eclipse.wst.html.core.htmlsource.source&quot; name=&quot;categories.html&quot; tooltip=&quot;ShopmeBackEnd/src/main/resources/templates/categories/categories.html&quot;>&#xD;&#xA;&lt;persistable path=&quot;/ShopmeBackEnd/src/main/resources/templates/categories/categories.html&quot;/>&#xD;&#xA;&lt;/file>&#xD;&#xA;&lt;file factoryID=&quot;org.eclipse.ui.part.FileEditorInputFactory&quot; id=&quot;org.eclipse.wst.html.core.htmlsource.source&quot; name=&quot;users.html&quot; tooltip=&quot;ShopmeBackEnd/src/main/resources/templates/users/users.html&quot;>&#xD;&#xA;&lt;persistable path=&quot;/ShopmeBackEnd/src/main/resources/templates/users/users.html&quot;/>&#xD;&#xA;&lt;/file>&#xD;&#xA;&lt;file factoryID=&quot;org.eclipse.jdt.ui.ClassFileEditorInputFactory&quot; id=&quot;org.eclipse.jdt.ui.ClassFileEditor&quot; name=&quot;String.class&quot; tooltip=&quot;java.lang.String&quot;>&#xD;&#xA;&lt;persistable org.eclipse.jdt.ui.ClassFileIdentifier=&quot;=ShopmeBackEnd/C:\/Program Files\/Java\/STS4\/sts-4.17.2.RELEASE\/plugins\/org.eclipse.justj.openjdk.hotspot.jre.full.win32.x86_64_17.0.6.v20230125-1136\/jre\/lib\/jrt-fs.jar`java.base=/javadoc_location=/https:\/\/docs.oracle.com\/en\/java\/javase\/17\/docs\/api\/=/=/module=/true=/=/maven.pomderived=/true=/&amp;lt;java.lang(String.class&quot;/>&#xD;&#xA;&lt;/file>&#xD;&#xA;&lt;file factoryID=&quot;org.eclipse.ui.part.FileEditorInputFactory&quot; id=&quot;org.eclipse.jdt.ui.CompilationUnitEditor&quot; name=&quot;UserController.java&quot; tooltip=&quot;ShopmeBackEnd/src/main/java/com/shopme/admin/user/controller/UserController.java&quot;>&#xD;&#xA;&lt;persistable path=&quot;/ShopmeBackEnd/src/main/java/com/shopme/admin/user/controller/UserController.java&quot;/>&#xD;&#xA;&lt;/file>&#xD;&#xA;&lt;file factoryID=&quot;org.eclipse.ui.part.FileEditorInputFactory&quot; id=&quot;org.eclipse.wst.css.core.csssource.source&quot; name=&quot;style.css&quot; tooltip=&quot;ShopmeBackEnd/src/main/resources/static/style.css&quot;>&#xD;&#xA;&lt;persistable path=&quot;/ShopmeBackEnd/src/main/resources/static/style.css&quot;/>&#xD;&#xA;&lt;/file>&#xD;&#xA;&lt;file factoryID=&quot;org.eclipse.ui.part.FileEditorInputFactory&quot; id=&quot;org.eclipse.jdt.ui.CompilationUnitEditor&quot; name=&quot;WebSecurityConfig.java&quot; tooltip=&quot;ShopmeBackEnd/src/main/java/com/shopme/admin/security/WebSecurityConfig.java&quot;>&#xD;&#xA;&lt;persistable path=&quot;/ShopmeBackEnd/src/main/java/com/shopme/admin/security/WebSecurityConfig.java&quot;/>&#xD;&#xA;&lt;/file>&#xD;&#xA;&lt;file factoryID=&quot;org.eclipse.jdt.ui.ClassFileEditorInputFactory&quot; id=&quot;org.eclipse.jdt.ui.ClassFileEditor&quot; name=&quot;System.class&quot; tooltip=&quot;java.lang.System&quot;>&#xD;&#xA;&lt;persistable org.eclipse.jdt.ui.ClassFileIdentifier=&quot;=ShopmeBackEnd/C:\/Program Files\/Java\/STS4\/sts-4.17.2.RELEASE\/plugins\/org.eclipse.justj.openjdk.hotspot.jre.full.win32.x86_64_17.0.6.v20230125-1136\/jre\/lib\/jrt-fs.jar`java.base=/javadoc_location=/https:\/\/docs.oracle.com\/en\/java\/javase\/17\/docs\/api\/=/=/module=/true=/=/maven.pomderived=/true=/&amp;lt;java.lang(System.class&quot;/>&#xD;&#xA;&lt;/file>&#xD;&#xA;&lt;file factoryID=&quot;org.eclipse.jdt.ui.ClassFileEditorInputFactory&quot; id=&quot;org.eclipse.jdt.ui.ClassFileEditor&quot; name=&quot;CrudRepository.class&quot; tooltip=&quot;org.springframework.data.repository.CrudRepository&quot;>&#xD;&#xA;&lt;persistable org.eclipse.jdt.ui.ClassFileIdentifier=&quot;=ShopmeBackEnd/C:\/Users\/User\/.m2\/repository\/org\/springframework\/data\/spring-data-commons\/3.0.1\/spring-data-commons-3.0.1.jar=/maven.pomderived=/true=/=/maven.groupId=/org.springframework.data=/=/maven.artifactId=/spring-data-commons=/=/maven.version=/3.0.1=/=/maven.scope=/compile=/=/maven.pomderived=/true=/&amp;lt;org.springframework.data.repository(CrudRepository.class&quot;/>&#xD;&#xA;&lt;/file>&#xD;&#xA;&lt;file factoryID=&quot;org.eclipse.ui.part.FileEditorInputFactory&quot; id=&quot;org.eclipse.jdt.ui.CompilationUnitEditor&quot; name=&quot;PasswordEncoderTest.java&quot; tooltip=&quot;ShopmeBackEnd/src/test/java/com/shopme/admin/user/PasswordEncoderTest.java&quot;>&#xD;&#xA;&lt;persistable path=&quot;/ShopmeBackEnd/src/test/java/com/shopme/admin/user/PasswordEncoderTest.java&quot;/>&#xD;&#xA;&lt;/file>&#xD;&#xA;&lt;file factoryID=&quot;org.eclipse.ui.part.FileEditorInputFactory&quot; id=&quot;org.eclipse.jdt.ui.CompilationUnitEditor&quot; name=&quot;RoleRepositoryTests.java&quot; tooltip=&quot;ShopmeBackEnd/src/test/java/com/shopme/admin/user/RoleRepositoryTests.java&quot;>&#xD;&#xA;&lt;persistable path=&quot;/ShopmeBackEnd/src/test/java/com/shopme/admin/user/RoleRepositoryTests.java&quot;/>&#xD;&#xA;&lt;/file>&#xD;&#xA;&lt;file factoryID=&quot;org.eclipse.ui.part.FileEditorInputFactory&quot; id=&quot;org.eclipse.jdt.ui.CompilationUnitEditor&quot; name=&quot;UserRepositoryTests.java&quot; tooltip=&quot;ShopmeBackEnd/src/test/java/com/shopme/admin/user/UserRepositoryTests.java&quot;>&#xD;&#xA;&lt;persistable path=&quot;/ShopmeBackEnd/src/test/java/com/shopme/admin/user/UserRepositoryTests.java&quot;/>&#xD;&#xA;&lt;/file>&#xD;&#xA;&lt;file factoryID=&quot;org.eclipse.ui.part.FileEditorInputFactory&quot; id=&quot;SpringBootPropertyEditor&quot; name=&quot;application.properties&quot; tooltip=&quot;ShopmeBackEnd/src/main/resources/application.properties&quot;>&#xD;&#xA;&lt;persistable path=&quot;/ShopmeBackEnd/src/main/resources/application.properties&quot;/>&#xD;&#xA;&lt;/file>&#xD;&#xA;&lt;file factoryID=&quot;org.eclipse.ui.part.FileEditorInputFactory&quot; id=&quot;org.eclipse.jdt.ui.CompilationUnitEditor&quot; name=&quot;UserRepository.java&quot; tooltip=&quot;ShopmeBackEnd/src/main/java/com/shopme/admin/user/UserRepository.java&quot;>&#xD;&#xA;&lt;persistable path=&quot;/ShopmeBackEnd/src/main/java/com/shopme/admin/user/UserRepository.java&quot;/>&#xD;&#xA;&lt;/file>&#xD;&#xA;&lt;file factoryID=&quot;org.eclipse.ui.part.FileEditorInputFactory&quot; id=&quot;org.eclipse.jdt.ui.CompilationUnitEditor&quot; name=&quot;CategoryRepository.java&quot; tooltip=&quot;ShopmeBackEnd/src/main/java/com/shopme/admin/category/CategoryRepository.java&quot;>&#xD;&#xA;&lt;persistable path=&quot;/ShopmeBackEnd/src/main/java/com/shopme/admin/category/CategoryRepository.java&quot;/>&#xD;&#xA;&lt;/file>&#xD;&#xA;&lt;file factoryID=&quot;org.eclipse.ui.part.FileEditorInputFactory&quot; id=&quot;org.eclipse.jdt.ui.CompilationUnitEditor&quot; name=&quot;CatgoryRepository.java&quot; tooltip=&quot;ShopmeBackEnd/src/main/java/com/shopme/admin/category/CatgoryRepository.java&quot;>&#xD;&#xA;&lt;persistable path=&quot;/ShopmeBackEnd/src/main/java/com/shopme/admin/category/CatgoryRepository.java&quot;/>&#xD;&#xA;&lt;/file>&#xD;&#xA;&lt;file factoryID=&quot;org.eclipse.ui.part.FileEditorInputFactory&quot; id=&quot;org.eclipse.jdt.ui.CompilationUnitEditor&quot; name=&quot;Category.java&quot; tooltip=&quot;ShopmeBackEnd/src/main/java/com/shopme/admin/category/Category.java&quot;>&#xD;&#xA;&lt;persistable path=&quot;/ShopmeBackEnd/src/main/java/com/shopme/admin/category/Category.java&quot;/>&#xD;&#xA;&lt;/file>&#xD;&#xA;&lt;file factoryID=&quot;org.eclipse.jdt.ui.ClassFileEditorInputFactory&quot; id=&quot;org.eclipse.jdt.ui.ClassFileEditor&quot; name=&quot;OneToMany.class&quot; tooltip=&quot;jakarta.persistence.OneToMany&quot;>&#xD;&#xA;&lt;persistable org.eclipse.jdt.ui.ClassFileIdentifier=&quot;=ShopmeCommon/C:\/Users\/User\/.m2\/repository\/jakarta\/persistence\/jakarta.persistence-api\/3.1.0\/jakarta.persistence-api-3.1.0.jar=/maven.pomderived=/true=/=/maven.groupId=/jakarta.persistence=/=/maven.artifactId=/jakarta.persistence-api=/=/maven.version=/3.1.0=/=/maven.scope=/compile=/=/maven.pomderived=/true=/&amp;lt;jakarta.persistence(OneToMany.class&quot;/>&#xD;&#xA;&lt;/file>&#xD;&#xA;&lt;file factoryID=&quot;org.eclipse.ui.part.FileEditorInputFactory&quot; id=&quot;org.eclipse.jdt.ui.CompilationUnitEditor&quot; name=&quot;Role.java&quot; tooltip=&quot;ShopmeCommon/src/main/java/com/shopme/common/entity/Role.java&quot;>&#xD;&#xA;&lt;persistable path=&quot;/ShopmeCommon/src/main/java/com/shopme/common/entity/Role.java&quot;/>&#xD;&#xA;&lt;/file>&#xD;&#xA;&lt;file factoryID=&quot;org.eclipse.ui.part.FileEditorInputFactory&quot; id=&quot;org.eclipse.jdt.ui.CompilationUnitEditor&quot; name=&quot;User.java&quot; tooltip=&quot;ShopmeCommon/src/main/java/com/shopme/common/entity/User.java&quot;>&#xD;&#xA;&lt;persistable path=&quot;/ShopmeCommon/src/main/java/com/shopme/common/entity/User.java&quot;/>&#xD;&#xA;&lt;/file>&#xD;&#xA;&lt;file factoryID=&quot;org.eclipse.ui.part.FileEditorInputFactory&quot; id=&quot;org.eclipse.jdt.ui.CompilationUnitEditor&quot; name=&quot;FileUploadUtil.java&quot; tooltip=&quot;ShopmeBackEnd/src/main/java/com/shopme/admin/FileUploadUtil.java&quot;>&#xD;&#xA;&lt;persistable path=&quot;/ShopmeBackEnd/src/main/java/com/shopme/admin/FileUploadUtil.java&quot;/>&#xD;&#xA;&lt;/file>&#xD;&#xA;&lt;file factoryID=&quot;org.eclipse.ui.part.FileEditorInputFactory&quot; id=&quot;org.eclipse.jdt.ui.ClassFileEditor&quot; name=&quot;FileUploadUtil.class&quot; tooltip=&quot;ShopmeWebParent/ShopmeBackEnd/target/classes/com/shopme/admin/FileUploadUtil.class&quot;>&#xD;&#xA;&lt;persistable path=&quot;/ShopmeWebParent/ShopmeBackEnd/target/classes/com/shopme/admin/FileUploadUtil.class&quot;/>&#xD;&#xA;&lt;/file>&#xD;&#xA;&lt;file factoryID=&quot;org.eclipse.ui.part.FileEditorInputFactory&quot; id=&quot;org.eclipse.jdt.ui.ClassFileEditor&quot; name=&quot;FileUploadUtil.class&quot; tooltip=&quot;ShopmeProject/ShopmeWebParent/ShopmeBackEnd/target/classes/com/shopme/admin/FileUploadUtil.class&quot;>&#xD;&#xA;&lt;persistable path=&quot;/ShopmeProject/ShopmeWebParent/ShopmeBackEnd/target/classes/com/shopme/admin/FileUploadUtil.class&quot;/>&#xD;&#xA;&lt;/file>&#xD;&#xA;&lt;file factoryID=&quot;org.eclipse.ui.part.FileEditorInputFactory&quot; id=&quot;org.eclipse.wst.html.core.htmlsource.source&quot; name=&quot;500.html&quot; tooltip=&quot;ShopmeBackEnd/src/main/resources/templates/error/500.html&quot;>&#xD;&#xA;&lt;persistable path=&quot;/ShopmeBackEnd/src/main/resources/templates/error/500.html&quot;/>&#xD;&#xA;&lt;/file>&#xD;&#xA;&lt;file factoryID=&quot;org.eclipse.ui.part.FileEditorInputFactory&quot; id=&quot;org.eclipse.wst.html.core.htmlsource.source&quot; name=&quot;403.html&quot; tooltip=&quot;ShopmeBackEnd/src/main/resources/templates/error/403.html&quot;>&#xD;&#xA;&lt;persistable path=&quot;/ShopmeBackEnd/src/main/resources/templates/error/403.html&quot;/>&#xD;&#xA;&lt;/file>&#xD;&#xA;&lt;file factoryID=&quot;org.eclipse.ui.part.FileEditorInputFactory&quot; id=&quot;org.eclipse.wst.html.core.htmlsource.source&quot; name=&quot;error.html&quot; tooltip=&quot;ShopmeBackEnd/src/main/resources/templates/error.html&quot;>&#xD;&#xA;&lt;persistable path=&quot;/ShopmeBackEnd/src/main/resources/templates/error.html&quot;/>&#xD;&#xA;&lt;/file>&#xD;&#xA;&lt;file factoryID=&quot;org.eclipse.ui.part.FileEditorInputFactory&quot; id=&quot;org.eclipse.wst.html.core.htmlsource.source&quot; name=&quot;404.html&quot; tooltip=&quot;ShopmeBackEnd/src/main/resources/templates/error/404.html&quot;>&#xD;&#xA;&lt;persistable path=&quot;/ShopmeBackEnd/src/main/resources/templates/error/404.html&quot;/>&#xD;&#xA;&lt;/file>&#xD;&#xA;&lt;file factoryID=&quot;org.eclipse.ui.part.FileEditorInputFactory&quot; id=&quot;org.eclipse.wst.html.core.htmlsource.source&quot; name=&quot;index.html&quot; tooltip=&quot;ShopmeBackEnd/src/main/resources/templates/index.html&quot;>&#xD;&#xA;&lt;persistable path=&quot;/ShopmeBackEnd/src/main/resources/templates/index.html&quot;/>&#xD;&#xA;&lt;/file>&#xD;&#xA;&lt;file factoryID=&quot;org.eclipse.ui.part.FileEditorInputFactory&quot; id=&quot;org.eclipse.wst.html.core.htmlsource.source&quot; name=&quot;account_form.html&quot; tooltip=&quot;ShopmeBackEnd/src/main/resources/templates/users/account_form.html&quot;>&#xD;&#xA;&lt;persistable path=&quot;/ShopmeBackEnd/src/main/resources/templates/users/account_form.html&quot;/>&#xD;&#xA;&lt;/file>&#xD;&#xA;&lt;file factoryID=&quot;org.eclipse.ui.part.FileEditorInputFactory&quot; id=&quot;org.eclipse.jdt.ui.CompilationUnitEditor&quot; name=&quot;AccountController.java&quot; tooltip=&quot;ShopmeBackEnd/src/main/java/com/shopme/admin/user/controller/AccountController.java&quot;>&#xD;&#xA;&lt;persistable path=&quot;/ShopmeBackEnd/src/main/java/com/shopme/admin/user/controller/AccountController.java&quot;/>&#xD;&#xA;&lt;/file>&#xD;&#xA;&lt;file factoryID=&quot;org.eclipse.ui.part.FileEditorInputFactory&quot; id=&quot;org.eclipse.wst.html.core.htmlsource.source&quot; name=&quot;navigation.html&quot; tooltip=&quot;ShopmeBackEnd/src/main/resources/templates/navigation.html&quot;>&#xD;&#xA;&lt;persistable path=&quot;/ShopmeBackEnd/src/main/resources/templates/navigation.html&quot;/>&#xD;&#xA;&lt;/file>&#xD;&#xA;&lt;file factoryID=&quot;org.eclipse.ui.part.FileEditorInputFactory&quot; id=&quot;org.eclipse.jdt.ui.CompilationUnitEditor&quot; name=&quot;UserService.java&quot; tooltip=&quot;ShopmeBackEnd/src/main/java/com/shopme/admin/user/UserService.java&quot;>&#xD;&#xA;&lt;persistable path=&quot;/ShopmeBackEnd/src/main/java/com/shopme/admin/user/UserService.java&quot;/>&#xD;&#xA;&lt;/file>&#xD;&#xA;&lt;file factoryID=&quot;org.eclipse.ui.part.FileEditorInputFactory&quot; id=&quot;org.eclipse.jdt.ui.CompilationUnitEditor&quot; name=&quot;ShopmeUserDetailsService.java&quot; tooltip=&quot;ShopmeBackEnd/src/main/java/com/shopme/admin/security/ShopmeUserDetailsService.java&quot;>&#xD;&#xA;&lt;persistable path=&quot;/ShopmeBackEnd/src/main/java/com/shopme/admin/security/ShopmeUserDetailsService.java&quot;/>&#xD;&#xA;&lt;/file>&#xD;&#xA;&lt;file factoryID=&quot;org.eclipse.ui.part.FileEditorInputFactory&quot; id=&quot;org.eclipse.jdt.ui.CompilationUnitEditor&quot; name=&quot;ShopmeUserDetails.java&quot; tooltip=&quot;ShopmeBackEnd/src/main/java/com/shopme/admin/security/ShopmeUserDetails.java&quot;>&#xD;&#xA;&lt;persistable path=&quot;/ShopmeBackEnd/src/main/java/com/shopme/admin/security/ShopmeUserDetails.java&quot;/>&#xD;&#xA;&lt;/file>&#xD;&#xA;&lt;file factoryID=&quot;org.eclipse.ui.part.FileEditorInputFactory&quot; id=&quot;org.eclipse.wst.html.core.htmlsource.source&quot; name=&quot;users.html&quot; tooltip=&quot;ShopmeBackEnd/src/main/resources/templates/users.html&quot;>&#xD;&#xA;&lt;persistable path=&quot;/ShopmeBackEnd/src/main/resources/templates/users.html&quot;/>&#xD;&#xA;&lt;/file>&#xD;&#xA;&lt;file factoryID=&quot;org.eclipse.ui.part.FileEditorInputFactory&quot; id=&quot;org.eclipse.jdt.ui.CompilationUnitEditor&quot; name=&quot;AccountController.java&quot; tooltip=&quot;ShopmeBackEnd/src/main/java/com/shopme/admin/user/AccountController.java&quot;>&#xD;&#xA;&lt;persistable path=&quot;/ShopmeBackEnd/src/main/java/com/shopme/admin/user/AccountController.java&quot;/>&#xD;&#xA;&lt;/file>&#xD;&#xA;&lt;file factoryID=&quot;org.eclipse.ui.part.FileEditorInputFactory&quot; id=&quot;org.eclipse.jdt.ui.CompilationUnitEditor&quot; name=&quot;UserController.java&quot; tooltip=&quot;ShopmeBackEnd/src/main/java/com/shopme/admin/user/UserController.java&quot;>&#xD;&#xA;&lt;persistable path=&quot;/ShopmeBackEnd/src/main/java/com/shopme/admin/user/UserController.java&quot;/>&#xD;&#xA;&lt;/file>&#xD;&#xA;&lt;file factoryID=&quot;org.eclipse.ui.part.FileEditorInputFactory&quot; id=&quot;org.eclipse.wst.html.core.htmlsource.source&quot; name=&quot;account_form.html&quot; tooltip=&quot;ShopmeBackEnd/src/main/resources/templates/account_form.html&quot;>&#xD;&#xA;&lt;persistable path=&quot;/ShopmeBackEnd/src/main/resources/templates/account_form.html&quot;/>&#xD;&#xA;&lt;/file>&#xD;&#xA;&lt;file factoryID=&quot;org.eclipse.ui.part.FileEditorInputFactory&quot; id=&quot;org.eclipse.jdt.ui.CompilationUnitEditor&quot; name=&quot;UserCsvExporter.java&quot; tooltip=&quot;ShopmeBackEnd/src/main/java/com/shopme/admin/user/UserCsvExporter.java&quot;>&#xD;&#xA;&lt;persistable path=&quot;/ShopmeBackEnd/src/main/java/com/shopme/admin/user/UserCsvExporter.java&quot;/>&#xD;&#xA;&lt;/file>&#xD;&#xA;&lt;file factoryID=&quot;org.eclipse.ui.part.FileEditorInputFactory&quot; id=&quot;org.eclipse.wst.html.core.htmlsource.source&quot; name=&quot;user_form.html&quot; tooltip=&quot;ShopmeBackEnd/src/main/resources/templates/user_form.html&quot;>&#xD;&#xA;&lt;persistable path=&quot;/ShopmeBackEnd/src/main/resources/templates/user_form.html&quot;/>&#xD;&#xA;&lt;/file>&#xD;&#xA;&lt;file factoryID=&quot;org.eclipse.jdt.ui.ClassFileEditorInputFactory&quot; id=&quot;org.eclipse.jdt.ui.ClassFileEditor&quot; name=&quot;HttpSecurity.class&quot; tooltip=&quot;org.springframework.security.config.annotation.web.builders.HttpSecurity&quot;>&#xD;&#xA;&lt;persistable org.eclipse.jdt.ui.ClassFileIdentifier=&quot;=ShopmeBackEnd/C:\/Users\/User\/.m2\/repository\/org\/springframework\/security\/spring-security-config\/6.0.1\/spring-security-config-6.0.1.jar=/maven.pomderived=/true=/=/maven.groupId=/org.springframework.security=/=/maven.artifactId=/spring-security-config=/=/maven.version=/6.0.1=/=/maven.scope=/compile=/=/maven.pomderived=/true=/&amp;lt;org.springframework.security.config.annotation.web.builders(HttpSecurity.class&quot;/>&#xD;&#xA;&lt;/file>&#xD;&#xA;&lt;file factoryID=&quot;org.eclipse.ui.part.FileEditorInputFactory&quot; id=&quot;org.eclipse.m2e.editor.MavenPomEditor&quot; name=&quot;pom.xml&quot; tooltip=&quot;ShopmeWebParent/pom.xml&quot;>&#xD;&#xA;&lt;persistable path=&quot;/ShopmeWebParent/pom.xml&quot;/>&#xD;&#xA;&lt;/file>&#xD;&#xA;&lt;file factoryID=&quot;org.eclipse.ui.part.FileEditorInputFactory&quot; id=&quot;org.eclipse.m2e.editor.MavenPomEditor&quot; name=&quot;pom.xml&quot; tooltip=&quot;ShopmeBackEnd/pom.xml&quot;>&#xD;&#xA;&lt;persistable path=&quot;/ShopmeBackEnd/pom.xml&quot;/>&#xD;&#xA;&lt;/file>&#xD;&#xA;&lt;file factoryID=&quot;org.eclipse.ui.part.FileEditorInputFactory&quot; id=&quot;org.eclipse.jdt.ui.ClassFileEditor&quot; name=&quot;User.class&quot; tooltip=&quot;ShopmeProject/ShopmeCommon/target/classes/com/shopme/common/entity/User.class&quot;>&#xD;&#xA;&lt;persistable path=&quot;/ShopmeProject/ShopmeCommon/target/classes/com/shopme/common/entity/User.class&quot;/>&#xD;&#xA;&lt;/file>&#xD;&#xA;&lt;file factoryID=&quot;org.eclipse.jdt.ui.ClassFileEditorInputFactory&quot; id=&quot;org.eclipse.jdt.ui.ClassFileEditor&quot; name=&quot;SimpleGrantedAuthority.class&quot; tooltip=&quot;org.springframework.security.core.authority.SimpleGrantedAuthority&quot;>&#xD;&#xA;&lt;persistable org.eclipse.jdt.ui.ClassFileIdentifier=&quot;=ShopmeBackEnd/C:\/Users\/User\/.m2\/repository\/org\/springframework\/security\/spring-security-core\/6.0.1\/spring-security-core-6.0.1.jar=/maven.pomderived=/true=/=/maven.groupId=/org.springframework.security=/=/maven.artifactId=/spring-security-core=/=/maven.version=/6.0.1=/=/maven.scope=/compile=/=/maven.pomderived=/true=/&amp;lt;org.springframework.security.core.authority(SimpleGrantedAuthority.class&quot;/>&#xD;&#xA;&lt;/file>&#xD;&#xA;&lt;file factoryID=&quot;org.eclipse.ui.part.FileEditorInputFactory&quot; id=&quot;org.eclipse.jdt.ui.CompilationUnitEditor&quot; name=&quot;MainController.java&quot; tooltip=&quot;ShopmeBackEnd/src/main/java/com/shopme/admin/MainController.java&quot;>&#xD;&#xA;&lt;persistable path=&quot;/ShopmeBackEnd/src/main/java/com/shopme/admin/MainController.java&quot;/>&#xD;&#xA;&lt;/file>&#xD;&#xA;&lt;file factoryID=&quot;org.eclipse.ui.part.FileEditorInputFactory&quot; id=&quot;org.eclipse.wst.html.core.htmlsource.source&quot; name=&quot;login.html&quot; tooltip=&quot;ShopmeBackEnd/src/main/resources/templates/login.html&quot;>&#xD;&#xA;&lt;persistable path=&quot;/ShopmeBackEnd/src/main/resources/templates/login.html&quot;/>&#xD;&#xA;&lt;/file>&#xD;&#xA;&lt;file factoryID=&quot;org.eclipse.ui.part.FileEditorInputFactory&quot; id=&quot;org.eclipse.jdt.ui.ClassFileEditor&quot; name=&quot;UserRepository.class&quot; tooltip=&quot;ShopmeProject/ShopmeWebParent/ShopmeBackEnd/target/classes/com/shopme/admin/user/UserRepository.class&quot;>&#xD;&#xA;&lt;persistable path=&quot;/ShopmeProject/ShopmeWebParent/ShopmeBackEnd/target/classes/com/shopme/admin/user/UserRepository.class&quot;/>&#xD;&#xA;&lt;/file>&#xD;&#xA;&lt;file factoryID=&quot;org.eclipse.ui.part.FileEditorInputFactory&quot; id=&quot;org.eclipse.jdt.ui.CompilationUnitEditor&quot; name=&quot;UserExcelExporter.java&quot; tooltip=&quot;ShopmeBackEnd/src/main/java/com/shopme/admin/user/UserExcelExporter.java&quot;>&#xD;&#xA;&lt;persistable path=&quot;/ShopmeBackEnd/src/main/java/com/shopme/admin/user/UserExcelExporter.java&quot;/>&#xD;&#xA;&lt;/file>&#xD;&#xA;&lt;file factoryID=&quot;org.eclipse.ui.part.FileEditorInputFactory&quot; id=&quot;org.eclipse.jdt.ui.CompilationUnitEditor&quot; name=&quot;AbstractExporter.java&quot; tooltip=&quot;ShopmeBackEnd/src/main/java/com/shopme/admin/user/AbstractExporter.java&quot;>&#xD;&#xA;&lt;persistable path=&quot;/ShopmeBackEnd/src/main/java/com/shopme/admin/user/AbstractExporter.java&quot;/>&#xD;&#xA;&lt;/file>&#xD;&#xA;&lt;file factoryID=&quot;org.eclipse.jdt.ui.ClassFileEditorInputFactory&quot; id=&quot;org.eclipse.jdt.ui.ClassFileEditor&quot; name=&quot;SimpleDateFormat.class&quot; tooltip=&quot;java.text.SimpleDateFormat&quot;>&#xD;&#xA;&lt;persistable org.eclipse.jdt.ui.ClassFileIdentifier=&quot;=ShopmeBackEnd/C:\/Program Files\/Java\/STS4\/sts-4.17.2.RELEASE\/plugins\/org.eclipse.justj.openjdk.hotspot.jre.full.win32.x86_64_17.0.6.v20230125-1136\/jre\/lib\/jrt-fs.jar`java.base=/javadoc_location=/https:\/\/docs.oracle.com\/en\/java\/javase\/17\/docs\/api\/=/=/maven.pomderived=/true=/&amp;lt;java.text(SimpleDateFormat.class&quot;/>&#xD;&#xA;&lt;/file>&#xD;&#xA;&lt;file factoryID=&quot;org.eclipse.jdt.ui.ClassFileEditorInputFactory&quot; id=&quot;org.eclipse.jdt.ui.ClassFileEditor&quot; name=&quot;DateFormat.class&quot; tooltip=&quot;java.text.DateFormat&quot;>&#xD;&#xA;&lt;persistable org.eclipse.jdt.ui.ClassFileIdentifier=&quot;=ShopmeBackEnd/C:\/Program Files\/Java\/STS4\/sts-4.17.2.RELEASE\/plugins\/org.eclipse.justj.openjdk.hotspot.jre.full.win32.x86_64_17.0.6.v20230125-1136\/jre\/lib\/jrt-fs.jar`java.base=/javadoc_location=/https:\/\/docs.oracle.com\/en\/java\/javase\/17\/docs\/api\/=/=/maven.pomderived=/true=/&amp;lt;java.text(DateFormat.class&quot;/>&#xD;&#xA;&lt;/file>&#xD;&#xA;&lt;file factoryID=&quot;org.eclipse.jdt.ui.ClassFileEditorInputFactory&quot; id=&quot;org.eclipse.jdt.ui.ClassFileEditor&quot; name=&quot;Iterable.class&quot; tooltip=&quot;java.lang.Iterable&quot;>&#xD;&#xA;&lt;persistable org.eclipse.jdt.ui.ClassFileIdentifier=&quot;=ShopmeBackEnd/C:\/Program Files\/Java\/STS4\/sts-4.17.2.RELEASE\/plugins\/org.eclipse.justj.openjdk.hotspot.jre.full.win32.x86_64_17.0.6.v20230125-1136\/jre\/lib\/jrt-fs.jar`java.base=/javadoc_location=/https:\/\/docs.oracle.com\/en\/java\/javase\/17\/docs\/api\/=/=/maven.pomderived=/true=/&amp;lt;java.lang(Iterable.class&quot;/>&#xD;&#xA;&lt;/file>&#xD;&#xA;&lt;file factoryID=&quot;org.eclipse.jdt.ui.ClassFileEditorInputFactory&quot; id=&quot;org.eclipse.jdt.ui.ClassFileEditor&quot; name=&quot;PagingAndSortingRepository.class&quot; tooltip=&quot;org.springframework.data.repository.PagingAndSortingRepository&quot;>&#xD;&#xA;&lt;persistable org.eclipse.jdt.ui.ClassFileIdentifier=&quot;=ShopmeBackEnd/C:\/Users\/User\/.m2\/repository\/org\/springframework\/data\/spring-data-commons\/3.0.1\/spring-data-commons-3.0.1.jar=/maven.pomderived=/true=/=/maven.groupId=/org.springframework.data=/=/maven.artifactId=/spring-data-commons=/=/maven.version=/3.0.1=/=/maven.scope=/compile=/=/maven.pomderived=/true=/&amp;lt;org.springframework.data.repository(PagingAndSortingRepository.class&quot;/>&#xD;&#xA;&lt;/file>&#xD;&#xA;&lt;file factoryID=&quot;org.eclipse.jdt.ui.ClassFileEditorInputFactory&quot; id=&quot;org.eclipse.jdt.ui.ClassFileEditor&quot; name=&quot;ResourceHandlerRegistration.class&quot; tooltip=&quot;org.springframework.web.servlet.config.annotation.ResourceHandlerRegistration&quot;>&#xD;&#xA;&lt;persistable org.eclipse.jdt.ui.ClassFileIdentifier=&quot;=ShopmeBackEnd/C:\/Users\/User\/.m2\/repository\/org\/springframework\/spring-webmvc\/6.0.4\/spring-webmvc-6.0.4.jar=/maven.pomderived=/true=/=/maven.groupId=/org.springframework=/=/maven.artifactId=/spring-webmvc=/=/maven.version=/6.0.4=/=/maven.scope=/compile=/=/maven.pomderived=/true=/&amp;lt;org.springframework.web.servlet.config.annotation(ResourceHandlerRegistration.class&quot;/>&#xD;&#xA;&lt;/file>&#xD;&#xA;&lt;file factoryID=&quot;org.eclipse.jdt.ui.ClassFileEditorInputFactory&quot; id=&quot;org.eclipse.jdt.ui.ClassFileEditor&quot; name=&quot;IOException.class&quot; tooltip=&quot;java.io.IOException&quot;>&#xD;&#xA;&lt;persistable org.eclipse.jdt.ui.ClassFileIdentifier=&quot;=ShopmeBackEnd/C:\/Program Files\/Java\/STS4\/sts-4.17.2.RELEASE\/plugins\/org.eclipse.justj.openjdk.hotspot.jre.full.win32.x86_64_17.0.6.v20230125-1136\/jre\/lib\/jrt-fs.jar`java.base=/javadoc_location=/https:\/\/docs.oracle.com\/en\/java\/javase\/17\/docs\/api\/=/=/maven.pomderived=/true=/&amp;lt;java.io(IOException.class&quot;/>&#xD;&#xA;&lt;/file>&#xD;&#xA;&lt;file factoryID=&quot;org.eclipse.jdt.ui.ClassFileEditorInputFactory&quot; id=&quot;org.eclipse.jdt.ui.ClassFileEditor&quot; name=&quot;Service.class&quot; tooltip=&quot;org.springframework.stereotype.Service&quot;>&#xD;&#xA;&lt;persistable org.eclipse.jdt.ui.ClassFileIdentifier=&quot;=ShopmeBackEnd/C:\/Users\/User\/.m2\/repository\/org\/springframework\/spring-context\/6.0.4\/spring-context-6.0.4.jar=/maven.pomderived=/true=/=/maven.groupId=/org.springframework=/=/maven.artifactId=/spring-context=/=/maven.version=/6.0.4=/=/maven.scope=/compile=/=/maven.pomderived=/true=/&amp;lt;org.springframework.stereotype(Service.class&quot;/>&#xD;&#xA;&lt;/file>&#xD;&#xA;&lt;file factoryID=&quot;org.eclipse.ui.part.FileEditorInputFactory&quot; id=&quot;org.eclipse.jdt.ui.CompilationUnitEditor&quot; name=&quot;UserRestController.java&quot; tooltip=&quot;ShopmeBackEnd/src/main/java/com/shopme/admin/user/UserRestController.java&quot;>&#xD;&#xA;&lt;persistable path=&quot;/ShopmeBackEnd/src/main/java/com/shopme/admin/user/UserRestController.java&quot;/>&#xD;&#xA;&lt;/file>&#xD;&#xA;&lt;file factoryID=&quot;org.eclipse.ui.part.FileEditorInputFactory&quot; id=&quot;org.eclipse.jdt.ui.CompilationUnitEditor&quot; name=&quot;UserRestController.java&quot; tooltip=&quot;ShopmeBackEnd/src/test/java/com/shopme/admin/user/UserRestController.java&quot;>&#xD;&#xA;&lt;persistable path=&quot;/ShopmeBackEnd/src/test/java/com/shopme/admin/user/UserRestController.java&quot;/>&#xD;&#xA;&lt;/file>&#xD;&#xA;&lt;file factoryID=&quot;org.eclipse.jdt.ui.ClassFileEditorInputFactory&quot; id=&quot;org.eclipse.jdt.ui.ClassFileEditor&quot; name=&quot;InputMismatchException.class&quot; tooltip=&quot;java.util.InputMismatchException&quot;>&#xD;&#xA;&lt;persistable org.eclipse.jdt.ui.ClassFileIdentifier=&quot;=ShopmeBackEnd/C:\/Program Files\/Java\/STS4\/sts-4.17.2.RELEASE\/plugins\/org.eclipse.justj.openjdk.hotspot.jre.full.win32.x86_64_17.0.6.v20230125-1136\/jre\/lib\/jrt-fs.jar`java.base=/javadoc_location=/https:\/\/docs.oracle.com\/en\/java\/javase\/17\/docs\/api\/=/=/maven.pomderived=/true=/&amp;lt;java.util(InputMismatchException.class&quot;/>&#xD;&#xA;&lt;/file>&#xD;&#xA;&lt;file factoryID=&quot;org.eclipse.jdt.ui.ClassFileEditorInputFactory&quot; id=&quot;org.eclipse.jdt.ui.ClassFileEditor&quot; name=&quot;PasswordEncoder.class&quot; tooltip=&quot;org.springframework.security.crypto.password.PasswordEncoder&quot;>&#xD;&#xA;&lt;persistable org.eclipse.jdt.ui.ClassFileIdentifier=&quot;=ShopmeBackEnd/C:\/Users\/User\/.m2\/repository\/org\/springframework\/security\/spring-security-crypto\/6.0.1\/spring-security-crypto-6.0.1.jar=/maven.pomderived=/true=/=/maven.groupId=/org.springframework.security=/=/maven.artifactId=/spring-security-crypto=/=/maven.version=/6.0.1=/=/maven.scope=/compile=/=/maven.pomderived=/true=/&amp;lt;org.springframework.security.crypto.password(PasswordEncoder.class&quot;/>&#xD;&#xA;&lt;/file>&#xD;&#xA;&lt;file factoryID=&quot;org.eclipse.ui.part.FileEditorInputFactory&quot; id=&quot;org.eclipse.jdt.ui.CompilationUnitEditor&quot; name=&quot;RoleRepository.java&quot; tooltip=&quot;ShopmeBackEnd/src/main/java/com/shopme/admin/user/RoleRepository.java&quot;>&#xD;&#xA;&lt;persistable path=&quot;/ShopmeBackEnd/src/main/java/com/shopme/admin/user/RoleRepository.java&quot;/>&#xD;&#xA;&lt;/file>&#xD;&#xA;&lt;file factoryID=&quot;org.eclipse.jdt.ui.ClassFileEditorInputFactory&quot; id=&quot;org.eclipse.jdt.ui.ClassFileEditor&quot; name=&quot;List.class&quot; tooltip=&quot;java.util.List&quot;>&#xD;&#xA;&lt;persistable org.eclipse.jdt.ui.ClassFileIdentifier=&quot;=ShopmeBackEnd/C:\/Program Files\/Java\/STS4\/sts-4.17.2.RELEASE\/plugins\/org.eclipse.justj.openjdk.hotspot.jre.full.win32.x86_64_17.0.6.v20230125-1136\/jre\/lib\/jrt-fs.jar`java.base=/javadoc_location=/https:\/\/docs.oracle.com\/en\/java\/javase\/17\/docs\/api\/=/=/maven.pomderived=/true=/&amp;lt;java.util(List.class&quot;/>&#xD;&#xA;&lt;/file>&#xD;&#xA;&lt;file factoryID=&quot;org.eclipse.ui.part.FileEditorInputFactory&quot; id=&quot;org.eclipse.m2e.editor.MavenPomEditor&quot; name=&quot;pom.xml&quot; tooltip=&quot;ShopmeProject/pom.xml&quot;>&#xD;&#xA;&lt;persistable path=&quot;/ShopmeProject/pom.xml&quot;/>&#xD;&#xA;&lt;/file>&#xD;&#xA;&lt;file factoryID=&quot;org.eclipse.ui.part.FileEditorInputFactory&quot; id=&quot;org.eclipse.m2e.editor.MavenPomEditor&quot; name=&quot;pom.xml&quot; tooltip=&quot;ShopmeCommon/pom.xml&quot;>&#xD;&#xA;&lt;persistable path=&quot;/ShopmeCommon/pom.xml&quot;/>&#xD;&#xA;&lt;/file>&#xD;&#xA;&lt;file factoryID=&quot;org.eclipse.jdt.ui.ClassFileEditorInputFactory&quot; id=&quot;org.eclipse.jdt.ui.ClassFileEditor&quot; name=&quot;AutoConfigureTestDatabase.class&quot; tooltip=&quot;org.springframework.boot.test.autoconfigure.jdbc.AutoConfigureTestDatabase&quot;>&#xD;&#xA;&lt;persistable org.eclipse.jdt.ui.ClassFileIdentifier=&quot;=ShopmeBackEnd/C:\/Users\/User\/.m2\/repository\/org\/springframework\/boot\/spring-boot-test-autoconfigure\/3.0.2\/spring-boot-test-autoconfigure-3.0.2.jar=/maven.pomderived=/true=/=/test=/true=/=/maven.groupId=/org.springframework.boot=/=/maven.artifactId=/spring-boot-test-autoconfigure=/=/maven.version=/3.0.2=/=/maven.scope=/test=/=/maven.pomderived=/true=/&amp;lt;org.springframework.boot.test.autoconfigure.jdbc(AutoConfigureTestDatabase.class&quot;/>&#xD;&#xA;&lt;/file>&#xD;&#xA;&lt;file factoryID=&quot;org.eclipse.jdt.ui.ClassFileEditorInputFactory&quot; id=&quot;org.eclipse.jdt.ui.ClassFileEditor&quot; name=&quot;Set.class&quot; tooltip=&quot;java.util.Set&quot;>&#xD;&#xA;&lt;persistable org.eclipse.jdt.ui.ClassFileIdentifier=&quot;=ShopmeCommon/C:\/Program Files\/Java\/STS4\/sts-4.17.2.RELEASE\/plugins\/org.eclipse.justj.openjdk.hotspot.jre.full.win32.x86_64_17.0.6.v20230125-1136\/jre\/lib\/jrt-fs.jar`java.base=/javadoc_location=/https:\/\/docs.oracle.com\/en\/java\/javase\/17\/docs\/api\/=/=/maven.pomderived=/true=/&amp;lt;java.util(Set.class&quot;/>&#xD;&#xA;&lt;/file>&#xD;&#xA;&lt;file factoryID=&quot;org.eclipse.ui.part.FileEditorInputFactory&quot; id=&quot;org.eclipse.jdt.ui.CompilationUnitEditor&quot; name=&quot;ShopmeBackEndApplication.java&quot; tooltip=&quot;ShopmeBackEnd/src/main/java/com/shopme/admin/ShopmeBackEndApplication.java&quot;>&#xD;&#xA;&lt;persistable path=&quot;/ShopmeBackEnd/src/main/java/com/shopme/admin/ShopmeBackEndApplication.java&quot;/>&#xD;&#xA;&lt;/file>&#xD;&#xA;&lt;file factoryID=&quot;org.eclipse.ui.part.FileEditorInputFactory&quot; id=&quot;org.eclipse.m2e.editor.MavenPomEditor&quot; name=&quot;pom.xml&quot; tooltip=&quot;ShopmeFrontEnd/pom.xml&quot;>&#xD;&#xA;&lt;persistable path=&quot;/ShopmeFrontEnd/pom.xml&quot;/>&#xD;&#xA;&lt;/file>&#xD;&#xA;&lt;file factoryID=&quot;org.eclipse.ui.ide.FileStoreEditorInputFactory&quot; id=&quot;org.eclipse.m2e.editor.MavenPomEditor&quot; name=&quot;jquery-3.4.1.pom&quot; tooltip=&quot;C:\Users\User\.m2\repository\org\webjars\jquery\3.4.1\jquery-3.4.1.pom&quot;>&#xD;&#xA;&lt;persistable uri=&quot;file:/C:/Users/User/.m2/repository/org/webjars/jquery/3.4.1/jquery-3.4.1.pom&quot;/>&#xD;&#xA;&lt;/file>&#xD;&#xA;&lt;file factoryID=&quot;org.eclipse.ui.part.FileEditorInputFactory&quot; id=&quot;org.eclipse.jdt.ui.CompilationUnitEditor&quot; name=&quot;MainController.java&quot; tooltip=&quot;ShopmeFrontEnd/src/main/java/com/shopme/site/MainController.java&quot;>&#xD;&#xA;&lt;persistable path=&quot;/ShopmeFrontEnd/src/main/java/com/shopme/site/MainController.java&quot;/>&#xD;&#xA;&lt;/file>&#xD;&#xA;&lt;file factoryID=&quot;org.eclipse.ui.part.FileEditorInputFactory&quot; id=&quot;org.eclipse.ui.genericeditor.GenericEditor&quot; name=&quot;index.html&quot; tooltip=&quot;ShopmeFrontEnd/src/main/resources/templates/index.html&quot;>&#xD;&#xA;&lt;persistable path=&quot;/ShopmeFrontEnd/src/main/resources/templates/index.html&quot;/>&#xD;&#xA;&lt;/file>&#xD;&#xA;&lt;file factoryID=&quot;org.eclipse.ui.part.FileEditorInputFactory&quot; id=&quot;SpringBootPropertyEditor&quot; name=&quot;application.properties&quot; tooltip=&quot;ShopmeFrontEnd/src/main/resources/application.properties&quot;>&#xD;&#xA;&lt;persistable path=&quot;/ShopmeFrontEnd/src/main/resources/application.properties&quot;/>&#xD;&#xA;&lt;/file>&#xD;&#xA;&lt;file factoryID=&quot;org.eclipse.ui.part.FileEditorInputFactory&quot; id=&quot;org.eclipse.jdt.ui.CompilationUnitEditor&quot; name=&quot;ShopmeFrontEndApplication.java&quot; tooltip=&quot;ShopmeFrontEnd/src/main/java/com/shopme/site/ShopmeFrontEndApplication.java&quot;>&#xD;&#xA;&lt;persistable path=&quot;/ShopmeFrontEnd/src/main/java/com/shopme/site/ShopmeFrontEndApplication.java&quot;/>&#xD;&#xA;&lt;/file>&#xD;&#xA;&lt;file factoryID=&quot;org.eclipse.ui.part.FileEditorInputFactory&quot; id=&quot;org.eclipse.ui.genericeditor.GenericEditor&quot; name=&quot;index.html&quot; tooltip=&quot;ShopmeWebParent/ShopmeBackEnd/src/main/resources/templates/index.html&quot;>&#xD;&#xA;&lt;persistable path=&quot;/ShopmeWebParent/ShopmeBackEnd/src/main/resources/templates/index.html&quot;/>&#xD;&#xA;&lt;/file>&#xD;&#xA;&lt;file factoryID=&quot;org.eclipse.ui.part.FileEditorInputFactory&quot; id=&quot;org.eclipse.m2e.editor.MavenPomEditor&quot; name=&quot;pom.xml&quot; tooltip=&quot;ShopmeWebParent/ShopmeBackEnd/pom.xml&quot;>&#xD;&#xA;&lt;persistable path=&quot;/ShopmeWebParent/ShopmeBackEnd/pom.xml&quot;/>&#xD;&#xA;&lt;/file>&#xD;&#xA;&lt;file factoryID=&quot;org.eclipse.jdt.ui.ClassFileEditorInputFactory&quot; id=&quot;org.eclipse.jdt.ui.ClassFileEditor&quot; name=&quot;ReflectionUtils.class&quot; tooltip=&quot;org.springframework.util.ReflectionUtils&quot;>&#xD;&#xA;&lt;persistable org.eclipse.jdt.ui.ClassFileIdentifier=&quot;=ShopmeBackEnd/C:\/Users\/User\/.m2\/repository\/org\/springframework\/spring-core\/6.0.4\/spring-core-6.0.4.jar=/maven.pomderived=/true=/=/maven.groupId=/org.springframework=/=/maven.artifactId=/spring-core=/=/maven.version=/6.0.4=/=/maven.scope=/compile=/=/maven.pomderived=/true=/&amp;lt;org.springframework.util(ReflectionUtils.class&quot;/>&#xD;&#xA;&lt;/file>&#xD;&#xA;&lt;file factoryID=&quot;org.eclipse.ui.part.FileEditorInputFactory&quot; id=&quot;org.eclipse.ui.genericeditor.GenericEditor&quot; name=&quot;useful.html&quot; tooltip=&quot;ShopmeBackEnd/src/main/resources/templates/useful.html&quot;>&#xD;&#xA;&lt;persistable path=&quot;/ShopmeBackEnd/src/main/resources/templates/useful.html&quot;/>&#xD;&#xA;&lt;/file>&#xD;&#xA;&lt;file factoryID=&quot;org.eclipse.jdt.ui.ClassFileEditorInputFactory&quot; id=&quot;org.eclipse.jdt.ui.ClassFileEditor&quot; name=&quot;Controller.class&quot; tooltip=&quot;org.springframework.stereotype.Controller&quot;>&#xD;&#xA;&lt;persistable org.eclipse.jdt.ui.ClassFileIdentifier=&quot;=ShopmeBackEnd/C:\/Users\/User\/.m2\/repository\/org\/springframework\/spring-context\/6.0.4\/spring-context-6.0.4.jar=/maven.pomderived=/true=/=/maven.groupId=/org.springframework=/=/maven.artifactId=/spring-context=/=/maven.version=/6.0.4=/=/maven.scope=/compile=/=/maven.pomderived=/true=/&amp;lt;org.springframework.stereotype(Controller.class&quot;/>&#xD;&#xA;&lt;/file>&#xD;&#xA;&lt;file factoryID=&quot;org.eclipse.ui.part.FileEditorInputFactory&quot; id=&quot;org.eclipse.jdt.ui.CompilationUnitEditor&quot; name=&quot;ShopmeCommonApplicationTests.java&quot; tooltip=&quot;ShopmeCommon/src/test/java/com/shopme/ShopmeCommonApplicationTests.java&quot;>&#xD;&#xA;&lt;persistable path=&quot;/ShopmeCommon/src/test/java/com/shopme/ShopmeCommonApplicationTests.java&quot;/>&#xD;&#xA;&lt;/file>&#xD;&#xA;&lt;file factoryID=&quot;org.eclipse.ui.part.FileEditorInputFactory&quot; id=&quot;org.eclipse.jdt.ui.CompilationUnitEditor&quot; name=&quot;ShopmeCommonApplication.java&quot; tooltip=&quot;ShopmeCommon/src/main/java/com/shopme/ShopmeCommonApplication.java&quot;>&#xD;&#xA;&lt;persistable path=&quot;/ShopmeCommon/src/main/java/com/shopme/ShopmeCommonApplication.java&quot;/>&#xD;&#xA;&lt;/file>&#xD;&#xA;&lt;file factoryID=&quot;org.eclipse.ui.part.FileEditorInputFactory&quot; id=&quot;org.eclipse.m2e.editor.MavenPomEditor&quot; name=&quot;pom.xml&quot; tooltip=&quot;ShopmeProject/ShopmeCommon/pom.xml&quot;>&#xD;&#xA;&lt;persistable path=&quot;/ShopmeProject/ShopmeCommon/pom.xml&quot;/>&#xD;&#xA;&lt;/file>&#xD;&#xA;&lt;/mruList>&#xD;&#xA;&lt;/workbench>"/>
   <tags>activeSchemeId:org.eclipse.ui.defaultAcceleratorConfiguration</tags>
-  <children xsi:type="basic:TrimmedWindow" xmi:id="_JQ9aQbjoEe25NdJK2M4KYw" elementId="IDEWindow" contributorURI="platform:/plugin/org.eclipse.platform" selectedElement="_JQ9aQrjoEe25NdJK2M4KYw" label="%trimmedwindow.label.eclipseSDK" x="0" y="0" width="978" height="731">
+  <children xsi:type="basic:TrimmedWindow" xmi:id="_ZFeDUKrbEe2-M8nuGout-A" elementId="IDEWindow" contributorURI="platform:/plugin/org.eclipse.platform" selectedElement="_Z_dmYKrbEe2-M8nuGout-A" label="%trimmedwindow.label.eclipseSDK" x="0" y="0" width="978" height="731">
     <persistedState key="coolBarVisible" value="true"/>
     <persistedState key="perspectiveBarVisible" value="true"/>
     <persistedState key="isRestored" value="true"/>
@@ -11,9 +11,9 @@
     <persistedState key="aggregateWorkingSetId" value="Aggregate for window 1676207692616"/>
     <tags>topLevel</tags>
     <tags>shellMaximized</tags>
-    <children xsi:type="basic:PartSashContainer" xmi:id="_JQ9aQrjoEe25NdJK2M4KYw" selectedElement="_JQ9aQ7joEe25NdJK2M4KYw" horizontal="true">
-      <children xsi:type="advanced:PerspectiveStack" xmi:id="_JQ9aQ7joEe25NdJK2M4KYw" elementId="org.eclipse.ui.ide.perspectivestack" containerData="7500" selectedElement="_JQ9aRLjoEe25NdJK2M4KYw">
-        <children xsi:type="advanced:Perspective" xmi:id="_JQ9aRLjoEe25NdJK2M4KYw" elementId="org.eclipse.jdt.ui.JavaPerspective" selectedElement="_JQ9aRbjoEe25NdJK2M4KYw" label="Java" iconURI="platform:/plugin/org.eclipse.jdt.ui/icons/full/eview16/jperspective.png">
+    <children xsi:type="basic:PartSashContainer" xmi:id="_Z_dmYKrbEe2-M8nuGout-A" selectedElement="_Z_eNcKrbEe2-M8nuGout-A" horizontal="true">
+      <children xsi:type="advanced:PerspectiveStack" xmi:id="_Z_eNcKrbEe2-M8nuGout-A" elementId="org.eclipse.ui.ide.perspectivestack" containerData="7500" selectedElement="_abpMEKrbEe2-M8nuGout-A">
+        <children xsi:type="advanced:Perspective" xmi:id="_abpMEKrbEe2-M8nuGout-A" elementId="org.eclipse.jdt.ui.JavaPerspective" selectedElement="_abpMEarbEe2-M8nuGout-A" label="Java" iconURI="platform:/plugin/org.eclipse.jdt.ui/icons/full/eview16/jperspective.png">
           <persistedState key="persp.hiddenItems" value="persp.hideToolbarSC:print,persp.hideToolbarSC:org.eclipse.ui.edit.undo,persp.hideToolbarSC:org.eclipse.ui.edit.redo,persp.hideToolbarSC:org.eclipse.ui.edit.text.toggleShowSelectedElementOnly,persp.hideToolbarSC:org.eclipse.debug.ui.commands.RunToLine,persp.hideToolbarSC:org.eclipse.jdt.ui.actions.OpenProjectWizard,"/>
           <tags>persp.actionSet:org.eclipse.ui.cheatsheets.actionSet</tags>
           <tags>persp.actionSet:org.eclipse.search.searchActionSet</tags>
@@ -73,106 +73,106 @@
           <tags>persp.showIn:org.eclipse.tm.terminal.view.ui.TerminalsView</tags>
           <tags>persp.viewSC:org.eclipse.ant.ui.views.AntView</tags>
           <tags>persp.actionSet:org.eclipse.debug.ui.debugActionSet</tags>
-          <children xsi:type="basic:PartSashContainer" xmi:id="_JQ9aRbjoEe25NdJK2M4KYw" selectedElement="_JQ9aUbjoEe25NdJK2M4KYw" horizontal="true">
-            <children xsi:type="basic:PartSashContainer" xmi:id="_JQ9aRrjoEe25NdJK2M4KYw" containerData="2393" selectedElement="_JQ9aR7joEe25NdJK2M4KYw">
-              <children xsi:type="basic:PartSashContainer" xmi:id="_JQ9aR7joEe25NdJK2M4KYw" containerData="6000" selectedElement="_JQ9aSLjoEe25NdJK2M4KYw">
-                <children xsi:type="basic:PartStack" xmi:id="_JQ9aSLjoEe25NdJK2M4KYw" elementId="left" containerData="6791" selectedElement="_JQ9aSbjoEe25NdJK2M4KYw">
+          <children xsi:type="basic:PartSashContainer" xmi:id="_abpMEarbEe2-M8nuGout-A" selectedElement="_abpMHqrbEe2-M8nuGout-A" horizontal="true">
+            <children xsi:type="basic:PartSashContainer" xmi:id="_abpMEqrbEe2-M8nuGout-A" containerData="2393" selectedElement="_GY4vMLaeEe20XtEP1LKklA">
+              <children xsi:type="basic:PartSashContainer" xmi:id="_GY4vMLaeEe20XtEP1LKklA" containerData="6000" selectedElement="_abpMFKrbEe2-M8nuGout-A">
+                <children xsi:type="basic:PartStack" xmi:id="_abpMFKrbEe2-M8nuGout-A" elementId="left" containerData="6791" selectedElement="_abpMFarbEe2-M8nuGout-A">
                   <tags>org.eclipse.e4.primaryNavigationStack</tags>
-                  <children xsi:type="advanced:Placeholder" xmi:id="_JQ9aSbjoEe25NdJK2M4KYw" elementId="org.eclipse.jdt.ui.PackageExplorer" ref="_JQ-CQ7joEe25NdJK2M4KYw" closeable="true">
+                  <children xsi:type="advanced:Placeholder" xmi:id="_abpMFarbEe2-M8nuGout-A" elementId="org.eclipse.jdt.ui.PackageExplorer" ref="_aZrdMKrbEe2-M8nuGout-A" closeable="true">
                     <tags>View</tags>
                     <tags>categoryTag:Java</tags>
                   </children>
-                  <children xsi:type="advanced:Placeholder" xmi:id="_JQ9aSrjoEe25NdJK2M4KYw" elementId="org.eclipse.jdt.ui.TypeHierarchy" toBeRendered="false" ref="_JQ-Ck7joEe25NdJK2M4KYw" closeable="true">
+                  <children xsi:type="advanced:Placeholder" xmi:id="_abpMFqrbEe2-M8nuGout-A" elementId="org.eclipse.jdt.ui.TypeHierarchy" toBeRendered="false" ref="_aZ0AEKrbEe2-M8nuGout-A" closeable="true">
                     <tags>View</tags>
                     <tags>categoryTag:Java</tags>
                   </children>
-                  <children xsi:type="advanced:Placeholder" xmi:id="_JQ9aS7joEe25NdJK2M4KYw" elementId="org.eclipse.ui.navigator.ProjectExplorer" toBeRendered="false" ref="_JQ-ClLjoEe25NdJK2M4KYw" closeable="true">
+                  <children xsi:type="advanced:Placeholder" xmi:id="_abpMF6rbEe2-M8nuGout-A" elementId="org.eclipse.ui.navigator.ProjectExplorer" toBeRendered="false" ref="_aZ11QKrbEe2-M8nuGout-A" closeable="true">
                     <tags>View</tags>
                     <tags>categoryTag:General</tags>
                   </children>
-                  <children xsi:type="advanced:Placeholder" xmi:id="_JQ9aTLjoEe25NdJK2M4KYw" elementId="org.eclipse.jdt.junit.ResultView" ref="_JQ-CxrjoEe25NdJK2M4KYw" closeable="true">
+                  <children xsi:type="advanced:Placeholder" xmi:id="_abpMGKrbEe2-M8nuGout-A" elementId="org.eclipse.jdt.junit.ResultView" ref="_abjsgKrbEe2-M8nuGout-A" closeable="true">
                     <tags>View</tags>
                     <tags>categoryTag:Java</tags>
                   </children>
                 </children>
-                <children xsi:type="basic:PartStack" xmi:id="_JQ9aTbjoEe25NdJK2M4KYw" elementId="org.springframework.ide.eclipse.boot.dash.views.BootDashViewMStack" containerData="3209" selectedElement="_JQ9aTrjoEe25NdJK2M4KYw">
-                  <children xsi:type="advanced:Placeholder" xmi:id="_JQ9aTrjoEe25NdJK2M4KYw" elementId="org.springframework.ide.eclipse.boot.dash.views.BootDashView" ref="_JQ-C57joEe25NdJK2M4KYw" closeable="true">
+                <children xsi:type="basic:PartStack" xmi:id="_abpMGarbEe2-M8nuGout-A" elementId="org.springframework.ide.eclipse.boot.dash.views.BootDashViewMStack" containerData="3209" selectedElement="_abpMGqrbEe2-M8nuGout-A">
+                  <children xsi:type="advanced:Placeholder" xmi:id="_abpMGqrbEe2-M8nuGout-A" elementId="org.springframework.ide.eclipse.boot.dash.views.BootDashView" ref="_abmv0KrbEe2-M8nuGout-A" closeable="true">
                     <tags>View</tags>
                     <tags>categoryTag:Other</tags>
                   </children>
                 </children>
               </children>
-              <children xsi:type="basic:PartStack" xmi:id="_JQ9aT7joEe25NdJK2M4KYw" elementId="org.eclipse.egit.ui.RepositoriesViewMStack" toBeRendered="false" containerData="4000">
-                <children xsi:type="advanced:Placeholder" xmi:id="_JQ9aULjoEe25NdJK2M4KYw" elementId="org.eclipse.egit.ui.RepositoriesView" toBeRendered="false" ref="_JQ-C5LjoEe25NdJK2M4KYw" closeable="true">
+              <children xsi:type="basic:PartStack" xmi:id="_abpMG6rbEe2-M8nuGout-A" elementId="org.eclipse.egit.ui.RepositoriesViewMStack" toBeRendered="false" containerData="4000">
+                <children xsi:type="advanced:Placeholder" xmi:id="_abpMHKrbEe2-M8nuGout-A" elementId="org.eclipse.egit.ui.RepositoriesView" toBeRendered="false" ref="_abkTkKrbEe2-M8nuGout-A" closeable="true">
                   <tags>View</tags>
                   <tags>categoryTag:Git</tags>
                 </children>
               </children>
             </children>
-            <children xsi:type="basic:PartSashContainer" xmi:id="_JQ9aUbjoEe25NdJK2M4KYw" containerData="7607" selectedElement="_JQ9aUrjoEe25NdJK2M4KYw" horizontal="true">
-              <children xsi:type="basic:PartSashContainer" xmi:id="_JQ9aUrjoEe25NdJK2M4KYw" containerData="5000" selectedElement="_JQ9aVLjoEe25NdJK2M4KYw">
-                <children xsi:type="advanced:Placeholder" xmi:id="_JQ9aU7joEe25NdJK2M4KYw" elementId="org.eclipse.ui.editorss" containerData="7387" ref="_JQ-BhrjoEe25NdJK2M4KYw"/>
-                <children xsi:type="basic:PartStack" xmi:id="_JQ9aVLjoEe25NdJK2M4KYw" elementId="bottom" containerData="2613" selectedElement="_JQ9aWbjoEe25NdJK2M4KYw">
+            <children xsi:type="basic:PartSashContainer" xmi:id="_abpMHqrbEe2-M8nuGout-A" containerData="7607" selectedElement="_pccx4LaZEe20XtEP1LKklA" horizontal="true">
+              <children xsi:type="basic:PartSashContainer" xmi:id="_pccx4LaZEe20XtEP1LKklA" containerData="5000" selectedElement="_abpMH6rbEe2-M8nuGout-A">
+                <children xsi:type="advanced:Placeholder" xmi:id="_abpMH6rbEe2-M8nuGout-A" elementId="org.eclipse.ui.editorss" containerData="7387" ref="_aZTpwKrbEe2-M8nuGout-A"/>
+                <children xsi:type="basic:PartStack" xmi:id="_abpMJarbEe2-M8nuGout-A" elementId="bottom" containerData="2613" selectedElement="_abpMKqrbEe2-M8nuGout-A">
                   <tags>org.eclipse.e4.secondaryDataStack</tags>
                   <tags>Debug</tags>
                   <tags>General</tags>
-                  <children xsi:type="advanced:Placeholder" xmi:id="_JQ9aVbjoEe25NdJK2M4KYw" elementId="org.eclipse.ui.views.ProblemView" ref="_JQ-Cl7joEe25NdJK2M4KYw" closeable="true">
+                  <children xsi:type="advanced:Placeholder" xmi:id="_abpMJqrbEe2-M8nuGout-A" elementId="org.eclipse.ui.views.ProblemView" ref="_aZ2cUKrbEe2-M8nuGout-A" closeable="true">
                     <tags>View</tags>
                     <tags>categoryTag:General</tags>
                   </children>
-                  <children xsi:type="advanced:Placeholder" xmi:id="_JQ9aVrjoEe25NdJK2M4KYw" elementId="org.eclipse.jdt.ui.JavadocView" ref="_JQ-CnbjoEe25NdJK2M4KYw" closeable="true">
+                  <children xsi:type="advanced:Placeholder" xmi:id="_abpMJ6rbEe2-M8nuGout-A" elementId="org.eclipse.jdt.ui.JavadocView" ref="_aZ3qcKrbEe2-M8nuGout-A" closeable="true">
                     <tags>View</tags>
                     <tags>categoryTag:Java</tags>
                   </children>
-                  <children xsi:type="advanced:Placeholder" xmi:id="_JQ9aV7joEe25NdJK2M4KYw" elementId="org.eclipse.jdt.ui.SourceView" ref="_JQ-CnrjoEe25NdJK2M4KYw" closeable="true">
+                  <children xsi:type="advanced:Placeholder" xmi:id="_abpMKKrbEe2-M8nuGout-A" elementId="org.eclipse.jdt.ui.SourceView" ref="_aZ6GsKrbEe2-M8nuGout-A" closeable="true">
                     <tags>View</tags>
                     <tags>categoryTag:Java</tags>
                   </children>
-                  <children xsi:type="advanced:Placeholder" xmi:id="_JQ9aWLjoEe25NdJK2M4KYw" elementId="org.eclipse.search.ui.views.SearchView" toBeRendered="false" ref="_JQ-Cn7joEe25NdJK2M4KYw" closeable="true">
+                  <children xsi:type="advanced:Placeholder" xmi:id="_abpMKarbEe2-M8nuGout-A" elementId="org.eclipse.search.ui.views.SearchView" toBeRendered="false" ref="_aZ8i8KrbEe2-M8nuGout-A" closeable="true">
                     <tags>View</tags>
                     <tags>categoryTag:General</tags>
                   </children>
-                  <children xsi:type="advanced:Placeholder" xmi:id="_JQ9aWbjoEe25NdJK2M4KYw" elementId="org.eclipse.ui.console.ConsoleView" ref="_JQ-CorjoEe25NdJK2M4KYw" closeable="true">
+                  <children xsi:type="advanced:Placeholder" xmi:id="_abpMKqrbEe2-M8nuGout-A" elementId="org.eclipse.ui.console.ConsoleView" ref="_aZ9xEKrbEe2-M8nuGout-A" closeable="true">
                     <tags>View</tags>
                     <tags>categoryTag:General</tags>
                   </children>
-                  <children xsi:type="advanced:Placeholder" xmi:id="_JQ9aWrjoEe25NdJK2M4KYw" elementId="org.eclipse.ui.views.BookmarkView" toBeRendered="false" ref="_JQ-Cv7joEe25NdJK2M4KYw" closeable="true">
+                  <children xsi:type="advanced:Placeholder" xmi:id="_abpMK6rbEe2-M8nuGout-A" elementId="org.eclipse.ui.views.BookmarkView" toBeRendered="false" ref="_aZ_mQKrbEe2-M8nuGout-A" closeable="true">
                     <tags>View</tags>
                     <tags>categoryTag:General</tags>
                   </children>
-                  <children xsi:type="advanced:Placeholder" xmi:id="_JQ9aW7joEe25NdJK2M4KYw" elementId="org.eclipse.ui.views.ProgressView" toBeRendered="false" ref="_JQ-CwLjoEe25NdJK2M4KYw" closeable="true">
+                  <children xsi:type="advanced:Placeholder" xmi:id="_abpMLKrbEe2-M8nuGout-A" elementId="org.eclipse.ui.views.ProgressView" toBeRendered="false" ref="_aaA0YKrbEe2-M8nuGout-A" closeable="true">
                     <tags>View</tags>
                     <tags>categoryTag:General</tags>
                   </children>
-                  <children xsi:type="advanced:Placeholder" xmi:id="_JQ9aXLjoEe25NdJK2M4KYw" elementId="org.eclipse.tm.terminal.view.ui.TerminalsView" toBeRendered="false" ref="_JQ-DD7joEe25NdJK2M4KYw" closeable="true">
+                  <children xsi:type="advanced:Placeholder" xmi:id="_abpMLarbEe2-M8nuGout-A" elementId="org.eclipse.tm.terminal.view.ui.TerminalsView" toBeRendered="false" ref="_abn98KrbEe2-M8nuGout-A" closeable="true">
                     <tags>View</tags>
                     <tags>categoryTag:Terminal</tags>
                   </children>
-                  <children xsi:type="advanced:Placeholder" xmi:id="_JQ9aXbjoEe25NdJK2M4KYw" elementId="org.eclipse.debug.ui.DebugView" ref="_JQ-DEbjoEe25NdJK2M4KYw" closeable="true">
+                  <children xsi:type="advanced:Placeholder" xmi:id="_Rung0Kr3Ee26usPLCNWeQg" elementId="org.eclipse.debug.ui.DebugView" ref="_Rum5wKr3Ee26usPLCNWeQg" closeable="true">
                     <tags>View</tags>
                     <tags>categoryTag:Debug</tags>
                   </children>
-                  <children xsi:type="advanced:Placeholder" xmi:id="_JQ9aXrjoEe25NdJK2M4KYw" elementId="org.eclipse.pde.runtime.LogView" toBeRendered="false" ref="_JQ-DI7joEe25NdJK2M4KYw" closeable="true">
+                  <children xsi:type="advanced:Placeholder" xmi:id="_u33h0LHwEe2sL9KyA62EbA" elementId="org.eclipse.pde.runtime.LogView" toBeRendered="false" ref="_u326wLHwEe2sL9KyA62EbA" closeable="true">
                     <tags>View</tags>
                     <tags>categoryTag:General</tags>
                   </children>
                 </children>
               </children>
-              <children xsi:type="basic:PartStack" xmi:id="_JQ9aX7joEe25NdJK2M4KYw" elementId="right" toBeRendered="false" containerData="2500">
+              <children xsi:type="basic:PartStack" xmi:id="_abpMIKrbEe2-M8nuGout-A" elementId="right" toBeRendered="false" containerData="2500">
                 <tags>org.eclipse.e4.secondaryNavigationStack</tags>
-                <children xsi:type="advanced:Placeholder" xmi:id="_JQ9aYLjoEe25NdJK2M4KYw" elementId="org.eclipse.ui.views.ContentOutline" toBeRendered="false" ref="_JQ-CwbjoEe25NdJK2M4KYw" closeable="true">
+                <children xsi:type="advanced:Placeholder" xmi:id="_abpMIarbEe2-M8nuGout-A" elementId="org.eclipse.ui.views.ContentOutline" toBeRendered="false" ref="_aaA0YarbEe2-M8nuGout-A" closeable="true">
                   <tags>View</tags>
                   <tags>categoryTag:General</tags>
                 </children>
-                <children xsi:type="advanced:Placeholder" xmi:id="_JQ9aYbjoEe25NdJK2M4KYw" elementId="org.eclipse.ui.texteditor.TemplatesView" toBeRendered="false" ref="_JQ-CxLjoEe25NdJK2M4KYw" closeable="true">
+                <children xsi:type="advanced:Placeholder" xmi:id="_abpMIqrbEe2-M8nuGout-A" elementId="org.eclipse.ui.texteditor.TemplatesView" toBeRendered="false" ref="_aaBbcKrbEe2-M8nuGout-A" closeable="true">
                   <tags>View</tags>
                   <tags>categoryTag:General</tags>
                 </children>
-                <children xsi:type="advanced:Placeholder" xmi:id="_JQ9aYrjoEe25NdJK2M4KYw" elementId="org.eclipse.ui.views.minimap.MinimapView" toBeRendered="false" ref="_JQ-CxbjoEe25NdJK2M4KYw" closeable="true">
+                <children xsi:type="advanced:Placeholder" xmi:id="_abpMI6rbEe2-M8nuGout-A" elementId="org.eclipse.ui.views.minimap.MinimapView" toBeRendered="false" ref="_abh3UKrbEe2-M8nuGout-A" closeable="true">
                   <tags>View</tags>
                   <tags>categoryTag:General</tags>
                 </children>
-                <children xsi:type="advanced:Placeholder" xmi:id="_JQ9aY7joEe25NdJK2M4KYw" elementId="org.eclipse.ant.ui.views.AntView" toBeRendered="false" ref="_JQ-DELjoEe25NdJK2M4KYw" closeable="true">
+                <children xsi:type="advanced:Placeholder" xmi:id="_abpMJKrbEe2-M8nuGout-A" elementId="org.eclipse.ant.ui.views.AntView" toBeRendered="false" ref="_abn98arbEe2-M8nuGout-A" closeable="true">
                   <tags>View</tags>
                   <tags>categoryTag:Ant</tags>
                 </children>
@@ -180,7 +180,7 @@
             </children>
           </children>
         </children>
-        <children xsi:type="advanced:Perspective" xmi:id="_JQ9aZLjoEe25NdJK2M4KYw" elementId="org.eclipse.egit.ui.GitRepositoryExploring" selectedElement="_JQ9aZbjoEe25NdJK2M4KYw" label="Git" iconURI="platform:/plugin/org.eclipse.egit.ui/icons/obj16/gitrepository.png">
+        <children xsi:type="advanced:Perspective" xmi:id="_vLco0LC2Ee26UITHIz0s8g" elementId="org.eclipse.egit.ui.GitRepositoryExploring" selectedElement="_vLco0bC2Ee26UITHIz0s8g" label="Git" iconURI="platform:/plugin/org.eclipse.egit.ui/icons/obj16/gitrepository.png">
           <persistedState key="persp.hiddenItems" value="persp.hideToolbarSC:print,persp.hideToolbarSC:org.eclipse.ui.edit.undo,persp.hideToolbarSC:org.eclipse.ui.edit.redo,persp.hideToolbarSC:org.eclipse.ui.edit.text.toggleShowSelectedElementOnly,persp.hideToolbarSC:org.eclipse.debug.ui.commands.RunToLine,persp.hideToolbarSC:org.eclipse.jdt.ui.actions.OpenProjectWizard,"/>
           <tags>persp.actionSet:org.eclipse.ui.cheatsheets.actionSet</tags>
           <tags>persp.actionSet:org.eclipse.search.searchActionSet</tags>
@@ -205,41 +205,41 @@
           <tags>persp.newWizSC:org.eclipse.egit.ui.CreateRepositoryWizard</tags>
           <tags>persp.actionSet:org.eclipse.debug.ui.launchActionSet</tags>
           <tags>persp.showIn:org.eclipse.tm.terminal.view.ui.TerminalsView</tags>
-          <children xsi:type="basic:PartSashContainer" xmi:id="_JQ9aZbjoEe25NdJK2M4KYw" selectedElement="_JQ9aZrjoEe25NdJK2M4KYw" horizontal="true">
-            <children xsi:type="basic:PartSashContainer" xmi:id="_JQ9aZrjoEe25NdJK2M4KYw" containerData="3000" selectedElement="_JQ9aZ7joEe25NdJK2M4KYw">
-              <children xsi:type="basic:PartStack" xmi:id="_JQ9aZ7joEe25NdJK2M4KYw" elementId="org.eclipse.egit.ui.RepositoriesViewMStack" containerData="7000" selectedElement="_JQ9aaLjoEe25NdJK2M4KYw">
-                <children xsi:type="advanced:Placeholder" xmi:id="_JQ9aaLjoEe25NdJK2M4KYw" elementId="org.eclipse.egit.ui.RepositoriesView" ref="_JQ-C5LjoEe25NdJK2M4KYw" closeable="true">
+          <children xsi:type="basic:PartSashContainer" xmi:id="_vLco0bC2Ee26UITHIz0s8g" selectedElement="_vLco0rC2Ee26UITHIz0s8g" horizontal="true">
+            <children xsi:type="basic:PartSashContainer" xmi:id="_vLco0rC2Ee26UITHIz0s8g" containerData="3000" selectedElement="_vLco07C2Ee26UITHIz0s8g">
+              <children xsi:type="basic:PartStack" xmi:id="_vLco07C2Ee26UITHIz0s8g" elementId="org.eclipse.egit.ui.RepositoriesViewMStack" containerData="7000" selectedElement="_vLco1LC2Ee26UITHIz0s8g">
+                <children xsi:type="advanced:Placeholder" xmi:id="_vLco1LC2Ee26UITHIz0s8g" elementId="org.eclipse.egit.ui.RepositoriesView" ref="_abkTkKrbEe2-M8nuGout-A" closeable="true">
                   <tags>View</tags>
                   <tags>categoryTag:Git</tags>
                 </children>
               </children>
-              <children xsi:type="basic:PartStack" xmi:id="_JQ9aabjoEe25NdJK2M4KYw" elementId="org.eclipse.jdt.ui.PackageExplorerMStack" toBeRendered="false" containerData="3000">
-                <children xsi:type="advanced:Placeholder" xmi:id="_JQ9aarjoEe25NdJK2M4KYw" elementId="org.eclipse.jdt.ui.PackageExplorer" toBeRendered="false" ref="_JQ-CQ7joEe25NdJK2M4KYw" closeable="true">
+              <children xsi:type="basic:PartStack" xmi:id="_vLco1bC2Ee26UITHIz0s8g" elementId="org.eclipse.jdt.ui.PackageExplorerMStack" toBeRendered="false" containerData="3000">
+                <children xsi:type="advanced:Placeholder" xmi:id="_vLco1rC2Ee26UITHIz0s8g" elementId="org.eclipse.jdt.ui.PackageExplorer" toBeRendered="false" ref="_aZrdMKrbEe2-M8nuGout-A" closeable="true">
                   <tags>View</tags>
                   <tags>categoryTag:Java</tags>
                 </children>
               </children>
             </children>
-            <children xsi:type="basic:PartSashContainer" xmi:id="_JQ9aa7joEe25NdJK2M4KYw" containerData="7000" selectedElement="_JQ9abLjoEe25NdJK2M4KYw">
-              <children xsi:type="advanced:Placeholder" xmi:id="_JQ9abLjoEe25NdJK2M4KYw" elementId="org.eclipse.ui.editorss" containerData="5000" ref="_JQ-BhrjoEe25NdJK2M4KYw"/>
-              <children xsi:type="basic:PartStack" xmi:id="_JQ9abbjoEe25NdJK2M4KYw" elementId="bottom" containerData="5000" selectedElement="_JQ9abrjoEe25NdJK2M4KYw">
-                <children xsi:type="advanced:Placeholder" xmi:id="_JQ9abrjoEe25NdJK2M4KYw" elementId="org.eclipse.team.ui.GenericHistoryView" ref="_JQ-DFLjoEe25NdJK2M4KYw" closeable="true">
+            <children xsi:type="basic:PartSashContainer" xmi:id="_vLco17C2Ee26UITHIz0s8g" containerData="7000" selectedElement="_vLco2LC2Ee26UITHIz0s8g">
+              <children xsi:type="advanced:Placeholder" xmi:id="_vLco2LC2Ee26UITHIz0s8g" elementId="org.eclipse.ui.editorss" containerData="5000" ref="_aZTpwKrbEe2-M8nuGout-A"/>
+              <children xsi:type="basic:PartStack" xmi:id="_vLco2bC2Ee26UITHIz0s8g" elementId="bottom" containerData="5000" selectedElement="_vLco2rC2Ee26UITHIz0s8g">
+                <children xsi:type="advanced:Placeholder" xmi:id="_vLco2rC2Ee26UITHIz0s8g" elementId="org.eclipse.team.ui.GenericHistoryView" ref="_vLXwULC2Ee26UITHIz0s8g" closeable="true">
                   <tags>View</tags>
                   <tags>categoryTag:Version Control (Team)</tags>
                 </children>
-                <children xsi:type="advanced:Placeholder" xmi:id="_JQ9ab7joEe25NdJK2M4KYw" elementId="org.eclipse.team.sync.views.SynchronizeView" ref="_JQ-DF7joEe25NdJK2M4KYw" closeable="true">
+                <children xsi:type="advanced:Placeholder" xmi:id="_vLco27C2Ee26UITHIz0s8g" elementId="org.eclipse.team.sync.views.SynchronizeView" ref="_vLYXYLC2Ee26UITHIz0s8g" closeable="true">
                   <tags>View</tags>
                   <tags>categoryTag:Version Control (Team)</tags>
                 </children>
-                <children xsi:type="advanced:Placeholder" xmi:id="_JQ9acLjoEe25NdJK2M4KYw" elementId="org.eclipse.egit.ui.StagingView" ref="_JQ-DGLjoEe25NdJK2M4KYw" closeable="true">
+                <children xsi:type="advanced:Placeholder" xmi:id="_vLco3LC2Ee26UITHIz0s8g" elementId="org.eclipse.egit.ui.StagingView" ref="_vLY-cLC2Ee26UITHIz0s8g" closeable="true">
                   <tags>View</tags>
                   <tags>categoryTag:Git</tags>
                 </children>
-                <children xsi:type="advanced:Placeholder" xmi:id="_JQ9acbjoEe25NdJK2M4KYw" elementId="org.eclipse.egit.ui.ReflogView" ref="_JQ-DGbjoEe25NdJK2M4KYw" closeable="true">
+                <children xsi:type="advanced:Placeholder" xmi:id="_vLco3bC2Ee26UITHIz0s8g" elementId="org.eclipse.egit.ui.ReflogView" ref="_vLY-cbC2Ee26UITHIz0s8g" closeable="true">
                   <tags>View</tags>
                   <tags>categoryTag:Git</tags>
                 </children>
-                <children xsi:type="advanced:Placeholder" xmi:id="_JQ9acrjoEe25NdJK2M4KYw" elementId="org.eclipse.ui.views.PropertySheet" ref="_JQ-DGrjoEe25NdJK2M4KYw" closeable="true">
+                <children xsi:type="advanced:Placeholder" xmi:id="_vLco3rC2Ee26UITHIz0s8g" elementId="org.eclipse.ui.views.PropertySheet" ref="_vLZlgLC2Ee26UITHIz0s8g" closeable="true">
                   <tags>View</tags>
                   <tags>categoryTag:General</tags>
                 </children>
@@ -247,7 +247,7 @@
             </children>
           </children>
         </children>
-        <children xsi:type="advanced:Perspective" xmi:id="_JQ9ac7joEe25NdJK2M4KYw" elementId="org.eclipse.wst.web.ui.webDevPerspective" selectedElement="_JQ9adLjoEe25NdJK2M4KYw" label="Web" iconURI="platform:/plugin/org.eclipse.wst.web.ui/icons/full/cview16/web_perspective.gif">
+        <children xsi:type="advanced:Perspective" xmi:id="_4tg08LC2Ee26UITHIz0s8g" elementId="org.eclipse.wst.web.ui.webDevPerspective" selectedElement="_4tg08bC2Ee26UITHIz0s8g" label="Web" iconURI="platform:/plugin/org.eclipse.wst.web.ui/icons/full/cview16/web_perspective.gif">
           <persistedState key="persp.hiddenItems" value="persp.hideToolbarSC:print,persp.hideToolbarSC:org.eclipse.ui.edit.undo,persp.hideToolbarSC:org.eclipse.ui.edit.redo,persp.hideToolbarSC:org.eclipse.ui.edit.text.toggleShowSelectedElementOnly,persp.hideToolbarSC:org.eclipse.debug.ui.commands.RunToLine,persp.hideToolbarSC:org.eclipse.jdt.ui.actions.OpenProjectWizard,"/>
           <tags>persp.actionSet:org.eclipse.ui.cheatsheets.actionSet</tags>
           <tags>persp.actionSet:org.eclipse.search.searchActionSet</tags>
@@ -281,73 +281,73 @@
           <tags>persp.viewSC:org.eclipse.ui.views.minimap.MinimapView</tags>
           <tags>persp.perspSC:org.eclipse.jdt.ui.JavaPerspective</tags>
           <tags>persp.showIn:org.eclipse.tm.terminal.view.ui.TerminalsView</tags>
-          <children xsi:type="basic:PartSashContainer" xmi:id="_JQ9adLjoEe25NdJK2M4KYw" selectedElement="_JQ9adbjoEe25NdJK2M4KYw" horizontal="true">
-            <children xsi:type="basic:PartStack" xmi:id="_JQ9adbjoEe25NdJK2M4KYw" elementId="topLeft" containerData="2500" selectedElement="_JQ9adrjoEe25NdJK2M4KYw">
-              <children xsi:type="advanced:Placeholder" xmi:id="_JQ9adrjoEe25NdJK2M4KYw" elementId="org.eclipse.ui.navigator.ProjectExplorer" ref="_JQ-ClLjoEe25NdJK2M4KYw" closeable="true">
+          <children xsi:type="basic:PartSashContainer" xmi:id="_4tg08bC2Ee26UITHIz0s8g" selectedElement="_4tg08rC2Ee26UITHIz0s8g" horizontal="true">
+            <children xsi:type="basic:PartStack" xmi:id="_4tg08rC2Ee26UITHIz0s8g" elementId="topLeft" containerData="2500" selectedElement="_4tg087C2Ee26UITHIz0s8g">
+              <children xsi:type="advanced:Placeholder" xmi:id="_4tg087C2Ee26UITHIz0s8g" elementId="org.eclipse.ui.navigator.ProjectExplorer" ref="_aZ11QKrbEe2-M8nuGout-A" closeable="true">
                 <tags>View</tags>
                 <tags>categoryTag:General</tags>
               </children>
-              <children xsi:type="advanced:Placeholder" xmi:id="_JQ9ad7joEe25NdJK2M4KYw" elementId="org.eclipse.ui.views.ResourceNavigator" toBeRendered="false" ref="_JQ-DHbjoEe25NdJK2M4KYw" closeable="true">
+              <children xsi:type="advanced:Placeholder" xmi:id="_4tg09LC2Ee26UITHIz0s8g" elementId="org.eclipse.ui.views.ResourceNavigator" toBeRendered="false" ref="_4taHQLC2Ee26UITHIz0s8g" closeable="true">
                 <tags>View</tags>
                 <tags>categoryTag:General</tags>
               </children>
             </children>
-            <children xsi:type="basic:PartSashContainer" xmi:id="_JQ9aeLjoEe25NdJK2M4KYw" containerData="7500" selectedElement="_JQ9aebjoEe25NdJK2M4KYw" horizontal="true">
-              <children xsi:type="basic:PartSashContainer" xmi:id="_JQ9aebjoEe25NdJK2M4KYw" containerData="8000" selectedElement="_JQ9aerjoEe25NdJK2M4KYw">
-                <children xsi:type="advanced:Placeholder" xmi:id="_JQ9aerjoEe25NdJK2M4KYw" elementId="org.eclipse.ui.editorss" containerData="7000" ref="_JQ-BhrjoEe25NdJK2M4KYw"/>
-                <children xsi:type="basic:PartStack" xmi:id="_JQ9ae7joEe25NdJK2M4KYw" elementId="bottom" containerData="3000" selectedElement="_JQ9afLjoEe25NdJK2M4KYw">
-                  <children xsi:type="advanced:Placeholder" xmi:id="_JQ9afLjoEe25NdJK2M4KYw" elementId="org.eclipse.ui.views.ProblemView" ref="_JQ-Cl7joEe25NdJK2M4KYw" closeable="true">
+            <children xsi:type="basic:PartSashContainer" xmi:id="_4tg09bC2Ee26UITHIz0s8g" containerData="7500" selectedElement="_4tg09rC2Ee26UITHIz0s8g" horizontal="true">
+              <children xsi:type="basic:PartSashContainer" xmi:id="_4tg09rC2Ee26UITHIz0s8g" containerData="8000" selectedElement="_4tg097C2Ee26UITHIz0s8g">
+                <children xsi:type="advanced:Placeholder" xmi:id="_4tg097C2Ee26UITHIz0s8g" elementId="org.eclipse.ui.editorss" containerData="7000" ref="_aZTpwKrbEe2-M8nuGout-A"/>
+                <children xsi:type="basic:PartStack" xmi:id="_4tg0-LC2Ee26UITHIz0s8g" elementId="bottom" containerData="3000" selectedElement="_4tg0-bC2Ee26UITHIz0s8g">
+                  <children xsi:type="advanced:Placeholder" xmi:id="_4tg0-bC2Ee26UITHIz0s8g" elementId="org.eclipse.ui.views.ProblemView" ref="_aZ2cUKrbEe2-M8nuGout-A" closeable="true">
                     <tags>View</tags>
                     <tags>categoryTag:General</tags>
                   </children>
-                  <children xsi:type="advanced:Placeholder" xmi:id="_JQ9afbjoEe25NdJK2M4KYw" elementId="org.eclipse.wst.server.ui.ServersView" ref="_JQ-DHrjoEe25NdJK2M4KYw" closeable="true">
+                  <children xsi:type="advanced:Placeholder" xmi:id="_4tg0-rC2Ee26UITHIz0s8g" elementId="org.eclipse.wst.server.ui.ServersView" ref="_4tcjgLC2Ee26UITHIz0s8g" closeable="true">
                     <tags>View</tags>
                     <tags>categoryTag:Server</tags>
                   </children>
-                  <children xsi:type="advanced:Placeholder" xmi:id="_JQ9afrjoEe25NdJK2M4KYw" elementId="org.eclipse.ui.views.PropertySheet" ref="_JQ-DGrjoEe25NdJK2M4KYw" closeable="true">
+                  <children xsi:type="advanced:Placeholder" xmi:id="_4tg0-7C2Ee26UITHIz0s8g" elementId="org.eclipse.ui.views.PropertySheet" ref="_vLZlgLC2Ee26UITHIz0s8g" closeable="true">
                     <tags>View</tags>
                     <tags>categoryTag:General</tags>
                   </children>
-                  <children xsi:type="advanced:Placeholder" xmi:id="_JQ9af7joEe25NdJK2M4KYw" elementId="org.eclipse.wst.common.snippets.internal.ui.SnippetsView" ref="_JQ-DIbjoEe25NdJK2M4KYw" closeable="true">
+                  <children xsi:type="advanced:Placeholder" xmi:id="_4tg0_LC2Ee26UITHIz0s8g" elementId="org.eclipse.wst.common.snippets.internal.ui.SnippetsView" ref="_4tdKkLC2Ee26UITHIz0s8g" closeable="true">
                     <tags>View</tags>
                     <tags>categoryTag:General</tags>
                   </children>
-                  <children xsi:type="advanced:Placeholder" xmi:id="_JQ9agLjoEe25NdJK2M4KYw" elementId="org.eclipse.search.ui.views.SearchView" toBeRendered="false" ref="_JQ-Cn7joEe25NdJK2M4KYw" closeable="true">
+                  <children xsi:type="advanced:Placeholder" xmi:id="_4tg0_bC2Ee26UITHIz0s8g" elementId="org.eclipse.search.ui.views.SearchView" toBeRendered="false" ref="_aZ8i8KrbEe2-M8nuGout-A" closeable="true">
                     <tags>View</tags>
                     <tags>categoryTag:General</tags>
                   </children>
-                  <children xsi:type="advanced:Placeholder" xmi:id="_JQ9agbjoEe25NdJK2M4KYw" elementId="org.eclipse.ui.console.ConsoleView" toBeRendered="false" ref="_JQ-CorjoEe25NdJK2M4KYw" closeable="true">
+                  <children xsi:type="advanced:Placeholder" xmi:id="_4tg0_rC2Ee26UITHIz0s8g" elementId="org.eclipse.ui.console.ConsoleView" toBeRendered="false" ref="_aZ9xEKrbEe2-M8nuGout-A" closeable="true">
                     <tags>View</tags>
                     <tags>categoryTag:General</tags>
                   </children>
-                  <children xsi:type="advanced:Placeholder" xmi:id="_JQ9agrjoEe25NdJK2M4KYw" elementId="org.eclipse.ui.views.BookmarkView" toBeRendered="false" ref="_JQ-Cv7joEe25NdJK2M4KYw" closeable="true">
+                  <children xsi:type="advanced:Placeholder" xmi:id="_4tg0_7C2Ee26UITHIz0s8g" elementId="org.eclipse.ui.views.BookmarkView" toBeRendered="false" ref="_aZ_mQKrbEe2-M8nuGout-A" closeable="true">
                     <tags>View</tags>
                     <tags>categoryTag:General</tags>
                   </children>
-                  <children xsi:type="advanced:Placeholder" xmi:id="_JQ9ag7joEe25NdJK2M4KYw" elementId="org.eclipse.ui.views.ProgressView" toBeRendered="false" ref="_JQ-CwLjoEe25NdJK2M4KYw" closeable="true">
+                  <children xsi:type="advanced:Placeholder" xmi:id="_4tg1ALC2Ee26UITHIz0s8g" elementId="org.eclipse.ui.views.ProgressView" toBeRendered="false" ref="_aaA0YKrbEe2-M8nuGout-A" closeable="true">
                     <tags>View</tags>
                     <tags>categoryTag:General</tags>
                   </children>
-                  <children xsi:type="advanced:Placeholder" xmi:id="_JQ9ahLjoEe25NdJK2M4KYw" elementId="org.eclipse.ui.views.TaskList" toBeRendered="false" ref="_JQ-DIrjoEe25NdJK2M4KYw" closeable="true">
+                  <children xsi:type="advanced:Placeholder" xmi:id="_4tg1AbC2Ee26UITHIz0s8g" elementId="org.eclipse.ui.views.TaskList" toBeRendered="false" ref="_4tdxoLC2Ee26UITHIz0s8g" closeable="true">
                     <tags>View</tags>
                     <tags>categoryTag:General</tags>
                   </children>
-                  <children xsi:type="advanced:Placeholder" xmi:id="_JQ9ahbjoEe25NdJK2M4KYw" elementId="org.eclipse.tm.terminal.view.ui.TerminalsView" ref="_JQ-DD7joEe25NdJK2M4KYw" closeable="true">
+                  <children xsi:type="advanced:Placeholder" xmi:id="_4tg1ArC2Ee26UITHIz0s8g" elementId="org.eclipse.tm.terminal.view.ui.TerminalsView" ref="_abn98KrbEe2-M8nuGout-A" closeable="true">
                     <tags>View</tags>
                     <tags>categoryTag:Terminal</tags>
                   </children>
                 </children>
               </children>
-              <children xsi:type="basic:PartStack" xmi:id="_JQ9ahrjoEe25NdJK2M4KYw" elementId="topRight" toBeRendered="false" containerData="2000">
-                <children xsi:type="advanced:Placeholder" xmi:id="_JQ9ah7joEe25NdJK2M4KYw" elementId="org.eclipse.ui.views.ContentOutline" toBeRendered="false" ref="_JQ-CwbjoEe25NdJK2M4KYw" closeable="true">
+              <children xsi:type="basic:PartStack" xmi:id="_4tg1A7C2Ee26UITHIz0s8g" elementId="topRight" toBeRendered="false" containerData="2000">
+                <children xsi:type="advanced:Placeholder" xmi:id="_4tg1BLC2Ee26UITHIz0s8g" elementId="org.eclipse.ui.views.ContentOutline" toBeRendered="false" ref="_aaA0YarbEe2-M8nuGout-A" closeable="true">
                   <tags>View</tags>
                   <tags>categoryTag:General</tags>
                 </children>
-                <children xsi:type="advanced:Placeholder" xmi:id="_JQ9aiLjoEe25NdJK2M4KYw" elementId="org.eclipse.ui.views.minimap.MinimapView" toBeRendered="false" ref="_JQ-CxbjoEe25NdJK2M4KYw" closeable="true">
+                <children xsi:type="advanced:Placeholder" xmi:id="_4tg1BbC2Ee26UITHIz0s8g" elementId="org.eclipse.ui.views.minimap.MinimapView" toBeRendered="false" ref="_abh3UKrbEe2-M8nuGout-A" closeable="true">
                   <tags>View</tags>
                   <tags>categoryTag:General</tags>
                 </children>
-                <children xsi:type="advanced:Placeholder" xmi:id="_JQ9aibjoEe25NdJK2M4KYw" elementId="org.eclipse.ui.views.minimap.MinimapView" toBeRendered="false" ref="_JQ-CxbjoEe25NdJK2M4KYw" closeable="true">
+                <children xsi:type="advanced:Placeholder" xmi:id="_4tg1BrC2Ee26UITHIz0s8g" elementId="org.eclipse.ui.views.minimap.MinimapView" toBeRendered="false" ref="_abh3UKrbEe2-M8nuGout-A" closeable="true">
                   <tags>View</tags>
                   <tags>categoryTag:General</tags>
                 </children>
@@ -356,2740 +356,2740 @@
           </children>
         </children>
       </children>
-      <children xsi:type="basic:PartStack" xmi:id="_JQ9airjoEe25NdJK2M4KYw" elementId="stickyFolderRight" toBeRendered="false" containerData="2500">
-        <children xsi:type="advanced:Placeholder" xmi:id="_JQ9ai7joEe25NdJK2M4KYw" elementId="org.eclipse.help.ui.HelpView" toBeRendered="false" ref="_JQ-BgbjoEe25NdJK2M4KYw" closeable="true">
+      <children xsi:type="basic:PartStack" xmi:id="_Z_eNcarbEe2-M8nuGout-A" elementId="stickyFolderRight" toBeRendered="false" containerData="2500">
+        <children xsi:type="advanced:Placeholder" xmi:id="_Z_eNcqrbEe2-M8nuGout-A" elementId="org.eclipse.help.ui.HelpView" toBeRendered="false" ref="_Z_W4sKrbEe2-M8nuGout-A" closeable="true">
           <tags>View</tags>
           <tags>categoryTag:Help</tags>
         </children>
-        <children xsi:type="advanced:Placeholder" xmi:id="_JQ9ajLjoEe25NdJK2M4KYw" elementId="org.eclipse.ui.internal.introview" toBeRendered="false" ref="_JQ-BhLjoEe25NdJK2M4KYw" closeable="true">
+        <children xsi:type="advanced:Placeholder" xmi:id="_Z_eNc6rbEe2-M8nuGout-A" elementId="org.eclipse.ui.internal.introview" toBeRendered="false" ref="_Z_cYQKrbEe2-M8nuGout-A" closeable="true">
           <tags>View</tags>
           <tags>categoryTag:General</tags>
         </children>
-        <children xsi:type="advanced:Placeholder" xmi:id="_JQ9ajbjoEe25NdJK2M4KYw" elementId="org.eclipse.ui.cheatsheets.views.CheatSheetView" toBeRendered="false" ref="_JQ-BhbjoEe25NdJK2M4KYw" closeable="true">
+        <children xsi:type="advanced:Placeholder" xmi:id="_Z_eNdKrbEe2-M8nuGout-A" elementId="org.eclipse.ui.cheatsheets.views.CheatSheetView" toBeRendered="false" ref="_Z_c_UKrbEe2-M8nuGout-A" closeable="true">
           <tags>View</tags>
           <tags>categoryTag:Help</tags>
         </children>
       </children>
     </children>
-    <sharedElements xsi:type="basic:Part" xmi:id="_JQ-BgbjoEe25NdJK2M4KYw" elementId="org.eclipse.help.ui.HelpView" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView" label="Help" iconURI="platform:/plugin/org.eclipse.help.ui/icons/view16/help_view.png" tooltip="" closeable="true">
+    <sharedElements xsi:type="basic:Part" xmi:id="_Z_W4sKrbEe2-M8nuGout-A" elementId="org.eclipse.help.ui.HelpView" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView" label="Help" iconURI="platform:/plugin/org.eclipse.help.ui/icons/view16/help_view.png" tooltip="" closeable="true">
       <persistedState key="originalCompatibilityViewClass" value="org.eclipse.help.ui.internal.views.HelpView"/>
       <persistedState key="originalCompatibilityViewBundle" value="org.eclipse.help.ui"/>
       <persistedState key="memento" value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?>&#xD;&#xA;&lt;view activeSet=&quot;Default&quot; expression=&quot;user&quot; pageId=&quot;fsearch-page&quot;/>"/>
       <tags>View</tags>
       <tags>categoryTag:Help</tags>
-      <menus xmi:id="_JQ-BgrjoEe25NdJK2M4KYw" elementId="org.eclipse.help.ui.HelpView">
+      <menus xmi:id="_aL50oLHmEe2sL9KyA62EbA" elementId="org.eclipse.help.ui.HelpView">
         <tags>ViewMenu</tags>
         <tags>menuContribution:menu</tags>
       </menus>
-      <toolbar xmi:id="_JQ-Bg7joEe25NdJK2M4KYw" elementId="org.eclipse.help.ui.HelpView" visible="false"/>
+      <toolbar xmi:id="_aL50obHmEe2sL9KyA62EbA" elementId="org.eclipse.help.ui.HelpView" visible="false"/>
     </sharedElements>
-    <sharedElements xsi:type="basic:Part" xmi:id="_JQ-BhLjoEe25NdJK2M4KYw" elementId="org.eclipse.ui.internal.introview" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView" label="Welcome" iconURI="platform:/plugin/org.eclipse.ui/icons/full/eview16/defaultview_misc.png" tooltip="" closeable="true">
+    <sharedElements xsi:type="basic:Part" xmi:id="_Z_cYQKrbEe2-M8nuGout-A" elementId="org.eclipse.ui.internal.introview" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView" label="Welcome" iconURI="platform:/plugin/org.eclipse.ui/icons/full/eview16/defaultview_misc.png" tooltip="" closeable="true">
       <persistedState key="originalCompatibilityViewClass" value="org.eclipse.ui.internal.ViewIntroAdapterPart"/>
       <persistedState key="originalCompatibilityViewBundle" value="org.eclipse.ui"/>
       <tags>View</tags>
       <tags>categoryTag:General</tags>
     </sharedElements>
-    <sharedElements xsi:type="basic:Part" xmi:id="_JQ-BhbjoEe25NdJK2M4KYw" elementId="org.eclipse.ui.cheatsheets.views.CheatSheetView" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView" label="Cheat Sheets" iconURI="platform:/plugin/org.eclipse.ui.cheatsheets/icons/view16/cheatsheet_view.png" tooltip="" closeable="true">
+    <sharedElements xsi:type="basic:Part" xmi:id="_Z_c_UKrbEe2-M8nuGout-A" elementId="org.eclipse.ui.cheatsheets.views.CheatSheetView" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView" label="Cheat Sheets" iconURI="platform:/plugin/org.eclipse.ui.cheatsheets/icons/view16/cheatsheet_view.png" tooltip="" closeable="true">
       <persistedState key="originalCompatibilityViewClass" value="org.eclipse.ui.internal.cheatsheets.views.CheatSheetView"/>
       <persistedState key="originalCompatibilityViewBundle" value="org.eclipse.ui.cheatsheets"/>
       <tags>View</tags>
       <tags>categoryTag:Help</tags>
     </sharedElements>
-    <sharedElements xsi:type="advanced:Area" xmi:id="_JQ-BhrjoEe25NdJK2M4KYw" elementId="org.eclipse.ui.editorss" selectedElement="_JQ-Bh7joEe25NdJK2M4KYw">
-      <children xsi:type="basic:PartStack" xmi:id="_JQ-Bh7joEe25NdJK2M4KYw" elementId="org.eclipse.e4.primaryDataStack" selectedElement="_JQ-BkLjoEe25NdJK2M4KYw">
+    <sharedElements xsi:type="advanced:Area" xmi:id="_aZTpwKrbEe2-M8nuGout-A" elementId="org.eclipse.ui.editorss" selectedElement="_aZTpwarbEe2-M8nuGout-A">
+      <children xsi:type="basic:PartStack" xmi:id="_aZTpwarbEe2-M8nuGout-A" elementId="org.eclipse.e4.primaryDataStack" selectedElement="_cePEYLdcEe2-B5_2EaFYHw">
         <tags>org.eclipse.e4.primaryDataStack</tags>
         <tags>EditorStack</tags>
         <tags>active</tags>
-        <tags>noFocus</tags>
-        <children xsi:type="basic:Part" xmi:id="_JQ-BiLjoEe25NdJK2M4KYw" elementId="org.eclipse.e4.ui.compatibility.editor" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityEditor" label="Category.java" iconURI="platform:/plugin/org.eclipse.jdt.ui/icons/full/obj16/jcu_obj.png" closeable="true">
-          <persistedState key="memento" value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?>&#xD;&#xA;&lt;editor id=&quot;org.eclipse.jdt.ui.CompilationUnitEditor&quot; name=&quot;Category.java&quot; partName=&quot;Category.java&quot; title=&quot;Category.java&quot; tooltip=&quot;ShopmeCommon/src/main/java/com/shopme/common/entity/Category.java&quot;>&#xD;&#xA;&lt;input factoryID=&quot;org.eclipse.ui.part.FileEditorInputFactory&quot; path=&quot;/ShopmeCommon/src/main/java/com/shopme/common/entity/Category.java&quot;/>&#xD;&#xA;&lt;editorState selectionHorizontalPixel=&quot;0&quot; selectionLength=&quot;0&quot; selectionOffset=&quot;1952&quot; selectionTopPixel=&quot;1729&quot;/>&#xD;&#xA;&lt;/editor>"/>
+        <children xsi:type="basic:Part" xmi:id="_NRcUsLaZEe20XtEP1LKklA" elementId="org.eclipse.e4.ui.compatibility.editor" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityEditor" label="Category.java" iconURI="platform:/plugin/org.eclipse.jdt.ui/icons/full/obj16/jcu_obj.png" closeable="true">
+          <persistedState key="memento" value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?>&#xD;&#xA;&lt;editor id=&quot;org.eclipse.jdt.ui.CompilationUnitEditor&quot; name=&quot;Category.java&quot; partName=&quot;Category.java&quot; title=&quot;Category.java&quot; tooltip=&quot;ShopmeCommon/src/main/java/com/shopme/common/entity/Category.java&quot;>&#xD;&#xA;&lt;input factoryID=&quot;org.eclipse.ui.part.FileEditorInputFactory&quot; path=&quot;/ShopmeCommon/src/main/java/com/shopme/common/entity/Category.java&quot;/>&#xD;&#xA;&lt;editorState selectionHorizontalPixel=&quot;0&quot; selectionLength=&quot;0&quot; selectionOffset=&quot;3523&quot; selectionTopPixel=&quot;4745&quot;/>&#xD;&#xA;&lt;/editor>"/>
           <tags>Editor</tags>
           <tags>removeOnHide</tags>
           <tags>org.eclipse.jdt.ui.CompilationUnitEditor</tags>
         </children>
-        <children xsi:type="basic:Part" xmi:id="_JQ-BjLjoEe25NdJK2M4KYw" elementId="org.eclipse.e4.ui.compatibility.editor" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityEditor" label="CategoryRepository.java" iconURI="platform:/plugin/org.eclipse.jdt.ui/icons/full/obj16/jcu_obj.png" closeable="true">
+        <children xsi:type="basic:Part" xmi:id="_yPcUsLadEe20XtEP1LKklA" elementId="org.eclipse.e4.ui.compatibility.editor" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityEditor" label="CategoryRepository.java" iconURI="platform:/plugin/org.eclipse.jdt.ui/icons/full/obj16/jcu_obj.png" closeable="true">
           <persistedState key="memento" value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?>&#xD;&#xA;&lt;editor id=&quot;org.eclipse.jdt.ui.CompilationUnitEditor&quot; name=&quot;CategoryRepository.java&quot; partName=&quot;CategoryRepository.java&quot; title=&quot;CategoryRepository.java&quot; tooltip=&quot;ShopmeBackEnd/src/main/java/com/shopme/admin/category/CategoryRepository.java&quot;>&#xD;&#xA;&lt;input factoryID=&quot;org.eclipse.ui.part.FileEditorInputFactory&quot; path=&quot;/ShopmeBackEnd/src/main/java/com/shopme/admin/category/CategoryRepository.java&quot;/>&#xD;&#xA;&lt;editorState selectionHorizontalPixel=&quot;0&quot; selectionLength=&quot;0&quot; selectionOffset=&quot;518&quot; selectionTopPixel=&quot;0&quot;/>&#xD;&#xA;&lt;/editor>"/>
           <tags>Editor</tags>
           <tags>removeOnHide</tags>
           <tags>org.eclipse.jdt.ui.CompilationUnitEditor</tags>
         </children>
-        <children xsi:type="basic:Part" xmi:id="_JQ-BkLjoEe25NdJK2M4KYw" elementId="org.eclipse.e4.ui.compatibility.editor" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityEditor" label="CategoryService.java" iconURI="platform:/plugin/org.eclipse.jdt.ui/icons/full/obj16/jcu_obj.png" closeable="true">
-          <persistedState key="memento" value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?>&#xD;&#xA;&lt;editor id=&quot;org.eclipse.jdt.ui.CompilationUnitEditor&quot; name=&quot;CategoryService.java&quot; partName=&quot;CategoryService.java&quot; title=&quot;CategoryService.java&quot; tooltip=&quot;ShopmeBackEnd/src/main/java/com/shopme/admin/category/CategoryService.java&quot;>&#xD;&#xA;&lt;input factoryID=&quot;org.eclipse.ui.part.FileEditorInputFactory&quot; path=&quot;/ShopmeBackEnd/src/main/java/com/shopme/admin/category/CategoryService.java&quot;/>&#xD;&#xA;&lt;editorState selectionHorizontalPixel=&quot;0&quot; selectionLength=&quot;0&quot; selectionOffset=&quot;1641&quot; selectionTopPixel=&quot;1455&quot;/>&#xD;&#xA;&lt;/editor>"/>
+        <children xsi:type="basic:Part" xmi:id="_cePEYLdcEe2-B5_2EaFYHw" elementId="org.eclipse.e4.ui.compatibility.editor" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityEditor" label="CategoryService.java" iconURI="platform:/plugin/org.eclipse.jdt.ui/icons/full/obj16/jcu_obj.png" closeable="true">
+          <persistedState key="memento" value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?>&#xD;&#xA;&lt;editor id=&quot;org.eclipse.jdt.ui.CompilationUnitEditor&quot; name=&quot;CategoryService.java&quot; partName=&quot;CategoryService.java&quot; title=&quot;CategoryService.java&quot; tooltip=&quot;ShopmeBackEnd/src/main/java/com/shopme/admin/category/CategoryService.java&quot;>&#xD;&#xA;&lt;input factoryID=&quot;org.eclipse.ui.part.FileEditorInputFactory&quot; path=&quot;/ShopmeBackEnd/src/main/java/com/shopme/admin/category/CategoryService.java&quot;/>&#xD;&#xA;&lt;editorState selectionHorizontalPixel=&quot;0&quot; selectionLength=&quot;0&quot; selectionOffset=&quot;3408&quot; selectionTopPixel=&quot;3453&quot;/>&#xD;&#xA;&lt;/editor>"/>
           <tags>Editor</tags>
           <tags>removeOnHide</tags>
           <tags>org.eclipse.jdt.ui.CompilationUnitEditor</tags>
           <tags>active</tags>
+          <tags>activeOnClose</tags>
         </children>
-        <children xsi:type="basic:Part" xmi:id="_JQ-B47joEe25NdJK2M4KYw" elementId="org.eclipse.e4.ui.compatibility.editor" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityEditor" label="categories.html" iconURI="platform:/plugin/org.eclipse.wst.html.ui/icons/full/obj16/sourceEditor.gif" closeable="true">
-          <persistedState key="memento" value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?>&#xD;&#xA;&lt;editor id=&quot;org.eclipse.wst.html.core.htmlsource.source&quot; name=&quot;categories.html&quot; partName=&quot;categories.html&quot; title=&quot;categories.html&quot; tooltip=&quot;ShopmeBackEnd/src/main/resources/templates/categories/categories.html&quot;>&#xD;&#xA;&lt;input factoryID=&quot;org.eclipse.ui.part.FileEditorInputFactory&quot; path=&quot;/ShopmeBackEnd/src/main/resources/templates/categories/categories.html&quot;/>&#xD;&#xA;&lt;editorState selectionHorizontalPixel=&quot;0&quot; selectionLength=&quot;0&quot; selectionOffset=&quot;638&quot; selectionTopPixel=&quot;3612&quot;/>&#xD;&#xA;&lt;/editor>"/>
+        <children xsi:type="basic:Part" xmi:id="_4tS3ALkQEe25NdJK2M4KYw" elementId="org.eclipse.e4.ui.compatibility.editor" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityEditor" label="MvcConfig.java" iconURI="platform:/plugin/org.eclipse.jdt.ui/icons/full/obj16/jcu_obj.png" closeable="true">
+          <persistedState key="memento" value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?>&#xD;&#xA;&lt;editor id=&quot;org.eclipse.jdt.ui.CompilationUnitEditor&quot; name=&quot;MvcConfig.java&quot; partName=&quot;MvcConfig.java&quot; title=&quot;MvcConfig.java&quot; tooltip=&quot;ShopmeBackEnd/src/main/java/com/shopme/admin/MvcConfig.java&quot;>&#xD;&#xA;&lt;input factoryID=&quot;org.eclipse.ui.part.FileEditorInputFactory&quot; path=&quot;/ShopmeBackEnd/src/main/java/com/shopme/admin/MvcConfig.java&quot;/>&#xD;&#xA;&lt;editorState selectionHorizontalPixel=&quot;0&quot; selectionLength=&quot;0&quot; selectionOffset=&quot;0&quot; selectionTopPixel=&quot;714&quot;/>&#xD;&#xA;&lt;/editor>"/>
           <tags>Editor</tags>
           <tags>removeOnHide</tags>
-          <tags>org.eclipse.wst.html.core.htmlsource.source</tags>
+          <tags>org.eclipse.jdt.ui.CompilationUnitEditor</tags>
         </children>
-        <children xsi:type="basic:Part" xmi:id="_JQ-B6bjoEe25NdJK2M4KYw" elementId="org.eclipse.e4.ui.compatibility.editor" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityEditor" label="category_form.html" iconURI="platform:/plugin/org.eclipse.wst.html.ui/icons/full/obj16/sourceEditor.gif" closeable="true">
-          <persistedState key="memento" value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?>&#xD;&#xA;&lt;editor id=&quot;org.eclipse.wst.html.core.htmlsource.source&quot; name=&quot;category_form.html&quot; partName=&quot;category_form.html&quot; title=&quot;category_form.html&quot; tooltip=&quot;ShopmeBackEnd/src/main/resources/templates/categories/category_form.html&quot;>&#xD;&#xA;&lt;input factoryID=&quot;org.eclipse.ui.part.FileEditorInputFactory&quot; path=&quot;/ShopmeBackEnd/src/main/resources/templates/categories/category_form.html&quot;/>&#xD;&#xA;&lt;editorState selectionHorizontalPixel=&quot;0&quot; selectionLength=&quot;0&quot; selectionOffset=&quot;1466&quot; selectionTopPixel=&quot;672&quot;/>&#xD;&#xA;&lt;/editor>"/>
+        <children xsi:type="basic:Part" xmi:id="_bl1wgLmQEe2gnP6GWxiHSQ" elementId="org.eclipse.e4.ui.compatibility.editor" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityEditor" label="CategoryController.java" iconURI="platform:/plugin/org.eclipse.jdt.ui/icons/full/obj16/jcu_obj.png" closeable="true">
+          <persistedState key="memento" value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?>&#xD;&#xA;&lt;editor id=&quot;org.eclipse.jdt.ui.CompilationUnitEditor&quot; name=&quot;CategoryController.java&quot; partName=&quot;CategoryController.java&quot; title=&quot;CategoryController.java&quot; tooltip=&quot;ShopmeBackEnd/src/main/java/com/shopme/admin/category/CategoryController.java&quot;>&#xD;&#xA;&lt;input factoryID=&quot;org.eclipse.ui.part.FileEditorInputFactory&quot; path=&quot;/ShopmeBackEnd/src/main/java/com/shopme/admin/category/CategoryController.java&quot;/>&#xD;&#xA;&lt;editorState selectionHorizontalPixel=&quot;0&quot; selectionLength=&quot;0&quot; selectionOffset=&quot;2528&quot; selectionTopPixel=&quot;1727&quot;/>&#xD;&#xA;&lt;/editor>"/>
+          <tags>Editor</tags>
+          <tags>removeOnHide</tags>
+          <tags>org.eclipse.jdt.ui.CompilationUnitEditor</tags>
+        </children>
+        <children xsi:type="basic:Part" xmi:id="_rjAaALmfEe2PhdbZsFs5Qw" elementId="org.eclipse.e4.ui.compatibility.editor" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityEditor" label="category_form.html" iconURI="platform:/plugin/org.eclipse.wst.html.ui/icons/full/obj16/sourceEditor.gif" closeable="true">
+          <persistedState key="memento" value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?>&#xD;&#xA;&lt;editor id=&quot;org.eclipse.wst.html.core.htmlsource.source&quot; name=&quot;category_form.html&quot; partName=&quot;category_form.html&quot; title=&quot;category_form.html&quot; tooltip=&quot;ShopmeBackEnd/src/main/resources/templates/categories/category_form.html&quot;>&#xD;&#xA;&lt;input factoryID=&quot;org.eclipse.ui.part.FileEditorInputFactory&quot; path=&quot;/ShopmeBackEnd/src/main/resources/templates/categories/category_form.html&quot;/>&#xD;&#xA;&lt;editorState selectionHorizontalPixel=&quot;0&quot; selectionLength=&quot;0&quot; selectionOffset=&quot;1977&quot; selectionTopPixel=&quot;1215&quot;/>&#xD;&#xA;&lt;/editor>"/>
           <tags>Editor</tags>
           <tags>removeOnHide</tags>
           <tags>org.eclipse.wst.html.core.htmlsource.source</tags>
         </children>
-        <children xsi:type="basic:Part" xmi:id="_JQ-B77joEe25NdJK2M4KYw" elementId="org.eclipse.e4.ui.compatibility.editor" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityEditor" label="CategoryRepositoryTests.java" iconURI="platform:/plugin/org.eclipse.jdt.ui/icons/full/obj16/jcu_obj.png" closeable="true">
-          <persistedState key="memento" value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?>&#xD;&#xA;&lt;editor id=&quot;org.eclipse.jdt.ui.CompilationUnitEditor&quot; name=&quot;CategoryRepositoryTests.java&quot; partName=&quot;CategoryRepositoryTests.java&quot; title=&quot;CategoryRepositoryTests.java&quot; tooltip=&quot;ShopmeBackEnd/src/test/java/com/shopme/admin/category/CategoryRepositoryTests.java&quot;>&#xD;&#xA;&lt;input factoryID=&quot;org.eclipse.ui.part.FileEditorInputFactory&quot; path=&quot;/ShopmeBackEnd/src/test/java/com/shopme/admin/category/CategoryRepositoryTests.java&quot;/>&#xD;&#xA;&lt;editorState selectionHorizontalPixel=&quot;0&quot; selectionLength=&quot;0&quot; selectionOffset=&quot;3820&quot; selectionTopPixel=&quot;4112&quot;/>&#xD;&#xA;&lt;/editor>"/>
+        <children xsi:type="basic:Part" xmi:id="_Fu9HYLjNEe25NdJK2M4KYw" elementId="org.eclipse.e4.ui.compatibility.editor" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityEditor" label="categories.html" iconURI="platform:/plugin/org.eclipse.wst.html.ui/icons/full/obj16/sourceEditor.gif" closeable="true">
+          <persistedState key="memento" value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?>&#xD;&#xA;&lt;editor id=&quot;org.eclipse.wst.html.core.htmlsource.source&quot; name=&quot;categories.html&quot; partName=&quot;categories.html&quot; title=&quot;categories.html&quot; tooltip=&quot;ShopmeBackEnd/src/main/resources/templates/categories/categories.html&quot;>&#xD;&#xA;&lt;input factoryID=&quot;org.eclipse.ui.part.FileEditorInputFactory&quot; path=&quot;/ShopmeBackEnd/src/main/resources/templates/categories/categories.html&quot;/>&#xD;&#xA;&lt;editorState selectionHorizontalPixel=&quot;0&quot; selectionLength=&quot;0&quot; selectionOffset=&quot;6556&quot; selectionTopPixel=&quot;4987&quot;/>&#xD;&#xA;&lt;/editor>"/>
           <tags>Editor</tags>
           <tags>removeOnHide</tags>
-          <tags>org.eclipse.jdt.ui.CompilationUnitEditor</tags>
+          <tags>org.eclipse.wst.html.core.htmlsource.source</tags>
         </children>
-        <children xsi:type="basic:Part" xmi:id="_JQ-CP7joEe25NdJK2M4KYw" elementId="org.eclipse.e4.ui.compatibility.editor" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityEditor" label="CategoryController.java" iconURI="platform:/plugin/org.eclipse.jdt.ui/icons/full/obj16/jcu_obj.png" closeable="true">
-          <persistedState key="memento" value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?>&#xD;&#xA;&lt;editor id=&quot;org.eclipse.jdt.ui.CompilationUnitEditor&quot; name=&quot;CategoryController.java&quot; partName=&quot;CategoryController.java&quot; title=&quot;CategoryController.java&quot; tooltip=&quot;ShopmeBackEnd/src/main/java/com/shopme/admin/category/CategoryController.java&quot;>&#xD;&#xA;&lt;input factoryID=&quot;org.eclipse.ui.part.FileEditorInputFactory&quot; path=&quot;/ShopmeBackEnd/src/main/java/com/shopme/admin/category/CategoryController.java&quot;/>&#xD;&#xA;&lt;editorState selectionHorizontalPixel=&quot;0&quot; selectionLength=&quot;0&quot; selectionOffset=&quot;925&quot; selectionTopPixel=&quot;102&quot;/>&#xD;&#xA;&lt;/editor>"/>
+        <children xsi:type="basic:Part" xmi:id="_wEu48LnEEe2PhdbZsFs5Qw" elementId="org.eclipse.e4.ui.compatibility.editor" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityEditor" label="fragments.html" iconURI="platform:/plugin/org.eclipse.wst.html.ui/icons/full/obj16/sourceEditor.gif" closeable="true">
+          <persistedState key="memento" value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?>&#xD;&#xA;&lt;editor id=&quot;org.eclipse.wst.html.core.htmlsource.source&quot; name=&quot;fragments.html&quot; partName=&quot;fragments.html&quot; title=&quot;fragments.html&quot; tooltip=&quot;ShopmeBackEnd/src/main/resources/templates/fragments.html&quot;>&#xD;&#xA;&lt;input factoryID=&quot;org.eclipse.ui.part.FileEditorInputFactory&quot; path=&quot;/ShopmeBackEnd/src/main/resources/templates/fragments.html&quot;/>&#xD;&#xA;&lt;editorState selectionHorizontalPixel=&quot;0&quot; selectionLength=&quot;0&quot; selectionOffset=&quot;2389&quot; selectionTopPixel=&quot;1355&quot;/>&#xD;&#xA;&lt;/editor>"/>
           <tags>Editor</tags>
           <tags>removeOnHide</tags>
-          <tags>org.eclipse.jdt.ui.CompilationUnitEditor</tags>
+          <tags>org.eclipse.wst.html.core.htmlsource.source</tags>
         </children>
       </children>
     </sharedElements>
-    <sharedElements xsi:type="basic:Part" xmi:id="_JQ-CQ7joEe25NdJK2M4KYw" elementId="org.eclipse.jdt.ui.PackageExplorer" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView" label="Package Explorer" iconURI="platform:/plugin/org.eclipse.jdt.ui/icons/full/eview16/package.png" tooltip="" closeable="true">
+    <sharedElements xsi:type="basic:Part" xmi:id="_aZrdMKrbEe2-M8nuGout-A" elementId="org.eclipse.jdt.ui.PackageExplorer" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView" label="Package Explorer" iconURI="platform:/plugin/org.eclipse.jdt.ui/icons/full/eview16/package.png" tooltip="" closeable="true">
       <persistedState key="originalCompatibilityViewClass" value="org.eclipse.jdt.internal.ui.packageview.PackageExplorerPart"/>
       <persistedState key="originalCompatibilityViewBundle" value="org.eclipse.jdt.ui"/>
       <persistedState key="memento" value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?>&#xD;&#xA;&lt;view group_libraries=&quot;1&quot; layout=&quot;2&quot; linkWithEditor=&quot;0&quot; rootMode=&quot;1&quot; workingSetName=&quot;&quot;>&#xD;&#xA;&lt;customFilters userDefinedPatternsEnabled=&quot;false&quot;>&#xD;&#xA;&lt;xmlDefinedFilters>&#xD;&#xA;&lt;child filterId=&quot;org.eclipse.jdt.ui.PackageExplorer.StaticsFilter&quot; isEnabled=&quot;false&quot;/>&#xD;&#xA;&lt;child filterId=&quot;org.eclipse.buildship.ui.packageexplorer.filter.gradle.buildfolder&quot; isEnabled=&quot;true&quot;/>&#xD;&#xA;&lt;child filterId=&quot;org.eclipse.jdt.ui.PackageExplorer.NonSharedProjectsFilter&quot; isEnabled=&quot;false&quot;/>&#xD;&#xA;&lt;child filterId=&quot;org.eclipse.jdt.internal.ui.PackageExplorer.EmptyInnerPackageFilter&quot; isEnabled=&quot;true&quot;/>&#xD;&#xA;&lt;child filterId=&quot;org.eclipse.m2e.MavenModuleFilter&quot; isEnabled=&quot;false&quot;/>&#xD;&#xA;&lt;child filterId=&quot;org.eclipse.buildship.ui.packageexplorer.filter.gradle.subProject&quot; isEnabled=&quot;true&quot;/>&#xD;&#xA;&lt;child filterId=&quot;org.eclipse.jdt.ui.PackageExplorer.ClosedProjectsFilter&quot; isEnabled=&quot;false&quot;/>&#xD;&#xA;&lt;child filterId=&quot;org.eclipse.jdt.ui.PackageExplorer.EmptyLibraryContainerFilter&quot; isEnabled=&quot;true&quot;/>&#xD;&#xA;&lt;child filterId=&quot;org.eclipse.jdt.ui.PackageExplorer.PackageDeclarationFilter&quot; isEnabled=&quot;true&quot;/>&#xD;&#xA;&lt;child filterId=&quot;org.eclipse.pde.ui.BinaryProjectFilter1&quot; isEnabled=&quot;false&quot;/>&#xD;&#xA;&lt;child filterId=&quot;org.eclipse.jdt.ui.PackageExplorer.LocalTypesFilter&quot; isEnabled=&quot;false&quot;/>&#xD;&#xA;&lt;child filterId=&quot;org.eclipse.pde.ui.ExternalPluginLibrariesFilter1&quot; isEnabled=&quot;true&quot;/>&#xD;&#xA;&lt;child filterId=&quot;org.eclipse.jdt.ui.PackageExplorer.FieldsFilter&quot; isEnabled=&quot;false&quot;/>&#xD;&#xA;&lt;child filterId=&quot;org.eclipse.jdt.ui.PackageExplorer.NonJavaProjectsFilter&quot; isEnabled=&quot;false&quot;/>&#xD;&#xA;&lt;child filterId=&quot;org.eclipse.jdt.ui.PackageExplorer_patternFilterId_.*&quot; isEnabled=&quot;true&quot;/>&#xD;&#xA;&lt;child filterId=&quot;org.eclipse.jdt.ui.PackageExplorer.SyntheticMembersFilter&quot; isEnabled=&quot;true&quot;/>&#xD;&#xA;&lt;child filterId=&quot;org.eclipse.jdt.ui.PackageExplorer.ContainedLibraryFilter&quot; isEnabled=&quot;false&quot;/>&#xD;&#xA;&lt;child filterId=&quot;org.eclipse.jdt.internal.ui.PackageExplorer.HideInnerClassFilesFilter&quot; isEnabled=&quot;true&quot;/>&#xD;&#xA;&lt;child filterId=&quot;org.eclipse.jdt.ui.PackageExplorer.DeprecatedMembersFilter&quot; isEnabled=&quot;false&quot;/>&#xD;&#xA;&lt;child filterId=&quot;org.eclipse.jdt.ui.PackageExplorer.ImportDeclarationFilter&quot; isEnabled=&quot;true&quot;/>&#xD;&#xA;&lt;child filterId=&quot;org.eclipse.jdt.ui.PackageExplorer.NonJavaElementFilter&quot; isEnabled=&quot;false&quot;/>&#xD;&#xA;&lt;child filterId=&quot;org.eclipse.jdt.ui.PackageExplorer.LibraryFilter&quot; isEnabled=&quot;false&quot;/>&#xD;&#xA;&lt;child filterId=&quot;org.eclipse.jdt.ui.PackageExplorer.CuAndClassFileFilter&quot; isEnabled=&quot;false&quot;/>&#xD;&#xA;&lt;child filterId=&quot;org.eclipse.jdt.internal.ui.PackageExplorer.EmptyPackageFilter&quot; isEnabled=&quot;false&quot;/>&#xD;&#xA;&lt;child filterId=&quot;org.eclipse.jdt.ui.PackageExplorer.NonPublicFilter&quot; isEnabled=&quot;false&quot;/>&#xD;&#xA;&lt;/xmlDefinedFilters>&#xD;&#xA;&lt;/customFilters>&#xD;&#xA;&lt;/view>"/>
       <tags>View</tags>
       <tags>categoryTag:Java</tags>
-      <menus xmi:id="_JQ-CRLjoEe25NdJK2M4KYw" elementId="org.eclipse.jdt.ui.PackageExplorer">
+      <menus xmi:id="_asGC4KrbEe2-M8nuGout-A" elementId="org.eclipse.jdt.ui.PackageExplorer">
         <tags>ViewMenu</tags>
         <tags>menuContribution:menu</tags>
       </menus>
-      <toolbar xmi:id="_JQ-Cj7joEe25NdJK2M4KYw" elementId="org.eclipse.jdt.ui.PackageExplorer"/>
+      <toolbar xmi:id="_asGC4arbEe2-M8nuGout-A" elementId="org.eclipse.jdt.ui.PackageExplorer" visible="false"/>
     </sharedElements>
-    <sharedElements xsi:type="basic:Part" xmi:id="_JQ-Ck7joEe25NdJK2M4KYw" elementId="org.eclipse.jdt.ui.TypeHierarchy" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView" label="Type Hierarchy" iconURI="platform:/plugin/org.eclipse.jdt.ui/icons/full/eview16/class_hi.png" tooltip="" closeable="true">
+    <sharedElements xsi:type="basic:Part" xmi:id="_aZ0AEKrbEe2-M8nuGout-A" elementId="org.eclipse.jdt.ui.TypeHierarchy" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView" label="Type Hierarchy" iconURI="platform:/plugin/org.eclipse.jdt.ui/icons/full/eview16/class_hi.png" tooltip="" closeable="true">
       <persistedState key="originalCompatibilityViewClass" value="org.eclipse.jdt.internal.ui.typehierarchy.TypeHierarchyViewPart"/>
       <persistedState key="originalCompatibilityViewBundle" value="org.eclipse.jdt.ui"/>
       <tags>View</tags>
       <tags>categoryTag:Java</tags>
     </sharedElements>
-    <sharedElements xsi:type="basic:Part" xmi:id="_JQ-ClLjoEe25NdJK2M4KYw" elementId="org.eclipse.ui.navigator.ProjectExplorer" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView" label="Project Explorer" iconURI="platform:/plugin/org.eclipse.ui.navigator.resources/icons/full/eview16/resource_persp.png" tooltip="" closeable="true">
+    <sharedElements xsi:type="basic:Part" xmi:id="_aZ11QKrbEe2-M8nuGout-A" elementId="org.eclipse.ui.navigator.ProjectExplorer" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView" label="Project Explorer" iconURI="platform:/plugin/org.eclipse.ui.navigator.resources/icons/full/eview16/resource_persp.png" tooltip="" closeable="true">
       <persistedState key="originalCompatibilityViewClass" value="org.eclipse.ui.navigator.resources.ProjectExplorer"/>
       <persistedState key="originalCompatibilityViewBundle" value="org.eclipse.ui.navigator.resources"/>
       <tags>View</tags>
       <tags>categoryTag:General</tags>
-      <menus xmi:id="_JQ-ClbjoEe25NdJK2M4KYw" elementId="org.eclipse.ui.navigator.ProjectExplorer">
+      <menus xmi:id="_4uAkMLC2Ee26UITHIz0s8g" elementId="org.eclipse.ui.navigator.ProjectExplorer">
         <tags>ViewMenu</tags>
         <tags>menuContribution:menu</tags>
       </menus>
-      <toolbar xmi:id="_JQ-ClrjoEe25NdJK2M4KYw" elementId="org.eclipse.ui.navigator.ProjectExplorer" visible="false"/>
+      <toolbar xmi:id="_4uAkMbC2Ee26UITHIz0s8g" elementId="org.eclipse.ui.navigator.ProjectExplorer" visible="false"/>
     </sharedElements>
-    <sharedElements xsi:type="basic:Part" xmi:id="_JQ-Cl7joEe25NdJK2M4KYw" elementId="org.eclipse.ui.views.ProblemView" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView" label="Problems" iconURI="platform:/plugin/org.eclipse.ui.ide/icons/full/eview16/problems_view.png" tooltip="" closeable="true">
+    <sharedElements xsi:type="basic:Part" xmi:id="_aZ2cUKrbEe2-M8nuGout-A" elementId="org.eclipse.ui.views.ProblemView" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView" label="Problems" iconURI="platform:/plugin/org.eclipse.ui.ide/icons/full/eview16/problems_view.png" tooltip="" closeable="true">
       <persistedState key="originalCompatibilityViewClass" value="org.eclipse.ui.internal.views.markers.ProblemsView"/>
       <persistedState key="originalCompatibilityViewBundle" value="org.eclipse.ui.ide"/>
-      <persistedState key="memento" value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?>&#xD;&#xA;&lt;view PRIMARY_SORT_FIELD=&quot;org.eclipse.ui.ide.severityAndDescriptionField&quot; categoryGroup=&quot;org.eclipse.ui.ide.severity&quot; markerContentGenerator=&quot;org.eclipse.ui.ide.problemsGenerator&quot; partName=&quot;Problems&quot;>&#xD;&#xA;&lt;expanded>&#xD;&#xA;&lt;category IMemento.internal.id=&quot;Errors&quot;/>&#xD;&#xA;&lt;category IMemento.internal.id=&quot;Warnings&quot;/>&#xD;&#xA;&lt;/expanded>&#xD;&#xA;&lt;columnWidths org.eclipse.ui.ide.locationField=&quot;120&quot; org.eclipse.ui.ide.markerType=&quot;120&quot; org.eclipse.ui.ide.pathField=&quot;160&quot; org.eclipse.ui.ide.resourceField=&quot;120&quot; org.eclipse.ui.ide.severityAndDescriptionField=&quot;400&quot;/>&#xD;&#xA;&lt;visible IMemento.internal.id=&quot;org.eclipse.ui.ide.severityAndDescriptionField&quot;/>&#xD;&#xA;&lt;visible IMemento.internal.id=&quot;org.eclipse.ui.ide.resourceField&quot;/>&#xD;&#xA;&lt;visible IMemento.internal.id=&quot;org.eclipse.ui.ide.pathField&quot;/>&#xD;&#xA;&lt;visible IMemento.internal.id=&quot;org.eclipse.ui.ide.locationField&quot;/>&#xD;&#xA;&lt;visible IMemento.internal.id=&quot;org.eclipse.ui.ide.markerType&quot;/>&#xD;&#xA;&lt;/view>"/>
+      <persistedState key="memento" value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?>&#xD;&#xA;&lt;view PRIMARY_SORT_FIELD=&quot;org.eclipse.ui.ide.severityAndDescriptionField&quot; categoryGroup=&quot;org.eclipse.ui.ide.severity&quot; markerContentGenerator=&quot;org.eclipse.ui.ide.problemsGenerator&quot; partName=&quot;Problems&quot;>&#xD;&#xA;&lt;columnWidths org.eclipse.ui.ide.locationField=&quot;120&quot; org.eclipse.ui.ide.markerType=&quot;120&quot; org.eclipse.ui.ide.pathField=&quot;160&quot; org.eclipse.ui.ide.resourceField=&quot;120&quot; org.eclipse.ui.ide.severityAndDescriptionField=&quot;400&quot;/>&#xD;&#xA;&lt;visible IMemento.internal.id=&quot;org.eclipse.ui.ide.severityAndDescriptionField&quot;/>&#xD;&#xA;&lt;visible IMemento.internal.id=&quot;org.eclipse.ui.ide.resourceField&quot;/>&#xD;&#xA;&lt;visible IMemento.internal.id=&quot;org.eclipse.ui.ide.pathField&quot;/>&#xD;&#xA;&lt;visible IMemento.internal.id=&quot;org.eclipse.ui.ide.locationField&quot;/>&#xD;&#xA;&lt;visible IMemento.internal.id=&quot;org.eclipse.ui.ide.markerType&quot;/>&#xD;&#xA;&lt;/view>"/>
       <tags>View</tags>
       <tags>categoryTag:General</tags>
-      <menus xmi:id="_JQ-CmLjoEe25NdJK2M4KYw" elementId="org.eclipse.ui.views.ProblemView">
+      <menus xmi:id="_bRHbgKrbEe2-M8nuGout-A" elementId="org.eclipse.ui.views.ProblemView">
         <tags>ViewMenu</tags>
         <tags>menuContribution:menu</tags>
       </menus>
-      <toolbar xmi:id="_JQ-CmrjoEe25NdJK2M4KYw" elementId="org.eclipse.ui.views.ProblemView" visible="false"/>
+      <toolbar xmi:id="_bRICkKrbEe2-M8nuGout-A" elementId="org.eclipse.ui.views.ProblemView" visible="false"/>
     </sharedElements>
-    <sharedElements xsi:type="basic:Part" xmi:id="_JQ-CnbjoEe25NdJK2M4KYw" elementId="org.eclipse.jdt.ui.JavadocView" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView" label="Javadoc" iconURI="platform:/plugin/org.eclipse.jdt.ui/icons/full/eview16/javadoc.png" tooltip="" closeable="true">
+    <sharedElements xsi:type="basic:Part" xmi:id="_aZ3qcKrbEe2-M8nuGout-A" elementId="org.eclipse.jdt.ui.JavadocView" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView" label="Javadoc" iconURI="platform:/plugin/org.eclipse.jdt.ui/icons/full/eview16/javadoc.png" tooltip="" closeable="true">
       <persistedState key="originalCompatibilityViewClass" value="org.eclipse.jdt.internal.ui.infoviews.JavadocView"/>
       <persistedState key="originalCompatibilityViewBundle" value="org.eclipse.jdt.ui"/>
       <tags>View</tags>
       <tags>categoryTag:Java</tags>
     </sharedElements>
-    <sharedElements xsi:type="basic:Part" xmi:id="_JQ-CnrjoEe25NdJK2M4KYw" elementId="org.eclipse.jdt.ui.SourceView" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView" label="Declaration" iconURI="platform:/plugin/org.eclipse.jdt.ui/icons/full/eview16/source.png" tooltip="" closeable="true">
+    <sharedElements xsi:type="basic:Part" xmi:id="_aZ6GsKrbEe2-M8nuGout-A" elementId="org.eclipse.jdt.ui.SourceView" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView" label="Declaration" iconURI="platform:/plugin/org.eclipse.jdt.ui/icons/full/eview16/source.png" tooltip="" closeable="true">
       <persistedState key="originalCompatibilityViewClass" value="org.eclipse.jdt.internal.ui.infoviews.SourceView"/>
       <persistedState key="originalCompatibilityViewBundle" value="org.eclipse.jdt.ui"/>
       <tags>View</tags>
       <tags>categoryTag:Java</tags>
     </sharedElements>
-    <sharedElements xsi:type="basic:Part" xmi:id="_JQ-Cn7joEe25NdJK2M4KYw" elementId="org.eclipse.search.ui.views.SearchView" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView" label="Search" iconURI="platform:/plugin/org.eclipse.search/icons/full/eview16/searchres.png" tooltip="" closeable="true">
+    <sharedElements xsi:type="basic:Part" xmi:id="_aZ8i8KrbEe2-M8nuGout-A" elementId="org.eclipse.search.ui.views.SearchView" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView" label="Search" iconURI="platform:/plugin/org.eclipse.search/icons/full/eview16/searchres.png" tooltip="" closeable="true">
       <persistedState key="originalCompatibilityViewClass" value="org.eclipse.search2.internal.ui.SearchView"/>
       <persistedState key="originalCompatibilityViewBundle" value="org.eclipse.search"/>
       <persistedState key="memento" value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?>&#xD;&#xA;&lt;view isPinned=&quot;false&quot;>&#xD;&#xA;&lt;view IMemento.internal.id=&quot;org.eclipse.search.text.FileSearchResultPage&quot; org.eclipse.search.lastActivation=&quot;1&quot; org.eclipse.search.resultpage.layout=&quot;2&quot; org.eclipse.search.resultpage.limit=&quot;1000&quot; org.eclipse.search.resultpage.sorting=&quot;2&quot;/>&#xD;&#xA;&lt;view IMemento.internal.id=&quot;&quot; org.eclipse.search.lastActivation=&quot;0&quot;/>&#xD;&#xA;&lt;/view>"/>
       <tags>View</tags>
       <tags>categoryTag:General</tags>
-      <menus xmi:id="_JQ-CoLjoEe25NdJK2M4KYw" elementId="org.eclipse.search.ui.views.SearchView">
+      <menus xmi:id="_hstToLHmEe2sL9KyA62EbA" elementId="org.eclipse.search.ui.views.SearchView">
         <tags>ViewMenu</tags>
         <tags>menuContribution:menu</tags>
       </menus>
-      <toolbar xmi:id="_JQ-CobjoEe25NdJK2M4KYw" elementId="org.eclipse.search.ui.views.SearchView" visible="false"/>
+      <toolbar xmi:id="_hstTobHmEe2sL9KyA62EbA" elementId="org.eclipse.search.ui.views.SearchView" visible="false"/>
     </sharedElements>
-    <sharedElements xsi:type="basic:Part" xmi:id="_JQ-CorjoEe25NdJK2M4KYw" elementId="org.eclipse.ui.console.ConsoleView" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView" label="Console" iconURI="platform:/plugin/org.eclipse.ui.console/icons/full/cview16/console_view.png" tooltip="" closeable="true">
+    <sharedElements xsi:type="basic:Part" xmi:id="_aZ9xEKrbEe2-M8nuGout-A" elementId="org.eclipse.ui.console.ConsoleView" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView" label="Console" iconURI="platform:/plugin/org.eclipse.ui.console/icons/full/cview16/console_view.png" tooltip="" closeable="true">
       <persistedState key="originalCompatibilityViewClass" value="org.eclipse.ui.internal.console.ConsoleView"/>
       <persistedState key="originalCompatibilityViewBundle" value="org.eclipse.ui.console"/>
       <persistedState key="memento" value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?>&#xD;&#xA;&lt;view/>"/>
       <tags>View</tags>
       <tags>categoryTag:General</tags>
-      <menus xmi:id="_JQ-Co7joEe25NdJK2M4KYw" elementId="org.eclipse.ui.console.ConsoleView">
+      <menus xmi:id="_RUVrgKrqEe25KaLDBlP9pA" elementId="org.eclipse.ui.console.ConsoleView">
         <tags>ViewMenu</tags>
         <tags>menuContribution:menu</tags>
       </menus>
-      <toolbar xmi:id="_JQ-CprjoEe25NdJK2M4KYw" elementId="org.eclipse.ui.console.ConsoleView"/>
+      <toolbar xmi:id="_RUVrgarqEe25KaLDBlP9pA" elementId="org.eclipse.ui.console.ConsoleView" visible="false"/>
     </sharedElements>
-    <sharedElements xsi:type="basic:Part" xmi:id="_JQ-Cv7joEe25NdJK2M4KYw" elementId="org.eclipse.ui.views.BookmarkView" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView" label="Bookmarks" iconURI="platform:/plugin/org.eclipse.ui.ide/icons/full/eview16/bkmrk_nav.png" tooltip="" closeable="true">
+    <sharedElements xsi:type="basic:Part" xmi:id="_aZ_mQKrbEe2-M8nuGout-A" elementId="org.eclipse.ui.views.BookmarkView" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView" label="Bookmarks" iconURI="platform:/plugin/org.eclipse.ui.ide/icons/full/eview16/bkmrk_nav.png" tooltip="" closeable="true">
       <persistedState key="originalCompatibilityViewClass" value="org.eclipse.ui.internal.views.markers.BookmarksView"/>
       <persistedState key="originalCompatibilityViewBundle" value="org.eclipse.ui.ide"/>
       <tags>View</tags>
       <tags>categoryTag:General</tags>
     </sharedElements>
-    <sharedElements xsi:type="basic:Part" xmi:id="_JQ-CwLjoEe25NdJK2M4KYw" elementId="org.eclipse.ui.views.ProgressView" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView" label="Progress" iconURI="platform:/plugin/org.eclipse.ui.ide/icons/full/eview16/pview.png" tooltip="" closeable="true">
+    <sharedElements xsi:type="basic:Part" xmi:id="_aaA0YKrbEe2-M8nuGout-A" elementId="org.eclipse.ui.views.ProgressView" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView" label="Progress" iconURI="platform:/plugin/org.eclipse.ui.ide/icons/full/eview16/pview.png" tooltip="" closeable="true">
       <persistedState key="originalCompatibilityViewClass" value="org.eclipse.ui.internal.progress.ProgressView"/>
       <persistedState key="originalCompatibilityViewBundle" value="org.eclipse.ui.ide"/>
       <tags>View</tags>
       <tags>categoryTag:General</tags>
     </sharedElements>
-    <sharedElements xsi:type="basic:Part" xmi:id="_JQ-CwbjoEe25NdJK2M4KYw" elementId="org.eclipse.ui.views.ContentOutline" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView" label="Outline" iconURI="platform:/plugin/org.eclipse.ui.views/icons/full/eview16/outline_co.png" tooltip="" closeable="true">
+    <sharedElements xsi:type="basic:Part" xmi:id="_aaA0YarbEe2-M8nuGout-A" elementId="org.eclipse.ui.views.ContentOutline" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView" label="Outline" iconURI="platform:/plugin/org.eclipse.ui.views/icons/full/eview16/outline_co.png" tooltip="" closeable="true">
       <persistedState key="originalCompatibilityViewClass" value="org.eclipse.ui.views.contentoutline.ContentOutline"/>
       <persistedState key="originalCompatibilityViewBundle" value="org.eclipse.ui.views"/>
       <persistedState key="memento" value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?>&#xD;&#xA;&lt;view/>"/>
       <tags>View</tags>
       <tags>categoryTag:General</tags>
-      <menus xmi:id="_JQ-CwrjoEe25NdJK2M4KYw" elementId="org.eclipse.ui.views.ContentOutline">
+      <menus xmi:id="_bPC-8KrbEe2-M8nuGout-A" elementId="org.eclipse.ui.views.ContentOutline">
         <tags>ViewMenu</tags>
         <tags>menuContribution:menu</tags>
       </menus>
-      <toolbar xmi:id="_JQ-Cw7joEe25NdJK2M4KYw" elementId="org.eclipse.ui.views.ContentOutline" visible="false"/>
+      <toolbar xmi:id="_bPDmAKrbEe2-M8nuGout-A" elementId="org.eclipse.ui.views.ContentOutline" visible="false"/>
     </sharedElements>
-    <sharedElements xsi:type="basic:Part" xmi:id="_JQ-CxLjoEe25NdJK2M4KYw" elementId="org.eclipse.ui.texteditor.TemplatesView" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView" label="Templates" iconURI="platform:/plugin/org.eclipse.jdt.ui/icons/full/eview16/templates.png" tooltip="" closeable="true">
+    <sharedElements xsi:type="basic:Part" xmi:id="_aaBbcKrbEe2-M8nuGout-A" elementId="org.eclipse.ui.texteditor.TemplatesView" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView" label="Templates" iconURI="platform:/plugin/org.eclipse.jdt.ui/icons/full/eview16/templates.png" tooltip="" closeable="true">
       <persistedState key="originalCompatibilityViewClass" value="org.eclipse.ui.texteditor.templates.TemplatesView"/>
       <persistedState key="originalCompatibilityViewBundle" value="org.eclipse.jdt.ui"/>
       <tags>View</tags>
       <tags>categoryTag:General</tags>
     </sharedElements>
-    <sharedElements xsi:type="basic:Part" xmi:id="_JQ-CxbjoEe25NdJK2M4KYw" elementId="org.eclipse.ui.views.minimap.MinimapView" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView" label="Minimap" iconURI="platform:/plugin/org.eclipse.ui.workbench.texteditor/icons/full/eview16/minimap.png" tooltip="" closeable="true">
+    <sharedElements xsi:type="basic:Part" xmi:id="_abh3UKrbEe2-M8nuGout-A" elementId="org.eclipse.ui.views.minimap.MinimapView" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView" label="Minimap" iconURI="platform:/plugin/org.eclipse.ui.workbench.texteditor/icons/full/eview16/minimap.png" tooltip="" closeable="true">
       <persistedState key="originalCompatibilityViewClass" value="org.eclipse.ui.internal.views.minimap.MinimapView"/>
       <persistedState key="originalCompatibilityViewBundle" value="org.eclipse.ui.workbench.texteditor"/>
       <tags>View</tags>
       <tags>categoryTag:General</tags>
     </sharedElements>
-    <sharedElements xsi:type="basic:Part" xmi:id="_JQ-CxrjoEe25NdJK2M4KYw" elementId="org.eclipse.jdt.junit.ResultView" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView" label="JUnit" iconURI="platform:/plugin/org.eclipse.jdt.junit/icons/full/eview16/junit.png" tooltip="" closeable="true">
+    <sharedElements xsi:type="basic:Part" xmi:id="_abjsgKrbEe2-M8nuGout-A" elementId="org.eclipse.jdt.junit.ResultView" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView" label="JUnit" iconURI="platform:/plugin/org.eclipse.jdt.junit/icons/full/eview16/junit.png" tooltip="" closeable="true">
       <persistedState key="originalCompatibilityViewClass" value="org.eclipse.jdt.internal.junit.ui.TestRunnerViewPart"/>
       <persistedState key="originalCompatibilityViewBundle" value="org.eclipse.jdt.junit"/>
       <persistedState key="memento" value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?>&#xD;&#xA;&lt;view failuresOnly=&quot;false&quot; ignoredOnly=&quot;false&quot; layout=&quot;1&quot; orientation=&quot;2&quot; ratio=&quot;500&quot; scroll=&quot;false&quot; sortingCriterion=&quot;1&quot; time=&quot;true&quot;/>"/>
       <tags>View</tags>
       <tags>categoryTag:Java</tags>
-      <menus xmi:id="_JQ-Cx7joEe25NdJK2M4KYw" elementId="org.eclipse.jdt.junit.ResultView">
+      <menus xmi:id="_9DciwK3qEe23QP-loa7WWA" elementId="org.eclipse.jdt.junit.ResultView">
         <tags>ViewMenu</tags>
         <tags>menuContribution:menu</tags>
       </menus>
-      <toolbar xmi:id="_JQ-C2bjoEe25NdJK2M4KYw" elementId="org.eclipse.jdt.junit.ResultView" visible="false"/>
+      <toolbar xmi:id="_9Dciwa3qEe23QP-loa7WWA" elementId="org.eclipse.jdt.junit.ResultView" visible="false"/>
     </sharedElements>
-    <sharedElements xsi:type="basic:Part" xmi:id="_JQ-C5LjoEe25NdJK2M4KYw" elementId="org.eclipse.egit.ui.RepositoriesView" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView" label="Git Repositories" iconURI="platform:/plugin/org.eclipse.egit.ui/icons/eview16/repo_rep.png" tooltip="" closeable="true">
+    <sharedElements xsi:type="basic:Part" xmi:id="_abkTkKrbEe2-M8nuGout-A" elementId="org.eclipse.egit.ui.RepositoriesView" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView" label="Git Repositories" iconURI="platform:/plugin/org.eclipse.egit.ui/icons/eview16/repo_rep.png" tooltip="" closeable="true">
       <persistedState key="originalCompatibilityViewClass" value="org.eclipse.egit.ui.internal.repository.RepositoriesView"/>
       <persistedState key="originalCompatibilityViewBundle" value="org.eclipse.egit.ui"/>
       <tags>View</tags>
       <tags>categoryTag:Git</tags>
-      <menus xmi:id="_JQ-C5bjoEe25NdJK2M4KYw" elementId="org.eclipse.egit.ui.RepositoriesView">
+      <menus xmi:id="_vOYBALC2Ee26UITHIz0s8g" elementId="org.eclipse.egit.ui.RepositoriesView">
         <tags>ViewMenu</tags>
         <tags>menuContribution:menu</tags>
       </menus>
-      <toolbar xmi:id="_JQ-C5rjoEe25NdJK2M4KYw" elementId="org.eclipse.egit.ui.RepositoriesView" visible="false"/>
+      <toolbar xmi:id="_vOYBAbC2Ee26UITHIz0s8g" elementId="org.eclipse.egit.ui.RepositoriesView" visible="false"/>
     </sharedElements>
-    <sharedElements xsi:type="basic:Part" xmi:id="_JQ-C57joEe25NdJK2M4KYw" elementId="org.springframework.ide.eclipse.boot.dash.views.BootDashView" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView" label="Boot Dashboard" iconURI="platform:/plugin/org.springframework.ide.eclipse.boot.dash/icons/boot-icon.png" tooltip="" closeable="true">
+    <sharedElements xsi:type="basic:Part" xmi:id="_abmv0KrbEe2-M8nuGout-A" elementId="org.springframework.ide.eclipse.boot.dash.views.BootDashView" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView" label="Boot Dashboard" iconURI="platform:/plugin/org.springframework.ide.eclipse.boot.dash/icons/boot-icon.png" tooltip="" closeable="true">
       <persistedState key="originalCompatibilityViewClass" value="org.springframework.ide.eclipse.boot.dash.views.BootDashTreeView"/>
       <persistedState key="originalCompatibilityViewBundle" value="org.springframework.ide.eclipse.boot.dash"/>
       <persistedState key="memento" value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?>&#xD;&#xA;&lt;view/>"/>
       <tags>View</tags>
       <tags>categoryTag:Other</tags>
-      <menus xmi:id="_JQ-C6LjoEe25NdJK2M4KYw" elementId="org.springframework.ide.eclipse.boot.dash.views.BootDashView">
+      <menus xmi:id="_bGNMAKrbEe2-M8nuGout-A" elementId="org.springframework.ide.eclipse.boot.dash.views.BootDashView">
         <tags>ViewMenu</tags>
         <tags>menuContribution:menu</tags>
       </menus>
-      <toolbar xmi:id="_JQ-DA7joEe25NdJK2M4KYw" elementId="org.springframework.ide.eclipse.boot.dash.views.BootDashView"/>
+      <toolbar xmi:id="_bGNMAarbEe2-M8nuGout-A" elementId="org.springframework.ide.eclipse.boot.dash.views.BootDashView" visible="false"/>
     </sharedElements>
-    <sharedElements xsi:type="basic:Part" xmi:id="_JQ-DD7joEe25NdJK2M4KYw" elementId="org.eclipse.tm.terminal.view.ui.TerminalsView" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView" label="Terminal" iconURI="platform:/plugin/org.eclipse.tm.terminal.view.ui/icons/eview16/terminal_view.gif" tooltip="" closeable="true">
+    <sharedElements xsi:type="basic:Part" xmi:id="_abn98KrbEe2-M8nuGout-A" elementId="org.eclipse.tm.terminal.view.ui.TerminalsView" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView" label="Terminal" iconURI="platform:/plugin/org.eclipse.tm.terminal.view.ui/icons/eview16/terminal_view.gif" tooltip="" closeable="true">
       <persistedState key="originalCompatibilityViewClass" value="org.eclipse.tm.terminal.view.ui.view.TerminalsView"/>
       <persistedState key="originalCompatibilityViewBundle" value="org.eclipse.tm.terminal.view.ui"/>
       <tags>View</tags>
       <tags>categoryTag:Terminal</tags>
     </sharedElements>
-    <sharedElements xsi:type="basic:Part" xmi:id="_JQ-DELjoEe25NdJK2M4KYw" elementId="org.eclipse.ant.ui.views.AntView" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView" label="Ant" iconURI="platform:/plugin/org.eclipse.ant.ui/icons/full/eview16/ant_view.png" tooltip="" closeable="true">
+    <sharedElements xsi:type="basic:Part" xmi:id="_abn98arbEe2-M8nuGout-A" elementId="org.eclipse.ant.ui.views.AntView" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView" label="Ant" iconURI="platform:/plugin/org.eclipse.ant.ui/icons/full/eview16/ant_view.png" tooltip="" closeable="true">
       <persistedState key="originalCompatibilityViewClass" value="org.eclipse.ant.internal.ui.views.AntView"/>
       <persistedState key="originalCompatibilityViewBundle" value="org.eclipse.ant.ui"/>
       <tags>View</tags>
       <tags>categoryTag:Ant</tags>
     </sharedElements>
-    <sharedElements xsi:type="basic:Part" xmi:id="_JQ-DEbjoEe25NdJK2M4KYw" elementId="org.eclipse.debug.ui.DebugView" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView" label="Debug" iconURI="platform:/plugin/org.eclipse.debug.ui/icons/full/eview16/debug_view.png" tooltip="" closeable="true">
+    <sharedElements xsi:type="basic:Part" xmi:id="_Rum5wKr3Ee26usPLCNWeQg" elementId="org.eclipse.debug.ui.DebugView" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView" label="Debug" iconURI="platform:/plugin/org.eclipse.debug.ui/icons/full/eview16/debug_view.png" tooltip="" closeable="true">
       <persistedState key="originalCompatibilityViewBundle" value="org.eclipse.debug.ui"/>
       <persistedState key="originalCompatibilityViewClass" value="org.eclipse.debug.internal.ui.views.launch.LaunchView"/>
       <persistedState key="memento" value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?>&#xD;&#xA;&lt;view/>"/>
       <tags>View</tags>
       <tags>categoryTag:Debug</tags>
-      <menus xmi:id="_JQ-DErjoEe25NdJK2M4KYw" elementId="org.eclipse.debug.ui.DebugView">
+      <menus xmi:id="_RvMvoKr3Ee26usPLCNWeQg" elementId="org.eclipse.debug.ui.DebugView">
         <tags>ViewMenu</tags>
         <tags>menuContribution:menu</tags>
       </menus>
-      <toolbar xmi:id="_JQ-DE7joEe25NdJK2M4KYw" elementId="org.eclipse.debug.ui.DebugView" visible="false"/>
+      <toolbar xmi:id="_RvMvoar3Ee26usPLCNWeQg" elementId="org.eclipse.debug.ui.DebugView" visible="false"/>
     </sharedElements>
-    <sharedElements xsi:type="basic:Part" xmi:id="_JQ-DFLjoEe25NdJK2M4KYw" elementId="org.eclipse.team.ui.GenericHistoryView" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView" label="History" iconURI="platform:/plugin/org.eclipse.team.ui/icons/full/eview16/history_view.png" tooltip="" closeable="true">
+    <sharedElements xsi:type="basic:Part" xmi:id="_vLXwULC2Ee26UITHIz0s8g" elementId="org.eclipse.team.ui.GenericHistoryView" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView" label="History" iconURI="platform:/plugin/org.eclipse.team.ui/icons/full/eview16/history_view.png" tooltip="" closeable="true">
       <persistedState key="originalCompatibilityViewBundle" value="org.eclipse.team.ui"/>
       <persistedState key="originalCompatibilityViewClass" value="org.eclipse.team.internal.ui.history.GenericHistoryView"/>
       <tags>View</tags>
       <tags>categoryTag:Version Control (Team)</tags>
-      <menus xmi:id="_JQ-DFbjoEe25NdJK2M4KYw" elementId="org.eclipse.team.ui.GenericHistoryView">
+      <menus xmi:id="_vSXJILC2Ee26UITHIz0s8g" elementId="org.eclipse.team.ui.GenericHistoryView">
         <tags>ViewMenu</tags>
         <tags>menuContribution:menu</tags>
       </menus>
-      <toolbar xmi:id="_JQ-DFrjoEe25NdJK2M4KYw" elementId="org.eclipse.team.ui.GenericHistoryView" visible="false"/>
+      <toolbar xmi:id="_vSXJIbC2Ee26UITHIz0s8g" elementId="org.eclipse.team.ui.GenericHistoryView" visible="false"/>
     </sharedElements>
-    <sharedElements xsi:type="basic:Part" xmi:id="_JQ-DF7joEe25NdJK2M4KYw" elementId="org.eclipse.team.sync.views.SynchronizeView" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView" label="Synchronize" iconURI="platform:/plugin/org.eclipse.team.ui/icons/full/eview16/synch_synch.png" tooltip="" closeable="true">
+    <sharedElements xsi:type="basic:Part" xmi:id="_vLYXYLC2Ee26UITHIz0s8g" elementId="org.eclipse.team.sync.views.SynchronizeView" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView" label="Synchronize" iconURI="platform:/plugin/org.eclipse.team.ui/icons/full/eview16/synch_synch.png" tooltip="" closeable="true">
       <persistedState key="originalCompatibilityViewBundle" value="org.eclipse.team.ui"/>
       <persistedState key="originalCompatibilityViewClass" value="org.eclipse.team.internal.ui.synchronize.SynchronizeView"/>
       <tags>View</tags>
       <tags>categoryTag:Version Control (Team)</tags>
     </sharedElements>
-    <sharedElements xsi:type="basic:Part" xmi:id="_JQ-DGLjoEe25NdJK2M4KYw" elementId="org.eclipse.egit.ui.StagingView" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView" label="Git Staging" iconURI="platform:/plugin/org.eclipse.egit.ui/icons/eview16/staging.png" tooltip="" closeable="true">
+    <sharedElements xsi:type="basic:Part" xmi:id="_vLY-cLC2Ee26UITHIz0s8g" elementId="org.eclipse.egit.ui.StagingView" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView" label="Git Staging" iconURI="platform:/plugin/org.eclipse.egit.ui/icons/eview16/staging.png" tooltip="" closeable="true">
       <persistedState key="originalCompatibilityViewBundle" value="org.eclipse.egit.ui"/>
       <persistedState key="originalCompatibilityViewClass" value="org.eclipse.egit.ui.internal.staging.StagingView"/>
       <tags>View</tags>
       <tags>categoryTag:Git</tags>
     </sharedElements>
-    <sharedElements xsi:type="basic:Part" xmi:id="_JQ-DGbjoEe25NdJK2M4KYw" elementId="org.eclipse.egit.ui.ReflogView" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView" label="Git Reflog" iconURI="platform:/plugin/org.eclipse.egit.ui/icons/eview16/reflog.png" tooltip="" closeable="true">
+    <sharedElements xsi:type="basic:Part" xmi:id="_vLY-cbC2Ee26UITHIz0s8g" elementId="org.eclipse.egit.ui.ReflogView" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView" label="Git Reflog" iconURI="platform:/plugin/org.eclipse.egit.ui/icons/eview16/reflog.png" tooltip="" closeable="true">
       <persistedState key="originalCompatibilityViewBundle" value="org.eclipse.egit.ui"/>
       <persistedState key="originalCompatibilityViewClass" value="org.eclipse.egit.ui.internal.reflog.ReflogView"/>
       <tags>View</tags>
       <tags>categoryTag:Git</tags>
     </sharedElements>
-    <sharedElements xsi:type="basic:Part" xmi:id="_JQ-DGrjoEe25NdJK2M4KYw" elementId="org.eclipse.ui.views.PropertySheet" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView" label="Properties" iconURI="platform:/plugin/org.eclipse.ui.views/icons/full/eview16/prop_ps.png" tooltip="" closeable="true">
+    <sharedElements xsi:type="basic:Part" xmi:id="_vLZlgLC2Ee26UITHIz0s8g" elementId="org.eclipse.ui.views.PropertySheet" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView" label="Properties" iconURI="platform:/plugin/org.eclipse.ui.views/icons/full/eview16/prop_ps.png" tooltip="" closeable="true">
       <persistedState key="originalCompatibilityViewBundle" value="org.eclipse.ui.views"/>
       <persistedState key="originalCompatibilityViewClass" value="org.eclipse.ui.views.properties.PropertySheet"/>
       <tags>View</tags>
       <tags>categoryTag:General</tags>
-      <menus xmi:id="_JQ-DG7joEe25NdJK2M4KYw" elementId="org.eclipse.ui.views.PropertySheet">
+      <menus xmi:id="_vaxeQLC2Ee26UITHIz0s8g" elementId="org.eclipse.ui.views.PropertySheet">
         <tags>ViewMenu</tags>
         <tags>menuContribution:menu</tags>
       </menus>
-      <toolbar xmi:id="_JQ-DHLjoEe25NdJK2M4KYw" elementId="org.eclipse.ui.views.PropertySheet" visible="false"/>
+      <toolbar xmi:id="_vaxeQbC2Ee26UITHIz0s8g" elementId="org.eclipse.ui.views.PropertySheet" visible="false"/>
     </sharedElements>
-    <sharedElements xsi:type="basic:Part" xmi:id="_JQ-DHbjoEe25NdJK2M4KYw" elementId="org.eclipse.ui.views.ResourceNavigator" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView" label="Navigator (Deprecated)" iconURI="platform:/plugin/org.eclipse.ui.ide/icons/full/eview16/filenav_nav.png" tooltip="" closeable="true">
+    <sharedElements xsi:type="basic:Part" xmi:id="_4taHQLC2Ee26UITHIz0s8g" elementId="org.eclipse.ui.views.ResourceNavigator" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView" label="Navigator (Deprecated)" iconURI="platform:/plugin/org.eclipse.ui.ide/icons/full/eview16/filenav_nav.png" tooltip="" closeable="true">
       <persistedState key="originalCompatibilityViewBundle" value="org.eclipse.ui.ide"/>
       <persistedState key="originalCompatibilityViewClass" value="org.eclipse.ui.views.navigator.ResourceNavigator"/>
       <tags>View</tags>
       <tags>categoryTag:General</tags>
     </sharedElements>
-    <sharedElements xsi:type="basic:Part" xmi:id="_JQ-DHrjoEe25NdJK2M4KYw" elementId="org.eclipse.wst.server.ui.ServersView" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView" label="Servers" iconURI="platform:/plugin/org.eclipse.wst.server.ui/icons/cview16/servers_view.gif" tooltip="" closeable="true">
+    <sharedElements xsi:type="basic:Part" xmi:id="_4tcjgLC2Ee26UITHIz0s8g" elementId="org.eclipse.wst.server.ui.ServersView" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView" label="Servers" iconURI="platform:/plugin/org.eclipse.wst.server.ui/icons/cview16/servers_view.gif" tooltip="" closeable="true">
       <persistedState key="originalCompatibilityViewBundle" value="org.eclipse.wst.server.ui"/>
       <persistedState key="originalCompatibilityViewClass" value="org.eclipse.wst.server.ui.internal.cnf.ServersView2"/>
       <tags>View</tags>
       <tags>categoryTag:Server</tags>
-      <menus xmi:id="_JQ-DH7joEe25NdJK2M4KYw" elementId="org.eclipse.wst.server.ui.ServersView">
+      <menus xmi:id="_6wv4ALC2Ee26UITHIz0s8g" elementId="org.eclipse.wst.server.ui.ServersView">
         <tags>ViewMenu</tags>
         <tags>menuContribution:menu</tags>
       </menus>
-      <toolbar xmi:id="_JQ-DILjoEe25NdJK2M4KYw" elementId="org.eclipse.wst.server.ui.ServersView" visible="false"/>
+      <toolbar xmi:id="_6wv4AbC2Ee26UITHIz0s8g" elementId="org.eclipse.wst.server.ui.ServersView" visible="false"/>
     </sharedElements>
-    <sharedElements xsi:type="basic:Part" xmi:id="_JQ-DIbjoEe25NdJK2M4KYw" elementId="org.eclipse.wst.common.snippets.internal.ui.SnippetsView" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView" label="Snippets" iconURI="platform:/plugin/org.eclipse.wst.common.snippets/icons/snippets_view.gif" tooltip="" closeable="true">
+    <sharedElements xsi:type="basic:Part" xmi:id="_4tdKkLC2Ee26UITHIz0s8g" elementId="org.eclipse.wst.common.snippets.internal.ui.SnippetsView" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView" label="Snippets" iconURI="platform:/plugin/org.eclipse.wst.common.snippets/icons/snippets_view.gif" tooltip="" closeable="true">
       <persistedState key="originalCompatibilityViewBundle" value="org.eclipse.wst.common.snippets"/>
       <persistedState key="originalCompatibilityViewClass" value="org.eclipse.wst.common.snippets.internal.ui.SnippetsView"/>
       <tags>View</tags>
       <tags>categoryTag:General</tags>
     </sharedElements>
-    <sharedElements xsi:type="basic:Part" xmi:id="_JQ-DIrjoEe25NdJK2M4KYw" elementId="org.eclipse.ui.views.TaskList" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView" label="Tasks" iconURI="platform:/plugin/org.eclipse.ui.ide/icons/full/eview16/tasks_tsk.png" tooltip="" closeable="true">
+    <sharedElements xsi:type="basic:Part" xmi:id="_4tdxoLC2Ee26UITHIz0s8g" elementId="org.eclipse.ui.views.TaskList" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView" label="Tasks" iconURI="platform:/plugin/org.eclipse.ui.ide/icons/full/eview16/tasks_tsk.png" tooltip="" closeable="true">
       <persistedState key="originalCompatibilityViewBundle" value="org.eclipse.ui.ide"/>
       <persistedState key="originalCompatibilityViewClass" value="org.eclipse.ui.internal.views.markers.TasksView"/>
       <tags>View</tags>
       <tags>categoryTag:General</tags>
     </sharedElements>
-    <sharedElements xsi:type="basic:Part" xmi:id="_JQ-DI7joEe25NdJK2M4KYw" elementId="org.eclipse.pde.runtime.LogView" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView" label="Error Log" iconURI="platform:/plugin/org.eclipse.ui.views.log/icons/eview16/error_log.png" tooltip="" closeable="true">
+    <sharedElements xsi:type="basic:Part" xmi:id="_u326wLHwEe2sL9KyA62EbA" elementId="org.eclipse.pde.runtime.LogView" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView" label="Error Log" iconURI="platform:/plugin/org.eclipse.ui.views.log/icons/eview16/error_log.png" tooltip="" closeable="true">
       <persistedState key="originalCompatibilityViewBundle" value="org.eclipse.ui.views.log"/>
       <persistedState key="originalCompatibilityViewClass" value="org.eclipse.ui.internal.views.log.LogView"/>
       <persistedState key="memento" value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?>&#xD;&#xA;&lt;view activate=&quot;true&quot; allSessions=&quot;true&quot; column2=&quot;300&quot; column3=&quot;150&quot; column4=&quot;150&quot; error=&quot;true&quot; groupBy=&quot;0&quot; info=&quot;true&quot; limit=&quot;50&quot; maxLogTailSize=&quot;1&quot; ok=&quot;true&quot; orderType=&quot;2&quot; orderValue=&quot;-1&quot; show_filter_text=&quot;true&quot; useLimit=&quot;true&quot; warning=&quot;true&quot;/>"/>
       <tags>View</tags>
       <tags>categoryTag:General</tags>
-      <menus xmi:id="_JQ-DJLjoEe25NdJK2M4KYw" elementId="org.eclipse.pde.runtime.LogView">
+      <menus xmi:id="_u5pDcLHwEe2sL9KyA62EbA" elementId="org.eclipse.pde.runtime.LogView">
         <tags>ViewMenu</tags>
         <tags>menuContribution:menu</tags>
       </menus>
-      <toolbar xmi:id="_JQ-DJbjoEe25NdJK2M4KYw" elementId="org.eclipse.pde.runtime.LogView" visible="false"/>
+      <toolbar xmi:id="_u5pDcbHwEe2sL9KyA62EbA" elementId="org.eclipse.pde.runtime.LogView" visible="false"/>
     </sharedElements>
-    <trimBars xmi:id="_JQ-DJrjoEe25NdJK2M4KYw" elementId="org.eclipse.ui.main.toolbar" contributorURI="platform:/plugin/org.eclipse.platform">
-      <children xsi:type="menu:ToolBar" xmi:id="_JQ-DJ7joEe25NdJK2M4KYw" visible="false">
+    <trimBars xmi:id="_ZFeDUarbEe2-M8nuGout-A" elementId="org.eclipse.ui.main.toolbar" contributorURI="platform:/plugin/org.eclipse.platform">
+      <children xsi:type="menu:ToolBar" xmi:id="_aDi1IKrbEe2-M8nuGout-A" visible="false">
         <tags>toolbarSeparator</tags>
         <tags>Draggable</tags>
       </children>
-      <children xsi:type="menu:ToolBar" xmi:id="_JQ-DKbjoEe25NdJK2M4KYw" elementId="org.eclipse.ui.workbench.file">
+      <children xsi:type="menu:ToolBar" xmi:id="_aDlRYKrbEe2-M8nuGout-A" elementId="org.eclipse.ui.workbench.file">
         <tags>Draggable</tags>
-        <children xsi:type="menu:HandledToolItem" xmi:id="_JQ-DMbjoEe25NdJK2M4KYw" elementId="print" visible="false" iconURI="platform:/plugin/org.eclipse.ui/icons/full/etool16/print_edit.png" tooltip="Print" command="_JQ_5X7joEe25NdJK2M4KYw"/>
+        <children xsi:type="menu:HandledToolItem" xmi:id="_bM_8QLmcEe2PhdbZsFs5Qw" elementId="print" visible="false" iconURI="platform:/plugin/org.eclipse.ui/icons/full/etool16/print_edit.png" tooltip="Print" command="_ZGae5arbEe2-M8nuGout-A"/>
       </children>
-      <children xsi:type="menu:ToolBar" xmi:id="_JQ-DNrjoEe25NdJK2M4KYw" elementId="group.edit" toBeRendered="false">
+      <children xsi:type="menu:ToolBar" xmi:id="_aDl4cKrbEe2-M8nuGout-A" elementId="group.edit" toBeRendered="false">
         <tags>toolbarSeparator</tags>
-        <children xsi:type="menu:ToolBarSeparator" xmi:id="_JQ-DN7joEe25NdJK2M4KYw" elementId="group.edit" toBeRendered="false"/>
+        <children xsi:type="menu:ToolBarSeparator" xmi:id="_aDl4carbEe2-M8nuGout-A" elementId="group.edit" toBeRendered="false"/>
       </children>
-      <children xsi:type="menu:ToolBar" xmi:id="_JQ-DOLjoEe25NdJK2M4KYw" elementId="org.eclipse.ui.workbench.edit" visible="false">
+      <children xsi:type="menu:ToolBar" xmi:id="_aDmfgKrbEe2-M8nuGout-A" elementId="org.eclipse.ui.workbench.edit" visible="false">
         <tags>Draggable</tags>
       </children>
-      <children xsi:type="menu:ToolBar" xmi:id="_JQ-DPLjoEe25NdJK2M4KYw" elementId="additions" toBeRendered="false">
+      <children xsi:type="menu:ToolBar" xmi:id="_aDnGkKrbEe2-M8nuGout-A" elementId="additions" toBeRendered="false">
         <tags>toolbarSeparator</tags>
-        <children xsi:type="menu:ToolBarSeparator" xmi:id="_JQ-DPbjoEe25NdJK2M4KYw" elementId="additions" toBeRendered="false"/>
+        <children xsi:type="menu:ToolBarSeparator" xmi:id="_aDnGkarbEe2-M8nuGout-A" elementId="additions" toBeRendered="false"/>
       </children>
-      <children xsi:type="menu:ToolBar" xmi:id="_JQ-Da7joEe25NdJK2M4KYw" elementId="org.eclipse.wst.server.ui.internal.webbrowser.actionSet" visible="false">
+      <children xsi:type="menu:ToolBar" xmi:id="_43ug4LC2Ee26UITHIz0s8g" elementId="org.eclipse.wst.server.ui.internal.webbrowser.actionSet" visible="false">
         <tags>Draggable</tags>
       </children>
-      <children xsi:type="menu:ToolBar" xmi:id="_JQ-DbLjoEe25NdJK2M4KYw" elementId="org.eclipse.wst.web.ui.wizardsActionSet" visible="false">
+      <children xsi:type="menu:ToolBar" xmi:id="_42-S8LC2Ee26UITHIz0s8g" elementId="org.eclipse.wst.web.ui.wizardsActionSet" visible="false">
         <tags>Draggable</tags>
       </children>
-      <children xsi:type="menu:ToolBar" xmi:id="_JQ-DbbjoEe25NdJK2M4KYw" elementId="org.eclipse.ui.edit.text.actionSet.presentation">
+      <children xsi:type="menu:ToolBar" xmi:id="_hQGwMKrgEe2jfaj98zN2qQ" elementId="org.eclipse.ui.edit.text.actionSet.presentation">
         <tags>Draggable</tags>
       </children>
-      <children xsi:type="menu:ToolBar" xmi:id="_JQ-Dd7joEe25NdJK2M4KYw" elementId="org.eclipse.debug.ui.launchActionSet">
+      <children xsi:type="menu:ToolBar" xmi:id="_ai3OYKrbEe2-M8nuGout-A" elementId="org.eclipse.debug.ui.launchActionSet">
         <tags>Draggable</tags>
       </children>
-      <children xsi:type="menu:ToolBar" xmi:id="_JQ-DfrjoEe25NdJK2M4KYw" elementId="org.eclipse.jdt.ui.JavaElementCreationActionSet">
+      <children xsi:type="menu:ToolBar" xmi:id="_agZwQKrbEe2-M8nuGout-A" elementId="org.eclipse.jdt.ui.JavaElementCreationActionSet">
         <tags>Draggable</tags>
       </children>
-      <children xsi:type="menu:ToolBar" xmi:id="_JQ-Dg7joEe25NdJK2M4KYw" elementId="org.eclipse.search.searchActionSet">
+      <children xsi:type="menu:ToolBar" xmi:id="_aiT0wKrbEe2-M8nuGout-A" elementId="org.eclipse.search.searchActionSet">
         <tags>Draggable</tags>
       </children>
-      <children xsi:type="menu:ToolBar" xmi:id="_JQ-Dh7joEe25NdJK2M4KYw" elementId="group.nav" toBeRendered="false">
+      <children xsi:type="menu:ToolBar" xmi:id="_aDnGkqrbEe2-M8nuGout-A" elementId="group.nav" toBeRendered="false">
         <tags>toolbarSeparator</tags>
-        <children xsi:type="menu:ToolBarSeparator" xmi:id="_JQ-DiLjoEe25NdJK2M4KYw" elementId="group.nav" toBeRendered="false"/>
-      </children>
-      <children xsi:type="menu:ToolBar" xmi:id="_JQ-DibjoEe25NdJK2M4KYw" elementId="org.eclipse.ui.workbench.navigate">
-        <tags>Draggable</tags>
-        <children xsi:type="menu:HandledToolItem" xmi:id="_JQ-Dj7joEe25NdJK2M4KYw" elementId="org.eclipse.ui.window.pinEditor" iconURI="platform:/plugin/org.eclipse.ui/icons/full/etool16/pin_editor.png" tooltip="Pin Editor" type="Check" command="_JQ_5GrjoEe25NdJK2M4KYw"/>
-      </children>
-      <children xsi:type="menu:ToolBar" xmi:id="_JQ-DlLjoEe25NdJK2M4KYw" elementId="org.eclipse.jdt.ui.CompilationUnitEditor" visible="false">
-        <tags>Draggable</tags>
+        <children xsi:type="menu:ToolBarSeparator" xmi:id="_aDnGk6rbEe2-M8nuGout-A" elementId="group.nav" toBeRendered="false"/>
       </children>
-      <children xsi:type="menu:ToolBar" xmi:id="_JQ-DlbjoEe25NdJK2M4KYw" elementId="org.eclipse.wst.html.core.htmlsource.source" visible="false">
+      <children xsi:type="menu:ToolBar" xmi:id="_aDoUsKrbEe2-M8nuGout-A" elementId="org.eclipse.ui.workbench.navigate">
         <tags>Draggable</tags>
+        <children xsi:type="menu:HandledToolItem" xmi:id="_bNBxcbmcEe2PhdbZsFs5Qw" elementId="org.eclipse.ui.window.pinEditor" iconURI="platform:/plugin/org.eclipse.ui/icons/full/etool16/pin_editor.png" tooltip="Pin Editor" type="Check" command="_ZGaeoKrbEe2-M8nuGout-A"/>
       </children>
-      <children xsi:type="menu:ToolBar" xmi:id="_JQ-DlrjoEe25NdJK2M4KYw" elementId="group.editor" toBeRendered="false">
+      <children xsi:type="menu:ToolBar" xmi:id="_aDpi0KrbEe2-M8nuGout-A" elementId="group.editor" toBeRendered="false">
         <tags>toolbarSeparator</tags>
-        <children xsi:type="menu:ToolBarSeparator" xmi:id="_JQ-Dl7joEe25NdJK2M4KYw" elementId="group.editor" toBeRendered="false"/>
+        <children xsi:type="menu:ToolBarSeparator" xmi:id="_aDqJ4KrbEe2-M8nuGout-A" elementId="group.editor" toBeRendered="false"/>
       </children>
-      <children xsi:type="menu:ToolBar" xmi:id="_JQ-DmLjoEe25NdJK2M4KYw" elementId="group.help" toBeRendered="false">
+      <children xsi:type="menu:ToolBar" xmi:id="_aDrYAKrbEe2-M8nuGout-A" elementId="group.help" toBeRendered="false">
         <tags>toolbarSeparator</tags>
-        <children xsi:type="menu:ToolBarSeparator" xmi:id="_JQ-DmbjoEe25NdJK2M4KYw" elementId="group.help" toBeRendered="false"/>
+        <children xsi:type="menu:ToolBarSeparator" xmi:id="_aDrYAarbEe2-M8nuGout-A" elementId="group.help" toBeRendered="false"/>
       </children>
-      <children xsi:type="menu:ToolBar" xmi:id="_JQ-DmrjoEe25NdJK2M4KYw" elementId="org.eclipse.ui.workbench.help" visible="false">
+      <children xsi:type="menu:ToolBar" xmi:id="_aDr_EKrbEe2-M8nuGout-A" elementId="org.eclipse.ui.workbench.help" visible="false">
         <tags>Draggable</tags>
       </children>
-      <children xsi:type="menu:ToolBar" xmi:id="_JQ-DnbjoEe25NdJK2M4KYw" elementId="group.file" toBeRendered="false">
+      <children xsi:type="menu:ToolBar" xmi:id="_kq-GgKw-Ee2RfPxWR6ceGA" elementId="group.file" toBeRendered="false">
         <tags>toolbarSeparator</tags>
-        <children xsi:type="menu:ToolBarSeparator" xmi:id="_JQ-DnrjoEe25NdJK2M4KYw" elementId="group.file" toBeRendered="false"/>
+        <children xsi:type="menu:ToolBarSeparator" xmi:id="_kq-Ggaw-Ee2RfPxWR6ceGA" elementId="group.file" toBeRendered="false"/>
       </children>
-      <children xsi:type="menu:ToolControl" xmi:id="_JQ-Dn7joEe25NdJK2M4KYw" elementId="PerspectiveSpacer" contributionURI="bundleclass://org.eclipse.e4.ui.workbench.renderers.swt/org.eclipse.e4.ui.workbench.renderers.swt.LayoutModifierToolControl">
+      <children xsi:type="menu:ToolControl" xmi:id="_aI1k0KrbEe2-M8nuGout-A" elementId="PerspectiveSpacer" contributionURI="bundleclass://org.eclipse.e4.ui.workbench.renderers.swt/org.eclipse.e4.ui.workbench.renderers.swt.LayoutModifierToolControl">
         <tags>stretch</tags>
         <tags>SHOW_RESTORE_MENU</tags>
       </children>
-      <children xsi:type="menu:ToolControl" xmi:id="_JQ-Do7joEe25NdJK2M4KYw" elementId="PerspectiveSwitcher" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.e4.ui.workbench.addons.perspectiveswitcher.PerspectiveSwitcher">
+      <children xsi:type="menu:ToolControl" xmi:id="_aI4BEKrbEe2-M8nuGout-A" elementId="PerspectiveSwitcher" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.e4.ui.workbench.addons.perspectiveswitcher.PerspectiveSwitcher">
         <tags>Draggable</tags>
         <tags>HIDEABLE</tags>
         <tags>SHOW_RESTORE_MENU</tags>
       </children>
-      <children xsi:type="menu:ToolControl" xmi:id="_JQ-DpLjoEe25NdJK2M4KYw" elementId="breadcrumb.toolcontrol" contributionURI="bundleclass://com.genuitec.eclipse.meexplorer/com.genuitec.eclipse.meexplorer.breadcrumb.e4.BreadCrumbContainer">
+      <children xsi:type="menu:ToolControl" xmi:id="_b6xcgKrbEe2-M8nuGout-A" elementId="breadcrumb.toolcontrol" contributionURI="bundleclass://com.genuitec.eclipse.meexplorer/com.genuitec.eclipse.meexplorer.breadcrumb.e4.BreadCrumbContainer">
         <tags>breadcrumb_visible_tag</tags>
       </children>
     </trimBars>
-    <trimBars xmi:id="_JQ-DpbjoEe25NdJK2M4KYw" elementId="org.eclipse.ui.trim.status" contributorURI="platform:/plugin/org.eclipse.platform" side="Bottom">
-      <children xsi:type="menu:ToolControl" xmi:id="_JQ-DprjoEe25NdJK2M4KYw" elementId="org.eclipse.ui.StatusLine" contributorURI="platform:/plugin/org.eclipse.platform" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.StandardTrim">
+    <trimBars xmi:id="_ZFeDUqrbEe2-M8nuGout-A" elementId="org.eclipse.ui.trim.status" contributorURI="platform:/plugin/org.eclipse.platform" side="Bottom">
+      <children xsi:type="menu:ToolControl" xmi:id="_ZFeDU6rbEe2-M8nuGout-A" elementId="org.eclipse.ui.StatusLine" contributorURI="platform:/plugin/org.eclipse.platform" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.StandardTrim">
         <tags>stretch</tags>
       </children>
-      <children xsi:type="menu:ToolControl" xmi:id="_JQ-Dp7joEe25NdJK2M4KYw" elementId="org.eclipse.ui.HeapStatus" contributorURI="platform:/plugin/org.eclipse.platform" toBeRendered="false" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.StandardTrim">
+      <children xsi:type="menu:ToolControl" xmi:id="_ZFeDVKrbEe2-M8nuGout-A" elementId="org.eclipse.ui.HeapStatus" contributorURI="platform:/plugin/org.eclipse.platform" toBeRendered="false" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.StandardTrim">
         <tags>Draggable</tags>
       </children>
-      <children xsi:type="menu:ToolControl" xmi:id="_JQ-DqLjoEe25NdJK2M4KYw" elementId="org.eclipse.ui.ProgressBar" contributorURI="platform:/plugin/org.eclipse.platform" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.StandardTrim">
+      <children xsi:type="menu:ToolControl" xmi:id="_ZFeDVarbEe2-M8nuGout-A" elementId="org.eclipse.ui.ProgressBar" contributorURI="platform:/plugin/org.eclipse.platform" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.StandardTrim">
         <tags>Draggable</tags>
       </children>
     </trimBars>
-    <trimBars xmi:id="_JQ-DrLjoEe25NdJK2M4KYw" elementId="org.eclipse.ui.trim.vertical1" contributorURI="platform:/plugin/org.eclipse.platform" toBeRendered="false" side="Left">
-      <children xsi:type="menu:ToolControl" xmi:id="_JQ-DrbjoEe25NdJK2M4KYw" elementId="left(IDEWindow).(org.eclipse.jdt.ui.JavaPerspective)" toBeRendered="false" contributionURI="bundleclass://org.eclipse.e4.ui.workbench.addons.swt/org.eclipse.e4.ui.workbench.addons.minmax.TrimStack">
+    <trimBars xmi:id="_ZFeDVqrbEe2-M8nuGout-A" elementId="org.eclipse.ui.trim.vertical1" contributorURI="platform:/plugin/org.eclipse.platform" toBeRendered="false" side="Left">
+      <children xsi:type="menu:ToolControl" xmi:id="_j19QQK6SEe2SNusMsQk83g" elementId="left(IDEWindow).(org.eclipse.jdt.ui.JavaPerspective)" toBeRendered="false" contributionURI="bundleclass://org.eclipse.e4.ui.workbench.addons.swt/org.eclipse.e4.ui.workbench.addons.minmax.TrimStack">
         <tags>TrimStack</tags>
         <tags>Draggable</tags>
       </children>
-      <children xsi:type="menu:ToolControl" xmi:id="_JQ-DrrjoEe25NdJK2M4KYw" elementId="org.springframework.ide.eclipse.boot.dash.views.BootDashViewMStack(IDEWindow).(org.eclipse.jdt.ui.JavaPerspective)" toBeRendered="false" contributionURI="bundleclass://org.eclipse.e4.ui.workbench.addons.swt/org.eclipse.e4.ui.workbench.addons.minmax.TrimStack">
+      <children xsi:type="menu:ToolControl" xmi:id="_j3ceAK6SEe2SNusMsQk83g" elementId="org.springframework.ide.eclipse.boot.dash.views.BootDashViewMStack(IDEWindow).(org.eclipse.jdt.ui.JavaPerspective)" toBeRendered="false" contributionURI="bundleclass://org.eclipse.e4.ui.workbench.addons.swt/org.eclipse.e4.ui.workbench.addons.minmax.TrimStack">
         <tags>TrimStack</tags>
         <tags>Draggable</tags>
       </children>
     </trimBars>
-    <trimBars xmi:id="_JQ-Dr7joEe25NdJK2M4KYw" elementId="org.eclipse.ui.trim.vertical2" contributorURI="platform:/plugin/org.eclipse.platform" toBeRendered="false" side="Right">
-      <children xsi:type="menu:ToolControl" xmi:id="_JQ-DsLjoEe25NdJK2M4KYw" elementId="org.eclipse.ui.editorss(IDEWindow).(org.eclipse.jdt.ui.JavaPerspective)" toBeRendered="false" contributionURI="bundleclass://org.eclipse.e4.ui.workbench.addons.swt/org.eclipse.e4.ui.workbench.addons.minmax.TrimStack">
+    <trimBars xmi:id="_ZFeDV6rbEe2-M8nuGout-A" elementId="org.eclipse.ui.trim.vertical2" contributorURI="platform:/plugin/org.eclipse.platform" toBeRendered="false" side="Right">
+      <children xsi:type="menu:ToolControl" xmi:id="_j3ndIK6SEe2SNusMsQk83g" elementId="org.eclipse.ui.editorss(IDEWindow).(org.eclipse.jdt.ui.JavaPerspective)" toBeRendered="false" contributionURI="bundleclass://org.eclipse.e4.ui.workbench.addons.swt/org.eclipse.e4.ui.workbench.addons.minmax.TrimStack">
         <tags>TrimStack</tags>
         <tags>Draggable</tags>
       </children>
-      <children xsi:type="menu:ToolControl" xmi:id="_JQ-DsbjoEe25NdJK2M4KYw" elementId="bottom(IDEWindow).(org.eclipse.jdt.ui.JavaPerspective)" toBeRendered="false" contributionURI="bundleclass://org.eclipse.e4.ui.workbench.addons.swt/org.eclipse.e4.ui.workbench.addons.minmax.TrimStack">
+      <children xsi:type="menu:ToolControl" xmi:id="_EQeRMLaeEe20XtEP1LKklA" elementId="bottom(IDEWindow).(org.eclipse.jdt.ui.JavaPerspective)" toBeRendered="false" contributionURI="bundleclass://org.eclipse.e4.ui.workbench.addons.swt/org.eclipse.e4.ui.workbench.addons.minmax.TrimStack">
         <tags>TrimStack</tags>
         <tags>Draggable</tags>
       </children>
     </trimBars>
   </children>
-  <bindingTables xmi:id="_JQ-DurjoEe25NdJK2M4KYw" contributorURI="platform:/plugin/org.eclipse.platform" bindingContext="_JQ-o6rjoEe25NdJK2M4KYw">
-    <bindings xmi:id="_JQ-Du7joEe25NdJK2M4KYw" keySequence="CTRL+1" command="_JQ_3b7joEe25NdJK2M4KYw"/>
-    <bindings xmi:id="_JQ-DvLjoEe25NdJK2M4KYw" keySequence="CTRL+6" command="_JQ_3lrjoEe25NdJK2M4KYw"/>
-    <bindings xmi:id="_JQ-DvbjoEe25NdJK2M4KYw" keySequence="CTRL+SHIFT+I" command="_JQ_3UrjoEe25NdJK2M4KYw"/>
-    <bindings xmi:id="_JQ-DvrjoEe25NdJK2M4KYw" keySequence="CTRL+SHIFT+L" command="_JQ_5l7joEe25NdJK2M4KYw"/>
-    <bindings xmi:id="_JQ-Dv7joEe25NdJK2M4KYw" keySequence="CTRL+SPACE" command="_JQ_5OLjoEe25NdJK2M4KYw"/>
-    <bindings xmi:id="_JQ-DwLjoEe25NdJK2M4KYw" keySequence="CTRL+SHIFT+D" command="_JQ_5vrjoEe25NdJK2M4KYw"/>
-    <bindings xmi:id="_JQ-DwbjoEe25NdJK2M4KYw" keySequence="CTRL+V" command="_JQ_227joEe25NdJK2M4KYw"/>
-    <bindings xmi:id="_JQ-DwrjoEe25NdJK2M4KYw" keySequence="CTRL+SHIFT+SPACE" command="_JQ_3i7joEe25NdJK2M4KYw"/>
-    <bindings xmi:id="_JQ-Dw7joEe25NdJK2M4KYw" keySequence="CTRL+A" command="_JQ_3-bjoEe25NdJK2M4KYw"/>
-    <bindings xmi:id="_JQ-DxLjoEe25NdJK2M4KYw" keySequence="CTRL+C" command="_JQ_4VLjoEe25NdJK2M4KYw"/>
-    <bindings xmi:id="_JQ-DxbjoEe25NdJK2M4KYw" keySequence="CTRL+X" command="_JQ_3sbjoEe25NdJK2M4KYw"/>
-    <bindings xmi:id="_JQ-DxrjoEe25NdJK2M4KYw" keySequence="CTRL+Y" command="_JQ_4ILjoEe25NdJK2M4KYw"/>
-    <bindings xmi:id="_JQ-Dx7joEe25NdJK2M4KYw" keySequence="CTRL+Z" command="_JQ_3q7joEe25NdJK2M4KYw"/>
-    <bindings xmi:id="_JQ-DyLjoEe25NdJK2M4KYw" keySequence="ALT+PAGE_UP" command="_JQ_4MLjoEe25NdJK2M4KYw"/>
-    <bindings xmi:id="_JQ-DybjoEe25NdJK2M4KYw" keySequence="ALT+PAGE_DOWN" command="_JQ_46rjoEe25NdJK2M4KYw"/>
-    <bindings xmi:id="_JQ-DyrjoEe25NdJK2M4KYw" keySequence="SHIFT+INSERT" command="_JQ_227joEe25NdJK2M4KYw"/>
-    <bindings xmi:id="_JQ-Dy7joEe25NdJK2M4KYw" keySequence="ALT+F11" command="_JQ_3GbjoEe25NdJK2M4KYw">
+  <bindingTables xmi:id="_ZFeDWKrbEe2-M8nuGout-A" contributorURI="platform:/plugin/org.eclipse.platform" bindingContext="_ZFeDWarbEe2-M8nuGout-A">
+    <bindings xmi:id="_ZG18U6rbEe2-M8nuGout-A" keySequence="CTRL+1" command="_ZGW0MqrbEe2-M8nuGout-A"/>
+    <bindings xmi:id="_ZG2jZarbEe2-M8nuGout-A" keySequence="CTRL+6" command="_ZGXbTqrbEe2-M8nuGout-A"/>
+    <bindings xmi:id="_ZG2jbqrbEe2-M8nuGout-A" keySequence="CTRL+SHIFT+I" command="_ZGWNI6rbEe2-M8nuGout-A"/>
+    <bindings xmi:id="_ZG3Kc6rbEe2-M8nuGout-A" keySequence="CTRL+SHIFT+L" command="_ZGbFvarbEe2-M8nuGout-A"/>
+    <bindings xmi:id="_ZG3xgKrbEe2-M8nuGout-A" keySequence="CTRL+SPACE" command="_ZGaevqrbEe2-M8nuGout-A"/>
+    <bindings xmi:id="_ZG3xkKrbEe2-M8nuGout-A" keySequence="CTRL+SHIFT+D" command="_ZGbF5KrbEe2-M8nuGout-A"/>
+    <bindings xmi:id="_ZG4_r6rbEe2-M8nuGout-A" keySequence="CTRL+V" command="_ZGTw86rbEe2-M8nuGout-A"/>
+    <bindings xmi:id="_ZG5mwKrbEe2-M8nuGout-A" keySequence="CTRL+SHIFT+SPACE" command="_ZGXbQ6rbEe2-M8nuGout-A"/>
+    <bindings xmi:id="_ZG5mwarbEe2-M8nuGout-A" keySequence="CTRL+A" command="_ZGYpUqrbEe2-M8nuGout-A"/>
+    <bindings xmi:id="_ZG6Nx6rbEe2-M8nuGout-A" keySequence="CTRL+C" command="_ZGZQcarbEe2-M8nuGout-A"/>
+    <bindings xmi:id="_ZG7b4KrbEe2-M8nuGout-A" keySequence="CTRL+X" command="_ZGXbaarbEe2-M8nuGout-A"/>
+    <bindings xmi:id="_ZG7b4arbEe2-M8nuGout-A" keySequence="CTRL+Y" command="_ZGYpearbEe2-M8nuGout-A"/>
+    <bindings xmi:id="_ZG7b46rbEe2-M8nuGout-A" keySequence="CTRL+Z" command="_ZGXbY6rbEe2-M8nuGout-A"/>
+    <bindings xmi:id="_ZG7b9qrbEe2-M8nuGout-A" keySequence="ALT+PAGE_UP" command="_ZGYpiarbEe2-M8nuGout-A"/>
+    <bindings xmi:id="_ZG7b96rbEe2-M8nuGout-A" keySequence="ALT+PAGE_DOWN" command="_ZGZ3warbEe2-M8nuGout-A"/>
+    <bindings xmi:id="_ZG8C8qrbEe2-M8nuGout-A" keySequence="SHIFT+INSERT" command="_ZGTw86rbEe2-M8nuGout-A"/>
+    <bindings xmi:id="_ZG8C96rbEe2-M8nuGout-A" keySequence="ALT+F11" command="_ZGVmBarbEe2-M8nuGout-A">
       <tags>platform:win32</tags>
     </bindings>
-    <bindings xmi:id="_JQ-DzLjoEe25NdJK2M4KYw" keySequence="CTRL+F10" command="_JQ_2-LjoEe25NdJK2M4KYw"/>
-    <bindings xmi:id="_JQ-DzbjoEe25NdJK2M4KYw" keySequence="CTRL+INSERT" command="_JQ_4VLjoEe25NdJK2M4KYw"/>
-    <bindings xmi:id="_JQ-DzrjoEe25NdJK2M4KYw" keySequence="CTRL+PAGE_UP" command="_JQ_5d7joEe25NdJK2M4KYw"/>
-    <bindings xmi:id="_JQ-Dz7joEe25NdJK2M4KYw" keySequence="CTRL+PAGE_DOWN" command="_JQ_3eLjoEe25NdJK2M4KYw"/>
-    <bindings xmi:id="_JQ-D0LjoEe25NdJK2M4KYw" keySequence="ALT+SHIFT+F1" command="_JQ_3LrjoEe25NdJK2M4KYw"/>
-    <bindings xmi:id="_JQ-D0bjoEe25NdJK2M4KYw" keySequence="ALT+SHIFT+F2" command="_JQ_407joEe25NdJK2M4KYw"/>
-    <bindings xmi:id="_JQ-D0rjoEe25NdJK2M4KYw" keySequence="ALT+SHIFT+F3" command="_JQ_5a7joEe25NdJK2M4KYw"/>
-    <bindings xmi:id="_JQ-D07joEe25NdJK2M4KYw" keySequence="SHIFT+DEL" command="_JQ_3sbjoEe25NdJK2M4KYw"/>
-    <bindings xmi:id="_JQ-D1LjoEe25NdJK2M4KYw" keySequence="ALT+CTRL+SHIFT+F9" command="_JQ_38rjoEe25NdJK2M4KYw"/>
+    <bindings xmi:id="_ZG9RHKrbEe2-M8nuGout-A" keySequence="CTRL+F10" command="_ZGU-_qrbEe2-M8nuGout-A"/>
+    <bindings xmi:id="_ZG94JqrbEe2-M8nuGout-A" keySequence="CTRL+INSERT" command="_ZGZQcarbEe2-M8nuGout-A"/>
+    <bindings xmi:id="_ZG-fOKrbEe2-M8nuGout-A" keySequence="CTRL+PAGE_UP" command="_ZGbFnarbEe2-M8nuGout-A"/>
+    <bindings xmi:id="_ZG-fOarbEe2-M8nuGout-A" keySequence="CTRL+PAGE_DOWN" command="_ZGXbMKrbEe2-M8nuGout-A"/>
+    <bindings xmi:id="_ZG-fO6rbEe2-M8nuGout-A" keySequence="ALT+SHIFT+F1" command="_ZGVmGqrbEe2-M8nuGout-A"/>
+    <bindings xmi:id="_ZG_GQKrbEe2-M8nuGout-A" keySequence="ALT+SHIFT+F2" command="_ZGZ3qqrbEe2-M8nuGout-A"/>
+    <bindings xmi:id="_ZG_GQarbEe2-M8nuGout-A" keySequence="ALT+SHIFT+F3" command="_ZGbFkarbEe2-M8nuGout-A"/>
+    <bindings xmi:id="_ZG_GRqrbEe2-M8nuGout-A" keySequence="SHIFT+DEL" command="_ZGXbaarbEe2-M8nuGout-A"/>
+    <bindings xmi:id="_ZG_tU6rbEe2-M8nuGout-A" keySequence="ALT+CTRL+SHIFT+F9" command="_ZGYCfarbEe2-M8nuGout-A"/>
   </bindingTables>
-  <bindingTables xmi:id="_JQ-D1bjoEe25NdJK2M4KYw" elementId="org.eclipse.ui.textEditorScope" bindingContext="_JQ-o77joEe25NdJK2M4KYw">
-    <bindings xmi:id="_JQ-D1rjoEe25NdJK2M4KYw" keySequence="CTRL+SHIFT+CR" command="_JQ_5arjoEe25NdJK2M4KYw"/>
-    <bindings xmi:id="_JQ-D17joEe25NdJK2M4KYw" keySequence="CTRL+BS" command="_JQ_2s7joEe25NdJK2M4KYw"/>
-    <bindings xmi:id="_JQ-D2LjoEe25NdJK2M4KYw" keySequence="CTRL+SHIFT+Q" command="_JQ_3WLjoEe25NdJK2M4KYw"/>
-    <bindings xmi:id="_JQ-D2bjoEe25NdJK2M4KYw" keySequence="CTRL+SHIFT+J" command="_JQ_3TbjoEe25NdJK2M4KYw"/>
-    <bindings xmi:id="_JQ-D2rjoEe25NdJK2M4KYw" keySequence="CTRL++" command="_JQ_4yLjoEe25NdJK2M4KYw"/>
-    <bindings xmi:id="_JQ-D27joEe25NdJK2M4KYw" keySequence="CTRL+-" command="_JQ_337joEe25NdJK2M4KYw"/>
-    <bindings xmi:id="_JQ-D3LjoEe25NdJK2M4KYw" keySequence="CTRL+/" command="_JQ_2vrjoEe25NdJK2M4KYw"/>
-    <bindings xmi:id="_JQ-D3bjoEe25NdJK2M4KYw" keySequence="CTRL+SHIFT+C" command="_JQ_2xbjoEe25NdJK2M4KYw"/>
-    <bindings xmi:id="_JQ-D3rjoEe25NdJK2M4KYw" keySequence="CTRL+SHIFT+C" command="_JQ_2vrjoEe25NdJK2M4KYw"/>
-    <bindings xmi:id="_JQ-D37joEe25NdJK2M4KYw" keySequence="CTRL+SHIFT+F" command="_JQ_3lbjoEe25NdJK2M4KYw"/>
-    <bindings xmi:id="_JQ-D4LjoEe25NdJK2M4KYw" keySequence="ALT+CTRL+J" command="_JQ_3ZrjoEe25NdJK2M4KYw"/>
-    <bindings xmi:id="_JQ-D4bjoEe25NdJK2M4KYw" keySequence="ALT+SHIFT+A" command="_JQ_4eLjoEe25NdJK2M4KYw"/>
-    <bindings xmi:id="_JQ-D4rjoEe25NdJK2M4KYw" keySequence="CTRL+J" command="_JQ_2_rjoEe25NdJK2M4KYw"/>
-    <bindings xmi:id="_JQ-D47joEe25NdJK2M4KYw" keySequence="CTRL+L" command="_JQ_5S7joEe25NdJK2M4KYw"/>
-    <bindings xmi:id="_JQ-D5LjoEe25NdJK2M4KYw" keySequence="CTRL+O" command="_JQ_4W7joEe25NdJK2M4KYw"/>
-    <bindings xmi:id="_JQ-D5bjoEe25NdJK2M4KYw" keySequence="CTRL+SHIFT+/" command="_JQ_3nLjoEe25NdJK2M4KYw"/>
-    <bindings xmi:id="_JQ-D5rjoEe25NdJK2M4KYw" keySequence="CTRL+D" command="_JQ_3CrjoEe25NdJK2M4KYw"/>
-    <bindings xmi:id="_JQ-D57joEe25NdJK2M4KYw" keySequence="CTRL+F" command="_JQ_3-rjoEe25NdJK2M4KYw"/>
-    <bindings xmi:id="_JQ-D6LjoEe25NdJK2M4KYw" keySequence="CTRL+=" command="_JQ_4yLjoEe25NdJK2M4KYw"/>
-    <bindings xmi:id="_JQ-D6bjoEe25NdJK2M4KYw" keySequence="ALT+SHIFT+Y" command="_JQ_2q7joEe25NdJK2M4KYw"/>
-    <bindings xmi:id="_JQ-D6rjoEe25NdJK2M4KYw" keySequence="CTRL+SHIFT+DEL" command="_JQ_5PbjoEe25NdJK2M4KYw"/>
-    <bindings xmi:id="_JQ-D67joEe25NdJK2M4KYw" keySequence="CTRL+SHIFT+X" command="_JQ_4X7joEe25NdJK2M4KYw"/>
-    <bindings xmi:id="_JQ-D7LjoEe25NdJK2M4KYw" keySequence="CTRL+SHIFT+Y" command="_JQ_33LjoEe25NdJK2M4KYw"/>
-    <bindings xmi:id="_JQ-D7bjoEe25NdJK2M4KYw" keySequence="CTRL+SHIFT+\" command="_JQ_4jrjoEe25NdJK2M4KYw"/>
-    <bindings xmi:id="_JQ-D7rjoEe25NdJK2M4KYw" keySequence="CTRL+DEL" command="_JQ_3o7joEe25NdJK2M4KYw"/>
-    <bindings xmi:id="_JQ-D77joEe25NdJK2M4KYw" keySequence="ALT+ARROW_UP" command="_JQ_58LjoEe25NdJK2M4KYw"/>
-    <bindings xmi:id="_JQ-D8LjoEe25NdJK2M4KYw" keySequence="ALT+ARROW_DOWN" command="_JQ_487joEe25NdJK2M4KYw"/>
-    <bindings xmi:id="_JQ-D8bjoEe25NdJK2M4KYw" keySequence="SHIFT+END" command="_JQ_35bjoEe25NdJK2M4KYw"/>
-    <bindings xmi:id="_JQ-D8rjoEe25NdJK2M4KYw" keySequence="SHIFT+HOME" command="_JQ_30bjoEe25NdJK2M4KYw"/>
-    <bindings xmi:id="_JQ-D87joEe25NdJK2M4KYw" keySequence="END" command="_JQ_5hLjoEe25NdJK2M4KYw"/>
-    <bindings xmi:id="_JQ-D9LjoEe25NdJK2M4KYw" keySequence="INSERT" command="_JQ_4mLjoEe25NdJK2M4KYw"/>
-    <bindings xmi:id="_JQ-D9bjoEe25NdJK2M4KYw" keySequence="F2" command="_JQ_3erjoEe25NdJK2M4KYw"/>
-    <bindings xmi:id="_JQ-D9rjoEe25NdJK2M4KYw" keySequence="HOME" command="_JQ_5pLjoEe25NdJK2M4KYw"/>
-    <bindings xmi:id="_JQ-D97joEe25NdJK2M4KYw" keySequence="ALT+CTRL+ARROW_UP" command="_JQ_50bjoEe25NdJK2M4KYw"/>
-    <bindings xmi:id="_JQ-D-LjoEe25NdJK2M4KYw" keySequence="ALT+CTRL+ARROW_DOWN" command="_JQ_4ArjoEe25NdJK2M4KYw"/>
-    <bindings xmi:id="_JQ-D-bjoEe25NdJK2M4KYw" keySequence="CTRL+SHIFT+INSERT" command="_JQ_3PrjoEe25NdJK2M4KYw"/>
-    <bindings xmi:id="_JQ-D-rjoEe25NdJK2M4KYw" keySequence="CTRL+SHIFT+ARROW_LEFT" command="_JQ_357joEe25NdJK2M4KYw"/>
-    <bindings xmi:id="_JQ-D-7joEe25NdJK2M4KYw" keySequence="CTRL+SHIFT+ARROW_RIGHT" command="_JQ_3RbjoEe25NdJK2M4KYw"/>
-    <bindings xmi:id="_JQ-D_LjoEe25NdJK2M4KYw" keySequence="CTRL+F10" command="_JQ_5ZbjoEe25NdJK2M4KYw"/>
-    <bindings xmi:id="_JQ-D_bjoEe25NdJK2M4KYw" keySequence="CTRL+END" command="_JQ_497joEe25NdJK2M4KYw"/>
-    <bindings xmi:id="_JQ-D_rjoEe25NdJK2M4KYw" keySequence="CTRL+ARROW_UP" command="_JQ_3LLjoEe25NdJK2M4KYw"/>
-    <bindings xmi:id="_JQ-D_7joEe25NdJK2M4KYw" keySequence="CTRL+ARROW_DOWN" command="_JQ_6AbjoEe25NdJK2M4KYw"/>
-    <bindings xmi:id="_JQ-EALjoEe25NdJK2M4KYw" keySequence="CTRL+ARROW_LEFT" command="_JQ_4TbjoEe25NdJK2M4KYw"/>
-    <bindings xmi:id="_JQ-EAbjoEe25NdJK2M4KYw" keySequence="CTRL+ARROW_RIGHT" command="_JQ_3V7joEe25NdJK2M4KYw"/>
-    <bindings xmi:id="_JQ-EArjoEe25NdJK2M4KYw" keySequence="CTRL+HOME" command="_JQ_22rjoEe25NdJK2M4KYw"/>
-    <bindings xmi:id="_JQ-EA7joEe25NdJK2M4KYw" keySequence="CTRL+NUMPAD_MULTIPLY" command="_JQ_5B7joEe25NdJK2M4KYw"/>
-    <bindings xmi:id="_JQ-EBLjoEe25NdJK2M4KYw" keySequence="CTRL+NUMPAD_ADD" command="_JQ_5xLjoEe25NdJK2M4KYw"/>
-    <bindings xmi:id="_JQ-EBbjoEe25NdJK2M4KYw" keySequence="CTRL+NUMPAD_SUBTRACT" command="_JQ_5aLjoEe25NdJK2M4KYw"/>
-    <bindings xmi:id="_JQ-EBrjoEe25NdJK2M4KYw" keySequence="CTRL+NUMPAD_DIVIDE" command="_JQ_3MLjoEe25NdJK2M4KYw"/>
-    <bindings xmi:id="_JQ-EB7joEe25NdJK2M4KYw" keySequence="CTRL+SHIFT+NUMPAD_MULTIPLY" command="_JQ_5DbjoEe25NdJK2M4KYw"/>
-    <bindings xmi:id="_JQ-ECLjoEe25NdJK2M4KYw" keySequence="CTRL+SHIFT+NUMPAD_DIVIDE" command="_JQ_4m7joEe25NdJK2M4KYw"/>
-    <bindings xmi:id="_JQ-ECbjoEe25NdJK2M4KYw" keySequence="ESC" command="_JQ_5KbjoEe25NdJK2M4KYw"/>
-    <bindings xmi:id="_JQ-ECrjoEe25NdJK2M4KYw" keySequence="ALT+/" command="_JQ_5p7joEe25NdJK2M4KYw"/>
-    <bindings xmi:id="_JQ-EC7joEe25NdJK2M4KYw" keySequence="SHIFT+CR" command="_JQ_5o7joEe25NdJK2M4KYw"/>
+  <bindingTables xmi:id="_ZGuAgKrbEe2-M8nuGout-A" elementId="org.eclipse.ui.textEditorScope" bindingContext="_ZGeI4qrbEe2-M8nuGout-A">
+    <bindings xmi:id="_ZG0HIKrbEe2-M8nuGout-A" keySequence="CTRL+SHIFT+CR" command="_ZGbFkKrbEe2-M8nuGout-A"/>
+    <bindings xmi:id="_ZG0uMqrbEe2-M8nuGout-A" keySequence="CTRL+BS" command="_ZGTJx6rbEe2-M8nuGout-A"/>
+    <bindings xmi:id="_ZG18UKrbEe2-M8nuGout-A" keySequence="CTRL+SHIFT+Q" command="_ZGWNKarbEe2-M8nuGout-A"/>
+    <bindings xmi:id="_ZG2jcarbEe2-M8nuGout-A" keySequence="CTRL+SHIFT+J" command="_ZGWNHqrbEe2-M8nuGout-A"/>
+    <bindings xmi:id="_ZG3KcarbEe2-M8nuGout-A" keySequence="CTRL++" command="_ZGZ3n6rbEe2-M8nuGout-A"/>
+    <bindings xmi:id="_ZG3Kd6rbEe2-M8nuGout-A" keySequence="CTRL+-" command="_ZGYCaqrbEe2-M8nuGout-A"/>
+    <bindings xmi:id="_ZG3KfKrbEe2-M8nuGout-A" keySequence="CTRL+/" command="_ZGTw1qrbEe2-M8nuGout-A"/>
+    <bindings xmi:id="_ZG3xjKrbEe2-M8nuGout-A" keySequence="CTRL+SHIFT+C" command="_ZGTw3arbEe2-M8nuGout-A"/>
+    <bindings xmi:id="_ZG3xjqrbEe2-M8nuGout-A" keySequence="CTRL+SHIFT+C" command="_ZGTw1qrbEe2-M8nuGout-A"/>
+    <bindings xmi:id="_ZG4YlKrbEe2-M8nuGout-A" keySequence="CTRL+SHIFT+F" command="_ZGXbTarbEe2-M8nuGout-A"/>
+    <bindings xmi:id="_ZG4YoKrbEe2-M8nuGout-A" keySequence="ALT+CTRL+J" command="_ZGW0KarbEe2-M8nuGout-A"/>
+    <bindings xmi:id="_ZG4_oarbEe2-M8nuGout-A" keySequence="ALT+SHIFT+A" command="_ZGZQlarbEe2-M8nuGout-A"/>
+    <bindings xmi:id="_ZG4_tarbEe2-M8nuGout-A" keySequence="CTRL+J" command="_ZGU_BKrbEe2-M8nuGout-A"/>
+    <bindings xmi:id="_ZG4_uarbEe2-M8nuGout-A" keySequence="CTRL+L" command="_ZGae0arbEe2-M8nuGout-A"/>
+    <bindings xmi:id="_ZG5mt6rbEe2-M8nuGout-A" keySequence="CTRL+O" command="_ZGZQeKrbEe2-M8nuGout-A"/>
+    <bindings xmi:id="_ZG5mvarbEe2-M8nuGout-A" keySequence="CTRL+SHIFT+/" command="_ZGXbVKrbEe2-M8nuGout-A"/>
+    <bindings xmi:id="_ZG6NzKrbEe2-M8nuGout-A" keySequence="CTRL+D" command="_ZGU_EKrbEe2-M8nuGout-A"/>
+    <bindings xmi:id="_ZG6N0qrbEe2-M8nuGout-A" keySequence="CTRL+F" command="_ZGYpU6rbEe2-M8nuGout-A"/>
+    <bindings xmi:id="_ZG601qrbEe2-M8nuGout-A" keySequence="CTRL+=" command="_ZGZ3n6rbEe2-M8nuGout-A"/>
+    <bindings xmi:id="_ZG602qrbEe2-M8nuGout-A" keySequence="ALT+SHIFT+Y" command="_ZGR7oqrbEe2-M8nuGout-A"/>
+    <bindings xmi:id="_ZG7b5qrbEe2-M8nuGout-A" keySequence="CTRL+SHIFT+DEL" command="_ZGaew6rbEe2-M8nuGout-A"/>
+    <bindings xmi:id="_ZG7b56rbEe2-M8nuGout-A" keySequence="CTRL+SHIFT+X" command="_ZGZQfKrbEe2-M8nuGout-A"/>
+    <bindings xmi:id="_ZG7b6KrbEe2-M8nuGout-A" keySequence="CTRL+SHIFT+Y" command="_ZGYCZ6rbEe2-M8nuGout-A"/>
+    <bindings xmi:id="_ZG7b7KrbEe2-M8nuGout-A" keySequence="CTRL+SHIFT+\" command="_ZGZQq6rbEe2-M8nuGout-A"/>
+    <bindings xmi:id="_ZG7b7qrbEe2-M8nuGout-A" keySequence="CTRL+DEL" command="_ZGXbW6rbEe2-M8nuGout-A"/>
+    <bindings xmi:id="_ZG7b8arbEe2-M8nuGout-A" keySequence="ALT+ARROW_UP" command="_ZGbstarbEe2-M8nuGout-A"/>
+    <bindings xmi:id="_ZG7b8qrbEe2-M8nuGout-A" keySequence="ALT+ARROW_DOWN" command="_ZGZ3yqrbEe2-M8nuGout-A"/>
+    <bindings xmi:id="_ZG8C8KrbEe2-M8nuGout-A" keySequence="SHIFT+END" command="_ZGYCcKrbEe2-M8nuGout-A"/>
+    <bindings xmi:id="_ZG8C-KrbEe2-M8nuGout-A" keySequence="SHIFT+HOME" command="_ZGYCXKrbEe2-M8nuGout-A"/>
+    <bindings xmi:id="_ZG8C_qrbEe2-M8nuGout-A" keySequence="END" command="_ZGbFqqrbEe2-M8nuGout-A"/>
+    <bindings xmi:id="_ZG8C_6rbEe2-M8nuGout-A" keySequence="INSERT" command="_ZGZQtarbEe2-M8nuGout-A"/>
+    <bindings xmi:id="_ZG8DBarbEe2-M8nuGout-A" keySequence="F2" command="_ZGXbMqrbEe2-M8nuGout-A"/>
+    <bindings xmi:id="_ZG8qCarbEe2-M8nuGout-A" keySequence="HOME" command="_ZGbFyqrbEe2-M8nuGout-A"/>
+    <bindings xmi:id="_ZG8qDKrbEe2-M8nuGout-A" keySequence="ALT+CTRL+ARROW_UP" command="_ZGbF96rbEe2-M8nuGout-A"/>
+    <bindings xmi:id="_ZG8qDarbEe2-M8nuGout-A" keySequence="ALT+CTRL+ARROW_DOWN" command="_ZGYpW6rbEe2-M8nuGout-A"/>
+    <bindings xmi:id="_ZG8qEKrbEe2-M8nuGout-A" keySequence="CTRL+SHIFT+INSERT" command="_ZGVmKqrbEe2-M8nuGout-A"/>
+    <bindings xmi:id="_ZG8qFarbEe2-M8nuGout-A" keySequence="CTRL+SHIFT+ARROW_LEFT" command="_ZGYCcqrbEe2-M8nuGout-A"/>
+    <bindings xmi:id="_ZG9REarbEe2-M8nuGout-A" keySequence="CTRL+SHIFT+ARROW_RIGHT" command="_ZGWNFqrbEe2-M8nuGout-A"/>
+    <bindings xmi:id="_ZG9RHarbEe2-M8nuGout-A" keySequence="CTRL+F10" command="_ZGae66rbEe2-M8nuGout-A"/>
+    <bindings xmi:id="_ZG94JKrbEe2-M8nuGout-A" keySequence="CTRL+END" command="_ZGZ3zqrbEe2-M8nuGout-A"/>
+    <bindings xmi:id="_ZG-fMarbEe2-M8nuGout-A" keySequence="CTRL+ARROW_UP" command="_ZGVmGKrbEe2-M8nuGout-A"/>
+    <bindings xmi:id="_ZG-fM6rbEe2-M8nuGout-A" keySequence="CTRL+ARROW_DOWN" command="_ZGbsxqrbEe2-M8nuGout-A"/>
+    <bindings xmi:id="_ZG-fNqrbEe2-M8nuGout-A" keySequence="CTRL+ARROW_LEFT" command="_ZGZQaqrbEe2-M8nuGout-A"/>
+    <bindings xmi:id="_ZG-fN6rbEe2-M8nuGout-A" keySequence="CTRL+ARROW_RIGHT" command="_ZGWNKKrbEe2-M8nuGout-A"/>
+    <bindings xmi:id="_ZG-fOqrbEe2-M8nuGout-A" keySequence="CTRL+HOME" command="_ZGTw8qrbEe2-M8nuGout-A"/>
+    <bindings xmi:id="_ZG_GQqrbEe2-M8nuGout-A" keySequence="CTRL+NUMPAD_MULTIPLY" command="_ZGaejarbEe2-M8nuGout-A"/>
+    <bindings xmi:id="_ZG_GQ6rbEe2-M8nuGout-A" keySequence="CTRL+NUMPAD_ADD" command="_ZGbF6qrbEe2-M8nuGout-A"/>
+    <bindings xmi:id="_ZG_GRKrbEe2-M8nuGout-A" keySequence="CTRL+NUMPAD_SUBTRACT" command="_ZGae7qrbEe2-M8nuGout-A"/>
+    <bindings xmi:id="_ZG_GRarbEe2-M8nuGout-A" keySequence="CTRL+NUMPAD_DIVIDE" command="_ZGVmHKrbEe2-M8nuGout-A"/>
+    <bindings xmi:id="_ZG_GTqrbEe2-M8nuGout-A" keySequence="CTRL+SHIFT+NUMPAD_MULTIPLY" command="_ZGaek6rbEe2-M8nuGout-A"/>
+    <bindings xmi:id="_ZG_tUqrbEe2-M8nuGout-A" keySequence="CTRL+SHIFT+NUMPAD_DIVIDE" command="_ZGZ3cqrbEe2-M8nuGout-A"/>
+    <bindings xmi:id="_ZHAUZqrbEe2-M8nuGout-A" keySequence="ESC" command="_ZGaer6rbEe2-M8nuGout-A"/>
+    <bindings xmi:id="_ZHAUbqrbEe2-M8nuGout-A" keySequence="ALT+/" command="_ZGbFzarbEe2-M8nuGout-A"/>
+    <bindings xmi:id="_ZHAUb6rbEe2-M8nuGout-A" keySequence="SHIFT+CR" command="_ZGbFyarbEe2-M8nuGout-A"/>
   </bindingTables>
-  <bindingTables xmi:id="_JQ-EDLjoEe25NdJK2M4KYw" elementId="org.eclipse.ui.contexts.window" bindingContext="_JQ-o67joEe25NdJK2M4KYw">
-    <bindings xmi:id="_JQ-EDbjoEe25NdJK2M4KYw" keySequence="ALT+CTRL+SHIFT+A" command="_JQ_49bjoEe25NdJK2M4KYw"/>
-    <bindings xmi:id="_JQ-EDrjoEe25NdJK2M4KYw" keySequence="ALT+CTRL+SHIFT+T" command="_JQ_297joEe25NdJK2M4KYw"/>
-    <bindings xmi:id="_JQ-ED7joEe25NdJK2M4KYw" keySequence="ALT+CTRL+SHIFT+L" command="_JQ_4jbjoEe25NdJK2M4KYw"/>
-    <bindings xmi:id="_JQ-EELjoEe25NdJK2M4KYw" keySequence="ALT+CTRL+SHIFT+M" command="_JQ_5tLjoEe25NdJK2M4KYw"/>
-    <bindings xmi:id="_JQ-EEbjoEe25NdJK2M4KYw" keySequence="ALT+SHIFT+Q O" command="_JQ_427joEe25NdJK2M4KYw">
-      <parameters xmi:id="_JQ-EErjoEe25NdJK2M4KYw" elementId="org.eclipse.ui.views.showView.viewId" name="org.eclipse.ui.views.showView.viewId" value="org.eclipse.ui.views.ContentOutline"/>
+  <bindingTables xmi:id="_ZG0uMKrbEe2-M8nuGout-A" elementId="org.eclipse.ui.contexts.window" bindingContext="_ZFeDWqrbEe2-M8nuGout-A">
+    <bindings xmi:id="_ZG0uMarbEe2-M8nuGout-A" keySequence="ALT+CTRL+SHIFT+A" command="_ZGZ3zKrbEe2-M8nuGout-A"/>
+    <bindings xmi:id="_ZG0uNarbEe2-M8nuGout-A" keySequence="ALT+CTRL+SHIFT+T" command="_ZGU-_arbEe2-M8nuGout-A"/>
+    <bindings xmi:id="_ZG0uNqrbEe2-M8nuGout-A" keySequence="ALT+CTRL+SHIFT+L" command="_ZGZQqqrbEe2-M8nuGout-A"/>
+    <bindings xmi:id="_ZG0uN6rbEe2-M8nuGout-A" keySequence="ALT+CTRL+SHIFT+M" command="_ZGbF2qrbEe2-M8nuGout-A"/>
+    <bindings xmi:id="_ZG1VSKrbEe2-M8nuGout-A" keySequence="ALT+SHIFT+Q O" command="_ZGZ3sqrbEe2-M8nuGout-A">
+      <parameters xmi:id="_ZG1VSarbEe2-M8nuGout-A" elementId="org.eclipse.ui.views.showView.viewId" name="org.eclipse.ui.views.showView.viewId" value="org.eclipse.ui.views.ContentOutline"/>
     </bindings>
-    <bindings xmi:id="_JQ-EE7joEe25NdJK2M4KYw" keySequence="ALT+SHIFT+Q P" command="_JQ_427joEe25NdJK2M4KYw">
-      <parameters xmi:id="_JQ-EFLjoEe25NdJK2M4KYw" elementId="org.eclipse.ui.views.showView.viewId" name="org.eclipse.ui.views.showView.viewId" value="org.eclipse.jdt.ui.PackageExplorer"/>
+    <bindings xmi:id="_ZG1VSqrbEe2-M8nuGout-A" keySequence="ALT+SHIFT+Q P" command="_ZGZ3sqrbEe2-M8nuGout-A">
+      <parameters xmi:id="_ZG1VS6rbEe2-M8nuGout-A" elementId="org.eclipse.ui.views.showView.viewId" name="org.eclipse.ui.views.showView.viewId" value="org.eclipse.jdt.ui.PackageExplorer"/>
     </bindings>
-    <bindings xmi:id="_JQ-EFbjoEe25NdJK2M4KYw" keySequence="ALT+CTRL+B" command="_JQ_447joEe25NdJK2M4KYw"/>
-    <bindings xmi:id="_JQ-EFrjoEe25NdJK2M4KYw" keySequence="CTRL+SHIFT+R" command="_JQ_6BbjoEe25NdJK2M4KYw"/>
-    <bindings xmi:id="_JQ-EF7joEe25NdJK2M4KYw" keySequence="ALT+SHIFT+Q Q" command="_JQ_427joEe25NdJK2M4KYw"/>
-    <bindings xmi:id="_JQ-EGLjoEe25NdJK2M4KYw" keySequence="CTRL+SHIFT+S" command="_JQ_4vLjoEe25NdJK2M4KYw"/>
-    <bindings xmi:id="_JQ-EGbjoEe25NdJK2M4KYw" keySequence="CTRL+3" command="_JQ_3ebjoEe25NdJK2M4KYw"/>
-    <bindings xmi:id="_JQ-EGrjoEe25NdJK2M4KYw" keySequence="CTRL+SHIFT+T" command="_JQ_3sLjoEe25NdJK2M4KYw"/>
-    <bindings xmi:id="_JQ-EG7joEe25NdJK2M4KYw" keySequence="CTRL+SHIFT+T" command="_JQ_3M7joEe25NdJK2M4KYw">
+    <bindings xmi:id="_ZG18VKrbEe2-M8nuGout-A" keySequence="ALT+CTRL+B" command="_ZGZ3uqrbEe2-M8nuGout-A"/>
+    <bindings xmi:id="_ZG18VarbEe2-M8nuGout-A" keySequence="CTRL+SHIFT+R" command="_ZGbsyqrbEe2-M8nuGout-A"/>
+    <bindings xmi:id="_ZG18VqrbEe2-M8nuGout-A" keySequence="ALT+SHIFT+Q Q" command="_ZGZ3sqrbEe2-M8nuGout-A"/>
+    <bindings xmi:id="_ZG18V6rbEe2-M8nuGout-A" keySequence="CTRL+SHIFT+S" command="_ZGZ3k6rbEe2-M8nuGout-A"/>
+    <bindings xmi:id="_ZG18WKrbEe2-M8nuGout-A" keySequence="CTRL+3" command="_ZGXbMarbEe2-M8nuGout-A"/>
+    <bindings xmi:id="_ZG18WarbEe2-M8nuGout-A" keySequence="CTRL+SHIFT+T" command="_ZGXbaKrbEe2-M8nuGout-A"/>
+    <bindings xmi:id="_ZG18WqrbEe2-M8nuGout-A" keySequence="CTRL+SHIFT+T" command="_ZGVmH6rbEe2-M8nuGout-A">
       <tags>deleted</tags>
     </bindings>
-    <bindings xmi:id="_JQ-EHLjoEe25NdJK2M4KYw" keySequence="ALT+SHIFT+Q S" command="_JQ_427joEe25NdJK2M4KYw">
-      <parameters xmi:id="_JQ-EHbjoEe25NdJK2M4KYw" elementId="org.eclipse.ui.views.showView.viewId" name="org.eclipse.ui.views.showView.viewId" value="org.eclipse.search.ui.views.SearchView"/>
+    <bindings xmi:id="_ZG18W6rbEe2-M8nuGout-A" keySequence="ALT+SHIFT+Q S" command="_ZGZ3sqrbEe2-M8nuGout-A">
+      <parameters xmi:id="_ZG18XKrbEe2-M8nuGout-A" elementId="org.eclipse.ui.views.showView.viewId" name="org.eclipse.ui.views.showView.viewId" value="org.eclipse.search.ui.views.SearchView"/>
     </bindings>
-    <bindings xmi:id="_JQ-EHrjoEe25NdJK2M4KYw" keySequence="CTRL+SHIFT+U" command="_JQ_3PbjoEe25NdJK2M4KYw"/>
-    <bindings xmi:id="_JQ-EH7joEe25NdJK2M4KYw" keySequence="ALT+SHIFT+Q T" command="_JQ_427joEe25NdJK2M4KYw">
-      <parameters xmi:id="_JQ-EILjoEe25NdJK2M4KYw" elementId="org.eclipse.ui.views.showView.viewId" name="org.eclipse.ui.views.showView.viewId" value="org.eclipse.jdt.ui.TypeHierarchy"/>
+    <bindings xmi:id="_ZG18X6rbEe2-M8nuGout-A" keySequence="CTRL+SHIFT+U" command="_ZGVmKarbEe2-M8nuGout-A"/>
+    <bindings xmi:id="_ZG2jYKrbEe2-M8nuGout-A" keySequence="ALT+SHIFT+Q T" command="_ZGZ3sqrbEe2-M8nuGout-A">
+      <parameters xmi:id="_ZG2jYarbEe2-M8nuGout-A" elementId="org.eclipse.ui.views.showView.viewId" name="org.eclipse.ui.views.showView.viewId" value="org.eclipse.jdt.ui.TypeHierarchy"/>
     </bindings>
-    <bindings xmi:id="_JQ-EIbjoEe25NdJK2M4KYw" keySequence="CTRL+SHIFT+V" command="_JQ_5h7joEe25NdJK2M4KYw"/>
-    <bindings xmi:id="_JQ-EIrjoEe25NdJK2M4KYw" keySequence="ALT+SHIFT+Q V" command="_JQ_427joEe25NdJK2M4KYw">
-      <parameters xmi:id="_JQ-EI7joEe25NdJK2M4KYw" elementId="org.eclipse.ui.views.showView.viewId" name="org.eclipse.ui.views.showView.viewId" value="org.eclipse.debug.ui.VariableView"/>
+    <bindings xmi:id="_ZG2jYqrbEe2-M8nuGout-A" keySequence="CTRL+SHIFT+V" command="_ZGbFrarbEe2-M8nuGout-A"/>
+    <bindings xmi:id="_ZG2jZqrbEe2-M8nuGout-A" keySequence="ALT+SHIFT+Q V" command="_ZGZ3sqrbEe2-M8nuGout-A">
+      <parameters xmi:id="_ZG2jZ6rbEe2-M8nuGout-A" elementId="org.eclipse.ui.views.showView.viewId" name="org.eclipse.ui.views.showView.viewId" value="org.eclipse.debug.ui.VariableView"/>
     </bindings>
-    <bindings xmi:id="_JQ-EJLjoEe25NdJK2M4KYw" keySequence="ALT+CTRL+G" command="_JQ_40bjoEe25NdJK2M4KYw"/>
-    <bindings xmi:id="_JQ-EJbjoEe25NdJK2M4KYw" keySequence="CTRL+SHIFT+W" command="_JQ_3r7joEe25NdJK2M4KYw"/>
-    <bindings xmi:id="_JQ-EJrjoEe25NdJK2M4KYw" keySequence="CTRL+SHIFT+H" command="_JQ_4SbjoEe25NdJK2M4KYw"/>
-    <bindings xmi:id="_JQ-EJ7joEe25NdJK2M4KYw" keySequence="ALT+SHIFT+Q H" command="_JQ_427joEe25NdJK2M4KYw">
-      <parameters xmi:id="_JQ-EKLjoEe25NdJK2M4KYw" elementId="org.eclipse.ui.views.showView.viewId" name="org.eclipse.ui.views.showView.viewId" value="org.eclipse.ui.cheatsheets.views.CheatSheetView"/>
+    <bindings xmi:id="_ZG2ja6rbEe2-M8nuGout-A" keySequence="ALT+CTRL+G" command="_ZGZ3qKrbEe2-M8nuGout-A"/>
+    <bindings xmi:id="_ZG2jbKrbEe2-M8nuGout-A" keySequence="CTRL+SHIFT+W" command="_ZGXbZ6rbEe2-M8nuGout-A"/>
+    <bindings xmi:id="_ZG2jbarbEe2-M8nuGout-A" keySequence="CTRL+SHIFT+H" command="_ZGZQZqrbEe2-M8nuGout-A"/>
+    <bindings xmi:id="_ZG2jb6rbEe2-M8nuGout-A" keySequence="ALT+SHIFT+Q H" command="_ZGZ3sqrbEe2-M8nuGout-A">
+      <parameters xmi:id="_ZG2jcKrbEe2-M8nuGout-A" elementId="org.eclipse.ui.views.showView.viewId" name="org.eclipse.ui.views.showView.viewId" value="org.eclipse.ui.cheatsheets.views.CheatSheetView"/>
     </bindings>
-    <bindings xmi:id="_JQ-EKbjoEe25NdJK2M4KYw" keySequence="ALT+SHIFT+Q J" command="_JQ_427joEe25NdJK2M4KYw">
-      <parameters xmi:id="_JQ-EKrjoEe25NdJK2M4KYw" elementId="org.eclipse.ui.views.showView.viewId" name="org.eclipse.ui.views.showView.viewId" value="org.eclipse.jdt.ui.JavadocView"/>
+    <bindings xmi:id="_ZG2jcqrbEe2-M8nuGout-A" keySequence="ALT+SHIFT+Q J" command="_ZGZ3sqrbEe2-M8nuGout-A">
+      <parameters xmi:id="_ZG2jc6rbEe2-M8nuGout-A" elementId="org.eclipse.ui.views.showView.viewId" name="org.eclipse.ui.views.showView.viewId" value="org.eclipse.jdt.ui.JavadocView"/>
     </bindings>
-    <bindings xmi:id="_JQ-EK7joEe25NdJK2M4KYw" keySequence="CTRL+SHIFT+K" command="_JQ_3KrjoEe25NdJK2M4KYw"/>
-    <bindings xmi:id="_JQ-ELLjoEe25NdJK2M4KYw" keySequence="CTRL+," command="_JQ_23rjoEe25NdJK2M4KYw"/>
-    <bindings xmi:id="_JQ-ELbjoEe25NdJK2M4KYw" keySequence="ALT+SHIFT+Q L" command="_JQ_427joEe25NdJK2M4KYw">
-      <parameters xmi:id="_JQ-ELrjoEe25NdJK2M4KYw" elementId="org.eclipse.ui.views.showView.viewId" name="org.eclipse.ui.views.showView.viewId" value="org.eclipse.pde.runtime.LogView"/>
+    <bindings xmi:id="_ZG3KcKrbEe2-M8nuGout-A" keySequence="CTRL+SHIFT+K" command="_ZGVmFqrbEe2-M8nuGout-A"/>
+    <bindings xmi:id="_ZG3KcqrbEe2-M8nuGout-A" keySequence="CTRL+," command="_ZGTw9qrbEe2-M8nuGout-A"/>
+    <bindings xmi:id="_ZG3KdarbEe2-M8nuGout-A" keySequence="ALT+SHIFT+Q L" command="_ZGZ3sqrbEe2-M8nuGout-A">
+      <parameters xmi:id="_ZG3KdqrbEe2-M8nuGout-A" elementId="org.eclipse.ui.views.showView.viewId" name="org.eclipse.ui.views.showView.viewId" value="org.eclipse.pde.runtime.LogView"/>
     </bindings>
-    <bindings xmi:id="_JQ-EL7joEe25NdJK2M4KYw" keySequence="CTRL+SHIFT+N" command="_JQ_4arjoEe25NdJK2M4KYw"/>
-    <bindings xmi:id="_JQ-EMLjoEe25NdJK2M4KYw" keySequence="CTRL+." command="_JQ_51bjoEe25NdJK2M4KYw"/>
-    <bindings xmi:id="_JQ-EMbjoEe25NdJK2M4KYw" keySequence="CTRL+SHIFT+O" command="_JQ_5uLjoEe25NdJK2M4KYw"/>
-    <bindings xmi:id="_JQ-EMrjoEe25NdJK2M4KYw" keySequence="ALT+CTRL+P" command="_JQ_3HbjoEe25NdJK2M4KYw"/>
-    <bindings xmi:id="_JQ-EM7joEe25NdJK2M4KYw" keySequence="CTRL+SHIFT+A" command="_JQ_46LjoEe25NdJK2M4KYw"/>
-    <bindings xmi:id="_JQ-ENLjoEe25NdJK2M4KYw" keySequence="CTRL+SHIFT+B" command="_JQ_3K7joEe25NdJK2M4KYw"/>
-    <bindings xmi:id="_JQ-ENbjoEe25NdJK2M4KYw" keySequence="CTRL+#" command="_JQ_2-bjoEe25NdJK2M4KYw"/>
-    <bindings xmi:id="_JQ-ENrjoEe25NdJK2M4KYw" keySequence="ALT+CTRL+T" command="_JQ_4TrjoEe25NdJK2M4KYw"/>
-    <bindings xmi:id="_JQ-EN7joEe25NdJK2M4KYw" keySequence="CTRL+SHIFT+E" command="_JQ_3ObjoEe25NdJK2M4KYw"/>
-    <bindings xmi:id="_JQ-EOLjoEe25NdJK2M4KYw" keySequence="CTRL+SHIFT+G" command="_JQ_537joEe25NdJK2M4KYw"/>
-    <bindings xmi:id="_JQ-EObjoEe25NdJK2M4KYw" keySequence="ALT+CTRL+H" command="_JQ_28rjoEe25NdJK2M4KYw"/>
-    <bindings xmi:id="_JQ-EOrjoEe25NdJK2M4KYw" keySequence="ALT+SHIFT+Q X" command="_JQ_427joEe25NdJK2M4KYw">
-      <parameters xmi:id="_JQ-EO7joEe25NdJK2M4KYw" elementId="org.eclipse.ui.views.showView.viewId" name="org.eclipse.ui.views.showView.viewId" value="org.eclipse.ui.views.ProblemView"/>
+    <bindings xmi:id="_ZG3KeKrbEe2-M8nuGout-A" keySequence="CTRL+SHIFT+N" command="_ZGZQh6rbEe2-M8nuGout-A"/>
+    <bindings xmi:id="_ZG3KearbEe2-M8nuGout-A" keySequence="CTRL+." command="_ZGbF-6rbEe2-M8nuGout-A"/>
+    <bindings xmi:id="_ZG3KfarbEe2-M8nuGout-A" keySequence="CTRL+SHIFT+O" command="_ZGbF3qrbEe2-M8nuGout-A"/>
+    <bindings xmi:id="_ZG3xgarbEe2-M8nuGout-A" keySequence="ALT+CTRL+P" command="_ZGVmCarbEe2-M8nuGout-A"/>
+    <bindings xmi:id="_ZG3xg6rbEe2-M8nuGout-A" keySequence="CTRL+SHIFT+A" command="_ZGZ3v6rbEe2-M8nuGout-A"/>
+    <bindings xmi:id="_ZG3xhqrbEe2-M8nuGout-A" keySequence="CTRL+SHIFT+B" command="_ZGVmF6rbEe2-M8nuGout-A"/>
+    <bindings xmi:id="_ZG3xiKrbEe2-M8nuGout-A" keySequence="CTRL+#" command="_ZGU-_6rbEe2-M8nuGout-A"/>
+    <bindings xmi:id="_ZG3xkqrbEe2-M8nuGout-A" keySequence="ALT+CTRL+T" command="_ZGZQa6rbEe2-M8nuGout-A"/>
+    <bindings xmi:id="_ZG4YkKrbEe2-M8nuGout-A" keySequence="CTRL+SHIFT+E" command="_ZGVmJarbEe2-M8nuGout-A"/>
+    <bindings xmi:id="_ZG4YmKrbEe2-M8nuGout-A" keySequence="CTRL+SHIFT+G" command="_ZGbspKrbEe2-M8nuGout-A"/>
+    <bindings xmi:id="_ZG4Ym6rbEe2-M8nuGout-A" keySequence="ALT+CTRL+H" command="_ZGU--KrbEe2-M8nuGout-A"/>
+    <bindings xmi:id="_ZG4YnKrbEe2-M8nuGout-A" keySequence="ALT+SHIFT+Q X" command="_ZGZ3sqrbEe2-M8nuGout-A">
+      <parameters xmi:id="_ZG4YnarbEe2-M8nuGout-A" elementId="org.eclipse.ui.views.showView.viewId" name="org.eclipse.ui.views.showView.viewId" value="org.eclipse.ui.views.ProblemView"/>
     </bindings>
-    <bindings xmi:id="_JQ-EPLjoEe25NdJK2M4KYw" keySequence="ALT+SHIFT+Q Y" command="_JQ_427joEe25NdJK2M4KYw">
-      <parameters xmi:id="_JQ-EPbjoEe25NdJK2M4KYw" elementId="org.eclipse.ui.views.showView.viewId" name="org.eclipse.ui.views.showView.viewId" value="org.eclipse.team.sync.views.SynchronizeView"/>
+    <bindings xmi:id="_ZG4YnqrbEe2-M8nuGout-A" keySequence="ALT+SHIFT+Q Y" command="_ZGZ3sqrbEe2-M8nuGout-A">
+      <parameters xmi:id="_ZG4Yn6rbEe2-M8nuGout-A" elementId="org.eclipse.ui.views.showView.viewId" name="org.eclipse.ui.views.showView.viewId" value="org.eclipse.team.sync.views.SynchronizeView"/>
     </bindings>
-    <bindings xmi:id="_JQ-EPrjoEe25NdJK2M4KYw" keySequence="ALT+SHIFT+Q Z" command="_JQ_427joEe25NdJK2M4KYw">
-      <parameters xmi:id="_JQ-EP7joEe25NdJK2M4KYw" elementId="org.eclipse.ui.views.showView.viewId" name="org.eclipse.ui.views.showView.viewId" value="org.eclipse.team.ui.GenericHistoryView"/>
+    <bindings xmi:id="_ZG4YoarbEe2-M8nuGout-A" keySequence="ALT+SHIFT+Q Z" command="_ZGZ3sqrbEe2-M8nuGout-A">
+      <parameters xmi:id="_ZG4YoqrbEe2-M8nuGout-A" elementId="org.eclipse.ui.views.showView.viewId" name="org.eclipse.ui.views.showView.viewId" value="org.eclipse.team.ui.GenericHistoryView"/>
     </bindings>
-    <bindings xmi:id="_JQ-EQLjoEe25NdJK2M4KYw" keySequence="CTRL+P" command="_JQ_5X7joEe25NdJK2M4KYw"/>
-    <bindings xmi:id="_JQ-EQbjoEe25NdJK2M4KYw" keySequence="CTRL+Q" command="_JQ_5cbjoEe25NdJK2M4KYw"/>
-    <bindings xmi:id="_JQ-EQrjoEe25NdJK2M4KYw" keySequence="ALT+SHIFT+C" command="_JQ_5PLjoEe25NdJK2M4KYw"/>
-    <bindings xmi:id="_JQ-EQ7joEe25NdJK2M4KYw" keySequence="CTRL+S" command="_JQ_34LjoEe25NdJK2M4KYw"/>
-    <bindings xmi:id="_JQ-ERLjoEe25NdJK2M4KYw" keySequence="CTRL+U" command="_JQ_4G7joEe25NdJK2M4KYw"/>
-    <bindings xmi:id="_JQ-ERbjoEe25NdJK2M4KYw" keySequence="ALT+SHIFT+F" command="_JQ_5dbjoEe25NdJK2M4KYw"/>
-    <bindings xmi:id="_JQ-ERrjoEe25NdJK2M4KYw" keySequence="CTRL+W" command="_JQ_4KrjoEe25NdJK2M4KYw"/>
-    <bindings xmi:id="_JQ-ER7joEe25NdJK2M4KYw" keySequence="CTRL+H" command="_JQ_5N7joEe25NdJK2M4KYw"/>
-    <bindings xmi:id="_JQ-ESLjoEe25NdJK2M4KYw" keySequence="CTRL+K" command="_JQ_45bjoEe25NdJK2M4KYw"/>
-    <bindings xmi:id="_JQ-ESbjoEe25NdJK2M4KYw" keySequence="CTRL+M" command="_JQ_5M7joEe25NdJK2M4KYw"/>
-    <bindings xmi:id="_JQ-ESrjoEe25NdJK2M4KYw" keySequence="CTRL+N" command="_JQ_55LjoEe25NdJK2M4KYw"/>
-    <bindings xmi:id="_JQ-ES7joEe25NdJK2M4KYw" keySequence="ALT+SHIFT+P" command="_JQ_41bjoEe25NdJK2M4KYw"/>
-    <bindings xmi:id="_JQ-ETLjoEe25NdJK2M4KYw" keySequence="ALT+SHIFT+R" command="_JQ_4JbjoEe25NdJK2M4KYw"/>
-    <bindings xmi:id="_JQ-ETbjoEe25NdJK2M4KYw" keySequence="ALT+SHIFT+R" command="_JQ_24LjoEe25NdJK2M4KYw"/>
-    <bindings xmi:id="_JQ-ETrjoEe25NdJK2M4KYw" keySequence="CTRL+B" command="_JQ_24bjoEe25NdJK2M4KYw"/>
-    <bindings xmi:id="_JQ-ET7joEe25NdJK2M4KYw" keySequence="ALT+SHIFT+Q B" command="_JQ_427joEe25NdJK2M4KYw">
-      <parameters xmi:id="_JQ-EULjoEe25NdJK2M4KYw" elementId="org.eclipse.ui.views.showView.viewId" name="org.eclipse.ui.views.showView.viewId" value="org.eclipse.debug.ui.BreakpointView"/>
+    <bindings xmi:id="_ZG4YpqrbEe2-M8nuGout-A" keySequence="CTRL+P" command="_ZGae5arbEe2-M8nuGout-A"/>
+    <bindings xmi:id="_ZG4_oKrbEe2-M8nuGout-A" keySequence="CTRL+Q" command="_ZGbFl6rbEe2-M8nuGout-A"/>
+    <bindings xmi:id="_ZG4_qarbEe2-M8nuGout-A" keySequence="ALT+SHIFT+C" command="_ZGaewqrbEe2-M8nuGout-A"/>
+    <bindings xmi:id="_ZG4_qqrbEe2-M8nuGout-A" keySequence="CTRL+S" command="_ZGYCa6rbEe2-M8nuGout-A"/>
+    <bindings xmi:id="_ZG4_rarbEe2-M8nuGout-A" keySequence="CTRL+U" command="_ZGYpdKrbEe2-M8nuGout-A"/>
+    <bindings xmi:id="_ZG4_rqrbEe2-M8nuGout-A" keySequence="ALT+SHIFT+F" command="_ZGbFm6rbEe2-M8nuGout-A"/>
+    <bindings xmi:id="_ZG4_sarbEe2-M8nuGout-A" keySequence="CTRL+W" command="_ZGYpg6rbEe2-M8nuGout-A"/>
+    <bindings xmi:id="_ZG4_sqrbEe2-M8nuGout-A" keySequence="CTRL+H" command="_ZGaevarbEe2-M8nuGout-A"/>
+    <bindings xmi:id="_ZG4_tqrbEe2-M8nuGout-A" keySequence="CTRL+K" command="_ZGZ3vKrbEe2-M8nuGout-A"/>
+    <bindings xmi:id="_ZG5msKrbEe2-M8nuGout-A" keySequence="CTRL+M" command="_ZGaeuarbEe2-M8nuGout-A"/>
+    <bindings xmi:id="_ZG5ms6rbEe2-M8nuGout-A" keySequence="CTRL+N" command="_ZGbsqarbEe2-M8nuGout-A"/>
+    <bindings xmi:id="_ZG5mv6rbEe2-M8nuGout-A" keySequence="ALT+SHIFT+P" command="_ZGZ3rKrbEe2-M8nuGout-A"/>
+    <bindings xmi:id="_ZG5mw6rbEe2-M8nuGout-A" keySequence="ALT+SHIFT+R" command="_ZGYpfqrbEe2-M8nuGout-A"/>
+    <bindings xmi:id="_ZG5mxKrbEe2-M8nuGout-A" keySequence="ALT+SHIFT+R" command="_ZGUX4arbEe2-M8nuGout-A"/>
+    <bindings xmi:id="_ZG6NwKrbEe2-M8nuGout-A" keySequence="CTRL+B" command="_ZGUX4qrbEe2-M8nuGout-A"/>
+    <bindings xmi:id="_ZG6NwarbEe2-M8nuGout-A" keySequence="ALT+SHIFT+Q B" command="_ZGZ3sqrbEe2-M8nuGout-A">
+      <parameters xmi:id="_ZG6NwqrbEe2-M8nuGout-A" elementId="org.eclipse.ui.views.showView.viewId" name="org.eclipse.ui.views.showView.viewId" value="org.eclipse.debug.ui.BreakpointView"/>
     </bindings>
-    <bindings xmi:id="_JQ-EUbjoEe25NdJK2M4KYw" keySequence="ALT+SHIFT+S" command="_JQ_4PrjoEe25NdJK2M4KYw"/>
-    <bindings xmi:id="_JQ-EUrjoEe25NdJK2M4KYw" keySequence="ALT+SHIFT+T" command="_JQ_4e7joEe25NdJK2M4KYw"/>
-    <bindings xmi:id="_JQ-EU7joEe25NdJK2M4KYw" keySequence="ALT+SHIFT+Q C" command="_JQ_427joEe25NdJK2M4KYw">
-      <parameters xmi:id="_JQ-EVLjoEe25NdJK2M4KYw" elementId="org.eclipse.ui.views.showView.viewId" name="org.eclipse.ui.views.showView.viewId" value="org.eclipse.ui.console.ConsoleView"/>
+    <bindings xmi:id="_ZG6NyKrbEe2-M8nuGout-A" keySequence="ALT+SHIFT+S" command="_ZGYpl6rbEe2-M8nuGout-A"/>
+    <bindings xmi:id="_ZG6NyarbEe2-M8nuGout-A" keySequence="ALT+SHIFT+T" command="_ZGZQmKrbEe2-M8nuGout-A"/>
+    <bindings xmi:id="_ZG6NyqrbEe2-M8nuGout-A" keySequence="ALT+SHIFT+Q C" command="_ZGZ3sqrbEe2-M8nuGout-A">
+      <parameters xmi:id="_ZG6Ny6rbEe2-M8nuGout-A" elementId="org.eclipse.ui.views.showView.viewId" name="org.eclipse.ui.views.showView.viewId" value="org.eclipse.ui.console.ConsoleView"/>
     </bindings>
-    <bindings xmi:id="_JQ-EVbjoEe25NdJK2M4KYw" keySequence="ALT+SHIFT+Q D" command="_JQ_427joEe25NdJK2M4KYw">
-      <parameters xmi:id="_JQ-EVrjoEe25NdJK2M4KYw" elementId="org.eclipse.ui.views.showView.viewId" name="org.eclipse.ui.views.showView.viewId" value="org.eclipse.jdt.ui.SourceView"/>
+    <bindings xmi:id="_ZG6NzqrbEe2-M8nuGout-A" keySequence="ALT+SHIFT+Q D" command="_ZGZ3sqrbEe2-M8nuGout-A">
+      <parameters xmi:id="_ZG6Nz6rbEe2-M8nuGout-A" elementId="org.eclipse.ui.views.showView.viewId" name="org.eclipse.ui.views.showView.viewId" value="org.eclipse.jdt.ui.SourceView"/>
     </bindings>
-    <bindings xmi:id="_JQ-EV7joEe25NdJK2M4KYw" keySequence="CTRL+E" command="_JQ_3oLjoEe25NdJK2M4KYw"/>
-    <bindings xmi:id="_JQ-EWLjoEe25NdJK2M4KYw" keySequence="CTRL+F" command="_JQ_3ErjoEe25NdJK2M4KYw"/>
-    <bindings xmi:id="_JQ-EWbjoEe25NdJK2M4KYw" keySequence="ALT+SHIFT+V" command="_JQ_35rjoEe25NdJK2M4KYw"/>
-    <bindings xmi:id="_JQ-EWrjoEe25NdJK2M4KYw" keySequence="CTRL+G" command="_JQ_2tLjoEe25NdJK2M4KYw"/>
-    <bindings xmi:id="_JQ-EW7joEe25NdJK2M4KYw" keySequence="ALT+SHIFT+W" command="_JQ_50LjoEe25NdJK2M4KYw"/>
-    <bindings xmi:id="_JQ-EXLjoEe25NdJK2M4KYw" keySequence="ALT+SHIFT+I" command="_JQ_2-rjoEe25NdJK2M4KYw"/>
-    <bindings xmi:id="_JQ-EXbjoEe25NdJK2M4KYw" keySequence="ALT+SHIFT+J" command="_JQ_3nbjoEe25NdJK2M4KYw"/>
-    <bindings xmi:id="_JQ-EXrjoEe25NdJK2M4KYw" keySequence="ALT+SHIFT+L" command="_JQ_3a7joEe25NdJK2M4KYw"/>
-    <bindings xmi:id="_JQ-EX7joEe25NdJK2M4KYw" keySequence="ALT+SHIFT+M" command="_JQ_5xbjoEe25NdJK2M4KYw"/>
-    <bindings xmi:id="_JQ-EYLjoEe25NdJK2M4KYw" keySequence="ALT+SHIFT+N" command="_JQ_3rLjoEe25NdJK2M4KYw"/>
-    <bindings xmi:id="_JQ-EYbjoEe25NdJK2M4KYw" keySequence="ALT+SHIFT+Z" command="_JQ_4Q7joEe25NdJK2M4KYw"/>
-    <bindings xmi:id="_JQ-EYrjoEe25NdJK2M4KYw" keySequence="CTRL+_" command="_JQ_3jrjoEe25NdJK2M4KYw">
-      <parameters xmi:id="_JQ-EY7joEe25NdJK2M4KYw" elementId="Splitter.isHorizontal" name="Splitter.isHorizontal" value="true"/>
+    <bindings xmi:id="_ZG6N0KrbEe2-M8nuGout-A" keySequence="CTRL+E" command="_ZGXbWKrbEe2-M8nuGout-A"/>
+    <bindings xmi:id="_ZG6N0arbEe2-M8nuGout-A" keySequence="CTRL+F" command="_ZGU_GKrbEe2-M8nuGout-A"/>
+    <bindings xmi:id="_ZG6N06rbEe2-M8nuGout-A" keySequence="ALT+SHIFT+V" command="_ZGYCcarbEe2-M8nuGout-A"/>
+    <bindings xmi:id="_ZG600KrbEe2-M8nuGout-A" keySequence="CTRL+G" command="_ZGTJyKrbEe2-M8nuGout-A"/>
+    <bindings xmi:id="_ZG600arbEe2-M8nuGout-A" keySequence="ALT+SHIFT+W" command="_ZGbF9qrbEe2-M8nuGout-A"/>
+    <bindings xmi:id="_ZG600qrbEe2-M8nuGout-A" keySequence="ALT+SHIFT+I" command="_ZGU_AKrbEe2-M8nuGout-A"/>
+    <bindings xmi:id="_ZG6006rbEe2-M8nuGout-A" keySequence="ALT+SHIFT+J" command="_ZGXbVarbEe2-M8nuGout-A"/>
+    <bindings xmi:id="_ZG601KrbEe2-M8nuGout-A" keySequence="ALT+SHIFT+L" command="_ZGW0LqrbEe2-M8nuGout-A"/>
+    <bindings xmi:id="_ZG601arbEe2-M8nuGout-A" keySequence="ALT+SHIFT+M" command="_ZGbF66rbEe2-M8nuGout-A"/>
+    <bindings xmi:id="_ZG6016rbEe2-M8nuGout-A" keySequence="ALT+SHIFT+N" command="_ZGXbZKrbEe2-M8nuGout-A"/>
+    <bindings xmi:id="_ZG6026rbEe2-M8nuGout-A" keySequence="ALT+SHIFT+Z" command="_ZGZQYKrbEe2-M8nuGout-A"/>
+    <bindings xmi:id="_ZG7b5KrbEe2-M8nuGout-A" keySequence="CTRL+_" command="_ZGXbRqrbEe2-M8nuGout-A">
+      <parameters xmi:id="_ZG7b5arbEe2-M8nuGout-A" elementId="Splitter.isHorizontal" name="Splitter.isHorizontal" value="true"/>
     </bindings>
-    <bindings xmi:id="_JQ-EZLjoEe25NdJK2M4KYw" keySequence="CTRL+{" command="_JQ_3jrjoEe25NdJK2M4KYw">
-      <parameters xmi:id="_JQ-EZbjoEe25NdJK2M4KYw" elementId="Splitter.isHorizontal" name="Splitter.isHorizontal" value="false"/>
+    <bindings xmi:id="_ZG7b6arbEe2-M8nuGout-A" keySequence="CTRL+{" command="_ZGXbRqrbEe2-M8nuGout-A">
+      <parameters xmi:id="_ZG7b6qrbEe2-M8nuGout-A" elementId="Splitter.isHorizontal" name="Splitter.isHorizontal" value="false"/>
     </bindings>
-    <bindings xmi:id="_JQ-EZrjoEe25NdJK2M4KYw" keySequence="ALT+ARROW_LEFT" command="_JQ_2_LjoEe25NdJK2M4KYw"/>
-    <bindings xmi:id="_JQ-EZ7joEe25NdJK2M4KYw" keySequence="ALT+ARROW_RIGHT" command="_JQ_3wrjoEe25NdJK2M4KYw"/>
-    <bindings xmi:id="_JQ-EaLjoEe25NdJK2M4KYw" keySequence="SHIFT+F2" command="_JQ_4qrjoEe25NdJK2M4KYw"/>
-    <bindings xmi:id="_JQ-EabjoEe25NdJK2M4KYw" keySequence="SHIFT+F5" command="_JQ_4CLjoEe25NdJK2M4KYw"/>
-    <bindings xmi:id="_JQ-EarjoEe25NdJK2M4KYw" keySequence="ALT+F7" command="_JQ_4f7joEe25NdJK2M4KYw"/>
-    <bindings xmi:id="_JQ-Ea7joEe25NdJK2M4KYw" keySequence="ALT+F5" command="_JQ_38bjoEe25NdJK2M4KYw"/>
-    <bindings xmi:id="_JQ-EbLjoEe25NdJK2M4KYw" keySequence="F11" command="_JQ_5sbjoEe25NdJK2M4KYw"/>
-    <bindings xmi:id="_JQ-EbbjoEe25NdJK2M4KYw" keySequence="F12" command="_JQ_5OrjoEe25NdJK2M4KYw"/>
-    <bindings xmi:id="_JQ-EbrjoEe25NdJK2M4KYw" keySequence="F2" command="_JQ_24LjoEe25NdJK2M4KYw"/>
-    <bindings xmi:id="_JQ-Eb7joEe25NdJK2M4KYw" keySequence="F3" command="_JQ_3abjoEe25NdJK2M4KYw"/>
-    <bindings xmi:id="_JQ-EcLjoEe25NdJK2M4KYw" keySequence="F4" command="_JQ_26bjoEe25NdJK2M4KYw"/>
-    <bindings xmi:id="_JQ-EcbjoEe25NdJK2M4KYw" keySequence="F5" command="_JQ_3y7joEe25NdJK2M4KYw"/>
-    <bindings xmi:id="_JQ-EcrjoEe25NdJK2M4KYw" keySequence="CTRL+SHIFT+F7" command="_JQ_5tbjoEe25NdJK2M4KYw"/>
-    <bindings xmi:id="_JQ-Ec7joEe25NdJK2M4KYw" keySequence="CTRL+SHIFT+F8" command="_JQ_3jbjoEe25NdJK2M4KYw"/>
-    <bindings xmi:id="_JQ-EdLjoEe25NdJK2M4KYw" keySequence="ALT+CTRL+ARROW_LEFT" command="_JQ_5cbjoEe25NdJK2M4KYw"/>
-    <bindings xmi:id="_JQ-EdbjoEe25NdJK2M4KYw" keySequence="ALT+CTRL+ARROW_RIGHT" command="_JQ_3MrjoEe25NdJK2M4KYw"/>
-    <bindings xmi:id="_JQ-EdrjoEe25NdJK2M4KYw" keySequence="CTRL+SHIFT+F4" command="_JQ_3r7joEe25NdJK2M4KYw"/>
-    <bindings xmi:id="_JQ-Ed7joEe25NdJK2M4KYw" keySequence="CTRL+SHIFT+F6" command="_JQ_4xLjoEe25NdJK2M4KYw"/>
-    <bindings xmi:id="_JQ-EeLjoEe25NdJK2M4KYw" keySequence="ALT+SHIFT+X J" command="_JQ_47LjoEe25NdJK2M4KYw"/>
-    <bindings xmi:id="_JQ-EebjoEe25NdJK2M4KYw" keySequence="ALT+SHIFT+X M" command="_JQ_3_rjoEe25NdJK2M4KYw"/>
-    <bindings xmi:id="_JQ-EerjoEe25NdJK2M4KYw" keySequence="ALT+SHIFT+X A" command="_JQ_23bjoEe25NdJK2M4KYw"/>
-    <bindings xmi:id="_JQ-Ee7joEe25NdJK2M4KYw" keySequence="ALT+SHIFT+X B" command="_JQ_6ALjoEe25NdJK2M4KYw"/>
-    <bindings xmi:id="_JQ-EfLjoEe25NdJK2M4KYw" keySequence="ALT+SHIFT+X E" command="_JQ_40LjoEe25NdJK2M4KYw"/>
-    <bindings xmi:id="_JQ-EfbjoEe25NdJK2M4KYw" keySequence="CTRL+F7" command="_JQ_4VbjoEe25NdJK2M4KYw"/>
-    <bindings xmi:id="_JQ-EfrjoEe25NdJK2M4KYw" keySequence="CTRL+F8" command="_JQ_3crjoEe25NdJK2M4KYw"/>
-    <bindings xmi:id="_JQ-Ef7joEe25NdJK2M4KYw" keySequence="CTRL+F11" command="_JQ_5hbjoEe25NdJK2M4KYw"/>
-    <bindings xmi:id="_JQ-EgLjoEe25NdJK2M4KYw" keySequence="CTRL+F4" command="_JQ_4KrjoEe25NdJK2M4KYw"/>
-    <bindings xmi:id="_JQ-EgbjoEe25NdJK2M4KYw" keySequence="CTRL+F6" command="_JQ_3HrjoEe25NdJK2M4KYw"/>
-    <bindings xmi:id="_JQ-EgrjoEe25NdJK2M4KYw" keySequence="ALT+SHIFT+F7" command="_JQ_4-bjoEe25NdJK2M4KYw"/>
-    <bindings xmi:id="_JQ-Eg7joEe25NdJK2M4KYw" keySequence="ALT+CTRL+X G" command="_JQ_5rbjoEe25NdJK2M4KYw"/>
-    <bindings xmi:id="_JQ-EhLjoEe25NdJK2M4KYw" keySequence="ALT+CTRL+SHIFT+B D" command="_JQ_5wbjoEe25NdJK2M4KYw"/>
-    <bindings xmi:id="_JQ-EhbjoEe25NdJK2M4KYw" keySequence="ALT+CTRL+SHIFT+B F" command="_JQ_3VrjoEe25NdJK2M4KYw"/>
-    <bindings xmi:id="_JQ-EhrjoEe25NdJK2M4KYw" keySequence="ALT+SHIFT+X O" command="_JQ_4q7joEe25NdJK2M4KYw"/>
-    <bindings xmi:id="_JQ-Eh7joEe25NdJK2M4KYw" keySequence="ALT+SHIFT+X P" command="_JQ_5ybjoEe25NdJK2M4KYw"/>
-    <bindings xmi:id="_JQ-EiLjoEe25NdJK2M4KYw" keySequence="CTRL+SHIFT+NUMPAD_MULTIPLY" command="_JQ_4u7joEe25NdJK2M4KYw"/>
-    <bindings xmi:id="_JQ-EibjoEe25NdJK2M4KYw" keySequence="ALT+SHIFT+X Q" command="_JQ_3ULjoEe25NdJK2M4KYw"/>
-    <bindings xmi:id="_JQ-EirjoEe25NdJK2M4KYw" keySequence="ALT+SHIFT+X R" command="_JQ_4H7joEe25NdJK2M4KYw"/>
-    <bindings xmi:id="_JQ-Ei7joEe25NdJK2M4KYw" keySequence="ALT+SHIFT+X T" command="_JQ_397joEe25NdJK2M4KYw"/>
-    <bindings xmi:id="_JQ-EjLjoEe25NdJK2M4KYw" keySequence="CTRL+SHIFT+NUMPAD_DIVIDE" command="_JQ_3kLjoEe25NdJK2M4KYw"/>
-    <bindings xmi:id="_JQ-EjbjoEe25NdJK2M4KYw" keySequence="ALT+CTRL+SHIFT+B R" command="_JQ_4mbjoEe25NdJK2M4KYw"/>
-    <bindings xmi:id="_JQ-EjrjoEe25NdJK2M4KYw" keySequence="ALT+CTRL+SHIFT+B S" command="_JQ_5JLjoEe25NdJK2M4KYw"/>
-    <bindings xmi:id="_JQ-Ej7joEe25NdJK2M4KYw" keySequence="DEL" command="_JQ_3IrjoEe25NdJK2M4KYw"/>
-    <bindings xmi:id="_JQ-EkLjoEe25NdJK2M4KYw" keySequence="ALT+-" command="_JQ_4aLjoEe25NdJK2M4KYw"/>
-    <bindings xmi:id="_JQ-EkbjoEe25NdJK2M4KYw" keySequence="ALT+CR" command="_JQ_5JrjoEe25NdJK2M4KYw"/>
-    <bindings xmi:id="_JQ-EkrjoEe25NdJK2M4KYw" keySequence="ALT+SHIFT+D B" command="_JQ_5u7joEe25NdJK2M4KYw"/>
-    <bindings xmi:id="_JQ-Ek7joEe25NdJK2M4KYw" keySequence="ALT+SHIFT+D E" command="_JQ_59bjoEe25NdJK2M4KYw"/>
-    <bindings xmi:id="_JQ-ElLjoEe25NdJK2M4KYw" keySequence="ALT+SHIFT+D A" command="_JQ_5TbjoEe25NdJK2M4KYw"/>
-    <bindings xmi:id="_JQ-ElbjoEe25NdJK2M4KYw" keySequence="ALT+SHIFT+D R" command="_JQ_4IbjoEe25NdJK2M4KYw"/>
-    <bindings xmi:id="_JQ-ElrjoEe25NdJK2M4KYw" keySequence="ALT+SHIFT+D T" command="_JQ_2wLjoEe25NdJK2M4KYw"/>
-    <bindings xmi:id="_JQ-El7joEe25NdJK2M4KYw" keySequence="ALT+SHIFT+D J" command="_JQ_5ErjoEe25NdJK2M4KYw"/>
-    <bindings xmi:id="_JQ-EmLjoEe25NdJK2M4KYw" keySequence="ALT+SHIFT+D O" command="_JQ_4WrjoEe25NdJK2M4KYw"/>
-    <bindings xmi:id="_JQ-EmbjoEe25NdJK2M4KYw" keySequence="ALT+SHIFT+D P" command="_JQ_5W7joEe25NdJK2M4KYw"/>
-    <bindings xmi:id="_JQ-EmrjoEe25NdJK2M4KYw" keySequence="ALT+SHIFT+D Q" command="_JQ_4DrjoEe25NdJK2M4KYw"/>
-    <bindings xmi:id="_JQ-Em7joEe25NdJK2M4KYw" keySequence="CTRL+-" command="_JQ_6u7joEe25NdJK2M4KYw"/>
-    <bindings xmi:id="_JQ-EnLjoEe25NdJK2M4KYw" keySequence="CTRL+=" command="_JQ_6i7joEe25NdJK2M4KYw"/>
+    <bindings xmi:id="_ZG7b86rbEe2-M8nuGout-A" keySequence="ALT+ARROW_LEFT" command="_ZGU_AqrbEe2-M8nuGout-A"/>
+    <bindings xmi:id="_ZG7b9arbEe2-M8nuGout-A" keySequence="ALT+ARROW_RIGHT" command="_ZGYCTarbEe2-M8nuGout-A"/>
+    <bindings xmi:id="_ZG8C9KrbEe2-M8nuGout-A" keySequence="SHIFT+F2" command="_ZGZ3garbEe2-M8nuGout-A"/>
+    <bindings xmi:id="_ZG8C9arbEe2-M8nuGout-A" keySequence="SHIFT+F5" command="_ZGYpYarbEe2-M8nuGout-A"/>
+    <bindings xmi:id="_ZG8C9qrbEe2-M8nuGout-A" keySequence="ALT+F7" command="_ZGZQnKrbEe2-M8nuGout-A"/>
+    <bindings xmi:id="_ZG8C-arbEe2-M8nuGout-A" keySequence="ALT+F5" command="_ZGYCfKrbEe2-M8nuGout-A"/>
+    <bindings xmi:id="_ZG8C_KrbEe2-M8nuGout-A" keySequence="F11" command="_ZGbF16rbEe2-M8nuGout-A"/>
+    <bindings xmi:id="_ZG8C_arbEe2-M8nuGout-A" keySequence="F12" command="_ZGaewKrbEe2-M8nuGout-A"/>
+    <bindings xmi:id="_ZG8DBKrbEe2-M8nuGout-A" keySequence="F2" command="_ZGUX4arbEe2-M8nuGout-A"/>
+    <bindings xmi:id="_ZG8qAKrbEe2-M8nuGout-A" keySequence="F3" command="_ZGW0LKrbEe2-M8nuGout-A"/>
+    <bindings xmi:id="_ZG8qA6rbEe2-M8nuGout-A" keySequence="F4" command="_ZGUX6qrbEe2-M8nuGout-A"/>
+    <bindings xmi:id="_ZG8qB6rbEe2-M8nuGout-A" keySequence="F5" command="_ZGYCVqrbEe2-M8nuGout-A"/>
+    <bindings xmi:id="_ZG8qCqrbEe2-M8nuGout-A" keySequence="CTRL+SHIFT+F7" command="_ZGbF26rbEe2-M8nuGout-A"/>
+    <bindings xmi:id="_ZG8qC6rbEe2-M8nuGout-A" keySequence="CTRL+SHIFT+F8" command="_ZGXbRarbEe2-M8nuGout-A"/>
+    <bindings xmi:id="_ZG8qDqrbEe2-M8nuGout-A" keySequence="ALT+CTRL+ARROW_LEFT" command="_ZGbFl6rbEe2-M8nuGout-A"/>
+    <bindings xmi:id="_ZG8qD6rbEe2-M8nuGout-A" keySequence="ALT+CTRL+ARROW_RIGHT" command="_ZGVmHqrbEe2-M8nuGout-A"/>
+    <bindings xmi:id="_ZG8qEarbEe2-M8nuGout-A" keySequence="CTRL+SHIFT+F4" command="_ZGXbZ6rbEe2-M8nuGout-A"/>
+    <bindings xmi:id="_ZG8qEqrbEe2-M8nuGout-A" keySequence="CTRL+SHIFT+F6" command="_ZGZ3m6rbEe2-M8nuGout-A"/>
+    <bindings xmi:id="_ZG9REKrbEe2-M8nuGout-A" keySequence="ALT+SHIFT+X J" command="_ZGZ3w6rbEe2-M8nuGout-A"/>
+    <bindings xmi:id="_ZG9REqrbEe2-M8nuGout-A" keySequence="ALT+SHIFT+X M" command="_ZGYpV6rbEe2-M8nuGout-A"/>
+    <bindings xmi:id="_ZG9RE6rbEe2-M8nuGout-A" keySequence="ALT+SHIFT+X A" command="_ZGTw9arbEe2-M8nuGout-A"/>
+    <bindings xmi:id="_ZG9RFKrbEe2-M8nuGout-A" keySequence="ALT+SHIFT+X B" command="_ZGbsxarbEe2-M8nuGout-A"/>
+    <bindings xmi:id="_ZG9RFarbEe2-M8nuGout-A" keySequence="ALT+SHIFT+X E" command="_ZGZ3p6rbEe2-M8nuGout-A"/>
+    <bindings xmi:id="_ZG9RFqrbEe2-M8nuGout-A" keySequence="CTRL+F7" command="_ZGZQcqrbEe2-M8nuGout-A"/>
+    <bindings xmi:id="_ZG9RF6rbEe2-M8nuGout-A" keySequence="CTRL+F8" command="_ZGW0NarbEe2-M8nuGout-A"/>
+    <bindings xmi:id="_ZG94IarbEe2-M8nuGout-A" keySequence="CTRL+F11" command="_ZGbFq6rbEe2-M8nuGout-A"/>
+    <bindings xmi:id="_ZG94K6rbEe2-M8nuGout-A" keySequence="CTRL+F4" command="_ZGYpg6rbEe2-M8nuGout-A"/>
+    <bindings xmi:id="_ZG94LarbEe2-M8nuGout-A" keySequence="CTRL+F6" command="_ZGVmCqrbEe2-M8nuGout-A"/>
+    <bindings xmi:id="_ZG94LqrbEe2-M8nuGout-A" keySequence="ALT+SHIFT+F7" command="_ZGZ30KrbEe2-M8nuGout-A"/>
+    <bindings xmi:id="_ZG-fMKrbEe2-M8nuGout-A" keySequence="ALT+CTRL+X G" command="_ZGbF06rbEe2-M8nuGout-A"/>
+    <bindings xmi:id="_ZG_GR6rbEe2-M8nuGout-A" keySequence="ALT+CTRL+SHIFT+B D" command="_ZGbF56rbEe2-M8nuGout-A"/>
+    <bindings xmi:id="_ZG_GSKrbEe2-M8nuGout-A" keySequence="ALT+CTRL+SHIFT+B F" command="_ZGWNJ6rbEe2-M8nuGout-A"/>
+    <bindings xmi:id="_ZG_GSarbEe2-M8nuGout-A" keySequence="ALT+SHIFT+X O" command="_ZGZ3gqrbEe2-M8nuGout-A"/>
+    <bindings xmi:id="_ZG_GTKrbEe2-M8nuGout-A" keySequence="ALT+SHIFT+X P" command="_ZGbF76rbEe2-M8nuGout-A"/>
+    <bindings xmi:id="_ZG_GTarbEe2-M8nuGout-A" keySequence="CTRL+SHIFT+NUMPAD_MULTIPLY" command="_ZGZ3kqrbEe2-M8nuGout-A"/>
+    <bindings xmi:id="_ZG_GT6rbEe2-M8nuGout-A" keySequence="ALT+SHIFT+X Q" command="_ZGWNIarbEe2-M8nuGout-A"/>
+    <bindings xmi:id="_ZG_GUKrbEe2-M8nuGout-A" keySequence="ALT+SHIFT+X R" command="_ZGYpeKrbEe2-M8nuGout-A"/>
+    <bindings xmi:id="_ZG_tUKrbEe2-M8nuGout-A" keySequence="ALT+SHIFT+X T" command="_ZGYpUKrbEe2-M8nuGout-A"/>
+    <bindings xmi:id="_ZG_tUarbEe2-M8nuGout-A" keySequence="CTRL+SHIFT+NUMPAD_DIVIDE" command="_ZGXbSKrbEe2-M8nuGout-A"/>
+    <bindings xmi:id="_ZG_tVKrbEe2-M8nuGout-A" keySequence="ALT+CTRL+SHIFT+B R" command="_ZGZ3cKrbEe2-M8nuGout-A"/>
+    <bindings xmi:id="_ZG_tVarbEe2-M8nuGout-A" keySequence="ALT+CTRL+SHIFT+B S" command="_ZGaeqqrbEe2-M8nuGout-A"/>
+    <bindings xmi:id="_ZG_tVqrbEe2-M8nuGout-A" keySequence="DEL" command="_ZGVmDqrbEe2-M8nuGout-A"/>
+    <bindings xmi:id="_ZHAUbarbEe2-M8nuGout-A" keySequence="ALT+-" command="_ZGZQharbEe2-M8nuGout-A"/>
+    <bindings xmi:id="_ZHAUcqrbEe2-M8nuGout-A" keySequence="ALT+CR" command="_ZGaerKrbEe2-M8nuGout-A"/>
+    <bindings xmi:id="_ZHAUc6rbEe2-M8nuGout-A" keySequence="ALT+SHIFT+D B" command="_ZGbF4arbEe2-M8nuGout-A"/>
+    <bindings xmi:id="_ZHA7cKrbEe2-M8nuGout-A" keySequence="ALT+SHIFT+D E" command="_ZGbsuqrbEe2-M8nuGout-A"/>
+    <bindings xmi:id="_ZHA7carbEe2-M8nuGout-A" keySequence="ALT+SHIFT+D A" command="_ZGae06rbEe2-M8nuGout-A"/>
+    <bindings xmi:id="_ZHA7cqrbEe2-M8nuGout-A" keySequence="ALT+SHIFT+D R" command="_ZGYpeqrbEe2-M8nuGout-A"/>
+    <bindings xmi:id="_ZHA7c6rbEe2-M8nuGout-A" keySequence="ALT+SHIFT+D T" command="_ZGTw2KrbEe2-M8nuGout-A"/>
+    <bindings xmi:id="_ZHA7dKrbEe2-M8nuGout-A" keySequence="ALT+SHIFT+D J" command="_ZGaemKrbEe2-M8nuGout-A"/>
+    <bindings xmi:id="_ZHA7darbEe2-M8nuGout-A" keySequence="ALT+SHIFT+D O" command="_ZGZQd6rbEe2-M8nuGout-A"/>
+    <bindings xmi:id="_ZHA7dqrbEe2-M8nuGout-A" keySequence="ALT+SHIFT+D P" command="_ZGae4arbEe2-M8nuGout-A"/>
+    <bindings xmi:id="_ZHA7d6rbEe2-M8nuGout-A" keySequence="ALT+SHIFT+D Q" command="_ZGYpZ6rbEe2-M8nuGout-A"/>
+    <bindings xmi:id="_vtbqMKxFEe2VqJFWjEAUdQ" keySequence="CTRL+-" command="_vo5vnaxFEe2VqJFWjEAUdQ"/>
+    <bindings xmi:id="_vtetgKxFEe2VqJFWjEAUdQ" keySequence="CTRL+=" command="_vo5Ie6xFEe2VqJFWjEAUdQ"/>
   </bindingTables>
-  <bindingTables xmi:id="_JQ-EnbjoEe25NdJK2M4KYw" elementId="com.genuitec.eclipse.inlinesearch.context" bindingContext="_JQ-o8bjoEe25NdJK2M4KYw">
-    <bindings xmi:id="_JQ-EnrjoEe25NdJK2M4KYw" keySequence="CTRL+BS" command="_JQ_4ibjoEe25NdJK2M4KYw"/>
-    <bindings xmi:id="_JQ-En7joEe25NdJK2M4KYw" keySequence="ALT+SHIFT+CR" command="_JQ_3nrjoEe25NdJK2M4KYw"/>
-    <bindings xmi:id="_JQ-EoLjoEe25NdJK2M4KYw" keySequence="ALT+SHIFT+1" command="_JQ_4x7joEe25NdJK2M4KYw"/>
-    <bindings xmi:id="_JQ-EobjoEe25NdJK2M4KYw" keySequence="CTRL+DEL" command="_JQ_4tLjoEe25NdJK2M4KYw"/>
-    <bindings xmi:id="_JQ-EorjoEe25NdJK2M4KYw" keySequence="CTRL+ARROW_UP" command="_JQ_5nbjoEe25NdJK2M4KYw"/>
-    <bindings xmi:id="_JQ-Eo7joEe25NdJK2M4KYw" keySequence="CTRL+ARROW_DOWN" command="_JQ_4UbjoEe25NdJK2M4KYw"/>
+  <bindingTables xmi:id="_ZG0uM6rbEe2-M8nuGout-A" elementId="com.genuitec.eclipse.inlinesearch.context" bindingContext="_ZGeI5KrbEe2-M8nuGout-A">
+    <bindings xmi:id="_ZG0uNKrbEe2-M8nuGout-A" keySequence="CTRL+BS" command="_ZGZQpqrbEe2-M8nuGout-A"/>
+    <bindings xmi:id="_ZG1VQKrbEe2-M8nuGout-A" keySequence="ALT+SHIFT+CR" command="_ZGXbVqrbEe2-M8nuGout-A"/>
+    <bindings xmi:id="_ZG3xharbEe2-M8nuGout-A" keySequence="ALT+SHIFT+1" command="_ZGZ3nqrbEe2-M8nuGout-A"/>
+    <bindings xmi:id="_ZG7b76rbEe2-M8nuGout-A" keySequence="CTRL+DEL" command="_ZGZ3i6rbEe2-M8nuGout-A"/>
+    <bindings xmi:id="_ZG-fMqrbEe2-M8nuGout-A" keySequence="CTRL+ARROW_UP" command="_ZGbFw6rbEe2-M8nuGout-A"/>
+    <bindings xmi:id="_ZG-fNKrbEe2-M8nuGout-A" keySequence="CTRL+ARROW_DOWN" command="_ZGZQbqrbEe2-M8nuGout-A"/>
   </bindingTables>
-  <bindingTables xmi:id="_JQ-EpLjoEe25NdJK2M4KYw" elementId="org.eclipse.jdt.ui.javaEditorScope" bindingContext="_JQ-o9bjoEe25NdJK2M4KYw">
-    <bindings xmi:id="_JQ-EpbjoEe25NdJK2M4KYw" keySequence="CTRL+SHIFT+P" command="_JQ_4-LjoEe25NdJK2M4KYw"/>
-    <bindings xmi:id="_JQ-EprjoEe25NdJK2M4KYw" keySequence="CTRL+7" command="_JQ_4bbjoEe25NdJK2M4KYw"/>
-    <bindings xmi:id="_JQ-Ep7joEe25NdJK2M4KYw" keySequence="CTRL+SHIFT+M" command="_JQ_3e7joEe25NdJK2M4KYw"/>
-    <bindings xmi:id="_JQ-EqLjoEe25NdJK2M4KYw" keySequence="CTRL+/" command="_JQ_4bbjoEe25NdJK2M4KYw"/>
-    <bindings xmi:id="_JQ-EqbjoEe25NdJK2M4KYw" keySequence="CTRL+SHIFT+C" command="_JQ_4bbjoEe25NdJK2M4KYw"/>
-    <bindings xmi:id="_JQ-EqrjoEe25NdJK2M4KYw" keySequence="CTRL+SHIFT+F" command="_JQ_5orjoEe25NdJK2M4KYw"/>
-    <bindings xmi:id="_JQ-Eq7joEe25NdJK2M4KYw" keySequence="ALT+SHIFT+B" command="_JQ_59LjoEe25NdJK2M4KYw"/>
-    <bindings xmi:id="_JQ-ErLjoEe25NdJK2M4KYw" keySequence="CTRL+T" command="_JQ_4d7joEe25NdJK2M4KYw"/>
-    <bindings xmi:id="_JQ-ErbjoEe25NdJK2M4KYw" keySequence="CTRL+I" command="_JQ_3wLjoEe25NdJK2M4KYw"/>
-    <bindings xmi:id="_JQ-ErrjoEe25NdJK2M4KYw" keySequence="CTRL+O" command="_JQ_3-7joEe25NdJK2M4KYw"/>
-    <bindings xmi:id="_JQ-Er7joEe25NdJK2M4KYw" keySequence="CTRL+SHIFT+/" command="_JQ_4HLjoEe25NdJK2M4KYw"/>
-    <bindings xmi:id="_JQ-EsLjoEe25NdJK2M4KYw" keySequence="ALT+SHIFT+U" command="_JQ_5GbjoEe25NdJK2M4KYw"/>
-    <bindings xmi:id="_JQ-EsbjoEe25NdJK2M4KYw" keySequence="CTRL+SHIFT+'" command="_JQ_4hrjoEe25NdJK2M4KYw"/>
-    <bindings xmi:id="_JQ-EsrjoEe25NdJK2M4KYw" keySequence="ALT+SHIFT+O" command="_JQ_3prjoEe25NdJK2M4KYw"/>
-    <bindings xmi:id="_JQ-Es7joEe25NdJK2M4KYw" keySequence="CTRL+SHIFT+\" command="_JQ_3C7joEe25NdJK2M4KYw"/>
-    <bindings xmi:id="_JQ-EtLjoEe25NdJK2M4KYw" keySequence="CTRL+SHIFT+ARROW_UP" command="_JQ_4LbjoEe25NdJK2M4KYw"/>
-    <bindings xmi:id="_JQ-EtbjoEe25NdJK2M4KYw" keySequence="CTRL+SHIFT+ARROW_DOWN" command="_JQ_3_LjoEe25NdJK2M4KYw"/>
-    <bindings xmi:id="_JQ-EtrjoEe25NdJK2M4KYw" keySequence="ALT+SHIFT+ARROW_UP" command="_JQ_4DbjoEe25NdJK2M4KYw"/>
-    <bindings xmi:id="_JQ-Et7joEe25NdJK2M4KYw" keySequence="ALT+SHIFT+ARROW_DOWN" command="_JQ_3LbjoEe25NdJK2M4KYw"/>
-    <bindings xmi:id="_JQ-EuLjoEe25NdJK2M4KYw" keySequence="ALT+SHIFT+ARROW_LEFT" command="_JQ_3ybjoEe25NdJK2M4KYw"/>
-    <bindings xmi:id="_JQ-EubjoEe25NdJK2M4KYw" keySequence="ALT+SHIFT+ARROW_RIGHT" command="_JQ_3BrjoEe25NdJK2M4KYw"/>
-    <bindings xmi:id="_JQ-EurjoEe25NdJK2M4KYw" keySequence="CTRL+F3" command="_JQ_507joEe25NdJK2M4KYw"/>
-    <bindings xmi:id="_JQ-Eu7joEe25NdJK2M4KYw" keySequence="CTRL+2 F" command="_JQ_5w7joEe25NdJK2M4KYw"/>
-    <bindings xmi:id="_JQ-EvLjoEe25NdJK2M4KYw" keySequence="CTRL+2 R" command="_JQ_5KLjoEe25NdJK2M4KYw"/>
-    <bindings xmi:id="_JQ-EvbjoEe25NdJK2M4KYw" keySequence="CTRL+2 T" command="_JQ_4bLjoEe25NdJK2M4KYw"/>
-    <bindings xmi:id="_JQ-EvrjoEe25NdJK2M4KYw" keySequence="CTRL+2 L" command="_JQ_2_7joEe25NdJK2M4KYw"/>
-    <bindings xmi:id="_JQ-Ev7joEe25NdJK2M4KYw" keySequence="CTRL+2 M" command="_JQ_3zrjoEe25NdJK2M4KYw"/>
+  <bindingTables xmi:id="_ZG1VQarbEe2-M8nuGout-A" elementId="org.eclipse.jdt.ui.javaEditorScope" bindingContext="_ZGeI9arbEe2-M8nuGout-A">
+    <bindings xmi:id="_ZG1VQqrbEe2-M8nuGout-A" keySequence="CTRL+SHIFT+P" command="_ZGZ3z6rbEe2-M8nuGout-A"/>
+    <bindings xmi:id="_ZG2jaKrbEe2-M8nuGout-A" keySequence="CTRL+7" command="_ZGZQiqrbEe2-M8nuGout-A"/>
+    <bindings xmi:id="_ZG3KdKrbEe2-M8nuGout-A" keySequence="CTRL+SHIFT+M" command="_ZGXbM6rbEe2-M8nuGout-A"/>
+    <bindings xmi:id="_ZG3KeqrbEe2-M8nuGout-A" keySequence="CTRL+/" command="_ZGZQiqrbEe2-M8nuGout-A"/>
+    <bindings xmi:id="_ZG3xiarbEe2-M8nuGout-A" keySequence="CTRL+SHIFT+C" command="_ZGZQiqrbEe2-M8nuGout-A"/>
+    <bindings xmi:id="_ZG4Yk6rbEe2-M8nuGout-A" keySequence="CTRL+SHIFT+F" command="_ZGbFyKrbEe2-M8nuGout-A"/>
+    <bindings xmi:id="_ZG4_oqrbEe2-M8nuGout-A" keySequence="ALT+SHIFT+B" command="_ZGbsuarbEe2-M8nuGout-A"/>
+    <bindings xmi:id="_ZG4_rKrbEe2-M8nuGout-A" keySequence="CTRL+T" command="_ZGZQlKrbEe2-M8nuGout-A"/>
+    <bindings xmi:id="_ZG4_s6rbEe2-M8nuGout-A" keySequence="CTRL+I" command="_ZGYCS6rbEe2-M8nuGout-A"/>
+    <bindings xmi:id="_ZG5mtqrbEe2-M8nuGout-A" keySequence="CTRL+O" command="_ZGYpVKrbEe2-M8nuGout-A"/>
+    <bindings xmi:id="_ZG5mvKrbEe2-M8nuGout-A" keySequence="CTRL+SHIFT+/" command="_ZGYpdarbEe2-M8nuGout-A"/>
+    <bindings xmi:id="_ZG6NzarbEe2-M8nuGout-A" keySequence="ALT+SHIFT+U" command="_ZGaen6rbEe2-M8nuGout-A"/>
+    <bindings xmi:id="_ZG6N1arbEe2-M8nuGout-A" keySequence="CTRL+SHIFT+'" command="_ZGZQo6rbEe2-M8nuGout-A"/>
+    <bindings xmi:id="_ZG602arbEe2-M8nuGout-A" keySequence="ALT+SHIFT+O" command="_ZGXbXqrbEe2-M8nuGout-A"/>
+    <bindings xmi:id="_ZG7b66rbEe2-M8nuGout-A" keySequence="CTRL+SHIFT+\" command="_ZGU_EarbEe2-M8nuGout-A"/>
+    <bindings xmi:id="_ZG8qE6rbEe2-M8nuGout-A" keySequence="CTRL+SHIFT+ARROW_UP" command="_ZGYphqrbEe2-M8nuGout-A"/>
+    <bindings xmi:id="_ZG8qFKrbEe2-M8nuGout-A" keySequence="CTRL+SHIFT+ARROW_DOWN" command="_ZGYpVarbEe2-M8nuGout-A"/>
+    <bindings xmi:id="_ZG9RGKrbEe2-M8nuGout-A" keySequence="ALT+SHIFT+ARROW_UP" command="_ZGYpZqrbEe2-M8nuGout-A"/>
+    <bindings xmi:id="_ZG9RGqrbEe2-M8nuGout-A" keySequence="ALT+SHIFT+ARROW_DOWN" command="_ZGVmGarbEe2-M8nuGout-A"/>
+    <bindings xmi:id="_ZG9RHqrbEe2-M8nuGout-A" keySequence="ALT+SHIFT+ARROW_LEFT" command="_ZGYCVKrbEe2-M8nuGout-A"/>
+    <bindings xmi:id="_ZG94IqrbEe2-M8nuGout-A" keySequence="ALT+SHIFT+ARROW_RIGHT" command="_ZGU_DKrbEe2-M8nuGout-A"/>
+    <bindings xmi:id="_ZG94KqrbEe2-M8nuGout-A" keySequence="CTRL+F3" command="_ZGbF-arbEe2-M8nuGout-A"/>
+    <bindings xmi:id="_ZG_tXKrbEe2-M8nuGout-A" keySequence="CTRL+2 F" command="_ZGbF6arbEe2-M8nuGout-A"/>
+    <bindings xmi:id="_ZHAUaarbEe2-M8nuGout-A" keySequence="CTRL+2 R" command="_ZGaerqrbEe2-M8nuGout-A"/>
+    <bindings xmi:id="_ZHAUaqrbEe2-M8nuGout-A" keySequence="CTRL+2 T" command="_ZGZQiarbEe2-M8nuGout-A"/>
+    <bindings xmi:id="_ZHAUa6rbEe2-M8nuGout-A" keySequence="CTRL+2 L" command="_ZGU_BarbEe2-M8nuGout-A"/>
+    <bindings xmi:id="_ZHAUbKrbEe2-M8nuGout-A" keySequence="CTRL+2 M" command="_ZGYCWarbEe2-M8nuGout-A"/>
   </bindingTables>
-  <bindingTables xmi:id="_JQ-EwLjoEe25NdJK2M4KYw" elementId="org.eclipse.core.runtime.xml" bindingContext="_JQ-o_LjoEe25NdJK2M4KYw">
-    <bindings xmi:id="_JQ-EwbjoEe25NdJK2M4KYw" keySequence="CTRL+SHIFT+P" command="_JQ_5O7joEe25NdJK2M4KYw"/>
-    <bindings xmi:id="_JQ-EwrjoEe25NdJK2M4KYw" keySequence="CTRL+SHIFT+D" command="_JQ_4GrjoEe25NdJK2M4KYw"/>
+  <bindingTables xmi:id="_ZG1VRKrbEe2-M8nuGout-A" elementId="org.eclipse.core.runtime.xml" bindingContext="_ZG1VQ6rbEe2-M8nuGout-A">
+    <bindings xmi:id="_ZG1VRarbEe2-M8nuGout-A" keySequence="CTRL+SHIFT+P" command="_ZGaewarbEe2-M8nuGout-A"/>
+    <bindings xmi:id="_ZG3xkarbEe2-M8nuGout-A" keySequence="CTRL+SHIFT+D" command="_ZGYpc6rbEe2-M8nuGout-A"/>
   </bindingTables>
-  <bindingTables xmi:id="_JQ-Ew7joEe25NdJK2M4KYw" elementId="org.eclipse.wst.sse.ui.structuredTextEditorScope" bindingContext="_JQ-o-LjoEe25NdJK2M4KYw">
-    <bindings xmi:id="_JQ-ExLjoEe25NdJK2M4KYw" keySequence="CTRL+SHIFT+P" command="_JQ_4ebjoEe25NdJK2M4KYw"/>
-    <bindings xmi:id="_JQ-ExbjoEe25NdJK2M4KYw" keySequence="CTRL+SHIFT+A" command="_JQ_6ArjoEe25NdJK2M4KYw"/>
-    <bindings xmi:id="_JQ-ExrjoEe25NdJK2M4KYw" keySequence="CTRL+SHIFT+C" command="_JQ_5oLjoEe25NdJK2M4KYw"/>
-    <bindings xmi:id="_JQ-Ex7joEe25NdJK2M4KYw" keySequence="CTRL+SHIFT+F" command="_JQ_54LjoEe25NdJK2M4KYw"/>
-    <bindings xmi:id="_JQ-EyLjoEe25NdJK2M4KYw" keySequence="CTRL+I" command="_JQ_5ZLjoEe25NdJK2M4KYw"/>
-    <bindings xmi:id="_JQ-EybjoEe25NdJK2M4KYw" keySequence="CTRL+O" command="_JQ_4hbjoEe25NdJK2M4KYw"/>
-    <bindings xmi:id="_JQ-EyrjoEe25NdJK2M4KYw" keySequence="CTRL+SHIFT+/" command="_JQ_4Z7joEe25NdJK2M4KYw"/>
-    <bindings xmi:id="_JQ-Ey7joEe25NdJK2M4KYw" keySequence="CTRL+SHIFT+\" command="_JQ_40rjoEe25NdJK2M4KYw"/>
-    <bindings xmi:id="_JQ-EzLjoEe25NdJK2M4KYw" keySequence="F3" command="_JQ_4drjoEe25NdJK2M4KYw"/>
-    <bindings xmi:id="_JQ-EzbjoEe25NdJK2M4KYw" keySequence="ALT+SHIFT+ARROW_UP" command="_JQ_477joEe25NdJK2M4KYw"/>
-    <bindings xmi:id="_JQ-EzrjoEe25NdJK2M4KYw" keySequence="ALT+SHIFT+ARROW_DOWN" command="_JQ_5A7joEe25NdJK2M4KYw"/>
-    <bindings xmi:id="_JQ-Ez7joEe25NdJK2M4KYw" keySequence="ALT+SHIFT+ARROW_LEFT" command="_JQ_28LjoEe25NdJK2M4KYw"/>
-    <bindings xmi:id="_JQ-E0LjoEe25NdJK2M4KYw" keySequence="ALT+SHIFT+ARROW_RIGHT" command="_JQ_4rbjoEe25NdJK2M4KYw"/>
-    <bindings xmi:id="_JQ-E0bjoEe25NdJK2M4KYw" keySequence="CTRL+SHIFT+>" command="_JQ_6tbjoEe25NdJK2M4KYw"/>
-    <bindings xmi:id="_JQ-E0rjoEe25NdJK2M4KYw" keySequence="CTRL+SHIFT+ARROW_UP" command="_JQ_6fLjoEe25NdJK2M4KYw"/>
-    <bindings xmi:id="_JQ-E07joEe25NdJK2M4KYw" keySequence="CTRL+SHIFT+ARROW_DOWN" command="_JQ_6l7joEe25NdJK2M4KYw"/>
+  <bindingTables xmi:id="_ZG1VRqrbEe2-M8nuGout-A" elementId="org.eclipse.wst.sse.ui.structuredTextEditorScope" bindingContext="_ZGeI-arbEe2-M8nuGout-A">
+    <bindings xmi:id="_ZG1VR6rbEe2-M8nuGout-A" keySequence="CTRL+SHIFT+P" command="_ZGZQlqrbEe2-M8nuGout-A"/>
+    <bindings xmi:id="_ZG3xhKrbEe2-M8nuGout-A" keySequence="CTRL+SHIFT+A" command="_ZGbsx6rbEe2-M8nuGout-A"/>
+    <bindings xmi:id="_ZG3xjarbEe2-M8nuGout-A" keySequence="CTRL+SHIFT+C" command="_ZGbFxqrbEe2-M8nuGout-A"/>
+    <bindings xmi:id="_ZG4Yl6rbEe2-M8nuGout-A" keySequence="CTRL+SHIFT+F" command="_ZGbsparbEe2-M8nuGout-A"/>
+    <bindings xmi:id="_ZG4_tKrbEe2-M8nuGout-A" keySequence="CTRL+I" command="_ZGae6qrbEe2-M8nuGout-A"/>
+    <bindings xmi:id="_ZG5mu6rbEe2-M8nuGout-A" keySequence="CTRL+O" command="_ZGZQoqrbEe2-M8nuGout-A"/>
+    <bindings xmi:id="_ZG5mvqrbEe2-M8nuGout-A" keySequence="CTRL+SHIFT+/" command="_ZGZQhKrbEe2-M8nuGout-A"/>
+    <bindings xmi:id="_ZG7b7arbEe2-M8nuGout-A" keySequence="CTRL+SHIFT+\" command="_ZGZ3qarbEe2-M8nuGout-A"/>
+    <bindings xmi:id="_ZG8qAqrbEe2-M8nuGout-A" keySequence="F3" command="_ZGZQk6rbEe2-M8nuGout-A"/>
+    <bindings xmi:id="_ZG9RGarbEe2-M8nuGout-A" keySequence="ALT+SHIFT+ARROW_UP" command="_ZGZ3xqrbEe2-M8nuGout-A"/>
+    <bindings xmi:id="_ZG9RG6rbEe2-M8nuGout-A" keySequence="ALT+SHIFT+ARROW_DOWN" command="_ZGaeiarbEe2-M8nuGout-A"/>
+    <bindings xmi:id="_ZG94IKrbEe2-M8nuGout-A" keySequence="ALT+SHIFT+ARROW_LEFT" command="_ZGU-9qrbEe2-M8nuGout-A"/>
+    <bindings xmi:id="_ZG94I6rbEe2-M8nuGout-A" keySequence="ALT+SHIFT+ARROW_RIGHT" command="_ZGZ3hKrbEe2-M8nuGout-A"/>
+    <bindings xmi:id="_vtc4UKxFEe2VqJFWjEAUdQ" keySequence="CTRL+SHIFT+>" command="_vo5vl6xFEe2VqJFWjEAUdQ"/>
+    <bindings xmi:id="_vtgisaxFEe2VqJFWjEAUdQ" keySequence="CTRL+SHIFT+ARROW_UP" command="_vo4hdaxFEe2VqJFWjEAUdQ"/>
+    <bindings xmi:id="_vtgis6xFEe2VqJFWjEAUdQ" keySequence="CTRL+SHIFT+ARROW_DOWN" command="_vo5Ih6xFEe2VqJFWjEAUdQ"/>
   </bindingTables>
-  <bindingTables xmi:id="_JQ-E1LjoEe25NdJK2M4KYw" elementId="org.eclipse.jdt.ui.classFileEditorScope" bindingContext="_JQ-o9LjoEe25NdJK2M4KYw">
-    <bindings xmi:id="_JQ-E1bjoEe25NdJK2M4KYw" keySequence="CTRL+1" command="_JQ_53bjoEe25NdJK2M4KYw"/>
+  <bindingTables xmi:id="_ZG18UarbEe2-M8nuGout-A" elementId="org.eclipse.jdt.ui.classFileEditorScope" bindingContext="_ZGeI8KrbEe2-M8nuGout-A">
+    <bindings xmi:id="_ZG18UqrbEe2-M8nuGout-A" keySequence="CTRL+1" command="_ZGbsoqrbEe2-M8nuGout-A"/>
   </bindingTables>
-  <bindingTables xmi:id="_JQ-E1rjoEe25NdJK2M4KYw" elementId="org.eclipse.ui.serverViewScope" bindingContext="_JQ-pE7joEe25NdJK2M4KYw">
-    <bindings xmi:id="_JQ-E17joEe25NdJK2M4KYw" keySequence="ALT+CTRL+D" command="_JQ_46bjoEe25NdJK2M4KYw"/>
-    <bindings xmi:id="_JQ-E2LjoEe25NdJK2M4KYw" keySequence="ALT+CTRL+P" command="_JQ_4_rjoEe25NdJK2M4KYw"/>
-    <bindings xmi:id="_JQ-E2bjoEe25NdJK2M4KYw" keySequence="ALT+CTRL+R" command="_JQ_51rjoEe25NdJK2M4KYw"/>
-    <bindings xmi:id="_JQ-E2rjoEe25NdJK2M4KYw" keySequence="ALT+CTRL+S" command="_JQ_3YbjoEe25NdJK2M4KYw"/>
+  <bindingTables xmi:id="_ZG18XarbEe2-M8nuGout-A" elementId="org.eclipse.ui.serverViewScope" bindingContext="_ZGeI7qrbEe2-M8nuGout-A">
+    <bindings xmi:id="_ZG18XqrbEe2-M8nuGout-A" keySequence="ALT+CTRL+D" command="_ZGZ3wKrbEe2-M8nuGout-A"/>
+    <bindings xmi:id="_ZG3xgqrbEe2-M8nuGout-A" keySequence="ALT+CTRL+P" command="_ZGaehKrbEe2-M8nuGout-A"/>
+    <bindings xmi:id="_ZG3xh6rbEe2-M8nuGout-A" keySequence="ALT+CTRL+R" command="_ZGbF_KrbEe2-M8nuGout-A"/>
+    <bindings xmi:id="_ZG3xj6rbEe2-M8nuGout-A" keySequence="ALT+CTRL+S" command="_ZGW0JKrbEe2-M8nuGout-A"/>
   </bindingTables>
-  <bindingTables xmi:id="_JQ-E27joEe25NdJK2M4KYw" elementId="org.eclipse.tm.terminal.EditContext" bindingContext="_JQ-o7bjoEe25NdJK2M4KYw">
-    <bindings xmi:id="_JQ-E3LjoEe25NdJK2M4KYw" keySequence="CTRL+SHIFT+V" command="_JQ_31rjoEe25NdJK2M4KYw"/>
-    <bindings xmi:id="_JQ-E3bjoEe25NdJK2M4KYw" keySequence="CTRL+SHIFT+C" command="_JQ_5HrjoEe25NdJK2M4KYw"/>
-    <bindings xmi:id="_JQ-E3rjoEe25NdJK2M4KYw" keySequence="ALT+ARROW_UP" command="_JQ_2srjoEe25NdJK2M4KYw"/>
-    <bindings xmi:id="_JQ-E37joEe25NdJK2M4KYw" keySequence="ALT+ARROW_RIGHT" command="_JQ_5sLjoEe25NdJK2M4KYw"/>
-    <bindings xmi:id="_JQ-E4LjoEe25NdJK2M4KYw" keySequence="SHIFT+INSERT" command="_JQ_31rjoEe25NdJK2M4KYw"/>
-    <bindings xmi:id="_JQ-E4bjoEe25NdJK2M4KYw" keySequence="CTRL+INSERT" command="_JQ_5HrjoEe25NdJK2M4KYw"/>
+  <bindingTables xmi:id="_ZG2jY6rbEe2-M8nuGout-A" elementId="org.eclipse.tm.terminal.EditContext" bindingContext="_ZGeI4KrbEe2-M8nuGout-A">
+    <bindings xmi:id="_ZG2jZKrbEe2-M8nuGout-A" keySequence="CTRL+SHIFT+V" command="_ZGYCYarbEe2-M8nuGout-A"/>
+    <bindings xmi:id="_ZG3xi6rbEe2-M8nuGout-A" keySequence="CTRL+SHIFT+C" command="_ZGaepKrbEe2-M8nuGout-A"/>
+    <bindings xmi:id="_ZG7b8KrbEe2-M8nuGout-A" keySequence="ALT+ARROW_UP" command="_ZGTJxqrbEe2-M8nuGout-A"/>
+    <bindings xmi:id="_ZG7b9KrbEe2-M8nuGout-A" keySequence="ALT+ARROW_RIGHT" command="_ZGbF1qrbEe2-M8nuGout-A"/>
+    <bindings xmi:id="_ZG8C8arbEe2-M8nuGout-A" keySequence="SHIFT+INSERT" command="_ZGYCYarbEe2-M8nuGout-A"/>
+    <bindings xmi:id="_ZG94JarbEe2-M8nuGout-A" keySequence="CTRL+INSERT" command="_ZGaepKrbEe2-M8nuGout-A"/>
   </bindingTables>
-  <bindingTables xmi:id="_JQ-E4rjoEe25NdJK2M4KYw" elementId="org.eclipse.jdt.ui.propertiesEditorScope" bindingContext="_JQ-pCbjoEe25NdJK2M4KYw">
-    <bindings xmi:id="_JQ-E47joEe25NdJK2M4KYw" keySequence="CTRL+7" command="_JQ_4bbjoEe25NdJK2M4KYw"/>
-    <bindings xmi:id="_JQ-E5LjoEe25NdJK2M4KYw" keySequence="CTRL+/" command="_JQ_4bbjoEe25NdJK2M4KYw"/>
-    <bindings xmi:id="_JQ-E5bjoEe25NdJK2M4KYw" keySequence="CTRL+SHIFT+C" command="_JQ_4bbjoEe25NdJK2M4KYw"/>
+  <bindingTables xmi:id="_ZG2jaarbEe2-M8nuGout-A" elementId="org.eclipse.jdt.ui.propertiesEditorScope" bindingContext="_ZGeI_6rbEe2-M8nuGout-A">
+    <bindings xmi:id="_ZG2jaqrbEe2-M8nuGout-A" keySequence="CTRL+7" command="_ZGZQiqrbEe2-M8nuGout-A"/>
+    <bindings xmi:id="_ZG3Ke6rbEe2-M8nuGout-A" keySequence="CTRL+/" command="_ZGZQiqrbEe2-M8nuGout-A"/>
+    <bindings xmi:id="_ZG3xiqrbEe2-M8nuGout-A" keySequence="CTRL+SHIFT+C" command="_ZGZQiqrbEe2-M8nuGout-A"/>
   </bindingTables>
-  <bindingTables xmi:id="_JQ-E5rjoEe25NdJK2M4KYw" elementId="org.eclipse.ant.ui.AntEditorScope" bindingContext="_JQ-pCLjoEe25NdJK2M4KYw">
-    <bindings xmi:id="_JQ-E57joEe25NdJK2M4KYw" keySequence="CTRL+SHIFT+F" command="_JQ_5orjoEe25NdJK2M4KYw"/>
-    <bindings xmi:id="_JQ-E6LjoEe25NdJK2M4KYw" keySequence="ALT+SHIFT+R" command="_JQ_26LjoEe25NdJK2M4KYw"/>
-    <bindings xmi:id="_JQ-E6bjoEe25NdJK2M4KYw" keySequence="ALT+SHIFT+O" command="_JQ_2vLjoEe25NdJK2M4KYw"/>
-    <bindings xmi:id="_JQ-E6rjoEe25NdJK2M4KYw" keySequence="SHIFT+F2" command="_JQ_4iLjoEe25NdJK2M4KYw"/>
-    <bindings xmi:id="_JQ-E67joEe25NdJK2M4KYw" keySequence="F3" command="_JQ_2w7joEe25NdJK2M4KYw"/>
+  <bindingTables xmi:id="_ZG4YkarbEe2-M8nuGout-A" elementId="org.eclipse.ant.ui.AntEditorScope" bindingContext="_ZGeI_KrbEe2-M8nuGout-A">
+    <bindings xmi:id="_ZG4YkqrbEe2-M8nuGout-A" keySequence="CTRL+SHIFT+F" command="_ZGbFyKrbEe2-M8nuGout-A"/>
+    <bindings xmi:id="_ZG5mwqrbEe2-M8nuGout-A" keySequence="ALT+SHIFT+R" command="_ZGUX6arbEe2-M8nuGout-A"/>
+    <bindings xmi:id="_ZG602KrbEe2-M8nuGout-A" keySequence="ALT+SHIFT+O" command="_ZGTw1KrbEe2-M8nuGout-A"/>
+    <bindings xmi:id="_ZG8C86rbEe2-M8nuGout-A" keySequence="SHIFT+F2" command="_ZGZQparbEe2-M8nuGout-A"/>
+    <bindings xmi:id="_ZG8DBqrbEe2-M8nuGout-A" keySequence="F3" command="_ZGTw26rbEe2-M8nuGout-A"/>
   </bindingTables>
-  <bindingTables xmi:id="_JQ-E7LjoEe25NdJK2M4KYw" elementId="org.eclipse.pde.ui.pdeEditorContext" bindingContext="_JQ-o8rjoEe25NdJK2M4KYw">
-    <bindings xmi:id="_JQ-E7bjoEe25NdJK2M4KYw" keySequence="CTRL+SHIFT+F" command="_JQ_3BLjoEe25NdJK2M4KYw"/>
-    <bindings xmi:id="_JQ-E7rjoEe25NdJK2M4KYw" keySequence="CTRL+O" command="_JQ_3GLjoEe25NdJK2M4KYw"/>
+  <bindingTables xmi:id="_ZG4YlarbEe2-M8nuGout-A" elementId="org.eclipse.pde.ui.pdeEditorContext" bindingContext="_ZGeI6arbEe2-M8nuGout-A">
+    <bindings xmi:id="_ZG4YlqrbEe2-M8nuGout-A" keySequence="CTRL+SHIFT+F" command="_ZGU_CqrbEe2-M8nuGout-A"/>
+    <bindings xmi:id="_ZG5muqrbEe2-M8nuGout-A" keySequence="CTRL+O" command="_ZGVmBKrbEe2-M8nuGout-A"/>
   </bindingTables>
-  <bindingTables xmi:id="_JQ-E77joEe25NdJK2M4KYw" elementId="org.eclipse.ui.genericeditor.genericEditorContext" bindingContext="_JQ-o87joEe25NdJK2M4KYw">
-    <bindings xmi:id="_JQ-E8LjoEe25NdJK2M4KYw" keySequence="CTRL+SHIFT+G" command="_JQ_5g7joEe25NdJK2M4KYw"/>
-    <bindings xmi:id="_JQ-E8bjoEe25NdJK2M4KYw" keySequence="F3" command="_JQ_5crjoEe25NdJK2M4KYw"/>
+  <bindingTables xmi:id="_ZG4YmarbEe2-M8nuGout-A" elementId="org.eclipse.ui.genericeditor.genericEditorContext" bindingContext="_ZGeI76rbEe2-M8nuGout-A">
+    <bindings xmi:id="_ZG4YmqrbEe2-M8nuGout-A" keySequence="CTRL+SHIFT+G" command="_ZGbFqarbEe2-M8nuGout-A"/>
+    <bindings xmi:id="_ZG8qAarbEe2-M8nuGout-A" keySequence="F3" command="_ZGbFmKrbEe2-M8nuGout-A"/>
   </bindingTables>
-  <bindingTables xmi:id="_JQ-E8rjoEe25NdJK2M4KYw" elementId="org.eclipse.debug.ui.memoryview" bindingContext="_JQ-pErjoEe25NdJK2M4KYw">
-    <bindings xmi:id="_JQ-E87joEe25NdJK2M4KYw" keySequence="ALT+CTRL+M" command="_JQ_39LjoEe25NdJK2M4KYw"/>
-    <bindings xmi:id="_JQ-E9LjoEe25NdJK2M4KYw" keySequence="ALT+CTRL+N" command="_JQ_5xrjoEe25NdJK2M4KYw"/>
-    <bindings xmi:id="_JQ-E9bjoEe25NdJK2M4KYw" keySequence="CTRL+T" command="_JQ_3fbjoEe25NdJK2M4KYw"/>
-    <bindings xmi:id="_JQ-E9rjoEe25NdJK2M4KYw" keySequence="CTRL+W" command="_JQ_4n7joEe25NdJK2M4KYw"/>
-    <bindings xmi:id="_JQ-E97joEe25NdJK2M4KYw" keySequence="CTRL+N" command="_JQ_4y7joEe25NdJK2M4KYw"/>
+  <bindingTables xmi:id="_ZG4Yo6rbEe2-M8nuGout-A" elementId="org.eclipse.debug.ui.memoryview" bindingContext="_ZGeI7arbEe2-M8nuGout-A">
+    <bindings xmi:id="_ZG4YpKrbEe2-M8nuGout-A" keySequence="ALT+CTRL+M" command="_ZGYCf6rbEe2-M8nuGout-A"/>
+    <bindings xmi:id="_ZG4YparbEe2-M8nuGout-A" keySequence="ALT+CTRL+N" command="_ZGbF7KrbEe2-M8nuGout-A"/>
+    <bindings xmi:id="_ZG4_q6rbEe2-M8nuGout-A" keySequence="CTRL+T" command="_ZGXbNarbEe2-M8nuGout-A"/>
+    <bindings xmi:id="_ZG4_sKrbEe2-M8nuGout-A" keySequence="CTRL+W" command="_ZGZ3dqrbEe2-M8nuGout-A"/>
+    <bindings xmi:id="_ZG5msqrbEe2-M8nuGout-A" keySequence="CTRL+N" command="_ZGZ3oqrbEe2-M8nuGout-A"/>
   </bindingTables>
-  <bindingTables xmi:id="_JQ-E-LjoEe25NdJK2M4KYw" elementId="org.eclipse.jdt.ui.breadcrumbEditorScope" bindingContext="_JQ-pH7joEe25NdJK2M4KYw">
-    <bindings xmi:id="_JQ-oYLjoEe25NdJK2M4KYw" keySequence="ALT+SHIFT+B" command="_JQ_59LjoEe25NdJK2M4KYw"/>
+  <bindingTables xmi:id="_ZG4_o6rbEe2-M8nuGout-A" elementId="org.eclipse.jdt.ui.breadcrumbEditorScope" bindingContext="_ZGeI9KrbEe2-M8nuGout-A">
+    <bindings xmi:id="_ZG4_pKrbEe2-M8nuGout-A" keySequence="ALT+SHIFT+B" command="_ZGbsuarbEe2-M8nuGout-A"/>
   </bindingTables>
-  <bindingTables xmi:id="_JQ-oYbjoEe25NdJK2M4KYw" elementId="org.eclipse.debug.ui.debugging" bindingContext="_JQ-pFLjoEe25NdJK2M4KYw">
-    <bindings xmi:id="_JQ-oYrjoEe25NdJK2M4KYw" keySequence="CTRL+R" command="_JQ_4WbjoEe25NdJK2M4KYw"/>
-    <bindings xmi:id="_JQ-oY7joEe25NdJK2M4KYw" keySequence="F7" command="_JQ_517joEe25NdJK2M4KYw"/>
-    <bindings xmi:id="_JQ-oZLjoEe25NdJK2M4KYw" keySequence="F8" command="_JQ_4k7joEe25NdJK2M4KYw"/>
-    <bindings xmi:id="_JQ-oZbjoEe25NdJK2M4KYw" keySequence="F5" command="_JQ_27rjoEe25NdJK2M4KYw"/>
-    <bindings xmi:id="_JQ-oZrjoEe25NdJK2M4KYw" keySequence="F6" command="_JQ_36LjoEe25NdJK2M4KYw"/>
-    <bindings xmi:id="_JQ-oZ7joEe25NdJK2M4KYw" keySequence="CTRL+F2" command="_JQ_5QLjoEe25NdJK2M4KYw"/>
-    <bindings xmi:id="_JQ-oaLjoEe25NdJK2M4KYw" keySequence="CTRL+F5" command="_JQ_5rLjoEe25NdJK2M4KYw"/>
+  <bindingTables xmi:id="_ZG4_parbEe2-M8nuGout-A" elementId="org.eclipse.debug.ui.debugging" bindingContext="_ZGeI8arbEe2-M8nuGout-A">
+    <bindings xmi:id="_ZG4_pqrbEe2-M8nuGout-A" keySequence="CTRL+R" command="_ZGZQdqrbEe2-M8nuGout-A"/>
+    <bindings xmi:id="_ZG8C-qrbEe2-M8nuGout-A" keySequence="F7" command="_ZGbF_arbEe2-M8nuGout-A"/>
+    <bindings xmi:id="_ZG8C-6rbEe2-M8nuGout-A" keySequence="F8" command="_ZGZQsKrbEe2-M8nuGout-A"/>
+    <bindings xmi:id="_ZG8qBqrbEe2-M8nuGout-A" keySequence="F5" command="_ZGU-9KrbEe2-M8nuGout-A"/>
+    <bindings xmi:id="_ZG8qCKrbEe2-M8nuGout-A" keySequence="F6" command="_ZGYCc6rbEe2-M8nuGout-A"/>
+    <bindings xmi:id="_ZG94KarbEe2-M8nuGout-A" keySequence="CTRL+F2" command="_ZGaexqrbEe2-M8nuGout-A"/>
+    <bindings xmi:id="_ZG94LKrbEe2-M8nuGout-A" keySequence="CTRL+F5" command="_ZGbF0qrbEe2-M8nuGout-A"/>
   </bindingTables>
-  <bindingTables xmi:id="_JQ-oabjoEe25NdJK2M4KYw" elementId="org.eclipse.debug.ui.console" bindingContext="_JQ-pDbjoEe25NdJK2M4KYw">
-    <bindings xmi:id="_JQ-oarjoEe25NdJK2M4KYw" keySequence="CTRL+R" command="_JQ_4gbjoEe25NdJK2M4KYw"/>
-    <bindings xmi:id="_JQ-oa7joEe25NdJK2M4KYw" keySequence="CTRL+Z" command="_JQ_5zrjoEe25NdJK2M4KYw">
+  <bindingTables xmi:id="_ZG4_p6rbEe2-M8nuGout-A" elementId="org.eclipse.debug.ui.console" bindingContext="_ZGeI5qrbEe2-M8nuGout-A">
+    <bindings xmi:id="_ZG4_qKrbEe2-M8nuGout-A" keySequence="CTRL+R" command="_ZGZQnqrbEe2-M8nuGout-A"/>
+    <bindings xmi:id="_ZG7b4qrbEe2-M8nuGout-A" keySequence="CTRL+Z" command="_ZGbF9KrbEe2-M8nuGout-A">
       <tags>platform:win32</tags>
     </bindings>
   </bindingTables>
-  <bindingTables xmi:id="_JQ-obLjoEe25NdJK2M4KYw" elementId="org.eclipse.debug.ui.memory.abstractasynctablerendering" bindingContext="_JQ-pFbjoEe25NdJK2M4KYw">
-    <bindings xmi:id="_JQ-obbjoEe25NdJK2M4KYw" keySequence="CTRL+SHIFT+," command="_JQ_5dLjoEe25NdJK2M4KYw"/>
-    <bindings xmi:id="_JQ-obrjoEe25NdJK2M4KYw" keySequence="CTRL+SHIFT+." command="_JQ_5MLjoEe25NdJK2M4KYw"/>
-    <bindings xmi:id="_JQ-ob7joEe25NdJK2M4KYw" keySequence="CTRL+G" command="_JQ_5MbjoEe25NdJK2M4KYw"/>
+  <bindingTables xmi:id="_ZG4_t6rbEe2-M8nuGout-A" elementId="org.eclipse.debug.ui.memory.abstractasynctablerendering" bindingContext="_ZGeI8qrbEe2-M8nuGout-A">
+    <bindings xmi:id="_ZG4_uKrbEe2-M8nuGout-A" keySequence="CTRL+SHIFT+," command="_ZGbFmqrbEe2-M8nuGout-A"/>
+    <bindings xmi:id="_ZG5msarbEe2-M8nuGout-A" keySequence="CTRL+SHIFT+." command="_ZGaetqrbEe2-M8nuGout-A"/>
+    <bindings xmi:id="_ZG6N1qrbEe2-M8nuGout-A" keySequence="CTRL+G" command="_ZGaet6rbEe2-M8nuGout-A"/>
   </bindingTables>
-  <bindingTables xmi:id="_JQ-ocLjoEe25NdJK2M4KYw" elementId="org.eclipse.egit.ui.DiffViewer" bindingContext="_JQ-o8LjoEe25NdJK2M4KYw">
-    <bindings xmi:id="_JQ-ocbjoEe25NdJK2M4KYw" keySequence="CTRL+O" command="_JQ_4DLjoEe25NdJK2M4KYw"/>
+  <bindingTables xmi:id="_ZG5mtKrbEe2-M8nuGout-A" elementId="org.eclipse.egit.ui.DiffViewer" bindingContext="_ZGeI46rbEe2-M8nuGout-A">
+    <bindings xmi:id="_ZG5mtarbEe2-M8nuGout-A" keySequence="CTRL+O" command="_ZGYpZarbEe2-M8nuGout-A"/>
   </bindingTables>
-  <bindingTables xmi:id="_JQ-ocrjoEe25NdJK2M4KYw" elementId="org.eclipse.mylyn.wikitext.ui.editor.markupSourceContext" bindingContext="_JQ-o97joEe25NdJK2M4KYw">
-    <bindings xmi:id="_JQ-oc7joEe25NdJK2M4KYw" keySequence="CTRL+O" command="_JQ_21bjoEe25NdJK2M4KYw"/>
+  <bindingTables xmi:id="_ZG5muKrbEe2-M8nuGout-A" elementId="org.eclipse.mylyn.wikitext.ui.editor.markupSourceContext" bindingContext="_ZGeI-KrbEe2-M8nuGout-A">
+    <bindings xmi:id="_ZG5muarbEe2-M8nuGout-A" keySequence="CTRL+O" command="_ZGTw7arbEe2-M8nuGout-A"/>
   </bindingTables>
-  <bindingTables xmi:id="_JQ-odLjoEe25NdJK2M4KYw" elementId="com.genuitec.eclipse.meExplorerScope" bindingContext="_JQ-pD7joEe25NdJK2M4KYw">
-    <bindings xmi:id="_JQ-odbjoEe25NdJK2M4KYw" keySequence="ALT+SHIFT+R" command="_JQ_24LjoEe25NdJK2M4KYw"/>
-    <bindings xmi:id="_JQ-odrjoEe25NdJK2M4KYw" keySequence="ALT+SHIFT+V" command="_JQ_2y7joEe25NdJK2M4KYw"/>
+  <bindingTables xmi:id="_ZG5mxarbEe2-M8nuGout-A" elementId="com.genuitec.eclipse.meExplorerScope" bindingContext="_ZGeI6KrbEe2-M8nuGout-A">
+    <bindings xmi:id="_ZG5mxqrbEe2-M8nuGout-A" keySequence="ALT+SHIFT+R" command="_ZGUX4arbEe2-M8nuGout-A"/>
+    <bindings xmi:id="_ZG6N1KrbEe2-M8nuGout-A" keySequence="ALT+SHIFT+V" command="_ZGTw46rbEe2-M8nuGout-A"/>
   </bindingTables>
-  <bindingTables xmi:id="_JQ-od7joEe25NdJK2M4KYw" elementId="org.eclipse.egit.ui.RepositoriesView" bindingContext="_JQ-pGrjoEe25NdJK2M4KYw">
-    <bindings xmi:id="_JQ-oeLjoEe25NdJK2M4KYw" keySequence="CTRL+C" command="_JQ_3grjoEe25NdJK2M4KYw"/>
-    <bindings xmi:id="_JQ-oebjoEe25NdJK2M4KYw" keySequence="CTRL+ARROW_LEFT" command="_JQ_3B7joEe25NdJK2M4KYw"/>
+  <bindingTables xmi:id="_ZG6Nw6rbEe2-M8nuGout-A" elementId="org.eclipse.egit.ui.RepositoriesView" bindingContext="_ZGeJAKrbEe2-M8nuGout-A">
+    <bindings xmi:id="_ZG6NxKrbEe2-M8nuGout-A" keySequence="CTRL+C" command="_ZGXbOqrbEe2-M8nuGout-A"/>
+    <bindings xmi:id="_ZG-fNarbEe2-M8nuGout-A" keySequence="CTRL+ARROW_LEFT" command="_ZGU_DarbEe2-M8nuGout-A"/>
   </bindingTables>
-  <bindingTables xmi:id="_JQ-oerjoEe25NdJK2M4KYw" elementId="org.eclipse.egit.ui.ReflogView" bindingContext="_JQ-pF7joEe25NdJK2M4KYw">
-    <bindings xmi:id="_JQ-oe7joEe25NdJK2M4KYw" keySequence="CTRL+C" command="_JQ_3H7joEe25NdJK2M4KYw"/>
+  <bindingTables xmi:id="_ZG6NxarbEe2-M8nuGout-A" elementId="org.eclipse.egit.ui.ReflogView" bindingContext="_ZGeI86rbEe2-M8nuGout-A">
+    <bindings xmi:id="_ZG6NxqrbEe2-M8nuGout-A" keySequence="CTRL+C" command="_ZGVmC6rbEe2-M8nuGout-A"/>
   </bindingTables>
-  <bindingTables xmi:id="_JQ-ofLjoEe25NdJK2M4KYw" elementId="org.eclipse.mylyn.internal.wikitext.ui.editor.basicMarkupSourceContext" bindingContext="_JQ-o9rjoEe25NdJK2M4KYw">
-    <bindings xmi:id="_JQ-ofbjoEe25NdJK2M4KYw" keySequence="F1" command="_JQ_2wbjoEe25NdJK2M4KYw"/>
+  <bindingTables xmi:id="_ZG8DAKrbEe2-M8nuGout-A" elementId="org.eclipse.mylyn.internal.wikitext.ui.editor.basicMarkupSourceContext" bindingContext="_ZGeI96rbEe2-M8nuGout-A">
+    <bindings xmi:id="_ZG8DAarbEe2-M8nuGout-A" keySequence="F1" command="_ZGTw2arbEe2-M8nuGout-A"/>
   </bindingTables>
-  <bindingTables xmi:id="_JQ-ofrjoEe25NdJK2M4KYw" elementId="org.eclipse.egit.ui.RepositoriesView.SingleRepository" bindingContext="_JQ-pG7joEe25NdJK2M4KYw">
-    <bindings xmi:id="_JQ-of7joEe25NdJK2M4KYw" keySequence="F2" command="_JQ_3JbjoEe25NdJK2M4KYw"/>
+  <bindingTables xmi:id="_ZG8DAqrbEe2-M8nuGout-A" elementId="org.eclipse.egit.ui.RepositoriesView.SingleRepository" bindingContext="_ZGeJAarbEe2-M8nuGout-A">
+    <bindings xmi:id="_ZG8DA6rbEe2-M8nuGout-A" keySequence="F2" command="_ZGVmEarbEe2-M8nuGout-A"/>
   </bindingTables>
-  <bindingTables xmi:id="_JQ-ogLjoEe25NdJK2M4KYw" elementId="org.eclipse.buildship.ui.contexts.taskview" bindingContext="_JQ-pGbjoEe25NdJK2M4KYw">
-    <bindings xmi:id="_JQ-ogbjoEe25NdJK2M4KYw" keySequence="F5" command="_JQ_5n7joEe25NdJK2M4KYw"/>
+  <bindingTables xmi:id="_ZG8qBKrbEe2-M8nuGout-A" elementId="org.eclipse.buildship.ui.contexts.taskview" bindingContext="_ZGeI-6rbEe2-M8nuGout-A">
+    <bindings xmi:id="_ZG8qBarbEe2-M8nuGout-A" keySequence="F5" command="_ZGbFxarbEe2-M8nuGout-A"/>
   </bindingTables>
-  <bindingTables xmi:id="_JQ-ogrjoEe25NdJK2M4KYw" elementId="org.eclipse.ui.console.ConsoleView" bindingContext="_JQ-pEbjoEe25NdJK2M4KYw">
-    <bindings xmi:id="_JQ-og7joEe25NdJK2M4KYw" keySequence="CTRL+INSERT" command="_JQ_4trjoEe25NdJK2M4KYw"/>
+  <bindingTables xmi:id="_ZG94J6rbEe2-M8nuGout-A" elementId="org.eclipse.ui.console.ConsoleView" bindingContext="_ZGeI7KrbEe2-M8nuGout-A">
+    <bindings xmi:id="_ZG94KKrbEe2-M8nuGout-A" keySequence="CTRL+INSERT" command="_ZGZ3jarbEe2-M8nuGout-A"/>
   </bindingTables>
-  <bindingTables xmi:id="_JQ-ohLjoEe25NdJK2M4KYw" elementId="org.eclipse.tm.terminal.TerminalContext" bindingContext="_JQ-pGLjoEe25NdJK2M4KYw">
-    <bindings xmi:id="_JQ-ohbjoEe25NdJK2M4KYw" keySequence="ALT+Y" command="_JQ_4ZbjoEe25NdJK2M4KYw"/>
-    <bindings xmi:id="_JQ-ohrjoEe25NdJK2M4KYw" keySequence="ALT+A" command="_JQ_4ZbjoEe25NdJK2M4KYw"/>
-    <bindings xmi:id="_JQ-oh7joEe25NdJK2M4KYw" keySequence="ALT+B" command="_JQ_4ZbjoEe25NdJK2M4KYw"/>
-    <bindings xmi:id="_JQ-oiLjoEe25NdJK2M4KYw" keySequence="ALT+C" command="_JQ_4ZbjoEe25NdJK2M4KYw"/>
-    <bindings xmi:id="_JQ-oibjoEe25NdJK2M4KYw" keySequence="ALT+D" command="_JQ_4ZbjoEe25NdJK2M4KYw"/>
-    <bindings xmi:id="_JQ-oirjoEe25NdJK2M4KYw" keySequence="ALT+E" command="_JQ_4ZbjoEe25NdJK2M4KYw"/>
-    <bindings xmi:id="_JQ-oi7joEe25NdJK2M4KYw" keySequence="ALT+F" command="_JQ_4ZbjoEe25NdJK2M4KYw"/>
-    <bindings xmi:id="_JQ-ojLjoEe25NdJK2M4KYw" keySequence="ALT+G" command="_JQ_4ZbjoEe25NdJK2M4KYw"/>
-    <bindings xmi:id="_JQ-ojbjoEe25NdJK2M4KYw" keySequence="ALT+P" command="_JQ_4ZbjoEe25NdJK2M4KYw"/>
-    <bindings xmi:id="_JQ-ojrjoEe25NdJK2M4KYw" keySequence="ALT+R" command="_JQ_4ZbjoEe25NdJK2M4KYw"/>
-    <bindings xmi:id="_JQ-oj7joEe25NdJK2M4KYw" keySequence="ALT+S" command="_JQ_4ZbjoEe25NdJK2M4KYw"/>
-    <bindings xmi:id="_JQ-okLjoEe25NdJK2M4KYw" keySequence="ALT+T" command="_JQ_4ZbjoEe25NdJK2M4KYw"/>
-    <bindings xmi:id="_JQ-okbjoEe25NdJK2M4KYw" keySequence="ALT+V" command="_JQ_4ZbjoEe25NdJK2M4KYw"/>
-    <bindings xmi:id="_JQ-okrjoEe25NdJK2M4KYw" keySequence="ALT+W" command="_JQ_4ZbjoEe25NdJK2M4KYw"/>
-    <bindings xmi:id="_JQ-ok7joEe25NdJK2M4KYw" keySequence="ALT+H" command="_JQ_4ZbjoEe25NdJK2M4KYw"/>
-    <bindings xmi:id="_JQ-olLjoEe25NdJK2M4KYw" keySequence="ALT+L" command="_JQ_4ZbjoEe25NdJK2M4KYw"/>
-    <bindings xmi:id="_JQ-olbjoEe25NdJK2M4KYw" keySequence="ALT+N" command="_JQ_4ZbjoEe25NdJK2M4KYw"/>
+  <bindingTables xmi:id="_ZG_GSqrbEe2-M8nuGout-A" elementId="org.eclipse.tm.terminal.TerminalContext" bindingContext="_ZGeI9qrbEe2-M8nuGout-A">
+    <bindings xmi:id="_ZG_GS6rbEe2-M8nuGout-A" keySequence="ALT+Y" command="_ZGZQgqrbEe2-M8nuGout-A"/>
+    <bindings xmi:id="_ZG_tV6rbEe2-M8nuGout-A" keySequence="ALT+A" command="_ZGZQgqrbEe2-M8nuGout-A"/>
+    <bindings xmi:id="_ZG_tWKrbEe2-M8nuGout-A" keySequence="ALT+B" command="_ZGZQgqrbEe2-M8nuGout-A"/>
+    <bindings xmi:id="_ZG_tWarbEe2-M8nuGout-A" keySequence="ALT+C" command="_ZGZQgqrbEe2-M8nuGout-A"/>
+    <bindings xmi:id="_ZG_tWqrbEe2-M8nuGout-A" keySequence="ALT+D" command="_ZGZQgqrbEe2-M8nuGout-A"/>
+    <bindings xmi:id="_ZG_tW6rbEe2-M8nuGout-A" keySequence="ALT+E" command="_ZGZQgqrbEe2-M8nuGout-A"/>
+    <bindings xmi:id="_ZG_tXarbEe2-M8nuGout-A" keySequence="ALT+F" command="_ZGZQgqrbEe2-M8nuGout-A"/>
+    <bindings xmi:id="_ZG_tXqrbEe2-M8nuGout-A" keySequence="ALT+G" command="_ZGZQgqrbEe2-M8nuGout-A"/>
+    <bindings xmi:id="_ZG_tX6rbEe2-M8nuGout-A" keySequence="ALT+P" command="_ZGZQgqrbEe2-M8nuGout-A"/>
+    <bindings xmi:id="_ZHAUYKrbEe2-M8nuGout-A" keySequence="ALT+R" command="_ZGZQgqrbEe2-M8nuGout-A"/>
+    <bindings xmi:id="_ZHAUYarbEe2-M8nuGout-A" keySequence="ALT+S" command="_ZGZQgqrbEe2-M8nuGout-A"/>
+    <bindings xmi:id="_ZHAUYqrbEe2-M8nuGout-A" keySequence="ALT+T" command="_ZGZQgqrbEe2-M8nuGout-A"/>
+    <bindings xmi:id="_ZHAUY6rbEe2-M8nuGout-A" keySequence="ALT+V" command="_ZGZQgqrbEe2-M8nuGout-A"/>
+    <bindings xmi:id="_ZHAUZKrbEe2-M8nuGout-A" keySequence="ALT+W" command="_ZGZQgqrbEe2-M8nuGout-A"/>
+    <bindings xmi:id="_ZHAUZarbEe2-M8nuGout-A" keySequence="ALT+H" command="_ZGZQgqrbEe2-M8nuGout-A"/>
+    <bindings xmi:id="_ZHAUZ6rbEe2-M8nuGout-A" keySequence="ALT+L" command="_ZGZQgqrbEe2-M8nuGout-A"/>
+    <bindings xmi:id="_ZHAUaKrbEe2-M8nuGout-A" keySequence="ALT+N" command="_ZGZQgqrbEe2-M8nuGout-A"/>
   </bindingTables>
-  <bindingTables xmi:id="_JQ-olrjoEe25NdJK2M4KYw" elementId="org.eclipse.debug.ui.BreakpointView" bindingContext="_JQ-o7rjoEe25NdJK2M4KYw">
-    <bindings xmi:id="_JQ-ol7joEe25NdJK2M4KYw" keySequence="ALT+CR" command="_JQ_4SLjoEe25NdJK2M4KYw"/>
+  <bindingTables xmi:id="_ZHAUcKrbEe2-M8nuGout-A" elementId="org.eclipse.debug.ui.BreakpointView" bindingContext="_ZGeI4arbEe2-M8nuGout-A">
+    <bindings xmi:id="_ZHAUcarbEe2-M8nuGout-A" keySequence="ALT+CR" command="_ZGZQZarbEe2-M8nuGout-A"/>
   </bindingTables>
-  <bindingTables xmi:id="_JQ-omLjoEe25NdJK2M4KYw" bindingContext="_JQ-pILjoEe25NdJK2M4KYw"/>
-  <bindingTables xmi:id="_JQ-ombjoEe25NdJK2M4KYw" bindingContext="_JQ-pIbjoEe25NdJK2M4KYw"/>
-  <bindingTables xmi:id="_JQ-omrjoEe25NdJK2M4KYw" bindingContext="_JQ-pIrjoEe25NdJK2M4KYw"/>
-  <bindingTables xmi:id="_JQ-om7joEe25NdJK2M4KYw" bindingContext="_JQ-pI7joEe25NdJK2M4KYw"/>
-  <bindingTables xmi:id="_JQ-onLjoEe25NdJK2M4KYw" bindingContext="_JQ-pJLjoEe25NdJK2M4KYw"/>
-  <bindingTables xmi:id="_JQ-onbjoEe25NdJK2M4KYw" bindingContext="_JQ-pJbjoEe25NdJK2M4KYw"/>
-  <bindingTables xmi:id="_JQ-onrjoEe25NdJK2M4KYw" bindingContext="_JQ-pJrjoEe25NdJK2M4KYw"/>
-  <bindingTables xmi:id="_JQ-on7joEe25NdJK2M4KYw" bindingContext="_JQ-pJ7joEe25NdJK2M4KYw"/>
-  <bindingTables xmi:id="_JQ-ooLjoEe25NdJK2M4KYw" bindingContext="_JQ-pKLjoEe25NdJK2M4KYw"/>
-  <bindingTables xmi:id="_JQ-oobjoEe25NdJK2M4KYw" bindingContext="_JQ-pKbjoEe25NdJK2M4KYw"/>
-  <bindingTables xmi:id="_JQ-oorjoEe25NdJK2M4KYw" bindingContext="_JQ-pKrjoEe25NdJK2M4KYw"/>
-  <bindingTables xmi:id="_JQ-oo7joEe25NdJK2M4KYw" bindingContext="_JQ-pK7joEe25NdJK2M4KYw"/>
-  <bindingTables xmi:id="_JQ-opLjoEe25NdJK2M4KYw" bindingContext="_JQ-pLLjoEe25NdJK2M4KYw"/>
-  <bindingTables xmi:id="_JQ-opbjoEe25NdJK2M4KYw" bindingContext="_JQ-pLbjoEe25NdJK2M4KYw"/>
-  <bindingTables xmi:id="_JQ-oprjoEe25NdJK2M4KYw" bindingContext="_JQ-pLrjoEe25NdJK2M4KYw"/>
-  <bindingTables xmi:id="_JQ-op7joEe25NdJK2M4KYw" bindingContext="_JQ-pL7joEe25NdJK2M4KYw"/>
-  <bindingTables xmi:id="_JQ-oqLjoEe25NdJK2M4KYw" bindingContext="_JQ-pMLjoEe25NdJK2M4KYw"/>
-  <bindingTables xmi:id="_JQ-oqbjoEe25NdJK2M4KYw" bindingContext="_JQ-pMbjoEe25NdJK2M4KYw"/>
-  <bindingTables xmi:id="_JQ-oqrjoEe25NdJK2M4KYw" bindingContext="_JQ-pMrjoEe25NdJK2M4KYw"/>
-  <bindingTables xmi:id="_JQ-oq7joEe25NdJK2M4KYw" bindingContext="_JQ-pM7joEe25NdJK2M4KYw"/>
-  <bindingTables xmi:id="_JQ-orLjoEe25NdJK2M4KYw" bindingContext="_JQ-pNLjoEe25NdJK2M4KYw"/>
-  <bindingTables xmi:id="_JQ-orbjoEe25NdJK2M4KYw" bindingContext="_JQ-pNbjoEe25NdJK2M4KYw"/>
-  <bindingTables xmi:id="_JQ-orrjoEe25NdJK2M4KYw" bindingContext="_JQ-pNrjoEe25NdJK2M4KYw"/>
-  <bindingTables xmi:id="_JQ-or7joEe25NdJK2M4KYw" bindingContext="_JQ-pN7joEe25NdJK2M4KYw"/>
-  <bindingTables xmi:id="_JQ-osLjoEe25NdJK2M4KYw" bindingContext="_JQ-pOLjoEe25NdJK2M4KYw"/>
-  <bindingTables xmi:id="_JQ-osbjoEe25NdJK2M4KYw" bindingContext="_JQ-pObjoEe25NdJK2M4KYw"/>
-  <bindingTables xmi:id="_JQ-osrjoEe25NdJK2M4KYw" bindingContext="_JQ-pOrjoEe25NdJK2M4KYw"/>
-  <bindingTables xmi:id="_JQ-os7joEe25NdJK2M4KYw" bindingContext="_JQ-pO7joEe25NdJK2M4KYw"/>
-  <bindingTables xmi:id="_JQ-otLjoEe25NdJK2M4KYw" bindingContext="_JQ-pPLjoEe25NdJK2M4KYw"/>
-  <bindingTables xmi:id="_JQ-otbjoEe25NdJK2M4KYw" bindingContext="_JQ-pPbjoEe25NdJK2M4KYw"/>
-  <bindingTables xmi:id="_JQ-otrjoEe25NdJK2M4KYw" bindingContext="_JQ-pPrjoEe25NdJK2M4KYw"/>
-  <bindingTables xmi:id="_JQ-ot7joEe25NdJK2M4KYw" bindingContext="_JQ-pP7joEe25NdJK2M4KYw"/>
-  <bindingTables xmi:id="_JQ-ouLjoEe25NdJK2M4KYw" bindingContext="_JQ-pQLjoEe25NdJK2M4KYw"/>
-  <bindingTables xmi:id="_JQ-oubjoEe25NdJK2M4KYw" bindingContext="_JQ-pQbjoEe25NdJK2M4KYw"/>
-  <bindingTables xmi:id="_JQ-ourjoEe25NdJK2M4KYw" bindingContext="_JQ-pQrjoEe25NdJK2M4KYw"/>
-  <bindingTables xmi:id="_JQ-ou7joEe25NdJK2M4KYw" bindingContext="_JQ-pQ7joEe25NdJK2M4KYw"/>
-  <bindingTables xmi:id="_JQ-ovLjoEe25NdJK2M4KYw" elementId="org.eclipse.wst.jsdt.ui.javaEditorScope" bindingContext="_JQ-pCrjoEe25NdJK2M4KYw">
-    <bindings xmi:id="_JQ-ovbjoEe25NdJK2M4KYw" keySequence="CTRL+SHIFT+P" command="_JQ_6pLjoEe25NdJK2M4KYw"/>
-    <bindings xmi:id="_JQ-ovrjoEe25NdJK2M4KYw" keySequence="CTRL+SHIFT+T" command="_JQ_6mLjoEe25NdJK2M4KYw"/>
-    <bindings xmi:id="_JQ-ov7joEe25NdJK2M4KYw" keySequence="CTRL+7" command="_JQ_6n7joEe25NdJK2M4KYw"/>
-    <bindings xmi:id="_JQ-owLjoEe25NdJK2M4KYw" keySequence="CTRL+/" command="_JQ_6n7joEe25NdJK2M4KYw"/>
-    <bindings xmi:id="_JQ-owbjoEe25NdJK2M4KYw" keySequence="CTRL+SHIFT+C" command="_JQ_6n7joEe25NdJK2M4KYw"/>
-    <bindings xmi:id="_JQ-owrjoEe25NdJK2M4KYw" keySequence="CTRL+SHIFT+F" command="_JQ_6drjoEe25NdJK2M4KYw"/>
-    <bindings xmi:id="_JQ-ow7joEe25NdJK2M4KYw" keySequence="CTRL+I" command="_JQ_6kLjoEe25NdJK2M4KYw"/>
-    <bindings xmi:id="_JQ-oxLjoEe25NdJK2M4KYw" keySequence="CTRL+O" command="_JQ_6bbjoEe25NdJK2M4KYw"/>
-    <bindings xmi:id="_JQ-oxbjoEe25NdJK2M4KYw" keySequence="CTRL+SHIFT+/" command="_JQ_6lrjoEe25NdJK2M4KYw"/>
-    <bindings xmi:id="_JQ-oxrjoEe25NdJK2M4KYw" keySequence="ALT+SHIFT+U" command="_JQ_6h7joEe25NdJK2M4KYw"/>
-    <bindings xmi:id="_JQ-ox7joEe25NdJK2M4KYw" keySequence="ALT+SHIFT+O" command="_JQ_6jbjoEe25NdJK2M4KYw"/>
-    <bindings xmi:id="_JQ-oyLjoEe25NdJK2M4KYw" keySequence="CTRL+SHIFT+\" command="_JQ_6d7joEe25NdJK2M4KYw"/>
-    <bindings xmi:id="_JQ-oybjoEe25NdJK2M4KYw" keySequence="CTRL+SHIFT+ARROW_UP" command="_JQ_6xbjoEe25NdJK2M4KYw"/>
-    <bindings xmi:id="_JQ-oyrjoEe25NdJK2M4KYw" keySequence="CTRL+SHIFT+ARROW_DOWN" command="_JQ_6erjoEe25NdJK2M4KYw"/>
-    <bindings xmi:id="_JQ-oy7joEe25NdJK2M4KYw" keySequence="CTRL+F3" command="_JQ_6nLjoEe25NdJK2M4KYw"/>
-    <bindings xmi:id="_JQ-ozLjoEe25NdJK2M4KYw" keySequence="CTRL+2 F" command="_JQ_6jrjoEe25NdJK2M4KYw"/>
-    <bindings xmi:id="_JQ-ozbjoEe25NdJK2M4KYw" keySequence="CTRL+2 R" command="_JQ_6gbjoEe25NdJK2M4KYw"/>
-    <bindings xmi:id="_JQ-ozrjoEe25NdJK2M4KYw" keySequence="CTRL+2 L" command="_JQ_6wLjoEe25NdJK2M4KYw"/>
+  <bindingTables xmi:id="_aZYiQarbEe2-M8nuGout-A" bindingContext="_aZYiQKrbEe2-M8nuGout-A"/>
+  <bindingTables xmi:id="_aZZJUarbEe2-M8nuGout-A" bindingContext="_aZZJUKrbEe2-M8nuGout-A"/>
+  <bindingTables xmi:id="_aZZwYarbEe2-M8nuGout-A" bindingContext="_aZZwYKrbEe2-M8nuGout-A"/>
+  <bindingTables xmi:id="_aZZwY6rbEe2-M8nuGout-A" bindingContext="_aZZwYqrbEe2-M8nuGout-A"/>
+  <bindingTables xmi:id="_aZZwZarbEe2-M8nuGout-A" bindingContext="_aZZwZKrbEe2-M8nuGout-A"/>
+  <bindingTables xmi:id="_aZZwZ6rbEe2-M8nuGout-A" bindingContext="_aZZwZqrbEe2-M8nuGout-A"/>
+  <bindingTables xmi:id="_aZaXcarbEe2-M8nuGout-A" bindingContext="_aZaXcKrbEe2-M8nuGout-A"/>
+  <bindingTables xmi:id="_aZaXc6rbEe2-M8nuGout-A" bindingContext="_aZaXcqrbEe2-M8nuGout-A"/>
+  <bindingTables xmi:id="_aZblkKrbEe2-M8nuGout-A" bindingContext="_aZaXdKrbEe2-M8nuGout-A"/>
+  <bindingTables xmi:id="_aZczsarbEe2-M8nuGout-A" bindingContext="_aZczsKrbEe2-M8nuGout-A"/>
+  <bindingTables xmi:id="_aZczs6rbEe2-M8nuGout-A" bindingContext="_aZczsqrbEe2-M8nuGout-A"/>
+  <bindingTables xmi:id="_aZdawarbEe2-M8nuGout-A" bindingContext="_aZdawKrbEe2-M8nuGout-A"/>
+  <bindingTables xmi:id="_aZdaw6rbEe2-M8nuGout-A" bindingContext="_aZdawqrbEe2-M8nuGout-A"/>
+  <bindingTables xmi:id="_aZdaxarbEe2-M8nuGout-A" bindingContext="_aZdaxKrbEe2-M8nuGout-A"/>
+  <bindingTables xmi:id="_aZdax6rbEe2-M8nuGout-A" bindingContext="_aZdaxqrbEe2-M8nuGout-A"/>
+  <bindingTables xmi:id="_aZeB0arbEe2-M8nuGout-A" bindingContext="_aZeB0KrbEe2-M8nuGout-A"/>
+  <bindingTables xmi:id="_aZeo4arbEe2-M8nuGout-A" bindingContext="_aZeo4KrbEe2-M8nuGout-A"/>
+  <bindingTables xmi:id="_aZfP8arbEe2-M8nuGout-A" bindingContext="_aZfP8KrbEe2-M8nuGout-A"/>
+  <bindingTables xmi:id="_aZfP86rbEe2-M8nuGout-A" bindingContext="_aZfP8qrbEe2-M8nuGout-A"/>
+  <bindingTables xmi:id="_aZfP9arbEe2-M8nuGout-A" bindingContext="_aZfP9KrbEe2-M8nuGout-A"/>
+  <bindingTables xmi:id="_aZfP96rbEe2-M8nuGout-A" bindingContext="_aZfP9qrbEe2-M8nuGout-A"/>
+  <bindingTables xmi:id="_aZf3AarbEe2-M8nuGout-A" bindingContext="_aZf3AKrbEe2-M8nuGout-A"/>
+  <bindingTables xmi:id="_aZf3A6rbEe2-M8nuGout-A" bindingContext="_aZf3AqrbEe2-M8nuGout-A"/>
+  <bindingTables xmi:id="_aZf3BarbEe2-M8nuGout-A" bindingContext="_aZf3BKrbEe2-M8nuGout-A"/>
+  <bindingTables xmi:id="_aZgeEarbEe2-M8nuGout-A" bindingContext="_aZgeEKrbEe2-M8nuGout-A"/>
+  <bindingTables xmi:id="_aZhFIarbEe2-M8nuGout-A" bindingContext="_aZhFIKrbEe2-M8nuGout-A"/>
+  <bindingTables xmi:id="_aZhsMarbEe2-M8nuGout-A" bindingContext="_aZhsMKrbEe2-M8nuGout-A"/>
+  <bindingTables xmi:id="_aZhsM6rbEe2-M8nuGout-A" bindingContext="_aZhsMqrbEe2-M8nuGout-A"/>
+  <bindingTables xmi:id="_aZhsNarbEe2-M8nuGout-A" bindingContext="_aZhsNKrbEe2-M8nuGout-A"/>
+  <bindingTables xmi:id="_aZiTQKrbEe2-M8nuGout-A" bindingContext="_aZhsNqrbEe2-M8nuGout-A"/>
+  <bindingTables xmi:id="_aZiTQqrbEe2-M8nuGout-A" bindingContext="_aZiTQarbEe2-M8nuGout-A"/>
+  <bindingTables xmi:id="_aZjhYKrbEe2-M8nuGout-A" bindingContext="_aZi6UKrbEe2-M8nuGout-A"/>
+  <bindingTables xmi:id="_aZkIcarbEe2-M8nuGout-A" bindingContext="_aZkIcKrbEe2-M8nuGout-A"/>
+  <bindingTables xmi:id="_aZkvgKrbEe2-M8nuGout-A" bindingContext="_aZkIcqrbEe2-M8nuGout-A"/>
+  <bindingTables xmi:id="_aZoZ4KrbEe2-M8nuGout-A" bindingContext="_aZny0KrbEe2-M8nuGout-A"/>
+  <bindingTables xmi:id="_RujPYar3Ee26usPLCNWeQg" bindingContext="_RujPYKr3Ee26usPLCNWeQg"/>
+  <bindingTables xmi:id="_vtXYwKxFEe2VqJFWjEAUdQ" elementId="org.eclipse.wst.jsdt.ui.javaEditorScope" bindingContext="_vsFmYKxFEe2VqJFWjEAUdQ">
+    <bindings xmi:id="_vtacEKxFEe2VqJFWjEAUdQ" keySequence="CTRL+SHIFT+P" command="_vo5vhqxFEe2VqJFWjEAUdQ"/>
+    <bindings xmi:id="_vtacEaxFEe2VqJFWjEAUdQ" keySequence="CTRL+SHIFT+T" command="_vo5IiKxFEe2VqJFWjEAUdQ"/>
+    <bindings xmi:id="_vtbDIqxFEe2VqJFWjEAUdQ" keySequence="CTRL+7" command="_vo5vgaxFEe2VqJFWjEAUdQ"/>
+    <bindings xmi:id="_vtbqMaxFEe2VqJFWjEAUdQ" keySequence="CTRL+/" command="_vo5vgaxFEe2VqJFWjEAUdQ"/>
+    <bindings xmi:id="_vtcRQKxFEe2VqJFWjEAUdQ" keySequence="CTRL+SHIFT+C" command="_vo5vgaxFEe2VqJFWjEAUdQ"/>
+    <bindings xmi:id="_vtcRQaxFEe2VqJFWjEAUdQ" keySequence="CTRL+SHIFT+F" command="_vo4hb6xFEe2VqJFWjEAUdQ"/>
+    <bindings xmi:id="_vtc4UaxFEe2VqJFWjEAUdQ" keySequence="CTRL+I" command="_vo5IgKxFEe2VqJFWjEAUdQ"/>
+    <bindings xmi:id="_vtdfYKxFEe2VqJFWjEAUdQ" keySequence="CTRL+O" command="_vo4hZqxFEe2VqJFWjEAUdQ"/>
+    <bindings xmi:id="_vtdfYaxFEe2VqJFWjEAUdQ" keySequence="CTRL+SHIFT+/" command="_vo5IhqxFEe2VqJFWjEAUdQ"/>
+    <bindings xmi:id="_vteGcKxFEe2VqJFWjEAUdQ" keySequence="ALT+SHIFT+U" command="_vo5Id6xFEe2VqJFWjEAUdQ"/>
+    <bindings xmi:id="_vtetgaxFEe2VqJFWjEAUdQ" keySequence="ALT+SHIFT+O" command="_vo5IfaxFEe2VqJFWjEAUdQ"/>
+    <bindings xmi:id="_vtetg6xFEe2VqJFWjEAUdQ" keySequence="CTRL+SHIFT+\" command="_vo4hcKxFEe2VqJFWjEAUdQ"/>
+    <bindings xmi:id="_vtgisKxFEe2VqJFWjEAUdQ" keySequence="CTRL+SHIFT+ARROW_UP" command="_vo5vp6xFEe2VqJFWjEAUdQ"/>
+    <bindings xmi:id="_vtgisqxFEe2VqJFWjEAUdQ" keySequence="CTRL+SHIFT+ARROW_DOWN" command="_vo4hc6xFEe2VqJFWjEAUdQ"/>
+    <bindings xmi:id="_vthJwKxFEe2VqJFWjEAUdQ" keySequence="CTRL+F3" command="_vo5IjKxFEe2VqJFWjEAUdQ"/>
+    <bindings xmi:id="_vtiX4KxFEe2VqJFWjEAUdQ" keySequence="CTRL+2 F" command="_vo5IfqxFEe2VqJFWjEAUdQ"/>
+    <bindings xmi:id="_vtiX4axFEe2VqJFWjEAUdQ" keySequence="CTRL+2 R" command="_vo5IcaxFEe2VqJFWjEAUdQ"/>
+    <bindings xmi:id="_vtiX4qxFEe2VqJFWjEAUdQ" keySequence="CTRL+2 L" command="_vo5voqxFEe2VqJFWjEAUdQ"/>
   </bindingTables>
-  <bindingTables xmi:id="_JQ-oz7joEe25NdJK2M4KYw" elementId="org.eclipse.wst.jsdt.ui.javascriptViewScope" bindingContext="_JQ-pC7joEe25NdJK2M4KYw">
-    <bindings xmi:id="_JQ-o0LjoEe25NdJK2M4KYw" keySequence="CTRL+SHIFT+U" command="_JQ_6frjoEe25NdJK2M4KYw"/>
-    <bindings xmi:id="_JQ-o0bjoEe25NdJK2M4KYw" keySequence="CTRL+SHIFT+H" command="_JQ_6w7joEe25NdJK2M4KYw"/>
-    <bindings xmi:id="_JQ-o0rjoEe25NdJK2M4KYw" keySequence="CTRL+SHIFT+G" command="_JQ_6nbjoEe25NdJK2M4KYw"/>
-    <bindings xmi:id="_JQ-o07joEe25NdJK2M4KYw" keySequence="ALT+CTRL+H" command="_JQ_6sLjoEe25NdJK2M4KYw"/>
-    <bindings xmi:id="_JQ-o1LjoEe25NdJK2M4KYw" keySequence="CTRL+G" command="_JQ_6p7joEe25NdJK2M4KYw"/>
-    <bindings xmi:id="_JQ-o1bjoEe25NdJK2M4KYw" keySequence="ALT+SHIFT+J" command="_JQ_6orjoEe25NdJK2M4KYw"/>
-    <bindings xmi:id="_JQ-o1rjoEe25NdJK2M4KYw" keySequence="ALT+SHIFT+Z" command="_JQ_6krjoEe25NdJK2M4KYw"/>
-    <bindings xmi:id="_JQ-o17joEe25NdJK2M4KYw" keySequence="SHIFT+F2" command="_JQ_6s7joEe25NdJK2M4KYw"/>
-    <bindings xmi:id="_JQ-o2LjoEe25NdJK2M4KYw" keySequence="F3" command="_JQ_6qbjoEe25NdJK2M4KYw"/>
-    <bindings xmi:id="_JQ-o2bjoEe25NdJK2M4KYw" keySequence="F4" command="_JQ_6lLjoEe25NdJK2M4KYw"/>
+  <bindingTables xmi:id="_vtbDIKxFEe2VqJFWjEAUdQ" elementId="org.eclipse.wst.jsdt.ui.javascriptViewScope" bindingContext="_vsFmbqxFEe2VqJFWjEAUdQ">
+    <bindings xmi:id="_vtbDIaxFEe2VqJFWjEAUdQ" keySequence="CTRL+SHIFT+U" command="_vo4hd6xFEe2VqJFWjEAUdQ"/>
+    <bindings xmi:id="_vtbDI6xFEe2VqJFWjEAUdQ" keySequence="CTRL+SHIFT+H" command="_vo5vpaxFEe2VqJFWjEAUdQ"/>
+    <bindings xmi:id="_vtcRQqxFEe2VqJFWjEAUdQ" keySequence="CTRL+SHIFT+G" command="_vo5IjaxFEe2VqJFWjEAUdQ"/>
+    <bindings xmi:id="_vtcRQ6xFEe2VqJFWjEAUdQ" keySequence="ALT+CTRL+H" command="_vo5vkqxFEe2VqJFWjEAUdQ"/>
+    <bindings xmi:id="_vteGcaxFEe2VqJFWjEAUdQ" keySequence="CTRL+G" command="_vo5viaxFEe2VqJFWjEAUdQ"/>
+    <bindings xmi:id="_vteGcqxFEe2VqJFWjEAUdQ" keySequence="ALT+SHIFT+J" command="_vo5vhKxFEe2VqJFWjEAUdQ"/>
+    <bindings xmi:id="_vtetgqxFEe2VqJFWjEAUdQ" keySequence="ALT+SHIFT+Z" command="_vo5IgqxFEe2VqJFWjEAUdQ"/>
+    <bindings xmi:id="_vtfUkKxFEe2VqJFWjEAUdQ" keySequence="SHIFT+F2" command="_vo5vlaxFEe2VqJFWjEAUdQ"/>
+    <bindings xmi:id="_vtf7oKxFEe2VqJFWjEAUdQ" keySequence="F3" command="_vo5vi6xFEe2VqJFWjEAUdQ"/>
+    <bindings xmi:id="_vtf7oaxFEe2VqJFWjEAUdQ" keySequence="F4" command="_vo5IhKxFEe2VqJFWjEAUdQ"/>
   </bindingTables>
-  <bindingTables xmi:id="_JQ-o2rjoEe25NdJK2M4KYw" bindingContext="_JQ-pRrjoEe25NdJK2M4KYw"/>
-  <rootContext xmi:id="_JQ-o6rjoEe25NdJK2M4KYw" elementId="org.eclipse.ui.contexts.dialogAndWindow" contributorURI="platform:/plugin/org.eclipse.platform" name="In Dialogs and Windows" description="Either a dialog or a window is open">
-    <children xmi:id="_JQ-o67joEe25NdJK2M4KYw" elementId="org.eclipse.ui.contexts.window" contributorURI="platform:/plugin/org.eclipse.platform" name="In Windows" description="A window is open">
-      <children xmi:id="_JQ-o7LjoEe25NdJK2M4KYw" elementId="org.eclipse.e4.ui.contexts.views" contributorURI="platform:/plugin/org.eclipse.platform" name="%bindingcontext.name.bindingView"/>
-      <children xmi:id="_JQ-o7bjoEe25NdJK2M4KYw" elementId="org.eclipse.tm.terminal.EditContext" name="Terminal Control in Focus" description="Show modified keyboard shortcuts in context menu"/>
-      <children xmi:id="_JQ-o7rjoEe25NdJK2M4KYw" elementId="org.eclipse.debug.ui.BreakpointView" name="In Breakpoints View" description="The breakpoints view context"/>
-      <children xmi:id="_JQ-o77joEe25NdJK2M4KYw" elementId="org.eclipse.ui.textEditorScope" name="Editing Text" description="Editing Text Context">
-        <children xmi:id="_JQ-o8LjoEe25NdJK2M4KYw" elementId="org.eclipse.egit.ui.DiffViewer" name="In Diff Viewer"/>
-        <children xmi:id="_JQ-o8bjoEe25NdJK2M4KYw" elementId="com.genuitec.eclipse.inlinesearch.context" name="Inline Search is Active"/>
-        <children xmi:id="_JQ-o8rjoEe25NdJK2M4KYw" elementId="org.eclipse.pde.ui.pdeEditorContext" name="PDE editor" description="The context used by PDE editors"/>
-        <children xmi:id="_JQ-o87joEe25NdJK2M4KYw" elementId="org.eclipse.ui.genericeditor.genericEditorContext" name="in Generic Code Editor" description="When editing in the Generic Code Editor"/>
-        <children xmi:id="_JQ-o9LjoEe25NdJK2M4KYw" elementId="org.eclipse.jdt.ui.classFileEditorScope" name="Browsing attached Java Source" description="Browsing attached Java Source Context"/>
-        <children xmi:id="_JQ-o9bjoEe25NdJK2M4KYw" elementId="org.eclipse.jdt.ui.javaEditorScope" name="Editing Java Source" description="Editing Java Source Context"/>
-        <children xmi:id="_JQ-o9rjoEe25NdJK2M4KYw" elementId="org.eclipse.mylyn.internal.wikitext.ui.editor.basicMarkupSourceContext" name="WikiText Markup Source Context" description="WikiText markup editing context">
-          <children xmi:id="_JQ-o97joEe25NdJK2M4KYw" elementId="org.eclipse.mylyn.wikitext.ui.editor.markupSourceContext" name="WikiText Markup Source Context" description="WikiText markup editing context"/>
+  <bindingTables xmi:id="_wdM6QaxFEe2VqJFWjEAUdQ" bindingContext="_wdM6QKxFEe2VqJFWjEAUdQ"/>
+  <rootContext xmi:id="_ZFeDWarbEe2-M8nuGout-A" elementId="org.eclipse.ui.contexts.dialogAndWindow" contributorURI="platform:/plugin/org.eclipse.platform" name="In Dialogs and Windows" description="Either a dialog or a window is open">
+    <children xmi:id="_ZFeDWqrbEe2-M8nuGout-A" elementId="org.eclipse.ui.contexts.window" contributorURI="platform:/plugin/org.eclipse.platform" name="In Windows" description="A window is open">
+      <children xmi:id="_ZFeDW6rbEe2-M8nuGout-A" elementId="org.eclipse.e4.ui.contexts.views" contributorURI="platform:/plugin/org.eclipse.platform" name="%bindingcontext.name.bindingView"/>
+      <children xmi:id="_ZGeI4KrbEe2-M8nuGout-A" elementId="org.eclipse.tm.terminal.EditContext" name="Terminal Control in Focus" description="Show modified keyboard shortcuts in context menu"/>
+      <children xmi:id="_ZGeI4arbEe2-M8nuGout-A" elementId="org.eclipse.debug.ui.BreakpointView" name="In Breakpoints View" description="The breakpoints view context"/>
+      <children xmi:id="_ZGeI4qrbEe2-M8nuGout-A" elementId="org.eclipse.ui.textEditorScope" name="Editing Text" description="Editing Text Context">
+        <children xmi:id="_ZGeI46rbEe2-M8nuGout-A" elementId="org.eclipse.egit.ui.DiffViewer" name="In Diff Viewer"/>
+        <children xmi:id="_ZGeI5KrbEe2-M8nuGout-A" elementId="com.genuitec.eclipse.inlinesearch.context" name="Inline Search is Active"/>
+        <children xmi:id="_ZGeI6arbEe2-M8nuGout-A" elementId="org.eclipse.pde.ui.pdeEditorContext" name="PDE editor" description="The context used by PDE editors"/>
+        <children xmi:id="_ZGeI76rbEe2-M8nuGout-A" elementId="org.eclipse.ui.genericeditor.genericEditorContext" name="in Generic Code Editor" description="When editing in the Generic Code Editor"/>
+        <children xmi:id="_ZGeI8KrbEe2-M8nuGout-A" elementId="org.eclipse.jdt.ui.classFileEditorScope" name="Browsing attached Java Source" description="Browsing attached Java Source Context"/>
+        <children xmi:id="_ZGeI9arbEe2-M8nuGout-A" elementId="org.eclipse.jdt.ui.javaEditorScope" name="Editing Java Source" description="Editing Java Source Context"/>
+        <children xmi:id="_ZGeI96rbEe2-M8nuGout-A" elementId="org.eclipse.mylyn.internal.wikitext.ui.editor.basicMarkupSourceContext" name="WikiText Markup Source Context" description="WikiText markup editing context">
+          <children xmi:id="_ZGeI-KrbEe2-M8nuGout-A" elementId="org.eclipse.mylyn.wikitext.ui.editor.markupSourceContext" name="WikiText Markup Source Context" description="WikiText markup editing context"/>
         </children>
-        <children xmi:id="_JQ-o-LjoEe25NdJK2M4KYw" elementId="org.eclipse.wst.sse.ui.structuredTextEditorScope" name="Editing in Structured Text Editors" description="Editing in Structured Text Editors">
-          <children xmi:id="_JQ-o-bjoEe25NdJK2M4KYw" elementId="org.eclipse.wst.sse.comments" name="Source Comments in Structured Text Editors" description="Source Comments in Structured Text Editors"/>
-          <children xmi:id="_JQ-o-rjoEe25NdJK2M4KYw" elementId="org.eclipse.wst.sse.hideFormat" name="Editing in Structured Text Editors" description="Editing in Structured Text Editors"/>
-          <children xmi:id="_JQ-o-7joEe25NdJK2M4KYw" elementId="org.eclipse.wst.xml.cleanup" name="XML Source Cleanup" description="XML Source Cleanup"/>
-          <children xmi:id="_JQ-o_LjoEe25NdJK2M4KYw" elementId="org.eclipse.core.runtime.xml" name="Editing XML Source" description="Editing XML Source"/>
-          <children xmi:id="_JQ-o_bjoEe25NdJK2M4KYw" elementId="org.eclipse.wst.xml.occurrences" name="XML Source Occurrences" description="XML Source Occurrences"/>
-          <children xmi:id="_JQ-o_rjoEe25NdJK2M4KYw" elementId="org.eclipse.wst.xml.grammar" name="XML Source Grammar" description="XML Source Grammar"/>
-          <children xmi:id="_JQ-o_7joEe25NdJK2M4KYw" elementId="org.eclipse.wst.xml.comments" name="XML Source Comments" description="XML Source Comments"/>
-          <children xmi:id="_JQ-pALjoEe25NdJK2M4KYw" elementId="org.eclipse.wst.xml.expand" name="XML Source Expand/Collapse" description="XML Source Expand/Collapse"/>
-          <children xmi:id="_JQ-pAbjoEe25NdJK2M4KYw" elementId="org.eclipse.wst.xml.selection" name="XML Source Selection" description="XML Source Selection"/>
-          <children xmi:id="_JQ-pArjoEe25NdJK2M4KYw" elementId="org.eclipse.wst.xml.navigation" name="XML Source Navigation" description="XML Source Navigation"/>
-          <children xmi:id="_JQ-pA7joEe25NdJK2M4KYw" elementId="org.eclipse.wst.json.core.jsonsource" name="%scope.structured.text.editor.json.name" description="%scope.structured.text.editor.json.description"/>
-          <children xmi:id="_JQ-pBLjoEe25NdJK2M4KYw" elementId="org.eclipse.wst.css.core.csssource" name="Editing CSS Source" description="Editing CSS Source"/>
-          <children xmi:id="_JQ-pBbjoEe25NdJK2M4KYw" elementId="org.eclipse.wst.html.core.htmlsource" name="Editing HTML Source" description="Editing HTML Source"/>
-          <children xmi:id="_JQ-pBrjoEe25NdJK2M4KYw" elementId="org.eclipse.wst.xml.dependencies" name="XML Source Dependencies" description="XML Source Dependencies"/>
-          <children xmi:id="_JQ-pB7joEe25NdJK2M4KYw" elementId="org.eclipse.wst.html.occurrences" name="HTML Source Occurrences" description="HTML Source Occurrences"/>
+        <children xmi:id="_ZGeI-arbEe2-M8nuGout-A" elementId="org.eclipse.wst.sse.ui.structuredTextEditorScope" name="Editing in Structured Text Editors" description="Editing in Structured Text Editors">
+          <children xmi:id="_ZGeI-qrbEe2-M8nuGout-A" elementId="org.eclipse.wst.sse.comments" name="Source Comments in Structured Text Editors" description="Source Comments in Structured Text Editors"/>
+          <children xmi:id="_ZGeI_arbEe2-M8nuGout-A" elementId="org.eclipse.wst.sse.hideFormat" name="Editing in Structured Text Editors" description="Editing in Structured Text Editors"/>
+          <children xmi:id="_vsFmYaxFEe2VqJFWjEAUdQ" elementId="org.eclipse.wst.xml.cleanup" name="XML Source Cleanup" description="XML Source Cleanup"/>
+          <children xmi:id="_ZG1VQ6rbEe2-M8nuGout-A" elementId="org.eclipse.core.runtime.xml" name="Editing XML Source" description="Editing XML Source"/>
+          <children xmi:id="_vsFmYqxFEe2VqJFWjEAUdQ" elementId="org.eclipse.wst.xml.occurrences" name="XML Source Occurrences" description="XML Source Occurrences"/>
+          <children xmi:id="_vsFmY6xFEe2VqJFWjEAUdQ" elementId="org.eclipse.wst.xml.grammar" name="XML Source Grammar" description="XML Source Grammar"/>
+          <children xmi:id="_vsFmZKxFEe2VqJFWjEAUdQ" elementId="org.eclipse.wst.xml.comments" name="XML Source Comments" description="XML Source Comments"/>
+          <children xmi:id="_vsFmZqxFEe2VqJFWjEAUdQ" elementId="org.eclipse.wst.xml.expand" name="XML Source Expand/Collapse" description="XML Source Expand/Collapse"/>
+          <children xmi:id="_vsFmZ6xFEe2VqJFWjEAUdQ" elementId="org.eclipse.wst.xml.selection" name="XML Source Selection" description="XML Source Selection"/>
+          <children xmi:id="_vsFmaaxFEe2VqJFWjEAUdQ" elementId="org.eclipse.wst.xml.navigation" name="XML Source Navigation" description="XML Source Navigation"/>
+          <children xmi:id="_vsFmaqxFEe2VqJFWjEAUdQ" elementId="org.eclipse.wst.json.core.jsonsource" name="%scope.structured.text.editor.json.name" description="%scope.structured.text.editor.json.description"/>
+          <children xmi:id="_vsFma6xFEe2VqJFWjEAUdQ" elementId="org.eclipse.wst.css.core.csssource" name="Editing CSS Source" description="Editing CSS Source"/>
+          <children xmi:id="_vsFmbaxFEe2VqJFWjEAUdQ" elementId="org.eclipse.wst.html.core.htmlsource" name="Editing HTML Source" description="Editing HTML Source"/>
+          <children xmi:id="_vsFmb6xFEe2VqJFWjEAUdQ" elementId="org.eclipse.wst.xml.dependencies" name="XML Source Dependencies" description="XML Source Dependencies"/>
+          <children xmi:id="_vsFmcKxFEe2VqJFWjEAUdQ" elementId="org.eclipse.wst.html.occurrences" name="HTML Source Occurrences" description="HTML Source Occurrences"/>
         </children>
-        <children xmi:id="_JQ-pCLjoEe25NdJK2M4KYw" elementId="org.eclipse.ant.ui.AntEditorScope" name="Editing Ant Buildfiles" description="Editing Ant Buildfiles Context"/>
-        <children xmi:id="_JQ-pCbjoEe25NdJK2M4KYw" elementId="org.eclipse.jdt.ui.propertiesEditorScope" name="Editing Properties Files" description="Editing Properties Files Context"/>
-        <children xmi:id="_JQ-pCrjoEe25NdJK2M4KYw" elementId="org.eclipse.wst.jsdt.ui.javaEditorScope" name="Editing JavaScript Source" description="Editing JavaScript Source Context">
-          <children xmi:id="_JQ-pC7joEe25NdJK2M4KYw" elementId="org.eclipse.wst.jsdt.ui.javascriptViewScope" name="JavaScript View" description="JavaScript View Context"/>
+        <children xmi:id="_ZGeI_KrbEe2-M8nuGout-A" elementId="org.eclipse.ant.ui.AntEditorScope" name="Editing Ant Buildfiles" description="Editing Ant Buildfiles Context"/>
+        <children xmi:id="_ZGeI_6rbEe2-M8nuGout-A" elementId="org.eclipse.jdt.ui.propertiesEditorScope" name="Editing Properties Files" description="Editing Properties Files Context"/>
+        <children xmi:id="_vsFmYKxFEe2VqJFWjEAUdQ" elementId="org.eclipse.wst.jsdt.ui.javaEditorScope" name="Editing JavaScript Source" description="Editing JavaScript Source Context">
+          <children xmi:id="_vsFmbqxFEe2VqJFWjEAUdQ" elementId="org.eclipse.wst.jsdt.ui.javascriptViewScope" name="JavaScript View" description="JavaScript View Context"/>
         </children>
-        <children xmi:id="_JQ-pDLjoEe25NdJK2M4KYw" elementId="org.eclipse.wst.xsd.ui.text.editor.context" name="Editing XSD context"/>
+        <children xmi:id="_vsFmbKxFEe2VqJFWjEAUdQ" elementId="org.eclipse.wst.xsd.ui.text.editor.context" name="Editing XSD context"/>
       </children>
-      <children xmi:id="_JQ-pDbjoEe25NdJK2M4KYw" elementId="org.eclipse.debug.ui.console" name="In I/O Console" description="In I/O console"/>
-      <children xmi:id="_JQ-pDrjoEe25NdJK2M4KYw" elementId="org.eclipse.tm.terminal.view.ui.TerminalsView" name="In Terminal View" description="Show modified keyboard shortcuts in context menu"/>
-      <children xmi:id="_JQ-pD7joEe25NdJK2M4KYw" elementId="com.genuitec.eclipse.meExplorerScope" name="Project Explorer +"/>
-      <children xmi:id="_JQ-pELjoEe25NdJK2M4KYw" elementId="org.eclipse.compare.compareEditorScope" name="Comparing in an Editor" description="Comparing in an Editor"/>
-      <children xmi:id="_JQ-pEbjoEe25NdJK2M4KYw" elementId="org.eclipse.ui.console.ConsoleView" name="In Console View" description="In Console View"/>
-      <children xmi:id="_JQ-pErjoEe25NdJK2M4KYw" elementId="org.eclipse.debug.ui.memoryview" name="In Memory View" description="In memory view"/>
-      <children xmi:id="_JQ-pE7joEe25NdJK2M4KYw" elementId="org.eclipse.ui.serverViewScope" name="In Servers View" description="In Servers View"/>
-      <children xmi:id="_JQ-pFLjoEe25NdJK2M4KYw" elementId="org.eclipse.debug.ui.debugging" name="Debugging" description="Debugging programs">
-        <children xmi:id="_JQ-pFbjoEe25NdJK2M4KYw" elementId="org.eclipse.debug.ui.memory.abstractasynctablerendering" name="In Table Memory Rendering" description="In Table Memory Rendering"/>
-        <children xmi:id="_JQ-pFrjoEe25NdJK2M4KYw" elementId="org.eclipse.jdt.debug.ui.debugging" name="Debugging Java" description="Debugging Java programs"/>
+      <children xmi:id="_ZGeI5qrbEe2-M8nuGout-A" elementId="org.eclipse.debug.ui.console" name="In I/O Console" description="In I/O console"/>
+      <children xmi:id="_ZGeI56rbEe2-M8nuGout-A" elementId="org.eclipse.tm.terminal.view.ui.TerminalsView" name="In Terminal View" description="Show modified keyboard shortcuts in context menu"/>
+      <children xmi:id="_ZGeI6KrbEe2-M8nuGout-A" elementId="com.genuitec.eclipse.meExplorerScope" name="Project Explorer +"/>
+      <children xmi:id="_ZGeI6qrbEe2-M8nuGout-A" elementId="org.eclipse.compare.compareEditorScope" name="Comparing in an Editor" description="Comparing in an Editor"/>
+      <children xmi:id="_ZGeI7KrbEe2-M8nuGout-A" elementId="org.eclipse.ui.console.ConsoleView" name="In Console View" description="In Console View"/>
+      <children xmi:id="_ZGeI7arbEe2-M8nuGout-A" elementId="org.eclipse.debug.ui.memoryview" name="In Memory View" description="In memory view"/>
+      <children xmi:id="_ZGeI7qrbEe2-M8nuGout-A" elementId="org.eclipse.ui.serverViewScope" name="In Servers View" description="In Servers View"/>
+      <children xmi:id="_ZGeI8arbEe2-M8nuGout-A" elementId="org.eclipse.debug.ui.debugging" name="Debugging" description="Debugging programs">
+        <children xmi:id="_ZGeI8qrbEe2-M8nuGout-A" elementId="org.eclipse.debug.ui.memory.abstractasynctablerendering" name="In Table Memory Rendering" description="In Table Memory Rendering"/>
+        <children xmi:id="_ZGeI_qrbEe2-M8nuGout-A" elementId="org.eclipse.jdt.debug.ui.debugging" name="Debugging Java" description="Debugging Java programs"/>
       </children>
-      <children xmi:id="_JQ-pF7joEe25NdJK2M4KYw" elementId="org.eclipse.egit.ui.ReflogView" name="In Git Reflog View"/>
-      <children xmi:id="_JQ-pGLjoEe25NdJK2M4KYw" elementId="org.eclipse.tm.terminal.TerminalContext" name="Terminal Typing Connected" description="Override ALT+x menu access keys while typing into the Terminal"/>
-      <children xmi:id="_JQ-pGbjoEe25NdJK2M4KYw" elementId="org.eclipse.buildship.ui.contexts.taskview" name="In Gradle Tasks View" description="This context is activated when the Gradle Tasks view is in focus"/>
-      <children xmi:id="_JQ-pGrjoEe25NdJK2M4KYw" elementId="org.eclipse.egit.ui.RepositoriesView" name="In Git Repositories View">
-        <children xmi:id="_JQ-pG7joEe25NdJK2M4KYw" elementId="org.eclipse.egit.ui.RepositoriesView.SingleRepository" name="In Git Repositories View"/>
+      <children xmi:id="_ZGeI86rbEe2-M8nuGout-A" elementId="org.eclipse.egit.ui.ReflogView" name="In Git Reflog View"/>
+      <children xmi:id="_ZGeI9qrbEe2-M8nuGout-A" elementId="org.eclipse.tm.terminal.TerminalContext" name="Terminal Typing Connected" description="Override ALT+x menu access keys while typing into the Terminal"/>
+      <children xmi:id="_ZGeI-6rbEe2-M8nuGout-A" elementId="org.eclipse.buildship.ui.contexts.taskview" name="In Gradle Tasks View" description="This context is activated when the Gradle Tasks view is in focus"/>
+      <children xmi:id="_ZGeJAKrbEe2-M8nuGout-A" elementId="org.eclipse.egit.ui.RepositoriesView" name="In Git Repositories View">
+        <children xmi:id="_ZGeJAarbEe2-M8nuGout-A" elementId="org.eclipse.egit.ui.RepositoriesView.SingleRepository" name="In Git Repositories View"/>
       </children>
     </children>
-    <children xmi:id="_JQ-pHLjoEe25NdJK2M4KYw" elementId="org.eclipse.ui.contexts.dialog" contributorURI="platform:/plugin/org.eclipse.platform" name="In Dialogs" description="A dialog is open"/>
+    <children xmi:id="_ZFeDXKrbEe2-M8nuGout-A" elementId="org.eclipse.ui.contexts.dialog" contributorURI="platform:/plugin/org.eclipse.platform" name="In Dialogs" description="A dialog is open"/>
   </rootContext>
-  <rootContext xmi:id="_JQ-pHbjoEe25NdJK2M4KYw" elementId="org.eclipse.ui.contexts.actionSet" name="Action Set" description="Parent context for action sets"/>
-  <rootContext xmi:id="_JQ-pHrjoEe25NdJK2M4KYw" elementId="org.eclipse.ui.contexts.workbenchMenu" name="Workbench Menu" description="When no Workbench windows are active"/>
-  <rootContext xmi:id="_JQ-pH7joEe25NdJK2M4KYw" elementId="org.eclipse.jdt.ui.breadcrumbEditorScope" name="Editor Breadcrumb Navigation" description="Editor Breadcrumb Navigation Context"/>
-  <rootContext xmi:id="_JQ-pILjoEe25NdJK2M4KYw" elementId="org.eclipse.ant.ui.actionSet.presentation" name="Auto::org.eclipse.ant.ui.actionSet.presentation"/>
-  <rootContext xmi:id="_JQ-pIbjoEe25NdJK2M4KYw" elementId="org.eclipse.debug.ui.breakpointActionSet" name="Auto::org.eclipse.debug.ui.breakpointActionSet"/>
-  <rootContext xmi:id="_JQ-pIrjoEe25NdJK2M4KYw" elementId="org.eclipse.debug.ui.debugActionSet" name="Auto::org.eclipse.debug.ui.debugActionSet"/>
-  <rootContext xmi:id="_JQ-pI7joEe25NdJK2M4KYw" elementId="org.eclipse.debug.ui.launchActionSet" name="Auto::org.eclipse.debug.ui.launchActionSet"/>
-  <rootContext xmi:id="_JQ-pJLjoEe25NdJK2M4KYw" elementId="org.eclipse.debug.ui.profileActionSet" name="Auto::org.eclipse.debug.ui.profileActionSet"/>
-  <rootContext xmi:id="_JQ-pJbjoEe25NdJK2M4KYw" elementId="org.eclipse.egit.ui.gitaction" name="Auto::org.eclipse.egit.ui.gitaction"/>
-  <rootContext xmi:id="_JQ-pJrjoEe25NdJK2M4KYw" elementId="org.eclipse.egit.ui.navigation" name="Auto::org.eclipse.egit.ui.navigation"/>
-  <rootContext xmi:id="_JQ-pJ7joEe25NdJK2M4KYw" elementId="org.eclipse.egit.ui.SearchActionSet" name="Auto::org.eclipse.egit.ui.SearchActionSet"/>
-  <rootContext xmi:id="_JQ-pKLjoEe25NdJK2M4KYw" elementId="org.eclipse.jdt.debug.ui.JDTDebugActionSet" name="Auto::org.eclipse.jdt.debug.ui.JDTDebugActionSet"/>
-  <rootContext xmi:id="_JQ-pKbjoEe25NdJK2M4KYw" elementId="org.eclipse.jdt.junit.JUnitActionSet" name="Auto::org.eclipse.jdt.junit.JUnitActionSet"/>
-  <rootContext xmi:id="_JQ-pKrjoEe25NdJK2M4KYw" elementId="org.eclipse.jdt.ui.text.java.actionSet.presentation" name="Auto::org.eclipse.jdt.ui.text.java.actionSet.presentation"/>
-  <rootContext xmi:id="_JQ-pK7joEe25NdJK2M4KYw" elementId="org.eclipse.jdt.ui.JavaElementCreationActionSet" name="Auto::org.eclipse.jdt.ui.JavaElementCreationActionSet"/>
-  <rootContext xmi:id="_JQ-pLLjoEe25NdJK2M4KYw" elementId="org.eclipse.jdt.ui.JavaActionSet" name="Auto::org.eclipse.jdt.ui.JavaActionSet"/>
-  <rootContext xmi:id="_JQ-pLbjoEe25NdJK2M4KYw" elementId="org.eclipse.jdt.ui.A_OpenActionSet" name="Auto::org.eclipse.jdt.ui.A_OpenActionSet"/>
-  <rootContext xmi:id="_JQ-pLrjoEe25NdJK2M4KYw" elementId="org.eclipse.jdt.ui.CodingActionSet" name="Auto::org.eclipse.jdt.ui.CodingActionSet"/>
-  <rootContext xmi:id="_JQ-pL7joEe25NdJK2M4KYw" elementId="org.eclipse.jdt.ui.SearchActionSet" name="Auto::org.eclipse.jdt.ui.SearchActionSet"/>
-  <rootContext xmi:id="_JQ-pMLjoEe25NdJK2M4KYw" elementId="org.eclipse.linuxtools.docker.launchActionSet" name="Auto::org.eclipse.linuxtools.docker.launchActionSet"/>
-  <rootContext xmi:id="_JQ-pMbjoEe25NdJK2M4KYw" elementId="org.eclipse.pde.ui.SearchActionSet" name="Auto::org.eclipse.pde.ui.SearchActionSet"/>
-  <rootContext xmi:id="_JQ-pMrjoEe25NdJK2M4KYw" elementId="org.eclipse.ui.cheatsheets.actionSet" name="Auto::org.eclipse.ui.cheatsheets.actionSet"/>
-  <rootContext xmi:id="_JQ-pM7joEe25NdJK2M4KYw" elementId="org.eclipse.search.searchActionSet" name="Auto::org.eclipse.search.searchActionSet"/>
-  <rootContext xmi:id="_JQ-pNLjoEe25NdJK2M4KYw" elementId="org.eclipse.team.ui.actionSet" name="Auto::org.eclipse.team.ui.actionSet"/>
-  <rootContext xmi:id="_JQ-pNbjoEe25NdJK2M4KYw" elementId="org.eclipse.text.quicksearch.actionSet" name="Auto::org.eclipse.text.quicksearch.actionSet"/>
-  <rootContext xmi:id="_JQ-pNrjoEe25NdJK2M4KYw" elementId="org.eclipse.ui.edit.text.actionSet.annotationNavigation" name="Auto::org.eclipse.ui.edit.text.actionSet.annotationNavigation"/>
-  <rootContext xmi:id="_JQ-pN7joEe25NdJK2M4KYw" elementId="org.eclipse.ui.edit.text.actionSet.navigation" name="Auto::org.eclipse.ui.edit.text.actionSet.navigation"/>
-  <rootContext xmi:id="_JQ-pOLjoEe25NdJK2M4KYw" elementId="org.eclipse.ui.edit.text.actionSet.convertLineDelimitersTo" name="Auto::org.eclipse.ui.edit.text.actionSet.convertLineDelimitersTo"/>
-  <rootContext xmi:id="_JQ-pObjoEe25NdJK2M4KYw" elementId="org.eclipse.ui.externaltools.ExternalToolsSet" name="Auto::org.eclipse.ui.externaltools.ExternalToolsSet"/>
-  <rootContext xmi:id="_JQ-pOrjoEe25NdJK2M4KYw" elementId="org.eclipse.ui.NavigateActionSet" name="Auto::org.eclipse.ui.NavigateActionSet"/>
-  <rootContext xmi:id="_JQ-pO7joEe25NdJK2M4KYw" elementId="org.eclipse.ui.actionSet.keyBindings" name="Auto::org.eclipse.ui.actionSet.keyBindings"/>
-  <rootContext xmi:id="_JQ-pPLjoEe25NdJK2M4KYw" elementId="org.eclipse.ui.WorkingSetModificationActionSet" name="Auto::org.eclipse.ui.WorkingSetModificationActionSet"/>
-  <rootContext xmi:id="_JQ-pPbjoEe25NdJK2M4KYw" elementId="org.eclipse.ui.WorkingSetActionSet" name="Auto::org.eclipse.ui.WorkingSetActionSet"/>
-  <rootContext xmi:id="_JQ-pPrjoEe25NdJK2M4KYw" elementId="org.eclipse.ui.actionSet.openFiles" name="Auto::org.eclipse.ui.actionSet.openFiles"/>
-  <rootContext xmi:id="_JQ-pP7joEe25NdJK2M4KYw" elementId="org.eclipse.ui.edit.text.actionSet.presentation" name="Auto::org.eclipse.ui.edit.text.actionSet.presentation"/>
-  <rootContext xmi:id="_JQ-pQLjoEe25NdJK2M4KYw" elementId="org.eclipse.wst.server.ui.new.actionSet" name="Auto::org.eclipse.wst.server.ui.new.actionSet"/>
-  <rootContext xmi:id="_JQ-pQbjoEe25NdJK2M4KYw" elementId="org.eclipse.wst.server.ui.internal.webbrowser.actionSet" name="Auto::org.eclipse.wst.server.ui.internal.webbrowser.actionSet"/>
-  <rootContext xmi:id="_JQ-pQrjoEe25NdJK2M4KYw" elementId="org.springsource.ide.eclipse.commons.launch.actionSet" name="Auto::org.springsource.ide.eclipse.commons.launch.actionSet"/>
-  <rootContext xmi:id="_JQ-pQ7joEe25NdJK2M4KYw" elementId="org.springframework.ide.eclipse.boot.launch.internal.org.eclipse.debug.ui.DebugPerspective" name="Auto::org.springframework.ide.eclipse.boot.launch.internal.org.eclipse.debug.ui.DebugPerspective"/>
-  <rootContext xmi:id="_JQ-pRLjoEe25NdJK2M4KYw" elementId="org.eclipse.wst.xsd.ui.editor.sourceView" name="XSD Editor Source View" description="XSD Editor Source View"/>
-  <rootContext xmi:id="_JQ-pRbjoEe25NdJK2M4KYw" elementId="org.eclipse.wst.xsd.ui.editor.designView" name="XSD Editor Design View" description="XSD Editor Design View"/>
-  <rootContext xmi:id="_JQ-pRrjoEe25NdJK2M4KYw" elementId="org.eclipse.wst.web.ui.wizardsActionSet" name="Auto::org.eclipse.wst.web.ui.wizardsActionSet"/>
-  <descriptors xmi:id="_JQ-pR7joEe25NdJK2M4KYw" elementId="org.eclipse.pde.spy.preferences.parts.PreferenceSpyPart" contributorURI="platform:/plugin/org.eclipse.pde.spy.preferences" label="Preference Spy" iconURI="platform:/plugin/org.eclipse.pde.spy.preferences/$nl$/icons/preference_spy.png" closeable="true" contributionURI="bundleclass://org.eclipse.pde.spy.preferences/org.eclipse.pde.spy.preferences.parts.PreferenceSpyPart" description="Spy to display preferences">
+  <rootContext xmi:id="_ZGeI5arbEe2-M8nuGout-A" elementId="org.eclipse.ui.contexts.actionSet" name="Action Set" description="Parent context for action sets"/>
+  <rootContext xmi:id="_ZGeI66rbEe2-M8nuGout-A" elementId="org.eclipse.ui.contexts.workbenchMenu" name="Workbench Menu" description="When no Workbench windows are active"/>
+  <rootContext xmi:id="_ZGeI9KrbEe2-M8nuGout-A" elementId="org.eclipse.jdt.ui.breadcrumbEditorScope" name="Editor Breadcrumb Navigation" description="Editor Breadcrumb Navigation Context"/>
+  <rootContext xmi:id="_aZYiQKrbEe2-M8nuGout-A" elementId="org.eclipse.ant.ui.actionSet.presentation" name="Auto::org.eclipse.ant.ui.actionSet.presentation"/>
+  <rootContext xmi:id="_aZZJUKrbEe2-M8nuGout-A" elementId="org.eclipse.debug.ui.breakpointActionSet" name="Auto::org.eclipse.debug.ui.breakpointActionSet"/>
+  <rootContext xmi:id="_aZZwYKrbEe2-M8nuGout-A" elementId="org.eclipse.debug.ui.debugActionSet" name="Auto::org.eclipse.debug.ui.debugActionSet"/>
+  <rootContext xmi:id="_aZZwYqrbEe2-M8nuGout-A" elementId="org.eclipse.debug.ui.launchActionSet" name="Auto::org.eclipse.debug.ui.launchActionSet"/>
+  <rootContext xmi:id="_aZZwZKrbEe2-M8nuGout-A" elementId="org.eclipse.debug.ui.profileActionSet" name="Auto::org.eclipse.debug.ui.profileActionSet"/>
+  <rootContext xmi:id="_aZZwZqrbEe2-M8nuGout-A" elementId="org.eclipse.egit.ui.gitaction" name="Auto::org.eclipse.egit.ui.gitaction"/>
+  <rootContext xmi:id="_aZaXcKrbEe2-M8nuGout-A" elementId="org.eclipse.egit.ui.navigation" name="Auto::org.eclipse.egit.ui.navigation"/>
+  <rootContext xmi:id="_aZaXcqrbEe2-M8nuGout-A" elementId="org.eclipse.egit.ui.SearchActionSet" name="Auto::org.eclipse.egit.ui.SearchActionSet"/>
+  <rootContext xmi:id="_aZaXdKrbEe2-M8nuGout-A" elementId="org.eclipse.jdt.debug.ui.JDTDebugActionSet" name="Auto::org.eclipse.jdt.debug.ui.JDTDebugActionSet"/>
+  <rootContext xmi:id="_aZczsKrbEe2-M8nuGout-A" elementId="org.eclipse.jdt.junit.JUnitActionSet" name="Auto::org.eclipse.jdt.junit.JUnitActionSet"/>
+  <rootContext xmi:id="_aZczsqrbEe2-M8nuGout-A" elementId="org.eclipse.jdt.ui.text.java.actionSet.presentation" name="Auto::org.eclipse.jdt.ui.text.java.actionSet.presentation"/>
+  <rootContext xmi:id="_aZdawKrbEe2-M8nuGout-A" elementId="org.eclipse.jdt.ui.JavaElementCreationActionSet" name="Auto::org.eclipse.jdt.ui.JavaElementCreationActionSet"/>
+  <rootContext xmi:id="_aZdawqrbEe2-M8nuGout-A" elementId="org.eclipse.jdt.ui.JavaActionSet" name="Auto::org.eclipse.jdt.ui.JavaActionSet"/>
+  <rootContext xmi:id="_aZdaxKrbEe2-M8nuGout-A" elementId="org.eclipse.jdt.ui.A_OpenActionSet" name="Auto::org.eclipse.jdt.ui.A_OpenActionSet"/>
+  <rootContext xmi:id="_aZdaxqrbEe2-M8nuGout-A" elementId="org.eclipse.jdt.ui.CodingActionSet" name="Auto::org.eclipse.jdt.ui.CodingActionSet"/>
+  <rootContext xmi:id="_aZeB0KrbEe2-M8nuGout-A" elementId="org.eclipse.jdt.ui.SearchActionSet" name="Auto::org.eclipse.jdt.ui.SearchActionSet"/>
+  <rootContext xmi:id="_aZeo4KrbEe2-M8nuGout-A" elementId="org.eclipse.linuxtools.docker.launchActionSet" name="Auto::org.eclipse.linuxtools.docker.launchActionSet"/>
+  <rootContext xmi:id="_aZfP8KrbEe2-M8nuGout-A" elementId="org.eclipse.pde.ui.SearchActionSet" name="Auto::org.eclipse.pde.ui.SearchActionSet"/>
+  <rootContext xmi:id="_aZfP8qrbEe2-M8nuGout-A" elementId="org.eclipse.ui.cheatsheets.actionSet" name="Auto::org.eclipse.ui.cheatsheets.actionSet"/>
+  <rootContext xmi:id="_aZfP9KrbEe2-M8nuGout-A" elementId="org.eclipse.search.searchActionSet" name="Auto::org.eclipse.search.searchActionSet"/>
+  <rootContext xmi:id="_aZfP9qrbEe2-M8nuGout-A" elementId="org.eclipse.team.ui.actionSet" name="Auto::org.eclipse.team.ui.actionSet"/>
+  <rootContext xmi:id="_aZf3AKrbEe2-M8nuGout-A" elementId="org.eclipse.text.quicksearch.actionSet" name="Auto::org.eclipse.text.quicksearch.actionSet"/>
+  <rootContext xmi:id="_aZf3AqrbEe2-M8nuGout-A" elementId="org.eclipse.ui.edit.text.actionSet.annotationNavigation" name="Auto::org.eclipse.ui.edit.text.actionSet.annotationNavigation"/>
+  <rootContext xmi:id="_aZf3BKrbEe2-M8nuGout-A" elementId="org.eclipse.ui.edit.text.actionSet.navigation" name="Auto::org.eclipse.ui.edit.text.actionSet.navigation"/>
+  <rootContext xmi:id="_aZgeEKrbEe2-M8nuGout-A" elementId="org.eclipse.ui.edit.text.actionSet.convertLineDelimitersTo" name="Auto::org.eclipse.ui.edit.text.actionSet.convertLineDelimitersTo"/>
+  <rootContext xmi:id="_aZhFIKrbEe2-M8nuGout-A" elementId="org.eclipse.ui.externaltools.ExternalToolsSet" name="Auto::org.eclipse.ui.externaltools.ExternalToolsSet"/>
+  <rootContext xmi:id="_aZhsMKrbEe2-M8nuGout-A" elementId="org.eclipse.ui.NavigateActionSet" name="Auto::org.eclipse.ui.NavigateActionSet"/>
+  <rootContext xmi:id="_aZhsMqrbEe2-M8nuGout-A" elementId="org.eclipse.ui.actionSet.keyBindings" name="Auto::org.eclipse.ui.actionSet.keyBindings"/>
+  <rootContext xmi:id="_aZhsNKrbEe2-M8nuGout-A" elementId="org.eclipse.ui.WorkingSetModificationActionSet" name="Auto::org.eclipse.ui.WorkingSetModificationActionSet"/>
+  <rootContext xmi:id="_aZhsNqrbEe2-M8nuGout-A" elementId="org.eclipse.ui.WorkingSetActionSet" name="Auto::org.eclipse.ui.WorkingSetActionSet"/>
+  <rootContext xmi:id="_aZiTQarbEe2-M8nuGout-A" elementId="org.eclipse.ui.actionSet.openFiles" name="Auto::org.eclipse.ui.actionSet.openFiles"/>
+  <rootContext xmi:id="_aZi6UKrbEe2-M8nuGout-A" elementId="org.eclipse.ui.edit.text.actionSet.presentation" name="Auto::org.eclipse.ui.edit.text.actionSet.presentation"/>
+  <rootContext xmi:id="_aZkIcKrbEe2-M8nuGout-A" elementId="org.eclipse.wst.server.ui.new.actionSet" name="Auto::org.eclipse.wst.server.ui.new.actionSet"/>
+  <rootContext xmi:id="_aZkIcqrbEe2-M8nuGout-A" elementId="org.eclipse.wst.server.ui.internal.webbrowser.actionSet" name="Auto::org.eclipse.wst.server.ui.internal.webbrowser.actionSet"/>
+  <rootContext xmi:id="_aZny0KrbEe2-M8nuGout-A" elementId="org.springsource.ide.eclipse.commons.launch.actionSet" name="Auto::org.springsource.ide.eclipse.commons.launch.actionSet"/>
+  <rootContext xmi:id="_RujPYKr3Ee26usPLCNWeQg" elementId="org.springframework.ide.eclipse.boot.launch.internal.org.eclipse.debug.ui.DebugPerspective" name="Auto::org.springframework.ide.eclipse.boot.launch.internal.org.eclipse.debug.ui.DebugPerspective"/>
+  <rootContext xmi:id="_vsFmZaxFEe2VqJFWjEAUdQ" elementId="org.eclipse.wst.xsd.ui.editor.sourceView" name="XSD Editor Source View" description="XSD Editor Source View"/>
+  <rootContext xmi:id="_vsFmaKxFEe2VqJFWjEAUdQ" elementId="org.eclipse.wst.xsd.ui.editor.designView" name="XSD Editor Design View" description="XSD Editor Design View"/>
+  <rootContext xmi:id="_wdM6QKxFEe2VqJFWjEAUdQ" elementId="org.eclipse.wst.web.ui.wizardsActionSet" name="Auto::org.eclipse.wst.web.ui.wizardsActionSet"/>
+  <descriptors xmi:id="_ZwoE4LmcEe2PhdbZsFs5Qw" elementId="org.eclipse.pde.spy.preferences.parts.PreferenceSpyPart" contributorURI="platform:/plugin/org.eclipse.pde.spy.preferences" label="Preference Spy" iconURI="platform:/plugin/org.eclipse.pde.spy.preferences/$nl$/icons/preference_spy.png" closeable="true" contributionURI="bundleclass://org.eclipse.pde.spy.preferences/org.eclipse.pde.spy.preferences.parts.PreferenceSpyPart" description="Spy to display preferences">
     <persistedState key="perstistState" value="false"/>
     <tags>Spy</tags>
-    <toolbar xmi:id="_JQ-pTbjoEe25NdJK2M4KYw" elementId="org.eclipse.pde.spy.preferences.toolbar" contributorURI="platform:/plugin/org.eclipse.pde.spy.preferences">
-      <children xsi:type="menu:ToolControl" xmi:id="_JQ-pTrjoEe25NdJK2M4KYw" elementId="org.eclipse.pde.spy.preferences.toolcontrol.layout" contributorURI="platform:/plugin/org.eclipse.pde.spy.preferences" contributionURI="bundleclass://org.eclipse.pde.spy.preferences/org.eclipse.pde.spy.preferences.handler.ToggleLayoutControl"/>
-      <children xsi:type="menu:ToolBarSeparator" xmi:id="_JQ-pT7joEe25NdJK2M4KYw" elementId="org.eclipse.pde.spy.preferences.toolbarseparator.0" contributorURI="platform:/plugin/org.eclipse.pde.spy.preferences"/>
-      <children xsi:type="menu:HandledToolItem" xmi:id="_JQ-pULjoEe25NdJK2M4KYw" elementId="org.eclipse.pde.spy.preferences.handledtoolitem.showall" contributorURI="platform:/plugin/org.eclipse.pde.spy.preferences" iconURI="platform:/plugin/org.eclipse.pde.spy.preferences/icons/show_all_preferences.png">
+    <toolbar xmi:id="_Zwor9bmcEe2PhdbZsFs5Qw" elementId="org.eclipse.pde.spy.preferences.toolbar" contributorURI="platform:/plugin/org.eclipse.pde.spy.preferences">
+      <children xsi:type="menu:ToolControl" xmi:id="_Zwor9rmcEe2PhdbZsFs5Qw" elementId="org.eclipse.pde.spy.preferences.toolcontrol.layout" contributorURI="platform:/plugin/org.eclipse.pde.spy.preferences" contributionURI="bundleclass://org.eclipse.pde.spy.preferences/org.eclipse.pde.spy.preferences.handler.ToggleLayoutControl"/>
+      <children xsi:type="menu:ToolBarSeparator" xmi:id="_Zwor97mcEe2PhdbZsFs5Qw" elementId="org.eclipse.pde.spy.preferences.toolbarseparator.0" contributorURI="platform:/plugin/org.eclipse.pde.spy.preferences"/>
+      <children xsi:type="menu:HandledToolItem" xmi:id="_Zwor-LmcEe2PhdbZsFs5Qw" elementId="org.eclipse.pde.spy.preferences.handledtoolitem.showall" contributorURI="platform:/plugin/org.eclipse.pde.spy.preferences" iconURI="platform:/plugin/org.eclipse.pde.spy.preferences/icons/show_all_preferences.png">
         <command href="platform:/plugin/org.eclipse.pde.spy.preferences/fragment.e4xmi#_ufxRsHY2EeSuTdKDH5hMwg"/>
       </children>
-      <children xsi:type="menu:ToolControl" xmi:id="_JQ-pUbjoEe25NdJK2M4KYw" elementId="org.eclipse.pde.spy.preferences.toolcontrol.trace" contributorURI="platform:/plugin/org.eclipse.pde.spy.preferences" contributionURI="bundleclass://org.eclipse.pde.spy.preferences/org.eclipse.pde.spy.preferences.handler.TogglePreferenceTraceControl"/>
-      <children xsi:type="menu:ToolBarSeparator" xmi:id="_JQ-pUrjoEe25NdJK2M4KYw" elementId="org.eclipse.pde.spy.preferences.toolbarseparator.1" contributorURI="platform:/plugin/org.eclipse.pde.spy.preferences"/>
-      <children xsi:type="menu:HandledToolItem" xmi:id="_JQ-pU7joEe25NdJK2M4KYw" elementId="org.eclipse.pde.spy.preferences.handledtoolitem.expandall" contributorURI="platform:/plugin/org.eclipse.pde.spy.preferences" iconURI="platform:/plugin/org.eclipse.pde.spy.preferences/icons/expandall.png">
+      <children xsi:type="menu:ToolControl" xmi:id="_Zwor-bmcEe2PhdbZsFs5Qw" elementId="org.eclipse.pde.spy.preferences.toolcontrol.trace" contributorURI="platform:/plugin/org.eclipse.pde.spy.preferences" contributionURI="bundleclass://org.eclipse.pde.spy.preferences/org.eclipse.pde.spy.preferences.handler.TogglePreferenceTraceControl"/>
+      <children xsi:type="menu:ToolBarSeparator" xmi:id="_Zwor-rmcEe2PhdbZsFs5Qw" elementId="org.eclipse.pde.spy.preferences.toolbarseparator.1" contributorURI="platform:/plugin/org.eclipse.pde.spy.preferences"/>
+      <children xsi:type="menu:HandledToolItem" xmi:id="_Zwor-7mcEe2PhdbZsFs5Qw" elementId="org.eclipse.pde.spy.preferences.handledtoolitem.expandall" contributorURI="platform:/plugin/org.eclipse.pde.spy.preferences" iconURI="platform:/plugin/org.eclipse.pde.spy.preferences/icons/expandall.png">
         <command href="platform:/plugin/org.eclipse.pde.spy.preferences/fragment.e4xmi#_4NM_IH_gEeSk-4v3KnNHPw"/>
       </children>
-      <children xsi:type="menu:HandledToolItem" xmi:id="_JQ-pVLjoEe25NdJK2M4KYw" elementId="org.eclipse.pde.spy.preferences.handledtoolitem.collapseall" contributorURI="platform:/plugin/org.eclipse.pde.spy.preferences" iconURI="platform:/plugin/org.eclipse.pde.spy.preferences/icons/collapseall.png">
+      <children xsi:type="menu:HandledToolItem" xmi:id="_Zwor_LmcEe2PhdbZsFs5Qw" elementId="org.eclipse.pde.spy.preferences.handledtoolitem.collapseall" contributorURI="platform:/plugin/org.eclipse.pde.spy.preferences" iconURI="platform:/plugin/org.eclipse.pde.spy.preferences/icons/collapseall.png">
         <command href="platform:/plugin/org.eclipse.pde.spy.preferences/fragment.e4xmi#_68UQwH_gEeSk-4v3KnNHPw"/>
       </children>
-      <children xsi:type="menu:ToolBarSeparator" xmi:id="_JQ-pVbjoEe25NdJK2M4KYw" elementId="org.eclipse.pde.spy.preferences.toolbarseparator.2" contributorURI="platform:/plugin/org.eclipse.pde.spy.preferences"/>
-      <children xsi:type="menu:HandledToolItem" xmi:id="_JQ-pVrjoEe25NdJK2M4KYw" elementId="org.eclipse.pde.spy.preferences.handledtoolitem.removeentry" contributorURI="platform:/plugin/org.eclipse.pde.spy.preferences" iconURI="platform:/plugin/org.eclipse.pde.spy.preferences/icons/remove_co.png">
+      <children xsi:type="menu:ToolBarSeparator" xmi:id="_Zwor_bmcEe2PhdbZsFs5Qw" elementId="org.eclipse.pde.spy.preferences.toolbarseparator.2" contributorURI="platform:/plugin/org.eclipse.pde.spy.preferences"/>
+      <children xsi:type="menu:HandledToolItem" xmi:id="_Zwor_rmcEe2PhdbZsFs5Qw" elementId="org.eclipse.pde.spy.preferences.handledtoolitem.removeentry" contributorURI="platform:/plugin/org.eclipse.pde.spy.preferences" iconURI="platform:/plugin/org.eclipse.pde.spy.preferences/icons/remove_co.png">
         <command href="platform:/plugin/org.eclipse.pde.spy.preferences/fragment.e4xmi#_iGEkYGxiEeSQ7v0akw7aRA"/>
       </children>
-      <children xsi:type="menu:HandledToolItem" xmi:id="_JQ-pV7joEe25NdJK2M4KYw" elementId="org.eclipse.pde.spy.preferences.handledtoolitem.removeall" contributorURI="platform:/plugin/org.eclipse.pde.spy.preferences" iconURI="platform:/plugin/org.eclipse.pde.spy.preferences/icons/removeall_co.png">
+      <children xsi:type="menu:HandledToolItem" xmi:id="_Zwor_7mcEe2PhdbZsFs5Qw" elementId="org.eclipse.pde.spy.preferences.handledtoolitem.removeall" contributorURI="platform:/plugin/org.eclipse.pde.spy.preferences" iconURI="platform:/plugin/org.eclipse.pde.spy.preferences/icons/removeall_co.png">
         <command href="platform:/plugin/org.eclipse.pde.spy.preferences/fragment.e4xmi#_eBGTEGxiEeSQ7v0akw7aRA"/>
       </children>
     </toolbar>
   </descriptors>
-  <descriptors xmi:id="_JQ-pWLjoEe25NdJK2M4KYw" elementId="org.eclipse.pde.spy.bundle.BundleSpyPart" contributorURI="platform:/plugin/org.eclipse.pde.spy.bundle" label="Bundle Spy" iconURI="platform:/plugin/org.eclipse.pde.spy.bundle/$nl$/icons/osgi.png" closeable="true" contributionURI="bundleclass://org.eclipse.pde.spy.bundle/org.eclipse.pde.spy.bundle.BundleSpyPart" description="Bundle Spy to display all bundles and their states">
+  <descriptors xmi:id="_ZKIg4arbEe2-M8nuGout-A" elementId="org.eclipse.pde.spy.bundle.BundleSpyPart" contributorURI="platform:/plugin/org.eclipse.pde.spy.bundle" label="Bundle Spy" iconURI="platform:/plugin/org.eclipse.pde.spy.bundle/$nl$/icons/osgi.png" closeable="true" contributionURI="bundleclass://org.eclipse.pde.spy.bundle/org.eclipse.pde.spy.bundle.BundleSpyPart" description="Bundle Spy to display all bundles and their states">
     <tags>Spy</tags>
   </descriptors>
-  <descriptors xmi:id="_JQ-pWbjoEe25NdJK2M4KYw" elementId="org.eclipse.pde.spy.context.ContextSpyPart" contributorURI="platform:/plugin/org.eclipse.pde.spy.context" label="Context Spy" iconURI="platform:/plugin/org.eclipse.pde.spy.context/$nl$/icons/annotation_obj.png" closeable="true" contributionURI="bundleclass://org.eclipse.pde.spy.context/org.eclipse.pde.spy.context.ContextSpyPart" description="Context Spy to understand what is behind the scene of injection">
+  <descriptors xmi:id="_ZKJvAqrbEe2-M8nuGout-A" elementId="org.eclipse.pde.spy.context.ContextSpyPart" contributorURI="platform:/plugin/org.eclipse.pde.spy.context" label="Context Spy" iconURI="platform:/plugin/org.eclipse.pde.spy.context/$nl$/icons/annotation_obj.png" closeable="true" contributionURI="bundleclass://org.eclipse.pde.spy.context/org.eclipse.pde.spy.context.ContextSpyPart" description="Context Spy to understand what is behind the scene of injection">
     <tags>Spy</tags>
   </descriptors>
-  <descriptors xmi:id="_JQ-pWrjoEe25NdJK2M4KYw" elementId="org.eclipse.pde.spy.css.CssSpyPart" contributorURI="platform:/plugin/org.eclipse.pde.spy.css" label="CSS Spy" iconURI="platform:/plugin/org.eclipse.pde.spy.css/$nl$/icons/cssspy.png" closeable="true" contributionURI="bundleclass://org.eclipse.pde.spy.css/org.eclipse.pde.spy.css.CssSpyPart" description="Open CSS Spy">
+  <descriptors xmi:id="_ZKK9IqrbEe2-M8nuGout-A" elementId="org.eclipse.pde.spy.css.CssSpyPart" contributorURI="platform:/plugin/org.eclipse.pde.spy.css" label="CSS Spy" iconURI="platform:/plugin/org.eclipse.pde.spy.css/$nl$/icons/cssspy.png" closeable="true" contributionURI="bundleclass://org.eclipse.pde.spy.css/org.eclipse.pde.spy.css.CssSpyPart" description="Open CSS Spy">
     <tags>Spy</tags>
   </descriptors>
-  <descriptors xmi:id="_JQ-pW7joEe25NdJK2M4KYw" elementId="org.eclipse.pde.spy.css.CSSScratchPadPart" contributorURI="platform:/plugin/org.eclipse.pde.spy.css" label="CSS Scratch Pad" iconURI="platform:/plugin/org.eclipse.pde.spy.css/$nl$/icons/css_scratchpad.png" closeable="true" contributionURI="bundleclass://org.eclipse.pde.spy.css/org.eclipse.pde.spy.css.CSSScratchPadPart" description="Open CSS Scratch Pad">
+  <descriptors xmi:id="_ZKLkMqrbEe2-M8nuGout-A" elementId="org.eclipse.pde.spy.css.CSSScratchPadPart" contributorURI="platform:/plugin/org.eclipse.pde.spy.css" label="CSS Scratch Pad" iconURI="platform:/plugin/org.eclipse.pde.spy.css/$nl$/icons/css_scratchpad.png" closeable="true" contributionURI="bundleclass://org.eclipse.pde.spy.css/org.eclipse.pde.spy.css.CSSScratchPadPart" description="Open CSS Scratch Pad">
     <tags>Spy</tags>
   </descriptors>
-  <descriptors xmi:id="_JQ-pXLjoEe25NdJK2M4KYw" elementId="org.eclipse.pde.spy.event.internal.ui.EventSpyPart" contributorURI="platform:/plugin/org.eclipse.pde.spy.event" label="Event Spy" iconURI="platform:/plugin/org.eclipse.pde.spy.event/$nl$/icons/eventspy.png" closeable="true" contributionURI="bundleclass://org.eclipse.pde.spy.event/org.eclipse.pde.spy.event.internal.ui.EventSpyPart" description="Event Spy is used to display E4 events sent by IEventBroker">
+  <descriptors xmi:id="_ZKMyUqrbEe2-M8nuGout-A" elementId="org.eclipse.pde.spy.event.internal.ui.EventSpyPart" contributorURI="platform:/plugin/org.eclipse.pde.spy.event" label="Event Spy" iconURI="platform:/plugin/org.eclipse.pde.spy.event/$nl$/icons/eventspy.png" closeable="true" contributionURI="bundleclass://org.eclipse.pde.spy.event/org.eclipse.pde.spy.event.internal.ui.EventSpyPart" description="Event Spy is used to display E4 events sent by IEventBroker">
     <tags>Spy</tags>
   </descriptors>
-  <descriptors xmi:id="_JQ-pXbjoEe25NdJK2M4KYw" elementId="org.eclipse.pde.spy.model.ModelSpyPart" contributorURI="platform:/plugin/org.eclipse.pde.spy.model" label="Model Spy" iconURI="platform:/plugin/org.eclipse.pde.spy.model/$nl$/icons/full/obj16/application_lightning.png" closeable="true" contributionURI="bundleclass://org.eclipse.pde.spy.model/org.eclipse.pde.spy.model.ModelSpyPart" description="Open the live model spy">
+  <descriptors xmi:id="_ZKOAcqrbEe2-M8nuGout-A" elementId="org.eclipse.pde.spy.model.ModelSpyPart" contributorURI="platform:/plugin/org.eclipse.pde.spy.model" label="Model Spy" iconURI="platform:/plugin/org.eclipse.pde.spy.model/$nl$/icons/full/obj16/application_lightning.png" closeable="true" contributionURI="bundleclass://org.eclipse.pde.spy.model/org.eclipse.pde.spy.model.ModelSpyPart" description="Open the live model spy">
     <tags>Spy</tags>
   </descriptors>
-  <descriptors xmi:id="_JQ-pXrjoEe25NdJK2M4KYw" elementId="org.eclipse.e4.ui.compatibility.editor" allowMultiple="true" category="org.eclipse.e4.primaryDataStack" closeable="true" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityEditor">
+  <descriptors xmi:id="_ZMXVgKrbEe2-M8nuGout-A" elementId="org.eclipse.e4.ui.compatibility.editor" allowMultiple="true" category="org.eclipse.e4.primaryDataStack" closeable="true" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityEditor">
     <tags>Editor</tags>
     <tags>removeOnHide</tags>
   </descriptors>
-  <descriptors xmi:id="_JQ-pX7joEe25NdJK2M4KYw" elementId="org.eclipse.ant.ui.views.AntView" label="Ant" iconURI="platform:/plugin/org.eclipse.ant.ui/icons/full/eview16/ant_view.png" tooltip="" category="Ant" closeable="true" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView">
+  <descriptors xmi:id="_Z9bmEKrbEe2-M8nuGout-A" elementId="org.eclipse.ant.ui.views.AntView" label="Ant" iconURI="platform:/plugin/org.eclipse.ant.ui/icons/full/eview16/ant_view.png" tooltip="" category="Ant" closeable="true" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView">
     <persistedState key="originalCompatibilityViewClass" value="org.eclipse.ant.internal.ui.views.AntView"/>
     <persistedState key="originalCompatibilityViewBundle" value="org.eclipse.ant.ui"/>
     <tags>View</tags>
     <tags>categoryTag:Ant</tags>
   </descriptors>
-  <descriptors xmi:id="_JQ-pYLjoEe25NdJK2M4KYw" elementId="org.eclipse.buildship.ui.views.taskview" label="Gradle Tasks" iconURI="platform:/plugin/org.eclipse.buildship.ui/icons/full/eview16/tasks_view.png" tooltip="" category="Gradle" closeable="true" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView">
+  <descriptors xmi:id="_Z9fQcKrbEe2-M8nuGout-A" elementId="org.eclipse.buildship.ui.views.taskview" label="Gradle Tasks" iconURI="platform:/plugin/org.eclipse.buildship.ui/icons/full/eview16/tasks_view.png" tooltip="" category="Gradle" closeable="true" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView">
     <persistedState key="originalCompatibilityViewClass" value="org.eclipse.buildship.ui.internal.view.task.TaskView"/>
     <persistedState key="originalCompatibilityViewBundle" value="org.eclipse.buildship.ui"/>
     <tags>View</tags>
     <tags>categoryTag:Gradle</tags>
   </descriptors>
-  <descriptors xmi:id="_JQ-pYbjoEe25NdJK2M4KYw" elementId="org.eclipse.buildship.ui.views.executionview" label="Gradle Executions" iconURI="platform:/plugin/org.eclipse.buildship.ui/icons/full/eview16/executions_view.png" tooltip="" category="Gradle" closeable="true" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView">
+  <descriptors xmi:id="_Z9gekKrbEe2-M8nuGout-A" elementId="org.eclipse.buildship.ui.views.executionview" label="Gradle Executions" iconURI="platform:/plugin/org.eclipse.buildship.ui/icons/full/eview16/executions_view.png" tooltip="" category="Gradle" closeable="true" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView">
     <persistedState key="originalCompatibilityViewClass" value="org.eclipse.buildship.ui.internal.view.execution.ExecutionsView"/>
     <persistedState key="originalCompatibilityViewBundle" value="org.eclipse.buildship.ui"/>
     <tags>View</tags>
     <tags>categoryTag:Gradle</tags>
   </descriptors>
-  <descriptors xmi:id="_JQ-pYrjoEe25NdJK2M4KYw" elementId="org.eclipse.debug.ui.DebugView" label="Debug" iconURI="platform:/plugin/org.eclipse.debug.ui/icons/full/eview16/debug_view.png" tooltip="" category="Debug" closeable="true" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView">
+  <descriptors xmi:id="_Z9hssKrbEe2-M8nuGout-A" elementId="org.eclipse.debug.ui.DebugView" label="Debug" iconURI="platform:/plugin/org.eclipse.debug.ui/icons/full/eview16/debug_view.png" tooltip="" category="Debug" closeable="true" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView">
     <persistedState key="originalCompatibilityViewClass" value="org.eclipse.debug.internal.ui.views.launch.LaunchView"/>
     <persistedState key="originalCompatibilityViewBundle" value="org.eclipse.debug.ui"/>
     <tags>View</tags>
     <tags>categoryTag:Debug</tags>
   </descriptors>
-  <descriptors xmi:id="_JQ-pY7joEe25NdJK2M4KYw" elementId="org.eclipse.debug.ui.BreakpointView" label="Breakpoints" iconURI="platform:/plugin/org.eclipse.debug.ui/icons/full/eview16/breakpoint_view.png" tooltip="" allowMultiple="true" category="Debug" closeable="true" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView">
+  <descriptors xmi:id="_Z9i60KrbEe2-M8nuGout-A" elementId="org.eclipse.debug.ui.BreakpointView" label="Breakpoints" iconURI="platform:/plugin/org.eclipse.debug.ui/icons/full/eview16/breakpoint_view.png" tooltip="" allowMultiple="true" category="Debug" closeable="true" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView">
     <persistedState key="originalCompatibilityViewClass" value="org.eclipse.debug.internal.ui.views.breakpoints.BreakpointsView"/>
     <persistedState key="originalCompatibilityViewBundle" value="org.eclipse.debug.ui"/>
     <tags>View</tags>
     <tags>categoryTag:Debug</tags>
   </descriptors>
-  <descriptors xmi:id="_JQ-pZLjoEe25NdJK2M4KYw" elementId="org.eclipse.debug.ui.VariableView" label="Variables" iconURI="platform:/plugin/org.eclipse.debug.ui/icons/full/eview16/variable_view.png" tooltip="" allowMultiple="true" category="Debug" closeable="true" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView">
+  <descriptors xmi:id="_Z9lXEKrbEe2-M8nuGout-A" elementId="org.eclipse.debug.ui.VariableView" label="Variables" iconURI="platform:/plugin/org.eclipse.debug.ui/icons/full/eview16/variable_view.png" tooltip="" allowMultiple="true" category="Debug" closeable="true" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView">
     <persistedState key="originalCompatibilityViewClass" value="org.eclipse.debug.internal.ui.views.variables.VariablesView"/>
     <persistedState key="originalCompatibilityViewBundle" value="org.eclipse.debug.ui"/>
     <tags>View</tags>
     <tags>categoryTag:Debug</tags>
   </descriptors>
-  <descriptors xmi:id="_JQ-pZbjoEe25NdJK2M4KYw" elementId="org.eclipse.debug.ui.ExpressionView" label="Expressions" iconURI="platform:/plugin/org.eclipse.debug.ui/icons/full/eview16/watchlist_view.png" tooltip="" allowMultiple="true" category="Debug" closeable="true" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView">
+  <descriptors xmi:id="_Z9pBcKrbEe2-M8nuGout-A" elementId="org.eclipse.debug.ui.ExpressionView" label="Expressions" iconURI="platform:/plugin/org.eclipse.debug.ui/icons/full/eview16/watchlist_view.png" tooltip="" allowMultiple="true" category="Debug" closeable="true" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView">
     <persistedState key="originalCompatibilityViewClass" value="org.eclipse.debug.internal.ui.views.expression.ExpressionView"/>
     <persistedState key="originalCompatibilityViewBundle" value="org.eclipse.debug.ui"/>
     <tags>View</tags>
     <tags>categoryTag:Debug</tags>
   </descriptors>
-  <descriptors xmi:id="_JQ-pZrjoEe25NdJK2M4KYw" elementId="org.eclipse.debug.ui.RegisterView" label="Registers" iconURI="platform:/plugin/org.eclipse.debug.ui/icons/full/eview16/register_view.png" tooltip="" allowMultiple="true" category="Debug" closeable="true" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView">
+  <descriptors xmi:id="_Z9q2oKrbEe2-M8nuGout-A" elementId="org.eclipse.debug.ui.RegisterView" label="Registers" iconURI="platform:/plugin/org.eclipse.debug.ui/icons/full/eview16/register_view.png" tooltip="" allowMultiple="true" category="Debug" closeable="true" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView">
     <persistedState key="originalCompatibilityViewClass" value="org.eclipse.debug.internal.ui.views.registers.RegistersView"/>
     <persistedState key="originalCompatibilityViewBundle" value="org.eclipse.debug.ui"/>
     <tags>View</tags>
     <tags>categoryTag:Debug</tags>
   </descriptors>
-  <descriptors xmi:id="_JQ-pZ7joEe25NdJK2M4KYw" elementId="org.eclipse.debug.ui.ModuleView" label="Modules" iconURI="platform:/plugin/org.eclipse.debug.ui/icons/full/eview16/module_view.png" tooltip="" allowMultiple="true" category="Debug" closeable="true" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView">
+  <descriptors xmi:id="_Z9sr0KrbEe2-M8nuGout-A" elementId="org.eclipse.debug.ui.ModuleView" label="Modules" iconURI="platform:/plugin/org.eclipse.debug.ui/icons/full/eview16/module_view.png" tooltip="" allowMultiple="true" category="Debug" closeable="true" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView">
     <persistedState key="originalCompatibilityViewClass" value="org.eclipse.debug.internal.ui.views.modules.ModulesView"/>
     <persistedState key="originalCompatibilityViewBundle" value="org.eclipse.debug.ui"/>
     <tags>View</tags>
     <tags>categoryTag:Debug</tags>
   </descriptors>
-  <descriptors xmi:id="_JQ-paLjoEe25NdJK2M4KYw" elementId="org.eclipse.debug.ui.MemoryView" label="Memory" iconURI="platform:/plugin/org.eclipse.debug.ui/icons/full/eview16/memory_view.png" tooltip="" allowMultiple="true" category="Debug" closeable="true" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView">
+  <descriptors xmi:id="_Z9tS4KrbEe2-M8nuGout-A" elementId="org.eclipse.debug.ui.MemoryView" label="Memory" iconURI="platform:/plugin/org.eclipse.debug.ui/icons/full/eview16/memory_view.png" tooltip="" allowMultiple="true" category="Debug" closeable="true" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView">
     <persistedState key="originalCompatibilityViewClass" value="org.eclipse.debug.internal.ui.views.memory.MemoryView"/>
     <persistedState key="originalCompatibilityViewBundle" value="org.eclipse.debug.ui"/>
     <tags>View</tags>
     <tags>categoryTag:Debug</tags>
   </descriptors>
-  <descriptors xmi:id="_JQ-pabjoEe25NdJK2M4KYw" elementId="org.eclipse.debug.ui.launchView" label="Launch Configurations" iconURI="platform:/plugin/org.eclipse.debug.ui.launchview/icons/run_exc.png" tooltip="" category="Debug" closeable="true" contributionURI="bundleclass://org.eclipse.debug.ui.launchview/org.eclipse.debug.ui.launchview.internal.view.LaunchViewImpl">
+  <descriptors xmi:id="_Z9t58KrbEe2-M8nuGout-A" elementId="org.eclipse.debug.ui.launchView" label="Launch Configurations" iconURI="platform:/plugin/org.eclipse.debug.ui.launchview/icons/run_exc.png" tooltip="" category="Debug" closeable="true" contributionURI="bundleclass://org.eclipse.debug.ui.launchview/org.eclipse.debug.ui.launchview.internal.view.LaunchViewImpl">
     <tags>View</tags>
     <tags>categoryTag:Debug</tags>
   </descriptors>
-  <descriptors xmi:id="_JQ-parjoEe25NdJK2M4KYw" elementId="org.eclipse.egit.ui.RepositoriesView" label="Git Repositories" iconURI="platform:/plugin/org.eclipse.egit.ui/icons/eview16/repo_rep.png" tooltip="" category="Git" closeable="true" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView">
+  <descriptors xmi:id="_Z9uhAKrbEe2-M8nuGout-A" elementId="org.eclipse.egit.ui.RepositoriesView" label="Git Repositories" iconURI="platform:/plugin/org.eclipse.egit.ui/icons/eview16/repo_rep.png" tooltip="" category="Git" closeable="true" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView">
     <persistedState key="originalCompatibilityViewClass" value="org.eclipse.egit.ui.internal.repository.RepositoriesView"/>
     <persistedState key="originalCompatibilityViewBundle" value="org.eclipse.egit.ui"/>
     <tags>View</tags>
     <tags>categoryTag:Git</tags>
   </descriptors>
-  <descriptors xmi:id="_JQ-pa7joEe25NdJK2M4KYw" elementId="org.eclipse.egit.ui.StagingView" label="Git Staging" iconURI="platform:/plugin/org.eclipse.egit.ui/icons/eview16/staging.png" tooltip="" category="Git" closeable="true" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView">
+  <descriptors xmi:id="_Z9uhAarbEe2-M8nuGout-A" elementId="org.eclipse.egit.ui.StagingView" label="Git Staging" iconURI="platform:/plugin/org.eclipse.egit.ui/icons/eview16/staging.png" tooltip="" category="Git" closeable="true" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView">
     <persistedState key="originalCompatibilityViewClass" value="org.eclipse.egit.ui.internal.staging.StagingView"/>
     <persistedState key="originalCompatibilityViewBundle" value="org.eclipse.egit.ui"/>
     <tags>View</tags>
     <tags>categoryTag:Git</tags>
   </descriptors>
-  <descriptors xmi:id="_JQ-pbLjoEe25NdJK2M4KYw" elementId="org.eclipse.egit.ui.InteractiveRebaseView" label="Git Interactive Rebase" iconURI="platform:/plugin/org.eclipse.egit.ui/icons/eview16/rebase_interactive.png" tooltip="" category="Git" closeable="true" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView">
+  <descriptors xmi:id="_Z9vIEKrbEe2-M8nuGout-A" elementId="org.eclipse.egit.ui.InteractiveRebaseView" label="Git Interactive Rebase" iconURI="platform:/plugin/org.eclipse.egit.ui/icons/eview16/rebase_interactive.png" tooltip="" category="Git" closeable="true" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView">
     <persistedState key="originalCompatibilityViewClass" value="org.eclipse.egit.ui.internal.rebase.RebaseInteractiveView"/>
     <persistedState key="originalCompatibilityViewBundle" value="org.eclipse.egit.ui"/>
     <tags>View</tags>
     <tags>categoryTag:Git</tags>
   </descriptors>
-  <descriptors xmi:id="_JQ-pbbjoEe25NdJK2M4KYw" elementId="org.eclipse.egit.ui.CompareTreeView" label="Git Tree Compare" iconURI="platform:/plugin/org.eclipse.egit.ui/icons/obj16/gitrepository.png" tooltip="" category="Git" closeable="true" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView">
+  <descriptors xmi:id="_Z9vvIKrbEe2-M8nuGout-A" elementId="org.eclipse.egit.ui.CompareTreeView" label="Git Tree Compare" iconURI="platform:/plugin/org.eclipse.egit.ui/icons/obj16/gitrepository.png" tooltip="" category="Git" closeable="true" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView">
     <persistedState key="originalCompatibilityViewClass" value="org.eclipse.egit.ui.internal.dialogs.CompareTreeView"/>
     <persistedState key="originalCompatibilityViewBundle" value="org.eclipse.egit.ui"/>
     <tags>View</tags>
     <tags>categoryTag:Git</tags>
     <tags>NoRestore</tags>
   </descriptors>
-  <descriptors xmi:id="_JQ-pbrjoEe25NdJK2M4KYw" elementId="org.eclipse.egit.ui.ReflogView" label="Git Reflog" iconURI="platform:/plugin/org.eclipse.egit.ui/icons/eview16/reflog.png" tooltip="" category="Git" closeable="true" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView">
+  <descriptors xmi:id="_Z9wWMKrbEe2-M8nuGout-A" elementId="org.eclipse.egit.ui.ReflogView" label="Git Reflog" iconURI="platform:/plugin/org.eclipse.egit.ui/icons/eview16/reflog.png" tooltip="" category="Git" closeable="true" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView">
     <persistedState key="originalCompatibilityViewClass" value="org.eclipse.egit.ui.internal.reflog.ReflogView"/>
     <persistedState key="originalCompatibilityViewBundle" value="org.eclipse.egit.ui"/>
     <tags>View</tags>
     <tags>categoryTag:Git</tags>
   </descriptors>
-  <descriptors xmi:id="_JQ-pb7joEe25NdJK2M4KYw" elementId="org.eclipse.help.ui.HelpView" label="Help" iconURI="platform:/plugin/org.eclipse.help.ui/icons/view16/help_view.png" tooltip="" category="Help" closeable="true" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView">
+  <descriptors xmi:id="_Z9w9QKrbEe2-M8nuGout-A" elementId="org.eclipse.help.ui.HelpView" label="Help" iconURI="platform:/plugin/org.eclipse.help.ui/icons/view16/help_view.png" tooltip="" category="Help" closeable="true" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView">
     <persistedState key="originalCompatibilityViewClass" value="org.eclipse.help.ui.internal.views.HelpView"/>
     <persistedState key="originalCompatibilityViewBundle" value="org.eclipse.help.ui"/>
     <tags>View</tags>
     <tags>categoryTag:Help</tags>
   </descriptors>
-  <descriptors xmi:id="_JQ-pcLjoEe25NdJK2M4KYw" elementId="org.eclipse.jdt.debug.ui.DisplayView" label="Debug Shell" iconURI="platform:/plugin/org.eclipse.jdt.debug.ui/icons/full/etool16/disp_sbook.png" tooltip="" category="Debug" closeable="true" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView">
+  <descriptors xmi:id="_Z9xkUKrbEe2-M8nuGout-A" elementId="org.eclipse.jdt.debug.ui.DisplayView" label="Debug Shell" iconURI="platform:/plugin/org.eclipse.jdt.debug.ui/icons/full/etool16/disp_sbook.png" tooltip="" category="Debug" closeable="true" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView">
     <persistedState key="originalCompatibilityViewClass" value="org.eclipse.jdt.internal.debug.ui.display.DisplayView"/>
     <persistedState key="originalCompatibilityViewBundle" value="org.eclipse.jdt.debug.ui"/>
     <tags>View</tags>
     <tags>categoryTag:Debug</tags>
   </descriptors>
-  <descriptors xmi:id="_JQ-pcbjoEe25NdJK2M4KYw" elementId="org.eclipse.jdt.junit.ResultView" label="JUnit" iconURI="platform:/plugin/org.eclipse.jdt.junit/icons/full/eview16/junit.png" tooltip="" category="Java" closeable="true" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView">
+  <descriptors xmi:id="_Z90AkKrbEe2-M8nuGout-A" elementId="org.eclipse.jdt.junit.ResultView" label="JUnit" iconURI="platform:/plugin/org.eclipse.jdt.junit/icons/full/eview16/junit.png" tooltip="" category="Java" closeable="true" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView">
     <persistedState key="originalCompatibilityViewClass" value="org.eclipse.jdt.internal.junit.ui.TestRunnerViewPart"/>
     <persistedState key="originalCompatibilityViewBundle" value="org.eclipse.jdt.junit"/>
     <tags>View</tags>
     <tags>categoryTag:Java</tags>
   </descriptors>
-  <descriptors xmi:id="_JQ-pcrjoEe25NdJK2M4KYw" elementId="org.eclipse.jdt.ui.PackageExplorer" label="Package Explorer" iconURI="platform:/plugin/org.eclipse.jdt.ui/icons/full/eview16/package.png" tooltip="" category="Java" closeable="true" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView">
+  <descriptors xmi:id="_Z94SAKrbEe2-M8nuGout-A" elementId="org.eclipse.jdt.ui.PackageExplorer" label="Package Explorer" iconURI="platform:/plugin/org.eclipse.jdt.ui/icons/full/eview16/package.png" tooltip="" category="Java" closeable="true" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView">
     <persistedState key="originalCompatibilityViewClass" value="org.eclipse.jdt.internal.ui.packageview.PackageExplorerPart"/>
     <persistedState key="originalCompatibilityViewBundle" value="org.eclipse.jdt.ui"/>
     <tags>View</tags>
     <tags>categoryTag:Java</tags>
   </descriptors>
-  <descriptors xmi:id="_JQ-pc7joEe25NdJK2M4KYw" elementId="org.eclipse.jdt.ui.TypeHierarchy" label="Type Hierarchy" iconURI="platform:/plugin/org.eclipse.jdt.ui/icons/full/eview16/class_hi.png" tooltip="" category="Java" closeable="true" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView">
+  <descriptors xmi:id="_Z978YKrbEe2-M8nuGout-A" elementId="org.eclipse.jdt.ui.TypeHierarchy" label="Type Hierarchy" iconURI="platform:/plugin/org.eclipse.jdt.ui/icons/full/eview16/class_hi.png" tooltip="" category="Java" closeable="true" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView">
     <persistedState key="originalCompatibilityViewClass" value="org.eclipse.jdt.internal.ui.typehierarchy.TypeHierarchyViewPart"/>
     <persistedState key="originalCompatibilityViewBundle" value="org.eclipse.jdt.ui"/>
     <tags>View</tags>
     <tags>categoryTag:Java</tags>
   </descriptors>
-  <descriptors xmi:id="_JQ-pdLjoEe25NdJK2M4KYw" elementId="org.eclipse.jdt.ui.ProjectsView" label="Projects" iconURI="platform:/plugin/org.eclipse.jdt.ui/icons/full/eview16/projects.png" tooltip="" category="Java Browsing" closeable="true" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView">
+  <descriptors xmi:id="_Z-AN0KrbEe2-M8nuGout-A" elementId="org.eclipse.jdt.ui.ProjectsView" label="Projects" iconURI="platform:/plugin/org.eclipse.jdt.ui/icons/full/eview16/projects.png" tooltip="" category="Java Browsing" closeable="true" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView">
     <persistedState key="originalCompatibilityViewClass" value="org.eclipse.jdt.internal.ui.browsing.ProjectsView"/>
     <persistedState key="originalCompatibilityViewBundle" value="org.eclipse.jdt.ui"/>
     <tags>View</tags>
     <tags>categoryTag:Java Browsing</tags>
   </descriptors>
-  <descriptors xmi:id="_JQ-pdbjoEe25NdJK2M4KYw" elementId="org.eclipse.jdt.ui.PackagesView" label="Packages" iconURI="platform:/plugin/org.eclipse.jdt.ui/icons/full/eview16/packages.png" tooltip="" category="Java Browsing" closeable="true" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView">
+  <descriptors xmi:id="_Z-CDAKrbEe2-M8nuGout-A" elementId="org.eclipse.jdt.ui.PackagesView" label="Packages" iconURI="platform:/plugin/org.eclipse.jdt.ui/icons/full/eview16/packages.png" tooltip="" category="Java Browsing" closeable="true" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView">
     <persistedState key="originalCompatibilityViewClass" value="org.eclipse.jdt.internal.ui.browsing.PackagesView"/>
     <persistedState key="originalCompatibilityViewBundle" value="org.eclipse.jdt.ui"/>
     <tags>View</tags>
     <tags>categoryTag:Java Browsing</tags>
   </descriptors>
-  <descriptors xmi:id="_JQ-pdrjoEe25NdJK2M4KYw" elementId="org.eclipse.jdt.ui.TypesView" label="Types" iconURI="platform:/plugin/org.eclipse.jdt.ui/icons/full/eview16/types.png" tooltip="" category="Java Browsing" closeable="true" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView">
+  <descriptors xmi:id="_Z-D4MKrbEe2-M8nuGout-A" elementId="org.eclipse.jdt.ui.TypesView" label="Types" iconURI="platform:/plugin/org.eclipse.jdt.ui/icons/full/eview16/types.png" tooltip="" category="Java Browsing" closeable="true" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView">
     <persistedState key="originalCompatibilityViewClass" value="org.eclipse.jdt.internal.ui.browsing.TypesView"/>
     <persistedState key="originalCompatibilityViewBundle" value="org.eclipse.jdt.ui"/>
     <tags>View</tags>
     <tags>categoryTag:Java Browsing</tags>
   </descriptors>
-  <descriptors xmi:id="_JQ-pd7joEe25NdJK2M4KYw" elementId="org.eclipse.jdt.ui.MembersView" label="Members" iconURI="platform:/plugin/org.eclipse.jdt.ui/icons/full/eview16/members.png" tooltip="" category="Java Browsing" closeable="true" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView">
+  <descriptors xmi:id="_Z-IJoKrbEe2-M8nuGout-A" elementId="org.eclipse.jdt.ui.MembersView" label="Members" iconURI="platform:/plugin/org.eclipse.jdt.ui/icons/full/eview16/members.png" tooltip="" category="Java Browsing" closeable="true" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView">
     <persistedState key="originalCompatibilityViewClass" value="org.eclipse.jdt.internal.ui.browsing.MembersView"/>
     <persistedState key="originalCompatibilityViewBundle" value="org.eclipse.jdt.ui"/>
     <tags>View</tags>
     <tags>categoryTag:Java Browsing</tags>
   </descriptors>
-  <descriptors xmi:id="_JQ-peLjoEe25NdJK2M4KYw" elementId="org.eclipse.jdt.callhierarchy.view" label="Call Hierarchy" iconURI="platform:/plugin/org.eclipse.jdt.ui/icons/full/eview16/call_hierarchy.png" tooltip="" allowMultiple="true" category="Java" closeable="true" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView">
+  <descriptors xmi:id="_Z-L0AKrbEe2-M8nuGout-A" elementId="org.eclipse.jdt.callhierarchy.view" label="Call Hierarchy" iconURI="platform:/plugin/org.eclipse.jdt.ui/icons/full/eview16/call_hierarchy.png" tooltip="" allowMultiple="true" category="Java" closeable="true" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView">
     <persistedState key="originalCompatibilityViewClass" value="org.eclipse.jdt.internal.ui.callhierarchy.CallHierarchyViewPart"/>
     <persistedState key="originalCompatibilityViewBundle" value="org.eclipse.jdt.ui"/>
     <tags>View</tags>
     <tags>categoryTag:Java</tags>
   </descriptors>
-  <descriptors xmi:id="_JQ-pebjoEe25NdJK2M4KYw" elementId="org.eclipse.ui.texteditor.TemplatesView" label="Templates" iconURI="platform:/plugin/org.eclipse.jdt.ui/icons/full/eview16/templates.png" tooltip="" category="General" closeable="true" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView">
+  <descriptors xmi:id="_Z-MbEKrbEe2-M8nuGout-A" elementId="org.eclipse.ui.texteditor.TemplatesView" label="Templates" iconURI="platform:/plugin/org.eclipse.jdt.ui/icons/full/eview16/templates.png" tooltip="" category="General" closeable="true" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView">
     <persistedState key="originalCompatibilityViewClass" value="org.eclipse.ui.texteditor.templates.TemplatesView"/>
     <persistedState key="originalCompatibilityViewBundle" value="org.eclipse.jdt.ui"/>
     <tags>View</tags>
     <tags>categoryTag:General</tags>
   </descriptors>
-  <descriptors xmi:id="_JQ-perjoEe25NdJK2M4KYw" elementId="org.eclipse.jdt.ui.SourceView" label="Declaration" iconURI="platform:/plugin/org.eclipse.jdt.ui/icons/full/eview16/source.png" tooltip="" category="Java" closeable="true" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView">
+  <descriptors xmi:id="_Z-Tv0KrbEe2-M8nuGout-A" elementId="org.eclipse.jdt.ui.SourceView" label="Declaration" iconURI="platform:/plugin/org.eclipse.jdt.ui/icons/full/eview16/source.png" tooltip="" category="Java" closeable="true" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView">
     <persistedState key="originalCompatibilityViewClass" value="org.eclipse.jdt.internal.ui.infoviews.SourceView"/>
     <persistedState key="originalCompatibilityViewBundle" value="org.eclipse.jdt.ui"/>
     <tags>View</tags>
     <tags>categoryTag:Java</tags>
   </descriptors>
-  <descriptors xmi:id="_JQ-pe7joEe25NdJK2M4KYw" elementId="org.eclipse.jdt.ui.JavadocView" label="Javadoc" iconURI="platform:/plugin/org.eclipse.jdt.ui/icons/full/eview16/javadoc.png" tooltip="" category="Java" closeable="true" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView">
+  <descriptors xmi:id="_Z-WMEKrbEe2-M8nuGout-A" elementId="org.eclipse.jdt.ui.JavadocView" label="Javadoc" iconURI="platform:/plugin/org.eclipse.jdt.ui/icons/full/eview16/javadoc.png" tooltip="" category="Java" closeable="true" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView">
     <persistedState key="originalCompatibilityViewClass" value="org.eclipse.jdt.internal.ui.infoviews.JavadocView"/>
     <persistedState key="originalCompatibilityViewBundle" value="org.eclipse.jdt.ui"/>
     <tags>View</tags>
     <tags>categoryTag:Java</tags>
   </descriptors>
-  <descriptors xmi:id="_JQ-pfLjoEe25NdJK2M4KYw" elementId="org.eclipse.linuxtools.docker.ui.dockerContainersView" label="Docker Containers" iconURI="platform:/plugin/org.eclipse.linuxtools.docker.ui/icons/mock-repository.gif" tooltip="" category="Docker" closeable="true" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView">
+  <descriptors xmi:id="_Z-WzIKrbEe2-M8nuGout-A" elementId="org.eclipse.linuxtools.docker.ui.dockerContainersView" label="Docker Containers" iconURI="platform:/plugin/org.eclipse.linuxtools.docker.ui/icons/mock-repository.gif" tooltip="" category="Docker" closeable="true" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView">
     <persistedState key="originalCompatibilityViewClass" value="org.eclipse.linuxtools.internal.docker.ui.views.DockerContainersView"/>
     <persistedState key="originalCompatibilityViewBundle" value="org.eclipse.linuxtools.docker.ui"/>
     <tags>View</tags>
     <tags>categoryTag:Docker</tags>
   </descriptors>
-  <descriptors xmi:id="_JQ-pfbjoEe25NdJK2M4KYw" elementId="org.eclipse.linuxtools.docker.ui.dockerImagesView" label="Docker Images" iconURI="platform:/plugin/org.eclipse.linuxtools.docker.ui/icons/dbgroup_obj.gif" tooltip="" category="Docker" closeable="true" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView">
+  <descriptors xmi:id="_Z-XaMKrbEe2-M8nuGout-A" elementId="org.eclipse.linuxtools.docker.ui.dockerImagesView" label="Docker Images" iconURI="platform:/plugin/org.eclipse.linuxtools.docker.ui/icons/dbgroup_obj.gif" tooltip="" category="Docker" closeable="true" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView">
     <persistedState key="originalCompatibilityViewClass" value="org.eclipse.linuxtools.internal.docker.ui.views.DockerImagesView"/>
     <persistedState key="originalCompatibilityViewBundle" value="org.eclipse.linuxtools.docker.ui"/>
     <tags>View</tags>
     <tags>categoryTag:Docker</tags>
   </descriptors>
-  <descriptors xmi:id="_JQ-pfrjoEe25NdJK2M4KYw" elementId="org.eclipse.linuxtools.docker.ui.dockerExplorerView" label="Docker Explorer" iconURI="platform:/plugin/org.eclipse.linuxtools.docker.ui/icons/repositories-blue.gif" tooltip="" category="Docker" closeable="true" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView">
+  <descriptors xmi:id="_Z-YBQKrbEe2-M8nuGout-A" elementId="org.eclipse.linuxtools.docker.ui.dockerExplorerView" label="Docker Explorer" iconURI="platform:/plugin/org.eclipse.linuxtools.docker.ui/icons/repositories-blue.gif" tooltip="" category="Docker" closeable="true" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView">
     <persistedState key="originalCompatibilityViewClass" value="org.eclipse.linuxtools.internal.docker.ui.views.DockerExplorerView"/>
     <persistedState key="originalCompatibilityViewBundle" value="org.eclipse.linuxtools.docker.ui"/>
     <tags>View</tags>
     <tags>categoryTag:Docker</tags>
   </descriptors>
-  <descriptors xmi:id="_JQ-pf7joEe25NdJK2M4KYw" elementId="org.eclipse.linuxtools.docker.ui.dockerImageHierarchyView" label="Docker Image Hierarchy" iconURI="platform:/plugin/org.eclipse.linuxtools.docker.ui/icons/class_hi.png" tooltip="" category="Docker" closeable="true" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView">
+  <descriptors xmi:id="_Z-YoUKrbEe2-M8nuGout-A" elementId="org.eclipse.linuxtools.docker.ui.dockerImageHierarchyView" label="Docker Image Hierarchy" iconURI="platform:/plugin/org.eclipse.linuxtools.docker.ui/icons/class_hi.png" tooltip="" category="Docker" closeable="true" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView">
     <persistedState key="originalCompatibilityViewClass" value="org.eclipse.linuxtools.internal.docker.ui.views.DockerImageHierarchyView"/>
     <persistedState key="originalCompatibilityViewBundle" value="org.eclipse.linuxtools.docker.ui"/>
     <tags>View</tags>
     <tags>categoryTag:Docker</tags>
   </descriptors>
-  <descriptors xmi:id="_JQ-pgLjoEe25NdJK2M4KYw" elementId="org.eclipse.m2e.core.views.MavenRepositoryView" label="Maven Repositories" iconURI="platform:/plugin/org.eclipse.m2e.core.ui/icons/maven_indexes.png" tooltip="" category="Maven" closeable="true" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView">
+  <descriptors xmi:id="_Z-ZPYKrbEe2-M8nuGout-A" elementId="org.eclipse.m2e.core.views.MavenRepositoryView" label="Maven Repositories" iconURI="platform:/plugin/org.eclipse.m2e.core.ui/icons/maven_indexes.png" tooltip="" category="Maven" closeable="true" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView">
     <persistedState key="originalCompatibilityViewClass" value="org.eclipse.m2e.core.ui.internal.views.MavenRepositoryView"/>
     <persistedState key="originalCompatibilityViewBundle" value="org.eclipse.m2e.core.ui"/>
     <tags>View</tags>
     <tags>categoryTag:Maven</tags>
   </descriptors>
-  <descriptors xmi:id="_JQ-pgbjoEe25NdJK2M4KYw" elementId="org.eclipse.m2e.core.views.MavenLifecycleMappingsView" label="Maven Lifecycle Mappings" iconURI="platform:/plugin/org.eclipse.m2e.core.ui/icons/main_tab.png" tooltip="" category="Maven" closeable="true" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView">
+  <descriptors xmi:id="_Z-c5wKrbEe2-M8nuGout-A" elementId="org.eclipse.m2e.core.views.MavenLifecycleMappingsView" label="Maven Lifecycle Mappings" iconURI="platform:/plugin/org.eclipse.m2e.core.ui/icons/main_tab.png" tooltip="" category="Maven" closeable="true" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView">
     <persistedState key="originalCompatibilityViewClass" value="org.eclipse.m2e.core.ui.internal.views.MavenLifecycleMappingsView"/>
     <persistedState key="originalCompatibilityViewBundle" value="org.eclipse.m2e.core.ui"/>
     <tags>View</tags>
     <tags>categoryTag:Maven</tags>
   </descriptors>
-  <descriptors xmi:id="_JQ-pgrjoEe25NdJK2M4KYw" elementId="org.eclipse.m2e.core.views.MavenBuild" label="Maven Workspace Build" iconURI="platform:/plugin/org.eclipse.ui/icons/full/eview16/defaultview_misc.png" tooltip="" category="Maven" closeable="true" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView">
+  <descriptors xmi:id="_Z-eH4KrbEe2-M8nuGout-A" elementId="org.eclipse.m2e.core.views.MavenBuild" label="Maven Workspace Build" iconURI="platform:/plugin/org.eclipse.ui/icons/full/eview16/defaultview_misc.png" tooltip="" category="Maven" closeable="true" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView">
     <persistedState key="originalCompatibilityViewClass" value="org.eclipse.m2e.core.ui.internal.views.build.BuildDebugView"/>
     <persistedState key="originalCompatibilityViewBundle" value="org.eclipse.m2e.core.ui"/>
     <tags>View</tags>
     <tags>categoryTag:Maven</tags>
   </descriptors>
-  <descriptors xmi:id="_JQ-pg7joEe25NdJK2M4KYw" elementId="org.eclipse.pde.api.tools.ui.views.apitooling.views.apitoolingview" label="API Tools" iconURI="platform:/plugin/org.eclipse.pde.api.tools.ui/icons/full/obj16/api_tools.png" tooltip="" category="API Tools" closeable="true" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView">
+  <descriptors xmi:id="_Z-fWAKrbEe2-M8nuGout-A" elementId="org.eclipse.pde.api.tools.ui.views.apitooling.views.apitoolingview" label="API Tools" iconURI="platform:/plugin/org.eclipse.pde.api.tools.ui/icons/full/obj16/api_tools.png" tooltip="" category="API Tools" closeable="true" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView">
     <persistedState key="originalCompatibilityViewClass" value="org.eclipse.pde.api.tools.ui.internal.views.APIToolingView"/>
     <persistedState key="originalCompatibilityViewBundle" value="org.eclipse.pde.api.tools.ui"/>
     <tags>View</tags>
     <tags>categoryTag:API Tools</tags>
   </descriptors>
-  <descriptors xmi:id="_JQ-phLjoEe25NdJK2M4KYw" elementId="org.eclipse.pde.runtime.RegistryBrowser" label="Plug-in Registry" iconURI="platform:/plugin/org.eclipse.pde.runtime/icons/eview16/registry.png" tooltip="" category="Plug-in Development" closeable="true" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView">
+  <descriptors xmi:id="_Z-hyQKrbEe2-M8nuGout-A" elementId="org.eclipse.pde.runtime.RegistryBrowser" label="Plug-in Registry" iconURI="platform:/plugin/org.eclipse.pde.runtime/icons/eview16/registry.png" tooltip="" category="Plug-in Development" closeable="true" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView">
     <persistedState key="originalCompatibilityViewClass" value="org.eclipse.pde.internal.runtime.registry.RegistryBrowser"/>
     <persistedState key="originalCompatibilityViewBundle" value="org.eclipse.pde.runtime"/>
     <tags>View</tags>
     <tags>categoryTag:Plug-in Development</tags>
   </descriptors>
-  <descriptors xmi:id="_JQ-phbjoEe25NdJK2M4KYw" elementId="org.eclipse.pde.ui.PluginsView" label="Plug-ins" iconURI="platform:/plugin/org.eclipse.pde.ui/icons/eview16/plugin_depend.png" tooltip="" category="Plug-in Development" closeable="true" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView">
+  <descriptors xmi:id="_Z-iZUKrbEe2-M8nuGout-A" elementId="org.eclipse.pde.ui.PluginsView" label="Plug-ins" iconURI="platform:/plugin/org.eclipse.pde.ui/icons/eview16/plugin_depend.png" tooltip="" category="Plug-in Development" closeable="true" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView">
     <persistedState key="originalCompatibilityViewClass" value="org.eclipse.pde.internal.ui.views.plugins.PluginsView"/>
     <persistedState key="originalCompatibilityViewBundle" value="org.eclipse.pde.ui"/>
     <tags>View</tags>
     <tags>categoryTag:Plug-in Development</tags>
   </descriptors>
-  <descriptors xmi:id="_JQ-phrjoEe25NdJK2M4KYw" elementId="org.eclipse.pde.ui.FeaturesView" label="Features" iconURI="platform:/plugin/org.eclipse.pde.ui/icons/obj16/feature_obj.png" tooltip="" category="Plug-in Development" closeable="true" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView">
+  <descriptors xmi:id="_Z-jncKrbEe2-M8nuGout-A" elementId="org.eclipse.pde.ui.FeaturesView" label="Features" iconURI="platform:/plugin/org.eclipse.pde.ui/icons/obj16/feature_obj.png" tooltip="" category="Plug-in Development" closeable="true" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView">
     <persistedState key="originalCompatibilityViewClass" value="org.eclipse.pde.internal.ui.views.features.FeaturesView"/>
     <persistedState key="originalCompatibilityViewBundle" value="org.eclipse.pde.ui"/>
     <tags>View</tags>
     <tags>categoryTag:Plug-in Development</tags>
   </descriptors>
-  <descriptors xmi:id="_JQ-ph7joEe25NdJK2M4KYw" elementId="org.eclipse.pde.ui.DependenciesView" label="Plug-in Dependencies" iconURI="platform:/plugin/org.eclipse.pde.ui/icons/obj16/req_plugins_obj.png" tooltip="" category="Plug-in Development" closeable="true" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView">
+  <descriptors xmi:id="_Z-of8KrbEe2-M8nuGout-A" elementId="org.eclipse.pde.ui.DependenciesView" label="Plug-in Dependencies" iconURI="platform:/plugin/org.eclipse.pde.ui/icons/obj16/req_plugins_obj.png" tooltip="" category="Plug-in Development" closeable="true" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView">
     <persistedState key="originalCompatibilityViewClass" value="org.eclipse.pde.internal.ui.views.dependencies.DependenciesView"/>
     <persistedState key="originalCompatibilityViewBundle" value="org.eclipse.pde.ui"/>
     <tags>View</tags>
     <tags>categoryTag:Plug-in Development</tags>
   </descriptors>
-  <descriptors xmi:id="_JQ-piLjoEe25NdJK2M4KYw" elementId="org.eclipse.pde.ui.TargetPlatformState" label="Target Platform State" iconURI="platform:/plugin/org.eclipse.pde.ui/icons/obj16/target_profile_xml_obj.png" tooltip="" category="Plug-in Development" closeable="true" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView">
+  <descriptors xmi:id="_Z-sKUKrbEe2-M8nuGout-A" elementId="org.eclipse.pde.ui.TargetPlatformState" label="Target Platform State" iconURI="platform:/plugin/org.eclipse.pde.ui/icons/obj16/target_profile_xml_obj.png" tooltip="" category="Plug-in Development" closeable="true" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView">
     <persistedState key="originalCompatibilityViewClass" value="org.eclipse.pde.internal.ui.views.target.TargetStateView"/>
     <persistedState key="originalCompatibilityViewBundle" value="org.eclipse.pde.ui"/>
     <tags>View</tags>
     <tags>categoryTag:Plug-in Development</tags>
   </descriptors>
-  <descriptors xmi:id="_JQ-pibjoEe25NdJK2M4KYw" elementId="org.eclipse.pde.ui.ImageBrowserView" label="Plug-in Image Browser" iconURI="platform:/plugin/org.eclipse.pde.ui/icons/obj16/psearch_obj.png" tooltip="" category="Plug-in Development" closeable="true" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView">
+  <descriptors xmi:id="_Z-tYcKrbEe2-M8nuGout-A" elementId="org.eclipse.pde.ui.ImageBrowserView" label="Plug-in Image Browser" iconURI="platform:/plugin/org.eclipse.pde.ui/icons/obj16/psearch_obj.png" tooltip="" category="Plug-in Development" closeable="true" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView">
     <persistedState key="originalCompatibilityViewClass" value="org.eclipse.pde.internal.ui.views.imagebrowser.ImageBrowserView"/>
     <persistedState key="originalCompatibilityViewBundle" value="org.eclipse.pde.ui"/>
     <tags>View</tags>
     <tags>categoryTag:Plug-in Development</tags>
   </descriptors>
-  <descriptors xmi:id="_JQ-pirjoEe25NdJK2M4KYw" elementId="org.eclipse.search.ui.views.SearchView" label="Search" iconURI="platform:/plugin/org.eclipse.search/icons/full/eview16/searchres.png" tooltip="" allowMultiple="true" category="General" closeable="true" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView">
+  <descriptors xmi:id="_Z-t_gKrbEe2-M8nuGout-A" elementId="org.eclipse.search.ui.views.SearchView" label="Search" iconURI="platform:/plugin/org.eclipse.search/icons/full/eview16/searchres.png" tooltip="" allowMultiple="true" category="General" closeable="true" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView">
     <persistedState key="originalCompatibilityViewClass" value="org.eclipse.search2.internal.ui.SearchView"/>
     <persistedState key="originalCompatibilityViewBundle" value="org.eclipse.search"/>
     <tags>View</tags>
     <tags>categoryTag:General</tags>
   </descriptors>
-  <descriptors xmi:id="_JQ-pi7joEe25NdJK2M4KYw" elementId="org.eclipse.team.sync.views.SynchronizeView" label="Synchronize" iconURI="platform:/plugin/org.eclipse.team.ui/icons/full/eview16/synch_synch.png" tooltip="" allowMultiple="true" category="Version Control (Team)" closeable="true" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView">
+  <descriptors xmi:id="_Z-wbwKrbEe2-M8nuGout-A" elementId="org.eclipse.team.sync.views.SynchronizeView" label="Synchronize" iconURI="platform:/plugin/org.eclipse.team.ui/icons/full/eview16/synch_synch.png" tooltip="" allowMultiple="true" category="Version Control (Team)" closeable="true" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView">
     <persistedState key="originalCompatibilityViewClass" value="org.eclipse.team.internal.ui.synchronize.SynchronizeView"/>
     <persistedState key="originalCompatibilityViewBundle" value="org.eclipse.team.ui"/>
     <tags>View</tags>
     <tags>categoryTag:Version Control (Team)</tags>
   </descriptors>
-  <descriptors xmi:id="_JQ-pjLjoEe25NdJK2M4KYw" elementId="org.eclipse.team.ui.GenericHistoryView" label="History" iconURI="platform:/plugin/org.eclipse.team.ui/icons/full/eview16/history_view.png" tooltip="" allowMultiple="true" category="Version Control (Team)" closeable="true" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView">
+  <descriptors xmi:id="_Z-xp4KrbEe2-M8nuGout-A" elementId="org.eclipse.team.ui.GenericHistoryView" label="History" iconURI="platform:/plugin/org.eclipse.team.ui/icons/full/eview16/history_view.png" tooltip="" allowMultiple="true" category="Version Control (Team)" closeable="true" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView">
     <persistedState key="originalCompatibilityViewClass" value="org.eclipse.team.internal.ui.history.GenericHistoryView"/>
     <persistedState key="originalCompatibilityViewBundle" value="org.eclipse.team.ui"/>
     <tags>View</tags>
     <tags>categoryTag:Version Control (Team)</tags>
   </descriptors>
-  <descriptors xmi:id="_JQ-pjbjoEe25NdJK2M4KYw" elementId="org.eclipse.tips.ide.tipPart" label="Tip of the Day" iconURI="platform:/plugin/org.eclipse.tips.ui/icons/lightbulb.png" tooltip="" category="Help" closeable="true" contributionURI="bundleclass://org.eclipse.tips.ide/org.eclipse.tips.ide.internal.TipPart">
+  <descriptors xmi:id="_Z-1UQKrbEe2-M8nuGout-A" elementId="org.eclipse.tips.ide.tipPart" label="Tip of the Day" iconURI="platform:/plugin/org.eclipse.tips.ui/icons/lightbulb.png" tooltip="" category="Help" closeable="true" contributionURI="bundleclass://org.eclipse.tips.ide/org.eclipse.tips.ide.internal.TipPart">
     <tags>View</tags>
     <tags>categoryTag:Help</tags>
   </descriptors>
-  <descriptors xmi:id="_JQ-pjrjoEe25NdJK2M4KYw" elementId="org.eclipse.tm.terminal.view.ui.TerminalsView" label="Terminal" iconURI="platform:/plugin/org.eclipse.tm.terminal.view.ui/icons/eview16/terminal_view.gif" tooltip="" allowMultiple="true" category="Terminal" closeable="true" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView">
+  <descriptors xmi:id="_Z-2iYKrbEe2-M8nuGout-A" elementId="org.eclipse.tm.terminal.view.ui.TerminalsView" label="Terminal" iconURI="platform:/plugin/org.eclipse.tm.terminal.view.ui/icons/eview16/terminal_view.gif" tooltip="" allowMultiple="true" category="Terminal" closeable="true" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView">
     <persistedState key="originalCompatibilityViewClass" value="org.eclipse.tm.terminal.view.ui.view.TerminalsView"/>
     <persistedState key="originalCompatibilityViewBundle" value="org.eclipse.tm.terminal.view.ui"/>
     <tags>View</tags>
     <tags>categoryTag:Terminal</tags>
   </descriptors>
-  <descriptors xmi:id="_JQ-pj7joEe25NdJK2M4KYw" elementId="org.eclipse.tcf.te.ui.terminals.TerminalsView" label="Terminals (Old)" iconURI="platform:/plugin/org.eclipse.tm.terminal.view.ui/icons/eview16/terminal_view.gif" tooltip="" allowMultiple="true" category="Other" closeable="true" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView">
+  <descriptors xmi:id="_Z-3JcKrbEe2-M8nuGout-A" elementId="org.eclipse.tcf.te.ui.terminals.TerminalsView" label="Terminals (Old)" iconURI="platform:/plugin/org.eclipse.tm.terminal.view.ui/icons/eview16/terminal_view.gif" tooltip="" allowMultiple="true" category="Other" closeable="true" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView">
     <persistedState key="originalCompatibilityViewClass" value="org.eclipse.tm.terminal.view.ui.view.OldTerminalsViewHandler"/>
     <persistedState key="originalCompatibilityViewBundle" value="org.eclipse.tm.terminal.view.ui"/>
     <tags>View</tags>
     <tags>categoryTag:Other</tags>
   </descriptors>
-  <descriptors xmi:id="_JQ-pkLjoEe25NdJK2M4KYw" elementId="org.eclipse.ui.internal.introview" label="Welcome" iconURI="platform:/plugin/org.eclipse.ui/icons/full/eview16/defaultview_misc.png" tooltip="" category="General" closeable="true" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView">
+  <descriptors xmi:id="_Z-3JcarbEe2-M8nuGout-A" elementId="org.eclipse.ui.internal.introview" label="Welcome" iconURI="platform:/plugin/org.eclipse.ui/icons/full/eview16/defaultview_misc.png" tooltip="" category="General" closeable="true" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView">
     <persistedState key="originalCompatibilityViewClass" value="org.eclipse.ui.internal.ViewIntroAdapterPart"/>
     <persistedState key="originalCompatibilityViewBundle" value="org.eclipse.ui"/>
     <tags>View</tags>
     <tags>categoryTag:General</tags>
   </descriptors>
-  <descriptors xmi:id="_JQ-pkbjoEe25NdJK2M4KYw" elementId="org.eclipse.ui.browser.view" label="Internal Web Browser" iconURI="platform:/plugin/org.eclipse.ui.browser/icons/obj16/internal_browser.png" tooltip="" allowMultiple="true" category="General" closeable="true" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView">
+  <descriptors xmi:id="_Z-3wgKrbEe2-M8nuGout-A" elementId="org.eclipse.ui.browser.view" label="Internal Web Browser" iconURI="platform:/plugin/org.eclipse.ui.browser/icons/obj16/internal_browser.png" tooltip="" allowMultiple="true" category="General" closeable="true" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView">
     <persistedState key="originalCompatibilityViewClass" value="org.eclipse.ui.internal.browser.WebBrowserView"/>
     <persistedState key="originalCompatibilityViewBundle" value="org.eclipse.ui.browser"/>
     <tags>View</tags>
     <tags>categoryTag:General</tags>
   </descriptors>
-  <descriptors xmi:id="_JQ-pkrjoEe25NdJK2M4KYw" elementId="org.eclipse.ui.cheatsheets.views.CheatSheetView" label="Cheat Sheets" iconURI="platform:/plugin/org.eclipse.ui.cheatsheets/icons/view16/cheatsheet_view.png" tooltip="" category="Help" closeable="true" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView">
+  <descriptors xmi:id="_Z-6MwKrbEe2-M8nuGout-A" elementId="org.eclipse.ui.cheatsheets.views.CheatSheetView" label="Cheat Sheets" iconURI="platform:/plugin/org.eclipse.ui.cheatsheets/icons/view16/cheatsheet_view.png" tooltip="" category="Help" closeable="true" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView">
     <persistedState key="originalCompatibilityViewClass" value="org.eclipse.ui.internal.cheatsheets.views.CheatSheetView"/>
     <persistedState key="originalCompatibilityViewBundle" value="org.eclipse.ui.cheatsheets"/>
     <tags>View</tags>
     <tags>categoryTag:Help</tags>
   </descriptors>
-  <descriptors xmi:id="_JQ-pk7joEe25NdJK2M4KYw" elementId="org.eclipse.ui.console.ConsoleView" label="Console" iconURI="platform:/plugin/org.eclipse.ui.console/icons/full/cview16/console_view.png" tooltip="" allowMultiple="true" category="General" closeable="true" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView">
+  <descriptors xmi:id="_Z-8pAKrbEe2-M8nuGout-A" elementId="org.eclipse.ui.console.ConsoleView" label="Console" iconURI="platform:/plugin/org.eclipse.ui.console/icons/full/cview16/console_view.png" tooltip="" allowMultiple="true" category="General" closeable="true" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView">
     <persistedState key="originalCompatibilityViewClass" value="org.eclipse.ui.internal.console.ConsoleView"/>
     <persistedState key="originalCompatibilityViewBundle" value="org.eclipse.ui.console"/>
     <tags>View</tags>
     <tags>categoryTag:General</tags>
   </descriptors>
-  <descriptors xmi:id="_JQ-plLjoEe25NdJK2M4KYw" elementId="org.eclipse.ui.views.ProgressView" label="Progress" iconURI="platform:/plugin/org.eclipse.ui.ide/icons/full/eview16/pview.png" tooltip="" category="General" closeable="true" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView">
+  <descriptors xmi:id="_Z-_FQKrbEe2-M8nuGout-A" elementId="org.eclipse.ui.views.ProgressView" label="Progress" iconURI="platform:/plugin/org.eclipse.ui.ide/icons/full/eview16/pview.png" tooltip="" category="General" closeable="true" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView">
     <persistedState key="originalCompatibilityViewClass" value="org.eclipse.ui.internal.progress.ProgressView"/>
     <persistedState key="originalCompatibilityViewBundle" value="org.eclipse.ui.ide"/>
     <tags>View</tags>
     <tags>categoryTag:General</tags>
   </descriptors>
-  <descriptors xmi:id="_JQ-plbjoEe25NdJK2M4KYw" elementId="org.eclipse.ui.views.ResourceNavigator" label="Navigator (Deprecated)" iconURI="platform:/plugin/org.eclipse.ui.ide/icons/full/eview16/filenav_nav.png" tooltip="" category="General" closeable="true" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView">
+  <descriptors xmi:id="_Z-_sUKrbEe2-M8nuGout-A" elementId="org.eclipse.ui.views.ResourceNavigator" label="Navigator (Deprecated)" iconURI="platform:/plugin/org.eclipse.ui.ide/icons/full/eview16/filenav_nav.png" tooltip="" category="General" closeable="true" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView">
     <persistedState key="originalCompatibilityViewClass" value="org.eclipse.ui.views.navigator.ResourceNavigator"/>
     <persistedState key="originalCompatibilityViewBundle" value="org.eclipse.ui.ide"/>
     <tags>View</tags>
     <tags>categoryTag:General</tags>
   </descriptors>
-  <descriptors xmi:id="_JQ-plrjoEe25NdJK2M4KYw" elementId="org.eclipse.ui.views.BookmarkView" label="Bookmarks" iconURI="platform:/plugin/org.eclipse.ui.ide/icons/full/eview16/bkmrk_nav.png" tooltip="" allowMultiple="true" category="General" closeable="true" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView">
+  <descriptors xmi:id="_Z-_sUarbEe2-M8nuGout-A" elementId="org.eclipse.ui.views.BookmarkView" label="Bookmarks" iconURI="platform:/plugin/org.eclipse.ui.ide/icons/full/eview16/bkmrk_nav.png" tooltip="" allowMultiple="true" category="General" closeable="true" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView">
     <persistedState key="originalCompatibilityViewClass" value="org.eclipse.ui.internal.views.markers.BookmarksView"/>
     <persistedState key="originalCompatibilityViewBundle" value="org.eclipse.ui.ide"/>
     <tags>View</tags>
     <tags>categoryTag:General</tags>
   </descriptors>
-  <descriptors xmi:id="_JQ-pl7joEe25NdJK2M4KYw" elementId="org.eclipse.ui.views.TaskList" label="Tasks" iconURI="platform:/plugin/org.eclipse.ui.ide/icons/full/eview16/tasks_tsk.png" tooltip="" allowMultiple="true" category="General" closeable="true" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView">
+  <descriptors xmi:id="_Z_ATYKrbEe2-M8nuGout-A" elementId="org.eclipse.ui.views.TaskList" label="Tasks" iconURI="platform:/plugin/org.eclipse.ui.ide/icons/full/eview16/tasks_tsk.png" tooltip="" allowMultiple="true" category="General" closeable="true" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView">
     <persistedState key="originalCompatibilityViewClass" value="org.eclipse.ui.internal.views.markers.TasksView"/>
     <persistedState key="originalCompatibilityViewBundle" value="org.eclipse.ui.ide"/>
     <tags>View</tags>
     <tags>categoryTag:General</tags>
   </descriptors>
-  <descriptors xmi:id="_JQ-pmLjoEe25NdJK2M4KYw" elementId="org.eclipse.ui.views.ProblemView" label="Problems" iconURI="platform:/plugin/org.eclipse.ui.ide/icons/full/eview16/problems_view.png" tooltip="" allowMultiple="true" category="General" closeable="true" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView">
+  <descriptors xmi:id="_Z_ATYarbEe2-M8nuGout-A" elementId="org.eclipse.ui.views.ProblemView" label="Problems" iconURI="platform:/plugin/org.eclipse.ui.ide/icons/full/eview16/problems_view.png" tooltip="" allowMultiple="true" category="General" closeable="true" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView">
     <persistedState key="originalCompatibilityViewClass" value="org.eclipse.ui.internal.views.markers.ProblemsView"/>
     <persistedState key="originalCompatibilityViewBundle" value="org.eclipse.ui.ide"/>
     <tags>View</tags>
     <tags>categoryTag:General</tags>
   </descriptors>
-  <descriptors xmi:id="_JQ-pmbjoEe25NdJK2M4KYw" elementId="org.eclipse.ui.views.AllMarkersView" label="Markers" iconURI="platform:/plugin/org.eclipse.ui.ide/icons/full/eview16/problems_view.png" tooltip="" allowMultiple="true" category="General" closeable="true" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView">
+  <descriptors xmi:id="_Z_A6cKrbEe2-M8nuGout-A" elementId="org.eclipse.ui.views.AllMarkersView" label="Markers" iconURI="platform:/plugin/org.eclipse.ui.ide/icons/full/eview16/problems_view.png" tooltip="" allowMultiple="true" category="General" closeable="true" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView">
     <persistedState key="originalCompatibilityViewClass" value="org.eclipse.ui.internal.views.markers.AllMarkersView"/>
     <persistedState key="originalCompatibilityViewBundle" value="org.eclipse.ui.ide"/>
     <tags>View</tags>
     <tags>categoryTag:General</tags>
   </descriptors>
-  <descriptors xmi:id="_JQ-pmrjoEe25NdJK2M4KYw" elementId="org.eclipse.ui.navigator.ProjectExplorer" label="Project Explorer" iconURI="platform:/plugin/org.eclipse.ui.navigator.resources/icons/full/eview16/resource_persp.png" tooltip="" category="General" closeable="true" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView">
+  <descriptors xmi:id="_Z_A6carbEe2-M8nuGout-A" elementId="org.eclipse.ui.navigator.ProjectExplorer" label="Project Explorer" iconURI="platform:/plugin/org.eclipse.ui.navigator.resources/icons/full/eview16/resource_persp.png" tooltip="" category="General" closeable="true" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView">
     <persistedState key="originalCompatibilityViewClass" value="org.eclipse.ui.navigator.resources.ProjectExplorer"/>
     <persistedState key="originalCompatibilityViewBundle" value="org.eclipse.ui.navigator.resources"/>
     <tags>View</tags>
     <tags>categoryTag:General</tags>
   </descriptors>
-  <descriptors xmi:id="_JQ-pm7joEe25NdJK2M4KYw" elementId="org.eclipse.ui.views.PropertySheet" label="Properties" iconURI="platform:/plugin/org.eclipse.ui.views/icons/full/eview16/prop_ps.png" tooltip="" allowMultiple="true" category="General" closeable="true" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView">
+  <descriptors xmi:id="_Z_BhgKrbEe2-M8nuGout-A" elementId="org.eclipse.ui.views.PropertySheet" label="Properties" iconURI="platform:/plugin/org.eclipse.ui.views/icons/full/eview16/prop_ps.png" tooltip="" allowMultiple="true" category="General" closeable="true" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView">
     <persistedState key="originalCompatibilityViewClass" value="org.eclipse.ui.views.properties.PropertySheet"/>
     <persistedState key="originalCompatibilityViewBundle" value="org.eclipse.ui.views"/>
     <tags>View</tags>
     <tags>categoryTag:General</tags>
   </descriptors>
-  <descriptors xmi:id="_JQ-pnLjoEe25NdJK2M4KYw" elementId="org.eclipse.ui.views.ContentOutline" label="Outline" iconURI="platform:/plugin/org.eclipse.ui.views/icons/full/eview16/outline_co.png" tooltip="" category="General" closeable="true" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView">
+  <descriptors xmi:id="_Z_CIkKrbEe2-M8nuGout-A" elementId="org.eclipse.ui.views.ContentOutline" label="Outline" iconURI="platform:/plugin/org.eclipse.ui.views/icons/full/eview16/outline_co.png" tooltip="" category="General" closeable="true" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView">
     <persistedState key="originalCompatibilityViewClass" value="org.eclipse.ui.views.contentoutline.ContentOutline"/>
     <persistedState key="originalCompatibilityViewBundle" value="org.eclipse.ui.views"/>
     <tags>View</tags>
     <tags>categoryTag:General</tags>
   </descriptors>
-  <descriptors xmi:id="_JQ-pnbjoEe25NdJK2M4KYw" elementId="org.eclipse.pde.runtime.LogView" label="Error Log" iconURI="platform:/plugin/org.eclipse.ui.views.log/icons/eview16/error_log.png" tooltip="" category="General" closeable="true" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView">
+  <descriptors xmi:id="_Z_D9wKrbEe2-M8nuGout-A" elementId="org.eclipse.pde.runtime.LogView" label="Error Log" iconURI="platform:/plugin/org.eclipse.ui.views.log/icons/eview16/error_log.png" tooltip="" category="General" closeable="true" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView">
     <persistedState key="originalCompatibilityViewClass" value="org.eclipse.ui.internal.views.log.LogView"/>
     <persistedState key="originalCompatibilityViewBundle" value="org.eclipse.ui.views.log"/>
     <tags>View</tags>
     <tags>categoryTag:General</tags>
   </descriptors>
-  <descriptors xmi:id="_JQ-pnrjoEe25NdJK2M4KYw" elementId="org.eclipse.ui.views.minimap.MinimapView" label="Minimap" iconURI="platform:/plugin/org.eclipse.ui.workbench.texteditor/icons/full/eview16/minimap.png" tooltip="" category="General" closeable="true" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView">
+  <descriptors xmi:id="_Z_HoIKrbEe2-M8nuGout-A" elementId="org.eclipse.ui.views.minimap.MinimapView" label="Minimap" iconURI="platform:/plugin/org.eclipse.ui.workbench.texteditor/icons/full/eview16/minimap.png" tooltip="" category="General" closeable="true" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView">
     <persistedState key="originalCompatibilityViewClass" value="org.eclipse.ui.internal.views.minimap.MinimapView"/>
     <persistedState key="originalCompatibilityViewBundle" value="org.eclipse.ui.workbench.texteditor"/>
     <tags>View</tags>
     <tags>categoryTag:General</tags>
   </descriptors>
-  <descriptors xmi:id="_JQ-pn7joEe25NdJK2M4KYw" elementId="org.eclipse.wst.internet.monitor.view" label="TCP/IP Monitor" iconURI="platform:/plugin/org.eclipse.wst.internet.monitor.ui/icons/cview16/monitorView.gif" tooltip="" category="Debug" closeable="true" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView">
+  <descriptors xmi:id="_Z_IPMKrbEe2-M8nuGout-A" elementId="org.eclipse.wst.internet.monitor.view" label="TCP/IP Monitor" iconURI="platform:/plugin/org.eclipse.wst.internet.monitor.ui/icons/cview16/monitorView.gif" tooltip="" category="Debug" closeable="true" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView">
     <persistedState key="originalCompatibilityViewClass" value="org.eclipse.wst.internet.monitor.ui.internal.view.MonitorView"/>
     <persistedState key="originalCompatibilityViewBundle" value="org.eclipse.wst.internet.monitor.ui"/>
     <tags>View</tags>
     <tags>categoryTag:Debug</tags>
   </descriptors>
-  <descriptors xmi:id="_JQ-poLjoEe25NdJK2M4KYw" elementId="org.eclipse.wst.server.ui.ServersView" label="Servers" iconURI="platform:/plugin/org.eclipse.wst.server.ui/icons/cview16/servers_view.gif" tooltip="" category="Server" closeable="true" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView">
+  <descriptors xmi:id="_Z_JdUKrbEe2-M8nuGout-A" elementId="org.eclipse.wst.server.ui.ServersView" label="Servers" iconURI="platform:/plugin/org.eclipse.wst.server.ui/icons/cview16/servers_view.gif" tooltip="" category="Server" closeable="true" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView">
     <persistedState key="originalCompatibilityViewClass" value="org.eclipse.wst.server.ui.internal.cnf.ServersView2"/>
     <persistedState key="originalCompatibilityViewBundle" value="org.eclipse.wst.server.ui"/>
     <tags>View</tags>
     <tags>categoryTag:Server</tags>
   </descriptors>
-  <descriptors xmi:id="_JQ-pobjoEe25NdJK2M4KYw" elementId="org.springframework.ide.eclipse.boot.dash.views.BootDashView" label="Boot Dashboard" iconURI="platform:/plugin/org.springframework.ide.eclipse.boot.dash/icons/boot-icon.png" tooltip="" category="Other" closeable="true" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView">
+  <descriptors xmi:id="_Z_KEYKrbEe2-M8nuGout-A" elementId="org.springframework.ide.eclipse.boot.dash.views.BootDashView" label="Boot Dashboard" iconURI="platform:/plugin/org.springframework.ide.eclipse.boot.dash/icons/boot-icon.png" tooltip="" category="Other" closeable="true" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView">
     <persistedState key="originalCompatibilityViewClass" value="org.springframework.ide.eclipse.boot.dash.views.BootDashTreeView"/>
     <persistedState key="originalCompatibilityViewBundle" value="org.springframework.ide.eclipse.boot.dash"/>
     <tags>View</tags>
     <tags>categoryTag:Other</tags>
   </descriptors>
-  <descriptors xmi:id="_JQ-porjoEe25NdJK2M4KYw" elementId="org.springframework.tooling.ls.eclipse.gotosymbol.view.SpringSymbolsView" label="Spring Symbols" iconURI="platform:/plugin/org.springframework.tooling.ls.eclipse.gotosymbol/icons/boot-icon.png" tooltip="" category="Other" closeable="true" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView">
+  <descriptors xmi:id="_Z_KrcKrbEe2-M8nuGout-A" elementId="org.springframework.tooling.ls.eclipse.gotosymbol.view.SpringSymbolsView" label="Spring Symbols" iconURI="platform:/plugin/org.springframework.tooling.ls.eclipse.gotosymbol/icons/boot-icon.png" tooltip="" category="Other" closeable="true" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView">
     <persistedState key="originalCompatibilityViewClass" value="org.springframework.tooling.ls.eclipse.gotosymbol.view.SpringSymbolsView"/>
     <persistedState key="originalCompatibilityViewBundle" value="org.springframework.tooling.ls.eclipse.gotosymbol"/>
     <tags>View</tags>
     <tags>categoryTag:Other</tags>
   </descriptors>
-  <descriptors xmi:id="_JQ-po7joEe25NdJK2M4KYw" elementId="com.genuitec.eclipse.icons.designer.ui.views.IconsDesignerView" label="Icon Designer" iconURI="platform:/plugin/com.genuitec.eclipse.theming.icon.designer/icons/icons-designer-view.png" tooltip="" category="DevStyle" closeable="true" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView">
+  <descriptors xmi:id="_Z_LSgKrbEe2-M8nuGout-A" elementId="com.genuitec.eclipse.icons.designer.ui.views.IconsDesignerView" label="Icon Designer" iconURI="platform:/plugin/com.genuitec.eclipse.theming.icon.designer/icons/icons-designer-view.png" tooltip="" category="DevStyle" closeable="true" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView">
     <persistedState key="originalCompatibilityViewClass" value="com.genuitec.eclipse.theming.icon.designer.views.IconsDesignerView"/>
     <persistedState key="originalCompatibilityViewBundle" value="com.genuitec.eclipse.theming.icon.designer"/>
     <tags>View</tags>
     <tags>categoryTag:DevStyle</tags>
   </descriptors>
-  <descriptors xmi:id="_JQ-ppLjoEe25NdJK2M4KYw" elementId="org.eclipse.gef.ui.palette_view" label="Palette" iconURI="platform:/plugin/org.eclipse.gef/icons/palette_view.gif" tooltip="" category="General" closeable="true" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView">
+  <descriptors xmi:id="_wcquwKxFEe2VqJFWjEAUdQ" elementId="org.eclipse.gef.ui.palette_view" label="Palette" iconURI="platform:/plugin/org.eclipse.gef/icons/palette_view.gif" tooltip="" category="General" closeable="true" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView">
     <persistedState key="originalCompatibilityViewClass" value="org.eclipse.gef.ui.views.palette.PaletteView"/>
     <persistedState key="originalCompatibilityViewBundle" value="org.eclipse.gef"/>
     <tags>View</tags>
     <tags>categoryTag:General</tags>
   </descriptors>
-  <descriptors xmi:id="_JQ-ppbjoEe25NdJK2M4KYw" elementId="org.eclipse.wst.common.snippets.internal.ui.SnippetsView" label="Snippets" iconURI="platform:/plugin/org.eclipse.wst.common.snippets/icons/snippets_view.gif" tooltip="" category="General" closeable="true" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView">
+  <descriptors xmi:id="_wctLAKxFEe2VqJFWjEAUdQ" elementId="org.eclipse.wst.common.snippets.internal.ui.SnippetsView" label="Snippets" iconURI="platform:/plugin/org.eclipse.wst.common.snippets/icons/snippets_view.gif" tooltip="" category="General" closeable="true" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView">
     <persistedState key="originalCompatibilityViewClass" value="org.eclipse.wst.common.snippets.internal.ui.SnippetsView"/>
     <persistedState key="originalCompatibilityViewBundle" value="org.eclipse.wst.common.snippets"/>
     <tags>View</tags>
     <tags>categoryTag:General</tags>
   </descriptors>
-  <descriptors xmi:id="_JQ-pprjoEe25NdJK2M4KYw" elementId="org.eclipse.wst.jsdt.callhierarchy.view" label="Call Hierarchy" iconURI="platform:/plugin/org.eclipse.wst.jsdt.ui/icons/full/eview16/call_hierarchy.gif" tooltip="" category="Other" closeable="true" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView">
+  <descriptors xmi:id="_wcuZIKxFEe2VqJFWjEAUdQ" elementId="org.eclipse.wst.jsdt.callhierarchy.view" label="Call Hierarchy" iconURI="platform:/plugin/org.eclipse.wst.jsdt.ui/icons/full/eview16/call_hierarchy.gif" tooltip="" category="Other" closeable="true" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView">
     <persistedState key="originalCompatibilityViewClass" value="org.eclipse.wst.jsdt.internal.ui.callhierarchy.CallHierarchyViewPart"/>
     <persistedState key="originalCompatibilityViewBundle" value="org.eclipse.wst.jsdt.ui"/>
     <tags>View</tags>
     <tags>categoryTag:Other</tags>
   </descriptors>
-  <descriptors xmi:id="_JQ-pp7joEe25NdJK2M4KYw" elementId="org.eclipse.wst.jsdt.ui.SourceView" label="Declaration" iconURI="platform:/plugin/org.eclipse.wst.jsdt.ui/icons/full/eview16/source.gif" tooltip="" category="Other" closeable="true" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView">
+  <descriptors xmi:id="_wcwOUKxFEe2VqJFWjEAUdQ" elementId="org.eclipse.wst.jsdt.ui.SourceView" label="Declaration" iconURI="platform:/plugin/org.eclipse.wst.jsdt.ui/icons/full/eview16/source.gif" tooltip="" category="Other" closeable="true" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView">
     <persistedState key="originalCompatibilityViewClass" value="org.eclipse.wst.jsdt.internal.ui.infoviews.SourceView"/>
     <persistedState key="originalCompatibilityViewBundle" value="org.eclipse.wst.jsdt.ui"/>
     <tags>View</tags>
     <tags>categoryTag:Other</tags>
   </descriptors>
-  <descriptors xmi:id="_JQ-pqLjoEe25NdJK2M4KYw" elementId="org.eclipse.wst.jsdt.ui.JavadocView" label="Documentation" iconURI="platform:/plugin/org.eclipse.wst.jsdt.ui/icons/full/eview16/javadoc.gif" tooltip="JavaScript Documentation" category="Other" closeable="true" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView">
+  <descriptors xmi:id="_wcxccKxFEe2VqJFWjEAUdQ" elementId="org.eclipse.wst.jsdt.ui.JavadocView" label="Documentation" iconURI="platform:/plugin/org.eclipse.wst.jsdt.ui/icons/full/eview16/javadoc.gif" tooltip="JavaScript Documentation" category="Other" closeable="true" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView">
     <persistedState key="originalCompatibilityViewClass" value="org.eclipse.wst.jsdt.internal.ui.infoviews.JavadocView"/>
     <persistedState key="originalCompatibilityViewBundle" value="org.eclipse.wst.jsdt.ui"/>
     <tags>View</tags>
     <tags>categoryTag:Other</tags>
   </descriptors>
-  <descriptors xmi:id="_JQ-pqbjoEe25NdJK2M4KYw" elementId="org.eclipse.wst.xml.ui.views.annotations.XMLAnnotationsView" label="Documentation" iconURI="platform:/plugin/org.eclipse.wst.xml.ui/icons/full/obj16/comment_obj.gif" tooltip="" category="XML" closeable="true" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView">
+  <descriptors xmi:id="_wcyqkKxFEe2VqJFWjEAUdQ" elementId="org.eclipse.wst.xml.ui.views.annotations.XMLAnnotationsView" label="Documentation" iconURI="platform:/plugin/org.eclipse.wst.xml.ui/icons/full/obj16/comment_obj.gif" tooltip="" category="XML" closeable="true" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView">
     <persistedState key="originalCompatibilityViewClass" value="org.eclipse.wst.xml.ui.internal.views.annotations.XMLAnnotationsView"/>
     <persistedState key="originalCompatibilityViewBundle" value="org.eclipse.wst.xml.ui"/>
     <tags>View</tags>
     <tags>categoryTag:XML</tags>
   </descriptors>
-  <descriptors xmi:id="_JQ-pqrjoEe25NdJK2M4KYw" elementId="org.eclipse.wst.xml.ui.contentmodel.view" label="Content Model" iconURI="platform:/plugin/org.eclipse.wst.xml.ui/icons/full/view16/hierarchy.gif" tooltip="" category="XML" closeable="true" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView">
+  <descriptors xmi:id="_wc0fwKxFEe2VqJFWjEAUdQ" elementId="org.eclipse.wst.xml.ui.contentmodel.view" label="Content Model" iconURI="platform:/plugin/org.eclipse.wst.xml.ui/icons/full/view16/hierarchy.gif" tooltip="" category="XML" closeable="true" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView">
     <persistedState key="originalCompatibilityViewClass" value="org.eclipse.wst.xml.ui.internal.views.contentmodel.ContentModelView"/>
     <persistedState key="originalCompatibilityViewBundle" value="org.eclipse.wst.xml.ui"/>
     <tags>View</tags>
     <tags>categoryTag:XML</tags>
   </descriptors>
-  <trimContributions xmi:id="_JQ_2l7joEe25NdJK2M4KYw" elementId="org.eclipse.ui.ide.application.trimcontribution.QuickAccess" contributorURI="platform:/plugin/org.eclipse.ui.ide.application" toBeRendered="false" parentId="org.eclipse.ui.main.toolbar" positionInParent="last">
-    <children xsi:type="menu:ToolControl" xmi:id="_JQ_2mLjoEe25NdJK2M4KYw" elementId="Spacer Glue" contributorURI="platform:/plugin/org.eclipse.ui.ide.application" contributionURI="bundleclass://org.eclipse.e4.ui.workbench.renderers.swt/org.eclipse.e4.ui.workbench.renderers.swt.LayoutModifierToolControl">
+  <trimContributions xmi:id="_2r10UF9tEeO-yojH_y4TJA" elementId="org.eclipse.ui.ide.application.trimcontribution.QuickAccess" contributorURI="platform:/plugin/org.eclipse.ui.ide.application" toBeRendered="false" parentId="org.eclipse.ui.main.toolbar" positionInParent="last">
+    <children xsi:type="menu:ToolControl" xmi:id="_76uUAF9tEeO-yojH_y4TJA" elementId="Spacer Glue" contributorURI="platform:/plugin/org.eclipse.ui.ide.application" contributionURI="bundleclass://org.eclipse.e4.ui.workbench.renderers.swt/org.eclipse.e4.ui.workbench.renderers.swt.LayoutModifierToolControl">
       <tags>glue</tags>
       <tags>move_after:PerspectiveSpacer</tags>
       <tags>SHOW_RESTORE_MENU</tags>
     </children>
-    <children xsi:type="menu:ToolControl" xmi:id="_JQ_2mbjoEe25NdJK2M4KYw" elementId="SearchField" contributorURI="platform:/plugin/org.eclipse.ui.ide.application" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.quickaccess.SearchField">
+    <children xsi:type="menu:ToolControl" xmi:id="_8tJPcF9tEeO-yojH_y4TJA" elementId="SearchField" contributorURI="platform:/plugin/org.eclipse.ui.ide.application" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.quickaccess.SearchField">
       <tags>move_after:Spacer Glue</tags>
       <tags>HIDEABLE</tags>
       <tags>SHOW_RESTORE_MENU</tags>
     </children>
-    <children xsi:type="menu:ToolControl" xmi:id="_JQ_2mrjoEe25NdJK2M4KYw" elementId="Search-PS Glue" contributorURI="platform:/plugin/org.eclipse.ui.ide.application" contributionURI="bundleclass://org.eclipse.e4.ui.workbench.renderers.swt/org.eclipse.e4.ui.workbench.renderers.swt.LayoutModifierToolControl">
+    <children xsi:type="menu:ToolControl" xmi:id="_9LgmcF9tEeO-yojH_y4TJA" elementId="Search-PS Glue" contributorURI="platform:/plugin/org.eclipse.ui.ide.application" contributionURI="bundleclass://org.eclipse.e4.ui.workbench.renderers.swt/org.eclipse.e4.ui.workbench.renderers.swt.LayoutModifierToolControl">
       <tags>glue</tags>
       <tags>move_after:SearchField</tags>
       <tags>SHOW_RESTORE_MENU</tags>
     </children>
   </trimContributions>
-  <commands xmi:id="_JQ_2qbjoEe25NdJK2M4KYw" elementId="org.eclipse.jdt.ui.correction.inlineLocal.assist" commandName="Quick Assist - Inline local variable" description="Invokes quick assist and selects 'Inline local variable'" category="_JQ_7GLjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_2qrjoEe25NdJK2M4KYw" elementId="org.eclipse.ui.edit.text.select.pageUp" commandName="Select Page Up" description="Select to the top of the page" category="_JQ_7ALjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_2q7joEe25NdJK2M4KYw" elementId="org.eclipse.ui.edit.text.toggleWordWrap" commandName="Toggle Word Wrap" description="Toggle word wrap in the current text editor" category="_JQ_6-7joEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_2rLjoEe25NdJK2M4KYw" elementId="org.eclipse.egit.ui.history.ResetQuickdiffBaseline" commandName="Reset quickdiff baseline" category="_JQ_7G7joEe25NdJK2M4KYw">
-    <parameters xmi:id="_JQ_2rbjoEe25NdJK2M4KYw" elementId="org.eclipse.egit.ui.history.ResetQuickdiffBaselineTarget" name="Reset target (HEAD, HEAD^1)" optional="false"/>
+  <commands xmi:id="_ZGR7oKrbEe2-M8nuGout-A" elementId="org.eclipse.jdt.ui.correction.inlineLocal.assist" commandName="Quick Assist - Inline local variable" description="Invokes quick assist and selects 'Inline local variable'" category="_ZGO4carbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGR7oarbEe2-M8nuGout-A" elementId="org.eclipse.ui.edit.text.select.pageUp" commandName="Select Page Up" description="Select to the top of the page" category="_ZGO4WarbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGR7oqrbEe2-M8nuGout-A" elementId="org.eclipse.ui.edit.text.toggleWordWrap" commandName="Toggle Word Wrap" description="Toggle word wrap in the current text editor" category="_ZGO4VKrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGTJwKrbEe2-M8nuGout-A" elementId="org.eclipse.egit.ui.history.ResetQuickdiffBaseline" commandName="Reset quickdiff baseline" category="_ZGO4dKrbEe2-M8nuGout-A">
+    <parameters xmi:id="_ZGTJwarbEe2-M8nuGout-A" elementId="org.eclipse.egit.ui.history.ResetQuickdiffBaselineTarget" name="Reset target (HEAD, HEAD^1)" optional="false"/>
   </commands>
-  <commands xmi:id="_JQ_2rrjoEe25NdJK2M4KYw" elementId="org.eclipse.jdt.ui.correction.convertLocalToField.assist" commandName="Quick Assist - Convert local variable to field" description="Invokes quick assist and selects 'Convert local variable to field'" category="_JQ_7GLjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_2r7joEe25NdJK2M4KYw" elementId="org.eclipse.jdt.ui.correction.addThrowsDecl" commandName="Quick Fix - Add throws declaration" description="Invokes quick assist and selects 'Add throws declaration'" category="_JQ_7GLjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_2sLjoEe25NdJK2M4KYw" elementId="org.eclipse.egit.ui.FetchGitLabMergeRequest" commandName="Fetch GitLab Merge Request" category="_JQ_7FLjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_2sbjoEe25NdJK2M4KYw" elementId="org.eclipse.linuxtools.docker.ui.commands.startContainers" commandName="&amp;Start" description="Start the selected containers" category="_JQ_7G7joEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_2srjoEe25NdJK2M4KYw" elementId="org.eclipse.tm.terminal.maximize" commandName="Maximize Active View or Editor" category="_JQ_7ELjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_2s7joEe25NdJK2M4KYw" elementId="org.eclipse.ui.edit.text.deletePreviousWord" commandName="Delete Previous Word" description="Delete the previous word" category="_JQ_7ALjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_2tLjoEe25NdJK2M4KYw" elementId="org.eclipse.jdt.ui.edit.text.java.search.declarations.in.workspace" commandName="Declaration in Workspace" description="Search for declarations of the selected element in the workspace" category="_JQ_7EbjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_2tbjoEe25NdJK2M4KYw" elementId="org.eclipse.ui.edit.text.select.stopMultiSelection" commandName="End multi-selection" description="Unselects all multi-selections returning to a single cursor " category="_JQ_7ALjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_2trjoEe25NdJK2M4KYw" elementId="org.eclipse.ui.edit.text.delimiter.unix" commandName="Convert Line Delimiters to Unix (LF, \n, 0A, &#xb6;)" description="Converts the line delimiters to Unix (LF, \n, 0A, &#xb6;)" category="_JQ_7BbjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_2t7joEe25NdJK2M4KYw" elementId="org.eclipse.jdt.ui.edit.text.java.search.read.access.in.working.set" commandName="Read Access in Working Set" description="Search for read references to the selected element in a working set" category="_JQ_7EbjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_2uLjoEe25NdJK2M4KYw" elementId="org.eclipse.egit.ui.history.Edit" commandName="Edit Commit" category="_JQ_7G7joEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_2ubjoEe25NdJK2M4KYw" elementId="org.eclipse.epp.mpc.ui.command.showMarketplaceWizard" commandName="Eclipse Marketplace" description="Show the Eclipse Marketplace wizard" category="_JQ_7G7joEe25NdJK2M4KYw">
-    <parameters xmi:id="_JQ_2urjoEe25NdJK2M4KYw" elementId="trigger" name="trigger"/>
+  <commands xmi:id="_ZGTJwqrbEe2-M8nuGout-A" elementId="org.eclipse.jdt.ui.correction.convertLocalToField.assist" commandName="Quick Assist - Convert local variable to field" description="Invokes quick assist and selects 'Convert local variable to field'" category="_ZGO4carbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGTJw6rbEe2-M8nuGout-A" elementId="org.eclipse.jdt.ui.correction.addThrowsDecl" commandName="Quick Fix - Add throws declaration" description="Invokes quick assist and selects 'Add throws declaration'" category="_ZGO4carbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGTJxKrbEe2-M8nuGout-A" elementId="org.eclipse.egit.ui.FetchGitLabMergeRequest" commandName="Fetch GitLab Merge Request" category="_ZGO4barbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGTJxarbEe2-M8nuGout-A" elementId="org.eclipse.linuxtools.docker.ui.commands.startContainers" commandName="&amp;Start" description="Start the selected containers" category="_ZGO4dKrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGTJxqrbEe2-M8nuGout-A" elementId="org.eclipse.tm.terminal.maximize" commandName="Maximize Active View or Editor" category="_ZGO4aarbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGTJx6rbEe2-M8nuGout-A" elementId="org.eclipse.ui.edit.text.deletePreviousWord" commandName="Delete Previous Word" description="Delete the previous word" category="_ZGO4WarbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGTJyKrbEe2-M8nuGout-A" elementId="org.eclipse.jdt.ui.edit.text.java.search.declarations.in.workspace" commandName="Declaration in Workspace" description="Search for declarations of the selected element in the workspace" category="_ZGO4aqrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGTJyarbEe2-M8nuGout-A" elementId="org.eclipse.ui.edit.text.select.stopMultiSelection" commandName="End multi-selection" description="Unselects all multi-selections returning to a single cursor " category="_ZGO4WarbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGTJyqrbEe2-M8nuGout-A" elementId="org.eclipse.ui.edit.text.delimiter.unix" commandName="Convert Line Delimiters to Unix (LF, \n, 0A, &#xb6;)" description="Converts the line delimiters to Unix (LF, \n, 0A, &#xb6;)" category="_ZGO4XqrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGTJy6rbEe2-M8nuGout-A" elementId="org.eclipse.jdt.ui.edit.text.java.search.read.access.in.working.set" commandName="Read Access in Working Set" description="Search for read references to the selected element in a working set" category="_ZGO4aqrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGTw0KrbEe2-M8nuGout-A" elementId="org.eclipse.egit.ui.history.Edit" commandName="Edit Commit" category="_ZGO4dKrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGTw0arbEe2-M8nuGout-A" elementId="org.eclipse.epp.mpc.ui.command.showMarketplaceWizard" commandName="Eclipse Marketplace" description="Show the Eclipse Marketplace wizard" category="_ZGO4dKrbEe2-M8nuGout-A">
+    <parameters xmi:id="_ZGTw0qrbEe2-M8nuGout-A" elementId="trigger" name="trigger"/>
   </commands>
-  <commands xmi:id="_JQ_2u7joEe25NdJK2M4KYw" elementId="org.eclipse.egit.gitflow.ui.command.hotfixPublish" commandName="Publish Hotfix" category="_JQ_7FLjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_2vLjoEe25NdJK2M4KYw" elementId="org.eclipse.ant.ui.toggleMarkOccurrences" commandName="Toggle Ant Mark Occurrences" description="Toggles mark occurrences in Ant editors" category="_JQ_7GLjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_2vbjoEe25NdJK2M4KYw" elementId="org.eclipse.ui.navigate.addToWorkingSet" commandName="Add to Working Set" description="Adds the selected object to a working set." category="_JQ_6-7joEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_2vrjoEe25NdJK2M4KYw" elementId="org.springframework.tooling.boot.ls.ToggleComment" commandName="Toggle Comment" category="_JQ_7DLjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_2v7joEe25NdJK2M4KYw" elementId="org.eclipse.egit.ui.team.Revert" commandName="Revert Commit" category="_JQ_7FLjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_2wLjoEe25NdJK2M4KYw" elementId="org.eclipse.jdt.junit.junitShortcut.debug" commandName="Debug JUnit Test" description="Debug JUnit Test" category="_JQ_7ErjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_2wbjoEe25NdJK2M4KYw" elementId="org.eclipse.mylyn.wikitext.ui.editor.showCheatSheetCommand" commandName="Show Markup Cheat Sheet" category="_JQ_7G7joEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_2wrjoEe25NdJK2M4KYw" elementId="org.eclipse.team.ui.TeamSynchronizingPerspective" commandName="Team Synchronizing" description="Open the Team Synchronizing Perspective" category="_JQ_7FbjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_2w7joEe25NdJK2M4KYw" elementId="org.eclipse.ant.ui.open.declaration.command" commandName="Open Declaration" description="Opens the Ant editor on the referenced element" category="_JQ_7GLjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_2xLjoEe25NdJK2M4KYw" elementId="org.eclipse.linuxtools.docker.ui.commands.editConnection" commandName="Edit..." category="_JQ_7G7joEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_2xbjoEe25NdJK2M4KYw" elementId="org.eclipse.tm4e.languageconfiguration.toggleLineCommentCommand" commandName="Toggle Line Comment" category="_JQ_6-rjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_2xrjoEe25NdJK2M4KYw" elementId="org.eclipse.epp.mpc.ui.command.showInstalled" commandName="Manage installed plug-ins" description="Update or uninstall plug-ins installed from the Marketplace" category="_JQ_7G7joEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_2x7joEe25NdJK2M4KYw" elementId="org.eclipse.jdt.ui.edit.text.java.create.delegate.methods" commandName="Generate Delegate Methods" description="Add delegate methods for a type's fields" category="_JQ_7GLjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_2yLjoEe25NdJK2M4KYw" elementId="org.eclipse.debug.ui.commands.ToggleLineBreakpoint" commandName="Toggle Line Breakpoint" description="Creates or removes a line breakpoint" category="_JQ_7ErjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_2ybjoEe25NdJK2M4KYw" elementId="org.eclipse.jdt.ui.correction.addImport" commandName="Quick Fix - Add import" description="Invokes quick assist and selects 'Add import'" category="_JQ_7GLjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_2yrjoEe25NdJK2M4KYw" elementId="org.eclipse.egit.ui.commit.UnifiedDiffCommand" commandName="Show Unified Diff" category="_JQ_7G7joEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_2y7joEe25NdJK2M4KYw" elementId="org.eclipse.ui.edit.move" commandName="Move..." description="Move the selected item" category="_JQ_7BbjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_2zLjoEe25NdJK2M4KYw" elementId="org.eclipse.jdt.ui.refactor.migrate.jar" commandName="Migrate JAR File" description="Migrate a JAR File to a new version" category="_JQ_7CrjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_2zbjoEe25NdJK2M4KYw" elementId="org.eclipse.compare.ignoreWhiteSpace" commandName="Ignore White Space" description="Ignore white space where applicable" category="_JQ_7B7joEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_2zrjoEe25NdJK2M4KYw" elementId="org.eclipse.jdt.ui.edit.text.java.generate.constructor.using.fields" commandName="Generate Constructor using Fields" description="Choose fields to initialize and constructor from superclass to call " category="_JQ_7GLjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_2z7joEe25NdJK2M4KYw" elementId="org.eclipse.egit.gitflow.ui.command.featurePublish" commandName="Publish Feature" category="_JQ_7FLjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_20LjoEe25NdJK2M4KYw" elementId="org.eclipse.jdt.ui.commands.showElementInTypeHierarchyView" commandName="Show Java Element Type Hierarchy" description="Show a Java element in the Type Hierarchy view" category="_JQ_7AbjoEe25NdJK2M4KYw">
-    <parameters xmi:id="_JQ_20bjoEe25NdJK2M4KYw" elementId="elementRef" name="Java element reference" typeId="org.eclipse.jdt.ui.commands.javaElementReference" optional="false"/>
+  <commands xmi:id="_ZGTw06rbEe2-M8nuGout-A" elementId="org.eclipse.egit.gitflow.ui.command.hotfixPublish" commandName="Publish Hotfix" category="_ZGO4barbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGTw1KrbEe2-M8nuGout-A" elementId="org.eclipse.ant.ui.toggleMarkOccurrences" commandName="Toggle Ant Mark Occurrences" description="Toggles mark occurrences in Ant editors" category="_ZGO4carbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGTw1arbEe2-M8nuGout-A" elementId="org.eclipse.ui.navigate.addToWorkingSet" commandName="Add to Working Set" description="Adds the selected object to a working set." category="_ZGO4VKrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGTw1qrbEe2-M8nuGout-A" elementId="org.springframework.tooling.boot.ls.ToggleComment" commandName="Toggle Comment" category="_ZGO4ZarbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGTw16rbEe2-M8nuGout-A" elementId="org.eclipse.egit.ui.team.Revert" commandName="Revert Commit" category="_ZGO4barbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGTw2KrbEe2-M8nuGout-A" elementId="org.eclipse.jdt.junit.junitShortcut.debug" commandName="Debug JUnit Test" description="Debug JUnit Test" category="_ZGO4a6rbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGTw2arbEe2-M8nuGout-A" elementId="org.eclipse.mylyn.wikitext.ui.editor.showCheatSheetCommand" commandName="Show Markup Cheat Sheet" category="_ZGO4dKrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGTw2qrbEe2-M8nuGout-A" elementId="org.eclipse.team.ui.TeamSynchronizingPerspective" commandName="Team Synchronizing" description="Open the Team Synchronizing Perspective" category="_ZGO4bqrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGTw26rbEe2-M8nuGout-A" elementId="org.eclipse.ant.ui.open.declaration.command" commandName="Open Declaration" description="Opens the Ant editor on the referenced element" category="_ZGO4carbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGTw3KrbEe2-M8nuGout-A" elementId="org.eclipse.linuxtools.docker.ui.commands.editConnection" commandName="Edit..." category="_ZGO4dKrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGTw3arbEe2-M8nuGout-A" elementId="org.eclipse.tm4e.languageconfiguration.toggleLineCommentCommand" commandName="Toggle Line Comment" category="_ZGO4U6rbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGTw3qrbEe2-M8nuGout-A" elementId="org.eclipse.epp.mpc.ui.command.showInstalled" commandName="Manage installed plug-ins" description="Update or uninstall plug-ins installed from the Marketplace" category="_ZGO4dKrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGTw36rbEe2-M8nuGout-A" elementId="org.eclipse.jdt.ui.edit.text.java.create.delegate.methods" commandName="Generate Delegate Methods" description="Add delegate methods for a type's fields" category="_ZGO4carbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGTw4KrbEe2-M8nuGout-A" elementId="org.eclipse.debug.ui.commands.ToggleLineBreakpoint" commandName="Toggle Line Breakpoint" description="Creates or removes a line breakpoint" category="_ZGO4a6rbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGTw4arbEe2-M8nuGout-A" elementId="org.eclipse.jdt.ui.correction.addImport" commandName="Quick Fix - Add import" description="Invokes quick assist and selects 'Add import'" category="_ZGO4carbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGTw4qrbEe2-M8nuGout-A" elementId="org.eclipse.egit.ui.commit.UnifiedDiffCommand" commandName="Show Unified Diff" category="_ZGO4dKrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGTw46rbEe2-M8nuGout-A" elementId="org.eclipse.ui.edit.move" commandName="Move..." description="Move the selected item" category="_ZGO4XqrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGTw5KrbEe2-M8nuGout-A" elementId="org.eclipse.jdt.ui.refactor.migrate.jar" commandName="Migrate JAR File" description="Migrate a JAR File to a new version" category="_ZGO4Y6rbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGTw5arbEe2-M8nuGout-A" elementId="org.eclipse.compare.ignoreWhiteSpace" commandName="Ignore White Space" description="Ignore white space where applicable" category="_ZGO4YKrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGTw5qrbEe2-M8nuGout-A" elementId="org.eclipse.jdt.ui.edit.text.java.generate.constructor.using.fields" commandName="Generate Constructor using Fields" description="Choose fields to initialize and constructor from superclass to call " category="_ZGO4carbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGTw56rbEe2-M8nuGout-A" elementId="org.eclipse.egit.gitflow.ui.command.featurePublish" commandName="Publish Feature" category="_ZGO4barbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGTw6KrbEe2-M8nuGout-A" elementId="org.eclipse.jdt.ui.commands.showElementInTypeHierarchyView" commandName="Show Java Element Type Hierarchy" description="Show a Java element in the Type Hierarchy view" category="_ZGO4WqrbEe2-M8nuGout-A">
+    <parameters xmi:id="_ZGTw6arbEe2-M8nuGout-A" elementId="elementRef" name="Java element reference" typeId="org.eclipse.jdt.ui.commands.javaElementReference" optional="false"/>
   </commands>
-  <commands xmi:id="_JQ_20rjoEe25NdJK2M4KYw" elementId="org.eclipse.ui.navigate.goToResource" commandName="Go to Resource" description="Go to a particular resource in the active view" category="_JQ_7AbjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_207joEe25NdJK2M4KYw" elementId="org.eclipse.jdt.ui.edit.text.java.open.super.implementation" commandName="Open Super Implementation" description="Open the Implementation in the Super Type" category="_JQ_7AbjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_21LjoEe25NdJK2M4KYw" elementId="org.eclipse.ui.window.resetPerspective" commandName="Reset Perspective" description="Reset the current perspective to its default state" category="_JQ_7CbjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_21bjoEe25NdJK2M4KYw" elementId="org.eclipse.mylyn.wikitext.ui.quickOutlineCommand" commandName="Quick Outline" description="Open a popup dialog with a quick outline of the current document" category="_JQ_7AbjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_21rjoEe25NdJK2M4KYw" elementId="AnsiConsole.command.enable_disable" commandName="Enable / Disable ANSI Support" description="Enable / disable ANSI Support" category="_JQ_7ArjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_217joEe25NdJK2M4KYw" elementId="org.eclipse.ui.project.buildLast" commandName="Repeat Working Set Build" description="Repeat the last working set build" category="_JQ_7DbjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_22LjoEe25NdJK2M4KYw" elementId="org.eclipse.ui.project.buildProject" commandName="Build Project" description="Build the selected project" category="_JQ_7DbjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_22bjoEe25NdJK2M4KYw" elementId="org.eclipse.compare.switchLeftAndRight" commandName="Swap Left and Right View" description="Switch the left and right sides in the compare editor" category="_JQ_7B7joEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_22rjoEe25NdJK2M4KYw" elementId="org.eclipse.ui.edit.text.goto.textStart" commandName="Text Start" description="Go to the beginning of the text" category="_JQ_7ALjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_227joEe25NdJK2M4KYw" elementId="org.eclipse.ui.edit.paste" commandName="Paste" description="Paste from the clipboard" category="_JQ_6-7joEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_23LjoEe25NdJK2M4KYw" elementId="org.eclipse.egit.gitflow.ui.command.featureCheckout" commandName="Check Out Feature" category="_JQ_7FLjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_23bjoEe25NdJK2M4KYw" elementId="org.eclipse.jdt.debug.ui.javaAppletShortcut.run" commandName="Run Java Applet" description="Run Java Applet" category="_JQ_7ErjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_23rjoEe25NdJK2M4KYw" elementId="org.eclipse.ui.navigate.previous" commandName="Previous" description="Navigate to the previous item" category="_JQ_7AbjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_237joEe25NdJK2M4KYw" elementId="org.eclipse.egit.ui.team.clean" commandName="Clean..." category="_JQ_7FLjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_24LjoEe25NdJK2M4KYw" elementId="org.eclipse.ui.edit.rename" commandName="Rename" description="Rename the selected item" category="_JQ_7BbjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_24bjoEe25NdJK2M4KYw" elementId="org.eclipse.ui.project.buildAll" commandName="Build All" description="Build all projects" category="_JQ_7DbjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_24rjoEe25NdJK2M4KYw" elementId="org.eclipse.egit.ui.history.OpenInTextEditorCommand" commandName="Open in Text Editor" category="_JQ_7G7joEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_247joEe25NdJK2M4KYw" elementId="org.eclipse.jdt.debug.ui.commands.ToggleLambdaEntryBreakpoint" commandName="Toggle &amp;Lambda Entry Breakpoint" description="Creates or removes a lambda entry breakpoint  " category="_JQ_7ErjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_25LjoEe25NdJK2M4KYw" elementId="org.eclipse.ui.edit.text.cut.line.to.beginning" commandName="Cut to Beginning of Line" description="Cut to the beginning of a line of text" category="_JQ_7ALjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_25bjoEe25NdJK2M4KYw" elementId="org.eclipse.buildship.ui.commands.runtasks" commandName="Run Gradle Tasks" description="Runs all the selected Gradle tasks" category="_JQ_7ErjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_25rjoEe25NdJK2M4KYw" elementId="org.eclipse.jdt.ui.edit.text.java.toggleBreadcrumb" commandName="Toggle Java Editor Breadcrumb" description="Toggle the Java editor breadcrumb" category="_JQ_7GLjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_257joEe25NdJK2M4KYw" elementId="org.eclipse.ui.editors.revisions.rendering.cycle" commandName="Cycle Revision Coloring Mode" description="Cycles through the available coloring modes for revisions" category="_JQ_7ALjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_26LjoEe25NdJK2M4KYw" elementId="org.eclipse.ant.ui.renameInFile" commandName="Rename In File" description="Renames all references within the same buildfile" category="_JQ_7GLjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_26bjoEe25NdJK2M4KYw" elementId="org.eclipse.jdt.ui.edit.text.java.open.type.hierarchy" commandName="Open Type Hierarchy" description="Open a type hierarchy on the selected element" category="_JQ_7AbjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_26rjoEe25NdJK2M4KYw" elementId="org.eclipse.jdt.ui.edit.text.java.extract.interface" commandName="Extract Interface" description="Extract a set of members into a new interface and try to use the new interface" category="_JQ_7CrjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_267joEe25NdJK2M4KYw" elementId="org.eclipse.ltk.ui.refactoring.commands.moveResources" commandName="Move Resources" description="Move the selected resources and notify LTK participants." category="_JQ_7FrjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_27LjoEe25NdJK2M4KYw" elementId="org.eclipse.m2e.actions.LifeCycleGenerateSources.run" commandName="Run Maven Generate Sources" description="Run Maven Generate Sources" category="_JQ_7ErjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_27bjoEe25NdJK2M4KYw" elementId="org.eclipse.linuxtools.docker.ui.commands.copytocontainer" commandName="Copy to Container" description="Copy local files to a running Container" category="_JQ_7G7joEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_27rjoEe25NdJK2M4KYw" elementId="org.eclipse.debug.ui.commands.StepInto" commandName="Step Into" description="Step into" category="_JQ_7ErjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_277joEe25NdJK2M4KYw" elementId="org.eclipse.e4.ui.importer.openDirectory" commandName="Open Projects from File System..." category="_JQ_7G7joEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_28LjoEe25NdJK2M4KYw" elementId="org.eclipse.wst.sse.ui.structure.select.previous" commandName="Select Previous Element" description="Expand selection to include previous sibling" category="_JQ_6-7joEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_28bjoEe25NdJK2M4KYw" elementId="org.eclipse.jdt.debug.ui.commands.AddExceptionBreakpoint" commandName="Add Java Exception Breakpoint" description="Add a Java exception breakpoint" category="_JQ_7ErjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_28rjoEe25NdJK2M4KYw" elementId="org.eclipse.jdt.ui.edit.text.java.open.call.hierarchy" commandName="Open Call Hierarchy" description="Open a call hierarchy on the selected element" category="_JQ_7AbjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_287joEe25NdJK2M4KYw" elementId="org.eclipse.egit.ui.RepositoriesViewClearCredentials" commandName="Clear Credentials" category="_JQ_7FLjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_29LjoEe25NdJK2M4KYw" elementId="org.eclipse.jdt.debug.ui.commands.ToggleTracepoint" commandName="Toggle Tracepoint" description="Creates or removes a tracepoint" category="_JQ_7ErjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_29bjoEe25NdJK2M4KYw" elementId="org.eclipse.mylyn.wikitext.ui.convertToMarkupCommand" commandName="Generate Markup" category="_JQ_7G7joEe25NdJK2M4KYw">
-    <parameters xmi:id="_JQ_29rjoEe25NdJK2M4KYw" elementId="org.eclipse.mylyn.wikitext.ui.targetLanguage" name="TargetLanguage" optional="false"/>
+  <commands xmi:id="_ZGTw6qrbEe2-M8nuGout-A" elementId="org.eclipse.ui.navigate.goToResource" commandName="Go to Resource" description="Go to a particular resource in the active view" category="_ZGO4WqrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGTw66rbEe2-M8nuGout-A" elementId="org.eclipse.jdt.ui.edit.text.java.open.super.implementation" commandName="Open Super Implementation" description="Open the Implementation in the Super Type" category="_ZGO4WqrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGTw7KrbEe2-M8nuGout-A" elementId="org.eclipse.ui.window.resetPerspective" commandName="Reset Perspective" description="Reset the current perspective to its default state" category="_ZGO4YqrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGTw7arbEe2-M8nuGout-A" elementId="org.eclipse.mylyn.wikitext.ui.quickOutlineCommand" commandName="Quick Outline" description="Open a popup dialog with a quick outline of the current document" category="_ZGO4WqrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGTw7qrbEe2-M8nuGout-A" elementId="AnsiConsole.command.enable_disable" commandName="Enable / Disable ANSI Support" description="Enable / disable ANSI Support" category="_ZGO4W6rbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGTw76rbEe2-M8nuGout-A" elementId="org.eclipse.ui.project.buildLast" commandName="Repeat Working Set Build" description="Repeat the last working set build" category="_ZGO4ZqrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGTw8KrbEe2-M8nuGout-A" elementId="org.eclipse.ui.project.buildProject" commandName="Build Project" description="Build the selected project" category="_ZGO4ZqrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGTw8arbEe2-M8nuGout-A" elementId="org.eclipse.compare.switchLeftAndRight" commandName="Swap Left and Right View" description="Switch the left and right sides in the compare editor" category="_ZGO4YKrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGTw8qrbEe2-M8nuGout-A" elementId="org.eclipse.ui.edit.text.goto.textStart" commandName="Text Start" description="Go to the beginning of the text" category="_ZGO4WarbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGTw86rbEe2-M8nuGout-A" elementId="org.eclipse.ui.edit.paste" commandName="Paste" description="Paste from the clipboard" category="_ZGO4VKrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGTw9KrbEe2-M8nuGout-A" elementId="org.eclipse.egit.gitflow.ui.command.featureCheckout" commandName="Check Out Feature" category="_ZGO4barbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGTw9arbEe2-M8nuGout-A" elementId="org.eclipse.jdt.debug.ui.javaAppletShortcut.run" commandName="Run Java Applet" description="Run Java Applet" category="_ZGO4a6rbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGTw9qrbEe2-M8nuGout-A" elementId="org.eclipse.ui.navigate.previous" commandName="Previous" description="Navigate to the previous item" category="_ZGO4WqrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGUX4KrbEe2-M8nuGout-A" elementId="org.eclipse.egit.ui.team.clean" commandName="Clean..." category="_ZGO4barbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGUX4arbEe2-M8nuGout-A" elementId="org.eclipse.ui.edit.rename" commandName="Rename" description="Rename the selected item" category="_ZGO4XqrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGUX4qrbEe2-M8nuGout-A" elementId="org.eclipse.ui.project.buildAll" commandName="Build All" description="Build all projects" category="_ZGO4ZqrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGUX46rbEe2-M8nuGout-A" elementId="org.eclipse.egit.ui.history.OpenInTextEditorCommand" commandName="Open in Text Editor" category="_ZGO4dKrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGUX5KrbEe2-M8nuGout-A" elementId="org.eclipse.jdt.debug.ui.commands.ToggleLambdaEntryBreakpoint" commandName="Toggle &amp;Lambda Entry Breakpoint" description="Creates or removes a lambda entry breakpoint  " category="_ZGO4a6rbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGUX5arbEe2-M8nuGout-A" elementId="org.eclipse.ui.edit.text.cut.line.to.beginning" commandName="Cut to Beginning of Line" description="Cut to the beginning of a line of text" category="_ZGO4WarbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGUX5qrbEe2-M8nuGout-A" elementId="org.eclipse.buildship.ui.commands.runtasks" commandName="Run Gradle Tasks" description="Runs all the selected Gradle tasks" category="_ZGO4a6rbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGUX56rbEe2-M8nuGout-A" elementId="org.eclipse.jdt.ui.edit.text.java.toggleBreadcrumb" commandName="Toggle Java Editor Breadcrumb" description="Toggle the Java editor breadcrumb" category="_ZGO4carbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGUX6KrbEe2-M8nuGout-A" elementId="org.eclipse.ui.editors.revisions.rendering.cycle" commandName="Cycle Revision Coloring Mode" description="Cycles through the available coloring modes for revisions" category="_ZGO4WarbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGUX6arbEe2-M8nuGout-A" elementId="org.eclipse.ant.ui.renameInFile" commandName="Rename In File" description="Renames all references within the same buildfile" category="_ZGO4carbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGUX6qrbEe2-M8nuGout-A" elementId="org.eclipse.jdt.ui.edit.text.java.open.type.hierarchy" commandName="Open Type Hierarchy" description="Open a type hierarchy on the selected element" category="_ZGO4WqrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGU-8KrbEe2-M8nuGout-A" elementId="org.eclipse.jdt.ui.edit.text.java.extract.interface" commandName="Extract Interface" description="Extract a set of members into a new interface and try to use the new interface" category="_ZGO4Y6rbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGU-8arbEe2-M8nuGout-A" elementId="org.eclipse.ltk.ui.refactoring.commands.moveResources" commandName="Move Resources" description="Move the selected resources and notify LTK participants." category="_ZGO4b6rbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGU-8qrbEe2-M8nuGout-A" elementId="org.eclipse.m2e.actions.LifeCycleGenerateSources.run" commandName="Run Maven Generate Sources" description="Run Maven Generate Sources" category="_ZGO4a6rbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGU-86rbEe2-M8nuGout-A" elementId="org.eclipse.linuxtools.docker.ui.commands.copytocontainer" commandName="Copy to Container" description="Copy local files to a running Container" category="_ZGO4dKrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGU-9KrbEe2-M8nuGout-A" elementId="org.eclipse.debug.ui.commands.StepInto" commandName="Step Into" description="Step into" category="_ZGO4a6rbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGU-9arbEe2-M8nuGout-A" elementId="org.eclipse.e4.ui.importer.openDirectory" commandName="Open Projects from File System..." category="_ZGO4dKrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGU-9qrbEe2-M8nuGout-A" elementId="org.eclipse.wst.sse.ui.structure.select.previous" commandName="Select Previous Element" description="Expand selection to include previous sibling" category="_ZGO4VKrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGU-96rbEe2-M8nuGout-A" elementId="org.eclipse.jdt.debug.ui.commands.AddExceptionBreakpoint" commandName="Add Java Exception Breakpoint" description="Add a Java exception breakpoint" category="_ZGO4a6rbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGU--KrbEe2-M8nuGout-A" elementId="org.eclipse.jdt.ui.edit.text.java.open.call.hierarchy" commandName="Open Call Hierarchy" description="Open a call hierarchy on the selected element" category="_ZGO4WqrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGU--arbEe2-M8nuGout-A" elementId="org.eclipse.egit.ui.RepositoriesViewClearCredentials" commandName="Clear Credentials" category="_ZGO4barbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGU--qrbEe2-M8nuGout-A" elementId="org.eclipse.jdt.debug.ui.commands.ToggleTracepoint" commandName="Toggle Tracepoint" description="Creates or removes a tracepoint" category="_ZGO4a6rbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGU--6rbEe2-M8nuGout-A" elementId="org.eclipse.mylyn.wikitext.ui.convertToMarkupCommand" commandName="Generate Markup" category="_ZGO4dKrbEe2-M8nuGout-A">
+    <parameters xmi:id="_ZGU-_KrbEe2-M8nuGout-A" elementId="org.eclipse.mylyn.wikitext.ui.targetLanguage" name="TargetLanguage" optional="false"/>
   </commands>
-  <commands xmi:id="_JQ_297joEe25NdJK2M4KYw" elementId="org.eclipse.tm.terminal.view.ui.command.launchToolbar" commandName="Open Local Terminal on Selection" category="_JQ_7BrjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_2-LjoEe25NdJK2M4KYw" elementId="org.eclipse.ui.window.showViewMenu" commandName="Show View Menu" description="Show the view menu" category="_JQ_7CbjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_2-bjoEe25NdJK2M4KYw" elementId="org.eclipse.egit.ui.team.Commit" commandName="Commit..." category="_JQ_7FLjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_2-rjoEe25NdJK2M4KYw" elementId="org.eclipse.jdt.ui.edit.text.java.inline" commandName="Inline" description="Inline a constant, local variable or method" category="_JQ_7CrjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_2-7joEe25NdJK2M4KYw" elementId="org.eclipse.ui.edit.text.shiftRight" commandName="Shift Right" description="Shift a block of text to the right" category="_JQ_6-7joEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_2_LjoEe25NdJK2M4KYw" elementId="org.eclipse.ui.navigate.backwardHistory" commandName="Backward History" description="Move backward in the editor navigation history" category="_JQ_7AbjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_2_bjoEe25NdJK2M4KYw" elementId="org.eclipse.ui.edit.text.removeTrailingWhitespace" commandName="Remove Trailing Whitespace" description="Removes the trailing whitespace of each line" category="_JQ_7BbjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_2_rjoEe25NdJK2M4KYw" elementId="org.eclipse.ui.edit.findIncremental" commandName="Incremental Find" description="Incremental find" category="_JQ_6-7joEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_2_7joEe25NdJK2M4KYw" elementId="org.eclipse.jdt.ui.correction.assignToLocal.assist" commandName="Quick Assist - Assign to local variable" description="Invokes quick assist and selects 'Assign to local variable'" category="_JQ_7GLjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_3ALjoEe25NdJK2M4KYw" elementId="org.eclipse.egit.ui.ImportChangedProjectsCommandId" commandName="Import Changed Projects" description="Import or create in local Git repository" category="_JQ_7FLjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_3AbjoEe25NdJK2M4KYw" elementId="org.eclipse.jdt.ui.edit.text.java.search.return.continue.targets" commandName="Search break/continue Target Occurrences in File" description="Search for break/continue target occurrences of a selected target name" category="_JQ_7EbjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_3ArjoEe25NdJK2M4KYw" elementId="org.springframework.ide.eclipse.boot.dash.ToggleLineNumbers" commandName="Toggle Line Numbers" description="Toggle Line Numbers" category="_JQ_7G7joEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_3A7joEe25NdJK2M4KYw" elementId="org.eclipse.jdt.ui.edit.text.java.create.getter.setter" commandName="Generate Getters and Setters" description="Generate Getter and Setter methods for type's fields" category="_JQ_7GLjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_3BLjoEe25NdJK2M4KYw" elementId="org.eclipse.pde.ui.edit.text.format" commandName="Format Source" description="Format a PDE Source Page" category="_JQ_7GrjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_3BbjoEe25NdJK2M4KYw" elementId="org.eclipse.linuxtools.docker.ui.commands.pauseContainers" commandName="&amp;Pause" description="Pause the selected containers" category="_JQ_7G7joEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_3BrjoEe25NdJK2M4KYw" elementId="org.eclipse.jdt.ui.edit.text.java.select.next" commandName="Select Next Element" description="Expand selection to include next sibling" category="_JQ_6-7joEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_3B7joEe25NdJK2M4KYw" elementId="org.eclipse.egit.ui.RepositoriesViewCollapseWorkingTree" commandName="Collapse Working Tree" category="_JQ_7FLjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_3CLjoEe25NdJK2M4KYw" elementId="org.eclipse.egit.ui.RepositoriesViewNewRemote" commandName="Create Remote..." category="_JQ_7FLjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_3CbjoEe25NdJK2M4KYw" elementId="org.eclipse.debug.ui.commands.Restart" commandName="Restart" description="Restart a process or debug target without terminating and re-launching" category="_JQ_7ErjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_3CrjoEe25NdJK2M4KYw" elementId="org.eclipse.ui.edit.text.delete.line" commandName="Delete Line" description="Delete a line of text" category="_JQ_7ALjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_3C7joEe25NdJK2M4KYw" elementId="org.eclipse.jdt.ui.edit.text.java.remove.block.comment" commandName="Remove Block Comment" description="Remove the block comment enclosing the selection" category="_JQ_7GLjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_3DLjoEe25NdJK2M4KYw" elementId="org.eclipse.jdt.ui.edit.text.java.open.implementation" commandName="Open Implementation" description="Opens the Implementations of a method or a type in its hierarchy" category="_JQ_7AbjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_3DbjoEe25NdJK2M4KYw" elementId="org.eclipse.jdt.junit.gotoTest" commandName="Referring Tests" description="Referring Tests" category="_JQ_7EbjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_3DrjoEe25NdJK2M4KYw" elementId="org.eclipse.jdt.ui.edit.text.java.find.broken.nls.keys" commandName="Find Broken Externalized Strings" description="Finds undefined, duplicate and unused externalized string keys in property files" category="_JQ_7GLjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_3D7joEe25NdJK2M4KYw" elementId="org.eclipse.jdt.ui.commands.showElementInPackageView" commandName="Show Java Element in Package Explorer" description="Select Java element in the Package Explorer view" category="_JQ_7AbjoEe25NdJK2M4KYw">
-    <parameters xmi:id="_JQ_3ELjoEe25NdJK2M4KYw" elementId="elementRef" name="Java element reference" typeId="org.eclipse.jdt.ui.commands.javaElementReference" optional="false"/>
+  <commands xmi:id="_ZGU-_arbEe2-M8nuGout-A" elementId="org.eclipse.tm.terminal.view.ui.command.launchToolbar" commandName="Open Local Terminal on Selection" category="_ZGO4X6rbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGU-_qrbEe2-M8nuGout-A" elementId="org.eclipse.ui.window.showViewMenu" commandName="Show View Menu" description="Show the view menu" category="_ZGO4YqrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGU-_6rbEe2-M8nuGout-A" elementId="org.eclipse.egit.ui.team.Commit" commandName="Commit..." category="_ZGO4barbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGU_AKrbEe2-M8nuGout-A" elementId="org.eclipse.jdt.ui.edit.text.java.inline" commandName="Inline" description="Inline a constant, local variable or method" category="_ZGO4Y6rbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGU_AarbEe2-M8nuGout-A" elementId="org.eclipse.ui.edit.text.shiftRight" commandName="Shift Right" description="Shift a block of text to the right" category="_ZGO4VKrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGU_AqrbEe2-M8nuGout-A" elementId="org.eclipse.ui.navigate.backwardHistory" commandName="Backward History" description="Move backward in the editor navigation history" category="_ZGO4WqrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGU_A6rbEe2-M8nuGout-A" elementId="org.eclipse.ui.edit.text.removeTrailingWhitespace" commandName="Remove Trailing Whitespace" description="Removes the trailing whitespace of each line" category="_ZGO4XqrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGU_BKrbEe2-M8nuGout-A" elementId="org.eclipse.ui.edit.findIncremental" commandName="Incremental Find" description="Incremental find" category="_ZGO4VKrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGU_BarbEe2-M8nuGout-A" elementId="org.eclipse.jdt.ui.correction.assignToLocal.assist" commandName="Quick Assist - Assign to local variable" description="Invokes quick assist and selects 'Assign to local variable'" category="_ZGO4carbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGU_BqrbEe2-M8nuGout-A" elementId="org.eclipse.egit.ui.ImportChangedProjectsCommandId" commandName="Import Changed Projects" description="Import or create in local Git repository" category="_ZGO4barbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGU_B6rbEe2-M8nuGout-A" elementId="org.eclipse.jdt.ui.edit.text.java.search.return.continue.targets" commandName="Search break/continue Target Occurrences in File" description="Search for break/continue target occurrences of a selected target name" category="_ZGO4aqrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGU_CKrbEe2-M8nuGout-A" elementId="org.springframework.ide.eclipse.boot.dash.ToggleLineNumbers" commandName="Toggle Line Numbers" description="Toggle Line Numbers" category="_ZGO4dKrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGU_CarbEe2-M8nuGout-A" elementId="org.eclipse.jdt.ui.edit.text.java.create.getter.setter" commandName="Generate Getters and Setters" description="Generate Getter and Setter methods for type's fields" category="_ZGO4carbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGU_CqrbEe2-M8nuGout-A" elementId="org.eclipse.pde.ui.edit.text.format" commandName="Format Source" description="Format a PDE Source Page" category="_ZGO4c6rbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGU_C6rbEe2-M8nuGout-A" elementId="org.eclipse.linuxtools.docker.ui.commands.pauseContainers" commandName="&amp;Pause" description="Pause the selected containers" category="_ZGO4dKrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGU_DKrbEe2-M8nuGout-A" elementId="org.eclipse.jdt.ui.edit.text.java.select.next" commandName="Select Next Element" description="Expand selection to include next sibling" category="_ZGO4VKrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGU_DarbEe2-M8nuGout-A" elementId="org.eclipse.egit.ui.RepositoriesViewCollapseWorkingTree" commandName="Collapse Working Tree" category="_ZGO4barbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGU_DqrbEe2-M8nuGout-A" elementId="org.eclipse.egit.ui.RepositoriesViewNewRemote" commandName="Create Remote..." category="_ZGO4barbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGU_D6rbEe2-M8nuGout-A" elementId="org.eclipse.debug.ui.commands.Restart" commandName="Restart" description="Restart a process or debug target without terminating and re-launching" category="_ZGO4a6rbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGU_EKrbEe2-M8nuGout-A" elementId="org.eclipse.ui.edit.text.delete.line" commandName="Delete Line" description="Delete a line of text" category="_ZGO4WarbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGU_EarbEe2-M8nuGout-A" elementId="org.eclipse.jdt.ui.edit.text.java.remove.block.comment" commandName="Remove Block Comment" description="Remove the block comment enclosing the selection" category="_ZGO4carbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGU_EqrbEe2-M8nuGout-A" elementId="org.eclipse.jdt.ui.edit.text.java.open.implementation" commandName="Open Implementation" description="Opens the Implementations of a method or a type in its hierarchy" category="_ZGO4WqrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGU_E6rbEe2-M8nuGout-A" elementId="org.eclipse.jdt.junit.gotoTest" commandName="Referring Tests" description="Referring Tests" category="_ZGO4aqrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGU_FKrbEe2-M8nuGout-A" elementId="org.eclipse.jdt.ui.edit.text.java.find.broken.nls.keys" commandName="Find Broken Externalized Strings" description="Finds undefined, duplicate and unused externalized string keys in property files" category="_ZGO4carbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGU_FarbEe2-M8nuGout-A" elementId="org.eclipse.jdt.ui.commands.showElementInPackageView" commandName="Show Java Element in Package Explorer" description="Select Java element in the Package Explorer view" category="_ZGO4WqrbEe2-M8nuGout-A">
+    <parameters xmi:id="_ZGU_FqrbEe2-M8nuGout-A" elementId="elementRef" name="Java element reference" typeId="org.eclipse.jdt.ui.commands.javaElementReference" optional="false"/>
   </commands>
-  <commands xmi:id="_JQ_3EbjoEe25NdJK2M4KYw" elementId="org.eclipse.jdt.debug.ui.commands.InstanceCount" commandName="Instance Count" description="View the instance count of the selected type loaded in the target VM" category="_JQ_7ErjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_3ErjoEe25NdJK2M4KYw" elementId="org.eclipse.ui.edit.findReplace" commandName="Find and Replace" description="Find and replace text" category="_JQ_6-7joEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_3E7joEe25NdJK2M4KYw" elementId="org.eclipse.egit.ui.team.MergeTool" commandName="Merge Tool" category="_JQ_7FLjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_3FLjoEe25NdJK2M4KYw" elementId="org.eclipse.pde.ui.addAllPluginsToJavaSearch" commandName="Add All Plug-ins to Java Workspace Scope" description="Adds all plug-ins in the target platform to Java workspace scope" category="_JQ_7G7joEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_3FbjoEe25NdJK2M4KYw" elementId="org.eclipse.egit.ui.command.shareProject" commandName="Share with Git" description="Share the project using Git" category="_JQ_7G7joEe25NdJK2M4KYw">
-    <parameters xmi:id="_JQ_3FrjoEe25NdJK2M4KYw" elementId="org.eclipse.egit.ui.command.projectNameParameter" name="Project" optional="false"/>
+  <commands xmi:id="_ZGU_F6rbEe2-M8nuGout-A" elementId="org.eclipse.jdt.debug.ui.commands.InstanceCount" commandName="Instance Count" description="View the instance count of the selected type loaded in the target VM" category="_ZGO4a6rbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGU_GKrbEe2-M8nuGout-A" elementId="org.eclipse.ui.edit.findReplace" commandName="Find and Replace" description="Find and replace text" category="_ZGO4VKrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGU_GarbEe2-M8nuGout-A" elementId="org.eclipse.egit.ui.team.MergeTool" commandName="Merge Tool" category="_ZGO4barbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGVmAKrbEe2-M8nuGout-A" elementId="org.eclipse.pde.ui.addAllPluginsToJavaSearch" commandName="Add All Plug-ins to Java Workspace Scope" description="Adds all plug-ins in the target platform to Java workspace scope" category="_ZGO4dKrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGVmAarbEe2-M8nuGout-A" elementId="org.eclipse.egit.ui.command.shareProject" commandName="Share with Git" description="Share the project using Git" category="_ZGO4dKrbEe2-M8nuGout-A">
+    <parameters xmi:id="_ZGVmAqrbEe2-M8nuGout-A" elementId="org.eclipse.egit.ui.command.projectNameParameter" name="Project" optional="false"/>
   </commands>
-  <commands xmi:id="_JQ_3F7joEe25NdJK2M4KYw" elementId="org.eclipse.jdt.ui.edit.text.java.convert.anonymous.to.nested" commandName="Convert Anonymous Class to Nested" description="Convert an anonymous class to a nested class" category="_JQ_7CrjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_3GLjoEe25NdJK2M4KYw" elementId="org.eclipse.pde.ui.quickOutline" commandName="Quick Outline" description="Open a quick outline popup dialog for a given editor input" category="_JQ_7AbjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_3GbjoEe25NdJK2M4KYw" elementId="org.eclipse.ui.window.fullscreenmode" commandName="Toggle Full Screen" description="Toggles the window between full screen and normal" category="_JQ_7CbjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_3GrjoEe25NdJK2M4KYw" elementId="org.eclipse.equinox.p2.ui.sdk.installationDetails" commandName="Installation Details" category="_JQ_7G7joEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_3G7joEe25NdJK2M4KYw" elementId="org.eclipse.team.ui.synchronizeAll" commandName="Synchronize..." description="Synchronize resources in the workspace with another location" category="_JQ_697joEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_3HLjoEe25NdJK2M4KYw" elementId="org.eclipse.linuxtools.docker.ui.commands.pullImage" commandName="&amp;Pull..." description="Pull Image from registry" category="_JQ_7G7joEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_3HbjoEe25NdJK2M4KYw" elementId="org.eclipse.m2e.profiles.ui.commands.selectMavenProfileCommand" commandName="Select Maven Profiles" category="_JQ_7CbjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_3HrjoEe25NdJK2M4KYw" elementId="org.eclipse.ui.window.nextEditor" commandName="Next Editor" description="Switch to the next editor" category="_JQ_7CbjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_3H7joEe25NdJK2M4KYw" elementId="org.eclipse.egit.ui.internal.reflog.CopyCommand" commandName="Copy Commit Id" category="_JQ_7G7joEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_3ILjoEe25NdJK2M4KYw" elementId="org.eclipse.ui.help.helpContents" commandName="Help Contents" description="Open the help contents" category="_JQ_7C7joEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_3IbjoEe25NdJK2M4KYw" elementId="org.eclipse.egit.ui.team.Reset" commandName="Reset..." category="_JQ_7FLjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_3IrjoEe25NdJK2M4KYw" elementId="org.eclipse.ui.edit.delete" commandName="Delete" description="Delete the selection" category="_JQ_6-7joEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_3I7joEe25NdJK2M4KYw" elementId="org.eclipse.linuxtools.docker.ui.commands.configureLabels" commandName="&amp;Configure Labels Filter..." description="Configure container labels to match with for filter." category="_JQ_7G7joEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_3JLjoEe25NdJK2M4KYw" elementId="org.eclipse.ui.edit.text.delete.line.to.beginning" commandName="Delete to Beginning of Line" description="Delete to the beginning of a line of text" category="_JQ_7ALjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_3JbjoEe25NdJK2M4KYw" elementId="org.eclipse.egit.ui.team.RenameBranch" commandName="Rename Branch..." category="_JQ_7FLjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_3JrjoEe25NdJK2M4KYw" elementId="org.eclipse.egit.ui.team.Synchronize" commandName="Synchronize" category="_JQ_7FLjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_3J7joEe25NdJK2M4KYw" elementId="org.eclipse.jdt.ui.edit.text.java.search.declarations.in.working.set" commandName="Declaration in Working Set" description="Search for declarations of the selected element in a working set" category="_JQ_7EbjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_3KLjoEe25NdJK2M4KYw" elementId="org.springframework.tooling.ls.eclipse.commons.commands.OpenResourceInEditor" commandName="Open File in Editor" category="_JQ_7G7joEe25NdJK2M4KYw">
-    <parameters xmi:id="_JQ_3KbjoEe25NdJK2M4KYw" elementId="path" name="path" optional="false"/>
+  <commands xmi:id="_ZGVmA6rbEe2-M8nuGout-A" elementId="org.eclipse.jdt.ui.edit.text.java.convert.anonymous.to.nested" commandName="Convert Anonymous Class to Nested" description="Convert an anonymous class to a nested class" category="_ZGO4Y6rbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGVmBKrbEe2-M8nuGout-A" elementId="org.eclipse.pde.ui.quickOutline" commandName="Quick Outline" description="Open a quick outline popup dialog for a given editor input" category="_ZGO4WqrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGVmBarbEe2-M8nuGout-A" elementId="org.eclipse.ui.window.fullscreenmode" commandName="Toggle Full Screen" description="Toggles the window between full screen and normal" category="_ZGO4YqrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGVmBqrbEe2-M8nuGout-A" elementId="org.eclipse.equinox.p2.ui.sdk.installationDetails" commandName="Installation Details" category="_ZGO4dKrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGVmB6rbEe2-M8nuGout-A" elementId="org.eclipse.team.ui.synchronizeAll" commandName="Synchronize..." description="Synchronize resources in the workspace with another location" category="_ZGO4UKrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGVmCKrbEe2-M8nuGout-A" elementId="org.eclipse.linuxtools.docker.ui.commands.pullImage" commandName="&amp;Pull..." description="Pull Image from registry" category="_ZGO4dKrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGVmCarbEe2-M8nuGout-A" elementId="org.eclipse.m2e.profiles.ui.commands.selectMavenProfileCommand" commandName="Select Maven Profiles" category="_ZGO4YqrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGVmCqrbEe2-M8nuGout-A" elementId="org.eclipse.ui.window.nextEditor" commandName="Next Editor" description="Switch to the next editor" category="_ZGO4YqrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGVmC6rbEe2-M8nuGout-A" elementId="org.eclipse.egit.ui.internal.reflog.CopyCommand" commandName="Copy Commit Id" category="_ZGO4dKrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGVmDKrbEe2-M8nuGout-A" elementId="org.eclipse.ui.help.helpContents" commandName="Help Contents" description="Open the help contents" category="_ZGO4ZKrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGVmDarbEe2-M8nuGout-A" elementId="org.eclipse.egit.ui.team.Reset" commandName="Reset..." category="_ZGO4barbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGVmDqrbEe2-M8nuGout-A" elementId="org.eclipse.ui.edit.delete" commandName="Delete" description="Delete the selection" category="_ZGO4VKrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGVmD6rbEe2-M8nuGout-A" elementId="org.eclipse.linuxtools.docker.ui.commands.configureLabels" commandName="&amp;Configure Labels Filter..." description="Configure container labels to match with for filter." category="_ZGO4dKrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGVmEKrbEe2-M8nuGout-A" elementId="org.eclipse.ui.edit.text.delete.line.to.beginning" commandName="Delete to Beginning of Line" description="Delete to the beginning of a line of text" category="_ZGO4WarbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGVmEarbEe2-M8nuGout-A" elementId="org.eclipse.egit.ui.team.RenameBranch" commandName="Rename Branch..." category="_ZGO4barbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGVmEqrbEe2-M8nuGout-A" elementId="org.eclipse.egit.ui.team.Synchronize" commandName="Synchronize" category="_ZGO4barbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGVmE6rbEe2-M8nuGout-A" elementId="org.eclipse.jdt.ui.edit.text.java.search.declarations.in.working.set" commandName="Declaration in Working Set" description="Search for declarations of the selected element in a working set" category="_ZGO4aqrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGVmFKrbEe2-M8nuGout-A" elementId="org.springframework.tooling.ls.eclipse.commons.commands.OpenResourceInEditor" commandName="Open File in Editor" category="_ZGO4dKrbEe2-M8nuGout-A">
+    <parameters xmi:id="_ZGVmFarbEe2-M8nuGout-A" elementId="path" name="path" optional="false"/>
   </commands>
-  <commands xmi:id="_JQ_3KrjoEe25NdJK2M4KYw" elementId="org.eclipse.ui.edit.findPrevious" commandName="Find Previous" description="Find previous item" category="_JQ_6-7joEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_3K7joEe25NdJK2M4KYw" elementId="org.eclipse.debug.ui.commands.ToggleBreakpoint" commandName="Toggle Breakpoint" description="Creates or removes a breakpoint" category="_JQ_7ErjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_3LLjoEe25NdJK2M4KYw" elementId="org.eclipse.ui.edit.text.scroll.lineUp" commandName="Scroll Line Up" description="Scroll up one line of text" category="_JQ_7ALjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_3LbjoEe25NdJK2M4KYw" elementId="org.eclipse.jdt.ui.edit.text.java.select.last" commandName="Restore Last Selection" description="Restore last selection" category="_JQ_6-7joEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_3LrjoEe25NdJK2M4KYw" elementId="org.eclipse.pde.runtime.spy.commands.spyCommand" commandName="Plug-in Selection Spy" description="Show the Plug-in Spy" category="_JQ_7GbjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_3L7joEe25NdJK2M4KYw" elementId="org.eclipse.linuxtools.docker.ui.commands.buildImage" commandName="&amp;Build Image" description="Build Image from Dockerfile" category="_JQ_7G7joEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_3MLjoEe25NdJK2M4KYw" elementId="org.eclipse.ui.edit.text.folding.toggle" commandName="Toggle Folding" description="Toggles folding in the current editor" category="_JQ_7ALjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_3MbjoEe25NdJK2M4KYw" elementId="org.eclipse.ui.edit.text.toggleShowWhitespaceCharacters" commandName="Show Whitespace Characters" description="Shows whitespace characters in current text editor" category="_JQ_7ALjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_3MrjoEe25NdJK2M4KYw" elementId="org.eclipse.ui.edit.text.gotoNextEditPosition" commandName="Next Edit Location" description="Next edit location" category="_JQ_7AbjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_3M7joEe25NdJK2M4KYw" elementId="org.eclipse.lsp4e.symbolinworkspace" commandName="Go to Symbol in Workspace" category="_JQ_7BLjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_3NLjoEe25NdJK2M4KYw" elementId="org.eclipse.ui.file.revert" commandName="Revert" description="Revert to the last saved state" category="_JQ_7BbjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_3NbjoEe25NdJK2M4KYw" elementId="org.eclipse.ui.project.buildAutomatically" commandName="Build Automatically" description="Toggle the workspace build automatically function" category="_JQ_7DbjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_3NrjoEe25NdJK2M4KYw" elementId="org.eclipse.ui.file.import" commandName="Import" description="Import" category="_JQ_7BbjoEe25NdJK2M4KYw">
-    <parameters xmi:id="_JQ_3N7joEe25NdJK2M4KYw" elementId="importWizardId" name="Import Wizard"/>
+  <commands xmi:id="_ZGVmFqrbEe2-M8nuGout-A" elementId="org.eclipse.ui.edit.findPrevious" commandName="Find Previous" description="Find previous item" category="_ZGO4VKrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGVmF6rbEe2-M8nuGout-A" elementId="org.eclipse.debug.ui.commands.ToggleBreakpoint" commandName="Toggle Breakpoint" description="Creates or removes a breakpoint" category="_ZGO4a6rbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGVmGKrbEe2-M8nuGout-A" elementId="org.eclipse.ui.edit.text.scroll.lineUp" commandName="Scroll Line Up" description="Scroll up one line of text" category="_ZGO4WarbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGVmGarbEe2-M8nuGout-A" elementId="org.eclipse.jdt.ui.edit.text.java.select.last" commandName="Restore Last Selection" description="Restore last selection" category="_ZGO4VKrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGVmGqrbEe2-M8nuGout-A" elementId="org.eclipse.pde.runtime.spy.commands.spyCommand" commandName="Plug-in Selection Spy" description="Show the Plug-in Spy" category="_ZGO4cqrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGVmG6rbEe2-M8nuGout-A" elementId="org.eclipse.linuxtools.docker.ui.commands.buildImage" commandName="&amp;Build Image" description="Build Image from Dockerfile" category="_ZGO4dKrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGVmHKrbEe2-M8nuGout-A" elementId="org.eclipse.ui.edit.text.folding.toggle" commandName="Toggle Folding" description="Toggles folding in the current editor" category="_ZGO4WarbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGVmHarbEe2-M8nuGout-A" elementId="org.eclipse.ui.edit.text.toggleShowWhitespaceCharacters" commandName="Show Whitespace Characters" description="Shows whitespace characters in current text editor" category="_ZGO4WarbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGVmHqrbEe2-M8nuGout-A" elementId="org.eclipse.ui.edit.text.gotoNextEditPosition" commandName="Next Edit Location" description="Next edit location" category="_ZGO4WqrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGVmH6rbEe2-M8nuGout-A" elementId="org.eclipse.lsp4e.symbolinworkspace" commandName="Go to Symbol in Workspace" category="_ZGO4XarbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGVmIKrbEe2-M8nuGout-A" elementId="org.eclipse.ui.file.revert" commandName="Revert" description="Revert to the last saved state" category="_ZGO4XqrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGVmIarbEe2-M8nuGout-A" elementId="org.eclipse.ui.project.buildAutomatically" commandName="Build Automatically" description="Toggle the workspace build automatically function" category="_ZGO4ZqrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGVmIqrbEe2-M8nuGout-A" elementId="org.eclipse.ui.file.import" commandName="Import" description="Import" category="_ZGO4XqrbEe2-M8nuGout-A">
+    <parameters xmi:id="_ZGVmI6rbEe2-M8nuGout-A" elementId="importWizardId" name="Import Wizard"/>
   </commands>
-  <commands xmi:id="_JQ_3OLjoEe25NdJK2M4KYw" elementId="org.eclipse.egit.ui.history.Merge" commandName="Merge" category="_JQ_7G7joEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_3ObjoEe25NdJK2M4KYw" elementId="org.eclipse.ui.window.switchToEditor" commandName="Switch to Editor" description="Switch to an editor" category="_JQ_7CbjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_3OrjoEe25NdJK2M4KYw" elementId="org.eclipse.ui.help.dynamicHelp" commandName="Show Context Help" description="Open the contextual help" category="_JQ_7C7joEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_3O7joEe25NdJK2M4KYw" elementId="org.eclipse.ui.edit.text.toMultiSelection" commandName="To multi-selection" description="Turn current selection into multiple text selections" category="_JQ_6-7joEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_3PLjoEe25NdJK2M4KYw" elementId="org.eclipse.jdt.ui.edit.text.java.comment" commandName="Comment" description="Turn the selected lines into Java comments" category="_JQ_7GLjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_3PbjoEe25NdJK2M4KYw" elementId="org.eclipse.jdt.ui.edit.text.java.search.occurrences.in.file.quickMenu" commandName="Show Occurrences in File Quick Menu" description="Shows the Occurrences in File quick menu" category="_JQ_7EbjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_3PrjoEe25NdJK2M4KYw" elementId="org.eclipse.ui.edit.text.toggleInsertMode" commandName="Toggle Insert Mode" description="Toggle insert mode" category="_JQ_6-7joEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_3P7joEe25NdJK2M4KYw" elementId="org.eclipse.egit.ui.RepositoriesViewDelete" commandName="Delete Repository" category="_JQ_7FLjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_3QLjoEe25NdJK2M4KYw" elementId="org.eclipse.ui.file.closePart" commandName="Close Part" description="Close the active workbench part" category="_JQ_7CbjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_3QbjoEe25NdJK2M4KYw" elementId="org.eclipse.ui.editors.revisions.id.toggle" commandName="Toggle Revision Id Display" description="Toggles the display of the revision id" category="_JQ_7ALjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_3QrjoEe25NdJK2M4KYw" elementId="org.eclipse.ui.project.cleanAction" commandName="Build Clean" description="Discard old built state" category="_JQ_7DbjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_3Q7joEe25NdJK2M4KYw" elementId="org.eclipse.ui.edit.text.select.multiCaretDown" commandName="Multi caret down" description="Add a new caret/multi selection below the current line, or remove the first caret/multi selection " category="_JQ_7ALjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_3RLjoEe25NdJK2M4KYw" elementId="org.eclipse.ui.navigate.back" commandName="Back" description="Navigate back" category="_JQ_7AbjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_3RbjoEe25NdJK2M4KYw" elementId="org.eclipse.ui.edit.text.select.wordNext" commandName="Select Next Word" description="Select the next word" category="_JQ_7ALjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_3RrjoEe25NdJK2M4KYw" elementId="org.eclipse.jdt.ui.JavaBrowsingPerspective" commandName="Java Browsing" description="Show the Java Browsing perspective" category="_JQ_7FbjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_3R7joEe25NdJK2M4KYw" elementId="org.eclipse.ui.edit.text.goto.pageDown" commandName="Page Down" description="Go down one page" category="_JQ_7ALjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_3SLjoEe25NdJK2M4KYw" elementId="org.eclipse.egit.ui.team.GarbageCollect" commandName="Collect Garbage" category="_JQ_7FLjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_3SbjoEe25NdJK2M4KYw" elementId="org.eclipse.egit.ui.history.CompareWithWorkingTree" commandName="Compare with Working Tree" category="_JQ_7G7joEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_3SrjoEe25NdJK2M4KYw" elementId="org.eclipse.egit.ui.team.Branch" commandName="Branch" description="Check out, rename, create, or delete a branch in a git repository" category="_JQ_7FLjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_3S7joEe25NdJK2M4KYw" elementId="org.eclipse.linuxtools.docker.ui.commands.openInHierarchyView" commandName="Open Image Hierarchy" description="Open the Docker image Hierarchy view" category="_JQ_7G7joEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_3TLjoEe25NdJK2M4KYw" elementId="org.eclipse.egit.ui.RepositoriesViewConfigurePush" commandName="Configure Push..." category="_JQ_7FLjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_3TbjoEe25NdJK2M4KYw" elementId="org.eclipse.ui.edit.findIncrementalReverse" commandName="Incremental Find Reverse" description="Incremental find reverse" category="_JQ_6-7joEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_3TrjoEe25NdJK2M4KYw" elementId="org.eclipse.epp.mpc.ui.command.importFavoritesWizard" commandName="Import Marketplace Favorites" description="Import another user's Marketplace Favorites List" category="_JQ_7G7joEe25NdJK2M4KYw">
-    <parameters xmi:id="_JQ_3T7joEe25NdJK2M4KYw" elementId="favoritesUrl" name="favoritesUrl"/>
+  <commands xmi:id="_ZGVmJKrbEe2-M8nuGout-A" elementId="org.eclipse.egit.ui.history.Merge" commandName="Merge" category="_ZGO4dKrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGVmJarbEe2-M8nuGout-A" elementId="org.eclipse.ui.window.switchToEditor" commandName="Switch to Editor" description="Switch to an editor" category="_ZGO4YqrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGVmJqrbEe2-M8nuGout-A" elementId="org.eclipse.ui.help.dynamicHelp" commandName="Show Context Help" description="Open the contextual help" category="_ZGO4ZKrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGVmJ6rbEe2-M8nuGout-A" elementId="org.eclipse.ui.edit.text.toMultiSelection" commandName="To multi-selection" description="Turn current selection into multiple text selections" category="_ZGO4VKrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGVmKKrbEe2-M8nuGout-A" elementId="org.eclipse.jdt.ui.edit.text.java.comment" commandName="Comment" description="Turn the selected lines into Java comments" category="_ZGO4carbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGVmKarbEe2-M8nuGout-A" elementId="org.eclipse.jdt.ui.edit.text.java.search.occurrences.in.file.quickMenu" commandName="Show Occurrences in File Quick Menu" description="Shows the Occurrences in File quick menu" category="_ZGO4aqrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGVmKqrbEe2-M8nuGout-A" elementId="org.eclipse.ui.edit.text.toggleInsertMode" commandName="Toggle Insert Mode" description="Toggle insert mode" category="_ZGO4VKrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGWNEKrbEe2-M8nuGout-A" elementId="org.eclipse.egit.ui.RepositoriesViewDelete" commandName="Delete Repository" category="_ZGO4barbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGWNEarbEe2-M8nuGout-A" elementId="org.eclipse.ui.file.closePart" commandName="Close Part" description="Close the active workbench part" category="_ZGO4YqrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGWNEqrbEe2-M8nuGout-A" elementId="org.eclipse.ui.editors.revisions.id.toggle" commandName="Toggle Revision Id Display" description="Toggles the display of the revision id" category="_ZGO4WarbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGWNE6rbEe2-M8nuGout-A" elementId="org.eclipse.ui.project.cleanAction" commandName="Build Clean" description="Discard old built state" category="_ZGO4ZqrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGWNFKrbEe2-M8nuGout-A" elementId="org.eclipse.ui.edit.text.select.multiCaretDown" commandName="Multi caret down" description="Add a new caret/multi selection below the current line, or remove the first caret/multi selection " category="_ZGO4WarbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGWNFarbEe2-M8nuGout-A" elementId="org.eclipse.ui.navigate.back" commandName="Back" description="Navigate back" category="_ZGO4WqrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGWNFqrbEe2-M8nuGout-A" elementId="org.eclipse.ui.edit.text.select.wordNext" commandName="Select Next Word" description="Select the next word" category="_ZGO4WarbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGWNF6rbEe2-M8nuGout-A" elementId="org.eclipse.jdt.ui.JavaBrowsingPerspective" commandName="Java Browsing" description="Show the Java Browsing perspective" category="_ZGO4bqrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGWNGKrbEe2-M8nuGout-A" elementId="org.eclipse.ui.edit.text.goto.pageDown" commandName="Page Down" description="Go down one page" category="_ZGO4WarbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGWNGarbEe2-M8nuGout-A" elementId="org.eclipse.egit.ui.team.GarbageCollect" commandName="Collect Garbage" category="_ZGO4barbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGWNGqrbEe2-M8nuGout-A" elementId="org.eclipse.egit.ui.history.CompareWithWorkingTree" commandName="Compare with Working Tree" category="_ZGO4dKrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGWNG6rbEe2-M8nuGout-A" elementId="org.eclipse.egit.ui.team.Branch" commandName="Branch" description="Check out, rename, create, or delete a branch in a git repository" category="_ZGO4barbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGWNHKrbEe2-M8nuGout-A" elementId="org.eclipse.linuxtools.docker.ui.commands.openInHierarchyView" commandName="Open Image Hierarchy" description="Open the Docker image Hierarchy view" category="_ZGO4dKrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGWNHarbEe2-M8nuGout-A" elementId="org.eclipse.egit.ui.RepositoriesViewConfigurePush" commandName="Configure Push..." category="_ZGO4barbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGWNHqrbEe2-M8nuGout-A" elementId="org.eclipse.ui.edit.findIncrementalReverse" commandName="Incremental Find Reverse" description="Incremental find reverse" category="_ZGO4VKrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGWNH6rbEe2-M8nuGout-A" elementId="org.eclipse.epp.mpc.ui.command.importFavoritesWizard" commandName="Import Marketplace Favorites" description="Import another user's Marketplace Favorites List" category="_ZGO4dKrbEe2-M8nuGout-A">
+    <parameters xmi:id="_ZGWNIKrbEe2-M8nuGout-A" elementId="favoritesUrl" name="favoritesUrl"/>
   </commands>
-  <commands xmi:id="_JQ_3ULjoEe25NdJK2M4KYw" elementId="org.eclipse.ant.ui.antShortcut.run" commandName="Run Ant Build" description="Run Ant Build" category="_JQ_7ErjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_3UbjoEe25NdJK2M4KYw" elementId="org.eclipse.egit.ui.team.stash.apply" commandName="Apply Stashed Changes" category="_JQ_7FLjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_3UrjoEe25NdJK2M4KYw" elementId="org.eclipse.jdt.debug.ui.commands.Inspect" commandName="Inspect" description="Inspect result of evaluating selected text" category="_JQ_7ErjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_3U7joEe25NdJK2M4KYw" elementId="org.eclipse.ui.edit.text.goto.columnNext" commandName="Next Column" description="Go to the next column" category="_JQ_7ALjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_3VLjoEe25NdJK2M4KYw" elementId="org.eclipse.egit.ui.history.Squash" commandName="Squash Commits" category="_JQ_7G7joEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_3VbjoEe25NdJK2M4KYw" elementId="org.eclipse.search.ui.performTextSearchWorkingSet" commandName="Find Text in Working Set" description="Searches the files in the working set for specific text." category="_JQ_7EbjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_3VrjoEe25NdJK2M4KYw" elementId="org.springframework.ide.eclipse.boot.dash.boot.dash.OpenLaunchConfigAction" commandName="Open Config" description="Open Launch Configuration" category="_JQ_7CbjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_3V7joEe25NdJK2M4KYw" elementId="org.eclipse.ui.edit.text.goto.wordNext" commandName="Next Word" description="Go to the next word" category="_JQ_7ALjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_3WLjoEe25NdJK2M4KYw" elementId="org.eclipse.quickdiff.toggle" commandName="Quick Diff Toggle" description="Toggles quick diff information display on the line number ruler" category="_JQ_6-7joEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_3WbjoEe25NdJK2M4KYw" elementId="org.eclipse.ui.edit.text.deleteNext" commandName="Delete Next" description="Delete the next character" category="_JQ_7ALjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_3WrjoEe25NdJK2M4KYw" elementId="org.eclipse.egit.ui.FetchGerritChange" commandName="Fetch From Gerrit" category="_JQ_7FLjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_3W7joEe25NdJK2M4KYw" elementId="org.eclipse.egit.ui.team.ReplaceWithTheirs" commandName="Replace Conflicting Files with Their Revision" category="_JQ_7FLjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_3XLjoEe25NdJK2M4KYw" elementId="org.eclipse.linuxtools.docker.ui.commands.removeContainers" commandName="&amp;Remove" description="Remove the selected containers" category="_JQ_7G7joEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_3XbjoEe25NdJK2M4KYw" elementId="org.eclipse.ui.toggleShowKeys" commandName="Toggle Show Key Bindings" description="Shows key binding when command is invoked" category="_JQ_7CbjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_3XrjoEe25NdJK2M4KYw" elementId="org.eclipse.jdt.debug.ui.commands.Watch" commandName="Watch" description="Create new watch expression" category="_JQ_7ErjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_3X7joEe25NdJK2M4KYw" elementId="org.eclipse.egit.ui.history.Reword" commandName="Reword Commit" category="_JQ_7G7joEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_3YLjoEe25NdJK2M4KYw" elementId="org.eclipse.egit.ui.team.OpenCommit" commandName="Open Git Commit" category="_JQ_7FLjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_3YbjoEe25NdJK2M4KYw" elementId="org.eclipse.wst.server.stop" commandName="Stop" description="Stop the server" category="_JQ_7A7joEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_3YrjoEe25NdJK2M4KYw" elementId="org.eclipse.ui.help.displayHelp" commandName="Display Help" description="Display a Help topic" category="_JQ_7C7joEe25NdJK2M4KYw">
-    <parameters xmi:id="_JQ_3Y7joEe25NdJK2M4KYw" elementId="href" name="Help topic href"/>
+  <commands xmi:id="_ZGWNIarbEe2-M8nuGout-A" elementId="org.eclipse.ant.ui.antShortcut.run" commandName="Run Ant Build" description="Run Ant Build" category="_ZGO4a6rbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGWNIqrbEe2-M8nuGout-A" elementId="org.eclipse.egit.ui.team.stash.apply" commandName="Apply Stashed Changes" category="_ZGO4barbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGWNI6rbEe2-M8nuGout-A" elementId="org.eclipse.jdt.debug.ui.commands.Inspect" commandName="Inspect" description="Inspect result of evaluating selected text" category="_ZGO4a6rbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGWNJKrbEe2-M8nuGout-A" elementId="org.eclipse.ui.edit.text.goto.columnNext" commandName="Next Column" description="Go to the next column" category="_ZGO4WarbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGWNJarbEe2-M8nuGout-A" elementId="org.eclipse.egit.ui.history.Squash" commandName="Squash Commits" category="_ZGO4dKrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGWNJqrbEe2-M8nuGout-A" elementId="org.eclipse.search.ui.performTextSearchWorkingSet" commandName="Find Text in Working Set" description="Searches the files in the working set for specific text." category="_ZGO4aqrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGWNJ6rbEe2-M8nuGout-A" elementId="org.springframework.ide.eclipse.boot.dash.boot.dash.OpenLaunchConfigAction" commandName="Open Config" description="Open Launch Configuration" category="_ZGO4YqrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGWNKKrbEe2-M8nuGout-A" elementId="org.eclipse.ui.edit.text.goto.wordNext" commandName="Next Word" description="Go to the next word" category="_ZGO4WarbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGWNKarbEe2-M8nuGout-A" elementId="org.eclipse.quickdiff.toggle" commandName="Quick Diff Toggle" description="Toggles quick diff information display on the line number ruler" category="_ZGO4VKrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGWNKqrbEe2-M8nuGout-A" elementId="org.eclipse.ui.edit.text.deleteNext" commandName="Delete Next" description="Delete the next character" category="_ZGO4WarbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGWNK6rbEe2-M8nuGout-A" elementId="org.eclipse.egit.ui.FetchGerritChange" commandName="Fetch From Gerrit" category="_ZGO4barbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGWNLKrbEe2-M8nuGout-A" elementId="org.eclipse.egit.ui.team.ReplaceWithTheirs" commandName="Replace Conflicting Files with Their Revision" category="_ZGO4barbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGWNLarbEe2-M8nuGout-A" elementId="org.eclipse.linuxtools.docker.ui.commands.removeContainers" commandName="&amp;Remove" description="Remove the selected containers" category="_ZGO4dKrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGW0IKrbEe2-M8nuGout-A" elementId="org.eclipse.ui.toggleShowKeys" commandName="Toggle Show Key Bindings" description="Shows key binding when command is invoked" category="_ZGO4YqrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGW0IarbEe2-M8nuGout-A" elementId="org.eclipse.jdt.debug.ui.commands.Watch" commandName="Watch" description="Create new watch expression" category="_ZGO4a6rbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGW0IqrbEe2-M8nuGout-A" elementId="org.eclipse.egit.ui.history.Reword" commandName="Reword Commit" category="_ZGO4dKrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGW0I6rbEe2-M8nuGout-A" elementId="org.eclipse.egit.ui.team.OpenCommit" commandName="Open Git Commit" category="_ZGO4barbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGW0JKrbEe2-M8nuGout-A" elementId="org.eclipse.wst.server.stop" commandName="Stop" description="Stop the server" category="_ZGO4XKrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGW0JarbEe2-M8nuGout-A" elementId="org.eclipse.ui.help.displayHelp" commandName="Display Help" description="Display a Help topic" category="_ZGO4ZKrbEe2-M8nuGout-A">
+    <parameters xmi:id="_ZGW0JqrbEe2-M8nuGout-A" elementId="href" name="Help topic href"/>
   </commands>
-  <commands xmi:id="_JQ_3ZLjoEe25NdJK2M4KYw" elementId="org.eclipse.ui.edit.text.select.pageDown" commandName="Select Page Down" description="Select to the bottom of the page" category="_JQ_7ALjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_3ZbjoEe25NdJK2M4KYw" elementId="org.eclipse.ltk.ui.refactor.create.refactoring.script" commandName="Create Script" description="Create a refactoring script from refactorings on the local workspace" category="_JQ_7CrjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_3ZrjoEe25NdJK2M4KYw" elementId="org.eclipse.ui.edit.text.join.lines" commandName="Join Lines" description="Join lines of text" category="_JQ_7ALjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_3Z7joEe25NdJK2M4KYw" elementId="org.eclipse.linuxtools.docker.ui.commands.refreshConnection" commandName="Refresh" category="_JQ_7G7joEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_3aLjoEe25NdJK2M4KYw" elementId="org.eclipse.linuxtools.docker.ui.commands.pushImage" commandName="P&amp;ush..." description="Push Image tag to registry" category="_JQ_7G7joEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_3abjoEe25NdJK2M4KYw" elementId="org.eclipse.jdt.ui.edit.text.java.open.editor" commandName="Open Declaration" description="Open an editor on the selected element" category="_JQ_7AbjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_3arjoEe25NdJK2M4KYw" elementId="org.eclipse.ui.window.showContextMenu" commandName="Show Context Menu" description="Show the context menu" category="_JQ_7CbjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_3a7joEe25NdJK2M4KYw" elementId="org.eclipse.jdt.ui.edit.text.java.extract.local.variable" commandName="Extract Local Variable" description="Extracts an expression into a new local variable and uses the new local variable" category="_JQ_7CrjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_3bLjoEe25NdJK2M4KYw" elementId="org.eclipse.egit.ui.team.InstallLfsLocal" commandName="Enable LFS locally" category="_JQ_7FLjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_3bbjoEe25NdJK2M4KYw" elementId="org.eclipse.ltk.ui.refactor.show.refactoring.history" commandName="Open Refactoring History " description="Opens the refactoring history" category="_JQ_7CrjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_3brjoEe25NdJK2M4KYw" elementId="org.eclipse.jdt.ui.edit.text.java.search.read.access.in.hierarchy" commandName="Read Access in Hierarchy" description="Search for read references of the selected element in its hierarchy" category="_JQ_7EbjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_3b7joEe25NdJK2M4KYw" elementId="org.eclipse.jdt.ui.edit.text.java.correction.assist.proposals" commandName="Quick Fix" description="Suggest possible fixes for a problem" category="_JQ_6-7joEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_3cLjoEe25NdJK2M4KYw" elementId="org.eclipse.ui.views.log.jdt.showinconsole" commandName="&amp;Show In Console" description="Show Stack Trace in Console View" category="_JQ_7G7joEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_3cbjoEe25NdJK2M4KYw" elementId="org.eclipse.jdt.ui.edit.text.java.push.down" commandName="Push Down" description="Move members to subclasses" category="_JQ_7CrjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_3crjoEe25NdJK2M4KYw" elementId="org.eclipse.ui.window.nextPerspective" commandName="Next Perspective" description="Switch to the next perspective" category="_JQ_7CbjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_3c7joEe25NdJK2M4KYw" elementId="com.genuitec.eclipse.theming.codetogether.start" commandName="Start Hosting Session" description="Collaborate with CodeTogether" category="_JQ_7G7joEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_3dLjoEe25NdJK2M4KYw" elementId="org.eclipse.debug.ui.commands.console.clear" commandName="Clear Console" description="Clear Console" category="_JQ_7ErjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_3dbjoEe25NdJK2M4KYw" elementId="org.eclipse.jdt.ui.edit.text.java.search.write.access.in.working.set" commandName="Write Access in Working Set" description="Search for write references to the selected element in a working set" category="_JQ_7EbjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_3drjoEe25NdJK2M4KYw" elementId="org.eclipse.egit.ui.history.ShowVersions" commandName="Open this Version" category="_JQ_7G7joEe25NdJK2M4KYw">
-    <parameters xmi:id="_JQ_3d7joEe25NdJK2M4KYw" elementId="org.eclipse.egit.ui.history.CompareMode" name="Compare mode"/>
+  <commands xmi:id="_ZGW0J6rbEe2-M8nuGout-A" elementId="org.eclipse.ui.edit.text.select.pageDown" commandName="Select Page Down" description="Select to the bottom of the page" category="_ZGO4WarbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGW0KKrbEe2-M8nuGout-A" elementId="org.eclipse.ltk.ui.refactor.create.refactoring.script" commandName="Create Script" description="Create a refactoring script from refactorings on the local workspace" category="_ZGO4Y6rbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGW0KarbEe2-M8nuGout-A" elementId="org.eclipse.ui.edit.text.join.lines" commandName="Join Lines" description="Join lines of text" category="_ZGO4WarbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGW0KqrbEe2-M8nuGout-A" elementId="org.eclipse.linuxtools.docker.ui.commands.refreshConnection" commandName="Refresh" category="_ZGO4dKrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGW0K6rbEe2-M8nuGout-A" elementId="org.eclipse.linuxtools.docker.ui.commands.pushImage" commandName="P&amp;ush..." description="Push Image tag to registry" category="_ZGO4dKrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGW0LKrbEe2-M8nuGout-A" elementId="org.eclipse.jdt.ui.edit.text.java.open.editor" commandName="Open Declaration" description="Open an editor on the selected element" category="_ZGO4WqrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGW0LarbEe2-M8nuGout-A" elementId="org.eclipse.ui.window.showContextMenu" commandName="Show Context Menu" description="Show the context menu" category="_ZGO4YqrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGW0LqrbEe2-M8nuGout-A" elementId="org.eclipse.jdt.ui.edit.text.java.extract.local.variable" commandName="Extract Local Variable" description="Extracts an expression into a new local variable and uses the new local variable" category="_ZGO4Y6rbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGW0L6rbEe2-M8nuGout-A" elementId="org.eclipse.egit.ui.team.InstallLfsLocal" commandName="Enable LFS locally" category="_ZGO4barbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGW0MKrbEe2-M8nuGout-A" elementId="org.eclipse.ltk.ui.refactor.show.refactoring.history" commandName="Open Refactoring History " description="Opens the refactoring history" category="_ZGO4Y6rbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGW0MarbEe2-M8nuGout-A" elementId="org.eclipse.jdt.ui.edit.text.java.search.read.access.in.hierarchy" commandName="Read Access in Hierarchy" description="Search for read references of the selected element in its hierarchy" category="_ZGO4aqrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGW0MqrbEe2-M8nuGout-A" elementId="org.eclipse.jdt.ui.edit.text.java.correction.assist.proposals" commandName="Quick Fix" description="Suggest possible fixes for a problem" category="_ZGO4VKrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGW0M6rbEe2-M8nuGout-A" elementId="org.eclipse.ui.views.log.jdt.showinconsole" commandName="&amp;Show In Console" description="Show Stack Trace in Console View" category="_ZGO4dKrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGW0NKrbEe2-M8nuGout-A" elementId="org.eclipse.jdt.ui.edit.text.java.push.down" commandName="Push Down" description="Move members to subclasses" category="_ZGO4Y6rbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGW0NarbEe2-M8nuGout-A" elementId="org.eclipse.ui.window.nextPerspective" commandName="Next Perspective" description="Switch to the next perspective" category="_ZGO4YqrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGW0NqrbEe2-M8nuGout-A" elementId="com.genuitec.eclipse.theming.codetogether.start" commandName="Start Hosting Session" description="Collaborate with CodeTogether" category="_ZGO4dKrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGW0N6rbEe2-M8nuGout-A" elementId="org.eclipse.debug.ui.commands.console.clear" commandName="Clear Console" description="Clear Console" category="_ZGO4a6rbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGW0OKrbEe2-M8nuGout-A" elementId="org.eclipse.jdt.ui.edit.text.java.search.write.access.in.working.set" commandName="Write Access in Working Set" description="Search for write references to the selected element in a working set" category="_ZGO4aqrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGW0OarbEe2-M8nuGout-A" elementId="org.eclipse.egit.ui.history.ShowVersions" commandName="Open this Version" category="_ZGO4dKrbEe2-M8nuGout-A">
+    <parameters xmi:id="_ZGW0OqrbEe2-M8nuGout-A" elementId="org.eclipse.egit.ui.history.CompareMode" name="Compare mode"/>
   </commands>
-  <commands xmi:id="_JQ_3eLjoEe25NdJK2M4KYw" elementId="org.eclipse.ui.navigate.nextTab" commandName="Next Tab" description="Switch to the next tab" category="_JQ_7AbjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_3ebjoEe25NdJK2M4KYw" elementId="org.eclipse.ui.window.quickAccess" commandName="Find Actions" description="Quickly access UI elements" category="_JQ_7CbjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_3erjoEe25NdJK2M4KYw" elementId="org.eclipse.ui.edit.text.showInformation" commandName="Show Tooltip Description" description="Displays information for the current caret location in a focused hover" category="_JQ_7ALjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_3e7joEe25NdJK2M4KYw" elementId="org.eclipse.jdt.ui.edit.text.java.add.import" commandName="Add Import" description="Create import statement on selection" category="_JQ_7GLjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_3fLjoEe25NdJK2M4KYw" elementId="org.eclipse.egit.gitflow.ui.command.releasePublish" commandName="Publish Release" category="_JQ_7FLjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_3fbjoEe25NdJK2M4KYw" elementId="org.eclipse.debug.ui.commands.toggleMemoryMonitorsPane" commandName="Toggle Memory Monitors Pane" description="Toggle visibility of the Memory Monitors Pane" category="_JQ_7ErjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_3frjoEe25NdJK2M4KYw" elementId="org.eclipse.jdt.ui.edit.text.java.search.implementors.in.working.set" commandName="Implementors in Working Set" description="Search for implementors of the selected interface in a working set" category="_JQ_7EbjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_3f7joEe25NdJK2M4KYw" elementId="org.eclipse.egit.ui.team.Discard" commandName="Replace with File in Index" category="_JQ_7FLjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_3gLjoEe25NdJK2M4KYw" elementId="org.eclipse.lsp4e.formatfile" commandName="Format" category="_JQ_7BLjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_3gbjoEe25NdJK2M4KYw" elementId="org.eclipse.egit.ui.RepositoriesViewCreateBranch" commandName="Create Branch..." category="_JQ_7FLjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_3grjoEe25NdJK2M4KYw" elementId="org.eclipse.egit.ui.RepositoriesViewCopyPath" commandName="Copy Path to Clipboard" category="_JQ_7FLjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_3g7joEe25NdJK2M4KYw" elementId="org.eclipse.ui.edit.text.showRulerAnnotationInformation" commandName="Show Ruler Annotation Tooltip" description="Displays annotation information for the caret line in a focused hover" category="_JQ_7ALjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_3hLjoEe25NdJK2M4KYw" elementId="org.eclipse.ui.browser.openBrowser" commandName="Open Browser" description="Opens the default web browser." category="_JQ_7CbjoEe25NdJK2M4KYw">
-    <parameters xmi:id="_JQ_3hbjoEe25NdJK2M4KYw" elementId="url" name="URL"/>
-    <parameters xmi:id="_JQ_3hrjoEe25NdJK2M4KYw" elementId="browserId" name="Browser Id"/>
-    <parameters xmi:id="_JQ_3h7joEe25NdJK2M4KYw" elementId="name" name="Browser Name"/>
-    <parameters xmi:id="_JQ_3iLjoEe25NdJK2M4KYw" elementId="tooltip" name="Browser Tooltip"/>
+  <commands xmi:id="_ZGXbMKrbEe2-M8nuGout-A" elementId="org.eclipse.ui.navigate.nextTab" commandName="Next Tab" description="Switch to the next tab" category="_ZGO4WqrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGXbMarbEe2-M8nuGout-A" elementId="org.eclipse.ui.window.quickAccess" commandName="Find Actions" description="Quickly access UI elements" category="_ZGO4YqrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGXbMqrbEe2-M8nuGout-A" elementId="org.eclipse.ui.edit.text.showInformation" commandName="Show Tooltip Description" description="Displays information for the current caret location in a focused hover" category="_ZGO4WarbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGXbM6rbEe2-M8nuGout-A" elementId="org.eclipse.jdt.ui.edit.text.java.add.import" commandName="Add Import" description="Create import statement on selection" category="_ZGO4carbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGXbNKrbEe2-M8nuGout-A" elementId="org.eclipse.egit.gitflow.ui.command.releasePublish" commandName="Publish Release" category="_ZGO4barbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGXbNarbEe2-M8nuGout-A" elementId="org.eclipse.debug.ui.commands.toggleMemoryMonitorsPane" commandName="Toggle Memory Monitors Pane" description="Toggle visibility of the Memory Monitors Pane" category="_ZGO4a6rbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGXbNqrbEe2-M8nuGout-A" elementId="org.eclipse.jdt.ui.edit.text.java.search.implementors.in.working.set" commandName="Implementors in Working Set" description="Search for implementors of the selected interface in a working set" category="_ZGO4aqrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGXbN6rbEe2-M8nuGout-A" elementId="org.eclipse.egit.ui.team.Discard" commandName="Replace with File in Index" category="_ZGO4barbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGXbOKrbEe2-M8nuGout-A" elementId="org.eclipse.lsp4e.formatfile" commandName="Format" category="_ZGO4XarbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGXbOarbEe2-M8nuGout-A" elementId="org.eclipse.egit.ui.RepositoriesViewCreateBranch" commandName="Create Branch..." category="_ZGO4barbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGXbOqrbEe2-M8nuGout-A" elementId="org.eclipse.egit.ui.RepositoriesViewCopyPath" commandName="Copy Path to Clipboard" category="_ZGO4barbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGXbO6rbEe2-M8nuGout-A" elementId="org.eclipse.ui.edit.text.showRulerAnnotationInformation" commandName="Show Ruler Annotation Tooltip" description="Displays annotation information for the caret line in a focused hover" category="_ZGO4WarbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGXbPKrbEe2-M8nuGout-A" elementId="org.eclipse.ui.browser.openBrowser" commandName="Open Browser" description="Opens the default web browser." category="_ZGO4YqrbEe2-M8nuGout-A">
+    <parameters xmi:id="_ZGXbParbEe2-M8nuGout-A" elementId="url" name="URL"/>
+    <parameters xmi:id="_ZGXbPqrbEe2-M8nuGout-A" elementId="browserId" name="Browser Id"/>
+    <parameters xmi:id="_ZGXbP6rbEe2-M8nuGout-A" elementId="name" name="Browser Name"/>
+    <parameters xmi:id="_ZGXbQKrbEe2-M8nuGout-A" elementId="tooltip" name="Browser Tooltip"/>
   </commands>
-  <commands xmi:id="_JQ_3ibjoEe25NdJK2M4KYw" elementId="org.eclipse.jdt.ui.edit.text.java.search.implement.occurrences" commandName="Search Implement Occurrences in File" description="Search for implement occurrences of a selected type" category="_JQ_7EbjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_3irjoEe25NdJK2M4KYw" elementId="org.eclipse.egit.ui.history.DeleteBranch" commandName="Delete Branch" category="_JQ_7G7joEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_3i7joEe25NdJK2M4KYw" elementId="org.eclipse.ui.edit.text.contentAssist.contextInformation" commandName="Context Information" description="Show Context Information" category="_JQ_6-7joEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_3jLjoEe25NdJK2M4KYw" elementId="org.eclipse.ui.file.saveAs" commandName="Save As" description="Save the current contents to another location" category="_JQ_7BbjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_3jbjoEe25NdJK2M4KYw" elementId="org.eclipse.ui.window.previousPerspective" commandName="Previous Perspective" description="Switch to the previous perspective" category="_JQ_7CbjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_3jrjoEe25NdJK2M4KYw" elementId="org.eclipse.ui.window.splitEditor" commandName="Toggle Split Editor" description="Split or join the currently active editor." category="_JQ_7CbjoEe25NdJK2M4KYw">
-    <parameters xmi:id="_JQ_3j7joEe25NdJK2M4KYw" elementId="Splitter.isHorizontal" name="Orientation" optional="false"/>
+  <commands xmi:id="_ZGXbQarbEe2-M8nuGout-A" elementId="org.eclipse.jdt.ui.edit.text.java.search.implement.occurrences" commandName="Search Implement Occurrences in File" description="Search for implement occurrences of a selected type" category="_ZGO4aqrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGXbQqrbEe2-M8nuGout-A" elementId="org.eclipse.egit.ui.history.DeleteBranch" commandName="Delete Branch" category="_ZGO4dKrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGXbQ6rbEe2-M8nuGout-A" elementId="org.eclipse.ui.edit.text.contentAssist.contextInformation" commandName="Context Information" description="Show Context Information" category="_ZGO4VKrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGXbRKrbEe2-M8nuGout-A" elementId="org.eclipse.ui.file.saveAs" commandName="Save As" description="Save the current contents to another location" category="_ZGO4XqrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGXbRarbEe2-M8nuGout-A" elementId="org.eclipse.ui.window.previousPerspective" commandName="Previous Perspective" description="Switch to the previous perspective" category="_ZGO4YqrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGXbRqrbEe2-M8nuGout-A" elementId="org.eclipse.ui.window.splitEditor" commandName="Toggle Split Editor" description="Split or join the currently active editor." category="_ZGO4YqrbEe2-M8nuGout-A">
+    <parameters xmi:id="_ZGXbR6rbEe2-M8nuGout-A" elementId="Splitter.isHorizontal" name="Orientation" optional="false"/>
   </commands>
-  <commands xmi:id="_JQ_3kLjoEe25NdJK2M4KYw" elementId="org.eclipse.ui.navigate.collapseAll" commandName="Collapse All" description="Collapse the current tree" category="_JQ_7AbjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_3kbjoEe25NdJK2M4KYw" elementId="org.eclipse.compare.copyAllRightToLeft" commandName="Copy All from Right to Left" description="Copy All Changes from Right to Left" category="_JQ_7B7joEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_3krjoEe25NdJK2M4KYw" elementId="org.eclipse.lsp4e.togglelinkwitheditor" commandName="Toggle Link with Editor" category="_JQ_7BLjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_3k7joEe25NdJK2M4KYw" elementId="org.eclipse.ui.window.lockToolBar" commandName="Toggle Lock Toolbars" description="Toggle the Lock on the Toolbars" category="_JQ_7CbjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_3lLjoEe25NdJK2M4KYw" elementId="org.eclipse.debug.ui.commands.Disconnect" commandName="Disconnect" description="Disconnect" category="_JQ_7ErjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_3lbjoEe25NdJK2M4KYw" elementId="org.eclipse.lsp4e.format" commandName="Format" category="_JQ_7BLjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_3lrjoEe25NdJK2M4KYw" elementId="org.springframework.tooling.ls.eclipse.gotosymbol.command" commandName="Goto Symbol" category="_JQ_6-bjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_3l7joEe25NdJK2M4KYw" elementId="org.eclipse.jdt.ui.edit.text.java.search.write.access.in.workspace" commandName="Write Access in Workspace" description="Search for write references to the selected element in the workspace" category="_JQ_7EbjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_3mLjoEe25NdJK2M4KYw" elementId="org.eclipse.ui.navigate.removeFromWorkingSet" commandName="Remove From Working Set" description="Removes the selected object from a working set." category="_JQ_6-7joEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_3mbjoEe25NdJK2M4KYw" elementId="org.eclipse.pde.ui.createAntBuildFile" commandName="Create Ant Build File" description="Creates an Ant build file for the current project" category="_JQ_7G7joEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_3mrjoEe25NdJK2M4KYw" elementId="org.eclipse.egit.ui.RepositoriesLinkWithSelection" commandName="Toggle &quot;Link with Editor and Selection&quot; (Git Repositories View)" category="_JQ_7FLjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_3m7joEe25NdJK2M4KYw" elementId="org.eclipse.ui.ide.deleteCompleted" commandName="Delete Completed Tasks" description="Delete the tasks marked as completed" category="_JQ_7G7joEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_3nLjoEe25NdJK2M4KYw" elementId="org.eclipse.tm4e.languageconfiguration.addBlockCommentCommand" commandName="Add Block Comment" category="_JQ_6-rjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_3nbjoEe25NdJK2M4KYw" elementId="org.eclipse.jdt.ui.edit.text.java.add.javadoc.comment" commandName="Add Javadoc Comment" description="Add a Javadoc comment stub to the member element" category="_JQ_7GLjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_3nrjoEe25NdJK2M4KYw" elementId="com.genuitec.eclipse.inlinesearch.replaceall" commandName="Replace All" category="_JQ_7HLjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_3n7joEe25NdJK2M4KYw" elementId="org.eclipse.egit.ui.RebaseInteractiveCurrent" commandName="Interactive Rebase" category="_JQ_7G7joEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_3oLjoEe25NdJK2M4KYw" elementId="org.eclipse.ui.window.openEditorDropDown" commandName="Quick Switch Editor" description="Open the editor drop down list" category="_JQ_7CbjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_3objoEe25NdJK2M4KYw" elementId="AnsiConsole.command.copy_with_escapes" commandName="Copy Text With ANSI Escapes" description="Copy the console content to clipboard, including the escape sequences" category="_JQ_7ArjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_3orjoEe25NdJK2M4KYw" elementId="org.eclipse.linuxtools.docker.ui.commands.runImage" commandName="Run" description="Run an Image" category="_JQ_7G7joEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_3o7joEe25NdJK2M4KYw" elementId="org.eclipse.ui.edit.text.deleteNextWord" commandName="Delete Next Word" description="Delete the next word" category="_JQ_7ALjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_3pLjoEe25NdJK2M4KYw" elementId="org.springframework.ide.eclipse.boot.properties.editor.convertPropertiesToYaml" commandName="Convert .properties to .yaml" category="_JQ_6_LjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_3pbjoEe25NdJK2M4KYw" elementId="org.eclipse.pde.ui.openDependencies" commandName="Open Plug-in Dependencies" description="Opens the plug-in dependencies view for the current plug-in" category="_JQ_7G7joEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_3prjoEe25NdJK2M4KYw" elementId="org.eclipse.jdt.ui.edit.text.java.toggleMarkOccurrences" commandName="Toggle Mark Occurrences" description="Toggles mark occurrences in Java editors" category="_JQ_7GLjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_3p7joEe25NdJK2M4KYw" elementId="org.eclipse.egit.ui.SkipRebase" commandName="Skip commit and continue" category="_JQ_7FLjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_3qLjoEe25NdJK2M4KYw" elementId="org.eclipse.jdt.ui.edit.text.java.replace.invocations" commandName="Replace Invocations" description="Replace invocations of the selected method" category="_JQ_7CrjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_3qbjoEe25NdJK2M4KYw" elementId="org.eclipse.jdt.ui.edit.text.java.search.declarations.in.hierarchy" commandName="Declaration in Hierarchy" description="Search for declarations of the selected element in its hierarchy" category="_JQ_7EbjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_3qrjoEe25NdJK2M4KYw" elementId="org.eclipse.egit.ui.history.SetQuickdiffBaseline" commandName="Set quickdiff baseline" category="_JQ_7G7joEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_3q7joEe25NdJK2M4KYw" elementId="org.eclipse.ui.edit.undo" commandName="Undo" description="Undo the last operation" category="_JQ_6-7joEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_3rLjoEe25NdJK2M4KYw" elementId="org.eclipse.ui.file.newQuickMenu" commandName="New menu" description="Open the New menu" category="_JQ_7BbjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_3rbjoEe25NdJK2M4KYw" elementId="org.eclipse.debug.ui.actions.WatchCommand" commandName="Watch" description="Create a watch expression from the current selection and add it to the Expressions view" category="_JQ_7G7joEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_3rrjoEe25NdJK2M4KYw" elementId="org.eclipse.ui.file.openWorkspace" commandName="Switch Workspace" description="Open the workspace selection dialog" category="_JQ_7BbjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_3r7joEe25NdJK2M4KYw" elementId="org.eclipse.ui.file.closeAll" commandName="Close All" description="Close all editors" category="_JQ_7BbjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_3sLjoEe25NdJK2M4KYw" elementId="org.eclipse.jdt.ui.navigate.open.type" commandName="Open Type" description="Open a type in a Java editor" category="_JQ_7AbjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_3sbjoEe25NdJK2M4KYw" elementId="org.eclipse.ui.edit.cut" commandName="Cut" description="Cut the selection to the clipboard" category="_JQ_6-7joEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_3srjoEe25NdJK2M4KYw" elementId="org.eclipse.jdt.ui.edit.text.java.introduce.indirection" commandName="Introduce Indirection" description="Introduce an indirection to encapsulate invocations of a selected method" category="_JQ_7CrjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_3s7joEe25NdJK2M4KYw" elementId="org.eclipse.egit.ui.team.Merge" commandName="Merge" category="_JQ_7FLjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_3tLjoEe25NdJK2M4KYw" elementId="org.eclipse.ltk.ui.refactor.apply.refactoring.script" commandName="Apply Script" description="Perform refactorings from a refactoring script on the local workspace" category="_JQ_7CrjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_3tbjoEe25NdJK2M4KYw" elementId="org.eclipse.egit.ui.team.ReplaceWithRef" commandName="Replace with branch, tag, or reference" category="_JQ_7FLjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_3trjoEe25NdJK2M4KYw" elementId="org.eclipse.jdt.ui.edit.text.java.extract.superclass" commandName="Extract Superclass" description="Extract a set of members into a new superclass and try to use the new superclass" category="_JQ_7CrjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_3t7joEe25NdJK2M4KYw" elementId="org.eclipse.ui.edit.text.toggleShowSelectedElementOnly" commandName="Show Selected Element Only" description="Show Selected Element Only" category="_JQ_7CbjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_3uLjoEe25NdJK2M4KYw" elementId="org.eclipse.egit.ui.internal.merge.ToggleCurrentChangesCommand" commandName="Ignore Changes from Ancestor to Current Version" description="Toggle ignoring changes only between the ancestor and the current version in a three-way merge comparison" category="_JQ_7FLjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_3ubjoEe25NdJK2M4KYw" elementId="org.eclipse.jdt.junit.junitShortcut.rerunFailedFirst" commandName="Rerun JUnit Test - Failures First" description="Rerun JUnit Test - Failures First" category="_JQ_7ErjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_3urjoEe25NdJK2M4KYw" elementId="com.genuitec.myeclipse.perspective.meexplorer.search.searchmodecommand" commandName="Search Mode" category="_JQ_7G7joEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_3u7joEe25NdJK2M4KYw" elementId="org.eclipse.ui.file.export" commandName="Export" description="Export" category="_JQ_7BbjoEe25NdJK2M4KYw">
-    <parameters xmi:id="_JQ_3vLjoEe25NdJK2M4KYw" elementId="exportWizardId" name="Export Wizard"/>
+  <commands xmi:id="_ZGXbSKrbEe2-M8nuGout-A" elementId="org.eclipse.ui.navigate.collapseAll" commandName="Collapse All" description="Collapse the current tree" category="_ZGO4WqrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGXbSarbEe2-M8nuGout-A" elementId="org.eclipse.compare.copyAllRightToLeft" commandName="Copy All from Right to Left" description="Copy All Changes from Right to Left" category="_ZGO4YKrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGXbSqrbEe2-M8nuGout-A" elementId="org.eclipse.lsp4e.togglelinkwitheditor" commandName="Toggle Link with Editor" category="_ZGO4XarbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGXbS6rbEe2-M8nuGout-A" elementId="org.eclipse.ui.window.lockToolBar" commandName="Toggle Lock Toolbars" description="Toggle the Lock on the Toolbars" category="_ZGO4YqrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGXbTKrbEe2-M8nuGout-A" elementId="org.eclipse.debug.ui.commands.Disconnect" commandName="Disconnect" description="Disconnect" category="_ZGO4a6rbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGXbTarbEe2-M8nuGout-A" elementId="org.eclipse.lsp4e.format" commandName="Format" category="_ZGO4XarbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGXbTqrbEe2-M8nuGout-A" elementId="org.springframework.tooling.ls.eclipse.gotosymbol.command" commandName="Goto Symbol" category="_ZGO4UqrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGXbT6rbEe2-M8nuGout-A" elementId="org.eclipse.jdt.ui.edit.text.java.search.write.access.in.workspace" commandName="Write Access in Workspace" description="Search for write references to the selected element in the workspace" category="_ZGO4aqrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGXbUKrbEe2-M8nuGout-A" elementId="org.eclipse.ui.navigate.removeFromWorkingSet" commandName="Remove From Working Set" description="Removes the selected object from a working set." category="_ZGO4VKrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGXbUarbEe2-M8nuGout-A" elementId="org.eclipse.pde.ui.createAntBuildFile" commandName="Create Ant Build File" description="Creates an Ant build file for the current project" category="_ZGO4dKrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGXbUqrbEe2-M8nuGout-A" elementId="org.eclipse.egit.ui.RepositoriesLinkWithSelection" commandName="Toggle &quot;Link with Editor and Selection&quot; (Git Repositories View)" category="_ZGO4barbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGXbU6rbEe2-M8nuGout-A" elementId="org.eclipse.ui.ide.deleteCompleted" commandName="Delete Completed Tasks" description="Delete the tasks marked as completed" category="_ZGO4dKrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGXbVKrbEe2-M8nuGout-A" elementId="org.eclipse.tm4e.languageconfiguration.addBlockCommentCommand" commandName="Add Block Comment" category="_ZGO4U6rbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGXbVarbEe2-M8nuGout-A" elementId="org.eclipse.jdt.ui.edit.text.java.add.javadoc.comment" commandName="Add Javadoc Comment" description="Add a Javadoc comment stub to the member element" category="_ZGO4carbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGXbVqrbEe2-M8nuGout-A" elementId="com.genuitec.eclipse.inlinesearch.replaceall" commandName="Replace All" category="_ZGO4darbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGXbV6rbEe2-M8nuGout-A" elementId="org.eclipse.egit.ui.RebaseInteractiveCurrent" commandName="Interactive Rebase" category="_ZGO4dKrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGXbWKrbEe2-M8nuGout-A" elementId="org.eclipse.ui.window.openEditorDropDown" commandName="Quick Switch Editor" description="Open the editor drop down list" category="_ZGO4YqrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGXbWarbEe2-M8nuGout-A" elementId="AnsiConsole.command.copy_with_escapes" commandName="Copy Text With ANSI Escapes" description="Copy the console content to clipboard, including the escape sequences" category="_ZGO4W6rbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGXbWqrbEe2-M8nuGout-A" elementId="org.eclipse.linuxtools.docker.ui.commands.runImage" commandName="Run" description="Run an Image" category="_ZGO4dKrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGXbW6rbEe2-M8nuGout-A" elementId="org.eclipse.ui.edit.text.deleteNextWord" commandName="Delete Next Word" description="Delete the next word" category="_ZGO4WarbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGXbXKrbEe2-M8nuGout-A" elementId="org.springframework.ide.eclipse.boot.properties.editor.convertPropertiesToYaml" commandName="Convert .properties to .yaml" category="_ZGO4VarbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGXbXarbEe2-M8nuGout-A" elementId="org.eclipse.pde.ui.openDependencies" commandName="Open Plug-in Dependencies" description="Opens the plug-in dependencies view for the current plug-in" category="_ZGO4dKrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGXbXqrbEe2-M8nuGout-A" elementId="org.eclipse.jdt.ui.edit.text.java.toggleMarkOccurrences" commandName="Toggle Mark Occurrences" description="Toggles mark occurrences in Java editors" category="_ZGO4carbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGXbX6rbEe2-M8nuGout-A" elementId="org.eclipse.egit.ui.SkipRebase" commandName="Skip commit and continue" category="_ZGO4barbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGXbYKrbEe2-M8nuGout-A" elementId="org.eclipse.jdt.ui.edit.text.java.replace.invocations" commandName="Replace Invocations" description="Replace invocations of the selected method" category="_ZGO4Y6rbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGXbYarbEe2-M8nuGout-A" elementId="org.eclipse.jdt.ui.edit.text.java.search.declarations.in.hierarchy" commandName="Declaration in Hierarchy" description="Search for declarations of the selected element in its hierarchy" category="_ZGO4aqrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGXbYqrbEe2-M8nuGout-A" elementId="org.eclipse.egit.ui.history.SetQuickdiffBaseline" commandName="Set quickdiff baseline" category="_ZGO4dKrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGXbY6rbEe2-M8nuGout-A" elementId="org.eclipse.ui.edit.undo" commandName="Undo" description="Undo the last operation" category="_ZGO4VKrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGXbZKrbEe2-M8nuGout-A" elementId="org.eclipse.ui.file.newQuickMenu" commandName="New menu" description="Open the New menu" category="_ZGO4XqrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGXbZarbEe2-M8nuGout-A" elementId="org.eclipse.debug.ui.actions.WatchCommand" commandName="Watch" description="Create a watch expression from the current selection and add it to the Expressions view" category="_ZGO4dKrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGXbZqrbEe2-M8nuGout-A" elementId="org.eclipse.ui.file.openWorkspace" commandName="Switch Workspace" description="Open the workspace selection dialog" category="_ZGO4XqrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGXbZ6rbEe2-M8nuGout-A" elementId="org.eclipse.ui.file.closeAll" commandName="Close All" description="Close all editors" category="_ZGO4XqrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGXbaKrbEe2-M8nuGout-A" elementId="org.eclipse.jdt.ui.navigate.open.type" commandName="Open Type" description="Open a type in a Java editor" category="_ZGO4WqrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGXbaarbEe2-M8nuGout-A" elementId="org.eclipse.ui.edit.cut" commandName="Cut" description="Cut the selection to the clipboard" category="_ZGO4VKrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGXbaqrbEe2-M8nuGout-A" elementId="org.eclipse.jdt.ui.edit.text.java.introduce.indirection" commandName="Introduce Indirection" description="Introduce an indirection to encapsulate invocations of a selected method" category="_ZGO4Y6rbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGXba6rbEe2-M8nuGout-A" elementId="org.eclipse.egit.ui.team.Merge" commandName="Merge" category="_ZGO4barbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGXbbKrbEe2-M8nuGout-A" elementId="org.eclipse.ltk.ui.refactor.apply.refactoring.script" commandName="Apply Script" description="Perform refactorings from a refactoring script on the local workspace" category="_ZGO4Y6rbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGYCQKrbEe2-M8nuGout-A" elementId="org.eclipse.egit.ui.team.ReplaceWithRef" commandName="Replace with branch, tag, or reference" category="_ZGO4barbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGYCQarbEe2-M8nuGout-A" elementId="org.eclipse.jdt.ui.edit.text.java.extract.superclass" commandName="Extract Superclass" description="Extract a set of members into a new superclass and try to use the new superclass" category="_ZGO4Y6rbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGYCQqrbEe2-M8nuGout-A" elementId="org.eclipse.ui.edit.text.toggleShowSelectedElementOnly" commandName="Show Selected Element Only" description="Show Selected Element Only" category="_ZGO4YqrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGYCQ6rbEe2-M8nuGout-A" elementId="org.eclipse.egit.ui.internal.merge.ToggleCurrentChangesCommand" commandName="Ignore Changes from Ancestor to Current Version" description="Toggle ignoring changes only between the ancestor and the current version in a three-way merge comparison" category="_ZGO4barbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGYCRKrbEe2-M8nuGout-A" elementId="org.eclipse.jdt.junit.junitShortcut.rerunFailedFirst" commandName="Rerun JUnit Test - Failures First" description="Rerun JUnit Test - Failures First" category="_ZGO4a6rbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGYCRarbEe2-M8nuGout-A" elementId="com.genuitec.myeclipse.perspective.meexplorer.search.searchmodecommand" commandName="Search Mode" category="_ZGO4dKrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGYCRqrbEe2-M8nuGout-A" elementId="org.eclipse.ui.file.export" commandName="Export" description="Export" category="_ZGO4XqrbEe2-M8nuGout-A">
+    <parameters xmi:id="_ZGYCR6rbEe2-M8nuGout-A" elementId="exportWizardId" name="Export Wizard"/>
   </commands>
-  <commands xmi:id="_JQ_3vbjoEe25NdJK2M4KYw" elementId="org.eclipse.jdt.ui.edit.text.java.search.implementors.in.project" commandName="Implementors in Project" description="Search for implementors of the selected interface in the enclosing project" category="_JQ_7EbjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_3vrjoEe25NdJK2M4KYw" elementId="org.eclipse.egit.ui.team.ApplyPatch" commandName="Apply Patch" category="_JQ_7FLjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_3v7joEe25NdJK2M4KYw" elementId="org.eclipse.jdt.ui.JavaPerspective" commandName="Java" description="Show the Java perspective" category="_JQ_7FbjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_3wLjoEe25NdJK2M4KYw" elementId="org.eclipse.jdt.ui.edit.text.java.indent" commandName="Correct Indentation" description="Corrects the indentation of the selected lines" category="_JQ_7GLjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_3wbjoEe25NdJK2M4KYw" elementId="org.eclipse.ui.ide.copyConfigCommand" commandName="Copy Configuration Data To Clipboard" description="Copies the configuration data (system properties, installed bundles, etc) to the clipboard." category="_JQ_6-7joEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_3wrjoEe25NdJK2M4KYw" elementId="org.eclipse.ui.navigate.forwardHistory" commandName="Forward History" description="Move forward in the editor navigation history" category="_JQ_7AbjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_3w7joEe25NdJK2M4KYw" elementId="org.eclipse.search.ui.performTextSearchProject" commandName="Find Text in Project" description="Searches the files in the project for specific text." category="_JQ_7EbjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_3xLjoEe25NdJK2M4KYw" elementId="org.eclipse.ui.project.rebuildAll" commandName="Rebuild All" description="Rebuild all projects" category="_JQ_7DbjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_3xbjoEe25NdJK2M4KYw" elementId="org.eclipse.jdt.ui.edit.text.java.surround.with.try.with.resources" commandName="Surround with try-with-resources Block" description="Surround the selected text with a try-with-resources block" category="_JQ_7GLjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_3xrjoEe25NdJK2M4KYw" elementId="org.eclipse.jdt.ui.edit.text.java.quick.format" commandName="Format Element" description="Format enclosing text element" category="_JQ_7GLjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_3x7joEe25NdJK2M4KYw" elementId="org.eclipse.ui.edit.text.openLocalFile" commandName="Open File..." description="Open a file" category="_JQ_7BbjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_3yLjoEe25NdJK2M4KYw" elementId="org.eclipse.egit.ui.team.Disconnect" commandName="Disconnect" category="_JQ_7FLjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_3ybjoEe25NdJK2M4KYw" elementId="org.eclipse.jdt.ui.edit.text.java.select.previous" commandName="Select Previous Element" description="Expand selection to include previous sibling" category="_JQ_6-7joEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_3yrjoEe25NdJK2M4KYw" elementId="org.eclipse.pde.ui.externalizeStrings" commandName="Externalize Strings in Plug-ins" description="Extract translatable strings from plug-in files" category="_JQ_7G7joEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_3y7joEe25NdJK2M4KYw" elementId="org.eclipse.ui.file.refresh" commandName="Refresh" description="Refresh the selected items" category="_JQ_7BbjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_3zLjoEe25NdJK2M4KYw" elementId="org.eclipse.egit.ui.team.ReplaceWithOurs" commandName="Replace Conflicting Files with Our Revision" category="_JQ_7FLjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_3zbjoEe25NdJK2M4KYw" elementId="org.eclipse.egit.ui.RepositoriesViewChangeCredentials" commandName="Change Credentials" category="_JQ_7FLjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_3zrjoEe25NdJK2M4KYw" elementId="org.eclipse.jdt.ui.correction.extractMethodInplace.assist" commandName="Quick Assist - Extract method" description="Invokes quick assist and selects 'Extract to method'" category="_JQ_7GLjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_3z7joEe25NdJK2M4KYw" elementId="org.eclipse.ui.window.closeAllPerspectives" commandName="Close All Perspectives" description="Close all open perspectives" category="_JQ_7CbjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_30LjoEe25NdJK2M4KYw" elementId="org.eclipse.debug.ui.commands.TerminateAll" commandName="Terminate/Disconnect All" description="Terminate/Disconnect All" category="_JQ_7ErjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_30bjoEe25NdJK2M4KYw" elementId="org.eclipse.ui.edit.text.select.lineStart" commandName="Select Line Start" description="Select to the beginning of the line of text" category="_JQ_7ALjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_30rjoEe25NdJK2M4KYw" elementId="org.eclipse.egit.ui.commit.Reword" commandName="Reword Commit" category="_JQ_7G7joEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_307joEe25NdJK2M4KYw" elementId="org.eclipse.ui.editors.lineNumberToggle" commandName="Show Line Numbers" description="Toggle display of line numbers" category="_JQ_7ALjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_31LjoEe25NdJK2M4KYw" elementId="org.springframework.tooling.boot.ls.rewrite.refactor" commandName="Refactor Spring Boot Project..." description="Rewrite Refactorings for Spring Boot projects" category="_JQ_7DLjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_31bjoEe25NdJK2M4KYw" elementId="org.eclipse.egit.ui.RepositoriesToggleBranchCommit" commandName="Toggle Latest Branch Commit" category="_JQ_7FLjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_31rjoEe25NdJK2M4KYw" elementId="org.eclipse.tm.terminal.paste" commandName="Paste" category="_JQ_7ELjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_317joEe25NdJK2M4KYw" elementId="org.eclipse.egit.ui.history.PushCommit" commandName="Push Commit..." category="_JQ_7G7joEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_32LjoEe25NdJK2M4KYw" elementId="org.eclipse.ui.ide.showInSystemExplorer" commandName="Show In (System Explorer)" description="Show in system's explorer (file manager)" category="_JQ_7AbjoEe25NdJK2M4KYw">
-    <parameters xmi:id="_JQ_32bjoEe25NdJK2M4KYw" elementId="org.eclipse.ui.ide.showInSystemExplorer.path" name="Resource System Path Parameter"/>
+  <commands xmi:id="_ZGYCSKrbEe2-M8nuGout-A" elementId="org.eclipse.jdt.ui.edit.text.java.search.implementors.in.project" commandName="Implementors in Project" description="Search for implementors of the selected interface in the enclosing project" category="_ZGO4aqrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGYCSarbEe2-M8nuGout-A" elementId="org.eclipse.egit.ui.team.ApplyPatch" commandName="Apply Patch" category="_ZGO4barbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGYCSqrbEe2-M8nuGout-A" elementId="org.eclipse.jdt.ui.JavaPerspective" commandName="Java" description="Show the Java perspective" category="_ZGO4bqrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGYCS6rbEe2-M8nuGout-A" elementId="org.eclipse.jdt.ui.edit.text.java.indent" commandName="Correct Indentation" description="Corrects the indentation of the selected lines" category="_ZGO4carbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGYCTKrbEe2-M8nuGout-A" elementId="org.eclipse.ui.ide.copyConfigCommand" commandName="Copy Configuration Data To Clipboard" description="Copies the configuration data (system properties, installed bundles, etc) to the clipboard." category="_ZGO4VKrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGYCTarbEe2-M8nuGout-A" elementId="org.eclipse.ui.navigate.forwardHistory" commandName="Forward History" description="Move forward in the editor navigation history" category="_ZGO4WqrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGYCTqrbEe2-M8nuGout-A" elementId="org.eclipse.search.ui.performTextSearchProject" commandName="Find Text in Project" description="Searches the files in the project for specific text." category="_ZGO4aqrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGYCT6rbEe2-M8nuGout-A" elementId="org.eclipse.ui.project.rebuildAll" commandName="Rebuild All" description="Rebuild all projects" category="_ZGO4ZqrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGYCUKrbEe2-M8nuGout-A" elementId="org.eclipse.jdt.ui.edit.text.java.surround.with.try.with.resources" commandName="Surround with try-with-resources Block" description="Surround the selected text with a try-with-resources block" category="_ZGO4carbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGYCUarbEe2-M8nuGout-A" elementId="org.eclipse.jdt.ui.edit.text.java.quick.format" commandName="Format Element" description="Format enclosing text element" category="_ZGO4carbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGYCUqrbEe2-M8nuGout-A" elementId="org.eclipse.ui.edit.text.openLocalFile" commandName="Open File..." description="Open a file" category="_ZGO4XqrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGYCU6rbEe2-M8nuGout-A" elementId="org.eclipse.egit.ui.team.Disconnect" commandName="Disconnect" category="_ZGO4barbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGYCVKrbEe2-M8nuGout-A" elementId="org.eclipse.jdt.ui.edit.text.java.select.previous" commandName="Select Previous Element" description="Expand selection to include previous sibling" category="_ZGO4VKrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGYCVarbEe2-M8nuGout-A" elementId="org.eclipse.pde.ui.externalizeStrings" commandName="Externalize Strings in Plug-ins" description="Extract translatable strings from plug-in files" category="_ZGO4dKrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGYCVqrbEe2-M8nuGout-A" elementId="org.eclipse.ui.file.refresh" commandName="Refresh" description="Refresh the selected items" category="_ZGO4XqrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGYCV6rbEe2-M8nuGout-A" elementId="org.eclipse.egit.ui.team.ReplaceWithOurs" commandName="Replace Conflicting Files with Our Revision" category="_ZGO4barbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGYCWKrbEe2-M8nuGout-A" elementId="org.eclipse.egit.ui.RepositoriesViewChangeCredentials" commandName="Change Credentials" category="_ZGO4barbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGYCWarbEe2-M8nuGout-A" elementId="org.eclipse.jdt.ui.correction.extractMethodInplace.assist" commandName="Quick Assist - Extract method" description="Invokes quick assist and selects 'Extract to method'" category="_ZGO4carbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGYCWqrbEe2-M8nuGout-A" elementId="org.eclipse.ui.window.closeAllPerspectives" commandName="Close All Perspectives" description="Close all open perspectives" category="_ZGO4YqrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGYCW6rbEe2-M8nuGout-A" elementId="org.eclipse.debug.ui.commands.TerminateAll" commandName="Terminate/Disconnect All" description="Terminate/Disconnect All" category="_ZGO4a6rbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGYCXKrbEe2-M8nuGout-A" elementId="org.eclipse.ui.edit.text.select.lineStart" commandName="Select Line Start" description="Select to the beginning of the line of text" category="_ZGO4WarbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGYCXarbEe2-M8nuGout-A" elementId="org.eclipse.egit.ui.commit.Reword" commandName="Reword Commit" category="_ZGO4dKrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGYCXqrbEe2-M8nuGout-A" elementId="org.eclipse.ui.editors.lineNumberToggle" commandName="Show Line Numbers" description="Toggle display of line numbers" category="_ZGO4WarbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGYCX6rbEe2-M8nuGout-A" elementId="org.springframework.tooling.boot.ls.rewrite.refactor" commandName="Refactor Spring Boot Project..." description="Rewrite Refactorings for Spring Boot projects" category="_ZGO4ZarbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGYCYKrbEe2-M8nuGout-A" elementId="org.eclipse.egit.ui.RepositoriesToggleBranchCommit" commandName="Toggle Latest Branch Commit" category="_ZGO4barbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGYCYarbEe2-M8nuGout-A" elementId="org.eclipse.tm.terminal.paste" commandName="Paste" category="_ZGO4aarbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGYCYqrbEe2-M8nuGout-A" elementId="org.eclipse.egit.ui.history.PushCommit" commandName="Push Commit..." category="_ZGO4dKrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGYCY6rbEe2-M8nuGout-A" elementId="org.eclipse.ui.ide.showInSystemExplorer" commandName="Show In (System Explorer)" description="Show in system's explorer (file manager)" category="_ZGO4WqrbEe2-M8nuGout-A">
+    <parameters xmi:id="_ZGYCZKrbEe2-M8nuGout-A" elementId="org.eclipse.ui.ide.showInSystemExplorer.path" name="Resource System Path Parameter"/>
   </commands>
-  <commands xmi:id="_JQ_32rjoEe25NdJK2M4KYw" elementId="org.eclipse.ui.edit.text.select.lineDown" commandName="Select Line Down" description="Extend the selection to the next line of text" category="_JQ_7ALjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_327joEe25NdJK2M4KYw" elementId="org.eclipse.jdt.ui.edit.text.java.sort.members" commandName="Sort Members" description="Sort all members using the member order preference" category="_JQ_7GLjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_33LjoEe25NdJK2M4KYw" elementId="org.eclipse.ui.edit.text.lowerCase" commandName="To Lower Case" description="Changes the selection to lower case" category="_JQ_7ALjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_33bjoEe25NdJK2M4KYw" elementId="org.eclipse.egit.ui.team.CompareWithIndex" commandName="Compare with Index" category="_JQ_7FLjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_33rjoEe25NdJK2M4KYw" elementId="org.eclipse.m2e.discovery.ui" commandName="m2e Marketplace" category="_JQ_7G7joEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_337joEe25NdJK2M4KYw" elementId="org.eclipse.ui.edit.text.zoomOut" commandName="Zoom Out" description="Zoom out text, decrease default font size for text editors" category="_JQ_7ALjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_34LjoEe25NdJK2M4KYw" elementId="org.eclipse.ui.file.save" commandName="Save" description="Save the current contents" category="_JQ_7BbjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_34bjoEe25NdJK2M4KYw" elementId="org.eclipse.jdt.ui.correction.assignAllParamsToNewFields.assist" commandName="Quick Assist - Assign all parameters to new fields" description="Invokes quick assist and selects 'Assign all parameters to new fields'" category="_JQ_7GLjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_34rjoEe25NdJK2M4KYw" elementId="org.eclipse.jdt.ui.edit.text.java.search.references.in.project" commandName="References in Project" description="Search for references to the selected element in the enclosing project" category="_JQ_7EbjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_347joEe25NdJK2M4KYw" elementId="org.eclipse.team.ui.applyPatch" commandName="Apply Patch..." description="Apply a patch to one or more workspace projects." category="_JQ_697joEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_35LjoEe25NdJK2M4KYw" elementId="org.eclipse.buildship.ui.commands.rundefaulttasks" commandName="Run Gradle Default Tasks" description="Runs the default tasks of the selected Gradle project" category="_JQ_7ErjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_35bjoEe25NdJK2M4KYw" elementId="org.eclipse.ui.edit.text.select.lineEnd" commandName="Select Line End" description="Select to the end of the line of text" category="_JQ_7ALjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_35rjoEe25NdJK2M4KYw" elementId="org.eclipse.jdt.ui.edit.text.java.move.element" commandName="Move - Refactoring " description="Move the selected element to a new location" category="_JQ_7CrjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_357joEe25NdJK2M4KYw" elementId="org.eclipse.ui.edit.text.select.wordPrevious" commandName="Select Previous Word" description="Select the previous word" category="_JQ_7ALjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_36LjoEe25NdJK2M4KYw" elementId="org.eclipse.debug.ui.commands.StepOver" commandName="Step Over" description="Step over" category="_JQ_7ErjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_36bjoEe25NdJK2M4KYw" elementId="org.eclipse.compare.selectPreviousChange" commandName="Select Previous Change" description="Select Previous Change" category="_JQ_7B7joEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_36rjoEe25NdJK2M4KYw" elementId="org.eclipse.ui.file.exit" commandName="Exit" description="Exit the application" category="_JQ_7BbjoEe25NdJK2M4KYw">
-    <parameters xmi:id="_JQ_367joEe25NdJK2M4KYw" elementId="mayPrompt" name="may prompt"/>
+  <commands xmi:id="_ZGYCZarbEe2-M8nuGout-A" elementId="org.eclipse.ui.edit.text.select.lineDown" commandName="Select Line Down" description="Extend the selection to the next line of text" category="_ZGO4WarbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGYCZqrbEe2-M8nuGout-A" elementId="org.eclipse.jdt.ui.edit.text.java.sort.members" commandName="Sort Members" description="Sort all members using the member order preference" category="_ZGO4carbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGYCZ6rbEe2-M8nuGout-A" elementId="org.eclipse.ui.edit.text.lowerCase" commandName="To Lower Case" description="Changes the selection to lower case" category="_ZGO4WarbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGYCaKrbEe2-M8nuGout-A" elementId="org.eclipse.egit.ui.team.CompareWithIndex" commandName="Compare with Index" category="_ZGO4barbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGYCaarbEe2-M8nuGout-A" elementId="org.eclipse.m2e.discovery.ui" commandName="m2e Marketplace" category="_ZGO4dKrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGYCaqrbEe2-M8nuGout-A" elementId="org.eclipse.ui.edit.text.zoomOut" commandName="Zoom Out" description="Zoom out text, decrease default font size for text editors" category="_ZGO4WarbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGYCa6rbEe2-M8nuGout-A" elementId="org.eclipse.ui.file.save" commandName="Save" description="Save the current contents" category="_ZGO4XqrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGYCbKrbEe2-M8nuGout-A" elementId="org.eclipse.jdt.ui.correction.assignAllParamsToNewFields.assist" commandName="Quick Assist - Assign all parameters to new fields" description="Invokes quick assist and selects 'Assign all parameters to new fields'" category="_ZGO4carbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGYCbarbEe2-M8nuGout-A" elementId="org.eclipse.jdt.ui.edit.text.java.search.references.in.project" commandName="References in Project" description="Search for references to the selected element in the enclosing project" category="_ZGO4aqrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGYCbqrbEe2-M8nuGout-A" elementId="org.eclipse.team.ui.applyPatch" commandName="Apply Patch..." description="Apply a patch to one or more workspace projects." category="_ZGO4UKrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGYCb6rbEe2-M8nuGout-A" elementId="org.eclipse.buildship.ui.commands.rundefaulttasks" commandName="Run Gradle Default Tasks" description="Runs the default tasks of the selected Gradle project" category="_ZGO4a6rbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGYCcKrbEe2-M8nuGout-A" elementId="org.eclipse.ui.edit.text.select.lineEnd" commandName="Select Line End" description="Select to the end of the line of text" category="_ZGO4WarbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGYCcarbEe2-M8nuGout-A" elementId="org.eclipse.jdt.ui.edit.text.java.move.element" commandName="Move - Refactoring " description="Move the selected element to a new location" category="_ZGO4Y6rbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGYCcqrbEe2-M8nuGout-A" elementId="org.eclipse.ui.edit.text.select.wordPrevious" commandName="Select Previous Word" description="Select the previous word" category="_ZGO4WarbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGYCc6rbEe2-M8nuGout-A" elementId="org.eclipse.debug.ui.commands.StepOver" commandName="Step Over" description="Step over" category="_ZGO4a6rbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGYCdKrbEe2-M8nuGout-A" elementId="org.eclipse.compare.selectPreviousChange" commandName="Select Previous Change" description="Select Previous Change" category="_ZGO4YKrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGYCdarbEe2-M8nuGout-A" elementId="org.eclipse.ui.file.exit" commandName="Exit" description="Exit the application" category="_ZGO4XqrbEe2-M8nuGout-A">
+    <parameters xmi:id="_ZGYCdqrbEe2-M8nuGout-A" elementId="mayPrompt" name="may prompt"/>
   </commands>
-  <commands xmi:id="_JQ_37LjoEe25NdJK2M4KYw" elementId="org.eclipse.egit.ui.team.CompareWithHead" commandName="Compare with HEAD Revision" category="_JQ_7FLjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_37bjoEe25NdJK2M4KYw" elementId="org.eclipse.egit.ui.team.CompareWithCommit" commandName="Compare with Commit..." category="_JQ_7FLjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_37rjoEe25NdJK2M4KYw" elementId="org.eclipse.egit.ui.RepositoriesViewOpen" commandName="Open" category="_JQ_7FLjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_377joEe25NdJK2M4KYw" elementId="org.eclipse.egit.ui.team.ShowHistory" commandName="Show in History" category="_JQ_7FLjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_38LjoEe25NdJK2M4KYw" elementId="org.eclipse.jdt.ui.edit.text.java.toggle.codemining" commandName="Toggle Code Mining" description="Toggle Code Mining Annotations" category="_JQ_7EbjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_38bjoEe25NdJK2M4KYw" elementId="org.eclipse.m2e.core.ui.command.updateProject" commandName="Update Maven Project" description="Update Maven project configuration and dependencies" category="_JQ_7CbjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_38rjoEe25NdJK2M4KYw" elementId="org.eclipse.tools.layout.spy.commands.layoutSpyCommand" commandName="Layout Spy" description="Show the Layout Spy" category="_JQ_7GbjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_387joEe25NdJK2M4KYw" elementId="org.eclipse.egit.ui.team.SimplePush" commandName="Push to Upstream" category="_JQ_7FLjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_39LjoEe25NdJK2M4KYw" elementId="org.eclipse.debug.ui.commands.addMemoryMonitor" commandName="Add Memory Block" description="Add memory block" category="_JQ_7ErjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_39bjoEe25NdJK2M4KYw" elementId="org.eclipse.linuxtools.docker.ui.commands.commitContainer" commandName="Commit" description="Commit the selected container into a new image" category="_JQ_7G7joEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_39rjoEe25NdJK2M4KYw" elementId="org.eclipse.pde.ui.organizeManifest" commandName="Organize Manifests" description="Cleans up plug-in manifest files" category="_JQ_7G7joEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_397joEe25NdJK2M4KYw" elementId="org.eclipse.jdt.junit.junitShortcut.run" commandName="Run JUnit Test" description="Run JUnit Test" category="_JQ_7ErjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_3-LjoEe25NdJK2M4KYw" elementId="org.eclipse.egit.ui.PushHeadToGerrit" commandName="Push Current Head to Gerrit" category="_JQ_7FLjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_3-bjoEe25NdJK2M4KYw" elementId="org.eclipse.ui.edit.selectAll" commandName="Select All" description="Select all" category="_JQ_6-7joEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_3-rjoEe25NdJK2M4KYw" elementId="com.genuitec.eclipse.inlinesearch.commands.showFindReplaceBarCommand" commandName="Show Inline Search" category="_JQ_7HLjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_3-7joEe25NdJK2M4KYw" elementId="org.eclipse.jdt.ui.edit.text.java.show.outline" commandName="Quick Outline" description="Show the quick outline for the editor input" category="_JQ_7AbjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_3_LjoEe25NdJK2M4KYw" elementId="org.eclipse.jdt.ui.edit.text.java.goto.next.member" commandName="Go to Next Member" description="Move the caret to the next member of the compilation unit" category="_JQ_7AbjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_3_bjoEe25NdJK2M4KYw" elementId="org.eclipse.ui.project.rebuildProject" commandName="Rebuild Project" description="Rebuild the selected projects" category="_JQ_7DbjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_3_rjoEe25NdJK2M4KYw" elementId="org.eclipse.m2e.core.pomFileAction.run" commandName="Run Maven Build" description="Run Maven Build" category="_JQ_7ErjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_3_7joEe25NdJK2M4KYw" elementId="org.eclipse.egit.gitflow.ui.command.init" commandName="Init Gitflow..." category="_JQ_7FLjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_4ALjoEe25NdJK2M4KYw" elementId="org.eclipse.egit.gitflow.ui.command.releaseStart" commandName="Start Release" category="_JQ_7FLjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_4AbjoEe25NdJK2M4KYw" elementId="org.eclipse.m2e.actions.LifeCycleInstall.run" commandName="Run Maven Install" description="Run Maven Install" category="_JQ_7ErjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_4ArjoEe25NdJK2M4KYw" elementId="org.eclipse.ui.edit.text.copyLineDown" commandName="Copy Lines" description="Duplicates the selected lines and moves the selection to the copy" category="_JQ_7ALjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_4A7joEe25NdJK2M4KYw" elementId="org.eclipse.egit.gitflow.ui.command.compareWithDevelop" commandName="Compare with develop branch" category="_JQ_7FLjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_4BLjoEe25NdJK2M4KYw" elementId="org.eclipse.linuxtools.docker.ui.commands.tagImage" commandName="Add &amp;Tag" description="Add a tag to an Image" category="_JQ_7G7joEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_4BbjoEe25NdJK2M4KYw" elementId="org.eclipse.ui.edit.text.select.selectMultiSelectionUp" commandName="Multi selection up relative to anchor selection" description="Search next matching region above and add it to the current selection, or remove last element from current multi-selection " category="_JQ_7ALjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_4BrjoEe25NdJK2M4KYw" elementId="org.eclipse.jdt.ui.edit.text.java.raw.paste" commandName="Raw Paste" description="Paste and ignore smart insert setting" category="_JQ_6-7joEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_4B7joEe25NdJK2M4KYw" elementId="org.eclipse.ui.help.installationDialog" commandName="Installation Information" description="Open the installation dialog" category="_JQ_7C7joEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_4CLjoEe25NdJK2M4KYw" elementId="org.eclipse.debug.ui.commands.ToggleStepFilters" commandName="Use Step Filters" description="Toggles enablement of debug step filters" category="_JQ_7ErjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_4CbjoEe25NdJK2M4KYw" elementId="org.eclipse.ui.edit.text.goto.lineUp" commandName="Line Up" description="Go up one line of text" category="_JQ_7ALjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_4CrjoEe25NdJK2M4KYw" elementId="org.eclipse.ui.edit.text.goto.windowStart" commandName="Window Start" description="Go to the start of the window" category="_JQ_7ALjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_4C7joEe25NdJK2M4KYw" elementId="org.eclipse.jdt.ui.correction.addBlock.assist" commandName="Quick Assist - Replace statement with block" description="Invokes quick assist and selects 'Replace statement with block'" category="_JQ_7GLjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_4DLjoEe25NdJK2M4KYw" elementId="org.eclipse.egit.ui.commit.DiffEditorQuickOutlineCommand" commandName="Quick Outline" description="Show the quick outline for a unified diff" category="_JQ_7FLjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_4DbjoEe25NdJK2M4KYw" elementId="org.eclipse.jdt.ui.edit.text.java.select.enclosing" commandName="Select Enclosing Element" description="Expand selection to include enclosing element" category="_JQ_6-7joEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_4DrjoEe25NdJK2M4KYw" elementId="org.eclipse.ant.ui.antShortcut.debug" commandName="Debug Ant Build" description="Debug Ant Build" category="_JQ_7ErjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_4D7joEe25NdJK2M4KYw" elementId="org.eclipse.egit.ui.team.AssumeUnchanged" commandName="Assume Unchanged" category="_JQ_7FLjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_4ELjoEe25NdJK2M4KYw" elementId="org.eclipse.ui.window.closePerspective" commandName="Close Perspective" description="Close the current perspective" category="_JQ_7CbjoEe25NdJK2M4KYw">
-    <parameters xmi:id="_JQ_4EbjoEe25NdJK2M4KYw" elementId="org.eclipse.ui.window.closePerspective.perspectiveId" name="Perspective Id"/>
+  <commands xmi:id="_ZGYCd6rbEe2-M8nuGout-A" elementId="org.eclipse.egit.ui.team.CompareWithHead" commandName="Compare with HEAD Revision" category="_ZGO4barbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGYCeKrbEe2-M8nuGout-A" elementId="org.eclipse.egit.ui.team.CompareWithCommit" commandName="Compare with Commit..." category="_ZGO4barbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGYCearbEe2-M8nuGout-A" elementId="org.eclipse.egit.ui.RepositoriesViewOpen" commandName="Open" category="_ZGO4barbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGYCeqrbEe2-M8nuGout-A" elementId="org.eclipse.egit.ui.team.ShowHistory" commandName="Show in History" category="_ZGO4barbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGYCe6rbEe2-M8nuGout-A" elementId="org.eclipse.jdt.ui.edit.text.java.toggle.codemining" commandName="Toggle Code Mining" description="Toggle Code Mining Annotations" category="_ZGO4aqrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGYCfKrbEe2-M8nuGout-A" elementId="org.eclipse.m2e.core.ui.command.updateProject" commandName="Update Maven Project" description="Update Maven project configuration and dependencies" category="_ZGO4YqrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGYCfarbEe2-M8nuGout-A" elementId="org.eclipse.tools.layout.spy.commands.layoutSpyCommand" commandName="Layout Spy" description="Show the Layout Spy" category="_ZGO4cqrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGYCfqrbEe2-M8nuGout-A" elementId="org.eclipse.egit.ui.team.SimplePush" commandName="Push to Upstream" category="_ZGO4barbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGYCf6rbEe2-M8nuGout-A" elementId="org.eclipse.debug.ui.commands.addMemoryMonitor" commandName="Add Memory Block" description="Add memory block" category="_ZGO4a6rbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGYCgKrbEe2-M8nuGout-A" elementId="org.eclipse.linuxtools.docker.ui.commands.commitContainer" commandName="Commit" description="Commit the selected container into a new image" category="_ZGO4dKrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGYCgarbEe2-M8nuGout-A" elementId="org.eclipse.pde.ui.organizeManifest" commandName="Organize Manifests" description="Cleans up plug-in manifest files" category="_ZGO4dKrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGYpUKrbEe2-M8nuGout-A" elementId="org.eclipse.jdt.junit.junitShortcut.run" commandName="Run JUnit Test" description="Run JUnit Test" category="_ZGO4a6rbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGYpUarbEe2-M8nuGout-A" elementId="org.eclipse.egit.ui.PushHeadToGerrit" commandName="Push Current Head to Gerrit" category="_ZGO4barbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGYpUqrbEe2-M8nuGout-A" elementId="org.eclipse.ui.edit.selectAll" commandName="Select All" description="Select all" category="_ZGO4VKrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGYpU6rbEe2-M8nuGout-A" elementId="com.genuitec.eclipse.inlinesearch.commands.showFindReplaceBarCommand" commandName="Show Inline Search" category="_ZGO4darbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGYpVKrbEe2-M8nuGout-A" elementId="org.eclipse.jdt.ui.edit.text.java.show.outline" commandName="Quick Outline" description="Show the quick outline for the editor input" category="_ZGO4WqrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGYpVarbEe2-M8nuGout-A" elementId="org.eclipse.jdt.ui.edit.text.java.goto.next.member" commandName="Go to Next Member" description="Move the caret to the next member of the compilation unit" category="_ZGO4WqrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGYpVqrbEe2-M8nuGout-A" elementId="org.eclipse.ui.project.rebuildProject" commandName="Rebuild Project" description="Rebuild the selected projects" category="_ZGO4ZqrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGYpV6rbEe2-M8nuGout-A" elementId="org.eclipse.m2e.core.pomFileAction.run" commandName="Run Maven Build" description="Run Maven Build" category="_ZGO4a6rbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGYpWKrbEe2-M8nuGout-A" elementId="org.eclipse.egit.gitflow.ui.command.init" commandName="Init Gitflow..." category="_ZGO4barbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGYpWarbEe2-M8nuGout-A" elementId="org.eclipse.egit.gitflow.ui.command.releaseStart" commandName="Start Release" category="_ZGO4barbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGYpWqrbEe2-M8nuGout-A" elementId="org.eclipse.m2e.actions.LifeCycleInstall.run" commandName="Run Maven Install" description="Run Maven Install" category="_ZGO4a6rbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGYpW6rbEe2-M8nuGout-A" elementId="org.eclipse.ui.edit.text.copyLineDown" commandName="Copy Lines" description="Duplicates the selected lines and moves the selection to the copy" category="_ZGO4WarbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGYpXKrbEe2-M8nuGout-A" elementId="org.eclipse.egit.gitflow.ui.command.compareWithDevelop" commandName="Compare with develop branch" category="_ZGO4barbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGYpXarbEe2-M8nuGout-A" elementId="org.eclipse.linuxtools.docker.ui.commands.tagImage" commandName="Add &amp;Tag" description="Add a tag to an Image" category="_ZGO4dKrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGYpXqrbEe2-M8nuGout-A" elementId="org.eclipse.ui.edit.text.select.selectMultiSelectionUp" commandName="Multi selection up relative to anchor selection" description="Search next matching region above and add it to the current selection, or remove last element from current multi-selection " category="_ZGO4WarbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGYpX6rbEe2-M8nuGout-A" elementId="org.eclipse.jdt.ui.edit.text.java.raw.paste" commandName="Raw Paste" description="Paste and ignore smart insert setting" category="_ZGO4VKrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGYpYKrbEe2-M8nuGout-A" elementId="org.eclipse.ui.help.installationDialog" commandName="Installation Information" description="Open the installation dialog" category="_ZGO4ZKrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGYpYarbEe2-M8nuGout-A" elementId="org.eclipse.debug.ui.commands.ToggleStepFilters" commandName="Use Step Filters" description="Toggles enablement of debug step filters" category="_ZGO4a6rbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGYpYqrbEe2-M8nuGout-A" elementId="org.eclipse.ui.edit.text.goto.lineUp" commandName="Line Up" description="Go up one line of text" category="_ZGO4WarbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGYpY6rbEe2-M8nuGout-A" elementId="org.eclipse.ui.edit.text.goto.windowStart" commandName="Window Start" description="Go to the start of the window" category="_ZGO4WarbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGYpZKrbEe2-M8nuGout-A" elementId="org.eclipse.jdt.ui.correction.addBlock.assist" commandName="Quick Assist - Replace statement with block" description="Invokes quick assist and selects 'Replace statement with block'" category="_ZGO4carbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGYpZarbEe2-M8nuGout-A" elementId="org.eclipse.egit.ui.commit.DiffEditorQuickOutlineCommand" commandName="Quick Outline" description="Show the quick outline for a unified diff" category="_ZGO4barbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGYpZqrbEe2-M8nuGout-A" elementId="org.eclipse.jdt.ui.edit.text.java.select.enclosing" commandName="Select Enclosing Element" description="Expand selection to include enclosing element" category="_ZGO4VKrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGYpZ6rbEe2-M8nuGout-A" elementId="org.eclipse.ant.ui.antShortcut.debug" commandName="Debug Ant Build" description="Debug Ant Build" category="_ZGO4a6rbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGYpaKrbEe2-M8nuGout-A" elementId="org.eclipse.egit.ui.team.AssumeUnchanged" commandName="Assume Unchanged" category="_ZGO4barbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGYpaarbEe2-M8nuGout-A" elementId="org.eclipse.ui.window.closePerspective" commandName="Close Perspective" description="Close the current perspective" category="_ZGO4YqrbEe2-M8nuGout-A">
+    <parameters xmi:id="_ZGYpaqrbEe2-M8nuGout-A" elementId="org.eclipse.ui.window.closePerspective.perspectiveId" name="Perspective Id"/>
   </commands>
-  <commands xmi:id="_JQ_4ErjoEe25NdJK2M4KYw" elementId="org.springframework.ide.eclipse.boot.dash.ShowBootDashboard" commandName="Boot Dashboard" description="Show Boot Dashboard view" category="_JQ_7G7joEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_4E7joEe25NdJK2M4KYw" elementId="org.eclipse.linuxtools.docker.ui.commands.execContainer" commandName="Execute Shell" description="Get an interactive shell into this container" category="_JQ_7G7joEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_4FLjoEe25NdJK2M4KYw" elementId="org.eclipse.ui.cheatsheets.openCheatSheetURL" commandName="Open Cheat Sheet from URL" description="Open a Cheat Sheet from file at a specified URL." category="_JQ_7C7joEe25NdJK2M4KYw">
-    <parameters xmi:id="_JQ_4FbjoEe25NdJK2M4KYw" elementId="cheatSheetId" name="Identifier" optional="false"/>
-    <parameters xmi:id="_JQ_4FrjoEe25NdJK2M4KYw" elementId="name" name="Name" optional="false"/>
-    <parameters xmi:id="_JQ_4F7joEe25NdJK2M4KYw" elementId="url" name="URL" optional="false"/>
+  <commands xmi:id="_ZGYpa6rbEe2-M8nuGout-A" elementId="org.springframework.ide.eclipse.boot.dash.ShowBootDashboard" commandName="Boot Dashboard" description="Show Boot Dashboard view" category="_ZGO4dKrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGYpbKrbEe2-M8nuGout-A" elementId="org.eclipse.linuxtools.docker.ui.commands.execContainer" commandName="Execute Shell" description="Get an interactive shell into this container" category="_ZGO4dKrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGYpbarbEe2-M8nuGout-A" elementId="org.eclipse.ui.cheatsheets.openCheatSheetURL" commandName="Open Cheat Sheet from URL" description="Open a Cheat Sheet from file at a specified URL." category="_ZGO4ZKrbEe2-M8nuGout-A">
+    <parameters xmi:id="_ZGYpbqrbEe2-M8nuGout-A" elementId="cheatSheetId" name="Identifier" optional="false"/>
+    <parameters xmi:id="_ZGYpb6rbEe2-M8nuGout-A" elementId="name" name="Name" optional="false"/>
+    <parameters xmi:id="_ZGYpcKrbEe2-M8nuGout-A" elementId="url" name="URL" optional="false"/>
   </commands>
-  <commands xmi:id="_JQ_4GLjoEe25NdJK2M4KYw" elementId="org.eclipse.linuxtools.docker.ui.commands.addConnection" commandName="&amp;Add Connection" category="_JQ_7G7joEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_4GbjoEe25NdJK2M4KYw" elementId="org.eclipse.egit.ui.team.PushBranch" commandName="Push Branch..." category="_JQ_7FLjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_4GrjoEe25NdJK2M4KYw" elementId="org.eclipse.m2e.core.ui.command.addDependency" commandName="Add Maven Dependency" description="Add Maven dependency" category="_JQ_6-7joEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_4G7joEe25NdJK2M4KYw" elementId="org.eclipse.jdt.debug.ui.commands.Execute" commandName="Execute" description="Evaluate selected text" category="_JQ_7ErjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_4HLjoEe25NdJK2M4KYw" elementId="org.eclipse.jdt.ui.edit.text.java.add.block.comment" commandName="Add Block Comment" description="Enclose the selection with a block comment" category="_JQ_7GLjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_4HbjoEe25NdJK2M4KYw" elementId="org.eclipse.jdt.ui.edit.text.java.search.read.access.in.project" commandName="Read Access in Project" description="Search for read references to the selected element in the enclosing project" category="_JQ_7EbjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_4HrjoEe25NdJK2M4KYw" elementId="org.eclipse.ui.file.closeAllSaved" commandName="Close All Saved" description="Close all saved editors" category="_JQ_7BbjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_4H7joEe25NdJK2M4KYw" elementId="org.eclipse.wst.server.launchShortcut.run" commandName="Run on Server" description="Run the current selection on a server" category="_JQ_7ErjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_4ILjoEe25NdJK2M4KYw" elementId="org.eclipse.ui.edit.redo" commandName="Redo" description="Redo the last operation" category="_JQ_6-7joEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_4IbjoEe25NdJK2M4KYw" elementId="org.eclipse.wst.server.launchShortcut.debug" commandName="Debug on Server" description="Debug the current selection on a server" category="_JQ_7ErjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_4IrjoEe25NdJK2M4KYw" elementId="org.eclipse.m2e.editor.RenameArtifactAction" commandName="Rename Maven Artifact..." category="_JQ_7G7joEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_4I7joEe25NdJK2M4KYw" elementId="org.eclipse.ui.navigate.selectWorkingSets" commandName="Select Working Sets" description="Select the working sets that are applicable for this window." category="_JQ_7CbjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_4JLjoEe25NdJK2M4KYw" elementId="org.eclipse.linuxtools.docker.ui.commands.displayContainerLog" commandName="Display Log" description="Display the log for the selected container in the Console" category="_JQ_7G7joEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_4JbjoEe25NdJK2M4KYw" elementId="org.eclipse.jdt.ui.edit.text.java.rename.element" commandName="Rename - Refactoring " description="Rename the selected element" category="_JQ_7CrjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_4JrjoEe25NdJK2M4KYw" elementId="org.eclipse.pde.api.tools.ui.remove.filters" commandName="Remove &amp;API Problem Filters..." description="Remove API problem filters for this project" category="_JQ_7G7joEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_4J7joEe25NdJK2M4KYw" elementId="org.eclipse.tm.terminal.view.ui.command.newview" commandName="New Terminal View" category="_JQ_7BrjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_4KLjoEe25NdJK2M4KYw" elementId="org.eclipse.jdt.ui.edit.text.java.externalize.strings" commandName="Externalize Strings" description="Finds all strings that are not externalized and moves them into a separate property file" category="_JQ_7GLjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_4KbjoEe25NdJK2M4KYw" elementId="org.eclipse.lsp4e.showkindinoutline" commandName="Show Kind in Outline" category="_JQ_7BLjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_4KrjoEe25NdJK2M4KYw" elementId="org.eclipse.ui.file.close" commandName="Close" description="Close the active editor" category="_JQ_7BbjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_4K7joEe25NdJK2M4KYw" elementId="org.eclipse.jdt.ui.edit.text.java.surround.with.try.catch" commandName="Surround with try/catch Block" description="Surround the selected text with a try/catch block" category="_JQ_7GLjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_4LLjoEe25NdJK2M4KYw" elementId="org.eclipse.egit.gitflow.ui.command.featureStart" commandName="Start Feature" category="_JQ_7FLjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_4LbjoEe25NdJK2M4KYw" elementId="org.eclipse.jdt.ui.edit.text.java.goto.previous.member" commandName="Go to Previous Member" description="Move the caret to the previous member of the compilation unit" category="_JQ_7AbjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_4LrjoEe25NdJK2M4KYw" elementId="org.eclipse.egit.ui.history.Reset" commandName="Reset..." category="_JQ_7G7joEe25NdJK2M4KYw">
-    <parameters xmi:id="_JQ_4L7joEe25NdJK2M4KYw" elementId="org.eclipse.egit.ui.history.ResetMode" name="Reset mode" optional="false"/>
+  <commands xmi:id="_ZGYpcarbEe2-M8nuGout-A" elementId="org.eclipse.linuxtools.docker.ui.commands.addConnection" commandName="&amp;Add Connection" category="_ZGO4dKrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGYpcqrbEe2-M8nuGout-A" elementId="org.eclipse.egit.ui.team.PushBranch" commandName="Push Branch..." category="_ZGO4barbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGYpc6rbEe2-M8nuGout-A" elementId="org.eclipse.m2e.core.ui.command.addDependency" commandName="Add Maven Dependency" description="Add Maven dependency" category="_ZGO4VKrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGYpdKrbEe2-M8nuGout-A" elementId="org.eclipse.jdt.debug.ui.commands.Execute" commandName="Execute" description="Evaluate selected text" category="_ZGO4a6rbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGYpdarbEe2-M8nuGout-A" elementId="org.eclipse.jdt.ui.edit.text.java.add.block.comment" commandName="Add Block Comment" description="Enclose the selection with a block comment" category="_ZGO4carbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGYpdqrbEe2-M8nuGout-A" elementId="org.eclipse.jdt.ui.edit.text.java.search.read.access.in.project" commandName="Read Access in Project" description="Search for read references to the selected element in the enclosing project" category="_ZGO4aqrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGYpd6rbEe2-M8nuGout-A" elementId="org.eclipse.ui.file.closeAllSaved" commandName="Close All Saved" description="Close all saved editors" category="_ZGO4XqrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGYpeKrbEe2-M8nuGout-A" elementId="org.eclipse.wst.server.launchShortcut.run" commandName="Run on Server" description="Run the current selection on a server" category="_ZGO4a6rbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGYpearbEe2-M8nuGout-A" elementId="org.eclipse.ui.edit.redo" commandName="Redo" description="Redo the last operation" category="_ZGO4VKrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGYpeqrbEe2-M8nuGout-A" elementId="org.eclipse.wst.server.launchShortcut.debug" commandName="Debug on Server" description="Debug the current selection on a server" category="_ZGO4a6rbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGYpe6rbEe2-M8nuGout-A" elementId="org.eclipse.m2e.editor.RenameArtifactAction" commandName="Rename Maven Artifact..." category="_ZGO4dKrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGYpfKrbEe2-M8nuGout-A" elementId="org.eclipse.ui.navigate.selectWorkingSets" commandName="Select Working Sets" description="Select the working sets that are applicable for this window." category="_ZGO4YqrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGYpfarbEe2-M8nuGout-A" elementId="org.eclipse.linuxtools.docker.ui.commands.displayContainerLog" commandName="Display Log" description="Display the log for the selected container in the Console" category="_ZGO4dKrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGYpfqrbEe2-M8nuGout-A" elementId="org.eclipse.jdt.ui.edit.text.java.rename.element" commandName="Rename - Refactoring " description="Rename the selected element" category="_ZGO4Y6rbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGYpf6rbEe2-M8nuGout-A" elementId="org.eclipse.pde.api.tools.ui.remove.filters" commandName="Remove &amp;API Problem Filters..." description="Remove API problem filters for this project" category="_ZGO4dKrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGYpgKrbEe2-M8nuGout-A" elementId="org.eclipse.tm.terminal.view.ui.command.newview" commandName="New Terminal View" category="_ZGO4X6rbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGYpgarbEe2-M8nuGout-A" elementId="org.eclipse.jdt.ui.edit.text.java.externalize.strings" commandName="Externalize Strings" description="Finds all strings that are not externalized and moves them into a separate property file" category="_ZGO4carbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGYpgqrbEe2-M8nuGout-A" elementId="org.eclipse.lsp4e.showkindinoutline" commandName="Show Kind in Outline" category="_ZGO4XarbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGYpg6rbEe2-M8nuGout-A" elementId="org.eclipse.ui.file.close" commandName="Close" description="Close the active editor" category="_ZGO4XqrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGYphKrbEe2-M8nuGout-A" elementId="org.eclipse.jdt.ui.edit.text.java.surround.with.try.catch" commandName="Surround with try/catch Block" description="Surround the selected text with a try/catch block" category="_ZGO4carbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGYpharbEe2-M8nuGout-A" elementId="org.eclipse.egit.gitflow.ui.command.featureStart" commandName="Start Feature" category="_ZGO4barbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGYphqrbEe2-M8nuGout-A" elementId="org.eclipse.jdt.ui.edit.text.java.goto.previous.member" commandName="Go to Previous Member" description="Move the caret to the previous member of the compilation unit" category="_ZGO4WqrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGYph6rbEe2-M8nuGout-A" elementId="org.eclipse.egit.ui.history.Reset" commandName="Reset..." category="_ZGO4dKrbEe2-M8nuGout-A">
+    <parameters xmi:id="_ZGYpiKrbEe2-M8nuGout-A" elementId="org.eclipse.egit.ui.history.ResetMode" name="Reset mode" optional="false"/>
   </commands>
-  <commands xmi:id="_JQ_4MLjoEe25NdJK2M4KYw" elementId="org.eclipse.ui.navigate.previousSubTab" commandName="Previous Sub-Tab" description="Switch to the previous sub-tab" category="_JQ_7AbjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_4MbjoEe25NdJK2M4KYw" elementId="org.eclipse.jdt.ui.edit.text.java.generate.hashcode.equals" commandName="Generate hashCode() and equals()" description="Generates hashCode() and equals() methods for the type" category="_JQ_7GLjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_4MrjoEe25NdJK2M4KYw" elementId="org.eclipse.ui.navigate.showIn" commandName="Show In" category="_JQ_7AbjoEe25NdJK2M4KYw">
-    <parameters xmi:id="_JQ_4M7joEe25NdJK2M4KYw" elementId="org.eclipse.ui.navigate.showIn.targetId" name="Show In Target Id" optional="false"/>
+  <commands xmi:id="_ZGYpiarbEe2-M8nuGout-A" elementId="org.eclipse.ui.navigate.previousSubTab" commandName="Previous Sub-Tab" description="Switch to the previous sub-tab" category="_ZGO4WqrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGYpiqrbEe2-M8nuGout-A" elementId="org.eclipse.jdt.ui.edit.text.java.generate.hashcode.equals" commandName="Generate hashCode() and equals()" description="Generates hashCode() and equals() methods for the type" category="_ZGO4carbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGYpi6rbEe2-M8nuGout-A" elementId="org.eclipse.ui.navigate.showIn" commandName="Show In" category="_ZGO4WqrbEe2-M8nuGout-A">
+    <parameters xmi:id="_ZGYpjKrbEe2-M8nuGout-A" elementId="org.eclipse.ui.navigate.showIn.targetId" name="Show In Target Id" optional="false"/>
   </commands>
-  <commands xmi:id="_JQ_4NLjoEe25NdJK2M4KYw" elementId="org.eclipse.egit.ui.RepositoriesViewRemoveRemote" commandName="Delete Remote" category="_JQ_7FLjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_4NbjoEe25NdJK2M4KYw" elementId="org.eclipse.linuxtools.docker.ui.commands.showInWebBrowser" commandName="Web Browser" description="Show in Web Browser" category="_JQ_7G7joEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_4NrjoEe25NdJK2M4KYw" elementId="org.eclipse.ui.dialogs.openInputDialog" commandName="Open Input Dialog" description="Open an Input Dialog" category="_JQ_7E7joEe25NdJK2M4KYw">
-    <parameters xmi:id="_JQ_4N7joEe25NdJK2M4KYw" elementId="title" name="Title"/>
-    <parameters xmi:id="_JQ_4OLjoEe25NdJK2M4KYw" elementId="message" name="Message"/>
-    <parameters xmi:id="_JQ_4ObjoEe25NdJK2M4KYw" elementId="initialValue" name="Initial Value"/>
-    <parameters xmi:id="_JQ_4OrjoEe25NdJK2M4KYw" elementId="cancelReturns" name="Return Value on Cancel"/>
+  <commands xmi:id="_ZGYpjarbEe2-M8nuGout-A" elementId="org.eclipse.egit.ui.RepositoriesViewRemoveRemote" commandName="Delete Remote" category="_ZGO4barbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGYpjqrbEe2-M8nuGout-A" elementId="org.eclipse.linuxtools.docker.ui.commands.showInWebBrowser" commandName="Web Browser" description="Show in Web Browser" category="_ZGO4dKrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGYpj6rbEe2-M8nuGout-A" elementId="org.eclipse.ui.dialogs.openInputDialog" commandName="Open Input Dialog" description="Open an Input Dialog" category="_ZGO4bKrbEe2-M8nuGout-A">
+    <parameters xmi:id="_ZGYpkKrbEe2-M8nuGout-A" elementId="title" name="Title"/>
+    <parameters xmi:id="_ZGYpkarbEe2-M8nuGout-A" elementId="message" name="Message"/>
+    <parameters xmi:id="_ZGYpkqrbEe2-M8nuGout-A" elementId="initialValue" name="Initial Value"/>
+    <parameters xmi:id="_ZGYpk6rbEe2-M8nuGout-A" elementId="cancelReturns" name="Return Value on Cancel"/>
   </commands>
-  <commands xmi:id="_JQ_4O7joEe25NdJK2M4KYw" elementId="org.eclipse.egit.ui.RebaseCurrent" commandName="Rebase" category="_JQ_7G7joEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_4PLjoEe25NdJK2M4KYw" elementId="org.eclipse.jdt.ui.edit.text.java.add.unimplemented.constructors" commandName="Generate Constructors from Superclass" description="Evaluate and add constructors from superclass" category="_JQ_7GLjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_4PbjoEe25NdJK2M4KYw" elementId="org.eclipse.ui.edit.text.select.windowStart" commandName="Select Window Start" description="Select to the start of the window" category="_JQ_7ALjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_4PrjoEe25NdJK2M4KYw" elementId="org.eclipse.jdt.ui.edit.text.java.source.quickMenu" commandName="Show Source Quick Menu" description="Shows the source quick menu" category="_JQ_7GLjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_4P7joEe25NdJK2M4KYw" elementId="org.eclipse.jdt.ui.edit.text.java.search.declarations.in.project" commandName="Declaration in Project" description="Search for declarations of the selected element in the enclosing project" category="_JQ_7EbjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_4QLjoEe25NdJK2M4KYw" elementId="org.eclipse.egit.ui.RepositoriesViewImportProjects" commandName="Import Projects..." description="Import or create in local Git repository" category="_JQ_7FLjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_4QbjoEe25NdJK2M4KYw" elementId="org.eclipse.linuxtools.docker.ui.commands.showAllContainers" commandName="&amp;Show all Containers" description="Show all Containers, including non-running ones." category="_JQ_7G7joEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_4QrjoEe25NdJK2M4KYw" elementId="org.eclipse.compare.copyAllLeftToRight" commandName="Copy All from Left to Right" description="Copy All Changes from Left to Right" category="_JQ_7B7joEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_4Q7joEe25NdJK2M4KYw" elementId="org.eclipse.jdt.ui.edit.text.java.surround.with.quickMenu" commandName="Surround With Quick Menu" description="Shows the Surround With quick menu" category="_JQ_7GLjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_4RLjoEe25NdJK2M4KYw" elementId="org.eclipse.search.ui.openFileSearchPage" commandName="File Search" description="Open the Search dialog's file search page" category="_JQ_7EbjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_4RbjoEe25NdJK2M4KYw" elementId="org.eclipse.jdt.ui.edit.text.java.search.implementors.in.workspace" commandName="Implementors in Workspace" description="Search for implementors of the selected interface" category="_JQ_7EbjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_4RrjoEe25NdJK2M4KYw" elementId="org.eclipse.linuxtools.docker.ui.commands.removeImages" commandName="Re&amp;move " description="Remove the selected images" category="_JQ_7G7joEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_4R7joEe25NdJK2M4KYw" elementId="org.eclipse.egit.ui.RepositoriesViewAddRepository" commandName="Add a Git Repository..." description="Adds an existing Git repository to the Git Repositories view" category="_JQ_7FLjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_4SLjoEe25NdJK2M4KYw" elementId="org.eclipse.jdt.debug.ui.breakpoint.properties" commandName="Java Breakpoint Properties" description="View and edit the properties for a given Java breakpoint" category="_JQ_7ErjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_4SbjoEe25NdJK2M4KYw" elementId="org.eclipse.jdt.ui.navigate.open.type.in.hierarchy" commandName="Open Type in Hierarchy" description="Open a type in the type hierarchy view" category="_JQ_7AbjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_4SrjoEe25NdJK2M4KYw" elementId="org.eclipse.ui.ide.copyBuildIdCommand" commandName="Copy Build Id Information To Clipboard" description="Copies the build identification information to the clipboard." category="_JQ_6-7joEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_4S7joEe25NdJK2M4KYw" elementId="org.eclipse.buildship.ui.commands.refreshproject" commandName="Refresh Gradle Project" description="Synchronizes the Gradle builds of the selected projects with the workspace" category="_JQ_6_rjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_4TLjoEe25NdJK2M4KYw" elementId="org.eclipse.ui.edit.text.select.textEnd" commandName="Select Text End" description="Select to the end of the text" category="_JQ_7ALjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_4TbjoEe25NdJK2M4KYw" elementId="org.eclipse.ui.edit.text.goto.wordPrevious" commandName="Previous Word" description="Go to the previous word" category="_JQ_7ALjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_4TrjoEe25NdJK2M4KYw" elementId="org.eclipse.tm.terminal.connector.local.command.launch" commandName="Open Local Terminal on Selection" category="_JQ_7BrjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_4T7joEe25NdJK2M4KYw" elementId="org.eclipse.ui.window.preferences" commandName="Preferences" description="Open the preferences dialog" category="_JQ_7CbjoEe25NdJK2M4KYw">
-    <parameters xmi:id="_JQ_4ULjoEe25NdJK2M4KYw" elementId="preferencePageId" name="Preference Page"/>
+  <commands xmi:id="_ZGYplKrbEe2-M8nuGout-A" elementId="org.eclipse.egit.ui.RebaseCurrent" commandName="Rebase" category="_ZGO4dKrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGYplarbEe2-M8nuGout-A" elementId="org.eclipse.jdt.ui.edit.text.java.add.unimplemented.constructors" commandName="Generate Constructors from Superclass" description="Evaluate and add constructors from superclass" category="_ZGO4carbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGYplqrbEe2-M8nuGout-A" elementId="org.eclipse.ui.edit.text.select.windowStart" commandName="Select Window Start" description="Select to the start of the window" category="_ZGO4WarbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGYpl6rbEe2-M8nuGout-A" elementId="org.eclipse.jdt.ui.edit.text.java.source.quickMenu" commandName="Show Source Quick Menu" description="Shows the source quick menu" category="_ZGO4carbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGYpmKrbEe2-M8nuGout-A" elementId="org.eclipse.jdt.ui.edit.text.java.search.declarations.in.project" commandName="Declaration in Project" description="Search for declarations of the selected element in the enclosing project" category="_ZGO4aqrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGYpmarbEe2-M8nuGout-A" elementId="org.eclipse.egit.ui.RepositoriesViewImportProjects" commandName="Import Projects..." description="Import or create in local Git repository" category="_ZGO4barbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGYpmqrbEe2-M8nuGout-A" elementId="org.eclipse.linuxtools.docker.ui.commands.showAllContainers" commandName="&amp;Show all Containers" description="Show all Containers, including non-running ones." category="_ZGO4dKrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGYpm6rbEe2-M8nuGout-A" elementId="org.eclipse.compare.copyAllLeftToRight" commandName="Copy All from Left to Right" description="Copy All Changes from Left to Right" category="_ZGO4YKrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGZQYKrbEe2-M8nuGout-A" elementId="org.eclipse.jdt.ui.edit.text.java.surround.with.quickMenu" commandName="Surround With Quick Menu" description="Shows the Surround With quick menu" category="_ZGO4carbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGZQYarbEe2-M8nuGout-A" elementId="org.eclipse.search.ui.openFileSearchPage" commandName="File Search" description="Open the Search dialog's file search page" category="_ZGO4aqrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGZQYqrbEe2-M8nuGout-A" elementId="org.eclipse.jdt.ui.edit.text.java.search.implementors.in.workspace" commandName="Implementors in Workspace" description="Search for implementors of the selected interface" category="_ZGO4aqrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGZQY6rbEe2-M8nuGout-A" elementId="org.eclipse.linuxtools.docker.ui.commands.removeImages" commandName="Re&amp;move " description="Remove the selected images" category="_ZGO4dKrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGZQZKrbEe2-M8nuGout-A" elementId="org.eclipse.egit.ui.RepositoriesViewAddRepository" commandName="Add a Git Repository..." description="Adds an existing Git repository to the Git Repositories view" category="_ZGO4barbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGZQZarbEe2-M8nuGout-A" elementId="org.eclipse.jdt.debug.ui.breakpoint.properties" commandName="Java Breakpoint Properties" description="View and edit the properties for a given Java breakpoint" category="_ZGO4a6rbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGZQZqrbEe2-M8nuGout-A" elementId="org.eclipse.jdt.ui.navigate.open.type.in.hierarchy" commandName="Open Type in Hierarchy" description="Open a type in the type hierarchy view" category="_ZGO4WqrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGZQZ6rbEe2-M8nuGout-A" elementId="org.eclipse.ui.ide.copyBuildIdCommand" commandName="Copy Build Id Information To Clipboard" description="Copies the build identification information to the clipboard." category="_ZGO4VKrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGZQaKrbEe2-M8nuGout-A" elementId="org.eclipse.buildship.ui.commands.refreshproject" commandName="Refresh Gradle Project" description="Synchronizes the Gradle builds of the selected projects with the workspace" category="_ZGO4V6rbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGZQaarbEe2-M8nuGout-A" elementId="org.eclipse.ui.edit.text.select.textEnd" commandName="Select Text End" description="Select to the end of the text" category="_ZGO4WarbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGZQaqrbEe2-M8nuGout-A" elementId="org.eclipse.ui.edit.text.goto.wordPrevious" commandName="Previous Word" description="Go to the previous word" category="_ZGO4WarbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGZQa6rbEe2-M8nuGout-A" elementId="org.eclipse.tm.terminal.connector.local.command.launch" commandName="Open Local Terminal on Selection" category="_ZGO4X6rbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGZQbKrbEe2-M8nuGout-A" elementId="org.eclipse.ui.window.preferences" commandName="Preferences" description="Open the preferences dialog" category="_ZGO4YqrbEe2-M8nuGout-A">
+    <parameters xmi:id="_ZGZQbarbEe2-M8nuGout-A" elementId="preferencePageId" name="Preference Page"/>
   </commands>
-  <commands xmi:id="_JQ_4UbjoEe25NdJK2M4KYw" elementId="com.genuitec.eclipse.inlinesearch.replace.toggle.open" commandName="Open Replace Bar" category="_JQ_7HLjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_4UrjoEe25NdJK2M4KYw" elementId="org.eclipse.m2e.sourcelookup.ui.openSourceLookupInfoDialog" commandName="Source Lookup Info" category="_JQ_7G7joEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_4U7joEe25NdJK2M4KYw" elementId="org.eclipse.egit.ui.commit.Squash" commandName="Squash Commits" category="_JQ_7G7joEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_4VLjoEe25NdJK2M4KYw" elementId="org.eclipse.ui.edit.copy" commandName="Copy" description="Copy the selection to the clipboard" category="_JQ_6-7joEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_4VbjoEe25NdJK2M4KYw" elementId="org.eclipse.ui.window.nextView" commandName="Next View" description="Switch to the next view" category="_JQ_7CbjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_4VrjoEe25NdJK2M4KYw" elementId="com.genuitec.myeclipse.perspective.meexplorer.search.regexcommand" commandName="Regular Expression" category="_JQ_7G7joEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_4V7joEe25NdJK2M4KYw" elementId="org.eclipse.ui.edit.revertToSaved" commandName="Revert to Saved" description="Revert to the last saved state" category="_JQ_6-7joEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_4WLjoEe25NdJK2M4KYw" elementId="org.eclipse.ui.views.properties.NewPropertySheetCommand" commandName="Properties" category="_JQ_7G7joEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_4WbjoEe25NdJK2M4KYw" elementId="org.eclipse.debug.ui.commands.RunToLine" commandName="Run to Line" description="Resume and break when execution reaches the current line" category="_JQ_7ErjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_4WrjoEe25NdJK2M4KYw" elementId="org.eclipse.pde.ui.EquinoxLaunchShortcut.debug" commandName="Debug OSGi Framework" description="Debug OSGi Framework" category="_JQ_7ErjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_4W7joEe25NdJK2M4KYw" elementId="org.eclipse.lsp4e.symbolinfile" commandName="Go to Symbol in File" category="_JQ_7BLjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_4XLjoEe25NdJK2M4KYw" elementId="org.eclipse.ui.edit.text.showChangeRulerInformation" commandName="Show Quick Diff Ruler Tooltip" description="Displays quick diff or revision information for the caret line in a focused hover" category="_JQ_7ALjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_4XbjoEe25NdJK2M4KYw" elementId="org.springframework.tooling.boot.ls.rewrite.boot-upgrade" commandName="Upgrade Spring Boot Version..." description="Upgrade Spring Boot Version for a Spring Boot project" category="_JQ_7DLjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_4XrjoEe25NdJK2M4KYw" elementId="org.eclipse.linuxtools.docker.ui.commands.removeTag" commandName="&amp;Remove Tag" description="Remove a tag from an Image with multiple tags" category="_JQ_7G7joEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_4X7joEe25NdJK2M4KYw" elementId="org.eclipse.ui.edit.text.upperCase" commandName="To Upper Case" description="Changes the selection to upper case" category="_JQ_7ALjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_4YLjoEe25NdJK2M4KYw" elementId="org.eclipse.egit.ui.team.ConfigureFetch" commandName="Configure Upstream Fetch" category="_JQ_7FLjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_4YbjoEe25NdJK2M4KYw" elementId="org.eclipse.ui.navigate.goInto" commandName="Go Into" description="Navigate into the selected item" category="_JQ_7AbjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_4YrjoEe25NdJK2M4KYw" elementId="org.eclipse.debug.ui.commands.OpenRunConfigurations" commandName="Run..." description="Open run launch configuration dialog" category="_JQ_7ErjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_4Y7joEe25NdJK2M4KYw" elementId="org.eclipse.ui.edit.text.select.windowEnd" commandName="Select Window End" description="Select to the end of the window" category="_JQ_7ALjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_4ZLjoEe25NdJK2M4KYw" elementId="org.eclipse.ui.window.minimizePart" commandName="Minimize Active View or Editor" description="Minimizes the active view or editor" category="_JQ_7CbjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_4ZbjoEe25NdJK2M4KYw" elementId="org.eclipse.tm.terminal.command1" commandName="Terminal view insert" category="_JQ_7ELjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_4ZrjoEe25NdJK2M4KYw" elementId="org.eclipse.egit.ui.team.Untrack" commandName="Untrack" category="_JQ_7FLjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_4Z7joEe25NdJK2M4KYw" elementId="org.eclipse.wst.sse.ui.add.block.comment" commandName="Add Block Comment" description="Add Block Comment" category="_JQ_6-7joEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_4aLjoEe25NdJK2M4KYw" elementId="org.eclipse.ui.window.showSystemMenu" commandName="Show System Menu" description="Show the system menu" category="_JQ_7CbjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_4abjoEe25NdJK2M4KYw" elementId="org.eclipse.egit.gitflow.ui.command.replaceWithDevelop" commandName="Replace with develop branch" category="_JQ_7FLjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_4arjoEe25NdJK2M4KYw" elementId="org.eclipse.jdt.debug.ui.commands.AllInstances" commandName="All Instances" description="View all instances of the selected type loaded in the target VM" category="_JQ_7ErjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_4a7joEe25NdJK2M4KYw" elementId="org.eclipse.egit.ui.history.OpenInCommitViewerCommand" commandName="Open in Commit Viewer" description="Opens selected commit(s) in Commit Viewer(s)" category="_JQ_7G7joEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_4bLjoEe25NdJK2M4KYw" elementId="org.eclipse.jdt.ui.correction.assignInTryWithResources.assist" commandName="Quick Assist - Assign to variable in new try-with-resources block" description="Invokes quick assist and selects 'Assign to variable in new try-with-resources block'" category="_JQ_7GLjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_4bbjoEe25NdJK2M4KYw" elementId="org.eclipse.jdt.ui.edit.text.java.toggle.comment" commandName="Toggle Comment" description="Toggle comment the selected lines" category="_JQ_7GLjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_4brjoEe25NdJK2M4KYw" elementId="org.eclipse.m2e.actions.LifeCycleTest.run" commandName="Run Maven Test" description="Run Maven Test" category="_JQ_7ErjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_4b7joEe25NdJK2M4KYw" elementId="com.genuitec.eclipse.core.ui.enableCodeLive" commandName="CodeLive" description="CodeLive Enablement" category="_JQ_7G7joEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_4cLjoEe25NdJK2M4KYw" elementId="org.eclipse.ui.window.savePerspective" commandName="Save Perspective As" description="Save the current perspective" category="_JQ_7CbjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_4cbjoEe25NdJK2M4KYw" elementId="org.eclipse.linuxtools.docker.ui.commands.removeContainerLog" commandName="Remove Log" description="Remove the console log for the selected container" category="_JQ_7G7joEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_4crjoEe25NdJK2M4KYw" elementId="org.eclipse.jdt.ui.correction.assignParamToField.assist" commandName="Quick Assist - Assign parameter to field" description="Invokes quick assist and selects 'Assign parameter to field'" category="_JQ_7GLjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_4c7joEe25NdJK2M4KYw" elementId="org.eclipse.egit.ui.command.configureTrace" commandName="Configure Git Debug Trace" category="_JQ_7FLjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_4dLjoEe25NdJK2M4KYw" elementId="org.eclipse.jdt.ui.edit.text.java.move.inner.to.top.level" commandName="Move Type to New File" description="Move Type to New File" category="_JQ_7CrjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_4dbjoEe25NdJK2M4KYw" elementId="org.eclipse.ui.navigate.linkWithEditor" commandName="Toggle Link with Editor" description="Toggles linking of a view's selection with the active editor's selection" category="_JQ_7AbjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_4drjoEe25NdJK2M4KYw" elementId="org.eclipse.wst.sse.ui.open.file.from.source" commandName="Open Selection" description="Open an editor on the selected link" category="_JQ_6-7joEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_4d7joEe25NdJK2M4KYw" elementId="org.eclipse.jdt.ui.edit.text.java.open.hierarchy" commandName="Quick Hierarchy" description="Show the quick hierarchy of the selected element" category="_JQ_7AbjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_4eLjoEe25NdJK2M4KYw" elementId="org.eclipse.ui.edit.text.toggleBlockSelectionMode" commandName="Toggle Block Selection" description="Toggle block / column selection in the current text editor" category="_JQ_6-7joEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_4ebjoEe25NdJK2M4KYw" elementId="org.eclipse.wst.sse.ui.goto.matching.bracket" commandName="Matching Character" description="Go to Matching Character" category="_JQ_7AbjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_4erjoEe25NdJK2M4KYw" elementId="org.eclipse.egit.ui.FetchGiteaPullRequest" commandName="Fetch Gitea Pull Request" category="_JQ_7FLjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_4e7joEe25NdJK2M4KYw" elementId="org.eclipse.jdt.ui.edit.text.java.refactor.quickMenu" commandName="Show Refactor Quick Menu" description="Shows the refactor quick menu" category="_JQ_7CrjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_4fLjoEe25NdJK2M4KYw" elementId="org.eclipse.egit.ui.team.CompareIndexWithHead" commandName="Compare File in Index with HEAD Revision" category="_JQ_7FLjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_4fbjoEe25NdJK2M4KYw" elementId="org.eclipse.jdt.ui.edit.text.java.override.methods" commandName="Override/Implement Methods" description="Override or implement methods from super types" category="_JQ_7GLjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_4frjoEe25NdJK2M4KYw" elementId="org.eclipse.mylyn.wikitext.ui.convertToDocbookCommand" commandName="Generate Docbook" category="_JQ_7G7joEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_4f7joEe25NdJK2M4KYw" elementId="org.eclipse.ui.part.nextPage" commandName="Next Page" description="Switch to the next page" category="_JQ_7AbjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_4gLjoEe25NdJK2M4KYw" elementId="org.eclipse.jdt.ui.edit.text.java.change.type" commandName="Generalize Declared Type" description="Change the declaration of a selected variable to a more general type consistent with usage" category="_JQ_7CrjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_4gbjoEe25NdJK2M4KYw" elementId="org.springframework.ide.eclipse.boot.restart.commands.restart" commandName="Trigger Restart" description="Restart Spring Boot Application" category="_JQ_7ErjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_4grjoEe25NdJK2M4KYw" elementId="org.eclipse.egit.ui.RepositoriesViewClone" commandName="Clone a Git Repository..." description="Clones a Git repository and adds the clone to the Git Repositories view" category="_JQ_7FLjoEe25NdJK2M4KYw">
-    <parameters xmi:id="_JQ_4g7joEe25NdJK2M4KYw" elementId="repositoryUri" name="Repository URI"/>
+  <commands xmi:id="_ZGZQbqrbEe2-M8nuGout-A" elementId="com.genuitec.eclipse.inlinesearch.replace.toggle.open" commandName="Open Replace Bar" category="_ZGO4darbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGZQb6rbEe2-M8nuGout-A" elementId="org.eclipse.m2e.sourcelookup.ui.openSourceLookupInfoDialog" commandName="Source Lookup Info" category="_ZGO4dKrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGZQcKrbEe2-M8nuGout-A" elementId="org.eclipse.egit.ui.commit.Squash" commandName="Squash Commits" category="_ZGO4dKrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGZQcarbEe2-M8nuGout-A" elementId="org.eclipse.ui.edit.copy" commandName="Copy" description="Copy the selection to the clipboard" category="_ZGO4VKrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGZQcqrbEe2-M8nuGout-A" elementId="org.eclipse.ui.window.nextView" commandName="Next View" description="Switch to the next view" category="_ZGO4YqrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGZQc6rbEe2-M8nuGout-A" elementId="com.genuitec.myeclipse.perspective.meexplorer.search.regexcommand" commandName="Regular Expression" category="_ZGO4dKrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGZQdKrbEe2-M8nuGout-A" elementId="org.eclipse.ui.edit.revertToSaved" commandName="Revert to Saved" description="Revert to the last saved state" category="_ZGO4VKrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGZQdarbEe2-M8nuGout-A" elementId="org.eclipse.ui.views.properties.NewPropertySheetCommand" commandName="Properties" category="_ZGO4dKrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGZQdqrbEe2-M8nuGout-A" elementId="org.eclipse.debug.ui.commands.RunToLine" commandName="Run to Line" description="Resume and break when execution reaches the current line" category="_ZGO4a6rbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGZQd6rbEe2-M8nuGout-A" elementId="org.eclipse.pde.ui.EquinoxLaunchShortcut.debug" commandName="Debug OSGi Framework" description="Debug OSGi Framework" category="_ZGO4a6rbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGZQeKrbEe2-M8nuGout-A" elementId="org.eclipse.lsp4e.symbolinfile" commandName="Go to Symbol in File" category="_ZGO4XarbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGZQearbEe2-M8nuGout-A" elementId="org.eclipse.ui.edit.text.showChangeRulerInformation" commandName="Show Quick Diff Ruler Tooltip" description="Displays quick diff or revision information for the caret line in a focused hover" category="_ZGO4WarbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGZQeqrbEe2-M8nuGout-A" elementId="org.springframework.tooling.boot.ls.rewrite.boot-upgrade" commandName="Upgrade Spring Boot Version..." description="Upgrade Spring Boot Version for a Spring Boot project" category="_ZGO4ZarbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGZQe6rbEe2-M8nuGout-A" elementId="org.eclipse.linuxtools.docker.ui.commands.removeTag" commandName="&amp;Remove Tag" description="Remove a tag from an Image with multiple tags" category="_ZGO4dKrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGZQfKrbEe2-M8nuGout-A" elementId="org.eclipse.ui.edit.text.upperCase" commandName="To Upper Case" description="Changes the selection to upper case" category="_ZGO4WarbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGZQfarbEe2-M8nuGout-A" elementId="org.eclipse.egit.ui.team.ConfigureFetch" commandName="Configure Upstream Fetch" category="_ZGO4barbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGZQfqrbEe2-M8nuGout-A" elementId="org.eclipse.ui.navigate.goInto" commandName="Go Into" description="Navigate into the selected item" category="_ZGO4WqrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGZQf6rbEe2-M8nuGout-A" elementId="org.eclipse.debug.ui.commands.OpenRunConfigurations" commandName="Run..." description="Open run launch configuration dialog" category="_ZGO4a6rbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGZQgKrbEe2-M8nuGout-A" elementId="org.eclipse.ui.edit.text.select.windowEnd" commandName="Select Window End" description="Select to the end of the window" category="_ZGO4WarbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGZQgarbEe2-M8nuGout-A" elementId="org.eclipse.ui.window.minimizePart" commandName="Minimize Active View or Editor" description="Minimizes the active view or editor" category="_ZGO4YqrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGZQgqrbEe2-M8nuGout-A" elementId="org.eclipse.tm.terminal.command1" commandName="Terminal view insert" category="_ZGO4aarbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGZQg6rbEe2-M8nuGout-A" elementId="org.eclipse.egit.ui.team.Untrack" commandName="Untrack" category="_ZGO4barbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGZQhKrbEe2-M8nuGout-A" elementId="org.eclipse.wst.sse.ui.add.block.comment" commandName="Add Block Comment" description="Add Block Comment" category="_ZGO4VKrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGZQharbEe2-M8nuGout-A" elementId="org.eclipse.ui.window.showSystemMenu" commandName="Show System Menu" description="Show the system menu" category="_ZGO4YqrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGZQhqrbEe2-M8nuGout-A" elementId="org.eclipse.egit.gitflow.ui.command.replaceWithDevelop" commandName="Replace with develop branch" category="_ZGO4barbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGZQh6rbEe2-M8nuGout-A" elementId="org.eclipse.jdt.debug.ui.commands.AllInstances" commandName="All Instances" description="View all instances of the selected type loaded in the target VM" category="_ZGO4a6rbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGZQiKrbEe2-M8nuGout-A" elementId="org.eclipse.egit.ui.history.OpenInCommitViewerCommand" commandName="Open in Commit Viewer" description="Opens selected commit(s) in Commit Viewer(s)" category="_ZGO4dKrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGZQiarbEe2-M8nuGout-A" elementId="org.eclipse.jdt.ui.correction.assignInTryWithResources.assist" commandName="Quick Assist - Assign to variable in new try-with-resources block" description="Invokes quick assist and selects 'Assign to variable in new try-with-resources block'" category="_ZGO4carbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGZQiqrbEe2-M8nuGout-A" elementId="org.eclipse.jdt.ui.edit.text.java.toggle.comment" commandName="Toggle Comment" description="Toggle comment the selected lines" category="_ZGO4carbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGZQi6rbEe2-M8nuGout-A" elementId="org.eclipse.m2e.actions.LifeCycleTest.run" commandName="Run Maven Test" description="Run Maven Test" category="_ZGO4a6rbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGZQjKrbEe2-M8nuGout-A" elementId="com.genuitec.eclipse.core.ui.enableCodeLive" commandName="CodeLive" description="CodeLive Enablement" category="_ZGO4dKrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGZQjarbEe2-M8nuGout-A" elementId="org.eclipse.ui.window.savePerspective" commandName="Save Perspective As" description="Save the current perspective" category="_ZGO4YqrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGZQjqrbEe2-M8nuGout-A" elementId="org.eclipse.linuxtools.docker.ui.commands.removeContainerLog" commandName="Remove Log" description="Remove the console log for the selected container" category="_ZGO4dKrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGZQj6rbEe2-M8nuGout-A" elementId="org.eclipse.jdt.ui.correction.assignParamToField.assist" commandName="Quick Assist - Assign parameter to field" description="Invokes quick assist and selects 'Assign parameter to field'" category="_ZGO4carbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGZQkKrbEe2-M8nuGout-A" elementId="org.eclipse.egit.ui.command.configureTrace" commandName="Configure Git Debug Trace" category="_ZGO4barbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGZQkarbEe2-M8nuGout-A" elementId="org.eclipse.jdt.ui.edit.text.java.move.inner.to.top.level" commandName="Move Type to New File" description="Move Type to New File" category="_ZGO4Y6rbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGZQkqrbEe2-M8nuGout-A" elementId="org.eclipse.ui.navigate.linkWithEditor" commandName="Toggle Link with Editor" description="Toggles linking of a view's selection with the active editor's selection" category="_ZGO4WqrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGZQk6rbEe2-M8nuGout-A" elementId="org.eclipse.wst.sse.ui.open.file.from.source" commandName="Open Selection" description="Open an editor on the selected link" category="_ZGO4VKrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGZQlKrbEe2-M8nuGout-A" elementId="org.eclipse.jdt.ui.edit.text.java.open.hierarchy" commandName="Quick Hierarchy" description="Show the quick hierarchy of the selected element" category="_ZGO4WqrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGZQlarbEe2-M8nuGout-A" elementId="org.eclipse.ui.edit.text.toggleBlockSelectionMode" commandName="Toggle Block Selection" description="Toggle block / column selection in the current text editor" category="_ZGO4VKrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGZQlqrbEe2-M8nuGout-A" elementId="org.eclipse.wst.sse.ui.goto.matching.bracket" commandName="Matching Character" description="Go to Matching Character" category="_ZGO4WqrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGZQl6rbEe2-M8nuGout-A" elementId="org.eclipse.egit.ui.FetchGiteaPullRequest" commandName="Fetch Gitea Pull Request" category="_ZGO4barbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGZQmKrbEe2-M8nuGout-A" elementId="org.eclipse.jdt.ui.edit.text.java.refactor.quickMenu" commandName="Show Refactor Quick Menu" description="Shows the refactor quick menu" category="_ZGO4Y6rbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGZQmarbEe2-M8nuGout-A" elementId="org.eclipse.egit.ui.team.CompareIndexWithHead" commandName="Compare File in Index with HEAD Revision" category="_ZGO4barbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGZQmqrbEe2-M8nuGout-A" elementId="org.eclipse.jdt.ui.edit.text.java.override.methods" commandName="Override/Implement Methods" description="Override or implement methods from super types" category="_ZGO4carbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGZQm6rbEe2-M8nuGout-A" elementId="org.eclipse.mylyn.wikitext.ui.convertToDocbookCommand" commandName="Generate Docbook" category="_ZGO4dKrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGZQnKrbEe2-M8nuGout-A" elementId="org.eclipse.ui.part.nextPage" commandName="Next Page" description="Switch to the next page" category="_ZGO4WqrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGZQnarbEe2-M8nuGout-A" elementId="org.eclipse.jdt.ui.edit.text.java.change.type" commandName="Generalize Declared Type" description="Change the declaration of a selected variable to a more general type consistent with usage" category="_ZGO4Y6rbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGZQnqrbEe2-M8nuGout-A" elementId="org.springframework.ide.eclipse.boot.restart.commands.restart" commandName="Trigger Restart" description="Restart Spring Boot Application" category="_ZGO4a6rbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGZQn6rbEe2-M8nuGout-A" elementId="org.eclipse.egit.ui.RepositoriesViewClone" commandName="Clone a Git Repository..." description="Clones a Git repository and adds the clone to the Git Repositories view" category="_ZGO4barbEe2-M8nuGout-A">
+    <parameters xmi:id="_ZGZQoKrbEe2-M8nuGout-A" elementId="repositoryUri" name="Repository URI"/>
   </commands>
-  <commands xmi:id="_JQ_4hLjoEe25NdJK2M4KYw" elementId="org.eclipse.ui.edit.text.clear.mark" commandName="Clear Mark" description="Clear the mark" category="_JQ_7ALjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_4hbjoEe25NdJK2M4KYw" elementId="org.eclipse.wst.sse.ui.quick_outline" commandName="Quick Outline" description="Show the quick outline for the editor input" category="_JQ_7AbjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_4hrjoEe25NdJK2M4KYw" elementId="org.eclipse.jdt.ui.edit.text.java.add.textblock" commandName="Add Text Block" description="Adds Text Block" category="_JQ_7GLjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_4h7joEe25NdJK2M4KYw" elementId="org.eclipse.egit.ui.RepositoriesViewRemove" commandName="Remove Repository" category="_JQ_7FLjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_4iLjoEe25NdJK2M4KYw" elementId="org.eclipse.ant.ui.openExternalDoc" commandName="Open External Documentation" description="Open the External documentation for the current task in the Ant editor" category="_JQ_7GLjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_4ibjoEe25NdJK2M4KYw" elementId="com.genuitec.eclipse.inlinesearch.delete.previous" commandName="Delete Previous Word" category="_JQ_7HLjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_4irjoEe25NdJK2M4KYw" elementId="org.eclipse.egit.ui.RepositoriesViewCreateRepository" commandName="Create a Git Repository..." description="Creates a new Git repository and adds it to the Git Repositories view" category="_JQ_7FLjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_4i7joEe25NdJK2M4KYw" elementId="org.eclipse.egit.gitflow.ui.command.featureFinish" commandName="Finish Feature" category="_JQ_7FLjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_4jLjoEe25NdJK2M4KYw" elementId="org.eclipse.jdt.ui.edit.text.java.search.write.access.in.hierarchy" commandName="Write Access in Hierarchy" description="Search for write references of the selected element in its hierarchy" category="_JQ_7EbjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_4jbjoEe25NdJK2M4KYw" elementId="org.eclipse.text.quicksearch.commands.quicksearchCommand" commandName="Quick Search" category="_JQ_7CLjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_4jrjoEe25NdJK2M4KYw" elementId="org.eclipse.tm4e.languageconfiguration.removeBlockCommentCommand" commandName="Remove Block Comment" category="_JQ_6-rjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_4j7joEe25NdJK2M4KYw" elementId="org.eclipse.egit.ui.team.PushTags" commandName="Push Tags..." category="_JQ_7FLjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_4kLjoEe25NdJK2M4KYw" elementId="org.eclipse.egit.ui.ContinueRebase" commandName="Continue Rebase" category="_JQ_7FLjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_4kbjoEe25NdJK2M4KYw" elementId="org.eclipse.help.ui.closeTray" commandName="Close User Assistance Tray" description="Close the user assistance tray containing context help information and cheat sheets." category="_JQ_7C7joEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_4krjoEe25NdJK2M4KYw" elementId="org.eclipse.egit.ui.history.CreatePatch" commandName="Create Patch..." category="_JQ_7G7joEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_4k7joEe25NdJK2M4KYw" elementId="org.eclipse.debug.ui.commands.Resume" commandName="Resume" description="Resume" category="_JQ_7ErjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_4lLjoEe25NdJK2M4KYw" elementId="org.eclipse.linuxtools.docker.ui.commands.restartContainers" commandName="Res&amp;tart" description="Restart selected containers" category="_JQ_7G7joEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_4lbjoEe25NdJK2M4KYw" elementId="com.genuitec.myeclipse.perspective.meexplorer.search.folderfiltertogglecommand" commandName="Do not match folders" category="_JQ_7G7joEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_4lrjoEe25NdJK2M4KYw" elementId="org.eclipse.ui.file.restartWorkbench" commandName="Restart" description="Restart the workbench" category="_JQ_7BbjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_4l7joEe25NdJK2M4KYw" elementId="org.eclipse.egit.ui.team.CompareWithRef" commandName="Compare with Branch, Tag or Reference..." category="_JQ_7FLjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_4mLjoEe25NdJK2M4KYw" elementId="org.eclipse.ui.edit.text.toggleOverwrite" commandName="Toggle Overwrite" description="Toggle overwrite mode" category="_JQ_7ALjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_4mbjoEe25NdJK2M4KYw" elementId="org.springframework.ide.eclipse.boot.dash.boot.dash.RestartAction" commandName="(Re)start" description="(Re)start Boot App" category="_JQ_7CbjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_4mrjoEe25NdJK2M4KYw" elementId="org.eclipse.jdt.ui.edit.text.java.pull.up" commandName="Pull Up" description="Move members to a superclass" category="_JQ_7CrjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_4m7joEe25NdJK2M4KYw" elementId="org.eclipse.ui.edit.text.folding.collapse_all" commandName="Collapse All" description="Collapses all folded regions" category="_JQ_7ALjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_4nLjoEe25NdJK2M4KYw" elementId="org.eclipse.debug.ui.commands.ToggleWatchpoint" commandName="Toggle Watchpoint" description="Creates or removes a watchpoint" category="_JQ_7ErjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_4nbjoEe25NdJK2M4KYw" elementId="org.eclipse.equinox.p2.ui.discovery.commands.ShowRepositoryCatalog" commandName="Show Repository Catalog" category="_JQ_7G7joEe25NdJK2M4KYw">
-    <parameters xmi:id="_JQ_4nrjoEe25NdJK2M4KYw" elementId="org.eclipse.equinox.p2.ui.discovery.commands.RepositoryParameter" name="P2 Repository URI"/>
+  <commands xmi:id="_ZGZQoarbEe2-M8nuGout-A" elementId="org.eclipse.ui.edit.text.clear.mark" commandName="Clear Mark" description="Clear the mark" category="_ZGO4WarbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGZQoqrbEe2-M8nuGout-A" elementId="org.eclipse.wst.sse.ui.quick_outline" commandName="Quick Outline" description="Show the quick outline for the editor input" category="_ZGO4WqrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGZQo6rbEe2-M8nuGout-A" elementId="org.eclipse.jdt.ui.edit.text.java.add.textblock" commandName="Add Text Block" description="Adds Text Block" category="_ZGO4carbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGZQpKrbEe2-M8nuGout-A" elementId="org.eclipse.egit.ui.RepositoriesViewRemove" commandName="Remove Repository" category="_ZGO4barbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGZQparbEe2-M8nuGout-A" elementId="org.eclipse.ant.ui.openExternalDoc" commandName="Open External Documentation" description="Open the External documentation for the current task in the Ant editor" category="_ZGO4carbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGZQpqrbEe2-M8nuGout-A" elementId="com.genuitec.eclipse.inlinesearch.delete.previous" commandName="Delete Previous Word" category="_ZGO4darbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGZQp6rbEe2-M8nuGout-A" elementId="org.eclipse.egit.ui.RepositoriesViewCreateRepository" commandName="Create a Git Repository..." description="Creates a new Git repository and adds it to the Git Repositories view" category="_ZGO4barbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGZQqKrbEe2-M8nuGout-A" elementId="org.eclipse.egit.gitflow.ui.command.featureFinish" commandName="Finish Feature" category="_ZGO4barbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGZQqarbEe2-M8nuGout-A" elementId="org.eclipse.jdt.ui.edit.text.java.search.write.access.in.hierarchy" commandName="Write Access in Hierarchy" description="Search for write references of the selected element in its hierarchy" category="_ZGO4aqrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGZQqqrbEe2-M8nuGout-A" elementId="org.eclipse.text.quicksearch.commands.quicksearchCommand" commandName="Quick Search" category="_ZGO4YarbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGZQq6rbEe2-M8nuGout-A" elementId="org.eclipse.tm4e.languageconfiguration.removeBlockCommentCommand" commandName="Remove Block Comment" category="_ZGO4U6rbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGZQrKrbEe2-M8nuGout-A" elementId="org.eclipse.egit.ui.team.PushTags" commandName="Push Tags..." category="_ZGO4barbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGZQrarbEe2-M8nuGout-A" elementId="org.eclipse.egit.ui.ContinueRebase" commandName="Continue Rebase" category="_ZGO4barbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGZQrqrbEe2-M8nuGout-A" elementId="org.eclipse.help.ui.closeTray" commandName="Close User Assistance Tray" description="Close the user assistance tray containing context help information and cheat sheets." category="_ZGO4ZKrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGZQr6rbEe2-M8nuGout-A" elementId="org.eclipse.egit.ui.history.CreatePatch" commandName="Create Patch..." category="_ZGO4dKrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGZQsKrbEe2-M8nuGout-A" elementId="org.eclipse.debug.ui.commands.Resume" commandName="Resume" description="Resume" category="_ZGO4a6rbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGZQsarbEe2-M8nuGout-A" elementId="org.eclipse.linuxtools.docker.ui.commands.restartContainers" commandName="Res&amp;tart" description="Restart selected containers" category="_ZGO4dKrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGZQsqrbEe2-M8nuGout-A" elementId="com.genuitec.myeclipse.perspective.meexplorer.search.folderfiltertogglecommand" commandName="Do not match folders" category="_ZGO4dKrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGZQs6rbEe2-M8nuGout-A" elementId="org.eclipse.ui.file.restartWorkbench" commandName="Restart" description="Restart the workbench" category="_ZGO4XqrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGZQtKrbEe2-M8nuGout-A" elementId="org.eclipse.egit.ui.team.CompareWithRef" commandName="Compare with Branch, Tag or Reference..." category="_ZGO4barbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGZQtarbEe2-M8nuGout-A" elementId="org.eclipse.ui.edit.text.toggleOverwrite" commandName="Toggle Overwrite" description="Toggle overwrite mode" category="_ZGO4WarbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGZ3cKrbEe2-M8nuGout-A" elementId="org.springframework.ide.eclipse.boot.dash.boot.dash.RestartAction" commandName="(Re)start" description="(Re)start Boot App" category="_ZGO4YqrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGZ3carbEe2-M8nuGout-A" elementId="org.eclipse.jdt.ui.edit.text.java.pull.up" commandName="Pull Up" description="Move members to a superclass" category="_ZGO4Y6rbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGZ3cqrbEe2-M8nuGout-A" elementId="org.eclipse.ui.edit.text.folding.collapse_all" commandName="Collapse All" description="Collapses all folded regions" category="_ZGO4WarbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGZ3c6rbEe2-M8nuGout-A" elementId="org.eclipse.debug.ui.commands.ToggleWatchpoint" commandName="Toggle Watchpoint" description="Creates or removes a watchpoint" category="_ZGO4a6rbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGZ3dKrbEe2-M8nuGout-A" elementId="org.eclipse.equinox.p2.ui.discovery.commands.ShowRepositoryCatalog" commandName="Show Repository Catalog" category="_ZGO4dKrbEe2-M8nuGout-A">
+    <parameters xmi:id="_ZGZ3darbEe2-M8nuGout-A" elementId="org.eclipse.equinox.p2.ui.discovery.commands.RepositoryParameter" name="P2 Repository URI"/>
   </commands>
-  <commands xmi:id="_JQ_4n7joEe25NdJK2M4KYw" elementId="org.eclipse.debug.ui.commands.closeRendering" commandName="Close Rendering" description="Close the selected rendering." category="_JQ_7ErjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_4oLjoEe25NdJK2M4KYw" elementId="org.eclipse.egit.ui.RepositoriesViewOpenInEditor" commandName="Open in Editor" category="_JQ_7FLjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_4objoEe25NdJK2M4KYw" elementId="org.eclipse.egit.ui.team.submodule.update" commandName="Update Submodule" category="_JQ_7FLjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_4orjoEe25NdJK2M4KYw" elementId="org.eclipse.debug.ui.commands.ProfileLast" commandName="Profile" description="Launch in profile mode" category="_JQ_7ErjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_4o7joEe25NdJK2M4KYw" elementId="org.eclipse.egit.ui.team.Pull" commandName="Pull" category="_JQ_7FLjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_4pLjoEe25NdJK2M4KYw" elementId="org.eclipse.ui.edit.text.swap.mark" commandName="Swap Mark" description="Swap the mark with the cursor position" category="_JQ_7ALjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_4pbjoEe25NdJK2M4KYw" elementId="org.eclipse.jdt.ui.correction.addCast" commandName="Quick Fix - Add cast" description="Invokes quick assist and selects 'Add cast'" category="_JQ_7GLjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_4prjoEe25NdJK2M4KYw" elementId="org.eclipse.egit.gitflow.ui.command.developCheckout" commandName="Check Out Develop" category="_JQ_7FLjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_4p7joEe25NdJK2M4KYw" elementId="org.eclipse.egit.ui.RepositoriesViewConfigureFetch" commandName="Configure Fetch..." category="_JQ_7FLjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_4qLjoEe25NdJK2M4KYw" elementId="org.eclipse.pde.api.tools.ui.convert.javadocs" commandName="Convert API Tools &amp;Javadoc Tags..." description="Starts a wizard that will allow you to convert existing Javadoc tags to annotations" category="_JQ_7G7joEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_4qbjoEe25NdJK2M4KYw" elementId="org.eclipse.egit.ui.RepositoriesViewShowInSystemExplorer" commandName="Show In System Explorer" category="_JQ_7FLjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_4qrjoEe25NdJK2M4KYw" elementId="org.eclipse.jdt.ui.edit.text.java.open.external.javadoc" commandName="Open Attached Javadoc" description="Open the attached Javadoc of the selected element in a browser" category="_JQ_7AbjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_4q7joEe25NdJK2M4KYw" elementId="org.eclipse.pde.ui.EquinoxLaunchShortcut.run" commandName="Run OSGi Framework" description="Run OSGi Framework" category="_JQ_7ErjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_4rLjoEe25NdJK2M4KYw" elementId="org.eclipse.ui.edit.text.shiftLeft" commandName="Shift Left" description="Shift a block of text to the left" category="_JQ_6-7joEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_4rbjoEe25NdJK2M4KYw" elementId="org.eclipse.wst.sse.ui.structure.select.next" commandName="Select Next Element" description="Expand selection to include next sibling" category="_JQ_6-7joEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_4rrjoEe25NdJK2M4KYw" elementId="org.eclipse.egit.ui.team.Push" commandName="Push..." category="_JQ_7FLjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_4r7joEe25NdJK2M4KYw" elementId="org.eclipse.jdt.debug.ui.commands.AddClassPrepareBreakpoint" commandName="Add Class Load Breakpoint" description="Add a class load breakpoint" category="_JQ_7ErjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_4sLjoEe25NdJK2M4KYw" elementId="org.eclipse.egit.ui.RepositoriesCreateGroup" commandName="Create a Repository Group" description="Create a repository group for structuring repositories in the Git Repositories view" category="_JQ_7FLjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_4sbjoEe25NdJK2M4KYw" elementId="com.genuitec.myeclipse.breadcrumb.togglebreadcrumbcommand" commandName="BreadCrumb" category="_JQ_7G7joEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_4srjoEe25NdJK2M4KYw" elementId="org.eclipse.egit.ui.team.stash.drop" commandName="Delete Stashed Commit..." category="_JQ_7FLjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_4s7joEe25NdJK2M4KYw" elementId="org.eclipse.debug.ui.DebugPerspective" commandName="Debug" description="Open the debug perspective" category="_JQ_7FbjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_4tLjoEe25NdJK2M4KYw" elementId="com.genuitec.eclipse.inlinesearch.delete.next" commandName="Delete Next Word" category="_JQ_7HLjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_4tbjoEe25NdJK2M4KYw" elementId="org.eclipse.tips.ide.command.open" commandName="Tip of the Day" category="_JQ_7G7joEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_4trjoEe25NdJK2M4KYw" elementId="AnsiConsole.command.copy_without_escapes" commandName="Copy Text Without ANSI Escapes" description="Copy the console content to clipboard, removing the escape sequences" category="_JQ_7ArjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_4t7joEe25NdJK2M4KYw" elementId="org.eclipse.egit.gitflow.ui.command.hotfixFinish" commandName="Finish Hotfix" category="_JQ_7FLjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_4uLjoEe25NdJK2M4KYw" elementId="org.eclipse.jdt.ui.specific_content_assist.command" commandName="Content Assist" description="A parameterizable command that invokes content assist with a single completion proposal category" category="_JQ_6-7joEe25NdJK2M4KYw">
-    <parameters xmi:id="_JQ_4ubjoEe25NdJK2M4KYw" elementId="org.eclipse.jdt.ui.specific_content_assist.category_id" name="type" optional="false"/>
+  <commands xmi:id="_ZGZ3dqrbEe2-M8nuGout-A" elementId="org.eclipse.debug.ui.commands.closeRendering" commandName="Close Rendering" description="Close the selected rendering." category="_ZGO4a6rbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGZ3d6rbEe2-M8nuGout-A" elementId="org.eclipse.egit.ui.RepositoriesViewOpenInEditor" commandName="Open in Editor" category="_ZGO4barbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGZ3eKrbEe2-M8nuGout-A" elementId="org.eclipse.egit.ui.team.submodule.update" commandName="Update Submodule" category="_ZGO4barbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGZ3earbEe2-M8nuGout-A" elementId="org.eclipse.debug.ui.commands.ProfileLast" commandName="Profile" description="Launch in profile mode" category="_ZGO4a6rbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGZ3eqrbEe2-M8nuGout-A" elementId="org.eclipse.egit.ui.team.Pull" commandName="Pull" category="_ZGO4barbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGZ3e6rbEe2-M8nuGout-A" elementId="org.eclipse.ui.edit.text.swap.mark" commandName="Swap Mark" description="Swap the mark with the cursor position" category="_ZGO4WarbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGZ3fKrbEe2-M8nuGout-A" elementId="org.eclipse.jdt.ui.correction.addCast" commandName="Quick Fix - Add cast" description="Invokes quick assist and selects 'Add cast'" category="_ZGO4carbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGZ3farbEe2-M8nuGout-A" elementId="org.eclipse.egit.gitflow.ui.command.developCheckout" commandName="Check Out Develop" category="_ZGO4barbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGZ3fqrbEe2-M8nuGout-A" elementId="org.eclipse.egit.ui.RepositoriesViewConfigureFetch" commandName="Configure Fetch..." category="_ZGO4barbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGZ3f6rbEe2-M8nuGout-A" elementId="org.eclipse.pde.api.tools.ui.convert.javadocs" commandName="Convert API Tools &amp;Javadoc Tags..." description="Starts a wizard that will allow you to convert existing Javadoc tags to annotations" category="_ZGO4dKrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGZ3gKrbEe2-M8nuGout-A" elementId="org.eclipse.egit.ui.RepositoriesViewShowInSystemExplorer" commandName="Show In System Explorer" category="_ZGO4barbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGZ3garbEe2-M8nuGout-A" elementId="org.eclipse.jdt.ui.edit.text.java.open.external.javadoc" commandName="Open Attached Javadoc" description="Open the attached Javadoc of the selected element in a browser" category="_ZGO4WqrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGZ3gqrbEe2-M8nuGout-A" elementId="org.eclipse.pde.ui.EquinoxLaunchShortcut.run" commandName="Run OSGi Framework" description="Run OSGi Framework" category="_ZGO4a6rbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGZ3g6rbEe2-M8nuGout-A" elementId="org.eclipse.ui.edit.text.shiftLeft" commandName="Shift Left" description="Shift a block of text to the left" category="_ZGO4VKrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGZ3hKrbEe2-M8nuGout-A" elementId="org.eclipse.wst.sse.ui.structure.select.next" commandName="Select Next Element" description="Expand selection to include next sibling" category="_ZGO4VKrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGZ3harbEe2-M8nuGout-A" elementId="org.eclipse.egit.ui.team.Push" commandName="Push..." category="_ZGO4barbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGZ3hqrbEe2-M8nuGout-A" elementId="org.eclipse.jdt.debug.ui.commands.AddClassPrepareBreakpoint" commandName="Add Class Load Breakpoint" description="Add a class load breakpoint" category="_ZGO4a6rbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGZ3h6rbEe2-M8nuGout-A" elementId="org.eclipse.egit.ui.RepositoriesCreateGroup" commandName="Create a Repository Group" description="Create a repository group for structuring repositories in the Git Repositories view" category="_ZGO4barbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGZ3iKrbEe2-M8nuGout-A" elementId="com.genuitec.myeclipse.breadcrumb.togglebreadcrumbcommand" commandName="BreadCrumb" category="_ZGO4dKrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGZ3iarbEe2-M8nuGout-A" elementId="org.eclipse.egit.ui.team.stash.drop" commandName="Delete Stashed Commit..." category="_ZGO4barbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGZ3iqrbEe2-M8nuGout-A" elementId="org.eclipse.debug.ui.DebugPerspective" commandName="Debug" description="Open the debug perspective" category="_ZGO4bqrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGZ3i6rbEe2-M8nuGout-A" elementId="com.genuitec.eclipse.inlinesearch.delete.next" commandName="Delete Next Word" category="_ZGO4darbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGZ3jKrbEe2-M8nuGout-A" elementId="org.eclipse.tips.ide.command.open" commandName="Tip of the Day" category="_ZGO4dKrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGZ3jarbEe2-M8nuGout-A" elementId="AnsiConsole.command.copy_without_escapes" commandName="Copy Text Without ANSI Escapes" description="Copy the console content to clipboard, removing the escape sequences" category="_ZGO4W6rbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGZ3jqrbEe2-M8nuGout-A" elementId="org.eclipse.egit.gitflow.ui.command.hotfixFinish" commandName="Finish Hotfix" category="_ZGO4barbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGZ3j6rbEe2-M8nuGout-A" elementId="org.eclipse.jdt.ui.specific_content_assist.command" commandName="Content Assist" description="A parameterizable command that invokes content assist with a single completion proposal category" category="_ZGO4VKrbEe2-M8nuGout-A">
+    <parameters xmi:id="_ZGZ3kKrbEe2-M8nuGout-A" elementId="org.eclipse.jdt.ui.specific_content_assist.category_id" name="type" optional="false"/>
   </commands>
-  <commands xmi:id="_JQ_4urjoEe25NdJK2M4KYw" elementId="org.eclipse.jdt.ui.edit.text.java.search.references.in.hierarchy" commandName="References in Hierarchy" description="Search for references of the selected element in its hierarchy" category="_JQ_7EbjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_4u7joEe25NdJK2M4KYw" elementId="org.eclipse.ui.navigate.expandAll" commandName="Expand All" description="Expand the current tree" category="_JQ_7AbjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_4vLjoEe25NdJK2M4KYw" elementId="org.eclipse.ui.file.saveAll" commandName="Save All" description="Save all current contents" category="_JQ_7BbjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_4vbjoEe25NdJK2M4KYw" elementId="org.eclipse.jdt.ui.edit.text.java.search.method.exits" commandName="Search Method Exit Occurrences in File" description="Search for method exit occurrences of a selected return type" category="_JQ_7EbjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_4vrjoEe25NdJK2M4KYw" elementId="org.eclipse.jdt.ui.edit.text.java.folding.collapseMembers" commandName="Collapse Members" description="Collapse all members" category="_JQ_7ALjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_4v7joEe25NdJK2M4KYw" elementId="org.eclipse.ui.file.closeOthers" commandName="Close Others" description="Close all editors except the one that is active" category="_JQ_7BbjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_4wLjoEe25NdJK2M4KYw" elementId="org.eclipse.ui.editors.quickdiff.revertLine" commandName="Revert Line" description="Revert the current line" category="_JQ_7ALjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_4wbjoEe25NdJK2M4KYw" elementId="org.eclipse.debug.ui.commands.OpenDebugConfigurations" commandName="Debug..." description="Open debug launch configuration dialog" category="_JQ_7ErjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_4wrjoEe25NdJK2M4KYw" elementId="org.eclipse.egit.ui.team.SimpleFetch" commandName="Fetch from Upstream" category="_JQ_7FLjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_4w7joEe25NdJK2M4KYw" elementId="org.eclipse.m2e.sourcelookup.ui.importBinaryProject" commandName="Import Binary Project" category="_JQ_7G7joEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_4xLjoEe25NdJK2M4KYw" elementId="org.eclipse.ui.window.previousEditor" commandName="Previous Editor" description="Switch to the previous editor" category="_JQ_7CbjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_4xbjoEe25NdJK2M4KYw" elementId="org.eclipse.jdt.ui.edit.text.java.copy.qualified.name" commandName="Copy Qualified Name" description="Copy a fully qualified name to the system clipboard" category="_JQ_7GLjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_4xrjoEe25NdJK2M4KYw" elementId="org.eclipse.jdt.ui.edit.text.java.promote.local.variable" commandName="Convert Local Variable to Field" description="Convert a local variable to a field" category="_JQ_7CrjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_4x7joEe25NdJK2M4KYw" elementId="com.genuitec.eclipse.inlinesearch.replaceone" commandName="Replace and Find Next" category="_JQ_7HLjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_4yLjoEe25NdJK2M4KYw" elementId="org.eclipse.ui.edit.text.zoomIn" commandName="Zoom In" description="Zoom in text, increase default font size for text editors" category="_JQ_7ALjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_4ybjoEe25NdJK2M4KYw" elementId="org.eclipse.ui.ide.OpenMarkersView" commandName="Open Another" description="Open another view" category="_JQ_7G7joEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_4yrjoEe25NdJK2M4KYw" elementId="org.eclipse.jdt.ui.correction.changeToStatic" commandName="Quick Fix - Change to static access" description="Invokes quick assist and selects 'Change to static access'" category="_JQ_7GLjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_4y7joEe25NdJK2M4KYw" elementId="org.eclipse.debug.ui.commands.newRendering" commandName="New Rendering" description="Add a new rendering." category="_JQ_7ErjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_4zLjoEe25NdJK2M4KYw" elementId="org.eclipse.linuxtools.docker.ui.commands.copyfromcontainer" commandName="Copy from Container" description="Copy files from running Container to a local directory" category="_JQ_7G7joEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_4zbjoEe25NdJK2M4KYw" elementId="org.eclipse.ui.project.closeUnrelatedProjects" commandName="Close Unrelated Projects" description="Close unrelated projects" category="_JQ_7DbjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_4zrjoEe25NdJK2M4KYw" elementId="org.eclipse.jdt.ui.edit.text.java.self.encapsulate.field" commandName="Encapsulate Field" description="Create getting and setting methods for the field and use only those to access the field" category="_JQ_7CrjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_4z7joEe25NdJK2M4KYw" elementId="org.eclipse.ui.ide.markers.copyMarkerResourceQualifiedName" commandName="Copy Resource Qualified Name To Clipboard" description="Copies markers resource qualified name to the clipboard" category="_JQ_6-7joEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_40LjoEe25NdJK2M4KYw" elementId="org.eclipse.pde.ui.runtimeWorkbenchShortcut.run" commandName="Run Eclipse Application" description="Run Eclipse Application" category="_JQ_7ErjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_40bjoEe25NdJK2M4KYw" elementId="org.eclipse.search.ui.performTextSearchWorkspace" commandName="Find Text in Workspace" description="Searches the files in the workspace for specific text." category="_JQ_7EbjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_40rjoEe25NdJK2M4KYw" elementId="org.eclipse.wst.sse.ui.remove.block.comment" commandName="Remove Block Comment" description="Remove Block Comment" category="_JQ_6-7joEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_407joEe25NdJK2M4KYw" elementId="org.eclipse.pde.runtime.spy.commands.menuSpyCommand" commandName="Plug-in Menu Spy" description="Show the Plug-in Spy" category="_JQ_7GbjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_41LjoEe25NdJK2M4KYw" elementId="org.eclipse.jdt.ui.navigate.gototype" commandName="Go to Type" description="Go to Type" category="_JQ_7AbjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_41bjoEe25NdJK2M4KYw" elementId="org.eclipse.m2e.core.ui.command.openPom" commandName="Open Maven POM" category="_JQ_7AbjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_41rjoEe25NdJK2M4KYw" elementId="org.eclipse.jdt.ui.index.rebuild" commandName="Rebuild Java Index" description="Rebuilds the Java index database" category="_JQ_7DbjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_417joEe25NdJK2M4KYw" elementId="org.eclipse.ui.edit.addBookmark" commandName="Add Bookmark" description="Add a bookmark" category="_JQ_6-7joEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_42LjoEe25NdJK2M4KYw" elementId="org.eclipse.ui.edit.text.set.mark" commandName="Set Mark" description="Set the mark" category="_JQ_7ALjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_42bjoEe25NdJK2M4KYw" elementId="org.eclipse.jdt.ui.correction.splitJoinVariableDeclaration.assist" commandName="Quick Assist - Split/Join variable declaration" description="Invokes quick assist and selects 'Split/Join variable declaration'" category="_JQ_7GLjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_42rjoEe25NdJK2M4KYw" elementId="org.springframework.ide.eclipse.boot.ui.EnableDisableBootDevtools" commandName="Add/Remove Boot Devtools" category="_JQ_6_LjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_427joEe25NdJK2M4KYw" elementId="org.eclipse.ui.views.showView" commandName="Show View" description="Shows a particular view" category="_JQ_6-LjoEe25NdJK2M4KYw">
-    <parameters xmi:id="_JQ_43LjoEe25NdJK2M4KYw" elementId="org.eclipse.ui.views.showView.viewId" name="View"/>
-    <parameters xmi:id="_JQ_43bjoEe25NdJK2M4KYw" elementId="org.eclipse.ui.views.showView.secondaryId" name="Secondary Id"/>
-    <parameters xmi:id="_JQ_43rjoEe25NdJK2M4KYw" elementId="org.eclipse.ui.views.showView.makeFast" name="As FastView"/>
+  <commands xmi:id="_ZGZ3karbEe2-M8nuGout-A" elementId="org.eclipse.jdt.ui.edit.text.java.search.references.in.hierarchy" commandName="References in Hierarchy" description="Search for references of the selected element in its hierarchy" category="_ZGO4aqrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGZ3kqrbEe2-M8nuGout-A" elementId="org.eclipse.ui.navigate.expandAll" commandName="Expand All" description="Expand the current tree" category="_ZGO4WqrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGZ3k6rbEe2-M8nuGout-A" elementId="org.eclipse.ui.file.saveAll" commandName="Save All" description="Save all current contents" category="_ZGO4XqrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGZ3lKrbEe2-M8nuGout-A" elementId="org.eclipse.jdt.ui.edit.text.java.search.method.exits" commandName="Search Method Exit Occurrences in File" description="Search for method exit occurrences of a selected return type" category="_ZGO4aqrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGZ3larbEe2-M8nuGout-A" elementId="org.eclipse.jdt.ui.edit.text.java.folding.collapseMembers" commandName="Collapse Members" description="Collapse all members" category="_ZGO4WarbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGZ3lqrbEe2-M8nuGout-A" elementId="org.eclipse.ui.file.closeOthers" commandName="Close Others" description="Close all editors except the one that is active" category="_ZGO4XqrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGZ3l6rbEe2-M8nuGout-A" elementId="org.eclipse.ui.editors.quickdiff.revertLine" commandName="Revert Line" description="Revert the current line" category="_ZGO4WarbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGZ3mKrbEe2-M8nuGout-A" elementId="org.eclipse.debug.ui.commands.OpenDebugConfigurations" commandName="Debug..." description="Open debug launch configuration dialog" category="_ZGO4a6rbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGZ3marbEe2-M8nuGout-A" elementId="org.eclipse.egit.ui.team.SimpleFetch" commandName="Fetch from Upstream" category="_ZGO4barbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGZ3mqrbEe2-M8nuGout-A" elementId="org.eclipse.m2e.sourcelookup.ui.importBinaryProject" commandName="Import Binary Project" category="_ZGO4dKrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGZ3m6rbEe2-M8nuGout-A" elementId="org.eclipse.ui.window.previousEditor" commandName="Previous Editor" description="Switch to the previous editor" category="_ZGO4YqrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGZ3nKrbEe2-M8nuGout-A" elementId="org.eclipse.jdt.ui.edit.text.java.copy.qualified.name" commandName="Copy Qualified Name" description="Copy a fully qualified name to the system clipboard" category="_ZGO4carbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGZ3narbEe2-M8nuGout-A" elementId="org.eclipse.jdt.ui.edit.text.java.promote.local.variable" commandName="Convert Local Variable to Field" description="Convert a local variable to a field" category="_ZGO4Y6rbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGZ3nqrbEe2-M8nuGout-A" elementId="com.genuitec.eclipse.inlinesearch.replaceone" commandName="Replace and Find Next" category="_ZGO4darbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGZ3n6rbEe2-M8nuGout-A" elementId="org.eclipse.ui.edit.text.zoomIn" commandName="Zoom In" description="Zoom in text, increase default font size for text editors" category="_ZGO4WarbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGZ3oKrbEe2-M8nuGout-A" elementId="org.eclipse.ui.ide.OpenMarkersView" commandName="Open Another" description="Open another view" category="_ZGO4dKrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGZ3oarbEe2-M8nuGout-A" elementId="org.eclipse.jdt.ui.correction.changeToStatic" commandName="Quick Fix - Change to static access" description="Invokes quick assist and selects 'Change to static access'" category="_ZGO4carbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGZ3oqrbEe2-M8nuGout-A" elementId="org.eclipse.debug.ui.commands.newRendering" commandName="New Rendering" description="Add a new rendering." category="_ZGO4a6rbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGZ3o6rbEe2-M8nuGout-A" elementId="org.eclipse.linuxtools.docker.ui.commands.copyfromcontainer" commandName="Copy from Container" description="Copy files from running Container to a local directory" category="_ZGO4dKrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGZ3pKrbEe2-M8nuGout-A" elementId="org.eclipse.ui.project.closeUnrelatedProjects" commandName="Close Unrelated Projects" description="Close unrelated projects" category="_ZGO4ZqrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGZ3parbEe2-M8nuGout-A" elementId="org.eclipse.jdt.ui.edit.text.java.self.encapsulate.field" commandName="Encapsulate Field" description="Create getting and setting methods for the field and use only those to access the field" category="_ZGO4Y6rbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGZ3pqrbEe2-M8nuGout-A" elementId="org.eclipse.ui.ide.markers.copyMarkerResourceQualifiedName" commandName="Copy Resource Qualified Name To Clipboard" description="Copies markers resource qualified name to the clipboard" category="_ZGO4VKrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGZ3p6rbEe2-M8nuGout-A" elementId="org.eclipse.pde.ui.runtimeWorkbenchShortcut.run" commandName="Run Eclipse Application" description="Run Eclipse Application" category="_ZGO4a6rbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGZ3qKrbEe2-M8nuGout-A" elementId="org.eclipse.search.ui.performTextSearchWorkspace" commandName="Find Text in Workspace" description="Searches the files in the workspace for specific text." category="_ZGO4aqrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGZ3qarbEe2-M8nuGout-A" elementId="org.eclipse.wst.sse.ui.remove.block.comment" commandName="Remove Block Comment" description="Remove Block Comment" category="_ZGO4VKrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGZ3qqrbEe2-M8nuGout-A" elementId="org.eclipse.pde.runtime.spy.commands.menuSpyCommand" commandName="Plug-in Menu Spy" description="Show the Plug-in Spy" category="_ZGO4cqrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGZ3q6rbEe2-M8nuGout-A" elementId="org.eclipse.jdt.ui.navigate.gototype" commandName="Go to Type" description="Go to Type" category="_ZGO4WqrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGZ3rKrbEe2-M8nuGout-A" elementId="org.eclipse.m2e.core.ui.command.openPom" commandName="Open Maven POM" category="_ZGO4WqrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGZ3rarbEe2-M8nuGout-A" elementId="org.eclipse.jdt.ui.index.rebuild" commandName="Rebuild Java Index" description="Rebuilds the Java index database" category="_ZGO4ZqrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGZ3rqrbEe2-M8nuGout-A" elementId="org.eclipse.ui.edit.addBookmark" commandName="Add Bookmark" description="Add a bookmark" category="_ZGO4VKrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGZ3r6rbEe2-M8nuGout-A" elementId="org.eclipse.ui.edit.text.set.mark" commandName="Set Mark" description="Set the mark" category="_ZGO4WarbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGZ3sKrbEe2-M8nuGout-A" elementId="org.eclipse.jdt.ui.correction.splitJoinVariableDeclaration.assist" commandName="Quick Assist - Split/Join variable declaration" description="Invokes quick assist and selects 'Split/Join variable declaration'" category="_ZGO4carbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGZ3sarbEe2-M8nuGout-A" elementId="org.springframework.ide.eclipse.boot.ui.EnableDisableBootDevtools" commandName="Add/Remove Boot Devtools" category="_ZGO4VarbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGZ3sqrbEe2-M8nuGout-A" elementId="org.eclipse.ui.views.showView" commandName="Show View" description="Shows a particular view" category="_ZGO4UarbEe2-M8nuGout-A">
+    <parameters xmi:id="_ZGZ3s6rbEe2-M8nuGout-A" elementId="org.eclipse.ui.views.showView.viewId" name="View"/>
+    <parameters xmi:id="_ZGZ3tKrbEe2-M8nuGout-A" elementId="org.eclipse.ui.views.showView.secondaryId" name="Secondary Id"/>
+    <parameters xmi:id="_ZGZ3tarbEe2-M8nuGout-A" elementId="org.eclipse.ui.views.showView.makeFast" name="As FastView"/>
   </commands>
-  <commands xmi:id="_JQ_437joEe25NdJK2M4KYw" elementId="org.eclipse.egit.ui.team.Ignore" commandName="Ignore" category="_JQ_7FLjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_44LjoEe25NdJK2M4KYw" elementId="org.eclipse.egit.ui.commit.Edit" commandName="Edit Commit" category="_JQ_7G7joEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_44bjoEe25NdJK2M4KYw" elementId="org.eclipse.ui.navigate.showResourceByPath" commandName="Show Resource in Navigator" description="Show a resource in the Navigator given its path" category="_JQ_7AbjoEe25NdJK2M4KYw">
-    <parameters xmi:id="_JQ_44rjoEe25NdJK2M4KYw" elementId="resourcePath" name="Resource Path" typeId="org.eclipse.ui.ide.resourcePath" optional="false"/>
+  <commands xmi:id="_ZGZ3tqrbEe2-M8nuGout-A" elementId="org.eclipse.egit.ui.team.Ignore" commandName="Ignore" category="_ZGO4barbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGZ3t6rbEe2-M8nuGout-A" elementId="org.eclipse.egit.ui.commit.Edit" commandName="Edit Commit" category="_ZGO4dKrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGZ3uKrbEe2-M8nuGout-A" elementId="org.eclipse.ui.navigate.showResourceByPath" commandName="Show Resource in Navigator" description="Show a resource in the Navigator given its path" category="_ZGO4WqrbEe2-M8nuGout-A">
+    <parameters xmi:id="_ZGZ3uarbEe2-M8nuGout-A" elementId="resourcePath" name="Resource Path" typeId="org.eclipse.ui.ide.resourcePath" optional="false"/>
   </commands>
-  <commands xmi:id="_JQ_447joEe25NdJK2M4KYw" elementId="org.eclipse.debug.ui.commands.SkipAllBreakpoints" commandName="Skip All Breakpoints" description="Sets whether or not any breakpoint should suspend execution" category="_JQ_7ErjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_45LjoEe25NdJK2M4KYw" elementId="org.eclipse.ui.edit.text.delimiter.windows" commandName="Convert Line Delimiters to Windows (CRLF, \r\n, 0D0A, &#xa4;&#xb6;)" description="Converts the line delimiters to Windows (CRLF, \r\n, 0D0A, &#xa4;&#xb6;)" category="_JQ_7BbjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_45bjoEe25NdJK2M4KYw" elementId="org.eclipse.ui.edit.findNext" commandName="Find Next" description="Find next item" category="_JQ_6-7joEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_45rjoEe25NdJK2M4KYw" elementId="org.eclipse.ui.window.hidetrimbars" commandName="Toggle visibility of the window toolbars" description="Toggle the visibility of the toolbars of the current window" category="_JQ_7CbjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_457joEe25NdJK2M4KYw" elementId="org.springframework.ide.eclipse.boot.commands.editStartersCommand" commandName="Edit Starters" category="_JQ_6_LjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_46LjoEe25NdJK2M4KYw" elementId="org.eclipse.pde.ui.openPluginArtifact" commandName="Open Plug-in Artifact" description="Open a plug-in artifact in the manifest editor" category="_JQ_7AbjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_46bjoEe25NdJK2M4KYw" elementId="org.eclipse.wst.server.debug" commandName="Debug" description="Debug server" category="_JQ_7A7joEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_46rjoEe25NdJK2M4KYw" elementId="org.eclipse.ui.navigate.nextSubTab" commandName="Next Sub-Tab" description="Switch to the next sub-tab" category="_JQ_7AbjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_467joEe25NdJK2M4KYw" elementId="org.eclipse.jdt.ui.edit.text.java.introduce.parameter" commandName="Introduce Parameter" description="Introduce a new method parameter based on the selected expression" category="_JQ_7CrjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_47LjoEe25NdJK2M4KYw" elementId="org.eclipse.jdt.debug.ui.localJavaShortcut.run" commandName="Run Java Application" description="Run Java Application" category="_JQ_7ErjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_47bjoEe25NdJK2M4KYw" elementId="org.eclipse.ui.edit.addTask" commandName="Add Task..." description="Add a task" category="_JQ_6-7joEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_47rjoEe25NdJK2M4KYw" elementId="org.eclipse.pde.updateUnitVersions" commandName="Update IU Versions from Repositories" description="Update to latest IU versions" category="_JQ_7GrjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_477joEe25NdJK2M4KYw" elementId="org.eclipse.wst.sse.ui.structure.select.enclosing" commandName="Select Enclosing Element" description="Expand selection to include enclosing element" category="_JQ_6-7joEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_48LjoEe25NdJK2M4KYw" elementId="org.eclipse.ui.cheatsheets.openCheatSheet" commandName="Open Cheat Sheet" description="Open a Cheat Sheet." category="_JQ_7C7joEe25NdJK2M4KYw">
-    <parameters xmi:id="_JQ_48bjoEe25NdJK2M4KYw" elementId="cheatSheetId" name="Identifier"/>
+  <commands xmi:id="_ZGZ3uqrbEe2-M8nuGout-A" elementId="org.eclipse.debug.ui.commands.SkipAllBreakpoints" commandName="Skip All Breakpoints" description="Sets whether or not any breakpoint should suspend execution" category="_ZGO4a6rbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGZ3u6rbEe2-M8nuGout-A" elementId="org.eclipse.ui.edit.text.delimiter.windows" commandName="Convert Line Delimiters to Windows (CRLF, \r\n, 0D0A, &#xa4;&#xb6;)" description="Converts the line delimiters to Windows (CRLF, \r\n, 0D0A, &#xa4;&#xb6;)" category="_ZGO4XqrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGZ3vKrbEe2-M8nuGout-A" elementId="org.eclipse.ui.edit.findNext" commandName="Find Next" description="Find next item" category="_ZGO4VKrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGZ3varbEe2-M8nuGout-A" elementId="org.eclipse.ui.window.hidetrimbars" commandName="Toggle visibility of the window toolbars" description="Toggle the visibility of the toolbars of the current window" category="_ZGO4YqrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGZ3vqrbEe2-M8nuGout-A" elementId="org.springframework.ide.eclipse.boot.commands.editStartersCommand" commandName="Edit Starters" category="_ZGO4VarbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGZ3v6rbEe2-M8nuGout-A" elementId="org.eclipse.pde.ui.openPluginArtifact" commandName="Open Plug-in Artifact" description="Open a plug-in artifact in the manifest editor" category="_ZGO4WqrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGZ3wKrbEe2-M8nuGout-A" elementId="org.eclipse.wst.server.debug" commandName="Debug" description="Debug server" category="_ZGO4XKrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGZ3warbEe2-M8nuGout-A" elementId="org.eclipse.ui.navigate.nextSubTab" commandName="Next Sub-Tab" description="Switch to the next sub-tab" category="_ZGO4WqrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGZ3wqrbEe2-M8nuGout-A" elementId="org.eclipse.jdt.ui.edit.text.java.introduce.parameter" commandName="Introduce Parameter" description="Introduce a new method parameter based on the selected expression" category="_ZGO4Y6rbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGZ3w6rbEe2-M8nuGout-A" elementId="org.eclipse.jdt.debug.ui.localJavaShortcut.run" commandName="Run Java Application" description="Run Java Application" category="_ZGO4a6rbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGZ3xKrbEe2-M8nuGout-A" elementId="org.eclipse.ui.edit.addTask" commandName="Add Task..." description="Add a task" category="_ZGO4VKrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGZ3xarbEe2-M8nuGout-A" elementId="org.eclipse.pde.updateUnitVersions" commandName="Update IU Versions from Repositories" description="Update to latest IU versions" category="_ZGO4c6rbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGZ3xqrbEe2-M8nuGout-A" elementId="org.eclipse.wst.sse.ui.structure.select.enclosing" commandName="Select Enclosing Element" description="Expand selection to include enclosing element" category="_ZGO4VKrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGZ3x6rbEe2-M8nuGout-A" elementId="org.eclipse.ui.cheatsheets.openCheatSheet" commandName="Open Cheat Sheet" description="Open a Cheat Sheet." category="_ZGO4ZKrbEe2-M8nuGout-A">
+    <parameters xmi:id="_ZGZ3yKrbEe2-M8nuGout-A" elementId="cheatSheetId" name="Identifier"/>
   </commands>
-  <commands xmi:id="_JQ_48rjoEe25NdJK2M4KYw" elementId="org.eclipse.linuxtools.docker.ui.commands.showInPropertiesView" commandName="Properties" description="Show in Properties View" category="_JQ_7G7joEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_487joEe25NdJK2M4KYw" elementId="org.eclipse.ui.edit.text.moveLineDown" commandName="Move Lines Down" description="Moves the selected lines down" category="_JQ_7ALjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_49LjoEe25NdJK2M4KYw" elementId="org.eclipse.equinox.p2.ui.sdk.update" commandName="Check for Updates" category="_JQ_7G7joEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_49bjoEe25NdJK2M4KYw" elementId="org.eclipse.pde.ui.searchTargetRepositories" commandName="Add Artifact to Target Platform" description="Add an artifact to your target platform" category="_JQ_7G7joEe25NdJK2M4KYw">
-    <parameters xmi:id="_JQ_49rjoEe25NdJK2M4KYw" elementId="org.eclipse.pde.ui.searchTargetRepositories.term" name="The initial search pattern for the artifact search dialog"/>
+  <commands xmi:id="_ZGZ3yarbEe2-M8nuGout-A" elementId="org.eclipse.linuxtools.docker.ui.commands.showInPropertiesView" commandName="Properties" description="Show in Properties View" category="_ZGO4dKrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGZ3yqrbEe2-M8nuGout-A" elementId="org.eclipse.ui.edit.text.moveLineDown" commandName="Move Lines Down" description="Moves the selected lines down" category="_ZGO4WarbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGZ3y6rbEe2-M8nuGout-A" elementId="org.eclipse.equinox.p2.ui.sdk.update" commandName="Check for Updates" category="_ZGO4dKrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGZ3zKrbEe2-M8nuGout-A" elementId="org.eclipse.pde.ui.searchTargetRepositories" commandName="Add Artifact to Target Platform" description="Add an artifact to your target platform" category="_ZGO4dKrbEe2-M8nuGout-A">
+    <parameters xmi:id="_ZGZ3zarbEe2-M8nuGout-A" elementId="org.eclipse.pde.ui.searchTargetRepositories.term" name="The initial search pattern for the artifact search dialog"/>
   </commands>
-  <commands xmi:id="_JQ_497joEe25NdJK2M4KYw" elementId="org.eclipse.ui.edit.text.goto.textEnd" commandName="Text End" description="Go to the end of the text" category="_JQ_7ALjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_4-LjoEe25NdJK2M4KYw" elementId="org.eclipse.jdt.ui.edit.text.java.goto.matching.bracket" commandName="Go to Matching Bracket" description="Moves the cursor to the matching bracket" category="_JQ_7AbjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_4-bjoEe25NdJK2M4KYw" elementId="org.eclipse.ui.part.previousPage" commandName="Previous Page" description="Switch to the previous page" category="_JQ_7AbjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_4-rjoEe25NdJK2M4KYw" elementId="com.genuitec.eclipse.meexplorer.jdtsupport.assignworkingset.command" commandName="Assign Working Sets..." category="_JQ_7G7joEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_4-7joEe25NdJK2M4KYw" elementId="org.eclipse.ui.project.closeProject" commandName="Close Project" description="Close the selected project" category="_JQ_7DbjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_4_LjoEe25NdJK2M4KYw" elementId="org.eclipse.egit.ui.team.PullWithOptions" commandName="Pull..." category="_JQ_7FLjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_4_bjoEe25NdJK2M4KYw" elementId="org.eclipse.ui.edit.text.select.addAllMatchesToMultiSelection" commandName="Add all matches to multi-selection" description="Looks for all regions matching the current selection or identifier and adds them to a multi-selection " category="_JQ_7ALjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_4_rjoEe25NdJK2M4KYw" elementId="org.eclipse.wst.server.publish" commandName="Publish" description="Publish to server" category="_JQ_7A7joEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_4_7joEe25NdJK2M4KYw" elementId="org.eclipse.jdt.ui.edit.text.java.introduce.factory" commandName="Introduce Factory" description="Introduce a factory method to encapsulate invocation of the selected constructor" category="_JQ_7CrjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_5ALjoEe25NdJK2M4KYw" elementId="org.eclipse.pde.ui.updateClasspath" commandName="Update Classpath" description="Updates the plug-in classpath from latest settings" category="_JQ_7G7joEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_5AbjoEe25NdJK2M4KYw" elementId="org.eclipse.jdt.ui.edit.text.java.use.supertype" commandName="Use Supertype Where Possible" description="Change occurrences of a type to use a supertype instead" category="_JQ_7CrjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_5ArjoEe25NdJK2M4KYw" elementId="org.eclipse.search.ui.performTextSearchFile" commandName="Find Text in File" description="Searches the files in the file for specific text." category="_JQ_7EbjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_5A7joEe25NdJK2M4KYw" elementId="org.eclipse.wst.sse.ui.structure.select.last" commandName="Restore Last Selection" description="Restore last selection" category="_JQ_6-7joEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_5BLjoEe25NdJK2M4KYw" elementId="org.eclipse.ui.edit.text.cut.line" commandName="Cut Line" description="Cut a line of text, or multiple lines when invoked again without interruption" category="_JQ_7ALjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_5BbjoEe25NdJK2M4KYw" elementId="org.eclipse.tm.terminal.view.ui.command.launch" commandName="Open Terminal on Selection" category="_JQ_7BrjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_5BrjoEe25NdJK2M4KYw" elementId="org.springsource.ide.eclipse.commons.ui.stop" commandName="Stop Application" description="Stop last launched application" category="_JQ_7DrjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_5B7joEe25NdJK2M4KYw" elementId="org.eclipse.ui.edit.text.folding.expand_all" commandName="Expand All" description="Expands all folded regions" category="_JQ_7ALjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_5CLjoEe25NdJK2M4KYw" elementId="org.eclipse.jdt.ui.correction.encapsulateField.assist" commandName="Quick Assist - Create getter/setter for field" description="Invokes quick assist and selects 'Create getter/setter for field'" category="_JQ_7GLjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_5CbjoEe25NdJK2M4KYw" elementId="org.eclipse.ui.help.quickStartAction" commandName="Welcome" description="Show help for beginning users" category="_JQ_7C7joEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_5CrjoEe25NdJK2M4KYw" elementId="org.eclipse.egit.ui.team.ReplaceWithPrevious" commandName="Replace with Previous Revision" category="_JQ_7FLjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_5C7joEe25NdJK2M4KYw" elementId="org.eclipse.m2e.sourcelookup.ui.openPom" commandName="Open Pom" category="_JQ_7G7joEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_5DLjoEe25NdJK2M4KYw" elementId="org.eclipse.ui.window.hideShowEditors" commandName="Toggle Shared Area Visibility" description="Toggles the visibility of the shared area" category="_JQ_7CbjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_5DbjoEe25NdJK2M4KYw" elementId="org.eclipse.ui.edit.text.folding.restore" commandName="Reset Structure" description="Resets the folding structure" category="_JQ_7ALjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_5DrjoEe25NdJK2M4KYw" elementId="org.eclipse.help.ui.indexcommand" commandName="Index" description="Show Keyword Index" category="_JQ_7C7joEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_5D7joEe25NdJK2M4KYw" elementId="org.eclipse.linuxtools.docker.ui.commands.removeConnection" commandName="&amp;Remove" category="_JQ_7G7joEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_5ELjoEe25NdJK2M4KYw" elementId="org.eclipse.jdt.ui.edit.text.java.clean.up" commandName="Clean Up" description="Solve problems and improve code style on selected resources" category="_JQ_7GLjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_5EbjoEe25NdJK2M4KYw" elementId="org.eclipse.pde.api.tools.ui.setup.projects" commandName="API &amp;Tools Setup..." description="Configure projects for API usage and compatibility checks" category="_JQ_7G7joEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_5ErjoEe25NdJK2M4KYw" elementId="org.eclipse.jdt.debug.ui.localJavaShortcut.debug" commandName="Debug Java Application" description="Debug Java Application" category="_JQ_7ErjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_5E7joEe25NdJK2M4KYw" elementId="org.eclipse.ui.navigate.forward" commandName="Forward" description="Navigate forward" category="_JQ_7AbjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_5FLjoEe25NdJK2M4KYw" elementId="org.eclipse.egit.ui.team.CherryPick" commandName="Cherry Pick" category="_JQ_7FLjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_5FbjoEe25NdJK2M4KYw" elementId="org.eclipse.buildship.ui.commands.openbuildscript" commandName="Open Gradle Build Script" description="Opens the Gradle build script for the selected Gradle project" category="_JQ_7AbjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_5FrjoEe25NdJK2M4KYw" elementId="org.eclipse.egit.ui.FetchGitHubPR" commandName="Fetch GitHub Pull Request" category="_JQ_7FLjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_5F7joEe25NdJK2M4KYw" elementId="org.eclipse.buildship.ui.commands.openrunconfiguration" commandName="Open Gradle Run Configuration" description="Opens the Run Configuration for the selected Gradle tasks" category="_JQ_7ErjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_5GLjoEe25NdJK2M4KYw" elementId="org.eclipse.egit.ui.history.DeleteTag" commandName="&amp;Delete Tag" category="_JQ_7G7joEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_5GbjoEe25NdJK2M4KYw" elementId="org.eclipse.jdt.ui.edit.text.remove.occurrence.annotations" commandName="Remove Occurrence Annotations" description="Removes the occurrence annotations from the current editor" category="_JQ_7GLjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_5GrjoEe25NdJK2M4KYw" elementId="org.eclipse.ui.window.pinEditor" commandName="Pin Editor" description="Pin the current editor" category="_JQ_7CbjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_5G7joEe25NdJK2M4KYw" elementId="org.eclipse.ui.edit.text.goto.pageUp" commandName="Page Up" description="Go up one page" category="_JQ_7ALjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_5HLjoEe25NdJK2M4KYw" elementId="org.eclipse.egit.ui.team.submodule.sync" commandName="Sync Submodule" category="_JQ_7FLjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_5HbjoEe25NdJK2M4KYw" elementId="org.eclipse.egit.ui.team.DeleteBranch" commandName="Delete Branch" category="_JQ_7FLjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_5HrjoEe25NdJK2M4KYw" elementId="org.eclipse.tm.terminal.copy" commandName="Copy" category="_JQ_7ELjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_5H7joEe25NdJK2M4KYw" elementId="org.eclipse.ui.edit.text.goto.columnPrevious" commandName="Previous Column" description="Go to the previous column" category="_JQ_7ALjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_5ILjoEe25NdJK2M4KYw" elementId="org.eclipse.compare.selectNextChange" commandName="Select Next Change" description="Select Next Change" category="_JQ_7B7joEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_5IbjoEe25NdJK2M4KYw" elementId="org.eclipse.ltk.ui.refactoring.commands.renameResource" commandName="Rename Resource" description="Rename the selected resource and notify LTK participants." category="_JQ_7FrjoEe25NdJK2M4KYw">
-    <parameters xmi:id="_JQ_5IrjoEe25NdJK2M4KYw" elementId="org.eclipse.ltk.ui.refactoring.commands.renameResource.newName.parameter.key" name="Selected resource's new name."/>
+  <commands xmi:id="_ZGZ3zqrbEe2-M8nuGout-A" elementId="org.eclipse.ui.edit.text.goto.textEnd" commandName="Text End" description="Go to the end of the text" category="_ZGO4WarbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGZ3z6rbEe2-M8nuGout-A" elementId="org.eclipse.jdt.ui.edit.text.java.goto.matching.bracket" commandName="Go to Matching Bracket" description="Moves the cursor to the matching bracket" category="_ZGO4WqrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGZ30KrbEe2-M8nuGout-A" elementId="org.eclipse.ui.part.previousPage" commandName="Previous Page" description="Switch to the previous page" category="_ZGO4WqrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGaegKrbEe2-M8nuGout-A" elementId="com.genuitec.eclipse.meexplorer.jdtsupport.assignworkingset.command" commandName="Assign Working Sets..." category="_ZGO4dKrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGaegarbEe2-M8nuGout-A" elementId="org.eclipse.ui.project.closeProject" commandName="Close Project" description="Close the selected project" category="_ZGO4ZqrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGaegqrbEe2-M8nuGout-A" elementId="org.eclipse.egit.ui.team.PullWithOptions" commandName="Pull..." category="_ZGO4barbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGaeg6rbEe2-M8nuGout-A" elementId="org.eclipse.ui.edit.text.select.addAllMatchesToMultiSelection" commandName="Add all matches to multi-selection" description="Looks for all regions matching the current selection or identifier and adds them to a multi-selection " category="_ZGO4WarbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGaehKrbEe2-M8nuGout-A" elementId="org.eclipse.wst.server.publish" commandName="Publish" description="Publish to server" category="_ZGO4XKrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGaeharbEe2-M8nuGout-A" elementId="org.eclipse.jdt.ui.edit.text.java.introduce.factory" commandName="Introduce Factory" description="Introduce a factory method to encapsulate invocation of the selected constructor" category="_ZGO4Y6rbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGaehqrbEe2-M8nuGout-A" elementId="org.eclipse.pde.ui.updateClasspath" commandName="Update Classpath" description="Updates the plug-in classpath from latest settings" category="_ZGO4dKrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGaeh6rbEe2-M8nuGout-A" elementId="org.eclipse.jdt.ui.edit.text.java.use.supertype" commandName="Use Supertype Where Possible" description="Change occurrences of a type to use a supertype instead" category="_ZGO4Y6rbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGaeiKrbEe2-M8nuGout-A" elementId="org.eclipse.search.ui.performTextSearchFile" commandName="Find Text in File" description="Searches the files in the file for specific text." category="_ZGO4aqrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGaeiarbEe2-M8nuGout-A" elementId="org.eclipse.wst.sse.ui.structure.select.last" commandName="Restore Last Selection" description="Restore last selection" category="_ZGO4VKrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGaeiqrbEe2-M8nuGout-A" elementId="org.eclipse.ui.edit.text.cut.line" commandName="Cut Line" description="Cut a line of text, or multiple lines when invoked again without interruption" category="_ZGO4WarbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGaei6rbEe2-M8nuGout-A" elementId="org.eclipse.tm.terminal.view.ui.command.launch" commandName="Open Terminal on Selection" category="_ZGO4X6rbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGaejKrbEe2-M8nuGout-A" elementId="org.springsource.ide.eclipse.commons.ui.stop" commandName="Stop Application" description="Stop last launched application" category="_ZGO4Z6rbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGaejarbEe2-M8nuGout-A" elementId="org.eclipse.ui.edit.text.folding.expand_all" commandName="Expand All" description="Expands all folded regions" category="_ZGO4WarbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGaejqrbEe2-M8nuGout-A" elementId="org.eclipse.jdt.ui.correction.encapsulateField.assist" commandName="Quick Assist - Create getter/setter for field" description="Invokes quick assist and selects 'Create getter/setter for field'" category="_ZGO4carbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGaej6rbEe2-M8nuGout-A" elementId="org.eclipse.ui.help.quickStartAction" commandName="Welcome" description="Show help for beginning users" category="_ZGO4ZKrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGaekKrbEe2-M8nuGout-A" elementId="org.eclipse.egit.ui.team.ReplaceWithPrevious" commandName="Replace with Previous Revision" category="_ZGO4barbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGaekarbEe2-M8nuGout-A" elementId="org.eclipse.m2e.sourcelookup.ui.openPom" commandName="Open Pom" category="_ZGO4dKrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGaekqrbEe2-M8nuGout-A" elementId="org.eclipse.ui.window.hideShowEditors" commandName="Toggle Shared Area Visibility" description="Toggles the visibility of the shared area" category="_ZGO4YqrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGaek6rbEe2-M8nuGout-A" elementId="org.eclipse.ui.edit.text.folding.restore" commandName="Reset Structure" description="Resets the folding structure" category="_ZGO4WarbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGaelKrbEe2-M8nuGout-A" elementId="org.eclipse.help.ui.indexcommand" commandName="Index" description="Show Keyword Index" category="_ZGO4ZKrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGaelarbEe2-M8nuGout-A" elementId="org.eclipse.linuxtools.docker.ui.commands.removeConnection" commandName="&amp;Remove" category="_ZGO4dKrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGaelqrbEe2-M8nuGout-A" elementId="org.eclipse.jdt.ui.edit.text.java.clean.up" commandName="Clean Up" description="Solve problems and improve code style on selected resources" category="_ZGO4carbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGael6rbEe2-M8nuGout-A" elementId="org.eclipse.pde.api.tools.ui.setup.projects" commandName="API &amp;Tools Setup..." description="Configure projects for API usage and compatibility checks" category="_ZGO4dKrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGaemKrbEe2-M8nuGout-A" elementId="org.eclipse.jdt.debug.ui.localJavaShortcut.debug" commandName="Debug Java Application" description="Debug Java Application" category="_ZGO4a6rbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGaemarbEe2-M8nuGout-A" elementId="org.eclipse.ui.navigate.forward" commandName="Forward" description="Navigate forward" category="_ZGO4WqrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGaemqrbEe2-M8nuGout-A" elementId="org.eclipse.egit.ui.team.CherryPick" commandName="Cherry Pick" category="_ZGO4barbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGaem6rbEe2-M8nuGout-A" elementId="org.eclipse.buildship.ui.commands.openbuildscript" commandName="Open Gradle Build Script" description="Opens the Gradle build script for the selected Gradle project" category="_ZGO4WqrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGaenKrbEe2-M8nuGout-A" elementId="org.eclipse.egit.ui.FetchGitHubPR" commandName="Fetch GitHub Pull Request" category="_ZGO4barbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGaenarbEe2-M8nuGout-A" elementId="org.eclipse.buildship.ui.commands.openrunconfiguration" commandName="Open Gradle Run Configuration" description="Opens the Run Configuration for the selected Gradle tasks" category="_ZGO4a6rbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGaenqrbEe2-M8nuGout-A" elementId="org.eclipse.egit.ui.history.DeleteTag" commandName="&amp;Delete Tag" category="_ZGO4dKrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGaen6rbEe2-M8nuGout-A" elementId="org.eclipse.jdt.ui.edit.text.remove.occurrence.annotations" commandName="Remove Occurrence Annotations" description="Removes the occurrence annotations from the current editor" category="_ZGO4carbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGaeoKrbEe2-M8nuGout-A" elementId="org.eclipse.ui.window.pinEditor" commandName="Pin Editor" description="Pin the current editor" category="_ZGO4YqrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGaeoarbEe2-M8nuGout-A" elementId="org.eclipse.ui.edit.text.goto.pageUp" commandName="Page Up" description="Go up one page" category="_ZGO4WarbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGaeoqrbEe2-M8nuGout-A" elementId="org.eclipse.egit.ui.team.submodule.sync" commandName="Sync Submodule" category="_ZGO4barbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGaeo6rbEe2-M8nuGout-A" elementId="org.eclipse.egit.ui.team.DeleteBranch" commandName="Delete Branch" category="_ZGO4barbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGaepKrbEe2-M8nuGout-A" elementId="org.eclipse.tm.terminal.copy" commandName="Copy" category="_ZGO4aarbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGaeparbEe2-M8nuGout-A" elementId="org.eclipse.ui.edit.text.goto.columnPrevious" commandName="Previous Column" description="Go to the previous column" category="_ZGO4WarbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGaepqrbEe2-M8nuGout-A" elementId="org.eclipse.compare.selectNextChange" commandName="Select Next Change" description="Select Next Change" category="_ZGO4YKrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGaep6rbEe2-M8nuGout-A" elementId="org.eclipse.ltk.ui.refactoring.commands.renameResource" commandName="Rename Resource" description="Rename the selected resource and notify LTK participants." category="_ZGO4b6rbEe2-M8nuGout-A">
+    <parameters xmi:id="_ZGaeqKrbEe2-M8nuGout-A" elementId="org.eclipse.ltk.ui.refactoring.commands.renameResource.newName.parameter.key" name="Selected resource's new name."/>
   </commands>
-  <commands xmi:id="_JQ_5I7joEe25NdJK2M4KYw" elementId="org.eclipse.pde.ui.importFromRepository" commandName="Import Plug-in from a Repository" description="Imports a plug-in from a source repository" category="_JQ_7G7joEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_5JLjoEe25NdJK2M4KYw" elementId="org.springframework.ide.eclipse.boot.dash.boot.dash.StopAction" commandName="Stop" description="Stop Boot App" category="_JQ_7CbjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_5JbjoEe25NdJK2M4KYw" elementId="org.eclipse.egit.ui.team.Rebase" commandName="Rebase on" category="_JQ_7FLjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_5JrjoEe25NdJK2M4KYw" elementId="org.eclipse.ui.file.properties" commandName="Properties" description="Display the properties of the selected item" category="_JQ_7BbjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_5J7joEe25NdJK2M4KYw" elementId="org.eclipse.egit.ui.team.ReplaceWithHead" commandName="Replace with HEAD revision" category="_JQ_7FLjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_5KLjoEe25NdJK2M4KYw" elementId="org.eclipse.jdt.ui.correction.renameInFile.assist" commandName="Quick Assist - Rename in file" description="Invokes quick assist and selects 'Rename in file'" category="_JQ_7GLjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_5KbjoEe25NdJK2M4KYw" elementId="com.genuitec.eclipse.inlinesearch.commands.hideFindReplaceBarCommand" commandName="Close Inline Search" category="_JQ_7HLjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_5KrjoEe25NdJK2M4KYw" elementId="org.eclipse.ui.activeContextInfo" commandName="Show activeContext Info" category="_JQ_7CbjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_5K7joEe25NdJK2M4KYw" elementId="org.eclipse.jdt.ui.edit.text.java.extract.constant" commandName="Extract Constant" description="Extracts a constant into a new static field and uses the new static field" category="_JQ_7CrjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_5LLjoEe25NdJK2M4KYw" elementId="org.eclipse.ui.edit.text.select.textStart" commandName="Select Text Start" description="Select to the beginning of the text" category="_JQ_7ALjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_5LbjoEe25NdJK2M4KYw" elementId="org.eclipse.wst.sse.ui.cleanup.document" commandName="Cleanup Document..." description="Cleanup document" category="_JQ_6-7joEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_5LrjoEe25NdJK2M4KYw" elementId="org.eclipse.egit.gitflow.ui.command.releaseFinish" commandName="Finish Release" category="_JQ_7FLjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_5L7joEe25NdJK2M4KYw" elementId="org.eclipse.egit.ui.team.ConfigurePush" commandName="Configure Upstream Push" category="_JQ_7FLjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_5MLjoEe25NdJK2M4KYw" elementId="org.eclipse.debug.ui.command.nextpage" commandName="Next Page of Memory" description="Load next page of memory" category="_JQ_7ErjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_5MbjoEe25NdJK2M4KYw" elementId="org.eclipse.debug.ui.command.gotoaddress" commandName="Go to Address" description="Go to Address" category="_JQ_7ErjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_5MrjoEe25NdJK2M4KYw" elementId="org.eclipse.egit.gitflow.ui.command.hotfixStart" commandName="Start Hotfix" category="_JQ_7FLjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_5M7joEe25NdJK2M4KYw" elementId="org.eclipse.ui.window.maximizePart" commandName="Maximize Active View or Editor" description="Toggles maximize/restore state of active view or editor" category="_JQ_7CbjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_5NLjoEe25NdJK2M4KYw" elementId="org.eclipse.jdt.ui.correction.qualifyField" commandName="Quick Fix - Qualify field access" description="Invokes quick assist and selects 'Qualify field access'" category="_JQ_7GLjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_5NbjoEe25NdJK2M4KYw" elementId="org.eclipse.ui.window.newEditor" commandName="Clone Editor" description="Open another editor on the active editor's input" category="_JQ_7CbjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_5NrjoEe25NdJK2M4KYw" elementId="org.eclipse.wst.sse.ui.format" commandName="Format" category="_JQ_7G7joEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_5N7joEe25NdJK2M4KYw" elementId="org.eclipse.search.ui.openSearchDialog" commandName="Open Search Dialog" description="Open the Search dialog" category="_JQ_7EbjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_5OLjoEe25NdJK2M4KYw" elementId="org.eclipse.ui.edit.text.contentAssist.proposals" commandName="Content Assist" description="Content Assist" category="_JQ_6-7joEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_5ObjoEe25NdJK2M4KYw" elementId="org.eclipse.ui.navigate.up" commandName="Up" description="Navigate up one level" category="_JQ_7AbjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_5OrjoEe25NdJK2M4KYw" elementId="org.eclipse.ui.window.activateEditor" commandName="Activate Editor" description="Activate the editor" category="_JQ_7CbjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_5O7joEe25NdJK2M4KYw" elementId="org.eclipse.m2e.core.ui.command.addPlugin" commandName="Add Maven Plugin" description="Add Maven plugin" category="_JQ_6-7joEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_5PLjoEe25NdJK2M4KYw" elementId="org.eclipse.jdt.ui.edit.text.java.modify.method.parameters" commandName="Change Method Signature" description="Change method signature includes parameter names and parameter order" category="_JQ_7CrjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_5PbjoEe25NdJK2M4KYw" elementId="org.eclipse.ui.edit.text.delete.line.to.end" commandName="Delete to End of Line" description="Delete to the end of a line of text" category="_JQ_7ALjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_5PrjoEe25NdJK2M4KYw" elementId="org.eclipse.jdt.ui.correction.extractLocal.assist" commandName="Quick Assist - Extract local variable (replace all occurrences)" description="Invokes quick assist and selects 'Extract local variable (replace all occurrences)'" category="_JQ_7GLjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_5P7joEe25NdJK2M4KYw" elementId="org.springsource.ide.eclipse.commons.ui.relaunch" commandName="Relaunch Application" description="Relaunch last launched application" category="_JQ_7DrjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_5QLjoEe25NdJK2M4KYw" elementId="org.eclipse.debug.ui.commands.Terminate" commandName="Terminate" description="Terminate" category="_JQ_7ErjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_5QbjoEe25NdJK2M4KYw" elementId="org.eclipse.egit.ui.team.ShowRepositoriesView" commandName="Show Git Repositories View" category="_JQ_7FLjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_5QrjoEe25NdJK2M4KYw" elementId="org.eclipse.help.ui.ignoreMissingPlaceholders" commandName="Do not warn of missing documentation" description="Sets the help preferences to no longer report a warning about the current set of missing documents." category="_JQ_7C7joEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_5Q7joEe25NdJK2M4KYw" elementId="org.eclipse.compare.compareWithOther" commandName="Compare With Other Resource" description="Compare resources, clipboard contents or editors" category="_JQ_7B7joEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_5RLjoEe25NdJK2M4KYw" elementId="org.eclipse.linuxtools.docker.ui.commands.showAllImages" commandName="&amp;Show all Images" description="Show all Images, including intermediate images." category="_JQ_7G7joEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_5RbjoEe25NdJK2M4KYw" elementId="org.eclipse.egit.ui.team.CreatePatch" commandName="Create Patch..." category="_JQ_7FLjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_5RrjoEe25NdJK2M4KYw" elementId="org.eclipse.ui.editors.revisions.author.toggle" commandName="Toggle Revision Author Display" description="Toggles the display of the revision author" category="_JQ_7ALjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_5R7joEe25NdJK2M4KYw" elementId="org.eclipse.ui.edit.text.goto.windowEnd" commandName="Window End" description="Go to the end of the window" category="_JQ_7ALjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_5SLjoEe25NdJK2M4KYw" elementId="org.eclipse.ui.perspectives.showPerspective" commandName="Show Perspective" description="Show a particular perspective" category="_JQ_7FbjoEe25NdJK2M4KYw">
-    <parameters xmi:id="_JQ_5SbjoEe25NdJK2M4KYw" elementId="org.eclipse.ui.perspectives.showPerspective.perspectiveId" name="Parameter"/>
-    <parameters xmi:id="_JQ_5SrjoEe25NdJK2M4KYw" elementId="org.eclipse.ui.perspectives.showPerspective.newWindow" name="In New Window"/>
+  <commands xmi:id="_ZGaeqarbEe2-M8nuGout-A" elementId="org.eclipse.pde.ui.importFromRepository" commandName="Import Plug-in from a Repository" description="Imports a plug-in from a source repository" category="_ZGO4dKrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGaeqqrbEe2-M8nuGout-A" elementId="org.springframework.ide.eclipse.boot.dash.boot.dash.StopAction" commandName="Stop" description="Stop Boot App" category="_ZGO4YqrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGaeq6rbEe2-M8nuGout-A" elementId="org.eclipse.egit.ui.team.Rebase" commandName="Rebase on" category="_ZGO4barbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGaerKrbEe2-M8nuGout-A" elementId="org.eclipse.ui.file.properties" commandName="Properties" description="Display the properties of the selected item" category="_ZGO4XqrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGaerarbEe2-M8nuGout-A" elementId="org.eclipse.egit.ui.team.ReplaceWithHead" commandName="Replace with HEAD revision" category="_ZGO4barbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGaerqrbEe2-M8nuGout-A" elementId="org.eclipse.jdt.ui.correction.renameInFile.assist" commandName="Quick Assist - Rename in file" description="Invokes quick assist and selects 'Rename in file'" category="_ZGO4carbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGaer6rbEe2-M8nuGout-A" elementId="com.genuitec.eclipse.inlinesearch.commands.hideFindReplaceBarCommand" commandName="Close Inline Search" category="_ZGO4darbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGaesKrbEe2-M8nuGout-A" elementId="org.eclipse.ui.activeContextInfo" commandName="Show activeContext Info" category="_ZGO4YqrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGaesarbEe2-M8nuGout-A" elementId="org.eclipse.jdt.ui.edit.text.java.extract.constant" commandName="Extract Constant" description="Extracts a constant into a new static field and uses the new static field" category="_ZGO4Y6rbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGaesqrbEe2-M8nuGout-A" elementId="org.eclipse.ui.edit.text.select.textStart" commandName="Select Text Start" description="Select to the beginning of the text" category="_ZGO4WarbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGaes6rbEe2-M8nuGout-A" elementId="org.eclipse.wst.sse.ui.cleanup.document" commandName="Cleanup Document..." description="Cleanup document" category="_ZGO4VKrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGaetKrbEe2-M8nuGout-A" elementId="org.eclipse.egit.gitflow.ui.command.releaseFinish" commandName="Finish Release" category="_ZGO4barbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGaetarbEe2-M8nuGout-A" elementId="org.eclipse.egit.ui.team.ConfigurePush" commandName="Configure Upstream Push" category="_ZGO4barbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGaetqrbEe2-M8nuGout-A" elementId="org.eclipse.debug.ui.command.nextpage" commandName="Next Page of Memory" description="Load next page of memory" category="_ZGO4a6rbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGaet6rbEe2-M8nuGout-A" elementId="org.eclipse.debug.ui.command.gotoaddress" commandName="Go to Address" description="Go to Address" category="_ZGO4a6rbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGaeuKrbEe2-M8nuGout-A" elementId="org.eclipse.egit.gitflow.ui.command.hotfixStart" commandName="Start Hotfix" category="_ZGO4barbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGaeuarbEe2-M8nuGout-A" elementId="org.eclipse.ui.window.maximizePart" commandName="Maximize Active View or Editor" description="Toggles maximize/restore state of active view or editor" category="_ZGO4YqrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGaeuqrbEe2-M8nuGout-A" elementId="org.eclipse.jdt.ui.correction.qualifyField" commandName="Quick Fix - Qualify field access" description="Invokes quick assist and selects 'Qualify field access'" category="_ZGO4carbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGaeu6rbEe2-M8nuGout-A" elementId="org.eclipse.ui.window.newEditor" commandName="Clone Editor" description="Open another editor on the active editor's input" category="_ZGO4YqrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGaevKrbEe2-M8nuGout-A" elementId="org.eclipse.wst.sse.ui.format" commandName="Format" category="_ZGO4dKrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGaevarbEe2-M8nuGout-A" elementId="org.eclipse.search.ui.openSearchDialog" commandName="Open Search Dialog" description="Open the Search dialog" category="_ZGO4aqrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGaevqrbEe2-M8nuGout-A" elementId="org.eclipse.ui.edit.text.contentAssist.proposals" commandName="Content Assist" description="Content Assist" category="_ZGO4VKrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGaev6rbEe2-M8nuGout-A" elementId="org.eclipse.ui.navigate.up" commandName="Up" description="Navigate up one level" category="_ZGO4WqrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGaewKrbEe2-M8nuGout-A" elementId="org.eclipse.ui.window.activateEditor" commandName="Activate Editor" description="Activate the editor" category="_ZGO4YqrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGaewarbEe2-M8nuGout-A" elementId="org.eclipse.m2e.core.ui.command.addPlugin" commandName="Add Maven Plugin" description="Add Maven plugin" category="_ZGO4VKrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGaewqrbEe2-M8nuGout-A" elementId="org.eclipse.jdt.ui.edit.text.java.modify.method.parameters" commandName="Change Method Signature" description="Change method signature includes parameter names and parameter order" category="_ZGO4Y6rbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGaew6rbEe2-M8nuGout-A" elementId="org.eclipse.ui.edit.text.delete.line.to.end" commandName="Delete to End of Line" description="Delete to the end of a line of text" category="_ZGO4WarbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGaexKrbEe2-M8nuGout-A" elementId="org.eclipse.jdt.ui.correction.extractLocal.assist" commandName="Quick Assist - Extract local variable (replace all occurrences)" description="Invokes quick assist and selects 'Extract local variable (replace all occurrences)'" category="_ZGO4carbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGaexarbEe2-M8nuGout-A" elementId="org.springsource.ide.eclipse.commons.ui.relaunch" commandName="Relaunch Application" description="Relaunch last launched application" category="_ZGO4Z6rbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGaexqrbEe2-M8nuGout-A" elementId="org.eclipse.debug.ui.commands.Terminate" commandName="Terminate" description="Terminate" category="_ZGO4a6rbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGaex6rbEe2-M8nuGout-A" elementId="org.eclipse.egit.ui.team.ShowRepositoriesView" commandName="Show Git Repositories View" category="_ZGO4barbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGaeyKrbEe2-M8nuGout-A" elementId="org.eclipse.help.ui.ignoreMissingPlaceholders" commandName="Do not warn of missing documentation" description="Sets the help preferences to no longer report a warning about the current set of missing documents." category="_ZGO4ZKrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGaeyarbEe2-M8nuGout-A" elementId="org.eclipse.compare.compareWithOther" commandName="Compare With Other Resource" description="Compare resources, clipboard contents or editors" category="_ZGO4YKrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGaeyqrbEe2-M8nuGout-A" elementId="org.eclipse.linuxtools.docker.ui.commands.showAllImages" commandName="&amp;Show all Images" description="Show all Images, including intermediate images." category="_ZGO4dKrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGaey6rbEe2-M8nuGout-A" elementId="org.eclipse.egit.ui.team.CreatePatch" commandName="Create Patch..." category="_ZGO4barbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGaezKrbEe2-M8nuGout-A" elementId="org.eclipse.ui.editors.revisions.author.toggle" commandName="Toggle Revision Author Display" description="Toggles the display of the revision author" category="_ZGO4WarbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGaezarbEe2-M8nuGout-A" elementId="org.eclipse.ui.edit.text.goto.windowEnd" commandName="Window End" description="Go to the end of the window" category="_ZGO4WarbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGaezqrbEe2-M8nuGout-A" elementId="org.eclipse.ui.perspectives.showPerspective" commandName="Show Perspective" description="Show a particular perspective" category="_ZGO4bqrbEe2-M8nuGout-A">
+    <parameters xmi:id="_ZGaez6rbEe2-M8nuGout-A" elementId="org.eclipse.ui.perspectives.showPerspective.perspectiveId" name="Parameter"/>
+    <parameters xmi:id="_ZGae0KrbEe2-M8nuGout-A" elementId="org.eclipse.ui.perspectives.showPerspective.newWindow" name="In New Window"/>
   </commands>
-  <commands xmi:id="_JQ_5S7joEe25NdJK2M4KYw" elementId="org.eclipse.ui.edit.text.goto.line" commandName="Go to Line" description="Go to a specified line of text" category="_JQ_7AbjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_5TLjoEe25NdJK2M4KYw" elementId="org.eclipse.ui.editors.quickdiff.revert" commandName="Revert Lines" description="Revert the current selection, block or deleted lines" category="_JQ_7ALjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_5TbjoEe25NdJK2M4KYw" elementId="org.eclipse.jdt.debug.ui.javaAppletShortcut.debug" commandName="Debug Java Applet" description="Debug Java Applet" category="_JQ_7ErjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_5TrjoEe25NdJK2M4KYw" elementId="org.eclipse.ui.edit.text.select.lineUp" commandName="Select Line Up" description="Extend the selection to the previous line of text" category="_JQ_7ALjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_5T7joEe25NdJK2M4KYw" elementId="org.eclipse.egit.ui.team.submodule.add" commandName="Add Submodule" category="_JQ_7FLjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_5ULjoEe25NdJK2M4KYw" elementId="org.eclipse.ui.edit.text.cut.line.to.end" commandName="Cut to End of Line" description="Cut to the end of a line of text" category="_JQ_7ALjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_5UbjoEe25NdJK2M4KYw" elementId="org.eclipse.jdt.ui.correction.convertAnonymousToLocal.assist" commandName="Quick Assist - Convert anonymous to local class" description="Invokes quick assist and selects 'Convert anonymous to local class'" category="_JQ_7GLjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_5UrjoEe25NdJK2M4KYw" elementId="org.eclipse.compare.copyLeftToRight" commandName="Copy from Left to Right" description="Copy Current Change from Left to Right" category="_JQ_7B7joEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_5U7joEe25NdJK2M4KYw" elementId="org.eclipse.ui.project.openProject" commandName="Open Project" description="Open a project" category="_JQ_7DbjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_5VLjoEe25NdJK2M4KYw" elementId="org.eclipse.egit.ui.history.ShowBlame" commandName="Show Revision Information" category="_JQ_7G7joEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_5VbjoEe25NdJK2M4KYw" elementId="org.eclipse.jdt.ui.correction.addSuppressWarnings" commandName="Quick Fix - Add @SuppressWarnings" description="Invokes quick fix and selects 'Add @SuppressWarnings' " category="_JQ_7GLjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_5VrjoEe25NdJK2M4KYw" elementId="org.eclipse.tips.ide.command.trim.open" commandName="Tip of the Day" category="_JQ_7G7joEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_5V7joEe25NdJK2M4KYw" elementId="org.eclipse.jdt.ui.edit.text.java.search.write.access.in.project" commandName="Write Access in Project" description="Search for write references to the selected element in the enclosing project" category="_JQ_7EbjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_5WLjoEe25NdJK2M4KYw" elementId="org.eclipse.ui.project.properties" commandName="Properties" description="Display the properties of the selected item's project " category="_JQ_7DbjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_5WbjoEe25NdJK2M4KYw" elementId="org.eclipse.egit.ui.history.CompareVersionsInTree" commandName="Compare in Tree" category="_JQ_7G7joEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_5WrjoEe25NdJK2M4KYw" elementId="org.eclipse.ui.edit.text.select.columnPrevious" commandName="Select Previous Column" description="Select the previous column" category="_JQ_7ALjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_5W7joEe25NdJK2M4KYw" elementId="org.eclipse.pde.ui.junitWorkbenchShortcut.debug" commandName="Debug JUnit Plug-in Test" description="Debug JUnit Plug-in Test" category="_JQ_7ErjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_5XLjoEe25NdJK2M4KYw" elementId="org.eclipse.jdt.ui.correction.extractLocalNotReplaceOccurrences.assist" commandName="Quick Assist - Extract local variable" description="Invokes quick assist and selects 'Extract local variable'" category="_JQ_7GLjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_5XbjoEe25NdJK2M4KYw" elementId="org.eclipse.egit.ui.RepositoriesToggleBranchHierarchy" commandName="Toggle Branch Representation" category="_JQ_7FLjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_5XrjoEe25NdJK2M4KYw" elementId="org.eclipse.ltk.ui.refactoring.commands.deleteResources" commandName="Delete Resources" description="Delete the selected resources and notify LTK participants." category="_JQ_7FrjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_5X7joEe25NdJK2M4KYw" elementId="org.eclipse.ui.file.print" commandName="Print" description="Print" category="_JQ_7BbjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_5YLjoEe25NdJK2M4KYw" elementId="com.genuitec.myeclipse.perspective.meexplorer.search.casesensitivecommand" commandName="Case Sensitive" category="_JQ_7G7joEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_5YbjoEe25NdJK2M4KYw" elementId="org.eclipse.jdt.debug.ui.commands.AllReferences" commandName="All References" description="Inspect all references to the selected object" category="_JQ_7ErjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_5YrjoEe25NdJK2M4KYw" elementId="org.eclipse.jdt.junit.junitShortcut.rerunLast" commandName="Rerun JUnit Test" description="Rerun JUnit Test" category="_JQ_7ErjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_5Y7joEe25NdJK2M4KYw" elementId="org.eclipse.ui.edit.text.select.selectMultiSelectionDown" commandName="Multi selection down relative to anchor selection  " description="Search next matching region and add it to the current selection, or remove first element from current multi-selection " category="_JQ_7ALjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_5ZLjoEe25NdJK2M4KYw" elementId="org.eclipse.wst.sse.ui.format.active.elements" commandName="Format Active Elements" description="Format active elements" category="_JQ_6-7joEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_5ZbjoEe25NdJK2M4KYw" elementId="org.eclipse.ui.edit.text.showRulerContextMenu" commandName="Show Ruler Context Menu" description="Show the context menu for the ruler" category="_JQ_7CbjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_5ZrjoEe25NdJK2M4KYw" elementId="org.eclipse.linuxtools.docker.ui.commands.showInSystemExplorer" commandName="System Explorer" description="%command.showInSystemExplorer.menu.description" category="_JQ_7G7joEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_5Z7joEe25NdJK2M4KYw" elementId="org.eclipse.jdt.ui.edit.text.java.search.references.in.working.set" commandName="References in Working Set" description="Search for references to the selected element in a working set" category="_JQ_7EbjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_5aLjoEe25NdJK2M4KYw" elementId="org.eclipse.ui.edit.text.folding.collapse" commandName="Collapse" description="Collapses the folded region at the current selection" category="_JQ_7ALjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_5abjoEe25NdJK2M4KYw" elementId="org.eclipse.epp.mpc.ui.command.showFavorites" commandName="Eclipse Marketplace Favorites" description="Open Marketplace Favorites" category="_JQ_7G7joEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_5arjoEe25NdJK2M4KYw" elementId="org.eclipse.ui.edit.text.smartEnterInverse" commandName="Insert Line Above Current Line" description="Adds a new line above the current line" category="_JQ_7ALjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_5a7joEe25NdJK2M4KYw" elementId="org.eclipse.ui.window.spy" commandName="Show Contributing Plug-in" description="Shows contribution information for the currently selected element" category="_JQ_7CbjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_5bLjoEe25NdJK2M4KYw" elementId="org.eclipse.ui.help.helpSearch" commandName="Help Search" description="Open the help search" category="_JQ_7C7joEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_5bbjoEe25NdJK2M4KYw" elementId="org.eclipse.jdt.ui.edit.text.java.infer.type.arguments" commandName="Infer Generic Type Arguments" description="Infer type arguments for references to generic classes and remove unnecessary casts" category="_JQ_7CrjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_5brjoEe25NdJK2M4KYw" elementId="org.eclipse.egit.gitflow.ui.command.featureTrack" commandName="Track Feature" category="_JQ_7FLjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_5b7joEe25NdJK2M4KYw" elementId="org.eclipse.ui.edit.text.goto.lineDown" commandName="Line Down" description="Go down one line of text" category="_JQ_7ALjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_5cLjoEe25NdJK2M4KYw" elementId="org.eclipse.m2e.actions.LifeCycleClean.run" commandName="Run Maven Clean" description="Run Maven Clean" category="_JQ_7ErjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_5cbjoEe25NdJK2M4KYw" elementId="org.eclipse.ui.edit.text.gotoLastEditPosition" commandName="Previous Edit Location" description="Previous edit location" category="_JQ_7AbjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_5crjoEe25NdJK2M4KYw" elementId="org.eclipse.ui.edit.text.open.hyperlink" commandName="Open Hyperlink" description="Opens the hyperlink at the caret location or opens a chooser if more than one hyperlink is available" category="_JQ_7ALjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_5c7joEe25NdJK2M4KYw" elementId="org.eclipse.mylyn.wikitext.ui.convertToEclipseHelpCommand" commandName="Generate Eclipse Help (*.html and *-toc.xml)" category="_JQ_7G7joEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_5dLjoEe25NdJK2M4KYw" elementId="org.eclipse.debug.ui.command.prevpage" commandName="Previous Page of Memory" description="Load previous page of memory" category="_JQ_7ErjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_5dbjoEe25NdJK2M4KYw" elementId="org.eclipse.jdt.debug.ui.commands.ForceReturn" commandName="Force Return" description="Forces return from method with value of selected expression " category="_JQ_7ErjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_5drjoEe25NdJK2M4KYw" elementId="org.eclipse.ui.ide.configureFilters" commandName="Filters..." description="Configure the filters to apply to the markers view" category="_JQ_7G7joEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_5d7joEe25NdJK2M4KYw" elementId="org.eclipse.ui.navigate.previousTab" commandName="Previous Tab" description="Switch to the previous tab" category="_JQ_7AbjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_5eLjoEe25NdJK2M4KYw" elementId="org.eclipse.lsp4e.toggleSortOutline" commandName="Sort" category="_JQ_7BLjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_5ebjoEe25NdJK2M4KYw" elementId="org.eclipse.ui.dialogs.openMessageDialog" commandName="Open Message Dialog" description="Open a Message Dialog" category="_JQ_7E7joEe25NdJK2M4KYw">
-    <parameters xmi:id="_JQ_5erjoEe25NdJK2M4KYw" elementId="title" name="Title"/>
-    <parameters xmi:id="_JQ_5e7joEe25NdJK2M4KYw" elementId="message" name="Message"/>
-    <parameters xmi:id="_JQ_5fLjoEe25NdJK2M4KYw" elementId="imageType" name="Image Type Constant" typeId="org.eclipse.ui.dialogs.Integer"/>
-    <parameters xmi:id="_JQ_5fbjoEe25NdJK2M4KYw" elementId="defaultIndex" name="Default Button Index" typeId="org.eclipse.ui.dialogs.Integer"/>
-    <parameters xmi:id="_JQ_5frjoEe25NdJK2M4KYw" elementId="buttonLabel0" name="First Button Label"/>
-    <parameters xmi:id="_JQ_5f7joEe25NdJK2M4KYw" elementId="buttonLabel1" name="Second Button Label"/>
-    <parameters xmi:id="_JQ_5gLjoEe25NdJK2M4KYw" elementId="buttonLabel2" name="Third Button Label"/>
-    <parameters xmi:id="_JQ_5gbjoEe25NdJK2M4KYw" elementId="buttonLabel3" name="Fourth Button Label"/>
-    <parameters xmi:id="_JQ_5grjoEe25NdJK2M4KYw" elementId="cancelReturns" name="Return Value on Cancel"/>
+  <commands xmi:id="_ZGae0arbEe2-M8nuGout-A" elementId="org.eclipse.ui.edit.text.goto.line" commandName="Go to Line" description="Go to a specified line of text" category="_ZGO4WqrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGae0qrbEe2-M8nuGout-A" elementId="org.eclipse.ui.editors.quickdiff.revert" commandName="Revert Lines" description="Revert the current selection, block or deleted lines" category="_ZGO4WarbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGae06rbEe2-M8nuGout-A" elementId="org.eclipse.jdt.debug.ui.javaAppletShortcut.debug" commandName="Debug Java Applet" description="Debug Java Applet" category="_ZGO4a6rbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGae1KrbEe2-M8nuGout-A" elementId="org.eclipse.ui.edit.text.select.lineUp" commandName="Select Line Up" description="Extend the selection to the previous line of text" category="_ZGO4WarbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGae1arbEe2-M8nuGout-A" elementId="org.eclipse.egit.ui.team.submodule.add" commandName="Add Submodule" category="_ZGO4barbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGae1qrbEe2-M8nuGout-A" elementId="org.eclipse.ui.edit.text.cut.line.to.end" commandName="Cut to End of Line" description="Cut to the end of a line of text" category="_ZGO4WarbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGae16rbEe2-M8nuGout-A" elementId="org.eclipse.jdt.ui.correction.convertAnonymousToLocal.assist" commandName="Quick Assist - Convert anonymous to local class" description="Invokes quick assist and selects 'Convert anonymous to local class'" category="_ZGO4carbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGae2KrbEe2-M8nuGout-A" elementId="org.eclipse.compare.copyLeftToRight" commandName="Copy from Left to Right" description="Copy Current Change from Left to Right" category="_ZGO4YKrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGae2arbEe2-M8nuGout-A" elementId="org.eclipse.ui.project.openProject" commandName="Open Project" description="Open a project" category="_ZGO4ZqrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGae2qrbEe2-M8nuGout-A" elementId="org.eclipse.egit.ui.history.ShowBlame" commandName="Show Revision Information" category="_ZGO4dKrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGae26rbEe2-M8nuGout-A" elementId="org.eclipse.jdt.ui.correction.addSuppressWarnings" commandName="Quick Fix - Add @SuppressWarnings" description="Invokes quick fix and selects 'Add @SuppressWarnings' " category="_ZGO4carbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGae3KrbEe2-M8nuGout-A" elementId="org.eclipse.tips.ide.command.trim.open" commandName="Tip of the Day" category="_ZGO4dKrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGae3arbEe2-M8nuGout-A" elementId="org.eclipse.jdt.ui.edit.text.java.search.write.access.in.project" commandName="Write Access in Project" description="Search for write references to the selected element in the enclosing project" category="_ZGO4aqrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGae3qrbEe2-M8nuGout-A" elementId="org.eclipse.ui.project.properties" commandName="Properties" description="Display the properties of the selected item's project " category="_ZGO4ZqrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGae36rbEe2-M8nuGout-A" elementId="org.eclipse.egit.ui.history.CompareVersionsInTree" commandName="Compare in Tree" category="_ZGO4dKrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGae4KrbEe2-M8nuGout-A" elementId="org.eclipse.ui.edit.text.select.columnPrevious" commandName="Select Previous Column" description="Select the previous column" category="_ZGO4WarbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGae4arbEe2-M8nuGout-A" elementId="org.eclipse.pde.ui.junitWorkbenchShortcut.debug" commandName="Debug JUnit Plug-in Test" description="Debug JUnit Plug-in Test" category="_ZGO4a6rbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGae4qrbEe2-M8nuGout-A" elementId="org.eclipse.jdt.ui.correction.extractLocalNotReplaceOccurrences.assist" commandName="Quick Assist - Extract local variable" description="Invokes quick assist and selects 'Extract local variable'" category="_ZGO4carbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGae46rbEe2-M8nuGout-A" elementId="org.eclipse.egit.ui.RepositoriesToggleBranchHierarchy" commandName="Toggle Branch Representation" category="_ZGO4barbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGae5KrbEe2-M8nuGout-A" elementId="org.eclipse.ltk.ui.refactoring.commands.deleteResources" commandName="Delete Resources" description="Delete the selected resources and notify LTK participants." category="_ZGO4b6rbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGae5arbEe2-M8nuGout-A" elementId="org.eclipse.ui.file.print" commandName="Print" description="Print" category="_ZGO4XqrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGae5qrbEe2-M8nuGout-A" elementId="com.genuitec.myeclipse.perspective.meexplorer.search.casesensitivecommand" commandName="Case Sensitive" category="_ZGO4dKrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGae56rbEe2-M8nuGout-A" elementId="org.eclipse.jdt.debug.ui.commands.AllReferences" commandName="All References" description="Inspect all references to the selected object" category="_ZGO4a6rbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGae6KrbEe2-M8nuGout-A" elementId="org.eclipse.jdt.junit.junitShortcut.rerunLast" commandName="Rerun JUnit Test" description="Rerun JUnit Test" category="_ZGO4a6rbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGae6arbEe2-M8nuGout-A" elementId="org.eclipse.ui.edit.text.select.selectMultiSelectionDown" commandName="Multi selection down relative to anchor selection  " description="Search next matching region and add it to the current selection, or remove first element from current multi-selection " category="_ZGO4WarbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGae6qrbEe2-M8nuGout-A" elementId="org.eclipse.wst.sse.ui.format.active.elements" commandName="Format Active Elements" description="Format active elements" category="_ZGO4VKrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGae66rbEe2-M8nuGout-A" elementId="org.eclipse.ui.edit.text.showRulerContextMenu" commandName="Show Ruler Context Menu" description="Show the context menu for the ruler" category="_ZGO4YqrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGae7KrbEe2-M8nuGout-A" elementId="org.eclipse.linuxtools.docker.ui.commands.showInSystemExplorer" commandName="System Explorer" description="%command.showInSystemExplorer.menu.description" category="_ZGO4dKrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGae7arbEe2-M8nuGout-A" elementId="org.eclipse.jdt.ui.edit.text.java.search.references.in.working.set" commandName="References in Working Set" description="Search for references to the selected element in a working set" category="_ZGO4aqrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGae7qrbEe2-M8nuGout-A" elementId="org.eclipse.ui.edit.text.folding.collapse" commandName="Collapse" description="Collapses the folded region at the current selection" category="_ZGO4WarbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGae76rbEe2-M8nuGout-A" elementId="org.eclipse.epp.mpc.ui.command.showFavorites" commandName="Eclipse Marketplace Favorites" description="Open Marketplace Favorites" category="_ZGO4dKrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGbFkKrbEe2-M8nuGout-A" elementId="org.eclipse.ui.edit.text.smartEnterInverse" commandName="Insert Line Above Current Line" description="Adds a new line above the current line" category="_ZGO4WarbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGbFkarbEe2-M8nuGout-A" elementId="org.eclipse.ui.window.spy" commandName="Show Contributing Plug-in" description="Shows contribution information for the currently selected element" category="_ZGO4YqrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGbFkqrbEe2-M8nuGout-A" elementId="org.eclipse.ui.help.helpSearch" commandName="Help Search" description="Open the help search" category="_ZGO4ZKrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGbFk6rbEe2-M8nuGout-A" elementId="org.eclipse.jdt.ui.edit.text.java.infer.type.arguments" commandName="Infer Generic Type Arguments" description="Infer type arguments for references to generic classes and remove unnecessary casts" category="_ZGO4Y6rbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGbFlKrbEe2-M8nuGout-A" elementId="org.eclipse.egit.gitflow.ui.command.featureTrack" commandName="Track Feature" category="_ZGO4barbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGbFlarbEe2-M8nuGout-A" elementId="org.eclipse.ui.edit.text.goto.lineDown" commandName="Line Down" description="Go down one line of text" category="_ZGO4WarbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGbFlqrbEe2-M8nuGout-A" elementId="org.eclipse.m2e.actions.LifeCycleClean.run" commandName="Run Maven Clean" description="Run Maven Clean" category="_ZGO4a6rbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGbFl6rbEe2-M8nuGout-A" elementId="org.eclipse.ui.edit.text.gotoLastEditPosition" commandName="Previous Edit Location" description="Previous edit location" category="_ZGO4WqrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGbFmKrbEe2-M8nuGout-A" elementId="org.eclipse.ui.edit.text.open.hyperlink" commandName="Open Hyperlink" description="Opens the hyperlink at the caret location or opens a chooser if more than one hyperlink is available" category="_ZGO4WarbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGbFmarbEe2-M8nuGout-A" elementId="org.eclipse.mylyn.wikitext.ui.convertToEclipseHelpCommand" commandName="Generate Eclipse Help (*.html and *-toc.xml)" category="_ZGO4dKrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGbFmqrbEe2-M8nuGout-A" elementId="org.eclipse.debug.ui.command.prevpage" commandName="Previous Page of Memory" description="Load previous page of memory" category="_ZGO4a6rbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGbFm6rbEe2-M8nuGout-A" elementId="org.eclipse.jdt.debug.ui.commands.ForceReturn" commandName="Force Return" description="Forces return from method with value of selected expression " category="_ZGO4a6rbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGbFnKrbEe2-M8nuGout-A" elementId="org.eclipse.ui.ide.configureFilters" commandName="Filters..." description="Configure the filters to apply to the markers view" category="_ZGO4dKrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGbFnarbEe2-M8nuGout-A" elementId="org.eclipse.ui.navigate.previousTab" commandName="Previous Tab" description="Switch to the previous tab" category="_ZGO4WqrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGbFnqrbEe2-M8nuGout-A" elementId="org.eclipse.lsp4e.toggleSortOutline" commandName="Sort" category="_ZGO4XarbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGbFn6rbEe2-M8nuGout-A" elementId="org.eclipse.ui.dialogs.openMessageDialog" commandName="Open Message Dialog" description="Open a Message Dialog" category="_ZGO4bKrbEe2-M8nuGout-A">
+    <parameters xmi:id="_ZGbFoKrbEe2-M8nuGout-A" elementId="title" name="Title"/>
+    <parameters xmi:id="_ZGbFoarbEe2-M8nuGout-A" elementId="message" name="Message"/>
+    <parameters xmi:id="_ZGbFoqrbEe2-M8nuGout-A" elementId="imageType" name="Image Type Constant" typeId="org.eclipse.ui.dialogs.Integer"/>
+    <parameters xmi:id="_ZGbFo6rbEe2-M8nuGout-A" elementId="defaultIndex" name="Default Button Index" typeId="org.eclipse.ui.dialogs.Integer"/>
+    <parameters xmi:id="_ZGbFpKrbEe2-M8nuGout-A" elementId="buttonLabel0" name="First Button Label"/>
+    <parameters xmi:id="_ZGbFparbEe2-M8nuGout-A" elementId="buttonLabel1" name="Second Button Label"/>
+    <parameters xmi:id="_ZGbFpqrbEe2-M8nuGout-A" elementId="buttonLabel2" name="Third Button Label"/>
+    <parameters xmi:id="_ZGbFp6rbEe2-M8nuGout-A" elementId="buttonLabel3" name="Fourth Button Label"/>
+    <parameters xmi:id="_ZGbFqKrbEe2-M8nuGout-A" elementId="cancelReturns" name="Return Value on Cancel"/>
   </commands>
-  <commands xmi:id="_JQ_5g7joEe25NdJK2M4KYw" elementId="org.eclipse.ui.genericeditor.findReferences" commandName="Find References" description="Find other code items referencing the current selected item." category="_JQ_7G7joEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_5hLjoEe25NdJK2M4KYw" elementId="org.eclipse.ui.edit.text.goto.lineEnd" commandName="Line End" description="Go to the end of the line of text" category="_JQ_7ALjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_5hbjoEe25NdJK2M4KYw" elementId="org.eclipse.debug.ui.commands.RunLast" commandName="Run" description="Launch in run mode" category="_JQ_7ErjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_5hrjoEe25NdJK2M4KYw" elementId="org.eclipse.ui.externalTools.commands.OpenExternalToolsConfigurations" commandName="External Tools..." description="Open external tools launch configuration dialog" category="_JQ_7ErjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_5h7joEe25NdJK2M4KYw" elementId="org.eclipse.jdt.debug.ui.command.OpenFromClipboard" commandName="Open from Clipboard" description="Opens a Java element or a Java stack trace from clipboard" category="_JQ_7AbjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_5iLjoEe25NdJK2M4KYw" elementId="org.eclipse.pde.ui.internationalize" commandName="Internationalize Plug-ins" description="Sets up internationalization for a plug-in" category="_JQ_7G7joEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_5ibjoEe25NdJK2M4KYw" elementId="com.genuitec.eclipse.webclipse.evergreen.checkForUpdates" commandName="Check for Updates" category="_JQ_7G7joEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_5irjoEe25NdJK2M4KYw" elementId="org.eclipse.ui.edit.text.deletePrevious" commandName="Delete Previous" description="Delete the previous character" category="_JQ_7ALjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_5i7joEe25NdJK2M4KYw" elementId="org.eclipse.egit.ui.team.CompareWithPrevious" commandName="Compare with Previous Revision" category="_JQ_7FLjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_5jLjoEe25NdJK2M4KYw" elementId="org.eclipse.ui.edit.text.select.columnNext" commandName="Select Next Column" description="Select the next column" category="_JQ_7ALjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_5jbjoEe25NdJK2M4KYw" elementId="org.eclipse.jdt.ui.edit.text.java.search.read.access.in.workspace" commandName="Read Access in Workspace" description="Search for read references to the selected element in the workspace" category="_JQ_7EbjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_5jrjoEe25NdJK2M4KYw" elementId="org.eclipse.debug.ui.commands.TerminateAndRelaunch" commandName="Terminate and Relaunch" description="Terminate and Relaunch" category="_JQ_7ErjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_5j7joEe25NdJK2M4KYw" elementId="org.eclipse.jdt.ui.JavaHierarchyPerspective" commandName="Java Type Hierarchy" description="Show the Java Type Hierarchy perspective" category="_JQ_7FbjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_5kLjoEe25NdJK2M4KYw" elementId="org.eclipse.jdt.ui.edit.text.java.surround.with.try.multicatch" commandName="Surround with try/multi-catch Block" description="Surround the selected text with a try/multi-catch block" category="_JQ_7GLjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_5kbjoEe25NdJK2M4KYw" elementId="org.eclipse.egit.ui.team.Tag" commandName="Create Tag..." category="_JQ_7FLjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_5krjoEe25NdJK2M4KYw" elementId="org.eclipse.egit.ui.team.NoAssumeUnchanged" commandName="No Assume Unchanged" category="_JQ_7FLjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_5k7joEe25NdJK2M4KYw" elementId="org.eclipse.debug.ui.commands.RemoveAllBreakpoints" commandName="Remove All Breakpoints" description="Removes all breakpoints" category="_JQ_7ErjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_5lLjoEe25NdJK2M4KYw" elementId="org.eclipse.ui.navigator.resources.nested.changeProjectPresentation" commandName="P&amp;rojects Presentation" category="_JQ_7G7joEe25NdJK2M4KYw">
-    <parameters xmi:id="_JQ_5lbjoEe25NdJK2M4KYw" elementId="org.eclipse.ui.navigator.resources.nested.enabled" name="&amp;Hierarchical"/>
-    <parameters xmi:id="_JQ_5lrjoEe25NdJK2M4KYw" elementId="org.eclipse.ui.commands.radioStateParameter" name="Nested Project view - Radio State" optional="false"/>
+  <commands xmi:id="_ZGbFqarbEe2-M8nuGout-A" elementId="org.eclipse.ui.genericeditor.findReferences" commandName="Find References" description="Find other code items referencing the current selected item." category="_ZGO4dKrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGbFqqrbEe2-M8nuGout-A" elementId="org.eclipse.ui.edit.text.goto.lineEnd" commandName="Line End" description="Go to the end of the line of text" category="_ZGO4WarbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGbFq6rbEe2-M8nuGout-A" elementId="org.eclipse.debug.ui.commands.RunLast" commandName="Run" description="Launch in run mode" category="_ZGO4a6rbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGbFrKrbEe2-M8nuGout-A" elementId="org.eclipse.ui.externalTools.commands.OpenExternalToolsConfigurations" commandName="External Tools..." description="Open external tools launch configuration dialog" category="_ZGO4a6rbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGbFrarbEe2-M8nuGout-A" elementId="org.eclipse.jdt.debug.ui.command.OpenFromClipboard" commandName="Open from Clipboard" description="Opens a Java element or a Java stack trace from clipboard" category="_ZGO4WqrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGbFrqrbEe2-M8nuGout-A" elementId="org.eclipse.pde.ui.internationalize" commandName="Internationalize Plug-ins" description="Sets up internationalization for a plug-in" category="_ZGO4dKrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGbFr6rbEe2-M8nuGout-A" elementId="com.genuitec.eclipse.webclipse.evergreen.checkForUpdates" commandName="Check for Updates" category="_ZGO4dKrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGbFsKrbEe2-M8nuGout-A" elementId="org.eclipse.ui.edit.text.deletePrevious" commandName="Delete Previous" description="Delete the previous character" category="_ZGO4WarbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGbFsarbEe2-M8nuGout-A" elementId="org.eclipse.egit.ui.team.CompareWithPrevious" commandName="Compare with Previous Revision" category="_ZGO4barbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGbFsqrbEe2-M8nuGout-A" elementId="org.eclipse.ui.edit.text.select.columnNext" commandName="Select Next Column" description="Select the next column" category="_ZGO4WarbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGbFs6rbEe2-M8nuGout-A" elementId="org.eclipse.jdt.ui.edit.text.java.search.read.access.in.workspace" commandName="Read Access in Workspace" description="Search for read references to the selected element in the workspace" category="_ZGO4aqrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGbFtKrbEe2-M8nuGout-A" elementId="org.eclipse.debug.ui.commands.TerminateAndRelaunch" commandName="Terminate and Relaunch" description="Terminate and Relaunch" category="_ZGO4a6rbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGbFtarbEe2-M8nuGout-A" elementId="org.eclipse.jdt.ui.JavaHierarchyPerspective" commandName="Java Type Hierarchy" description="Show the Java Type Hierarchy perspective" category="_ZGO4bqrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGbFtqrbEe2-M8nuGout-A" elementId="org.eclipse.jdt.ui.edit.text.java.surround.with.try.multicatch" commandName="Surround with try/multi-catch Block" description="Surround the selected text with a try/multi-catch block" category="_ZGO4carbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGbFt6rbEe2-M8nuGout-A" elementId="org.eclipse.egit.ui.team.Tag" commandName="Create Tag..." category="_ZGO4barbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGbFuKrbEe2-M8nuGout-A" elementId="org.eclipse.egit.ui.team.NoAssumeUnchanged" commandName="No Assume Unchanged" category="_ZGO4barbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGbFuarbEe2-M8nuGout-A" elementId="org.eclipse.debug.ui.commands.RemoveAllBreakpoints" commandName="Remove All Breakpoints" description="Removes all breakpoints" category="_ZGO4a6rbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGbFuqrbEe2-M8nuGout-A" elementId="org.eclipse.ui.navigator.resources.nested.changeProjectPresentation" commandName="P&amp;rojects Presentation" category="_ZGO4dKrbEe2-M8nuGout-A">
+    <parameters xmi:id="_ZGbFu6rbEe2-M8nuGout-A" elementId="org.eclipse.ui.navigator.resources.nested.enabled" name="&amp;Hierarchical"/>
+    <parameters xmi:id="_ZGbFvKrbEe2-M8nuGout-A" elementId="org.eclipse.ui.commands.radioStateParameter" name="Nested Project view - Radio State" optional="false"/>
   </commands>
-  <commands xmi:id="_JQ_5l7joEe25NdJK2M4KYw" elementId="org.eclipse.ui.window.showKeyAssist" commandName="Show Key Assist" description="Show the key assist dialog" category="_JQ_7CbjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_5mLjoEe25NdJK2M4KYw" elementId="org.eclipse.ui.genericeditor.togglehighlight" commandName="Toggle Highlight" category="_JQ_7G7joEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_5mbjoEe25NdJK2M4KYw" elementId="org.eclipse.jdt.ui.edit.text.java.introduce.parameter.object" commandName="Introduce Parameter Object" description="Introduce a parameter object to a selected method" category="_JQ_7CrjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_5mrjoEe25NdJK2M4KYw" elementId="org.eclipse.linuxtools.docker.ui.commands.stopContainers" commandName="&amp;Stop" description="Stop the selected containers" category="_JQ_7G7joEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_5m7joEe25NdJK2M4KYw" elementId="org.eclipse.jdt.ui.commands.openElementInEditor" commandName="Open Java Element" description="Open a Java element in its editor" category="_JQ_7AbjoEe25NdJK2M4KYw">
-    <parameters xmi:id="_JQ_5nLjoEe25NdJK2M4KYw" elementId="elementRef" name="Java element reference" typeId="org.eclipse.jdt.ui.commands.javaElementReference" optional="false"/>
+  <commands xmi:id="_ZGbFvarbEe2-M8nuGout-A" elementId="org.eclipse.ui.window.showKeyAssist" commandName="Show Key Assist" description="Show the key assist dialog" category="_ZGO4YqrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGbFvqrbEe2-M8nuGout-A" elementId="org.eclipse.ui.genericeditor.togglehighlight" commandName="Toggle Highlight" category="_ZGO4dKrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGbFv6rbEe2-M8nuGout-A" elementId="org.eclipse.jdt.ui.edit.text.java.introduce.parameter.object" commandName="Introduce Parameter Object" description="Introduce a parameter object to a selected method" category="_ZGO4Y6rbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGbFwKrbEe2-M8nuGout-A" elementId="org.eclipse.linuxtools.docker.ui.commands.stopContainers" commandName="&amp;Stop" description="Stop the selected containers" category="_ZGO4dKrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGbFwarbEe2-M8nuGout-A" elementId="org.eclipse.jdt.ui.commands.openElementInEditor" commandName="Open Java Element" description="Open a Java element in its editor" category="_ZGO4WqrbEe2-M8nuGout-A">
+    <parameters xmi:id="_ZGbFwqrbEe2-M8nuGout-A" elementId="elementRef" name="Java element reference" typeId="org.eclipse.jdt.ui.commands.javaElementReference" optional="false"/>
   </commands>
-  <commands xmi:id="_JQ_5nbjoEe25NdJK2M4KYw" elementId="com.genuitec.eclipse.inlinesearch.replace.toggle.close" commandName="Close Replace Bar" category="_JQ_7HLjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_5nrjoEe25NdJK2M4KYw" elementId="org.eclipse.egit.ui.team.AddToIndex" commandName="Add to Index" category="_JQ_7FLjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_5n7joEe25NdJK2M4KYw" elementId="org.eclipse.buildship.ui.commands.refreshtaskview" commandName="Refresh View (Gradle Tasks)" description="Refreshes the Gradle Tasks view" category="_JQ_6-LjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_5oLjoEe25NdJK2M4KYw" elementId="org.eclipse.wst.sse.ui.toggle.comment" commandName="Toggle Comment" description="Toggle Comment" category="_JQ_6-7joEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_5objoEe25NdJK2M4KYw" elementId="org.eclipse.ui.help.tipsAndTricksAction" commandName="Tips and Tricks" description="Open the tips and tricks help page" category="_JQ_7C7joEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_5orjoEe25NdJK2M4KYw" elementId="org.eclipse.jdt.ui.edit.text.java.format" commandName="Format" description="Format the selected text" category="_JQ_7GLjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_5o7joEe25NdJK2M4KYw" elementId="org.eclipse.ui.edit.text.smartEnter" commandName="Insert Line Below Current Line" description="Adds a new line below the current line" category="_JQ_7ALjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_5pLjoEe25NdJK2M4KYw" elementId="org.eclipse.ui.edit.text.goto.lineStart" commandName="Line Start" description="Go to the start of the line of text" category="_JQ_7ALjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_5pbjoEe25NdJK2M4KYw" elementId="org.eclipse.egit.ui.RepositoriesViewConfigureBranch" commandName="Configure Branch" category="_JQ_7FLjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_5prjoEe25NdJK2M4KYw" elementId="org.eclipse.debug.ui.commands.Suspend" commandName="Suspend" description="Suspend" category="_JQ_7ErjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_5p7joEe25NdJK2M4KYw" elementId="org.eclipse.ui.edit.text.hippieCompletion" commandName="Word Completion" description="Context insensitive completion" category="_JQ_6-7joEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_5qLjoEe25NdJK2M4KYw" elementId="org.eclipse.jdt.ui.edit.text.java.folding.collapseComments" commandName="Collapse Comments" description="Collapse all comments" category="_JQ_7ALjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_5qbjoEe25NdJK2M4KYw" elementId="org.eclipse.team.ui.synchronizeLast" commandName="Repeat last synchronization" description="Repeat the last synchronization" category="_JQ_697joEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_5qrjoEe25NdJK2M4KYw" elementId="org.eclipse.jdt.ui.generate.javadoc" commandName="Generate Javadoc" description="Generates Javadoc for a selectable set of Java resources" category="_JQ_7DbjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_5q7joEe25NdJK2M4KYw" elementId="org.eclipse.egit.ui.RepositoriesViewConfigureGerritRemote" commandName="Gerrit Configuration..." category="_JQ_7FLjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_5rLjoEe25NdJK2M4KYw" elementId="org.eclipse.jdt.debug.ui.commands.StepIntoSelection" commandName="Step Into Selection" description="Step into the current selected statement" category="_JQ_7ErjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_5rbjoEe25NdJK2M4KYw" elementId="org.eclipse.buildship.ui.shortcut.test.run" commandName="Run Gradle Test" description="Run Gradle test based on the current selection" category="_JQ_7ErjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_5rrjoEe25NdJK2M4KYw" elementId="org.eclipse.ui.ide.configureColumns" commandName="Configure Columns..." description="Configure the columns in the markers view" category="_JQ_7G7joEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_5r7joEe25NdJK2M4KYw" elementId="org.eclipse.egit.ui.team.ReplaceWithCommit" commandName="Replace with commit" category="_JQ_7FLjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_5sLjoEe25NdJK2M4KYw" elementId="org.eclipse.tm.terminal.quickaccess" commandName="Quick Access" category="_JQ_7ELjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_5sbjoEe25NdJK2M4KYw" elementId="org.eclipse.debug.ui.commands.DebugLast" commandName="Debug" description="Launch in debug mode" category="_JQ_7ErjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_5srjoEe25NdJK2M4KYw" elementId="org.eclipse.linuxtools.docker.ui.commands.filterContainersWithLabels" commandName="Filter by &amp;Labels" description="Show containers that have specified labels." category="_JQ_7G7joEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_5s7joEe25NdJK2M4KYw" elementId="org.eclipse.mylyn.wikitext.ui.convertToHtmlCommand" commandName="Generate HTML" category="_JQ_7G7joEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_5tLjoEe25NdJK2M4KYw" elementId="org.eclipse.pde.ui.openManifest" commandName="Open Manifest" description="Open the plug-in manifest" category="_JQ_7AbjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_5tbjoEe25NdJK2M4KYw" elementId="org.eclipse.ui.window.previousView" commandName="Previous View" description="Switch to the previous view" category="_JQ_7CbjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_5trjoEe25NdJK2M4KYw" elementId="org.eclipse.linuxtools.docker.ui.commands.enableConnection" commandName="&amp;Enable Connection" category="_JQ_7G7joEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_5t7joEe25NdJK2M4KYw" elementId="org.eclipse.jdt.ui.edit.text.java.generate.tostring" commandName="Generate toString()" description="Generates the toString() method for the type" category="_JQ_7GLjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_5uLjoEe25NdJK2M4KYw" elementId="org.eclipse.jdt.ui.edit.text.java.organize.imports" commandName="Organize Imports" description="Evaluate all required imports and replace the current imports" category="_JQ_7GLjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_5ubjoEe25NdJK2M4KYw" elementId="org.eclipse.ui.ide.markers.copyDescription" commandName="Copy Description To Clipboard" description="Copies markers description field to the clipboard" category="_JQ_6-7joEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_5urjoEe25NdJK2M4KYw" elementId="org.eclipse.debug.ui.commands.DropToFrame" commandName="Drop to Frame" description="Drop to Frame" category="_JQ_7ErjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_5u7joEe25NdJK2M4KYw" elementId="org.springsource.ide.eclipse.boot.BootLaunchShortcut.debug" commandName="Debug Spring Boot App" description="Debug Spring Boot App" category="_JQ_7ErjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_5vLjoEe25NdJK2M4KYw" elementId="org.eclipse.pde.api.tools.ui.compare.to.baseline" commandName="API Baseline..." description="Allows to compare the selected resource with the current baseline" category="_JQ_7G7joEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_5vbjoEe25NdJK2M4KYw" elementId="org.eclipse.pde.ui.imagebrowser.saveToWorkspace" commandName="Save Image" description="Save the selected image into a project in the workspace" category="_JQ_7G7joEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_5vrjoEe25NdJK2M4KYw" elementId="org.eclipse.jdt.debug.ui.commands.Display" commandName="Display" description="Display result of evaluating selected text" category="_JQ_7ErjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_5v7joEe25NdJK2M4KYw" elementId="org.eclipse.jdt.ui.edit.text.java.search.exception.occurrences" commandName="Search Exception Occurrences in File" description="Search for exception occurrences of a selected exception type" category="_JQ_7EbjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_5wLjoEe25NdJK2M4KYw" elementId="org.eclipse.tm.terminal.view.ui.command.disconnect" commandName="Disconnect Terminal" category="_JQ_7BrjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_5wbjoEe25NdJK2M4KYw" elementId="org.springframework.ide.eclipse.boot.dash.boot.dash.RedebugAction" commandName="(Re)debug" description="(Re)debug Boot App" category="_JQ_7CbjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_5wrjoEe25NdJK2M4KYw" elementId="org.eclipse.egit.ui.team.ShowBlame" commandName="Show Revision Information" category="_JQ_7FLjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_5w7joEe25NdJK2M4KYw" elementId="org.eclipse.jdt.ui.correction.assignToField.assist" commandName="Quick Assist - Assign to field" description="Invokes quick assist and selects 'Assign to field'" category="_JQ_7GLjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_5xLjoEe25NdJK2M4KYw" elementId="org.eclipse.ui.edit.text.folding.expand" commandName="Expand" description="Expands the folded region at the current selection" category="_JQ_7ALjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_5xbjoEe25NdJK2M4KYw" elementId="org.eclipse.jdt.ui.edit.text.java.extract.method" commandName="Extract Method" description="Extract a set of statements or an expression into a new method and use the new method" category="_JQ_7CrjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_5xrjoEe25NdJK2M4KYw" elementId="org.eclipse.debug.ui.commands.nextMemoryBlock" commandName="Next Memory Monitor" description="Show renderings from next memory monitor." category="_JQ_7ErjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_5x7joEe25NdJK2M4KYw" elementId="org.eclipse.egit.ui.CompareWithEachOther" commandName="Compare with Each Other" description="Compare two files selected in the Compare Editor with each other." category="_JQ_7B7joEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_5yLjoEe25NdJK2M4KYw" elementId="org.eclipse.egit.ui.team.Fetch" commandName="Fetch" category="_JQ_7FLjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_5ybjoEe25NdJK2M4KYw" elementId="org.eclipse.pde.ui.junitWorkbenchShortcut.run" commandName="Run JUnit Plug-in Test" description="Run JUnit Plug-in Test" category="_JQ_7ErjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_5yrjoEe25NdJK2M4KYw" elementId="org.eclipse.jdt.ui.navigate.gotopackage" commandName="Go to Package" description="Go to Package" category="_JQ_7AbjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_5y7joEe25NdJK2M4KYw" elementId="org.eclipse.ui.window.togglestatusbar" commandName="Toggle Statusbar" description="Toggle the visibility of the bottom status bar" category="_JQ_7CbjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_5zLjoEe25NdJK2M4KYw" elementId="org.eclipse.ui.edit.text.select.multiCaretUp" commandName="Multi caret up" description="Add a new caret/multi selection above the current line, or remove the last caret/multi selection " category="_JQ_7ALjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_5zbjoEe25NdJK2M4KYw" elementId="org.eclipse.buildship.ui.commands.addbuildshipnature" commandName="Add Gradle Nature" description="Adds the Gradle nature and synchronizes this project as if the Gradle Import wizard had been run on its location." category="_JQ_6_rjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_5zrjoEe25NdJK2M4KYw" elementId="org.eclipse.debug.ui.commands.eof" commandName="EOF" description="Send end of file" category="_JQ_7ErjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_5z7joEe25NdJK2M4KYw" elementId="org.eclipse.egit.ui.AbortRebase" commandName="Abort Rebase" category="_JQ_7FLjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_50LjoEe25NdJK2M4KYw" elementId="org.eclipse.ui.navigate.showInQuickMenu" commandName="Show In..." description="Open the Show In menu" category="_JQ_7AbjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_50bjoEe25NdJK2M4KYw" elementId="org.eclipse.ui.edit.text.copyLineUp" commandName="Duplicate Lines" description="Duplicates the selected lines and leaves the selection unchanged" category="_JQ_7ALjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_50rjoEe25NdJK2M4KYw" elementId="org.eclipse.debug.ui.commands.ToggleMethodBreakpoint" commandName="Toggle Method Breakpoint" description="Creates or removes a method breakpoint" category="_JQ_7ErjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_507joEe25NdJK2M4KYw" elementId="org.eclipse.jdt.ui.navigate.java.open.structure" commandName="Open Structure" description="Show the structure of the selected element" category="_JQ_7AbjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_51LjoEe25NdJK2M4KYw" elementId="org.eclipse.linuxtools.docker.ui.commands.unpauseContainers" commandName="&amp;Unpause" description="Unpause the selected containers" category="_JQ_7G7joEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_51bjoEe25NdJK2M4KYw" elementId="org.eclipse.ui.navigate.next" commandName="Next" description="Navigate to the next item" category="_JQ_7AbjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_51rjoEe25NdJK2M4KYw" elementId="org.eclipse.wst.server.run" commandName="Run" description="Run server" category="_JQ_7A7joEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_517joEe25NdJK2M4KYw" elementId="org.eclipse.debug.ui.commands.StepReturn" commandName="Step Return" description="Step return" category="_JQ_7ErjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_52LjoEe25NdJK2M4KYw" elementId="org.eclipse.ui.browser.openBundleResource" commandName="Open Resource in Browser" description="Opens a bundle resource in the default web browser." category="_JQ_7CbjoEe25NdJK2M4KYw">
-    <parameters xmi:id="_JQ_52bjoEe25NdJK2M4KYw" elementId="plugin" name="Plugin"/>
-    <parameters xmi:id="_JQ_52rjoEe25NdJK2M4KYw" elementId="path" name="Path"/>
+  <commands xmi:id="_ZGbFw6rbEe2-M8nuGout-A" elementId="com.genuitec.eclipse.inlinesearch.replace.toggle.close" commandName="Close Replace Bar" category="_ZGO4darbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGbFxKrbEe2-M8nuGout-A" elementId="org.eclipse.egit.ui.team.AddToIndex" commandName="Add to Index" category="_ZGO4barbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGbFxarbEe2-M8nuGout-A" elementId="org.eclipse.buildship.ui.commands.refreshtaskview" commandName="Refresh View (Gradle Tasks)" description="Refreshes the Gradle Tasks view" category="_ZGO4UarbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGbFxqrbEe2-M8nuGout-A" elementId="org.eclipse.wst.sse.ui.toggle.comment" commandName="Toggle Comment" description="Toggle Comment" category="_ZGO4VKrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGbFx6rbEe2-M8nuGout-A" elementId="org.eclipse.ui.help.tipsAndTricksAction" commandName="Tips and Tricks" description="Open the tips and tricks help page" category="_ZGO4ZKrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGbFyKrbEe2-M8nuGout-A" elementId="org.eclipse.jdt.ui.edit.text.java.format" commandName="Format" description="Format the selected text" category="_ZGO4carbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGbFyarbEe2-M8nuGout-A" elementId="org.eclipse.ui.edit.text.smartEnter" commandName="Insert Line Below Current Line" description="Adds a new line below the current line" category="_ZGO4WarbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGbFyqrbEe2-M8nuGout-A" elementId="org.eclipse.ui.edit.text.goto.lineStart" commandName="Line Start" description="Go to the start of the line of text" category="_ZGO4WarbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGbFy6rbEe2-M8nuGout-A" elementId="org.eclipse.egit.ui.RepositoriesViewConfigureBranch" commandName="Configure Branch" category="_ZGO4barbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGbFzKrbEe2-M8nuGout-A" elementId="org.eclipse.debug.ui.commands.Suspend" commandName="Suspend" description="Suspend" category="_ZGO4a6rbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGbFzarbEe2-M8nuGout-A" elementId="org.eclipse.ui.edit.text.hippieCompletion" commandName="Word Completion" description="Context insensitive completion" category="_ZGO4VKrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGbFzqrbEe2-M8nuGout-A" elementId="org.eclipse.jdt.ui.edit.text.java.folding.collapseComments" commandName="Collapse Comments" description="Collapse all comments" category="_ZGO4WarbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGbFz6rbEe2-M8nuGout-A" elementId="org.eclipse.team.ui.synchronizeLast" commandName="Repeat last synchronization" description="Repeat the last synchronization" category="_ZGO4UKrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGbF0KrbEe2-M8nuGout-A" elementId="org.eclipse.jdt.ui.generate.javadoc" commandName="Generate Javadoc" description="Generates Javadoc for a selectable set of Java resources" category="_ZGO4ZqrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGbF0arbEe2-M8nuGout-A" elementId="org.eclipse.egit.ui.RepositoriesViewConfigureGerritRemote" commandName="Gerrit Configuration..." category="_ZGO4barbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGbF0qrbEe2-M8nuGout-A" elementId="org.eclipse.jdt.debug.ui.commands.StepIntoSelection" commandName="Step Into Selection" description="Step into the current selected statement" category="_ZGO4a6rbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGbF06rbEe2-M8nuGout-A" elementId="org.eclipse.buildship.ui.shortcut.test.run" commandName="Run Gradle Test" description="Run Gradle test based on the current selection" category="_ZGO4a6rbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGbF1KrbEe2-M8nuGout-A" elementId="org.eclipse.ui.ide.configureColumns" commandName="Configure Columns..." description="Configure the columns in the markers view" category="_ZGO4dKrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGbF1arbEe2-M8nuGout-A" elementId="org.eclipse.egit.ui.team.ReplaceWithCommit" commandName="Replace with commit" category="_ZGO4barbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGbF1qrbEe2-M8nuGout-A" elementId="org.eclipse.tm.terminal.quickaccess" commandName="Quick Access" category="_ZGO4aarbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGbF16rbEe2-M8nuGout-A" elementId="org.eclipse.debug.ui.commands.DebugLast" commandName="Debug" description="Launch in debug mode" category="_ZGO4a6rbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGbF2KrbEe2-M8nuGout-A" elementId="org.eclipse.linuxtools.docker.ui.commands.filterContainersWithLabels" commandName="Filter by &amp;Labels" description="Show containers that have specified labels." category="_ZGO4dKrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGbF2arbEe2-M8nuGout-A" elementId="org.eclipse.mylyn.wikitext.ui.convertToHtmlCommand" commandName="Generate HTML" category="_ZGO4dKrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGbF2qrbEe2-M8nuGout-A" elementId="org.eclipse.pde.ui.openManifest" commandName="Open Manifest" description="Open the plug-in manifest" category="_ZGO4WqrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGbF26rbEe2-M8nuGout-A" elementId="org.eclipse.ui.window.previousView" commandName="Previous View" description="Switch to the previous view" category="_ZGO4YqrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGbF3KrbEe2-M8nuGout-A" elementId="org.eclipse.linuxtools.docker.ui.commands.enableConnection" commandName="&amp;Enable Connection" category="_ZGO4dKrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGbF3arbEe2-M8nuGout-A" elementId="org.eclipse.jdt.ui.edit.text.java.generate.tostring" commandName="Generate toString()" description="Generates the toString() method for the type" category="_ZGO4carbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGbF3qrbEe2-M8nuGout-A" elementId="org.eclipse.jdt.ui.edit.text.java.organize.imports" commandName="Organize Imports" description="Evaluate all required imports and replace the current imports" category="_ZGO4carbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGbF36rbEe2-M8nuGout-A" elementId="org.eclipse.ui.ide.markers.copyDescription" commandName="Copy Description To Clipboard" description="Copies markers description field to the clipboard" category="_ZGO4VKrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGbF4KrbEe2-M8nuGout-A" elementId="org.eclipse.debug.ui.commands.DropToFrame" commandName="Drop to Frame" description="Drop to Frame" category="_ZGO4a6rbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGbF4arbEe2-M8nuGout-A" elementId="org.springsource.ide.eclipse.boot.BootLaunchShortcut.debug" commandName="Debug Spring Boot App" description="Debug Spring Boot App" category="_ZGO4a6rbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGbF4qrbEe2-M8nuGout-A" elementId="org.eclipse.pde.api.tools.ui.compare.to.baseline" commandName="API Baseline..." description="Allows to compare the selected resource with the current baseline" category="_ZGO4dKrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGbF46rbEe2-M8nuGout-A" elementId="org.eclipse.pde.ui.imagebrowser.saveToWorkspace" commandName="Save Image" description="Save the selected image into a project in the workspace" category="_ZGO4dKrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGbF5KrbEe2-M8nuGout-A" elementId="org.eclipse.jdt.debug.ui.commands.Display" commandName="Display" description="Display result of evaluating selected text" category="_ZGO4a6rbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGbF5arbEe2-M8nuGout-A" elementId="org.eclipse.jdt.ui.edit.text.java.search.exception.occurrences" commandName="Search Exception Occurrences in File" description="Search for exception occurrences of a selected exception type" category="_ZGO4aqrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGbF5qrbEe2-M8nuGout-A" elementId="org.eclipse.tm.terminal.view.ui.command.disconnect" commandName="Disconnect Terminal" category="_ZGO4X6rbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGbF56rbEe2-M8nuGout-A" elementId="org.springframework.ide.eclipse.boot.dash.boot.dash.RedebugAction" commandName="(Re)debug" description="(Re)debug Boot App" category="_ZGO4YqrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGbF6KrbEe2-M8nuGout-A" elementId="org.eclipse.egit.ui.team.ShowBlame" commandName="Show Revision Information" category="_ZGO4barbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGbF6arbEe2-M8nuGout-A" elementId="org.eclipse.jdt.ui.correction.assignToField.assist" commandName="Quick Assist - Assign to field" description="Invokes quick assist and selects 'Assign to field'" category="_ZGO4carbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGbF6qrbEe2-M8nuGout-A" elementId="org.eclipse.ui.edit.text.folding.expand" commandName="Expand" description="Expands the folded region at the current selection" category="_ZGO4WarbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGbF66rbEe2-M8nuGout-A" elementId="org.eclipse.jdt.ui.edit.text.java.extract.method" commandName="Extract Method" description="Extract a set of statements or an expression into a new method and use the new method" category="_ZGO4Y6rbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGbF7KrbEe2-M8nuGout-A" elementId="org.eclipse.debug.ui.commands.nextMemoryBlock" commandName="Next Memory Monitor" description="Show renderings from next memory monitor." category="_ZGO4a6rbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGbF7arbEe2-M8nuGout-A" elementId="org.eclipse.egit.ui.CompareWithEachOther" commandName="Compare with Each Other" description="Compare two files selected in the Compare Editor with each other." category="_ZGO4YKrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGbF7qrbEe2-M8nuGout-A" elementId="org.eclipse.egit.ui.team.Fetch" commandName="Fetch" category="_ZGO4barbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGbF76rbEe2-M8nuGout-A" elementId="org.eclipse.pde.ui.junitWorkbenchShortcut.run" commandName="Run JUnit Plug-in Test" description="Run JUnit Plug-in Test" category="_ZGO4a6rbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGbF8KrbEe2-M8nuGout-A" elementId="org.eclipse.jdt.ui.navigate.gotopackage" commandName="Go to Package" description="Go to Package" category="_ZGO4WqrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGbF8arbEe2-M8nuGout-A" elementId="org.eclipse.ui.window.togglestatusbar" commandName="Toggle Statusbar" description="Toggle the visibility of the bottom status bar" category="_ZGO4YqrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGbF8qrbEe2-M8nuGout-A" elementId="org.eclipse.ui.edit.text.select.multiCaretUp" commandName="Multi caret up" description="Add a new caret/multi selection above the current line, or remove the last caret/multi selection " category="_ZGO4WarbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGbF86rbEe2-M8nuGout-A" elementId="org.eclipse.buildship.ui.commands.addbuildshipnature" commandName="Add Gradle Nature" description="Adds the Gradle nature and synchronizes this project as if the Gradle Import wizard had been run on its location." category="_ZGO4V6rbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGbF9KrbEe2-M8nuGout-A" elementId="org.eclipse.debug.ui.commands.eof" commandName="EOF" description="Send end of file" category="_ZGO4a6rbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGbF9arbEe2-M8nuGout-A" elementId="org.eclipse.egit.ui.AbortRebase" commandName="Abort Rebase" category="_ZGO4barbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGbF9qrbEe2-M8nuGout-A" elementId="org.eclipse.ui.navigate.showInQuickMenu" commandName="Show In..." description="Open the Show In menu" category="_ZGO4WqrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGbF96rbEe2-M8nuGout-A" elementId="org.eclipse.ui.edit.text.copyLineUp" commandName="Duplicate Lines" description="Duplicates the selected lines and leaves the selection unchanged" category="_ZGO4WarbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGbF-KrbEe2-M8nuGout-A" elementId="org.eclipse.debug.ui.commands.ToggleMethodBreakpoint" commandName="Toggle Method Breakpoint" description="Creates or removes a method breakpoint" category="_ZGO4a6rbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGbF-arbEe2-M8nuGout-A" elementId="org.eclipse.jdt.ui.navigate.java.open.structure" commandName="Open Structure" description="Show the structure of the selected element" category="_ZGO4WqrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGbF-qrbEe2-M8nuGout-A" elementId="org.eclipse.linuxtools.docker.ui.commands.unpauseContainers" commandName="&amp;Unpause" description="Unpause the selected containers" category="_ZGO4dKrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGbF-6rbEe2-M8nuGout-A" elementId="org.eclipse.ui.navigate.next" commandName="Next" description="Navigate to the next item" category="_ZGO4WqrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGbF_KrbEe2-M8nuGout-A" elementId="org.eclipse.wst.server.run" commandName="Run" description="Run server" category="_ZGO4XKrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGbF_arbEe2-M8nuGout-A" elementId="org.eclipse.debug.ui.commands.StepReturn" commandName="Step Return" description="Step return" category="_ZGO4a6rbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGbF_qrbEe2-M8nuGout-A" elementId="org.eclipse.ui.browser.openBundleResource" commandName="Open Resource in Browser" description="Opens a bundle resource in the default web browser." category="_ZGO4YqrbEe2-M8nuGout-A">
+    <parameters xmi:id="_ZGbF_6rbEe2-M8nuGout-A" elementId="plugin" name="Plugin"/>
+    <parameters xmi:id="_ZGbGAKrbEe2-M8nuGout-A" elementId="path" name="Path"/>
   </commands>
-  <commands xmi:id="_JQ_527joEe25NdJK2M4KYw" elementId="org.eclipse.ui.help.aboutAction" commandName="About" description="Open the about dialog" category="_JQ_7C7joEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_53LjoEe25NdJK2M4KYw" elementId="org.eclipse.wst.common.project.facet.ui.ConvertProjectToFacetedForm" commandName="Convert to Faceted Form..." category="_JQ_7BbjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_53bjoEe25NdJK2M4KYw" elementId="org.eclipse.jdt.ui.edit.text.java.annotate.classFile" commandName="Annotate Class File" description="Externally add Annotations to a Class File." category="_JQ_7GLjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_53rjoEe25NdJK2M4KYw" elementId="org.eclipse.egit.ui.team.stash.create" commandName="Stash Changes..." category="_JQ_7FLjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_537joEe25NdJK2M4KYw" elementId="org.eclipse.jdt.ui.edit.text.java.search.references.in.workspace" commandName="References in Workspace" description="Search for references to the selected element in the workspace" category="_JQ_7EbjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_54LjoEe25NdJK2M4KYw" elementId="org.eclipse.wst.sse.ui.format.document" commandName="Format" description="Format selection" category="_JQ_6-7joEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_54bjoEe25NdJK2M4KYw" elementId="org.eclipse.jdt.ui.correction.addNonNLS" commandName="Quick Fix - Add non-NLS tag" description="Invokes quick assist and selects 'Add non-NLS tag'" category="_JQ_7GLjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_54rjoEe25NdJK2M4KYw" elementId="org.sonatype.m2e.egit.CloneAsMavenProjects" commandName="Clone Maven Projects..." category="_JQ_7FLjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_547joEe25NdJK2M4KYw" elementId="org.eclipse.egit.ui.team.RemoveFromIndex" commandName="Remove from Index" category="_JQ_7FLjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_55LjoEe25NdJK2M4KYw" elementId="org.eclipse.ui.newWizard" commandName="New" description="Open the New item wizard" category="_JQ_7BbjoEe25NdJK2M4KYw">
-    <parameters xmi:id="_JQ_55bjoEe25NdJK2M4KYw" elementId="newWizardId" name="New Wizard"/>
+  <commands xmi:id="_ZGbsoKrbEe2-M8nuGout-A" elementId="org.eclipse.ui.help.aboutAction" commandName="About" description="Open the about dialog" category="_ZGO4ZKrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGbsoarbEe2-M8nuGout-A" elementId="org.eclipse.wst.common.project.facet.ui.ConvertProjectToFacetedForm" commandName="Convert to Faceted Form..." category="_ZGO4XqrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGbsoqrbEe2-M8nuGout-A" elementId="org.eclipse.jdt.ui.edit.text.java.annotate.classFile" commandName="Annotate Class File" description="Externally add Annotations to a Class File." category="_ZGO4carbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGbso6rbEe2-M8nuGout-A" elementId="org.eclipse.egit.ui.team.stash.create" commandName="Stash Changes..." category="_ZGO4barbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGbspKrbEe2-M8nuGout-A" elementId="org.eclipse.jdt.ui.edit.text.java.search.references.in.workspace" commandName="References in Workspace" description="Search for references to the selected element in the workspace" category="_ZGO4aqrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGbsparbEe2-M8nuGout-A" elementId="org.eclipse.wst.sse.ui.format.document" commandName="Format" description="Format selection" category="_ZGO4VKrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGbspqrbEe2-M8nuGout-A" elementId="org.eclipse.jdt.ui.correction.addNonNLS" commandName="Quick Fix - Add non-NLS tag" description="Invokes quick assist and selects 'Add non-NLS tag'" category="_ZGO4carbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGbsp6rbEe2-M8nuGout-A" elementId="org.sonatype.m2e.egit.CloneAsMavenProjects" commandName="Clone Maven Projects..." category="_ZGO4barbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGbsqKrbEe2-M8nuGout-A" elementId="org.eclipse.egit.ui.team.RemoveFromIndex" commandName="Remove from Index" category="_ZGO4barbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGbsqarbEe2-M8nuGout-A" elementId="org.eclipse.ui.newWizard" commandName="New" description="Open the New item wizard" category="_ZGO4XqrbEe2-M8nuGout-A">
+    <parameters xmi:id="_ZGbsqqrbEe2-M8nuGout-A" elementId="newWizardId" name="New Wizard"/>
   </commands>
-  <commands xmi:id="_JQ_55rjoEe25NdJK2M4KYw" elementId="org.eclipse.ui.window.newWindow" commandName="New Window" description="Open another window" category="_JQ_7CbjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_557joEe25NdJK2M4KYw" elementId="org.eclipse.jdt.ui.edit.text.java.uncomment" commandName="Uncomment" description="Uncomment the selected Java comment lines" category="_JQ_7GLjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_56LjoEe25NdJK2M4KYw" elementId="org.eclipse.e4.ui.importer.configureProject" commandName="Configure and Detect Nested Projects..." category="_JQ_7G7joEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_56bjoEe25NdJK2M4KYw" elementId="org.eclipse.egit.ui.history.CompareVersions" commandName="Compare with Each Other" category="_JQ_7G7joEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_56rjoEe25NdJK2M4KYw" elementId="org.eclipse.equinox.p2.ui.sdk.install" commandName="Install New Software..." category="_JQ_7G7joEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_567joEe25NdJK2M4KYw" elementId="org.eclipse.ui.window.customizePerspective" commandName="Customize Perspective" description="Customize the current perspective" category="_JQ_7CbjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_57LjoEe25NdJK2M4KYw" elementId="org.eclipse.linuxtools.docker.ui.commands.killContainers" commandName="&amp;Kill" description="Kill the selected containers" category="_JQ_7G7joEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_57bjoEe25NdJK2M4KYw" elementId="org.eclipse.ui.externaltools.ExternalToolMenuDelegateToolbar" commandName="Run Last Launched External Tool" description="Runs the last launched external Tool" category="_JQ_7ErjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_57rjoEe25NdJK2M4KYw" elementId="org.eclipse.egit.ui.CheckoutCommand" commandName="Check Out" category="_JQ_7FLjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_577joEe25NdJK2M4KYw" elementId="org.eclipse.jdt.ui.edit.text.java.search.occurrences.in.file" commandName="Search All Occurrences in File" description="Search for all occurrences of the selected element in its declaring file" category="_JQ_7EbjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_58LjoEe25NdJK2M4KYw" elementId="org.eclipse.ui.edit.text.moveLineUp" commandName="Move Lines Up" description="Moves the selected lines up" category="_JQ_7ALjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_58bjoEe25NdJK2M4KYw" elementId="org.eclipse.equinox.p2.ui.discovery.commands.ShowBundleCatalog" commandName="Show Bundle Catalog" category="_JQ_7G7joEe25NdJK2M4KYw">
-    <parameters xmi:id="_JQ_58rjoEe25NdJK2M4KYw" elementId="org.eclipse.equinox.p2.ui.discovery.commands.DirectoryParameter" name="Directory URL"/>
-    <parameters xmi:id="_JQ_587joEe25NdJK2M4KYw" elementId="org.eclipse.equinox.p2.ui.discovery.commands.TagsParameter" name="Tags"/>
+  <commands xmi:id="_ZGbsq6rbEe2-M8nuGout-A" elementId="org.eclipse.ui.window.newWindow" commandName="New Window" description="Open another window" category="_ZGO4YqrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGbsrKrbEe2-M8nuGout-A" elementId="org.eclipse.jdt.ui.edit.text.java.uncomment" commandName="Uncomment" description="Uncomment the selected Java comment lines" category="_ZGO4carbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGbsrarbEe2-M8nuGout-A" elementId="org.eclipse.e4.ui.importer.configureProject" commandName="Configure and Detect Nested Projects..." category="_ZGO4dKrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGbsrqrbEe2-M8nuGout-A" elementId="org.eclipse.egit.ui.history.CompareVersions" commandName="Compare with Each Other" category="_ZGO4dKrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGbsr6rbEe2-M8nuGout-A" elementId="org.eclipse.equinox.p2.ui.sdk.install" commandName="Install New Software..." category="_ZGO4dKrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGbssKrbEe2-M8nuGout-A" elementId="org.eclipse.ui.window.customizePerspective" commandName="Customize Perspective" description="Customize the current perspective" category="_ZGO4YqrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGbssarbEe2-M8nuGout-A" elementId="org.eclipse.linuxtools.docker.ui.commands.killContainers" commandName="&amp;Kill" description="Kill the selected containers" category="_ZGO4dKrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGbssqrbEe2-M8nuGout-A" elementId="org.eclipse.ui.externaltools.ExternalToolMenuDelegateToolbar" commandName="Run Last Launched External Tool" description="Runs the last launched external Tool" category="_ZGO4a6rbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGbss6rbEe2-M8nuGout-A" elementId="org.eclipse.egit.ui.CheckoutCommand" commandName="Check Out" category="_ZGO4barbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGbstKrbEe2-M8nuGout-A" elementId="org.eclipse.jdt.ui.edit.text.java.search.occurrences.in.file" commandName="Search All Occurrences in File" description="Search for all occurrences of the selected element in its declaring file" category="_ZGO4aqrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGbstarbEe2-M8nuGout-A" elementId="org.eclipse.ui.edit.text.moveLineUp" commandName="Move Lines Up" description="Moves the selected lines up" category="_ZGO4WarbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGbstqrbEe2-M8nuGout-A" elementId="org.eclipse.equinox.p2.ui.discovery.commands.ShowBundleCatalog" commandName="Show Bundle Catalog" category="_ZGO4dKrbEe2-M8nuGout-A">
+    <parameters xmi:id="_ZGbst6rbEe2-M8nuGout-A" elementId="org.eclipse.equinox.p2.ui.discovery.commands.DirectoryParameter" name="Directory URL"/>
+    <parameters xmi:id="_ZGbsuKrbEe2-M8nuGout-A" elementId="org.eclipse.equinox.p2.ui.discovery.commands.TagsParameter" name="Tags"/>
   </commands>
-  <commands xmi:id="_JQ_59LjoEe25NdJK2M4KYw" elementId="org.eclipse.jdt.ui.edit.text.java.gotoBreadcrumb" commandName="Show In Breadcrumb" description="Shows the Java editor breadcrumb and sets the keyboard focus into it" category="_JQ_7AbjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_59bjoEe25NdJK2M4KYw" elementId="org.eclipse.pde.ui.runtimeWorkbenchShortcut.debug" commandName="Debug Eclipse Application" description="Debug Eclipse Application" category="_JQ_7ErjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_59rjoEe25NdJK2M4KYw" elementId="org.eclipse.userstorage.ui.showPullDown" commandName="Show Pull Down Menu" category="_JQ_7C7joEe25NdJK2M4KYw">
-    <parameters xmi:id="_JQ_597joEe25NdJK2M4KYw" elementId="intoolbar" name="In Tool Bar" optional="false"/>
+  <commands xmi:id="_ZGbsuarbEe2-M8nuGout-A" elementId="org.eclipse.jdt.ui.edit.text.java.gotoBreadcrumb" commandName="Show In Breadcrumb" description="Shows the Java editor breadcrumb and sets the keyboard focus into it" category="_ZGO4WqrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGbsuqrbEe2-M8nuGout-A" elementId="org.eclipse.pde.ui.runtimeWorkbenchShortcut.debug" commandName="Debug Eclipse Application" description="Debug Eclipse Application" category="_ZGO4a6rbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGbsu6rbEe2-M8nuGout-A" elementId="org.eclipse.userstorage.ui.showPullDown" commandName="Show Pull Down Menu" category="_ZGO4ZKrbEe2-M8nuGout-A">
+    <parameters xmi:id="_ZGbsvKrbEe2-M8nuGout-A" elementId="intoolbar" name="In Tool Bar" optional="false"/>
   </commands>
-  <commands xmi:id="_JQ_5-LjoEe25NdJK2M4KYw" elementId="org.eclipse.jdt.ui.edit.text.java.extract.class" commandName="Extract Class..." description="Extracts fields into a new class" category="_JQ_7CrjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_5-bjoEe25NdJK2M4KYw" elementId="org.eclipse.jdt.ui.correction.extractConstant.assist" commandName="Quick Assist - Extract constant" description="Invokes quick assist and selects 'Extract constant'" category="_JQ_7GLjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_5-rjoEe25NdJK2M4KYw" elementId="org.eclipse.compare.copyRightToLeft" commandName="Copy from Right to Left" description="Copy Current Change from Right to Left" category="_JQ_7B7joEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_5-7joEe25NdJK2M4KYw" elementId="org.eclipse.debug.ui.commands.OpenProfileConfigurations" commandName="Profile..." description="Open profile launch configuration dialog" category="_JQ_7ErjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_5_LjoEe25NdJK2M4KYw" elementId="org.eclipse.egit.gitflow.ui.command.featureRebase" commandName="Rebase Feature" category="_JQ_7FLjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_5_bjoEe25NdJK2M4KYw" elementId="org.eclipse.ui.ide.markCompleted" commandName="Mark Completed" description="Mark the selected tasks as completed" category="_JQ_7G7joEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_5_rjoEe25NdJK2M4KYw" elementId="org.eclipse.ui.edit.text.recenter" commandName="Recenter" description="Scroll cursor line to center, top and bottom" category="_JQ_7ALjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_5_7joEe25NdJK2M4KYw" elementId="org.eclipse.linuxtools.docker.ui.commands.refreshExplorerView" commandName="&amp;Refresh" category="_JQ_7G7joEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_6ALjoEe25NdJK2M4KYw" elementId="org.springsource.ide.eclipse.boot.BootLaunchShortcut.run" commandName="Run Spring Boot App" description="Run Spring Boot App" category="_JQ_7ErjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_6AbjoEe25NdJK2M4KYw" elementId="org.eclipse.ui.edit.text.scroll.lineDown" commandName="Scroll Line Down" description="Scroll down one line of text" category="_JQ_7ALjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_6ArjoEe25NdJK2M4KYw" elementId="org.eclipse.wst.sse.ui.search.find.occurrences" commandName="Occurrences in File" description="Find occurrences of the selection in the file" category="_JQ_6-7joEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_6A7joEe25NdJK2M4KYw" elementId="org.eclipse.ui.ToggleCoolbarAction" commandName="Toggle Main Toolbar Visibility" description="Toggles the visibility of the window toolbar" category="_JQ_7CbjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_6BLjoEe25NdJK2M4KYw" elementId="org.eclipse.wst.sse.ui.outline.customFilter" commandName="&amp;Filters" category="_JQ_7G7joEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_6BbjoEe25NdJK2M4KYw" elementId="org.eclipse.ui.navigate.openResource" commandName="Open Resource" description="Open an editor on a particular resource" category="_JQ_7AbjoEe25NdJK2M4KYw">
-    <parameters xmi:id="_JQ_6BrjoEe25NdJK2M4KYw" elementId="filePath" name="File Path" typeId="org.eclipse.ui.ide.resourcePath"/>
+  <commands xmi:id="_ZGbsvarbEe2-M8nuGout-A" elementId="org.eclipse.jdt.ui.edit.text.java.extract.class" commandName="Extract Class..." description="Extracts fields into a new class" category="_ZGO4Y6rbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGbsvqrbEe2-M8nuGout-A" elementId="org.eclipse.jdt.ui.correction.extractConstant.assist" commandName="Quick Assist - Extract constant" description="Invokes quick assist and selects 'Extract constant'" category="_ZGO4carbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGbsv6rbEe2-M8nuGout-A" elementId="org.eclipse.compare.copyRightToLeft" commandName="Copy from Right to Left" description="Copy Current Change from Right to Left" category="_ZGO4YKrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGbswKrbEe2-M8nuGout-A" elementId="org.eclipse.debug.ui.commands.OpenProfileConfigurations" commandName="Profile..." description="Open profile launch configuration dialog" category="_ZGO4a6rbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGbswarbEe2-M8nuGout-A" elementId="org.eclipse.egit.gitflow.ui.command.featureRebase" commandName="Rebase Feature" category="_ZGO4barbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGbswqrbEe2-M8nuGout-A" elementId="org.eclipse.ui.ide.markCompleted" commandName="Mark Completed" description="Mark the selected tasks as completed" category="_ZGO4dKrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGbsw6rbEe2-M8nuGout-A" elementId="org.eclipse.ui.edit.text.recenter" commandName="Recenter" description="Scroll cursor line to center, top and bottom" category="_ZGO4WarbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGbsxKrbEe2-M8nuGout-A" elementId="org.eclipse.linuxtools.docker.ui.commands.refreshExplorerView" commandName="&amp;Refresh" category="_ZGO4dKrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGbsxarbEe2-M8nuGout-A" elementId="org.springsource.ide.eclipse.boot.BootLaunchShortcut.run" commandName="Run Spring Boot App" description="Run Spring Boot App" category="_ZGO4a6rbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGbsxqrbEe2-M8nuGout-A" elementId="org.eclipse.ui.edit.text.scroll.lineDown" commandName="Scroll Line Down" description="Scroll down one line of text" category="_ZGO4WarbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGbsx6rbEe2-M8nuGout-A" elementId="org.eclipse.wst.sse.ui.search.find.occurrences" commandName="Occurrences in File" description="Find occurrences of the selection in the file" category="_ZGO4VKrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGbsyKrbEe2-M8nuGout-A" elementId="org.eclipse.ui.ToggleCoolbarAction" commandName="Toggle Main Toolbar Visibility" description="Toggles the visibility of the window toolbar" category="_ZGO4YqrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGbsyarbEe2-M8nuGout-A" elementId="org.eclipse.wst.sse.ui.outline.customFilter" commandName="&amp;Filters" category="_ZGO4dKrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_ZGbsyqrbEe2-M8nuGout-A" elementId="org.eclipse.ui.navigate.openResource" commandName="Open Resource" description="Open an editor on a particular resource" category="_ZGO4WqrbEe2-M8nuGout-A">
+    <parameters xmi:id="_ZGbsy6rbEe2-M8nuGout-A" elementId="filePath" name="File Path" typeId="org.eclipse.ui.ide.resourcePath"/>
   </commands>
-  <commands xmi:id="_JQ_6B7joEe25NdJK2M4KYw" elementId="org.springframework.tooling.ls.eclipse.commons.commands.OpenJavaElementInEditor" commandName="Open Java Element in Editor" category="_JQ_7G7joEe25NdJK2M4KYw">
-    <parameters xmi:id="_JQ_6CLjoEe25NdJK2M4KYw" elementId="bindingKey" name="bindingKey" optional="false"/>
-    <parameters xmi:id="_JQ_6CbjoEe25NdJK2M4KYw" elementId="projectName" name="projectName" optional="false"/>
+  <commands xmi:id="_ZGbszKrbEe2-M8nuGout-A" elementId="org.springframework.tooling.ls.eclipse.commons.commands.OpenJavaElementInEditor" commandName="Open Java Element in Editor" category="_ZGO4dKrbEe2-M8nuGout-A">
+    <parameters xmi:id="_ZGbszarbEe2-M8nuGout-A" elementId="bindingKey" name="bindingKey" optional="false"/>
+    <parameters xmi:id="_ZGbszqrbEe2-M8nuGout-A" elementId="projectName" name="projectName" optional="false"/>
   </commands>
-  <commands xmi:id="_JQ_6CrjoEe25NdJK2M4KYw" elementId="com.genuitec.myeclipse.help.darktheme.commandid" commandName="com.genuitec.myeclipse.help.darktheme.commandid"/>
-  <commands xmi:id="_JQ_6C7joEe25NdJK2M4KYw" elementId="AUTOGEN:::org.eclipse.ant.ui.actionSet.presentation/org.eclipse.ant.ui.toggleAutoReconcile" commandName="Toggle Ant Editor Auto Reconcile" description="Toggle Ant Editor Auto Reconcile" category="_JQ_7G7joEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_6DLjoEe25NdJK2M4KYw" elementId="AUTOGEN:::org.eclipse.debug.ui.launchActionSet/org.eclipse.debug.internal.ui.actions.RunWithConfigurationAction" commandName="Run As" category="_JQ_7G7joEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_6DbjoEe25NdJK2M4KYw" elementId="AUTOGEN:::org.eclipse.debug.ui.launchActionSet/org.eclipse.debug.internal.ui.actions.RunHistoryMenuAction" commandName="Run History" category="_JQ_7G7joEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_6DrjoEe25NdJK2M4KYw" elementId="AUTOGEN:::org.eclipse.debug.ui.launchActionSet/org.eclipse.debug.internal.ui.actions.RunDropDownAction" commandName="Run" category="_JQ_7G7joEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_6D7joEe25NdJK2M4KYw" elementId="AUTOGEN:::org.eclipse.debug.ui.launchActionSet/org.eclipse.debug.internal.ui.actions.DebugWithConfigurationAction" commandName="Debug As" category="_JQ_7G7joEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_6ELjoEe25NdJK2M4KYw" elementId="AUTOGEN:::org.eclipse.debug.ui.launchActionSet/org.eclipse.debug.internal.ui.actions.DebugHistoryMenuAction" commandName="Debug History" category="_JQ_7G7joEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_6EbjoEe25NdJK2M4KYw" elementId="AUTOGEN:::org.eclipse.debug.ui.launchActionSet/org.eclipse.debug.internal.ui.actions.DebugDropDownAction" commandName="Debug" category="_JQ_7G7joEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_6ErjoEe25NdJK2M4KYw" elementId="AUTOGEN:::org.eclipse.debug.ui.profileActionSet/org.eclipse.debug.internal.ui.actions.ProfileDropDownAction" commandName="Profile" category="_JQ_7G7joEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_6E7joEe25NdJK2M4KYw" elementId="AUTOGEN:::org.eclipse.debug.ui.profileActionSet/org.eclipse.debug.internal.ui.actions.ProfileWithConfigurationAction" commandName="Profile As" category="_JQ_7G7joEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_6FLjoEe25NdJK2M4KYw" elementId="AUTOGEN:::org.eclipse.debug.ui.profileActionSet/org.eclipse.debug.internal.ui.actions.ProfileHistoryMenuAction" commandName="Profile History" category="_JQ_7G7joEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_6FbjoEe25NdJK2M4KYw" elementId="AUTOGEN:::org.eclipse.egit.ui.SearchActionSet/org.eclipse.egit.ui.actions.OpenCommitSearchPage" commandName="Git..." category="_JQ_7G7joEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_6FrjoEe25NdJK2M4KYw" elementId="AUTOGEN:::org.eclipse.jdt.ui.JavaElementCreationActionSet/org.eclipse.jdt.ui.actions.NewTypeDropDown" commandName="Class..." description="New Java Class" category="_JQ_7G7joEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_6F7joEe25NdJK2M4KYw" elementId="AUTOGEN:::org.eclipse.jdt.ui.JavaElementCreationActionSet/org.eclipse.jdt.ui.actions.OpenPackageWizard" commandName="Package..." description="New Java Package" category="_JQ_7G7joEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_6GLjoEe25NdJK2M4KYw" elementId="AUTOGEN:::org.eclipse.jdt.ui.JavaElementCreationActionSet/org.eclipse.jdt.ui.actions.OpenProjectWizard" commandName="Java Project..." description="New Java Project" category="_JQ_7G7joEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_6GbjoEe25NdJK2M4KYw" elementId="AUTOGEN:::org.eclipse.jdt.ui.SearchActionSet/org.eclipse.jdt.ui.actions.OpenJavaSearchPage" commandName="Java..." category="_JQ_7G7joEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_6GrjoEe25NdJK2M4KYw" elementId="AUTOGEN:::org.eclipse.linuxtools.docker.launchActionSet/org.eclipse.debug.internal.ui.actions.RunWithConfigurationAction" commandName="Run As" category="_JQ_7G7joEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_6G7joEe25NdJK2M4KYw" elementId="AUTOGEN:::org.eclipse.linuxtools.docker.launchActionSet/org.eclipse.debug.internal.ui.actions.RunHistoryMenuAction" commandName="Run History" category="_JQ_7G7joEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_6HLjoEe25NdJK2M4KYw" elementId="AUTOGEN:::org.eclipse.linuxtools.docker.launchActionSet/org.eclipse.debug.internal.ui.actions.RunDropDownAction" commandName="Run" category="_JQ_7G7joEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_6HbjoEe25NdJK2M4KYw" elementId="AUTOGEN:::org.eclipse.pde.ui.SearchActionSet/org.eclipse.pde.ui.actions.OpenPluginSearchPage" commandName="Plug-in..." category="_JQ_7G7joEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_6HrjoEe25NdJK2M4KYw" elementId="AUTOGEN:::org.eclipse.ui.cheatsheets.actionSet/org.eclipse.ui.cheatsheets.actions.CheatSheetHelpMenuAction" commandName="Cheat Sheets..." category="_JQ_7G7joEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_6H7joEe25NdJK2M4KYw" elementId="AUTOGEN:::org.eclipse.search.searchActionSet/org.eclipse.search.OpenSearchDialogPage" commandName="Search..." description="Search" category="_JQ_7G7joEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_6ILjoEe25NdJK2M4KYw" elementId="AUTOGEN:::org.eclipse.team.ui.actionSet/org.eclipse.team.ui.synchronizeAll" commandName="Synchronize..." description="Synchronize..." category="_JQ_7G7joEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_6IbjoEe25NdJK2M4KYw" elementId="AUTOGEN:::org.eclipse.team.ui.actionSet/org.eclipse.team.ui.ConfigureProject" commandName="Share Project..." description="Share the project with others using a version and configuration management system." category="_JQ_7G7joEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_6IrjoEe25NdJK2M4KYw" elementId="AUTOGEN:::org.eclipse.ui.externaltools.ExternalToolsSet/org.eclipse.ui.externaltools.ExternalToolMenuDelegateMenu" commandName="External Tools" category="_JQ_7G7joEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_6I7joEe25NdJK2M4KYw" elementId="AUTOGEN:::org.eclipse.wst.server.ui.new.actionSet/org.eclipse.wst.server.ui.action.new.server" commandName="Create Server" description="Create Server" category="_JQ_7G7joEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_6JLjoEe25NdJK2M4KYw" elementId="AUTOGEN:::org.eclipse.wst.server.ui.internal.webbrowser.actionSet/org.eclipse.wst.server.ui.internal.webbrowser.action.open" commandName="Open Web Browser" description="Open Web Browser" category="_JQ_7G7joEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_6JbjoEe25NdJK2M4KYw" elementId="AUTOGEN:::org.eclipse.wst.server.ui.internal.webbrowser.actionSet/org.eclipse.wst.server.ui.internal.webbrowser.action.switch" commandName="Web Browser" description="Web Browser" category="_JQ_7G7joEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_6JrjoEe25NdJK2M4KYw" elementId="AUTOGEN:::org.springsource.ide.eclipse.commons.launch.actionSet/org.springsource.ide.eclipse.commons.launch.relaunch.action" commandName="Relaunch" category="_JQ_7G7joEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_6J7joEe25NdJK2M4KYw" elementId="AUTOGEN:::org.springsource.ide.eclipse.commons.launch.actionSet/org.springsource.ide.eclipse.commons.launch.stop.action" commandName="Terminate" category="_JQ_7G7joEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_6KLjoEe25NdJK2M4KYw" elementId="AUTOGEN:::org.eclipse.ant.ui.BreakpointRulerActions/org.eclipse.ant.ui.actions.ManageBreakpointRulerAction" commandName="Toggle Breakpoint" category="_JQ_7G7joEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_6KbjoEe25NdJK2M4KYw" elementId="AUTOGEN:::org.eclipse.jdt.debug.CompilationUnitEditor.BreakpointRulerActions/org.eclipse.jdt.debug.ui.actions.ManageBreakpointRulerAction" commandName="Toggle Breakpoint" category="_JQ_7G7joEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_6KrjoEe25NdJK2M4KYw" elementId="AUTOGEN:::org.eclipse.jdt.debug.CompilationUnitEditor.BreakpointRulerActions/org.eclipse.jdt.debug.ui.actions.RunToLineRulerActionDelegate" commandName="Run to Line" category="_JQ_7G7joEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_6K7joEe25NdJK2M4KYw" elementId="AUTOGEN:::org.eclipse.jdt.debug.ClassFileEditor.BreakpointRulerActions/org.eclipse.jdt.debug.ui.actions.ManageBreakpointRulerAction" commandName="Toggle Breakpoint" category="_JQ_7G7joEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_6LLjoEe25NdJK2M4KYw" elementId="AUTOGEN:::org.eclipse.jdt.debug.ClassFileEditor.BreakpointRulerActions/org.eclipse.jdt.debug.ui.actions.RunToLineRulerActionDelegate" commandName="Run to Line" category="_JQ_7G7joEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_6LbjoEe25NdJK2M4KYw" elementId="AUTOGEN:::org.eclipse.jdt.debug.ui.JavaSnippetToolbarActions/org.eclipse.jdt.debug.ui.SnippetExecute" commandName="Execute" description="Execute the Selected Text" category="_JQ_7G7joEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_6LrjoEe25NdJK2M4KYw" elementId="AUTOGEN:::org.eclipse.jdt.debug.ui.JavaSnippetToolbarActions/org.eclipse.jdt.debug.ui.SnippetDisplay" commandName="Display" description="Display Result of Evaluating Selected Text" category="_JQ_7G7joEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_6L7joEe25NdJK2M4KYw" elementId="AUTOGEN:::org.eclipse.jdt.debug.ui.JavaSnippetToolbarActions/org.eclipse.jdt.debug.ui.SnippetInspect" commandName="Inspect" description="Inspect Result of Evaluating Selected Text" category="_JQ_7G7joEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_6MLjoEe25NdJK2M4KYw" elementId="AUTOGEN:::org.eclipse.jdt.internal.ui.CompilationUnitEditor.ruler.actions/org.eclipse.jdt.internal.ui.javaeditor.BookmarkRulerAction" commandName="Java Editor Bookmark Ruler Action" category="_JQ_7G7joEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_6MbjoEe25NdJK2M4KYw" elementId="AUTOGEN:::org.eclipse.jdt.internal.ui.CompilationUnitEditor.ruler.actions/org.eclipse.jdt.internal.ui.javaeditor.JavaSelectRulerAction" commandName="Java Editor Ruler Single-Click" category="_JQ_7G7joEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_6MrjoEe25NdJK2M4KYw" elementId="AUTOGEN:::org.eclipse.jdt.internal.ui.ClassFileEditor.ruler.actions/org.eclipse.jdt.internal.ui.javaeditor.JavaSelectRulerAction" commandName="Java Editor Ruler Single-Click" category="_JQ_7G7joEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_6M7joEe25NdJK2M4KYw" elementId="AUTOGEN:::org.eclipse.jdt.internal.ui.PropertiesFileEditor.ruler.actions/org.eclipse.jdt.internal.ui.propertiesfileeditor.BookmarkRulerAction" commandName="Java Editor Bookmark Ruler Action" category="_JQ_7G7joEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_6NLjoEe25NdJK2M4KYw" elementId="AUTOGEN:::org.eclipse.jdt.internal.ui.PropertiesFileEditor.ruler.actions/org.eclipse.jdt.internal.ui.propertiesfileeditor.SelectRulerAction" commandName="Java Editor Ruler Single-Click" category="_JQ_7G7joEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_6NbjoEe25NdJK2M4KYw" elementId="AUTOGEN:::org.eclipse.lsp4e.debug.textEditor.rulerActions/org.eclipse.lsp4e.debug.textEditor.doubleClickBreakpointAction" commandName="unusedlabel" category="_JQ_7G7joEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_6NrjoEe25NdJK2M4KYw" elementId="AUTOGEN:::org.eclipse.lsp4e.debug.genericEditor.rulerActions/org.eclipse.lsp4e.debug.genericEditor.doubleClickBreakpointAction" commandName="unusedlabel" category="_JQ_7G7joEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_6N7joEe25NdJK2M4KYw" elementId="AUTOGEN:::org.eclipse.m2e.jdt.ui.downloadSourcesContribution/org.eclipse.m2e.jdt.ui.downloadSourcesAction" commandName="label" category="_JQ_7G7joEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_6OLjoEe25NdJK2M4KYw" elementId="AUTOGEN:::org.eclipse.m2e.jdt.ui.downloadSourcesContribution_38/org.eclipse.m2e.jdt.ui.downloadSourcesAction_38" commandName="label" category="_JQ_7G7joEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_6ObjoEe25NdJK2M4KYw" elementId="AUTOGEN:::org.eclipse.ui.texteditor.ruler.actions/org.eclipse.ui.texteditor.BookmarkRulerAction" commandName="Text Editor Bookmark Ruler Action" category="_JQ_7G7joEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_6OrjoEe25NdJK2M4KYw" elementId="AUTOGEN:::org.eclipse.ui.texteditor.ruler.actions/org.eclipse.ui.texteditor.SelectRulerAction" commandName="Text Editor Ruler Single-Click" category="_JQ_7G7joEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_6O7joEe25NdJK2M4KYw" elementId="AUTOGEN:::org.eclipse.debug.ui.PulldownActions/org.eclipse.debug.ui.debugview.pulldown.ViewManagementAction" commandName="View Management..." category="_JQ_7G7joEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_6PLjoEe25NdJK2M4KYw" elementId="AUTOGEN:::org.eclipse.debug.ui.debugview.toolbar/org.eclipse.debug.ui.debugview.toolbar.removeAllTerminated" commandName="Remove All Terminated" description="Remove All Terminated Launches" category="_JQ_7G7joEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_6PbjoEe25NdJK2M4KYw" elementId="AUTOGEN:::org.eclipse.debug.ui.debugview.toolbar/org.eclipse.debug.ui.debugview.toolbar.collapseAll" commandName="Collapse All" description="Collapse All" category="_JQ_7G7joEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_6PrjoEe25NdJK2M4KYw" elementId="AUTOGEN:::org.eclipse.debug.ui.breakpointsview.toolbar/org.eclipse.debug.ui.breakpointsView.toolbar.removeAll" commandName="Remove All" description="Remove All Breakpoints" category="_JQ_7G7joEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_6P7joEe25NdJK2M4KYw" elementId="AUTOGEN:::org.eclipse.debug.ui.breakpointsview.toolbar/org.eclipse.debug.ui.breakpointsView.toolbar.linkWithDebugView" commandName="Link with Debug View" description="Link with Debug View" category="_JQ_7G7joEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_6QLjoEe25NdJK2M4KYw" elementId="AUTOGEN:::org.eclipse.debug.ui.breakpointsview.toolbar/org.eclipse.debug.ui.breakpointsView.toolbar.workingSets" commandName="Working Sets..." description="Manage Working Sets" category="_JQ_7G7joEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_6QbjoEe25NdJK2M4KYw" elementId="AUTOGEN:::org.eclipse.debug.ui.breakpointsview.toolbar/org.eclipse.debug.ui.breakpointsView.toolbar.clearDefaultBreakpointGroup" commandName="Deselect Default Working Set" description="Deselect Default Working Set" category="_JQ_7G7joEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_6QrjoEe25NdJK2M4KYw" elementId="AUTOGEN:::org.eclipse.debug.ui.breakpointsview.toolbar/org.eclipse.debug.ui.breakpointsView.toolbar.setDefaultBreakpointGroup" commandName="Select Default Working Set..." description="Select Default Working Set" category="_JQ_7G7joEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_6Q7joEe25NdJK2M4KYw" elementId="AUTOGEN:::org.eclipse.debug.ui.breakpointsview.toolbar/org.eclipse.debug.ui.breakpointsView.toolbar.sortByAction" commandName="Sort By" description="Sort By" category="_JQ_7G7joEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_6RLjoEe25NdJK2M4KYw" elementId="AUTOGEN:::org.eclipse.debug.ui.breakpointsview.toolbar/org.eclipse.debug.ui.breakpointsView.toolbar.groupByAction" commandName="Group By" description="Show" category="_JQ_7G7joEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_6RbjoEe25NdJK2M4KYw" elementId="AUTOGEN:::org.eclipse.debug.ui.expressionsView.toolbar/org.eclipse.debug.ui.expresssionsView.toolbar.removeAll" commandName="Remove All" description="Remove All Expressions" category="_JQ_7G7joEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_6RrjoEe25NdJK2M4KYw" elementId="AUTOGEN:::org.eclipse.debug.ui.expressionsView.toolbar/org.eclipse.debug.ui.expresssionsView.toolbar.AddWatchExpression" commandName="Add Watch Expression..." description="Create a new watch expression" category="_JQ_7G7joEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_6R7joEe25NdJK2M4KYw" elementId="AUTOGEN:::org.eclipse.debug.ui.memoryView.toolbar/org.eclipse.debug.ui.PinMemoryBlockAction" commandName="Pin Memory Monitor" description="Pin Memory Monitor" category="_JQ_7G7joEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_6SLjoEe25NdJK2M4KYw" elementId="AUTOGEN:::org.eclipse.debug.ui.memoryView.toolbar/org.eclipse.debug.ui.NewMemoryViewAction" commandName="New Memory View" description="New Memory View" category="_JQ_7G7joEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_6SbjoEe25NdJK2M4KYw" elementId="AUTOGEN:::org.eclipse.debug.ui.memoryView.toolbar/org.eclipse.debug.ui.togglemonitors" commandName="Toggle Memory Monitors Pane" description="Toggle Memory Monitors Pane" category="_JQ_7G7joEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_6SrjoEe25NdJK2M4KYw" elementId="AUTOGEN:::org.eclipse.debug.ui.memoryView.toolbar/org.eclipse.debug.ui.linkrenderingpanes" commandName="Link Memory Rendering Panes" description="Link Memory Rendering Panes" category="_JQ_7G7joEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_6S7joEe25NdJK2M4KYw" elementId="AUTOGEN:::org.eclipse.debug.ui.memoryView.toolbar/org.eclipse.debug.ui.tablerendering.preferencesaction" commandName="Table Renderings Preferences..." description="&amp;Table Renderings Preferences..." category="_JQ_7G7joEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_6TLjoEe25NdJK2M4KYw" elementId="AUTOGEN:::org.eclipse.debug.ui.memoryView.toolbar/org.eclipse.debug.ui.togglesplitpane" commandName="Toggle Split Pane" description="Toggle Split Pane" category="_JQ_7G7joEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_6TbjoEe25NdJK2M4KYw" elementId="AUTOGEN:::org.eclipse.debug.ui.memoryView.toolbar/org.eclipse.debug.ui.switchMemoryBlock" commandName="Switch Memory Monitor" description="Switch Memory Monitor" category="_JQ_7G7joEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_6TrjoEe25NdJK2M4KYw" elementId="AUTOGEN:::org.eclipse.debug.ui.memoryView.toolbar/org.eclipse.debug.ui.memoryViewPreferencesAction" commandName="Preferences..." description="&amp;Preferences..." category="_JQ_7G7joEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_6T7joEe25NdJK2M4KYw" elementId="AUTOGEN:::org.eclipse.jdt.debug.ui.VariableViewActions/org.eclipse.jdt.debug.ui.variableViewActions.Preferences" commandName="Java Preferences..." description="Opens preferences for Java variables" category="_JQ_7G7joEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_6ULjoEe25NdJK2M4KYw" elementId="AUTOGEN:::org.eclipse.jdt.debug.ui.VariableViewActions/org.eclipse.jdt.debug.ui.variablesViewActions.AllReferencesInView" commandName="Show References" description="Shows references to each object in the variables view as an array of objects." category="_JQ_7G7joEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_6UbjoEe25NdJK2M4KYw" elementId="AUTOGEN:::org.eclipse.jdt.debug.ui.VariableViewActions/org.eclipse.jdt.debug.ui.variableViewActions.ShowNullEntries" commandName="Show Null Array Entries" description="Show Null Array Entries" category="_JQ_7G7joEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_6UrjoEe25NdJK2M4KYw" elementId="AUTOGEN:::org.eclipse.jdt.debug.ui.VariableViewActions/org.eclipse.jdt.debug.ui.variableViewActions.ShowQualified" commandName="Show Qualified Names" description="Show Qualified Names" category="_JQ_7G7joEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_6U7joEe25NdJK2M4KYw" elementId="AUTOGEN:::org.eclipse.jdt.debug.ui.VariableViewActions/org.eclipse.jdt.debug.ui.variableViewActions.ShowStatic" commandName="Show Static Variables" description="Show Static Variables" category="_JQ_7G7joEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_6VLjoEe25NdJK2M4KYw" elementId="AUTOGEN:::org.eclipse.jdt.debug.ui.VariableViewActions/org.eclipse.jdt.debug.ui.variableViewActions.ShowConstants" commandName="Show Constants" description="Show Constants" category="_JQ_7G7joEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_6VbjoEe25NdJK2M4KYw" elementId="AUTOGEN:::org.eclipse.jdt.debug.ui.ExpressionViewActions/org.eclipse.jdt.debug.ui.variableViewActions.Preferences" commandName="Java Preferences..." description="Opens preferences for Java variables" category="_JQ_7G7joEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_6VrjoEe25NdJK2M4KYw" elementId="AUTOGEN:::org.eclipse.jdt.debug.ui.ExpressionViewActions/org.eclipse.jdt.debug.ui.expressionViewActions.AllReferencesInView" commandName="Show References" description="Show &amp;References" category="_JQ_7G7joEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_6V7joEe25NdJK2M4KYw" elementId="AUTOGEN:::org.eclipse.jdt.debug.ui.ExpressionViewActions/org.eclipse.jdt.debug.ui.variableViewActions.ShowNullEntries" commandName="Show Null Array Entries" description="Show Null Array Entries" category="_JQ_7G7joEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_6WLjoEe25NdJK2M4KYw" elementId="AUTOGEN:::org.eclipse.jdt.debug.ui.ExpressionViewActions/org.eclipse.jdt.debug.ui.expressionViewActions.ShowQualified" commandName="Show Qualified Names" description="Show Qualified Names" category="_JQ_7G7joEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_6WbjoEe25NdJK2M4KYw" elementId="AUTOGEN:::org.eclipse.jdt.debug.ui.ExpressionViewActions/org.eclipse.jdt.debug.ui.expressionViewActions.ShowStatic" commandName="Show Static Variables" description="Show Static Variables" category="_JQ_7G7joEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_6WrjoEe25NdJK2M4KYw" elementId="AUTOGEN:::org.eclipse.jdt.debug.ui.ExpressionViewActions/org.eclipse.jdt.debug.ui.expressionViewActions.ShowConstants" commandName="Show Constants" description="Show Constants" category="_JQ_7G7joEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_6W7joEe25NdJK2M4KYw" elementId="AUTOGEN:::org.eclipse.jdt.debug.ui.BreakpointViewActions/org.eclipse.jdt.debug.ui.actions.AddException" commandName="Add Java Exception Breakpoint" description="Add Java Exception Breakpoint" category="_JQ_7G7joEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_6XLjoEe25NdJK2M4KYw" elementId="AUTOGEN:::org.eclipse.jdt.debug.ui.BreakpointViewActions/org.eclipse.jdt.debug.ui.breakpointViewActions.ShowQualified" commandName="Show Qualified Names" description="Show Qualified Names" category="_JQ_7G7joEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_6XbjoEe25NdJK2M4KYw" elementId="AUTOGEN:::org.eclipse.jdt.debug.ui.LaunchViewActions/org.eclipse.jdt.debug.ui.launchViewActions.ShowThreadGroups" commandName="Show Thread Groups" description="Show Thread Groups" category="_JQ_7G7joEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_6XrjoEe25NdJK2M4KYw" elementId="AUTOGEN:::org.eclipse.jdt.debug.ui.LaunchViewActions/org.eclipse.jdt.debug.ui.launchViewActions.ShowQualified" commandName="Show Qualified Names" description="Show Qualified Names" category="_JQ_7G7joEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_6X7joEe25NdJK2M4KYw" elementId="AUTOGEN:::org.eclipse.jdt.debug.ui.LaunchViewActions/org.eclipse.jdt.debug.ui.launchViewActions.ShowSystemThreads" commandName="Show System Threads" description="Show System Threads" category="_JQ_7G7joEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_6YLjoEe25NdJK2M4KYw" elementId="AUTOGEN:::org.eclipse.jdt.debug.ui.LaunchViewActions/org.eclipse.jdt.debug.ui.launchViewActions.ShowRunningThreads" commandName="Show Running Threads" description="Show Running Threads" category="_JQ_7G7joEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_6YbjoEe25NdJK2M4KYw" elementId="AUTOGEN:::org.eclipse.jdt.debug.ui.LaunchViewActions/org.eclipse.jdt.debug.ui.launchViewActions.ShowMonitorThreadInfo" commandName="Show Monitors" description="Show the Thread &amp; Monitor Information" category="_JQ_7G7joEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_6YrjoEe25NdJK2M4KYw" elementId="AUTOGEN:::org.eclipse.jdt.debug.ui.DisplayViewActions/org.eclipse.jdt.debug.ui.displayViewToolbar.Watch" commandName="Watch" description="Create a Watch Expression from the Selected Text" category="_JQ_7G7joEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_6Y7joEe25NdJK2M4KYw" elementId="AUTOGEN:::org.eclipse.jdt.debug.ui.DisplayViewActions/org.eclipse.jdt.debug.ui.displayViewToolbar.Execute" commandName="Execute" description="Execute the Selected Text" category="_JQ_7G7joEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_6ZLjoEe25NdJK2M4KYw" elementId="AUTOGEN:::org.eclipse.jdt.debug.ui.DisplayViewActions/org.eclipse.jdt.debug.ui.displayViewToolbar.Display" commandName="Display" description="Display Result of Evaluating Selected Text" category="_JQ_7G7joEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_6ZbjoEe25NdJK2M4KYw" elementId="AUTOGEN:::org.eclipse.jdt.debug.ui.DisplayViewActions/org.eclipse.jdt.debug.ui.displayViewToolbar.Inspect" commandName="Inspect" description="Inspect Result of Evaluating Selected Text" category="_JQ_7G7joEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_6ZrjoEe25NdJK2M4KYw" elementId="AUTOGEN:::org.eclipse.pde.ui.logViewActions/org.eclipse.jdt.debug.ui.LogViewActions.showStackTrace" commandName="Show Stack Trace in Console View" description="Show Stack Trace in Console View" category="_JQ_7G7joEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_6Z7joEe25NdJK2M4KYw" elementId="org.eclipse.wst.jsdt.ui.edit.text.java.search.references.in.working.set" commandName="References in Working Set" description="Search for references to the selected element in a working set" category="_JQ_7EbjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_6aLjoEe25NdJK2M4KYw" elementId="org.eclipse.gef.ui.palette_view" commandName="Palette" category="_JQ_6-LjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_6abjoEe25NdJK2M4KYw" elementId="org.eclipse.wst.jsdt.ui.edit.text.java.search.write.access.in.working.set" commandName="Write Access in Working Set" description="Search for write references to the selected element in a working set" category="_JQ_7EbjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_6arjoEe25NdJK2M4KYw" elementId="org.eclipse.wst.jsdt.ui.edit.text.java.search.read.access.in.hierarchy" commandName="Read Access in Hierarchy" description="Search for read references of the selected element in its hierarchy" category="_JQ_7EbjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_6a7joEe25NdJK2M4KYw" elementId="org.eclipse.wst.jsdt.ui.edit.text.java.folding.collapseMembers" commandName="Collapse Members" description="Collapse all members" category="_JQ_7ALjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_6bLjoEe25NdJK2M4KYw" elementId="org.eclipse.wst.jsdt.ui.edit.text.java.search.write.access.in.project" commandName="Write Access in Project" description="Search for write references to the selected element in the enclosing project" category="_JQ_7EbjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_6bbjoEe25NdJK2M4KYw" elementId="org.eclipse.wst.jsdt.ui.edit.text.java.show.outline" commandName="Quick Outline" description="Show the quick outline for the editor input" category="_JQ_7AbjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_6brjoEe25NdJK2M4KYw" elementId="org.eclipse.wst.jsdt.ui.edit.text.java.search.write.access.in.hierarchy" commandName="Write Access in Hierarchy" description="Search for write references of the selected element in its hierarchy" category="_JQ_7EbjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_6b7joEe25NdJK2M4KYw" elementId="org.eclipse.wst.xml.ui.disable.grammar.constraints" commandName="Turn off Grammar Constraints" description="Turn off grammar Constraints" category="_JQ_7G7joEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_6cLjoEe25NdJK2M4KYw" elementId="org.eclipse.wst.jsdt.ui.edit.text.java.search.references.in.project" commandName="References in Project" description="Search for references to the selected element in the enclosing project" category="_JQ_7EbjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_6cbjoEe25NdJK2M4KYw" elementId="org.eclipse.wst.jsdt.ui.edit.text.java.search.declarations.in.working.set" commandName="Declaration in Working Set" description="Search for declarations of the selected element in a working set" category="_JQ_7EbjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_6crjoEe25NdJK2M4KYw" elementId="org.eclipse.wst.jsdt.ui.correction.qualifyField" commandName="Quick Fix - Qualify var access" description="Invokes quick assist and selects 'Qualify var access'" category="_JQ_7HbjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_6c7joEe25NdJK2M4KYw" elementId="org.eclipse.wst.jsdt.ui.edit.text.java.add.unimplemented.constructors" commandName="Generate Constructors from Superclass" description="Evaluate and add constructors from superclass" category="_JQ_7HbjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_6dLjoEe25NdJK2M4KYw" elementId="org.eclipse.wst.jsdt.ui.edit.text.java.search.implementors.in.working.set" commandName="Implementors in Working Set" description="Search for implementors of the selected interface in a working set" category="_JQ_7EbjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_6dbjoEe25NdJK2M4KYw" elementId="org.eclipse.wst.jsdt.ui.correction.inlineLocal.assist" commandName="Quick Assist - Inline local variable" description="Invokes quick assist and selects 'Inline local variable'" category="_JQ_7HbjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_6drjoEe25NdJK2M4KYw" elementId="org.eclipse.wst.jsdt.ui.edit.text.java.format" commandName="Format" description="Format the selected text" category="_JQ_7HbjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_6d7joEe25NdJK2M4KYw" elementId="org.eclipse.wst.jsdt.ui.edit.text.java.remove.block.comment" commandName="Remove Block Comment" description="Remove the block comment enclosing the selection" category="_JQ_7HbjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_6eLjoEe25NdJK2M4KYw" elementId="org.eclipse.wst.jsdt.ui.edit.text.java.clean.up" commandName="Clean Up" description="Solve problems and improve code style on selected resources" category="_JQ_7HbjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_6ebjoEe25NdJK2M4KYw" elementId="org.eclipse.wst.jsdt.ui.edit.text.java.find.broken.nls.keys" commandName="Find Broken Externalized Strings" description="Finds undefined, duplicate and unused externalized string keys in property files" category="_JQ_7HbjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_6erjoEe25NdJK2M4KYw" elementId="org.eclipse.wst.jsdt.ui.edit.text.java.goto.next.member" commandName="Go to Next Member" description="Move the caret to the next member of the JavaScript file" category="_JQ_7AbjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_6e7joEe25NdJK2M4KYw" elementId="org.eclipse.wst.jsdt.ui.edit.text.java.search.implementors.in.project" commandName="Implementors in Project" description="Search for implementors of the selected interface in the enclosing project" category="_JQ_7EbjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_6fLjoEe25NdJK2M4KYw" elementId="org.eclipse.wst.xml.ui.previousSibling" commandName="Previous Sibling" description="Go to Previous Sibling" category="_JQ_6-7joEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_6fbjoEe25NdJK2M4KYw" elementId="org.eclipse.wst.jsdt.ui.correction.convertAnonymousToLocal.assist" commandName="Quick Assist - Convert anonymous to local class" description="Invokes quick assist and selects 'Convert anonymous to local class'" category="_JQ_7HbjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_6frjoEe25NdJK2M4KYw" elementId="org.eclipse.wst.jsdt.ui.edit.text.java.search.occurrences.in.file.quickMenu" commandName="Show Occurrences in File Quick Menu" description="Shows the Occurrences in File quick menu" category="_JQ_7EbjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_6f7joEe25NdJK2M4KYw" elementId="org.eclipse.wst.jsdt.ui.correction.convertLocalToField.assist" commandName="Quick Assist - Convert local variable to var" description="Invokes quick assist and selects 'Convert local variable to var'" category="_JQ_7HbjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_6gLjoEe25NdJK2M4KYw" elementId="org.eclipse.wst.jsdt.ui.correction.extractLocal.assist" commandName="Quick Assist - Extract local variable" description="Invokes quick assist and selects 'Extract local variable'" category="_JQ_7HbjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_6gbjoEe25NdJK2M4KYw" elementId="org.eclipse.wst.jsdt.ui.correction.renameInFile.assist" commandName="Quick Assist - Rename in file" description="Invokes quick assist and selects 'Rename in file'" category="_JQ_7HbjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_6grjoEe25NdJK2M4KYw" elementId="org.eclipse.wst.jsdt.ui.edit.text.java.search.read.access.in.workspace" commandName="Read Access in Workspace" description="Search for read references to the selected element in the workspace" category="_JQ_7EbjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_6g7joEe25NdJK2M4KYw" elementId="org.eclipse.wst.jsdt.ui.correction.changeToStatic" commandName="Quick Fix - Change to static access" description="Invokes quick assist and selects 'Change to static access'" category="_JQ_7HbjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_6hLjoEe25NdJK2M4KYw" elementId="org.eclipse.wst.validation.ValidationCommand" commandName="Validate" description="Invoke registered Validators" category="_JQ_7G7joEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_6hbjoEe25NdJK2M4KYw" elementId="org.eclipse.wst.jsdt.ui.correction.addCast" commandName="Quick Fix - Add cast" description="Invokes quick assist and selects 'Add cast'" category="_JQ_7HbjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_6hrjoEe25NdJK2M4KYw" elementId="org.eclipse.wst.jsdt.ui.correction.addSuppressWarnings" commandName="Quick Fix - Add @SuppressWarnings" description="Invokes quick fix and selects 'Add @SuppressWarnings' " category="_JQ_7HbjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_6h7joEe25NdJK2M4KYw" elementId="org.eclipse.wst.jsdt.ui.edit.text.remove.occurrence.annotations" commandName="Remove Occurrence Annotations" description="Removes the occurrence annotations from the current editor" category="_JQ_7HbjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_6iLjoEe25NdJK2M4KYw" elementId="org.eclipse.wst.xml.ui.reload.dependencies" commandName="Reload Dependencies" description="Reload Dependencies" category="_JQ_7G7joEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_6ibjoEe25NdJK2M4KYw" elementId="org.eclipse.wst.jsdt.ui.correction.addImport" commandName="Quick Fix - Add import" description="Invokes quick assist and selects 'Add import'" category="_JQ_7HbjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_6irjoEe25NdJK2M4KYw" elementId="org.eclipse.wst.xsd.ui.refactor.makeTypeGlobal" commandName="Make &amp;Anonymous Type Global" description="Promotes anonymous type to global level and replaces its references" category="_JQ_6-7joEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_6i7joEe25NdJK2M4KYw" elementId="org.eclipse.gef.zoom_in" commandName="Zoom In" description="Zoom In" category="_JQ_7HrjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_6jLjoEe25NdJK2M4KYw" elementId="org.eclipse.wst.jsdt.ui.correction.addThrowsDecl" commandName="Quick Fix - Add throws declaration" description="Invokes quick assist and selects 'Add throws declaration'" category="_JQ_7HbjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_6jbjoEe25NdJK2M4KYw" elementId="org.eclipse.wst.jsdt.ui.edit.text.java.toggleMarkOccurrences" commandName="Toggle Mark Occurrences" description="Toggles mark occurrences in JavaScript editors" category="_JQ_7HbjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_6jrjoEe25NdJK2M4KYw" elementId="org.eclipse.wst.jsdt.ui.correction.assignToField.assist" commandName="Quick Assist - Assign to var" description="Invokes quick assist and selects 'Assign to var'" category="_JQ_7HbjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_6j7joEe25NdJK2M4KYw" elementId="org.eclipse.wst.jsdt.ui.edit.text.java.search.occurrences.in.file" commandName="Search All Occurrences in File" description="Search for all occurrences of the selected element in its declaring file" category="_JQ_7EbjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_6kLjoEe25NdJK2M4KYw" elementId="org.eclipse.wst.jsdt.ui.edit.text.java.indent" commandName="Indent Line" description="Indents the current line" category="_JQ_7HbjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_6kbjoEe25NdJK2M4KYw" elementId="org.eclipse.wst.jsdt.ui.edit.text.java.quick.format" commandName="Format Element" description="Format enclosing text element" category="_JQ_7HbjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_6krjoEe25NdJK2M4KYw" elementId="org.eclipse.wst.jsdt.ui.edit.text.java.surround.with.quickMenu" commandName="Surround With Quick Menu" description="Shows the Surround With quick menu" category="_JQ_7HbjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_6k7joEe25NdJK2M4KYw" elementId="org.eclipse.wst.jsdt.ui.navigate.gototype" commandName="Go to Type" description="Go to Type" category="_JQ_7AbjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_6lLjoEe25NdJK2M4KYw" elementId="org.eclipse.wst.jsdt.ui.edit.text.java.open.type.hierarchy" commandName="Open Type Hierarchy" description="Open a type hierarchy on the selected element" category="_JQ_7AbjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_6lbjoEe25NdJK2M4KYw" elementId="org.eclipse.wst.jsdt.ui.correction.addNonNLS" commandName="Quick Fix - Add non-NLS tag" description="Invokes quick assist and selects 'Add non-NLS tag'" category="_JQ_7HbjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_6lrjoEe25NdJK2M4KYw" elementId="org.eclipse.wst.jsdt.ui.edit.text.java.add.block.comment" commandName="Add Block Comment" description="Enclose the selection with a block comment" category="_JQ_7HbjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_6l7joEe25NdJK2M4KYw" elementId="org.eclipse.wst.xml.ui.nextSibling" commandName="Next Sibling" description="Go to Next Sibling" category="_JQ_6-7joEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_6mLjoEe25NdJK2M4KYw" elementId="org.eclipse.wst.jsdt.ui.navigate.open.type" commandName="Open Type" description="Open a type in a JavaScript editor" category="_JQ_7AbjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_6mbjoEe25NdJK2M4KYw" elementId="org.eclipse.wst.jsdt.ui.navigate.gotopackage" commandName="Go to Folder" description="Go to Folder" category="_JQ_7AbjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_6mrjoEe25NdJK2M4KYw" elementId="org.eclipse.wst.jsdt.ui.correction.extractConstant.assist" commandName="Quick Assist - Extract constant" description="Invokes quick assist and selects 'Extract constant'" category="_JQ_7HbjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_6m7joEe25NdJK2M4KYw" elementId="sed.tabletree.collapseAll" commandName="Collapse All" category="_JQ_7G7joEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_6nLjoEe25NdJK2M4KYw" elementId="org.eclipse.wst.jsdt.ui.navigate.java.open.structure" commandName="Open Structure" description="Show the structure of the selected element" category="_JQ_7AbjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_6nbjoEe25NdJK2M4KYw" elementId="org.eclipse.wst.jsdt.ui.edit.text.java.search.references.in.workspace" commandName="References in Workspace" description="Search for references to the selected element in the workspace" category="_JQ_7EbjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_6nrjoEe25NdJK2M4KYw" elementId="org.eclipse.wst.jsdt.ui.edit.text.java.folding.collapseComments" commandName="Collapse Comments" description="Collapse all comments" category="_JQ_7ALjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_6n7joEe25NdJK2M4KYw" elementId="org.eclipse.wst.jsdt.ui.edit.text.java.toggle.comment" commandName="Toggle Comment" description="Toggle comment the selected lines" category="_JQ_7HbjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_6oLjoEe25NdJK2M4KYw" elementId="org.eclipse.wst.jsdt.ui.edit.text.java.search.read.access.in.project" commandName="Read Access in Project" description="Search for read references to the selected element in the enclosing project" category="_JQ_7EbjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_6objoEe25NdJK2M4KYw" elementId="org.eclipse.wst.jsdt.ui.edit.text.java.surround.with.try.catch" commandName="Surround with try/catch Block" description="Surround the selected text with a try/catch block" category="_JQ_7HbjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_6orjoEe25NdJK2M4KYw" elementId="org.eclipse.wst.jsdt.ui.edit.text.java.add.javadoc.comment" commandName="Add JSDoc Comment" description="Add a JSDoc comment stub to the member element" category="_JQ_7HbjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_6o7joEe25NdJK2M4KYw" elementId="org.eclipse.wst.jsdt.ui.generate.javadoc" commandName="Generate JSDoc" description="Generates JSDoc for a selectable set of JavaScript resources" category="_JQ_7DbjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_6pLjoEe25NdJK2M4KYw" elementId="org.eclipse.wst.jsdt.ui.edit.text.java.goto.matching.bracket" commandName="Go to Matching Bracket" description="Moves the cursor to the matching bracket" category="_JQ_7AbjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_6pbjoEe25NdJK2M4KYw" elementId="org.eclipse.wst.jsdt.ui.edit.text.java.generate.constructor.using.fields" commandName="Generate Constructor using Vars" description="Choose vars to initialize and constructor from superclass to call " category="_JQ_7HbjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_6prjoEe25NdJK2M4KYw" elementId="org.eclipse.wst.xsd.ui.refactor.rename.element" commandName="&amp;Rename XSD element" description="Rename XSD element" category="_JQ_6-7joEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_6p7joEe25NdJK2M4KYw" elementId="org.eclipse.wst.jsdt.ui.edit.text.java.search.declarations.in.workspace" commandName="Declaration in Workspace" description="Search for declarations of the selected element in the workspace" category="_JQ_7EbjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_6qLjoEe25NdJK2M4KYw" elementId="org.eclipse.wst.jsdt.ui.edit.text.java.open.super.implementation" commandName="Open Super Implementation" description="Open the Implementation in the Super Type" category="_JQ_7AbjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_6qbjoEe25NdJK2M4KYw" elementId="org.eclipse.wst.jsdt.ui.edit.text.java.open.editor" commandName="Open Declaration" description="Open an editor on the selected element" category="_JQ_7AbjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_6qrjoEe25NdJK2M4KYw" elementId="org.eclipse.wst.xsd.ui.refactor.makeElementGlobal" commandName="Make Local Element &amp;Global" description="Promotes local element to global level and replaces its references" category="_JQ_6-7joEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_6q7joEe25NdJK2M4KYw" elementId="org.eclipse.wst.xml.ui.generate.xml" commandName="XML File..." description="Generate a XML file from the selected DTD or Schema" category="_JQ_7G7joEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_6rLjoEe25NdJK2M4KYw" elementId="org.eclipse.wst.jsdt.ui.correction.splitJoinVariableDeclaration.assist" commandName="Quick Assist - Split/Join variable declaration" description="Invokes quick assist and selects 'Split/Join variable declaration'" category="_JQ_7HbjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_6rbjoEe25NdJK2M4KYw" elementId="org.eclipse.wst.jsdt.ui.correction.assignParamToField.assist" commandName="Quick Assist - Assign parameter to var" description="Invokes quick assist and selects 'Assign parameter to var'" category="_JQ_7HbjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_6rrjoEe25NdJK2M4KYw" elementId="org.eclipse.wst.jsdt.ui.edit.text.java.copy.qualified.name" commandName="Copy Qualified Name" description="Copy a fully qualified name to the system clipboard" category="_JQ_7HbjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_6r7joEe25NdJK2M4KYw" elementId="org.eclipse.wst.jsdt.ui.edit.text.java.search.references.in.hierarchy" commandName="References in Hierarchy" description="Search for references of the selected element in its hierarchy" category="_JQ_7EbjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_6sLjoEe25NdJK2M4KYw" elementId="org.eclipse.wst.jsdt.ui.edit.text.java.open.call.hierarchy" commandName="Open Call Hierarchy" description="Open a call hierarchy on the selected element" category="_JQ_7AbjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_6sbjoEe25NdJK2M4KYw" elementId="org.eclipse.wst.jsdt.ui.edit.text.java.externalize.strings" commandName="Externalize Strings" description="Finds all strings that are not externalized and moves them into a separate property file" category="_JQ_7HbjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_6srjoEe25NdJK2M4KYw" elementId="sed.tabletree.expandAll" commandName="Expand All" category="_JQ_7G7joEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_6s7joEe25NdJK2M4KYw" elementId="org.eclipse.wst.jsdt.ui.edit.text.java.open.external.javadoc" commandName="Open External JSDoc" description="Open the JSDoc of the selected element in an external browser" category="_JQ_7AbjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_6tLjoEe25NdJK2M4KYw" elementId="org.eclipse.wst.jsdt.ui.edit.text.java.search.implement.occurrences" commandName="Search Implement Occurrences in File" description="Search for implement occurrences of a selected type" category="_JQ_7EbjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_6tbjoEe25NdJK2M4KYw" elementId="org.eclipse.wst.xml.ui.gotoMatchingTag" commandName="Matching Tag" description="Go to Matching Tag" category="_JQ_6-7joEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_6trjoEe25NdJK2M4KYw" elementId="org.eclipse.wst.jsdt.ui.edit.text.java.search.exception.occurrences" commandName="Search Exception Occurrences in File" description="Search for exception occurrences of a selected exception type" category="_JQ_7EbjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_6t7joEe25NdJK2M4KYw" elementId="org.eclipse.wst.jsdt.ui.edit.text.java.search.declarations.in.hierarchy" commandName="Declaration in Hierarchy" description="Search for declarations of the selected element in its hierarchy" category="_JQ_7EbjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_6uLjoEe25NdJK2M4KYw" elementId="org.eclipse.wst.xml.ui.referencedFileErrors" commandName="Show Details..." description="Show Details..." category="_JQ_7G7joEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_6ubjoEe25NdJK2M4KYw" elementId="org.eclipse.wst.jsdt.ui.edit.text.java.search.implementors.in.workspace" commandName="Implementors in Workspace" description="Search for implementors of the selected interface" category="_JQ_7EbjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_6urjoEe25NdJK2M4KYw" elementId="org.eclipse.wst.jsdt.ui.edit.text.java.search.declarations.in.project" commandName="Declaration in Project" description="Search for declarations of the selected element in the enclosing project" category="_JQ_7EbjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_6u7joEe25NdJK2M4KYw" elementId="org.eclipse.gef.zoom_out" commandName="Zoom Out" description="Zoom Out" category="_JQ_7HrjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_6vLjoEe25NdJK2M4KYw" elementId="org.eclipse.wst.jsdt.ui.edit.text.java.uncomment" commandName="Uncomment" description="Uncomment the selected JavaScript comment lines" category="_JQ_7HbjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_6vbjoEe25NdJK2M4KYw" elementId="org.eclipse.wst.jsdt.ui.edit.text.java.search.read.access.in.working.set" commandName="Read Access in Working Set" description="Search for read references to the selected element in a working set" category="_JQ_7EbjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_6vrjoEe25NdJK2M4KYw" elementId="org.eclipse.wst.xml.ui.cmnd.contentmodel.sych" commandName="Synch" category="_JQ_7G7joEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_6v7joEe25NdJK2M4KYw" elementId="org.eclipse.wst.xsd.ui.refactor.renameTargetNamespace" commandName="Rename Target Namespace" description="Changes the target namespace of the schema" category="_JQ_6-7joEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_6wLjoEe25NdJK2M4KYw" elementId="org.eclipse.wst.jsdt.ui.correction.assignToLocal.assist" commandName="Quick Assist - Assign to local variable" description="Invokes quick assist and selects 'Assign to local variable'" category="_JQ_7HbjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_6wbjoEe25NdJK2M4KYw" elementId="org.eclipse.wst.jsdt.ui.edit.text.java.search.write.access.in.workspace" commandName="Write Access in Workspace" description="Search for write references to the selected element in the workspace" category="_JQ_7EbjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_6wrjoEe25NdJK2M4KYw" elementId="org.eclipse.wst.jsdt.ui.edit.text.java.comment" commandName="Comment" description="Turn the selected lines into JavaScript comments" category="_JQ_7HbjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_6w7joEe25NdJK2M4KYw" elementId="org.eclipse.wst.jsdt.ui.navigate.open.type.in.hierarchy" commandName="Open Type in Hierarchy" description="Open a type in the type hierarchy view" category="_JQ_7AbjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_6xLjoEe25NdJK2M4KYw" elementId="org.eclipse.wst.jsdt.ui.correction.addBlock.assist" commandName="Quick Assist - Replace statement with block" description="Invokes quick assist and selects 'Replace statement with block'" category="_JQ_7HbjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_6xbjoEe25NdJK2M4KYw" elementId="org.eclipse.wst.jsdt.ui.edit.text.java.goto.previous.member" commandName="Go to Previous Member" description="Move the caret to the previous member of the JavaScript file" category="_JQ_7AbjoEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_6xrjoEe25NdJK2M4KYw" elementId="AUTOGEN:::org.eclipse.wst.web.ui.wizardsActionSet/org.eclipse.wst.web.ui.actions.newCSSFile" commandName="CSS" description="Create a new Cascading Style Sheet" category="_JQ_7G7joEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_6x7joEe25NdJK2M4KYw" elementId="AUTOGEN:::org.eclipse.wst.web.ui.wizardsActionSet/org.eclipse.wst.web.ui.actions.newJSFile" commandName="JavaScript" description="Create a new JavaScript file" category="_JQ_7G7joEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_6yLjoEe25NdJK2M4KYw" elementId="AUTOGEN:::org.eclipse.wst.web.ui.wizardsActionSet/org.eclipse.wst.web.ui.actions.newHTMLFile" commandName="HTML" description="Create a new HTML page" category="_JQ_7G7joEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_6ybjoEe25NdJK2M4KYw" elementId="AUTOGEN:::org.eclipse.wst.css.core.csssource.ruler.actions/org.eclipse.ui.texteditor.BookmarkRulerAction" commandName="Add Bookmark..." category="_JQ_7G7joEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_6yrjoEe25NdJK2M4KYw" elementId="AUTOGEN:::org.eclipse.wst.css.core.csssource.ruler.actions/org.eclipse.ui.texteditor.SelectRulerAction" commandName="Select Ruler" category="_JQ_7G7joEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_6y7joEe25NdJK2M4KYw" elementId="AUTOGEN:::org.eclipse.wst.dtd.core.dtdsource.ruler.actions/org.eclipse.ui.texteditor.BookmarkRulerAction" commandName="Add Bookmark..." category="_JQ_7G7joEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_6zLjoEe25NdJK2M4KYw" elementId="AUTOGEN:::org.eclipse.wst.dtd.core.dtdsource.ruler.actions/org.eclipse.ui.texteditor.SelectRulerAction" commandName="Select Ruler" category="_JQ_7G7joEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_6zbjoEe25NdJK2M4KYw" elementId="AUTOGEN:::org.eclipse.wst.html.core.htmlsource.ruler.actions/org.eclipse.ui.texteditor.BookmarkRulerAction" commandName="Add Bookmark..." category="_JQ_7G7joEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_6zrjoEe25NdJK2M4KYw" elementId="AUTOGEN:::org.eclipse.wst.html.core.htmlsource.ruler.actions/org.eclipse.ui.texteditor.SelectRulerAction" commandName="Select Ruler" category="_JQ_7G7joEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_6z7joEe25NdJK2M4KYw" elementId="AUTOGEN:::org.eclipse.wst.jsdt.internal.ui.CompilationUnitEditor.ruler.actions/org.eclipse.wst.jsdt.internal.ui.javaeditor.BookmarkRulerAction" commandName="JavaScript Editor Bookmark Ruler Action" category="_JQ_7G7joEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_60LjoEe25NdJK2M4KYw" elementId="AUTOGEN:::org.eclipse.wst.jsdt.internal.ui.CompilationUnitEditor.ruler.actions/org.eclipse.wst.jsdt.internal.ui.javaeditor.JavaSelectRulerAction" commandName="JavaScript Editor Ruler Single-Click" category="_JQ_7G7joEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_60bjoEe25NdJK2M4KYw" elementId="AUTOGEN:::org.eclipse.wst.jsdt.internal.ui.ClassFileEditor.ruler.actions/org.eclipse.wst.jsdt.internal.ui.javaeditor.JavaSelectRulerAction" commandName="JavaScript Editor Ruler Single-Click" category="_JQ_7G7joEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_60rjoEe25NdJK2M4KYw" elementId="AUTOGEN:::org.eclipse.wst.jsdt.internal.ui.PropertiesFileEditor.ruler.actions/org.eclipse.wst.jsdt.internal.ui.propertiesfileeditor.BookmarkRulerAction" commandName="JavaScript Editor Bookmark Ruler Action" category="_JQ_7G7joEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_607joEe25NdJK2M4KYw" elementId="AUTOGEN:::org.eclipse.wst.jsdt.internal.ui.PropertiesFileEditor.ruler.actions/org.eclipse.wst.jsdt.internal.ui.propertiesfileeditor.SelectRulerAction" commandName="JavaScript Editor Ruler Single-Click" category="_JQ_7G7joEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_61LjoEe25NdJK2M4KYw" elementId="AUTOGEN:::org.eclipse.wst.json.core.jsonsource.ruler.actions/org.eclipse.ui.texteditor.BookmarkRulerAction" commandName="%AddBookmark.label" category="_JQ_7G7joEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_61bjoEe25NdJK2M4KYw" elementId="AUTOGEN:::org.eclipse.wst.json.core.jsonsource.ruler.actions/org.eclipse.ui.texteditor.SelectRulerAction" commandName="%SelectRuler.label" category="_JQ_7G7joEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_61rjoEe25NdJK2M4KYw" elementId="AUTOGEN:::org.eclipse.core.runtime.xml.source.ruler.actions/org.eclipse.ui.texteditor.BookmarkRulerAction" commandName="Add Bookmark..." category="_JQ_7G7joEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_617joEe25NdJK2M4KYw" elementId="AUTOGEN:::org.eclipse.core.runtime.xml.source.ruler.actions/org.eclipse.ui.texteditor.SelectRulerAction" commandName="Select Ruler" category="_JQ_7G7joEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_62LjoEe25NdJK2M4KYw" elementId="AUTOGEN:::org.eclipse.wst.xsd.core.xsdsource.ruler.actions/org.eclipse.ui.texteditor.BookmarkRulerAction" commandName="Add Bookmark..." category="_JQ_7G7joEe25NdJK2M4KYw"/>
-  <commands xmi:id="_JQ_62bjoEe25NdJK2M4KYw" elementId="AUTOGEN:::org.eclipse.wst.xsd.core.xsdsource.ruler.actions/org.eclipse.ui.texteditor.SelectRulerAction" commandName="Select Ruler" category="_JQ_7G7joEe25NdJK2M4KYw"/>
-  <addons xmi:id="_JQ_66bjoEe25NdJK2M4KYw" elementId="org.eclipse.e4.core.commands.service" contributorURI="platform:/plugin/org.eclipse.platform" contributionURI="bundleclass://org.eclipse.e4.core.commands/org.eclipse.e4.core.commands.CommandServiceAddon"/>
-  <addons xmi:id="_JQ_66rjoEe25NdJK2M4KYw" elementId="org.eclipse.e4.ui.contexts.service" contributorURI="platform:/plugin/org.eclipse.platform" contributionURI="bundleclass://org.eclipse.e4.ui.services/org.eclipse.e4.ui.services.ContextServiceAddon"/>
-  <addons xmi:id="_JQ_667joEe25NdJK2M4KYw" elementId="org.eclipse.e4.ui.bindings.service" contributorURI="platform:/plugin/org.eclipse.platform" contributionURI="bundleclass://org.eclipse.e4.ui.bindings/org.eclipse.e4.ui.bindings.BindingServiceAddon"/>
-  <addons xmi:id="_JQ_67LjoEe25NdJK2M4KYw" elementId="org.eclipse.e4.ui.workbench.commands.model" contributorURI="platform:/plugin/org.eclipse.platform" contributionURI="bundleclass://org.eclipse.e4.ui.workbench/org.eclipse.e4.ui.internal.workbench.addons.CommandProcessingAddon"/>
-  <addons xmi:id="_JQ_67bjoEe25NdJK2M4KYw" elementId="org.eclipse.e4.ui.workbench.contexts.model" contributorURI="platform:/plugin/org.eclipse.platform" contributionURI="bundleclass://org.eclipse.e4.ui.workbench/org.eclipse.e4.ui.internal.workbench.addons.ContextProcessingAddon"/>
-  <addons xmi:id="_JQ_67rjoEe25NdJK2M4KYw" elementId="org.eclipse.e4.ui.workbench.bindings.model" contributorURI="platform:/plugin/org.eclipse.platform" contributionURI="bundleclass://org.eclipse.e4.ui.workbench.swt/org.eclipse.e4.ui.workbench.swt.util.BindingProcessingAddon"/>
-  <addons xmi:id="_JQ_677joEe25NdJK2M4KYw" elementId="Cleanup Addon" contributorURI="platform:/plugin/org.eclipse.platform" contributionURI="bundleclass://org.eclipse.e4.ui.workbench.addons.swt/org.eclipse.e4.ui.workbench.addons.cleanupaddon.CleanupAddon"/>
-  <addons xmi:id="_JQ_68LjoEe25NdJK2M4KYw" elementId="DnD Addon" contributorURI="platform:/plugin/org.eclipse.platform" contributionURI="bundleclass://org.eclipse.e4.ui.workbench.addons.swt/org.eclipse.e4.ui.workbench.addons.dndaddon.DnDAddon"/>
-  <addons xmi:id="_JQ_68bjoEe25NdJK2M4KYw" elementId="MinMax Addon" contributorURI="platform:/plugin/org.eclipse.platform" contributionURI="bundleclass://org.eclipse.e4.ui.workbench.addons.swt/org.eclipse.e4.ui.workbench.addons.minmax.MinMaxAddon"/>
-  <addons xmi:id="_JQ_68rjoEe25NdJK2M4KYw" elementId="org.eclipse.ui.workbench.addon.0" contributorURI="platform:/plugin/org.eclipse.platform" contributionURI="bundleclass://org.eclipse.e4.ui.workbench/org.eclipse.e4.ui.internal.workbench.addons.HandlerProcessingAddon"/>
-  <addons xmi:id="_JQ_687joEe25NdJK2M4KYw" elementId="SplitterAddon" contributionURI="bundleclass://org.eclipse.e4.ui.workbench.addons.swt/org.eclipse.e4.ui.workbench.addons.splitteraddon.SplitterAddon"/>
-  <addons xmi:id="_JQ_69LjoEe25NdJK2M4KYw" elementId="org.eclipse.ui.ide.addon.0" contributionURI="bundleclass://org.eclipse.ui.ide/org.eclipse.ui.internal.ide.addons.SaveAllDirtyPartsAddon"/>
-  <addons xmi:id="_JQ_69bjoEe25NdJK2M4KYw" elementId="org.eclipse.ui.ide.application.addon.0" contributorURI="platform:/plugin/org.eclipse.ui.ide.application" contributionURI="bundleclass://org.eclipse.ui.ide.application/org.eclipse.ui.internal.ide.application.addons.ModelCleanupAddon"/>
-  <categories xmi:id="_JQ_697joEe25NdJK2M4KYw" elementId="org.eclipse.team.ui.category.team" name="Version control (Team)" description="Actions that apply when working with a version control system"/>
-  <categories xmi:id="_JQ_6-LjoEe25NdJK2M4KYw" elementId="org.eclipse.ui.category.views" name="Views" description="Commands for opening views"/>
-  <categories xmi:id="_JQ_6-bjoEe25NdJK2M4KYw" elementId="org.springframework.tooling.ls.eclipse.gotosymbol.commands.category" name="STS4"/>
-  <categories xmi:id="_JQ_6-rjoEe25NdJK2M4KYw" elementId="org.eclipse.tm4e.languageconfiguration.category" name="TM4E Language Configuration"/>
-  <categories xmi:id="_JQ_6-7joEe25NdJK2M4KYw" elementId="org.eclipse.ui.category.edit" name="Edit"/>
-  <categories xmi:id="_JQ_6_LjoEe25NdJK2M4KYw" elementId="org.springframework.ide.eclipse.boot.commands.category" name="Spring Boot"/>
-  <categories xmi:id="_JQ_6_bjoEe25NdJK2M4KYw" elementId="org.eclipse.mylyn.wikitext.ui.editor.category" name="WikiText Markup Editing Commands" description="commands for editing lightweight markup"/>
-  <categories xmi:id="_JQ_6_rjoEe25NdJK2M4KYw" elementId="org.eclipse.buildship.ui.project" name="Buildship" description="Contains the Buildship specific commands"/>
-  <categories xmi:id="_JQ_6_7joEe25NdJK2M4KYw" elementId="org.eclipse.ui.ide.markerContents" name="Contents" description="The category for menu contents"/>
-  <categories xmi:id="_JQ_7ALjoEe25NdJK2M4KYw" elementId="org.eclipse.ui.category.textEditor" name="Text Editing" description="Text Editing Commands"/>
-  <categories xmi:id="_JQ_7AbjoEe25NdJK2M4KYw" elementId="org.eclipse.ui.category.navigate" name="Navigate"/>
-  <categories xmi:id="_JQ_7ArjoEe25NdJK2M4KYw" elementId="AnsiConsole.command.categoryid" name="ANSI Support Commands"/>
-  <categories xmi:id="_JQ_7A7joEe25NdJK2M4KYw" elementId="org.eclipse.wst.server.ui" name="Server" description="Server"/>
-  <categories xmi:id="_JQ_7BLjoEe25NdJK2M4KYw" elementId="org.eclipse.lsp4e.category" name="Language Servers"/>
-  <categories xmi:id="_JQ_7BbjoEe25NdJK2M4KYw" elementId="org.eclipse.ui.category.file" name="File"/>
-  <categories xmi:id="_JQ_7BrjoEe25NdJK2M4KYw" elementId="org.eclipse.tm.terminal.view.ui.commands.category" name="Terminal Commands"/>
-  <categories xmi:id="_JQ_7B7joEe25NdJK2M4KYw" elementId="org.eclipse.compare.ui.category.compare" name="Compare" description="Compare command category"/>
-  <categories xmi:id="_JQ_7CLjoEe25NdJK2M4KYw" elementId="org.eclipse.text.quicksearch.commands.category" name="Quick Search"/>
-  <categories xmi:id="_JQ_7CbjoEe25NdJK2M4KYw" elementId="org.eclipse.ui.category.window" name="Window"/>
-  <categories xmi:id="_JQ_7CrjoEe25NdJK2M4KYw" elementId="org.eclipse.jdt.ui.category.refactoring" name="Refactor - Java" description="Java Refactoring Actions"/>
-  <categories xmi:id="_JQ_7C7joEe25NdJK2M4KYw" elementId="org.eclipse.ui.category.help" name="Help"/>
-  <categories xmi:id="_JQ_7DLjoEe25NdJK2M4KYw" elementId="org.springframework.ide.eclipse.commands" name="Spring Generic Text Editor" description="Spring Language Server Commands"/>
-  <categories xmi:id="_JQ_7DbjoEe25NdJK2M4KYw" elementId="org.eclipse.ui.category.project" name="Project"/>
-  <categories xmi:id="_JQ_7DrjoEe25NdJK2M4KYw" elementId="org.springsource.ide.eclipse.common.ui.commands" name="SpringSource Tools"/>
-  <categories xmi:id="_JQ_7D7joEe25NdJK2M4KYw" elementId="org.eclipse.pde.genericeditor.extension.category.source" name="Target Definition Source" description="Target Definition Source Page actions"/>
-  <categories xmi:id="_JQ_7ELjoEe25NdJK2M4KYw" elementId="org.eclipse.tm.terminal.category1" name="Terminal view commands" description="Terminal view commands"/>
-  <categories xmi:id="_JQ_7EbjoEe25NdJK2M4KYw" elementId="org.eclipse.search.ui.category.search" name="Search" description="Search command category"/>
-  <categories xmi:id="_JQ_7ErjoEe25NdJK2M4KYw" elementId="org.eclipse.debug.ui.category.run" name="Run/Debug" description="Run/Debug command category"/>
-  <categories xmi:id="_JQ_7E7joEe25NdJK2M4KYw" elementId="org.eclipse.ui.category.dialogs" name="Dialogs" description="Commands for opening dialogs"/>
-  <categories xmi:id="_JQ_7FLjoEe25NdJK2M4KYw" elementId="org.eclipse.egit.ui.commandCategory" name="Git"/>
-  <categories xmi:id="_JQ_7FbjoEe25NdJK2M4KYw" elementId="org.eclipse.ui.category.perspectives" name="Perspectives" description="Commands for opening perspectives"/>
-  <categories xmi:id="_JQ_7FrjoEe25NdJK2M4KYw" elementId="org.eclipse.ltk.ui.category.refactoring" name="Refactoring"/>
-  <categories xmi:id="_JQ_7F7joEe25NdJK2M4KYw" elementId="org.eclipse.lsp4e.commandCategory" name="Command"/>
-  <categories xmi:id="_JQ_7GLjoEe25NdJK2M4KYw" elementId="org.eclipse.jdt.ui.category.source" name="Source" description="Java Source Actions"/>
-  <categories xmi:id="_JQ_7GbjoEe25NdJK2M4KYw" elementId="org.eclipse.pde.runtime.spy.commands.category" name="Spy"/>
-  <categories xmi:id="_JQ_7GrjoEe25NdJK2M4KYw" elementId="org.eclipse.pde.ui.category.source" name="Manifest Editor Source" description="PDE Source Page actions"/>
-  <categories xmi:id="_JQ_7G7joEe25NdJK2M4KYw" elementId="org.eclipse.core.commands.categories.autogenerated" name="Uncategorized" description="Commands that were either auto-generated or have no category"/>
-  <categories xmi:id="_JQ_7HLjoEe25NdJK2M4KYw" elementId="com.genuitec.eclipse.inlinesearch.commands.category" name="Inline Search"/>
-  <categories xmi:id="_JQ_7HbjoEe25NdJK2M4KYw" elementId="org.eclipse.wst.jsdt.ui.category.source" name="Source" description="JavaScript Source Actions"/>
-  <categories xmi:id="_JQ_7HrjoEe25NdJK2M4KYw" elementId="org.eclipse.gef.category.view" name="View" description="View"/>
+  <commands xmi:id="_ZNUXwKrbEe2-M8nuGout-A" elementId="com.genuitec.myeclipse.help.darktheme.commandid" commandName="com.genuitec.myeclipse.help.darktheme.commandid"/>
+  <commands xmi:id="_Z65PcKrbEe2-M8nuGout-A" elementId="AUTOGEN:::org.eclipse.ant.ui.actionSet.presentation/org.eclipse.ant.ui.toggleAutoReconcile" commandName="Toggle Ant Editor Auto Reconcile" description="Toggle Ant Editor Auto Reconcile" category="_ZGO4dKrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_Z69g4KrbEe2-M8nuGout-A" elementId="AUTOGEN:::org.eclipse.debug.ui.launchActionSet/org.eclipse.debug.internal.ui.actions.RunWithConfigurationAction" commandName="Run As" category="_ZGO4dKrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_Z6-vAKrbEe2-M8nuGout-A" elementId="AUTOGEN:::org.eclipse.debug.ui.launchActionSet/org.eclipse.debug.internal.ui.actions.RunHistoryMenuAction" commandName="Run History" category="_ZGO4dKrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_Z6_9IKrbEe2-M8nuGout-A" elementId="AUTOGEN:::org.eclipse.debug.ui.launchActionSet/org.eclipse.debug.internal.ui.actions.RunDropDownAction" commandName="Run" category="_ZGO4dKrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_Z7BLQKrbEe2-M8nuGout-A" elementId="AUTOGEN:::org.eclipse.debug.ui.launchActionSet/org.eclipse.debug.internal.ui.actions.DebugWithConfigurationAction" commandName="Debug As" category="_ZGO4dKrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_Z7ByUKrbEe2-M8nuGout-A" elementId="AUTOGEN:::org.eclipse.debug.ui.launchActionSet/org.eclipse.debug.internal.ui.actions.DebugHistoryMenuAction" commandName="Debug History" category="_ZGO4dKrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_Z7ByUarbEe2-M8nuGout-A" elementId="AUTOGEN:::org.eclipse.debug.ui.launchActionSet/org.eclipse.debug.internal.ui.actions.DebugDropDownAction" commandName="Debug" category="_ZGO4dKrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_Z7ByUqrbEe2-M8nuGout-A" elementId="AUTOGEN:::org.eclipse.debug.ui.profileActionSet/org.eclipse.debug.internal.ui.actions.ProfileDropDownAction" commandName="Profile" category="_ZGO4dKrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_Z7ByU6rbEe2-M8nuGout-A" elementId="AUTOGEN:::org.eclipse.debug.ui.profileActionSet/org.eclipse.debug.internal.ui.actions.ProfileWithConfigurationAction" commandName="Profile As" category="_ZGO4dKrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_Z7CZYKrbEe2-M8nuGout-A" elementId="AUTOGEN:::org.eclipse.debug.ui.profileActionSet/org.eclipse.debug.internal.ui.actions.ProfileHistoryMenuAction" commandName="Profile History" category="_ZGO4dKrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_Z7CZYarbEe2-M8nuGout-A" elementId="AUTOGEN:::org.eclipse.egit.ui.SearchActionSet/org.eclipse.egit.ui.actions.OpenCommitSearchPage" commandName="Git..." category="_ZGO4dKrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_Z7KVMKrbEe2-M8nuGout-A" elementId="AUTOGEN:::org.eclipse.jdt.ui.JavaElementCreationActionSet/org.eclipse.jdt.ui.actions.NewTypeDropDown" commandName="Class..." description="New Java Class" category="_ZGO4dKrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_Z7K8QKrbEe2-M8nuGout-A" elementId="AUTOGEN:::org.eclipse.jdt.ui.JavaElementCreationActionSet/org.eclipse.jdt.ui.actions.OpenPackageWizard" commandName="Package..." description="New Java Package" category="_ZGO4dKrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_Z7LjUKrbEe2-M8nuGout-A" elementId="AUTOGEN:::org.eclipse.jdt.ui.JavaElementCreationActionSet/org.eclipse.jdt.ui.actions.OpenProjectWizard" commandName="Java Project..." description="New Java Project" category="_ZGO4dKrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_Z7MKYKrbEe2-M8nuGout-A" elementId="AUTOGEN:::org.eclipse.jdt.ui.SearchActionSet/org.eclipse.jdt.ui.actions.OpenJavaSearchPage" commandName="Java..." category="_ZGO4dKrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_Z7MxcKrbEe2-M8nuGout-A" elementId="AUTOGEN:::org.eclipse.linuxtools.docker.launchActionSet/org.eclipse.debug.internal.ui.actions.RunWithConfigurationAction" commandName="Run As" category="_ZGO4dKrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_Z7MxcarbEe2-M8nuGout-A" elementId="AUTOGEN:::org.eclipse.linuxtools.docker.launchActionSet/org.eclipse.debug.internal.ui.actions.RunHistoryMenuAction" commandName="Run History" category="_ZGO4dKrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_Z7MxcqrbEe2-M8nuGout-A" elementId="AUTOGEN:::org.eclipse.linuxtools.docker.launchActionSet/org.eclipse.debug.internal.ui.actions.RunDropDownAction" commandName="Run" category="_ZGO4dKrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_Z7NYgKrbEe2-M8nuGout-A" elementId="AUTOGEN:::org.eclipse.pde.ui.SearchActionSet/org.eclipse.pde.ui.actions.OpenPluginSearchPage" commandName="Plug-in..." category="_ZGO4dKrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_Z7NYgarbEe2-M8nuGout-A" elementId="AUTOGEN:::org.eclipse.ui.cheatsheets.actionSet/org.eclipse.ui.cheatsheets.actions.CheatSheetHelpMenuAction" commandName="Cheat Sheets..." category="_ZGO4dKrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_Z7NYgqrbEe2-M8nuGout-A" elementId="AUTOGEN:::org.eclipse.search.searchActionSet/org.eclipse.search.OpenSearchDialogPage" commandName="Search..." description="Search" category="_ZGO4dKrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_Z7NYg6rbEe2-M8nuGout-A" elementId="AUTOGEN:::org.eclipse.team.ui.actionSet/org.eclipse.team.ui.synchronizeAll" commandName="Synchronize..." description="Synchronize..." category="_ZGO4dKrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_Z7NYhKrbEe2-M8nuGout-A" elementId="AUTOGEN:::org.eclipse.team.ui.actionSet/org.eclipse.team.ui.ConfigureProject" commandName="Share Project..." description="Share the project with others using a version and configuration management system." category="_ZGO4dKrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_Z7N_kKrbEe2-M8nuGout-A" elementId="AUTOGEN:::org.eclipse.ui.externaltools.ExternalToolsSet/org.eclipse.ui.externaltools.ExternalToolMenuDelegateMenu" commandName="External Tools" category="_ZGO4dKrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_Z7OmoKrbEe2-M8nuGout-A" elementId="AUTOGEN:::org.eclipse.wst.server.ui.new.actionSet/org.eclipse.wst.server.ui.action.new.server" commandName="Create Server" description="Create Server" category="_ZGO4dKrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_Z7P0wKrbEe2-M8nuGout-A" elementId="AUTOGEN:::org.eclipse.wst.server.ui.internal.webbrowser.actionSet/org.eclipse.wst.server.ui.internal.webbrowser.action.open" commandName="Open Web Browser" description="Open Web Browser" category="_ZGO4dKrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_Z7S4EKrbEe2-M8nuGout-A" elementId="AUTOGEN:::org.eclipse.wst.server.ui.internal.webbrowser.actionSet/org.eclipse.wst.server.ui.internal.webbrowser.action.switch" commandName="Web Browser" description="Web Browser" category="_ZGO4dKrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_Z7VUUKrbEe2-M8nuGout-A" elementId="AUTOGEN:::org.springsource.ide.eclipse.commons.launch.actionSet/org.springsource.ide.eclipse.commons.launch.relaunch.action" commandName="Relaunch" category="_ZGO4dKrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_Z7WicKrbEe2-M8nuGout-A" elementId="AUTOGEN:::org.springsource.ide.eclipse.commons.launch.actionSet/org.springsource.ide.eclipse.commons.launch.stop.action" commandName="Terminate" category="_ZGO4dKrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_Z7XJgKrbEe2-M8nuGout-A" elementId="AUTOGEN:::org.eclipse.ant.ui.BreakpointRulerActions/org.eclipse.ant.ui.actions.ManageBreakpointRulerAction" commandName="Toggle Breakpoint" category="_ZGO4dKrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_Z7XwkKrbEe2-M8nuGout-A" elementId="AUTOGEN:::org.eclipse.jdt.debug.CompilationUnitEditor.BreakpointRulerActions/org.eclipse.jdt.debug.ui.actions.ManageBreakpointRulerAction" commandName="Toggle Breakpoint" category="_ZGO4dKrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_Z7YXoKrbEe2-M8nuGout-A" elementId="AUTOGEN:::org.eclipse.jdt.debug.CompilationUnitEditor.BreakpointRulerActions/org.eclipse.jdt.debug.ui.actions.RunToLineRulerActionDelegate" commandName="Run to Line" category="_ZGO4dKrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_Z7YXoarbEe2-M8nuGout-A" elementId="AUTOGEN:::org.eclipse.jdt.debug.ClassFileEditor.BreakpointRulerActions/org.eclipse.jdt.debug.ui.actions.ManageBreakpointRulerAction" commandName="Toggle Breakpoint" category="_ZGO4dKrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_Z7Y-sKrbEe2-M8nuGout-A" elementId="AUTOGEN:::org.eclipse.jdt.debug.ClassFileEditor.BreakpointRulerActions/org.eclipse.jdt.debug.ui.actions.RunToLineRulerActionDelegate" commandName="Run to Line" category="_ZGO4dKrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_Z7ZlwKrbEe2-M8nuGout-A" elementId="AUTOGEN:::org.eclipse.jdt.debug.ui.JavaSnippetToolbarActions/org.eclipse.jdt.debug.ui.SnippetExecute" commandName="Execute" description="Execute the Selected Text" category="_ZGO4dKrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_Z7cCAKrbEe2-M8nuGout-A" elementId="AUTOGEN:::org.eclipse.jdt.debug.ui.JavaSnippetToolbarActions/org.eclipse.jdt.debug.ui.SnippetDisplay" commandName="Display" description="Display Result of Evaluating Selected Text" category="_ZGO4dKrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_Z7cpEKrbEe2-M8nuGout-A" elementId="AUTOGEN:::org.eclipse.jdt.debug.ui.JavaSnippetToolbarActions/org.eclipse.jdt.debug.ui.SnippetInspect" commandName="Inspect" description="Inspect Result of Evaluating Selected Text" category="_ZGO4dKrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_Z7dQIKrbEe2-M8nuGout-A" elementId="AUTOGEN:::org.eclipse.jdt.internal.ui.CompilationUnitEditor.ruler.actions/org.eclipse.jdt.internal.ui.javaeditor.BookmarkRulerAction" commandName="Java Editor Bookmark Ruler Action" category="_ZGO4dKrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_Z7dQIarbEe2-M8nuGout-A" elementId="AUTOGEN:::org.eclipse.jdt.internal.ui.CompilationUnitEditor.ruler.actions/org.eclipse.jdt.internal.ui.javaeditor.JavaSelectRulerAction" commandName="Java Editor Ruler Single-Click" category="_ZGO4dKrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_Z7d3MKrbEe2-M8nuGout-A" elementId="AUTOGEN:::org.eclipse.jdt.internal.ui.ClassFileEditor.ruler.actions/org.eclipse.jdt.internal.ui.javaeditor.JavaSelectRulerAction" commandName="Java Editor Ruler Single-Click" category="_ZGO4dKrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_Z7eeQKrbEe2-M8nuGout-A" elementId="AUTOGEN:::org.eclipse.jdt.internal.ui.PropertiesFileEditor.ruler.actions/org.eclipse.jdt.internal.ui.propertiesfileeditor.BookmarkRulerAction" commandName="Java Editor Bookmark Ruler Action" category="_ZGO4dKrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_Z7fsYKrbEe2-M8nuGout-A" elementId="AUTOGEN:::org.eclipse.jdt.internal.ui.PropertiesFileEditor.ruler.actions/org.eclipse.jdt.internal.ui.propertiesfileeditor.SelectRulerAction" commandName="Java Editor Ruler Single-Click" category="_ZGO4dKrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_Z7gTcKrbEe2-M8nuGout-A" elementId="AUTOGEN:::org.eclipse.lsp4e.debug.textEditor.rulerActions/org.eclipse.lsp4e.debug.textEditor.doubleClickBreakpointAction" commandName="unusedlabel" category="_ZGO4dKrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_Z7hhkKrbEe2-M8nuGout-A" elementId="AUTOGEN:::org.eclipse.lsp4e.debug.genericEditor.rulerActions/org.eclipse.lsp4e.debug.genericEditor.doubleClickBreakpointAction" commandName="unusedlabel" category="_ZGO4dKrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_Z7iIoKrbEe2-M8nuGout-A" elementId="AUTOGEN:::org.eclipse.m2e.jdt.ui.downloadSourcesContribution/org.eclipse.m2e.jdt.ui.downloadSourcesAction" commandName="label" category="_ZGO4dKrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_Z7ivsKrbEe2-M8nuGout-A" elementId="AUTOGEN:::org.eclipse.m2e.jdt.ui.downloadSourcesContribution_38/org.eclipse.m2e.jdt.ui.downloadSourcesAction_38" commandName="label" category="_ZGO4dKrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_Z7jWwKrbEe2-M8nuGout-A" elementId="AUTOGEN:::org.eclipse.ui.texteditor.ruler.actions/org.eclipse.ui.texteditor.BookmarkRulerAction" commandName="Text Editor Bookmark Ruler Action" category="_ZGO4dKrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_Z7kk4KrbEe2-M8nuGout-A" elementId="AUTOGEN:::org.eclipse.ui.texteditor.ruler.actions/org.eclipse.ui.texteditor.SelectRulerAction" commandName="Text Editor Ruler Single-Click" category="_ZGO4dKrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_Z7noMKrbEe2-M8nuGout-A" elementId="AUTOGEN:::org.eclipse.debug.ui.PulldownActions/org.eclipse.debug.ui.debugview.pulldown.ViewManagementAction" commandName="View Management..." category="_ZGO4dKrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_Z7oPQKrbEe2-M8nuGout-A" elementId="AUTOGEN:::org.eclipse.debug.ui.debugview.toolbar/org.eclipse.debug.ui.debugview.toolbar.removeAllTerminated" commandName="Remove All Terminated" description="Remove All Terminated Launches" category="_ZGO4dKrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_Z7o2UKrbEe2-M8nuGout-A" elementId="AUTOGEN:::org.eclipse.debug.ui.debugview.toolbar/org.eclipse.debug.ui.debugview.toolbar.collapseAll" commandName="Collapse All" description="Collapse All" category="_ZGO4dKrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_Z7pdYKrbEe2-M8nuGout-A" elementId="AUTOGEN:::org.eclipse.debug.ui.breakpointsview.toolbar/org.eclipse.debug.ui.breakpointsView.toolbar.removeAll" commandName="Remove All" description="Remove All Breakpoints" category="_ZGO4dKrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_Z7pdYarbEe2-M8nuGout-A" elementId="AUTOGEN:::org.eclipse.debug.ui.breakpointsview.toolbar/org.eclipse.debug.ui.breakpointsView.toolbar.linkWithDebugView" commandName="Link with Debug View" description="Link with Debug View" category="_ZGO4dKrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_Z7pdYqrbEe2-M8nuGout-A" elementId="AUTOGEN:::org.eclipse.debug.ui.breakpointsview.toolbar/org.eclipse.debug.ui.breakpointsView.toolbar.workingSets" commandName="Working Sets..." description="Manage Working Sets" category="_ZGO4dKrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_Z7qEcKrbEe2-M8nuGout-A" elementId="AUTOGEN:::org.eclipse.debug.ui.breakpointsview.toolbar/org.eclipse.debug.ui.breakpointsView.toolbar.clearDefaultBreakpointGroup" commandName="Deselect Default Working Set" description="Deselect Default Working Set" category="_ZGO4dKrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_Z7qEcarbEe2-M8nuGout-A" elementId="AUTOGEN:::org.eclipse.debug.ui.breakpointsview.toolbar/org.eclipse.debug.ui.breakpointsView.toolbar.setDefaultBreakpointGroup" commandName="Select Default Working Set..." description="Select Default Working Set" category="_ZGO4dKrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_Z7qEcqrbEe2-M8nuGout-A" elementId="AUTOGEN:::org.eclipse.debug.ui.breakpointsview.toolbar/org.eclipse.debug.ui.breakpointsView.toolbar.sortByAction" commandName="Sort By" description="Sort By" category="_ZGO4dKrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_Z7qEc6rbEe2-M8nuGout-A" elementId="AUTOGEN:::org.eclipse.debug.ui.breakpointsview.toolbar/org.eclipse.debug.ui.breakpointsView.toolbar.groupByAction" commandName="Group By" description="Show" category="_ZGO4dKrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_Z7qEdKrbEe2-M8nuGout-A" elementId="AUTOGEN:::org.eclipse.debug.ui.expressionsView.toolbar/org.eclipse.debug.ui.expresssionsView.toolbar.removeAll" commandName="Remove All" description="Remove All Expressions" category="_ZGO4dKrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_Z7qrgKrbEe2-M8nuGout-A" elementId="AUTOGEN:::org.eclipse.debug.ui.expressionsView.toolbar/org.eclipse.debug.ui.expresssionsView.toolbar.AddWatchExpression" commandName="Add Watch Expression..." description="Create a new watch expression" category="_ZGO4dKrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_Z7qrgarbEe2-M8nuGout-A" elementId="AUTOGEN:::org.eclipse.debug.ui.memoryView.toolbar/org.eclipse.debug.ui.PinMemoryBlockAction" commandName="Pin Memory Monitor" description="Pin Memory Monitor" category="_ZGO4dKrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_Z7qrgqrbEe2-M8nuGout-A" elementId="AUTOGEN:::org.eclipse.debug.ui.memoryView.toolbar/org.eclipse.debug.ui.NewMemoryViewAction" commandName="New Memory View" description="New Memory View" category="_ZGO4dKrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_Z7qrg6rbEe2-M8nuGout-A" elementId="AUTOGEN:::org.eclipse.debug.ui.memoryView.toolbar/org.eclipse.debug.ui.togglemonitors" commandName="Toggle Memory Monitors Pane" description="Toggle Memory Monitors Pane" category="_ZGO4dKrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_Z7qrhKrbEe2-M8nuGout-A" elementId="AUTOGEN:::org.eclipse.debug.ui.memoryView.toolbar/org.eclipse.debug.ui.linkrenderingpanes" commandName="Link Memory Rendering Panes" description="Link Memory Rendering Panes" category="_ZGO4dKrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_Z7rSkKrbEe2-M8nuGout-A" elementId="AUTOGEN:::org.eclipse.debug.ui.memoryView.toolbar/org.eclipse.debug.ui.tablerendering.preferencesaction" commandName="Table Renderings Preferences..." description="&amp;Table Renderings Preferences..." category="_ZGO4dKrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_Z7rSkarbEe2-M8nuGout-A" elementId="AUTOGEN:::org.eclipse.debug.ui.memoryView.toolbar/org.eclipse.debug.ui.togglesplitpane" commandName="Toggle Split Pane" description="Toggle Split Pane" category="_ZGO4dKrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_Z7rSkqrbEe2-M8nuGout-A" elementId="AUTOGEN:::org.eclipse.debug.ui.memoryView.toolbar/org.eclipse.debug.ui.switchMemoryBlock" commandName="Switch Memory Monitor" description="Switch Memory Monitor" category="_ZGO4dKrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_Z7rSk6rbEe2-M8nuGout-A" elementId="AUTOGEN:::org.eclipse.debug.ui.memoryView.toolbar/org.eclipse.debug.ui.memoryViewPreferencesAction" commandName="Preferences..." description="&amp;Preferences..." category="_ZGO4dKrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_Z7rSlKrbEe2-M8nuGout-A" elementId="AUTOGEN:::org.eclipse.jdt.debug.ui.VariableViewActions/org.eclipse.jdt.debug.ui.variableViewActions.Preferences" commandName="Java Preferences..." description="Opens preferences for Java variables" category="_ZGO4dKrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_Z7r5oKrbEe2-M8nuGout-A" elementId="AUTOGEN:::org.eclipse.jdt.debug.ui.VariableViewActions/org.eclipse.jdt.debug.ui.variablesViewActions.AllReferencesInView" commandName="Show References" description="Shows references to each object in the variables view as an array of objects." category="_ZGO4dKrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_Z7r5oarbEe2-M8nuGout-A" elementId="AUTOGEN:::org.eclipse.jdt.debug.ui.VariableViewActions/org.eclipse.jdt.debug.ui.variableViewActions.ShowNullEntries" commandName="Show Null Array Entries" description="Show Null Array Entries" category="_ZGO4dKrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_Z7r5oqrbEe2-M8nuGout-A" elementId="AUTOGEN:::org.eclipse.jdt.debug.ui.VariableViewActions/org.eclipse.jdt.debug.ui.variableViewActions.ShowQualified" commandName="Show Qualified Names" description="Show Qualified Names" category="_ZGO4dKrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_Z7r5o6rbEe2-M8nuGout-A" elementId="AUTOGEN:::org.eclipse.jdt.debug.ui.VariableViewActions/org.eclipse.jdt.debug.ui.variableViewActions.ShowStatic" commandName="Show Static Variables" description="Show Static Variables" category="_ZGO4dKrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_Z7r5pKrbEe2-M8nuGout-A" elementId="AUTOGEN:::org.eclipse.jdt.debug.ui.VariableViewActions/org.eclipse.jdt.debug.ui.variableViewActions.ShowConstants" commandName="Show Constants" description="Show Constants" category="_ZGO4dKrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_Z7r5parbEe2-M8nuGout-A" elementId="AUTOGEN:::org.eclipse.jdt.debug.ui.ExpressionViewActions/org.eclipse.jdt.debug.ui.variableViewActions.Preferences" commandName="Java Preferences..." description="Opens preferences for Java variables" category="_ZGO4dKrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_Z7sgsKrbEe2-M8nuGout-A" elementId="AUTOGEN:::org.eclipse.jdt.debug.ui.ExpressionViewActions/org.eclipse.jdt.debug.ui.expressionViewActions.AllReferencesInView" commandName="Show References" description="Show &amp;References" category="_ZGO4dKrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_Z7sgsarbEe2-M8nuGout-A" elementId="AUTOGEN:::org.eclipse.jdt.debug.ui.ExpressionViewActions/org.eclipse.jdt.debug.ui.variableViewActions.ShowNullEntries" commandName="Show Null Array Entries" description="Show Null Array Entries" category="_ZGO4dKrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_Z7sgsqrbEe2-M8nuGout-A" elementId="AUTOGEN:::org.eclipse.jdt.debug.ui.ExpressionViewActions/org.eclipse.jdt.debug.ui.expressionViewActions.ShowQualified" commandName="Show Qualified Names" description="Show Qualified Names" category="_ZGO4dKrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_Z7sgs6rbEe2-M8nuGout-A" elementId="AUTOGEN:::org.eclipse.jdt.debug.ui.ExpressionViewActions/org.eclipse.jdt.debug.ui.expressionViewActions.ShowStatic" commandName="Show Static Variables" description="Show Static Variables" category="_ZGO4dKrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_Z7sgtKrbEe2-M8nuGout-A" elementId="AUTOGEN:::org.eclipse.jdt.debug.ui.ExpressionViewActions/org.eclipse.jdt.debug.ui.expressionViewActions.ShowConstants" commandName="Show Constants" description="Show Constants" category="_ZGO4dKrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_Z7tHwKrbEe2-M8nuGout-A" elementId="AUTOGEN:::org.eclipse.jdt.debug.ui.BreakpointViewActions/org.eclipse.jdt.debug.ui.actions.AddException" commandName="Add Java Exception Breakpoint" description="Add Java Exception Breakpoint" category="_ZGO4dKrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_Z7tHwarbEe2-M8nuGout-A" elementId="AUTOGEN:::org.eclipse.jdt.debug.ui.BreakpointViewActions/org.eclipse.jdt.debug.ui.breakpointViewActions.ShowQualified" commandName="Show Qualified Names" description="Show Qualified Names" category="_ZGO4dKrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_Z7vkAKrbEe2-M8nuGout-A" elementId="AUTOGEN:::org.eclipse.jdt.debug.ui.LaunchViewActions/org.eclipse.jdt.debug.ui.launchViewActions.ShowThreadGroups" commandName="Show Thread Groups" description="Show Thread Groups" category="_ZGO4dKrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_Z7xZMKrbEe2-M8nuGout-A" elementId="AUTOGEN:::org.eclipse.jdt.debug.ui.LaunchViewActions/org.eclipse.jdt.debug.ui.launchViewActions.ShowQualified" commandName="Show Qualified Names" description="Show Qualified Names" category="_ZGO4dKrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_Z7zOYKrbEe2-M8nuGout-A" elementId="AUTOGEN:::org.eclipse.jdt.debug.ui.LaunchViewActions/org.eclipse.jdt.debug.ui.launchViewActions.ShowSystemThreads" commandName="Show System Threads" description="Show System Threads" category="_ZGO4dKrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_Z71DkKrbEe2-M8nuGout-A" elementId="AUTOGEN:::org.eclipse.jdt.debug.ui.LaunchViewActions/org.eclipse.jdt.debug.ui.launchViewActions.ShowRunningThreads" commandName="Show Running Threads" description="Show Running Threads" category="_ZGO4dKrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_Z72RsKrbEe2-M8nuGout-A" elementId="AUTOGEN:::org.eclipse.jdt.debug.ui.LaunchViewActions/org.eclipse.jdt.debug.ui.launchViewActions.ShowMonitorThreadInfo" commandName="Show Monitors" description="Show the Thread &amp; Monitor Information" category="_ZGO4dKrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_Z724wKrbEe2-M8nuGout-A" elementId="AUTOGEN:::org.eclipse.jdt.debug.ui.DisplayViewActions/org.eclipse.jdt.debug.ui.displayViewToolbar.Watch" commandName="Watch" description="Create a Watch Expression from the Selected Text" category="_ZGO4dKrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_Z724warbEe2-M8nuGout-A" elementId="AUTOGEN:::org.eclipse.jdt.debug.ui.DisplayViewActions/org.eclipse.jdt.debug.ui.displayViewToolbar.Execute" commandName="Execute" description="Execute the Selected Text" category="_ZGO4dKrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_Z724wqrbEe2-M8nuGout-A" elementId="AUTOGEN:::org.eclipse.jdt.debug.ui.DisplayViewActions/org.eclipse.jdt.debug.ui.displayViewToolbar.Display" commandName="Display" description="Display Result of Evaluating Selected Text" category="_ZGO4dKrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_Z73f0KrbEe2-M8nuGout-A" elementId="AUTOGEN:::org.eclipse.jdt.debug.ui.DisplayViewActions/org.eclipse.jdt.debug.ui.displayViewToolbar.Inspect" commandName="Inspect" description="Inspect Result of Evaluating Selected Text" category="_ZGO4dKrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_Z73f0arbEe2-M8nuGout-A" elementId="AUTOGEN:::org.eclipse.pde.ui.logViewActions/org.eclipse.jdt.debug.ui.LogViewActions.showStackTrace" commandName="Show Stack Trace in Console View" description="Show Stack Trace in Console View" category="_ZGO4dKrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_vo4hYKxFEe2VqJFWjEAUdQ" elementId="org.eclipse.wst.jsdt.ui.edit.text.java.search.references.in.working.set" commandName="References in Working Set" description="Search for references to the selected element in a working set" category="_ZGO4aqrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_vo4hYaxFEe2VqJFWjEAUdQ" elementId="org.eclipse.gef.ui.palette_view" commandName="Palette" category="_ZGO4UarbEe2-M8nuGout-A"/>
+  <commands xmi:id="_vo4hYqxFEe2VqJFWjEAUdQ" elementId="org.eclipse.wst.jsdt.ui.edit.text.java.search.write.access.in.working.set" commandName="Write Access in Working Set" description="Search for write references to the selected element in a working set" category="_ZGO4aqrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_vo4hY6xFEe2VqJFWjEAUdQ" elementId="org.eclipse.wst.jsdt.ui.edit.text.java.search.read.access.in.hierarchy" commandName="Read Access in Hierarchy" description="Search for read references of the selected element in its hierarchy" category="_ZGO4aqrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_vo4hZKxFEe2VqJFWjEAUdQ" elementId="org.eclipse.wst.jsdt.ui.edit.text.java.folding.collapseMembers" commandName="Collapse Members" description="Collapse all members" category="_ZGO4WarbEe2-M8nuGout-A"/>
+  <commands xmi:id="_vo4hZaxFEe2VqJFWjEAUdQ" elementId="org.eclipse.wst.jsdt.ui.edit.text.java.search.write.access.in.project" commandName="Write Access in Project" description="Search for write references to the selected element in the enclosing project" category="_ZGO4aqrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_vo4hZqxFEe2VqJFWjEAUdQ" elementId="org.eclipse.wst.jsdt.ui.edit.text.java.show.outline" commandName="Quick Outline" description="Show the quick outline for the editor input" category="_ZGO4WqrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_vo4hZ6xFEe2VqJFWjEAUdQ" elementId="org.eclipse.wst.jsdt.ui.edit.text.java.search.write.access.in.hierarchy" commandName="Write Access in Hierarchy" description="Search for write references of the selected element in its hierarchy" category="_ZGO4aqrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_vo4haKxFEe2VqJFWjEAUdQ" elementId="org.eclipse.wst.xml.ui.disable.grammar.constraints" commandName="Turn off Grammar Constraints" description="Turn off grammar Constraints" category="_ZGO4dKrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_vo4haaxFEe2VqJFWjEAUdQ" elementId="org.eclipse.wst.jsdt.ui.edit.text.java.search.references.in.project" commandName="References in Project" description="Search for references to the selected element in the enclosing project" category="_ZGO4aqrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_vo4haqxFEe2VqJFWjEAUdQ" elementId="org.eclipse.wst.jsdt.ui.edit.text.java.search.declarations.in.working.set" commandName="Declaration in Working Set" description="Search for declarations of the selected element in a working set" category="_ZGO4aqrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_vo4ha6xFEe2VqJFWjEAUdQ" elementId="org.eclipse.wst.jsdt.ui.correction.qualifyField" commandName="Quick Fix - Qualify var access" description="Invokes quick assist and selects 'Qualify var access'" category="_vowlkaxFEe2VqJFWjEAUdQ"/>
+  <commands xmi:id="_vo4hbKxFEe2VqJFWjEAUdQ" elementId="org.eclipse.wst.jsdt.ui.edit.text.java.add.unimplemented.constructors" commandName="Generate Constructors from Superclass" description="Evaluate and add constructors from superclass" category="_vowlkaxFEe2VqJFWjEAUdQ"/>
+  <commands xmi:id="_vo4hbaxFEe2VqJFWjEAUdQ" elementId="org.eclipse.wst.jsdt.ui.edit.text.java.search.implementors.in.working.set" commandName="Implementors in Working Set" description="Search for implementors of the selected interface in a working set" category="_ZGO4aqrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_vo4hbqxFEe2VqJFWjEAUdQ" elementId="org.eclipse.wst.jsdt.ui.correction.inlineLocal.assist" commandName="Quick Assist - Inline local variable" description="Invokes quick assist and selects 'Inline local variable'" category="_vowlkaxFEe2VqJFWjEAUdQ"/>
+  <commands xmi:id="_vo4hb6xFEe2VqJFWjEAUdQ" elementId="org.eclipse.wst.jsdt.ui.edit.text.java.format" commandName="Format" description="Format the selected text" category="_vowlkaxFEe2VqJFWjEAUdQ"/>
+  <commands xmi:id="_vo4hcKxFEe2VqJFWjEAUdQ" elementId="org.eclipse.wst.jsdt.ui.edit.text.java.remove.block.comment" commandName="Remove Block Comment" description="Remove the block comment enclosing the selection" category="_vowlkaxFEe2VqJFWjEAUdQ"/>
+  <commands xmi:id="_vo4hcaxFEe2VqJFWjEAUdQ" elementId="org.eclipse.wst.jsdt.ui.edit.text.java.clean.up" commandName="Clean Up" description="Solve problems and improve code style on selected resources" category="_vowlkaxFEe2VqJFWjEAUdQ"/>
+  <commands xmi:id="_vo4hcqxFEe2VqJFWjEAUdQ" elementId="org.eclipse.wst.jsdt.ui.edit.text.java.find.broken.nls.keys" commandName="Find Broken Externalized Strings" description="Finds undefined, duplicate and unused externalized string keys in property files" category="_vowlkaxFEe2VqJFWjEAUdQ"/>
+  <commands xmi:id="_vo4hc6xFEe2VqJFWjEAUdQ" elementId="org.eclipse.wst.jsdt.ui.edit.text.java.goto.next.member" commandName="Go to Next Member" description="Move the caret to the next member of the JavaScript file" category="_ZGO4WqrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_vo4hdKxFEe2VqJFWjEAUdQ" elementId="org.eclipse.wst.jsdt.ui.edit.text.java.search.implementors.in.project" commandName="Implementors in Project" description="Search for implementors of the selected interface in the enclosing project" category="_ZGO4aqrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_vo4hdaxFEe2VqJFWjEAUdQ" elementId="org.eclipse.wst.xml.ui.previousSibling" commandName="Previous Sibling" description="Go to Previous Sibling" category="_ZGO4VKrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_vo4hdqxFEe2VqJFWjEAUdQ" elementId="org.eclipse.wst.jsdt.ui.correction.convertAnonymousToLocal.assist" commandName="Quick Assist - Convert anonymous to local class" description="Invokes quick assist and selects 'Convert anonymous to local class'" category="_vowlkaxFEe2VqJFWjEAUdQ"/>
+  <commands xmi:id="_vo4hd6xFEe2VqJFWjEAUdQ" elementId="org.eclipse.wst.jsdt.ui.edit.text.java.search.occurrences.in.file.quickMenu" commandName="Show Occurrences in File Quick Menu" description="Shows the Occurrences in File quick menu" category="_ZGO4aqrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_vo4heKxFEe2VqJFWjEAUdQ" elementId="org.eclipse.wst.jsdt.ui.correction.convertLocalToField.assist" commandName="Quick Assist - Convert local variable to var" description="Invokes quick assist and selects 'Convert local variable to var'" category="_vowlkaxFEe2VqJFWjEAUdQ"/>
+  <commands xmi:id="_vo5IcKxFEe2VqJFWjEAUdQ" elementId="org.eclipse.wst.jsdt.ui.correction.extractLocal.assist" commandName="Quick Assist - Extract local variable" description="Invokes quick assist and selects 'Extract local variable'" category="_vowlkaxFEe2VqJFWjEAUdQ"/>
+  <commands xmi:id="_vo5IcaxFEe2VqJFWjEAUdQ" elementId="org.eclipse.wst.jsdt.ui.correction.renameInFile.assist" commandName="Quick Assist - Rename in file" description="Invokes quick assist and selects 'Rename in file'" category="_vowlkaxFEe2VqJFWjEAUdQ"/>
+  <commands xmi:id="_vo5IcqxFEe2VqJFWjEAUdQ" elementId="org.eclipse.wst.jsdt.ui.edit.text.java.search.read.access.in.workspace" commandName="Read Access in Workspace" description="Search for read references to the selected element in the workspace" category="_ZGO4aqrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_vo5Ic6xFEe2VqJFWjEAUdQ" elementId="org.eclipse.wst.jsdt.ui.correction.changeToStatic" commandName="Quick Fix - Change to static access" description="Invokes quick assist and selects 'Change to static access'" category="_vowlkaxFEe2VqJFWjEAUdQ"/>
+  <commands xmi:id="_vo5IdKxFEe2VqJFWjEAUdQ" elementId="org.eclipse.wst.validation.ValidationCommand" commandName="Validate" description="Invoke registered Validators" category="_ZGO4dKrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_vo5IdaxFEe2VqJFWjEAUdQ" elementId="org.eclipse.wst.jsdt.ui.correction.addCast" commandName="Quick Fix - Add cast" description="Invokes quick assist and selects 'Add cast'" category="_vowlkaxFEe2VqJFWjEAUdQ"/>
+  <commands xmi:id="_vo5IdqxFEe2VqJFWjEAUdQ" elementId="org.eclipse.wst.jsdt.ui.correction.addSuppressWarnings" commandName="Quick Fix - Add @SuppressWarnings" description="Invokes quick fix and selects 'Add @SuppressWarnings' " category="_vowlkaxFEe2VqJFWjEAUdQ"/>
+  <commands xmi:id="_vo5Id6xFEe2VqJFWjEAUdQ" elementId="org.eclipse.wst.jsdt.ui.edit.text.remove.occurrence.annotations" commandName="Remove Occurrence Annotations" description="Removes the occurrence annotations from the current editor" category="_vowlkaxFEe2VqJFWjEAUdQ"/>
+  <commands xmi:id="_vo5IeKxFEe2VqJFWjEAUdQ" elementId="org.eclipse.wst.xml.ui.reload.dependencies" commandName="Reload Dependencies" description="Reload Dependencies" category="_ZGO4dKrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_vo5IeaxFEe2VqJFWjEAUdQ" elementId="org.eclipse.wst.jsdt.ui.correction.addImport" commandName="Quick Fix - Add import" description="Invokes quick assist and selects 'Add import'" category="_vowlkaxFEe2VqJFWjEAUdQ"/>
+  <commands xmi:id="_vo5IeqxFEe2VqJFWjEAUdQ" elementId="org.eclipse.wst.xsd.ui.refactor.makeTypeGlobal" commandName="Make &amp;Anonymous Type Global" description="Promotes anonymous type to global level and replaces its references" category="_ZGO4VKrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_vo5Ie6xFEe2VqJFWjEAUdQ" elementId="org.eclipse.gef.zoom_in" commandName="Zoom In" description="Zoom In" category="_voxMoKxFEe2VqJFWjEAUdQ"/>
+  <commands xmi:id="_vo5IfKxFEe2VqJFWjEAUdQ" elementId="org.eclipse.wst.jsdt.ui.correction.addThrowsDecl" commandName="Quick Fix - Add throws declaration" description="Invokes quick assist and selects 'Add throws declaration'" category="_vowlkaxFEe2VqJFWjEAUdQ"/>
+  <commands xmi:id="_vo5IfaxFEe2VqJFWjEAUdQ" elementId="org.eclipse.wst.jsdt.ui.edit.text.java.toggleMarkOccurrences" commandName="Toggle Mark Occurrences" description="Toggles mark occurrences in JavaScript editors" category="_vowlkaxFEe2VqJFWjEAUdQ"/>
+  <commands xmi:id="_vo5IfqxFEe2VqJFWjEAUdQ" elementId="org.eclipse.wst.jsdt.ui.correction.assignToField.assist" commandName="Quick Assist - Assign to var" description="Invokes quick assist and selects 'Assign to var'" category="_vowlkaxFEe2VqJFWjEAUdQ"/>
+  <commands xmi:id="_vo5If6xFEe2VqJFWjEAUdQ" elementId="org.eclipse.wst.jsdt.ui.edit.text.java.search.occurrences.in.file" commandName="Search All Occurrences in File" description="Search for all occurrences of the selected element in its declaring file" category="_ZGO4aqrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_vo5IgKxFEe2VqJFWjEAUdQ" elementId="org.eclipse.wst.jsdt.ui.edit.text.java.indent" commandName="Indent Line" description="Indents the current line" category="_vowlkaxFEe2VqJFWjEAUdQ"/>
+  <commands xmi:id="_vo5IgaxFEe2VqJFWjEAUdQ" elementId="org.eclipse.wst.jsdt.ui.edit.text.java.quick.format" commandName="Format Element" description="Format enclosing text element" category="_vowlkaxFEe2VqJFWjEAUdQ"/>
+  <commands xmi:id="_vo5IgqxFEe2VqJFWjEAUdQ" elementId="org.eclipse.wst.jsdt.ui.edit.text.java.surround.with.quickMenu" commandName="Surround With Quick Menu" description="Shows the Surround With quick menu" category="_vowlkaxFEe2VqJFWjEAUdQ"/>
+  <commands xmi:id="_vo5Ig6xFEe2VqJFWjEAUdQ" elementId="org.eclipse.wst.jsdt.ui.navigate.gototype" commandName="Go to Type" description="Go to Type" category="_ZGO4WqrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_vo5IhKxFEe2VqJFWjEAUdQ" elementId="org.eclipse.wst.jsdt.ui.edit.text.java.open.type.hierarchy" commandName="Open Type Hierarchy" description="Open a type hierarchy on the selected element" category="_ZGO4WqrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_vo5IhaxFEe2VqJFWjEAUdQ" elementId="org.eclipse.wst.jsdt.ui.correction.addNonNLS" commandName="Quick Fix - Add non-NLS tag" description="Invokes quick assist and selects 'Add non-NLS tag'" category="_vowlkaxFEe2VqJFWjEAUdQ"/>
+  <commands xmi:id="_vo5IhqxFEe2VqJFWjEAUdQ" elementId="org.eclipse.wst.jsdt.ui.edit.text.java.add.block.comment" commandName="Add Block Comment" description="Enclose the selection with a block comment" category="_vowlkaxFEe2VqJFWjEAUdQ"/>
+  <commands xmi:id="_vo5Ih6xFEe2VqJFWjEAUdQ" elementId="org.eclipse.wst.xml.ui.nextSibling" commandName="Next Sibling" description="Go to Next Sibling" category="_ZGO4VKrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_vo5IiKxFEe2VqJFWjEAUdQ" elementId="org.eclipse.wst.jsdt.ui.navigate.open.type" commandName="Open Type" description="Open a type in a JavaScript editor" category="_ZGO4WqrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_vo5IiaxFEe2VqJFWjEAUdQ" elementId="org.eclipse.wst.jsdt.ui.navigate.gotopackage" commandName="Go to Folder" description="Go to Folder" category="_ZGO4WqrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_vo5IiqxFEe2VqJFWjEAUdQ" elementId="org.eclipse.wst.jsdt.ui.correction.extractConstant.assist" commandName="Quick Assist - Extract constant" description="Invokes quick assist and selects 'Extract constant'" category="_vowlkaxFEe2VqJFWjEAUdQ"/>
+  <commands xmi:id="_vo5Ii6xFEe2VqJFWjEAUdQ" elementId="sed.tabletree.collapseAll" commandName="Collapse All" category="_ZGO4dKrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_vo5IjKxFEe2VqJFWjEAUdQ" elementId="org.eclipse.wst.jsdt.ui.navigate.java.open.structure" commandName="Open Structure" description="Show the structure of the selected element" category="_ZGO4WqrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_vo5IjaxFEe2VqJFWjEAUdQ" elementId="org.eclipse.wst.jsdt.ui.edit.text.java.search.references.in.workspace" commandName="References in Workspace" description="Search for references to the selected element in the workspace" category="_ZGO4aqrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_vo5vgKxFEe2VqJFWjEAUdQ" elementId="org.eclipse.wst.jsdt.ui.edit.text.java.folding.collapseComments" commandName="Collapse Comments" description="Collapse all comments" category="_ZGO4WarbEe2-M8nuGout-A"/>
+  <commands xmi:id="_vo5vgaxFEe2VqJFWjEAUdQ" elementId="org.eclipse.wst.jsdt.ui.edit.text.java.toggle.comment" commandName="Toggle Comment" description="Toggle comment the selected lines" category="_vowlkaxFEe2VqJFWjEAUdQ"/>
+  <commands xmi:id="_vo5vgqxFEe2VqJFWjEAUdQ" elementId="org.eclipse.wst.jsdt.ui.edit.text.java.search.read.access.in.project" commandName="Read Access in Project" description="Search for read references to the selected element in the enclosing project" category="_ZGO4aqrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_vo5vg6xFEe2VqJFWjEAUdQ" elementId="org.eclipse.wst.jsdt.ui.edit.text.java.surround.with.try.catch" commandName="Surround with try/catch Block" description="Surround the selected text with a try/catch block" category="_vowlkaxFEe2VqJFWjEAUdQ"/>
+  <commands xmi:id="_vo5vhKxFEe2VqJFWjEAUdQ" elementId="org.eclipse.wst.jsdt.ui.edit.text.java.add.javadoc.comment" commandName="Add JSDoc Comment" description="Add a JSDoc comment stub to the member element" category="_vowlkaxFEe2VqJFWjEAUdQ"/>
+  <commands xmi:id="_vo5vhaxFEe2VqJFWjEAUdQ" elementId="org.eclipse.wst.jsdt.ui.generate.javadoc" commandName="Generate JSDoc" description="Generates JSDoc for a selectable set of JavaScript resources" category="_ZGO4ZqrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_vo5vhqxFEe2VqJFWjEAUdQ" elementId="org.eclipse.wst.jsdt.ui.edit.text.java.goto.matching.bracket" commandName="Go to Matching Bracket" description="Moves the cursor to the matching bracket" category="_ZGO4WqrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_vo5vh6xFEe2VqJFWjEAUdQ" elementId="org.eclipse.wst.jsdt.ui.edit.text.java.generate.constructor.using.fields" commandName="Generate Constructor using Vars" description="Choose vars to initialize and constructor from superclass to call " category="_vowlkaxFEe2VqJFWjEAUdQ"/>
+  <commands xmi:id="_vo5viKxFEe2VqJFWjEAUdQ" elementId="org.eclipse.wst.xsd.ui.refactor.rename.element" commandName="&amp;Rename XSD element" description="Rename XSD element" category="_ZGO4VKrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_vo5viaxFEe2VqJFWjEAUdQ" elementId="org.eclipse.wst.jsdt.ui.edit.text.java.search.declarations.in.workspace" commandName="Declaration in Workspace" description="Search for declarations of the selected element in the workspace" category="_ZGO4aqrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_vo5viqxFEe2VqJFWjEAUdQ" elementId="org.eclipse.wst.jsdt.ui.edit.text.java.open.super.implementation" commandName="Open Super Implementation" description="Open the Implementation in the Super Type" category="_ZGO4WqrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_vo5vi6xFEe2VqJFWjEAUdQ" elementId="org.eclipse.wst.jsdt.ui.edit.text.java.open.editor" commandName="Open Declaration" description="Open an editor on the selected element" category="_ZGO4WqrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_vo5vjKxFEe2VqJFWjEAUdQ" elementId="org.eclipse.wst.xsd.ui.refactor.makeElementGlobal" commandName="Make Local Element &amp;Global" description="Promotes local element to global level and replaces its references" category="_ZGO4VKrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_vo5vjaxFEe2VqJFWjEAUdQ" elementId="org.eclipse.wst.xml.ui.generate.xml" commandName="XML File..." description="Generate a XML file from the selected DTD or Schema" category="_ZGO4dKrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_vo5vjqxFEe2VqJFWjEAUdQ" elementId="org.eclipse.wst.jsdt.ui.correction.splitJoinVariableDeclaration.assist" commandName="Quick Assist - Split/Join variable declaration" description="Invokes quick assist and selects 'Split/Join variable declaration'" category="_vowlkaxFEe2VqJFWjEAUdQ"/>
+  <commands xmi:id="_vo5vj6xFEe2VqJFWjEAUdQ" elementId="org.eclipse.wst.jsdt.ui.correction.assignParamToField.assist" commandName="Quick Assist - Assign parameter to var" description="Invokes quick assist and selects 'Assign parameter to var'" category="_vowlkaxFEe2VqJFWjEAUdQ"/>
+  <commands xmi:id="_vo5vkKxFEe2VqJFWjEAUdQ" elementId="org.eclipse.wst.jsdt.ui.edit.text.java.copy.qualified.name" commandName="Copy Qualified Name" description="Copy a fully qualified name to the system clipboard" category="_vowlkaxFEe2VqJFWjEAUdQ"/>
+  <commands xmi:id="_vo5vkaxFEe2VqJFWjEAUdQ" elementId="org.eclipse.wst.jsdt.ui.edit.text.java.search.references.in.hierarchy" commandName="References in Hierarchy" description="Search for references of the selected element in its hierarchy" category="_ZGO4aqrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_vo5vkqxFEe2VqJFWjEAUdQ" elementId="org.eclipse.wst.jsdt.ui.edit.text.java.open.call.hierarchy" commandName="Open Call Hierarchy" description="Open a call hierarchy on the selected element" category="_ZGO4WqrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_vo5vk6xFEe2VqJFWjEAUdQ" elementId="org.eclipse.wst.jsdt.ui.edit.text.java.externalize.strings" commandName="Externalize Strings" description="Finds all strings that are not externalized and moves them into a separate property file" category="_vowlkaxFEe2VqJFWjEAUdQ"/>
+  <commands xmi:id="_vo5vlKxFEe2VqJFWjEAUdQ" elementId="sed.tabletree.expandAll" commandName="Expand All" category="_ZGO4dKrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_vo5vlaxFEe2VqJFWjEAUdQ" elementId="org.eclipse.wst.jsdt.ui.edit.text.java.open.external.javadoc" commandName="Open External JSDoc" description="Open the JSDoc of the selected element in an external browser" category="_ZGO4WqrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_vo5vlqxFEe2VqJFWjEAUdQ" elementId="org.eclipse.wst.jsdt.ui.edit.text.java.search.implement.occurrences" commandName="Search Implement Occurrences in File" description="Search for implement occurrences of a selected type" category="_ZGO4aqrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_vo5vl6xFEe2VqJFWjEAUdQ" elementId="org.eclipse.wst.xml.ui.gotoMatchingTag" commandName="Matching Tag" description="Go to Matching Tag" category="_ZGO4VKrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_vo5vmKxFEe2VqJFWjEAUdQ" elementId="org.eclipse.wst.jsdt.ui.edit.text.java.search.exception.occurrences" commandName="Search Exception Occurrences in File" description="Search for exception occurrences of a selected exception type" category="_ZGO4aqrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_vo5vmaxFEe2VqJFWjEAUdQ" elementId="org.eclipse.wst.jsdt.ui.edit.text.java.search.declarations.in.hierarchy" commandName="Declaration in Hierarchy" description="Search for declarations of the selected element in its hierarchy" category="_ZGO4aqrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_vo5vmqxFEe2VqJFWjEAUdQ" elementId="org.eclipse.wst.xml.ui.referencedFileErrors" commandName="Show Details..." description="Show Details..." category="_ZGO4dKrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_vo5vm6xFEe2VqJFWjEAUdQ" elementId="org.eclipse.wst.jsdt.ui.edit.text.java.search.implementors.in.workspace" commandName="Implementors in Workspace" description="Search for implementors of the selected interface" category="_ZGO4aqrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_vo5vnKxFEe2VqJFWjEAUdQ" elementId="org.eclipse.wst.jsdt.ui.edit.text.java.search.declarations.in.project" commandName="Declaration in Project" description="Search for declarations of the selected element in the enclosing project" category="_ZGO4aqrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_vo5vnaxFEe2VqJFWjEAUdQ" elementId="org.eclipse.gef.zoom_out" commandName="Zoom Out" description="Zoom Out" category="_voxMoKxFEe2VqJFWjEAUdQ"/>
+  <commands xmi:id="_vo5vnqxFEe2VqJFWjEAUdQ" elementId="org.eclipse.wst.jsdt.ui.edit.text.java.uncomment" commandName="Uncomment" description="Uncomment the selected JavaScript comment lines" category="_vowlkaxFEe2VqJFWjEAUdQ"/>
+  <commands xmi:id="_vo5vn6xFEe2VqJFWjEAUdQ" elementId="org.eclipse.wst.jsdt.ui.edit.text.java.search.read.access.in.working.set" commandName="Read Access in Working Set" description="Search for read references to the selected element in a working set" category="_ZGO4aqrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_vo5voKxFEe2VqJFWjEAUdQ" elementId="org.eclipse.wst.xml.ui.cmnd.contentmodel.sych" commandName="Synch" category="_ZGO4dKrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_vo5voaxFEe2VqJFWjEAUdQ" elementId="org.eclipse.wst.xsd.ui.refactor.renameTargetNamespace" commandName="Rename Target Namespace" description="Changes the target namespace of the schema" category="_ZGO4VKrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_vo5voqxFEe2VqJFWjEAUdQ" elementId="org.eclipse.wst.jsdt.ui.correction.assignToLocal.assist" commandName="Quick Assist - Assign to local variable" description="Invokes quick assist and selects 'Assign to local variable'" category="_vowlkaxFEe2VqJFWjEAUdQ"/>
+  <commands xmi:id="_vo5vo6xFEe2VqJFWjEAUdQ" elementId="org.eclipse.wst.jsdt.ui.edit.text.java.search.write.access.in.workspace" commandName="Write Access in Workspace" description="Search for write references to the selected element in the workspace" category="_ZGO4aqrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_vo5vpKxFEe2VqJFWjEAUdQ" elementId="org.eclipse.wst.jsdt.ui.edit.text.java.comment" commandName="Comment" description="Turn the selected lines into JavaScript comments" category="_vowlkaxFEe2VqJFWjEAUdQ"/>
+  <commands xmi:id="_vo5vpaxFEe2VqJFWjEAUdQ" elementId="org.eclipse.wst.jsdt.ui.navigate.open.type.in.hierarchy" commandName="Open Type in Hierarchy" description="Open a type in the type hierarchy view" category="_ZGO4WqrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_vo5vpqxFEe2VqJFWjEAUdQ" elementId="org.eclipse.wst.jsdt.ui.correction.addBlock.assist" commandName="Quick Assist - Replace statement with block" description="Invokes quick assist and selects 'Replace statement with block'" category="_vowlkaxFEe2VqJFWjEAUdQ"/>
+  <commands xmi:id="_vo5vp6xFEe2VqJFWjEAUdQ" elementId="org.eclipse.wst.jsdt.ui.edit.text.java.goto.previous.member" commandName="Go to Previous Member" description="Move the caret to the previous member of the JavaScript file" category="_ZGO4WqrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_wYQI0KxFEe2VqJFWjEAUdQ" elementId="AUTOGEN:::org.eclipse.wst.web.ui.wizardsActionSet/org.eclipse.wst.web.ui.actions.newCSSFile" commandName="CSS" description="Create a new Cascading Style Sheet" category="_ZGO4dKrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_wYRW8KxFEe2VqJFWjEAUdQ" elementId="AUTOGEN:::org.eclipse.wst.web.ui.wizardsActionSet/org.eclipse.wst.web.ui.actions.newJSFile" commandName="JavaScript" description="Create a new JavaScript file" category="_ZGO4dKrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_wYR-AKxFEe2VqJFWjEAUdQ" elementId="AUTOGEN:::org.eclipse.wst.web.ui.wizardsActionSet/org.eclipse.wst.web.ui.actions.newHTMLFile" commandName="HTML" description="Create a new HTML page" category="_ZGO4dKrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_wYTMIKxFEe2VqJFWjEAUdQ" elementId="AUTOGEN:::org.eclipse.wst.css.core.csssource.ruler.actions/org.eclipse.ui.texteditor.BookmarkRulerAction" commandName="Add Bookmark..." category="_ZGO4dKrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_wYTMIaxFEe2VqJFWjEAUdQ" elementId="AUTOGEN:::org.eclipse.wst.css.core.csssource.ruler.actions/org.eclipse.ui.texteditor.SelectRulerAction" commandName="Select Ruler" category="_ZGO4dKrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_wYTzMKxFEe2VqJFWjEAUdQ" elementId="AUTOGEN:::org.eclipse.wst.dtd.core.dtdsource.ruler.actions/org.eclipse.ui.texteditor.BookmarkRulerAction" commandName="Add Bookmark..." category="_ZGO4dKrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_wYTzMaxFEe2VqJFWjEAUdQ" elementId="AUTOGEN:::org.eclipse.wst.dtd.core.dtdsource.ruler.actions/org.eclipse.ui.texteditor.SelectRulerAction" commandName="Select Ruler" category="_ZGO4dKrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_wYUaQKxFEe2VqJFWjEAUdQ" elementId="AUTOGEN:::org.eclipse.wst.html.core.htmlsource.ruler.actions/org.eclipse.ui.texteditor.BookmarkRulerAction" commandName="Add Bookmark..." category="_ZGO4dKrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_wYUaQaxFEe2VqJFWjEAUdQ" elementId="AUTOGEN:::org.eclipse.wst.html.core.htmlsource.ruler.actions/org.eclipse.ui.texteditor.SelectRulerAction" commandName="Select Ruler" category="_ZGO4dKrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_wYUaQqxFEe2VqJFWjEAUdQ" elementId="AUTOGEN:::org.eclipse.wst.jsdt.internal.ui.CompilationUnitEditor.ruler.actions/org.eclipse.wst.jsdt.internal.ui.javaeditor.BookmarkRulerAction" commandName="JavaScript Editor Bookmark Ruler Action" category="_ZGO4dKrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_wYUaQ6xFEe2VqJFWjEAUdQ" elementId="AUTOGEN:::org.eclipse.wst.jsdt.internal.ui.CompilationUnitEditor.ruler.actions/org.eclipse.wst.jsdt.internal.ui.javaeditor.JavaSelectRulerAction" commandName="JavaScript Editor Ruler Single-Click" category="_ZGO4dKrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_wYVBUKxFEe2VqJFWjEAUdQ" elementId="AUTOGEN:::org.eclipse.wst.jsdt.internal.ui.ClassFileEditor.ruler.actions/org.eclipse.wst.jsdt.internal.ui.javaeditor.JavaSelectRulerAction" commandName="JavaScript Editor Ruler Single-Click" category="_ZGO4dKrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_wYVBUaxFEe2VqJFWjEAUdQ" elementId="AUTOGEN:::org.eclipse.wst.jsdt.internal.ui.PropertiesFileEditor.ruler.actions/org.eclipse.wst.jsdt.internal.ui.propertiesfileeditor.BookmarkRulerAction" commandName="JavaScript Editor Bookmark Ruler Action" category="_ZGO4dKrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_wYVBUqxFEe2VqJFWjEAUdQ" elementId="AUTOGEN:::org.eclipse.wst.jsdt.internal.ui.PropertiesFileEditor.ruler.actions/org.eclipse.wst.jsdt.internal.ui.propertiesfileeditor.SelectRulerAction" commandName="JavaScript Editor Ruler Single-Click" category="_ZGO4dKrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_wYVBU6xFEe2VqJFWjEAUdQ" elementId="AUTOGEN:::org.eclipse.wst.json.core.jsonsource.ruler.actions/org.eclipse.ui.texteditor.BookmarkRulerAction" commandName="%AddBookmark.label" category="_ZGO4dKrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_wYVoYKxFEe2VqJFWjEAUdQ" elementId="AUTOGEN:::org.eclipse.wst.json.core.jsonsource.ruler.actions/org.eclipse.ui.texteditor.SelectRulerAction" commandName="%SelectRuler.label" category="_ZGO4dKrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_wYVoYaxFEe2VqJFWjEAUdQ" elementId="AUTOGEN:::org.eclipse.core.runtime.xml.source.ruler.actions/org.eclipse.ui.texteditor.BookmarkRulerAction" commandName="Add Bookmark..." category="_ZGO4dKrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_wYVoYqxFEe2VqJFWjEAUdQ" elementId="AUTOGEN:::org.eclipse.core.runtime.xml.source.ruler.actions/org.eclipse.ui.texteditor.SelectRulerAction" commandName="Select Ruler" category="_ZGO4dKrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_wYVoY6xFEe2VqJFWjEAUdQ" elementId="AUTOGEN:::org.eclipse.wst.xsd.core.xsdsource.ruler.actions/org.eclipse.ui.texteditor.BookmarkRulerAction" commandName="Add Bookmark..." category="_ZGO4dKrbEe2-M8nuGout-A"/>
+  <commands xmi:id="_wYWPcKxFEe2VqJFWjEAUdQ" elementId="AUTOGEN:::org.eclipse.wst.xsd.core.xsdsource.ruler.actions/org.eclipse.ui.texteditor.SelectRulerAction" commandName="Select Ruler" category="_ZGO4dKrbEe2-M8nuGout-A"/>
+  <addons xmi:id="_ZFeDXarbEe2-M8nuGout-A" elementId="org.eclipse.e4.core.commands.service" contributorURI="platform:/plugin/org.eclipse.platform" contributionURI="bundleclass://org.eclipse.e4.core.commands/org.eclipse.e4.core.commands.CommandServiceAddon"/>
+  <addons xmi:id="_ZFeDXqrbEe2-M8nuGout-A" elementId="org.eclipse.e4.ui.contexts.service" contributorURI="platform:/plugin/org.eclipse.platform" contributionURI="bundleclass://org.eclipse.e4.ui.services/org.eclipse.e4.ui.services.ContextServiceAddon"/>
+  <addons xmi:id="_ZFeDX6rbEe2-M8nuGout-A" elementId="org.eclipse.e4.ui.bindings.service" contributorURI="platform:/plugin/org.eclipse.platform" contributionURI="bundleclass://org.eclipse.e4.ui.bindings/org.eclipse.e4.ui.bindings.BindingServiceAddon"/>
+  <addons xmi:id="_ZFeDYKrbEe2-M8nuGout-A" elementId="org.eclipse.e4.ui.workbench.commands.model" contributorURI="platform:/plugin/org.eclipse.platform" contributionURI="bundleclass://org.eclipse.e4.ui.workbench/org.eclipse.e4.ui.internal.workbench.addons.CommandProcessingAddon"/>
+  <addons xmi:id="_ZFeDYarbEe2-M8nuGout-A" elementId="org.eclipse.e4.ui.workbench.contexts.model" contributorURI="platform:/plugin/org.eclipse.platform" contributionURI="bundleclass://org.eclipse.e4.ui.workbench/org.eclipse.e4.ui.internal.workbench.addons.ContextProcessingAddon"/>
+  <addons xmi:id="_ZFeDYqrbEe2-M8nuGout-A" elementId="org.eclipse.e4.ui.workbench.bindings.model" contributorURI="platform:/plugin/org.eclipse.platform" contributionURI="bundleclass://org.eclipse.e4.ui.workbench.swt/org.eclipse.e4.ui.workbench.swt.util.BindingProcessingAddon"/>
+  <addons xmi:id="_ZFeDY6rbEe2-M8nuGout-A" elementId="Cleanup Addon" contributorURI="platform:/plugin/org.eclipse.platform" contributionURI="bundleclass://org.eclipse.e4.ui.workbench.addons.swt/org.eclipse.e4.ui.workbench.addons.cleanupaddon.CleanupAddon"/>
+  <addons xmi:id="_ZFeDZKrbEe2-M8nuGout-A" elementId="DnD Addon" contributorURI="platform:/plugin/org.eclipse.platform" contributionURI="bundleclass://org.eclipse.e4.ui.workbench.addons.swt/org.eclipse.e4.ui.workbench.addons.dndaddon.DnDAddon"/>
+  <addons xmi:id="_ZFeDZarbEe2-M8nuGout-A" elementId="MinMax Addon" contributorURI="platform:/plugin/org.eclipse.platform" contributionURI="bundleclass://org.eclipse.e4.ui.workbench.addons.swt/org.eclipse.e4.ui.workbench.addons.minmax.MinMaxAddon"/>
+  <addons xmi:id="_ZFeDZqrbEe2-M8nuGout-A" elementId="org.eclipse.ui.workbench.addon.0" contributorURI="platform:/plugin/org.eclipse.platform" contributionURI="bundleclass://org.eclipse.e4.ui.workbench/org.eclipse.e4.ui.internal.workbench.addons.HandlerProcessingAddon"/>
+  <addons xmi:id="_ZFq3oKrbEe2-M8nuGout-A" elementId="SplitterAddon" contributionURI="bundleclass://org.eclipse.e4.ui.workbench.addons.swt/org.eclipse.e4.ui.workbench.addons.splitteraddon.SplitterAddon"/>
+  <addons xmi:id="_ZxJpULmcEe2PhdbZsFs5Qw" elementId="org.eclipse.ui.ide.addon.0" contributionURI="bundleclass://org.eclipse.ui.ide/org.eclipse.ui.internal.ide.addons.SaveAllDirtyPartsAddon"/>
+  <addons xmi:id="_dz0JgGOlEeSMMaPQU2nlzw" elementId="org.eclipse.ui.ide.application.addon.0" contributorURI="platform:/plugin/org.eclipse.ui.ide.application" contributionURI="bundleclass://org.eclipse.ui.ide.application/org.eclipse.ui.internal.ide.application.addons.ModelCleanupAddon"/>
+  <categories xmi:id="_ZGO4UKrbEe2-M8nuGout-A" elementId="org.eclipse.team.ui.category.team" name="Version control (Team)" description="Actions that apply when working with a version control system"/>
+  <categories xmi:id="_ZGO4UarbEe2-M8nuGout-A" elementId="org.eclipse.ui.category.views" name="Views" description="Commands for opening views"/>
+  <categories xmi:id="_ZGO4UqrbEe2-M8nuGout-A" elementId="org.springframework.tooling.ls.eclipse.gotosymbol.commands.category" name="STS4"/>
+  <categories xmi:id="_ZGO4U6rbEe2-M8nuGout-A" elementId="org.eclipse.tm4e.languageconfiguration.category" name="TM4E Language Configuration"/>
+  <categories xmi:id="_ZGO4VKrbEe2-M8nuGout-A" elementId="org.eclipse.ui.category.edit" name="Edit"/>
+  <categories xmi:id="_ZGO4VarbEe2-M8nuGout-A" elementId="org.springframework.ide.eclipse.boot.commands.category" name="Spring Boot"/>
+  <categories xmi:id="_ZGO4VqrbEe2-M8nuGout-A" elementId="org.eclipse.mylyn.wikitext.ui.editor.category" name="WikiText Markup Editing Commands" description="commands for editing lightweight markup"/>
+  <categories xmi:id="_ZGO4V6rbEe2-M8nuGout-A" elementId="org.eclipse.buildship.ui.project" name="Buildship" description="Contains the Buildship specific commands"/>
+  <categories xmi:id="_ZGO4WKrbEe2-M8nuGout-A" elementId="org.eclipse.ui.ide.markerContents" name="Contents" description="The category for menu contents"/>
+  <categories xmi:id="_ZGO4WarbEe2-M8nuGout-A" elementId="org.eclipse.ui.category.textEditor" name="Text Editing" description="Text Editing Commands"/>
+  <categories xmi:id="_ZGO4WqrbEe2-M8nuGout-A" elementId="org.eclipse.ui.category.navigate" name="Navigate"/>
+  <categories xmi:id="_ZGO4W6rbEe2-M8nuGout-A" elementId="AnsiConsole.command.categoryid" name="ANSI Support Commands"/>
+  <categories xmi:id="_ZGO4XKrbEe2-M8nuGout-A" elementId="org.eclipse.wst.server.ui" name="Server" description="Server"/>
+  <categories xmi:id="_ZGO4XarbEe2-M8nuGout-A" elementId="org.eclipse.lsp4e.category" name="Language Servers"/>
+  <categories xmi:id="_ZGO4XqrbEe2-M8nuGout-A" elementId="org.eclipse.ui.category.file" name="File"/>
+  <categories xmi:id="_ZGO4X6rbEe2-M8nuGout-A" elementId="org.eclipse.tm.terminal.view.ui.commands.category" name="Terminal Commands"/>
+  <categories xmi:id="_ZGO4YKrbEe2-M8nuGout-A" elementId="org.eclipse.compare.ui.category.compare" name="Compare" description="Compare command category"/>
+  <categories xmi:id="_ZGO4YarbEe2-M8nuGout-A" elementId="org.eclipse.text.quicksearch.commands.category" name="Quick Search"/>
+  <categories xmi:id="_ZGO4YqrbEe2-M8nuGout-A" elementId="org.eclipse.ui.category.window" name="Window"/>
+  <categories xmi:id="_ZGO4Y6rbEe2-M8nuGout-A" elementId="org.eclipse.jdt.ui.category.refactoring" name="Refactor - Java" description="Java Refactoring Actions"/>
+  <categories xmi:id="_ZGO4ZKrbEe2-M8nuGout-A" elementId="org.eclipse.ui.category.help" name="Help"/>
+  <categories xmi:id="_ZGO4ZarbEe2-M8nuGout-A" elementId="org.springframework.ide.eclipse.commands" name="Spring Generic Text Editor" description="Spring Language Server Commands"/>
+  <categories xmi:id="_ZGO4ZqrbEe2-M8nuGout-A" elementId="org.eclipse.ui.category.project" name="Project"/>
+  <categories xmi:id="_ZGO4Z6rbEe2-M8nuGout-A" elementId="org.springsource.ide.eclipse.common.ui.commands" name="SpringSource Tools"/>
+  <categories xmi:id="_ZGO4aKrbEe2-M8nuGout-A" elementId="org.eclipse.pde.genericeditor.extension.category.source" name="Target Definition Source" description="Target Definition Source Page actions"/>
+  <categories xmi:id="_ZGO4aarbEe2-M8nuGout-A" elementId="org.eclipse.tm.terminal.category1" name="Terminal view commands" description="Terminal view commands"/>
+  <categories xmi:id="_ZGO4aqrbEe2-M8nuGout-A" elementId="org.eclipse.search.ui.category.search" name="Search" description="Search command category"/>
+  <categories xmi:id="_ZGO4a6rbEe2-M8nuGout-A" elementId="org.eclipse.debug.ui.category.run" name="Run/Debug" description="Run/Debug command category"/>
+  <categories xmi:id="_ZGO4bKrbEe2-M8nuGout-A" elementId="org.eclipse.ui.category.dialogs" name="Dialogs" description="Commands for opening dialogs"/>
+  <categories xmi:id="_ZGO4barbEe2-M8nuGout-A" elementId="org.eclipse.egit.ui.commandCategory" name="Git"/>
+  <categories xmi:id="_ZGO4bqrbEe2-M8nuGout-A" elementId="org.eclipse.ui.category.perspectives" name="Perspectives" description="Commands for opening perspectives"/>
+  <categories xmi:id="_ZGO4b6rbEe2-M8nuGout-A" elementId="org.eclipse.ltk.ui.category.refactoring" name="Refactoring"/>
+  <categories xmi:id="_ZGO4cKrbEe2-M8nuGout-A" elementId="org.eclipse.lsp4e.commandCategory" name="Command"/>
+  <categories xmi:id="_ZGO4carbEe2-M8nuGout-A" elementId="org.eclipse.jdt.ui.category.source" name="Source" description="Java Source Actions"/>
+  <categories xmi:id="_ZGO4cqrbEe2-M8nuGout-A" elementId="org.eclipse.pde.runtime.spy.commands.category" name="Spy"/>
+  <categories xmi:id="_ZGO4c6rbEe2-M8nuGout-A" elementId="org.eclipse.pde.ui.category.source" name="Manifest Editor Source" description="PDE Source Page actions"/>
+  <categories xmi:id="_ZGO4dKrbEe2-M8nuGout-A" elementId="org.eclipse.core.commands.categories.autogenerated" name="Uncategorized" description="Commands that were either auto-generated or have no category"/>
+  <categories xmi:id="_ZGO4darbEe2-M8nuGout-A" elementId="com.genuitec.eclipse.inlinesearch.commands.category" name="Inline Search"/>
+  <categories xmi:id="_vowlkaxFEe2VqJFWjEAUdQ" elementId="org.eclipse.wst.jsdt.ui.category.source" name="Source" description="JavaScript Source Actions"/>
+  <categories xmi:id="_voxMoKxFEe2VqJFWjEAUdQ" elementId="org.eclipse.gef.category.view" name="View" description="View"/>
 </application:Application>
diff --git a/.metadata/.plugins/org.eclipse.jdt.core/1865797976.index b/.metadata/.plugins/org.eclipse.jdt.core/1865797976.index
index 1c6f5068..d0016cc3 100644
Binary files a/.metadata/.plugins/org.eclipse.jdt.core/1865797976.index and b/.metadata/.plugins/org.eclipse.jdt.core/1865797976.index differ
diff --git a/.metadata/.plugins/org.eclipse.jdt.core/2740986887.index b/.metadata/.plugins/org.eclipse.jdt.core/2740986887.index
index 246891d4..c6e35107 100644
Binary files a/.metadata/.plugins/org.eclipse.jdt.core/2740986887.index and b/.metadata/.plugins/org.eclipse.jdt.core/2740986887.index differ
diff --git a/.metadata/.plugins/org.eclipse.jdt.core/740010317.index b/.metadata/.plugins/org.eclipse.jdt.core/740010317.index
index 4339c61c..4ddccfe2 100644
Binary files a/.metadata/.plugins/org.eclipse.jdt.core/740010317.index and b/.metadata/.plugins/org.eclipse.jdt.core/740010317.index differ
diff --git a/.metadata/.plugins/org.eclipse.jdt.ui/QualifiedTypeNameHistory.xml b/.metadata/.plugins/org.eclipse.jdt.ui/QualifiedTypeNameHistory.xml
index 9b54cb9f..001a8e92 100644
--- a/.metadata/.plugins/org.eclipse.jdt.ui/QualifiedTypeNameHistory.xml
+++ b/.metadata/.plugins/org.eclipse.jdt.ui/QualifiedTypeNameHistory.xml
@@ -1,16 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <qualifiedTypeNameHistroy>
-    <fullyQualifiedTypeName name="java.util.Date"/>
-    <fullyQualifiedTypeName name="org.supercsv.io.ICsvBeanWriter"/>
-    <fullyQualifiedTypeName name="org.supercsv.io.CsvBeanWriter"/>
-    <fullyQualifiedTypeName name="org.supercsv.prefs.CsvPreference"/>
-    <fullyQualifiedTypeName name="org.springframework.data.domain.Sort"/>
-    <fullyQualifiedTypeName name="jakarta.persistence.Transient"/>
-    <fullyQualifiedTypeName name="org.aspectj.weaver.ast.And"/>
-    <fullyQualifiedTypeName name="org.springframework.security.config.annotation.web.configuration.WebSecurityConfiguration"/>
-    <fullyQualifiedTypeName name="org.springframework.security.config.annotation.web.configuration.WebSecurityCustomizer"/>
-    <fullyQualifiedTypeName name="org.springframework.security.core.userdetails.UserDetails"/>
-    <fullyQualifiedTypeName name="com.shopme.common.entity.Role"/>
     <fullyQualifiedTypeName name="org.springframework.security.core.authority.SimpleGrantedAuthority"/>
     <fullyQualifiedTypeName name="org.springframework.security.core.userdetails.UsernameNotFoundException"/>
     <fullyQualifiedTypeName name="org.springframework.context.annotation.Bean"/>
@@ -24,13 +13,10 @@
     <fullyQualifiedTypeName name="java.security.Provider.Service"/>
     <fullyQualifiedTypeName name="com.shopme.admin.user.UserService"/>
     <fullyQualifiedTypeName name="com.shopme.common.entity.User"/>
-    <fullyQualifiedTypeName name="org.springframework.data.repository.support.Repositories"/>
     <fullyQualifiedTypeName name="org.springframework.security.core.annotation.AuthenticationPrincipal"/>
     <fullyQualifiedTypeName name="com.shopme.admin.security.ShopmeUserDetails"/>
     <fullyQualifiedTypeName name="javax.swing.text.ChangedCharSetException"/>
     <fullyQualifiedTypeName name="org.slf4j.LoggerFactory"/>
-    <fullyQualifiedTypeName name="com.shopme.admin.FileUploadUtil"/>
-    <fullyQualifiedTypeName name="java.lang.Integer"/>
     <fullyQualifiedTypeName name="java.util.HashSet"/>
     <fullyQualifiedTypeName name="jakarta.persistence.Entity"/>
     <fullyQualifiedTypeName name="jakarta.persistence.Table"/>
@@ -45,19 +31,33 @@
     <fullyQualifiedTypeName name="org.springframework.boot.test.autoconfigure.jdbc.AutoConfigureTestDatabase"/>
     <fullyQualifiedTypeName name="org.springframework.boot.test.autoconfigure.jdbc.AutoConfigureTestDatabase.Replace"/>
     <fullyQualifiedTypeName name="org.springframework.test.annotation.Rollback"/>
-    <fullyQualifiedTypeName name="org.junit.jupiter.api.Test"/>
     <fullyQualifiedTypeName name="org.hibernate.internal.build.AllowSysOut"/>
-    <fullyQualifiedTypeName name="java.util.Set"/>
     <fullyQualifiedTypeName name="org.springframework.stereotype.Service"/>
     <fullyQualifiedTypeName name="com.shopme.admin.category.CategoryRepository"/>
     <fullyQualifiedTypeName name="org.springframework.stereotype.Controller"/>
     <fullyQualifiedTypeName name="org.springframework.beans.factory.annotation.Autowired"/>
     <fullyQualifiedTypeName name="com.shopme.admin.category.CategoryService"/>
-    <fullyQualifiedTypeName name="org.springframework.web.bind.annotation.GetMapping"/>
     <fullyQualifiedTypeName name="org.springframework.ui.Model"/>
-    <fullyQualifiedTypeName name="java.util.List"/>
     <fullyQualifiedTypeName name="java.util.ArrayList"/>
     <fullyQualifiedTypeName name="java.lang.Iterable"/>
+    <fullyQualifiedTypeName name="org.springframework.web.bind.annotation.PostMapping"/>
+    <fullyQualifiedTypeName name="org.springframework.scheduling.support.SimpleTriggerContext"/>
+    <fullyQualifiedTypeName name="org.springframework.web.bind.annotation.ModelAttribute"/>
+    <fullyQualifiedTypeName name="org.springframework.web.bind.annotation.RequestParam"/>
+    <fullyQualifiedTypeName name="org.springframework.web.multipart.MultipartFile"/>
+    <fullyQualifiedTypeName name="org.springframework.util.StringUtils"/>
+    <fullyQualifiedTypeName name="org.springframework.web.servlet.mvc.support.RedirectAttributes"/>
+    <fullyQualifiedTypeName name="org.springframework.data.jpa.repository.Query"/>
+    <fullyQualifiedTypeName name="org.junit.jupiter.api.Test"/>
+    <fullyQualifiedTypeName name="java.util.List"/>
+    <fullyQualifiedTypeName name="java.util.Set"/>
+    <fullyQualifiedTypeName name="jakarta.persistence.Transient"/>
+    <fullyQualifiedTypeName name="org.springframework.data.repository.support.Repositories"/>
     <fullyQualifiedTypeName name="com.shopme.common.entity.Category"/>
+    <fullyQualifiedTypeName name="java.lang.Integer"/>
+    <fullyQualifiedTypeName name="java.util.NoSuchElementException"/>
+    <fullyQualifiedTypeName name="org.springframework.web.bind.annotation.GetMapping"/>
     <fullyQualifiedTypeName name="java.lang.String"/>
+    <fullyQualifiedTypeName name="org.springframework.web.bind.annotation.PathVariable"/>
+    <fullyQualifiedTypeName name="com.shopme.admin.FileUploadUtil"/>
 </qualifiedTypeNameHistroy>
diff --git a/.metadata/.plugins/org.eclipse.jdt.ui/dialog_settings.xml b/.metadata/.plugins/org.eclipse.jdt.ui/dialog_settings.xml
index ff5d19b8..025e0458 100644
--- a/.metadata/.plugins/org.eclipse.jdt.ui/dialog_settings.xml
+++ b/.metadata/.plugins/org.eclipse.jdt.ui/dialog_settings.xml
@@ -181,4 +181,6 @@
 	<section name="BuildPathsPropertyPage">
 		<item key="pageIndex" value="3"/>
 	</section>
+	<section name="RenameInformationPopup">
+	</section>
 </section>
diff --git a/.metadata/.plugins/org.eclipse.jdt.ui/jdt-images/0.png b/.metadata/.plugins/org.eclipse.jdt.ui/jdt-images/0.png
deleted file mode 100644
index 1f627fae..00000000
Binary files a/.metadata/.plugins/org.eclipse.jdt.ui/jdt-images/0.png and /dev/null differ
diff --git a/.metadata/.plugins/org.eclipse.jdt.ui/jdt-images/1.png b/.metadata/.plugins/org.eclipse.jdt.ui/jdt-images/1.png
deleted file mode 100644
index 697278b8..00000000
Binary files a/.metadata/.plugins/org.eclipse.jdt.ui/jdt-images/1.png and /dev/null differ
diff --git a/.metadata/.plugins/org.eclipse.jdt.ui/jdt-images/10.png b/.metadata/.plugins/org.eclipse.jdt.ui/jdt-images/10.png
deleted file mode 100644
index c1e0d7d6..00000000
Binary files a/.metadata/.plugins/org.eclipse.jdt.ui/jdt-images/10.png and /dev/null differ
diff --git a/.metadata/.plugins/org.eclipse.jdt.ui/jdt-images/11.png b/.metadata/.plugins/org.eclipse.jdt.ui/jdt-images/11.png
deleted file mode 100644
index ffc18f4c..00000000
Binary files a/.metadata/.plugins/org.eclipse.jdt.ui/jdt-images/11.png and /dev/null differ
diff --git a/.metadata/.plugins/org.eclipse.jdt.ui/jdt-images/12.png b/.metadata/.plugins/org.eclipse.jdt.ui/jdt-images/12.png
deleted file mode 100644
index bc9ec45f..00000000
Binary files a/.metadata/.plugins/org.eclipse.jdt.ui/jdt-images/12.png and /dev/null differ
diff --git a/.metadata/.plugins/org.eclipse.jdt.ui/jdt-images/2.png b/.metadata/.plugins/org.eclipse.jdt.ui/jdt-images/2.png
deleted file mode 100644
index 4d0a2c0e..00000000
Binary files a/.metadata/.plugins/org.eclipse.jdt.ui/jdt-images/2.png and /dev/null differ
diff --git a/.metadata/.plugins/org.eclipse.jdt.ui/jdt-images/3.png b/.metadata/.plugins/org.eclipse.jdt.ui/jdt-images/3.png
deleted file mode 100644
index c1e0d7d6..00000000
Binary files a/.metadata/.plugins/org.eclipse.jdt.ui/jdt-images/3.png and /dev/null differ
diff --git a/.metadata/.plugins/org.eclipse.jdt.ui/jdt-images/4.png b/.metadata/.plugins/org.eclipse.jdt.ui/jdt-images/4.png
deleted file mode 100644
index a2afc02b..00000000
Binary files a/.metadata/.plugins/org.eclipse.jdt.ui/jdt-images/4.png and /dev/null differ
diff --git a/.metadata/.plugins/org.eclipse.jdt.ui/jdt-images/5.png b/.metadata/.plugins/org.eclipse.jdt.ui/jdt-images/5.png
deleted file mode 100644
index 2a4f1a7f..00000000
Binary files a/.metadata/.plugins/org.eclipse.jdt.ui/jdt-images/5.png and /dev/null differ
diff --git a/.metadata/.plugins/org.eclipse.jdt.ui/jdt-images/6.png b/.metadata/.plugins/org.eclipse.jdt.ui/jdt-images/6.png
deleted file mode 100644
index 57dd43cb..00000000
Binary files a/.metadata/.plugins/org.eclipse.jdt.ui/jdt-images/6.png and /dev/null differ
diff --git a/.metadata/.plugins/org.eclipse.jdt.ui/jdt-images/7.png b/.metadata/.plugins/org.eclipse.jdt.ui/jdt-images/7.png
deleted file mode 100644
index fd754724..00000000
Binary files a/.metadata/.plugins/org.eclipse.jdt.ui/jdt-images/7.png and /dev/null differ
diff --git a/.metadata/.plugins/org.eclipse.jdt.ui/jdt-images/8.png b/.metadata/.plugins/org.eclipse.jdt.ui/jdt-images/8.png
deleted file mode 100644
index 0cdcd102..00000000
Binary files a/.metadata/.plugins/org.eclipse.jdt.ui/jdt-images/8.png and /dev/null differ
diff --git a/.metadata/.plugins/org.eclipse.jdt.ui/jdt-images/9.png b/.metadata/.plugins/org.eclipse.jdt.ui/jdt-images/9.png
deleted file mode 100644
index fbcb1225..00000000
Binary files a/.metadata/.plugins/org.eclipse.jdt.ui/jdt-images/9.png and /dev/null differ
diff --git a/.metadata/.plugins/org.eclipse.m2e.logback/0.log b/.metadata/.plugins/org.eclipse.m2e.logback/0.log
index 64c6e3c7..cc0df358 100644
--- a/.metadata/.plugins/org.eclipse.m2e.logback/0.log
+++ b/.metadata/.plugins/org.eclipse.m2e.logback/0.log
@@ -8713,3 +8713,167 @@ org.eclipse.core.runtime.CoreException: Could not resolve artifact org.apache.po
 2023-03-02 18:21:47,141 [Worker-110: Building] INFO  o.a.m.s.f.DefaultMavenResourcesFiltering - Copying 1 resource
 2023-03-02 18:21:47,152 [Worker-110: Building] INFO  o.a.m.s.f.DefaultMavenResourcesFiltering - Copying 29 resources
 2023-03-02 18:21:47,165 [Worker-110: Building] INFO  o.a.m.s.f.DefaultMavenResourcesFiltering - skip non existing resourceDirectory C:\Users\User\Desktop\ShopmeEcommerce\ShopmeProject\ShopmeWebParent\ShopmeBackEnd\src\test\resources
+2023-03-02 20:56:42,149 [Worker-121: Building] INFO  o.a.m.s.f.DefaultMavenResourcesFiltering - Copying 1 resource
+2023-03-02 20:56:42,190 [Worker-121: Building] INFO  o.a.m.s.f.DefaultMavenResourcesFiltering - Copying 29 resources
+2023-03-02 20:56:42,204 [Worker-121: Building] INFO  o.a.m.s.f.DefaultMavenResourcesFiltering - skip non existing resourceDirectory C:\Users\User\Desktop\ShopmeEcommerce\ShopmeProject\ShopmeWebParent\ShopmeBackEnd\src\test\resources
+2023-03-02 20:56:47,160 [Worker-119: Building] INFO  o.a.m.s.f.DefaultMavenResourcesFiltering - Copying 1 resource
+2023-03-02 20:56:47,183 [Worker-119: Building] INFO  o.a.m.s.f.DefaultMavenResourcesFiltering - Copying 29 resources
+2023-03-02 20:56:47,196 [Worker-119: Building] INFO  o.a.m.s.f.DefaultMavenResourcesFiltering - skip non existing resourceDirectory C:\Users\User\Desktop\ShopmeEcommerce\ShopmeProject\ShopmeWebParent\ShopmeBackEnd\src\test\resources
+2023-03-02 20:56:51,942 [Worker-122: Building] INFO  o.a.m.s.f.DefaultMavenResourcesFiltering - Copying 1 resource
+2023-03-02 20:56:51,971 [Worker-122: Building] INFO  o.a.m.s.f.DefaultMavenResourcesFiltering - Copying 29 resources
+2023-03-02 20:56:51,985 [Worker-122: Building] INFO  o.a.m.s.f.DefaultMavenResourcesFiltering - skip non existing resourceDirectory C:\Users\User\Desktop\ShopmeEcommerce\ShopmeProject\ShopmeWebParent\ShopmeBackEnd\src\test\resources
+2023-03-02 20:56:55,232 [Worker-122: Building] INFO  o.a.m.s.f.DefaultMavenResourcesFiltering - Copying 1 resource
+2023-03-02 20:56:55,254 [Worker-122: Building] INFO  o.a.m.s.f.DefaultMavenResourcesFiltering - Copying 29 resources
+2023-03-02 20:56:55,270 [Worker-122: Building] INFO  o.a.m.s.f.DefaultMavenResourcesFiltering - skip non existing resourceDirectory C:\Users\User\Desktop\ShopmeEcommerce\ShopmeProject\ShopmeWebParent\ShopmeBackEnd\src\test\resources
+2023-03-02 22:59:50,784 [Worker-127: Building] INFO  o.a.m.s.f.DefaultMavenResourcesFiltering - Copying 1 resource
+2023-03-02 22:59:50,849 [Worker-127: Building] INFO  o.a.m.s.f.DefaultMavenResourcesFiltering - Copying 29 resources
+2023-03-02 22:59:50,863 [Worker-127: Building] INFO  o.a.m.s.f.DefaultMavenResourcesFiltering - skip non existing resourceDirectory C:\Users\User\Desktop\ShopmeEcommerce\ShopmeProject\ShopmeWebParent\ShopmeBackEnd\src\test\resources
+2023-03-02 23:00:01,440 [Worker-121: Building] INFO  o.a.m.s.f.DefaultMavenResourcesFiltering - Copying 1 resource
+2023-03-02 23:00:01,469 [Worker-121: Building] INFO  o.a.m.s.f.DefaultMavenResourcesFiltering - Copying 29 resources
+2023-03-02 23:00:01,484 [Worker-121: Building] INFO  o.a.m.s.f.DefaultMavenResourcesFiltering - skip non existing resourceDirectory C:\Users\User\Desktop\ShopmeEcommerce\ShopmeProject\ShopmeWebParent\ShopmeBackEnd\src\test\resources
+2023-03-02 23:00:22,528 [Worker-126: Building] INFO  o.a.m.s.f.DefaultMavenResourcesFiltering - Copying 1 resource
+2023-03-02 23:00:22,555 [Worker-126: Building] INFO  o.a.m.s.f.DefaultMavenResourcesFiltering - Copying 29 resources
+2023-03-02 23:00:22,568 [Worker-126: Building] INFO  o.a.m.s.f.DefaultMavenResourcesFiltering - skip non existing resourceDirectory C:\Users\User\Desktop\ShopmeEcommerce\ShopmeProject\ShopmeWebParent\ShopmeBackEnd\src\test\resources
+2023-03-02 23:00:43,385 [Worker-127: Building] INFO  o.a.m.s.f.DefaultMavenResourcesFiltering - Copying 1 resource
+2023-03-02 23:00:43,457 [Worker-127: Building] INFO  o.a.m.s.f.DefaultMavenResourcesFiltering - Copying 29 resources
+2023-03-02 23:00:43,471 [Worker-127: Building] INFO  o.a.m.s.f.DefaultMavenResourcesFiltering - skip non existing resourceDirectory C:\Users\User\Desktop\ShopmeEcommerce\ShopmeProject\ShopmeWebParent\ShopmeBackEnd\src\test\resources
+2023-03-02 23:01:16,357 [Worker-121: Building] INFO  o.a.m.s.f.DefaultMavenResourcesFiltering - Copying 1 resource
+2023-03-02 23:01:16,382 [Worker-121: Building] INFO  o.a.m.s.f.DefaultMavenResourcesFiltering - Copying 29 resources
+2023-03-02 23:01:16,396 [Worker-121: Building] INFO  o.a.m.s.f.DefaultMavenResourcesFiltering - skip non existing resourceDirectory C:\Users\User\Desktop\ShopmeEcommerce\ShopmeProject\ShopmeWebParent\ShopmeBackEnd\src\test\resources
+2023-03-02 23:01:43,382 [Worker-127: Building] INFO  o.a.m.s.f.DefaultMavenResourcesFiltering - Copying 1 resource
+2023-03-02 23:01:43,393 [Worker-127: Building] INFO  o.a.m.s.f.DefaultMavenResourcesFiltering - Copying 29 resources
+2023-03-02 23:01:43,411 [Worker-127: Building] INFO  o.a.m.s.f.DefaultMavenResourcesFiltering - skip non existing resourceDirectory C:\Users\User\Desktop\ShopmeEcommerce\ShopmeProject\ShopmeWebParent\ShopmeBackEnd\src\test\resources
+2023-03-02 23:02:06,100 [Worker-128: Building] INFO  o.a.m.s.f.DefaultMavenResourcesFiltering - Copying 1 resource
+2023-03-02 23:02:06,114 [Worker-128: Building] INFO  o.a.m.s.f.DefaultMavenResourcesFiltering - Copying 29 resources
+2023-03-02 23:02:06,128 [Worker-128: Building] INFO  o.a.m.s.f.DefaultMavenResourcesFiltering - skip non existing resourceDirectory C:\Users\User\Desktop\ShopmeEcommerce\ShopmeProject\ShopmeWebParent\ShopmeBackEnd\src\test\resources
+2023-03-02 23:02:17,398 [Worker-127: Building] INFO  o.a.m.s.f.DefaultMavenResourcesFiltering - Copying 1 resource
+2023-03-02 23:02:17,408 [Worker-127: Building] INFO  o.a.m.s.f.DefaultMavenResourcesFiltering - Copying 29 resources
+2023-03-02 23:02:17,423 [Worker-127: Building] INFO  o.a.m.s.f.DefaultMavenResourcesFiltering - skip non existing resourceDirectory C:\Users\User\Desktop\ShopmeEcommerce\ShopmeProject\ShopmeWebParent\ShopmeBackEnd\src\test\resources
+2023-03-02 23:02:46,114 [Worker-122: Building] INFO  o.a.m.s.f.DefaultMavenResourcesFiltering - Copying 1 resource
+2023-03-02 23:02:46,125 [Worker-122: Building] INFO  o.a.m.s.f.DefaultMavenResourcesFiltering - Copying 29 resources
+2023-03-02 23:02:46,142 [Worker-122: Building] INFO  o.a.m.s.f.DefaultMavenResourcesFiltering - skip non existing resourceDirectory C:\Users\User\Desktop\ShopmeEcommerce\ShopmeProject\ShopmeWebParent\ShopmeBackEnd\src\test\resources
+2023-03-02 23:03:40,404 [Worker-128: Building] INFO  o.a.m.s.f.DefaultMavenResourcesFiltering - Copying 1 resource
+2023-03-02 23:03:40,416 [Worker-128: Building] INFO  o.a.m.s.f.DefaultMavenResourcesFiltering - Copying 29 resources
+2023-03-02 23:03:40,434 [Worker-128: Building] INFO  o.a.m.s.f.DefaultMavenResourcesFiltering - skip non existing resourceDirectory C:\Users\User\Desktop\ShopmeEcommerce\ShopmeProject\ShopmeWebParent\ShopmeBackEnd\src\test\resources
+2023-03-02 23:06:02,647 [Worker-121: Building] INFO  o.a.m.s.f.DefaultMavenResourcesFiltering - Copying 1 resource
+2023-03-02 23:06:02,654 [Worker-121: Building] INFO  o.a.m.s.f.DefaultMavenResourcesFiltering - Copying 0 resource
+2023-03-02 23:06:02,656 [Worker-121: Building] INFO  o.a.m.s.f.DefaultMavenResourcesFiltering - skip non existing resourceDirectory C:\Users\User\Desktop\ShopmeEcommerce\ShopmeProject\ShopmeCommon\src\test\resources
+2023-03-02 23:07:38,093 [Worker-128: Building] INFO  o.a.m.s.f.DefaultMavenResourcesFiltering - Copying 0 resource
+2023-03-02 23:07:38,093 [Worker-128: Building] INFO  o.a.m.s.f.DefaultMavenResourcesFiltering - Copying 1 resource
+2023-03-02 23:07:38,097 [Worker-128: Building] INFO  o.a.m.s.f.DefaultMavenResourcesFiltering - skip non existing resourceDirectory C:\Users\User\Desktop\ShopmeEcommerce\ShopmeProject\ShopmeWebParent\ShopmeBackEnd\src\test\resources
+2023-03-02 23:08:06,187 [Worker-129: Building] INFO  o.a.m.s.f.DefaultMavenResourcesFiltering - Copying 0 resource
+2023-03-02 23:08:06,187 [Worker-129: Building] INFO  o.a.m.s.f.DefaultMavenResourcesFiltering - Copying 1 resource
+2023-03-02 23:08:06,191 [Worker-129: Building] INFO  o.a.m.s.f.DefaultMavenResourcesFiltering - skip non existing resourceDirectory C:\Users\User\Desktop\ShopmeEcommerce\ShopmeProject\ShopmeWebParent\ShopmeBackEnd\src\test\resources
+2023-03-02 23:08:22,181 [Worker-127: Building] INFO  o.a.m.s.f.DefaultMavenResourcesFiltering - Copying 0 resource
+2023-03-02 23:08:22,182 [Worker-127: Building] INFO  o.a.m.s.f.DefaultMavenResourcesFiltering - Copying 1 resource
+2023-03-02 23:08:22,186 [Worker-127: Building] INFO  o.a.m.s.f.DefaultMavenResourcesFiltering - skip non existing resourceDirectory C:\Users\User\Desktop\ShopmeEcommerce\ShopmeProject\ShopmeWebParent\ShopmeBackEnd\src\test\resources
+2023-03-02 23:16:03,567 [Worker-129: Building] INFO  o.a.m.s.f.DefaultMavenResourcesFiltering - Copying 0 resource
+2023-03-02 23:16:03,567 [Worker-129: Building] INFO  o.a.m.s.f.DefaultMavenResourcesFiltering - Copying 1 resource
+2023-03-02 23:16:03,573 [Worker-129: Building] INFO  o.a.m.s.f.DefaultMavenResourcesFiltering - skip non existing resourceDirectory C:\Users\User\Desktop\ShopmeEcommerce\ShopmeProject\ShopmeWebParent\ShopmeBackEnd\src\test\resources
+2023-03-02 23:16:14,581 [Worker-133: Building] INFO  o.a.m.s.f.DefaultMavenResourcesFiltering - Copying 0 resource
+2023-03-02 23:16:14,581 [Worker-133: Building] INFO  o.a.m.s.f.DefaultMavenResourcesFiltering - Copying 1 resource
+2023-03-02 23:16:14,586 [Worker-133: Building] INFO  o.a.m.s.f.DefaultMavenResourcesFiltering - skip non existing resourceDirectory C:\Users\User\Desktop\ShopmeEcommerce\ShopmeProject\ShopmeWebParent\ShopmeBackEnd\src\test\resources
+2023-03-02 23:16:19,756 [Worker-134: Building] INFO  o.a.m.s.f.DefaultMavenResourcesFiltering - Copying 0 resource
+2023-03-02 23:16:19,757 [Worker-134: Building] INFO  o.a.m.s.f.DefaultMavenResourcesFiltering - Copying 1 resource
+2023-03-02 23:16:19,761 [Worker-134: Building] INFO  o.a.m.s.f.DefaultMavenResourcesFiltering - skip non existing resourceDirectory C:\Users\User\Desktop\ShopmeEcommerce\ShopmeProject\ShopmeWebParent\ShopmeBackEnd\src\test\resources
+2023-03-02 23:16:27,589 [Worker-129: Building] INFO  o.a.m.s.f.DefaultMavenResourcesFiltering - Copying 0 resource
+2023-03-02 23:16:27,589 [Worker-129: Building] INFO  o.a.m.s.f.DefaultMavenResourcesFiltering - Copying 1 resource
+2023-03-02 23:16:27,593 [Worker-129: Building] INFO  o.a.m.s.f.DefaultMavenResourcesFiltering - skip non existing resourceDirectory C:\Users\User\Desktop\ShopmeEcommerce\ShopmeProject\ShopmeWebParent\ShopmeBackEnd\src\test\resources
+2023-03-02 23:16:53,850 [Worker-129: Building] INFO  o.a.m.s.f.DefaultMavenResourcesFiltering - Copying 0 resource
+2023-03-02 23:16:53,851 [Worker-129: Building] INFO  o.a.m.s.f.DefaultMavenResourcesFiltering - Copying 1 resource
+2023-03-02 23:16:53,855 [Worker-129: Building] INFO  o.a.m.s.f.DefaultMavenResourcesFiltering - skip non existing resourceDirectory C:\Users\User\Desktop\ShopmeEcommerce\ShopmeProject\ShopmeWebParent\ShopmeBackEnd\src\test\resources
+2023-03-02 23:17:45,014 [Worker-133: Building] INFO  o.a.m.s.f.DefaultMavenResourcesFiltering - Copying 0 resource
+2023-03-02 23:17:45,014 [Worker-133: Building] INFO  o.a.m.s.f.DefaultMavenResourcesFiltering - Copying 1 resource
+2023-03-02 23:17:45,018 [Worker-133: Building] INFO  o.a.m.s.f.DefaultMavenResourcesFiltering - skip non existing resourceDirectory C:\Users\User\Desktop\ShopmeEcommerce\ShopmeProject\ShopmeWebParent\ShopmeBackEnd\src\test\resources
+2023-03-02 23:17:57,355 [Worker-133: Building] INFO  o.a.m.s.f.DefaultMavenResourcesFiltering - Copying 0 resource
+2023-03-02 23:17:57,356 [Worker-133: Building] INFO  o.a.m.s.f.DefaultMavenResourcesFiltering - Copying 1 resource
+2023-03-02 23:17:57,359 [Worker-133: Building] INFO  o.a.m.s.f.DefaultMavenResourcesFiltering - skip non existing resourceDirectory C:\Users\User\Desktop\ShopmeEcommerce\ShopmeProject\ShopmeWebParent\ShopmeBackEnd\src\test\resources
+2023-03-03 12:12:44,521 [Worker-10: Loading available Gradle versions] INFO  o.e.b.c.i.u.g.PublishedGradleVersions - Gradle version information cache is out-of-date. Trying to update.
+2023-03-03 14:04:41,213 [Worker-41: Building] WARN  o.e.m.c.i.embedder.EclipseLogger - The artifact mysql:mysql-connector-java:jar:8.0.32 has been relocated to com.mysql:mysql-connector-j:jar:8.0.32: MySQL Connector/J artifacts moved to reverse-DNS compliant Maven 2+ coordinates.
+2023-03-03 14:04:41,285 [Worker-41: Building] INFO  o.e.m.c.i.p.WorkspaceClassifierResolverManager - Resolving P/ShopmeCommon: com.shopme:ShopmeCommon:0.0.1-SNAPSHOT with classifier  to /ShopmeCommon/target/classes
+2023-03-03 14:04:41,953 [Worker-41: Building] WARN  o.e.m.c.i.embedder.EclipseLogger - The artifact mysql:mysql-connector-java:jar:8.0.32 has been relocated to com.mysql:mysql-connector-j:jar:8.0.32: MySQL Connector/J artifacts moved to reverse-DNS compliant Maven 2+ coordinates.
+2023-03-03 14:04:41,975 [Worker-41: Building] INFO  o.e.m.c.i.p.WorkspaceClassifierResolverManager - Resolving P/ShopmeCommon: com.shopme:ShopmeCommon:0.0.1-SNAPSHOT with classifier  to /ShopmeCommon/target/classes
+2023-03-03 14:04:44,217 [Worker-41: Building] INFO  o.a.m.s.f.DefaultMavenResourcesFiltering - Copying 1 resource
+2023-03-03 14:04:44,249 [Worker-41: Building] INFO  o.a.m.s.f.DefaultMavenResourcesFiltering - Copying 29 resources
+2023-03-03 14:04:44,862 [Worker-41: Building] INFO  o.a.m.s.f.DefaultMavenResourcesFiltering - skip non existing resourceDirectory C:\Users\User\Desktop\ShopmeEcommerce\ShopmeProject\ShopmeWebParent\ShopmeBackEnd\src\test\resources
+2023-03-03 14:04:46,791 [Worker-41: Building] WARN  o.e.m.c.i.embedder.EclipseLogger - The artifact mysql:mysql-connector-java:jar:8.0.32 has been relocated to com.mysql:mysql-connector-j:jar:8.0.32: MySQL Connector/J artifacts moved to reverse-DNS compliant Maven 2+ coordinates.
+2023-03-03 14:04:46,815 [Worker-41: Building] INFO  o.e.m.c.i.p.WorkspaceClassifierResolverManager - Resolving P/ShopmeCommon: com.shopme:ShopmeCommon:0.0.1-SNAPSHOT with classifier  to /ShopmeCommon/target/classes
+2023-03-03 14:05:16,473 [Worker-40: Building] INFO  o.a.m.s.f.DefaultMavenResourcesFiltering - Copying 1 resource
+2023-03-03 14:05:16,487 [Worker-40: Building] INFO  o.a.m.s.f.DefaultMavenResourcesFiltering - Copying 29 resources
+2023-03-03 14:05:16,506 [Worker-40: Building] INFO  o.a.m.s.f.DefaultMavenResourcesFiltering - skip non existing resourceDirectory C:\Users\User\Desktop\ShopmeEcommerce\ShopmeProject\ShopmeWebParent\ShopmeBackEnd\src\test\resources
+2023-03-03 14:07:46,924 [Worker-42: Building] INFO  o.a.m.s.f.DefaultMavenResourcesFiltering - Copying 1 resource
+2023-03-03 14:07:46,942 [Worker-42: Building] INFO  o.a.m.s.f.DefaultMavenResourcesFiltering - Copying 29 resources
+2023-03-03 14:07:46,971 [Worker-42: Building] INFO  o.a.m.s.f.DefaultMavenResourcesFiltering - skip non existing resourceDirectory C:\Users\User\Desktop\ShopmeEcommerce\ShopmeProject\ShopmeWebParent\ShopmeBackEnd\src\test\resources
+2023-03-03 14:07:49,099 [Worker-42: Building] INFO  o.a.m.s.f.DefaultMavenResourcesFiltering - Copying 1 resource
+2023-03-03 14:07:49,108 [Worker-42: Building] INFO  o.a.m.s.f.DefaultMavenResourcesFiltering - Copying 29 resources
+2023-03-03 14:07:49,122 [Worker-42: Building] INFO  o.a.m.s.f.DefaultMavenResourcesFiltering - skip non existing resourceDirectory C:\Users\User\Desktop\ShopmeEcommerce\ShopmeProject\ShopmeWebParent\ShopmeBackEnd\src\test\resources
+2023-03-03 14:42:37,826 [Worker-54: Building] INFO  o.a.m.s.f.DefaultMavenResourcesFiltering - Copying 1 resource
+2023-03-03 14:42:37,859 [Worker-54: Building] INFO  o.a.m.s.f.DefaultMavenResourcesFiltering - Copying 29 resources
+2023-03-03 14:42:37,885 [Worker-54: Building] INFO  o.a.m.s.f.DefaultMavenResourcesFiltering - skip non existing resourceDirectory C:\Users\User\Desktop\ShopmeEcommerce\ShopmeProject\ShopmeWebParent\ShopmeBackEnd\src\test\resources
+2023-03-03 15:52:16,424 [Worker-10: Loading available Gradle versions] INFO  o.e.b.c.i.u.g.PublishedGradleVersions - Gradle version information cache is up-to-date. Trying to read.
+2023-03-03 15:59:05,993 [Worker-11: Building] WARN  o.e.m.c.i.embedder.EclipseLogger - The artifact mysql:mysql-connector-java:jar:8.0.32 has been relocated to com.mysql:mysql-connector-j:jar:8.0.32: MySQL Connector/J artifacts moved to reverse-DNS compliant Maven 2+ coordinates.
+2023-03-03 15:59:06,069 [Worker-11: Building] INFO  o.e.m.c.i.p.WorkspaceClassifierResolverManager - Resolving P/ShopmeCommon: com.shopme:ShopmeCommon:0.0.1-SNAPSHOT with classifier  to /ShopmeCommon/target/classes
+2023-03-03 15:59:06,660 [Worker-11: Building] WARN  o.e.m.c.i.embedder.EclipseLogger - The artifact mysql:mysql-connector-java:jar:8.0.32 has been relocated to com.mysql:mysql-connector-j:jar:8.0.32: MySQL Connector/J artifacts moved to reverse-DNS compliant Maven 2+ coordinates.
+2023-03-03 15:59:06,695 [Worker-11: Building] INFO  o.e.m.c.i.p.WorkspaceClassifierResolverManager - Resolving P/ShopmeCommon: com.shopme:ShopmeCommon:0.0.1-SNAPSHOT with classifier  to /ShopmeCommon/target/classes
+2023-03-03 15:59:08,846 [Worker-11: Building] INFO  o.a.m.s.f.DefaultMavenResourcesFiltering - Copying 1 resource
+2023-03-03 15:59:08,894 [Worker-11: Building] INFO  o.a.m.s.f.DefaultMavenResourcesFiltering - Copying 29 resources
+2023-03-03 15:59:09,514 [Worker-11: Building] INFO  o.a.m.s.f.DefaultMavenResourcesFiltering - skip non existing resourceDirectory C:\Users\User\Desktop\ShopmeEcommerce\ShopmeProject\ShopmeWebParent\ShopmeBackEnd\src\test\resources
+2023-03-03 15:59:11,964 [Worker-11: Building] WARN  o.e.m.c.i.embedder.EclipseLogger - The artifact mysql:mysql-connector-java:jar:8.0.32 has been relocated to com.mysql:mysql-connector-j:jar:8.0.32: MySQL Connector/J artifacts moved to reverse-DNS compliant Maven 2+ coordinates.
+2023-03-03 15:59:11,988 [Worker-11: Building] INFO  o.e.m.c.i.p.WorkspaceClassifierResolverManager - Resolving P/ShopmeCommon: com.shopme:ShopmeCommon:0.0.1-SNAPSHOT with classifier  to /ShopmeCommon/target/classes
+2023-03-03 15:59:23,673 [Worker-23: Building] INFO  o.a.m.s.f.DefaultMavenResourcesFiltering - Copying 1 resource
+2023-03-03 15:59:23,690 [Worker-23: Building] INFO  o.a.m.s.f.DefaultMavenResourcesFiltering - Copying 29 resources
+2023-03-03 15:59:23,710 [Worker-23: Building] INFO  o.a.m.s.f.DefaultMavenResourcesFiltering - skip non existing resourceDirectory C:\Users\User\Desktop\ShopmeEcommerce\ShopmeProject\ShopmeWebParent\ShopmeBackEnd\src\test\resources
+2023-03-03 16:04:46,860 [Worker-30: Building] INFO  o.a.m.s.f.DefaultMavenResourcesFiltering - Copying 1 resource
+2023-03-03 16:04:46,880 [Worker-30: Building] INFO  o.a.m.s.f.DefaultMavenResourcesFiltering - Copying 29 resources
+2023-03-03 16:04:46,912 [Worker-30: Building] INFO  o.a.m.s.f.DefaultMavenResourcesFiltering - skip non existing resourceDirectory C:\Users\User\Desktop\ShopmeEcommerce\ShopmeProject\ShopmeWebParent\ShopmeBackEnd\src\test\resources
+2023-03-03 16:05:02,318 [Worker-6: Building] INFO  o.a.m.s.f.DefaultMavenResourcesFiltering - Copying 1 resource
+2023-03-03 16:05:02,335 [Worker-6: Building] INFO  o.a.m.s.f.DefaultMavenResourcesFiltering - Copying 29 resources
+2023-03-03 16:05:02,361 [Worker-6: Building] INFO  o.a.m.s.f.DefaultMavenResourcesFiltering - skip non existing resourceDirectory C:\Users\User\Desktop\ShopmeEcommerce\ShopmeProject\ShopmeWebParent\ShopmeBackEnd\src\test\resources
+2023-03-03 16:16:01,426 [Worker-28: Building] INFO  o.a.m.s.f.DefaultMavenResourcesFiltering - Copying 0 resource
+2023-03-03 16:16:01,427 [Worker-28: Building] INFO  o.a.m.s.f.DefaultMavenResourcesFiltering - Copying 1 resource
+2023-03-03 16:16:01,436 [Worker-28: Building] INFO  o.a.m.s.f.DefaultMavenResourcesFiltering - skip non existing resourceDirectory C:\Users\User\Desktop\ShopmeEcommerce\ShopmeProject\ShopmeWebParent\ShopmeBackEnd\src\test\resources
+2023-03-03 16:17:17,673 [Worker-35: Building] INFO  o.a.m.s.f.DefaultMavenResourcesFiltering - Copying 0 resource
+2023-03-03 16:17:17,674 [Worker-35: Building] INFO  o.a.m.s.f.DefaultMavenResourcesFiltering - Copying 1 resource
+2023-03-03 16:17:17,680 [Worker-35: Building] INFO  o.a.m.s.f.DefaultMavenResourcesFiltering - skip non existing resourceDirectory C:\Users\User\Desktop\ShopmeEcommerce\ShopmeProject\ShopmeWebParent\ShopmeBackEnd\src\test\resources
+2023-03-03 16:17:24,692 [Worker-32: Building] INFO  o.a.m.s.f.DefaultMavenResourcesFiltering - Copying 0 resource
+2023-03-03 16:17:24,692 [Worker-32: Building] INFO  o.a.m.s.f.DefaultMavenResourcesFiltering - Copying 1 resource
+2023-03-03 16:17:24,697 [Worker-32: Building] INFO  o.a.m.s.f.DefaultMavenResourcesFiltering - skip non existing resourceDirectory C:\Users\User\Desktop\ShopmeEcommerce\ShopmeProject\ShopmeWebParent\ShopmeBackEnd\src\test\resources
+2023-03-03 16:19:14,847 [Worker-35: Building] INFO  o.a.m.s.f.DefaultMavenResourcesFiltering - Copying 1 resource
+2023-03-03 16:19:14,988 [Worker-35: Building] INFO  o.a.m.s.f.DefaultMavenResourcesFiltering - Copying 0 resource
+2023-03-03 16:19:14,997 [Worker-35: Building] INFO  o.a.m.s.f.DefaultMavenResourcesFiltering - skip non existing resourceDirectory C:\Users\User\Desktop\ShopmeEcommerce\ShopmeProject\ShopmeCommon\src\test\resources
+2023-03-03 16:19:24,035 [Worker-39: Building] INFO  o.a.m.s.f.DefaultMavenResourcesFiltering - Copying 1 resource
+2023-03-03 16:19:24,045 [Worker-39: Building] INFO  o.a.m.s.f.DefaultMavenResourcesFiltering - Copying 0 resource
+2023-03-03 16:19:24,051 [Worker-39: Building] INFO  o.a.m.s.f.DefaultMavenResourcesFiltering - skip non existing resourceDirectory C:\Users\User\Desktop\ShopmeEcommerce\ShopmeProject\ShopmeCommon\src\test\resources
+2023-03-03 16:23:19,129 [Worker-38: Building] INFO  o.a.m.s.f.DefaultMavenResourcesFiltering - Copying 1 resource
+2023-03-03 16:23:19,143 [Worker-38: Building] INFO  o.a.m.s.f.DefaultMavenResourcesFiltering - Copying 29 resources
+2023-03-03 16:23:19,166 [Worker-38: Building] INFO  o.a.m.s.f.DefaultMavenResourcesFiltering - skip non existing resourceDirectory C:\Users\User\Desktop\ShopmeEcommerce\ShopmeProject\ShopmeWebParent\ShopmeBackEnd\src\test\resources
+2023-03-03 16:23:48,515 [Worker-38: Building] INFO  o.a.m.s.f.DefaultMavenResourcesFiltering - Copying 1 resource
+2023-03-03 16:23:48,525 [Worker-38: Building] INFO  o.a.m.s.f.DefaultMavenResourcesFiltering - Copying 29 resources
+2023-03-03 16:23:48,538 [Worker-38: Building] INFO  o.a.m.s.f.DefaultMavenResourcesFiltering - skip non existing resourceDirectory C:\Users\User\Desktop\ShopmeEcommerce\ShopmeProject\ShopmeWebParent\ShopmeBackEnd\src\test\resources
+2023-03-03 16:23:57,559 [Worker-41: Building] INFO  o.a.m.s.f.DefaultMavenResourcesFiltering - Copying 1 resource
+2023-03-03 16:23:57,570 [Worker-41: Building] INFO  o.a.m.s.f.DefaultMavenResourcesFiltering - Copying 29 resources
+2023-03-03 16:23:57,584 [Worker-41: Building] INFO  o.a.m.s.f.DefaultMavenResourcesFiltering - skip non existing resourceDirectory C:\Users\User\Desktop\ShopmeEcommerce\ShopmeProject\ShopmeWebParent\ShopmeBackEnd\src\test\resources
+2023-03-03 16:24:26,050 [Worker-41: Building] INFO  o.a.m.s.f.DefaultMavenResourcesFiltering - Copying 1 resource
+2023-03-03 16:24:26,061 [Worker-41: Building] INFO  o.a.m.s.f.DefaultMavenResourcesFiltering - Copying 29 resources
+2023-03-03 16:24:26,077 [Worker-41: Building] INFO  o.a.m.s.f.DefaultMavenResourcesFiltering - skip non existing resourceDirectory C:\Users\User\Desktop\ShopmeEcommerce\ShopmeProject\ShopmeWebParent\ShopmeBackEnd\src\test\resources
+2023-03-03 16:24:32,241 [Worker-41: Building] INFO  o.a.m.s.f.DefaultMavenResourcesFiltering - Copying 1 resource
+2023-03-03 16:24:32,254 [Worker-41: Building] INFO  o.a.m.s.f.DefaultMavenResourcesFiltering - Copying 29 resources
+2023-03-03 16:24:32,272 [Worker-41: Building] INFO  o.a.m.s.f.DefaultMavenResourcesFiltering - skip non existing resourceDirectory C:\Users\User\Desktop\ShopmeEcommerce\ShopmeProject\ShopmeWebParent\ShopmeBackEnd\src\test\resources
+2023-03-03 20:36:33,602 [Worker-45: Launching ShopmeBackEnd - ShopmeBackEndApplication] INFO  o.e.m.c.i.p.WorkspaceClassifierResolverManager - Resolving P/ShopmeCommon: com.shopme:ShopmeCommon:0.0.1-SNAPSHOT with classifier null to /ShopmeCommon/target/classes
+2023-03-03 20:36:33,817 [Worker-45: Launching ShopmeBackEnd - ShopmeBackEndApplication] INFO  o.e.m.c.i.p.WorkspaceClassifierResolverManager - Resolving P/ShopmeCommon: com.shopme:ShopmeCommon:0.0.1-SNAPSHOT with classifier null to /ShopmeCommon/target/classes
+2023-03-03 20:36:34,061 [Worker-45: Launching ShopmeBackEnd - ShopmeBackEndApplication] INFO  o.e.m.c.i.p.WorkspaceClassifierResolverManager - Resolving P/ShopmeCommon: com.shopme:ShopmeCommon:0.0.1-SNAPSHOT with classifier null to /ShopmeCommon/target/classes
+2023-03-03 21:10:07,983 [Worker-63: Building] INFO  o.a.m.s.f.DefaultMavenResourcesFiltering - Copying 0 resource
+2023-03-03 21:10:07,984 [Worker-63: Building] INFO  o.a.m.s.f.DefaultMavenResourcesFiltering - Copying 1 resource
+2023-03-03 21:10:07,989 [Worker-63: Building] INFO  o.a.m.s.f.DefaultMavenResourcesFiltering - skip non existing resourceDirectory C:\Users\User\Desktop\ShopmeEcommerce\ShopmeProject\ShopmeWebParent\ShopmeBackEnd\src\test\resources
+2023-03-03 21:10:16,129 [Worker-64: Building] INFO  o.a.m.s.f.DefaultMavenResourcesFiltering - Copying 0 resource
+2023-03-03 21:10:16,130 [Worker-64: Building] INFO  o.a.m.s.f.DefaultMavenResourcesFiltering - Copying 1 resource
+2023-03-03 21:10:16,134 [Worker-64: Building] INFO  o.a.m.s.f.DefaultMavenResourcesFiltering - skip non existing resourceDirectory C:\Users\User\Desktop\ShopmeEcommerce\ShopmeProject\ShopmeWebParent\ShopmeBackEnd\src\test\resources
+2023-03-03 21:11:35,579 [Worker-64: Building] INFO  o.a.m.s.f.DefaultMavenResourcesFiltering - Copying 0 resource
+2023-03-03 21:11:35,580 [Worker-64: Building] INFO  o.a.m.s.f.DefaultMavenResourcesFiltering - Copying 1 resource
+2023-03-03 21:11:35,584 [Worker-64: Building] INFO  o.a.m.s.f.DefaultMavenResourcesFiltering - skip non existing resourceDirectory C:\Users\User\Desktop\ShopmeEcommerce\ShopmeProject\ShopmeWebParent\ShopmeBackEnd\src\test\resources
+2023-03-03 21:11:55,229 [Worker-64: Building] INFO  o.a.m.s.f.DefaultMavenResourcesFiltering - Copying 0 resource
+2023-03-03 21:11:55,229 [Worker-64: Building] INFO  o.a.m.s.f.DefaultMavenResourcesFiltering - Copying 1 resource
+2023-03-03 21:11:55,234 [Worker-64: Building] INFO  o.a.m.s.f.DefaultMavenResourcesFiltering - skip non existing resourceDirectory C:\Users\User\Desktop\ShopmeEcommerce\ShopmeProject\ShopmeWebParent\ShopmeBackEnd\src\test\resources
+2023-03-03 22:25:30,460 [Worker-68: Building] INFO  o.a.m.s.f.DefaultMavenResourcesFiltering - Copying 1 resource
+2023-03-03 22:25:30,514 [Worker-68: Building] INFO  o.a.m.s.f.DefaultMavenResourcesFiltering - Copying 29 resources
+2023-03-03 22:25:30,528 [Worker-68: Building] INFO  o.a.m.s.f.DefaultMavenResourcesFiltering - skip non existing resourceDirectory C:\Users\User\Desktop\ShopmeEcommerce\ShopmeProject\ShopmeWebParent\ShopmeBackEnd\src\test\resources
diff --git a/.metadata/.plugins/org.eclipse.pde.core/.cache/clean-cache.properties b/.metadata/.plugins/org.eclipse.pde.core/.cache/clean-cache.properties
index 3040c6a2..f453200f 100644
--- a/.metadata/.plugins/org.eclipse.pde.core/.cache/clean-cache.properties
+++ b/.metadata/.plugins/org.eclipse.pde.core/.cache/clean-cache.properties
@@ -1,2 +1,2 @@
 #Cached timestamps
-#Wed Mar 01 20:52:09 SGT 2023
+#Fri Mar 03 22:53:49 SGT 2023
diff --git a/.metadata/version.ini b/.metadata/version.ini
index 7cfba620..d17a25c3 100644
--- a/.metadata/version.ini
+++ b/.metadata/version.ini
@@ -1,3 +1,3 @@
-#Thu Mar 02 10:25:50 SGT 2023
+#Fri Mar 03 15:51:05 SGT 2023
 org.eclipse.core.runtime=2
 org.eclipse.platform=4.26.0.v20221123-1800
diff --git a/ShopmeProject/ShopmeCommon/src/main/java/com/shopme/common/entity/Category.java b/ShopmeProject/ShopmeCommon/src/main/java/com/shopme/common/entity/Category.java
index 5ba9b5cf..ebbcbbcd 100644
--- a/ShopmeProject/ShopmeCommon/src/main/java/com/shopme/common/entity/Category.java
+++ b/ShopmeProject/ShopmeCommon/src/main/java/com/shopme/common/entity/Category.java
@@ -12,6 +12,7 @@
 import jakarta.persistence.OneToMany;
 import jakarta.persistence.OneToOne;
 import jakarta.persistence.Table;
+import jakarta.persistence.Transient;
 
 @Entity
 @Table(name = "categories")
@@ -158,4 +159,12 @@ public void setChildren(Set<Category> children) {
 		this.children = children;
 	}
 
+	@Transient
+	public String getImagePath() {
+		
+		if(this.id == null) return "/images/image-thumbnail.png";
+		
+		return "/category-images/" + this.id + "/" + this.image;
+	}
+	
 }
diff --git a/ShopmeProject/ShopmeWebParent/ShopmeBackEnd/src/main/java/com/shopme/admin/MvcConfig.java b/ShopmeProject/ShopmeWebParent/ShopmeBackEnd/src/main/java/com/shopme/admin/MvcConfig.java
index a0dae396..556d4bc6 100644
--- a/ShopmeProject/ShopmeWebParent/ShopmeBackEnd/src/main/java/com/shopme/admin/MvcConfig.java
+++ b/ShopmeProject/ShopmeWebParent/ShopmeBackEnd/src/main/java/com/shopme/admin/MvcConfig.java
@@ -18,23 +18,29 @@ public class MvcConfig implements WebMvcConfigurer {
 	 * the web clients (browsers) - that's the primary purpose
 	 *  of using resource handlers in Spring MVC.
 	 * 
+	 * Because the assets are not located in the src/main/resources/static folder
 	 * */
 	
 	@Override
 	public void addResourceHandlers(ResourceHandlerRegistry registry) {
 
 		String dirName = "user-photos";
-		
 		Path userPhotoDir = Paths.get(dirName);
-		
 		String userPhotosPath = userPhotoDir.toFile().getAbsolutePath();
 		
-		
 		// add /** to allow all files under this directory to be available to client
-		
 		registry.addResourceHandler("/" + dirName + "/**")
 		.addResourceLocations("file:/" + userPhotosPath + "/");
 		
+		
+		String categoryImagesDirName = "../category-images";
+		Path categoryImagesDir = Paths.get(categoryImagesDirName);
+		String categoryImagesPath = categoryImagesDir.toFile().getAbsolutePath();
+		
+		// add /** to allow all files under this directory to be available to client
+		registry.addResourceHandler("/category-images/**")
+		.addResourceLocations("file:/" + categoryImagesPath + "/");
+		
 	}
 	
 	
diff --git a/ShopmeProject/ShopmeWebParent/ShopmeBackEnd/src/main/java/com/shopme/admin/category/CategoryController.java b/ShopmeProject/ShopmeWebParent/ShopmeBackEnd/src/main/java/com/shopme/admin/category/CategoryController.java
index 6f9eea2e..f7c82387 100644
--- a/ShopmeProject/ShopmeWebParent/ShopmeBackEnd/src/main/java/com/shopme/admin/category/CategoryController.java
+++ b/ShopmeProject/ShopmeWebParent/ShopmeBackEnd/src/main/java/com/shopme/admin/category/CategoryController.java
@@ -10,6 +10,7 @@
 import org.springframework.util.StringUtils;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.ModelAttribute;
+import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.multipart.MultipartFile;
@@ -20,54 +21,68 @@
 
 @Controller
 public class CategoryController {
-	
+
 	@Autowired
 	private CategoryService service;
-	
+
 	@GetMapping("/categories")
 	public String listAll(Model model) {
-		
+
 		List<Category> listCategories = service.listAll();
 		model.addAttribute("listCategories", listCategories);
-		
+
 		return "categories/categories";
 	}
-	
-	
+
 	@GetMapping("/categories/new")
 	public String newCategory(Model model) {
-		
+
 		List<Category> listCategories = service.listCategoriesUsedInForm();
-		
+
 		model.addAttribute("category", new Category());
 		model.addAttribute("listCategories", listCategories);
 		model.addAttribute("pageTitle", "Create New Category");
-		
+
 		return "categories/category_form";
-	
+
 	}
-	
+
 	@PostMapping("/categories/save")
-	public String saveCategory(@ModelAttribute("category") Category category, 
-			RedirectAttributes redirectAttributes,
+	public String saveCategory(@ModelAttribute("category") Category category, RedirectAttributes redirectAttributes,
 			@RequestParam("fileImage") MultipartFile multipartFile) throws IOException {
-		
-		String fileName = StringUtils.cleanPath(multipartFile.getOriginalFilename());
-		category.setImage(fileName);
-		
-		Category savedCategory = service.save(category);
-		String uploadDir = "../category-images/" + savedCategory.getId();
-		FileUploadUtil.saveFile(uploadDir, fileName, multipartFile);
-		
-		
+
+		if (!multipartFile.isEmpty()) {
+			String fileName = StringUtils.cleanPath(multipartFile.getOriginalFilename());
+			category.setImage(fileName);
+
+			Category savedCategory = service.save(category);
+			String uploadDir = "../category-images/" + savedCategory.getId();
+
+			FileUploadUtil.cleanDir(uploadDir);
+			FileUploadUtil.saveFile(uploadDir, fileName, multipartFile);
+		} else {
+			service.save(category);
+		}
+
 		redirectAttributes.addFlashAttribute("message", "the category have been saved successfully");
-		
-		
 		return "redirect:/categories";
 	}
-	
-}
-	
 
+	@GetMapping("/categories/edit/{id}")
+	public String editCategory(@PathVariable(name = "id") Integer id, Model model, RedirectAttributes ra) {
+		try {
+			Category category = service.get(id);
+			List<Category> listCategories = service.listCategoriesUsedInForm();
+
+			model.addAttribute("category", category);
+			model.addAttribute("listCategories", listCategories);
+			model.addAttribute("pageTitle", "Edit Category (ID: " + id + ")");
 
+			return "categories/category_form";
+		} catch (CategoryNotFoundException ex) {
+			ra.addFlashAttribute("message", ex.getMessage());
+			return "redirect:/categories";
+		}
+	}
 
+}
diff --git a/ShopmeProject/ShopmeWebParent/ShopmeBackEnd/src/main/java/com/shopme/admin/category/CategoryNotFoundException.java b/ShopmeProject/ShopmeWebParent/ShopmeBackEnd/src/main/java/com/shopme/admin/category/CategoryNotFoundException.java
new file mode 100644
index 00000000..f425c50a
--- /dev/null
+++ b/ShopmeProject/ShopmeWebParent/ShopmeBackEnd/src/main/java/com/shopme/admin/category/CategoryNotFoundException.java
@@ -0,0 +1,10 @@
+package com.shopme.admin.category;
+
+public class CategoryNotFoundException extends Exception {
+
+	public CategoryNotFoundException(String message) {
+		super(message);
+	}
+
+	
+}
diff --git a/ShopmeProject/ShopmeWebParent/ShopmeBackEnd/src/main/java/com/shopme/admin/category/CategoryService.java b/ShopmeProject/ShopmeWebParent/ShopmeBackEnd/src/main/java/com/shopme/admin/category/CategoryService.java
index 8fde603c..af3fe72c 100644
--- a/ShopmeProject/ShopmeWebParent/ShopmeBackEnd/src/main/java/com/shopme/admin/category/CategoryService.java
+++ b/ShopmeProject/ShopmeWebParent/ShopmeBackEnd/src/main/java/com/shopme/admin/category/CategoryService.java
@@ -2,9 +2,11 @@
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.NoSuchElementException;
 import java.util.Set;
 
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.repository.support.Repositories;
 import org.springframework.stereotype.Service;
 
 import com.shopme.common.entity.Category;
@@ -34,7 +36,7 @@ private List<Category> listHierarchicalCategories(List<Category> rootCategories)
 			for (Category subCategory : children) {
 				String name = "--" + subCategory.getName();
 				hierarchicalCategories.add(Category.copyFull(subCategory, name));
-				
+
 				listHierarchicalCategories(hierarchicalCategories, subCategory, 1);
 			}
 		}
@@ -106,7 +108,6 @@ private void listSubCategoriesUsedInForm(List<Category> categoriesUsedInForm, Ca
 			for (int i = 0; i < newSubLevel; i++) {
 				name += "--";
 			}
-
 			name += subCategory.getName();
 			categoriesUsedInForm.add(Category.copyIdAndName(subCategory.getId(), name));
 
@@ -115,4 +116,16 @@ private void listSubCategoriesUsedInForm(List<Category> categoriesUsedInForm, Ca
 
 	}
 
+	public Category get(Integer id) throws CategoryNotFoundException {
+
+		try {
+			return repo.findById(id).get();
+
+		} catch (NoSuchElementException ex) {
+
+			throw new CategoryNotFoundException("could not find any category with the ID: " + id);
+		}
+
+	}
+
 }
diff --git a/ShopmeProject/ShopmeWebParent/ShopmeBackEnd/src/main/resources/templates/categories/categories.html b/ShopmeProject/ShopmeWebParent/ShopmeBackEnd/src/main/resources/templates/categories/categories.html
index a6a3a54d..0a41de2e 100644
--- a/ShopmeProject/ShopmeWebParent/ShopmeBackEnd/src/main/resources/templates/categories/categories.html
+++ b/ShopmeProject/ShopmeWebParent/ShopmeBackEnd/src/main/resources/templates/categories/categories.html
@@ -55,14 +55,16 @@ <h2>Manage Categories</h2>
 					<tbody>
 						<tr th:each="cat : ${listCategories}">
 							<td>[[${cat.id}]]</td>
-							<td></td>
+							<td>	
+								<img th:src="@{${cat.imagePath}}" style="width: 100px;" class="image-fluid"/>
+							</td>
 							<td>[[${cat.name}]]</td>
 							<td>[[${cat.alias}]]</td>
 							<td>
 								<div th:replace="fragments :: category_status"></div>
 							</td>
 							<td>
-								<div th:replace="fragments :: category_actions"></div>
+								<div th:replace="fragments :: category_actions(${cat.id})"></div>
 							</td>
 						</tr>
 					</tbody>
diff --git a/ShopmeProject/ShopmeWebParent/ShopmeBackEnd/src/main/resources/templates/categories/category_form.html b/ShopmeProject/ShopmeWebParent/ShopmeBackEnd/src/main/resources/templates/categories/category_form.html
index 4dd231f4..ad710d66 100644
--- a/ShopmeProject/ShopmeWebParent/ShopmeBackEnd/src/main/resources/templates/categories/category_form.html
+++ b/ShopmeProject/ShopmeWebParent/ShopmeBackEnd/src/main/resources/templates/categories/category_form.html
@@ -50,10 +50,10 @@ <h2>Manage Categories | [[${pageTitle}]]</h2>
 					<div class="col-sm-8">
 						<input type="hidden" th:field="*{image}"/>
 						<input type="file" id="fileImage" name="fileImage" accept="image/png, image/jpeg"
-						 required class="mb-2" />
+						 th:required="${category.imagePath == null}"  required class="mb-2" />
 						
 					<div class="mt-2">
-						<img id="thumbnail" alt="Image preview" th:src="@{/images/image-thumbnail.png}"
+						<img id="thumbnail" alt="Image preview" th:src="@{${category.imagePath}}"
 						 class="img-fluid" />
 					</div>	 
 						 
diff --git a/ShopmeProject/ShopmeWebParent/ShopmeBackEnd/src/main/resources/templates/fragments.html b/ShopmeProject/ShopmeWebParent/ShopmeBackEnd/src/main/resources/templates/fragments.html
index 0dc26190..0c854e1a 100644
--- a/ShopmeProject/ShopmeWebParent/ShopmeBackEnd/src/main/resources/templates/fragments.html
+++ b/ShopmeProject/ShopmeWebParent/ShopmeBackEnd/src/main/resources/templates/fragments.html
@@ -58,9 +58,9 @@
 				title="Enable this category"></a> 
 	</div>	
 	
-	<div th:fragment="category_actions">	
+	<div th:fragment="category_actions(id)">	
 					
-			<a href="" class="fas fa-edit fa-2x icon-green" 
+			<a th:href="@{'/categories/edit/' + ${id}}" class="fas fa-edit fa-2x icon-green" 
 					title="edit this category"></a>
 					&nbsp; 
 			<a href="" class="fas fa-trash fa-2x icon-dark link-delete" 
diff --git a/ShopmeProject/ShopmeWebParent/category-images/1/computers.png b/ShopmeProject/ShopmeWebParent/category-images/1/computers.png
new file mode 100644
index 00000000..29706037
Binary files /dev/null and b/ShopmeProject/ShopmeWebParent/category-images/1/computers.png differ
diff --git a/ShopmeProject/ShopmeWebParent/category-images/10/carrier cellphones.png b/ShopmeProject/ShopmeWebParent/category-images/10/carrier cellphones.png
new file mode 100644
index 00000000..4c52a6d2
Binary files /dev/null and b/ShopmeProject/ShopmeWebParent/category-images/10/carrier cellphones.png differ
diff --git a/ShopmeProject/ShopmeWebParent/category-images/2/electronics.png b/ShopmeProject/ShopmeWebParent/category-images/2/electronics.png
new file mode 100644
index 00000000..3e34c916
Binary files /dev/null and b/ShopmeProject/ShopmeWebParent/category-images/2/electronics.png differ
diff --git a/ShopmeProject/ShopmeWebParent/category-images/3/desktop computers.png b/ShopmeProject/ShopmeWebParent/category-images/3/desktop computers.png
new file mode 100644
index 00000000..0ca3f7d5
Binary files /dev/null and b/ShopmeProject/ShopmeWebParent/category-images/3/desktop computers.png differ
diff --git a/ShopmeProject/ShopmeWebParent/category-images/4/laptop computers.png b/ShopmeProject/ShopmeWebParent/category-images/4/laptop computers.png
new file mode 100644
index 00000000..2a03c25a
Binary files /dev/null and b/ShopmeProject/ShopmeWebParent/category-images/4/laptop computers.png differ
diff --git a/ShopmeProject/ShopmeWebParent/category-images/5/computer components.png b/ShopmeProject/ShopmeWebParent/category-images/5/computer components.png
new file mode 100644
index 00000000..c3eeebb5
Binary files /dev/null and b/ShopmeProject/ShopmeWebParent/category-images/5/computer components.png differ
diff --git a/ShopmeProject/ShopmeWebParent/category-images/6/digital cameras.png b/ShopmeProject/ShopmeWebParent/category-images/6/digital cameras.png
new file mode 100644
index 00000000..831538c9
Binary files /dev/null and b/ShopmeProject/ShopmeWebParent/category-images/6/digital cameras.png differ
diff --git a/ShopmeProject/ShopmeWebParent/category-images/7/unlocked cellphones.png b/ShopmeProject/ShopmeWebParent/category-images/7/unlocked cellphones.png
new file mode 100644
index 00000000..de3013e6
Binary files /dev/null and b/ShopmeProject/ShopmeWebParent/category-images/7/unlocked cellphones.png differ
diff --git a/ShopmeProject/ShopmeWebParent/category-images/8/computer memory.png b/ShopmeProject/ShopmeWebParent/category-images/8/computer memory.png
new file mode 100644
index 00000000..716906ea
Binary files /dev/null and b/ShopmeProject/ShopmeWebParent/category-images/8/computer memory.png differ
diff --git a/ShopmeProject/ShopmeWebParent/category-images/9/laptop computers.png b/ShopmeProject/ShopmeWebParent/category-images/9/laptop computers.png
new file mode 100644
index 00000000..2a03c25a
Binary files /dev/null and b/ShopmeProject/ShopmeWebParent/category-images/9/laptop computers.png differ