diff --git a/.gitignore b/.gitignore index 0012c662..2ef2e656 100644 --- a/.gitignore +++ b/.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 diff --git a/build-community.sh b/build-community.sh new file mode 100755 index 00000000..28cba79b --- /dev/null +++ b/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." diff --git a/build.sh b/build.sh deleted file mode 100755 index 6357c452..00000000 --- a/build.sh +++ /dev/null @@ -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." diff --git a/documize/documize.go b/cmd/documize-community/documize.go similarity index 82% rename from documize/documize.go rename to cmd/documize-community/documize.go index 96df3ce5..6de4960e 100644 --- a/documize/documize.go +++ b/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 ) diff --git a/documize/api/convert/apidocumizecom/init.go b/core/api/convert/apidocumizecom/init.go similarity index 95% rename from documize/api/convert/apidocumizecom/init.go rename to core/api/convert/apidocumizecom/init.go index 3176b959..afd41a75 100644 --- a/documize/api/convert/apidocumizecom/init.go +++ b/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 { diff --git a/documize/api/convert/apidocumizecom/msword.go b/core/api/convert/apidocumizecom/msword.go similarity index 97% rename from documize/api/convert/apidocumizecom/msword.go rename to core/api/convert/apidocumizecom/msword.go index 4c3455bb..e5fbad99 100644 --- a/documize/api/convert/apidocumizecom/msword.go +++ b/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" ) diff --git a/documize/api/convert/convert.go b/core/api/convert/convert.go similarity index 92% rename from documize/api/convert/convert.go rename to core/api/convert/convert.go index e5c94cff..c7662f55 100644 --- a/documize/api/convert/convert.go +++ b/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" ) diff --git a/documize/api/convert/convert_test.go b/core/api/convert/convert_test.go similarity index 94% rename from documize/api/convert/convert_test.go rename to core/api/convert/convert_test.go index 623d8981..7d76d9ef 100644 --- a/documize/api/convert/convert_test.go +++ b/core/api/convert/convert_test.go @@ -1,24 +1,25 @@ // Copyright 2016 Documize Inc. . 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 . +// by contacting . // // 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" ) diff --git a/documize/api/convert/documizeapi/documizeapi.go b/core/api/convert/documizeapi/documizeapi.go similarity index 94% rename from documize/api/convert/documizeapi/documizeapi.go rename to core/api/convert/documizeapi/documizeapi.go index afed0d4a..ffd1e9f4 100644 --- a/documize/api/convert/documizeapi/documizeapi.go +++ b/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" ) diff --git a/documize/api/convert/excerpt/excerpt.go b/core/api/convert/excerpt/excerpt.go similarity index 98% rename from documize/api/convert/excerpt/excerpt.go rename to core/api/convert/excerpt/excerpt.go index 70eeef93..b50126fb 100644 --- a/documize/api/convert/excerpt/excerpt.go +++ b/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" ) diff --git a/documize/api/convert/excerpt/excerpt_test.go b/core/api/convert/excerpt/excerpt_test.go similarity index 96% rename from documize/api/convert/excerpt/excerpt_test.go rename to core/api/convert/excerpt/excerpt_test.go index cf861e23..98d28102 100644 --- a/documize/api/convert/excerpt/excerpt_test.go +++ b/core/api/convert/excerpt/excerpt_test.go @@ -1,18 +1,18 @@ // Copyright 2016 Documize Inc. . 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 . +// by contacting . // // 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" diff --git a/documize/api/convert/html/README.md b/core/api/convert/html/README.md similarity index 100% rename from documize/api/convert/html/README.md rename to core/api/convert/html/README.md diff --git a/documize/api/convert/html/doc.go b/core/api/convert/html/doc.go similarity index 100% rename from documize/api/convert/html/doc.go rename to core/api/convert/html/doc.go diff --git a/documize/api/convert/html/html.go b/core/api/convert/html/html.go similarity index 96% rename from documize/api/convert/html/html.go rename to core/api/convert/html/html.go index c9fccc02..7ddcf51f 100644 --- a/documize/api/convert/html/html.go +++ b/core/api/convert/html/html.go @@ -1,11 +1,11 @@ // Copyright 2016 Documize Inc. . 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 . +// by contacting . // // 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" diff --git a/documize/api/convert/html/html_test.go b/core/api/convert/html/html_test.go similarity index 98% rename from documize/api/convert/html/html_test.go rename to core/api/convert/html/html_test.go index 22fd2f52..580c6628 100644 --- a/documize/api/convert/html/html_test.go +++ b/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 = `

Markdown: Basics

diff --git a/documize/api/convert/md/md.go b/core/api/convert/md/md.go similarity index 95% rename from documize/api/convert/md/md.go rename to core/api/convert/md/md.go index 96826cd4..81c51b94 100644 --- a/documize/api/convert/md/md.go +++ b/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" diff --git a/documize/api/endpoint/TESTDATA.html b/core/api/endpoint/TESTDATA.html similarity index 100% rename from documize/api/endpoint/TESTDATA.html rename to core/api/endpoint/TESTDATA.html diff --git a/documize/api/endpoint/attachment_endpoint.go b/core/api/endpoint/attachment_endpoint.go similarity index 95% rename from documize/api/endpoint/attachment_endpoint.go rename to core/api/endpoint/attachment_endpoint.go index ca39cf2e..8b6c2c51 100644 --- a/documize/api/endpoint/attachment_endpoint.go +++ b/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" diff --git a/documize/api/endpoint/authentication_endpoint.go b/core/api/endpoint/authentication_endpoint.go similarity index 95% rename from documize/api/endpoint/authentication_endpoint.go rename to core/api/endpoint/authentication_endpoint.go index f664ad05..4e5886d7 100644 --- a/documize/api/endpoint/authentication_endpoint.go +++ b/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. diff --git a/documize/api/endpoint/conversion_endpoint.go b/core/api/endpoint/conversion_endpoint.go similarity index 93% rename from documize/api/endpoint/conversion_endpoint.go rename to core/api/endpoint/conversion_endpoint.go index 6142d398..752c4647 100644 --- a/documize/api/endpoint/conversion_endpoint.go +++ b/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" diff --git a/documize/api/endpoint/doc.go b/core/api/endpoint/doc.go similarity index 100% rename from documize/api/endpoint/doc.go rename to core/api/endpoint/doc.go diff --git a/documize/api/endpoint/document_endpoint.go b/core/api/endpoint/document_endpoint.go similarity index 96% rename from documize/api/endpoint/document_endpoint.go rename to core/api/endpoint/document_endpoint.go index cb6c93fc..8438ef80 100644 --- a/documize/api/endpoint/document_endpoint.go +++ b/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" ) diff --git a/documize/api/endpoint/endpoint_test.go b/core/api/endpoint/endpoint_test.go similarity index 96% rename from documize/api/endpoint/endpoint_test.go rename to core/api/endpoint/endpoint_test.go index 21efb673..d91cf457 100644 --- a/documize/api/endpoint/endpoint_test.go +++ b/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" ) diff --git a/documize/api/endpoint/init.go b/core/api/endpoint/init.go similarity index 97% rename from documize/api/endpoint/init.go rename to core/api/endpoint/init.go index 090e8ef1..38155dc1 100644 --- a/documize/api/endpoint/init.go +++ b/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 diff --git a/documize/api/endpoint/label_endpoint.go b/core/api/endpoint/label_endpoint.go similarity index 97% rename from documize/api/endpoint/label_endpoint.go rename to core/api/endpoint/label_endpoint.go index 3900fe24..63b78495 100644 --- a/documize/api/endpoint/label_endpoint.go +++ b/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. diff --git a/documize/api/endpoint/meta_endpoint.go b/core/api/endpoint/meta_endpoint.go similarity index 95% rename from documize/api/endpoint/meta_endpoint.go rename to core/api/endpoint/meta_endpoint.go index 51075d75..71bc9de1 100644 --- a/documize/api/endpoint/meta_endpoint.go +++ b/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). diff --git a/documize/api/endpoint/models/models.go b/core/api/endpoint/models/models.go similarity index 97% rename from documize/api/endpoint/models/models.go rename to core/api/endpoint/models/models.go index 0ee54678..2bf8ae0e 100644 --- a/documize/api/endpoint/models/models.go +++ b/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. diff --git a/documize/api/endpoint/org_endpoint.go b/core/api/endpoint/org_endpoint.go similarity index 90% rename from documize/api/endpoint/org_endpoint.go rename to core/api/endpoint/org_endpoint.go index d3d05be4..72283c60 100644 --- a/documize/api/endpoint/org_endpoint.go +++ b/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" ) diff --git a/documize/api/endpoint/page_endpoint.go b/core/api/endpoint/page_endpoint.go similarity index 97% rename from documize/api/endpoint/page_endpoint.go rename to core/api/endpoint/page_endpoint.go index 015bc7fa..ec879281 100644 --- a/documize/api/endpoint/page_endpoint.go +++ b/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" ) diff --git a/documize/api/endpoint/router.go b/core/api/endpoint/router.go similarity index 97% rename from documize/api/endpoint/router.go rename to core/api/endpoint/router.go index e6af6ee7..2b6e7b21 100644 --- a/documize/api/endpoint/router.go +++ b/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" ) diff --git a/documize/api/endpoint/sections_endpoint.go b/core/api/endpoint/sections_endpoint.go similarity index 93% rename from documize/api/endpoint/sections_endpoint.go rename to core/api/endpoint/sections_endpoint.go index 27d5c3e2..a6c51c05 100644 --- a/documize/api/endpoint/sections_endpoint.go +++ b/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. diff --git a/documize/api/endpoint/templates_endpoint.go b/core/api/endpoint/templates_endpoint.go similarity index 96% rename from documize/api/endpoint/templates_endpoint.go rename to core/api/endpoint/templates_endpoint.go index 4974b235..1449f93d 100644 --- a/documize/api/endpoint/templates_endpoint.go +++ b/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" ) diff --git a/documize/api/endpoint/user_endpoint.go b/core/api/endpoint/user_endpoint.go similarity index 97% rename from documize/api/endpoint/user_endpoint.go rename to core/api/endpoint/user_endpoint.go index 192bd9e7..a7b44d13 100644 --- a/documize/api/endpoint/user_endpoint.go +++ b/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" ) diff --git a/documize/api/entity/objects.go b/core/api/entity/objects.go similarity index 100% rename from documize/api/entity/objects.go rename to core/api/entity/objects.go diff --git a/documize/api/mail/email.html b/core/api/mail/email.html similarity index 100% rename from documize/api/mail/email.html rename to core/api/mail/email.html diff --git a/documize/api/mail/invite-existing-user.html b/core/api/mail/invite-existing-user.html similarity index 100% rename from documize/api/mail/invite-existing-user.html rename to core/api/mail/invite-existing-user.html diff --git a/documize/api/mail/invite-new-user.html b/core/api/mail/invite-new-user.html similarity index 100% rename from documize/api/mail/invite-new-user.html rename to core/api/mail/invite-new-user.html diff --git a/documize/api/mail/mailer.go b/core/api/mail/mailer.go similarity index 96% rename from documize/api/mail/mailer.go rename to core/api/mail/mailer.go index 8ec647ae..c34a9b3b 100644 --- a/documize/api/mail/mailer.go +++ b/core/api/mail/mailer.go @@ -1,11 +1,11 @@ // Copyright 2016 Documize Inc. . 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 . +// by contacting . // // 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. diff --git a/documize/api/mail/mailer_test.go b/core/api/mail/mailer_test.go similarity index 98% rename from documize/api/mail/mailer_test.go rename to core/api/mail/mailer_test.go index 398cc269..a9e45613 100644 --- a/documize/api/mail/mailer_test.go +++ b/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) { diff --git a/documize/api/mail/password-reset.html b/core/api/mail/password-reset.html similarity index 100% rename from documize/api/mail/password-reset.html rename to core/api/mail/password-reset.html diff --git a/documize/api/mail/share-folder-existing-user.html b/core/api/mail/share-folder-existing-user.html similarity index 100% rename from documize/api/mail/share-folder-existing-user.html rename to core/api/mail/share-folder-existing-user.html diff --git a/documize/api/mail/share-folder-new-user.html b/core/api/mail/share-folder-new-user.html similarity index 100% rename from documize/api/mail/share-folder-new-user.html rename to core/api/mail/share-folder-new-user.html diff --git a/documize/api/mail/smtp.go b/core/api/mail/smtp.go similarity index 99% rename from documize/api/mail/smtp.go rename to core/api/mail/smtp.go index a73bc856..20fb6206 100644 --- a/documize/api/mail/smtp.go +++ b/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" diff --git a/documize/api/plugins/glick.go b/core/api/plugins/glick.go similarity index 88% rename from documize/api/plugins/glick.go rename to core/api/plugins/glick.go index 4edfc02e..62f26449 100644 --- a/documize/api/plugins/glick.go +++ b/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" ) diff --git a/documize/api/plugins/glick_test.go b/core/api/plugins/glick_test.go similarity index 100% rename from documize/api/plugins/glick_test.go rename to core/api/plugins/glick_test.go diff --git a/documize/api/request/account.go b/core/api/request/account.go similarity index 96% rename from documize/api/request/account.go rename to core/api/request/account.go index c0d4f21f..36705ef2 100644 --- a/documize/api/request/account.go +++ b/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" ) diff --git a/documize/api/request/account_test.go b/core/api/request/account_test.go similarity index 98% rename from documize/api/request/account_test.go rename to core/api/request/account_test.go index 9e82fcca..d0379c23 100644 --- a/documize/api/request/account_test.go +++ b/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" ) diff --git a/documize/api/request/attachment.go b/core/api/request/attachment.go similarity index 95% rename from documize/api/request/attachment.go rename to core/api/request/attachment.go index 3b6e8c05..2e8a2885 100644 --- a/documize/api/request/attachment.go +++ b/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. diff --git a/documize/api/request/attachment_test.go b/core/api/request/attachment_test.go similarity index 97% rename from documize/api/request/attachment_test.go rename to core/api/request/attachment_test.go index 26407d3d..e0130e3c 100644 --- a/documize/api/request/attachment_test.go +++ b/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" diff --git a/documize/api/request/config.go b/core/api/request/config.go similarity index 98% rename from documize/api/request/config.go rename to core/api/request/config.go index 86ccab32..35a84921 100644 --- a/documize/api/request/config.go +++ b/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 diff --git a/documize/api/request/context.go b/core/api/request/context.go similarity index 99% rename from documize/api/request/context.go rename to core/api/request/context.go index 87061f49..f6174bda 100644 --- a/documize/api/request/context.go +++ b/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{} diff --git a/documize/api/request/context_test.go b/core/api/request/context_test.go similarity index 96% rename from documize/api/request/context_test.go rename to core/api/request/context_test.go index 492e78d8..9684ebd4 100644 --- a/documize/api/request/context_test.go +++ b/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" ) diff --git a/documize/api/request/doc.go b/core/api/request/doc.go similarity index 100% rename from documize/api/request/doc.go rename to core/api/request/doc.go diff --git a/documize/api/request/document.go b/core/api/request/document.go similarity index 98% rename from documize/api/request/document.go rename to core/api/request/document.go index 7d7947d2..db112c0b 100644 --- a/documize/api/request/document.go +++ b/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. diff --git a/documize/api/request/document_test.go b/core/api/request/document_test.go similarity index 99% rename from documize/api/request/document_test.go rename to core/api/request/document_test.go index 2b74a40c..cbf1fd2a 100644 --- a/documize/api/request/document_test.go +++ b/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" ) diff --git a/documize/api/request/domain.go b/core/api/request/domain.go similarity index 100% rename from documize/api/request/domain.go rename to core/api/request/domain.go diff --git a/documize/api/request/domain_test.go b/core/api/request/domain_test.go similarity index 100% rename from documize/api/request/domain_test.go rename to core/api/request/domain_test.go diff --git a/documize/api/request/init.go b/core/api/request/init.go similarity index 95% rename from documize/api/request/init.go rename to core/api/request/init.go index 74b609f3..1e0d6e7a 100644 --- a/documize/api/request/init.go +++ b/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 diff --git a/documize/api/request/init_test.go b/core/api/request/init_test.go similarity index 100% rename from documize/api/request/init_test.go rename to core/api/request/init_test.go diff --git a/documize/api/request/label.go b/core/api/request/label.go similarity index 97% rename from documize/api/request/label.go rename to core/api/request/label.go index 6b988123..4ed1abe0 100644 --- a/documize/api/request/label.go +++ b/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. diff --git a/documize/api/request/label_test.go b/core/api/request/label_test.go similarity index 100% rename from documize/api/request/label_test.go rename to core/api/request/label_test.go diff --git a/documize/api/request/labelrole.go b/core/api/request/labelrole.go similarity index 96% rename from documize/api/request/labelrole.go rename to core/api/request/labelrole.go index 4cb98674..8c01b2e9 100644 --- a/documize/api/request/labelrole.go +++ b/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. diff --git a/documize/api/request/labelrole_test.go b/core/api/request/labelrole_test.go similarity index 100% rename from documize/api/request/labelrole_test.go rename to core/api/request/labelrole_test.go diff --git a/documize/api/request/organization.go b/core/api/request/organization.go similarity index 96% rename from documize/api/request/organization.go rename to core/api/request/organization.go index 044c9eef..75e1f58b 100644 --- a/documize/api/request/organization.go +++ b/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" ) diff --git a/documize/api/request/organization_test.go b/core/api/request/organization_test.go similarity index 100% rename from documize/api/request/organization_test.go rename to core/api/request/organization_test.go diff --git a/documize/api/request/page.go b/core/api/request/page.go similarity index 98% rename from documize/api/request/page.go rename to core/api/request/page.go index e191e7fa..a8c869be 100644 --- a/documize/api/request/page.go +++ b/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. diff --git a/documize/api/request/page_test.go b/core/api/request/page_test.go similarity index 100% rename from documize/api/request/page_test.go rename to core/api/request/page_test.go diff --git a/documize/api/request/search.go b/core/api/request/search.go similarity index 98% rename from documize/api/request/search.go rename to core/api/request/search.go index e688fe92..b0d2c2e4 100644 --- a/documize/api/request/search.go +++ b/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. diff --git a/documize/api/request/setup.go b/core/api/request/setup.go similarity index 95% rename from documize/api/request/setup.go rename to core/api/request/setup.go index f783abdb..540015a5 100644 --- a/documize/api/request/setup.go +++ b/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) { diff --git a/documize/api/request/user.go b/core/api/request/user.go similarity index 98% rename from documize/api/request/user.go rename to core/api/request/user.go index db65479e..250db158 100644 --- a/documize/api/request/user.go +++ b/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. diff --git a/documize/api/request/user_test.go b/core/api/request/user_test.go similarity index 100% rename from documize/api/request/user_test.go rename to core/api/request/user_test.go diff --git a/documize/api/store/local.go b/core/api/store/local.go similarity index 95% rename from documize/api/store/local.go rename to core/api/store/local.go index d8f2f0fc..8e481940 100644 --- a/documize/api/store/local.go +++ b/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 diff --git a/documize/api/store/local_test.go b/core/api/store/local_test.go similarity index 90% rename from documize/api/store/local_test.go rename to core/api/store/local_test.go index f4e561f3..5984541a 100644 --- a/documize/api/store/local_test.go +++ b/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" diff --git a/documize/api/store/store.go b/core/api/store/store.go similarity index 93% rename from documize/api/store/store.go rename to core/api/store/store.go index b5cb2991..dc6a6fe9 100644 --- a/documize/api/store/store.go +++ b/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. diff --git a/documize/api/store/store_test.go b/core/api/store/store_test.go similarity index 84% rename from documize/api/store/store_test.go rename to core/api/store/store_test.go index 530e5525..2b59aaaf 100644 --- a/documize/api/store/store_test.go +++ b/core/api/store/store_test.go @@ -1,11 +1,11 @@ // Copyright 2016 Documize Inc. . 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 . +// by contacting . // // 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) { diff --git a/documize/api/templates/Change Request/template.docx b/core/api/templates/Change Request/template.docx similarity index 100% rename from documize/api/templates/Change Request/template.docx rename to core/api/templates/Change Request/template.docx diff --git a/documize/api/templates/Change Request/template.json b/core/api/templates/Change Request/template.json similarity index 100% rename from documize/api/templates/Change Request/template.json rename to core/api/templates/Change Request/template.json diff --git a/documize/api/templates/Disaster Recovery Plan/template.docx b/core/api/templates/Disaster Recovery Plan/template.docx similarity index 100% rename from documize/api/templates/Disaster Recovery Plan/template.docx rename to core/api/templates/Disaster Recovery Plan/template.docx diff --git a/documize/api/templates/Disaster Recovery Plan/template.json b/core/api/templates/Disaster Recovery Plan/template.json similarity index 100% rename from documize/api/templates/Disaster Recovery Plan/template.json rename to core/api/templates/Disaster Recovery Plan/template.json diff --git a/documize/api/templates/Formal Requirements Capture/template.docx b/core/api/templates/Formal Requirements Capture/template.docx similarity index 100% rename from documize/api/templates/Formal Requirements Capture/template.docx rename to core/api/templates/Formal Requirements Capture/template.docx diff --git a/documize/api/templates/Formal Requirements Capture/template.json b/core/api/templates/Formal Requirements Capture/template.json similarity index 100% rename from documize/api/templates/Formal Requirements Capture/template.json rename to core/api/templates/Formal Requirements Capture/template.json diff --git a/documize/api/templates/Project Post Mortem/template.docx b/core/api/templates/Project Post Mortem/template.docx similarity index 100% rename from documize/api/templates/Project Post Mortem/template.docx rename to core/api/templates/Project Post Mortem/template.docx diff --git a/documize/api/templates/Project Post Mortem/template.json b/core/api/templates/Project Post Mortem/template.json similarity index 100% rename from documize/api/templates/Project Post Mortem/template.json rename to core/api/templates/Project Post Mortem/template.json diff --git a/documize/api/templates/Requirements Capture/template.docx b/core/api/templates/Requirements Capture/template.docx similarity index 100% rename from documize/api/templates/Requirements Capture/template.docx rename to core/api/templates/Requirements Capture/template.docx diff --git a/documize/api/templates/Requirements Capture/template.json b/core/api/templates/Requirements Capture/template.json similarity index 100% rename from documize/api/templates/Requirements Capture/template.json rename to core/api/templates/Requirements Capture/template.json diff --git a/documize/api/util/encoding.go b/core/api/util/encoding.go similarity index 100% rename from documize/api/util/encoding.go rename to core/api/util/encoding.go diff --git a/documize/api/util/encoding_test.go b/core/api/util/encoding_test.go similarity index 100% rename from documize/api/util/encoding_test.go rename to core/api/util/encoding_test.go diff --git a/documize/api/util/password.go b/core/api/util/password.go similarity index 97% rename from documize/api/util/password.go rename to core/api/util/password.go index 813cfbce..da7411a4 100644 --- a/documize/api/util/password.go +++ b/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. diff --git a/documize/api/util/uniqueid.go b/core/api/util/uniqueid.go similarity index 100% rename from documize/api/util/uniqueid.go rename to core/api/util/uniqueid.go diff --git a/documize/api/util/uniqueid_test.go b/core/api/util/uniqueid_test.go similarity index 87% rename from documize/api/util/uniqueid_test.go rename to core/api/util/uniqueid_test.go index fa936983..3257e78a 100644 --- a/documize/api/util/uniqueid_test.go +++ b/core/api/util/uniqueid_test.go @@ -1,11 +1,11 @@ // Copyright 2016 Documize Inc. . 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 . +// by contacting . // // 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 diff --git a/wordsmith/api/convertapi.go b/core/convapi/convertapi.go similarity index 81% rename from wordsmith/api/convertapi.go rename to core/convapi/convertapi.go index 6cf03e8c..a853e92f 100644 --- a/wordsmith/api/convertapi.go +++ b/core/convapi/convertapi.go @@ -1,16 +1,16 @@ // Copyright 2016 Documize Inc. . 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 . +// by contacting . // // 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 { diff --git a/wordsmith/api/request.go b/core/convapi/request.go similarity index 97% rename from wordsmith/api/request.go rename to core/convapi/request.go index 30258d96..3e68abbe 100644 --- a/wordsmith/api/request.go +++ b/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 { diff --git a/wordsmith/api/response.go b/core/convapi/response.go similarity index 97% rename from wordsmith/api/response.go rename to core/convapi/response.go index 60adc2ae..7f13b56d 100644 --- a/wordsmith/api/response.go +++ b/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" ) diff --git a/documize/database/check.go b/core/database/check.go similarity index 97% rename from documize/database/check.go rename to core/database/check.go index 7e2a0e72..9b77e323 100644 --- a/documize/database/check.go +++ b/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" ) diff --git a/documize/database/create.go b/core/database/create.go similarity index 96% rename from documize/database/create.go rename to core/database/create.go index 07ce6bac..e4a2e803 100644 --- a/documize/database/create.go +++ b/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 diff --git a/documize/database/database_test.go b/core/database/database_test.go similarity index 100% rename from documize/database/database_test.go rename to core/database/database_test.go diff --git a/documize/database/migrate.go b/core/database/migrate.go similarity index 96% rename from documize/database/migrate.go rename to core/database/migrate.go index 3cf3da6e..066d5ba4 100644 --- a/documize/database/migrate.go +++ b/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" diff --git a/documize/database/scripts/autobuild/db_00000.sql b/core/database/scripts/autobuild/db_00000.sql similarity index 100% rename from documize/database/scripts/autobuild/db_00000.sql rename to core/database/scripts/autobuild/db_00000.sql diff --git a/documize/database/templates/db-error.html b/core/database/templates/db-error.html similarity index 100% rename from documize/database/templates/db-error.html rename to core/database/templates/db-error.html diff --git a/documize/database/templates/offline.html b/core/database/templates/offline.html similarity index 100% rename from documize/database/templates/offline.html rename to core/database/templates/offline.html diff --git a/wordsmith/environment/environment.go b/core/environment/environment.go similarity index 100% rename from wordsmith/environment/environment.go rename to core/environment/environment.go diff --git a/wordsmith/log/logger.go b/core/log/logger.go similarity index 97% rename from wordsmith/log/logger.go rename to core/log/logger.go index 0eb01780..9766bf7b 100644 --- a/wordsmith/log/logger.go +++ b/core/log/logger.go @@ -20,7 +20,7 @@ import ( log "github.com/Sirupsen/logrus" - env "github.com/documize/community/wordsmith/environment" + env "github.com/documize/community/core/environment" ) var environment = "Non-production" diff --git a/documize/section/code/code.go b/core/section/code/code.go similarity index 95% rename from documize/section/code/code.go rename to core/section/code/code.go index 8d8370e3..8471ca64 100644 --- a/documize/section/code/code.go +++ b/core/section/code/code.go @@ -14,7 +14,7 @@ package code import ( "net/http" - "github.com/documize/community/documize/section/provider" + "github.com/documize/community/core/section/provider" ) // Provider represents code snippet diff --git a/documize/section/gemini/gemini.go b/core/section/gemini/gemini.go similarity index 98% rename from documize/section/gemini/gemini.go rename to core/section/gemini/gemini.go index 83afc45f..395b16fe 100644 --- a/documize/section/gemini/gemini.go +++ b/core/section/gemini/gemini.go @@ -20,8 +20,8 @@ import ( "io/ioutil" "net/http" - "github.com/documize/community/documize/section/provider" - "github.com/documize/community/wordsmith/log" + "github.com/documize/community/core/section/provider" + "github.com/documize/community/core/log" ) // Provider represents Gemini diff --git a/documize/section/gemini/model.go b/core/section/gemini/model.go similarity index 97% rename from documize/section/gemini/model.go rename to core/section/gemini/model.go index 84dfc1c1..2dc35af5 100644 --- a/documize/section/gemini/model.go +++ b/core/section/gemini/model.go @@ -14,8 +14,8 @@ package gemini import ( "strings" - "github.com/documize/community/documize/section/provider" - "github.com/documize/community/wordsmith/log" + "github.com/documize/community/core/section/provider" + "github.com/documize/community/core/log" ) // the HTML that is rendered by this section. diff --git a/documize/section/github/github.go b/core/section/github/github.go similarity index 99% rename from documize/section/github/github.go rename to core/section/github/github.go index 2943a5fe..af419d3f 100644 --- a/documize/section/github/github.go +++ b/core/section/github/github.go @@ -23,9 +23,9 @@ import ( "strconv" "strings" - "github.com/documize/community/documize/api/request" - "github.com/documize/community/documize/section/provider" - "github.com/documize/community/wordsmith/log" + "github.com/documize/community/core/api/request" + "github.com/documize/community/core/section/provider" + "github.com/documize/community/core/log" gogithub "github.com/google/go-github/github" "golang.org/x/oauth2" diff --git a/documize/section/github/model.go b/core/section/github/model.go similarity index 99% rename from documize/section/github/model.go rename to core/section/github/model.go index eedfe7e1..7a7171df 100644 --- a/documize/section/github/model.go +++ b/core/section/github/model.go @@ -15,7 +15,7 @@ import ( "html/template" "time" - "github.com/documize/community/wordsmith/log" + "github.com/documize/community/core/log" ) const tagIssuesData = "issuesData" diff --git a/documize/section/github/sort.go b/core/section/github/sort.go similarity index 100% rename from documize/section/github/sort.go rename to core/section/github/sort.go diff --git a/documize/section/markdown/markdown.go b/core/section/markdown/markdown.go similarity index 95% rename from documize/section/markdown/markdown.go rename to core/section/markdown/markdown.go index 5e739c3c..f6828de7 100644 --- a/documize/section/markdown/markdown.go +++ b/core/section/markdown/markdown.go @@ -15,7 +15,7 @@ import ( "net/http" "github.com/documize/blackfriday" - "github.com/documize/community/documize/section/provider" + "github.com/documize/community/core/section/provider" ) // Provider represents Markdown diff --git a/documize/section/papertrail/model.go b/core/section/papertrail/model.go similarity index 100% rename from documize/section/papertrail/model.go rename to core/section/papertrail/model.go diff --git a/documize/section/papertrail/papertrail.go b/core/section/papertrail/papertrail.go similarity index 98% rename from documize/section/papertrail/papertrail.go rename to core/section/papertrail/papertrail.go index a76a3195..2d6b3212 100644 --- a/documize/section/papertrail/papertrail.go +++ b/core/section/papertrail/papertrail.go @@ -21,8 +21,8 @@ import ( "net/http" "net/url" - "github.com/documize/community/documize/section/provider" - "github.com/documize/community/wordsmith/log" + "github.com/documize/community/core/section/provider" + "github.com/documize/community/core/log" ) const me = "papertrail" diff --git a/documize/section/provider/provider.go b/core/section/provider/provider.go similarity index 98% rename from documize/section/provider/provider.go rename to core/section/provider/provider.go index 7964f856..7698c82e 100644 --- a/documize/section/provider/provider.go +++ b/core/section/provider/provider.go @@ -19,8 +19,8 @@ import ( "sort" "strings" - "github.com/documize/community/documize/api/request" - "github.com/documize/community/wordsmith/log" + "github.com/documize/community/core/api/request" + "github.com/documize/community/core/log" ) // SecretReplacement is a constant used to replace secrets in data-structures when required. diff --git a/documize/section/register.go b/core/section/register.go similarity index 63% rename from documize/section/register.go rename to core/section/register.go index 1043d79e..005056bd 100644 --- a/documize/section/register.go +++ b/core/section/register.go @@ -14,16 +14,16 @@ package section import ( "fmt" - "github.com/documize/community/documize/section/code" - "github.com/documize/community/documize/section/gemini" - "github.com/documize/community/documize/section/github" - "github.com/documize/community/documize/section/markdown" - "github.com/documize/community/documize/section/papertrail" - "github.com/documize/community/documize/section/provider" - "github.com/documize/community/documize/section/table" - "github.com/documize/community/documize/section/trello" - "github.com/documize/community/documize/section/wysiwyg" - "github.com/documize/community/wordsmith/log" + "github.com/documize/community/core/section/code" + "github.com/documize/community/core/section/gemini" + "github.com/documize/community/core/section/github" + "github.com/documize/community/core/section/markdown" + "github.com/documize/community/core/section/papertrail" + "github.com/documize/community/core/section/provider" + "github.com/documize/community/core/section/table" + "github.com/documize/community/core/section/trello" + "github.com/documize/community/core/section/wysiwyg" + "github.com/documize/community/core/log" ) // Register sections diff --git a/documize/section/section_test.go b/core/section/section_test.go similarity index 97% rename from documize/section/section_test.go rename to core/section/section_test.go index 5d92c3f0..f048f906 100644 --- a/documize/section/section_test.go +++ b/core/section/section_test.go @@ -15,7 +15,7 @@ import ( "net/http" "testing" - "github.com/documize/community/documize/section/provider" + "github.com/documize/community/core/section/provider" ) type testsection provider.TypeMeta diff --git a/documize/section/table/table.go b/core/section/table/table.go similarity index 95% rename from documize/section/table/table.go rename to core/section/table/table.go index 22cc0add..2d44a0bf 100644 --- a/documize/section/table/table.go +++ b/core/section/table/table.go @@ -14,7 +14,7 @@ package table import ( "net/http" - "github.com/documize/community/documize/section/provider" + "github.com/documize/community/core/section/provider" ) // Provider represents Table diff --git a/documize/section/trello/model.go b/core/section/trello/model.go similarity index 100% rename from documize/section/trello/model.go rename to core/section/trello/model.go diff --git a/documize/section/trello/trello.go b/core/section/trello/trello.go similarity index 97% rename from documize/section/trello/trello.go rename to core/section/trello/trello.go index a28d5756..de6c3fc5 100644 --- a/documize/section/trello/trello.go +++ b/core/section/trello/trello.go @@ -19,9 +19,9 @@ import ( "io/ioutil" "net/http" - "github.com/documize/community/documize/api/request" - "github.com/documize/community/documize/section/provider" - "github.com/documize/community/wordsmith/log" + "github.com/documize/community/core/api/request" + "github.com/documize/community/core/section/provider" + "github.com/documize/community/core/log" ) var meta provider.TypeMeta diff --git a/documize/section/wysiwyg/wysiwyg.go b/core/section/wysiwyg/wysiwyg.go similarity index 95% rename from documize/section/wysiwyg/wysiwyg.go rename to core/section/wysiwyg/wysiwyg.go index 1f9ea62f..0c10f429 100644 --- a/documize/section/wysiwyg/wysiwyg.go +++ b/core/section/wysiwyg/wysiwyg.go @@ -14,7 +14,7 @@ package wysiwyg import ( "net/http" - "github.com/documize/community/documize/section/provider" + "github.com/documize/community/core/section/provider" ) // Provider represents WYSIWYG diff --git a/wordsmith/utility/beautify.go b/core/utility/beautify.go similarity index 100% rename from wordsmith/utility/beautify.go rename to core/utility/beautify.go diff --git a/wordsmith/utility/beautify_test.go b/core/utility/beautify_test.go similarity index 100% rename from wordsmith/utility/beautify_test.go rename to core/utility/beautify_test.go diff --git a/wordsmith/utility/command.go b/core/utility/command.go similarity index 97% rename from wordsmith/utility/command.go rename to core/utility/command.go index a348aa22..2b77855c 100644 --- a/wordsmith/utility/command.go +++ b/core/utility/command.go @@ -13,7 +13,7 @@ package utility import ( "bytes" - "github.com/documize/community/wordsmith/log" + "github.com/documize/community/core/log" "errors" "os/exec" "time" diff --git a/wordsmith/utility/command_test.go b/core/utility/command_test.go similarity index 100% rename from wordsmith/utility/command_test.go rename to core/utility/command_test.go diff --git a/wordsmith/utility/defclose.go b/core/utility/defclose.go similarity index 92% rename from wordsmith/utility/defclose.go rename to core/utility/defclose.go index 39bfdc19..1406c4c6 100644 --- a/wordsmith/utility/defclose.go +++ b/core/utility/defclose.go @@ -12,7 +12,7 @@ package utility import "io" -import "github.com/documize/community/wordsmith/log" +import "github.com/documize/community/core/log" // Close is a convenience function to close an io.Closer, usually in a defer. func Close(f interface{}) { diff --git a/wordsmith/utility/defclose_test.go b/core/utility/defclose_test.go similarity index 92% rename from wordsmith/utility/defclose_test.go rename to core/utility/defclose_test.go index 4e29cc8c..45cc9afe 100644 --- a/wordsmith/utility/defclose_test.go +++ b/core/utility/defclose_test.go @@ -13,7 +13,7 @@ package utility import "testing" import "os" -import "github.com/documize/community/wordsmith/log" +import "github.com/documize/community/core/log" func TestDefclose(t *testing.T) { var f *os.File diff --git a/wordsmith/utility/doc.go b/core/utility/doc.go similarity index 100% rename from wordsmith/utility/doc.go rename to core/utility/doc.go diff --git a/wordsmith/utility/html.go b/core/utility/html.go similarity index 98% rename from wordsmith/utility/html.go rename to core/utility/html.go index d5ee8f44..da778f17 100644 --- a/wordsmith/utility/html.go +++ b/core/utility/html.go @@ -21,7 +21,7 @@ import ( "golang.org/x/net/html" "golang.org/x/net/html/atom" - "github.com/documize/community/wordsmith/log" + "github.com/documize/community/core/log" ) // HTML describes a chunk of HTML, Text() method returns plain text. diff --git a/wordsmith/utility/html_test.go b/core/utility/html_test.go similarity index 100% rename from wordsmith/utility/html_test.go rename to core/utility/html_test.go diff --git a/wordsmith/utility/secrets.go b/core/utility/secrets.go similarity index 100% rename from wordsmith/utility/secrets.go rename to core/utility/secrets.go diff --git a/wordsmith/utility/secrets_test.go b/core/utility/secrets_test.go similarity index 100% rename from wordsmith/utility/secrets_test.go rename to core/utility/secrets_test.go diff --git a/wordsmith/utility/slug.go b/core/utility/slug.go similarity index 100% rename from wordsmith/utility/slug.go rename to core/utility/slug.go diff --git a/wordsmith/utility/slug_test.go b/core/utility/slug_test.go similarity index 100% rename from wordsmith/utility/slug_test.go rename to core/utility/slug_test.go diff --git a/wordsmith/utility/user.go b/core/utility/user.go similarity index 100% rename from wordsmith/utility/user.go rename to core/utility/user.go diff --git a/wordsmith/utility/user_test.go b/core/utility/user_test.go similarity index 100% rename from wordsmith/utility/user_test.go rename to core/utility/user_test.go diff --git a/wordsmith/utility/words.go b/core/utility/words.go similarity index 100% rename from wordsmith/utility/words.go rename to core/utility/words.go diff --git a/wordsmith/utility/words_test.go b/core/utility/words_test.go similarity index 100% rename from wordsmith/utility/words_test.go rename to core/utility/words_test.go diff --git a/documize/web/README.md b/core/web/README.md similarity index 100% rename from documize/web/README.md rename to core/web/README.md diff --git a/documize/web/web.go b/core/web/web.go similarity index 95% rename from documize/web/web.go rename to core/web/web.go index e17fa7b3..19de11f4 100644 --- a/documize/web/web.go +++ b/core/web/web.go @@ -18,8 +18,8 @@ import ( "html/template" "net/http" - "github.com/documize/community/documize/api/util" - "github.com/documize/community/wordsmith/environment" + "github.com/documize/community/core/api/util" + "github.com/documize/community/core/environment" assetfs "github.com/elazarl/go-bindata-assetfs" ) diff --git a/wordsmith/wordlists/en-2012/en-s.log b/core/wordlists/en-2012/en-s.log similarity index 100% rename from wordsmith/wordlists/en-2012/en-s.log rename to core/wordlists/en-2012/en-s.log diff --git a/wordsmith/wordlists/en-2012/en.log b/core/wordlists/en-2012/en.log similarity index 100% rename from wordsmith/wordlists/en-2012/en.log rename to core/wordlists/en-2012/en.log diff --git a/wordsmith/wordlists/en-2012/en.txt b/core/wordlists/en-2012/en.txt similarity index 100% rename from wordsmith/wordlists/en-2012/en.txt rename to core/wordlists/en-2012/en.txt diff --git a/wordsmith/wordlists/en-2012/englishwords.go b/core/wordlists/en-2012/englishwords.go similarity index 100% rename from wordsmith/wordlists/en-2012/englishwords.go rename to core/wordlists/en-2012/englishwords.go diff --git a/wordsmith/wordlists/makewordlist.go b/core/wordlists/makewordlist.go similarity index 100% rename from wordsmith/wordlists/makewordlist.go rename to core/wordlists/makewordlist.go diff --git a/plugin-libreoffice/plugin.go b/plugin-libreoffice/plugin.go index 980bfe8e..583292f1 100644 --- a/plugin-libreoffice/plugin.go +++ b/plugin-libreoffice/plugin.go @@ -1,11 +1,11 @@ // Copyright 2016 Documize Inc. . 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 . +// by contacting . // // https://documize.com @@ -32,7 +32,7 @@ import ( "unicode" "unicode/utf8" - "github.com/documize/community/wordsmith/api" + api "github.com/documize/community/core/convapi" ) var cmdmtx sync.Mutex // enforce only one conversion at a time diff --git a/sdk/attachment.go b/sdk/attachment.go index ab47e673..ef4fa642 100644 --- a/sdk/attachment.go +++ b/sdk/attachment.go @@ -20,7 +20,7 @@ import ( "mime/multipart" "net/http" - "github.com/documize/community/documize/api/entity" + "github.com/documize/community/core/api/entity" ) const emptyBraces = "{}" diff --git a/sdk/auth.go b/sdk/auth.go index 212cd506..1d78102e 100644 --- a/sdk/auth.go +++ b/sdk/auth.go @@ -19,8 +19,8 @@ import ( "net/http" "strings" - "github.com/documize/community/documize/api/endpoint/models" - "github.com/documize/community/documize/api/entity" + "github.com/documize/community/core/api/endpoint/models" + "github.com/documize/community/core/api/entity" ) // Client holds the data for a sustained connection to Documize. diff --git a/sdk/document.go b/sdk/document.go index 3c0dc2da..74f19d5d 100644 --- a/sdk/document.go +++ b/sdk/document.go @@ -20,7 +20,7 @@ import ( "net/url" "strings" - "github.com/documize/community/documize/api/entity" + "github.com/documize/community/core/api/entity" ) // DeleteDocument removes the given document from the Documize database. diff --git a/sdk/exttest/apitest.go b/sdk/exttest/apitest.go index e40d1b18..83472f08 100644 --- a/sdk/exttest/apitest.go +++ b/sdk/exttest/apitest.go @@ -13,7 +13,7 @@ package exttest import ( "bytes" - "github.com/documize/community/documize/api/entity" + "github.com/documize/community/core/api/entity" "github.com/documize/community/sdk" "io/ioutil" "os" diff --git a/sdk/exttest/folders.go b/sdk/exttest/folders.go index 6e031476..cd9a02a5 100644 --- a/sdk/exttest/folders.go +++ b/sdk/exttest/folders.go @@ -15,7 +15,7 @@ import ( "testing" "github.com/documize/community/sdk" - "github.com/documize/community/documize/api/entity" + "github.com/documize/community/core/api/entity" ) func testFolders(t *testing.T, c *documize.Client, myFolder *entity.Label) { diff --git a/sdk/exttest/loaddata.go b/sdk/exttest/loaddata.go index 6317cb51..37c0457b 100644 --- a/sdk/exttest/loaddata.go +++ b/sdk/exttest/loaddata.go @@ -15,7 +15,7 @@ import ( "testing" "github.com/documize/community/sdk" - "github.com/documize/community/wordsmith/api" +api "github.com/documize/community/core/convapi" ) // loadData provides data-loading tests to be run locally or from the main Documize repo. diff --git a/sdk/exttest/pages.go b/sdk/exttest/pages.go index 430333fc..549b88a8 100644 --- a/sdk/exttest/pages.go +++ b/sdk/exttest/pages.go @@ -16,8 +16,8 @@ import ( "strings" "testing" - "github.com/documize/community/documize/api/endpoint/models" - "github.com/documize/community/documize/api/entity" + "github.com/documize/community/core/api/endpoint/models" + "github.com/documize/community/core/api/entity" "github.com/documize/community/sdk" ) diff --git a/sdk/exttest/users.go b/sdk/exttest/users.go index 384e701f..cff0e9d7 100644 --- a/sdk/exttest/users.go +++ b/sdk/exttest/users.go @@ -15,7 +15,7 @@ import ( "testing" "github.com/documize/community/sdk" - "github.com/documize/community/documize/api/entity" + "github.com/documize/community/core/api/entity" ) func testUsers(t *testing.T, c *documize.Client) { diff --git a/sdk/folders.go b/sdk/folders.go index de4ea729..fc3721e5 100644 --- a/sdk/folders.go +++ b/sdk/folders.go @@ -18,8 +18,8 @@ import ( "io/ioutil" "net/http" - "github.com/documize/community/documize/api/endpoint/models" - "github.com/documize/community/documize/api/entity" + "github.com/documize/community/core/api/endpoint/models" + "github.com/documize/community/core/api/entity" ) // GetFolders returns the folders that the current user can see. diff --git a/sdk/loaddata.go b/sdk/loaddata.go index 0d843085..2f8a7fd1 100644 --- a/sdk/loaddata.go +++ b/sdk/loaddata.go @@ -17,8 +17,8 @@ import ( "errors" "strings" - "github.com/documize/community/wordsmith/api" - "github.com/documize/community/documize/api/entity" +api "github.com/documize/community/core/convapi" + "github.com/documize/community/core/api/entity" ) // LoadData uploads and converts the raw data comprising a Documize document into Documize, returning a fileID and error. diff --git a/sdk/loadfile.go b/sdk/loadfile.go index 1c375146..06defb62 100644 --- a/sdk/loadfile.go +++ b/sdk/loadfile.go @@ -22,7 +22,7 @@ import ( "os" "path" - "github.com/documize/community/documize/api/entity" + "github.com/documize/community/core/api/entity" ) func (c *Client) upload(folderID, fileName string, fileReader io.Reader) (*entity.Document, error) { diff --git a/sdk/organization.go b/sdk/organization.go index 61695bbf..329997c0 100644 --- a/sdk/organization.go +++ b/sdk/organization.go @@ -18,7 +18,7 @@ import ( "io/ioutil" "net/http" - "github.com/documize/community/documize/api/entity" + "github.com/documize/community/core/api/entity" ) // GetOrganizations returns the user's organizations. diff --git a/sdk/pages.go b/sdk/pages.go index 3d81ce83..5077ce69 100644 --- a/sdk/pages.go +++ b/sdk/pages.go @@ -19,8 +19,8 @@ import ( "net/http" "strings" - "github.com/documize/community/documize/api/endpoint/models" - "github.com/documize/community/documize/api/entity" + "github.com/documize/community/core/api/endpoint/models" + "github.com/documize/community/core/api/entity" ) // GetDocumentPages returns all the pages in a document. diff --git a/sdk/templates.go b/sdk/templates.go index bc638928..b3940a9b 100644 --- a/sdk/templates.go +++ b/sdk/templates.go @@ -1,11 +1,11 @@ // Copyright 2016 Documize Inc. . 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 . +// by contacting . // // https://documize.com @@ -18,7 +18,7 @@ import ( "io/ioutil" "net/http" - "github.com/documize/community/documize/api/entity" + "github.com/documize/community/core/api/entity" ) // GetTemplates returns the available templates; from the stock templates if useStock is set. diff --git a/sdk/users.go b/sdk/users.go index fd7ed3c2..fb0ea15f 100644 --- a/sdk/users.go +++ b/sdk/users.go @@ -1,11 +1,11 @@ // Copyright 2016 Documize Inc. . 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 . +// by contacting . // // https://documize.com @@ -18,7 +18,7 @@ import ( "io/ioutil" "net/http" - "github.com/documize/community/documize/api/entity" + "github.com/documize/community/core/api/entity" ) // GetUsers returns the users in the user's organization. diff --git a/wordsmith/README.md b/wordsmith/README.md deleted file mode 100644 index e2b78a79..00000000 --- a/wordsmith/README.md +++ /dev/null @@ -1,4 +0,0 @@ -Wordsmith -========= - -Provides common code for all