Modified apps folder search to look for apps instead of brjs-apps.

brjs-core-tests/src/test-integration/java/org/bladerunnerjs/api/memoization/BundleCachingIntegrationTest.java

@@ -51,12 +51,12 @@ public void stopServer() throws Exception {
 	}
 
 	@After
-	public void deleteCreatedBrjsAppsDirFromTemp() throws IOException {
+	public void deleteCreatedAppsDirFromTemp() throws IOException {
 		if (secondaryTempFolder != null) FileUtils.deleteQuietly(secondaryTempFolder);
 	}
 
 	@Test @Ignore //TODO: this test is unreliable - fix it
-	public void fileWatcherDetectsChangesWhenBrjsAppsAtTheSameLevelAsSdk() throws Exception {
+	public void fileWatcherDetectsChangesWhenAppsAtTheSameLevelAsSdk() throws Exception {
 		given(brjs).hasBeenAuthenticallyCreatedWithFileWatcherThread();
 			App app = brjs.app("app1");
 			Aspect aspect = app.defaultAspect();
@@ -72,7 +72,7 @@ public void fileWatcherDetectsChangesWhenBrjsAppsAtTheSameLevelAsSdk() throws Ex
 	}
 
 	@Test @Ignore //TODO: this test is unreliable - fix it
-	public void fileWatcherPollsFolderBrjsAppsAtTheSameLevelAsSdk() throws Throwable {
+	public void fileWatcherPollsFolderAppsAtTheSameLevelAsSdk() throws Throwable {
 		given(brjs).hasBeenAuthenticallyCreatedWithFilePollingThread();
 		App app = brjs.app("app1");
 		Aspect aspect = app.defaultAspect();
@@ -148,10 +148,10 @@ public void exceptionIsThrownIfFileObserverValueIsInvalid() throws Throwable {
 	}
 
 	@Test @Ignore
-	public void fileWatcherDetectsChangesWhenBrjsAppsAtAnotherLevelThanTheSdk() throws Exception {
+	public void fileWatcherDetectsChangesWhenAppsAtAnotherLevelThanTheSdk() throws Exception {
 		secondaryTempFolder = org.bladerunnerjs.utility.FileUtils.createTemporaryDirectory(BRJSTest.class);
-		given(secondaryTempFolder).containsFolder("brjs-apps")
-			.and(brjs).hasBeenAuthenticallyCreatedWithFileWatcherThreadAndWorkingDir(new File(secondaryTempFolder, "brjs-apps"));
+		given(secondaryTempFolder).containsFolder("apps")
+			.and(brjs).hasBeenAuthenticallyCreatedWithFileWatcherThreadAndWorkingDir(new File(secondaryTempFolder, "apps"));
 			App app = brjs.app("app1");
 			Aspect aspect = app.defaultAspect();
 			given(app).hasBeenCreated()

brjs-core-tests/src/test-integration/java/org/bladerunnerjs/api/memoization/FileModificationRegistryThreadSafetyTest.java

@@ -24,7 +24,7 @@ public class FileModificationRegistryThreadSafetyTest
 
 	@Before
 	public void setup() throws Exception {
-		testSdkDirectory = BRJSTestModelFactory.createTestSdkDirectory();
+		testSdkDirectory = BRJSTestModelFactory.createRootTestDir();
 		fileInRoot = new File(testSdkDirectory, "some-file.txt");
 		dirInRoot = new File(testSdkDirectory, "some-dir");
 		fileInChildDir = new File(dirInRoot, "nested-file.txt");

brjs-core-tests/src/test-integration/java/org/bladerunnerjs/api/memoization/FileObserverTest.java

@@ -181,25 +181,25 @@ public void fileVersionIsIncrementedForDeletedFilesInASubDirDir() throws Excepti
 	public void fileVersionIsIncrementedForDirsInASeperateAppsDirectory() throws Exception {
 		brjs.close();
 		secondaryTempFolder = org.bladerunnerjs.utility.FileUtils.createTemporaryDirectory(BRJSTest.class);
-		File brjsAppsDir = new File(secondaryTempFolder, "brjs-apps");
-		brjsAppsDir.mkdir();
+		File appsDir = new File(secondaryTempFolder, "apps");
+		appsDir.mkdir();
 
 		given(brjs).hasBeenCreatedWithWorkingDir(secondaryTempFolder);
 		modificationRegistry = brjs.getFileModificationRegistry();
 		fileObserver = fileObserverFactory.createObserver(brjs);
 		brjsDir = brjs.dir().getUnderlyingFile();
 
-		File dir1 = new File(brjsAppsDir, "dir1");
+		File dir1 = new File(appsDir, "dir1");
 		File file = new File(dir1, "someFile.txt");
 		file.getParentFile().mkdirs();
 		fileObserver.start();
 		long oldFileVersion = modificationRegistry.getFileVersion(file);
 		long oldDir1Version = modificationRegistry.getFileVersion(dir1);
-		long oldDir2Version = modificationRegistry.getFileVersion(brjsAppsDir);
+		long oldDir2Version = modificationRegistry.getFileVersion(appsDir);
 		file.createNewFile();
 		assertVersionIncreased(oldFileVersion, file);
 		assertVersionIncreased(oldDir1Version, dir1);
-		assertVersionIncreased(oldDir2Version, brjsAppsDir);
+		assertVersionIncreased(oldDir2Version, appsDir);
 	}
 
 	@Test

brjs-core-tests/src/test-integration/java/org/bladerunnerjs/spec/DashboardLoadingTest.java

@@ -32,7 +32,7 @@ public static void main(String[] args) throws Exception {
 
 	@Before
 	public void initTestObjects() throws Exception {
-		testSdkDirectory = new File("../brjs-sdk/sdk/").getAbsoluteFile();
+		testRootDirectory = new File("../brjs-sdk/sdk/").getAbsoluteFile();
 		System.out.print("BRJS initialization: ");
 		long startTime = new Date().getTime();
 		given(brjs).hasBeenAuthenticallyCreated();

brjs-core-tests/src/test-integration/java/org/bladerunnerjs/spec/brjs/appserver/AppServerTest.java

@@ -55,7 +55,7 @@ public void initTestObjects() throws Exception {
 			.and(brjs).hasContentPlugins(new MockContentPlugin())
 			.and(brjs).hasBeenCreated()
 			.and(brjs).localeSwitcherHasContents("locale-forwarder.js")
-			.and(brjs).containsFolder("brjs-apps")
+			.and(brjs).containsFolder("apps")
 			.and(brjs).containsFolder("sdk/system-applications");
 			brjs.bladerunnerConf().setJettyPort(appServerPort);
 			brjs.bladerunnerConf().write();
@@ -104,6 +104,8 @@ public void appIsDeployedWhenAppServerStarts() throws Exception
 		then(appServer).requestCanBeMadeFor("/app1")
 			.and(appServer).requestIs302Redirected("/","/dashboard")
 			.and(logging).infoMessageReceived(SERVER_STARTING_LOG_MSG, "BladeRunnerJS")
+			.and(logging).infoMessageReceived(BRJS.Messages.NO_APPS_DISCOVERED, "system")
+			.and(logging).infoMessageReceived(BRJS.Messages.APPS_DISCOVERED, "User", "app1")
 			.and(logging).infoMessageReceived(SERVER_STARTED_LOG_MESSAGE, appServerPort)
 			.and(logging).debugMessageReceived(DEPLOYING_APP_MSG, "app1");
 	}
@@ -216,6 +218,9 @@ public void otherServletsCanBeAddedWithRootMapping() throws Exception
 			.and(templates).templateGroupCreated()
 			.and(templates.template("app")).containsFile("fileForApp.txt")
 			.and(app1).hasBeenPopulated("default")
+			.and(app1).containsFileWithContents("app.conf", "localeCookieName: BRJS.LOCALE\n"
+					+ "locales: en\n"
+					+ "requirePrefix: app1")
 			.and(appServer).started()
 			.and(appServer).appHasServlet(app1, helloWorldServlet, "/servlet/hello/*");
 		then(appServer).requestForUrlReturns("/app1/servlet/hello", "Hello World!");
@@ -228,6 +233,9 @@ public void otherServletsCanBeAddedWithExtensionMapping() throws Exception
 			.and(templates).templateGroupCreated()
 			.and(templates.template("app")).containsFile("fileForApp.txt")
 			.and(app1).hasBeenPopulated("default")
+			.and(app1).containsFileWithContents("app.conf", "localeCookieName: BRJS.LOCALE\n"
+					+ "locales: en\n"
+					+ "requirePrefix: app1")
 			.and(appServer).started()
 			.and(appServer).appHasServlet(app1, helloWorldServlet, "*.mock");
 		then(appServer).requestForUrlReturns("/app1/hello.mock", "Hello World!");
@@ -248,7 +256,7 @@ public void newAppsAreAutomaticallyHostedWhenRunningCreateAppCommandFromADiffere
 	@Test
 	public void newAppsAreAutomaticallyHostedWhenRunningCreateAppCommandFromADifferentModelInstanceAndOnlyAppsDirectoryExists() throws Exception
 	{
-		given(brjs).doesNotContainFolder("brjs-apps")
+		given(brjs).doesNotContainFolder("apps")
 			.and(brjs).containsFolder("apps")
 			.and(brjs).hasBeenAuthenticallyCreated(); 
 			/*and*/ secondBrjsProcess.close(); secondBrjsProcess = createNonTestModel();
@@ -301,7 +309,7 @@ public void fileWatcherThreadDoesntThrowAnExceptionWhenAFileExistsInAppsDir() th
 	{
 		given(brjs).hasBeenAuthenticallyCreatedWithFileWatcherThread()
 			.and(templates).templateGroupCreated()
-			.and(brjs).containsFile("brjs-apps/file.txt")
+			.and(brjs).containsFile("apps/file.txt")
 			.and(brjs.applicationServer(appServerPort)).started();
 		when(secondBrjsProcess).runCommand("create-app", "app1", "blah")
 			.and(app1Conf).localesUpdatedTo("en", "de");
@@ -311,6 +319,9 @@ public void fileWatcherThreadDoesntThrowAnExceptionWhenAFileExistsInAppsDir() th
 	@Test
 	public void errorCode500IsThrownIfBadFileIsRequired() throws Exception {
 		given(app1.defaultAspect()).indexPageRequires("appns/App")
+			.and(app1).containsFileWithContents("app.conf", "localeCookieName: BRJS.LOCALE\n"
+					+ "locales: en\n"
+					+ "requirePrefix: app1")
 			.and(app1.defaultAspect()).classFileHasContent("appns/App", "require('badFile')")
 			.and(appServer).started();
 		then(appServer).requestForUrlContains("/app1/v/dev/js/dev/combined/bundle.js", "Error 500");
@@ -319,6 +330,9 @@ public void errorCode500IsThrownIfBadFileIsRequired() throws Exception {
 	@Test
 	public void errorCode400IsThrownIfTheRequestIsMalformed() throws Exception {
 		given(app1.defaultAspect()).indexPageHasContent("")
+			.and(app1).containsFileWithContents("app.conf", "localeCookieName: BRJS.LOCALE\n"
+					+ "locales: en\n"
+					+ "requirePrefix: app1")
 			.and(appServer).started();
 		then(appServer).requestForUrlContains("/app1/v/dev/js/malformed-request", "Error 400");
 	}

brjs-core-tests/src/test-integration/java/org/bladerunnerjs/spec/brjs/appserver/ServedAppBundleTest.java

@@ -33,6 +33,9 @@ public void initTestObjects() throws Exception {
 		BladeWorkbench workbench = b1.workbench();
 
 		given(app).hasBeenPopulated("default")
+			.and(app).containsFileWithContents("app.conf", "localeCookieName: BRJS.LOCALE\n"
+					+ "locales: en\n"
+					+ "requirePrefix: appns")
 			.and(aspect).hasClass("appns/Class1")
 			.and(aspect).indexPageRefersTo("appns.Class1")
 			.and(b1).hasClass("appns/bs/b1/Class")