Author: peter_firmstone Date: Thu Dec 3 12:01:37 2015 New Revision: 1717738
URL: http://svn.apache.org/viewvc?rev=1717738&view=rev Log: Merge code changes in trunk revision 1520131. Note that note removal of author tags from source code has only been partially merged and we also need to check build.xml file for how to build src-extra. Added: river/jtsk/skunk/qa-refactor-namespace/trunk/src-extra/org/apache/river/extra/discovery/ (props changed) - copied from r1717028, river/jtsk/trunk/src-extra/org/apache/river/extra/discovery/ river/jtsk/skunk/qa-refactor-namespace/trunk/src-extra/org/apache/river/extra/helpers/ - copied from r1717028, river/jtsk/trunk/src-extra/org/apache/river/extra/helpers/ river/jtsk/skunk/qa-refactor-namespace/trunk/src-extra/org/apache/river/extra/selfhealing/ (props changed) - copied from r1717028, river/jtsk/trunk/src-extra/org/apache/river/extra/selfhealing/ Modified: river/jtsk/skunk/qa-refactor-namespace/trunk/src-extra/org/apache/river/extra/helpers/ConfigHelper.java Propchange: river/jtsk/skunk/qa-refactor-namespace/trunk/src-extra/org/apache/river/extra/discovery/ ------------------------------------------------------------------------------ --- svn:mergeinfo (added) +++ svn:mergeinfo Thu Dec 3 12:01:37 2015 @@ -0,0 +1,3 @@ +/incubator/river/jtsk/skunk/jcosters/src/org/apache/river/extra/discovery:765902-766476 +/river/jtsk/branches/2.2/src-extra/org/apache/river/extra/discovery:1520020 +/river/jtsk/trunk/src-extra/org/apache/river/extra/discovery:1396251-1407431,1415845-1717028 Modified: river/jtsk/skunk/qa-refactor-namespace/trunk/src-extra/org/apache/river/extra/helpers/ConfigHelper.java URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa-refactor-namespace/trunk/src-extra/org/apache/river/extra/helpers/ConfigHelper.java?rev=1717738&r1=1717028&r2=1717738&view=diff ============================================================================== --- river/jtsk/skunk/qa-refactor-namespace/trunk/src-extra/org/apache/river/extra/helpers/ConfigHelper.java (original) +++ river/jtsk/skunk/qa-refactor-namespace/trunk/src-extra/org/apache/river/extra/helpers/ConfigHelper.java Thu Dec 3 12:01:37 2015 @@ -18,7 +18,7 @@ package org.apache.river.extra.helpers; -import com.sun.jini.config.Component; +import org.apache.river.config.Component; import java.lang.reflect.Proxy; import java.net.URL; import java.rmi.Remote; Propchange: river/jtsk/skunk/qa-refactor-namespace/trunk/src-extra/org/apache/river/extra/selfhealing/ ------------------------------------------------------------------------------ --- svn:mergeinfo (added) +++ svn:mergeinfo Thu Dec 3 12:01:37 2015 @@ -0,0 +1,3 @@ +/incubator/river/jtsk/skunk/jcosters/src/org/apache/river/extra/selfhealing:765902-766476 +/river/jtsk/branches/2.2/src-extra/org/apache/river/extra/selfhealing:1520020 +/river/jtsk/trunk/src-extra/org/apache/river/extra/selfhealing:1396251-1407431,1415845-1717028
