Author: chris.laprun(a)jboss.com Date: 2007-02-25 01:32:01 -0500 (Sun, 25 Feb 2007) New Revision: 6397 Added: trunk/wsrp/src/main/org/jboss/portal/wsrp/consumer/ConsumerRegistry.java trunk/wsrp/src/main/org/jboss/portal/wsrp/consumer/ConsumerRegistryService.java Modified: trunk/wsrp/build.xml trunk/wsrp/src/main/org/jboss/portal/test/wsrp/deployment/MockConsumerRegistry.java trunk/wsrp/src/main/org/jboss/portal/wsrp/deployment/WSRPDeployer.java trunk/wsrp/src/main/org/jboss/portal/wsrp/deployment/WSRPDeployerMBean.java trunk/wsrp/src/main/org/jboss/portal/wsrp/deployment/WSRPDeploymentFactory.java trunk/wsrp/src/main/org/jboss/portal/wsrp/portlet/consumers/WSRPConsumerConfigurationPortlet.java trunk/wsrp/src/resources/portal-wsrp-sar/META-INF/jboss-service.xml trunk/wsrp/src/resources/portal-wsrp-sar/wsrp-aop.xml trunk/wsrp/src/resources/portal-wsrp-war/WEB-INF/jboss-portlet.xml trunk/wsrp/src/resources/portal-wsrp-war/WEB-INF/jsp/consumers/consumer.jsp trunk/wsrp/src/resources/portal-wsrp-war/WEB-INF/jsp/consumers/view.jsp Log: - JBPORTAL-1264: Moved ConsumersRegistry* to wsrp.consumer and renamed the classes to ConsumerRegistry*. Modified: trunk/wsrp/build.xml =================================================================== --- trunk/wsrp/build.xml 2007-02-25 01:50:29 UTC (rev 6396) +++ trunk/wsrp/build.xml 2007-02-25 06:32:01 UTC (rev 6397) @@ -252,7 +252,7 @@ <classpath refid="bilto"/> <src path="${build.classes}"/> <aoppath path="${build.resources}/portal-wsrp-sar/wsrp-aop.xml"/> - <include name="org/jboss/portal/wsrp/portlet/consumers/ConsumersRegistryService.class"/> + <include name="org/jboss/portal/wsrp/consumer/ConsumerRegistryService.class"/> </aopc> <property name="compile.disable" value="true"/> Modified: trunk/wsrp/src/main/org/jboss/portal/test/wsrp/deployment/MockConsumerRegistry.java =================================================================== --- trunk/wsrp/src/main/org/jboss/portal/test/wsrp/deployment/MockConsumerRegistry.java 2007-02-25 01:50:29 UTC (rev 6396) +++ trunk/wsrp/src/main/org/jboss/portal/test/wsrp/deployment/MockConsumerRegistry.java 2007-02-25 06:32:01 UTC (rev 6397) @@ -26,7 +26,7 @@ import org.jboss.portal.portlet.federation.FederatingPortletInvoker; import org.jboss.portal.test.wsrp.framework.support.MockWSRPConsumer; import org.jboss.portal.wsrp.WSRPConsumer; -import org.jboss.portal.wsrp.portlet.consumers.ConsumersRegistry; +import org.jboss.portal.wsrp.consumer.ConsumerRegistry; import java.util.Collection; import java.util.HashMap; @@ -37,7 +37,7 @@ * @version $Revision$ * @since 2.6 */ -public class MockConsumerRegistry implements ConsumersRegistry +public class MockConsumerRegistry implements ConsumerRegistry { private Map consumers = new HashMap(3); Copied: trunk/wsrp/src/main/org/jboss/portal/wsrp/consumer/ConsumerRegistry.java (from rev 6396, trunk/wsrp/src/main/org/jboss/portal/wsrp/portlet/consumers/ConsumersRegistry.java) =================================================================== --- trunk/wsrp/src/main/org/jboss/portal/wsrp/consumer/ConsumerRegistry.java (rev 0) +++ trunk/wsrp/src/main/org/jboss/portal/wsrp/consumer/ConsumerRegistry.java 2007-02-25 06:32:01 UTC (rev 6397) @@ -0,0 +1,42 @@ +/* +* JBoss, a division of Red Hat +* Copyright 2006, Red Hat Middleware, LLC, and individual contributors as indicated +* by the @authors tag. See the copyright.txt in the distribution for a +* full listing of individual contributors. +* +* This is free software; you can redistribute it and/or modify it +* under the terms of the GNU Lesser General Public License as +* published by the Free Software Foundation; either version 2.1 of +* the License, or (at your option) any later version. +* +* This software is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +* Lesser General Public License for more details. +* +* You should have received a copy of the GNU Lesser General Public +* License along with this software; if not, write to the Free +* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA +* 02110-1301 USA, or see the FSF site: http://www.fsf.org. +*/ + +package org.jboss.portal.wsrp.consumer; + +import org.jboss.portal.portlet.federation.FederatingPortletInvoker; +import org.jboss.portal.wsrp.WSRPConsumer; + +import java.util.Collection; + +/** + * @author <a href="mailto:chris.laprun@jboss.com">Chris Laprun</a> + * @version $Revision$ + * @since 2.6 + */ +public interface ConsumerRegistry +{ + Collection getConfiguredConsumers(); + + WSRPConsumer getConsumer(String id); + + FederatingPortletInvoker getFederatingPortletInvoker(); +} \ No newline at end of file Property changes on: trunk/wsrp/src/main/org/jboss/portal/wsrp/consumer/ConsumerRegistry.java ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native Copied: trunk/wsrp/src/main/org/jboss/portal/wsrp/consumer/ConsumerRegistryService.java (from rev 6396, trunk/wsrp/src/main/org/jboss/portal/wsrp/portlet/consumers/ConsumersRegistryService.java) =================================================================== --- trunk/wsrp/src/main/org/jboss/portal/wsrp/consumer/ConsumerRegistryService.java (rev 0) +++ trunk/wsrp/src/main/org/jboss/portal/wsrp/consumer/ConsumerRegistryService.java 2007-02-25 06:32:01 UTC (rev 6397) @@ -0,0 +1,157 @@ +/****************************************************************************** + * JBoss, a division of Red Hat * + * Copyright 2006, Red Hat Middleware, LLC, and individual * + * contributors as indicated by the @authors tag. See the * + * copyright.txt in the distribution for a full listing of * + * individual contributors. * + * * + * This is free software; you can redistribute it and/or modify it * + * under the terms of the GNU Lesser General Public License as * + * published by the Free Software Foundation; either version 2.1 of * + * the License, or (at your option) any later version. * + * * + * This software is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * + * Lesser General Public License for more details. * + * * + * You should have received a copy of the GNU Lesser General Public * + * License along with this software; if not, write to the Free * + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * + ******************************************************************************/ + +package org.jboss.portal.wsrp.consumer; + +import org.hibernate.Session; +import org.hibernate.SessionFactory; +import org.jboss.portal.common.util.ParameterValidation; +import org.jboss.portal.jems.as.system.AbstractJBossService; +import org.jboss.portal.portlet.federation.FederatingPortletInvoker; +import org.jboss.portal.wsrp.WSRPConsumer; +import org.jboss.portal.wsrp.deployment.WSRPConsumerService; + +import javax.naming.InitialContext; +import java.util.Collection; +import java.util.Collections; +import java.util.Iterator; +import java.util.SortedMap; +import java.util.TreeMap; + +/** + * @author <a href="mailto:chris.laprun@jboss.com">Chris Laprun</a> + * @version $Revision$ + * @since 2.6 + */ +public class ConsumerRegistryService extends AbstractJBossService implements ConsumerRegistry +{ + /** Gives access to the Portal's portlet invokers */ + private FederatingPortletInvoker federatingPortletInvoker; + + private SortedMap consumers; + + private SessionFactory sessionFactory; + + private String sessionFactoryJNDIName; + + public FederatingPortletInvoker getFederatingPortletInvoker() + { + return federatingPortletInvoker; + } + + public void setFederatingPortletInvoker(FederatingPortletInvoker federatingPortletInvoker) + { + this.federatingPortletInvoker = federatingPortletInvoker; + } + + public String getSessionFactoryJNDIName() + { + return sessionFactoryJNDIName; + } + + public void setSessionFactoryJNDIName(String sessionFactoryJNDIName) + { + this.sessionFactoryJNDIName = sessionFactoryJNDIName; + } + + protected void startService() throws Exception + { + sessionFactory = (SessionFactory)new InitialContext().lookup(sessionFactoryJNDIName); + + // load the configured consumers + consumers = new TreeMap(); + Session session = sessionFactory.getCurrentSession(); + Iterator producerInfos = session.createQuery("from ProducerInfo pi order by pi.id").iterate(); + ProducerInfo producerInfo; + WSRPConsumer consumer; + while (producerInfos.hasNext()) + { + producerInfo = (ProducerInfo)producerInfos.next(); + consumer = new WSRPConsumerImpl(); + consumer.setProducerInfo(producerInfo); + consumers.put(producerInfo.getId(), consumer); + if (producerInfo.isActive()) + { + WSRPConsumerService service = new WSRPConsumerService(); + service.setConsumer(consumer); + service.setFederatingPortletInvoker(federatingPortletInvoker); + service.start(); + } + } + } + + protected void stopService() throws Exception + { + sessionFactory = null; + consumers.clear(); + consumers = null; + } + + public Collection getConfiguredConsumers() + { + return Collections.unmodifiableCollection(consumers.values()); + } + + public WSRPConsumer getConsumer(String id) + { + ParameterValidation.throwIllegalArgExceptionIfNullOrEmpty(id, "consumer id", null); + return (WSRPConsumer)consumers.get(id); + + /*// first check if this consumer has already been loaded + WSRPConsumer wsrpConsumer = (WSRPConsumer)consumers.get(id); + + if(wsrpConsumer != null) + { + return wsrpConsumer; + } + else + { + Session session = sessionFactory.getCurrentSession(); + Query query = session.createQuery("from ProducerInfo where id=:id"); + query.setString("id", id); + ProducerInfo pi = (ProducerInfo)query.uniqueResult(); + if (pi != null) + { + wsrpConsumer = new WSRPConsumerImpl(); + wsrpConsumer.setProducerInfo(pi); + consumers.put(pi.getId(), wsrpConsumer); + if (pi.isActive()) + { + WSRPConsumerService service = new WSRPConsumerService(); + service.setConsumer(wsrpConsumer); + service.setFederatingPortletInvoker(federatingPortletInvoker); + try + { + service.start(); + } + catch (Exception e) + { + throw new RuntimeException("Couldn't start Consumer '" + pi.getId() + "'", e); + } + } + return wsrpConsumer; + } + return null; + }*/ + } +} Property changes on: trunk/wsrp/src/main/org/jboss/portal/wsrp/consumer/ConsumerRegistryService.java ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native Modified: trunk/wsrp/src/main/org/jboss/portal/wsrp/deployment/WSRPDeployer.java =================================================================== --- trunk/wsrp/src/main/org/jboss/portal/wsrp/deployment/WSRPDeployer.java 2007-02-25 01:50:29 UTC (rev 6396) +++ trunk/wsrp/src/main/org/jboss/portal/wsrp/deployment/WSRPDeployer.java 2007-02-25 06:32:01 UTC (rev 6397) @@ -27,7 +27,7 @@ import org.jboss.deployment.SubDeployerSupport; import org.jboss.portal.common.util.URLTools; import org.jboss.portal.common.xml.NullEntityResolver; -import org.jboss.portal.wsrp.portlet.consumers.ConsumersRegistry; +import org.jboss.portal.wsrp.consumer.ConsumerRegistry; import org.jboss.xb.binding.ObjectModelFactory; import org.jboss.xb.binding.Unmarshaller; import org.jboss.xb.binding.UnmarshallerFactory; @@ -50,7 +50,7 @@ setEnhancedSuffixes(DEFAULT_ENHANCED_SUFFIXES); } - private ConsumersRegistry consumerRegistry; + private ConsumerRegistry consumerRegistry; /** . */ private URL deployedDefaultWSRPURL; @@ -70,12 +70,12 @@ this.entityResolver = entityResolver; } - public ConsumersRegistry getConsumerRegistry() + public ConsumerRegistry getConsumerRegistry() { return consumerRegistry; } - public void setConsumerRegistry(ConsumersRegistry consumerRegistry) + public void setConsumerRegistry(ConsumerRegistry consumerRegistry) { this.consumerRegistry = consumerRegistry; } Modified: trunk/wsrp/src/main/org/jboss/portal/wsrp/deployment/WSRPDeployerMBean.java =================================================================== --- trunk/wsrp/src/main/org/jboss/portal/wsrp/deployment/WSRPDeployerMBean.java 2007-02-25 01:50:29 UTC (rev 6396) +++ trunk/wsrp/src/main/org/jboss/portal/wsrp/deployment/WSRPDeployerMBean.java 2007-02-25 06:32:01 UTC (rev 6397) @@ -23,7 +23,7 @@ package org.jboss.portal.wsrp.deployment; import org.jboss.deployment.SubDeployerExtMBean; -import org.jboss.portal.wsrp.portlet.consumers.ConsumersRegistry; +import org.jboss.portal.wsrp.consumer.ConsumerRegistry; import org.xml.sax.EntityResolver; /** @@ -36,9 +36,9 @@ void setDefaultWSRPLocation(String defaultWSRPLocation); - ConsumersRegistry getConsumerRegistry(); + ConsumerRegistry getConsumerRegistry(); - void setConsumerRegistry(ConsumersRegistry consumerRegistry); + void setConsumerRegistry(ConsumerRegistry consumerRegistry); EntityResolver getEntityResolver(); Modified: trunk/wsrp/src/main/org/jboss/portal/wsrp/deployment/WSRPDeploymentFactory.java =================================================================== --- trunk/wsrp/src/main/org/jboss/portal/wsrp/deployment/WSRPDeploymentFactory.java 2007-02-25 01:50:29 UTC (rev 6396) +++ trunk/wsrp/src/main/org/jboss/portal/wsrp/deployment/WSRPDeploymentFactory.java 2007-02-25 06:32:01 UTC (rev 6397) @@ -25,11 +25,11 @@ import org.jboss.logging.Logger; import org.jboss.portal.common.util.ParameterValidation; import org.jboss.portal.wsrp.WSRPConsumer; +import org.jboss.portal.wsrp.consumer.ConsumerRegistry; import org.jboss.portal.wsrp.consumer.EndpointConfigurationInfo; import org.jboss.portal.wsrp.consumer.ProducerInfo; import org.jboss.portal.wsrp.consumer.RegistrationInfo; import org.jboss.portal.wsrp.consumer.WSRPConsumerImpl; -import org.jboss.portal.wsrp.portlet.consumers.ConsumersRegistry; import org.jboss.portal.wsrp.services.AbstractJNDIServiceFactory; import org.jboss.portal.wsrp.services.PerEndpointSOAPInvokerServiceFactory; import org.jboss.portal.wsrp.services.RemoteSOAPInvokerServiceFactory; @@ -50,7 +50,7 @@ { private final Logger log = Logger.getLogger(getClass()); - private ConsumersRegistry consumerRegistry; + private ConsumerRegistry consumerRegistry; private static final boolean DEBUG = false; @@ -87,7 +87,7 @@ } - public WSRPDeploymentFactory(ConsumersRegistry consumerRegistry) + public WSRPDeploymentFactory(ConsumerRegistry consumerRegistry) { this.consumerRegistry = consumerRegistry; } Modified: trunk/wsrp/src/main/org/jboss/portal/wsrp/portlet/consumers/WSRPConsumerConfigurationPortlet.java =================================================================== --- trunk/wsrp/src/main/org/jboss/portal/wsrp/portlet/consumers/WSRPConsumerConfigurationPortlet.java 2007-02-25 01:50:29 UTC (rev 6396) +++ trunk/wsrp/src/main/org/jboss/portal/wsrp/portlet/consumers/WSRPConsumerConfigurationPortlet.java 2007-02-25 06:32:01 UTC (rev 6397) @@ -23,6 +23,8 @@ package org.jboss.portal.wsrp.portlet.consumers; +import org.jboss.portal.wsrp.consumer.ConsumerRegistry; + import javax.portlet.ActionRequest; import javax.portlet.ActionResponse; import javax.portlet.GenericPortlet; @@ -42,7 +44,7 @@ */ public class WSRPConsumerConfigurationPortlet extends GenericPortlet { - private ConsumersRegistry registry; + private ConsumerRegistry registry; private static final String NOT_SUPPORTED = "notSupported"; private static final String JSP_PATH = "/WEB-INF/jsp/consumers/"; @@ -58,7 +60,7 @@ public void init() throws PortletException { super.init(); - registry = (ConsumersRegistry)getPortletContext().getAttribute(CONSUMERS_REGISTRY); + registry = (ConsumerRegistry)getPortletContext().getAttribute(CONSUMERS_REGISTRY); if (registry == null) { throw new PortletException("Couldn't initialize Consumers registry"); Modified: trunk/wsrp/src/resources/portal-wsrp-sar/META-INF/jboss-service.xml =================================================================== --- trunk/wsrp/src/resources/portal-wsrp-sar/META-INF/jboss-service.xml 2007-02-25 01:50:29 UTC (rev 6396) +++ trunk/wsrp/src/resources/portal-wsrp-sar/META-INF/jboss-service.xml 2007-02-25 06:32:01 UTC (rev 6397) @@ -149,7 +149,7 @@ </mbean> <!-- Consumers registry for WSRP consumers --> - <mbean code="org.jboss.portal.wsrp.portlet.consumers.ConsumersRegistryService" + <mbean code="org.jboss.portal.wsrp.consumer.ConsumerRegistryService" name="portal.wsrp:service=ConsumersRegistry" xmbean-dd="" xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean"> <xmbean/> Modified: trunk/wsrp/src/resources/portal-wsrp-sar/wsrp-aop.xml =================================================================== --- trunk/wsrp/src/resources/portal-wsrp-sar/wsrp-aop.xml 2007-02-25 01:50:29 UTC (rev 6396) +++ trunk/wsrp/src/resources/portal-wsrp-sar/wsrp-aop.xml 2007-02-25 06:32:01 UTC (rev 6397) @@ -22,7 +22,7 @@ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~--> <aop> - <metadata tag="transaction" class="org.jboss.portal.wsrp.portlet.consumers.ConsumersRegistryService"> + <metadata tag="transaction" class="org.jboss.portal.wsrp.consumer.ConsumerRegistryService"> <method name="startService"> <trans-attribute>Required</trans-attribute> </method> Modified: trunk/wsrp/src/resources/portal-wsrp-war/WEB-INF/jboss-portlet.xml =================================================================== --- trunk/wsrp/src/resources/portal-wsrp-war/WEB-INF/jboss-portlet.xml 2007-02-25 01:50:29 UTC (rev 6396) +++ trunk/wsrp/src/resources/portal-wsrp-war/WEB-INF/jboss-portlet.xml 2007-02-25 06:32:01 UTC (rev 6397) @@ -24,7 +24,7 @@ <portlet-app> <service> <service-name>ConsumersRegistry</service-name> - <service-class>org.jboss.portal.wsrp.portlet.consumers.ConsumersRegistry</service-class> + <service-class>org.jboss.portal.wsrp.consumer.ConsumerRegistry</service-class> <service-ref>portal.wsrp:service=ConsumersRegistry</service-ref> </service> </portlet-app> Modified: trunk/wsrp/src/resources/portal-wsrp-war/WEB-INF/jsp/consumers/consumer.jsp =================================================================== --- trunk/wsrp/src/resources/portal-wsrp-war/WEB-INF/jsp/consumers/consumer.jsp 2007-02-25 01:50:29 UTC (rev 6396) +++ trunk/wsrp/src/resources/portal-wsrp-war/WEB-INF/jsp/consumers/consumer.jsp 2007-02-25 06:32:01 UTC (rev 6397) @@ -1,8 +1,8 @@ <%@ page import="org.jboss.portal.wsrp.WSRPConsumer" %> +<%@ page import="org.jboss.portal.wsrp.consumer.ConsumerRegistry" %> <%@ page import="org.jboss.portal.wsrp.consumer.EndpointConfigurationInfo" %> <%@ page import="org.jboss.portal.wsrp.consumer.ProducerInfo" %> <%@ page import="org.jboss.portal.wsrp.consumer.RegistrationInfo" %> -<%@ page import="org.jboss.portal.wsrp.portlet.consumers.ConsumersRegistry" %> <%@ page import="org.jboss.portal.wsrp.portlet.consumers.WSRPConsumerConfigurationPortlet" %> <%@ page import="org.jboss.portal.wsrp.registration.RegistrationPropertyDescription" %> <%@ page import="java.util.Iterator" %> @@ -11,7 +11,7 @@ <portlet:defineObjects/> <% - ConsumersRegistry registry = (ConsumersRegistry)portletConfig.getPortletContext().getAttribute(WSRPConsumerConfigurationPortlet.CONSUMERS_REGISTRY); + ConsumerRegistry registry = (ConsumerRegistry)portletConfig.getPortletContext().getAttribute(WSRPConsumerConfigurationPortlet.CONSUMERS_REGISTRY); String id = request.getParameter(WSRPConsumerConfigurationPortlet.ID); if (id == null) { Modified: trunk/wsrp/src/resources/portal-wsrp-war/WEB-INF/jsp/consumers/view.jsp =================================================================== --- trunk/wsrp/src/resources/portal-wsrp-war/WEB-INF/jsp/consumers/view.jsp 2007-02-25 01:50:29 UTC (rev 6396) +++ trunk/wsrp/src/resources/portal-wsrp-war/WEB-INF/jsp/consumers/view.jsp 2007-02-25 06:32:01 UTC (rev 6397) @@ -1,12 +1,12 @@ <%@ page import="org.jboss.portal.wsrp.WSRPConsumer" %> -<%@ page import="org.jboss.portal.wsrp.portlet.consumers.ConsumersRegistry" %> +<%@ page import="org.jboss.portal.wsrp.consumer.ConsumerRegistry" %> <%@ page import="org.jboss.portal.wsrp.portlet.consumers.WSRPConsumerConfigurationPortlet" %> <%@ page import="java.util.Iterator" %> <%@ taglib uri="http://java.sun.com/portlet" prefix="portlet" %> <portlet:defineObjects/> <% - ConsumersRegistry registry = (ConsumersRegistry)portletConfig.getPortletContext().getAttribute(WSRPConsumerConfigurationPortlet.CONSUMERS_REGISTRY); + ConsumerRegistry registry = (ConsumerRegistry)portletConfig.getPortletContext().getAttribute(WSRPConsumerConfigurationPortlet.CONSUMERS_REGISTRY); %> <div class="portlet-section-body">