You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by to...@apache.org on 2015/08/03 22:30:52 UTC
[08/21] incubator-usergrid git commit: USERGRID-871: base64 issues
with Java 7, will fix
USERGRID-871: base64 issues with Java 7, will fix
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/f1326fd1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/f1326fd1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/f1326fd1
Branch: refs/heads/two-dot-o-dev
Commit: f1326fd17601096acc1cc38fb7534eba2dee81ba
Parents: c499e42
Author: Mike Dunker <md...@apigee.com>
Authored: Tue Jul 21 17:29:20 2015 -0700
Committer: Mike Dunker <md...@apigee.com>
Committed: Tue Jul 21 17:29:20 2015 -0700
----------------------------------------------------------------------
.../src/main/scala/org/apache/usergrid/settings/Settings.scala | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/f1326fd1/stack/loadtests/src/main/scala/org/apache/usergrid/settings/Settings.scala
----------------------------------------------------------------------
diff --git a/stack/loadtests/src/main/scala/org/apache/usergrid/settings/Settings.scala b/stack/loadtests/src/main/scala/org/apache/usergrid/settings/Settings.scala
index 75bed58..72b591f 100755
--- a/stack/loadtests/src/main/scala/org/apache/usergrid/settings/Settings.scala
+++ b/stack/loadtests/src/main/scala/org/apache/usergrid/settings/Settings.scala
@@ -17,7 +17,8 @@
package org.apache.usergrid.settings
import java.nio.charset.StandardCharsets
-import java.util.Base64
+//import java.util.Base64
+
import io.gatling.core.Predef._
import io.gatling.http.Predef._
@@ -51,7 +52,8 @@ object Settings {
val userSeed:Int = Integer.getInteger(ConfigProperties.UserSeed,1).toInt
val appUser = System.getProperty(ConfigProperties.AppUser)
val appUserPassword = System.getProperty(ConfigProperties.AppUserPassword)
- val appUserBase64 = Base64.getEncoder.encodeToString((appUser + ":" + appUserPassword).getBytes(StandardCharsets.UTF_8))
+ //val appUserBase64 = Base64.getEncoder.encodeToString((appUser + ":" + appUserPassword).getBytes(StandardCharsets.UTF_8))
+ val appUserBase64 = "BROKEN FOR NOW"
val numEntities:Int = Integer.getInteger(ConfigProperties.NumEntities, 5000).toInt
val numDevices:Int = Integer.getInteger(ConfigProperties.NumDevices, 4000).toInt