Skip to content
This repository was archived by the owner on Sep 10, 2021. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
bower_components/
composer.lock
composer.phar
cron.yaml
env/
node_modules/
site/
Expand Down
14 changes: 11 additions & 3 deletions app.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,18 +18,25 @@
#=============================================================================

---
# Update with the project id.
application: your-appengine-project-id
version: 1
runtime: php55
api_version: 1
threadsafe: yes

handlers:
- url: /(.*\.(css|gif|ico|jpeg|jpg|js|map|png))$
- url: /favicon\.ico
static_files: favicon.ico
upload: favicon\.ico
secure: always

- url: /(.*/(public|SwaggerUI)/.*\.(css|gif|ico|jpeg|jpg|js|map|png))$
static_files: \1
upload: .*\.(css|gif|ico|jpeg|jpg|js|map|png)$
secure: always

# Must enable the task scheduler module. The cron job is defined in cron.yaml.
- url: /scheduler/run
script: index.php
login: admin
Expand All @@ -39,6 +46,7 @@ handlers:
script: index.php
secure: always

# Update with the bucket name and the project id. Also update php.ini with the bucket name.
env_variables:
midas_data_path: gs://your-cloudstorage-bucket/data
midas_email_sender: no-reply@your-appengine-project-id.appspotmail.com
Expand All @@ -48,8 +56,8 @@ env_variables:
skip_files:
- ^(.*/)?.*/(\.DS_Store|\.htaccess|\.gitignore|CMakeLists\.txt|.*\.java)$
- ^(.*/)?.*/\.sass-cache/.*
- ^(.*/)?(\.coveralls\.yml|\.editorconfig|\.travis\.yml|AUTHORS|bower\.json|composer\.json|composer\.lock|composer\.phar|COPYRIGHT|CTestConfig\.cmake|cron-sample\.yaml|LICENSE|mkdocs\.yml|phpunit\.xml\.dist|README\.md|requirements\.txt|Vagrantfile)$
- ^(.*/)?(\.codeclimate\.yml|\.coveralls\.yml|\.editorconfig|\.styleci\.yml|\.travis\.yml|AUTHORS|bower\.json|composer\.json|composer\.lock|composer\.phar|COPYRIGHT|CTestConfig\.cmake|LICENSE|mkdocs\.yml|phpunit\.xml\.dist|README\.md|requirements\.txt|Vagrantfile)$
- ^(.*/)?core/configs/.*\.local\.ini$
- ^(.*/)?(\.git|\.idea|\.vagrant|data|docs|env|log|provisioning|site|tests|tmp|utils)/.*
- ^(.*/)?(core|modules/.*)/(database/(pgsql|sqlite)|tests)/.*
- ^(.*/)?modules/(archive|batchmake|dicom.*|example|javauploaddownload|metadataextractor|pvw|remoteprocessing|solr|statistics|visualize)/.*
- ^(.*/)?modules/(archive|batchmake|dicom.*|javauploaddownload|metadataextractor|pvw|remoteprocessing|solr|statistics|visualize)/.*
4 changes: 2 additions & 2 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,20 +20,20 @@
"leafo/scssphp": "~0.2",
"maennchen/zipstream-php": "~0.3",
"moontoast/math": "~1.1",
"ramsey/uuid": "~2.8",
"ramsey/uuid": "~3.0",
"reprovinci/solr-php-client": "~1.0",
"sendgrid/sendgrid": "~3.2",
"zendframework/zendframework1": "~1.12"
},
"require-dev": {
"ext-curl": "*",
"ext-xdebug": "*",
"fabpot/php-cs-fixer": "~1.10",
"jokkedk/zfdebug": "~1.6",
"phpcheckstyle/phpcheckstyle": "V0.14.1",
"phpunit/dbunit": "~1.4",
"phpunit/phpcov": "~2.0",
"phpunit/phpunit": "~4.8",
"ramsey/uuid-console": "~1.0",
"satooshi/php-coveralls": "~0.6",
"sensiolabs/security-checker": "~3.0",
"symfony/console": "~2.7"
Expand Down
7 changes: 2 additions & 5 deletions core/configs/core.ini
Original file line number Diff line number Diff line change
@@ -1,19 +1,16 @@
; Midas Server. Copyright Kitware SAS. Licensed under the Apache License 2.0.

[global]
bootstrap.path = BASE_PATH "/core/Bootstrap.php"
bootstrap.class = "Bootstrap"
bootstrap.path = BASE_PATH "/core/Bootstrap.php"
internationalization = "0"
resources.frontController.controllerDirectory = BASE_PATH "/core/controllers"
resources.frontController.moduleDirectory = BASE_PATH "/modules"
resources.layout.layoutPath = BASE_PATH "/core/layouts"
resources.modules[] = ""
resources.view.scriptPath = BASE_PATH "/core/views"
internationalization = "0"
rest.default = "json"
rest.formats[] = "xml"
rest.formats[] = "json"
rest.formats[] = "html"
rest.formats[] = "php"
uuid = "67a81613-074d-4c9a-afb7-4613f3144a3d"
version = "3.4.1"

Expand Down
2 changes: 1 addition & 1 deletion core/controllers/components/UuidComponent.php
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ class UuidComponent extends AppComponent
*/
public function generate()
{
return str_replace('-', '', \Rhumsaa\Uuid\Uuid::uuid4()->toString());
return str_replace('-', '', \Ramsey\Uuid\Uuid::uuid4()->toString());
}

/**
Expand Down
4 changes: 2 additions & 2 deletions cron-sample.yaml → cron.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@
#=============================================================================

---
# Enable the task scheduler module and rename this file "cron.yaml".
# Must enable the task scheduler module.
cron:
- description: task scheduler job
url: /scheduler/run
schedule: every 10 minutes
schedule: every 12 minutes
25 changes: 0 additions & 25 deletions modules/example/AppController.php

This file was deleted.

24 changes: 0 additions & 24 deletions modules/example/Bootstrap.php

This file was deleted.

3 changes: 0 additions & 3 deletions modules/example/README

This file was deleted.

9 changes: 0 additions & 9 deletions modules/example/configs/module.ini

This file was deleted.

21 changes: 0 additions & 21 deletions modules/example/constant/module.php

This file was deleted.

55 changes: 0 additions & 55 deletions modules/example/controllers/SampleController.php

This file was deleted.

10 changes: 0 additions & 10 deletions modules/example/database/mysql/1.0.0.sql

This file was deleted.

12 changes: 0 additions & 12 deletions modules/example/database/pgsql/1.0.0.sql

This file was deleted.

9 changes: 0 additions & 9 deletions modules/example/database/sqlite/1.0.0.sql

This file was deleted.

41 changes: 0 additions & 41 deletions modules/example/database/upgrade/1.0.1.php

This file was deleted.

26 changes: 0 additions & 26 deletions modules/example/models/AppDao.php

This file was deleted.

25 changes: 0 additions & 25 deletions modules/example/models/AppModel.php

This file was deleted.

Loading