restructure directories

.gitignore

@@ -17,7 +17,7 @@ _convert
 # Documize build artifacts
 bin/*
 dist/*
-/documize/web/bindata/*
+/core/web/bindata/*
 app/dist/*
 app/dist-prod/*
 
@@ -51,7 +51,7 @@ _testmain.go
 /app/testem.log
 
 # Misc.
-documize/web/bindata_assetfs.go
+core/web/bindata_assetfs.go
 build
 plugin-msword/plugin-msword
 plugin-msword/plugin-msword-osx

build-community.sh

@@ -0,0 +1,52 @@
+#! /bin/bash
+
+NOW=$(date)
+echo "Build process started $NOW"
+
+# First parameter to this script is the Intercom.io key for audit logging.
+# This is optional and we use Intercom to record user activity and provider in-app support via messaging.
+intercomKey="$1"
+
+echo "Building Ember assets..."
+cd app
+ember b -o dist-prod/ --environment=production intercom=$intercomKey
+
+echo "Copying Ember assets..."
+cd ..
+rm -rf core/web/bindata/public
+mkdir -p core/web/bindata/public
+cp -r app/dist-prod/assets core/web/bindata/public
+cp -r app/dist-prod/codemirror core/web/bindata/public/codemirror
+cp -r app/dist-prod/tinymce core/web/bindata/public/tinymce
+cp -r app/dist-prod/sections core/web/bindata/public/sections
+cp app/dist-prod/*.* core/web/bindata
+cp app/dist-prod/favicon.ico core/web/bindata/public
+rm -rf core/web/bindata/mail
+mkdir -p core/web/bindata/mail
+cp core/api/mail/*.html core/web/bindata/mail
+cp core/database/templates/*.html core/web/bindata
+rm -rf core/web/bindata/scripts
+mkdir -p core/web/bindata/scripts
+cp -r core/database/scripts/autobuild/*.sql core/web/bindata/scripts
+
+echo "Generating in-memory static assets..."
+go get -u github.com/jteeuwen/go-bindata/...
+go get -u github.com/elazarl/go-bindata-assetfs/...
+cd core/web
+go generate
+
+echo "Compiling app..."
+cd ../..
+for arch in amd64 ; do
+    for os in darwin linux windows ; do
+        if [ "$os" == "windows" ] ; then
+            echo "Compiling documize-community-$os-$arch.exe"
+            env GOOS=$os GOARCH=$arch go build -o bin/documize-community-$os-$arch.exe ./cmd/documize-community
+        else
+            echo "Compiling documize-community-$os-$arch"
+            env GOOS=$os GOARCH=$arch go build -o bin/documize-community-$os-$arch ./cmd/documize-community
+        fi
+    done
+done
+
+echo "Finished."

build.sh

@@ -1,52 +0,0 @@
-#! /bin/bash
-
-NOW=$(date)
-echo "Build process started $NOW"
-
-# First parameter to this script is the Intercom.io key for audit logging.
-# This is optional and we use Intercom to record user activity and provider in-app support via messaging.
-intercomKey="$1"
-
-echo "Building Ember assets..."
-cd app
-ember b -o dist-prod/ --environment=production intercom=$intercomKey
-
-echo "Copying Ember assets..."
-cd ..
-rm -rf documize/web/bindata/public
-mkdir -p documize/web/bindata/public
-cp -r app/dist-prod/assets documize/web/bindata/public
-cp -r app/dist-prod/codemirror documize/web/bindata/public/codemirror
-cp -r app/dist-prod/tinymce documize/web/bindata/public/tinymce
-cp -r app/dist-prod/sections documize/web/bindata/public/sections
-cp app/dist-prod/*.* documize/web/bindata
-cp app/dist-prod/favicon.ico documize/web/bindata/public
-rm -rf documize/web/bindata/mail
-mkdir -p documize/web/bindata/mail
-cp documize/api/mail/*.html documize/web/bindata/mail
-cp documize/database/templates/*.html documize/web/bindata
-rm -rf documize/web/bindata/scripts
-mkdir -p documize/web/bindata/scripts
-cp -r documize/database/scripts/autobuild/*.sql documize/web/bindata/scripts
-
-echo "Generating in-memory static assets..."
-go get github.com/jteeuwen/go-bindata/...
-go get github.com/elazarl/go-bindata-assetfs/...
-cd documize/web
-go generate
-
-echo "Compiling app..."
-cd ../..
-for arch in amd64 ; do
-    for os in darwin linux windows ; do
-        if [ "$os" == "windows" ] ; then
-            echo "Compiling documize-$os-$arch.exe"
-            env GOOS=$os GOARCH=$arch go build -o bin/documize-$os-$arch.exe ./documize
-        else
-            echo "Compiling documize-$os-$arch"
-            env GOOS=$os GOARCH=$arch go build -o bin/documize-$os-$arch ./documize
-        fi
-    done
-done
-
-echo "Finished."

cmd/documize-community/documize.go

@@ -13,9 +13,9 @@
 package main
 
 import (
-	"github.com/documize/community/documize/api/endpoint"
-	"github.com/documize/community/documize/section"
-	"github.com/documize/community/wordsmith/environment"
+	"github.com/documize/community/core/api/endpoint"
+	"github.com/documize/community/core/environment"
+	"github.com/documize/community/core/section"
 
 	_ "github.com/go-sql-driver/mysql" // the mysql driver is required behind the scenes
 )

core/api/convert/apidocumizecom/init.go

@@ -16,7 +16,7 @@ import (
 	"errors"
 	"net/http"
 
-	"github.com/documize/community/documize/api/request"
+	"github.com/documize/community/core/api/request"
 )
 
 func endPoint() string {

core/api/convert/apidocumizecom/msword.go

@@ -18,7 +18,7 @@ import (
 	"net/http"
 	"path/filepath"
 
-	"github.com/documize/community/wordsmith/api"
+	api "github.com/documize/community/core/convapi"
 
 	"golang.org/x/net/context"
 )

core/api/convert/convert.go

@@ -14,11 +14,11 @@ package convert
 
 import (
 	"errors"
-	"github.com/documize/community/documize/api/convert/excerpt"
-	"github.com/documize/community/documize/api/convert/html"
-	"github.com/documize/community/documize/api/plugins"
-	"github.com/documize/community/wordsmith/api"
-	"github.com/documize/community/wordsmith/utility"
+	"github.com/documize/community/core/api/convert/excerpt"
+	"github.com/documize/community/core/api/convert/html"
+	"github.com/documize/community/core/api/plugins"
+api	"github.com/documize/community/core/convapi"
+	"github.com/documize/community/core/utility"
 
 	"golang.org/x/net/context"
 )

core/api/convert/convert_test.go

@@ -1,24 +1,25 @@
 // Copyright 2016 Documize Inc. <legal@documize.com>. All rights reserved.
 //
-// This software (Documize Community Edition) is licensed under 
+// This software (Documize Community Edition) is licensed under
 // GNU AGPL v3 http://www.gnu.org/licenses/agpl-3.0.en.html
 //
 // You can operate outside the AGPL restrictions by purchasing
 // Documize Enterprise Edition and obtaining a commercial license
-// by contacting <sales@documize.com>. 
+// by contacting <sales@documize.com>.
 //
 // https://documize.com
 
 package convert_test
 
 import (
-	"github.com/documize/community/documize/api/convert"
-	"github.com/documize/community/documize/api/plugins"
-	"github.com/documize/community/wordsmith/api"
-	"github.com/documize/community/wordsmith/log"
 	"strings"
 	"testing"
 
+	"github.com/documize/community/core/api/convert"
+	"github.com/documize/community/core/api/plugins"
+	api "github.com/documize/community/core/convapi"
+	"github.com/documize/community/core/log"
+
 	"golang.org/x/net/context"
 )
 

core/api/convert/documizeapi/documizeapi.go

@@ -14,7 +14,7 @@ package documizeapi
 import (
 	"encoding/json"
 
-	"github.com/documize/community/wordsmith/api"
+	api "github.com/documize/community/core/convapi"
 
 	"golang.org/x/net/context"
 )

core/api/convert/excerpt/excerpt.go

@@ -18,7 +18,7 @@ import (
 	"unicode"
 	"unicode/utf8"
 
-	words "github.com/documize/community/wordsmith/wordlists/en-2012"
+	words "github.com/documize/community/core/wordlists/en-2012"
 
 	"github.com/rookii/paicehusk"
 )

core/api/convert/excerpt/excerpt_test.go

@@ -1,18 +1,18 @@
 // Copyright 2016 Documize Inc. <legal@documize.com>. All rights reserved.
 //
-// This software (Documize Community Edition) is licensed under 
+// This software (Documize Community Edition) is licensed under
 // GNU AGPL v3 http://www.gnu.org/licenses/agpl-3.0.en.html
 //
 // You can operate outside the AGPL restrictions by purchasing
 // Documize Enterprise Edition and obtaining a commercial license
-// by contacting <sales@documize.com>. 
+// by contacting <sales@documize.com>.
 //
 // https://documize.com
 
 package excerpt_test
 
 import "testing"
-import "github.com/documize/community/documize/api/convert/excerpt"
+import "github.com/documize/community/core/api/convert/excerpt"
 import "strings"
 import "fmt"
 

core/api/convert/html/html.go

@@ -1,11 +1,11 @@
 // Copyright 2016 Documize Inc. <legal@documize.com>. All rights reserved.
 //
-// This software (Documize Community Edition) is licensed under 
+// This software (Documize Community Edition) is licensed under
 // GNU AGPL v3 http://www.gnu.org/licenses/agpl-3.0.en.html
 //
 // You can operate outside the AGPL restrictions by purchasing
 // Documize Enterprise Edition and obtaining a commercial license
-// by contacting <sales@documize.com>. 
+// by contacting <sales@documize.com>.
 //
 // https://documize.com
 
@@ -16,9 +16,9 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/documize/community/wordsmith/api"
-	"github.com/documize/community/wordsmith/log"
-	"github.com/documize/community/wordsmith/utility"
+	api "github.com/documize/community/core/convapi"
+	"github.com/documize/community/core/log"
+	"github.com/documize/community/core/utility"
 
 	"golang.org/x/net/html"
 	"golang.org/x/net/html/atom"

core/api/convert/html/html_test.go

@@ -15,8 +15,8 @@ import (
 	"strings"
 	"testing"
 )
-import "github.com/documize/community/wordsmith/api"
-import "github.com/documize/community/documize/api/convert/html"
+import api "github.com/documize/community/core/convapi"
+import "github.com/documize/community/core/api/convert/html"
 
 const b string = `
 <h1>Markdown: Basics</h1>

core/api/convert/md/md.go

@@ -12,7 +12,7 @@
 package md
 
 import (
-	"github.com/documize/community/wordsmith/api"
+api	"github.com/documize/community/core/convapi"
 
 	"github.com/documize/blackfriday"
 

core/api/endpoint/attachment_endpoint.go

@@ -20,10 +20,10 @@ import (
 	"mime"
 	"net/http"
 
-	"github.com/documize/community/documize/api/entity"
-	"github.com/documize/community/documize/api/request"
-	"github.com/documize/community/documize/api/util"
-	"github.com/documize/community/wordsmith/log"
+	"github.com/documize/community/core/api/entity"
+	"github.com/documize/community/core/api/request"
+	"github.com/documize/community/core/api/util"
+	"github.com/documize/community/core/log"
 
 	uuid "github.com/nu7hatch/gouuid"
 

core/api/endpoint/authentication_endpoint.go

@@ -23,15 +23,15 @@ import (
 
 	jwt "github.com/dgrijalva/jwt-go"
 
-	"github.com/documize/community/documize/api/endpoint/models"
-	"github.com/documize/community/documize/api/entity"
-	"github.com/documize/community/documize/api/request"
-	"github.com/documize/community/documize/api/util"
-	"github.com/documize/community/documize/section/provider"
-	"github.com/documize/community/documize/web"
-	"github.com/documize/community/wordsmith/environment"
-	"github.com/documize/community/wordsmith/log"
-	"github.com/documize/community/wordsmith/utility"
+	"github.com/documize/community/core/api/endpoint/models"
+	"github.com/documize/community/core/api/entity"
+	"github.com/documize/community/core/api/request"
+	"github.com/documize/community/core/api/util"
+	"github.com/documize/community/core/section/provider"
+	"github.com/documize/community/core/web"
+	"github.com/documize/community/core/environment"
+	"github.com/documize/community/core/log"
+	"github.com/documize/community/core/utility"
 )
 
 // Authenticate user based up HTTP Authorization header.

core/api/endpoint/conversion_endpoint.go

@@ -20,13 +20,13 @@ import (
 	"net/http"
 	"strings"
 
-	"github.com/documize/community/documize/api/endpoint/models"
-	"github.com/documize/community/documize/api/entity"
-	"github.com/documize/community/documize/api/request"
-	"github.com/documize/community/documize/api/store"
-	"github.com/documize/community/documize/api/util"
-	"github.com/documize/community/wordsmith/api"
-	"github.com/documize/community/wordsmith/log"
+	"github.com/documize/community/core/api/endpoint/models"
+	"github.com/documize/community/core/api/entity"
+	"github.com/documize/community/core/api/request"
+	"github.com/documize/community/core/api/store"
+	"github.com/documize/community/core/api/util"
+api	"github.com/documize/community/core/convapi"
+	"github.com/documize/community/core/log"
 
 	uuid "github.com/nu7hatch/gouuid"
 

core/api/endpoint/document_endpoint.go

@@ -19,12 +19,12 @@ import (
 	"net/http"
 	"net/url"
 
-	"github.com/documize/community/documize/api/entity"
-	"github.com/documize/community/documize/api/plugins"
-	"github.com/documize/community/documize/api/request"
-	"github.com/documize/community/documize/api/store"
-	"github.com/documize/community/wordsmith/log"
-	"github.com/documize/community/wordsmith/utility"
+	"github.com/documize/community/core/api/entity"
+	"github.com/documize/community/core/api/plugins"
+	"github.com/documize/community/core/api/request"
+	"github.com/documize/community/core/api/store"
+	"github.com/documize/community/core/log"
+	"github.com/documize/community/core/utility"
 
 	"github.com/gorilla/mux"
 )

core/api/endpoint/endpoint_test.go

@@ -36,8 +36,8 @@ import (
 	"time"
 
 	"github.com/documize/community/documize/api/plugins"
-	"github.com/documize/community/wordsmith/environment"
-	"github.com/documize/community/wordsmith/log"
+	"github.com/documize/community/core/environment"
+	"github.com/documize/community/core/log"
 
 	"github.com/documize/community/sdk/exttest"
 )

core/api/endpoint/init.go

@@ -15,9 +15,9 @@ import (
 	"fmt"
 	"net/http"
 
-	"github.com/documize/community/documize/api/request"
-	"github.com/documize/community/documize/api/store"
-	"github.com/documize/community/wordsmith/log"
+	"github.com/documize/community/core/api/request"
+	"github.com/documize/community/core/api/store"
+	"github.com/documize/community/core/log"
 )
 
 var storageProvider store.StorageProvider

core/api/endpoint/label_endpoint.go

@@ -21,13 +21,13 @@ import (
 
 	"github.com/gorilla/mux"
 
-	"github.com/documize/community/documize/api/endpoint/models"
-	"github.com/documize/community/documize/api/entity"
-	"github.com/documize/community/documize/api/mail"
-	"github.com/documize/community/documize/api/request"
-	"github.com/documize/community/documize/api/util"
-	"github.com/documize/community/wordsmith/log"
-	"github.com/documize/community/wordsmith/utility"
+	"github.com/documize/community/core/api/endpoint/models"
+	"github.com/documize/community/core/api/entity"
+	"github.com/documize/community/core/api/mail"
+	"github.com/documize/community/core/api/request"
+	"github.com/documize/community/core/api/util"
+	"github.com/documize/community/core/log"
+	"github.com/documize/community/core/utility"
 )
 
 // AddFolder creates a new folder.

core/api/endpoint/meta_endpoint.go

@@ -18,10 +18,10 @@ import (
 	"net/http"
 	"text/template"
 
-	"github.com/documize/community/documize/api/entity"
-	"github.com/documize/community/documize/api/request"
-	"github.com/documize/community/wordsmith/log"
-	"github.com/documize/community/wordsmith/utility"
+	"github.com/documize/community/core/api/entity"
+	"github.com/documize/community/core/api/request"
+	"github.com/documize/community/core/log"
+	"github.com/documize/community/core/utility"
 )
 
 // GetMeta provides org meta data based upon request domain (e.g. acme.documize.com).

core/api/endpoint/models/models.go

@@ -15,7 +15,7 @@
 package models
 
 import (
-	"github.com/documize/community/documize/api/entity"
+	"github.com/documize/community/core/api/entity"
 )
 
 // PageSequenceRequestModel details a page ID and its sequence within the document.

core/api/endpoint/org_endpoint.go

@@ -18,10 +18,10 @@ import (
 	"io/ioutil"
 	"net/http"
 
-	"github.com/documize/community/documize/api/entity"
-	"github.com/documize/community/documize/api/request"
-	"github.com/documize/community/wordsmith/log"
-	"github.com/documize/community/wordsmith/utility"
+	"github.com/documize/community/core/api/entity"
+	"github.com/documize/community/core/api/request"
+	"github.com/documize/community/core/log"
+	"github.com/documize/community/core/utility"
 
 	"github.com/gorilla/mux"
 )

core/api/endpoint/page_endpoint.go

@@ -19,13 +19,13 @@ import (
 	"net/http"
 	"strconv"
 
-	"github.com/documize/community/documize/api/endpoint/models"
-	"github.com/documize/community/documize/api/entity"
-	"github.com/documize/community/documize/api/request"
-	"github.com/documize/community/documize/api/util"
-	"github.com/documize/community/documize/section/provider"
-	"github.com/documize/community/wordsmith/log"
-	"github.com/documize/community/wordsmith/utility"
+	"github.com/documize/community/core/api/endpoint/models"
+	"github.com/documize/community/core/api/entity"
+	"github.com/documize/community/core/api/request"
+	"github.com/documize/community/core/api/util"
+	"github.com/documize/community/core/section/provider"
+	"github.com/documize/community/core/log"
+	"github.com/documize/community/core/utility"
 
 	"github.com/gorilla/mux"
 )

core/api/endpoint/router.go

@@ -18,11 +18,11 @@ import (
 	"strings"
 
 	"github.com/codegangsta/negroni"
-	"github.com/documize/community/documize/api/plugins"
-	"github.com/documize/community/documize/database"
-	"github.com/documize/community/documize/web"
-	"github.com/documize/community/wordsmith/environment"
-	"github.com/documize/community/wordsmith/log"
+	"github.com/documize/community/core/api/plugins"
+	"github.com/documize/community/core/database"
+	"github.com/documize/community/core/web"
+	"github.com/documize/community/core/environment"
+	"github.com/documize/community/core/log"
 	"github.com/gorilla/mux"
 )
 

core/api/endpoint/sections_endpoint.go

@@ -15,11 +15,11 @@ import (
 	"encoding/json"
 	"net/http"
 
-	"github.com/documize/community/documize/api/entity"
-	"github.com/documize/community/documize/api/request"
-	"github.com/documize/community/documize/api/util"
-	"github.com/documize/community/documize/section/provider"
-	"github.com/documize/community/wordsmith/log"
+	"github.com/documize/community/core/api/entity"
+	"github.com/documize/community/core/api/request"
+	"github.com/documize/community/core/api/util"
+	"github.com/documize/community/core/section/provider"
+	"github.com/documize/community/core/log"
 )
 
 // GetSections returns available smart sections.

core/api/endpoint/templates_endpoint.go

@@ -22,14 +22,14 @@ import (
 
 	"github.com/gorilla/mux"
 
-	"github.com/documize/community/documize/api/convert"
-	"github.com/documize/community/documize/api/endpoint/models"
-	"github.com/documize/community/documize/api/entity"
-	"github.com/documize/community/documize/api/request"
-	"github.com/documize/community/documize/api/util"
-	"github.com/documize/community/wordsmith/api"
-	"github.com/documize/community/wordsmith/log"
-	"github.com/documize/community/wordsmith/utility"
+	"github.com/documize/community/core/api/convert"
+	"github.com/documize/community/core/api/endpoint/models"
+	"github.com/documize/community/core/api/entity"
+	"github.com/documize/community/core/api/request"
+	"github.com/documize/community/core/api/util"
+	api "github.com/documize/community/core/convapi"
+	"github.com/documize/community/core/log"
+	"github.com/documize/community/core/utility"
 
 	uuid "github.com/nu7hatch/gouuid"
 )

core/api/endpoint/user_endpoint.go

@@ -20,13 +20,13 @@ import (
 	"net/url"
 	"strings"
 
-	"github.com/documize/community/documize/api/entity"
-	"github.com/documize/community/documize/api/mail"
-	"github.com/documize/community/documize/api/request"
-	"github.com/documize/community/documize/api/util"
-	"github.com/documize/community/wordsmith/api"
-	"github.com/documize/community/wordsmith/log"
-	"github.com/documize/community/wordsmith/utility"
+	"github.com/documize/community/core/api/entity"
+	"github.com/documize/community/core/api/mail"
+	"github.com/documize/community/core/api/request"
+	"github.com/documize/community/core/api/util"
+	api "github.com/documize/community/core/convapi"
+	"github.com/documize/community/core/log"
+	"github.com/documize/community/core/utility"
 
 	"github.com/gorilla/mux"
 )

core/api/mail/mailer.go

@@ -1,11 +1,11 @@
 // Copyright 2016 Documize Inc. <legal@documize.com>. All rights reserved.
 //
-// This software (Documize Community Edition) is licensed under 
+// This software (Documize Community Edition) is licensed under
 // GNU AGPL v3 http://www.gnu.org/licenses/agpl-3.0.en.html
 //
 // You can operate outside the AGPL restrictions by purchasing
 // Documize Enterprise Edition and obtaining a commercial license
-// by contacting <sales@documize.com>. 
+// by contacting <sales@documize.com>.
 //
 // https://documize.com
 
@@ -19,9 +19,9 @@ import (
 	"html/template"
 	"net/smtp"
 
-	"github.com/documize/community/documize/api/request"
-	"github.com/documize/community/documize/web"
-	"github.com/documize/community/wordsmith/log"
+	"github.com/documize/community/core/api/request"
+	"github.com/documize/community/core/web"
+	"github.com/documize/community/core/log"
 )
 
 // InviteNewUser invites someone new providing credentials, explaining the product and stating who is inviting them.

core/api/mail/mailer_test.go

@@ -19,7 +19,7 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/documize/community/wordsmith/log"
+	"github.com/documize/community/core/log"
 )
 
 func TestMail(t *testing.T) {

core/api/mail/smtp.go

@@ -45,7 +45,7 @@ import (
 	"encoding/base64"
 	"errors"
 	"fmt"
-	"github.com/documize/community/wordsmith/log"
+	"github.com/documize/community/core/log"
 	"io"
 	"mime"
 	"mime/multipart"

core/api/plugins/glick.go

@@ -18,14 +18,14 @@ import (
 	"io/ioutil"
 	"time"
 
-	"github.com/documize/community/documize/api/convert/apidocumizecom"
-	"github.com/documize/community/documize/api/convert/documizeapi"
-	"github.com/documize/community/documize/api/convert/html"
-	"github.com/documize/community/documize/api/convert/md"
-	"github.com/documize/community/documize/api/request"
-	"github.com/documize/community/wordsmith/api"
-	"github.com/documize/community/wordsmith/environment"
-	"github.com/documize/community/wordsmith/log"
+	"github.com/documize/community/core/api/convert/apidocumizecom"
+	"github.com/documize/community/core/api/convert/documizeapi"
+	"github.com/documize/community/core/api/convert/html"
+	"github.com/documize/community/core/api/convert/md"
+	"github.com/documize/community/core/api/request"
+	api "github.com/documize/community/core/convapi"
+	"github.com/documize/community/core/environment"
+	"github.com/documize/community/core/log"
 	"github.com/documize/glick"
 )
 

core/api/request/account.go

@@ -14,9 +14,9 @@ package request
 import (
 	"database/sql"
 	"fmt"
-	"github.com/documize/community/documize/api/entity"
-	"github.com/documize/community/wordsmith/log"
-	"github.com/documize/community/wordsmith/utility"
+	"github.com/documize/community/core/api/entity"
+	"github.com/documize/community/core/log"
+	"github.com/documize/community/core/utility"
 	"time"
 )
 

core/api/request/account_test.go

@@ -14,7 +14,7 @@ package request
 /* TODO(Elliott)
 import (
 	"github.com/documize/community/documize/api/entity"
-	"github.com/documize/community/wordsmith/environment"
+	"github.com/documize/community/core/environment"
 	"testing"
 )
 

core/api/request/attachment.go

@@ -16,9 +16,9 @@ import (
 	"strings"
 	"time"
 
-	"github.com/documize/community/documize/api/entity"
-	"github.com/documize/community/wordsmith/log"
-	"github.com/documize/community/wordsmith/utility"
+	"github.com/documize/community/core/api/entity"
+	"github.com/documize/community/core/log"
+	"github.com/documize/community/core/utility"
 )
 
 // AddAttachment inserts the given record into the database attachement table.

core/api/request/attachment_test.go

@@ -17,7 +17,7 @@ import (
 	"testing"
 
 	"github.com/documize/community/documize/api/entity"
-	"github.com/documize/community/wordsmith/environment"
+	"github.com/documize/community/core/environment"
 )
 
 const testAtt = "TestAttachment"

core/api/request/config.go

@@ -15,7 +15,7 @@ import (
 	"bytes"
 	"errors"
 
-	"github.com/documize/community/wordsmith/utility"
+	"github.com/documize/community/core/utility"
 )
 
 /* NOT CURRENTLY USED

core/api/request/context.go

@@ -20,7 +20,7 @@ import (
 	"github.com/gorilla/context"
 	"github.com/jmoiron/sqlx"
 
-	"github.com/documize/community/wordsmith/log"
+	"github.com/documize/community/core/log"
 )
 
 var rc = Context{}

core/api/request/context_test.go

@@ -13,7 +13,7 @@ package request
 
 /* TODO(Elliott)
 import (
-	"github.com/documize/community/wordsmith/environment"
+	"github.com/documize/community/core/environment"
 	"net/http"
 	"testing"
 )

core/api/request/document.go

@@ -18,9 +18,9 @@ import (
 	"strings"
 	"time"
 
-	"github.com/documize/community/documize/api/entity"
-	"github.com/documize/community/wordsmith/log"
-	"github.com/documize/community/wordsmith/utility"
+	"github.com/documize/community/core/api/entity"
+	"github.com/documize/community/core/log"
+	"github.com/documize/community/core/utility"
 )
 
 // AddDocument inserts the given document record into the document table and audits that it has been done.

core/api/request/document_test.go

@@ -14,7 +14,7 @@ package request
 /* TODO(Elliott)
 import (
 	"github.com/documize/community/documize/api/entity"
-	"github.com/documize/community/wordsmith/environment"
+	"github.com/documize/community/core/environment"
 	"testing"
 	"time"
 )

core/api/request/init.go

@@ -18,11 +18,11 @@ import (
 
 	"github.com/jmoiron/sqlx"
 
-	"github.com/documize/community/documize/database"
-	"github.com/documize/community/documize/web"
-	"github.com/documize/community/wordsmith/environment"
-	"github.com/documize/community/wordsmith/log"
-	"github.com/documize/community/wordsmith/utility"
+	"github.com/documize/community/core/database"
+	"github.com/documize/community/core/web"
+	"github.com/documize/community/core/environment"
+	"github.com/documize/community/core/log"
+	"github.com/documize/community/core/utility"
 )
 
 var connectionString string

core/api/request/label.go

@@ -15,9 +15,9 @@ import (
 	"fmt"
 	"time"
 
-	"github.com/documize/community/documize/api/entity"
-	"github.com/documize/community/wordsmith/log"
-	"github.com/documize/community/wordsmith/utility"
+	"github.com/documize/community/core/api/entity"
+	"github.com/documize/community/core/log"
+	"github.com/documize/community/core/utility"
 )
 
 // AddLabel adds new folder into the store.

core/api/request/labelrole.go

@@ -16,9 +16,9 @@ import (
 	"fmt"
 	"time"
 
-	"github.com/documize/community/documize/api/entity"
-	"github.com/documize/community/wordsmith/log"
-	"github.com/documize/community/wordsmith/utility"
+	"github.com/documize/community/core/api/entity"
+	"github.com/documize/community/core/log"
+	"github.com/documize/community/core/utility"
 )
 
 // AddLabelRole inserts the given record into the labelrole database table.

core/api/request/organization.go

@@ -17,10 +17,10 @@ import (
 	"strings"
 	"time"
 
-	"github.com/documize/community/documize/api/entity"
-	"github.com/documize/community/documize/web"
-	"github.com/documize/community/wordsmith/log"
-	"github.com/documize/community/wordsmith/utility"
+	"github.com/documize/community/core/api/entity"
+	"github.com/documize/community/core/web"
+	"github.com/documize/community/core/log"
+	"github.com/documize/community/core/utility"
 	"github.com/jmoiron/sqlx"
 )
 

core/api/request/page.go

@@ -18,10 +18,10 @@ import (
 
 	"github.com/jmoiron/sqlx"
 
-	"github.com/documize/community/documize/api/endpoint/models"
-	"github.com/documize/community/documize/api/entity"
-	"github.com/documize/community/wordsmith/log"
-	"github.com/documize/community/wordsmith/utility"
+	"github.com/documize/community/core/api/endpoint/models"
+	"github.com/documize/community/core/api/entity"
+	"github.com/documize/community/core/log"
+	"github.com/documize/community/core/utility"
 )
 
 // AddPage inserts the given page into the page table, adds that page to the queue of pages to index and audits that the page has been added.

core/api/request/search.go

@@ -21,9 +21,9 @@ import (
 	_ "github.com/go-sql-driver/mysql" // required for sqlx but not directly called
 	"github.com/jmoiron/sqlx"
 
-	"github.com/documize/community/documize/api/entity"
-	"github.com/documize/community/wordsmith/log"
-	"github.com/documize/community/wordsmith/utility"
+	"github.com/documize/community/core/api/entity"
+	"github.com/documize/community/core/log"
+	"github.com/documize/community/core/utility"
 )
 
 // SearchManager type provides the datastructure for the queues of activity to be serialized through a single background goroutine.

core/api/request/setup.go

@@ -14,8 +14,8 @@ package request
 // This file contains the code for initial set-up of a database
 
 import (
-	"github.com/documize/community/documize/api/entity"
-	"github.com/documize/community/documize/api/util"
+	"github.com/documize/community/core/api/entity"
+	"github.com/documize/community/core/api/util"
 )
 
 func SetupPersister() (*Persister, error) {

core/api/request/user.go

@@ -18,9 +18,9 @@ import (
 
 	"database/sql"
 
-	"github.com/documize/community/documize/api/entity"
-	"github.com/documize/community/wordsmith/log"
-	"github.com/documize/community/wordsmith/utility"
+	"github.com/documize/community/core/api/entity"
+	"github.com/documize/community/core/log"
+	"github.com/documize/community/core/utility"
 )
 
 // AddUser adds the given user record to the user table.

core/api/store/local.go

@@ -20,9 +20,9 @@ import (
 	"os"
 	"strings"
 
-	"github.com/documize/community/documize/api/convert"
-	"github.com/documize/community/wordsmith/api"
-	"github.com/documize/community/wordsmith/log"
+	"github.com/documize/community/core/api/convert"
+api	"github.com/documize/community/core/convapi"
+	"github.com/documize/community/core/log"
 )
 
 var folderPath string

core/api/store/local_test.go

@@ -12,10 +12,10 @@
 package store
 
 import (
-	"github.com/documize/community/documize/api/plugins"
-	"github.com/documize/community/documize/api/util"
-	"github.com/documize/community/wordsmith/api"
-	"github.com/documize/community/wordsmith/log"
+	"github.com/documize/community/core/api/plugins"
+	"github.com/documize/community/core/api/util"
+api	"github.com/documize/community/core/convapi"
+	"github.com/documize/community/core/log"
 	"io/ioutil"
 	"os"
 	"strings"

core/api/store/store.go

@@ -15,9 +15,9 @@ import (
 	"errors"
 	"strings"
 
-	"github.com/documize/community/documize/api/entity"
-	"github.com/documize/community/wordsmith/api"
-	"github.com/documize/community/wordsmith/utility"
+	"github.com/documize/community/core/api/entity"
+api	"github.com/documize/community/core/convapi"
+	"github.com/documize/community/core/utility"
 )
 
 // StorageProvider describes the interface for document conversion and take-on.

core/api/store/store_test.go

@@ -1,11 +1,11 @@
 // Copyright 2016 Documize Inc. <legal@documize.com>. All rights reserved.
 //
-// This software (Documize Community Edition) is licensed under 
+// This software (Documize Community Edition) is licensed under
 // GNU AGPL v3 http://www.gnu.org/licenses/agpl-3.0.en.html
 //
 // You can operate outside the AGPL restrictions by purchasing
 // Documize Enterprise Edition and obtaining a commercial license
-// by contacting <sales@documize.com>. 
+// by contacting <sales@documize.com>.
 //
 // https://documize.com
 
@@ -14,9 +14,9 @@ package store
 import (
 	"testing"
 
-	"github.com/documize/community/documize/api/plugins"
-	"github.com/documize/community/wordsmith/api"
-	"github.com/documize/community/wordsmith/log"
+	"github.com/documize/community/core/api/plugins"
+	api "github.com/documize/community/core/convapi"
+	"github.com/documize/community/core/log"
 )
 
 func TestExportAs(t *testing.T) {

core/api/util/password.go

@@ -17,7 +17,7 @@ import (
 
 	"golang.org/x/crypto/bcrypt"
 
-	"github.com/documize/community/wordsmith/log"
+	"github.com/documize/community/core/log"
 )
 
 // GenerateRandomPassword provides a string suitable for use as a password.

core/api/util/uniqueid_test.go

@@ -1,11 +1,11 @@
 // Copyright 2016 Documize Inc. <legal@documize.com>. All rights reserved.
 //
-// This software (Documize Community Edition) is licensed under 
+// This software (Documize Community Edition) is licensed under
 // GNU AGPL v3 http://www.gnu.org/licenses/agpl-3.0.en.html
 //
 // You can operate outside the AGPL restrictions by purchasing
 // Documize Enterprise Edition and obtaining a commercial license
-// by contacting <sales@documize.com>. 
+// by contacting <sales@documize.com>.
 //
 // https://documize.com
 
@@ -16,7 +16,7 @@ import (
 	"sync"
 	"testing"
 
-	"github.com/documize/community/documize/api/util"
+	"github.com/documize/community/core/api/util"
 )
 
 const sample = 1 << 24

core/convapi/convertapi.go

@@ -1,16 +1,16 @@
 // Copyright 2016 Documize Inc. <legal@documize.com>. All rights reserved.
 //
-// This software (Documize Community Edition) is licensed under 
+// This software (Documize Community Edition) is licensed under
 // GNU AGPL v3 http://www.gnu.org/licenses/agpl-3.0.en.html
 //
 // You can operate outside the AGPL restrictions by purchasing
 // Documize Enterprise Edition and obtaining a commercial license
-// by contacting <sales@documize.com>. 
+// by contacting <sales@documize.com>.
 //
 // https://documize.com
 
-// Package api provides the defininitions of types used for communication between different components of the Documize system.
-package api
+// Package convapi provides the defininitions of types used for file conversion communication between different components of the Documize system.
+package convapi
 
 // DocumentConversionRequest is what is passed to a Convert plugin.
 type DocumentConversionRequest struct {

core/convapi/request.go

@@ -9,7 +9,7 @@
 //
 // https://documize.com
 
-package api
+package convapi
 
 // ConversionJobRequest is the information used to set-up a conversion job.
 type ConversionJobRequest struct {

core/convapi/response.go

@@ -9,10 +9,10 @@
 //
 // https://documize.com
 
-package api
+package convapi
 
 import (
-	"github.com/documize/community/wordsmith/log"
+	"github.com/documize/community/core/log"
 	"encoding/json"
 	"net/http"
 )

core/database/check.go

@@ -17,9 +17,9 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/documize/community/documize/web"
-	"github.com/documize/community/wordsmith/log"
-	"github.com/documize/community/wordsmith/utility"
+	"github.com/documize/community/core/web"
+	"github.com/documize/community/core/log"
+	"github.com/documize/community/core/utility"
 	"github.com/jmoiron/sqlx"
 )
 

core/database/create.go

@@ -18,10 +18,10 @@ import (
 	"strings"
 	"time"
 
-	"github.com/documize/community/documize/api/util"
-	"github.com/documize/community/documize/web"
-	"github.com/documize/community/wordsmith/log"
-	"github.com/documize/community/wordsmith/utility"
+	"github.com/documize/community/core/api/util"
+	"github.com/documize/community/core/web"
+	"github.com/documize/community/core/log"
+	"github.com/documize/community/core/utility"
 )
 
 // runSQL creates a transaction per call

core/database/migrate.go

@@ -20,9 +20,9 @@ import (
 
 	"github.com/jmoiron/sqlx"
 
-	"github.com/documize/community/documize/web"
-	"github.com/documize/community/wordsmith/log"
-	"github.com/documize/community/wordsmith/utility"
+	"github.com/documize/community/core/web"
+	"github.com/documize/community/core/log"
+	"github.com/documize/community/core/utility"
 )
 
 const migrationsDir = "bindata/scripts"