Rename mason.server to webapps.mason.backend, rename mason.version to webapps.mason.version, for cleaner client-server separation

extra/webapps/mason/backend/backend-tests.factor

@@ -1,6 +1,6 @@
 USING: continuations db db.sqlite io.directories io.files.temp
-mason.server tools.test ;
-IN: mason.server.tests
+webapps.mason.backend tools.test ;
+IN: webapps.mason.backend.tests
 
 [ "test.db" temp-file delete-file ] ignore-errors
 

extra/webapps/mason/backend/backend.factor

@@ -2,7 +2,7 @@
 ! See http://factorcode.org/license.txt for BSD license.
 USING: accessors calendar db db.sqlite db.tuples db.types kernel
 math math.order sequences combinators.short-circuit ;
-IN: mason.server
+IN: webapps.mason.backend
 
 CONSTANT: +idle+ "idle"
 CONSTANT: +starting+ "starting"

extra/webapps/mason/backend/watchdog/watchdog.factor

@@ -1,8 +1,8 @@
 ! Copyright (C) 2010 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: kernel math mason.email mason.server math.parser sequences
-xml.syntax xml.writer ;
-IN: mason.server.watchdog
+USING: kernel math math.parser sequences xml.syntax xml.writer
+mason.email webapps.mason.backend ;
+IN: webapps.mason.backend.watchdog
 
 : crashed-builder-body ( crashed-builders -- string content-type )
     [ os/cpu [XML <li><-></li> XML] ] map

extra/webapps/mason/counter/counter.factor

@@ -1,7 +1,7 @@
 ! Copyright (C) 2010 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: accessors furnace.actions http.server.responses
-mason.server math.parser ;
+webapps.mason.backend math.parser ;
 IN: webapps.mason.counter
 
 : <counter-action> ( -- action )

extra/webapps/mason/dashboard/dashboard.factor

@@ -1,7 +1,7 @@
 ! Copyright (C) 2010 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: accessors kernel mason.server furnace.actions
-html.forms sequences xml.syntax webapps.mason.utils ;
+USING: accessors kernel furnace.actions html.forms sequences
+xml.syntax webapps.mason.backend webapps.mason.utils ;
 IN: webapps.mason.downloads
 
 : builder-list ( seq -- xml )

extra/webapps/mason/downloads/downloads.factor

@@ -1,8 +1,8 @@
 ! Copyright (C) 2010 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: accessors furnace.actions html.components html.forms
-kernel mason.server mason.version.data webapps.mason.grids
-webapps.mason.utils ;
+kernel webapps.mason.backend webapps.mason.version.data
+webapps.mason.grids webapps.mason.utils ;
 IN: webapps.mason.downloads
 
 : stable-release ( version -- link )

extra/webapps/mason/grids/grids.factor

@@ -1,9 +1,9 @@
 ! Copyright (C) 2010 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: accessors assocs db.tuples furnace.actions
-furnace.utilities http.server.responses kernel locals
-mason.server mason.version.data sequences splitting urls
-webapps.mason.utils xml.syntax xml.writer ;
+furnace.utilities http.server.responses kernel locals sequences
+splitting urls xml.syntax xml.writer webapps.mason.backend
+webapps.mason.version.data webapps.mason.utils ;
 IN: webapps.mason.grids
 
 : render-grid-cell ( cpu os quot -- xml )

extra/webapps/mason/increment-counter/increment-counter.factor

@@ -1,7 +1,7 @@
 ! Copyright (C) 2010 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: accessors furnace.actions math.parser
-http.server.responses mason.server ;
+http.server.responses webapps.mason.backend ;
 IN: webapps.mason.increment-counter
 
 : <increment-counter-action> ( -- action )

extra/webapps/mason/make-release/make-release.factor

@@ -1,7 +1,8 @@
 ! Copyright (C) 2010 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: accessors furnace.actions html.forms
-http.server.responses mason.server mason.version validators ;
+http.server.responses validators webapps.mason.backend
+webapps.mason.version ;
 IN: webapps.mason.make-release
 
 : <make-release-action> ( -- action )

extra/webapps/mason/mason.factor

@@ -1,7 +1,7 @@
 ! Copyright (C) 2009, 2010 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: accessors furnace.actions furnace.auth furnace.db
-http.server.dispatchers mason.server webapps.mason.grids
+http.server.dispatchers webapps.mason.backend webapps.mason.grids
 webapps.mason.package webapps.mason.release webapps.mason.report
 webapps.mason.downloads webapps.mason.counter
 webapps.mason.status-update webapps.mason.docs-update

extra/webapps/mason/package/package.factor

@@ -1,10 +1,10 @@
 ! Copyright (C) 2010 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: accessors arrays combinators furnace.actions html.forms
-kernel mason.platform mason.report mason.server present
-sequences webapps.mason webapps.mason.report webapps.mason.utils
-xml.syntax ;
-FROM: mason.version.files => platform ;
+kernel xml.syntax mason.platform mason.report present
+sequences webapps.mason webapps.mason.report
+webapps.mason.backend webapps.mason.utils ;
+FROM: webapps.mason.version.files => platform ;
 IN: webapps.mason.package
 
 : building ( builder string -- xml )

extra/webapps/mason/release/release.factor

@@ -1,8 +1,8 @@
 ! Copyright (C) 2010 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: accessors furnace.actions html.forms kernel
-mason.platform mason.report mason.server sequences webapps.mason
-webapps.mason.utils io.pathnames ;
+USING: accessors furnace.actions html.forms io.pathnames kernel
+mason.platform mason.report sequences webapps.mason
+webapps.mason.backend webapps.mason.utils ;
 IN: webapps.mason.release
 
 : release-link ( builder -- xml )

extra/webapps/mason/report/report.factor

@@ -1,7 +1,7 @@
 ! Copyright (C) 2010 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: accessors furnace.actions http.server.responses kernel
-urls mason.server webapps.mason.utils xml.syntax ;
+urls xml.syntax webapps.mason.backend webapps.mason.utils ;
 IN: webapps.mason.report
 
 : <build-report-action> ( -- action )

extra/webapps/mason/status-update/status-update.factor

@@ -2,7 +2,7 @@
 ! See http://factorcode.org/license.txt for BSD license.
 USING: accessors calendar combinators db.tuples furnace.actions
 furnace.redirection html.forms http.server.responses io kernel
-mason.server namespaces validators webapps.mason.utils ;
+namespaces validators webapps.mason.utils webapps.mason.backend ;
 IN: webapps.mason.status-update
 
 : find-builder ( host-name os cpu -- builder )

extra/webapps/mason/utils/utils.factor

@@ -1,9 +1,9 @@
 ! Copyright (C) 2010 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: accessors arrays assocs db.tuples furnace.actions
-furnace.utilities html.forms kernel mason.config mason.server
-mason.version.data namespaces sequences validators xml.syntax
-urls ;
+furnace.utilities html.forms kernel namespaces sequences
+validators xml.syntax urls mason.config
+webapps.mason.version.data webapps.mason.backend ;
 IN: webapps.mason.utils
 
 : link ( url label -- xml )

extra/webapps/mason/version/binary/binary.factor

@@ -1,8 +1,8 @@
 ! Copyright (C) 2010 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: io kernel make mason.version.common mason.version.files
-sequences ;
-IN: mason.version.binary
+USING: io kernel make sequences webapps.mason.version.common
+webapps.mason.version.files ;
+IN: webapps.mason.version.binary
 
 : binary-release-command ( version builder -- command )
     [

extra/webapps/mason/version/common/common.factor

@@ -2,7 +2,7 @@
 ! See http://factorcode.org/license.txt for BSD license.
 USING: accessors calendar io io.encodings.ascii io.launcher
 kernel make mason.config namespaces ;
-IN: mason.version.common
+IN: webapps.mason.version.common
 
 : execute-on-server ( string -- )
     [ "ssh" , upload-host get , "-l" , upload-username get , ] { } make

extra/webapps/mason/version/data/data.factor

@@ -1,8 +1,8 @@
 ! Copyright (C) 2010 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: accessors calendar db db.tuples db.types kernel locals
-mason.version.files sequences ;
-IN: mason.version.data
+webapps.mason.version.files sequences ;
+IN: webapps.mason.version.data
 
 TUPLE: release
 host-name os cpu

extra/webapps/mason/version/files/files.factor

@@ -2,7 +2,7 @@
 ! See http://factorcode.org/license.txt for BSD license.
 USING: accessors fry kernel make mason.config mason.platform
 mason.release.archive namespaces sequences ;
-IN: mason.version.files
+IN: webapps.mason.version.files
 
 : release-directory ( string version -- string )
     [ "releases/" % % "/" % % ] "" make ;

extra/webapps/mason/version/source/source.factor

@@ -2,9 +2,9 @@
 ! See http://factorcode.org/license.txt for BSD license.
 USING: bootstrap.image bootstrap.image.download io
 io.directories io.directories.hierarchy io.files.unique
-io.launcher io.pathnames kernel mason.common mason.config
-mason.version.files namespaces sequences ;
-IN: mason.version.source
+io.launcher io.pathnames kernel namespaces sequences
+mason.common mason.config webapps.mason.version.files ;
+IN: webapps.mason.version.source
 
 : clone-factor ( -- )
     { "git" "clone" "git://factorcode.org/git/factor.git" } try-process ;

extra/webapps/mason/version/version.factor

@@ -1,11 +1,12 @@
 ! Copyright (C) 2010 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: accessors bit.ly combinators db.tuples debugger fry
-grouping io io.streams.string kernel locals make mason.email
-mason.server mason.twitter mason.version.binary
-mason.version.common mason.version.data mason.version.files
-mason.version.source sequences threads ;
-IN: mason.version
+grouping io io.streams.string kernel locals make sequences
+threads mason.email mason.twitter webapps.mason.backend
+webapps.mason.version.common webapps.mason.version.data
+webapps.mason.version.files webapps.mason.version.source
+webapps.mason.version.binary ;
+IN: webapps.mason.version
 
 : check-releases ( builders -- )
     [ release-git-id>> ] map all-equal?

extra/websites/concatenative/concatenative.factor

@@ -26,7 +26,7 @@ webapps.wiki
 webapps.user-admin
 webapps.help
 webapps.mason
-mason.server ;
+webapps.mason.backend ;
 IN: websites.concatenative
 
 : test-db ( -- db ) "resource:test.db" <sqlite-db> ;