From 21c8dd524a75a935bc45c01f30f9f500a04bfbd3 Mon Sep 17 00:00:00 2001 From: rbygrave Date: Sat, 9 May 2015 01:11:26 +1200 Subject: [PATCH] No effective change - change newline char --- .../server/resource/ResourceManager.java | 58 ++--- .../resource/ResourceManagerFactory.java | 216 +++++++++--------- 2 files changed, 137 insertions(+), 137 deletions(-) diff --git a/src/main/java/com/avaje/ebeaninternal/server/resource/ResourceManager.java b/src/main/java/com/avaje/ebeaninternal/server/resource/ResourceManager.java index 6de21d307..087e1d2cd 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/resource/ResourceManager.java +++ b/src/main/java/com/avaje/ebeaninternal/server/resource/ResourceManager.java @@ -1,29 +1,29 @@ -package com.avaje.ebeaninternal.server.resource; - -import java.io.File; - -import com.avaje.ebeaninternal.server.lib.resource.ResourceSource; - -/** - * The ResourceManager implementation. - */ -public class ResourceManager { - - final ResourceSource resourceSource; - - final File autofetchDir; - - public ResourceManager(ResourceSource resourceSource, File autofetchDir) { - this.resourceSource = resourceSource; - this.autofetchDir = autofetchDir; - } - - public ResourceSource getResourceSource() { - return resourceSource; - } - - public File getAutofetchDirectory() { - return autofetchDir; - } - -} +package com.avaje.ebeaninternal.server.resource; + +import java.io.File; + +import com.avaje.ebeaninternal.server.lib.resource.ResourceSource; + +/** + * The ResourceManager implementation. + */ +public class ResourceManager { + + final ResourceSource resourceSource; + + final File autofetchDir; + + public ResourceManager(ResourceSource resourceSource, File autofetchDir) { + this.resourceSource = resourceSource; + this.autofetchDir = autofetchDir; + } + + public ResourceSource getResourceSource() { + return resourceSource; + } + + public File getAutofetchDirectory() { + return autofetchDir; + } + +} diff --git a/src/main/java/com/avaje/ebeaninternal/server/resource/ResourceManagerFactory.java b/src/main/java/com/avaje/ebeaninternal/server/resource/ResourceManagerFactory.java index 65f672bd5..77a72d2b7 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/resource/ResourceManagerFactory.java +++ b/src/main/java/com/avaje/ebeaninternal/server/resource/ResourceManagerFactory.java @@ -1,108 +1,108 @@ -package com.avaje.ebeaninternal.server.resource; - -import com.avaje.ebean.config.ServerConfig; -import com.avaje.ebeaninternal.server.lib.resource.DirectoryFinder; -import com.avaje.ebeaninternal.server.lib.resource.FileResourceSource; -import com.avaje.ebeaninternal.server.lib.resource.ResourceSource; -import com.avaje.ebeaninternal.server.lib.util.NotFoundException; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import java.io.File; - -/** - * Creates a ResourceManager for a server depending on the avaje.properties. - *

- * This can use URL based resource loading for web applications or file based - * otherwise. - *

- */ -public class ResourceManagerFactory { - - private static final Logger logger = LoggerFactory.getLogger(ResourceManagerFactory.class); - - /** - * Construct with the properties for a server. - */ - public ResourceManagerFactory() { - } - - /** - * Create the resource manager given the properties for this server. - */ - public static ResourceManager createResourceManager(ServerConfig serverConfig) { - - ResourceSource resourceSource = createResourceSource(serverConfig); - File autofetchDir = getAutofetchDir(serverConfig, resourceSource); - - return new ResourceManager(resourceSource, autofetchDir); - } - - - /** - * Return the directory that autofetch file goes into. - */ - protected static File getAutofetchDir(ServerConfig serverConfig, ResourceSource resourceSource) { - - String dir = null; - if (serverConfig.getAutofetchConfig() != null) { - dir = serverConfig.getAutofetchConfig().getLogDirectory(); - } - if (dir != null) { - return new File(dir); - } - - String realPath = resourceSource.getRealPath(); - if (realPath != null) { - return new File(realPath); - - } else { - throw new RuntimeException("No autofetch directory set?"); - } - } - - /** - * Return the resource loader for external sql files. - *

- * This can be url based (for webapps) or otherwise file based. - *

- */ - protected static ResourceSource createResourceSource(ServerConfig serverConfig) { - - // default for web application, override this for file system - String defaultDir = serverConfig.getResourceDirectory(); - - // use File System directory - return createFileSource(defaultDir); - } - - private static ResourceSource createFileSource(String fileDir) { - - if (fileDir != null) { - // explicitly stated so - File dir = new File(fileDir); - if (dir.exists()) { - logger.info("ResourceManager initialised: type[file] [" + fileDir + "]"); - return new FileResourceSource(fileDir); - } else { - String msg = "ResourceManager could not find directory [" + fileDir + "]"; - throw new NotFoundException(msg); - } - } - - // try to guess the directory starting from the current working - // directory, and searching to a maximum depth of 3 subdirectories - File guessDir = DirectoryFinder.find(null, "WEB-INF", 3); - if (guessDir != null) { - // Typically this means we found the WEB-INF directory below the - // current working directory - logger.info("ResourceManager initialised: type[file] [" + guessDir.getPath() + "]"); - return new FileResourceSource(guessDir.getPath()); - } - - // default to the current working directory - File workingDir = new File("."); - return new FileResourceSource(workingDir); - } - -} +package com.avaje.ebeaninternal.server.resource; + +import com.avaje.ebean.config.ServerConfig; +import com.avaje.ebeaninternal.server.lib.resource.DirectoryFinder; +import com.avaje.ebeaninternal.server.lib.resource.FileResourceSource; +import com.avaje.ebeaninternal.server.lib.resource.ResourceSource; +import com.avaje.ebeaninternal.server.lib.util.NotFoundException; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import java.io.File; + +/** + * Creates a ResourceManager for a server depending on the avaje.properties. + *

+ * This can use URL based resource loading for web applications or file based + * otherwise. + *

+ */ +public class ResourceManagerFactory { + + private static final Logger logger = LoggerFactory.getLogger(ResourceManagerFactory.class); + + /** + * Construct with the properties for a server. + */ + public ResourceManagerFactory() { + } + + /** + * Create the resource manager given the properties for this server. + */ + public static ResourceManager createResourceManager(ServerConfig serverConfig) { + + ResourceSource resourceSource = createResourceSource(serverConfig); + File autofetchDir = getAutofetchDir(serverConfig, resourceSource); + + return new ResourceManager(resourceSource, autofetchDir); + } + + + /** + * Return the directory that autofetch file goes into. + */ + protected static File getAutofetchDir(ServerConfig serverConfig, ResourceSource resourceSource) { + + String dir = null; + if (serverConfig.getAutofetchConfig() != null) { + dir = serverConfig.getAutofetchConfig().getLogDirectory(); + } + if (dir != null) { + return new File(dir); + } + + String realPath = resourceSource.getRealPath(); + if (realPath != null) { + return new File(realPath); + + } else { + throw new RuntimeException("No autofetch directory set?"); + } + } + + /** + * Return the resource loader for external sql files. + *

+ * This can be url based (for webapps) or otherwise file based. + *

+ */ + protected static ResourceSource createResourceSource(ServerConfig serverConfig) { + + // default for web application, override this for file system + String defaultDir = serverConfig.getResourceDirectory(); + + // use File System directory + return createFileSource(defaultDir); + } + + private static ResourceSource createFileSource(String fileDir) { + + if (fileDir != null) { + // explicitly stated so + File dir = new File(fileDir); + if (dir.exists()) { + logger.info("ResourceManager initialised: type[file] [" + fileDir + "]"); + return new FileResourceSource(fileDir); + } else { + String msg = "ResourceManager could not find directory [" + fileDir + "]"; + throw new NotFoundException(msg); + } + } + + // try to guess the directory starting from the current working + // directory, and searching to a maximum depth of 3 subdirectories + File guessDir = DirectoryFinder.find(null, "WEB-INF", 3); + if (guessDir != null) { + // Typically this means we found the WEB-INF directory below the + // current working directory + logger.info("ResourceManager initialised: type[file] [" + guessDir.getPath() + "]"); + return new FileResourceSource(guessDir.getPath()); + } + + // default to the current working directory + File workingDir = new File("."); + return new FileResourceSource(workingDir); + } + +}