Add missing export for OSGI.

7 files changed, 18 insertions, 9 deletions

diff --git a/node-admin/src/main/application/services.xml b/node-admin/src/main/application/services.xml
index 8cb1d450035..94e9a405ee4 100644
--- a/node-admin/src/main/application/services.xml
+++ b/node-admin/src/main/application/services.xml
@@ -5,7 +5,7 @@
     <handler id="com.yahoo.vespa.hosted.node.admin.restapi" bundle="node-admin">
       <binding>http://*/rest/*</binding>
     </handler>
-    <component id="node-admin" class="com.yahoo.vespa.hosted.node.admin.ComponentsProviderImpl" bundle="node-admin"/>
+    <component id="node-admin" class="com.yahoo.vespa.hosted.node.admin.provider.ComponentsProviderImpl" bundle="node-admin"/>
     <component id="docker" class="com.yahoo.vespa.hosted.node.admin.docker.DockerImpl" bundle="node-admin"/>
 
     <config name='nodeadmin.docker.docker'>
diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/ComponentsProvider.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/provider/ComponentsProvider.java
index 391a76c9ed7..343ac24b20f 100644
--- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/ComponentsProvider.java
+++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/provider/ComponentsProvider.java
@@ -1,4 +1,6 @@
-package com.yahoo.vespa.hosted.node.admin;
+package com.yahoo.vespa.hosted.node.admin.provider;
+
+import com.yahoo.vespa.hosted.node.admin.NodeAdminStateUpdater;
 
 /**
  * Class for setting up instances of classes; enables testing.
diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/ComponentsProviderImpl.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/provider/ComponentsProviderImpl.java
index b1638c62359..1bdc59f22ea 100644
--- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/ComponentsProviderImpl.java
+++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/provider/ComponentsProviderImpl.java
@@ -1,6 +1,11 @@
-package com.yahoo.vespa.hosted.node.admin;
+package com.yahoo.vespa.hosted.node.admin.provider;
 
 import com.yahoo.vespa.applicationmodel.HostName;
+import com.yahoo.vespa.hosted.node.admin.NodeAdmin;
+import com.yahoo.vespa.hosted.node.admin.NodeAdminImpl;
+import com.yahoo.vespa.hosted.node.admin.NodeAdminStateUpdater;
+import com.yahoo.vespa.hosted.node.admin.NodeAgent;
+import com.yahoo.vespa.hosted.node.admin.NodeAgentImpl;
 import com.yahoo.vespa.hosted.node.admin.docker.Docker;
 import com.yahoo.vespa.hosted.node.admin.noderepository.NodeRepository;
 import com.yahoo.vespa.hosted.node.admin.noderepository.NodeRepositoryImpl;
@@ -16,7 +21,7 @@ import java.util.function.Function;
  *
  * @author dybis
  */
-public class ComponentsProviderImpl implements ComponentsProvider{
+public class ComponentsProviderImpl implements ComponentsProvider {
 
     private final Docker docker;
     private static final long INITIAL_SCHEDULER_DELAY_SECONDS = 0;
diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/provider/package-info.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/provider/package-info.java
new file mode 100644
index 00000000000..468577e8f4f
--- /dev/null
+++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/provider/package-info.java
@@ -0,0 +1,5 @@
+// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+@ExportPackage
+package com.yahoo.vespa.hosted.node.admin.provider;
+
+import com.yahoo.osgi.annotation.ExportPackage;
diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/restapi/RestApiHandler.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/restapi/RestApiHandler.java
index 06fb9f63148..bab9c521024 100644
--- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/restapi/RestApiHandler.java
+++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/restapi/RestApiHandler.java
@@ -5,7 +5,7 @@ import com.yahoo.container.jdisc.HttpResponse;
 import com.yahoo.container.jdisc.LoggingRequestHandler;
 import com.yahoo.container.logging.AccessLog;
 
-import com.yahoo.vespa.hosted.node.admin.ComponentsProvider;
+import com.yahoo.vespa.hosted.node.admin.provider.ComponentsProvider;
 import com.yahoo.vespa.hosted.node.admin.NodeAdminStateUpdater;
 
 import javax.ws.rs.core.MediaType;
diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/restapi/package-info.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/restapi/package-info.java
index f25374efa9e..5e5bd002950 100644
--- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/restapi/package-info.java
+++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/restapi/package-info.java
@@ -1,7 +1,5 @@
 // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 @ExportPackage
-@PublicApi
 package com.yahoo.vespa.hosted.node.admin.restapi;
 
-import com.yahoo.api.annotations.PublicApi;
 import com.yahoo.osgi.annotation.ExportPackage;
\ No newline at end of file
diff --git a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/integrationTests/ComponentsProviderWithMocks.java b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/integrationTests/ComponentsProviderWithMocks.java
index 752b401d840..cf147ce7936 100644
--- a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/integrationTests/ComponentsProviderWithMocks.java
+++ b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/integrationTests/ComponentsProviderWithMocks.java
@@ -1,8 +1,7 @@
 package com.yahoo.vespa.hosted.node.admin.integrationTests;
 
-import com.yahoo.vespa.hosted.node.admin.ComponentsProvider;
+import com.yahoo.vespa.hosted.node.admin.provider.ComponentsProvider;
 import com.yahoo.vespa.hosted.node.admin.NodeAdminStateUpdater;
-import com.yahoo.vespa.hosted.node.admin.noderepository.NodeRepository;
 
 /**
  * For setting up test with mocks.