From ba43ccbd5f6e18926c4dcc0b461ef70691365294 Mon Sep 17 00:00:00 2001
From: Kris De Volder <kdevolder@pivotal.io>
Date: Thu, 20 Oct 2016 11:24:15 -0700
Subject: [PATCH] vscode-application-yaml package renames

Bring package names in line with project name
---
 vscode-extensions/vscode-application-yaml/lib/Main.ts     | 2 +-
 .../yaml/ApplicationYamlLanguageServer.java               | 4 ++--
 .../{ => application}/yaml/ApplicationYamlProblems.java   | 2 +-
 .../yaml/DefaultSpringPropertyIndexProvider.java          | 2 +-
 .../ide/vscode/{ => application}/yaml/Main.java           | 2 +-
 .../yaml/quickfix/ReplaceDeprecatedYamlQuickfix.java      | 4 ++--
 .../yaml/reconcile/ApplicationYamlASTReconciler.java      | 8 ++++----
 .../yaml/reconcile/ApplicationYamlReconcileEngine.java    | 6 +++---
 .../yaml/reconcile/SpringPropertiesProblemType.java       | 2 +-
 .../yaml/reconcile/SpringPropertyProblem.java             | 2 +-
 .../{ => application}/yaml/AbstractPropsEditorTest.java   | 5 +++--
 .../{ => application}/yaml/ApplicationYamlEditorTest.java | 2 +-
 .../yaml/ApplicationYamlLanguageServerTests.java          | 3 ++-
 .../{ => application}/yaml/PropertyIndexHarness.java      | 2 +-
 .../{ => application}/yaml/StyledStringMatcher.java       | 2 +-
 15 files changed, 25 insertions(+), 23 deletions(-)
 rename vscode-extensions/vscode-application-yaml/src/main/java/org/springframework/ide/vscode/{ => application}/yaml/ApplicationYamlLanguageServer.java (96%)
 rename vscode-extensions/vscode-application-yaml/src/main/java/org/springframework/ide/vscode/{ => application}/yaml/ApplicationYamlProblems.java (95%)
 rename vscode-extensions/vscode-application-yaml/src/main/java/org/springframework/ide/vscode/{ => application}/yaml/DefaultSpringPropertyIndexProvider.java (95%)
 rename vscode-extensions/vscode-application-yaml/src/main/java/org/springframework/ide/vscode/{ => application}/yaml/Main.java (98%)
 rename vscode-extensions/vscode-application-yaml/src/main/java/org/springframework/ide/vscode/{ => application}/yaml/quickfix/ReplaceDeprecatedYamlQuickfix.java (97%)
 rename vscode-extensions/vscode-application-yaml/src/main/java/org/springframework/ide/vscode/{ => application}/yaml/reconcile/ApplicationYamlASTReconciler.java (97%)
 rename vscode-extensions/vscode-application-yaml/src/main/java/org/springframework/ide/vscode/{ => application}/yaml/reconcile/ApplicationYamlReconcileEngine.java (90%)
 rename vscode-extensions/vscode-application-yaml/src/main/java/org/springframework/ide/vscode/{ => application}/yaml/reconcile/SpringPropertiesProblemType.java (98%)
 rename vscode-extensions/vscode-application-yaml/src/main/java/org/springframework/ide/vscode/{ => application}/yaml/reconcile/SpringPropertyProblem.java (93%)
 rename vscode-extensions/vscode-application-yaml/src/test/java/org/springframework/ide/vscode/{ => application}/yaml/AbstractPropsEditorTest.java (96%)
 rename vscode-extensions/vscode-application-yaml/src/test/java/org/springframework/ide/vscode/{ => application}/yaml/ApplicationYamlEditorTest.java (99%)
 rename vscode-extensions/vscode-application-yaml/src/test/java/org/springframework/ide/vscode/{ => application}/yaml/ApplicationYamlLanguageServerTests.java (91%)
 rename vscode-extensions/vscode-application-yaml/src/test/java/org/springframework/ide/vscode/{ => application}/yaml/PropertyIndexHarness.java (99%)
 rename vscode-extensions/vscode-application-yaml/src/test/java/org/springframework/ide/vscode/{ => application}/yaml/StyledStringMatcher.java (98%)

diff --git a/vscode-extensions/vscode-application-yaml/lib/Main.ts b/vscode-extensions/vscode-application-yaml/lib/Main.ts
index 35d67710b..314d81ba9 100644
--- a/vscode-extensions/vscode-application-yaml/lib/Main.ts
+++ b/vscode-extensions/vscode-application-yaml/lib/Main.ts
@@ -103,7 +103,7 @@ export function activate(context: VSCode.ExtensionContext) {
                         let args = [
                             '-Dserver.port=' + port,
                             '-cp', classpath, 
-                            'org.springframework.ide.vscode.yaml.Main'
+                            'org.springframework.ide.vscode.application.yaml.Main'
                         ];
                         if (DEBUG) {
                             args.unshift(DEBUG_ARG);
diff --git a/vscode-extensions/vscode-application-yaml/src/main/java/org/springframework/ide/vscode/yaml/ApplicationYamlLanguageServer.java b/vscode-extensions/vscode-application-yaml/src/main/java/org/springframework/ide/vscode/application/yaml/ApplicationYamlLanguageServer.java
similarity index 96%
rename from vscode-extensions/vscode-application-yaml/src/main/java/org/springframework/ide/vscode/yaml/ApplicationYamlLanguageServer.java
rename to vscode-extensions/vscode-application-yaml/src/main/java/org/springframework/ide/vscode/application/yaml/ApplicationYamlLanguageServer.java
index dbfaa5940..a8b451889 100644
--- a/vscode-extensions/vscode-application-yaml/src/main/java/org/springframework/ide/vscode/yaml/ApplicationYamlLanguageServer.java
+++ b/vscode-extensions/vscode-application-yaml/src/main/java/org/springframework/ide/vscode/application/yaml/ApplicationYamlLanguageServer.java
@@ -1,4 +1,4 @@
-package org.springframework.ide.vscode.yaml;
+package org.springframework.ide.vscode.application.yaml;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -6,6 +6,7 @@ import java.util.concurrent.CompletableFuture;
 
 import org.springframework.ide.vscode.application.properties.metadata.SpringPropertyIndexProvider;
 import org.springframework.ide.vscode.application.properties.metadata.types.TypeUtilProvider;
+import org.springframework.ide.vscode.application.yaml.reconcile.ApplicationYamlReconcileEngine;
 import org.springframework.ide.vscode.commons.languageserver.reconcile.IReconcileEngine;
 import org.springframework.ide.vscode.commons.languageserver.util.SimpleLanguageServer;
 import org.springframework.ide.vscode.commons.languageserver.util.SimpleTextDocumentService;
@@ -13,7 +14,6 @@ import org.springframework.ide.vscode.commons.languageserver.util.TextDocument;
 import org.springframework.ide.vscode.commons.util.Futures;
 import org.springframework.ide.vscode.commons.yaml.ast.YamlASTProvider;
 import org.springframework.ide.vscode.commons.yaml.ast.YamlParser;
-import org.springframework.ide.vscode.yaml.reconcile.ApplicationYamlReconcileEngine;
 import org.yaml.snakeyaml.Yaml;
 
 import io.typefox.lsapi.CompletionItem;
diff --git a/vscode-extensions/vscode-application-yaml/src/main/java/org/springframework/ide/vscode/yaml/ApplicationYamlProblems.java b/vscode-extensions/vscode-application-yaml/src/main/java/org/springframework/ide/vscode/application/yaml/ApplicationYamlProblems.java
similarity index 95%
rename from vscode-extensions/vscode-application-yaml/src/main/java/org/springframework/ide/vscode/yaml/ApplicationYamlProblems.java
rename to vscode-extensions/vscode-application-yaml/src/main/java/org/springframework/ide/vscode/application/yaml/ApplicationYamlProblems.java
index 652fe71a2..5436fe9a0 100644
--- a/vscode-extensions/vscode-application-yaml/src/main/java/org/springframework/ide/vscode/yaml/ApplicationYamlProblems.java
+++ b/vscode-extensions/vscode-application-yaml/src/main/java/org/springframework/ide/vscode/application/yaml/ApplicationYamlProblems.java
@@ -1,4 +1,4 @@
-package org.springframework.ide.vscode.yaml;
+package org.springframework.ide.vscode.application.yaml;
 
 import static org.springframework.ide.vscode.commons.languageserver.reconcile.ProblemSeverity.ERROR;
 
diff --git a/vscode-extensions/vscode-application-yaml/src/main/java/org/springframework/ide/vscode/yaml/DefaultSpringPropertyIndexProvider.java b/vscode-extensions/vscode-application-yaml/src/main/java/org/springframework/ide/vscode/application/yaml/DefaultSpringPropertyIndexProvider.java
similarity index 95%
rename from vscode-extensions/vscode-application-yaml/src/main/java/org/springframework/ide/vscode/yaml/DefaultSpringPropertyIndexProvider.java
rename to vscode-extensions/vscode-application-yaml/src/main/java/org/springframework/ide/vscode/application/yaml/DefaultSpringPropertyIndexProvider.java
index acdfb9d50..32f554d0f 100644
--- a/vscode-extensions/vscode-application-yaml/src/main/java/org/springframework/ide/vscode/yaml/DefaultSpringPropertyIndexProvider.java
+++ b/vscode-extensions/vscode-application-yaml/src/main/java/org/springframework/ide/vscode/application/yaml/DefaultSpringPropertyIndexProvider.java
@@ -1,4 +1,4 @@
-package org.springframework.ide.vscode.yaml;
+package org.springframework.ide.vscode.application.yaml;
 
 import java.nio.file.Path;
 
diff --git a/vscode-extensions/vscode-application-yaml/src/main/java/org/springframework/ide/vscode/yaml/Main.java b/vscode-extensions/vscode-application-yaml/src/main/java/org/springframework/ide/vscode/application/yaml/Main.java
similarity index 98%
rename from vscode-extensions/vscode-application-yaml/src/main/java/org/springframework/ide/vscode/yaml/Main.java
rename to vscode-extensions/vscode-application-yaml/src/main/java/org/springframework/ide/vscode/application/yaml/Main.java
index 51585d3ed..657620c9c 100644
--- a/vscode-extensions/vscode-application-yaml/src/main/java/org/springframework/ide/vscode/yaml/Main.java
+++ b/vscode-extensions/vscode-application-yaml/src/main/java/org/springframework/ide/vscode/application/yaml/Main.java
@@ -1,4 +1,4 @@
-package org.springframework.ide.vscode.yaml;
+package org.springframework.ide.vscode.application.yaml;
 
 import java.io.IOException;
 import java.io.InputStream;
diff --git a/vscode-extensions/vscode-application-yaml/src/main/java/org/springframework/ide/vscode/yaml/quickfix/ReplaceDeprecatedYamlQuickfix.java b/vscode-extensions/vscode-application-yaml/src/main/java/org/springframework/ide/vscode/application/yaml/quickfix/ReplaceDeprecatedYamlQuickfix.java
similarity index 97%
rename from vscode-extensions/vscode-application-yaml/src/main/java/org/springframework/ide/vscode/yaml/quickfix/ReplaceDeprecatedYamlQuickfix.java
rename to vscode-extensions/vscode-application-yaml/src/main/java/org/springframework/ide/vscode/application/yaml/quickfix/ReplaceDeprecatedYamlQuickfix.java
index 4257d56e7..85d01a303 100644
--- a/vscode-extensions/vscode-application-yaml/src/main/java/org/springframework/ide/vscode/yaml/quickfix/ReplaceDeprecatedYamlQuickfix.java
+++ b/vscode-extensions/vscode-application-yaml/src/main/java/org/springframework/ide/vscode/application/yaml/quickfix/ReplaceDeprecatedYamlQuickfix.java
@@ -8,11 +8,12 @@
  * Contributors:
  *     Pivotal, Inc. - initial API and implementation
  *******************************************************************************/
-package org.springframework.ide.vscode.yaml.quickfix;
+package org.springframework.ide.vscode.application.yaml.quickfix;
 
 import java.awt.Image;
 import java.awt.Point;
 
+import org.springframework.ide.vscode.application.yaml.reconcile.SpringPropertyProblem;
 import org.springframework.ide.vscode.commons.languageserver.completion.DocumentEdits;
 import org.springframework.ide.vscode.commons.languageserver.completion.ICompletionProposal;
 import org.springframework.ide.vscode.commons.languageserver.completion.ProposalApplier;
@@ -29,7 +30,6 @@ import org.springframework.ide.vscode.commons.yaml.structure.YamlStructureParser
 import org.springframework.ide.vscode.commons.yaml.structure.YamlStructureParser.SKeyNode;
 import org.springframework.ide.vscode.commons.yaml.structure.YamlStructureParser.SNode;
 import org.springframework.ide.vscode.commons.yaml.structure.YamlStructureParser.SNodeType;
-import org.springframework.ide.vscode.yaml.reconcile.SpringPropertyProblem;
 
 import io.typefox.lsapi.CompletionItemKind;
 
diff --git a/vscode-extensions/vscode-application-yaml/src/main/java/org/springframework/ide/vscode/yaml/reconcile/ApplicationYamlASTReconciler.java b/vscode-extensions/vscode-application-yaml/src/main/java/org/springframework/ide/vscode/application/yaml/reconcile/ApplicationYamlASTReconciler.java
similarity index 97%
rename from vscode-extensions/vscode-application-yaml/src/main/java/org/springframework/ide/vscode/yaml/reconcile/ApplicationYamlASTReconciler.java
rename to vscode-extensions/vscode-application-yaml/src/main/java/org/springframework/ide/vscode/application/yaml/reconcile/ApplicationYamlASTReconciler.java
index 4cc142882..bed8f9e45 100644
--- a/vscode-extensions/vscode-application-yaml/src/main/java/org/springframework/ide/vscode/yaml/reconcile/ApplicationYamlASTReconciler.java
+++ b/vscode-extensions/vscode-application-yaml/src/main/java/org/springframework/ide/vscode/application/yaml/reconcile/ApplicationYamlASTReconciler.java
@@ -1,9 +1,9 @@
-package org.springframework.ide.vscode.yaml.reconcile;
+package org.springframework.ide.vscode.application.yaml.reconcile;
 
+import static org.springframework.ide.vscode.application.yaml.reconcile.SpringPropertiesProblemType.YAML_DEPRECATED;
+import static org.springframework.ide.vscode.application.yaml.reconcile.SpringPropertiesProblemType.YAML_DUPLICATE_KEY;
 import static org.springframework.ide.vscode.commons.yaml.ast.NodeUtil.asScalar;
 import static org.springframework.ide.vscode.commons.yaml.ast.YamlFileAST.getChildren;
-import static org.springframework.ide.vscode.yaml.reconcile.SpringPropertiesProblemType.YAML_DEPRECATED;
-import static org.springframework.ide.vscode.yaml.reconcile.SpringPropertiesProblemType.YAML_DUPLICATE_KEY;
 
 import java.util.HashSet;
 import java.util.List;
@@ -17,6 +17,7 @@ import org.springframework.ide.vscode.application.properties.metadata.types.Type
 import org.springframework.ide.vscode.application.properties.metadata.types.TypeUtil;
 import org.springframework.ide.vscode.application.properties.metadata.types.TypeUtil.BeanPropertyNameMode;
 import org.springframework.ide.vscode.application.properties.metadata.types.TypeUtil.EnumCaseMode;
+import org.springframework.ide.vscode.application.yaml.quickfix.ReplaceDeprecatedYamlQuickfix;
 import org.springframework.ide.vscode.application.properties.metadata.types.TypedProperty;
 import org.springframework.ide.vscode.commons.languageserver.reconcile.IProblemCollector;
 import org.springframework.ide.vscode.commons.util.StringUtil;
@@ -27,7 +28,6 @@ import org.springframework.ide.vscode.commons.yaml.ast.YamlFileAST;
 import org.springframework.ide.vscode.commons.yaml.ast.NodeRef.Kind;
 import org.springframework.ide.vscode.commons.yaml.ast.NodeRef.TupleValueRef;
 import org.springframework.ide.vscode.commons.yaml.reconcile.YamlASTReconciler;
-import org.springframework.ide.vscode.yaml.quickfix.ReplaceDeprecatedYamlQuickfix;
 import org.yaml.snakeyaml.nodes.MappingNode;
 import org.yaml.snakeyaml.nodes.Node;
 import org.yaml.snakeyaml.nodes.NodeId;
diff --git a/vscode-extensions/vscode-application-yaml/src/main/java/org/springframework/ide/vscode/yaml/reconcile/ApplicationYamlReconcileEngine.java b/vscode-extensions/vscode-application-yaml/src/main/java/org/springframework/ide/vscode/application/yaml/reconcile/ApplicationYamlReconcileEngine.java
similarity index 90%
rename from vscode-extensions/vscode-application-yaml/src/main/java/org/springframework/ide/vscode/yaml/reconcile/ApplicationYamlReconcileEngine.java
rename to vscode-extensions/vscode-application-yaml/src/main/java/org/springframework/ide/vscode/application/yaml/reconcile/ApplicationYamlReconcileEngine.java
index 7defadb37..5c82c9350 100644
--- a/vscode-extensions/vscode-application-yaml/src/main/java/org/springframework/ide/vscode/yaml/reconcile/ApplicationYamlReconcileEngine.java
+++ b/vscode-extensions/vscode-application-yaml/src/main/java/org/springframework/ide/vscode/application/yaml/reconcile/ApplicationYamlReconcileEngine.java
@@ -8,22 +8,22 @@
  * Contributors:
  *     Pivotal, Inc. - initial API and implementation
  *******************************************************************************/
-package org.springframework.ide.vscode.yaml.reconcile;
+package org.springframework.ide.vscode.application.yaml.reconcile;
 
-import static org.springframework.ide.vscode.yaml.ApplicationYamlProblems.Type.YAML_SYNTAX_ERROR;
+import static org.springframework.ide.vscode.application.yaml.ApplicationYamlProblems.Type.YAML_SYNTAX_ERROR;
 
 import org.springframework.ide.vscode.application.properties.metadata.IndexNavigator;
 import org.springframework.ide.vscode.application.properties.metadata.PropertyInfo;
 import org.springframework.ide.vscode.application.properties.metadata.SpringPropertyIndexProvider;
 import org.springframework.ide.vscode.application.properties.metadata.types.TypeUtilProvider;
 import org.springframework.ide.vscode.application.properties.metadata.util.FuzzyMap;
+import org.springframework.ide.vscode.application.yaml.ApplicationYamlProblems;
 import org.springframework.ide.vscode.commons.languageserver.reconcile.IProblemCollector;
 import org.springframework.ide.vscode.commons.languageserver.reconcile.ReconcileProblem;
 import org.springframework.ide.vscode.commons.languageserver.util.IDocument;
 import org.springframework.ide.vscode.commons.yaml.ast.YamlASTProvider;
 import org.springframework.ide.vscode.commons.yaml.reconcile.YamlASTReconciler;
 import org.springframework.ide.vscode.commons.yaml.reconcile.YamlReconcileEngine;
-import org.springframework.ide.vscode.yaml.ApplicationYamlProblems;
 
 public class ApplicationYamlReconcileEngine extends YamlReconcileEngine {
 
diff --git a/vscode-extensions/vscode-application-yaml/src/main/java/org/springframework/ide/vscode/yaml/reconcile/SpringPropertiesProblemType.java b/vscode-extensions/vscode-application-yaml/src/main/java/org/springframework/ide/vscode/application/yaml/reconcile/SpringPropertiesProblemType.java
similarity index 98%
rename from vscode-extensions/vscode-application-yaml/src/main/java/org/springframework/ide/vscode/yaml/reconcile/SpringPropertiesProblemType.java
rename to vscode-extensions/vscode-application-yaml/src/main/java/org/springframework/ide/vscode/application/yaml/reconcile/SpringPropertiesProblemType.java
index 57fa02036..e8ee3b2e6 100644
--- a/vscode-extensions/vscode-application-yaml/src/main/java/org/springframework/ide/vscode/yaml/reconcile/SpringPropertiesProblemType.java
+++ b/vscode-extensions/vscode-application-yaml/src/main/java/org/springframework/ide/vscode/application/yaml/reconcile/SpringPropertiesProblemType.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     Pivotal, Inc. - initial API and implementation
  *******************************************************************************/
-package org.springframework.ide.vscode.yaml.reconcile;
+package org.springframework.ide.vscode.application.yaml.reconcile;
 
 import static org.springframework.ide.vscode.commons.languageserver.reconcile.ProblemSeverity.*;
 
diff --git a/vscode-extensions/vscode-application-yaml/src/main/java/org/springframework/ide/vscode/yaml/reconcile/SpringPropertyProblem.java b/vscode-extensions/vscode-application-yaml/src/main/java/org/springframework/ide/vscode/application/yaml/reconcile/SpringPropertyProblem.java
similarity index 93%
rename from vscode-extensions/vscode-application-yaml/src/main/java/org/springframework/ide/vscode/yaml/reconcile/SpringPropertyProblem.java
rename to vscode-extensions/vscode-application-yaml/src/main/java/org/springframework/ide/vscode/application/yaml/reconcile/SpringPropertyProblem.java
index 456887403..8c71402a3 100644
--- a/vscode-extensions/vscode-application-yaml/src/main/java/org/springframework/ide/vscode/yaml/reconcile/SpringPropertyProblem.java
+++ b/vscode-extensions/vscode-application-yaml/src/main/java/org/springframework/ide/vscode/application/yaml/reconcile/SpringPropertyProblem.java
@@ -1,4 +1,4 @@
-package org.springframework.ide.vscode.yaml.reconcile;
+package org.springframework.ide.vscode.application.yaml.reconcile;
 
 import org.springframework.ide.vscode.application.properties.metadata.PropertyInfo;
 import org.springframework.ide.vscode.commons.languageserver.quickfix.ProblemFixer;
diff --git a/vscode-extensions/vscode-application-yaml/src/test/java/org/springframework/ide/vscode/yaml/AbstractPropsEditorTest.java b/vscode-extensions/vscode-application-yaml/src/test/java/org/springframework/ide/vscode/application/yaml/AbstractPropsEditorTest.java
similarity index 96%
rename from vscode-extensions/vscode-application-yaml/src/test/java/org/springframework/ide/vscode/yaml/AbstractPropsEditorTest.java
rename to vscode-extensions/vscode-application-yaml/src/test/java/org/springframework/ide/vscode/application/yaml/AbstractPropsEditorTest.java
index 7b5adf134..7e9882864 100644
--- a/vscode-extensions/vscode-application-yaml/src/test/java/org/springframework/ide/vscode/yaml/AbstractPropsEditorTest.java
+++ b/vscode-extensions/vscode-application-yaml/src/test/java/org/springframework/ide/vscode/application/yaml/AbstractPropsEditorTest.java
@@ -1,4 +1,4 @@
-package org.springframework.ide.vscode.yaml;
+package org.springframework.ide.vscode.application.yaml;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.fail;
@@ -13,12 +13,13 @@ import org.junit.Before;
 import org.springframework.ide.vscode.application.properties.metadata.SpringPropertyIndexProvider;
 import org.springframework.ide.vscode.application.properties.metadata.types.TypeUtil;
 import org.springframework.ide.vscode.application.properties.metadata.types.TypeUtilProvider;
+import org.springframework.ide.vscode.application.yaml.ApplicationYamlLanguageServer;
+import org.springframework.ide.vscode.application.yaml.PropertyIndexHarness.ItemConfigurer;
 import org.springframework.ide.vscode.commons.java.IJavaProject;
 import org.springframework.ide.vscode.commons.languageserver.util.IDocument;
 import org.springframework.ide.vscode.commons.languageserver.util.SimpleLanguageServer;
 import org.springframework.ide.vscode.languageserver.testharness.Editor;
 import org.springframework.ide.vscode.languageserver.testharness.LanguageServerHarness;
-import org.springframework.ide.vscode.yaml.PropertyIndexHarness.ItemConfigurer;
 
 import io.typefox.lsapi.CompletionItem;
 
diff --git a/vscode-extensions/vscode-application-yaml/src/test/java/org/springframework/ide/vscode/yaml/ApplicationYamlEditorTest.java b/vscode-extensions/vscode-application-yaml/src/test/java/org/springframework/ide/vscode/application/yaml/ApplicationYamlEditorTest.java
similarity index 99%
rename from vscode-extensions/vscode-application-yaml/src/test/java/org/springframework/ide/vscode/yaml/ApplicationYamlEditorTest.java
rename to vscode-extensions/vscode-application-yaml/src/test/java/org/springframework/ide/vscode/application/yaml/ApplicationYamlEditorTest.java
index 92dee94dd..447a9ca35 100644
--- a/vscode-extensions/vscode-application-yaml/src/test/java/org/springframework/ide/vscode/yaml/ApplicationYamlEditorTest.java
+++ b/vscode-extensions/vscode-application-yaml/src/test/java/org/springframework/ide/vscode/application/yaml/ApplicationYamlEditorTest.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     Pivotal, Inc. - initial API and implementation
  *******************************************************************************/
-package org.springframework.ide.vscode.yaml;
+package org.springframework.ide.vscode.application.yaml;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
diff --git a/vscode-extensions/vscode-application-yaml/src/test/java/org/springframework/ide/vscode/yaml/ApplicationYamlLanguageServerTests.java b/vscode-extensions/vscode-application-yaml/src/test/java/org/springframework/ide/vscode/application/yaml/ApplicationYamlLanguageServerTests.java
similarity index 91%
rename from vscode-extensions/vscode-application-yaml/src/test/java/org/springframework/ide/vscode/yaml/ApplicationYamlLanguageServerTests.java
rename to vscode-extensions/vscode-application-yaml/src/test/java/org/springframework/ide/vscode/application/yaml/ApplicationYamlLanguageServerTests.java
index 17b25b051..883b73ab2 100644
--- a/vscode-extensions/vscode-application-yaml/src/test/java/org/springframework/ide/vscode/yaml/ApplicationYamlLanguageServerTests.java
+++ b/vscode-extensions/vscode-application-yaml/src/test/java/org/springframework/ide/vscode/application/yaml/ApplicationYamlLanguageServerTests.java
@@ -1,4 +1,4 @@
-package org.springframework.ide.vscode.yaml;
+package org.springframework.ide.vscode.application.yaml;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
@@ -8,6 +8,7 @@ import java.nio.file.Paths;
 import java.util.concurrent.Callable;
 
 import org.junit.Test;
+import org.springframework.ide.vscode.application.yaml.ApplicationYamlLanguageServer;
 import org.springframework.ide.vscode.languageserver.testharness.LanguageServerHarness;
 
 import io.typefox.lsapi.InitializeResult;
diff --git a/vscode-extensions/vscode-application-yaml/src/test/java/org/springframework/ide/vscode/yaml/PropertyIndexHarness.java b/vscode-extensions/vscode-application-yaml/src/test/java/org/springframework/ide/vscode/application/yaml/PropertyIndexHarness.java
similarity index 99%
rename from vscode-extensions/vscode-application-yaml/src/test/java/org/springframework/ide/vscode/yaml/PropertyIndexHarness.java
rename to vscode-extensions/vscode-application-yaml/src/test/java/org/springframework/ide/vscode/application/yaml/PropertyIndexHarness.java
index c3a7e0124..408d71799 100644
--- a/vscode-extensions/vscode-application-yaml/src/test/java/org/springframework/ide/vscode/yaml/PropertyIndexHarness.java
+++ b/vscode-extensions/vscode-application-yaml/src/test/java/org/springframework/ide/vscode/application/yaml/PropertyIndexHarness.java
@@ -1,4 +1,4 @@
-package org.springframework.ide.vscode.yaml;
+package org.springframework.ide.vscode.application.yaml;
 
 import java.nio.file.Path;
 import java.util.LinkedHashMap;
diff --git a/vscode-extensions/vscode-application-yaml/src/test/java/org/springframework/ide/vscode/yaml/StyledStringMatcher.java b/vscode-extensions/vscode-application-yaml/src/test/java/org/springframework/ide/vscode/application/yaml/StyledStringMatcher.java
similarity index 98%
rename from vscode-extensions/vscode-application-yaml/src/test/java/org/springframework/ide/vscode/yaml/StyledStringMatcher.java
rename to vscode-extensions/vscode-application-yaml/src/test/java/org/springframework/ide/vscode/application/yaml/StyledStringMatcher.java
index c04fa5e50..057374484 100644
--- a/vscode-extensions/vscode-application-yaml/src/test/java/org/springframework/ide/vscode/yaml/StyledStringMatcher.java
+++ b/vscode-extensions/vscode-application-yaml/src/test/java/org/springframework/ide/vscode/application/yaml/StyledStringMatcher.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     Pivotal, Inc. - initial API and implementation
  *******************************************************************************/
-package org.springframework.ide.vscode.yaml;
+package org.springframework.ide.vscode.application.yaml;
 
 //import org.eclipse.jface.viewers.StyledString;
 //import org.eclipse.swt.custom.StyleRange;