You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by mb...@apache.org on 2015/11/06 00:15:04 UTC
[1/7] incubator-geode git commit: GEODE-380 ensure that gfsh shutdown
does not leave only daemon threads
Repository: incubator-geode
Updated Branches:
refs/heads/feature/GEODE-227 e76196188 -> 29ce1cac0
GEODE-380 ensure that gfsh shutdown does not leave only daemon threads
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/4aebab69
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/4aebab69
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/4aebab69
Branch: refs/heads/feature/GEODE-227
Commit: 4aebab69e0d67f15f87c0bb3e5a9f77e55a118cf
Parents: 2baf397
Author: Jens Deppe <jd...@gopivotal.com>
Authored: Thu Oct 8 16:13:06 2015 -0700
Committer: Mark Bretl <mb...@pivotal.io>
Committed: Thu Nov 5 14:09:06 2015 -0800
----------------------------------------------------------------------
.../gemfire/management/internal/beans/MemberMBeanBridge.java | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/4aebab69/gemfire-core/src/main/java/com/gemstone/gemfire/management/internal/beans/MemberMBeanBridge.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/management/internal/beans/MemberMBeanBridge.java b/gemfire-core/src/main/java/com/gemstone/gemfire/management/internal/beans/MemberMBeanBridge.java
index 2d14486..d56504a 100644
--- a/gemfire-core/src/main/java/com/gemstone/gemfire/management/internal/beans/MemberMBeanBridge.java
+++ b/gemfire-core/src/main/java/com/gemstone/gemfire/management/internal/beans/MemberMBeanBridge.java
@@ -1114,6 +1114,7 @@ public class MemberMBeanBridge {
}
}
});
+ t.setDaemon(false);
t.start();
}
[2/7] incubator-geode git commit: GEODE-504 - Removing references to
XX:MaxPermSize since due to JDK 8
Posted by mb...@apache.org.
GEODE-504 - Removing references to XX:MaxPermSize since due to JDK 8
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/2baf3975
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/2baf3975
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/2baf3975
Branch: refs/heads/feature/GEODE-227
Commit: 2baf3975b07ac5986ee90dc0e01008ac7b14e4be
Parents: e761961
Author: William Markito <wm...@pivotal.io>
Authored: Tue Oct 27 12:05:17 2015 -0700
Committer: Mark Bretl <mb...@pivotal.io>
Committed: Thu Nov 5 14:09:06 2015 -0800
----------------------------------------------------------------------
build.gradle | 2 +-
gemfire-core/src/test/java/dunit/standalone/ProcessManager.java | 2 --
2 files changed, 1 insertion(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/2baf3975/build.gradle
----------------------------------------------------------------------
diff --git a/build.gradle b/build.gradle
index 42ea86d..8fddbfe 100755
--- a/build.gradle
+++ b/build.gradle
@@ -388,7 +388,7 @@ subprojects {
}
maxHeapSize '768m'
- jvmArgs = ['-XX:+HeapDumpOnOutOfMemoryError', '-XX:MaxPermSize=256M', '-ea']
+ jvmArgs = ['-XX:+HeapDumpOnOutOfMemoryError', '-ea']
systemProperties = [
'gemfire.DEFAULT_MAX_OPLOG_SIZE' : '10',
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/2baf3975/gemfire-core/src/test/java/dunit/standalone/ProcessManager.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/dunit/standalone/ProcessManager.java b/gemfire-core/src/test/java/dunit/standalone/ProcessManager.java
index c4a55ed..814a48e 100644
--- a/gemfire-core/src/test/java/dunit/standalone/ProcessManager.java
+++ b/gemfire-core/src/test/java/dunit/standalone/ProcessManager.java
@@ -171,10 +171,8 @@ public class ProcessManager {
"-Xrunjdwp:transport=dt_socket,server=y,suspend=" + jdkSuspend + jdkDebug,
"-XX:+HeapDumpOnOutOfMemoryError",
"-Xmx512m",
- "-XX:MaxPermSize=256M",
"-Dgemfire.DEFAULT_MAX_OPLOG_SIZE=10",
"-Dgemfire.disallowMcastDefaults=true",
- "-XX:MaxPermSize=256M",
"-ea",
agent,
"dunit.standalone.ChildVM"
[4/7] incubator-geode git commit: Initial sweep of aggregating all
dependency versions into a single file
Posted by mb...@apache.org.
Initial sweep of aggregating all dependency versions into a single file
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/2ea5e394
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/2ea5e394
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/2ea5e394
Branch: refs/heads/feature/GEODE-227
Commit: 2ea5e394ac5bd7baa198c88cd4e59c6d6f9101a3
Parents: 562347a
Author: Mark Bretl <mb...@pivotal.io>
Authored: Thu Oct 22 17:36:54 2015 -0700
Committer: Mark Bretl <mb...@pivotal.io>
Committed: Thu Nov 5 14:43:23 2015 -0800
----------------------------------------------------------------------
gemfire-core/build.gradle | 1 -
gradle.properties | 75 ++++++++++++++++++++++++++++++++++++++++++
2 files changed, 75 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/2ea5e394/gemfire-core/build.gradle
----------------------------------------------------------------------
diff --git a/gemfire-core/build.gradle b/gemfire-core/build.gradle
index 1db1689..647fc62 100755
--- a/gemfire-core/build.gradle
+++ b/gemfire-core/build.gradle
@@ -84,7 +84,6 @@ dependencies {
testRuntime 'commons-collections:commons-collections:' + project.'commons-collections.version'
testRuntime 'commons-configuration:commons-configuration:' + project.'commons-configuration.version'
testRuntime 'commons-io:commons-io:' + project.'commons-io.version'
- //testRuntime 'log4j:log4j:' + project.'log4j.version'
testCompile 'net.spy:spymemcached:' + project.'spymemcached.version'
testCompile 'redis.clients:jedis:' + project.'jedis.version'
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/2ea5e394/gradle.properties
----------------------------------------------------------------------
diff --git a/gradle.properties b/gradle.properties
index 5c332b3..d7f229e 100755
--- a/gradle.properties
+++ b/gradle.properties
@@ -8,3 +8,78 @@ org.gradle.jvmargs = -Xmx2048m
# to change the buildDir location. Use an absolute path.
buildRoot=
+# Buildscript Dependencies
+gradle-maven-publish-auth.version = 2.0.1
+
+# Dependency versions
+activation.version = 1.1.1
+annotations.version = 3.0.0
+antlr.version = 2.7.7
+asm.version = 5.0.3
+assertj-core.version = 2.1.0
+bcel.version = 5.2
+cglib.version = 3.1
+#cglib-nodep.version = 2.1.3
+classmate.version = 0.9.0
+commons-collections.version = 3.2.1
+commons-configuration.version = 1.6
+commons-fileupload.version = 1.3.1
+commons-io.version = 2.3
+commons-lang.version = 2.5
+commons-logging.version = 1.1.1
+commons-modeler.version = 2.0
+derby.version = 10.2.2.0
+fastutil.version = 7.0.2
+guava.version = 11.0.2
+hadoop.version = 2.4.1
+hamcrest-all.version = 1.3
+#hamcrest-core.version = 1.1
+#hamcrest-library.version = 1.1
+hbase.version = 0.94.27
+jackson.version = 2.2.0
+#jackson-annotations.version = 2.2.0
+#jackson-core.version = 2.2.0
+#jackson-databind.version = 2.2.0
+jackson-module-scala_2.10.version = 2.1.5
+jansi.version = 1.8
+javax.mail-api.version = 1.4.5
+javax.resource-api.version = 1.7
+javax.servlet-api.version = 3.1.0
+javax.transaction-api.version = 1.2
+jedis.version = 2.7.2
+jetty.version = 9.2.3.v20140905
+jline.version = 1.0.S2-B
+jmock.version = 2.8.1
+jmock-junit4.version = 2.8.1
+jmock-legacy.version = 2.8.1
+jna.version = 4.0.0
+json4s.version = 3.2.4
+junit.version = 4.12
+JUnitParams.version = 1.0.4
+log4j.version = 2.1
+lucene.version = 5.0.0
+#lucene-analyzers-common.version = 5.0.0
+#lucene-core.version = 5.0.0
+#lucene-queries.version = 5.0.0
+#lucene-queryparser.version = 5.0.0
+mockito-core.version = 1.10.19
+multithreadedtc.version = 1.01
+mx4j.version = 3.0.1
+mx4j-remote.version = 3.0.1
+mx4j-tools.version = 3.0.1
+netty-all.version = 4.0.4.Final
+objenesis.version = 2.1
+paranamer.version = 2.3
+quartz.version = 2.2.1
+scala.version = 2.10.0
+slf4j-api.version = 1.7.7
+snappy-java.version = 1.1.1.6
+spring-data-commons.version = 1.9.1.RELEASE
+spring-data-gemfire.version = 1.5.1.RELEASE
+spring-hateos.version = 0.16.0.RELEASE
+spring-shell.version = 1.0.0.RELEASE
+springframework.version = 3.2.12.RELEASE
+spymemcached.version = 2.9.0
+swagger.version = 1.3.2
+swagger-springmvc.version = 0.8.2
+system-rules.version = 1.12.1
[3/7] incubator-geode git commit: GEODE-381 enable gfsh https usage
through SSL terminated environments
Posted by mb...@apache.org.
GEODE-381 enable gfsh https usage through SSL terminated environments
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/562347af
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/562347af
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/562347af
Branch: refs/heads/feature/GEODE-227
Commit: 562347af9e08e4a2138a5b6301b9de2d848e2580
Parents: 4aebab6
Author: Jens Deppe <jd...@gopivotal.com>
Authored: Mon Oct 5 15:01:17 2015 -0700
Committer: Mark Bretl <mb...@pivotal.io>
Committed: Thu Nov 5 14:11:11 2015 -0800
----------------------------------------------------------------------
.../internal/cli/commands/ShellCommands.java | 7 +-
.../controllers/AbstractCommandsController.java | 7 +-
.../controllers/ShellCommandsController.java | 178 ++++++++++---------
gemfire-web/build.gradle | 4 +-
.../ShellCommandsControllerJUnitTest.java | 47 +++--
5 files changed, 140 insertions(+), 103 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/562347af/gemfire-core/src/main/java/com/gemstone/gemfire/management/internal/cli/commands/ShellCommands.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/management/internal/cli/commands/ShellCommands.java b/gemfire-core/src/main/java/com/gemstone/gemfire/management/internal/cli/commands/ShellCommands.java
index 43e85f4..edab207 100644
--- a/gemfire-core/src/main/java/com/gemstone/gemfire/management/internal/cli/commands/ShellCommands.java
+++ b/gemfire-core/src/main/java/com/gemstone/gemfire/management/internal/cli/commands/ShellCommands.java
@@ -206,10 +206,13 @@ public class ShellCommands implements CommandMarker {
url = url.replace("http:", "https:");
}
}
-
+
+ // This is so that SSL termination results in https URLs being returned
+ String query = (url.startsWith("https")) ? "?scheme=https" : "";
+
LogWrapper.getInstance().warning(String.format("Sending HTTP request for Link Index at (%1$s)...", url.concat("/index")));
- LinkIndex linkIndex = new SimpleHttpRequester(CONNECT_LOCATOR_TIMEOUT_MS).get(url.concat("/index"), LinkIndex.class);
+ LinkIndex linkIndex = new SimpleHttpRequester(CONNECT_LOCATOR_TIMEOUT_MS).get(url.concat("/index").concat(query), LinkIndex.class);
LogWrapper.getInstance().warning(String.format("Received Link Index (%1$s)", linkIndex.toString()));
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/562347af/gemfire-core/src/main/java/com/gemstone/gemfire/management/internal/web/controllers/AbstractCommandsController.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/management/internal/web/controllers/AbstractCommandsController.java b/gemfire-core/src/main/java/com/gemstone/gemfire/management/internal/web/controllers/AbstractCommandsController.java
index 74a9bff..41a890a 100644
--- a/gemfire-core/src/main/java/com/gemstone/gemfire/management/internal/web/controllers/AbstractCommandsController.java
+++ b/gemfire-core/src/main/java/com/gemstone/gemfire/management/internal/web/controllers/AbstractCommandsController.java
@@ -57,6 +57,7 @@ import org.springframework.web.bind.annotation.InitBinder;
import org.springframework.web.bind.annotation.ResponseBody;
import org.springframework.web.context.request.WebRequest;
import org.springframework.web.servlet.support.ServletUriComponentsBuilder;
+import org.springframework.web.util.UriComponentsBuilder;
/**
* The AbstractCommandsController class is the abstract base class encapsulating common functionality across all
@@ -255,12 +256,14 @@ public abstract class AbstractCommandsController {
* Converts the URI relative path to an absolute path based on the Servlet context information.
*
* @param path the URI relative path to append to the Servlet context path.
+ * @param scheme the scheme to use for the URI
* @return a URI constructed with all component path information.
* @see java.net.URI
* @see org.springframework.web.servlet.support.ServletUriComponentsBuilder
*/
- protected /*static*/ URI toUri(final String path) {
- return ServletUriComponentsBuilder.fromCurrentContextPath().path(REST_API_VERSION).path(path).build().toUri();
+ protected /*static*/ URI toUri(final String path, final String scheme) {
+ return ServletUriComponentsBuilder.fromCurrentContextPath()
+ .path(REST_API_VERSION).path(path).scheme(scheme).build().toUri();
}
/**
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/562347af/gemfire-core/src/main/java/com/gemstone/gemfire/management/internal/web/controllers/ShellCommandsController.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/management/internal/web/controllers/ShellCommandsController.java b/gemfire-core/src/main/java/com/gemstone/gemfire/management/internal/web/controllers/ShellCommandsController.java
index bf3fb06..0bac797 100644
--- a/gemfire-core/src/main/java/com/gemstone/gemfire/management/internal/web/controllers/ShellCommandsController.java
+++ b/gemfire-core/src/main/java/com/gemstone/gemfire/management/internal/web/controllers/ShellCommandsController.java
@@ -144,7 +144,7 @@ public class ShellCommandsController extends AbstractCommandsController {
*
* @return a LinkIndex containing Links for all web service endpoints, REST API calls in GemFire.
* @see com.gemstone.gemfire.management.internal.cli.i18n.CliStrings
- * @see com.gemstone.gemfire.management.internal.web.controllers.AbstractCommandsController#toUri(String)
+ * @see AbstractCommandsController#toUri(String, String)
* @see com.gemstone.gemfire.management.internal.web.domain.Link
* @see com.gemstone.gemfire.management.internal.web.domain.LinkIndex
* @see com.gemstone.gemfire.management.internal.web.http.HttpMethod
@@ -153,113 +153,117 @@ public class ShellCommandsController extends AbstractCommandsController {
// the Spring Web MVC Controller RequestMapping Annotations.
@RequestMapping(method = RequestMethod.GET, value = "/index", produces = MediaType.APPLICATION_XML_VALUE)
@ResponseBody
- public LinkIndex index() {
+ public LinkIndex index(@RequestParam(value = "scheme", required = false, defaultValue = "http") final String scheme) {
//logger.warning(String.format("Returning Link Index for Context Path (%1$s).",
// ServletUriComponentsBuilder.fromCurrentContextPath().build().toString()));
return new LinkIndex()
// Cluster Commands
- .add(new Link(CliStrings.STATUS_SHARED_CONFIG, toUri("/services/cluster-config")))
+ .add(new Link(CliStrings.STATUS_SHARED_CONFIG, toUri("/services/cluster-config",
+ scheme)))
// Member Commands
- .add(new Link(CliStrings.LIST_MEMBER, toUri("/members")))
- .add(new Link(CliStrings.DESCRIBE_MEMBER, toUri("/members/{name}")))
+ .add(new Link(CliStrings.LIST_MEMBER, toUri("/members", scheme)))
+ .add(new Link(CliStrings.DESCRIBE_MEMBER, toUri("/members/{name}", scheme)))
// Region Commands
- .add(new Link(CliStrings.LIST_REGION, toUri("/regions")))
- .add(new Link(CliStrings.DESCRIBE_REGION, toUri("/regions/{name}")))
- .add(new Link(CliStrings.ALTER_REGION, toUri("/regions/{name}"), HttpMethod.PUT))
- .add(new Link(CliStrings.CREATE_REGION, toUri("/regions"), HttpMethod.POST))
- .add(new Link(CliStrings.DESTROY_REGION, toUri("/regions/{name}"), HttpMethod.DELETE))
+ .add(new Link(CliStrings.LIST_REGION, toUri("/regions", scheme)))
+ .add(new Link(CliStrings.DESCRIBE_REGION, toUri("/regions/{name}", scheme)))
+ .add(new Link(CliStrings.ALTER_REGION, toUri("/regions/{name}", scheme), HttpMethod.PUT))
+ .add(new Link(CliStrings.CREATE_REGION, toUri("/regions", scheme), HttpMethod.POST))
+ .add(new Link(CliStrings.DESTROY_REGION, toUri("/regions/{name}", scheme), HttpMethod.DELETE))
// Index Commands
- .add(new Link(CliStrings.LIST_INDEX, toUri("/indexes")))
- .add(new Link(CliStrings.CLEAR_DEFINED_INDEXES, toUri("/indexes?op=clear-defined"), HttpMethod.DELETE))
- .add(new Link(CliStrings.CREATE_INDEX, toUri("/indexes"), HttpMethod.POST))
- .add(new Link(CliStrings.CREATE_DEFINED_INDEXES, toUri("/indexes?op=create-defined"), HttpMethod.POST))
- .add(new Link(CliStrings.DEFINE_INDEX, toUri("/indexes?op=define"), HttpMethod.POST))
- .add(new Link(CliStrings.DESTROY_INDEX, toUri("/indexes"), HttpMethod.DELETE))
- .add(new Link(CliStrings.DESTROY_INDEX, toUri("/indexes/{name}"), HttpMethod.DELETE))
+ .add(new Link(CliStrings.LIST_INDEX, toUri("/indexes", scheme)))
+ .add(new Link(CliStrings.CLEAR_DEFINED_INDEXES, toUri("/indexes?op=clear-defined",
+ scheme), HttpMethod.DELETE))
+ .add(new Link(CliStrings.CREATE_INDEX, toUri("/indexes", scheme), HttpMethod.POST))
+ .add(new Link(CliStrings.CREATE_DEFINED_INDEXES, toUri("/indexes?op=create-defined",
+ scheme), HttpMethod.POST))
+ .add(new Link(CliStrings.DEFINE_INDEX, toUri("/indexes?op=define", scheme), HttpMethod.POST))
+ .add(new Link(CliStrings.DESTROY_INDEX, toUri("/indexes", scheme), HttpMethod.DELETE))
+ .add(new Link(CliStrings.DESTROY_INDEX, toUri("/indexes/{name}", scheme), HttpMethod.DELETE))
// Data Commands
- .add(new Link(CliStrings.GET, toUri("/regions/{region}/data"), HttpMethod.GET))
- .add(new Link(CliStrings.PUT, toUri("/regions/{region}/data"), HttpMethod.PUT))
- .add(new Link(CliStrings.REMOVE, toUri("/regions/{region}/data"), HttpMethod.DELETE))
- .add(new Link(CliStrings.EXPORT_DATA, toUri("/members/{member}/regions/{region}/data"), HttpMethod.GET))
- .add(new Link(CliStrings.IMPORT_DATA, toUri("/members/{member}/regions/{region}/data"), HttpMethod.POST))
- .add(new Link(CliStrings.LOCATE_ENTRY, toUri("/regions/{region}/data/location"), HttpMethod.GET))
- .add(new Link(CliStrings.QUERY, toUri("/regions/data/query"), HttpMethod.GET))
- .add(new Link(CliStrings.REBALANCE, toUri("/regions/data?op=rebalance"), HttpMethod.POST))
+ .add(new Link(CliStrings.GET, toUri("/regions/{region}/data", scheme), HttpMethod.GET))
+ .add(new Link(CliStrings.PUT, toUri("/regions/{region}/data", scheme), HttpMethod.PUT))
+ .add(new Link(CliStrings.REMOVE, toUri("/regions/{region}/data", scheme), HttpMethod.DELETE))
+ .add(new Link(CliStrings.EXPORT_DATA, toUri("/members/{member}/regions/{region}/data", scheme), HttpMethod.GET))
+ .add(new Link(CliStrings.IMPORT_DATA, toUri("/members/{member}/regions/{region}/data", scheme), HttpMethod.POST))
+ .add(new Link(CliStrings.LOCATE_ENTRY, toUri("/regions/{region}/data/location", scheme), HttpMethod.GET))
+ .add(new Link(CliStrings.QUERY, toUri("/regions/data/query", scheme), HttpMethod.GET))
+ .add(new Link(CliStrings.REBALANCE, toUri("/regions/data?op=rebalance", scheme), HttpMethod.POST))
// Function Commands
- .add(new Link(CliStrings.LIST_FUNCTION, toUri("/functions")))
- .add(new Link(CliStrings.DESTROY_FUNCTION, toUri("/functions/{id}"), HttpMethod.DELETE))
- .add(new Link(CliStrings.EXECUTE_FUNCTION, toUri("/functions/{id}"), HttpMethod.POST))
+ .add(new Link(CliStrings.LIST_FUNCTION, toUri("/functions", scheme)))
+ .add(new Link(CliStrings.DESTROY_FUNCTION, toUri("/functions/{id}", scheme), HttpMethod.DELETE))
+ .add(new Link(CliStrings.EXECUTE_FUNCTION, toUri("/functions/{id}", scheme), HttpMethod.POST))
// Client Commands
- .add(new Link(CliStrings.LIST_CLIENTS, toUri("/clients")))
- .add(new Link(CliStrings.DESCRIBE_CLIENT, toUri("/clients/{clientID}")))
+ .add(new Link(CliStrings.LIST_CLIENTS, toUri("/clients", scheme)))
+ .add(new Link(CliStrings.DESCRIBE_CLIENT, toUri("/clients/{clientID}", scheme)))
// Config Commands
- .add(new Link(CliStrings.ALTER_RUNTIME_CONFIG, toUri("/config"), HttpMethod.POST))
- .add(new Link(CliStrings.DESCRIBE_CONFIG, toUri("/members/{member}/config")))
- .add(new Link(CliStrings.EXPORT_CONFIG, toUri("/config")))
- .add(new Link(CliStrings.EXPORT_SHARED_CONFIG, toUri("/config/cluster")))
- .add(new Link(CliStrings.IMPORT_SHARED_CONFIG, toUri("/config/cluster"), HttpMethod.POST))
+ .add(new Link(CliStrings.ALTER_RUNTIME_CONFIG, toUri("/config", scheme), HttpMethod.POST))
+ .add(new Link(CliStrings.DESCRIBE_CONFIG, toUri("/members/{member}/config", scheme)))
+ .add(new Link(CliStrings.EXPORT_CONFIG, toUri("/config", scheme)))
+ .add(new Link(CliStrings.EXPORT_SHARED_CONFIG, toUri("/config/cluster", scheme)))
+ .add(new Link(CliStrings.IMPORT_SHARED_CONFIG, toUri("/config/cluster", scheme), HttpMethod.POST))
// Deploy Commands
- .add(new Link(CliStrings.LIST_DEPLOYED, toUri("/deployed")))
- .add(new Link(CliStrings.DEPLOY, toUri("/deployed"), HttpMethod.POST))
- .add(new Link(CliStrings.UNDEPLOY, toUri("/deployed"), HttpMethod.DELETE))
+ .add(new Link(CliStrings.LIST_DEPLOYED, toUri("/deployed", scheme)))
+ .add(new Link(CliStrings.DEPLOY, toUri("/deployed", scheme), HttpMethod.POST))
+ .add(new Link(CliStrings.UNDEPLOY, toUri("/deployed", scheme), HttpMethod.DELETE))
// Disk Store Commands
- .add(new Link(CliStrings.LIST_DISK_STORE, toUri("/diskstores")))
- .add(new Link(CliStrings.BACKUP_DISK_STORE, toUri("/diskstores?op=backup"), HttpMethod.POST))
- .add(new Link(CliStrings.COMPACT_DISK_STORE, toUri("/diskstores/{name}?op=compact"), HttpMethod.POST))
- .add(new Link(CliStrings.CREATE_DISK_STORE, toUri("/diskstores"), HttpMethod.POST))
- .add(new Link(CliStrings.DESCRIBE_DISK_STORE, toUri("/diskstores/{name}")))
- .add(new Link(CliStrings.DESTROY_DISK_STORE, toUri("/diskstores/{name}"), HttpMethod.DELETE))
- .add(new Link(CliStrings.REVOKE_MISSING_DISK_STORE, toUri("/diskstores/{id}?op=revoke"), HttpMethod.POST))
- .add(new Link(CliStrings.SHOW_MISSING_DISK_STORE, toUri("/diskstores/missing")))
+ .add(new Link(CliStrings.LIST_DISK_STORE, toUri("/diskstores", scheme)))
+ .add(new Link(CliStrings.BACKUP_DISK_STORE, toUri("/diskstores?op=backup", scheme), HttpMethod.POST))
+ .add(new Link(CliStrings.COMPACT_DISK_STORE, toUri("/diskstores/{name}?op=compact",
+ scheme), HttpMethod.POST))
+ .add(new Link(CliStrings.CREATE_DISK_STORE, toUri("/diskstores", scheme), HttpMethod.POST))
+ .add(new Link(CliStrings.DESCRIBE_DISK_STORE, toUri("/diskstores/{name}", scheme)))
+ .add(new Link(CliStrings.DESTROY_DISK_STORE, toUri("/diskstores/{name}", scheme), HttpMethod.DELETE))
+ .add(new Link(CliStrings.REVOKE_MISSING_DISK_STORE, toUri("/diskstores/{id}?op=revoke", scheme), HttpMethod.POST))
+ .add(new Link(CliStrings.SHOW_MISSING_DISK_STORE, toUri("/diskstores/missing", scheme)))
// Durable Client Commands
- .add(new Link(CliStrings.LIST_DURABLE_CQS, toUri("/durable-clients/{durable-client-id}/cqs")))
- .add(new Link(CliStrings.COUNT_DURABLE_CQ_EVENTS, toUri("/durable-clients/{durable-client-id}/cqs/events")))
- .add(new Link(CliStrings.COUNT_DURABLE_CQ_EVENTS, toUri("/durable-clients/{durable-client-id}/cqs/{durable-cq-name}/events")))
- .add(new Link(CliStrings.CLOSE_DURABLE_CLIENTS, toUri("/durable-clients/{durable-client-id}?op=close"), HttpMethod.POST))
- .add(new Link(CliStrings.CLOSE_DURABLE_CQS, toUri("/durable-clients/{durable-client-id}/cqs/{durable-cq-name}?op=close"), HttpMethod.POST))
+ .add(new Link(CliStrings.LIST_DURABLE_CQS, toUri("/durable-clients/{durable-client-id}/cqs", scheme)))
+ .add(new Link(CliStrings.COUNT_DURABLE_CQ_EVENTS, toUri("/durable-clients/{durable-client-id}/cqs/events", scheme)))
+ .add(new Link(CliStrings.COUNT_DURABLE_CQ_EVENTS, toUri("/durable-clients/{durable-client-id}/cqs/{durable-cq-name}/events", scheme)))
+ .add(new Link(CliStrings.CLOSE_DURABLE_CLIENTS, toUri("/durable-clients/{durable-client-id}?op=close", scheme), HttpMethod.POST))
+ .add(new Link(CliStrings.CLOSE_DURABLE_CQS, toUri("/durable-clients/{durable-client-id}/cqs/{durable-cq-name}?op=close", scheme), HttpMethod.POST))
// Launcher Lifecycle Commands
- .add(new Link(CliStrings.STATUS_LOCATOR, toUri("/members/{name}/locator")))
- .add(new Link(CliStrings.STATUS_SERVER, toUri("/members/{name}/server")))
+ .add(new Link(CliStrings.STATUS_LOCATOR, toUri("/members/{name}/locator", scheme)))
+ .add(new Link(CliStrings.STATUS_SERVER, toUri("/members/{name}/server", scheme)))
// Miscellaneous Commands
- .add(new Link(CliStrings.CHANGE_LOGLEVEL, toUri("/groups/{groups}/loglevel"), HttpMethod.POST))
- .add(new Link(CliStrings.CHANGE_LOGLEVEL, toUri("/members/{members}/loglevel"), HttpMethod.POST))
- .add(new Link(CliStrings.CHANGE_LOGLEVEL, toUri("/members/{members}/groups/{groups}/loglevel"), HttpMethod.POST))
- .add(new Link(CliStrings.EXPORT_LOGS, toUri("/logs")))
- .add(new Link(CliStrings.EXPORT_STACKTRACE, toUri("/stacktraces")))
- .add(new Link(CliStrings.GC, toUri("/gc"), HttpMethod.POST))
- .add(new Link(CliStrings.GC, toUri("/members/{member}/gc"), HttpMethod.POST))
- .add(new Link(CliStrings.NETSTAT, toUri("/netstat")))
- .add(new Link(CliStrings.SHOW_DEADLOCK, toUri("/deadlocks")))
- .add(new Link(CliStrings.SHOW_LOG, toUri("/members/{member}/log")))
- .add(new Link(CliStrings.SHOW_METRICS, toUri("/metrics")))
- .add(new Link(CliStrings.SHUTDOWN, toUri("/shutdown"), HttpMethod.POST)) // verb!
+ .add(new Link(CliStrings.CHANGE_LOGLEVEL, toUri("/groups/{groups}/loglevel", scheme), HttpMethod.POST))
+ .add(new Link(CliStrings.CHANGE_LOGLEVEL, toUri("/members/{members}/loglevel", scheme), HttpMethod.POST))
+ .add(new Link(CliStrings.CHANGE_LOGLEVEL, toUri("/members/{members}/groups/{groups}/loglevel", scheme), HttpMethod.POST))
+ .add(new Link(CliStrings.EXPORT_LOGS, toUri("/logs", scheme)))
+ .add(new Link(CliStrings.EXPORT_STACKTRACE, toUri("/stacktraces", scheme)))
+ .add(new Link(CliStrings.GC, toUri("/gc", scheme), HttpMethod.POST))
+ .add(new Link(CliStrings.GC, toUri("/members/{member}/gc", scheme), HttpMethod.POST))
+ .add(new Link(CliStrings.NETSTAT, toUri("/netstat", scheme)))
+ .add(new Link(CliStrings.SHOW_DEADLOCK, toUri("/deadlocks", scheme)))
+ .add(new Link(CliStrings.SHOW_LOG, toUri("/members/{member}/log", scheme)))
+ .add(new Link(CliStrings.SHOW_METRICS, toUri("/metrics", scheme)))
+ .add(new Link(CliStrings.SHUTDOWN, toUri("/shutdown", scheme), HttpMethod.POST)) // verb!
// Queue Commands
- .add(new Link(CliStrings.CREATE_ASYNC_EVENT_QUEUE, toUri("/async-event-queues"), HttpMethod.POST))
- .add(new Link(CliStrings.LIST_ASYNC_EVENT_QUEUES, toUri("/async-event-queues")))
+ .add(new Link(CliStrings.CREATE_ASYNC_EVENT_QUEUE, toUri("/async-event-queues", scheme), HttpMethod.POST))
+ .add(new Link(CliStrings.LIST_ASYNC_EVENT_QUEUES, toUri("/async-event-queues", scheme)))
// PDX Commands
- .add(new Link(CliStrings.CONFIGURE_PDX, toUri("/pdx"), HttpMethod.POST))
+ .add(new Link(CliStrings.CONFIGURE_PDX, toUri("/pdx", scheme), HttpMethod.POST))
//.add(new Link(CliStrings.PDX_DELETE_FIELD, toUri("/pdx/type/field"), HttpMethod.DELETE))
- .add(new Link(CliStrings.PDX_RENAME, toUri("/pdx/type"), HttpMethod.POST))
+ .add(new Link(CliStrings.PDX_RENAME, toUri("/pdx/type", scheme), HttpMethod.POST))
// Shell Commands
- .add(new Link(MBEAN_ATTRIBUTE_LINK_RELATION, toUri("/mbean/attribute")))
- .add(new Link(MBEAN_OPERATION_LINK_RELATION, toUri("/mbean/operation"), HttpMethod.POST))
- .add(new Link(MBEAN_QUERY_LINK_RELATION, toUri("/mbean/query"), HttpMethod.POST))
- .add(new Link(PING_LINK_RELATION, toUri("/ping"), HttpMethod.GET))
- .add(new Link(CliStrings.VERSION, toUri("/version")))
+ .add(new Link(MBEAN_ATTRIBUTE_LINK_RELATION, toUri("/mbean/attribute", scheme)))
+ .add(new Link(MBEAN_OPERATION_LINK_RELATION, toUri("/mbean/operation", scheme), HttpMethod.POST))
+ .add(new Link(MBEAN_QUERY_LINK_RELATION, toUri("/mbean/query", scheme), HttpMethod.POST))
+ .add(new Link(PING_LINK_RELATION, toUri("/ping", scheme), HttpMethod.GET))
+ .add(new Link(CliStrings.VERSION, toUri("/version", scheme)))
// WAN Gateway Commands
- .add(new Link(CliStrings.LIST_GATEWAY, toUri("/gateways")))
- .add(new Link(CliStrings.CREATE_GATEWAYRECEIVER, toUri("/gateways/receivers"), HttpMethod.POST))
- .add(new Link(CliStrings.CREATE_GATEWAYSENDER, toUri("/gateways/senders"), HttpMethod.POST))
- .add(new Link(CliStrings.LOAD_BALANCE_GATEWAYSENDER, toUri("/gateways/senders/{id}?op=load-balance"), HttpMethod.POST))
- .add(new Link(CliStrings.PAUSE_GATEWAYSENDER, toUri("/gateways/senders/{id}?op=pause"), HttpMethod.POST))
- .add(new Link(CliStrings.RESUME_GATEWAYSENDER, toUri("/gateways/senders/{id}?op=resume"), HttpMethod.POST))
- .add(new Link(CliStrings.START_GATEWAYRECEIVER, toUri("/gateways/receivers?op=start"), HttpMethod.POST))
- .add(new Link(CliStrings.START_GATEWAYSENDER, toUri("/gateways/senders?op=start"), HttpMethod.POST))
- .add(new Link(CliStrings.STATUS_GATEWAYRECEIVER, toUri("/gateways/receivers")))
- .add(new Link(CliStrings.STATUS_GATEWAYSENDER, toUri("/gateways/senders/{id}")))
- .add(new Link(CliStrings.STOP_GATEWAYRECEIVER, toUri("/gateways/receivers?op=stop"), HttpMethod.POST))
- .add(new Link(CliStrings.STOP_GATEWAYSENDER, toUri("/gateways/senders/{id}?op=stop"), HttpMethod.POST))
- ;
+ .add(new Link(CliStrings.LIST_GATEWAY, toUri("/gateways", scheme)))
+ .add(new Link(CliStrings.CREATE_GATEWAYRECEIVER, toUri("/gateways/receivers", scheme), HttpMethod.POST))
+ .add(new Link(CliStrings.CREATE_GATEWAYSENDER, toUri("/gateways/senders", scheme), HttpMethod.POST))
+ .add(new Link(CliStrings.LOAD_BALANCE_GATEWAYSENDER, toUri("/gateways/senders/{id}?op=load-balance", scheme), HttpMethod.POST))
+ .add(new Link(CliStrings.PAUSE_GATEWAYSENDER, toUri("/gateways/senders/{id}?op=pause", scheme), HttpMethod.POST))
+ .add(new Link(CliStrings.RESUME_GATEWAYSENDER, toUri("/gateways/senders/{id}?op=resume", scheme), HttpMethod.POST))
+ .add(new Link(CliStrings.START_GATEWAYRECEIVER, toUri("/gateways/receivers?op=start", scheme), HttpMethod.POST))
+ .add(new Link(CliStrings.START_GATEWAYSENDER, toUri("/gateways/senders?op=start", scheme), HttpMethod.POST))
+ .add(new Link(CliStrings.STATUS_GATEWAYRECEIVER, toUri("/gateways/receivers", scheme)))
+ .add(new Link(CliStrings.STATUS_GATEWAYSENDER, toUri("/gateways/senders/{id}", scheme)))
+ .add(new Link(CliStrings.STOP_GATEWAYRECEIVER, toUri("/gateways/receivers?op=stop", scheme), HttpMethod.POST))
+ .add(new Link(CliStrings.STOP_GATEWAYSENDER, toUri("/gateways/senders/{id}?op=stop", scheme), HttpMethod.POST))
+ ;
}
@RequestMapping(method = { RequestMethod.GET, RequestMethod.HEAD }, value = "/ping")
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/562347af/gemfire-web/build.gradle
----------------------------------------------------------------------
diff --git a/gemfire-web/build.gradle b/gemfire-web/build.gradle
index a9c86ec..9ba0fa9 100755
--- a/gemfire-web/build.gradle
+++ b/gemfire-web/build.gradle
@@ -4,13 +4,15 @@ dependencies {
runtime 'org.springframework:spring-aspects:' + project.'springframework.version'
runtime 'org.springframework:spring-oxm:' + project.'springframework.version'
runtime 'commons-fileupload:commons-fileupload:' + project.'commons-fileupload.version'
+
+ testCompile 'org.springframework:spring-test:' + project.'springframework.version'
provided 'javax.servlet:javax.servlet-api:' + project.'javax.servlet-api.version'
// have to use output since we exclude the dependent classes from jar :(
provided project(path: ':gemfire-core', configuration: 'classesOutput')
- provided project(':gemfire-core')
+ testRuntime project(':gemfire-core')
provided project(path: ':gemfire-junit', configuration: 'testOutput')
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/562347af/gemfire-web/src/test/java/com/gemstone/gemfire/management/internal/web/controllers/ShellCommandsControllerJUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-web/src/test/java/com/gemstone/gemfire/management/internal/web/controllers/ShellCommandsControllerJUnitTest.java b/gemfire-web/src/test/java/com/gemstone/gemfire/management/internal/web/controllers/ShellCommandsControllerJUnitTest.java
index c02b3ee..07d1012 100644
--- a/gemfire-web/src/test/java/com/gemstone/gemfire/management/internal/web/controllers/ShellCommandsControllerJUnitTest.java
+++ b/gemfire-web/src/test/java/com/gemstone/gemfire/management/internal/web/controllers/ShellCommandsControllerJUnitTest.java
@@ -19,7 +19,6 @@ package com.gemstone.gemfire.management.internal.web.controllers;
import static org.junit.Assert.*;
import java.lang.reflect.Method;
-import java.net.URI;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashMap;
@@ -38,9 +37,15 @@ import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Test;
import org.junit.experimental.categories.Category;
+import org.springframework.mock.web.MockHttpServletRequest;
import org.springframework.shell.core.CommandMarker;
import org.springframework.shell.core.annotation.CliCommand;
import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.context.request.RequestAttributes;
+import org.springframework.web.context.request.RequestContextHolder;
+import org.springframework.web.context.request.ServletRequestAttributes;
+
+import javax.servlet.http.HttpServletRequest;
/**
* The ShellCommandsControllerJUnitTest class is a test suite of test cases testing the contract and functionality of the
@@ -59,11 +64,10 @@ public class ShellCommandsControllerJUnitTest {
@BeforeClass
public static void setupBeforeClass() {
- controller = new ShellCommandsController() {
- @Override protected URI toUri(final String path) {
- return URI.create(UriUtils.encode(path));
- }
- };
+ controller = new ShellCommandsController();
+ MockHttpServletRequest request = new MockHttpServletRequest();
+ request.setContextPath("gemfire");
+ RequestContextHolder.setRequestAttributes(new ServletRequestAttributes(request));
}
@AfterClass
@@ -99,6 +103,10 @@ public class ShellCommandsControllerJUnitTest {
}
protected List<String> getControllerWebServiceEndpoints() {
+ RequestAttributes requestAttrs = RequestContextHolder.getRequestAttributes();
+ HttpServletRequest servletRequest = ((ServletRequestAttributes) requestAttrs).getRequest();
+ String scheme = servletRequest.getScheme();
+
try {
Set<Class<?>> controllerClasses = ClasspathScanLoadHelper.loadAndGet(
"com.gemstone.gemfire.management.internal.web.controllers", AbstractCommandsController.class, true);
@@ -112,7 +120,7 @@ public class ShellCommandsControllerJUnitTest {
RequestMapping requestMappingAnnotation = method.getAnnotation(RequestMapping.class);
String webServiceEndpoint = String.format("%1$s %2$s", requestMappingAnnotation.method()[0],
- requestMappingAnnotation.value()[0]);
+ UriUtils.decode(controller.toUri(requestMappingAnnotation.value()[0], scheme).toString()));
String[] requestParameters = requestMappingAnnotation.params();
@@ -136,7 +144,7 @@ public class ShellCommandsControllerJUnitTest {
@Test
public void testUniqueIndex() {
- LinkIndex linkIndex = controller.index();
+ LinkIndex linkIndex = controller.index("https");
List<String> conflicts = new ArrayList<>();
Map<String, String> uriRelationMapping = new HashMap<>(linkIndex.size());
@@ -161,7 +169,7 @@ public class ShellCommandsControllerJUnitTest {
assertNotNull(commands);
assertFalse(commands.isEmpty());
- LinkIndex linkIndex = controller.index();
+ LinkIndex linkIndex = controller.index("https");
assertNotNull(linkIndex);
assertFalse(linkIndex.isEmpty());
@@ -190,7 +198,7 @@ public class ShellCommandsControllerJUnitTest {
assertNotNull(controllerWebServiceEndpoints);
assertFalse(controllerWebServiceEndpoints.isEmpty());
- LinkIndex linkIndex = controller.index();
+ LinkIndex linkIndex = controller.index("http");
assertNotNull(linkIndex);
assertFalse(linkIndex.isEmpty());
@@ -208,8 +216,25 @@ public class ShellCommandsControllerJUnitTest {
missingControllerWebServiceEndpoints.removeAll(controllerWebServiceEndpoints);
assertTrue(String.format(
- "The Management REST API Web Service Controllers in (%1$s) are missing the following REST API Web Service Endpoint(s): %2$s!",
+ "The Management REST API Web Service Controllers in (%1$s) are missing the following REST API Web Service Endpoint(s): %2$s!",
getClass().getPackage().getName(), missingControllerWebServiceEndpoints), missingControllerWebServiceEndpoints.isEmpty());
}
+ @Test
+ public void testIndexUrisHaveCorrectScheme() {
+ String versionCmd = "version";
+ List<String> controllerWebServiceEndpoints = getControllerWebServiceEndpoints();
+
+ assertNotNull(controllerWebServiceEndpoints);
+ assertFalse(controllerWebServiceEndpoints.isEmpty());
+
+ String testScheme = "xyz";
+ LinkIndex linkIndex = controller.index(testScheme);
+
+ assertNotNull(linkIndex);
+ assertFalse(linkIndex.isEmpty());
+
+ assertTrue(String.format("Link does not have correct scheme %1$s", linkIndex.find(versionCmd)),
+ testScheme.equals(linkIndex.find(versionCmd).getHref().getScheme()));
+ }
}
[7/7] incubator-geode git commit: Re-add property loading which was
missing
Posted by mb...@apache.org.
Re-add property loading which was missing
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/29ce1cac
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/29ce1cac
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/29ce1cac
Branch: refs/heads/feature/GEODE-227
Commit: 29ce1cac0b881ae28bef88c5eaaecbb774f9647b
Parents: a7c7e7f
Author: Mark Bretl <mb...@pivotal.io>
Authored: Thu Nov 5 14:08:36 2015 -0800
Committer: Mark Bretl <mb...@pivotal.io>
Committed: Thu Nov 5 14:49:11 2015 -0800
----------------------------------------------------------------------
build.gradle | 5 +++++
1 file changed, 5 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/29ce1cac/build.gradle
----------------------------------------------------------------------
diff --git a/build.gradle b/build.gradle
index 16995ef..04b2522 100755
--- a/build.gradle
+++ b/build.gradle
@@ -1,5 +1,10 @@
apply plugin: 'wrapper'
+// Load all properties in dependency-version.properties as project properties, so all projects can read them
+Properties dependencyVersions = new Properties()
+dependencyVersions.load(new FileInputStream("${project.projectDir}/gradle/dependency-versions.properties"))
+dependencyVersions.keys().each{ k -> project.ext[k] = dependencyVersions[k]}
+
allprojects {
version = versionNumber + '-' + releaseType
// We want to see all test results. This is equivalatent to setting --continue
[5/7] incubator-geode git commit: Update location of
dependency-version.properties file
Posted by mb...@apache.org.
Update location of dependency-version.properties file
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/bdcc3922
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/bdcc3922
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/bdcc3922
Branch: refs/heads/feature/GEODE-227
Commit: bdcc3922ab0df0f504c4d068f28c425be836d23a
Parents: 2ea5e39
Author: Mark Bretl <mb...@pivotal.io>
Authored: Mon Nov 2 11:09:35 2015 -0800
Committer: Mark Bretl <mb...@pivotal.io>
Committed: Thu Nov 5 14:48:14 2015 -0800
----------------------------------------------------------------------
build.gradle | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/bdcc3922/build.gradle
----------------------------------------------------------------------
diff --git a/build.gradle b/build.gradle
index 8fddbfe..e3b1033 100755
--- a/build.gradle
+++ b/build.gradle
@@ -3,7 +3,7 @@ apply plugin: 'wrapper'
// Load all properties in dependency-version.properties as project properties, so all projects can read them
Properties dependencyVersions = new Properties()
-dependencyVersions.load(new FileInputStream("../open/gradle/dependency-versions.properties"))
+dependencyVersions.load(new FileInputStream("${project.projectDir}/gradle/dependency-versions.properties"))
dependencyVersions.keys().each{ k -> project.ext[k] = dependencyVersions[k]}
allprojects {
[6/7] incubator-geode git commit: Clean up syntax and unused
properties
Posted by mb...@apache.org.
Clean up syntax and unused properties
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/a7c7e7fc
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/a7c7e7fc
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/a7c7e7fc
Branch: refs/heads/feature/GEODE-227
Commit: a7c7e7fc4d81a98fc1d34b8ff805adbd2b3ef212
Parents: bdcc392
Author: Mark Bretl <mb...@pivotal.io>
Authored: Mon Nov 2 11:29:39 2015 -0800
Committer: Mark Bretl <mb...@pivotal.io>
Committed: Thu Nov 5 14:48:14 2015 -0800
----------------------------------------------------------------------
build.gradle | 6 ------
gemfire-assembly/build.gradle | 2 +-
2 files changed, 1 insertion(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/a7c7e7fc/build.gradle
----------------------------------------------------------------------
diff --git a/build.gradle b/build.gradle
index e3b1033..16995ef 100755
--- a/build.gradle
+++ b/build.gradle
@@ -1,11 +1,5 @@
apply plugin: 'wrapper'
-
-// Load all properties in dependency-version.properties as project properties, so all projects can read them
-Properties dependencyVersions = new Properties()
-dependencyVersions.load(new FileInputStream("${project.projectDir}/gradle/dependency-versions.properties"))
-dependencyVersions.keys().each{ k -> project.ext[k] = dependencyVersions[k]}
-
allprojects {
version = versionNumber + '-' + releaseType
// We want to see all test results. This is equivalatent to setting --continue
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/a7c7e7fc/gemfire-assembly/build.gradle
----------------------------------------------------------------------
diff --git a/gemfire-assembly/build.gradle b/gemfire-assembly/build.gradle
index b511466..2fd8e96 100755
--- a/gemfire-assembly/build.gradle
+++ b/gemfire-assembly/build.gradle
@@ -3,7 +3,7 @@ buildscript {
mavenCentral()
}
dependencies {
- classpath group: 'org.hibernate.build.gradle', name: 'gradle-maven-publish-auth', version: property("gradle-maven-publish-auth.version")
+ classpath group: 'org.hibernate.build.gradle', name: 'gradle-maven-publish-auth', version: project.'gradle-maven-publish-auth.version'
}
}