Skip to content

Commit e139b51

Browse files
committed
Merge pull request #1869 from wheels-dev/fix/fixes-for-cli
commit: update wheels snippets to load json files correctly
1 parent feebb9a commit e139b51

File tree

9 files changed

+37
-23
lines changed

9 files changed

+37
-23
lines changed

cli/src/templates/BoxJSON.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"author":"Wheels Core Team and Community, repackaged by Peter Amiri",
55
"shortDescription":"Wheels MVC Framework Base Template",
66
"location":"",
7-
"slug":"myapp",
7+
"slug":"|appName|",
88
"createPackageDirectory":false,
99
"type":"wheels-templates",
1010
"keywords":[

cli/src/templates/ServerJSON.txt

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,16 @@
11
{
22
"name": "|appName|",
3-
"app": {
4-
"cfengine": "|setEngine|",
5-
"serverHomeDirectory": ".wheels/server"
6-
},
73
"web": {
4+
"host":"localhost",
85
"webroot": "public",
96
"rewrites": {
107
"enable": true,
118
"config": "public/urlrewrite.xml"
129
}
10+
},
11+
"app": {
12+
"cfengine": "|setEngine|",
13+
"serverHomeDirectory": ".wheels/server",
14+
"libDirs":"app/lib"
1315
}
1416
}

docs/src/command-line-tools/commands/docker/docker-init.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -595,7 +595,13 @@ The command automatically updates your `server.json` with Docker-specific settin
595595
"web": {
596596
"host": "0.0.0.0",
597597
"http": {
598+
"enable": true,
598599
"port": "8080"
600+
},
601+
"webroot":"public",
602+
"rewrites":{
603+
"enable":true,
604+
"config":"public/urlrewrite.xml"
599605
}
600606
},
601607
"openBrowser": false,

examples/starter-app/app/snippets/BoxJSON.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"author":"Wheels Core Team and Community, repackaged by Peter Amiri",
55
"shortDescription":"Wheels MVC Framework Base Template",
66
"location":"",
7-
"slug":"myapp",
7+
"slug":"|appName|",
88
"createPackageDirectory":false,
99
"type":"wheels-templates",
1010
"keywords":[
@@ -35,7 +35,7 @@
3535
},
3636
"dependencies":{
3737
"wheels":"|version|",
38-
"orgh213172lex":"lex:https://ext.lucee.org/org.h2-1.3.172.lex"
38+
"orgh213172lex":"lex:https://ext.lucee.org/org.lucee.h2-2.1.214.0001L.lex"
3939
},
4040
"private":false,
4141
"license":[
Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,16 @@
11
{
22
"name": "|appName|",
3-
"app": {
4-
"cfengine": "|setEngine|",
5-
"serverHomeDirectory": ".wheels/server"
6-
},
73
"web": {
4+
"host":"localhost",
85
"webroot": "public",
96
"rewrites": {
107
"enable": true,
118
"config": "public/urlrewrite.xml"
129
}
10+
},
11+
"app": {
12+
"cfengine": "|setEngine|",
13+
"serverHomeDirectory": ".wheels/server",
14+
"libDirs":"app/lib"
1315
}
1416
}

examples/tweet/app/snippets/BoxJSON.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"author":"Wheels Core Team and Community, repackaged by Peter Amiri",
55
"shortDescription":"Wheels MVC Framework Base Template",
66
"location":"",
7-
"slug":"myapp",
7+
"slug":"|appName|",
88
"createPackageDirectory":false,
99
"type":"wheels-templates",
1010
"keywords":[
@@ -35,7 +35,7 @@
3535
},
3636
"dependencies":{
3737
"wheels":"|version|",
38-
"orgh213172lex":"lex:https://ext.lucee.org/org.h2-1.3.172.lex"
38+
"orgh213172lex":"lex:https://ext.lucee.org/org.lucee.h2-2.1.214.0001L.lex"
3939
},
4040
"private":false,
4141
"license":[
Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,16 @@
11
{
22
"name": "|appName|",
3-
"app": {
4-
"cfengine": "|setEngine|",
5-
"serverHomeDirectory": ".wheels/server"
6-
},
73
"web": {
4+
"host":"localhost",
85
"webroot": "public",
96
"rewrites": {
107
"enable": true,
118
"config": "public/urlrewrite.xml"
129
}
10+
},
11+
"app": {
12+
"cfengine": "|setEngine|",
13+
"serverHomeDirectory": ".wheels/server",
14+
"libDirs":"app/lib"
1315
}
1416
}

templates/base/src/app/snippets/BoxJSON.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"author":"Wheels Core Team and Community, repackaged by Peter Amiri",
55
"shortDescription":"Wheels MVC Framework Base Template",
66
"location":"",
7-
"slug":"myapp",
7+
"slug":"|appName|",
88
"createPackageDirectory":false,
99
"type":"wheels-templates",
1010
"keywords":[
@@ -35,7 +35,7 @@
3535
},
3636
"dependencies":{
3737
"wheels":"|version|",
38-
"orgh213172lex":"lex:https://ext.lucee.org/org.h2-1.3.172.lex"
38+
"orgh213172lex":"lex:https://ext.lucee.org/org.lucee.h2-2.1.214.0001L.lex"
3939
},
4040
"private":false,
4141
"license":[
Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,16 @@
11
{
22
"name": "|appName|",
3-
"app": {
4-
"cfengine": "|setEngine|",
5-
"serverHomeDirectory": ".wheels/server"
6-
},
73
"web": {
4+
"host":"localhost",
85
"webroot": "public",
96
"rewrites": {
107
"enable": true,
118
"config": "public/urlrewrite.xml"
129
}
10+
},
11+
"app": {
12+
"cfengine": "|setEngine|",
13+
"serverHomeDirectory": ".wheels/server",
14+
"libDirs":"app/lib"
1315
}
1416
}

0 commit comments

Comments
 (0)