Author: peter_firmstone
Date: Thu Jul 9 10:10:53 2020
New Revision: 1879695
URL: http://svn.apache.org/viewvc?rev=1879695&view=rev
Log:
RIVER-471
Moved classes between modules to break circular links and fixed dependencies in
pom files.
Added:
river/jtsk/modules/modularize/apache-river/phoenix-activation/phoenix/src/test/
river/jtsk/modules/modularize/apache-river/phoenix-activation/phoenix/src/test/java/
river/jtsk/modules/modularize/apache-river/river-discovery-providers/src/test/
river/jtsk/modules/modularize/apache-river/river-discovery-providers/src/test/java/
river/jtsk/modules/modularize/apache-river/river-pref-loader/src/test/
river/jtsk/modules/modularize/apache-river/river-pref-loader/src/test/java/
river/jtsk/modules/modularize/apache-river/river-start/src/test/
river/jtsk/modules/modularize/apache-river/river-start/src/test/java/
Modified:
river/jtsk/modules/modularize/apache-river/browser/ (props changed)
river/jtsk/modules/modularize/apache-river/dist/ (props changed)
river/jtsk/modules/modularize/apache-river/extra/ (props changed)
river/jtsk/modules/modularize/apache-river/phoenix-activation/phoenix/
(props changed)
river/jtsk/modules/modularize/apache-river/phoenix-activation/phoenix-common/
(props changed)
river/jtsk/modules/modularize/apache-river/phoenix-activation/phoenix-dl/
(props changed)
river/jtsk/modules/modularize/apache-river/phoenix-activation/phoenix-dl/pom.xml
river/jtsk/modules/modularize/apache-river/phoenix-activation/phoenix-group/
(props changed)
river/jtsk/modules/modularize/apache-river/phoenix-activation/phoenix-group/pom.xml
river/jtsk/modules/modularize/apache-river/phoenix-activation/phoenix/pom.xml
river/jtsk/modules/modularize/apache-river/phoenix-activation/phoenix/src/main/java/org/apache/river/phoenix/AbstractSystem.java
river/jtsk/modules/modularize/apache-river/phoenix-activation/phoenix/src/main/java/org/apache/river/phoenix/PhoenixStarter.java
river/jtsk/modules/modularize/apache-river/phoenix-activation/phoenix/src/main/java/org/apache/river/phoenix/SystemAccessExporter.java
river/jtsk/modules/modularize/apache-river/pom.xml
river/jtsk/modules/modularize/apache-river/river-activation/ (props
changed)
river/jtsk/modules/modularize/apache-river/river-collections/ (props
changed)
river/jtsk/modules/modularize/apache-river/river-destroy/ (props changed)
river/jtsk/modules/modularize/apache-river/river-destroy/src/main/java/org/apache/river/start/destroy/DestroySharedGroup.java
river/jtsk/modules/modularize/apache-river/river-discovery-providers/
(props changed)
river/jtsk/modules/modularize/apache-river/river-discovery-providers/src/main/java/org/apache/river/discovery/internal/EndpointBasedClient.java
river/jtsk/modules/modularize/apache-river/river-discovery-providers/src/main/java/org/apache/river/discovery/internal/EndpointBasedProvider.java
river/jtsk/modules/modularize/apache-river/river-discovery-providers/src/main/java/org/apache/river/discovery/internal/EndpointBasedServer.java
river/jtsk/modules/modularize/apache-river/river-discovery-providers/src/main/java/org/apache/river/discovery/internal/X500Client.java
river/jtsk/modules/modularize/apache-river/river-discovery-providers/src/main/java/org/apache/river/discovery/internal/X500Provider.java
river/jtsk/modules/modularize/apache-river/river-discovery-providers/src/main/java/org/apache/river/discovery/internal/X500Server.java
river/jtsk/modules/modularize/apache-river/river-discovery-providers/src/main/java/org/apache/river/discovery/kerberos/Client.java
river/jtsk/modules/modularize/apache-river/river-discovery-providers/src/main/java/org/apache/river/discovery/kerberos/Server.java
river/jtsk/modules/modularize/apache-river/river-discovery-providers/src/main/java/org/apache/river/discovery/plaintext/Client.java
river/jtsk/modules/modularize/apache-river/river-discovery-providers/src/main/java/org/apache/river/discovery/plaintext/Server.java
river/jtsk/modules/modularize/apache-river/river-discovery-providers/src/main/java/org/apache/river/discovery/ssl/Client.java
river/jtsk/modules/modularize/apache-river/river-discovery-providers/src/main/java/org/apache/river/discovery/ssl/Server.java
river/jtsk/modules/modularize/apache-river/river-dl/ (props changed)
river/jtsk/modules/modularize/apache-river/river-jeri/ (props changed)
river/jtsk/modules/modularize/apache-river/river-jeri/pom.xml
river/jtsk/modules/modularize/apache-river/river-jeri/src/main/java/net/jini/jeri/kerberos/KerberosEndpoint.java
river/jtsk/modules/modularize/apache-river/river-jeri/src/main/java/net/jini/jeri/ssl/SslEndpoint.java
river/jtsk/modules/modularize/apache-river/river-jeri/src/main/java/org/apache/river/jeri/internal/EndpointInternals.java
river/jtsk/modules/modularize/apache-river/river-jeri/src/main/java/org/apache/river/jeri/internal/EndpointInternalsPermission.java
river/jtsk/modules/modularize/apache-river/river-jeri/src/main/java/org/apache/river/jeri/internal/KerberosEndpointInternalsAccess.java
river/jtsk/modules/modularize/apache-river/river-jeri/src/main/java/org/apache/river/jeri/internal/SslEndpointInternalsAccess.java
river/jtsk/modules/modularize/apache-river/river-jrmp/ (props changed)
river/jtsk/modules/modularize/apache-river/river-lib/pom.xml
river/jtsk/modules/modularize/apache-river/river-platform/ (props
changed)
river/jtsk/modules/modularize/apache-river/river-platform/pom.xml
river/jtsk/modules/modularize/apache-river/river-platform/src/main/java/net/jini/core/discovery/LookupLocator.java
river/jtsk/modules/modularize/apache-river/river-platform/src/main/java/net/jini/discovery/AbstractLookupDiscovery.java
river/jtsk/modules/modularize/apache-river/river-platform/src/main/java/net/jini/discovery/AbstractLookupLocatorDiscovery.java
river/jtsk/modules/modularize/apache-river/river-platform/src/main/java/net/jini/discovery/ConstrainableLookupLocator.java
river/jtsk/modules/modularize/apache-river/river-platform/src/main/java/net/jini/discovery/RemoteDiscoveryEvent.java
river/jtsk/modules/modularize/apache-river/river-platform/src/main/java/net/jini/loader/ClassAnnotation.java
river/jtsk/modules/modularize/apache-river/river-platform/src/main/java/net/jini/loader/DownloadPermission.java
river/jtsk/modules/modularize/apache-river/river-platform/src/main/java/net/jini/security/proxytrust/ProxyTrustInvocationHandler.java
river/jtsk/modules/modularize/apache-river/river-platform/src/main/java/org/apache/river/config/KeyStores.java
river/jtsk/modules/modularize/apache-river/river-platform/src/main/java/org/apache/river/discovery/DiscoveryV1.java
river/jtsk/modules/modularize/apache-river/river-platform/src/main/java/org/apache/river/discovery/MultiIPDiscovery.java
river/jtsk/modules/modularize/apache-river/river-platform/src/main/java/org/apache/river/discovery/Plaintext.java
river/jtsk/modules/modularize/apache-river/river-platform/src/main/java/org/apache/river/thread/wakeup/RetryTask.java
river/jtsk/modules/modularize/apache-river/river-platform/src/main/java/org/apache/river/thread/wakeup/WakeupManager.java
river/jtsk/modules/modularize/apache-river/river-platform/src/test/java/org/apache/river/api/security/DefaultPolicyParserTest.java
river/jtsk/modules/modularize/apache-river/river-pref-loader/ (props
changed)
river/jtsk/modules/modularize/apache-river/river-pref-loader/pom.xml
river/jtsk/modules/modularize/apache-river/river-services/fiddler/fiddler-dl/
(props changed)
river/jtsk/modules/modularize/apache-river/river-services/fiddler/fiddler-dl/src/main/java/org/apache/river/fiddler/proxy/Fiddler.java
river/jtsk/modules/modularize/apache-river/river-services/fiddler/fiddler-service/
(props changed)
river/jtsk/modules/modularize/apache-river/river-services/group/group-dl/
(props changed)
river/jtsk/modules/modularize/apache-river/river-services/mahalo/mahalo-dl/
(props changed)
river/jtsk/modules/modularize/apache-river/river-services/mahalo/mahalo-dl/src/main/java/org/apache/river/mahalo/proxy/TxnManager.java
river/jtsk/modules/modularize/apache-river/river-services/mercury/mercury-dl/
(props changed)
river/jtsk/modules/modularize/apache-river/river-services/mercury/mercury-dl/src/main/java/org/apache/river/mercury/proxy/MailboxBackEnd.java
river/jtsk/modules/modularize/apache-river/river-services/mercury/mercury-service/
(props changed)
river/jtsk/modules/modularize/apache-river/river-services/norm/norm-dl/
(props changed)
river/jtsk/modules/modularize/apache-river/river-services/norm/norm-dl/src/main/java/org/apache/river/norm/proxy/NormServer.java
river/jtsk/modules/modularize/apache-river/river-services/norm/norm-service/
(props changed)
river/jtsk/modules/modularize/apache-river/river-services/outrigger/outrigger-dl/
(props changed)
river/jtsk/modules/modularize/apache-river/river-services/outrigger/outrigger-dl/src/main/java/org/apache/river/outrigger/proxy/OutriggerServer.java
river/jtsk/modules/modularize/apache-river/river-services/outrigger/outrigger-service/
(props changed)
river/jtsk/modules/modularize/apache-river/river-services/reggie/reggie-dl/
(props changed)
river/jtsk/modules/modularize/apache-river/river-services/reggie/reggie-dl/src/main/java/org/apache/river/reggie/proxy/Registrar.java
river/jtsk/modules/modularize/apache-river/river-start/ (props changed)
river/jtsk/modules/modularize/apache-river/river-start/src/main/java/org/apache/river/start/NonActivatableServiceDescriptor.java
river/jtsk/modules/modularize/apache-river/river-start/src/main/java/org/apache/river/start/ServiceStarter.java
river/jtsk/modules/modularize/apache-river/river-ui-factory/ (props
changed)
river/jtsk/modules/modularize/apache-river/river-url-integrity/ (props
changed)
river/jtsk/modules/modularize/apache-river/tools/checkconfigurationfile/
(props changed)
river/jtsk/modules/modularize/apache-river/tools/checkser/ (props
changed)
river/jtsk/modules/modularize/apache-river/tools/classdep/ (props
changed)
river/jtsk/modules/modularize/apache-river/tools/classserver/ (props
changed)
river/jtsk/modules/modularize/apache-river/tools/computedigest/ (props
changed)
river/jtsk/modules/modularize/apache-river/tools/envcheck/ (props
changed)
river/jtsk/modules/modularize/apache-river/tools/jarwrapper/ (props
changed)
river/jtsk/modules/modularize/apache-river/tools/pom.xml
river/jtsk/modules/modularize/apache-river/tools/preferredlistgen/
(props changed)
river/jtsk/modules/modularize/apache-river/tools/security-policy-debug/
(props changed)
Propchange: river/jtsk/modules/modularize/apache-river/browser/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Thu Jul 9 10:10:53 2020
@@ -0,0 +1 @@
+target
Propchange: river/jtsk/modules/modularize/apache-river/dist/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Thu Jul 9 10:10:53 2020
@@ -0,0 +1 @@
+target
Propchange: river/jtsk/modules/modularize/apache-river/extra/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Thu Jul 9 10:10:53 2020
@@ -0,0 +1 @@
+target
Propchange:
river/jtsk/modules/modularize/apache-river/phoenix-activation/phoenix/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Thu Jul 9 10:10:53 2020
@@ -0,0 +1 @@
+target
Propchange:
river/jtsk/modules/modularize/apache-river/phoenix-activation/phoenix-common/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Thu Jul 9 10:10:53 2020
@@ -0,0 +1 @@
+target
Propchange:
river/jtsk/modules/modularize/apache-river/phoenix-activation/phoenix-dl/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Thu Jul 9 10:10:53 2020
@@ -0,0 +1 @@
+target
Modified:
river/jtsk/modules/modularize/apache-river/phoenix-activation/phoenix-dl/pom.xml
URL:
http://svn.apache.org/viewvc/river/jtsk/modules/modularize/apache-river/phoenix-activation/phoenix-dl/pom.xml?rev=1879695&r1=1879694&r2=1879695&view=diff
==============================================================================
---
river/jtsk/modules/modularize/apache-river/phoenix-activation/phoenix-dl/pom.xml
(original)
+++
river/jtsk/modules/modularize/apache-river/phoenix-activation/phoenix-dl/pom.xml
Thu Jul 9 10:10:53 2020
@@ -37,7 +37,7 @@
</dependency>
<dependency>
<groupId>org.apache.river</groupId>
- <artifactId>river-lib-dl</artifactId>
+ <artifactId>river-dl</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
@@ -75,8 +75,8 @@
<artifactId>maven-compiler-plugin</artifactId>
<version>2.3.2</version>
<configuration>
- <source>1.5</source>
- <target>1.5</target>
+ <source>1.8</source>
+ <target>1.8</target>
<optimize>true</optimize>
<encoding>UTF-8</encoding>
<meminitial>128m</meminitial>
Propchange:
river/jtsk/modules/modularize/apache-river/phoenix-activation/phoenix-group/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Thu Jul 9 10:10:53 2020
@@ -0,0 +1 @@
+target
Modified:
river/jtsk/modules/modularize/apache-river/phoenix-activation/phoenix-group/pom.xml
URL:
http://svn.apache.org/viewvc/river/jtsk/modules/modularize/apache-river/phoenix-activation/phoenix-group/pom.xml?rev=1879695&r1=1879694&r2=1879695&view=diff
==============================================================================
---
river/jtsk/modules/modularize/apache-river/phoenix-activation/phoenix-group/pom.xml
(original)
+++
river/jtsk/modules/modularize/apache-river/phoenix-activation/phoenix-group/pom.xml
Thu Jul 9 10:10:53 2020
@@ -47,7 +47,7 @@
</dependency>
<dependency>
<groupId>org.apache.river</groupId>
- <artifactId>river-lib-dl</artifactId>
+ <artifactId>river-dl</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
Modified:
river/jtsk/modules/modularize/apache-river/phoenix-activation/phoenix/pom.xml
URL:
http://svn.apache.org/viewvc/river/jtsk/modules/modularize/apache-river/phoenix-activation/phoenix/pom.xml?rev=1879695&r1=1879694&r2=1879695&view=diff
==============================================================================
---
river/jtsk/modules/modularize/apache-river/phoenix-activation/phoenix/pom.xml
(original)
+++
river/jtsk/modules/modularize/apache-river/phoenix-activation/phoenix/pom.xml
Thu Jul 9 10:10:53 2020
@@ -69,8 +69,8 @@
<artifactId>maven-compiler-plugin</artifactId>
<version>2.3.2</version>
<configuration>
- <source>1.5</source>
- <target>1.5</target>
+ <source>1.8</source>
+ <target>1.8</target>
<optimize>true</optimize>
<encoding>UTF-8</encoding>
<meminitial>128m</meminitial>
Modified:
river/jtsk/modules/modularize/apache-river/phoenix-activation/phoenix/src/main/java/org/apache/river/phoenix/AbstractSystem.java
URL:
http://svn.apache.org/viewvc/river/jtsk/modules/modularize/apache-river/phoenix-activation/phoenix/src/main/java/org/apache/river/phoenix/AbstractSystem.java?rev=1879695&r1=1879694&r2=1879695&view=diff
==============================================================================
---
river/jtsk/modules/modularize/apache-river/phoenix-activation/phoenix/src/main/java/org/apache/river/phoenix/AbstractSystem.java
(original)
+++
river/jtsk/modules/modularize/apache-river/phoenix-activation/phoenix/src/main/java/org/apache/river/phoenix/AbstractSystem.java
Thu Jul 9 10:10:53 2020
@@ -19,6 +19,7 @@
package org.apache.river.phoenix;
import java.rmi.activation.ActivationSystem;
+import org.apache.river.activation.ActivationAdmin;
/**
* Abstract class for generating JRMP and IIOP stubs.
Modified:
river/jtsk/modules/modularize/apache-river/phoenix-activation/phoenix/src/main/java/org/apache/river/phoenix/PhoenixStarter.java
URL:
http://svn.apache.org/viewvc/river/jtsk/modules/modularize/apache-river/phoenix-activation/phoenix/src/main/java/org/apache/river/phoenix/PhoenixStarter.java?rev=1879695&r1=1879694&r2=1879695&view=diff
==============================================================================
---
river/jtsk/modules/modularize/apache-river/phoenix-activation/phoenix/src/main/java/org/apache/river/phoenix/PhoenixStarter.java
(original)
+++
river/jtsk/modules/modularize/apache-river/phoenix-activation/phoenix/src/main/java/org/apache/river/phoenix/PhoenixStarter.java
Thu Jul 9 10:10:53 2020
@@ -18,7 +18,7 @@
package org.apache.river.phoenix;
-import org.apache.river.start.LifeCycle;
+import org.apache.river.start.lifecycle.LifeCycle;
import org.apache.river.start.ServiceProxyAccessor;
/**
Modified:
river/jtsk/modules/modularize/apache-river/phoenix-activation/phoenix/src/main/java/org/apache/river/phoenix/SystemAccessExporter.java
URL:
http://svn.apache.org/viewvc/river/jtsk/modules/modularize/apache-river/phoenix-activation/phoenix/src/main/java/org/apache/river/phoenix/SystemAccessExporter.java?rev=1879695&r1=1879694&r2=1879695&view=diff
==============================================================================
---
river/jtsk/modules/modularize/apache-river/phoenix-activation/phoenix/src/main/java/org/apache/river/phoenix/SystemAccessExporter.java
(original)
+++
river/jtsk/modules/modularize/apache-river/phoenix-activation/phoenix/src/main/java/org/apache/river/phoenix/SystemAccessExporter.java
Thu Jul 9 10:10:53 2020
@@ -32,6 +32,7 @@ import java.rmi.activation.UnknownGroupE
import java.rmi.server.ExportException;
import java.util.Map;
import net.jini.export.Exporter;
+import org.apache.river.activation.ActivationAdmin;
/**
* Exporter that wraps an <code>ActivationSystem</code> instance so that it
Modified: river/jtsk/modules/modularize/apache-river/pom.xml
URL:
http://svn.apache.org/viewvc/river/jtsk/modules/modularize/apache-river/pom.xml?rev=1879695&r1=1879694&r2=1879695&view=diff
==============================================================================
--- river/jtsk/modules/modularize/apache-river/pom.xml (original)
+++ river/jtsk/modules/modularize/apache-river/pom.xml Thu Jul 9 10:10:53 2020
@@ -296,7 +296,7 @@
<module>river-activation</module>
<module>river-collections</module>
<module>river-destroy</module>
-<!-- <module>river-discovery-providers</module> -->
+ <module>river-discovery-providers</module>
<module>river-iiop</module>
<module>river-jeri</module>
<module>river-jrmp</module>
Propchange: river/jtsk/modules/modularize/apache-river/river-activation/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Thu Jul 9 10:10:53 2020
@@ -0,0 +1 @@
+target
Propchange: river/jtsk/modules/modularize/apache-river/river-collections/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Thu Jul 9 10:10:53 2020
@@ -0,0 +1 @@
+target
Propchange: river/jtsk/modules/modularize/apache-river/river-destroy/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Thu Jul 9 10:10:53 2020
@@ -0,0 +1 @@
+target
Modified:
river/jtsk/modules/modularize/apache-river/river-destroy/src/main/java/org/apache/river/start/destroy/DestroySharedGroup.java
URL:
http://svn.apache.org/viewvc/river/jtsk/modules/modularize/apache-river/river-destroy/src/main/java/org/apache/river/start/destroy/DestroySharedGroup.java?rev=1879695&r1=1879694&r2=1879695&view=diff
==============================================================================
---
river/jtsk/modules/modularize/apache-river/river-destroy/src/main/java/org/apache/river/start/destroy/DestroySharedGroup.java
(original)
+++
river/jtsk/modules/modularize/apache-river/river-destroy/src/main/java/org/apache/river/start/destroy/DestroySharedGroup.java
Thu Jul 9 10:10:53 2020
@@ -31,6 +31,7 @@ import java.rmi.activation.ActivationSys
import java.security.PrivilegedActionException;
import java.security.PrivilegedExceptionAction;
import java.util.Arrays;
+import java.util.MissingResourceException;
import java.util.logging.Level;
import java.util.logging.Logger;
@@ -160,9 +161,29 @@ import org.apache.river.start.ServiceDes
*/
public class DestroySharedGroup {
- /** Configure logger. */
- private static final Logger logger = ServiceStarter.logger;
-
+ /** Configure logger */
+ static final Logger logger;
+ static {
+ Logger lggr;
+ try {
+ lggr =
+ Logger.getLogger(
+ ServiceStarter.START_PACKAGE + ".service.starter",
+ ServiceStarter.START_PACKAGE + ".resources.service");
+ } catch (Exception e) {
+ lggr =
+ Logger.getLogger(ServiceStarter.START_PACKAGE +
".service.starter");
+ if(e instanceof MissingResourceException) {
+ lggr.info("Could not load logger's ResourceBundle: "
+ + e);
+ } else if (e instanceof IllegalArgumentException) {
+ lggr.info("Logger exists and uses another resource bundle: "
+ + e);
+ }
+ lggr.info("Defaulting to existing logger");
+ }
+ logger = lggr;
+ }
// Private constructor to prevent instantiation
private DestroySharedGroup() { }
Propchange:
river/jtsk/modules/modularize/apache-river/river-discovery-providers/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Thu Jul 9 10:10:53 2020
@@ -0,0 +1 @@
+target
Modified:
river/jtsk/modules/modularize/apache-river/river-discovery-providers/src/main/java/org/apache/river/discovery/internal/EndpointBasedClient.java
URL:
http://svn.apache.org/viewvc/river/jtsk/modules/modularize/apache-river/river-discovery-providers/src/main/java/org/apache/river/discovery/internal/EndpointBasedClient.java?rev=1879695&r1=1879694&r2=1879695&view=diff
==============================================================================
---
river/jtsk/modules/modularize/apache-river/river-discovery-providers/src/main/java/org/apache/river/discovery/internal/EndpointBasedClient.java
(original)
+++
river/jtsk/modules/modularize/apache-river/river-discovery-providers/src/main/java/org/apache/river/discovery/internal/EndpointBasedClient.java
Thu Jul 9 10:10:53 2020
@@ -41,6 +41,8 @@ import net.jini.jeri.OutboundRequestIter
import net.jini.jeri.connection.Connection;
import net.jini.jeri.connection.ConnectionEndpoint;
import net.jini.jeri.connection.OutboundRequestHandle;
+import org.apache.river.discovery.Plaintext;
+import org.apache.river.jeri.internal.EndpointInternals;
/**
* Provides an abstract endpoint-based UnicastDiscoveryClient implementation,
Modified:
river/jtsk/modules/modularize/apache-river/river-discovery-providers/src/main/java/org/apache/river/discovery/internal/EndpointBasedProvider.java
URL:
http://svn.apache.org/viewvc/river/jtsk/modules/modularize/apache-river/river-discovery-providers/src/main/java/org/apache/river/discovery/internal/EndpointBasedProvider.java?rev=1879695&r1=1879694&r2=1879695&view=diff
==============================================================================
---
river/jtsk/modules/modularize/apache-river/river-discovery-providers/src/main/java/org/apache/river/discovery/internal/EndpointBasedProvider.java
(original)
+++
river/jtsk/modules/modularize/apache-river/river-discovery-providers/src/main/java/org/apache/river/discovery/internal/EndpointBasedProvider.java
Thu Jul 9 10:10:53 2020
@@ -26,6 +26,7 @@ import net.jini.core.constraint.Integrit
import net.jini.core.constraint.InvocationConstraint;
import net.jini.core.constraint.InvocationConstraints;
import net.jini.io.UnsupportedConstraintException;
+import org.apache.river.jeri.internal.EndpointInternals;
/**
* Superclass for endpoint-based unicast discovery providers.
Modified:
river/jtsk/modules/modularize/apache-river/river-discovery-providers/src/main/java/org/apache/river/discovery/internal/EndpointBasedServer.java
URL:
http://svn.apache.org/viewvc/river/jtsk/modules/modularize/apache-river/river-discovery-providers/src/main/java/org/apache/river/discovery/internal/EndpointBasedServer.java?rev=1879695&r1=1879694&r2=1879695&view=diff
==============================================================================
---
river/jtsk/modules/modularize/apache-river/river-discovery-providers/src/main/java/org/apache/river/discovery/internal/EndpointBasedServer.java
(original)
+++
river/jtsk/modules/modularize/apache-river/river-discovery-providers/src/main/java/org/apache/river/discovery/internal/EndpointBasedServer.java
Thu Jul 9 10:10:53 2020
@@ -52,6 +52,8 @@ import net.jini.jeri.ServerEndpoint.List
import net.jini.jeri.ServerEndpoint.ListenHandle;
import net.jini.jeri.connection.InboundRequestHandle;
import net.jini.jeri.connection.ServerConnection;
+import org.apache.river.discovery.Plaintext;
+import org.apache.river.jeri.internal.EndpointInternals;
/**
* Provides an abstract server endpoint-based UnicastDiscoveryServer
Modified:
river/jtsk/modules/modularize/apache-river/river-discovery-providers/src/main/java/org/apache/river/discovery/internal/X500Client.java
URL:
http://svn.apache.org/viewvc/river/jtsk/modules/modularize/apache-river/river-discovery-providers/src/main/java/org/apache/river/discovery/internal/X500Client.java?rev=1879695&r1=1879694&r2=1879695&view=diff
==============================================================================
---
river/jtsk/modules/modularize/apache-river/river-discovery-providers/src/main/java/org/apache/river/discovery/internal/X500Client.java
(original)
+++
river/jtsk/modules/modularize/apache-river/river-discovery-providers/src/main/java/org/apache/river/discovery/internal/X500Client.java
Thu Jul 9 10:10:53 2020
@@ -32,6 +32,7 @@ import javax.security.auth.x500.X500Prin
import javax.security.auth.x500.X500PrivateCredential;
import net.jini.core.constraint.InvocationConstraints;
import net.jini.io.UnsupportedConstraintException;
+import org.apache.river.discovery.Plaintext;
/**
* Superclass for client-side providers for the net.jini.discovery.x500.*
Modified:
river/jtsk/modules/modularize/apache-river/river-discovery-providers/src/main/java/org/apache/river/discovery/internal/X500Provider.java
URL:
http://svn.apache.org/viewvc/river/jtsk/modules/modularize/apache-river/river-discovery-providers/src/main/java/org/apache/river/discovery/internal/X500Provider.java?rev=1879695&r1=1879694&r2=1879695&view=diff
==============================================================================
---
river/jtsk/modules/modularize/apache-river/river-discovery-providers/src/main/java/org/apache/river/discovery/internal/X500Provider.java
(original)
+++
river/jtsk/modules/modularize/apache-river/river-discovery-providers/src/main/java/org/apache/river/discovery/internal/X500Provider.java
Thu Jul 9 10:10:53 2020
@@ -68,6 +68,7 @@ import javax.security.auth.x500.X500Prin
import javax.security.auth.x500.X500PrivateCredential;
import net.jini.io.UnsupportedConstraintException;
import net.jini.security.AuthenticationPermission;
+import org.apache.river.discovery.Plaintext;
/**
* Superclass for providers for the net.jini.discovery.x500.* discovery
Modified:
river/jtsk/modules/modularize/apache-river/river-discovery-providers/src/main/java/org/apache/river/discovery/internal/X500Server.java
URL:
http://svn.apache.org/viewvc/river/jtsk/modules/modularize/apache-river/river-discovery-providers/src/main/java/org/apache/river/discovery/internal/X500Server.java?rev=1879695&r1=1879694&r2=1879695&view=diff
==============================================================================
---
river/jtsk/modules/modularize/apache-river/river-discovery-providers/src/main/java/org/apache/river/discovery/internal/X500Server.java
(original)
+++
river/jtsk/modules/modularize/apache-river/river-discovery-providers/src/main/java/org/apache/river/discovery/internal/X500Server.java
Thu Jul 9 10:10:53 2020
@@ -35,6 +35,7 @@ import javax.security.auth.x500.X500Prin
import javax.security.auth.x500.X500PrivateCredential;
import net.jini.core.constraint.InvocationConstraints;
import net.jini.io.UnsupportedConstraintException;
+import org.apache.river.discovery.Plaintext;
/**
* Superclass for server-side providers for the net.jini.discovery.x500.*
Modified:
river/jtsk/modules/modularize/apache-river/river-discovery-providers/src/main/java/org/apache/river/discovery/kerberos/Client.java
URL:
http://svn.apache.org/viewvc/river/jtsk/modules/modularize/apache-river/river-discovery-providers/src/main/java/org/apache/river/discovery/kerberos/Client.java?rev=1879695&r1=1879694&r2=1879695&view=diff
==============================================================================
---
river/jtsk/modules/modularize/apache-river/river-discovery-providers/src/main/java/org/apache/river/discovery/kerberos/Client.java
(original)
+++
river/jtsk/modules/modularize/apache-river/river-discovery-providers/src/main/java/org/apache/river/discovery/kerberos/Client.java
Thu Jul 9 10:10:53 2020
@@ -21,8 +21,8 @@ package org.apache.river.discovery.kerbe
import org.apache.river.discovery.UnicastDiscoveryClient;
import org.apache.river.discovery.UnicastResponse;
import org.apache.river.discovery.internal.EndpointBasedClient;
-import org.apache.river.discovery.internal.EndpointInternals;
-import org.apache.river.discovery.internal.KerberosEndpointInternalsAccess;
+import org.apache.river.jeri.internal.EndpointInternals;
+import org.apache.river.jeri.internal.KerberosEndpointInternalsAccess;
import java.io.IOException;
import java.net.Socket;
import java.nio.ByteBuffer;
Modified:
river/jtsk/modules/modularize/apache-river/river-discovery-providers/src/main/java/org/apache/river/discovery/kerberos/Server.java
URL:
http://svn.apache.org/viewvc/river/jtsk/modules/modularize/apache-river/river-discovery-providers/src/main/java/org/apache/river/discovery/kerberos/Server.java?rev=1879695&r1=1879694&r2=1879695&view=diff
==============================================================================
---
river/jtsk/modules/modularize/apache-river/river-discovery-providers/src/main/java/org/apache/river/discovery/kerberos/Server.java
(original)
+++
river/jtsk/modules/modularize/apache-river/river-discovery-providers/src/main/java/org/apache/river/discovery/kerberos/Server.java
Thu Jul 9 10:10:53 2020
@@ -22,8 +22,8 @@ import org.apache.river.discovery.Client
import org.apache.river.discovery.UnicastDiscoveryServer;
import org.apache.river.discovery.UnicastResponse;
import org.apache.river.discovery.internal.EndpointBasedServer;
-import org.apache.river.discovery.internal.EndpointInternals;
-import org.apache.river.discovery.internal.KerberosEndpointInternalsAccess;
+import org.apache.river.jeri.internal.EndpointInternals;
+import org.apache.river.jeri.internal.KerberosEndpointInternalsAccess;
import java.io.IOException;
import java.net.Socket;
import java.nio.ByteBuffer;
Modified:
river/jtsk/modules/modularize/apache-river/river-discovery-providers/src/main/java/org/apache/river/discovery/plaintext/Client.java
URL:
http://svn.apache.org/viewvc/river/jtsk/modules/modularize/apache-river/river-discovery-providers/src/main/java/org/apache/river/discovery/plaintext/Client.java?rev=1879695&r1=1879694&r2=1879695&view=diff
==============================================================================
---
river/jtsk/modules/modularize/apache-river/river-discovery-providers/src/main/java/org/apache/river/discovery/plaintext/Client.java
(original)
+++
river/jtsk/modules/modularize/apache-river/river-discovery-providers/src/main/java/org/apache/river/discovery/plaintext/Client.java
Thu Jul 9 10:10:53 2020
@@ -25,7 +25,7 @@ import org.apache.river.discovery.Multic
import org.apache.river.discovery.MulticastRequestEncoder;
import org.apache.river.discovery.UnicastDiscoveryClient;
import org.apache.river.discovery.UnicastResponse;
-import org.apache.river.discovery.internal.Plaintext;
+import org.apache.river.discovery.Plaintext;
import java.io.BufferedInputStream;
import java.io.IOException;
import java.net.Socket;
Modified:
river/jtsk/modules/modularize/apache-river/river-discovery-providers/src/main/java/org/apache/river/discovery/plaintext/Server.java
URL:
http://svn.apache.org/viewvc/river/jtsk/modules/modularize/apache-river/river-discovery-providers/src/main/java/org/apache/river/discovery/plaintext/Server.java?rev=1879695&r1=1879694&r2=1879695&view=diff
==============================================================================
---
river/jtsk/modules/modularize/apache-river/river-discovery-providers/src/main/java/org/apache/river/discovery/plaintext/Server.java
(original)
+++
river/jtsk/modules/modularize/apache-river/river-discovery-providers/src/main/java/org/apache/river/discovery/plaintext/Server.java
Thu Jul 9 10:10:53 2020
@@ -26,7 +26,7 @@ import org.apache.river.discovery.Multic
import org.apache.river.discovery.MulticastRequestDecoder;
import org.apache.river.discovery.UnicastDiscoveryServer;
import org.apache.river.discovery.UnicastResponse;
-import org.apache.river.discovery.internal.Plaintext;
+import org.apache.river.discovery.Plaintext;
import java.io.BufferedOutputStream;
import java.io.IOException;
import java.io.OutputStream;
Modified:
river/jtsk/modules/modularize/apache-river/river-discovery-providers/src/main/java/org/apache/river/discovery/ssl/Client.java
URL:
http://svn.apache.org/viewvc/river/jtsk/modules/modularize/apache-river/river-discovery-providers/src/main/java/org/apache/river/discovery/ssl/Client.java?rev=1879695&r1=1879694&r2=1879695&view=diff
==============================================================================
---
river/jtsk/modules/modularize/apache-river/river-discovery-providers/src/main/java/org/apache/river/discovery/ssl/Client.java
(original)
+++
river/jtsk/modules/modularize/apache-river/river-discovery-providers/src/main/java/org/apache/river/discovery/ssl/Client.java
Thu Jul 9 10:10:53 2020
@@ -21,8 +21,8 @@ package org.apache.river.discovery.ssl;
import org.apache.river.discovery.UnicastDiscoveryClient;
import org.apache.river.discovery.UnicastResponse;
import org.apache.river.discovery.internal.EndpointBasedClient;
-import org.apache.river.discovery.internal.EndpointInternals;
-import org.apache.river.discovery.internal.SslEndpointInternalsAccess;
+import org.apache.river.jeri.internal.EndpointInternals;
+import org.apache.river.jeri.internal.SslEndpointInternalsAccess;
import java.io.IOException;
import java.net.Socket;
import java.nio.ByteBuffer;
Modified:
river/jtsk/modules/modularize/apache-river/river-discovery-providers/src/main/java/org/apache/river/discovery/ssl/Server.java
URL:
http://svn.apache.org/viewvc/river/jtsk/modules/modularize/apache-river/river-discovery-providers/src/main/java/org/apache/river/discovery/ssl/Server.java?rev=1879695&r1=1879694&r2=1879695&view=diff
==============================================================================
---
river/jtsk/modules/modularize/apache-river/river-discovery-providers/src/main/java/org/apache/river/discovery/ssl/Server.java
(original)
+++
river/jtsk/modules/modularize/apache-river/river-discovery-providers/src/main/java/org/apache/river/discovery/ssl/Server.java
Thu Jul 9 10:10:53 2020
@@ -22,8 +22,8 @@ import org.apache.river.discovery.Client
import org.apache.river.discovery.UnicastDiscoveryServer;
import org.apache.river.discovery.UnicastResponse;
import org.apache.river.discovery.internal.EndpointBasedServer;
-import org.apache.river.discovery.internal.EndpointInternals;
-import org.apache.river.discovery.internal.SslEndpointInternalsAccess;
+import org.apache.river.jeri.internal.EndpointInternals;
+import org.apache.river.jeri.internal.SslEndpointInternalsAccess;
import java.io.IOException;
import java.net.Socket;
import java.nio.ByteBuffer;
Propchange: river/jtsk/modules/modularize/apache-river/river-dl/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Thu Jul 9 10:10:53 2020
@@ -0,0 +1 @@
+target
Propchange: river/jtsk/modules/modularize/apache-river/river-jeri/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Thu Jul 9 10:10:53 2020
@@ -0,0 +1 @@
+target
Modified: river/jtsk/modules/modularize/apache-river/river-jeri/pom.xml
URL:
http://svn.apache.org/viewvc/river/jtsk/modules/modularize/apache-river/river-jeri/pom.xml?rev=1879695&r1=1879694&r2=1879695&view=diff
==============================================================================
--- river/jtsk/modules/modularize/apache-river/river-jeri/pom.xml (original)
+++ river/jtsk/modules/modularize/apache-river/river-jeri/pom.xml Thu Jul 9
10:10:53 2020
@@ -43,19 +43,12 @@
<version>${project.version}</version>
</dependency>
- <!--
+
<dependency>
<groupId>org.apache.river</groupId>
<artifactId>river-platform</artifactId>
<version>${project.version}</version>
</dependency>
- -->
-
- <dependency>
- <groupId>org.apache.river</groupId>
- <artifactId>river-lib</artifactId>
- <version>${project.version}</version>
- </dependency>
<dependency>
<groupId>com.boundary</groupId>
Modified:
river/jtsk/modules/modularize/apache-river/river-jeri/src/main/java/net/jini/jeri/kerberos/KerberosEndpoint.java
URL:
http://svn.apache.org/viewvc/river/jtsk/modules/modularize/apache-river/river-jeri/src/main/java/net/jini/jeri/kerberos/KerberosEndpoint.java?rev=1879695&r1=1879694&r2=1879695&view=diff
==============================================================================
---
river/jtsk/modules/modularize/apache-river/river-jeri/src/main/java/net/jini/jeri/kerberos/KerberosEndpoint.java
(original)
+++
river/jtsk/modules/modularize/apache-river/river-jeri/src/main/java/net/jini/jeri/kerberos/KerberosEndpoint.java
Thu Jul 9 10:10:53 2020
@@ -18,8 +18,8 @@
package net.jini.jeri.kerberos;
import org.apache.river.action.GetIntegerAction;
-import org.apache.river.discovery.internal.EndpointInternals;
-import org.apache.river.discovery.internal.KerberosEndpointInternalsAccess;
+import org.apache.river.jeri.internal.EndpointInternals;
+import org.apache.river.jeri.internal.KerberosEndpointInternalsAccess;
import org.apache.river.jeri.internal.connection.BasicConnManagerFactory;
import org.apache.river.jeri.internal.connection.ConnManager;
import org.apache.river.jeri.internal.connection.ConnManagerFactory;
Modified:
river/jtsk/modules/modularize/apache-river/river-jeri/src/main/java/net/jini/jeri/ssl/SslEndpoint.java
URL:
http://svn.apache.org/viewvc/river/jtsk/modules/modularize/apache-river/river-jeri/src/main/java/net/jini/jeri/ssl/SslEndpoint.java?rev=1879695&r1=1879694&r2=1879695&view=diff
==============================================================================
---
river/jtsk/modules/modularize/apache-river/river-jeri/src/main/java/net/jini/jeri/ssl/SslEndpoint.java
(original)
+++
river/jtsk/modules/modularize/apache-river/river-jeri/src/main/java/net/jini/jeri/ssl/SslEndpoint.java
Thu Jul 9 10:10:53 2020
@@ -18,8 +18,8 @@
package net.jini.jeri.ssl;
-import org.apache.river.discovery.internal.EndpointInternals;
-import org.apache.river.discovery.internal.SslEndpointInternalsAccess;
+import org.apache.river.jeri.internal.EndpointInternals;
+import org.apache.river.jeri.internal.SslEndpointInternalsAccess;
import org.apache.river.jeri.internal.connection.ConnManagerFactory;
import org.apache.river.jeri.internal.connection.ServerConnManager;
import org.apache.river.logging.Levels;
Modified:
river/jtsk/modules/modularize/apache-river/river-jeri/src/main/java/org/apache/river/jeri/internal/EndpointInternals.java
URL:
http://svn.apache.org/viewvc/river/jtsk/modules/modularize/apache-river/river-jeri/src/main/java/org/apache/river/jeri/internal/EndpointInternals.java?rev=1879695&r1=1879694&r2=1879695&view=diff
==============================================================================
---
river/jtsk/modules/modularize/apache-river/river-jeri/src/main/java/org/apache/river/jeri/internal/EndpointInternals.java
(original)
+++
river/jtsk/modules/modularize/apache-river/river-jeri/src/main/java/org/apache/river/jeri/internal/EndpointInternals.java
Thu Jul 9 10:10:53 2020
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.apache.river.discovery.internal;
+package org.apache.river.jeri.internal;
import org.apache.river.jeri.internal.connection.ConnManagerFactory;
import org.apache.river.jeri.internal.connection.ServerConnManager;
Modified:
river/jtsk/modules/modularize/apache-river/river-jeri/src/main/java/org/apache/river/jeri/internal/EndpointInternalsPermission.java
URL:
http://svn.apache.org/viewvc/river/jtsk/modules/modularize/apache-river/river-jeri/src/main/java/org/apache/river/jeri/internal/EndpointInternalsPermission.java?rev=1879695&r1=1879694&r2=1879695&view=diff
==============================================================================
---
river/jtsk/modules/modularize/apache-river/river-jeri/src/main/java/org/apache/river/jeri/internal/EndpointInternalsPermission.java
(original)
+++
river/jtsk/modules/modularize/apache-river/river-jeri/src/main/java/org/apache/river/jeri/internal/EndpointInternalsPermission.java
Thu Jul 9 10:10:53 2020
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.apache.river.discovery.internal;
+package org.apache.river.jeri.internal;
import java.security.BasicPermission;
Modified:
river/jtsk/modules/modularize/apache-river/river-jeri/src/main/java/org/apache/river/jeri/internal/KerberosEndpointInternalsAccess.java
URL:
http://svn.apache.org/viewvc/river/jtsk/modules/modularize/apache-river/river-jeri/src/main/java/org/apache/river/jeri/internal/KerberosEndpointInternalsAccess.java?rev=1879695&r1=1879694&r2=1879695&view=diff
==============================================================================
---
river/jtsk/modules/modularize/apache-river/river-jeri/src/main/java/org/apache/river/jeri/internal/KerberosEndpointInternalsAccess.java
(original)
+++
river/jtsk/modules/modularize/apache-river/river-jeri/src/main/java/org/apache/river/jeri/internal/KerberosEndpointInternalsAccess.java
Thu Jul 9 10:10:53 2020
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.apache.river.discovery.internal;
+package org.apache.river.jeri.internal;
import net.jini.jeri.kerberos.KerberosEndpoint;
Modified:
river/jtsk/modules/modularize/apache-river/river-jeri/src/main/java/org/apache/river/jeri/internal/SslEndpointInternalsAccess.java
URL:
http://svn.apache.org/viewvc/river/jtsk/modules/modularize/apache-river/river-jeri/src/main/java/org/apache/river/jeri/internal/SslEndpointInternalsAccess.java?rev=1879695&r1=1879694&r2=1879695&view=diff
==============================================================================
---
river/jtsk/modules/modularize/apache-river/river-jeri/src/main/java/org/apache/river/jeri/internal/SslEndpointInternalsAccess.java
(original)
+++
river/jtsk/modules/modularize/apache-river/river-jeri/src/main/java/org/apache/river/jeri/internal/SslEndpointInternalsAccess.java
Thu Jul 9 10:10:53 2020
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.apache.river.discovery.internal;
+package org.apache.river.jeri.internal;
import net.jini.jeri.ssl.SslEndpoint;
Propchange: river/jtsk/modules/modularize/apache-river/river-jrmp/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Thu Jul 9 10:10:53 2020
@@ -0,0 +1 @@
+target
Modified: river/jtsk/modules/modularize/apache-river/river-lib/pom.xml
URL:
http://svn.apache.org/viewvc/river/jtsk/modules/modularize/apache-river/river-lib/pom.xml?rev=1879695&r1=1879694&r2=1879695&view=diff
==============================================================================
--- river/jtsk/modules/modularize/apache-river/river-lib/pom.xml (original)
+++ river/jtsk/modules/modularize/apache-river/river-lib/pom.xml Thu Jul 9
10:10:53 2020
@@ -39,6 +39,11 @@
<artifactId>river-logging</artifactId>
<version>${project.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.river</groupId>
+ <artifactId>river-dl</artifactId>
+ <version>${project.version}</version>
+ </dependency>
<dependency>
<groupId>org.apache.river</groupId>
Propchange: river/jtsk/modules/modularize/apache-river/river-platform/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Thu Jul 9 10:10:53 2020
@@ -0,0 +1 @@
+target
Modified: river/jtsk/modules/modularize/apache-river/river-platform/pom.xml
URL:
http://svn.apache.org/viewvc/river/jtsk/modules/modularize/apache-river/river-platform/pom.xml?rev=1879695&r1=1879694&r2=1879695&view=diff
==============================================================================
--- river/jtsk/modules/modularize/apache-river/river-platform/pom.xml (original)
+++ river/jtsk/modules/modularize/apache-river/river-platform/pom.xml Thu Jul
9 10:10:53 2020
@@ -36,12 +36,6 @@
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>river-lib</artifactId>
- <version>${project.version}</version>
- </dependency>
-
- <dependency>
- <groupId>${project.groupId}</groupId>
<artifactId>river-collections</artifactId>
<version>${project.version}</version>
</dependency>
@@ -59,6 +53,12 @@
<artifactId>high-scale-lib</artifactId>
<version>${high.scale.lib.version}</version>
</dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>${junit.version}</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
Modified:
river/jtsk/modules/modularize/apache-river/river-platform/src/main/java/net/jini/core/discovery/LookupLocator.java
URL:
http://svn.apache.org/viewvc/river/jtsk/modules/modularize/apache-river/river-platform/src/main/java/net/jini/core/discovery/LookupLocator.java?rev=1879695&r1=1879694&r2=1879695&view=diff
==============================================================================
---
river/jtsk/modules/modularize/apache-river/river-platform/src/main/java/net/jini/core/discovery/LookupLocator.java
(original)
+++
river/jtsk/modules/modularize/apache-river/river-platform/src/main/java/net/jini/core/discovery/LookupLocator.java
Thu Jul 9 10:10:53 2020
@@ -39,7 +39,7 @@ import org.apache.river.discovery.Discov
import org.apache.river.discovery.DiscoveryProtocolVersion;
import org.apache.river.discovery.UnicastResponse;
import org.apache.river.discovery.UnicastSocketTimeout;
-import org.apache.river.discovery.internal.MultiIPDiscovery;
+import org.apache.river.discovery.MultiIPDiscovery;
/**
* LookupLocator supports unicast discovery, using either Discovery V1 or V2.
Modified:
river/jtsk/modules/modularize/apache-river/river-platform/src/main/java/net/jini/discovery/AbstractLookupDiscovery.java
URL:
http://svn.apache.org/viewvc/river/jtsk/modules/modularize/apache-river/river-platform/src/main/java/net/jini/discovery/AbstractLookupDiscovery.java?rev=1879695&r1=1879694&r2=1879695&view=diff
==============================================================================
---
river/jtsk/modules/modularize/apache-river/river-platform/src/main/java/net/jini/discovery/AbstractLookupDiscovery.java
(original)
+++
river/jtsk/modules/modularize/apache-river/river-platform/src/main/java/net/jini/discovery/AbstractLookupDiscovery.java
Thu Jul 9 10:10:53 2020
@@ -27,11 +27,11 @@ import org.apache.river.discovery.Encode
import org.apache.river.discovery.MulticastAnnouncement;
import org.apache.river.discovery.MulticastRequest;
import org.apache.river.discovery.UnicastResponse;
-import org.apache.river.discovery.internal.MultiIPDiscovery;
+import org.apache.river.discovery.MultiIPDiscovery;
import org.apache.river.logging.Levels;
import org.apache.river.logging.LogUtil;
-import org.apache.river.thread.WakeupManager;
-import org.apache.river.thread.WakeupManager.Ticket;
+import org.apache.river.thread.wakeup.WakeupManager;
+import org.apache.river.thread.wakeup.WakeupManager.Ticket;
import java.io.IOException;
import java.io.InterruptedIOException;
import java.net.DatagramPacket;
Modified:
river/jtsk/modules/modularize/apache-river/river-platform/src/main/java/net/jini/discovery/AbstractLookupLocatorDiscovery.java
URL:
http://svn.apache.org/viewvc/river/jtsk/modules/modularize/apache-river/river-platform/src/main/java/net/jini/discovery/AbstractLookupLocatorDiscovery.java?rev=1879695&r1=1879694&r2=1879695&view=diff
==============================================================================
---
river/jtsk/modules/modularize/apache-river/river-platform/src/main/java/net/jini/discovery/AbstractLookupLocatorDiscovery.java
(original)
+++
river/jtsk/modules/modularize/apache-river/river-platform/src/main/java/net/jini/discovery/AbstractLookupLocatorDiscovery.java
Thu Jul 9 10:10:53 2020
@@ -22,11 +22,11 @@ import org.apache.river.config.Config;
import org.apache.river.discovery.Discovery;
import org.apache.river.discovery.DiscoveryConstraints;
import org.apache.river.discovery.UnicastResponse;
-import org.apache.river.discovery.internal.MultiIPDiscovery;
+import org.apache.river.discovery.MultiIPDiscovery;
import org.apache.river.logging.Levels;
import org.apache.river.logging.LogUtil;
-import org.apache.river.thread.RetryTask;
-import org.apache.river.thread.WakeupManager;
+import org.apache.river.thread.wakeup.RetryTask;
+import org.apache.river.thread.wakeup.WakeupManager;
import java.io.IOException;
import java.lang.reflect.Method;
import java.net.InetAddress;
Modified:
river/jtsk/modules/modularize/apache-river/river-platform/src/main/java/net/jini/discovery/ConstrainableLookupLocator.java
URL:
http://svn.apache.org/viewvc/river/jtsk/modules/modularize/apache-river/river-platform/src/main/java/net/jini/discovery/ConstrainableLookupLocator.java?rev=1879695&r1=1879694&r2=1879695&view=diff
==============================================================================
---
river/jtsk/modules/modularize/apache-river/river-platform/src/main/java/net/jini/discovery/ConstrainableLookupLocator.java
(original)
+++
river/jtsk/modules/modularize/apache-river/river-platform/src/main/java/net/jini/discovery/ConstrainableLookupLocator.java
Thu Jul 9 10:10:53 2020
@@ -22,7 +22,7 @@ import org.apache.river.discovery.Discov
import org.apache.river.discovery.DiscoveryConstraints;
import org.apache.river.discovery.UnicastResponse;
import org.apache.river.discovery.UnicastSocketTimeout;
-import org.apache.river.discovery.internal.MultiIPDiscovery;
+import org.apache.river.discovery.MultiIPDiscovery;
import java.io.IOException;
import java.lang.reflect.Method;
import java.net.MalformedURLException;
Modified:
river/jtsk/modules/modularize/apache-river/river-platform/src/main/java/net/jini/discovery/RemoteDiscoveryEvent.java
URL:
http://svn.apache.org/viewvc/river/jtsk/modules/modularize/apache-river/river-platform/src/main/java/net/jini/discovery/RemoteDiscoveryEvent.java?rev=1879695&r1=1879694&r2=1879695&view=diff
==============================================================================
---
river/jtsk/modules/modularize/apache-river/river-platform/src/main/java/net/jini/discovery/RemoteDiscoveryEvent.java
(original)
+++
river/jtsk/modules/modularize/apache-river/river-platform/src/main/java/net/jini/discovery/RemoteDiscoveryEvent.java
Thu Jul 9 10:10:53 2020
@@ -19,19 +19,23 @@ package net.jini.discovery;
import java.io.InvalidObjectException;
import java.io.IOException;
+import java.io.ObjectInput;
import java.io.ObjectInputStream;
import java.rmi.MarshalledObject;
import java.util.ArrayList;
+import java.util.Collection;
import java.util.HashMap;
+import java.util.Iterator;
import java.util.Map;
import net.jini.core.event.RemoteEvent;
import net.jini.core.lookup.ServiceRegistrar;
import net.jini.io.MarshalledInstance;
-import org.apache.river.proxy.MarshalledWrapper;
import java.util.List;
import net.jini.core.lookup.ServiceID;
+import net.jini.io.ObjectStreamContext;
+import net.jini.io.context.IntegrityEnforcement;
/**
* Whenever the lookup discovery service discovers or discards a lookup
@@ -101,6 +105,41 @@ import net.jini.core.lookup.ServiceID;
public class RemoteDiscoveryEvent extends RemoteEvent {
private static final long serialVersionUID = -9171289945014585248L;
+
+ /**
+ * Returns the integrity protection setting of the given stream, determined
+ * as follows: if the stream implements {@link ObjectStreamContext} and has
+ * in its context collection an object of type
+ * {@link IntegrityEnforcement}, the
+ * {@link IntegrityEnforcement#integrityEnforced integrityEnforced} method
+ * of that object is called and the resulting value returned; otherwise,
+ * <code>false</code> is returned.
+ *
+ * @param stream the given stream
+ * @return integrity protection setting of the given stream
+ */
+ static boolean integrityEnforced(ObjectInput stream) {
+ if (stream instanceof ObjectStreamContext) {
+ return integrityEnforced(((ObjectStreamContext) stream));
+ }
+ return false;
+ }
+
+ /**
+ * Returns the integrity protection setting in the given
ObjectStreamContext.
+ * @param context
+ * @return
+ */
+ static boolean integrityEnforced(ObjectStreamContext context) {
+ Collection ctx = context.getObjectStreamContext();
+ for (Iterator i = ctx.iterator(); i.hasNext(); ) {
+ Object obj = i.next();
+ if (obj instanceof IntegrityEnforcement) {
+ return ((IntegrityEnforcement) obj).integrityEnforced();
+ }
+ }
+ return false;
+ }
/**
* Flag indicating whether the event is a discovery event or a discard
@@ -543,7 +582,7 @@ public class RemoteDiscoveryEvent extend
+"failure - source field is
null");
}//endif
/* Retrieve the value of the integrity flag */
- integrity = MarshalledWrapper.integrityEnforced(s);
+ integrity = integrityEnforced(s);
}//end readObject
}//end class RemoteDiscoveryEvent
Modified:
river/jtsk/modules/modularize/apache-river/river-platform/src/main/java/net/jini/loader/ClassAnnotation.java
URL:
http://svn.apache.org/viewvc/river/jtsk/modules/modularize/apache-river/river-platform/src/main/java/net/jini/loader/ClassAnnotation.java?rev=1879695&r1=1879694&r2=1879695&view=diff
==============================================================================
---
river/jtsk/modules/modularize/apache-river/river-platform/src/main/java/net/jini/loader/ClassAnnotation.java
(original)
+++
river/jtsk/modules/modularize/apache-river/river-platform/src/main/java/net/jini/loader/ClassAnnotation.java
Thu Jul 9 10:10:53 2020
@@ -19,7 +19,6 @@
package net.jini.loader;
import java.rmi.server.RMIClassLoader;
-import net.jini.loader.pref.PreferredClassProvider;
/**
* Provides a class annotation string for classes defined by a class
@@ -38,9 +37,9 @@ import net.jini.loader.pref.PreferredCla
* RMIClassLoader.getDefaultProviderInstance}) does <i>not</i> support
* this interface, and so when the default provider is used, this
* interface will be ignored by
- * <code>RMIClassLoader.getClassAnnotation</code>. {@link
- * PreferredClassProvider} and its subclasses do support this
- * interface.
+ * <code>RMIClassLoader.getClassAnnotation</code>. <code>
+ * net.jini.loader.pref.PreferredClassProvider </code>
+ * and its subclasses do support this interface.
*
* @author Sun Microsystems, Inc.
* @since 2.0
Modified:
river/jtsk/modules/modularize/apache-river/river-platform/src/main/java/net/jini/loader/DownloadPermission.java
URL:
http://svn.apache.org/viewvc/river/jtsk/modules/modularize/apache-river/river-platform/src/main/java/net/jini/loader/DownloadPermission.java?rev=1879695&r1=1879694&r2=1879695&view=diff
==============================================================================
---
river/jtsk/modules/modularize/apache-river/river-platform/src/main/java/net/jini/loader/DownloadPermission.java
(original)
+++
river/jtsk/modules/modularize/apache-river/river-platform/src/main/java/net/jini/loader/DownloadPermission.java
Thu Jul 9 10:10:53 2020
@@ -21,8 +21,6 @@ package net.jini.loader;
import java.rmi.server.RMIClassLoader;
import java.security.BasicPermission;
import java.security.CodeSource;
-import net.jini.loader.pref.PreferredClassProvider;
-import net.jini.loader.pref.RequireDlPermProvider;
/**
* Permission that must be granted to the {@link CodeSource} of a
@@ -50,9 +48,9 @@ import net.jini.loader.pref.RequireDlPer
* this permission, and so when the default provider is used,
* downloaded classes do not need to be granted
* <code>DownloadPermission</code> in order to be defined using
- * <code>RMIClassLoader</code>. {@link PreferredClassProvider} itself
+ * <code>RMIClassLoader</code>.
<code>net.jini.loader.pref.PreferredClassProvider</code> itself
* does not enforce this permission, but subclasses may configure it
- * to do so (see {@link RequireDlPermProvider}).
+ * to do so (see <code>net.jini.loader.pref.RequireDlPermProvider</code>).
*
* @author Sun Microsystems, Inc.
* @since 2.0
Modified:
river/jtsk/modules/modularize/apache-river/river-platform/src/main/java/net/jini/security/proxytrust/ProxyTrustInvocationHandler.java
URL:
http://svn.apache.org/viewvc/river/jtsk/modules/modularize/apache-river/river-platform/src/main/java/net/jini/security/proxytrust/ProxyTrustInvocationHandler.java?rev=1879695&r1=1879694&r2=1879695&view=diff
==============================================================================
---
river/jtsk/modules/modularize/apache-river/river-platform/src/main/java/net/jini/security/proxytrust/ProxyTrustInvocationHandler.java
(original)
+++
river/jtsk/modules/modularize/apache-river/river-platform/src/main/java/net/jini/security/proxytrust/ProxyTrustInvocationHandler.java
Thu Jul 9 10:10:53 2020
@@ -18,7 +18,6 @@
package net.jini.security.proxytrust;
-import org.apache.river.jeri.internal.runtime.Util;
import java.io.IOException;
import java.io.InvalidObjectException;
import java.io.ObjectInputStream;
@@ -54,6 +53,36 @@ public final class ProxyTrustInvocationH
private static final long serialVersionUID = -3270029468290295063L;
private static final Class[] consArgs =
new Class[]{InvocationHandler.class};
+
+ /**
+ * Returns true if proxy2 is a generated Proxy (proxy1 is assumed to
+ * be one) and the classes of both proxies implement the same ordered
+ * list of interfaces, and returns false otherwise.
+ */
+ public static boolean sameProxyClass(Object proxy1, Object proxy2) {
+ return (proxy1.getClass() == proxy2.getClass() ||
+ (Proxy.isProxyClass(proxy2.getClass()) &&
+ equalInterfaces(proxy1, proxy2)));
+ }
+
+ /**
+ * Returns true if the interfaces implemented by obj1's class
+ * are the same (and in the same order) as obj2's class.
+ */
+ public static boolean equalInterfaces(Object obj1, Object obj2) {
+ Class[] intf1 = obj1.getClass().getInterfaces();
+ Class[] intf2 = obj2.getClass().getInterfaces();
+ if (intf1.length != intf2.length) {
+ return false;
+ } else {
+ for (int i = 0; i < intf1.length; i++) {
+ if (intf1[i] != intf2[i]) {
+ return false;
+ }
+ }
+ return true;
+ }
+ }
/**
* The main proxy.
@@ -166,7 +195,7 @@ public final class ProxyTrustInvocationH
if (name.equals("equals")) {
Object obj = args[0];
if (proxy == obj ||
- (obj != null && Util.sameProxyClass(proxy, obj) &&
+ (obj != null && sameProxyClass(proxy, obj) &&
equals(Proxy.getInvocationHandler(obj))))
{
return Boolean.TRUE;
@@ -196,7 +225,7 @@ public final class ProxyTrustInvocationH
}
Object obj = args[0];
if (proxy == obj ||
- (obj != null && Util.sameProxyClass(proxy, obj) &&
+ (obj != null && sameProxyClass(proxy, obj) &&
checkTrustEquivalence(Proxy.getInvocationHandler(obj))))
{
return Boolean.TRUE;
Modified:
river/jtsk/modules/modularize/apache-river/river-platform/src/main/java/org/apache/river/config/KeyStores.java
URL:
http://svn.apache.org/viewvc/river/jtsk/modules/modularize/apache-river/river-platform/src/main/java/org/apache/river/config/KeyStores.java?rev=1879695&r1=1879694&r2=1879695&view=diff
==============================================================================
---
river/jtsk/modules/modularize/apache-river/river-platform/src/main/java/org/apache/river/config/KeyStores.java
(original)
+++
river/jtsk/modules/modularize/apache-river/river-platform/src/main/java/org/apache/river/config/KeyStores.java
Thu Jul 9 10:10:53 2020
@@ -32,7 +32,6 @@ import java.security.cert.X509Certificat
import javax.security.auth.x500.X500Principal;
import net.jini.config.Configuration;
import net.jini.config.ConfigurationFile;
-import net.jini.jeri.ssl.SslServerEndpoint;
/**
* Provides static methods for manipulating instances of {@link KeyStore}
@@ -56,7 +55,7 @@ public class KeyStores {
* which may then be used with {@link #getX500Principal getX500Principal}
* to refer to principals. <p>
*
- * For example, a deployer that was using {@link SslServerEndpoint} might
+ * For example, a deployer that was using an <code>
net.jini.jeri.ssl.SslServerEndpoint </code> might
* use the following in the source for a {@link ConfigurationFile} to
* supply principals for use in security constraints: <p>
*
@@ -119,7 +118,7 @@ public class KeyStores {
* to refer to principals from within the source for a configuration by
* specifying aliases when used with {@link #getKeyStore getKeystore}. <p>
*
- * For example, a deployer that was using {@link SslServerEndpoint} might
+ * For example, a deployer that was using an <code>
net.jini.jeri.ssl.SslServerEndpoint </code> might
* use the following in the source for a {@link ConfigurationFile} to
* supply principals for use in security constraints: <p>
*
Modified:
river/jtsk/modules/modularize/apache-river/river-platform/src/main/java/org/apache/river/discovery/DiscoveryV1.java
URL:
http://svn.apache.org/viewvc/river/jtsk/modules/modularize/apache-river/river-platform/src/main/java/org/apache/river/discovery/DiscoveryV1.java?rev=1879695&r1=1879694&r2=1879695&view=diff
==============================================================================
---
river/jtsk/modules/modularize/apache-river/river-platform/src/main/java/org/apache/river/discovery/DiscoveryV1.java
(original)
+++
river/jtsk/modules/modularize/apache-river/river-platform/src/main/java/org/apache/river/discovery/DiscoveryV1.java
Thu Jul 9 10:10:53 2020
@@ -18,7 +18,6 @@
package org.apache.river.discovery;
-import org.apache.river.discovery.internal.Plaintext;
import java.io.BufferedInputStream;
import java.io.BufferedOutputStream;
import java.io.DataOutputStream;
Modified:
river/jtsk/modules/modularize/apache-river/river-platform/src/main/java/org/apache/river/discovery/MultiIPDiscovery.java
URL:
http://svn.apache.org/viewvc/river/jtsk/modules/modularize/apache-river/river-platform/src/main/java/org/apache/river/discovery/MultiIPDiscovery.java?rev=1879695&r1=1879694&r2=1879695&view=diff
==============================================================================
---
river/jtsk/modules/modularize/apache-river/river-platform/src/main/java/org/apache/river/discovery/MultiIPDiscovery.java
(original)
+++
river/jtsk/modules/modularize/apache-river/river-platform/src/main/java/org/apache/river/discovery/MultiIPDiscovery.java
Thu Jul 9 10:10:53 2020
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.apache.river.discovery.internal;
+package org.apache.river.discovery;
import org.apache.river.discovery.Discovery;
import org.apache.river.discovery.DiscoveryConstraints;
Modified:
river/jtsk/modules/modularize/apache-river/river-platform/src/main/java/org/apache/river/discovery/Plaintext.java
URL:
http://svn.apache.org/viewvc/river/jtsk/modules/modularize/apache-river/river-platform/src/main/java/org/apache/river/discovery/Plaintext.java?rev=1879695&r1=1879694&r2=1879695&view=diff
==============================================================================
---
river/jtsk/modules/modularize/apache-river/river-platform/src/main/java/org/apache/river/discovery/Plaintext.java
(original)
+++
river/jtsk/modules/modularize/apache-river/river-platform/src/main/java/org/apache/river/discovery/Plaintext.java
Thu Jul 9 10:10:53 2020
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.apache.river.discovery.internal;
+package org.apache.river.discovery;
import org.apache.river.discovery.DatagramBufferFactory;
import org.apache.river.discovery.DiscoveryProtocolException;
Modified:
river/jtsk/modules/modularize/apache-river/river-platform/src/main/java/org/apache/river/thread/wakeup/RetryTask.java
URL:
http://svn.apache.org/viewvc/river/jtsk/modules/modularize/apache-river/river-platform/src/main/java/org/apache/river/thread/wakeup/RetryTask.java?rev=1879695&r1=1879694&r2=1879695&view=diff
==============================================================================
---
river/jtsk/modules/modularize/apache-river/river-platform/src/main/java/org/apache/river/thread/wakeup/RetryTask.java
(original)
+++
river/jtsk/modules/modularize/apache-river/river-platform/src/main/java/org/apache/river/thread/wakeup/RetryTask.java
Thu Jul 9 10:10:53 2020
@@ -15,7 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.river.thread;
+package org.apache.river.thread.wakeup;
import java.util.logging.Level;
import java.util.logging.Logger;
@@ -61,7 +61,7 @@ import org.apache.river.constants.TimeCo
* @see TaskManager
* @see WakeupManager
*/
-import org.apache.river.thread.WakeupManager.Ticket;
+import org.apache.river.thread.wakeup.WakeupManager.Ticket;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
@@ -72,7 +72,9 @@ import java.util.concurrent.RunnableFutu
import java.util.concurrent.TimeUnit;
import java.util.concurrent.TimeoutException;
import java.util.concurrent.atomic.AtomicInteger;
+import org.apache.river.thread.FutureObserver;
import org.apache.river.thread.FutureObserver.ObservableFuture;
+import org.apache.river.thread.TaskManager;
/**
*
Modified:
river/jtsk/modules/modularize/apache-river/river-platform/src/main/java/org/apache/river/thread/wakeup/WakeupManager.java
URL:
http://svn.apache.org/viewvc/river/jtsk/modules/modularize/apache-river/river-platform/src/main/java/org/apache/river/thread/wakeup/WakeupManager.java?rev=1879695&r1=1879694&r2=1879695&view=diff
==============================================================================
---
river/jtsk/modules/modularize/apache-river/river-platform/src/main/java/org/apache/river/thread/wakeup/WakeupManager.java
(original)
+++
river/jtsk/modules/modularize/apache-river/river-platform/src/main/java/org/apache/river/thread/wakeup/WakeupManager.java
Thu Jul 9 10:10:53 2020
@@ -15,7 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.river.thread;
+package org.apache.river.thread.wakeup;
import org.apache.river.config.Config;
Modified:
river/jtsk/modules/modularize/apache-river/river-platform/src/test/java/org/apache/river/api/security/DefaultPolicyParserTest.java
URL:
http://svn.apache.org/viewvc/river/jtsk/modules/modularize/apache-river/river-platform/src/test/java/org/apache/river/api/security/DefaultPolicyParserTest.java?rev=1879695&r1=1879694&r2=1879695&view=diff
==============================================================================
---
river/jtsk/modules/modularize/apache-river/river-platform/src/test/java/org/apache/river/api/security/DefaultPolicyParserTest.java
(original)
+++
river/jtsk/modules/modularize/apache-river/river-platform/src/test/java/org/apache/river/api/security/DefaultPolicyParserTest.java
Thu Jul 9 10:10:53 2020
@@ -22,7 +22,6 @@
package org.apache.river.api.security;
-import org.apache.river.start.SharedActivationPolicyPermission;
import java.net.URISyntaxException;
import java.security.KeyStore;
import java.util.Properties;
Propchange: river/jtsk/modules/modularize/apache-river/river-pref-loader/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Thu Jul 9 10:10:53 2020
@@ -0,0 +1 @@
+target
Modified: river/jtsk/modules/modularize/apache-river/river-pref-loader/pom.xml
URL:
http://svn.apache.org/viewvc/river/jtsk/modules/modularize/apache-river/river-pref-loader/pom.xml?rev=1879695&r1=1879694&r2=1879695&view=diff
==============================================================================
--- river/jtsk/modules/modularize/apache-river/river-pref-loader/pom.xml
(original)
+++ river/jtsk/modules/modularize/apache-river/river-pref-loader/pom.xml Thu
Jul 9 10:10:53 2020
@@ -43,13 +43,11 @@
<artifactId>river-logging</artifactId>
<version>${project.version}</version>
</dependency>
- <!--
<dependency>
<groupId>org.apache.river</groupId>
<artifactId>river-platform</artifactId>
<version>${project.version}</version>
</dependency>
- -->
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
Propchange:
river/jtsk/modules/modularize/apache-river/river-services/fiddler/fiddler-dl/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Thu Jul 9 10:10:53 2020
@@ -0,0 +1 @@
+target
Modified:
river/jtsk/modules/modularize/apache-river/river-services/fiddler/fiddler-dl/src/main/java/org/apache/river/fiddler/proxy/Fiddler.java
URL:
http://svn.apache.org/viewvc/river/jtsk/modules/modularize/apache-river/river-services/fiddler/fiddler-dl/src/main/java/org/apache/river/fiddler/proxy/Fiddler.java?rev=1879695&r1=1879694&r2=1879695&view=diff
==============================================================================
---
river/jtsk/modules/modularize/apache-river/river-services/fiddler/fiddler-dl/src/main/java/org/apache/river/fiddler/proxy/Fiddler.java
(original)
+++
river/jtsk/modules/modularize/apache-river/river-services/fiddler/fiddler-dl/src/main/java/org/apache/river/fiddler/proxy/Fiddler.java
Thu Jul 9 10:10:53 2020
@@ -20,7 +20,7 @@ package org.apache.river.fiddler.proxy;
import net.jini.discovery.LookupDiscoveryRegistration;
import org.apache.river.proxy.ThrowThis;
-import org.apache.river.start.moveMe.ServiceProxyAccessor;
+import org.apache.river.start.ServiceProxyAccessor;
import net.jini.id.Uuid;
import org.apache.river.admin.FiddlerAdmin;
import net.jini.admin.Administrable;
Propchange:
river/jtsk/modules/modularize/apache-river/river-services/fiddler/fiddler-service/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Thu Jul 9 10:10:53 2020
@@ -0,0 +1 @@
+target
Propchange:
river/jtsk/modules/modularize/apache-river/river-services/group/group-dl/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Thu Jul 9 10:10:53 2020
@@ -0,0 +1 @@
+target
Propchange:
river/jtsk/modules/modularize/apache-river/river-services/mahalo/mahalo-dl/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Thu Jul 9 10:10:53 2020
@@ -0,0 +1 @@
+target
Modified:
river/jtsk/modules/modularize/apache-river/river-services/mahalo/mahalo-dl/src/main/java/org/apache/river/mahalo/proxy/TxnManager.java
URL:
http://svn.apache.org/viewvc/river/jtsk/modules/modularize/apache-river/river-services/mahalo/mahalo-dl/src/main/java/org/apache/river/mahalo/proxy/TxnManager.java?rev=1879695&r1=1879694&r2=1879695&view=diff
==============================================================================
---
river/jtsk/modules/modularize/apache-river/river-services/mahalo/mahalo-dl/src/main/java/org/apache/river/mahalo/proxy/TxnManager.java
(original)
+++
river/jtsk/modules/modularize/apache-river/river-services/mahalo/mahalo-dl/src/main/java/org/apache/river/mahalo/proxy/TxnManager.java
Thu Jul 9 10:10:53 2020
@@ -21,7 +21,7 @@ import net.jini.admin.Administrable;
import net.jini.admin.JoinAdmin;
import org.apache.river.admin.DestroyAdmin;
import org.apache.river.landlord.Landlord;
-import org.apache.river.start.moveMe.ServiceProxyAccessor;
+import org.apache.river.start.ServiceProxyAccessor;
import java.rmi.Remote;
import java.rmi.RemoteException;
import net.jini.core.transaction.Transaction;
Propchange:
river/jtsk/modules/modularize/apache-river/river-services/mercury/mercury-dl/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Thu Jul 9 10:10:53 2020
@@ -0,0 +1 @@
+target
Modified:
river/jtsk/modules/modularize/apache-river/river-services/mercury/mercury-dl/src/main/java/org/apache/river/mercury/proxy/MailboxBackEnd.java
URL:
http://svn.apache.org/viewvc/river/jtsk/modules/modularize/apache-river/river-services/mercury/mercury-dl/src/main/java/org/apache/river/mercury/proxy/MailboxBackEnd.java?rev=1879695&r1=1879694&r2=1879695&view=diff
==============================================================================
---
river/jtsk/modules/modularize/apache-river/river-services/mercury/mercury-dl/src/main/java/org/apache/river/mercury/proxy/MailboxBackEnd.java
(original)
+++
river/jtsk/modules/modularize/apache-river/river-services/mercury/mercury-dl/src/main/java/org/apache/river/mercury/proxy/MailboxBackEnd.java
Thu Jul 9 10:10:53 2020
@@ -19,7 +19,7 @@ package org.apache.river.mercury.proxy;
import org.apache.river.landlord.Landlord;
import org.apache.river.proxy.ThrowThis;
-import org.apache.river.start.moveMe.ServiceProxyAccessor;
+import org.apache.river.start.ServiceProxyAccessor;
import java.rmi.RemoteException;
Propchange:
river/jtsk/modules/modularize/apache-river/river-services/mercury/mercury-service/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Thu Jul 9 10:10:53 2020
@@ -0,0 +1 @@
+target
Propchange:
river/jtsk/modules/modularize/apache-river/river-services/norm/norm-dl/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Thu Jul 9 10:10:53 2020
@@ -0,0 +1 @@
+target
Modified:
river/jtsk/modules/modularize/apache-river/river-services/norm/norm-dl/src/main/java/org/apache/river/norm/proxy/NormServer.java
URL:
http://svn.apache.org/viewvc/river/jtsk/modules/modularize/apache-river/river-services/norm/norm-dl/src/main/java/org/apache/river/norm/proxy/NormServer.java?rev=1879695&r1=1879694&r2=1879695&view=diff
==============================================================================
---
river/jtsk/modules/modularize/apache-river/river-services/norm/norm-dl/src/main/java/org/apache/river/norm/proxy/NormServer.java
(original)
+++
river/jtsk/modules/modularize/apache-river/river-services/norm/norm-dl/src/main/java/org/apache/river/norm/proxy/NormServer.java
Thu Jul 9 10:10:53 2020
@@ -33,7 +33,7 @@ import net.jini.lease.LeaseRenewalServic
import org.apache.river.admin.DestroyAdmin;
import org.apache.river.landlord.Landlord;
import org.apache.river.proxy.ThrowThis;
-import org.apache.river.start.moveMe.ServiceProxyAccessor;
+import org.apache.river.start.ServiceProxyAccessor;
/**
* This interface is the private wire protocol to that the various
Propchange:
river/jtsk/modules/modularize/apache-river/river-services/norm/norm-service/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Thu Jul 9 10:10:53 2020
@@ -0,0 +1 @@
+target
Propchange:
river/jtsk/modules/modularize/apache-river/river-services/outrigger/outrigger-dl/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Thu Jul 9 10:10:53 2020
@@ -0,0 +1 @@
+target
Modified:
river/jtsk/modules/modularize/apache-river/river-services/outrigger/outrigger-dl/src/main/java/org/apache/river/outrigger/proxy/OutriggerServer.java
URL:
http://svn.apache.org/viewvc/river/jtsk/modules/modularize/apache-river/river-services/outrigger/outrigger-dl/src/main/java/org/apache/river/outrigger/proxy/OutriggerServer.java?rev=1879695&r1=1879694&r2=1879695&view=diff
==============================================================================
---
river/jtsk/modules/modularize/apache-river/river-services/outrigger/outrigger-dl/src/main/java/org/apache/river/outrigger/proxy/OutriggerServer.java
(original)
+++
river/jtsk/modules/modularize/apache-river/river-services/outrigger/outrigger-dl/src/main/java/org/apache/river/outrigger/proxy/OutriggerServer.java
Thu Jul 9 10:10:53 2020
@@ -19,7 +19,7 @@ package org.apache.river.outrigger.proxy
import org.apache.river.landlord.Landlord;
-import org.apache.river.start.moveMe.ServiceProxyAccessor;
+import org.apache.river.start.ServiceProxyAccessor;
import java.rmi.MarshalledObject;
import java.rmi.NoSuchObjectException;
Propchange:
river/jtsk/modules/modularize/apache-river/river-services/outrigger/outrigger-service/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Thu Jul 9 10:10:53 2020
@@ -0,0 +1 @@
+target
Propchange:
river/jtsk/modules/modularize/apache-river/river-services/reggie/reggie-dl/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Thu Jul 9 10:10:53 2020
@@ -0,0 +1 @@
+target
Modified:
river/jtsk/modules/modularize/apache-river/river-services/reggie/reggie-dl/src/main/java/org/apache/river/reggie/proxy/Registrar.java
URL:
http://svn.apache.org/viewvc/river/jtsk/modules/modularize/apache-river/river-services/reggie/reggie-dl/src/main/java/org/apache/river/reggie/proxy/Registrar.java?rev=1879695&r1=1879694&r2=1879695&view=diff
==============================================================================
---
river/jtsk/modules/modularize/apache-river/river-services/reggie/reggie-dl/src/main/java/org/apache/river/reggie/proxy/Registrar.java
(original)
+++
river/jtsk/modules/modularize/apache-river/river-services/reggie/reggie-dl/src/main/java/org/apache/river/reggie/proxy/Registrar.java
Thu Jul 9 10:10:53 2020
@@ -19,7 +19,7 @@ package org.apache.river.reggie.proxy;
import org.apache.river.admin.DestroyAdmin;
import org.apache.river.proxy.MarshalledWrapper;
-import org.apache.river.start.moveMe.ServiceProxyAccessor;
+import org.apache.river.start.ServiceProxyAccessor;
import java.rmi.MarshalledObject;
import java.rmi.Remote;
import java.rmi.RemoteException;
Propchange: river/jtsk/modules/modularize/apache-river/river-start/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Thu Jul 9 10:10:53 2020
@@ -0,0 +1 @@
+target
Modified:
river/jtsk/modules/modularize/apache-river/river-start/src/main/java/org/apache/river/start/NonActivatableServiceDescriptor.java
URL:
http://svn.apache.org/viewvc/river/jtsk/modules/modularize/apache-river/river-start/src/main/java/org/apache/river/start/NonActivatableServiceDescriptor.java?rev=1879695&r1=1879694&r2=1879695&view=diff
==============================================================================
---
river/jtsk/modules/modularize/apache-river/river-start/src/main/java/org/apache/river/start/NonActivatableServiceDescriptor.java
(original)
+++
river/jtsk/modules/modularize/apache-river/river-start/src/main/java/org/apache/river/start/NonActivatableServiceDescriptor.java
Thu Jul 9 10:10:53 2020
@@ -46,6 +46,7 @@ import java.util.logging.Level;
import java.util.logging.Logger;
import net.jini.loader.ClassLoading;
import net.jini.loader.LoadClass;
+import org.apache.river.start.lifecycle.LifeCycle;
/**
* Class used to launch shared, non-activatable, in-process
Modified:
river/jtsk/modules/modularize/apache-river/river-start/src/main/java/org/apache/river/start/ServiceStarter.java
URL:
http://svn.apache.org/viewvc/river/jtsk/modules/modularize/apache-river/river-start/src/main/java/org/apache/river/start/ServiceStarter.java?rev=1879695&r1=1879694&r2=1879695&view=diff
==============================================================================
---
river/jtsk/modules/modularize/apache-river/river-start/src/main/java/org/apache/river/start/ServiceStarter.java
(original)
+++
river/jtsk/modules/modularize/apache-river/river-start/src/main/java/org/apache/river/start/ServiceStarter.java
Thu Jul 9 10:10:53 2020
@@ -134,29 +134,31 @@ import org.apache.river.api.security.Com
public class ServiceStarter {
/** Component name for service starter configuration entries */
- static final String START_PACKAGE = "org.apache.river.start";
+ public static final String START_PACKAGE = "org.apache.river.start";
/** Configure logger */
- static /*final*/ Logger logger = null;
+ static final Logger logger;
static {
+ Logger lggr;
try {
- logger =
+ lggr =
Logger.getLogger(
START_PACKAGE + ".service.starter",
START_PACKAGE + ".resources.service");
} catch (Exception e) {
- logger =
+ lggr =
Logger.getLogger(START_PACKAGE + ".service.starter");
if(e instanceof MissingResourceException) {
- logger.info("Could not load logger's ResourceBundle: "
+ lggr.info("Could not load logger's ResourceBundle: "
+ e);
} else if (e instanceof IllegalArgumentException) {
- logger.info("Logger exists and uses another resource bundle: "
+ lggr.info("Logger exists and uses another resource bundle: "
+ e);
}
- logger.info("Defaulting to existing logger");
+ lggr.info("Defaulting to existing logger");
}
+ logger = lggr;
}
/** Array of strong references to transient services */
@@ -302,7 +304,7 @@ public class ServiceStarter {
* Utility routine that sets a security manager if one isn't already
* present.
*/
- synchronized static void ensureSecurityManager() {
+ public synchronized static void ensureSecurityManager() {
if (System.getSecurityManager() == null) {
System.setSecurityManager(new CombinerSecurityManager());
}
@@ -322,7 +324,7 @@ public class ServiceStarter {
* system.
* @see net.jini.config.Configuration
*/
- static ActivationSystem getActivationSystem(
+ public static ActivationSystem getActivationSystem(
String host, int port, Configuration config)
throws ActivationException, ConfigurationException
{
Propchange: river/jtsk/modules/modularize/apache-river/river-ui-factory/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Thu Jul 9 10:10:53 2020
@@ -0,0 +1 @@
+target
Propchange: river/jtsk/modules/modularize/apache-river/river-url-integrity/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Thu Jul 9 10:10:53 2020
@@ -0,0 +1 @@
+target
Propchange:
river/jtsk/modules/modularize/apache-river/tools/checkconfigurationfile/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Thu Jul 9 10:10:53 2020
@@ -0,0 +1 @@
+target
Propchange: river/jtsk/modules/modularize/apache-river/tools/checkser/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Thu Jul 9 10:10:53 2020
@@ -0,0 +1 @@
+target
Propchange: river/jtsk/modules/modularize/apache-river/tools/classdep/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Thu Jul 9 10:10:53 2020
@@ -0,0 +1 @@
+target
Propchange: river/jtsk/modules/modularize/apache-river/tools/classserver/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Thu Jul 9 10:10:53 2020
@@ -0,0 +1 @@
+target
Propchange: river/jtsk/modules/modularize/apache-river/tools/computedigest/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Thu Jul 9 10:10:53 2020
@@ -0,0 +1 @@
+target
Propchange: river/jtsk/modules/modularize/apache-river/tools/envcheck/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Thu Jul 9 10:10:53 2020
@@ -0,0 +1 @@
+target
Propchange: river/jtsk/modules/modularize/apache-river/tools/jarwrapper/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Thu Jul 9 10:10:53 2020
@@ -0,0 +1 @@
+target
Modified: river/jtsk/modules/modularize/apache-river/tools/pom.xml
URL:
http://svn.apache.org/viewvc/river/jtsk/modules/modularize/apache-river/tools/pom.xml?rev=1879695&r1=1879694&r2=1879695&view=diff
==============================================================================
--- river/jtsk/modules/modularize/apache-river/tools/pom.xml (original)
+++ river/jtsk/modules/modularize/apache-river/tools/pom.xml Thu Jul 9
10:10:53 2020
@@ -36,7 +36,7 @@
<module>classdep</module>
<module>classserver</module>
<module>computedigest</module>
- <module>computehttpmdcodebase</module>
+ <!--<module>computehttpmdcodebase</module>-->
<module>envcheck</module>
<module>jarwrapper</module>
<module>preferredlistgen</module>
Propchange: river/jtsk/modules/modularize/apache-river/tools/preferredlistgen/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Thu Jul 9 10:10:53 2020
@@ -0,0 +1 @@
+target
Propchange:
river/jtsk/modules/modularize/apache-river/tools/security-policy-debug/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Thu Jul 9 10:10:53 2020
@@ -0,0 +1 @@
+target
