aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHenning Baldersheim <balder@yahoo-inc.com>2022-04-21 08:34:56 +0200
committergjoranv <gv@verizonmedia.com>2022-05-09 11:12:18 +0200
commitc3090208e3089fa5f29a8b037effd91d2ec692ca (patch)
tree30012383f9080b363de78083b2212f9aed83bbd8
parent50bf1672e56574db80ccddcd8f0f058031782347 (diff)
Move to non-public impl package.
-rw-r--r--container-disc/src/main/java/com/yahoo/container/jdisc/ConfiguredApplication.java2
-rw-r--r--jdisc_core/src/main/java/com/yahoo/jdisc/core/ApplicationLoader.java2
-rw-r--r--vespalog/src/main/java/com/yahoo/log/impl/InitializeLog.java (renamed from vespalog/src/main/java/com/yahoo/log/InitializeLog.java)4
-rw-r--r--vespalog/src/main/java/com/yahoo/log/impl/package-info.java5
4 files changed, 10 insertions, 3 deletions
diff --git a/container-disc/src/main/java/com/yahoo/container/jdisc/ConfiguredApplication.java b/container-disc/src/main/java/com/yahoo/container/jdisc/ConfiguredApplication.java
index 0fa2c248df2..ab764e97fa0 100644
--- a/container-disc/src/main/java/com/yahoo/container/jdisc/ConfiguredApplication.java
+++ b/container-disc/src/main/java/com/yahoo/container/jdisc/ConfiguredApplication.java
@@ -42,7 +42,7 @@ import com.yahoo.jrt.Supervisor;
import com.yahoo.jrt.Transport;
import com.yahoo.jrt.slobrok.api.Register;
import com.yahoo.jrt.slobrok.api.SlobrokList;
-import com.yahoo.log.InitializeLog;
+import com.yahoo.log.impl.InitializeLog;
import com.yahoo.messagebus.network.rpc.SlobrokConfigSubscriber;
import com.yahoo.net.HostName;
import com.yahoo.vespa.config.ConfigKey;
diff --git a/jdisc_core/src/main/java/com/yahoo/jdisc/core/ApplicationLoader.java b/jdisc_core/src/main/java/com/yahoo/jdisc/core/ApplicationLoader.java
index 4ccec132ccc..601a96da24d 100644
--- a/jdisc_core/src/main/java/com/yahoo/jdisc/core/ApplicationLoader.java
+++ b/jdisc_core/src/main/java/com/yahoo/jdisc/core/ApplicationLoader.java
@@ -16,7 +16,7 @@ import com.yahoo.jdisc.application.OsgiHeader;
import com.yahoo.jdisc.service.ContainerNotReadyException;
import com.yahoo.jdisc.service.CurrentContainer;
import com.yahoo.jdisc.statistics.ContainerWatchdogMetrics;
-import com.yahoo.log.InitializeLog;
+import com.yahoo.log.impl.InitializeLog;
import com.yahoo.log.LogSetup;
import org.osgi.framework.Bundle;
import org.osgi.framework.BundleContext;
diff --git a/vespalog/src/main/java/com/yahoo/log/InitializeLog.java b/vespalog/src/main/java/com/yahoo/log/impl/InitializeLog.java
index d8b97c2e5ca..9b309916469 100644
--- a/vespalog/src/main/java/com/yahoo/log/InitializeLog.java
+++ b/vespalog/src/main/java/com/yahoo/log/impl/InitializeLog.java
@@ -1,4 +1,6 @@
-package com.yahoo.log;
+package com.yahoo.log.impl;
+
+import com.yahoo.log.LogSetup;
/**
* Sets up Vespa logging. Call a setup method to set up this.
diff --git a/vespalog/src/main/java/com/yahoo/log/impl/package-info.java b/vespalog/src/main/java/com/yahoo/log/impl/package-info.java
new file mode 100644
index 00000000000..ac6fe22b9cf
--- /dev/null
+++ b/vespalog/src/main/java/com/yahoo/log/impl/package-info.java
@@ -0,0 +1,5 @@
+// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+@ExportPackage
+package com.yahoo.log.impl;
+
+import com.yahoo.osgi.annotation.ExportPackage;