Fix issues after merge

Author: ahornace

test/org/opensolaris/opengrok/history/RepositoryFactoryTest.java renamed to opengrok-indexer/src/test/java/org/opengrok/indexer/history/RepositoryFactoryTest.java

@@ -20,15 +20,15 @@
 /*
  * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
  */
-package org.opensolaris.opengrok.history;
+package org.opengrok.indexer.history;
 
 import java.io.File;
 import java.lang.reflect.InvocationTargetException;
 import org.junit.AfterClass;
 import static org.junit.Assert.assertFalse;
 import org.junit.BeforeClass;
 import org.junit.Test;
-import org.opensolaris.opengrok.util.TestRepository;
+import org.opengrok.indexer.util.TestRepository;
 
 /**
  * Test RepositoryFactory

opengrok-web/src/main/java/org/opengrok/web/AuthorizationFilter.java

@@ -35,7 +35,8 @@
 import javax.servlet.http.HttpServletResponse;
 import org.opengrok.indexer.configuration.Project;
 import org.opengrok.indexer.logger.LoggerFactory;
-import org.opengrok.indexer.web.api.v1.RestApp;
+import org.opengrok.indexer.web.PageConfig;
+import org.opengrok.web.api.v1.RestApp;
 
 public class AuthorizationFilter implements Filter {