More rc6 fixes (#1689)

* the error messages set by prepareExec() should contain list of erroneous projects
* fix permissions of /var/share/opengrok
fixes #1688

Author: Vladimir Kotal

platform/solaris/ips/create.sh

@@ -196,6 +196,9 @@ done
 
 PKG pkgsend add dir mode=0755 owner=webservd group=webservd path=/var/opengrok
 
+PKG pkgsend add dir mode=0755 owner=webservd group=webservd \
+    path=/var/.migrate/opengrok
+
 for dirname in data etc log src
 do
    #

src/org/opensolaris/opengrok/web/SearchHelper.java

@@ -262,17 +262,25 @@ public SearchHelper prepareExec(SortedSet<String> projects) {
                 // Check list of project names first to make sure all of them
                 // are valid and indexed.
                 closeOnDestroy = false;
-                Set <Project> projectSet = projects.stream().
-                    map(x -> Project.getByName(x)).collect(Collectors.toSet());
-                if (projectSet.contains(null)) {
-                    errorMsg = "Project list contains invalid projects";
+                Set<String> invalidProjects = projects.stream().
+                    filter(proj -> (Project.getByName(proj) == null)).
+                    collect(Collectors.toSet());
+                if (invalidProjects.size() > 0) {
+                    errorMsg = "Project list contains invalid projects: " +
+                        String.join(", ", invalidProjects);
                     return this;
                 }
-                if (projectSet.stream().
+                Set<Project> notIndexedProjects =
+                    projects.stream().
+                    map(x -> Project.getByName(x)).
                     filter(proj -> !proj.isIndexed()).
-                    collect(Collectors.toSet()).size() > 0) {
-                        errorMsg = "Some of the projects to be searched are not indexed yet.";
-                        return this;
+                    collect(Collectors.toSet());
+                if (notIndexedProjects.size() > 0) {
+                    errorMsg = "Some of the projects to be searched are not indexed yet: " +
+                        String.join(", ", notIndexedProjects.stream().
+                        map(proj -> proj.getName()).
+                        collect(Collectors.toSet()));
+                    return this;
                 }
 
                 // We use MultiReader even for single project. This should

test/org/opensolaris/opengrok/web/SearchHelperTest.java

@@ -182,13 +182,18 @@ public void testPrepareExecInvalidInput() {
         // Fake project addition to avoid reindex.
         Project project = new Project("c", "/c");
         env.getProjects().put("c", project);
+        project = new Project("java", "/java");
+        project.setIndexed(true);
+        env.getProjects().put("java", project);
 
         // Try to prepare search for project that is not yet indexed.
         projectNames.add("c");
+        projectNames.add("java");
         searchHelper = this.getSearchHelper("foobar")
             .prepareExec(projectNames);
         Assert.assertNotNull(searchHelper.errorMsg);
         Assert.assertTrue(searchHelper.errorMsg.contains("not indexed"));
+        Assert.assertFalse(searchHelper.errorMsg.contains("java"));
 
         // Try to prepare search for list that contains non-existing project.
         projectNames.add("totally_nonexistent_project");