[gatein-commits] gatein SVN: r1106 - in components/wsrp/trunk/consumer/src: main/java/org/gatein/wsrp/consumer/registry/xml and 2 other directories.

Author: chris.laprun(a)jboss.com Date: 2009-12-21 12:25:32 -0500 (Mon, 21 Dec 2009) New Revision: 1106 Modified: components/wsrp/trunk/consumer/src/main/java/org/gatein/wsrp/consumer/registry/AbstractConsumerRegistry.java components/wsrp/trunk/consumer/src/main/java/org/gatein/wsrp/consumer/registry/ConsumerRegistry.java components/wsrp/trunk/consumer/src/main/java/org/gatein/wsrp/consumer/registry/xml/XMLWSRPConsumerFactory.java components/wsrp/trunk/consumer/src/test/java/org/gatein/wsrp/consumer/registry/ConsumerRegistryTestCase.java components/wsrp/trunk/consumer/src/test/java/org/gatein/wsrp/test/support/MockConsumerRegistry.java Log: - ConsumerRegistry.createConsumer now takes the WSDL URL in parameter. Modified: components/wsrp/trunk/consumer/src/main/java/org/gatein/wsrp/consumer/registry/AbstractConsumerRegistry.java =================================================================== --- components/wsrp/trunk/consumer/src/main/java/org/gatein/wsrp/consumer/registry/AbstractConsumerRegistry.java 2009-12-21 17:23:34 UTC (rev 1105) +++ components/wsrp/trunk/consumer/src/main/java/org/gatein/wsrp/consumer/registry/AbstractConsumerRegistry.java 2009-12-21 17:25:32 UTC (rev 1106) @@ -81,7 +81,7 @@ this.sessionEventBroadcaster = sessionEventBroadcaster; } - public WSRPConsumer createConsumer(String id, Integer expirationCacheSeconds) + public WSRPConsumer createConsumer(String id, Integer expirationCacheSeconds, String wsdlURL) { ParameterValidation.throwIllegalArgExceptionIfNullOrEmpty(id, "Consumer identifier", "Creating a Consumer"); @@ -95,6 +95,7 @@ info.setId(id); info.setRegistry(this); info.setExpirationCacheSeconds(expirationCacheSeconds); + info.getEndpointConfigurationInfo().setWsdlDefinitionURL(wsdlURL); save(info, "Couldn't create Consumer '" + id + "'"); Modified: components/wsrp/trunk/consumer/src/main/java/org/gatein/wsrp/consumer/registry/ConsumerRegistry.java =================================================================== --- components/wsrp/trunk/consumer/src/main/java/org/gatein/wsrp/consumer/registry/ConsumerRegistry.java 2009-12-21 17:23:34 UTC (rev 1105) +++ components/wsrp/trunk/consumer/src/main/java/org/gatein/wsrp/consumer/registry/ConsumerRegistry.java 2009-12-21 17:25:32 UTC (rev 1106) @@ -44,7 +44,7 @@ FederatingPortletInvoker getFederatingPortletInvoker(); - WSRPConsumer createConsumer(String id, Integer expirationCacheSeconds) throws ConsumerException; + WSRPConsumer createConsumer(String id, Integer expirationCacheSeconds, String wsdlURL) throws ConsumerException; void persistConsumer(WSRPConsumer consumer) throws ConsumerException; Modified: components/wsrp/trunk/consumer/src/main/java/org/gatein/wsrp/consumer/registry/xml/XMLWSRPConsumerFactory.java =================================================================== --- components/wsrp/trunk/consumer/src/main/java/org/gatein/wsrp/consumer/registry/xml/XMLWSRPConsumerFactory.java 2009-12-21 17:23:34 UTC (rev 1105) +++ components/wsrp/trunk/consumer/src/main/java/org/gatein/wsrp/consumer/registry/xml/XMLWSRPConsumerFactory.java 2009-12-21 17:25:32 UTC (rev 1106) @@ -173,7 +173,7 @@ } // consumer didn't exist in the database, so create one and configure it - consumer = consumerRegistry.createConsumer(id, expirationCacheSeconds); + consumer = consumerRegistry.createConsumer(id, expirationCacheSeconds, null); return consumer; } Modified: components/wsrp/trunk/consumer/src/test/java/org/gatein/wsrp/consumer/registry/ConsumerRegistryTestCase.java =================================================================== --- components/wsrp/trunk/consumer/src/test/java/org/gatein/wsrp/consumer/registry/ConsumerRegistryTestCase.java 2009-12-21 17:23:34 UTC (rev 1105) +++ components/wsrp/trunk/consumer/src/test/java/org/gatein/wsrp/consumer/registry/ConsumerRegistryTestCase.java 2009-12-21 17:25:32 UTC (rev 1106) @@ -52,7 +52,7 @@ public void testCreateAndGet() { String id = "test"; - WSRPConsumer consumer = registry.createConsumer(id, null); + WSRPConsumer consumer = registry.createConsumer(id, null, null); assertNotNull(consumer); assertEquals(id, consumer.getProducerId()); ProducerInfo info = consumer.getProducerInfo(); @@ -89,7 +89,7 @@ public void testGetProducerInfoByKey() { - WSRPConsumer consumer = registry.createConsumer("id", null); + WSRPConsumer consumer = registry.createConsumer("id", null, null); ProducerInfo info = consumer.getProducerInfo(); String key = info.getKey(); @@ -102,11 +102,11 @@ { String id = "foo"; - registry.createConsumer(id, null); + registry.createConsumer(id, null, null); try { - registry.createConsumer(id, null); + registry.createConsumer(id, null, null); fail("Shouldn't be possible to create a consumer with an existing id"); } catch (ConsumerException expected) @@ -118,7 +118,7 @@ { String id = "id"; - WSRPConsumer consumer = registry.createConsumer(id, null); + WSRPConsumer consumer = registry.createConsumer(id, null, null); assertEquals(consumer, registry.getConsumer(id)); String key = consumer.getProducerInfo().getKey(); @@ -133,7 +133,7 @@ { // create a foo consumer String id = "foo"; - WSRPConsumer consumer = registry.createConsumer(id, null); + WSRPConsumer consumer = registry.createConsumer(id, null, null); ProducerInfo info = consumer.getProducerInfo(); String key = info.getKey(); Modified: components/wsrp/trunk/consumer/src/test/java/org/gatein/wsrp/test/support/MockConsumerRegistry.java =================================================================== --- components/wsrp/trunk/consumer/src/test/java/org/gatein/wsrp/test/support/MockConsumerRegistry.java 2009-12-21 17:23:34 UTC (rev 1105) +++ components/wsrp/trunk/consumer/src/test/java/org/gatein/wsrp/test/support/MockConsumerRegistry.java 2009-12-21 17:25:32 UTC (rev 1106) @@ -75,10 +75,12 @@ return null; } - public WSRPConsumer createConsumer(String id, Integer expirationCacheSeconds) + public WSRPConsumer createConsumer(String id, Integer expirationCacheSeconds, String wsdlURL) { MockWSRPConsumer consumer = new MockWSRPConsumer(id); - consumer.getProducerInfo().setExpirationCacheSeconds(expirationCacheSeconds); + ProducerInfo producerInfo = consumer.getProducerInfo(); + producerInfo.setExpirationCacheSeconds(expirationCacheSeconds); + producerInfo.getEndpointConfigurationInfo().setWsdlDefinitionURL(wsdlURL); consumers.put(id, consumer); return consumer; }