Merge pull request #8 from apache/feature/codecleanup

NOJIRA code cleanup
apache · Jun 22, 2021 · dd880ff · dd880ff
2 parents b0fc3b4 + e6ae0f4
commit dd880ff
Show file tree

Hide file tree

Showing 58 changed files with 56 additions and 2,371 deletions.
diff --git a/juddi-client/src/main/java/org/apache/juddi/v3/client/UDDIConstants.java b/juddi-client/src/main/java/org/apache/juddi/v3/client/UDDIConstants.java
@@ -674,10 +674,12 @@ public interface UDDIConstants {
         /**
          * Java RMI based service registered to the Java Registry
          */
+        @Deprecated
         public static final String TRANSPORT_RMI = "uddi:uddi.org:transport:rmi";
         /**
          * A Java RMI based service registered to a JNDI Registry
          */
+        @Deprecated
         public static final String TRANSPORT_JNDI_RMI = "uddi:uddi.org:transport:jndi-rmi";
         /**
          * A Web service that uses the AMQP transport

diff --git a/juddi-client/src/main/java/org/apache/juddi/v3/client/transport/RMITransport.java b/juddi-client/src/main/java/org/apache/juddi/v3/client/transport/RMITransport.java
diff --git a/juddi-client/src/main/java/org/apache/juddi/v3/client/transport/Transport.java b/juddi-client/src/main/java/org/apache/juddi/v3/client/transport/Transport.java
@@ -28,8 +28,7 @@
  * This abstract class defined the basic model for accessing different transport mechanisms
  * using the same interfaces for UDDIv3.
  * @see JAXWSTransport
- * @see RMITransport
- * @see InVMTransport
+  * @see InVMTransport
  * 
  */
 public abstract class Transport {

diff --git a/juddi-client/src/test/resources/META-INF/subscription.xml b/juddi-client/src/test/resources/META-INF/subscription.xml
@@ -46,19 +46,7 @@
 				<subscriptionListenerUrl>org.apache.juddi.api.impl.UDDISubscriptionListenerImpl</subscriptionListenerUrl>
 				<juddiApiUrl>org.apache.juddi.api.impl.JUDDIApiImpl</juddiApiUrl>
 				-->
-				<!-- RMI Transport Settings 
-				<proxyTransport>org.apache.juddi.v3.client.transport.RMITransport</proxyTransport>
-				<custodyTransferUrl>/juddiv3/UDDICustodyTransferService</custodyTransferUrl>
-				<inquiryUrl>/juddiv3/UDDIInquiryService</inquiryUrl>
-		        <publishUrl>/juddiv3/UDDIPublicationService</publishUrl>
-		        <securityUrl>/juddiv3/UDDISecurityService</securityUrl>
-				<subscriptionUrl>/juddiv3/UDDISubscriptionService</subscriptionUrl>
-				<subscriptionListenerUrl>/juddiv3/UDDISubscriptionListenerService</subscriptionListenerUrl>
-				<juddiApiUrl>/juddiv3/JUDDIApiService</juddiApiUrl>
-				<javaNamingFactoryInitial>org.jnp.interfaces.NamingContextFactory</javaNamingFactoryInitial>
-				<javaNamingFactoryUrlPkgs>org.jboss.naming</javaNamingFactoryUrlPkgs>
-				<javaNamingProviderUrl>jnp://localhost:1099</javaNamingProviderUrl>
-				-->
+
 			</node>
 			<node>
 				<name>med</name>

diff --git a/juddi-client/src/test/resources/META-INF/uddi.xml b/juddi-client/src/test/resources/META-INF/uddi.xml
@@ -52,19 +52,7 @@
                 <subscriptionListenerUrl>org.apache.juddi.api.impl.UDDISubscriptionListenerImpl</subscriptionListenerUrl>
                 <juddiApiUrl>org.apache.juddi.api.impl.JUDDIApiImpl</juddiApiUrl>
                 -->
-                <!-- RMI Transport Settings 
-                <proxyTransport>org.apache.juddi.v3.client.transport.RMITransport</proxyTransport>
-                <custodyTransferUrl>/juddiv3/UDDICustodyTransferService</custodyTransferUrl>
-                <inquiryUrl>/juddiv3/UDDIInquiryService</inquiryUrl>
-        <publishUrl>/juddiv3/UDDIPublicationService</publishUrl>
-        <securityUrl>/juddiv3/UDDISecurityService</securityUrl>
-                <subscriptionUrl>/juddiv3/UDDISubscriptionService</subscriptionUrl>
-                <subscriptionListenerUrl>/juddiv3/UDDISubscriptionListenerService</subscriptionListenerUrl>
-                <juddiApiUrl>/juddiv3/JUDDIApiService</juddiApiUrl>
-                <javaNamingFactoryInitial>org.jnp.interfaces.NamingContextFactory</javaNamingFactoryInitial>
-                <javaNamingFactoryUrlPkgs>org.jboss.naming</javaNamingFactoryUrlPkgs>
-                <javaNamingProviderUrl>jnp://localhost:1099</javaNamingProviderUrl>
-                -->
+
             </node>
 
             <node isHomeJUDDI="false" >

diff --git a/juddi-core/src/main/java/org/apache/juddi/Registry.java b/juddi-core/src/main/java/org/apache/juddi/Registry.java
@@ -24,8 +24,6 @@
 import org.apache.juddi.config.AppConfig;
 import org.apache.juddi.config.Property;
 import org.apache.juddi.replication.ReplicationNotifier;
-import org.apache.juddi.rmi.JNDIRegistration;
-import org.apache.juddi.rmi.RMIRegistration;
 import org.apache.juddi.subscription.SubscriptionNotifier;
 
 public class Registry {
@@ -59,13 +57,6 @@ public synchronized static void stop() throws ConfigurationException {
                                 replicationNotifier.cancel();
                                 replicationNotifier = null;
                         }
-                        if (AppConfig.getConfiguration().getBoolean(Property.JUDDI_JNDI_REGISTRATION, false)) {
-                                try {
-                                        JNDIRegistration.getInstance().unregister();
-                                } catch (NamingException e) {
-                                        log.error("Unable to Register jUDDI services with JNDI. " + e.getMessage(), e);
-                                }
-                        }
                         registry = null;
                         log.info("jUDDI shutdown completed.");
                 }
@@ -85,24 +76,6 @@ public synchronized static void start() throws ConfigurationException {
                         if (AppConfig.getConfiguration().getBoolean(Property.JUDDI_SUBSCRIPTION_NOTIFICATION, true)) {
                                 subscriptionNotifier = new SubscriptionNotifier();
                         }
-                        if (AppConfig.getConfiguration().getBoolean(Property.JUDDI_JNDI_REGISTRATION, false)) {
-                                try {
-                                        int port = AppConfig.getConfiguration().getInteger(Property.JUDDI_RMI_PORT, 0);
-                                        JNDIRegistration.getInstance().register(port);
-                                } catch (NamingException e) {
-                                        log.error("Unable to Register jUDDI services with JNDI. " + e.getMessage(), e);
-                                }
-                        }
-                        if (AppConfig.getConfiguration().getBoolean(Property.JUDDI_RMI_REGISTRATION, false)) {
-                                try {
-                                        int rmiport = AppConfig.getConfiguration().getInteger(Property.JUDDI_RMI_REGISTRY_PORT, 1099);
-                                        int port = AppConfig.getConfiguration().getInteger(Property.JUDDI_RMI_PORT, 0);
-                                        RMIRegistration.getInstance(rmiport).register(port);
-                                } catch (Exception e) {
-                                        log.error("Unable to Register jUDDI services with RMI Registry. " + e.getMessage(), e);
-                                }
-                        }
-
                         log.info("jUDDI registry started successfully.");
                 }
         }

diff --git a/juddi-core/src/main/java/org/apache/juddi/config/Property.java b/juddi-core/src/main/java/org/apache/juddi/config/Property.java
@@ -168,9 +168,12 @@ public interface Property {
          * @since 3.2
          */
         public final static String JUDDI_NOTIFICATION_SENDAUTHTOKEN = "juddi.notification.sendAuthTokenWithResultList";
+        @Deprecated
         public final static String JUDDI_JNDI_REGISTRATION = "juddi.jndi.registration";
         public final static String JUDDI_RMI_PORT = "juddi.rmi.port";
+        @Deprecated
         public final static String JUDDI_RMI_REGISTRATION = "juddi.rmi.registration";
+        @Deprecated
         public final static String JUDDI_RMI_REGISTRY_PORT = "juddi.rmi.registry.port";
 
         public final static String JUDDI_EMAIL_PREFIX = "juddi.mail.smtp.prefix";