You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@juddi.apache.org by ks...@apache.org on 2009/05/31 20:02:15 UTC
svn commit: r780489 - in /webservices/juddi/branches/v3_trunk:
juddi-core/src/main/java/org/apache/juddi/
juddi-core/src/main/java/org/apache/juddi/api/impl/
juddi-core/src/main/java/org/apache/juddi/config/
juddi-cxf/src/main/java/org/apache/juddi/
Author: kstam
Date: Sun May 31 18:02:15 2009
New Revision: 780489
URL: http://svn.apache.org/viewvc?rev=780489&view=rev
Log:
JUDDI-244 adding Registry Singleton, so that inVM use of jUDDI will still kick of a subscription Notifier.
Added:
webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/Registry.java
webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/api/impl/BaseService.java
Removed:
webservices/juddi/branches/v3_trunk/juddi-cxf/src/main/java/org/apache/juddi/RegistryServlet.java
Modified:
webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/api/impl/AuthenticatedService.java
webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/api/impl/UDDIReplicationImpl.java
webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/api/impl/UDDISubscriptionListenerImpl.java
webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/api/impl/UDDIValueSetCachingImpl.java
webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/api/impl/UDDIValueSetValidationImpl.java
webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/config/AppConfig.java
Added: webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/Registry.java
URL: http://svn.apache.org/viewvc/webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/Registry.java?rev=780489&view=auto
==============================================================================
--- webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/Registry.java (added)
+++ webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/Registry.java Sun May 31 18:02:15 2009
@@ -0,0 +1,41 @@
+package org.apache.juddi;
+
+import org.apache.commons.configuration.ConfigurationException;
+import org.apache.juddi.subscription.SubscriptionNotifier;
+import org.apache.log4j.Logger;
+
+public class Registry {
+
+ private static Registry registry = null;
+ private static Logger log = Logger.getLogger(Registry.class);
+ private static SubscriptionNotifier subscriptionNotifier = null;
+ /**
+ * Singleton.
+ */
+ private Registry() {
+ super();
+ }
+ /**
+ * Stops the registry.
+ */
+ public static void stop() {
+ if (registry!=null) {
+ log.info("Stopping jUDDI registry...");
+ subscriptionNotifier.cancel();
+ registry=null;
+ }
+ }
+ /**
+ * Starts the registry.
+ * @return
+ * @throws ConfigurationException
+ */
+ public static Registry start() throws ConfigurationException {
+ if (registry==null) {
+ log.info("Creating new jUDDI registry...");
+ registry = new Registry();
+ subscriptionNotifier = new SubscriptionNotifier();
+ }
+ return registry;
+ }
+}
Modified: webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/api/impl/AuthenticatedService.java
URL: http://svn.apache.org/viewvc/webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/api/impl/AuthenticatedService.java?rev=780489&r1=780488&r2=780489&view=diff
==============================================================================
--- webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/api/impl/AuthenticatedService.java (original)
+++ webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/api/impl/AuthenticatedService.java Sun May 31 18:02:15 2009
@@ -31,7 +31,7 @@
/**
* @author <a href="mailto:jfaath@apache.org">Jeff Faath</a>
*/
-public abstract class AuthenticatedService {
+public abstract class AuthenticatedService extends BaseService {
public static final int AUTHTOKEN_ACTIVE = 1;
public static final int AUTHTOKEN_RETIRED = 0;
Added: webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/api/impl/BaseService.java
URL: http://svn.apache.org/viewvc/webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/api/impl/BaseService.java?rev=780489&view=auto
==============================================================================
--- webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/api/impl/BaseService.java (added)
+++ webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/api/impl/BaseService.java Sun May 31 18:02:15 2009
@@ -0,0 +1,40 @@
+/*
+ * 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.api.impl;
+
+import org.apache.commons.configuration.ConfigurationException;
+import org.apache.juddi.Registry;
+import org.apache.log4j.Logger;
+
+/**
+ * @author <a href="mailto:kstam@apache.org">Kurt T Stam</a>
+ */
+public abstract class BaseService {
+
+ private Logger log = Logger.getLogger(this.getClass());
+ protected Registry registry = null;
+
+ protected BaseService() {
+ super();
+ try {
+ Registry.start();
+ } catch (ConfigurationException ce) {
+ log.error(ce.getMessage(),ce);
+ }
+ }
+}
Modified: webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/api/impl/UDDIReplicationImpl.java
URL: http://svn.apache.org/viewvc/webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/api/impl/UDDIReplicationImpl.java?rev=780489&r1=780488&r2=780489&view=diff
==============================================================================
--- webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/api/impl/UDDIReplicationImpl.java (original)
+++ webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/api/impl/UDDIReplicationImpl.java Sun May 31 18:02:15 2009
@@ -35,7 +35,7 @@
@WebService(serviceName="UDDIReplicationService",
endpointInterface="org.uddi.v3_service.UDDIReplicationPortType",
targetNamespace = "urn:uddi-org:repl_v3_portType")
-public class UDDIReplicationImpl implements UDDIReplicationPortType {
+public class UDDIReplicationImpl extends AuthenticatedService implements UDDIReplicationPortType {
public String doPing(DoPing body) throws DispositionReportFaultMessage {
Modified: webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/api/impl/UDDISubscriptionListenerImpl.java
URL: http://svn.apache.org/viewvc/webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/api/impl/UDDISubscriptionListenerImpl.java?rev=780489&r1=780488&r2=780489&view=diff
==============================================================================
--- webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/api/impl/UDDISubscriptionListenerImpl.java (original)
+++ webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/api/impl/UDDISubscriptionListenerImpl.java Sun May 31 18:02:15 2009
@@ -38,7 +38,7 @@
@WebService(serviceName="UDDISubscriptionListenerService",
endpointInterface="org.uddi.v3_service.UDDISubscriptionListenerPortType",
targetNamespace = "urn:uddi-org:subr_v3_portType")
-public class UDDISubscriptionListenerImpl implements
+public class UDDISubscriptionListenerImpl extends AuthenticatedService implements
UDDISubscriptionListenerPortType {
private static Logger logger = Logger.getLogger(UDDISubscriptionListenerImpl.class);
Modified: webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/api/impl/UDDIValueSetCachingImpl.java
URL: http://svn.apache.org/viewvc/webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/api/impl/UDDIValueSetCachingImpl.java?rev=780489&r1=780488&r2=780489&view=diff
==============================================================================
--- webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/api/impl/UDDIValueSetCachingImpl.java (original)
+++ webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/api/impl/UDDIValueSetCachingImpl.java Sun May 31 18:02:15 2009
@@ -30,7 +30,7 @@
@WebService(serviceName="UDDIValueSetCachingService",
endpointInterface="org.uddi.v3_service.UDDIValueSetCachingPortType",
targetNamespace = "urn:uddi-org:vscache_v3_portType")
-public class UDDIValueSetCachingImpl implements UDDIValueSetCachingPortType {
+public class UDDIValueSetCachingImpl extends AuthenticatedService implements UDDIValueSetCachingPortType {
public void getAllValidValues(String authInfo, String modelKey,
Holder<String> chunkToken, Holder<List<ValidValue>> validValue)
throws DispositionReportFaultMessage {
Modified: webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/api/impl/UDDIValueSetValidationImpl.java
URL: http://svn.apache.org/viewvc/webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/api/impl/UDDIValueSetValidationImpl.java?rev=780489&r1=780488&r2=780489&view=diff
==============================================================================
--- webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/api/impl/UDDIValueSetValidationImpl.java (original)
+++ webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/api/impl/UDDIValueSetValidationImpl.java Sun May 31 18:02:15 2009
@@ -28,7 +28,7 @@
@WebService(serviceName="UDDIValueSetValidationService",
endpointInterface="org.uddi.v3_service.UDDIValueSetValidationPortType",
targetNamespace = "urn:uddi-org:vs_v3_portType")
-public class UDDIValueSetValidationImpl implements
+public class UDDIValueSetValidationImpl extends AuthenticatedService implements
UDDIValueSetValidationPortType {
public DispositionReport validateValues(ValidateValues body)
throws DispositionReportFaultMessage {
Modified: webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/config/AppConfig.java
URL: http://svn.apache.org/viewvc/webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/config/AppConfig.java?rev=780489&r1=780488&r2=780489&view=diff
==============================================================================
--- webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/config/AppConfig.java (original)
+++ webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/config/AppConfig.java Sun May 31 18:02:15 2009
@@ -31,6 +31,7 @@
import org.apache.commons.configuration.PropertiesConfiguration;
import org.apache.commons.configuration.SystemConfiguration;
import org.apache.commons.configuration.reloading.FileChangedReloadingStrategy;
+import org.apache.juddi.Registry;
import org.apache.juddi.keygen.KeyGenerator;
import org.apache.juddi.model.UddiEntityPublisher;
import org.apache.juddi.query.FindBusinessByCategoryQuery;
@@ -182,7 +183,9 @@
*/
public static void reloadConfig() throws ConfigurationException
{
+ Registry.stop();
getInstance().loadConfiguration();
+ Registry.start();
}
/**
* The object from which property values can be obtained.
---------------------------------------------------------------------
To unsubscribe, e-mail: juddi-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: juddi-cvs-help@ws.apache.org