You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@juddi.apache.org by tc...@apache.org on 2009/07/20 18:23:38 UTC

svn commit: r795899 - in /webservices/juddi/branches/v3_trunk: juddi-core/src/main/java/org/apache/juddi/config/ juddi-core/src/main/java/org/apache/juddi/subscription/ juddi-core/src/test/resources/ juddi-cxf/src/main/webapp/WEB-INF/classes/ uddi-clie...

Author: tcunning
Date: Mon Jul 20 16:23:38 2009
New Revision: 795899

URL: http://svn.apache.org/viewvc?rev=795899&view=rev
Log:
JUDDI-245
Create a start buffer so that the subscription listener is kicked off after
X number of ms after registered.

Modified:
    webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/config/Property.java
    webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/subscription/SubscriptionNotifier.java
    webservices/juddi/branches/v3_trunk/juddi-core/src/test/resources/juddi.properties
    webservices/juddi/branches/v3_trunk/juddi-cxf/src/main/webapp/WEB-INF/classes/juddi.properties
    webservices/juddi/branches/v3_trunk/uddi-client/src/test/java/org/apache/juddi/client/UDDI_090_SubscriptionListenerIntegrationTest.java

Modified: webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/config/Property.java
URL: http://svn.apache.org/viewvc/webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/config/Property.java?rev=795899&r1=795898&r2=795899&view=diff
==============================================================================
--- webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/config/Property.java (original)
+++ webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/config/Property.java Mon Jul 20 16:23:38 2009
@@ -25,6 +25,7 @@
 	public final static String JUDDI_TRANSFER_EXPIRATION_DAYS    ="juddi.transfer.expiration.days";
 	public final static String JUDDI_AUTHENTICATE_INQUIRY        ="juddi.authenticate.Inquiry";
 	public final static String JUDDI_SUBSCRIPTION_EXPIRATION_DAYS="juddi.subscription.expiration.days";
+	public final static String JUDDI_NOTIFICATION_START_BUFFER   ="juddi.notification.start.buffer";
 	public final static String JUDDI_NOTIFICATION_INTERVAL       ="juddi.notification.interval";
 	public final static String JUDDI_SUBSCRIPTION_CHUNKEXPIRATION_MINUTES="juddi.subscription.chunkexpiration.minutes";
 	public final static String JUDDI_JNDI_REGISTRATION           ="juddi.jndi.registration";

Modified: webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/subscription/SubscriptionNotifier.java
URL: http://svn.apache.org/viewvc/webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/subscription/SubscriptionNotifier.java?rev=795899&r1=795898&r2=795899&view=diff
==============================================================================
--- webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/subscription/SubscriptionNotifier.java (original)
+++ webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/subscription/SubscriptionNotifier.java Mon Jul 20 16:23:38 2009
@@ -59,6 +59,7 @@
 
 	private Logger log = Logger.getLogger(this.getClass());
 	private Timer timer = new Timer();
+	private long startBuffer = AppConfig.getConfiguration().getLong(Property.JUDDI_NOTIFICATION_START_BUFFER, 20000l); // 20s startup delay default 
 	private long interval = AppConfig.getConfiguration().getLong(Property.JUDDI_NOTIFICATION_INTERVAL, 300000l); //5 min default
 	private UDDISubscriptionImpl subscriptionImpl = new UDDISubscriptionImpl();
 	private static long ACCEPTABLE_LAG_TIME = 20l; //20 milliseconds
@@ -67,7 +68,7 @@
 	
 	public SubscriptionNotifier() throws ConfigurationException {
 		super();
-		timer.scheduleAtFixedRate(this, new Date(), interval);
+		timer.scheduleAtFixedRate(this, startBuffer, interval);
 	}
 
 	public void run() 

Modified: webservices/juddi/branches/v3_trunk/juddi-core/src/test/resources/juddi.properties
URL: http://svn.apache.org/viewvc/webservices/juddi/branches/v3_trunk/juddi-core/src/test/resources/juddi.properties?rev=795899&r1=795898&r2=795899&view=diff
==============================================================================
--- webservices/juddi/branches/v3_trunk/juddi-core/src/test/resources/juddi.properties (original)
+++ webservices/juddi/branches/v3_trunk/juddi-core/src/test/resources/juddi.properties Mon Jul 20 16:23:38 2009
@@ -72,6 +72,7 @@
 #
 # Specifies the interval at which the notification timer triggers
 juddi.notification.interval=3000000
-
+# Specifies the amount of time to wait before the notification timer initially fires
+juddi.notification.start.buffer=20000
 
 

Modified: webservices/juddi/branches/v3_trunk/juddi-cxf/src/main/webapp/WEB-INF/classes/juddi.properties
URL: http://svn.apache.org/viewvc/webservices/juddi/branches/v3_trunk/juddi-cxf/src/main/webapp/WEB-INF/classes/juddi.properties?rev=795899&r1=795898&r2=795899&view=diff
==============================================================================
--- webservices/juddi/branches/v3_trunk/juddi-cxf/src/main/webapp/WEB-INF/classes/juddi.properties (original)
+++ webservices/juddi/branches/v3_trunk/juddi-cxf/src/main/webapp/WEB-INF/classes/juddi.properties Mon Jul 20 16:23:38 2009
@@ -68,6 +68,11 @@
 # Specifies the interval at which the notification timer triggers
 juddi.notification.interval=5000
 #
+# Specifies the amount of time to wait before the notification timer initially f
+ires
+juddi.notification.start.buffer=20000
+
+#
 # These two tokens are referenced in the install data. Note that you
 # can use any tokens, and that their values can be set here or as
 # System parameters.

Modified: webservices/juddi/branches/v3_trunk/uddi-client/src/test/java/org/apache/juddi/client/UDDI_090_SubscriptionListenerIntegrationTest.java
URL: http://svn.apache.org/viewvc/webservices/juddi/branches/v3_trunk/uddi-client/src/test/java/org/apache/juddi/client/UDDI_090_SubscriptionListenerIntegrationTest.java?rev=795899&r1=795898&r2=795899&view=diff
==============================================================================
--- webservices/juddi/branches/v3_trunk/uddi-client/src/test/java/org/apache/juddi/client/UDDI_090_SubscriptionListenerIntegrationTest.java (original)
+++ webservices/juddi/branches/v3_trunk/uddi-client/src/test/java/org/apache/juddi/client/UDDI_090_SubscriptionListenerIntegrationTest.java Mon Jul 20 16:23:38 2009
@@ -19,6 +19,7 @@
 
 import org.apache.commons.configuration.ConfigurationException;
 import org.apache.juddi.Registry;
+import org.apache.juddi.config.AppConfig;
 import org.apache.log4j.Logger;
 import org.apache.log4j.helpers.Loader;
 import org.junit.AfterClass;
@@ -54,19 +55,20 @@
 
 	private static UDDIPublicationPortType publication = null;
 
-	
 	private static String authInfoJoe = null;
 	private static String authInfoSam = null;
 
+	private static long START_BUFFER = 30000l;
+
 	@BeforeClass
 	public static void setup() throws ConfigurationException {
-		String clazz = ClientConfig.getConfiguration().getString(Property.UDDI_PROXY_TRANSPORT,Property.DEFAULT_UDDI_PROXY_TRANSPORT);
+		String clazz = ClientConfig.getConfiguration().getString(org.uddi.api_v3.client.config.Property.UDDI_PROXY_TRANSPORT,org.uddi.api_v3.client.config.Property.DEFAULT_UDDI_PROXY_TRANSPORT);
 		if (InVMTransport.class.getName().equals(clazz)) {
 			Registry.start();
 		}
 		logger.debug("Getting subscriber proxy..");
 		try {
-	    	 clazz = ClientConfig.getConfiguration().getString(Property.UDDI_PROXY_TRANSPORT, Property.DEFAULT_UDDI_PROXY_TRANSPORT);
+	    	 clazz = ClientConfig.getConfiguration().getString(org.uddi.api_v3.client.config.Property.UDDI_PROXY_TRANSPORT, org.uddi.api_v3.client.config.Property.DEFAULT_UDDI_PROXY_TRANSPORT);
 	         Class<?> transportClass = Loader.loadClass(clazz);
 	         if (transportClass!=null) {
 	        	 Transport transport = (Transport) transportClass.newInstance();
@@ -96,7 +98,7 @@
 	
 	@AfterClass
 	public static void stopRegistry() throws ConfigurationException {
-		String clazz = ClientConfig.getConfiguration().getString(Property.UDDI_PROXY_TRANSPORT,Property.DEFAULT_UDDI_PROXY_TRANSPORT);
+		String clazz = ClientConfig.getConfiguration().getString(org.uddi.api_v3.client.config.Property.UDDI_PROXY_TRANSPORT,org.uddi.api_v3.client.config.Property.DEFAULT_UDDI_PROXY_TRANSPORT);
 		if (InVMTransport.class.getName().equals(clazz)) {
 			Registry.stop();
 		}
@@ -110,6 +112,8 @@
 			tckBusinessService.saveJoePublisherService(authInfoJoe);
 			tckSubscriptionListener.saveService(authInfoJoe);
 			tckSubscriptionListener.saveNotifierSubscription(authInfoJoe);
+
+			Thread.sleep(START_BUFFER);
 			tckSubscriptionListener.changeSubscribedObject(authInfoJoe);			
 
 			String test = readLogAsString("./target/uddiclient.log");



---------------------------------------------------------------------
To unsubscribe, e-mail: juddi-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: juddi-cvs-help@ws.apache.org