[gatein-commits] gatein SVN: r6145 - in epp/portal/branches/EPP_5_1_Branch: component/wsrp/src/main/java/org/gatein/portal/wsrp/state/producer/registrations and 1 other directory.

[do-not-reply at jboss.org]

Author: chris.laprun at jboss.com
Date: 2011-03-30 11:21:05 -0400 (Wed, 30 Mar 2011)
New Revision: 6145

Modified:
   epp/portal/branches/EPP_5_1_Branch/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/producer/registrations/JCRRegistrationPersistenceManager.java
   epp/portal/branches/EPP_5_1_Branch/pom.xml
Log:
- GTNWSRP-216: Updated JCRRegistrationPersistenceManager to account for changes in API.
- Upgraded to WSRP 2.0.1-Beta02.

Modified: epp/portal/branches/EPP_5_1_Branch/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/producer/registrations/JCRRegistrationPersistenceManager.java
===================================================================
--- epp/portal/branches/EPP_5_1_Branch/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/producer/registrations/JCRRegistrationPersistenceManager.java	2011-03-30 15:00:56 UTC (rev 6144)
+++ epp/portal/branches/EPP_5_1_Branch/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/producer/registrations/JCRRegistrationPersistenceManager.java	2011-03-30 15:21:05 UTC (rev 6145)
@@ -97,7 +97,7 @@
    }
 
    @Override
-   protected RegistrationSPI internalRemoveRegistration(String registrationId)
+   protected RegistrationSPI internalRemoveRegistration(String registrationId) throws RegistrationException
    {
       Registration registration = getRegistration(registrationId);
       remove(registration.getPersistentKey(), RegistrationMapping.class);
@@ -106,7 +106,7 @@
    }
 
    @Override
-   protected RegistrationSPI internalCreateRegistration(ConsumerSPI consumer, Map registrationProperties)
+   protected RegistrationSPI internalCreateRegistration(ConsumerSPI consumer, Map registrationProperties) throws RegistrationException
    {
       ChromatticSession session = persister.getSession();
       RegistrationSPI registration = null;
@@ -120,15 +120,15 @@
       }
       catch (Exception e)
       {
-         e.printStackTrace(); // todo fix me
          persister.closeSession(false);
+         throw new RegistrationException(e);
       }
 
       return registration;
    }
 
    @Override
-   protected ConsumerSPI internalRemoveConsumer(String consumerId)
+   protected ConsumerSPI internalRemoveConsumer(String consumerId) throws RegistrationException
    {
       remove(consumerId, ConsumerMapping.class);
 
@@ -143,7 +143,7 @@
    }
 
    @Override
-   protected ConsumerSPI internalCreateConsumer(String consumerId, String consumerName)
+   protected ConsumerSPI internalCreateConsumer(String consumerId, String consumerName) throws RegistrationException
    {
       ConsumerSPI consumer = super.internalCreateConsumer(consumerId, consumerName);
 
@@ -159,15 +159,15 @@
       }
       catch (Exception e)
       {
-         e.printStackTrace(); // todo: fix me
          persister.closeSession(false);
+         throw new RegistrationException(e);
       }
 
       return consumer;
    }
 
    @Override
-   protected ConsumerSPI internalSaveChangesTo(Consumer consumer)
+   protected ConsumerSPI internalSaveChangesTo(Consumer consumer) throws RegistrationException
    {
       ConsumerSPI consumerSPI = super.internalSaveChangesTo(consumer);
 
@@ -180,14 +180,14 @@
       }
       catch (Exception e)
       {
-         e.printStackTrace();  // todo: fix me
          persister.closeSession(false);
+         throw new RegistrationException(e);
       }
 
       return consumerSPI;
    }
 
-   protected RegistrationSPI internalSaveChangesTo(Registration registration)
+   protected RegistrationSPI internalSaveChangesTo(Registration registration) throws RegistrationException
    {
       RegistrationSPI registrationSPI = super.internalSaveChangesTo(registration);
 
@@ -200,15 +200,15 @@
       }
       catch (Exception e)
       {
-         e.printStackTrace(); //todo: fix me
          persister.closeSession(false);
+         throw new RegistrationException(e);
       }
 
       return registrationSPI;
    }
 
    @Override
-   protected ConsumerGroupSPI internalRemoveConsumerGroup(String name)
+   protected ConsumerGroupSPI internalRemoveConsumerGroup(String name) throws RegistrationException
    {
       try
       {
@@ -224,7 +224,7 @@
    }
 
    @Override
-   protected ConsumerGroupSPI internalCreateConsumerGroup(String name)
+   protected ConsumerGroupSPI internalCreateConsumerGroup(String name) throws RegistrationException
    {
       ConsumerGroupSPI group = super.internalCreateConsumerGroup(name);
 
@@ -239,8 +239,8 @@
       }
       catch (Exception e)
       {
-         e.printStackTrace();  // todo: fix me
          persister.closeSession(false);
+         throw new RegistrationException(e);
       }
 
       return group;

Modified: epp/portal/branches/EPP_5_1_Branch/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_1_Branch/pom.xml	2011-03-30 15:00:56 UTC (rev 6144)
+++ epp/portal/branches/EPP_5_1_Branch/pom.xml	2011-03-30 15:21:05 UTC (rev 6145)
@@ -48,7 +48,7 @@
       <org.gatein.wci.version>2.0.2-GA</org.gatein.wci.version>
       <org.gatein.pc.version>2.2.0-GA</org.gatein.pc.version>
       <org.picketlink.idm>1.1.8.CR01</org.picketlink.idm>
-      <org.gatein.wsrp.version>2.0.1-Beta01</org.gatein.wsrp.version>
+      <org.gatein.wsrp.version>2.0.1-Beta02</org.gatein.wsrp.version>
       <org.gatein.mop.version>1.0.3-GA</org.gatein.mop.version>
       <org.slf4j.version>1.5.6</org.slf4j.version>
       <rhino.version>1.6R5</rhino.version>