Permalink
Browse files

Merge branch 'develop'

Merge 4.0.0 to master
  • Loading branch information...
seancorfield committed Sep 17, 2016
2 parents b94ce20 + ee55f3c commit 627754bfc1891373bf800d6e0e7462189c4d444a
Showing with 2,431 additions and 1,634 deletions.
  1. +1 −0 .gitignore
  2. +0 −1 .travis.yml
  3. +2 −0 CONTRIBUTING.md
  4. +14 −0 LICENSE
  5. +11 −3 README.md
  6. +3 −3 box.json
  7. +1 −5 build.xml
  8. +1 −1 examples/layouts/default.cfm
  9. +1 −1 examples/subsystems/4hellocontroller/views/main/default.cfm
  10. +1 −1 examples/subsystems/5helloservice/views/main/default.cfm
  11. +6 −0 examples/subsystems/6helloclojure/boot.properties
  12. +9 −0 examples/subsystems/6helloclojure/build.boot
  13. +2 −1 framework/Application.cfc
  14. +1 −1 framework/MyApplication.cfc
  15. +2 −2 framework/WireBoxAdapter.cfc
  16. +312 −312 framework/aop.cfc
  17. +936 −936 framework/beanProxy.cfc
  18. +34 −16 framework/cfmljure.cfc
  19. +38 −27 framework/cljcontroller.cfc
  20. +30 −0 framework/facade.cfc
  21. +177 −47 framework/ioc.cfc
  22. +108 −96 framework/ioclj.cfc
  23. +404 −160 framework/one.cfc
  24. +1 −1 introduction/layouts/default.cfm
  25. +4 −4 introduction/views/main/default.cfm
  26. +1 −1 tests/AddBeanTest.cfc
  27. +4 −3 tests/BeanInfoTest.cfc
  28. +37 −6 tests/DeclareBeanTest.cfc
  29. +16 −4 tests/FactoryBeanTest.cfc
  30. +22 −0 tests/TransientInjectionTest.cfc
  31. +38 −0 tests/TransientTest.cfc
  32. +3 −0 tests/declared/things/myconfig.cfc
  33. +25 −0 tests/defaultPropertyTest.cfc
  34. +8 −0 tests/extrabeans/sheep/construct.cfc
  35. +6 −0 tests/extrabeans/sheep/default.cfc
  36. +4 −0 tests/frameworkEnvTest.cfc
  37. +25 −0 tests/frameworkFacadeTest.cfc
  38. +31 −2 tests/frameworkProcessRoutesTest.cfc
  39. +54 −0 tests/frameworkRenderTest.cfc
  40. +23 −0 tests/frameworkRouteTest.cfc
  41. +8 −0 tests/issue420/singleton.cfc
  42. +8 −0 tests/issue420/transient.cfc
  43. +19 −0 tests/onMissingViewLayoutTest.cfc
View
@@ -15,3 +15,4 @@ settings.xml
run-tests.sh
/examples/6helloclojure/target/stale/extract-native.dependencies
/taskmanager/
/server.json
View
@@ -2,7 +2,6 @@ language: java
env:
matrix:
- PLATFORM=acf10-linux64
- PLATFORM=acf902-linux64
- PLATFORM=railo42beta
- PLATFORM=railo41
View
@@ -10,6 +10,8 @@ Look at `run-tests-example.sh` to see how to run tests locally (copy that shell
Please follow the same formatting as the existing code, especially in terms of spacing around operators, parentheses, braces and so on. If in doubt, ask on the mailing list.
By submitting a Pull Request, you are granting copyright license to Sean Corfield and that your submission may be legally released under the Apache Source License 2.0 (http://www.apache.org/licenses/LICENSE-2.0).
The **master** branch represents the current stable release of FW/1. Do not submit Pull Requests against **master**. Showstopping bugs should be raised as issues and fixes will be applied to **develop** (if appropriate) and backported to **master** manually.
**Note:** Do not submit Pull Requests against [Sean's personal fork](https://github.com/seancorfield/fw1) - that exists for historical reasons and Github doesn't let you turn Pull Requests off.
View
14 LICENSE
@@ -0,0 +1,14 @@
Copyright (c) 2009-2016 Sean Corfield (see individual files for any
additional copyright holders)
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
View
@@ -1,4 +1,4 @@
# FW/1 (Framework One) [![Build Status](https://travis-ci.org/framework-one/fw1.png)](https://travis-ci.org/framework-one/fw1) [![Join the chat at https://gitter.im/framework-one/fw1](https://badges.gitter.im/framework-one/fw1.svg)](https://gitter.im/framework-one/fw1?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
# FW/1 (Framework One) [![Build Status](https://travis-ci.org/framework-one/fw1.png)](https://travis-ci.org/framework-one/fw1) [![Stories in Ready](https://badge.waffle.io/framework-one/fw1.png?label=ready&title=Ready)](http://waffle.io/framework-one/fw1) [![Join the chat at https://gitter.im/framework-one/fw1](https://badges.gitter.im/framework-one/fw1.svg)](https://gitter.im/framework-one/fw1?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
This FW/1 directory is a complete web application and expects to live in its own
webroot if you plan to run the applications within it. To use FW/1 in a separate
@@ -9,7 +9,9 @@ in your admin - you can't just use a per-application mapping.
Please read the [Framework One Code of Conduct](CODE_OF_CONDUCT.md) - we want FW/1 to be a welcoming and supportive environment for everyone to feel comfortable contributing!
**Project home:** http://fw1.riaforge.org
# Resources
**Project home:** https://github.com/framework-one/fw1
**Documentation / Wiki:** http://framework-one.github.io/documentation/ / http://github.com/framework-one/fw1/wiki
@@ -19,7 +21,7 @@ Please read the [Framework One Code of Conduct](CODE_OF_CONDUCT.md) - we want FW
**Chat:** The [CFML team Slack](http://cfml-slack.herokuapp.com) has a [dedicated #fw1 channel](https://cfml.slack.com/messages/fw1/).
**Running the tests:**
# Running the Tests
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:
@@ -40,3 +42,9 @@ See the `run-tests-example.sh` file for a template (for Mac/Linux).
* `server.name` should be the test domain you have configured
* `server.port` should be the port on which you access that test domain
* `run-tests-mxunit` is the actual Ant task that does the testing
# Copyright and License
Copyright (c) 2009-2016 Sean Corfield (and others -- see individual files for additional copyright holders). All rights reserved.
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.
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.
View
@@ -1,9 +1,9 @@
{
"name" : "Framework One",
"slug" : "fw1",
"version" : "3.5.1",
"version" : "4.0.0",
"author" : "Sean Corfield, Marcin Szczepanski, Ryan Cogswell",
"location" : "https://github.com/framework-one/fw1/archive/v3.5.1.zip",
"location" : "https://github.com/framework-one/fw1/archive/4.0.0.zip",
"createPackageDirectory" : true,
"packageDirectory" : "framework",
"Homepage" : "http://framework-one.github.io/",
@@ -22,7 +22,7 @@
"engines" : [
{ "type" : "railo", "version" : ">=4.1.x" },
{ "type" : "lucee", "version" : ">=4.5.x" },
{ "type" : "adobe", "version" : ">=9.0.2" }
{ "type" : "adobe", "version" : ">=10.0.x" }
],
"License" : [
{ "type" : "Apache 2.0", "URL" : "http://www.apache.org/licenses/LICENSE-2.0" }
View
@@ -21,7 +21,6 @@
<property name="railo41-osx.local.url" value="/opt/ci/railo-express-4.1.2.005-macosx.zip" />
<property name="acf10-linux32.local.url" value="/opt/ci/cf10-linux32.tar.gz" />
<property name="acf10-linux64.local.url" value="/opt/ci/cf10-linux64.tar.gz" />
<property name="acf902-linux64.local.url" value="/opt/ci/cf902-linux64.tar.gz" />
<!-- test frameworks -->
<property name="mxunit.local.url" value="/opt/ci/fix-railo-nulls.zip" />
@@ -31,7 +30,6 @@
<property name="railo42beta.remote.url" value="http://cfml-ci.s3.amazonaws.com/railo-express-4.2.0.000-nojre.tar.gz" />
<property name="acf10-linux32.remote.url" value="http://cfml-ci.s3.amazonaws.com/cf10-linux32.tar.gz" />
<property name="acf10-linux64.remote.url" value="http://cfml-ci.s3.amazonaws.com/cf10-linux64.tar.gz" />
<property name="acf902-linux64.remote.url" value="http://cfml-ci.s3.amazonaws.com/cf902-linux64.tar.gz" />
<property name="mxunit.remote.url" value="https://github.com/marcins/mxunit/archive/fix-railo-nulls.zip" />
@@ -42,7 +40,6 @@
<property name="railo42beta.helper" value="railo" />
<property name="acf10-linux32.helper" value="acf" />
<property name="acf10-linux64.helper" value="acf" />
<property name="acf902-linux64.helper" value="acf9" />
<fail unless="platform" message="Platform is not set" />
<fail unless="${platform}.${source}.url">Unkown platform ${platform} for source ${source}.
@@ -52,8 +49,7 @@ Valid values are:
railo41-osx
railo42beta
acf10-linux32
acf10-linux64
acf902-linux64</fail>
acf10-linux64</fail>
<macrodef name="propertycopy">
<attribute name="name"/>
@@ -12,7 +12,7 @@
<p><a href="<cfoutput>#buildURL( ':main.default' )#</cfoutput>">Examples Home</a></p>
</div>
<div class="footer">
<a href="http://fw1.riaforge.org/">FW/1</a> is copyright (c) 2009-2015 Sean Corfield, Marcin Szczepanski, Ryan Cogswell -
<a href="https://github.com/framework-one/fw1">FW/1</a> is copyright (c) 2009-2016 Sean Corfield, Marcin Szczepanski, Ryan Cogswell -
<a href="http://www.apache.org/licenses/LICENSE-2.0">Licensed under the Apache License, Version 2.0</a><br />
Logo by Kevan Stannard - You are running FW/1 version <cfoutput>#variables.framework.version#</cfoutput>.
</div>
@@ -1,4 +1,4 @@
<cfoutput>
<p>Hello #rc.name#!</p>
<p><a href="#buildURL('main.other&name=#rc.name#')#">Go away</a>!</p>
<p><a href="#buildURL('main.other?name=#rc.name#')#">Go away</a>!</p>
</cfoutput>
@@ -1,4 +1,4 @@
<cfoutput>
<p>Hello #rc.name#!</p>
<p><a href="#buildURL('main.other&name=#rc.name#')#">Go away</a>!</p>
<p><a href="#buildURL('main.other?name=#rc.name#')#">Go away</a>!</p>
</cfoutput>
@@ -0,0 +1,6 @@
#http://boot-clj.com
#Mon Dec 21 11:44:14 PST 2015
BOOT_CLOJURE_NAME=org.clojure/clojure
BOOT_CLOJURE_VERSION=1.7.0
BOOT_VERSION=2.5.2
BOOT_EMIT_TARGET=no
@@ -0,0 +1,9 @@
;; very minimal Boot build file: for use with cfmljure we do not
;; need any pom / jar information, just the dependencies and a
;; matching boot.properties file
(set-env! :resource-paths #{"src"}
:source-paths #{"test"}
:dependencies '[[org.clojure/clojure "1.7.0"]
[adzerk/boot-test "1.0.7"]])
(require '[adzerk.boot-test :refer [test]])
@@ -1,5 +1,6 @@
component {
// Version: FW/1 3.5.1
// Version: FW/1 4.0.0
// copy this to your application root to use as your Application.cfc
// or incorporate the logic below into your existing Application.cfc
@@ -1,5 +1,5 @@
component extends="framework.one" {
// Version: FW/1 3.5.1
// Version: FW/1 4.0.0
// if you need to provide extension points, copy this to
// your web root, next to your Application.cfc, and add
@@ -1,7 +1,7 @@
component extends="wirebox.system.ioc.Injector" {
variables._fw1_version = "3.5.1";
variables._fw1_version = "4.0.0";
/*
Copyright (c) 2010-2015, Sean Corfield
Copyright (c) 2010-2016, Sean Corfield
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Oops, something went wrong.

0 comments on commit 627754b

Please sign in to comment.