Skip to content

Commit d297f34

Browse files
committed
v8 ready
1 parent 337e71b commit d297f34

9 files changed

Lines changed: 23 additions & 19 deletions

File tree

.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,4 +26,4 @@ effective-pom.xml
2626
/coldbox/**
2727
/testbox/**
2828
/modules/**
29-
/lib/java/**
29+
/lib/**

Application.cfc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ component {
2828
* Modify only if you need to, else default them: https://cfdocs.org/application-cfc
2929
*/
3030
this.javaSettings = {
31-
loadPaths : [ expandPath( "./lib/java" ) ],
31+
loadPaths : [ expandPath( "./lib" ) ],
3232
loadColdFusionClassPath : true,
3333
reloadOnChange : false
3434
};

box.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,13 @@
2525
"commandbox-boxlang":"*",
2626
"commandbox-cfformat":"*"
2727
},
28+
"dependencies":{
29+
"coldbox":"be"
30+
},
2831
"installPaths":{
2932
"coldbox":"coldbox/",
3033
"testbox":"testbox/"
3134
},
32-
"dependencies":{
33-
"coldbox":"^7.0.0"
34-
},
3535
"scripts":{
3636
"postInstall":"pathExists .env || cp .env.example .env && package set ignore=[]",
3737
"format":"cfformat run config/,handlers/,interceptors/,models/,modules_app/,tests/specs/,*.cfc ./.cfformat.json --overwrite",

lib/Application.cfc

Lines changed: 0 additions & 9 deletions
This file was deleted.

lib/java/drop_jars_here.txt

Whitespace-only changes.

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
<goal>copy-dependencies</goal>
4040
</goals>
4141
<configuration>
42-
<outputDirectory>${project.basedir}/lib/java</outputDirectory>
42+
<outputDirectory>${project.basedir}/lib</outputDirectory>
4343
</configuration>
4444
</execution>
4545
</executions>

robots.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ Disallow:
2222
User-Agent: *
2323
Disallow: /config/
2424
Disallow: /handlers/
25+
Disallow: /includes/
2526
Disallow: /interceptors/
2627
Disallow: /layouts/
2728
Disallow: /logs/

server.json

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,19 @@
11
{
2+
"name":"coldbox-start-template",
3+
"app":{
4+
"cfengine":"boxlang@1"
5+
},
6+
"jvm":{
7+
"heapSize":"512",
8+
"javaVersion":"openjdk21_jre",
9+
"args":"-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=8888"
10+
},
211
"web":{
312
"rewrites":{
4-
"enable":"true"
13+
"enable": true
514
}
15+
},
16+
"scripts":{
17+
"onServerInitialInstall":"install bx-compat-cfml,bx-esapi"
618
}
719
}

tests/Application.cfc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,15 +18,15 @@ component {
1818
* --------------------------------------------------------------------------
1919
* Location Mappings
2020
* --------------------------------------------------------------------------
21-
* - cbApp : Quick reference to root application
21+
* - app : Quick reference to root application
2222
* - coldbox : Where ColdBox library is installed
2323
* - testbox : Where TestBox is installed
2424
*/
2525
// Create testing mapping
2626
this.mappings[ "/tests" ] = getDirectoryFromPath( getCurrentTemplatePath() );
2727
// The root application mapping
2828
rootPath = reReplaceNoCase( this.mappings[ "/tests" ], "tests(\\|/)", "" );
29-
this.mappings[ "/root" ] = this.mappings[ "/cbapp" ] = rootPath;
29+
this.mappings[ "/app" ] = rootPath;
3030
this.mappings[ "/coldbox" ] = rootPath & "coldbox";
3131
this.mappings[ "/testbox" ] = rootPath & "testbox";
3232

@@ -39,7 +39,7 @@ component {
3939
// Set a high timeout for long running tests
4040
setting requestTimeout ="9999";
4141
// New ColdBox Virtual Application Starter
42-
request.coldBoxVirtualApp= new coldbox.system.testing.VirtualApp( appMapping = "/root" );
42+
request.coldBoxVirtualApp= new coldbox.system.testing.VirtualApp( appMapping = "/app" );
4343

4444
// If hitting the runner or specs, prep our virtual app
4545
if ( getBaseTemplatePath().replace( expandPath( "/tests" ), "" ).reFindNoCase( "(runner|specs)" ) ) {

0 commit comments

Comments
 (0)