Skip to content

Commit 5610e79

Browse files
paxtonharepaxtonhare
committed
mlcp is now full screen
added missing host username options to mlcp command updated a dependent lib angular2-mdl to latest version fixed tooltip getting cut off
1 parent 67fcf5f commit 5610e79

32 files changed

+331
-412
lines changed

‎marklogic-data-hub/src/main/java/com/marklogic/hub/DataHub.java‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -87,20 +87,20 @@ public DataHub(HubConfig hubConfig) {
8787
public DataHub(String host, String username, String password) {
8888
hubConfig = new HubConfig();
8989
hubConfig.host = host;
90-
hubConfig.adminUsername = username;
91-
hubConfig.adminPassword = password;
90+
hubConfig.username = username;
91+
hubConfig.password = password;
9292
init(hubConfig);
9393
}
9494

9595
private void init(HubConfig hubConfig) {
9696
this.hubConfig = hubConfig;
97-
config = new ManageConfig(hubConfig.host, 8002, hubConfig.adminUsername, hubConfig.adminPassword);
97+
config = new ManageConfig(hubConfig.host, 8002, hubConfig.username, hubConfig.password);
9898
client = new ManageClient(config);
9999

100100
AdminConfig adminConfig = new AdminConfig();
101101
adminConfig.setHost(hubConfig.host);
102-
adminConfig.setUsername(hubConfig.adminUsername);
103-
adminConfig.setPassword(hubConfig.adminPassword);
102+
adminConfig.setUsername(hubConfig.username);
103+
adminConfig.setPassword(hubConfig.password);
104104
adminManager = new AdminManager(adminConfig);
105105
}
106106

@@ -208,8 +208,8 @@ public void updateAppConfig(AppConfig config) {
208208
config.setHost(hubConfig.host);
209209
config.setRestPort(hubConfig.stagingPort);
210210
config.setName(hubConfig.name);
211-
config.setRestAdminUsername(hubConfig.adminUsername);
212-
config.setRestAdminPassword(hubConfig.adminPassword);
211+
config.setRestAdminUsername(hubConfig.username);
212+
config.setRestAdminPassword(hubConfig.password);
213213
config.setModulesDatabaseName(hubConfig.modulesDbName);
214214

215215
config.setTriggersDatabaseName(hubConfig.triggersDbName);
@@ -267,9 +267,9 @@ private DatabaseClient getDatabaseClient(int port) {
267267
AppConfig config = new AppConfig();
268268
config.setHost(hubConfig.host);
269269
config.setName(hubConfig.name);
270-
config.setRestAdminUsername(hubConfig.adminUsername);
271-
config.setRestAdminPassword(hubConfig.adminPassword);
272-
DatabaseClient client = DatabaseClientFactory.newClient(hubConfig.host, port, hubConfig.adminUsername, hubConfig.adminPassword,
270+
config.setRestAdminUsername(hubConfig.username);
271+
config.setRestAdminPassword(hubConfig.password);
272+
DatabaseClient client = DatabaseClientFactory.newClient(hubConfig.host, port, hubConfig.username, hubConfig.password,
273273
config.getRestAuthentication(), config.getRestSslContext(), config.getRestSslHostnameVerifier());
274274
return client;
275275
}

‎marklogic-data-hub/src/main/java/com/marklogic/hub/FlowManager.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,8 @@ private DatabaseClient getClient() {
5858
return DatabaseClientFactory.newClient(
5959
hubConfig.host,
6060
hubConfig.stagingPort,
61-
hubConfig.adminUsername,
62-
hubConfig.adminPassword, authMethod);
61+
hubConfig.username,
62+
hubConfig.password, authMethod);
6363
}
6464

6565
public FlowManager(HubConfig hubConfig) {

‎marklogic-data-hub/src/main/java/com/marklogic/hub/HubConfig.java‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,10 +43,9 @@ public class HubConfig {
4343

4444
public String name = DEFAULT_APP_NAME;
4545

46+
public String username;
4647
@JsonIgnore
47-
public String adminUsername;
48-
@JsonIgnore
49-
public String adminPassword;
48+
public String password;
5049

5150
public String host = DEFAULT_HOST;
5251

‎marklogic-data-hub/src/main/java/com/marklogic/hub/commands/LoadHubModulesCommand.java‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,6 @@
1111

1212
import com.marklogic.client.DatabaseClient;
1313
import com.marklogic.client.DatabaseClientFactory;
14-
import com.marklogic.client.admin.QueryOptionsManager;
15-
import com.marklogic.client.admin.ServerConfigurationManager;
16-
import com.marklogic.client.io.StringHandle;
1714
import com.marklogic.client.modulesloader.impl.PropertiesModuleManager;
1815
import com.marklogic.hub.HubConfig;
1916
import org.apache.commons.io.IOUtils;
@@ -116,13 +113,13 @@ protected void initializeActiveSession(CommandContext context) {
116113
private DatabaseClient jobDbClient() {
117114
DatabaseClientFactory.Authentication authMethod = DatabaseClientFactory.Authentication
118115
.valueOf(hubConfig.authMethod.toUpperCase());
119-
return DatabaseClientFactory.newClient(hubConfig.host, hubConfig.jobPort, hubConfig.jobDbName, hubConfig.adminUsername, hubConfig.adminPassword, authMethod);
116+
return DatabaseClientFactory.newClient(hubConfig.host, hubConfig.jobPort, hubConfig.jobDbName, hubConfig.username, hubConfig.password, authMethod);
120117
}
121118

122119
private DatabaseClient traceDbClient() {
123120
DatabaseClientFactory.Authentication authMethod = DatabaseClientFactory.Authentication
124121
.valueOf(hubConfig.authMethod.toUpperCase());
125-
return DatabaseClientFactory.newClient(hubConfig.host, hubConfig.tracePort, hubConfig.traceDbName, hubConfig.adminUsername, hubConfig.adminPassword, authMethod);
122+
return DatabaseClientFactory.newClient(hubConfig.host, hubConfig.tracePort, hubConfig.traceDbName, hubConfig.username, hubConfig.password, authMethod);
126123
}
127124

128125
@Override

‎marklogic-data-hub/src/main/java/com/marklogic/hub/commands/LoadUserModulesCommand.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ public LoadUserModulesCommand(HubConfig hubConfig) {
4040

4141
private DatabaseClient getDatabaseClient(AppConfig config, int port) {
4242

43-
DatabaseClient client = DatabaseClientFactory.newClient(hubConfig.host, port, hubConfig.adminUsername, hubConfig.adminPassword,
43+
DatabaseClient client = DatabaseClientFactory.newClient(hubConfig.host, port, hubConfig.username, hubConfig.password,
4444
config.getRestAuthentication(), config.getRestSslContext(), config.getRestSslHostnameVerifier());
4545
return client;
4646
}

‎marklogic-data-hub/src/main/java/com/marklogic/spring/batch/hub/MarkLogicJobRepoConfig.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ public DatabaseClientProvider databaseClientProvider() {
1515
DatabaseClientConfig config = new DatabaseClientConfig(
1616
hubConfig.host,
1717
hubConfig.jobPort,
18-
hubConfig.adminUsername,
19-
hubConfig.adminPassword
18+
hubConfig.username,
19+
hubConfig.password
2020
);
2121

2222
config.setDatabase(hubConfig.jobDbName);
@@ -31,8 +31,8 @@ public DatabaseClientProvider jobRepositoryDatabaseClientProvider() {
3131
DatabaseClientConfig config = new DatabaseClientConfig(
3232
hubConfig.host,
3333
hubConfig.jobPort,
34-
hubConfig.adminUsername,
35-
hubConfig.adminPassword
34+
hubConfig.username,
35+
hubConfig.password
3636
);
3737

3838
config.setDatabase(hubConfig.jobDbName);

‎marklogic-data-hub/src/main/java/com/marklogic/spring/batch/hub/StagingConfig.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@ public DatabaseClientProvider databaseClientProvider() {
2828
DatabaseClientConfig config = new DatabaseClientConfig(
2929
hubConfig.host,
3030
hubConfig.stagingPort,
31-
hubConfig.adminUsername,
32-
hubConfig.adminPassword
31+
hubConfig.username,
32+
hubConfig.password
3333
);
3434

3535
config.setDatabase(hubConfig.stagingDbName);
@@ -44,8 +44,8 @@ public DatabaseClientProvider jobRepositoryDatabaseClientProvider() {
4444
DatabaseClientConfig config = new DatabaseClientConfig(
4545
hubConfig.host,
4646
hubConfig.jobPort,
47-
hubConfig.adminUsername,
48-
hubConfig.adminPassword
47+
hubConfig.username,
48+
hubConfig.password
4949
);
5050

5151
config.setDatabase(hubConfig.jobDbName);

‎marklogic-data-hub/src/test/java/com/marklogic/hub/HubTestBase.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -154,8 +154,8 @@ protected static HubConfig getHubConfig(String projectDir) {
154154
hubConfig.stagingPort = stagingPort;
155155
hubConfig.finalPort = finalPort;
156156
hubConfig.tracePort = tracePort;
157-
hubConfig.adminUsername = user;
158-
hubConfig.adminPassword = password;
157+
hubConfig.username = user;
158+
hubConfig.password = password;
159159
return hubConfig;
160160
}
161161

‎quick-start/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@
8080
"@angularclass/request-idle-callback": "^1.0.7",
8181
"@angularclass/webpack-toolkit": "^1.3.3",
8282
"angular2-clipboard": "^0.2.12",
83-
"angular2-mdl": "^1.0.0-rc1",
83+
"angular2-mdl": "^1.1.5",
8484
"angular2-moment": "^0.8.1",
8585
"codemirror": "^5.17.0",
8686
"core-js": "^2.4.0",

‎quick-start/src/main/java/com/marklogic/quickstart/model/EnvironmentConfig.java‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -86,8 +86,8 @@ public void init(String projectDir, String environment, LoginInfo loginInfo) {
8686
this.environment = environment;
8787
mlSettings = new HubConfig(this.projectDir);
8888
if (loginInfo != null) {
89-
mlSettings.adminUsername = loginInfo.username;
90-
mlSettings.adminPassword = loginInfo.password;
89+
mlSettings.username = loginInfo.username;
90+
mlSettings.password = loginInfo.password;
9191
}
9292
loadConfigurationFromFiles();
9393

@@ -187,8 +187,8 @@ public DatabaseClient getStagingClient() {
187187
DatabaseClient client = DatabaseClientFactory.newClient(
188188
mlSettings.host,
189189
mlSettings.stagingPort,
190-
mlSettings.adminUsername,
191-
mlSettings.adminPassword, authMethod);
190+
mlSettings.username,
191+
mlSettings.password, authMethod);
192192
return client;
193193
}
194194

@@ -200,8 +200,8 @@ public DatabaseClient getFinalClient() {
200200
DatabaseClient client = DatabaseClientFactory.newClient(
201201
mlSettings.host,
202202
mlSettings.finalPort,
203-
mlSettings.adminUsername,
204-
mlSettings.adminPassword, authMethod);
203+
mlSettings.username,
204+
mlSettings.password, authMethod);
205205
return client;
206206
}
207207

@@ -213,8 +213,8 @@ public DatabaseClient getTraceClient() {
213213
DatabaseClient client = DatabaseClientFactory.newClient(
214214
mlSettings.host,
215215
mlSettings.tracePort,
216-
mlSettings.adminUsername,
217-
mlSettings.adminPassword, authMethod);
216+
mlSettings.username,
217+
mlSettings.password, authMethod);
218218
return client;
219219
}
220220

@@ -226,8 +226,8 @@ public DatabaseClient getJobClient() {
226226
DatabaseClient client = DatabaseClientFactory.newClient(
227227
mlSettings.host,
228228
mlSettings.jobPort,
229-
mlSettings.adminUsername,
230-
mlSettings.adminPassword, authMethod);
229+
mlSettings.username,
230+
mlSettings.password, authMethod);
231231
return client;
232232
}
233233

0 commit comments

Comments
 (0)