Skip to content

Commit acfc98d

Browse files
maeisabelle08maeisabelle08
committed
Merge branch 'master' into 164-LoadDataImprovements
* master: changelog update for beta 2 fixed #199 - created ML stuff (http server, db, forests) - updated all routes (gradle, quick start) to create tracing - enabled tracing from xquery - updated DataHub code to allow arbitrary changing of http/db names - added config.xqy that can tell xqy code the name of the staging, final, tracing databases. This file gets dynamically written with appropriate values on hub deploy adding trace server, db, forests
2 parents 6512ef7 + 04c0bc3 commit acfc98d

File tree

44 files changed

+1004
-309
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+1004
-309
lines changed

‎CHANGELOG.md‎

Lines changed: 39 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,43 @@
11
# Change Log
22

3+
## [v1.0.0-beta.2](https://github.com/marklogic/marklogic-data-hub/tree/v1.0.0-beta.2) (2016-04-13)
4+
[Full Changelog](https://github.com/marklogic/marklogic-data-hub/compare/v1.0.0-beta.1...v1.0.0-beta.2)
5+
6+
**Implemented enhancements:**
7+
8+
- Handle duplicate REST service extensions and transforms [\#143](https://github.com/marklogic/marklogic-data-hub/issues/143)
9+
10+
**Fixed bugs:**
11+
12+
- Bug deploying rest services - maybe missing \<hub:plugins\> config ? [\#187](https://github.com/marklogic/marklogic-data-hub/issues/187)
13+
- Session invalidated bug [\#109](https://github.com/marklogic/marklogic-data-hub/issues/109)
14+
15+
**Closed issues:**
16+
17+
- Enable Tracing in the Hub [\#199](https://github.com/marklogic/marklogic-data-hub/issues/199)
18+
- REST folder is being deployed as assets [\#189](https://github.com/marklogic/marklogic-data-hub/issues/189)
19+
- Create Hub example for simple gradle integration [\#184](https://github.com/marklogic/marklogic-data-hub/issues/184)
20+
- Error while loading data [\#179](https://github.com/marklogic/marklogic-data-hub/issues/179)
21+
- Uninstall hub results in error [\#177](https://github.com/marklogic/marklogic-data-hub/issues/177)
22+
- Define different func signatures for simple vs advanced Flows [\#174](https://github.com/marklogic/marklogic-data-hub/issues/174)
23+
- Revisit comments in plugin template files [\#168](https://github.com/marklogic/marklogic-data-hub/issues/168)
24+
- Add writer to scaffolding for conformance flow [\#115](https://github.com/marklogic/marklogic-data-hub/issues/115)
25+
- Make UI code more angular [\#104](https://github.com/marklogic/marklogic-data-hub/issues/104)
26+
- Swagger UI [\#75](https://github.com/marklogic/marklogic-data-hub/issues/75)
27+
- Swagger JSON Endpoint [\#74](https://github.com/marklogic/marklogic-data-hub/issues/74)
28+
- gradle plugin to run hub functions from a gradle project [\#58](https://github.com/marklogic/marklogic-data-hub/issues/58)
29+
30+
**Merged pull requests:**
31+
32+
- 177 uninstall hub results in error [\#196](https://github.com/marklogic/marklogic-data-hub/pull/196) ([divino](https://github.com/divino))
33+
- adding trace server, db, forests [\#195](https://github.com/marklogic/marklogic-data-hub/pull/195) ([paxtonhare](https://github.com/paxtonhare))
34+
- fixing filenames for databases [\#191](https://github.com/marklogic/marklogic-data-hub/pull/191) ([paxtonhare](https://github.com/paxtonhare))
35+
- fixed \#187 [\#190](https://github.com/marklogic/marklogic-data-hub/pull/190) ([paxtonhare](https://github.com/paxtonhare))
36+
- fixed \#184 [\#188](https://github.com/marklogic/marklogic-data-hub/pull/188) ([paxtonhare](https://github.com/paxtonhare))
37+
- prepping for beta 2 release [\#181](https://github.com/marklogic/marklogic-data-hub/pull/181) ([paxtonhare](https://github.com/paxtonhare))
38+
- Get document type from the dataFormat of the entity [\#180](https://github.com/marklogic/marklogic-data-hub/pull/180) ([divino](https://github.com/divino))
39+
- update plugin signatures [\#178](https://github.com/marklogic/marklogic-data-hub/pull/178) ([paxtonhare](https://github.com/paxtonhare))
40+
341
## [v1.0.0-beta.1](https://github.com/marklogic/marklogic-data-hub/tree/v1.0.0-beta.1) (2016-04-01)
442
[Full Changelog](https://github.com/marklogic/marklogic-data-hub/compare/v1.0.0-alpha.4...v1.0.0-beta.1)
543

@@ -191,4 +229,4 @@
191229

192230

193231

194-
\* *This Change Log was automatically generated by [github_changelog_generator](https://github.com/skywinder/Github-Changelog-Generator)*
232+
\* *This Change Log was automatically generated by [github_changelog_generator](https://github.com/skywinder/Github-Changelog-Generator)*

‎examples/gradle-advanced/build.gradle‎

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,17 +31,21 @@ ext {
3131
modulesDatabaseName = mlModulesDbName
3232
triggersDatabaseName = mlTriggersDbName
3333
schemasDatabaseName = mlSchemasDbName
34-
restPort = Integer.parseInt(mlStagingAppserverPort)
34+
restPort = Integer.parseInt(mlStagingPort)
3535

3636
// Configure custom tokens for our json files
3737
customTokens.put("%%STAGING_SERVER_NAME%%", mlStagingAppserverName)
38-
customTokens.put("%%STAGING_SERVER_PORT%%", mlStagingAppserverPort)
38+
customTokens.put("%%STAGING_SERVER_PORT%%", mlStagingPort)
3939
customTokens.put("%%STAGING_DB_NAME%%", mlStagingDbName)
4040

4141
customTokens.put("%%FINAL_SERVER_NAME%%", mlFinalAppserverName)
42-
customTokens.put("%%FINAL_SERVER_PORT%%", mlFinalAppserverPort)
42+
customTokens.put("%%FINAL_SERVER_PORT%%", mlFinalPort)
4343
customTokens.put("%%FINAL_DB_NAME%%", mlFinalDbName)
4444

45+
customTokens.put("%%TRACE_SERVER_NAME%%", mlTraceAppserverName)
46+
customTokens.put("%%TRACE_SERVER_PORT%%", mlTracePort)
47+
customTokens.put("%%TRACE_DB_NAME%%", mlTraceDbName)
48+
4549
customTokens.put("%%MODULES_DB_NAME%%", mlModulesDbName)
4650
}
4751
}
@@ -58,14 +62,22 @@ ext {
5862

5963
// install the staging database
6064
def stagingDbCommand = new com.marklogic.appdeployer.command.databases.DeployDatabaseCommand("staging-database.json")
65+
stagingDbCommand.setForestsPerHost(Integer.parseInt(mlStagingForestsPerHost));
6166
mlAppDeployer.commands.add(stagingDbCommand)
6267
mlDatabaseCommands.add(stagingDbCommand)
6368

6469
// install the final database
6570
def finalDbCommand = new com.marklogic.appdeployer.command.databases.DeployDatabaseCommand("final-database.json")
71+
finalDbCommand.setForestsPerHost(Integer.parseInt(mlFinalForestsPerHost));
6672
mlAppDeployer.commands.add(finalDbCommand)
6773
mlDatabaseCommands.add(finalDbCommand)
6874

75+
// install the trace database
76+
def traceDbCommand = new com.marklogic.appdeployer.command.databases.DeployDatabaseCommand("trace-database.json")
77+
traceDbCommand.setForestsPerHost(Integer.parseInt(mlTraceForestsPerHost));
78+
mlAppDeployer.commands.add(traceDbCommand)
79+
mlDatabaseCommands.add(traceDbCommand)
80+
6981
// install the modules database
7082
def modulesDbCommand = new com.marklogic.appdeployer.command.databases.DeployDatabaseCommand("modules-database.json")
7183
mlAppDeployer.commands.add(modulesDbCommand)

‎examples/gradle-advanced/gradle.properties‎

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,19 @@ mlHost=localhost
22
mlAppName=gradle-advanced-example
33

44
mlStagingAppserverName=data-hub-STAGING
5-
mlStagingAppserverPort=8100
5+
mlStagingPort=8100
66
mlStagingDbName=data-hub-STAGING
7+
mlStagingForestsPerHost=4
78

89
mlFinalAppserverName=data-hub-FINAL
9-
mlFinalAppserverPort=8101
10+
mlFinalPort=8101
1011
mlFinalDbName=data-hub-FINAL
12+
mlFinalForestsPerHost=4
13+
14+
mlTraceAppserverName=data-hub-TRACING
15+
mlTracePort=8102
16+
mlTraceDbName=data-hub-TRACING
17+
mlTraceForestsPerHost=1
1118

1219
mlModulesDbName=data-hub-MODULES
1320
mlTriggersDbName=data-hub-TRIGGERS

‎examples/gradle-advanced/src/main/ml-config/databases/trace-database.json‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
{
2+
"database-name": "%%TRACE_DB_NAME%%",
3+
"range-element-index": [],
4+
"schema-database": "%%SCHEMAS_DATABASE%%",
5+
"triggers-database": "%%TRIGGERS_DATABASE%%",
6+
"triple-index": true,
7+
"collection-lexicon": true,
8+
"uri-lexicon": true
9+
}

‎examples/gradle-advanced/src/main/ml-config/servers/trace-server.json‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
{
2+
"server-name": "%%TRACE_SERVER_NAME%%",
3+
"server-type": "http",
4+
"root": "/",
5+
"group-name": "%%GROUP%%",
6+
"port": %%TRACE_SERVER_PORT%%,
7+
"modules-database": "%%MODULES_DB_NAME%%",
8+
"content-database": "%%TRACE_DB_NAME%%",
9+
"authentication": "digest",
10+
"default-error-format": "json",
11+
"error-handler": "/MarkLogic/rest-api/error-handler.xqy",
12+
"url-rewriter": "/MarkLogic/rest-api/rewriter.xml",
13+
"rewrite-resolves-globally": true
14+
}

‎examples/gradle-basic/gradle.properties‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
mlHost=localhost
22
mlStagingPort=8100
33
mlFinalPort=8101
4+
mlTracePort=8102
45
hubModulesPath=./plugins

‎marklogic-data-hub/gradle.properties‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ mlConfigDir=marklogic-data-hub/src/main/resources/ml-config
33
publishUrl=file:../marklogic-data-hub/releases
44
mlStagingRestPort=8010
55
mlFinalRestPort=8011
6+
mlTraceRestPort=8012
67
mlUsername=admin
78
mlPassword=admin
89
mlHost=localhost

0 commit comments

Comments
 (0)