You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@juddi.apache.org by al...@apache.org on 2021/06/12 02:45:16 UTC
[juddi] branch feature/codecleanup created (now e6ae0f4)
This is an automated email from the ASF dual-hosted git repository.
alexoree pushed a change to branch feature/codecleanup
in repository https://gitbox.apache.org/repos/asf/juddi.git.
at e6ae0f4 NOJIRA code cleanup
This branch includes the following new commits:
new e6ae0f4 NOJIRA code cleanup
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@juddi.apache.org
For additional commands, e-mail: commits-help@juddi.apache.org
[juddi] 01/01: NOJIRA code cleanup
Posted by al...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
alexoree pushed a commit to branch feature/codecleanup
in repository https://gitbox.apache.org/repos/asf/juddi.git
commit e6ae0f4ce39e73ba29ab1c2926a41ac71e68574a
Author: Alex O'Ree <al...@apache.org>
AuthorDate: Fri Jun 11 22:45:15 2021 -0400
NOJIRA code cleanup
---
.../org/apache/juddi/v3/client/UDDIConstants.java | 2 +
.../juddi/v3/client/transport/RMITransport.java | 220 ---------------------
.../juddi/v3/client/transport/Transport.java | 3 +-
.../src/test/resources/META-INF/subscription.xml | 14 +-
juddi-client/src/test/resources/META-INF/uddi.xml | 14 +-
.../src/main/java/org/apache/juddi/Registry.java | 27 ---
.../java/org/apache/juddi/config/Property.java | 3 +
.../org/apache/juddi/rmi/JNDIRegistration.java | 154 ---------------
.../java/org/apache/juddi/rmi/JUDDIApiService.java | 196 ------------------
.../java/org/apache/juddi/rmi/RMIRegistration.java | 149 --------------
.../juddi/rmi/UDDICustodyTransferService.java | 66 -------
.../org/apache/juddi/rmi/UDDIInquiryService.java | 108 ----------
.../apache/juddi/rmi/UDDIPublicationService.java | 133 -------------
.../org/apache/juddi/rmi/UDDISecurityService.java | 53 -----
.../juddi/rmi/UDDISubscriptionListenerService.java | 49 -----
.../apache/juddi/rmi/UDDISubscriptionService.java | 71 -------
.../java/org/apache/juddi/rmi/package-info.java | 19 --
.../subscription/notify/JNDI_RMINotifier.java | 91 ---------
.../juddi/subscription/notify/RMINotifier.java | 63 ------
.../org/apache/juddi/validation/ValidateNode.java | 13 +-
.../resources/juddi_install_data/UDDI_tModels.xml | 25 +--
juddi-core/src/main/resources/messages.properties | 2 +-
...091_RMISubscriptionListenerIntegrationTest.java | 173 ----------------
.../org/apache/juddi/rmi/JNDIRegistrationTest.java | 58 ------
.../juddi/subscription/notify/NotifierTest.java | 32 +--
.../java/org/apache/juddi/ddl/generator/App.java | 4 +-
.../partition/SimpleCreateTmodelPartition.java | 2 +-
.../juddi/example/helloworld/HelloWorld.java | 2 +-
.../juddi/example/helloworld/HelloWorld.java | 2 +-
.../juddi/samples/BusinessServiceKeymismatch.java | 2 +-
.../apache/juddi/samples/FindBusinessBugHunt.java | 2 +-
.../apache/juddi/samples/JuddiAdminService.java | 4 +-
.../org/apache/juddi/samples/SimpleBrowse.java | 2 +-
.../service/version/ServiceVersioningExample.java | 2 +-
.../apache/juddi/example/browse/SimpleBrowse.java | 2 +-
.../example/publish/SimplePublishPortable.java | 2 +-
.../api/bridge/example/SimpleBrowseUDDIv2.java | 2 +-
.../juddi_install_data_node2/UDDI_tModels.xml | 27 +--
.../juddi_install_data_node3/UDDI_tModels.xml | 26 +--
pom.xml | 23 +--
qa/juddi-xlt/src/META-INF/uddi.xml | 14 +-
readme.txt | 8 +-
src/site/markdown/index.md | 2 +
src/site/markdown/releases.md | 2 +-
.../org/apache/juddi/v3/migration/tool/Export.java | 2 +-
.../org/apache/juddi/v3/migration/tool/Import.java | 2 +-
.../java/org/apache/juddi/v2/tck/TckPublisher.java | 5 +-
.../java/org/apache/juddi/v3/tck/TckPublisher.java | 4 +-
uddi-tck-base/src/main/resources/tck.properties | 2 -
.../subscriptionnotifier/listenerServiceRMI.xml | 43 ----
.../subscriptionnotifier/subscription1RMI.xml | 32 ---
.../subscriptionnotifier/subscription2RMI.xml | 32 ---
.../subscriptionnotifier/subscription3RMI.xml | 32 ---
.../main/java/org/apache/juddi/tckrunner/App.java | 2 -
uddi-tck-runner/tck.properties | 4 +-
uddi-tck/juddi_install_data_node2/UDDI_tModels.xml | 25 +--
...091_RMISubscriptionListenerIntegrationTest.java | 186 -----------------
.../juddi/v3/tck/UDDI_090_RMIIntegrationTest.java | 188 ------------------
58 files changed, 56 insertions(+), 2371 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
index c73875b..9111b95 100644
--- 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
deleted file mode 100644
index a341db4..0000000
--- a/juddi-client/src/main/java/org/apache/juddi/v3/client/transport/RMITransport.java
+++ /dev/null
@@ -1,220 +0,0 @@
-/*
- * Copyright 2001-2009 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-package org.apache.juddi.v3.client.transport;
-
-import java.net.URI;
-import java.util.Properties;
-
-import javax.naming.InitialContext;
-import javax.naming.NamingException;
-
-import org.apache.commons.configuration.ConfigurationException;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.juddi.v3.client.config.Property;
-import org.apache.juddi.v3.client.config.UDDIClient;
-import org.apache.juddi.v3.client.config.UDDIClientContainer;
-import org.apache.juddi.v3_service.JUDDIApiPortType;
-import org.uddi.v3_service.UDDICustodyTransferPortType;
-import org.uddi.v3_service.UDDIInquiryPortType;
-import org.uddi.v3_service.UDDIPublicationPortType;
-import org.uddi.v3_service.UDDISecurityPortType;
-import org.uddi.v3_service.UDDISubscriptionListenerPortType;
-import org.uddi.v3_service.UDDISubscriptionPortType;
-
-
-public class RMITransport extends Transport {
-
- InitialContext context = null;
- private Log logger = LogFactory.getLog(this.getClass());
- private String nodeName = null;
- private String clientName = null;
-
- public RMITransport() {
- super();
- this.nodeName = Transport.DEFAULT_NODE_NAME;
- }
-
- public RMITransport(String nodeName) throws NamingException, ConfigurationException {
- super();
- this.nodeName = nodeName;
- initContext();
- }
-
- public RMITransport(String clientName, String nodeName) throws NamingException, ConfigurationException {
- super();
- this.nodeName = nodeName;
- this.clientName = clientName;
- initContext();
- }
-
- private void initContext() throws NamingException, ConfigurationException {
- Properties env = new Properties();
- UDDIClient client = UDDIClientContainer.getUDDIClient(clientName);
- String factoryInitial = client.getClientConfig().getHomeNode().getFactoryInitial();
- String factoryURLPkgs = client.getClientConfig().getHomeNode().getFactoryURLPkgs();
- String factoryNamingProvider = client.getClientConfig().getHomeNode().getFactoryNamingProvider();
- if (factoryInitial!=null && !"".equals(factoryInitial)) env.setProperty(Property.UDDI_PROXY_FACTORY_INITIAL, factoryInitial);
- if (factoryURLPkgs!=null && !"".equals(factoryURLPkgs)) env.setProperty(Property.UDDI_PROXY_FACTORY_URL_PKS, factoryURLPkgs);
- if (factoryNamingProvider!=null && !"".equals(factoryNamingProvider)) env.setProperty(Property.UDDI_PROXY_PROVIDER_URL, factoryNamingProvider);
- logger.debug("Initial Context using env=" + env.toString());
- context = new InitialContext(env);
- }
-
- private UDDIInquiryPortType inquiryService = null;
- private UDDISecurityPortType securityService = null;
- private UDDIPublicationPortType publishService = null;
- private UDDISubscriptionPortType subscriptionService = null;
- private UDDISubscriptionListenerPortType subscriptionListenerService = null;
- private UDDICustodyTransferPortType custodyTransferService = null;
- private JUDDIApiPortType publisherService = null;
-
-
- public UDDIInquiryPortType getUDDIInquiryService(String endpointURL) throws TransportException {
- if (inquiryService==null) {
- try {
- if (endpointURL==null) {
- UDDIClient client = UDDIClientContainer.getUDDIClient(clientName);
- endpointURL = client.getClientConfig().getUDDINode(nodeName).getInquiryUrl();
- }
- URI endpointURI = new URI(endpointURL);
- String service = endpointURI.getPath();
- logger.debug("Looking up service=" + service);
- Object requestHandler = context.lookup(service);
- inquiryService = (UDDIInquiryPortType) requestHandler;
- } catch (Exception e) {
- throw new TransportException(e.getMessage(), e);
- }
- }
- return inquiryService;
- }
-
- public UDDISecurityPortType getUDDISecurityService(String endpointURL) throws TransportException {
- if (securityService==null) {
- try {
- if (endpointURL==null) {
- UDDIClient client = UDDIClientContainer.getUDDIClient(clientName);
- endpointURL = client.getClientConfig().getUDDINode(nodeName).getSecurityUrl();
- }
- URI endpointURI = new URI(endpointURL);
- String service = endpointURI.getPath();
- logger.debug("Looking up service=" + service);
- Object requestHandler = context.lookup(service);
- securityService = (UDDISecurityPortType) requestHandler;
- } catch (Exception e) {
- throw new TransportException(e.getMessage(), e);
- }
- }
- return securityService;
- }
-
- public UDDIPublicationPortType getUDDIPublishService(String endpointURL) throws TransportException {
- if (publishService==null) {
- try {
- if (endpointURL==null) {
- UDDIClient client = UDDIClientContainer.getUDDIClient(clientName);
- endpointURL = client.getClientConfig().getUDDINode(nodeName).getPublishUrl();
- }
- URI endpointURI = new URI(endpointURL);
- String service = endpointURI.getPath();
- logger.debug("Looking up service=" + service);
- Object requestHandler = context.lookup(service);
- publishService = (UDDIPublicationPortType) requestHandler;
- } catch (Exception e) {
- throw new TransportException(e.getMessage(), e);
- }
- }
- return publishService;
- }
-
- public UDDISubscriptionPortType getUDDISubscriptionService(String endpointURL) throws TransportException {
- if (subscriptionService==null) {
- try {
- if (endpointURL==null) {
- UDDIClient client = UDDIClientContainer.getUDDIClient(clientName);
- endpointURL = client.getClientConfig().getUDDINode(nodeName).getSubscriptionUrl();
- }
- URI endpointURI = new URI(endpointURL);
- String service = endpointURI.getPath();
- logger.debug("Looking up service=" + service);
- Object requestHandler = context.lookup(service);
- subscriptionService = (UDDISubscriptionPortType) requestHandler;
- } catch (Exception e) {
- throw new TransportException(e.getMessage(), e);
- }
- }
- return subscriptionService;
- }
-
- public UDDISubscriptionListenerPortType getUDDISubscriptionListenerService(String endpointURL) throws TransportException {
- if (subscriptionListenerService==null) {
- try {
- if (endpointURL==null) {
- UDDIClient client = UDDIClientContainer.getUDDIClient(clientName);
- endpointURL = client.getClientConfig().getUDDINode(nodeName).getSubscriptionListenerUrl();
- }
- URI endpointURI = new URI(endpointURL);
- String service = endpointURI.getPath();
- logger.debug("Looking up service=" + service);
- Object requestHandler = context.lookup(service);
- subscriptionListenerService = (UDDISubscriptionListenerPortType) requestHandler;
- } catch (Exception e) {
- throw new TransportException(e.getMessage(), e);
- }
- }
- return subscriptionListenerService;
- }
-
- public UDDICustodyTransferPortType getUDDICustodyTransferService(String endpointURL) throws TransportException {
- if (custodyTransferService==null) {
- try {
- if (endpointURL==null) {
- UDDIClient client = UDDIClientContainer.getUDDIClient(clientName);
- endpointURL = client.getClientConfig().getUDDINode(nodeName).getCustodyTransferUrl();
- }
- URI endpointURI = new URI(endpointURL);
- String service = endpointURI.getPath();
- logger.debug("Looking up service=" + service);
- Object requestHandler = context.lookup(service);
- custodyTransferService = (UDDICustodyTransferPortType) requestHandler;
- } catch (Exception e) {
- throw new TransportException(e.getMessage(), e);
- }
- }
- return custodyTransferService;
- }
-
- public JUDDIApiPortType getJUDDIApiService(String endpointURL) throws TransportException {
- if (publisherService==null) {
- try {
- if (endpointURL==null) {
- UDDIClient client = UDDIClientContainer.getUDDIClient(clientName);
- endpointURL = client.getClientConfig().getUDDINode(nodeName).getJuddiApiUrl();
- }
- URI endpointURI = new URI(endpointURL);
- String service = endpointURI.getPath();
- logger.debug("Looking up service=" + service);
- Object requestHandler = context.lookup(service);
- publisherService = (JUDDIApiPortType) requestHandler;
- } catch (Exception e) {
- throw new TransportException(e.getMessage(), e);
- }
- }
- return publisherService;
- }
-
-}
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
index bb85fd6..92b5c17 100644
--- 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 @@ import org.uddi.v3_service.UDDISubscriptionPortType;;
* 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
index bdde534..07ebfb8 100644
--- 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
index d7c3f13..e3f1c16 100644
--- 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
index 4a1fff0..479fbf4 100644
--- 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.commons.logging.LogFactory;
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 class Registry {
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 class Registry {
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
index 74ee22c..b6dcd3c 100644
--- 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";
diff --git a/juddi-core/src/main/java/org/apache/juddi/rmi/JNDIRegistration.java b/juddi-core/src/main/java/org/apache/juddi/rmi/JNDIRegistration.java
deleted file mode 100644
index d970884..0000000
--- a/juddi-core/src/main/java/org/apache/juddi/rmi/JNDIRegistration.java
+++ /dev/null
@@ -1,154 +0,0 @@
-/*
- * Copyright 2001-2009 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.juddi.rmi;
-
-import javax.naming.Context;
-import javax.naming.InitialContext;
-import javax.naming.NamingException;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-/**
- * @author Kurt Stam (kstam@apache.org)
- */
-public class JNDIRegistration
-{
- public static final String JUDDI = "/juddiv3";
- public static final String UDDI_SECURITY_SERVICE = JUDDI + "/UDDISecurityService";
- public static final String UDDI_PUBLICATION_SERVICE = JUDDI + "/UDDIPublicationService";
- public static final String UDDI_INQUIRY_SERVICE = JUDDI + "/UDDIInquiryService";
- public static final String UDDI_SUBSCRIPTION_SERVICE = JUDDI + "/UDDISubscriptionService";
- public static final String UDDI_SUBSCRIPTION_LISTENER_SERVICE = JUDDI + "/UDDISubscriptionListenerService";
- public static final String UDDI_CUSTODY_TRANSFER_SERVICE = JUDDI + "/UDDICustodyTransferService";
- public static final String JUDDI_PUBLISHER_SERVICE = JUDDI + "/JUDDIApiService";
-
- private UDDISecurityService securityService = null;
- private UDDIPublicationService publicationService = null;
- private UDDIInquiryService inquiryService = null;
- private UDDISubscriptionService subscriptionService = null;
- private UDDISubscriptionListenerService subscriptionListenerService = null;
- private UDDICustodyTransferService custodyTransferService = null;
- private JUDDIApiService publisherService = null;
-
- private Log log = LogFactory.getLog(this.getClass());
- InitialContext context = null;
- private static JNDIRegistration registration = null;
-
- public static JNDIRegistration getInstance() throws NamingException {
- if (registration==null) {
- registration = new JNDIRegistration();
- }
- return registration;
- }
-
- private JNDIRegistration() throws NamingException{
- super();
- context = new InitialContext();
- }
- /**
- * Registers the Publish and Inquiry Services to JNDI and instantiates a
- * instance of each so we can remotely attach to it later.
- */
- public void register(int port) {
- try {
- Context juddiContext = context.createSubcontext(JUDDI);
-
- securityService = new UDDISecurityService(port);
- if (log.isDebugEnabled()) log.debug("Setting " + UDDI_SECURITY_SERVICE + ", " + securityService.getClass());
- juddiContext.bind(UDDI_SECURITY_SERVICE, securityService);
-
- publicationService = new UDDIPublicationService(port);
- if (log.isDebugEnabled()) log.debug("Setting " + UDDI_PUBLICATION_SERVICE + ", " + publicationService.getClass());
- juddiContext.bind(UDDI_PUBLICATION_SERVICE, publicationService);
-
- inquiryService = new UDDIInquiryService(port);
- if (log.isDebugEnabled()) log.debug("Setting " + UDDI_INQUIRY_SERVICE + ", " + inquiryService.getClass());
- juddiContext.bind(UDDI_INQUIRY_SERVICE, inquiryService);
-
- subscriptionService = new UDDISubscriptionService(port);
- if (log.isDebugEnabled()) log.debug("Setting " + UDDI_SUBSCRIPTION_SERVICE + ", " + subscriptionService.getClass());
- juddiContext.bind(UDDI_SUBSCRIPTION_SERVICE, subscriptionService);
-
- subscriptionListenerService = new UDDISubscriptionListenerService(port);
- if (log.isDebugEnabled()) log.debug("Setting " + UDDI_SUBSCRIPTION_LISTENER_SERVICE + ", " + subscriptionListenerService.getClass());
- juddiContext.bind(UDDI_SUBSCRIPTION_LISTENER_SERVICE, subscriptionListenerService);
-
- custodyTransferService = new UDDICustodyTransferService(port);
- if (log.isDebugEnabled()) log.debug("Setting " + UDDI_CUSTODY_TRANSFER_SERVICE + ", " + custodyTransferService.getClass());
- juddiContext.bind(UDDI_CUSTODY_TRANSFER_SERVICE, custodyTransferService);
-
- publisherService = new JUDDIApiService(port);
- if (log.isDebugEnabled()) log.debug("Setting " + JUDDI_PUBLISHER_SERVICE + ", " + publisherService.getClass());
- juddiContext.bind(JUDDI_PUBLISHER_SERVICE, publisherService);
-
- } catch (Exception e) {
- log.error(e.getMessage(),e);
- }
- }
-
- public void unregister() {
-
- try {
- context.unbind(UDDI_SECURITY_SERVICE);
- } catch (NamingException e) {
- log.error(e.getMessage(),e);
- }
- securityService = null;
- try {
- context.unbind(UDDI_PUBLICATION_SERVICE);
- } catch (NamingException e) {
- log.error(e.getMessage(),e);
- }
- publicationService = null;
- try {
- context.unbind(UDDI_INQUIRY_SERVICE);
- } catch (NamingException e) {
- log.error(e.getMessage(),e);
- }
- inquiryService = null;
- try {
- context.unbind(UDDI_SUBSCRIPTION_SERVICE);
- } catch (NamingException e) {
- log.error(e.getMessage(),e);
- }
- subscriptionService = null;
- try {
- context.unbind(UDDI_SUBSCRIPTION_LISTENER_SERVICE);
- } catch (NamingException e) {
- log.error(e.getMessage(),e);
- }
- subscriptionListenerService = null;
- try {
- context.unbind(UDDI_CUSTODY_TRANSFER_SERVICE);
- } catch (NamingException e) {
- log.error(e.getMessage(),e);
- }
- custodyTransferService = null;
- try {
- context.unbind(JUDDI_PUBLISHER_SERVICE);
- } catch (NamingException e) {
- log.error(e.getMessage(),e);
- }
- publisherService = null;
- try {
- context.unbind(JUDDI);
- } catch (NamingException e) {
- log.error(e.getMessage(),e);
- }
-
- }
-}
diff --git a/juddi-core/src/main/java/org/apache/juddi/rmi/JUDDIApiService.java b/juddi-core/src/main/java/org/apache/juddi/rmi/JUDDIApiService.java
deleted file mode 100644
index 1a922c4..0000000
--- a/juddi-core/src/main/java/org/apache/juddi/rmi/JUDDIApiService.java
+++ /dev/null
@@ -1,196 +0,0 @@
-/*
- * Copyright 2001-2009 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-package org.apache.juddi.rmi;
-
-import java.rmi.RemoteException;
-import java.rmi.server.UnicastRemoteObject;
-import java.util.List;
-import javax.xml.ws.Holder;
-
-import org.apache.juddi.api.impl.JUDDIApiImpl;
-import org.apache.juddi.api_v3.AdminSaveBusinessWrapper;
-import org.apache.juddi.api_v3.AdminSaveTModelWrapper;
-import org.apache.juddi.api_v3.ClerkDetail;
-import org.apache.juddi.api_v3.ClerkList;
-import org.apache.juddi.api_v3.ClientSubscriptionInfoDetail;
-import org.apache.juddi.api_v3.DeleteClerk;
-import org.apache.juddi.api_v3.DeleteClientSubscriptionInfo;
-import org.apache.juddi.api_v3.DeleteNode;
-import org.apache.juddi.api_v3.DeletePublisher;
-import org.apache.juddi.api_v3.GetAllPublisherDetail;
-import org.apache.juddi.api_v3.GetEntityHistoryMessageRequest;
-import org.apache.juddi.api_v3.GetEntityHistoryMessageResponse;
-import org.apache.juddi.api_v3.GetFailedReplicationChangeRecordsMessageRequest;
-import org.apache.juddi.api_v3.GetFailedReplicationChangeRecordsMessageResponse;
-import org.apache.juddi.api_v3.GetPublisherDetail;
-import org.apache.juddi.api_v3.NodeDetail;
-import org.apache.juddi.api_v3.NodeList;
-import org.apache.juddi.api_v3.PublisherDetail;
-import org.apache.juddi.api_v3.SaveClerk;
-import org.apache.juddi.api_v3.SaveClientSubscriptionInfo;
-import org.apache.juddi.api_v3.SaveNode;
-import org.apache.juddi.api_v3.SavePublisher;
-import org.apache.juddi.api_v3.SubscriptionWrapper;
-import org.apache.juddi.api_v3.SyncSubscription;
-import org.apache.juddi.api_v3.SyncSubscriptionDetail;
-import org.apache.juddi.api_v3.ValidValues;
-import org.apache.juddi.v3_service.JUDDIApiPortType;
-import org.uddi.api_v3.DeleteTModel;
-import org.uddi.api_v3.DispositionReport;
-import org.uddi.repl_v3.ReplicationConfiguration;
-import org.uddi.sub_v3.Subscription;
-import org.uddi.v3_service.DispositionReportFaultMessage;
-/**
- * UDDIPublicationPortType wrapper so it can be exposed as a service over RMI.
- *
- * @author <a href="mailto:kstam@apache.org">Kurt T Stam</a>
- *
- */
-public class JUDDIApiService extends UnicastRemoteObject implements JUDDIApiPortType {
-
- private static final long serialVersionUID = 1404805184314952141L;
- private JUDDIApiPortType juddiAPI = new JUDDIApiImpl();
-
- protected JUDDIApiService(int port) throws RemoteException {
- super(port);
- }
-
- public void deletePublisher(DeletePublisher body)
- throws DispositionReportFaultMessage, RemoteException {
- juddiAPI.deletePublisher(body);
- }
-
- public PublisherDetail getAllPublisherDetail(GetAllPublisherDetail body)
- throws DispositionReportFaultMessage, RemoteException {
- return juddiAPI.getAllPublisherDetail(body);
- }
-
- public PublisherDetail getPublisherDetail(GetPublisherDetail body)
- throws DispositionReportFaultMessage, RemoteException {
- return juddiAPI.getPublisherDetail(body);
- }
-
- public PublisherDetail savePublisher(SavePublisher body)
- throws DispositionReportFaultMessage, RemoteException {
- return juddiAPI.savePublisher(body);
- }
-
- public void adminDeleteTModel(DeleteTModel body)
- throws DispositionReportFaultMessage, RemoteException {
- juddiAPI.adminDeleteTModel(body);
- }
-
- public void deleteClientSubscriptionInfo(DeleteClientSubscriptionInfo body)
- throws DispositionReportFaultMessage, RemoteException {
- juddiAPI.deleteClientSubscriptionInfo(body);
- }
-
- public ClientSubscriptionInfoDetail saveClientSubscriptionInfo(SaveClientSubscriptionInfo body)
- throws DispositionReportFaultMessage, RemoteException {
- return juddiAPI.saveClientSubscriptionInfo(body);
-
- }
-
- public ClerkDetail saveClerk(SaveClerk body)
- throws DispositionReportFaultMessage, RemoteException {
- return juddiAPI.saveClerk(body);
-
- }
-
- public NodeDetail saveNode(SaveNode body)
- throws DispositionReportFaultMessage, RemoteException {
- return juddiAPI.saveNode(body);
-
- }
-
- public SyncSubscriptionDetail invokeSyncSubscription(SyncSubscription body)
- throws DispositionReportFaultMessage, RemoteException {
- return juddiAPI.invokeSyncSubscription(body);
- }
-
- @Override
- public NodeList getAllNodes(String authInfo) throws DispositionReportFaultMessage, RemoteException {
- return juddiAPI.getAllNodes(authInfo);
- }
-
- @Override
- public ClerkList getAllClerks(String authInfo) throws DispositionReportFaultMessage, RemoteException {
- return juddiAPI.getAllClerks(authInfo);
- }
-
- @Override
- public void deleteNode(DeleteNode body) throws DispositionReportFaultMessage, RemoteException {
- juddiAPI.deleteNode(body);
- }
-
- @Override
- public void deleteClerk(DeleteClerk request) throws DispositionReportFaultMessage, RemoteException {
- juddiAPI.deleteClerk(request);
- }
-
- @Override
- public DispositionReport adminSaveBusiness(String authInfo, List<AdminSaveBusinessWrapper> values) throws DispositionReportFaultMessage, RemoteException {
- return juddiAPI.adminSaveBusiness(authInfo, values);
- }
-
- @Override
- public DispositionReport adminSaveTModel(String authInfo, List<AdminSaveTModelWrapper> values) throws DispositionReportFaultMessage, RemoteException {
- return juddiAPI.adminSaveTModel(authInfo, values);
- }
-
- @Override
- public ReplicationConfiguration getReplicationNodes(String authInfo) throws DispositionReportFaultMessage, RemoteException {
- return juddiAPI.getReplicationNodes(authInfo);
- }
-
- @Override
- public DispositionReport setReplicationNodes(String authInfo, ReplicationConfiguration replicationConfiguration) throws DispositionReportFaultMessage, RemoteException {
- return juddiAPI.setReplicationNodes(authInfo, replicationConfiguration);
- }
-
- @Override
- public List<SubscriptionWrapper> getAllClientSubscriptionInfo(String authInfo) throws DispositionReportFaultMessage, RemoteException {
- return juddiAPI.getAllClientSubscriptionInfo(authInfo);
- }
-
- @Override
- public void adminDeleteSubscription(String authInfo, List<String> subscriptionKey) throws DispositionReportFaultMessage, RemoteException {
- juddiAPI.adminDeleteSubscription(authInfo, subscriptionKey);
- }
-
- @Override
- public void adminSaveSubscription(String authInfo, String publisherOrUsername, Holder<List<Subscription>> subscriptions) throws DispositionReportFaultMessage, RemoteException {
- juddiAPI.adminSaveSubscription(authInfo, publisherOrUsername, subscriptions);
- }
-
- @Override
- public GetEntityHistoryMessageResponse getEntityHistory(GetEntityHistoryMessageRequest body) throws DispositionReportFaultMessage,RemoteException {
- return juddiAPI.getEntityHistory(body);
-
- }
-
- @Override
- public GetFailedReplicationChangeRecordsMessageResponse getFailedReplicationChangeRecords(GetFailedReplicationChangeRecordsMessageRequest body) throws DispositionReportFaultMessage,RemoteException {
- return juddiAPI.getFailedReplicationChangeRecords(body);
- }
-
-
-
-
-
-
-}
diff --git a/juddi-core/src/main/java/org/apache/juddi/rmi/RMIRegistration.java b/juddi-core/src/main/java/org/apache/juddi/rmi/RMIRegistration.java
deleted file mode 100644
index 61d86c7..0000000
--- a/juddi-core/src/main/java/org/apache/juddi/rmi/RMIRegistration.java
+++ /dev/null
@@ -1,149 +0,0 @@
-/*
- * Copyright 2001-2009 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.juddi.rmi;
-
-import java.rmi.RemoteException;
-import java.rmi.registry.LocateRegistry;
-import java.rmi.registry.Registry;
-
-import javax.naming.NamingException;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-/**
- * @author Kurt Stam (kstam@apache.org)
- */
-public class RMIRegistration
-{
- public static final String JUDDI = "/juddiv3";
- public static final String UDDI_SECURITY_SERVICE = JUDDI + "/UDDISecurityService";
- public static final String UDDI_PUBLICATION_SERVICE = JUDDI + "/UDDIPublicationService";
- public static final String UDDI_INQUIRY_SERVICE = JUDDI + "/UDDIInquiryService";
- public static final String UDDI_SUBSCRIPTION_SERVICE = JUDDI + "/UDDISubscriptionService";
- public static final String UDDI_SUBSCRIPTION_LISTENER_SERVICE = JUDDI + "/UDDISubscriptionListenerService";
- public static final String UDDI_CUSTODY_TRANSFER_SERVICE = JUDDI + "/UDDICustodyTransferService";
- public static final String JUDDI_PUBLISHER_SERVICE = JUDDI + "/JUDDIApiService";
-
- private UDDISecurityService securityService = null;
- private UDDIPublicationService publicationService = null;
- private UDDIInquiryService inquiryService = null;
- private UDDISubscriptionService subscriptionService = null;
- private UDDISubscriptionListenerService subscriptionListenerService = null;
- private UDDICustodyTransferService custodyTransferService = null;
- private JUDDIApiService publisherService = null;
-
- private Log log = LogFactory.getLog(this.getClass());
- Registry registry = null;
- private static RMIRegistration registration = null;
-
- public static RMIRegistration getInstance(int port) throws NamingException, RemoteException {
- if (registration==null) {
- registration = new RMIRegistration(port);
- }
- return registration;
- }
-
- private RMIRegistration(int port) throws NamingException, RemoteException{
- super();
- registry = LocateRegistry.createRegistry(port);
- }
- /**
- * Registers the Publish and Inquiry Services to JNDI and instantiates a
- * instance of each so we can remotely attach to it later.
- */
- public void register(int port) {
- try {
- securityService = new UDDISecurityService(port);
- if (log.isDebugEnabled()) log.debug("Setting " + UDDI_SECURITY_SERVICE + ", " + securityService.getClass());
- registry.bind(UDDI_SECURITY_SERVICE, securityService);
-
- publicationService = new UDDIPublicationService(port);
- if (log.isDebugEnabled()) log.debug("Setting " + UDDI_PUBLICATION_SERVICE + ", " + publicationService.getClass());
- registry.bind(UDDI_PUBLICATION_SERVICE, publicationService);
-
- inquiryService = new UDDIInquiryService(port);
- if (log.isDebugEnabled()) log.debug("Setting " + UDDI_INQUIRY_SERVICE + ", " + inquiryService.getClass());
- registry.bind(UDDI_INQUIRY_SERVICE, inquiryService);
-
- subscriptionService = new UDDISubscriptionService(port);
- if (log.isDebugEnabled()) log.debug("Setting " + UDDI_SUBSCRIPTION_SERVICE + ", " + subscriptionService.getClass());
- registry.bind(UDDI_SUBSCRIPTION_SERVICE, subscriptionService);
-
- subscriptionListenerService = new UDDISubscriptionListenerService(port);
- if (log.isDebugEnabled()) log.debug("Setting " + UDDI_SUBSCRIPTION_LISTENER_SERVICE + ", " + subscriptionListenerService.getClass());
- registry.bind(UDDI_SUBSCRIPTION_LISTENER_SERVICE, subscriptionListenerService);
-
- custodyTransferService = new UDDICustodyTransferService(port);
- if (log.isDebugEnabled()) log.debug("Setting " + UDDI_CUSTODY_TRANSFER_SERVICE + ", " + custodyTransferService.getClass());
- registry.bind(UDDI_CUSTODY_TRANSFER_SERVICE, custodyTransferService);
-
- publisherService = new JUDDIApiService(port);
- if (log.isDebugEnabled()) log.debug("Setting " + JUDDI_PUBLISHER_SERVICE + ", " + publisherService.getClass());
- registry.bind(JUDDI_PUBLISHER_SERVICE, publisherService);
-
- } catch (Exception e) {
- log.error(e.getMessage(),e);
- }
- }
-
- public void unregister() {
-
- try {
- registry.unbind(UDDI_SECURITY_SERVICE);
- } catch (Exception e) {
- log.error(e.getMessage(),e);
- }
- securityService = null;
- try {
- registry.unbind(UDDI_PUBLICATION_SERVICE);
- } catch (Exception e) {
- log.error(e.getMessage(),e);
- }
- publicationService = null;
- try {
- registry.unbind(UDDI_INQUIRY_SERVICE);
- } catch (Exception e) {
- log.error(e.getMessage(),e);
- }
- inquiryService = null;
- try {
- registry.unbind(UDDI_SUBSCRIPTION_SERVICE);
- } catch (Exception e) {
- log.error(e.getMessage(),e);
- }
- subscriptionService = null;
- try {
- registry.unbind(UDDI_SUBSCRIPTION_LISTENER_SERVICE);
- } catch (Exception e) {
- log.error(e.getMessage(),e);
- }
- subscriptionListenerService = null;
- try {
- registry.unbind(UDDI_CUSTODY_TRANSFER_SERVICE);
- } catch (Exception e) {
- log.error(e.getMessage(),e);
- }
- custodyTransferService = null;
- try {
- registry.unbind(JUDDI_PUBLISHER_SERVICE);
- } catch (Exception e) {
- log.error(e.getMessage(),e);
- }
- publisherService = null;
-
- }
-}
diff --git a/juddi-core/src/main/java/org/apache/juddi/rmi/UDDICustodyTransferService.java b/juddi-core/src/main/java/org/apache/juddi/rmi/UDDICustodyTransferService.java
deleted file mode 100644
index 535f5a6..0000000
--- a/juddi-core/src/main/java/org/apache/juddi/rmi/UDDICustodyTransferService.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * Copyright 2001-2009 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-package org.apache.juddi.rmi;
-
-import java.rmi.RemoteException;
-import java.rmi.server.UnicastRemoteObject;
-
-import javax.xml.datatype.XMLGregorianCalendar;
-import javax.xml.ws.Holder;
-
-import org.apache.juddi.api.impl.UDDICustodyTransferImpl;
-import org.uddi.custody_v3.DiscardTransferToken;
-import org.uddi.custody_v3.KeyBag;
-import org.uddi.custody_v3.TransferEntities;
-import org.uddi.v3_service.DispositionReportFaultMessage;
-import org.uddi.v3_service.UDDICustodyTransferPortType;
-
-/**
- * UDDISecurityPortType wrapper so it can be exposed as a service over RMI.
- *
- * @author <a href="mailto:kstam@apache.org">Kurt T Stam</a>
- *
- */
-public class UDDICustodyTransferService extends UnicastRemoteObject implements UDDICustodyTransferPortType {
-
- private static final long serialVersionUID = 8900970766388210839L;
- private transient UDDICustodyTransferPortType custodyTransfer = new UDDICustodyTransferImpl();
-
- protected UDDICustodyTransferService(int port) throws RemoteException {
- super(port);
- }
-
- public void discardTransferToken(DiscardTransferToken body)
- throws DispositionReportFaultMessage, RemoteException {
- custodyTransfer.discardTransferToken(body);
- }
-
- public void getTransferToken(String authInfo, KeyBag keyBag,
- Holder<String> nodeID, Holder<XMLGregorianCalendar> expirationTime,
- Holder<byte[]> opaqueToken) throws DispositionReportFaultMessage,
- RemoteException {
- custodyTransfer.getTransferToken(authInfo, keyBag, nodeID, expirationTime, opaqueToken);
- }
-
- public void transferEntities(TransferEntities body)
- throws DispositionReportFaultMessage, RemoteException {
- custodyTransfer.transferEntities(body);
- }
-
-
-
-}
diff --git a/juddi-core/src/main/java/org/apache/juddi/rmi/UDDIInquiryService.java b/juddi-core/src/main/java/org/apache/juddi/rmi/UDDIInquiryService.java
deleted file mode 100644
index a9ecbc9..0000000
--- a/juddi-core/src/main/java/org/apache/juddi/rmi/UDDIInquiryService.java
+++ /dev/null
@@ -1,108 +0,0 @@
-/*
- * Copyright 2001-2009 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-package org.apache.juddi.rmi;
-
-import java.rmi.RemoteException;
-import java.rmi.server.UnicastRemoteObject;
-
-import org.apache.juddi.api.impl.UDDIInquiryImpl;
-import org.uddi.api_v3.BindingDetail;
-import org.uddi.api_v3.BusinessDetail;
-import org.uddi.api_v3.BusinessList;
-import org.uddi.api_v3.FindBinding;
-import org.uddi.api_v3.FindBusiness;
-import org.uddi.api_v3.FindRelatedBusinesses;
-import org.uddi.api_v3.FindService;
-import org.uddi.api_v3.FindTModel;
-import org.uddi.api_v3.GetBindingDetail;
-import org.uddi.api_v3.GetBusinessDetail;
-import org.uddi.api_v3.GetOperationalInfo;
-import org.uddi.api_v3.GetServiceDetail;
-import org.uddi.api_v3.GetTModelDetail;
-import org.uddi.api_v3.OperationalInfos;
-import org.uddi.api_v3.RelatedBusinessesList;
-import org.uddi.api_v3.ServiceDetail;
-import org.uddi.api_v3.ServiceList;
-import org.uddi.api_v3.TModelDetail;
-import org.uddi.api_v3.TModelList;
-import org.uddi.v3_service.UDDIInquiryPortType;
-/**
- * UDDIInquiryPortType wrapper so it can be exposed as a service over RMI.
- *
- * @author <a href="mailto:kstam@apache.org">Kurt T Stam</a>
- *
- */
-public class UDDIInquiryService extends UnicastRemoteObject implements UDDIInquiryPortType {
-
- private static final long serialVersionUID = -8384112899703963130L;
- private transient UDDIInquiryImpl inquiry = new UDDIInquiryImpl();
-
- protected UDDIInquiryService(int port) throws RemoteException {
- super(port);
- }
-
- public BindingDetail findBinding(FindBinding body)
- throws RemoteException {
- return inquiry.findBinding(body);
- }
-
- public BusinessList findBusiness(FindBusiness body)
- throws RemoteException {
- return inquiry.findBusiness(body);
- }
-
- public RelatedBusinessesList findRelatedBusinesses(
- FindRelatedBusinesses body) throws RemoteException {
- return inquiry.findRelatedBusinesses(body);
- }
-
- public ServiceList findService(FindService body)
- throws RemoteException {
- return inquiry.findService(body);
- }
-
- public TModelList findTModel(FindTModel body)
- throws RemoteException {
- return inquiry.findTModel(body);
- }
-
- public BindingDetail getBindingDetail(GetBindingDetail body)
- throws RemoteException {
- return inquiry.getBindingDetail(body);
- }
-
- public BusinessDetail getBusinessDetail(GetBusinessDetail body)
- throws RemoteException {
- return inquiry.getBusinessDetail(body);
- }
-
- public OperationalInfos getOperationalInfo(GetOperationalInfo body)
- throws RemoteException {
- return inquiry.getOperationalInfo(body);
- }
-
- public ServiceDetail getServiceDetail(GetServiceDetail body)
- throws RemoteException {
- return inquiry.getServiceDetail(body);
- }
-
- public TModelDetail getTModelDetail(GetTModelDetail body)
- throws RemoteException {
- return inquiry.getTModelDetail(body);
- }
-
-}
diff --git a/juddi-core/src/main/java/org/apache/juddi/rmi/UDDIPublicationService.java b/juddi-core/src/main/java/org/apache/juddi/rmi/UDDIPublicationService.java
deleted file mode 100644
index 1646a94..0000000
--- a/juddi-core/src/main/java/org/apache/juddi/rmi/UDDIPublicationService.java
+++ /dev/null
@@ -1,133 +0,0 @@
-/*
- * Copyright 2001-2009 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-package org.apache.juddi.rmi;
-
-import java.rmi.RemoteException;
-import java.rmi.server.UnicastRemoteObject;
-import java.util.List;
-
-import javax.xml.ws.Holder;
-
-import org.apache.juddi.api.impl.UDDIPublicationImpl;
-import org.uddi.api_v3.AddPublisherAssertions;
-import org.uddi.api_v3.AssertionStatusItem;
-import org.uddi.api_v3.BindingDetail;
-import org.uddi.api_v3.BusinessDetail;
-import org.uddi.api_v3.CompletionStatus;
-import org.uddi.api_v3.DeleteBinding;
-import org.uddi.api_v3.DeleteBusiness;
-import org.uddi.api_v3.DeletePublisherAssertions;
-import org.uddi.api_v3.DeleteService;
-import org.uddi.api_v3.DeleteTModel;
-import org.uddi.api_v3.GetRegisteredInfo;
-import org.uddi.api_v3.PublisherAssertion;
-import org.uddi.api_v3.RegisteredInfo;
-import org.uddi.api_v3.SaveBinding;
-import org.uddi.api_v3.SaveBusiness;
-import org.uddi.api_v3.SaveService;
-import org.uddi.api_v3.SaveTModel;
-import org.uddi.api_v3.ServiceDetail;
-import org.uddi.api_v3.TModelDetail;
-import org.uddi.v3_service.UDDIPublicationPortType;
-/**
- * UDDIPublicationPortType wrapper so it can be exposed as a service over RMI.
- *
- * @author <a href="mailto:kstam@apache.org">Kurt T Stam</a>
- *
- */
-public class UDDIPublicationService extends UnicastRemoteObject implements UDDIPublicationPortType {
-
- private static final long serialVersionUID = 8342463046574333026L;
- private transient UDDIPublicationPortType publication = new UDDIPublicationImpl();
-
- protected UDDIPublicationService(int port) throws RemoteException {
- super(port);
- }
-
- public void addPublisherAssertions(AddPublisherAssertions body)
- throws RemoteException {
- publication.addPublisherAssertions(body);
- }
-
- public void deleteBinding(DeleteBinding body)
- throws RemoteException {
- publication.deleteBinding(body);
- }
-
- public void deleteBusiness(DeleteBusiness body)
- throws RemoteException {
- publication.deleteBusiness(body);
- }
-
- public void deletePublisherAssertions(DeletePublisherAssertions body)
- throws RemoteException {
- publication.deletePublisherAssertions(body);
- }
-
- public void deleteService(DeleteService body)
- throws RemoteException {
- publication.deleteService(body);
- }
-
- public void deleteTModel(DeleteTModel body)
- throws RemoteException {
- publication.deleteTModel(body);
- }
-
- public List<AssertionStatusItem> getAssertionStatusReport(String authInfo,
- CompletionStatus completionStatus)
- throws RemoteException {
- return publication.getAssertionStatusReport(authInfo, completionStatus);
- }
-
- public List<PublisherAssertion> getPublisherAssertions(String authInfo)
- throws RemoteException {
- return publication.getPublisherAssertions(authInfo);
- }
-
- public RegisteredInfo getRegisteredInfo(GetRegisteredInfo body)
- throws RemoteException {
- return publication.getRegisteredInfo(body);
- }
-
- public BindingDetail saveBinding(SaveBinding body)
- throws RemoteException {
- return publication.saveBinding(body);
- }
-
- public BusinessDetail saveBusiness(SaveBusiness body)
- throws RemoteException {
- return publication.saveBusiness(body);
- }
-
- public ServiceDetail saveService(SaveService body)
- throws RemoteException {
- return publication.saveService(body);
- }
-
- public TModelDetail saveTModel(SaveTModel body)
- throws RemoteException {
- return publication.saveTModel(body);
- }
-
- public void setPublisherAssertions(String authInfo,
- Holder<List<PublisherAssertion>> publisherAssertion)
- throws RemoteException {
- publication.setPublisherAssertions(authInfo, publisherAssertion);
- }
-
-}
diff --git a/juddi-core/src/main/java/org/apache/juddi/rmi/UDDISecurityService.java b/juddi-core/src/main/java/org/apache/juddi/rmi/UDDISecurityService.java
deleted file mode 100644
index 5812a5b..0000000
--- a/juddi-core/src/main/java/org/apache/juddi/rmi/UDDISecurityService.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Copyright 2001-2009 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-package org.apache.juddi.rmi;
-
-import java.rmi.RemoteException;
-import java.rmi.server.UnicastRemoteObject;
-
-import org.apache.juddi.api.impl.UDDISecurityImpl;
-import org.uddi.api_v3.AuthToken;
-import org.uddi.api_v3.DiscardAuthToken;
-import org.uddi.api_v3.GetAuthToken;
-import org.uddi.v3_service.UDDISecurityPortType;
-
-/**
- * UDDISecurityPortType wrapper so it can be exposed as a service over RMI.
- *
- * @author <a href="mailto:kstam@apache.org">Kurt T Stam</a>
- *
- */
-public class UDDISecurityService extends UnicastRemoteObject implements UDDISecurityPortType {
-
- private static final long serialVersionUID = -7931578658303681458L;
- private transient UDDISecurityPortType security = new UDDISecurityImpl();
-
- protected UDDISecurityService(int port) throws RemoteException {
- super(port);
- }
-
- public void discardAuthToken(DiscardAuthToken body)
- throws RemoteException {
- security.discardAuthToken(body);
- }
-
- public AuthToken getAuthToken(GetAuthToken body)
- throws RemoteException {
- return security.getAuthToken(body);
- }
-
-}
diff --git a/juddi-core/src/main/java/org/apache/juddi/rmi/UDDISubscriptionListenerService.java b/juddi-core/src/main/java/org/apache/juddi/rmi/UDDISubscriptionListenerService.java
deleted file mode 100644
index 183a728..0000000
--- a/juddi-core/src/main/java/org/apache/juddi/rmi/UDDISubscriptionListenerService.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Copyright 2001-2009 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-package org.apache.juddi.rmi;
-
-import java.rmi.RemoteException;
-import java.rmi.server.UnicastRemoteObject;
-
-import org.apache.juddi.api.impl.UDDISubscriptionListenerImpl;
-import org.uddi.api_v3.DispositionReport;
-import org.uddi.subr_v3.NotifySubscriptionListener;
-import org.uddi.v3_service.DispositionReportFaultMessage;
-import org.uddi.v3_service.UDDISubscriptionListenerPortType;
-
-/**
- * UDDISecurityPortType wrapper so it can be exposed as a service over RMI.
- *
- * @author <a href="mailto:kstam@apache.org">Kurt T Stam</a>
- *
- */
-public class UDDISubscriptionListenerService extends UnicastRemoteObject implements UDDISubscriptionListenerPortType {
-
- private static final long serialVersionUID = -5103095115366760255L;
- private transient UDDISubscriptionListenerPortType subscriptionListener = new UDDISubscriptionListenerImpl();
-
- protected UDDISubscriptionListenerService(int port) throws RemoteException {
- super(port);
- }
-
- public DispositionReport notifySubscriptionListener(
- NotifySubscriptionListener body)
- throws DispositionReportFaultMessage, RemoteException {
- return subscriptionListener.notifySubscriptionListener(body);
- }
-
-}
diff --git a/juddi-core/src/main/java/org/apache/juddi/rmi/UDDISubscriptionService.java b/juddi-core/src/main/java/org/apache/juddi/rmi/UDDISubscriptionService.java
deleted file mode 100644
index bf3b052..0000000
--- a/juddi-core/src/main/java/org/apache/juddi/rmi/UDDISubscriptionService.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * Copyright 2001-2009 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-package org.apache.juddi.rmi;
-
-import java.rmi.RemoteException;
-import java.rmi.server.UnicastRemoteObject;
-import java.util.List;
-
-import javax.xml.ws.Holder;
-
-import org.apache.juddi.api.impl.UDDISubscriptionImpl;
-import org.uddi.sub_v3.DeleteSubscription;
-import org.uddi.sub_v3.GetSubscriptionResults;
-import org.uddi.sub_v3.Subscription;
-import org.uddi.sub_v3.SubscriptionResultsList;
-import org.uddi.v3_service.DispositionReportFaultMessage;
-import org.uddi.v3_service.UDDISubscriptionPortType;
-
-/**
- * UDDISecurityPortType wrapper so it can be exposed as a service over RMI.
- *
- * @author <a href="mailto:kstam@apache.org">Kurt T Stam</a>
- *
- */
-public class UDDISubscriptionService extends UnicastRemoteObject implements UDDISubscriptionPortType {
-
- private static final long serialVersionUID = 3534214581063707293L;
- private transient UDDISubscriptionPortType subscription = new UDDISubscriptionImpl();
-
- protected UDDISubscriptionService(int port) throws RemoteException {
- super(port);
- }
-
- public void deleteSubscription(DeleteSubscription body)
- throws DispositionReportFaultMessage, RemoteException {
- subscription.deleteSubscription(body);
- }
-
- public SubscriptionResultsList getSubscriptionResults(
- GetSubscriptionResults body) throws DispositionReportFaultMessage,
- RemoteException {
- return subscription.getSubscriptionResults(body);
- }
-
- public List<Subscription> getSubscriptions(String authInfo)
- throws DispositionReportFaultMessage, RemoteException {
- return subscription.getSubscriptions(authInfo);
- }
-
- public void saveSubscription(String authInfo,
- Holder<List<Subscription>> subscription)
- throws DispositionReportFaultMessage, RemoteException {
- this.subscription.saveSubscription(authInfo, subscription);
-
- }
-
-}
diff --git a/juddi-core/src/main/java/org/apache/juddi/rmi/package-info.java b/juddi-core/src/main/java/org/apache/juddi/rmi/package-info.java
deleted file mode 100644
index d0d15cf..0000000
--- a/juddi-core/src/main/java/org/apache/juddi/rmi/package-info.java
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
- * Copyright 2014 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/**
- * jUDDI's RMI Transport wrappers
- */
-package org.apache.juddi.rmi;
diff --git a/juddi-core/src/main/java/org/apache/juddi/subscription/notify/JNDI_RMINotifier.java b/juddi-core/src/main/java/org/apache/juddi/subscription/notify/JNDI_RMINotifier.java
deleted file mode 100644
index 5c37cc3..0000000
--- a/juddi-core/src/main/java/org/apache/juddi/subscription/notify/JNDI_RMINotifier.java
+++ /dev/null
@@ -1,91 +0,0 @@
-/*
- * Copyright 2001-2008 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-package org.apache.juddi.subscription.notify;
-
-import java.io.IOException;
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.rmi.NotBoundException;
-import java.rmi.RemoteException;
-import java.util.Properties;
-
-import javax.naming.InitialContext;
-import javax.naming.NamingException;
-import javax.xml.bind.JAXBException;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.juddi.InitialContextInfo;
-import org.apache.juddi.Property;
-import org.apache.juddi.api_v3.AccessPointType;
-import org.apache.juddi.jaxb.JAXBMarshaller;
-import org.apache.juddi.model.BindingTemplate;
-import org.apache.juddi.model.TmodelInstanceInfo;
-import org.uddi.api_v3.DispositionReport;
-import org.uddi.subr_v3.NotifySubscriptionListener;
-import org.uddi.v3_service.DispositionReportFaultMessage;
-import org.uddi.v3_service.UDDISubscriptionListenerPortType;
-
-public class JNDI_RMINotifier implements Notifier {
-
- Log log = LogFactory.getLog(this.getClass());
- UDDISubscriptionListenerPortType subscriptionListenerPort = null;
- public static final String JNDI_RMI_TRANSPORT_KEY = "uddi:uddi.org:transport:jndi-rmi";
-
- public JNDI_RMINotifier(BindingTemplate bindingTemplate) throws IOException,
- URISyntaxException, NotBoundException, NamingException, JAXBException {
- super();
- if (!AccessPointType.END_POINT.toString().equalsIgnoreCase(bindingTemplate.getAccessPointType())) {
- log.error("jndi-rmi enpoints only support AccessPointType " + AccessPointType.END_POINT);
- }
- String accessPointUrl = bindingTemplate.getAccessPointUrl().toLowerCase();
- if (!accessPointUrl.startsWith("jndi-rmi")) {
- log.warn("jndi-rmi accessPointUrl for bindingTemplate " + bindingTemplate.getEntityKey() +
- " should start with 'jndi-rmi'");
- }
- InitialContext context = new InitialContext();
- for (TmodelInstanceInfo tModelInstanceInfo : bindingTemplate.getTmodelInstanceInfos()) {
- if (tModelInstanceInfo.getTmodelKey().equals(JNDI_RMI_TRANSPORT_KEY)) {
- if (log.isDebugEnabled()) log.debug("Found transport tModelKey " + tModelInstanceInfo.getTmodelKey());
- String instanceParmsStr = tModelInstanceInfo.getInstanceParms();
- if (instanceParmsStr!=null) {
- if (log.isDebugEnabled()) log.debug("Found instanceParms with value: " + instanceParmsStr);
- InitialContextInfo icInfo = (InitialContextInfo) JAXBMarshaller.unmarshallFromString(instanceParmsStr, JAXBMarshaller.PACKAGE_JUDDI);
- Properties properties = new Properties();
- for (Property property: icInfo.getContextProperty()) {
- if (log.isDebugEnabled()) {
- log.debug("Initial Context Property from instanceParms " +
- property.getName() + ":" + property.getValue());
- }
- properties.put(property.getName(), property.getValue());
- }
- context = new InitialContext(properties);
- break;
- }
- }
- }
- URI accessPointURI = new URI(accessPointUrl);
- String path = accessPointURI.getPath();
-
- subscriptionListenerPort = (UDDISubscriptionListenerPortType) context.lookup(path);
- log.info("Successfully located " + path);
- }
-
- public DispositionReport notifySubscriptionListener(NotifySubscriptionListener body) throws DispositionReportFaultMessage, RemoteException {
- return subscriptionListenerPort.notifySubscriptionListener(body);
- }
-}
diff --git a/juddi-core/src/main/java/org/apache/juddi/subscription/notify/RMINotifier.java b/juddi-core/src/main/java/org/apache/juddi/subscription/notify/RMINotifier.java
deleted file mode 100644
index 434f77d..0000000
--- a/juddi-core/src/main/java/org/apache/juddi/subscription/notify/RMINotifier.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * Copyright 2001-2008 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-package org.apache.juddi.subscription.notify;
-
-import java.io.IOException;
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.rmi.NotBoundException;
-import java.rmi.RemoteException;
-import java.rmi.registry.LocateRegistry;
-import java.rmi.registry.Registry;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.juddi.api_v3.AccessPointType;
-import org.apache.juddi.model.BindingTemplate;
-import org.uddi.api_v3.DispositionReport;
-import org.uddi.subr_v3.NotifySubscriptionListener;
-import org.uddi.v3_service.DispositionReportFaultMessage;
-import org.uddi.v3_service.UDDISubscriptionListenerPortType;
-
-public class RMINotifier implements Notifier {
-
- Log log = LogFactory.getLog(this.getClass());
- UDDISubscriptionListenerPortType subscriptionListenerPort = null;
-
- public RMINotifier(BindingTemplate bindingTemplate) throws IOException, URISyntaxException, NotBoundException {
- super();
- if (!AccessPointType.END_POINT.toString().equalsIgnoreCase(bindingTemplate.getAccessPointType())) {
- log.error("rmi enpoints only support AccessPointType " + AccessPointType.END_POINT);
- }
- String accessPointUrl = bindingTemplate.getAccessPointUrl().toLowerCase();
- if (!accessPointUrl.startsWith("rmi")) {
- log.warn("rmi accessPointUrl for bindingTemplate " + bindingTemplate.getEntityKey() +
- " should start with 'rmi'");
- }
- URI accessPointURI = new URI(accessPointUrl);
- String host = accessPointURI.getHost();
- int port = accessPointURI.getPort();
- String path = accessPointURI.getPath();
- log.debug("Connecting to " + host + ":" + port);
- Registry registry = LocateRegistry.getRegistry(host, port);
- subscriptionListenerPort = (UDDISubscriptionListenerPortType) registry.lookup(path);
- }
-
- public DispositionReport notifySubscriptionListener(NotifySubscriptionListener body) throws DispositionReportFaultMessage, RemoteException {
- return subscriptionListenerPort.notifySubscriptionListener(body);
- }
-}
diff --git a/juddi-core/src/main/java/org/apache/juddi/validation/ValidateNode.java b/juddi-core/src/main/java/org/apache/juddi/validation/ValidateNode.java
index 573f39b..1f6a203 100644
--- a/juddi-core/src/main/java/org/apache/juddi/validation/ValidateNode.java
+++ b/juddi-core/src/main/java/org/apache/juddi/validation/ValidateNode.java
@@ -114,16 +114,9 @@ public class ValidateNode extends ValidateUDDIApi {
throw new ValueNotAllowedException(new ErrorMessage("errors.node.illegalProxyTransport"));
}
}
- if (node.getProxyTransport().equalsIgnoreCase(org.apache.juddi.v3.client.transport.RMITransport.class.getCanonicalName())) {
- if (node.getFactoryInitial() == null || node.getFactoryInitial().length() == 0 || node.getFactoryInitial().length() > 255) {
- throw new ValueNotAllowedException(new ErrorMessage("errors.node.NoRMIData"));
- }
- if (node.getFactoryNamingProvider() == null || node.getFactoryNamingProvider().length() == 0 || node.getFactoryNamingProvider().length() > 255) {
- throw new ValueNotAllowedException(new ErrorMessage("errors.node.NoRMIData"));
- }
- if (node.getFactoryURLPkgs() == null || node.getFactoryURLPkgs().length() == 0 || node.getFactoryURLPkgs().length() > 255) {
- throw new ValueNotAllowedException(new ErrorMessage("errors.node.NoRMIDataF"));
- }
+ if (node.getProxyTransport().equalsIgnoreCase("org.apache.juddi.v3.client.transport.RMITransport")) {
+ throw new ValueNotAllowedException(new ErrorMessage("errors.node.NoRMIData"));
+
}
}
diff --git a/juddi-core/src/main/resources/juddi_install_data/UDDI_tModels.xml b/juddi-core/src/main/resources/juddi_install_data/UDDI_tModels.xml
index a4fe97e..2ec74dc 100644
--- a/juddi-core/src/main/resources/juddi_install_data/UDDI_tModels.xml
+++ b/juddi-core/src/main/resources/juddi_install_data/UDDI_tModels.xml
@@ -565,30 +565,7 @@
<keyedReference keyName="uddi-org:types:transport" keyValue="transport" tModelKey="uddi:uddi.org:categorization:types" />
</categoryBag>
</tModel>
- <tModel tModelKey="uddi:uddi.org:transport:rmi">
- <name>uddi-org:rmi</name>
- <description>Java RMI based service registered to the Java Registry</description>
- <overviewDoc>
- <overviewURL useType="text">
- http://juddi.apache.org/docs/3.0/userguide/html_single/index.html#sect-overRMI
- </overviewURL>
- </overviewDoc>
- <categoryBag>
- <keyedReference keyName="uddi-org:types:transport" keyValue="transport" tModelKey="uddi:uddi.org:categorization:types" />
- </categoryBag>
- </tModel>
- <tModel tModelKey="uddi:uddi.org:transport:jndi-rmi">
- <name>uddi-org:jndi-rmi</name>
- <description>A Java RMI based service registered to a JNDI Registry</description>
- <overviewDoc>
- <overviewURL useType="text">
- http://juddi.apache.org/docs/3.0/userguide/html_single/index.html#sect-overJNDIRMI
- </overviewURL>
- </overviewDoc>
- <categoryBag>
- <keyedReference keyName="uddi-org:types:transport" keyValue="transport" tModelKey="uddi:uddi.org:categorization:types" />
- </categoryBag>
- </tModel>
+
<tModel tModelKey="uddi:uddi.org:transport:amqp">
diff --git a/juddi-core/src/main/resources/messages.properties b/juddi-core/src/main/resources/messages.properties
index 76605ea..817f5c3 100644
--- a/juddi-core/src/main/resources/messages.properties
+++ b/juddi-core/src/main/resources/messages.properties
@@ -251,7 +251,7 @@ errors.node.NoSUB=A subscription url was not specified
errors.node.NoSec=A security url was not specified
errors.node.NoProxy=A transport proxy class must be specified. If you're not sure, use 'org.apache.juddi.v3.client.transport.JAXWSTransport'
errors.node.illegalProxyTransport=The transport proxy class is invalid. If you're not sure, use 'org.apache.juddi.v3.client.transport.JAXWSTransport'
-errors.node.NoRMIData=When using org.apache.juddi.v3.client.transport.RMITransport the factory settings must be specified
+errors.node.NoRMIData=When using org.apache.juddi.v3.client.transport.RMITransport is no longer supported.
#-- Authentication error messages
errors.auth.AuthRequired=Authentication is required for this API call
diff --git a/juddi-core/src/test/java/org/apache/juddi/api/impl/API_091_RMISubscriptionListenerIntegrationTest.java b/juddi-core/src/test/java/org/apache/juddi/api/impl/API_091_RMISubscriptionListenerIntegrationTest.java
deleted file mode 100644
index 35c98d2..0000000
--- a/juddi-core/src/test/java/org/apache/juddi/api/impl/API_091_RMISubscriptionListenerIntegrationTest.java
+++ /dev/null
@@ -1,173 +0,0 @@
-package org.apache.juddi.api.impl;
-
-/*
- * Copyright 2001-2009 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-import java.net.URI;
-import java.rmi.AccessException;
-import java.rmi.NotBoundException;
-import java.rmi.RemoteException;
-import java.rmi.registry.LocateRegistry;
-import java.rmi.registry.Registry;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.Random;
-
-import org.apache.commons.configuration.ConfigurationException;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.juddi.api.util.SubscriptionListenerQuery;
-import org.apache.juddi.v3.tck.TckBusiness;
-import org.apache.juddi.v3.tck.TckBusinessService;
-import org.apache.juddi.v3.tck.TckPublisher;
-import org.apache.juddi.v3.tck.TckSecurity;
-import org.apache.juddi.v3.tck.TckSubscriptionListener;
-import org.apache.juddi.v3.tck.TckSubscriptionListenerRMI;
-import org.apache.juddi.v3.tck.TckTModel;
-import org.apache.juddi.v3.tck.UDDISubscriptionListenerImpl;
-import org.junit.AfterClass;
-import org.junit.Assert;
-import org.junit.BeforeClass;
-import org.junit.Test;
-import org.uddi.v3_service.UDDISecurityPortType;
-
-/**
- * @author <a href="mailto:tcunning@apache.org">Tom Cunningham</a>
- */
-public class API_091_RMISubscriptionListenerIntegrationTest
-{
-
- private static Log logger = LogFactory.getLog(API_090_SubscriptionListenerIntegrationTest.class);
- private static API_010_PublisherTest api010 = new API_010_PublisherTest();
- private static TckTModel tckTModel = new TckTModel(new UDDIPublicationImpl(), new UDDIInquiryImpl());
- private static TckBusiness tckBusiness = new TckBusiness(new UDDIPublicationImpl(), new UDDIInquiryImpl());
- private static TckBusinessService tckBusinessService = new TckBusinessService(new UDDIPublicationImpl(), new UDDIInquiryImpl());
- private static TckSubscriptionListenerRMI tckSubscriptionListenerRMI = new TckSubscriptionListenerRMI(new UDDISubscriptionImpl(), new UDDIPublicationImpl());
-
- private static String authInfoJoe = null;
- //private static UDDIClient manager;
- private static UDDISubscriptionListenerImpl rmiSubscriptionListenerService = null;
- private static Registry registry;
- private static String path = null;
- private static Integer randomPort = null;
-
- @AfterClass
- public static void stopManager() throws ConfigurationException, AccessException, RemoteException, NotBoundException {
- //manager.stop();
- //shutting down the TCK SubscriptionListener
- registry.unbind(path);
- org.apache.juddi.Registry.stop();
- }
-
- @BeforeClass
- public static void startManager() throws ConfigurationException {
- org.apache.juddi.Registry.start();
- try {
- //random port
- randomPort = 19800 + new Random().nextInt(99);
- System.out.println("RMI Random port=" + randomPort);
- //bring up the RMISubscriptionListener
- URI rmiEndPoint = new URI("rmi://localhost:" + randomPort + "/tck/rmisubscriptionlistener");
- registry = LocateRegistry.createRegistry(rmiEndPoint.getPort());
- path = rmiEndPoint.getPath();
-
- //starting the service
- rmiSubscriptionListenerService = new UDDISubscriptionListenerImpl(0);
- //binding to the RMI Registry
- registry.bind(path,rmiSubscriptionListenerService);
-
- //double check that the service is bound in the local Registry
- Registry registry2 = LocateRegistry.getRegistry(rmiEndPoint.getHost(), rmiEndPoint.getPort());
- registry2.lookup(rmiEndPoint.getPath());
-
-
- } catch (Exception e2) {
- e2.printStackTrace();
- Assert.fail();
- }
-
- //manager = new UDDIClient();
- //manager.start();
-
- logger.debug("Getting auth tokens..");
- try {
-
- api010.saveJoePublisher();
- UDDISecurityPortType security = new UDDISecurityImpl();
- authInfoJoe = TckSecurity.getAuthToken(security, TckPublisher.getJoePublisherId(), TckPublisher.getJoePassword());
- Assert.assertNotNull(authInfoJoe);
-
- } catch (Exception e) {
- logger.error(e.getMessage(), e);
- Assert.fail("Could not obtain authInfo token.");
- }
- }
-
- @Test
- public void joePublisher() {
- try {
- UDDISubscriptionListenerImpl.notifcationMap.clear();
- UDDISubscriptionListenerImpl.notificationCount=0;
- tckTModel.saveJoePublisherTmodel(authInfoJoe);
- tckBusiness.saveJoePublisherBusiness(authInfoJoe);
- tckBusinessService.saveJoePublisherService(authInfoJoe);
- //Saving the Listener Service
- tckSubscriptionListenerRMI.saveService(authInfoJoe, TckSubscriptionListener.LISTENER_RMI_SERVICE_XML, randomPort, "localhost");
- //Saving the Subscription
- tckSubscriptionListenerRMI.saveNotifierSubscription(authInfoJoe, TckSubscriptionListenerRMI.SUBSCRIPTION_XML_RMI);
- //Changing the service we subscribed to "JoePublisherService"
- tckBusinessService.updateJoePublisherService(authInfoJoe, "foo");
-
- //waiting up to 100 seconds for the listener to notice the change.
- boolean found=API_090_SubscriptionListenerIntegrationTest.verifyDelivery("Service One");
- if (!found)
- {
- logger.warn("The test failed, dumping any received notifications");
- Iterator<Map.Entry<Integer, String>> iterator = UDDISubscriptionListenerImpl.notifcationMap.entrySet().iterator();
- while (iterator.hasNext()){
- logger.info("Notification RX: " +iterator.next().getValue());
- }
- }
- Assert.assertTrue("Notification failed " +UDDISubscriptionListenerImpl.notificationCount + " items returned" , found);
- /*String test="";
- for (int i=0; i<200; i++) {
- Thread.sleep(500);
- System.out.print(".");
- if (UDDISubscriptionListenerImpl.notificationCount > 0) {
- break;
- } else {
- System.out.print(test);
- }
- }
- if (UDDISubscriptionListenerImpl.notificationCount == 0) {
- Assert.fail("No Notification was sent");
- }
- if (!UDDISubscriptionListenerImpl.notifcationMap.get(0).contains("foo")) {
- Assert.fail("Notification does not contain the correct service");
- }*/
-
- } catch (Exception e) {
- e.printStackTrace();
-
- Assert.fail();
- } finally {
-
- tckSubscriptionListenerRMI.deleteNotifierSubscription(authInfoJoe, TckSubscriptionListenerRMI.SUBSCRIPTION_KEY_RMI);
- tckBusinessService.deleteJoePublisherService(authInfoJoe);
- tckBusiness.deleteJoePublisherBusiness(authInfoJoe);
- tckTModel.deleteJoePublisherTmodel(authInfoJoe);
- }
- }
-
-}
diff --git a/juddi-core/src/test/java/org/apache/juddi/rmi/JNDIRegistrationTest.java b/juddi-core/src/test/java/org/apache/juddi/rmi/JNDIRegistrationTest.java
deleted file mode 100644
index efd369e..0000000
--- a/juddi-core/src/test/java/org/apache/juddi/rmi/JNDIRegistrationTest.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * Copyright 2001-2010 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.juddi.rmi;
-
-import org.apache.commons.configuration.ConfigurationException;
-import org.junit.Assert;
-import org.junit.Test;
-import org.mockejb.jndi.MockContextFactory;
-
-/**
- * @author <a href="mailto:kstam@apache.org">Kurt T Stam</a>
- */
-public class JNDIRegistrationTest
-{
- @Test
- public void registerToJNDI_AnonymousPort() throws ConfigurationException
- {
- try {
- MockContextFactory.setAsInitial();
- //register all jUDDI services, under an anonymous port
- JNDIRegistration.getInstance().register(0);
- JNDIRegistration.getInstance().unregister();
-
- } catch (Exception e) {
- e.printStackTrace();
- Assert.fail();
- }
- }
-
- @Test
- public void registerToJNDI_UserDefinedPort() throws ConfigurationException
- {
- try {
- MockContextFactory.setAsInitial();
- //register all jUDDI services, under an use defined port
- JNDIRegistration.getInstance().register(34567);
- JNDIRegistration.getInstance().unregister();
-
- } catch (Exception e) {
- e.printStackTrace();
- Assert.fail();
- }
- }
-
-
-}
diff --git a/juddi-core/src/test/java/org/apache/juddi/subscription/notify/NotifierTest.java b/juddi-core/src/test/java/org/apache/juddi/subscription/notify/NotifierTest.java
index 8411157..dfcfa12 100644
--- a/juddi-core/src/test/java/org/apache/juddi/subscription/notify/NotifierTest.java
+++ b/juddi-core/src/test/java/org/apache/juddi/subscription/notify/NotifierTest.java
@@ -57,37 +57,7 @@ public class NotifierTest
Assert.assertEquals(SMTPNotifier.class, notifier.getClass());
}
- //Expected error because we can't connect to the registry on localhost:11099
- @Test(expected=java.lang.reflect.InvocationTargetException.class)
- public void testRMINotifier() throws IllegalArgumentException, SecurityException, URISyntaxException, InstantiationException, IllegalAccessException, InvocationTargetException, NoSuchMethodException, ClassNotFoundException {
- BindingTemplate bindingTemplate = new BindingTemplate();
- bindingTemplate.setEntityKey("uddi:uddi.joepublisher.com:bindingnotifier");
- bindingTemplate.setAccessPointType(AccessPointType.END_POINT.toString());
- bindingTemplate.setAccessPointUrl("rmi://localhost:11099/tcksubscriptionlistener");
- TmodelInstanceInfo instanceInfo = new TmodelInstanceInfo();
- instanceInfo.setTmodelKey("uddi:uddi.org:transport:rmi");
- bindingTemplate.getTmodelInstanceInfos().add(instanceInfo);
-
- Notifier notifier = new NotifierFactory().getNotifier(bindingTemplate);
-
- Assert.assertEquals(RMINotifier.class, notifier.getClass());
- }
- //Expected error because we did not specify a correct InitialContext
- @Test(expected=java.lang.reflect.InvocationTargetException.class)
- public void testJNDIRMINotifier() throws IllegalArgumentException, SecurityException, URISyntaxException, InstantiationException, IllegalAccessException, InvocationTargetException, NoSuchMethodException, ClassNotFoundException {
- BindingTemplate bindingTemplate = new BindingTemplate();
- bindingTemplate.setEntityKey("uddi:uddi.joepublisher.com:bindingnotifier");
- bindingTemplate.setAccessPointType(AccessPointType.END_POINT.toString());
- bindingTemplate.setAccessPointUrl("jndi-rmi://localhost:11099/tcksubscriptionlistener");
- TmodelInstanceInfo instanceInfo = new TmodelInstanceInfo();
- instanceInfo.setTmodelKey("uddi:uddi.org:transport:jndi-rmi");
- bindingTemplate.getTmodelInstanceInfos().add(instanceInfo);
-
- Notifier notifier = new NotifierFactory().getNotifier(bindingTemplate);
-
- Assert.assertEquals(JNDI_RMINotifier.class, notifier.getClass());
- }
-
+
}
diff --git a/juddi-ddl-generator/src/main/java/org/apache/juddi/ddl/generator/App.java b/juddi-ddl-generator/src/main/java/org/apache/juddi/ddl/generator/App.java
index 62ed94c..daae98d 100644
--- a/juddi-ddl-generator/src/main/java/org/apache/juddi/ddl/generator/App.java
+++ b/juddi-ddl-generator/src/main/java/org/apache/juddi/ddl/generator/App.java
@@ -50,7 +50,7 @@ import org.hibernate.tool.schema.TargetType;
*/
public class App {
- private List<Class> jpaClasses = new ArrayList<>();
+ private List<Class> jpaClasses = new ArrayList<Class>();
public App() {
@@ -59,7 +59,7 @@ public class App {
//initial from the current class path
private void initialJpsClassList(String packageName) throws Exception {
Package pk = Package.getPackage(packageName);
- List<Class> classesForPackage = new ArrayList<>();
+ List<Class> classesForPackage = new ArrayList<Class>();
if (pk != null) {
classesForPackage.addAll(getClassesForPackage(pk));
} else {
diff --git a/juddi-examples/create-partition/src/main/java/org/apache/juddi/example/partition/SimpleCreateTmodelPartition.java b/juddi-examples/create-partition/src/main/java/org/apache/juddi/example/partition/SimpleCreateTmodelPartition.java
index 0bf40b9..ff8da05 100644
--- a/juddi-examples/create-partition/src/main/java/org/apache/juddi/example/partition/SimpleCreateTmodelPartition.java
+++ b/juddi-examples/create-partition/src/main/java/org/apache/juddi/example/partition/SimpleCreateTmodelPartition.java
@@ -57,7 +57,7 @@ public class SimpleCreateTmodelPartition {
// a UddiClient can be a client to multiple UDDI nodes, so
// supply the nodeName (defined in your uddi.xml.
- // The transport can be WS, inVM, RMI etc which is defined in the uddi.xml
+ // The transport can be WS, inVM etc which is defined in the uddi.xml
Transport transport = uddiClient.getTransport("default");
// Now you create a reference to the UDDI API
diff --git a/juddi-examples/hello-world-embedded/src/main/java/org/apache/juddi/example/helloworld/HelloWorld.java b/juddi-examples/hello-world-embedded/src/main/java/org/apache/juddi/example/helloworld/HelloWorld.java
index 823e1bf..5d24f70 100644
--- a/juddi-examples/hello-world-embedded/src/main/java/org/apache/juddi/example/helloworld/HelloWorld.java
+++ b/juddi-examples/hello-world-embedded/src/main/java/org/apache/juddi/example/helloworld/HelloWorld.java
@@ -42,7 +42,7 @@ public class HelloWorld {
UDDIClient uddiClient = new UDDIClient("META-INF/embedded-uddi.xml");
// a UddiClient can be a client to multiple UDDI nodes, so
// supply the nodeName (defined in your uddi.xml.
- // The transport can be WS, inVM, RMI etc which is defined in the uddi.xml
+ // The transport can be WS, inVM etc which is defined in the uddi.xml
Transport transport = uddiClient.getTransport("default");
// Now you create a reference to the UDDI API
security = transport.getUDDISecurityService();
diff --git a/juddi-examples/hello-world/src/main/java/org/apache/juddi/example/helloworld/HelloWorld.java b/juddi-examples/hello-world/src/main/java/org/apache/juddi/example/helloworld/HelloWorld.java
index a7f06c3..2fad55f 100644
--- a/juddi-examples/hello-world/src/main/java/org/apache/juddi/example/helloworld/HelloWorld.java
+++ b/juddi-examples/hello-world/src/main/java/org/apache/juddi/example/helloworld/HelloWorld.java
@@ -40,7 +40,7 @@ public class HelloWorld {
UDDIClient uddiClient = new UDDIClient("META-INF/hello-world-uddi.xml");
// a UddiClient can be a client to multiple UDDI nodes, so
// supply the nodeName (defined in your uddi.xml.
- // The transport can be WS, inVM, RMI etc which is defined in the uddi.xml
+ // The transport can be WS, inVM etc which is defined in the uddi.xml
Transport transport = uddiClient.getTransport("default");
// Now you create a reference to the UDDI API
security = transport.getUDDISecurityService();
diff --git a/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/BusinessServiceKeymismatch.java b/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/BusinessServiceKeymismatch.java
index ff6bea5..6d08c85 100644
--- a/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/BusinessServiceKeymismatch.java
+++ b/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/BusinessServiceKeymismatch.java
@@ -54,7 +54,7 @@ public class BusinessServiceKeymismatch {
// create a manager and read the config in the archive;
// you can use your config file name
UDDIClient clerkManager = new UDDIClient("META-INF/simple-publish-uddi.xml");
- // The transport can be WS, inVM, RMI etc which is defined in the uddi.xml
+ // The transport can be WS, inVM etc which is defined in the uddi.xml
Transport transport = clerkManager.getTransport("default");
// Now you create a reference to the UDDI API
security = transport.getUDDISecurityService();
diff --git a/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/FindBusinessBugHunt.java b/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/FindBusinessBugHunt.java
index 3e2fbff..657d961 100644
--- a/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/FindBusinessBugHunt.java
+++ b/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/FindBusinessBugHunt.java
@@ -68,7 +68,7 @@ public class FindBusinessBugHunt {
// a ClerkManager can be a client to multiple UDDI nodes, so
// supply the nodeName (defined in your uddi.xml.
- // The transport can be WS, inVM, RMI etc which is defined in the uddi.xml
+ // The transport can be WS, inVM etc which is defined in the uddi.xml
Transport transport = clerkManager.getTransport();
// Now you create a reference to the UDDI API
security = transport.getUDDISecurityService();
diff --git a/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/JuddiAdminService.java b/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/JuddiAdminService.java
index 1ed62db..7afbc9e 100644
--- a/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/JuddiAdminService.java
+++ b/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/JuddiAdminService.java
@@ -72,7 +72,7 @@ public class JuddiAdminService {
// you can use your config file name
// clerkManager = new UDDIClient("META-INF/simple-publish-uddi.xml");
//clerk = clerkManager.getClerk("default");
- // The transport can be WS, inVM, RMI etc which is defined in the uddi.xml
+ // The transport can be WS, inVM etc which is defined in the uddi.xml
{
transport = clerkManager.getTransport();
juddi = transport.getJUDDIApiService();
@@ -111,7 +111,7 @@ public class JuddiAdminService {
// you can use your config file name
// clerkManager = new UDDIClient("META-INF/simple-publish-uddi.xml");
//clerk = clerkManager.getClerk("default");
- // The transport can be WS, inVM, RMI etc which is defined in the uddi.xml
+ // The transport can be WS, inVM etc which is defined in the uddi.xml
{
transport = clerkManager.getTransport();
}
diff --git a/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/SimpleBrowse.java b/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/SimpleBrowse.java
index cb62e1b..3c4348e 100644
--- a/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/SimpleBrowse.java
+++ b/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/SimpleBrowse.java
@@ -62,7 +62,7 @@ public class SimpleBrowse {
UDDIClient client = new UDDIClient("META-INF/simple-browse-uddi.xml");
// a UDDIClient can be a client to multiple UDDI nodes, so
// supply the nodeName (defined in your uddi.xml.
- // The transport can be WS, inVM, RMI etc which is defined in the uddi.xml
+ // The transport can be WS, inVM etc which is defined in the uddi.xml
Transport transport = client.getTransport("default");
// Now you create a reference to the UDDI API
security = transport.getUDDISecurityService();
diff --git a/juddi-examples/service-version/src/main/java/org/apache/juddi/examples/service/version/ServiceVersioningExample.java b/juddi-examples/service-version/src/main/java/org/apache/juddi/examples/service/version/ServiceVersioningExample.java
index 26f34f0..f8c0435 100644
--- a/juddi-examples/service-version/src/main/java/org/apache/juddi/examples/service/version/ServiceVersioningExample.java
+++ b/juddi-examples/service-version/src/main/java/org/apache/juddi/examples/service/version/ServiceVersioningExample.java
@@ -179,7 +179,7 @@ public class ServiceVersioningExample {
clerk = client.getClerk("default");
// a UddiClient can be a client to multiple UDDI nodes, so
// supply the nodeName (defined in your uddi.xml.
- // The transport can be WS, inVM, RMI etc which is defined in the uddi.xml
+ // The transport can be WS, inVM etc which is defined in the uddi.xml
Transport transport = client.getTransport("default");
// Now you create a reference to the UDDI API
security = transport.getUDDISecurityService();
diff --git a/juddi-examples/simple-browse/src/main/java/org/apache/juddi/example/browse/SimpleBrowse.java b/juddi-examples/simple-browse/src/main/java/org/apache/juddi/example/browse/SimpleBrowse.java
index 0bd8085..ee844c2 100644
--- a/juddi-examples/simple-browse/src/main/java/org/apache/juddi/example/browse/SimpleBrowse.java
+++ b/juddi-examples/simple-browse/src/main/java/org/apache/juddi/example/browse/SimpleBrowse.java
@@ -62,7 +62,7 @@ public class SimpleBrowse {
UDDIClient client = new UDDIClient("META-INF/simple-browse-uddi.xml");
// a UDDIClient can be a client to multiple UDDI nodes, so
// supply the nodeName (defined in your uddi.xml.
- // The transport can be WS, inVM, RMI etc which is defined in the uddi.xml
+ // The transport can be WS, inVM etc which is defined in the uddi.xml
Transport transport = client.getTransport("default");
// Now you create a reference to the UDDI API
security = transport.getUDDISecurityService();
diff --git a/juddi-examples/simple-publish-portable/src/main/java/org/apache/juddi/example/publish/SimplePublishPortable.java b/juddi-examples/simple-publish-portable/src/main/java/org/apache/juddi/example/publish/SimplePublishPortable.java
index 3a4b886..460dd52 100644
--- a/juddi-examples/simple-publish-portable/src/main/java/org/apache/juddi/example/publish/SimplePublishPortable.java
+++ b/juddi-examples/simple-publish-portable/src/main/java/org/apache/juddi/example/publish/SimplePublishPortable.java
@@ -42,7 +42,7 @@ public class SimplePublishPortable {
UDDIClient uddiClient = new UDDIClient("META-INF/uddi.xml");
// a UddiClient can be a client to multiple UDDI nodes, so
// supply the nodeName (defined in your uddi.xml.
- // The transport can be WS, inVM, RMI etc which is defined in the uddi.xml
+ // The transport can be WS, inVM etc which is defined in the uddi.xml
Transport transport = uddiClient.getTransport("default");
// Now you create a reference to the UDDI API
security = transport.getUDDISecurityService();
diff --git a/juddi-examples/uddiv2-api-bridge-example/src/main/java/org/apache/juddi/example/uddiv2/api/bridge/example/SimpleBrowseUDDIv2.java b/juddi-examples/uddiv2-api-bridge-example/src/main/java/org/apache/juddi/example/uddiv2/api/bridge/example/SimpleBrowseUDDIv2.java
index a2d8794..da8e2f1 100644
--- a/juddi-examples/uddiv2-api-bridge-example/src/main/java/org/apache/juddi/example/uddiv2/api/bridge/example/SimpleBrowseUDDIv2.java
+++ b/juddi-examples/uddiv2-api-bridge-example/src/main/java/org/apache/juddi/example/uddiv2/api/bridge/example/SimpleBrowseUDDIv2.java
@@ -72,7 +72,7 @@ public class SimpleBrowseUDDIv2 {
UDDIClient client = new UDDIClient("META-INF/uddiv2-browse-uddi.xml");
// a UDDIClient can be a client to multiple UDDI nodes, so
// supply the nodeName (defined in your uddi.xml.
- // The transport can be WS, inVM, RMI etc which is defined in the uddi.xml
+ // The transport can be WS, inVM etc which is defined in the uddi.xml
Transport transport = client.getTransport("default");
// Now you create a reference to the UDDI API
security = transport.getUDDISecurityService();
diff --git a/juddi-tomcat/juddi_install_data_node2/UDDI_tModels.xml b/juddi-tomcat/juddi_install_data_node2/UDDI_tModels.xml
index 9e2120e..2ce0344 100644
--- a/juddi-tomcat/juddi_install_data_node2/UDDI_tModels.xml
+++ b/juddi-tomcat/juddi_install_data_node2/UDDI_tModels.xml
@@ -565,33 +565,10 @@
<keyedReference keyName="uddi-org:types:transport" keyValue="transport" tModelKey="uddi:uddi.org:categorization:types" />
</categoryBag>
</tModel>
- <tModel tModelKey="uddi:uddi.org:transport:rmi">
- <name>uddi-org:rmi</name>
- <description>Java RMI based service registered to the Java Registry</description>
- <overviewDoc>
- <overviewURL useType="text">
- http://juddi.apache.org/docs/3.0/userguide/html_single/index.html#sect-overRMI
- </overviewURL>
- </overviewDoc>
- <categoryBag>
- <keyedReference keyName="uddi-org:types:transport" keyValue="transport" tModelKey="uddi:uddi.org:categorization:types" />
- </categoryBag>
- </tModel>
- <tModel tModelKey="uddi:uddi.org:transport:jndi-rmi">
- <name>uddi-org:jndi-rmi</name>
- <description>A Java RMI based service registered to a JNDI Registry</description>
- <overviewDoc>
- <overviewURL useType="text">
- http://juddi.apache.org/docs/3.0/userguide/html_single/index.html#sect-overJNDIRMI
- </overviewURL>
- </overviewDoc>
- <categoryBag>
- <keyedReference keyName="uddi-org:types:transport" keyValue="transport" tModelKey="uddi:uddi.org:categorization:types" />
- </categoryBag>
- </tModel>
- <tModel tModelKey="uddi:uddi.org:transport:amqp">
+
+ <tModel tModelKey="uddi:uddi.org:transport:amqp">
<name>uddi-org:amqp</name>
<description> A Web service that uses the AMQP transport</description>
<overviewDoc>
diff --git a/juddi-tomcat/juddi_install_data_node3/UDDI_tModels.xml b/juddi-tomcat/juddi_install_data_node3/UDDI_tModels.xml
index 9e2120e..42abe78 100644
--- a/juddi-tomcat/juddi_install_data_node3/UDDI_tModels.xml
+++ b/juddi-tomcat/juddi_install_data_node3/UDDI_tModels.xml
@@ -565,31 +565,7 @@
<keyedReference keyName="uddi-org:types:transport" keyValue="transport" tModelKey="uddi:uddi.org:categorization:types" />
</categoryBag>
</tModel>
- <tModel tModelKey="uddi:uddi.org:transport:rmi">
- <name>uddi-org:rmi</name>
- <description>Java RMI based service registered to the Java Registry</description>
- <overviewDoc>
- <overviewURL useType="text">
- http://juddi.apache.org/docs/3.0/userguide/html_single/index.html#sect-overRMI
- </overviewURL>
- </overviewDoc>
- <categoryBag>
- <keyedReference keyName="uddi-org:types:transport" keyValue="transport" tModelKey="uddi:uddi.org:categorization:types" />
- </categoryBag>
- </tModel>
- <tModel tModelKey="uddi:uddi.org:transport:jndi-rmi">
- <name>uddi-org:jndi-rmi</name>
- <description>A Java RMI based service registered to a JNDI Registry</description>
- <overviewDoc>
- <overviewURL useType="text">
- http://juddi.apache.org/docs/3.0/userguide/html_single/index.html#sect-overJNDIRMI
- </overviewURL>
- </overviewDoc>
- <categoryBag>
- <keyedReference keyName="uddi-org:types:transport" keyValue="transport" tModelKey="uddi:uddi.org:categorization:types" />
- </categoryBag>
- </tModel>
-
+
<tModel tModelKey="uddi:uddi.org:transport:amqp">
<name>uddi-org:amqp</name>
diff --git a/pom.xml b/pom.xml
index 54ab5c3..7c51d58 100644
--- a/pom.xml
+++ b/pom.xml
@@ -39,7 +39,6 @@ under the License.
</prerequisites>
<properties>
- <javadoc.extra.settings />
<sourceReleaseAssemblyDescriptor>source-release</sourceReleaseAssemblyDescriptor>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
@@ -246,14 +245,15 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
- <version>3.6</version>
+ <version>3.9.1</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
+ <version>3.3.0</version>
<configuration>
<aggregate>true</aggregate>
- <additionalparam>${javadoc.extra.settings}</additionalparam>
+ <doclint>none</doclint>
</configuration>
<executions>
<execution>
@@ -472,7 +472,12 @@ under the License.
<plugins>
<plugin>
<artifactId>maven-javadoc-plugin</artifactId>
- <version>3.1.1</version>
+ <version>3.2.0</version>
+ <configuration>
+ <doclint>none</doclint>
+ </configuration>
+
+
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -918,15 +923,7 @@ under the License.
</plugins>
</build>
</profile>
- <profile>
- <id>doclint-java8-disable</id>
- <activation>
- <jdk>[1.8,)</jdk>
- </activation>
- <properties>
- <javadoc.extra.settings>-Xdoclint:none</javadoc.extra.settings>
- </properties>
- </profile>
+
<!-- inherit from the apache parent: release-profile -->
<profile>
diff --git a/qa/juddi-xlt/src/META-INF/uddi.xml b/qa/juddi-xlt/src/META-INF/uddi.xml
index 445f232..6a31f79 100644
--- a/qa/juddi-xlt/src/META-INF/uddi.xml
+++ b/qa/juddi-xlt/src/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>
<name>med</name>
diff --git a/readme.txt b/readme.txt
index d5b5912..c7a1f1b 100644
--- a/readme.txt
+++ b/readme.txt
@@ -2,8 +2,8 @@ Welcome to the Apache JUDDI Project!
Here's some quick notes for building, testing and deploying JUDDI from source.
-1) Acquire a JDK5 or higher and setup the JAVA_HOME environment variable
-2) Acquire Apache Maven. Known working version: 3.0.4
+1) Acquire a JDK8 or higher and setup the JAVA_HOME environment variable
+2) Acquire Apache Maven. Known working version: 3.2.1 or newer
3) Setup an environment variable, MAVEN_OPTS=-Xmx768m -XX:MaxPermSize=512m
4) Make sure the Maven/bin folder and the JDK/bin folders are in the current path
5) execute "mvn clean install"
@@ -34,8 +34,8 @@ cd juddi-console
mvn clean install
To start Juddi's embedded Tomcat server:
-juddi-tomcat\target\tomcat\apache-tomcat-6.0.26\bin\startup.bat
-juddi-tomcat\target\tomcat\apache-tomcat-6.0.26\bin\startup.sh
+juddi-tomcat\target\tomcat\apache-tomcat-9.0.XX\bin\startup.bat
+juddi-tomcat\target\tomcat\apache-tomcat-9.0.XX\bin\startup.sh
To build the .NET components of jUDDI
cd juddi-client.net
diff --git a/src/site/markdown/index.md b/src/site/markdown/index.md
index 9b13b0f..2df1573 100644
--- a/src/site/markdown/index.md
+++ b/src/site/markdown/index.md
@@ -43,6 +43,8 @@ jUDDI (pronounced "Judy") is an open source Java implementation of [OASIS](https
## News
+Aug 18, 2020, jUDDI Release 3.3.9
+
Mar 15, 2020, jUDDI Release 3.3.8
Jan 11, 2020, jUDDI Release 3.3.7
diff --git a/src/site/markdown/releases.md b/src/site/markdown/releases.md
index 3f48fd3..494caf2 100644
--- a/src/site/markdown/releases.md
+++ b/src/site/markdown/releases.md
@@ -4,7 +4,7 @@ Title: Downloads and Releases
| Name | Date | Description |
| --- | --- | --- |
-| [3.3.8](http://www.apache.org/dyn/closer.cgi/juddi/juddi/3.3.8/) | Mar 15, 2020 | Stable 3.3.8 Release | |
+| [3.3.9](http://www.apache.org/dyn/closer.cgi/juddi/juddi/3.3.9/) | Aug 18, 2020 | Stable 3.3.9 Release | |
| [Older releases](http://archive.apache.org/dist/juddi/) | | Archived Releases |
diff --git a/uddi-migration-tool/src/main/java/org/apache/juddi/v3/migration/tool/Export.java b/uddi-migration-tool/src/main/java/org/apache/juddi/v3/migration/tool/Export.java
index 5451b2f..72ca8cf 100644
--- a/uddi-migration-tool/src/main/java/org/apache/juddi/v3/migration/tool/Export.java
+++ b/uddi-migration-tool/src/main/java/org/apache/juddi/v3/migration/tool/Export.java
@@ -98,7 +98,7 @@ public class Export {
UDDIClerk clerk = clerkManager.getClerk(name);
// a ClerkManager can be a client to multiple UDDI nodes, so
// supply the nodeName (defined in your uddi.xml.
- // The transport can be WS, inVM, RMI etc which is defined in the uddi.xml
+ // The transport can be WS, inVM, etc which is defined in the uddi.xml
Transport transport = clerkManager.getTransport(name);
// Now you create a reference to the UDDI API
security = transport.getUDDISecurityService();
diff --git a/uddi-migration-tool/src/main/java/org/apache/juddi/v3/migration/tool/Import.java b/uddi-migration-tool/src/main/java/org/apache/juddi/v3/migration/tool/Import.java
index f78a1ac..2630e0b 100644
--- a/uddi-migration-tool/src/main/java/org/apache/juddi/v3/migration/tool/Import.java
+++ b/uddi-migration-tool/src/main/java/org/apache/juddi/v3/migration/tool/Import.java
@@ -98,7 +98,7 @@ public class Import {
UDDIClerk clerk = clerkManager.getClerk(name);
// a ClerkManager can be a client to multiple UDDI nodes, so
// supply the nodeName (defined in your uddi.xml.
- // The transport can be WS, inVM, RMI etc which is defined in the uddi.xml
+ // The transport can be WS, inVM, etc which is defined in the uddi.xml
Transport transport = clerkManager.getTransport(name);
// Now you create a reference to the UDDI API
security = transport.getUDDISecurityService();
diff --git a/uddi-tck-base/src/main/java/org/apache/juddi/v2/tck/TckPublisher.java b/uddi-tck-base/src/main/java/org/apache/juddi/v2/tck/TckPublisher.java
index f06c5c9..cb77524 100644
--- a/uddi-tck-base/src/main/java/org/apache/juddi/v2/tck/TckPublisher.java
+++ b/uddi-tck-base/src/main/java/org/apache/juddi/v2/tck/TckPublisher.java
@@ -190,11 +190,8 @@ public class TckPublisher {
return false;
}
+ @Deprecated
public static boolean isRMI() {
- String x = tckProperties.getProperty("rmi.enabled");
- if (x.equalsIgnoreCase("true")) {
- return true;
- }
return false;
}
diff --git a/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/TckPublisher.java b/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/TckPublisher.java
index da6e4f1..22eb290 100644
--- a/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/TckPublisher.java
+++ b/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/TckPublisher.java
@@ -169,9 +169,9 @@ public class TckPublisher {
return "true".equalsIgnoreCase(x);
}
+ @Deprecated
public static boolean isRMI() {
- String x = tckProperties.getProperty("rmi.enabled");
- return "true".equalsIgnoreCase(x);
+ return false;
}
public static boolean isLoadTest() {
diff --git a/uddi-tck-base/src/main/resources/tck.properties b/uddi-tck-base/src/main/resources/tck.properties
index 9a8cf1b..2e8be44 100644
--- a/uddi-tck-base/src/main/resources/tck.properties
+++ b/uddi-tck-base/src/main/resources/tck.properties
@@ -32,8 +32,6 @@ riftsaw.password = riftsaw
#if this is a jUDDI server, use true, otherwise false
isJuddi = true
-# does the UDDI server support RMI transport?
-rmi.enabled=true
#authentication mechanism, uddi=auth token, http for everything else.
# in general, MS UDDI = HTTP, all others use Auth Token
diff --git a/uddi-tck-base/src/main/resources/uddi_data/subscriptionnotifier/listenerServiceRMI.xml b/uddi-tck-base/src/main/resources/uddi_data/subscriptionnotifier/listenerServiceRMI.xml
deleted file mode 100644
index 902533d..0000000
--- a/uddi-tck-base/src/main/resources/uddi_data/subscriptionnotifier/listenerServiceRMI.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Copyright 2001-2009 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */ -->
-<businessService xmlns="urn:uddi-org:api_v3" xmlns:xml="http://www.w3.org/XML/1998/namespace"
- businessKey="uddi:uddi.joepublisher.com:businessone" serviceKey="uddi:uddi.joepublisher.com:listeneronermi">
- <name xml:lang="en">Listener One RMI</name>
- <name xml:lang="es">Listener Uno RMI </name>
- <description xml:lang="en">This is the description of listener one rmi.</description>
- <description xml:lang="es">Ésta es la descripción del listener uno rmi.</description>
- <bindingTemplates>
- <bindingTemplate xmlns="urn:uddi-org:api_v3" bindingKey="uddi:uddi.joepublisher.com:bindinglistenerrmi">
- <description xml:lang="en">This is the endpoint for the RMI subscription listener</description>
- <accessPoint useType="endPoint">rmi://localhost:{randomPort}/tck/rmisubscriptionlistener</accessPoint>
- <tModelInstanceDetails>
- <tModelInstanceInfo tModelKey="uddi:uddi.org:transport:rmi" />
- </tModelInstanceDetails>
- <categoryBag>
- <keyedReference tModelKey="uddi:uddi.org:transport:telephone" keyName="category" keyValue="secure" />
- </categoryBag>
- </bindingTemplate>
- </bindingTemplates>
- <categoryBag>
- <keyedReference tModelKey="uddi:uddi.org:transport:telephone" keyName="category" keyValue="peaches" />
- <keyedReference tModelKey="uddi:uddi.org:transport:telephone" keyName="category" keyValue="plums" />
- <keyedReferenceGroup tModelKey="uddi:uddi.org:transport:telephone">
- <keyedReference tModelKey="uddi:uddi.org:transport:telephone" keyName="blank" keyValue="blank" />
- </keyedReferenceGroup>
- </categoryBag>
-</businessService>
diff --git a/uddi-tck-base/src/main/resources/uddi_data/subscriptionnotifier/subscription1RMI.xml b/uddi-tck-base/src/main/resources/uddi_data/subscriptionnotifier/subscription1RMI.xml
deleted file mode 100644
index 37c34e9..0000000
--- a/uddi-tck-base/src/main/resources/uddi_data/subscriptionnotifier/subscription1RMI.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Copyright 2001-2009 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
--->
-<subscription xmlns="urn:uddi-org:sub_v3">
- <subscriptionKey>uddi:uddi.joepublisher.com:subscriptiononermi</subscriptionKey>
- <subscriptionFilter>
- <find_service xmlns="urn:uddi-org:api_v3" xmlns:xml="http://www.w3.org/XML/1998/namespace">
- <findQualifiers>
- <findQualifier>exactMatch</findQualifier>
- </findQualifiers>
- <name xml:lang="en">Service One</name>
- </find_service>
- </subscriptionFilter>
- <bindingKey xmlns="urn:uddi-org:api_v3">uddi:uddi.joepublisher.com:bindinglistenerrmi</bindingKey>
- <notificationInterval>PT5S</notificationInterval>
- <maxEntities>1000</maxEntities>
-</subscription>
diff --git a/uddi-tck-base/src/main/resources/uddi_data/subscriptionnotifier/subscription2RMI.xml b/uddi-tck-base/src/main/resources/uddi_data/subscriptionnotifier/subscription2RMI.xml
deleted file mode 100644
index 8554504..0000000
--- a/uddi-tck-base/src/main/resources/uddi_data/subscriptionnotifier/subscription2RMI.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Copyright 2001-2009 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
--->
-<subscription xmlns="urn:uddi-org:sub_v3">
- <subscriptionKey>uddi:uddi.joepublisher.com:subscriptiononermi</subscriptionKey>
- <subscriptionFilter>
- <find_business xmlns="urn:uddi-org:api_v3" xmlns:xml="http://www.w3.org/XML/1998/namespace">
- <findQualifiers>
- <findQualifier>approximateMatch</findQualifier>
- </findQualifiers>
- <name >%</name>
- </find_business>
- </subscriptionFilter>
- <bindingKey xmlns="urn:uddi-org:api_v3">uddi:uddi.joepublisher.com:bindinglistenerrmi</bindingKey>
- <notificationInterval>PT5S</notificationInterval>
- <maxEntities>1000</maxEntities>
-</subscription>
diff --git a/uddi-tck-base/src/main/resources/uddi_data/subscriptionnotifier/subscription3RMI.xml b/uddi-tck-base/src/main/resources/uddi_data/subscriptionnotifier/subscription3RMI.xml
deleted file mode 100644
index bb87c02..0000000
--- a/uddi-tck-base/src/main/resources/uddi_data/subscriptionnotifier/subscription3RMI.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Copyright 2001-2009 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
--->
-<subscription xmlns="urn:uddi-org:sub_v3">
- <subscriptionKey>uddi:uddi.joepublisher.com:subscriptiononermi</subscriptionKey>
- <subscriptionFilter>
- <find_tModel xmlns="urn:uddi-org:api_v3" xmlns:xml="http://www.w3.org/XML/1998/namespace">
- <findQualifiers>
- <findQualifier>exactMatch</findQualifier>
- </findQualifiers>
- <name xml:lang="en">tModel One</name>
- </find_tModel>
- </subscriptionFilter>
- <bindingKey xmlns="urn:uddi-org:api_v3">uddi:uddi.joepublisher.com:bindinglistenerrmi</bindingKey>
- <notificationInterval>PT5S</notificationInterval>
- <maxEntities>1000</maxEntities>
-</subscription>
diff --git a/uddi-tck-runner/src/main/java/org/apache/juddi/tckrunner/App.java b/uddi-tck-runner/src/main/java/org/apache/juddi/tckrunner/App.java
index b2b9077..98ec307 100644
--- a/uddi-tck-runner/src/main/java/org/apache/juddi/tckrunner/App.java
+++ b/uddi-tck-runner/src/main/java/org/apache/juddi/tckrunner/App.java
@@ -92,8 +92,6 @@ public class App {
//org.apache.juddi.v3.tck.UDDI_090_SubscriptionListenerExternalTest.class,
org.apache.juddi.v3.tck.UDDI_090_HttpExternalTest.class,
org.apache.juddi.v3.tck.UDDI_090_Smtp_ExternalTest.class,
- org.apache.juddi.v3.tck.UDDI_090_RMIIntegrationTest.class,
- //org.apache.juddi.v3.tck.JUDDI_091_RMISubscriptionListenerIntegrationTest.class,
org.apache.juddi.v3.tck.UDDI_110_FindBusinessIntegrationTest.class,
org.apache.juddi.v3.tck.UDDI_120_CombineCategoryBagsFindServiceIntegrationTest.class,
diff --git a/uddi-tck-runner/tck.properties b/uddi-tck-runner/tck.properties
index 14b9417..0b69ea9 100644
--- a/uddi-tck-runner/tck.properties
+++ b/uddi-tck-runner/tck.properties
@@ -18,9 +18,7 @@ riftsaw.password = riftsaw
#if this is a jUDDI server, use true, otherwise false
isJuddi = true
-# does the UDDI server support RMI transport?
-rmi.enabled=true
-
+rmi.enabled
#authentication mechanism, uddi=auth token, http for everything else.
# in general, MS UDDI = HTTP, all others use Auth Token
auth_mode = uddi
diff --git a/uddi-tck/juddi_install_data_node2/UDDI_tModels.xml b/uddi-tck/juddi_install_data_node2/UDDI_tModels.xml
index 9e2120e..9e4b08a 100644
--- a/uddi-tck/juddi_install_data_node2/UDDI_tModels.xml
+++ b/uddi-tck/juddi_install_data_node2/UDDI_tModels.xml
@@ -565,30 +565,7 @@
<keyedReference keyName="uddi-org:types:transport" keyValue="transport" tModelKey="uddi:uddi.org:categorization:types" />
</categoryBag>
</tModel>
- <tModel tModelKey="uddi:uddi.org:transport:rmi">
- <name>uddi-org:rmi</name>
- <description>Java RMI based service registered to the Java Registry</description>
- <overviewDoc>
- <overviewURL useType="text">
- http://juddi.apache.org/docs/3.0/userguide/html_single/index.html#sect-overRMI
- </overviewURL>
- </overviewDoc>
- <categoryBag>
- <keyedReference keyName="uddi-org:types:transport" keyValue="transport" tModelKey="uddi:uddi.org:categorization:types" />
- </categoryBag>
- </tModel>
- <tModel tModelKey="uddi:uddi.org:transport:jndi-rmi">
- <name>uddi-org:jndi-rmi</name>
- <description>A Java RMI based service registered to a JNDI Registry</description>
- <overviewDoc>
- <overviewURL useType="text">
- http://juddi.apache.org/docs/3.0/userguide/html_single/index.html#sect-overJNDIRMI
- </overviewURL>
- </overviewDoc>
- <categoryBag>
- <keyedReference keyName="uddi-org:types:transport" keyValue="transport" tModelKey="uddi:uddi.org:categorization:types" />
- </categoryBag>
- </tModel>
+
<tModel tModelKey="uddi:uddi.org:transport:amqp">
diff --git a/uddi-tck/src/test/java/org/apache/juddi/v3/tck/JUDDI_091_RMISubscriptionListenerIntegrationTest.java b/uddi-tck/src/test/java/org/apache/juddi/v3/tck/JUDDI_091_RMISubscriptionListenerIntegrationTest.java
deleted file mode 100644
index c38f996..0000000
--- a/uddi-tck/src/test/java/org/apache/juddi/v3/tck/JUDDI_091_RMISubscriptionListenerIntegrationTest.java
+++ /dev/null
@@ -1,186 +0,0 @@
-package org.apache.juddi.v3.tck;
-
-/*
- * Copyright 2001-2009 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-import java.net.InetAddress;
-import java.net.URI;
-import java.rmi.registry.LocateRegistry;
-import java.rmi.registry.Registry;
-import java.util.Iterator;
-import java.util.Random;
-import javax.xml.ws.BindingProvider;
-
-import org.apache.commons.configuration.ConfigurationException;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.juddi.v3.client.config.UDDIClient;
-import org.apache.juddi.v3.client.transport.Transport;
-import org.junit.AfterClass;
-import org.junit.Assert;
-import org.junit.Assume;
-import org.junit.BeforeClass;
-import org.junit.Test;
-import org.uddi.v3_service.UDDIInquiryPortType;
-import org.uddi.v3_service.UDDIPublicationPortType;
-import org.uddi.v3_service.UDDISecurityPortType;
-import org.uddi.v3_service.UDDISubscriptionPortType;
-
-/**
- * jUDDI specific test
- *
- * @author <a href="mailto:alexoree@apache.org">Alex O'Ree</a>
- * @author <a href="mailto:tcunning@apache.org">Tom Cunningham</a>
- */
-public class JUDDI_091_RMISubscriptionListenerIntegrationTest {
-
- private static Log logger = LogFactory.getLog(JUDDI_091_RMISubscriptionListenerIntegrationTest.class);
- private static TckTModel tckTModel = null;
- private static TckBusiness tckBusiness = null;
- private static TckBusinessService tckBusinessService = null;
- private static TckSubscriptionListenerRMI rmiSubscriptionListener = null;
- private static String authInfoJoe = null;
- private static String hostname = null;
- private static UDDIClient manager;
- private static UDDISubscriptionListenerImpl rmiSubscriptionListenerService = null;
- private static Registry registry;
- private static Integer randomPort = null;
-
- @AfterClass
- public static void stopManager() throws ConfigurationException {
- if (!TckPublisher.isEnabled()) return;
- if (manager!=null)
- manager.stop();
- //shutting down the TCK SubscriptionListener
- //re
- }
-
- @BeforeClass
- public static void startManager() throws ConfigurationException {
-
- if (!TckPublisher.isEnabled()) return;
- try {
- //bring up the RMISubscriptionListener
- //random port
- randomPort = 19800 + new Random().nextInt(99);
- logger.info("RMI Random port=" + randomPort);
- //bring up the RMISubscriptionListener
- //saw this once before
- // internal error: ObjID already in use
- URI rmiEndPoint = new URI("rmi://localhost:" + randomPort + "/tck/rmisubscriptionlistener");
- registry = LocateRegistry.createRegistry(rmiEndPoint.getPort());
- String path = rmiEndPoint.getPath();
- hostname = InetAddress.getLocalHost().getHostName();
- //starting the service
- rmiSubscriptionListenerService = new UDDISubscriptionListenerImpl(0);
- //binding to the RMI Registry
- registry.bind(path, rmiSubscriptionListenerService);
-
- //double check that the service is bound in the local Registry
- Registry registry2 = LocateRegistry.getRegistry(rmiEndPoint.getHost(), rmiEndPoint.getPort());
- registry2.lookup(rmiEndPoint.getPath());
-
-
- } catch (Exception e2) {
- e2.printStackTrace();
- Assert.fail(e2.getMessage());
- }
-
- manager = new UDDIClient();
- manager.start();
-
- logger.debug("Getting auth tokens..");
- try {
-
- Transport transport = manager.getTransport("uddiv3");
- UDDISecurityPortType security = transport.getUDDISecurityService();
- authInfoJoe = TckSecurity.getAuthToken(security, TckPublisher.getJoePublisherId(), TckPublisher.getJoePassword());
-
-
- UDDISubscriptionPortType subscription = transport.getUDDISubscriptionService();
- UDDIPublicationPortType publication = transport.getUDDIPublishService();
- UDDIInquiryPortType inquiry = transport.getUDDIInquiryService();
-
- tckTModel = new TckTModel(publication, inquiry);
- tckBusiness = new TckBusiness(publication, inquiry);
- tckBusinessService = new TckBusinessService(publication, inquiry);
- rmiSubscriptionListener = new TckSubscriptionListenerRMI(subscription, publication);
-
- if (!TckPublisher.isUDDIAuthMode()) {
- TckSecurity.setCredentials((BindingProvider) publication, TckPublisher.getRootPublisherId(), TckPublisher.getRootPassword());
- TckSecurity.setCredentials((BindingProvider) subscription, TckPublisher.getRootPublisherId(), TckPublisher.getRootPassword());
- TckSecurity.setCredentials((BindingProvider) inquiry, TckPublisher.getRootPublisherId(), TckPublisher.getRootPassword());
- }
-
- } catch (Exception e) {
- logger.error(e.getMessage(), e);
- Assert.fail("Could not obtain authInfo token." + e.getMessage());
- }
- JUDDI_300_MultiNodeIntegrationTest.testSetupReplicationConfig();
- }
-
- @Test
- public void joePublisher() {
- Assume.assumeTrue(TckPublisher.isEnabled());
- Assume.assumeTrue(TckPublisher.isRMI());
- Assume.assumeTrue(TckPublisher.isSubscriptionEnabled());
- try {
- UDDISubscriptionListenerImpl.notifcationMap.clear();
- UDDISubscriptionListenerImpl.notificationCount=0;
- tckTModel.saveJoePublisherTmodel(authInfoJoe);
- tckBusiness.saveJoePublisherBusiness(authInfoJoe);
- tckBusinessService.saveJoePublisherService(authInfoJoe);
- rmiSubscriptionListener.saveService(authInfoJoe, TckSubscriptionListener.LISTENER_RMI_SERVICE_XML, randomPort, hostname);
-
- rmiSubscriptionListener.saveNotifierSubscription(authInfoJoe, TckSubscriptionListenerRMI.SUBSCRIPTION_XML_RMI);
-
- tckBusinessService.updateJoePublisherService(authInfoJoe, "foo");
-
- //waiting up to 100 seconds for the listener to notice the change.
-
- for (int i = 0; i < 60; i++) {
- Thread.sleep(1000);
-
- if (UDDISubscriptionListenerImpl.notificationCount > 0) {
- break;
- }
- }
- if (UDDISubscriptionListenerImpl.notificationCount == 0) {
- Assert.fail("No Notification was sent");
- }
- Iterator<String> it = UDDISubscriptionListenerImpl.notifcationMap.values().iterator();
- boolean found=false;
- while (it.hasNext()){
- String test = it.next();
- if (test.toLowerCase().contains("service one"))
- found = true;
- }
- if (!found){
- //if (!UDDISubscriptionListenerImpl.notifcationMap.get(0).contains("<name xml:lang=\"en\">Service One</name>")) {
- Assert.fail("Notification does not contain the correct service");
- }
-
- } catch (Exception e) {
- e.printStackTrace();
-
- Assert.fail(e.getMessage());
- } finally {
-
- rmiSubscriptionListener.deleteNotifierSubscription(authInfoJoe, TckSubscriptionListenerRMI.SUBSCRIPTION_KEY_RMI);
- tckBusinessService.deleteJoePublisherService(authInfoJoe);
- tckBusiness.deleteJoePublisherBusiness(authInfoJoe);
- tckTModel.deleteJoePublisherTmodel(authInfoJoe);
- }
- }
-}
diff --git a/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_090_RMIIntegrationTest.java b/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_090_RMIIntegrationTest.java
deleted file mode 100644
index b07e138..0000000
--- a/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_090_RMIIntegrationTest.java
+++ /dev/null
@@ -1,188 +0,0 @@
-/*
- * Copyright 2014 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.juddi.v3.tck;
-
-import java.net.InetAddress;
-import java.net.URI;
-import java.rmi.registry.LocateRegistry;
-import java.rmi.registry.Registry;
-import java.util.Iterator;
-import java.util.Random;
-import org.apache.commons.configuration.ConfigurationException;
-import static org.apache.juddi.v3.tck.UDDI_090_SubscriptionListenerIntegrationBase.logger;
-import static org.apache.juddi.v3.tck.UDDI_090_SubscriptionListenerIntegrationBase.startManager;
-import static org.apache.juddi.v3.tck.UDDI_090_SubscriptionListenerIntegrationBase.stopManager;
-import org.junit.AfterClass;
-import org.junit.Assert;
-import org.junit.BeforeClass;
-
-/**
- *
- * @author Alex O'Ree
- */
-public class UDDI_090_RMIIntegrationTest extends UDDI_090_SubscriptionListenerIntegrationBase {
-
- private static UDDISubscriptionListenerImpl rmiSubscriptionListenerService = null;
- private static TckSubscriptionListenerRMI rmiSubscriptionListener = null;
- private static Registry registry;
- private static Integer randomPort = null;
- private static String hostname = null;
-
- @AfterClass
- public static void stop() throws ConfigurationException {
- if (!TckPublisher.isEnabled()) {
- return;
- }
- stopManager();
-
- }
-
- @BeforeClass
- public static void startup() throws Exception {
-
- if (!TckPublisher.isEnabled()) {
- return;
- }
- startManager();
- int count = 0;
- rmiSubscriptionListenerService = new UDDISubscriptionListenerImpl(0);
- UDDISubscriptionListenerImpl.notifcationMap.clear();
- UDDISubscriptionListenerImpl.notificationCount=0;
- while (true && count < 5) {
- try {
- count++;
- randomPort = 19800 + new Random().nextInt(99);
- logger.info("RMI Random port=" + randomPort);
- //bring up the RMISubscriptionListener
- URI rmiEndPoint = new URI("rmi://localhost:" + randomPort + "/tck/rmisubscriptionlistener");
- registry = LocateRegistry.createRegistry(rmiEndPoint.getPort());
-
- String path = rmiEndPoint.getPath();
- hostname = InetAddress.getLocalHost().getHostName();
- //starting the service
-
- //binding to the RMI Registry
- registry.bind(path, rmiSubscriptionListenerService);
-
- //double check that the service is bound in the local Registry
- Registry registry2 = LocateRegistry.getRegistry(rmiEndPoint.getHost(), rmiEndPoint.getPort());
- registry2.lookup(rmiEndPoint.getPath());
- break;
- } catch (Exception ex) {
- logger.warn("trouble starting rmi endpoint " + ex.getMessage());
- }
- }
- Assert.assertNotNull(registry);
- Assert.assertNotNull(hostname);
- }
-
- @Override
- public boolean verifyDelivery(String findMe) {
- for (int i = 0; i < TckPublisher.getSubscriptionTimeout(); i++) {
- try {
- Thread.sleep(1000);
- } catch (InterruptedException ex) {
- }
- logger.info(".");
- //if (UDDISubscriptionListenerImpl.notificationCount > 0) { }
- }
- logger.info("RX " + UDDISubscriptionListenerImpl.notificationCount + " notifications");
- Iterator<String> it = UDDISubscriptionListenerImpl.notifcationMap.values().iterator();
- boolean found = false;
-
- while (it.hasNext()) {
- String test = it.next();
- if (TckCommon.isDebug()) {
- logger.info("Notification: " + test);
- }
- if (test.toLowerCase().contains(findMe.toLowerCase())) {
- found = true;
- }
- }
-
- if (!found) {
- it = UDDISubscriptionListenerImpl.notifcationMap.values().iterator();
- Thread.dumpStack();
- while (it.hasNext()) {
- logger.info("Notification: " + it.next());
- }
- }
- return found;
- }
-
- @Override
- public void reset() {
- UDDISubscriptionListenerImpl.notifcationMap.clear();
- UDDISubscriptionListenerImpl.notificationCount = 0;
-
- }
-
- @Override
- public String getXMLLocationOfServiceForDelivery() {
- return TckSubscriptionListener.LISTENER_RMI_SERVICE_XML;
- }
-
- @Override
- public String getTransport() {
- return "RMI";
- }
-
- @Override
- public int getPort() {
- return randomPort;
- }
-
- @Override
- public String getHostame() {
- return hostname;
- }
-
- @Override
- public String getSubscription1XML() {
- return TckSubscriptionListenerRMI.SUBSCRIPTION_XML_RMI;
- }
-
- @Override
- public String getSubscription2XML() {
- return TckSubscriptionListenerRMI.SUBSCRIPTION_XML2_RMI;
- }
-
- @Override
- public String getSubscription3XML() {
- return TckSubscriptionListenerRMI.SUBSCRIPTION_XML3_RMI;
- }
-
- @Override
- public String getSubscriptionKey1() {
- return TckSubscriptionListenerRMI.SUBSCRIPTION_KEY_RMI;
- }
-
- @Override
- public String getSubscriptionKey2() {
- return TckSubscriptionListenerRMI.SUBSCRIPTION_KEY_RMI;
- }
-
- @Override
- public String getSubscriptionKey3() {
- return TckSubscriptionListenerRMI.SUBSCRIPTION_KEY_RMI;
- }
-
- @Override
- public boolean IsEnabled() {
- return TckPublisher.isRMI();
- }
-
-}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@juddi.apache.org
For additional commands, e-mail: commits-help@juddi.apache.org