Author: chris.laprun(a)jboss.com
Date: 2011-10-26 05:21:58 -0400 (Wed, 26 Oct 2011)
New Revision: 7890
Modified:
components/wsrp/trunk/consumer/src/main/java/org/gatein/wsrp/consumer/RegistrationInfo.java
components/wsrp/trunk/producer/src/main/java/org/gatein/registration/impl/RegistrationManagerImpl.java
Log:
- GTNWSRP-251, GTNWSRP-253: Reverted change of behavior since it would require adding the
identity of the consumer to the consumer name to work properly and thus might not work
well with existing data.
Modified:
components/wsrp/trunk/consumer/src/main/java/org/gatein/wsrp/consumer/RegistrationInfo.java
===================================================================
---
components/wsrp/trunk/consumer/src/main/java/org/gatein/wsrp/consumer/RegistrationInfo.java 2011-10-26
09:20:19 UTC (rev 7889)
+++
components/wsrp/trunk/consumer/src/main/java/org/gatein/wsrp/consumer/RegistrationInfo.java 2011-10-26
09:21:58 UTC (rev 7890)
@@ -428,7 +428,10 @@
{
Version version = parent.getEndpointConfigurationInfo().getWSRPVersion();
String versionInfo = version != null ? " WSRP v" +
version.getMajor() + " version" : " unknown WSRP version";
- setConsumerName(parent.getId() + " " +
WSRPConstants.DEFAULT_CONSUMER_NAME + versionInfo);
+ setConsumerName(WSRPConstants.DEFAULT_CONSUMER_NAME + versionInfo);
+
+ // todo: GTNWSRP-251, GTNWSRP-253: implemented but requires adding consumer
identity to consumer name to work properly
+ // setConsumerName(parent.getId() + " " +
WSRPConstants.DEFAULT_CONSUMER_NAME + versionInfo);
}
// get a service description if we don't already have one
Modified:
components/wsrp/trunk/producer/src/main/java/org/gatein/registration/impl/RegistrationManagerImpl.java
===================================================================
---
components/wsrp/trunk/producer/src/main/java/org/gatein/registration/impl/RegistrationManagerImpl.java 2011-10-26
09:20:19 UTC (rev 7889)
+++
components/wsrp/trunk/producer/src/main/java/org/gatein/registration/impl/RegistrationManagerImpl.java 2011-10-26
09:21:58 UTC (rev 7890)
@@ -26,7 +26,6 @@
import org.gatein.common.util.ParameterValidation;
import org.gatein.registration.Consumer;
import org.gatein.registration.ConsumerGroup;
-import org.gatein.registration.DuplicateRegistrationException;
import org.gatein.registration.InvalidConsumerDataException;
import org.gatein.registration.NoSuchRegistrationException;
import org.gatein.registration.Registration;
@@ -117,7 +116,10 @@
String identity = policy.getConsumerIdFrom(consumerName, registrationProperties);
// validate the registration information
- try
+ policy.validateRegistrationDataFor(registrationProperties, identity, expectations,
this);
+
+ // todo: GTNWSRP-251, GTNWSRP-253: implemented but requires changing the consumer
names to work properly
+ /*try
{
policy.validateRegistrationDataFor(registrationProperties, identity,
expectations, this);
}
@@ -136,7 +138,7 @@
// if we didn't get a registration to return, just throw the exception
throw e;
}
- }
+ }*/
Consumer consumer = getOrCreateConsumer(identity, createConsumerIfNeeded,
consumerName);