Skip to content

Commit

Permalink
Merge develop to master for 2.1 release
Browse files Browse the repository at this point in the history
  • Loading branch information
seancorfield committed Jan 6, 2013
2 parents 9e69741 + c7a00b5 commit 0e91ba4
Show file tree
Hide file tree
Showing 24 changed files with 1,268 additions and 300 deletions.
7 changes: 6 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
WEB-INF/*
litepost/*
mxunit/*
.project
settings.xml
.settings/org.eclipse.core.resources.prefs
.settings/org.eclipse.core.resources.prefs
# Intellij IDEA files
*.iml
*.ipr
*.idea
11 changes: 6 additions & 5 deletions README.txt
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
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 webroot you can
either copy the org directory to that webroot or add a mapping for /org/corfield to the
corfield folder inside the org directory (or a /org mapping to the org directory directly).
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
webroot you can either copy the org directory to that webroot or add a mapping
for /org/corfield to the corfield folder inside the org directory (or a /org
mapping to the org directory directly).

Project home: http://fw1.riaforge.org

Documentation wiki: http://github.com/seancorfield/fw1/wiki

Blog: http://corfield.org/blog/archives.cfm/category/fw1

Support: http://groups.google.com/group/framework-one/
Support: http://groups.google.com/group/framework-one/
Binary file added docs/fw1.pdf
Binary file not shown.
5 changes: 3 additions & 2 deletions examples/Application.cfc
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@ component extends="org.corfield.framework" {
// FW/1 - configuration:
variables.framework = {
usingSubsystems = true,
SESOmitIndex = true
SESOmitIndex = true,
trace = true
};

// pull in bean factory for hello8:
Expand All @@ -17,4 +18,4 @@ component extends="org.corfield.framework" {
}
}

}
}
Loading

0 comments on commit 0e91ba4

Please sign in to comment.