svn commit: r1843154 - in /tomcat/trunk: build.properties.default java/org/apache/catalina/tribes/membership/cloud/CloudMembershipProvider.java java/org/apache/catalina/tribes/membership/cloud/CloudMembershipService.java

[remm]

Author: remm
Date: Mon Oct  8 14:38:48 2018
New Revision: 1843154

URL: http://svn.apache.org/viewvc?rev=1843154&view=rev
Log:
Fix cut and paste issue, and two problems when renaming package.

Modified:
    tomcat/trunk/build.properties.default
    
tomcat/trunk/java/org/apache/catalina/tribes/membership/cloud/CloudMembershipProvider.java
    
tomcat/trunk/java/org/apache/catalina/tribes/membership/cloud/CloudMembershipService.java

Modified: tomcat/trunk/build.properties.default
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/build.properties.default?rev=1843154&r1=1843153&r2=1843154&view=diff
==============================================================================
--- tomcat/trunk/build.properties.default (original)
+++ tomcat/trunk/build.properties.default Mon Oct  8 14:38:48 2018
@@ -289,7 +289,7 @@ openjson.checksum.enabled=true
 openjson.checksum.algorithm=MD5|SHA-1
 
openjson.checksum.value=c7c4cb9266cacc0aab5dcbb59456720c|8dcccbcc8bbfa15162cd7ca77bcf2b9daa90e70a
 openjson.home=${base.path}/openjson-${openjson.version}
-openjson.jar=${easymock.home}/openjson-${openjson.version}.jar
+openjson.jar=${openjson.home}/openjson-${openjson.version}.jar
 
openjson.loc=${base-maven.loc}/com/github/openjson/openjson/${openjson.version}/openjson-${openjson.version}.jar
 
 # ----- bnd & bndlib, version 4.0.0 or later  -----

Modified: 
tomcat/trunk/java/org/apache/catalina/tribes/membership/cloud/CloudMembershipProvider.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/membership/cloud/CloudMembershipProvider.java?rev=1843154&r1=1843153&r2=1843154&view=diff
==============================================================================
--- 
tomcat/trunk/java/org/apache/catalina/tribes/membership/cloud/CloudMembershipProvider.java
 (original)
+++ 
tomcat/trunk/java/org/apache/catalina/tribes/membership/cloud/CloudMembershipProvider.java
 Mon Oct  8 14:38:48 2018
@@ -32,7 +32,6 @@ import java.util.Properties;
 import org.apache.catalina.tribes.ChannelListener;
 import org.apache.catalina.tribes.Heartbeat;
 import org.apache.catalina.tribes.Member;
-import org.apache.catalina.tribes.membership.Constants;
 import org.apache.catalina.tribes.membership.Membership;
 import org.apache.catalina.tribes.membership.MembershipProviderBase;
 import org.apache.catalina.tribes.util.StringManager;

Modified: 
tomcat/trunk/java/org/apache/catalina/tribes/membership/cloud/CloudMembershipService.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/membership/cloud/CloudMembershipService.java?rev=1843154&r1=1843153&r2=1843154&view=diff
==============================================================================
--- 
tomcat/trunk/java/org/apache/catalina/tribes/membership/cloud/CloudMembershipService.java
 (original)
+++ 
tomcat/trunk/java/org/apache/catalina/tribes/membership/cloud/CloudMembershipService.java
 Mon Oct  8 14:38:48 2018
@@ -41,7 +41,7 @@ public class CloudMembershipService exte
 
     public static final String MEMBERSHIP_PROVIDER_CLASS_NAME = 
"membershipProviderClassName";
     private static final String KUBE = "kubernetes";
-    private static final String KUBE_PROVIDER_CLASS = 
"org.apache.catalina.cloud.membership.KubernetesMembershipProvider";
+    private static final String KUBE_PROVIDER_CLASS = 
"org.apache.catalina.tribes.membership.cloud.KubernetesMembershipProvider";
 
     private MembershipProvider membershipProvider;
     private MemberImpl localMember;



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org