Skip to content

Commit fb5f029

Browse files
seancorfieldseancorfield
committed
Merge branch 'develop'
Roll 4.1.0 from develop to master # Conflicts: # box.json # framework/Application.cfc
2 parents e25aa41 + 20c0932 commit fb5f029

File tree

95 files changed

+813
-1940
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

95 files changed

+813
-1940
lines changed

‎.gitignore

+2-8
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,12 @@
11
WEB-INF/*
2-
litepost/*
3-
mxunit/*
42
wirebox/*
5-
tests/ci/results
6-
tests/ci/results/*
3+
testbox/*
4+
tests/results/
75
.project
86
settings.xml
97
.settings/org.eclipse.core.resources.prefs
108
# Intellij IDEA files
119
*.iml
1210
*.ipr
1311
*.idea
14-
.ant-targets-build.xml
1512
run-tests.sh
16-
/examples/6helloclojure/target/stale/extract-native.dependencies
17-
/taskmanager/
18-
/server.json

‎.travis.yml

+29-6
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,35 @@
11
language: java
2+
3+
sudo: required
4+
25
env:
36
matrix:
4-
- PLATFORM=acf10-linux64
5-
- PLATFORM=railo42beta
6-
- PLATFORM=railo41
7+
- [email protected]
8+
- ENGINE=lucee@5
9+
- ENGINE=adobe@2016
10+
- ENGINE=adobe@11
11+
- ENGINE=adobe@10
12+
13+
cache:
14+
directories:
15+
- $HOME/.CommandBox
16+
17+
before_install:
18+
- sudo apt-key adv --keyserver keys.gnupg.net --recv 6DA70622
19+
- sudo echo "deb http://downloads.ortussolutions.com/debs/noarch /" | sudo tee -a
20+
/etc/apt/sources.list.d/commandbox.list
21+
22+
install:
23+
- sudo apt-get update && sudo apt-get --assume-yes install commandbox
24+
- box install
25+
26+
before_script:
27+
- box server start cfengine=$ENGINE port=8500 openbrowser=false
28+
29+
script: >
30+
testResults="echo $(box testbox run reporter=mintext)";
31+
echo "$testResults";
32+
if grep -i "\[Failures: [1-9][0-9]\?[0-9]\?\]\|\[Errors: [1-9][0-9]\?[0-9]\?\]\|<t[^>]*>\|<b[^>]*>" <<< $testResults; then exit 1; fi
733
834
notifications:
935
webhooks:
@@ -12,6 +38,3 @@ notifications:
1238
on_success: change # options: [always|never|change] default: always
1339
on_failure: always # options: [always|never|change] default: always
1440
on_start: false # default: false
15-
16-
install: ant -Dsource=remote -Dwork.dir=$HOME/work -Dbuild.dir=$TRAVIS_BUILD_DIR -Dplatform=$PLATFORM install-ci-deps
17-
script: ant -Dsource=remote -Dwork.dir=$HOME/work -Dbuild.dir=$TRAVIS_BUILD_DIR -Dplatform=$PLATFORM test-ci

‎Application.cfc

+2-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,8 @@ component {
1818
// create your FW/1 application:
1919
request._framework_one = new framework.one( {
2020
trace = true,
21-
base = getDirectoryFromPath( CGI.SCRIPT_NAME )
21+
missingview = 'main.missingview',
22+
base = getDirectoryFromPath( CGI.SCRIPT_NAME )
2223
.replaceFirst( getContextRoot(), '' ) & 'introduction'
2324
} );
2425

‎CONTRIBUTING.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ Contributing to Framework One (FW/1, DI/1, AOP/1)
22
==
33
Please note that in order to encourage more people to get involved with Framework One, we have adopted a [Code of Conduct](CODE_OF_CONDUCT.md) so that _everyone_ should feel welcome and safe when getting involved with any aspect of the Framework One community.
44

5-
All development happens in the main [Framework One repository](https://github.com/framework-one/fw1) on the **develop** branch. Feel free to fork the repo and submit Pull Requests on the **develop** branch. You can also open issues there to discuss potential enhancements etc.
5+
All development happens in the main [Framework One repository](https://github.com/framework-one/fw1) on the **develop** branch. Feel free to fork the repo and submit Pull Requests on the **develop** branch. You can also open issues there to discuss potential enhancements etc. You can also discuss bugs and enhancements on [Gitter](https://gitter.im/framework-one/fw1) or [Slack](https://cfml.slack.com/messages/fw1/). You can sign into Gitter directly using your GitHub credentials. For Slack, you'll need to [request an account](http://cfml-slack.herokuapp.com/).
66

77
Pull Requests that contain new/updated tests for the bug fix / enhancement will be looked on more favorably than those that do not contain fixes. Travis-CI automatically runs the test suite for Pull Requests which helps us be confident that the Pull Request is "good".
88

‎LICENSE

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Copyright (c) 2009-2016 Sean Corfield (see individual files for any
1+
Copyright (c) 2009-2017 Sean Corfield (see individual files for any
22
additional copyright holders)
33

44
Licensed under the Apache License, Version 2.0 (the "License");

‎README.md

+11-15
Original file line numberDiff line numberDiff line change
@@ -23,28 +23,24 @@ Please read the [Framework One Code of Conduct](CODE_OF_CONDUCT.md) - we want FW
2323

2424
# Running the Tests
2525

26-
The Ant `build.xml` file is primarily designed to be used by Travis to run the tests automatically, but it is possible to run the tests locally, with some setup:
26+
FW/1 is setup to run tests on [Travis CI](https://travis-ci.org/framework-one/fw1) using the `.travis.yml` file.
2727

28-
* This FW/1 directory needs to be a web root for some test domain on your local machine. I have `fw1.local` setup to resolve to this folder.
29-
* You'll need MXUnit installed and accessible via `/mxunit` for the test domain you use for this project. You can install MXUnit into this FW/1 directory if you want - `mxunit/*` is on the `.gitignore` list.
28+
To run tests manually, you'll need [CommandBox](https://www.ortussolutions.com/products/commandbox) installed.
3029

31-
You can run the build locally using a variant of this command (all on one line):
30+
Then run `box install` once to install the dependencies (TestBox is the only one currently).
3231

33-
ant -Dplatform=railo41 -Dtest.path.root=/Developer/workspace/fw1 \
34-
-Dcontext.root= -Dserver.name=fw1.local -Dserver.port=8080 \
35-
run-tests-mxunit
32+
Then start a server on port 8500 with your choice of CFML engine, e.g.,
3633

37-
See the `run-tests-example.sh` file for a template (for Mac/Linux).
34+
box server start cfengine=lucee@5 port=8500
3835

39-
* `platform` needs to be set just to satisfy the build script it doesn't affect anything (so use `railo41` even if you're on ACF or a different version of Railo)
40-
* `test.path.root` should be the filesystem path to this directory, i.e., the web root for the FW/1 project.
41-
* `context.root` should probably be empty (unless you are using a named web application context)
42-
* `server.name` should be the test domain you have configured
43-
* `server.port` should be the port on which you access that test domain
44-
* `run-tests-mxunit` is the actual Ant task that does the testing
36+
This will open a browser, running the FW/1 "Introduction" app.
37+
38+
You can then run the tests:
39+
40+
box testbox run reporter=mintext
4541

4642
# Copyright and License
4743

48-
Copyright (c) 2009-2016 Sean Corfield (and others -- see individual files for additional copyright holders). All rights reserved.
44+
Copyright (c) 2009-2017 Sean Corfield (and others -- see individual files for additional copyright holders). All rights reserved.
4945
The use and distribution terms for this software are covered by the Apache Software License 2.0 (http://www.apache.org/licenses/LICENSE-2.0) which can also be found in the file LICENSE at the root of this distribution and in individual licensed files.
5046
By using this software in any fashion, you are agreeing to be bound by the terms of this license. You must not remove this notice, or any other, from this software.

‎box.json

+62-28
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,66 @@
11
{
2-
"name" : "Framework One",
3-
"slug" : "fw1",
4-
"version" : "4.0.0",
5-
"author" : "Sean Corfield, Marcin Szczepanski, Ryan Cogswell",
6-
"location" : "https://github.com/framework-one/fw1/archive/v4.0.0.zip",
7-
"createPackageDirectory" : true,
8-
"packageDirectory" : "framework",
9-
"Homepage" : "http://framework-one.github.io/",
10-
"Documentation" : "http://framework-one.github.io/documentation/",
11-
"Repository" : {
12-
"type" : "git", "URL" : "https://github.com/framework-one/fw1.git"
13-
},
14-
"Bugs" : "https://github.com/framework-one/fw1/issues",
15-
"shortDescription" : "FW/1 - Framework One - is a family of small, lightweight, convention-over-configuration frameworks, primarily for CFML.",
16-
"description" : "FW/1 - Framework One - is a family of small, lightweight, convention-over-configuration frameworks, primarily for CFML. FW/1 itself provides MVC, DI/1 provides dependency injection (a.k.a. inversion of control), and AOP/1 provides aspect-oriented programming features on top of DI/1.",
17-
"instructions" : "http://framework-one.github.io/documentation/",
18-
"changelog" : "https://github.com/framework-one/fw1/commits/master",
19-
"type" : "mvc",
20-
"keywords" : [ "fw1", "framework one", "mvc", "conventions" ],
21-
"private" : "false",
22-
"engines" : [
23-
{ "type" : "railo", "version" : ">=4.1.x" },
24-
{ "type" : "lucee", "version" : ">=4.5.x" },
25-
{ "type" : "adobe", "version" : ">=10.0.x" }
2+
"name":"Framework One",
3+
"slug":"fw1",
4+
"version":"4.1.0",
5+
"author":"Sean Corfield, Marcin Szczepanski, Ryan Cogswell",
6+
"location":"https://github.com/framework-one/fw1/archive/v4.1.0.zip",
7+
"createPackageDirectory":true,
8+
"packageDirectory":"framework",
9+
"Homepage":"http://framework-one.github.io/",
10+
"Documentation":"http://framework-one.github.io/documentation/",
11+
"Repository":{
12+
"type":"git",
13+
"URL":"https://github.com/framework-one/fw1.git"
14+
},
15+
"Bugs":"https://github.com/framework-one/fw1/issues",
16+
"shortDescription":"FW/1 - Framework One - is a family of small, lightweight, convention-over-configuration frameworks, primarily for CFML.",
17+
"description":"FW/1 - Framework One - is a family of small, lightweight, convention-over-configuration frameworks, primarily for CFML. FW/1 itself provides MVC, DI/1 provides dependency injection (a.k.a. inversion of control), and AOP/1 provides aspect-oriented programming features on top of DI/1.",
18+
"instructions":"http://framework-one.github.io/documentation/",
19+
"changelog":"https://github.com/framework-one/fw1/commits/master",
20+
"type":"mvc",
21+
"keywords":[
22+
"fw1",
23+
"framework one",
24+
"mvc",
25+
"conventions"
2626
],
27-
"License" : [
28-
{ "type" : "Apache 2.0", "URL" : "http://www.apache.org/licenses/LICENSE-2.0" }
27+
"private":"false",
28+
"engines":[
29+
{
30+
"type":"railo",
31+
"version":">=4.1.x"
32+
},
33+
{
34+
"type":"lucee",
35+
"version":">=4.5.x"
36+
},
37+
{
38+
"type":"adobe",
39+
"version":">=10.0.x"
40+
}
2941
],
30-
"Contributors" : [ {"name": "Contributors List", "url": "https://github.com/framework-one/fw1/graphs/contributors"} ],
31-
"ignore" : [ ]
42+
"License":[
43+
{
44+
"type":"Apache 2.0",
45+
"URL":"http://www.apache.org/licenses/LICENSE-2.0"
46+
}
47+
],
48+
"Contributors":[
49+
{
50+
"name":"Contributors List",
51+
"url":"https://github.com/framework-one/fw1/graphs/contributors"
52+
}
53+
],
54+
"ignore":[
55+
56+
],
57+
"devDependencies":{
58+
"testbox":"^2.3.0+00044"
59+
},
60+
"installPaths":{
61+
"testbox":"testbox"
62+
},
63+
"testbox":{
64+
"runner":"http://localhost:8500/tests/runner.cfm"
65+
}
3266
}

‎build.xml

-142
This file was deleted.

‎examples/Application.cfc

-3
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,7 @@ component {
1818
// create your FW/1 application:
1919
request._framework_one = new framework.one( {
2020
SESOmitIndex = true,
21-
diComponent = "framework.ioclj",
2221
diLocations = [
23-
// must provide path to project.clj in Clojure example:
24-
getDirectoryFromPath( CGI.SCRIPT_NAME ) & "/subsystems/6helloclojure",
2522
"model", "controllers", "beans", "services" // to account for the variety of D/I locations in our examples
2623
// that allows all our subsystems to automatically have their own bean factory with the base factory as parent
2724
],

‎examples/layouts/default.cfm

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<p><a href="<cfoutput>#buildURL( ':main.default' )#</cfoutput>">Examples Home</a></p>
1313
</div>
1414
<div class="footer">
15-
<a href="https://github.com/framework-one/fw1">FW/1</a> is copyright (c) 2009-2016 Sean Corfield, Marcin Szczepanski, Ryan Cogswell -
15+
<a href="https://github.com/framework-one/fw1">FW/1</a> is copyright (c) 2009-2017 Sean Corfield, Marcin Szczepanski, Ryan Cogswell -
1616
<a href="http://www.apache.org/licenses/LICENSE-2.0">Licensed under the Apache License, Version 2.0</a><br />
1717
Logo by Kevan Stannard - You are running FW/1 version <cfoutput>#variables.framework.version#</cfoutput>.
1818
</div>

0 commit comments

Comments
 (0)