Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ lazy val ComputingUnitManagingService = (project in file("computing-unit-managin
"com.fasterxml.jackson.module" %% "jackson-module-scala" % "2.17.0"
)
)
lazy val FileService = (project in file("core/file-service"))
lazy val FileService = (project in file("file-service"))
.dependsOn(WorkflowCore, Auth, Config)
.configs(Test)
.dependsOn(DAO % "test->test") // test scope dependency
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,6 @@ object PathUtils {
}
}

lazy val fileServicePath: Path = corePath.resolve("file-service")

lazy val configServicePath: Path = corePath.resolve("config-service")

lazy val accessControlServicePath: Path = corePath.resolve("access-control-service")
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ import io.dropwizard.core.Application
import io.dropwizard.core.setup.{Bootstrap, Environment}
import org.apache.amber.config.StorageConfig
import org.apache.amber.core.storage.util.LakeFSStorageClient
import org.apache.amber.util.PathUtils.fileServicePath
import org.apache.texera.auth.{JwtAuthFilter, SessionUser}
import org.apache.texera.dao.SqlServer
import org.apache.texera.service.`type`.DatasetFileNode
Expand All @@ -40,6 +39,8 @@ import org.apache.texera.service.resource.{
import org.apache.texera.service.util.S3StorageClient
import org.eclipse.jetty.server.session.SessionHandler

import java.nio.file.Path

class FileService extends Application[FileServiceConfiguration] with LazyLogging {
override def initialize(bootstrap: Bootstrap[FileServiceConfiguration]): Unit = {
// Register Scala module to Dropwizard default object mapper
Expand Down Expand Up @@ -86,7 +87,9 @@ class FileService extends Application[FileServiceConfiguration] with LazyLogging
object FileService {
def main(args: Array[String]): Unit = {
// Set the configuration file's path
val configFilePath = fileServicePath
val configFilePath = Path
.of(sys.env.getOrElse("TEXERA_HOME", "."))
.resolve("file-service")
.resolve("src")
.resolve("main")
.resolve("resources")
Expand Down
Loading