Permalink
Browse files

Attempt to get it building, upgrade to SBT 0.11.3-2 and set http prox…

…y for TeamCity
  • Loading branch information...
bruntonspall committed Jun 19, 2012
1 parent 96f342d commit 5d3bea69b74f5575c47c09bb37cbc7f8858071dc
Showing with 16 additions and 20 deletions.
  1. +12 −8 README.md
  2. +1 −1 build.sbt
  3. BIN dev/sbt-launch-0.10.1.jar
  4. BIN dev/sbt-launch-0.11.3-2.jar
  5. +0 −4 project/plugins/build.sbt
  6. +0 −6 sbt
  7. +3 −1 sbt-tc
View
@@ -2,6 +2,10 @@
Framework support for a standard webapp configuration scheme.
+## Building it ##
+
+* Ensure you have SBT installed, we recommend 0.11.3-2 for maximum backward compatibility
+
## Guiding Principles ##
@@ -89,9 +93,9 @@ or version control, according to their variety:
These properties are provided by a war resource usually located at
`/conf/global.properties`.
-8. _Java System properties_: Properties which are passed to the JVM when started.
+8. _Java System properties_: Properties which are passed to the JVM when started.
These should generally not be used unless required by deployment in a restrictive hosting
- environment, i.e. Heroku.
+ environment, i.e. Heroku.
Only properties of types 3 through 7 should be provided to applications. They
@@ -182,7 +186,7 @@ dependency management tool.
libraryDependencies += "com.gu" % "configuration" % latestConfigurationVersion
To process configuration property files:
-
+
object Configuration {
import com.gu.conf.ConfigurationFactory
@@ -194,7 +198,7 @@ To process configuration property files:
This defaults to reading resource configuration property files from `conf` on the classpath. In
the case where there is contention for the default location, the configuration source location may be
-specified in the `getConfiguration` call:
+specified in the `getConfiguration` call:
private lazy val configuration = ConfigurationFactory("application-name", "conf/application-name")
@@ -286,17 +290,17 @@ is not reported.
### Heroku Example
-When deploying to Heroku, the file system is not available to read properties from.
+When deploying to Heroku, the file system is not available to read properties from.
Heroku recommends Environment variables should be used when requiring properties from outside of the application.
-[An up to date article is available on Heroku](http://devcenter.heroku.com/articles/config-vars) about configuration but briefly, here is how you can use the Heroku CLI application:
+[An up to date article is available on Heroku](http://devcenter.heroku.com/articles/config-vars) about configuration but briefly, here is how you can use the Heroku CLI application:
heroku config:add my.application.property=SomeValue -a my_app_name
-
+
You you view configuration:
heroku config -a my_app_name
-
+
Remove by:
heroku config:remove my.application.property -a my_app_name
View
@@ -8,7 +8,7 @@ scalaVersion := "2.9.1"
crossScalaVersions ++= Seq("2.9.0-1", "2.8.1")
-seq(ScalariformPlugin.settings: _*)
+scalariformSettings
ivyXML :=
<dependencies>
View
Binary file not shown.
View
Binary file not shown.
@@ -1,4 +0,0 @@
-resolvers += "Typesafe Repo" at "http://repo.typesafe.com/typesafe/releases"
-
-libraryDependencies += "com.typesafe.sbt-scalariform" %% "sbt-scalariform" % "0.1.2"
-
View
6 sbt
@@ -1,6 +0,0 @@
-#!/bin/sh
-if test -f ~/.sbtconfig; then
- . ~/.sbtconfig
-fi
-exec java -Dfile.encoding=UTF8 -Xmx2048M -XX:+CMSClassUnloadingEnabled -XX:+UseCompressedOops -XX:MaxPermSize=512m \
- -jar ./dev/sbt-launch-0.10.1.jar "$@"
View
4 sbt-tc
@@ -4,5 +4,7 @@ cat /dev/null | java -Xmx1G -XX:MaxPermSize=250m \
-Dsbt.log.noformat=true \
-Dbuild.number="$BUILD_NUMBER" \
-Dbuild.vcs.number="$BUILD_VCS_NUMBER" \
- -jar dev/sbt-launch-0.10.1.jar "$@"
+ -Dhttp.proxyHost=devproxy.gul3.gnl \
+ -Dhttp.proxyPort=3128 \
+ -jar dev/sbt-launch-0.11.3-2.jar "$@"

0 comments on commit 5d3bea6

Please sign in to comment.