Skip to content

Commit cea4095

Browse files
committed
Fixes the resources in the app/* not found in development mode
ResourceLocator should use `BuildSettings.GRAILS_APP_PATH` instead of `GrailsResourceUtils.GRAILS_APP_DIR` Closes gh-1251
1 parent 5057f8f commit cea4095

File tree

2 files changed

+4
-11
lines changed

2 files changed

+4
-11
lines changed

grace-bootstrap/src/main/groovy/org/grails/io/support/ResourceLocator.java

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
import org.springframework.core.io.ResourceLoader;
3030
import org.springframework.core.io.support.PathMatchingResourcePatternResolver;
3131

32+
import grails.util.BuildSettings;
3233
import grails.util.Environment;
3334

3435
/**
@@ -84,22 +85,14 @@ public void setSearchLocations(Collection<String> searchLocations) {
8485
private void initializeForSearchLocation(String searchLocation) {
8586
String searchLocationPlusSlash = searchLocation.endsWith("/") ? searchLocation : searchLocation + FILE_SEPARATOR;
8687
try {
87-
File[] directories = new File(searchLocationPlusSlash + GrailsResourceUtils.GRAILS_APP_DIR)
88+
File[] directories = new File(searchLocationPlusSlash + BuildSettings.GRAILS_APP_PATH)
8889
.listFiles(file -> file.isDirectory() && !file.isHidden());
8990

9091
if (directories != null) {
9192
for (File directory : directories) {
9293
this.classSearchDirectories.add(directory.getCanonicalPath());
9394
}
9495
}
95-
File[] appDirectories = new File(searchLocationPlusSlash + "app")
96-
.listFiles(file -> file.isDirectory() && !file.isHidden());
97-
98-
if (appDirectories != null) {
99-
for (File directory : appDirectories) {
100-
this.classSearchDirectories.add(directory.getCanonicalPath());
101-
}
102-
}
10396
}
10497
catch (IOException ignored) {
10598
}

grace-core/src/main/groovy/org/grails/core/io/DefaultResourceLocator.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,9 @@
3333
import grails.plugins.GrailsPlugin;
3434
import grails.plugins.GrailsPluginManager;
3535
import grails.plugins.PluginManagerAware;
36+
import grails.util.BuildSettings;
3637
import grails.util.Environment;
3738

38-
import org.grails.io.support.GrailsResourceUtils;
3939
import org.grails.plugins.BinaryGrailsPlugin;
4040

4141
/**
@@ -93,7 +93,7 @@ public void setSearchLocations(Collection<String> searchLocations) {
9393
private void initializeForSearchLocation(String searchLocation) {
9494
String searchLocationPlusSlash = searchLocation.endsWith("/") ? searchLocation : searchLocation + FILE_SEPARATOR;
9595
try {
96-
File[] directories = new File(searchLocationPlusSlash + GrailsResourceUtils.GRAILS_APP_DIR)
96+
File[] directories = new File(searchLocationPlusSlash + BuildSettings.GRAILS_APP_PATH)
9797
.listFiles(file -> file.isDirectory() && !file.isHidden());
9898

9999
if (directories != null) {

0 commit comments

Comments
 (0)