Skip to content

Commit 7655cb0

Browse files
paxtonharepaxtonhare
committed
adding a gradle plugin for the hub
1 parent c170490 commit 7655cb0

20 files changed

+694
-8
lines changed

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

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -34,12 +34,11 @@ public DataHubContentPump(String[] arguments) {
3434
/**
3535
* Run the Content Pump.
3636
*
37-
* @return true if the content pump executed successfully, false otherwise.
38-
* @throws IOException
37+
* @throws IOException
3938
*/
4039
public void execute() throws IOException {
4140
String[] expandedArgs = null;
42-
41+
4342
PrintStream sysout = System.out;
4443
PrintStream mlcpOutputStream = null;
4544
BufferedReader mlcpBufferedReader = null;
@@ -49,7 +48,7 @@ public void execute() throws IOException {
4948
mlcpOutputFile = File.createTempFile("mlcp", ".txt");
5049
mlcpOutputStream = new PrintStream(mlcpOutputFile);
5150
System.setOut(mlcpOutputStream);
52-
51+
5352
// run mlcp
5453
expandedArgs = OptionsFileUtil.expandArguments(arguments);
5554
runCommand(expandedArgs);
@@ -62,11 +61,11 @@ public void execute() throws IOException {
6261
if (mlcpOutputStream != null) {
6362
mlcpOutputStream.close();
6463
}
65-
64+
6665
// revert to the original standard output
6766
System.setOut(sysout);
6867
}
69-
68+
7069
// read the mlcp output and get any error message
7170
StringBuilder errorMessage = new StringBuilder();
7271
try {
@@ -102,11 +101,11 @@ public void execute() throws IOException {
102101
// intentionally empty
103102
}
104103
}
105-
104+
106105
// delete the temporary file
107106
mlcpOutputFile.delete();
108107
}
109-
108+
110109
if (errorMessage.length() > 0) {
111110
throw new IOException("Load data failed with:\r\n" + errorMessage.toString());
112111
}

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

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,15 @@ else if (mlPassword != null) {
8080
if (prop != null) {
8181
c.setModulesPath(prop);
8282
}
83+
else {
84+
c.setModulesPath("./plugins");
85+
}
86+
87+
prop = getProperty("mlAuth");
88+
if (prop != null) {
89+
c.setAuthMethod(prop);
90+
}
91+
8392
return c;
8493
}
8594

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

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,13 +24,16 @@ public class HubConfig {
2424
public static final Integer DEFAULT_FINAL_PORT = 8011;
2525
public static final String DEFAULT_APP_NAME = "my-data-hub";
2626
public final static String DEFAULT_MODULES_PATH = "src/data-hub";
27+
public static final String DEFAULT_AUTH_METHOD = "digest";
2728

2829
private String name = DEFAULT_APP_NAME;
2930
private String adminUsername = DEFAULT_USERNAME;
3031
private String adminPassword = DEFAULT_PASSWORD;
3132
private String host = DEFAULT_HOST;
3233
private Integer stagingPort = DEFAULT_STAGING_PORT;
3334
private Integer finalPort = DEFAULT_FINAL_PORT;
35+
private String authMethod = DEFAULT_AUTH_METHOD;
36+
3437
private String modulesPath;
3538

3639
public HubConfig() {
@@ -116,4 +119,11 @@ public void setModulesPath(String modulesPath) {
116119
this.modulesPath = modulesPath;
117120
}
118121

122+
public String getAuthMethod() {
123+
return this.authMethod;
124+
}
125+
126+
public void setAuthMethod(String authMethod) {
127+
this.authMethod = authMethod;
128+
}
119129
}

‎ml-data-hub-plugin/build.gradle‎

Lines changed: 84 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,84 @@
1+
buildscript {
2+
repositories {
3+
jcenter()
4+
maven { url 'http://developer.marklogic.com/maven2' }
5+
}
6+
dependencies {
7+
classpath "com.gradle.publish:plugin-publish-plugin:0.9.2"
8+
}
9+
}
10+
11+
plugins {
12+
id "groovy"
13+
id "maven-publish"
14+
id "eclipse"
15+
id "idea"
16+
id "com.jfrog.bintray" version "1.6"
17+
}
18+
19+
apply plugin: "com.gradle.plugin-publish"
20+
21+
sourceCompatibility = 1.8
22+
targetCompatibility = 1.8
23+
24+
repositories {
25+
jcenter()
26+
maven { url 'http://developer.marklogic.com/maven2' }
27+
}
28+
29+
dependencies {
30+
compile gradleApi()
31+
compile 'com.marklogic:marklogic-data-hub:+'
32+
compile 'com.marklogic:marklogic-xcc:8.0.4.2'
33+
}
34+
35+
task sourcesJar(type: Jar, dependsOn: classes) {
36+
classifier 'sources'
37+
from sourceSets.main.allJava
38+
from sourceSets.main.allGroovy
39+
}
40+
41+
publishing {
42+
publications {
43+
main(MavenPublication) {
44+
from components.java
45+
artifact sourcesJar
46+
}
47+
}
48+
}
49+
50+
bintray {
51+
user = project.hasProperty('bintrayUser') ? project.property('bintrayUser') : System.getenv('BINTRAY_USER')
52+
key = project.hasProperty('bintrayApiKey') ? project.property('bintrayApiKey') : System.getenv('BINTRAY_API_KEY')
53+
publications = ['main']
54+
pkg {
55+
repo = 'maven'
56+
name = 'ml-data-hub-plugin'
57+
desc = 'A gradle plugin for Data Hub tasks'
58+
// userOrg = user
59+
licenses = ['Apache-2.0']
60+
websiteUrl = 'https://github.com/marklogic/marklogic-data-hub'
61+
issueTrackerUrl = 'https://github.com/marklogic/marklogic-data-hub/issues'
62+
}
63+
}
64+
65+
pluginBundle {
66+
website = 'http://www.gradle.org/'
67+
vcsUrl = 'https://github.com/marklogic/marklogic-data-hub.git'
68+
description = 'ml-data-hub-plugin A gradle plugin for Data Hub tasks'
69+
tags = ['marklogic']
70+
71+
plugins {
72+
mldatahubPlugin {
73+
id = 'com.marklogic.ml-data-hub-plugin'
74+
displayName = 'Gradle tasks for MarkLogic Data Hub'
75+
description = 'Gradle plugin for configuring and deploying the MarkLogic Data Hub'
76+
tags = ['marklogic']
77+
version = "0.0.9"
78+
}
79+
}
80+
81+
mavenCoordinates {
82+
version = "0.0.9"
83+
}
84+
}

‎ml-data-hub-plugin/gradle.properties‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
version=1.0.0-alpha.3
2+
group=com.marklogic

‎ml-data-hub-plugin/gradle/wrapper/gradle-wrapper.jar‎

52.4 KB
Binary file not shown.

‎ml-data-hub-plugin/gradle/wrapper/gradle-wrapper.properties‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
#Mon Feb 08 14:24:38 EST 2016
2+
distributionBase=GRADLE_USER_HOME
3+
distributionPath=wrapper/dists
4+
zipStoreBase=GRADLE_USER_HOME
5+
zipStorePath=wrapper/dists
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-2.10-bin.zip

‎ml-data-hub-plugin/gradlew‎

Lines changed: 160 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,160 @@
1+
#!/usr/bin/env bash
2+
3+
##############################################################################
4+
##
5+
## Gradle start up script for UN*X
6+
##
7+
##############################################################################
8+
9+
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
10+
DEFAULT_JVM_OPTS=""
11+
12+
APP_NAME="Gradle"
13+
APP_BASE_NAME=`basename "$0"`
14+
15+
# Use the maximum available, or set MAX_FD != -1 to use that value.
16+
MAX_FD="maximum"
17+
18+
warn ( ) {
19+
echo "$*"
20+
}
21+
22+
die ( ) {
23+
echo
24+
echo "$*"
25+
echo
26+
exit 1
27+
}
28+
29+
# OS specific support (must be 'true' or 'false').
30+
cygwin=false
31+
msys=false
32+
darwin=false
33+
case "`uname`" in
34+
CYGWIN* )
35+
cygwin=true
36+
;;
37+
Darwin* )
38+
darwin=true
39+
;;
40+
MINGW* )
41+
msys=true
42+
;;
43+
esac
44+
45+
# Attempt to set APP_HOME
46+
# Resolve links: $0 may be a link
47+
PRG="$0"
48+
# Need this for relative symlinks.
49+
while [ -h "$PRG" ] ; do
50+
ls=`ls -ld "$PRG"`
51+
link=`expr "$ls" : '.*-> \(.*\)$'`
52+
if expr "$link" : '/.*' > /dev/null; then
53+
PRG="$link"
54+
else
55+
PRG=`dirname "$PRG"`"/$link"
56+
fi
57+
done
58+
SAVED="`pwd`"
59+
cd "`dirname \"$PRG\"`/" >&-
60+
APP_HOME="`pwd -P`"
61+
cd "$SAVED" >&-
62+
63+
CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
64+
65+
# Determine the Java command to use to start the JVM.
66+
if [ -n "$JAVA_HOME" ] ; then
67+
if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
68+
# IBM's JDK on AIX uses strange locations for the executables
69+
JAVACMD="$JAVA_HOME/jre/sh/java"
70+
else
71+
JAVACMD="$JAVA_HOME/bin/java"
72+
fi
73+
if [ ! -x "$JAVACMD" ] ; then
74+
die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
75+
76+
Please set the JAVA_HOME variable in your environment to match the
77+
location of your Java installation."
78+
fi
79+
else
80+
JAVACMD="java"
81+
which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
82+
83+
Please set the JAVA_HOME variable in your environment to match the
84+
location of your Java installation."
85+
fi
86+
87+
# Increase the maximum file descriptors if we can.
88+
if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then
89+
MAX_FD_LIMIT=`ulimit -H -n`
90+
if [ $? -eq 0 ] ; then
91+
if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
92+
MAX_FD="$MAX_FD_LIMIT"
93+
fi
94+
ulimit -n $MAX_FD
95+
if [ $? -ne 0 ] ; then
96+
warn "Could not set maximum file descriptor limit: $MAX_FD"
97+
fi
98+
else
99+
warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
100+
fi
101+
fi
102+
103+
# For Darwin, add options to specify how the application appears in the dock
104+
if $darwin; then
105+
GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
106+
fi
107+
108+
# For Cygwin, switch paths to Windows format before running java
109+
if $cygwin ; then
110+
APP_HOME=`cygpath --path --mixed "$APP_HOME"`
111+
CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
112+
JAVACMD=`cygpath --unix "$JAVACMD"`
113+
114+
# We build the pattern for arguments to be converted via cygpath
115+
ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
116+
SEP=""
117+
for dir in $ROOTDIRSRAW ; do
118+
ROOTDIRS="$ROOTDIRS$SEP$dir"
119+
SEP="|"
120+
done
121+
OURCYGPATTERN="(^($ROOTDIRS))"
122+
# Add a user-defined pattern to the cygpath arguments
123+
if [ "$GRADLE_CYGPATTERN" != "" ] ; then
124+
OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
125+
fi
126+
# Now convert the arguments - kludge to limit ourselves to /bin/sh
127+
i=0
128+
for arg in "$@" ; do
129+
CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
130+
CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option
131+
132+
if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition
133+
eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
134+
else
135+
eval `echo args$i`="\"$arg\""
136+
fi
137+
i=$((i+1))
138+
done
139+
case $i in
140+
(0) set -- ;;
141+
(1) set -- "$args0" ;;
142+
(2) set -- "$args0" "$args1" ;;
143+
(3) set -- "$args0" "$args1" "$args2" ;;
144+
(4) set -- "$args0" "$args1" "$args2" "$args3" ;;
145+
(5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
146+
(6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
147+
(7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
148+
(8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
149+
(9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
150+
esac
151+
fi
152+
153+
# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules
154+
function splitJvmOpts() {
155+
JVM_OPTS=("$@")
156+
}
157+
eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
158+
JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
159+
160+
exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"

0 commit comments

Comments
 (0)