Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feature/3.x refactor #764

Merged
merged 28 commits into from
Mar 2, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
63ec724
Interfaces for tracing, debugging, and scaffolding
aebadirad Feb 15, 2018
a7de23c
Merge branch 'develop' into feature/3.X_Refactor
aebadirad Feb 15, 2018
ffa0348
Merge branch 'develop' into feature/3.X_Refactor
aebadirad Feb 15, 2018
ba2eb77
Entity manager refactor
aebadirad Feb 15, 2018
ea554e7
Entitiesvalidator interface& impl
aebadirad Feb 15, 2018
450e76d
Job manager interface and implementation changes
aebadirad Feb 15, 2018
6d94a51
FlowManager interface refactor
aebadirad Feb 15, 2018
dc054b1
Fixing tests due to refactor
aebadirad Feb 15, 2018
e9e0d5d
Removal of preintellcheck as a class, now a subclass of datahub
aebadirad Feb 15, 2018
47a3ef0
Shifting hubdatabase and hubupgrader into datahub, updating associations
aebadirad Feb 15, 2018
c099f3a
Merge branch 'develop' into feature/3.X_Refactor
aebadirad Feb 16, 2018
378b14d
Hubproject interface creation
aebadirad Feb 16, 2018
7773072
Refactoring datahub to use an interface for its base class
aebadirad Feb 16, 2018
5134388
Hubconfig builder interface
aebadirad Feb 16, 2018
e237403
Create installinfo interface
aebadirad Feb 20, 2018
5059224
Merge branch 'develop' into feature/3.X_Refactor
aebadirad Feb 23, 2018
3833ef7
Merge branch 'develop' into feature/3.X_Refactor
aebadirad Feb 23, 2018
f31b239
Change names from searchoptions to queryoptions for java api consistency
aebadirad Feb 26, 2018
eb2e717
encapsulate the spring resource use while still returning if the stag…
aebadirad Feb 26, 2018
beee32e
Create databasekind enum as its own enum, remove any external depende…
aebadirad Feb 27, 2018
4e1e95c
Call hubconfig impl internally
aebadirad Feb 27, 2018
33a1b79
refactoring InstallInfo as requested by Erik
dmcassel Feb 27, 2018
90b776c
removing unnecessary import
dmcassel Feb 27, 2018
e2643dd
Merge pull request #763 from marklogic-community/refactor-install-info
aebadirad Feb 27, 2018
d8ebaba
Consolidate setters/getters to common methods using databasekind
aebadirad Feb 27, 2018
de1768b
Adding schemas, triggers, and modules to databasekind and consolidati…
aebadirad Feb 28, 2018
b84a76a
Adding copyright headers, removing database subclass, adding javadoc …
aebadirad Mar 2, 2018
b5e4c9f
Remove extra todo
aebadirad Mar 2, 2018
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
17 changes: 17 additions & 0 deletions marklogic-data-hub/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -235,6 +235,23 @@ ext {
}
}

/*
* Copyright 2012-2018 MarkLogic Corporation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/

// for the StreamCollectorTest we need to constrain the memory
// to a lower value so that the out of memory issue appears
// the hack here is to run that single test in this task with
Expand Down
17 changes: 17 additions & 0 deletions marklogic-data-hub/gradle.properties
Original file line number Diff line number Diff line change
@@ -1,3 +1,20 @@
#
# Copyright 2012-2018 MarkLogic Corporation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
#

mlConfigDir=marklogic-data-hub/src/main/resources/ml-config

mlHost=localhost
Expand Down
Loading