Merge pull request revel#1133 from notzippy/sample-to-example

notzippy · web-flow · commit c0220f975a48 · 2017-03-10T13:45:08.000-08:00
Changed samples to example to match repository
diff --git a/.travis.yml b/.travis.yml
@@ -38,7 +38,7 @@ install:
   - git clone -b $REVEL_BRANCH git://github.com/revel/cmd ../cmd/
   - git clone -b $REVEL_BRANCH git://github.com/revel/config ../config/
   - git clone -b $REVEL_BRANCH git://github.com/revel/cron ../cron/
-  - git clone -b $REVEL_BRANCH git://github.com/revel/samples ../samples/
+  - git clone -b $REVEL_BRANCH git://github.com/revel/examples ../examples/
   - go get -v github.com/revel/revel/...
   - go get -v github.com/revel/cmd/revel
 
@@ -55,18 +55,10 @@ script:
   - revel package my/testapp
   - revel package my/testapp prod
 
-  # Build & run the sample apps
-  - revel test github.com/revel/samples/booking
-  - revel test github.com/revel/samples/chat
-  - revel test github.com/revel/samples/facebook-oauth2
-  - revel test github.com/revel/samples/twitter-oauth
-  - revel test github.com/revel/samples/validation
-  - revel test github.com/revel/samples/upload
-
   # Commented out persona test sample, since persona.org gonna be shutdown.
   # Also http://personatestuser.org becomes non-responsive most of the time.
   # https://wiki.mozilla.org/Identity/Persona_Shutdown_Guidelines_for_Reliers
-  # - revel test github.com/revel/samples/persona
+  # - revel test github.com/revel/examples/persona
 
 matrix:
   allow_failures:
diff --git a/errors.go b/errors.go
@@ -36,7 +36,7 @@ type SourceLine struct {
 func NewErrorFromPanic(err interface{}) *Error {
 
 	// Parse the filename and line from the originating line of app code.
-	// /Users/robfig/code/gocode/src/revel/samples/booking/app/controllers/hotels.go:191 (0x44735)
+	// /Users/robfig/code/gocode/src/revel/examples/booking/app/controllers/hotels.go:191 (0x44735)
 	stack := string(debug.Stack())
 	frame, basePath := findRelevantStackFrame(stack)
 	if frame == -1 {
