Author: chris.laprun(a)jboss.com Date: 2007-02-21 00:55:02 -0500 (Wed, 21 Feb 2007) New Revision: 6357 Added: trunk/wsrp/src/main/org/jboss/portal/wsrp/consumer/RegistrationProperty.java trunk/wsrp/src/resources/portal-wsrp-sar/conf/consumer/ trunk/wsrp/src/resources/portal-wsrp-sar/conf/consumer/hibernate/ trunk/wsrp/src/resources/portal-wsrp-sar/conf/consumer/hibernate/domain.hbm.xml trunk/wsrp/src/resources/portal-wsrp-sar/conf/consumer/hibernate/ehcache.xml trunk/wsrp/src/resources/portal-wsrp-sar/conf/consumer/hibernate/hibernate.cfg.xml Modified: trunk/wsrp/build.xml trunk/wsrp/src/main/org/jboss/portal/test/wsrp/deployment/DeploymentTestCase.java trunk/wsrp/src/main/org/jboss/portal/wsrp/consumer/EndpointConfigurationInfo.java trunk/wsrp/src/main/org/jboss/portal/wsrp/consumer/ProducerInfo.java trunk/wsrp/src/main/org/jboss/portal/wsrp/consumer/RegistrationInfo.java trunk/wsrp/src/main/org/jboss/portal/wsrp/portlet/consumers/ConsumersRegistry.java trunk/wsrp/src/main/org/jboss/portal/wsrp/registration/RegistrationPropertyDescription.java trunk/wsrp/src/resources/portal-wsrp-sar/META-INF/jboss-service.xml trunk/wsrp/src/resources/portal-wsrp-war/WEB-INF/jsp/consumers/consumer.jsp Log: - Started implementation of persistence of registrations on the consumer. - Modified classes to work with Hibernate. - Added Hibernate configuration files. - Added service descriptions. - Modified build to accomodate token filtering. - Broke almost all the consumer tests (and some others too) but WSRP deploys correctly so hopefully only minor work is left (hence the commit). Modified: trunk/wsrp/build.xml =================================================================== --- trunk/wsrp/build.xml 2007-02-20 22:07:16 UTC (rev 6356) +++ trunk/wsrp/build.xml 2007-02-21 05:55:02 UTC (rev 6357) @@ -200,9 +200,21 @@ <target name="compile" description="Compile all source files." - depends="_default:compile-classes, - _default:compile-etc, - _default:compile-resources"> + depends="_default:compile-classes,_default:compile-etc"> + <!-- essentially accomplish _default:compile-resources that needs to be done here to filter hibernate conf files --> + <mkdir dir="${build.resources}"/> + <copy todir="${build.resources}"> + <filterset> + <filtersfile file="../build/etc/single.properties"/> + <filter token="portal.datasource.name" value="${portal.datasource.name}"/> + </filterset> + <fileset dir="${source.resources}" includes="**/domain.hbm.xml"/> + <fileset dir="${source.resources}" includes="**/hibernate.cfg.xml"/> + <fileset dir="${source.resources}" includes="**/jboss-service.xml"/> + </copy> + <copy todir="${build.resources}" filtering="no"> + <fileset dir="${source.resources}"/> + </copy> <mkdir dir="${build.lib.test}"/> <mkdir dir="${build.resources.test}"/> <property name="compile.disable" value="true"/> @@ -212,7 +224,7 @@ <!--| Generate Output |--> <!--| |--> <!--| Generates the target output for this module. Target output is |--> - <!--| the output which is ment to be released or used by external |--> + <!--| the output which is meant to be released or used by external |--> <!--| modules. |--> <!--+====================================================================+--> Modified: trunk/wsrp/src/main/org/jboss/portal/test/wsrp/deployment/DeploymentTestCase.java =================================================================== --- trunk/wsrp/src/main/org/jboss/portal/test/wsrp/deployment/DeploymentTestCase.java 2007-02-20 22:07:16 UTC (rev 6356) +++ trunk/wsrp/src/main/org/jboss/portal/test/wsrp/deployment/DeploymentTestCase.java 2007-02-21 05:55:02 UTC (rev 6357) @@ -84,10 +84,10 @@ assertEquals("markup-1", serviceFactory1.getMarkupURL()); assertEquals("registration-1", serviceFactory1.getRegistrationURL()); assertEquals("portlet-management-1", serviceFactory1.getPortletManagementURL()); - assertEquals(endInfo.getServiceDescriptionInterfaceURL(), serviceFactory1.getServiceDescriptionURL()); - assertEquals(endInfo.getMarkupInterfaceURL(), serviceFactory1.getMarkupURL()); - assertEquals(endInfo.getRegistrationInterfaceURL(), serviceFactory1.getRegistrationURL()); - assertEquals(endInfo.getPortletManagementInterfaceURL(), serviceFactory1.getPortletManagementURL()); + assertEquals(endInfo.getServiceDescriptionURL(), serviceFactory1.getServiceDescriptionURL()); + assertEquals(endInfo.getMarkupURL(), serviceFactory1.getMarkupURL()); + assertEquals(endInfo.getRegistrationURL(), serviceFactory1.getRegistrationURL()); + assertEquals(endInfo.getPortletManagementURL(), serviceFactory1.getPortletManagementURL()); // service = services.get(1); @@ -116,10 +116,10 @@ endInfo = info.getEndpointConfigurationInfo(); assertNotNull(endInfo); assertTrue(endInfo.usesWSDL()); - assertEquals("http://wsrp.bea.com:7001/producer/producer?WSDL", endInfo.getWSDLLocationIfAvailable()); + assertEquals("http://wsrp.bea.com:7001/producer/producer?WSDL", endInfo.getWsdlDefinitionURL()); RegistrationInfo regInfo = info.getRegistrationInfo(); assertNotNull(regInfo); - assertTrue(regInfo.requiresRegistration()); + assertTrue(regInfo.isRequiresRegistration()); RegistrationData registrationData = regInfo.getRegistrationData(); assertNotNull(registrationData); assertEquals("JBoss Portal 2.4 Test", registrationData.getConsumerName()); Modified: trunk/wsrp/src/main/org/jboss/portal/wsrp/consumer/EndpointConfigurationInfo.java =================================================================== --- trunk/wsrp/src/main/org/jboss/portal/wsrp/consumer/EndpointConfigurationInfo.java 2007-02-20 22:07:16 UTC (rev 6356) +++ trunk/wsrp/src/main/org/jboss/portal/wsrp/consumer/EndpointConfigurationInfo.java 2007-02-21 05:55:02 UTC (rev 6357) @@ -29,6 +29,7 @@ import org.jboss.portal.wsrp.core.WSRP_v1_PortletManagement_PortType; import org.jboss.portal.wsrp.core.WSRP_v1_Registration_PortType; import org.jboss.portal.wsrp.core.WSRP_v1_ServiceDescription_PortType; +import org.jboss.portal.wsrp.services.PerEndpointSOAPInvokerServiceFactory; import org.jboss.portal.wsrp.services.RemoteSOAPInvokerServiceFactory; import org.jboss.portal.wsrp.services.ServiceFactory; @@ -39,13 +40,31 @@ */ public class EndpointConfigurationInfo { + /** DB primary key */ + private Long key; + + private String serviceDescriptionURL; + private String markupURL; + private String registrationURL; + private String portletManagementURL; + private String wsdlDefinitionURL; + + // transient variables + /** Access to the WS */ private ServiceFactory serviceFactory; + /** Whether the service factory needs refreshing */ + private boolean dirty; + static final String SERVICE_DESCRIPTION = "service description"; static final String MARKUP = "markup"; static final String PORTLET_MANAGEMENT = "portlet management"; static final String REGISTRATION = "registration"; + public EndpointConfigurationInfo() + { + } + public EndpointConfigurationInfo(ProducerInfo producerInfo) { ParameterValidation.throwIllegalArgExceptionIfNull(producerInfo, "ProducerInfo"); @@ -58,50 +77,106 @@ setServiceFactory(serviceFactory); } + + public Long getKey() + { + return key; + } + + public void setKey(Long key) + { + this.key = key; + } + public boolean usesWSDL() { - return getServiceFactory() instanceof RemoteSOAPInvokerServiceFactory; + return wsdlDefinitionURL != null; } - public String getWSDLLocationIfAvailable() + public String getWsdlDefinitionURL() { - if (usesWSDL()) - { - RemoteSOAPInvokerServiceFactory remoteSF = (RemoteSOAPInvokerServiceFactory)getServiceFactory(); - return remoteSF.getWsdlDefinitionURL(); - } - else - { - return null; - } + return wsdlDefinitionURL; } - public String getServiceDescriptionInterfaceURL() + public String getServiceDescriptionURL() { - return getServiceFactory().getServiceDescriptionURL(); + return serviceDescriptionURL; } - public String getMarkupInterfaceURL() + public String getMarkupURL() { - return getServiceFactory().getMarkupURL(); + return markupURL; } - public String getPortletManagementInterfaceURL() + public String getPortletManagementURL() { - return getServiceFactory().getPortletManagementURL(); + return portletManagementURL; } - public String getRegistrationInterfaceURL() + public String getRegistrationURL() { - return getServiceFactory().getRegistrationURL(); + return registrationURL; } - ServiceFactory getServiceFactory() + public void setServiceDescriptionURL(String serviceDescriptionURL) { - if (serviceFactory == null) + this.serviceDescriptionURL = serviceDescriptionURL; + dirty = true; + } + + public void setMarkupURL(String markupURL) + { + this.markupURL = markupURL; + dirty = true; + } + + public void setRegistrationURL(String registrationURL) + { + this.registrationURL = registrationURL; + dirty = true; + } + + public void setPortletManagementURL(String portletManagementURL) + { + this.portletManagementURL = portletManagementURL; + dirty = true; + } + + public void setWsdlDefinitionURL(String wsdlDefinitionURL) + { + this.wsdlDefinitionURL = wsdlDefinitionURL; + dirty = true; + } + + public void refreshServiceFactory() + { + if (dirty) { - throw new IllegalStateException("ServiceFactory hasn't been initialized for this EndpointConfigurationInfo"); + // todo: implement update of service factory when URLs are changed... + if (serviceFactory == null) + { + if (usesWSDL()) + { + serviceFactory = new RemoteSOAPInvokerServiceFactory(); + ((RemoteSOAPInvokerServiceFactory)serviceFactory).setWsdlDefinitionURL(wsdlDefinitionURL); + } + else + { + serviceFactory = new PerEndpointSOAPInvokerServiceFactory(); + ((PerEndpointSOAPInvokerServiceFactory)serviceFactory).setServiceDescriptionURL(serviceDescriptionURL); + ((PerEndpointSOAPInvokerServiceFactory)serviceFactory).setMarkupURL(markupURL); + ((PerEndpointSOAPInvokerServiceFactory)serviceFactory).setPortletManagementURL(portletManagementURL); + ((PerEndpointSOAPInvokerServiceFactory)serviceFactory).setRegistrationURL(registrationURL); + } + } + + dirty = false; } + } + + ServiceFactory getServiceFactory() + { + refreshServiceFactory(); return serviceFactory; } @@ -109,6 +184,17 @@ { ParameterValidation.throwIllegalArgExceptionIfNull(serviceFactory, "ServiceFactory"); this.serviceFactory = serviceFactory; + serviceDescriptionURL = serviceFactory.getServiceDescriptionURL(); + markupURL = serviceFactory.getMarkupURL(); + portletManagementURL = serviceFactory.getPortletManagementURL(); + registrationURL = serviceFactory.getRegistrationURL(); + + if (serviceFactory instanceof RemoteSOAPInvokerServiceFactory) + { + wsdlDefinitionURL = ((RemoteSOAPInvokerServiceFactory)serviceFactory).getWsdlDefinitionURL(); + } + + dirty = false; } WSRP_v1_ServiceDescription_PortType getServiceDescriptionService() throws InvokerUnavailableException Modified: trunk/wsrp/src/main/org/jboss/portal/wsrp/consumer/ProducerInfo.java =================================================================== --- trunk/wsrp/src/main/org/jboss/portal/wsrp/consumer/ProducerInfo.java 2007-02-20 22:07:16 UTC (rev 6356) +++ trunk/wsrp/src/main/org/jboss/portal/wsrp/consumer/ProducerInfo.java 2007-02-21 05:55:02 UTC (rev 6357) @@ -64,6 +64,9 @@ // Persistent information + /** DB primary key */ + private Long key; + /** Configuration of the remote WS endpoints */ private EndpointConfigurationInfo persistentEndpointInfo; @@ -76,13 +79,14 @@ /** The cache expiration duration (in seconds) for cached values */ private Integer persitentExpirationCacheSeconds; + /** The activated status of the associated Consumer */ + private boolean persistentActive; + // Transient information /** The Cookie handling policy required by the Producer */ private CookieProtocol requiresInitCookie; - private boolean isInitialized; - /** The Producer-Offered Portlets (handle -> WSRPPortlet) */ private Map popsMap; @@ -115,6 +119,17 @@ persistentRegistrationInfo = RegistrationInfo.REGISTRATION_NOT_NEEDED; } + + public Long getKey() + { + return key; + } + + public void setKey(Long key) + { + this.key = key; + } + public EndpointConfigurationInfo getEndpointConfigurationInfo() { return persistentEndpointInfo; @@ -136,6 +151,29 @@ this.persistentRegistrationInfo = registrationInfo; } + /** + * Determines whether the associated consumer is active. + * + * @return + * @since 2.6 + */ + public boolean isActive() + { + return persistentActive; + } + + /** + * Activates or de-activate this Consumer. Note that this shouldn't be called directly as ConsumersRegistry will + * handle activation. + * + * @param active + * @since 2.6 + */ + public void setActive(boolean active) + { + this.persistentActive = active; + } + CookieProtocol getRequiresInitCookie() { return requiresInitCookie; @@ -147,7 +185,7 @@ * @param forceRefresh whether or not to force a refresh regardless of whether one would have been required based on * cache expiration * @return <code>true</code> if the producer's information just was refreshed, <code>false</code> - * @throws PortletInvokerException + * @throws PortletInvokerException if registration was required but couldn't be achieved properly */ public boolean refresh(boolean forceRefresh) throws PortletInvokerException { Modified: trunk/wsrp/src/main/org/jboss/portal/wsrp/consumer/RegistrationInfo.java =================================================================== --- trunk/wsrp/src/main/org/jboss/portal/wsrp/consumer/RegistrationInfo.java 2007-02-20 22:07:16 UTC (rev 6356) +++ trunk/wsrp/src/main/org/jboss/portal/wsrp/consumer/RegistrationInfo.java 2007-02-21 05:55:02 UTC (rev 6357) @@ -25,8 +25,6 @@ import org.jboss.logging.Logger; import org.jboss.portal.common.util.ParameterValidation; -import org.jboss.portal.common.value.StringValue; -import org.jboss.portal.registration.Registration; import org.jboss.portal.wsrp.WSRPConstants; import org.jboss.portal.wsrp.WSRPTypeFactory; import org.jboss.portal.wsrp.WSRPUtils; @@ -56,13 +54,16 @@ { public final static RegistrationInfo REGISTRATION_NOT_NEEDED = new RegistrationInfo(); private final Logger log = Logger.getLogger(getClass()); - private Registration registration; + + private Long key; + private String consumerName; + private String registrationHandle; + private byte[] registrationState; private boolean requiresRegistration; - private Map registrationProperties; // todo: remove and compute from registration + private Map registrationProperties; + private transient RegistrationData registrationData; - private boolean isRegistrationValid; // todo: remove and compute from registration - private RegistrationContext registrationContext; // todo: remove and compute from registration - private String consumerName; + private transient boolean isRegistrationValid; public RegistrationInfo(ProducerInfo producerInfo) { @@ -79,16 +80,47 @@ requiresRegistration = false; } - public boolean requiresRegistration() + + public Long getKey() { - return requiresRegistration; + return key; } - public Registration getRegistration() + public void setKey(Long key) { - return registration; + this.key = key; } + public String getRegistrationHandle() + { + return registrationHandle; + } + + public void setRegistrationHandle(String registrationHandle) + { + this.registrationHandle = registrationHandle; + } + + public byte[] getRegistrationState() + { + return registrationState; + } + + public void setRegistrationState(byte[] registrationState) + { + this.registrationState = registrationState; + } + + public void setRequiresRegistration(boolean requiresRegistration) + { + this.requiresRegistration = requiresRegistration; + } + + public boolean isRequiresRegistration() + { + return requiresRegistration; + } + public RegistrationData getRegistrationData() { if (registrationData == null) @@ -102,10 +134,10 @@ for (Iterator entries = regProps.values().iterator(); entries.hasNext();) { RegistrationProperty prop = (RegistrationProperty)entries.next(); - String value = prop.getValueAsString(); + String value = prop.getValue(); if (value != null && !prop.isInvalid()) { - properties.add(WSRPTypeFactory.createProperty(prop.getName(), prop.getLang(), prop.getValueAsString())); + properties.add(WSRPTypeFactory.createProperty(prop.getName(), prop.getLang(), prop.getValue())); } } @@ -190,6 +222,11 @@ } } + public void setRegistrationProperties(Map registrationProperties) + { + this.registrationProperties = registrationProperties; + } + public Set getRegistrationPropertyNames() { return getRegistrationProperties().keySet(); @@ -287,6 +324,7 @@ { log.info("Producer '" + producerId + "' doesn't require registration."); requiresRegistration = false; + isRegistrationValid = true; configurationValid = true; } @@ -326,77 +364,30 @@ void resetRegistration() { registrationData = null; - registrationContext = null; + registrationHandle = null; + registrationState = null; isRegistrationValid = false; } public boolean isRegistrationValid() { -// return !requiresRegistration() || (registration != null && RegistrationStatus.VALID == registration.getStatus()); return isRegistrationValid; } public void setRegistrationContext(RegistrationContext registrationContext) { - // todo: remove - this.registrationContext = registrationContext; + ParameterValidation.throwIllegalArgExceptionIfNull(registrationContext, "RegistrationContext"); + String handle = registrationContext.getRegistrationHandle(); + ParameterValidation.throwIllegalArgExceptionIfNullOrEmpty(handle, "registration handle", "RegistrationContext"); + registrationHandle = handle; + registrationState = registrationContext.getRegistrationState(); isRegistrationValid = true; } public RegistrationContext getRegistrationContext() { + RegistrationContext registrationContext = WSRPTypeFactory.createRegistrationContext(registrationHandle); + registrationContext.setRegistrationState(registrationState); return registrationContext; } - - public static class RegistrationProperty extends org.jboss.portal.portlet.state.Property - { - private RegistrationPropertyDescription description; - private boolean isInvalid; - private String lang; - - public RegistrationProperty(String name, String stringValue) - { - super(name, new StringValue(stringValue)); - } - - public String getValueAsString() - { - return getValue().asString(); - } - - public RegistrationPropertyDescription getDescription() - { - return description; - } - - public void setDescription(RegistrationPropertyDescription description) - { - this.description = description; - } - - public boolean isInvalid() - { - return isInvalid; - } - - public void setInvalid(boolean invalid) - { - isInvalid = invalid; - } - - public void setValue(String stringValue) - { - value = new StringValue(stringValue); - } - - public String getLang() - { - return lang; - } - - public void setLang(String lang) - { - this.lang = lang; - } - } } Added: trunk/wsrp/src/main/org/jboss/portal/wsrp/consumer/RegistrationProperty.java =================================================================== --- trunk/wsrp/src/main/org/jboss/portal/wsrp/consumer/RegistrationProperty.java (rev 0) +++ trunk/wsrp/src/main/org/jboss/portal/wsrp/consumer/RegistrationProperty.java 2007-02-21 05:55:02 UTC (rev 6357) @@ -0,0 +1,113 @@ +/****************************************************************************** + * JBoss, a division of Red Hat * + * Copyright 2007, 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.wsrp.registration.RegistrationPropertyDescription; + +/** + * @author <a href="mailto:chris.laprun@jboss.com">Chris Laprun</a> + * @version $Revision$ + * @since 2.6 + */ +public class RegistrationProperty +{ + private Long key; + private RegistrationPropertyDescription description; + private boolean invalid; + private String lang; + private String name; + private String value; + + + public RegistrationProperty() + { + } + + public RegistrationProperty(String name, String stringValue) + { + this.name = name; + this.value = stringValue; + } + + + public Long getKey() + { + return key; + } + + public void setKey(Long key) + { + this.key = key; + } + + public String getName() + { + return name; + } + + public void setName(String name) + { + this.name = name; + } + + public String getValue() + { + return value; + } + + public RegistrationPropertyDescription getDescription() + { + return description; + } + + public void setDescription(RegistrationPropertyDescription description) + { + this.description = description; + } + + public boolean isInvalid() + { + return invalid; + } + + public void setInvalid(boolean invalid) + { + this.invalid = invalid; + } + + public void setValue(String stringValue) + { + value = stringValue; + } + + public String getLang() + { + return lang; + } + + public void setLang(String lang) + { + this.lang = lang; + } +} Property changes on: trunk/wsrp/src/main/org/jboss/portal/wsrp/consumer/RegistrationProperty.java ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native Modified: trunk/wsrp/src/main/org/jboss/portal/wsrp/portlet/consumers/ConsumersRegistry.java =================================================================== --- trunk/wsrp/src/main/org/jboss/portal/wsrp/portlet/consumers/ConsumersRegistry.java 2007-02-20 22:07:16 UTC (rev 6356) +++ trunk/wsrp/src/main/org/jboss/portal/wsrp/portlet/consumers/ConsumersRegistry.java 2007-02-21 05:55:02 UTC (rev 6357) @@ -39,5 +39,4 @@ WSRPConsumer getConsumer(String id); FederatingPortletInvoker getFederatingPortletInvoker(); - -} +} \ No newline at end of file Modified: trunk/wsrp/src/main/org/jboss/portal/wsrp/registration/RegistrationPropertyDescription.java =================================================================== --- trunk/wsrp/src/main/org/jboss/portal/wsrp/registration/RegistrationPropertyDescription.java 2007-02-20 22:07:16 UTC (rev 6356) +++ trunk/wsrp/src/main/org/jboss/portal/wsrp/registration/RegistrationPropertyDescription.java 2007-02-21 05:55:02 UTC (rev 6357) @@ -27,6 +27,7 @@ import javax.xml.namespace.QName; import java.net.URI; +import java.net.URISyntaxException; /** * @author <a href="mailto:chris.laprun@jboss.com">Chris Laprun</a> @@ -35,17 +36,18 @@ */ public class RegistrationPropertyDescription implements Cloneable { + private Long key; private QName name; private QName type; - private URI schemaLocation; + private String schemaLocation; private LocalizedString description; private LocalizedString hint; private LocalizedString label; private String[] usages; private QName[] aliases; + private transient ProducerRegistrationRequirements parent; - public RegistrationPropertyDescription(QName name, QName type) { this.name = name; @@ -89,6 +91,17 @@ ", label=" + label; } + + public Long getKey() + { + return key; + } + + public void setKey(Long key) + { + this.key = key; + } + public QName getName() { return name; @@ -111,13 +124,36 @@ notifyParentOfChangeIfNeeded(); } - public URI getSchemaLocation() + public String getSchemaLocation() { return schemaLocation; } - public void setSchemaLocation(URI schemaLocation) + public URI getSchemaLocationAsURI() { + try + { + return new URI(schemaLocation); + } + catch (URISyntaxException e) + { + // shouldn't happen + throw new IllegalArgumentException("Invalid URI: " + schemaLocation + ". Cause: " + e.getLocalizedMessage()); + } + } + + public void setSchemaLocation(String schemaLocation) + { + // first check if schemaLocation is a valid URI + try + { + new URI(schemaLocation); + } + catch (URISyntaxException e) + { + throw new IllegalArgumentException("Invalid URI: " + schemaLocation + ". Cause: " + e.getLocalizedMessage()); + } + this.schemaLocation = schemaLocation; notifyParentOfChangeIfNeeded(); } 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-20 22:07:16 UTC (rev 6356) +++ trunk/wsrp/src/resources/portal-wsrp-sar/META-INF/jboss-service.xml 2007-02-21 05:55:02 UTC (rev 6357) @@ -79,13 +79,13 @@ <xmbean/> <depends optional-attribute-name="Invoker" proxy-type="attribute">portal:service=PortletInvoker,type=WSRPProducer</depends> - <depends optional-attribute-name="RegistrationManager" proxy-type="attribute">portal.wsrp:service=RegistrationManager</depends> + <depends optional-attribute-name="RegistrationManager" proxy-type="attribute">portal.wsrp:service=RegistrationManager,type=Producer</depends> <depends optional-attribute-name="ProducerConfigurationService" proxy-type="attribute">portal.wsrp:service=ProducerConfiguration</depends> </mbean> <!-- Registration manager --> <mbean code="org.jboss.portal.registration.impl.RegistrationManagerImpl" - name="portal.wsrp:service=RegistrationManager" xmbean-dd="" + name="portal.wsrp:service=RegistrationManager,type=Producer" xmbean-dd="" xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean"> <xmbean/> <depends optional-attribute-name="PersistenceManager" proxy-type="attribute">portal.wsrp:service=PersistenceManager</depends> @@ -115,28 +115,28 @@ proxy-type="attribute">portal.wsrp:service=ConsumersRegistry</depends> </mbean> - <!--<mbean + <mbean code="org.jboss.portal.jems.hibernate.SessionFactoryBinder" name="portal:service=Hibernate,type=WSRPConsumer" xmbean-dd="" xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean"> <xmbean/> <depends>jboss.jca:service=DataSourceBinding,name=@portal.datasource.name@</depends> - --><!-- Uncomment in clustered mode : hibernate depends on its tree cache service @portal.single.xml.close@ + <!-- Uncomment in clustered mode : hibernate depends on its tree cache service @portal.single.xml.close@ <depends>portal:service=TreeCacheProvider,type=hibernate</depends> - @portal.single.xml.open@ --><!-- + @portal.single.xml.open@ --> <attribute name="DoChecking">true</attribute> <attribute name="ConfigLocation">conf/consumer/hibernate/hibernate.cfg.xml</attribute> - <attribute name="JNDIName">java:/portal/PortletSessionFactory</attribute> - </mbean>--> + <attribute name="JNDIName">java:/portal/WSRPConsumerSessionFactory</attribute> + </mbean> <!-- Consumers registry for WSRP consumer configuration portlet --> <mbean code="org.jboss.portal.wsrp.portlet.consumers.ConsumersRegistryService" name="portal.wsrp:service=ConsumersRegistry" xmbean-dd="" xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean"> <xmbean/> - <!--<depends>portal:service=Hibernate,type=WSRPConsumer</depends> - <attribute name="SessionFactoryJNDIName">java:/portal/PortletSessionFactory</attribute>--> + <depends>portal:service=Hibernate,type=WSRPConsumer</depends> + <attribute name="SessionFactoryJNDIName">java:/portal/WSRPConsumerSessionFactory</attribute> <depends optional-attribute-name="FederatingPortletInvoker" proxy-type="attribute">portal:service=PortletInvoker,type=Federating</depends> </mbean> </server> Added: trunk/wsrp/src/resources/portal-wsrp-sar/conf/consumer/hibernate/domain.hbm.xml =================================================================== --- trunk/wsrp/src/resources/portal-wsrp-sar/conf/consumer/hibernate/domain.hbm.xml (rev 0) +++ trunk/wsrp/src/resources/portal-wsrp-sar/conf/consumer/hibernate/domain.hbm.xml 2007-02-21 05:55:02 UTC (rev 6357) @@ -0,0 +1,252 @@ +<?xml version="1.0"?> +<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ~ JBoss, a division of Red Hat ~ + ~ Copyright 2007, 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. ~ + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~--> + +<!DOCTYPE hibernate-mapping PUBLIC + "-//Hibernate/Hibernate Mapping DTD 3.0//EN" + "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> + <hibernate-mapping> + <class + name="org.jboss.portal.wsrp.consumer.ProducerInfo" + table="JBP_PRODUCER_INFO"> + <cache usage=&quot;@portal.hibernate.cache.usage(a)&quot;/&gt; + <id + name="key" + column="PK" + access="field"> + <generator class="native"> + <param name="sequence">wsrpconsumer_seq</param> + </generator> + </id> + <many-to-one + name="endpointConfigurationInfo" + column="ENDPOINT_ID" + class="org.jboss.portal.wsrp.consumer.EndpointConfigurationInfo" + unique="true" + not-null="true"/> + <many-to-one + name="registrationInfo" + column="REGISTRATION_ID" + class="org.jboss.portal.wsrp.consumer.RegistrationInfo" + unique="true" + not-null="false"/> + <property + name="expirationCacheSeconds" + column="EXPIRATION_CACHE_SECONDS" + not-null="false" + unique="false"/> + <property + name="active" + column="ACTIVE" + not-null="true" + unique="false"/> + </class> + + <class + name="org.jboss.portal.wsrp.consumer.EndpointConfigurationInfo" + table="JBP_ENDPOINT_INFO"> + <cache usage=&quot;@portal.hibernate.cache.usage(a)&quot;/&gt; + <id + name="key" + column="PK" + type="java.lang.Long"> + <generator class="native"> + <param name="sequence">wsrpconsumer_seq</param> + </generator> + </id> + <property + name="serviceDescriptionURL" + column="SD_URL" + type="java.lang.String" + not-null="true"/> + <property + name="markupURL" + column="M_URL" + type="java.lang.String" + not-null="true"/> + <property + name="portletManagementURL" + column="PM_URL" + type="java.lang.String" + not-null="true"/> + <property + name="registrationURL" + column="R_URL" + type="java.lang.String" + not-null="true"/> + <property + name="wsdlDefinitionURL" + column="WSDL_URL" + type="java.lang.String" + not-null="false"/> + </class> + + <class + name="org.jboss.portal.wsrp.consumer.RegistrationInfo" + table="JBP_REGISTRATION_INFO"> + <cache usage=&quot;@portal.hibernate.cache.usage(a)&quot;/&gt; + <id + name="key" + column="PK" + type="java.lang.Long"> + <generator class="native"> + <param name="sequence">wsrpconsumer_seq</param> + </generator> + </id> + <property + name="consumerName" + column="CONSUMER_NAME" + type="java.lang.String" + not-null="true" + unique="true"/> + <property + name="registrationHandle" + column="HANDLE" + type="java.lang.String"/> + <property + name="registrationState" + column="STATE" + type="binary"/> + <map + name="registrationProperties"> + <cache usage=&quot;@portal.hibernate.cache.usage(a)&quot;/&gt; + <key column="REG_PROP_PK"/> + <map-key + type="string" + column="NAME"/> + <one-to-many class="org.jboss.portal.wsrp.consumer.RegistrationProperty"/> + </map> + </class> + <class + name="org.jboss.portal.wsrp.consumer.RegistrationProperty" + table="JBP_REG_PROPERTY"> + <cache usage=&quot;@portal.hibernate.cache.usage(a)&quot;/&gt; + <id + name="key" + column="PK" + type="java.lang.Long"> + <generator class="native"> + <param name="sequence">wsrpconsumer_seq</param> + </generator> + </id> + <property + name="name" + column="NAME" + type="java.lang.String" + not-null="true"/> + <property + name="value" + column="VALUE" + type="java.lang.String"/> + <property + name="invalid" + column="INVALID" + type="boolean"/> + <property + name="lang" + column="LANG" + type="java.lang.String"/> + <many-to-one + name="description" + column="DESC_PK" + class="org.jboss.portal.wsrp.registration.RegistrationPropertyDescription" + not-null="true" + unique="true"/> + </class> + <class + name="org.jboss.portal.wsrp.registration.RegistrationPropertyDescription" + table="JBP_REG_PROP_DESC"> + <cache usage=&quot;@portal.hibernate.cache.usage(a)&quot;/&gt; + <id + name="key" + column="PK" + type="java.lang.Long"> + <generator class="native"> + <param name="sequence">portlet_seq</param> + </generator> + </id> + <property + name="name" + column="NAME" + type="org.jboss.portal.jems.hibernate.QNameUserType" + not-null="true"/> + <property + name="type" + column="TYPE" + type="org.jboss.portal.jems.hibernate.QNameUserType" + not-null="true"/> + <property + name="schemaLocation" + column="SCHEMA" + type="java.lang.String"/> + <component + name="description" + class="org.jboss.portal.wsrp.registration.LocalizedString"> + <property name="value" column="DESC_VALUE"/> + <property name="locale" column="DESC_LOCALE"/> + <property name="resourceName" column="DESC_RES"/> + </component> + <component + name="hint" + class="org.jboss.portal.wsrp.registration.LocalizedString"> + <property name="value" column="HINT_VALUE"/> + <property name="locale" column="HINT_LOCALE"/> + <property name="resourceName" column="HINT_RES"/> + </component> + <component + name="label" + class="org.jboss.portal.wsrp.registration.LocalizedString"> + <property name="value" column="LABEL_VALUE"/> + <property name="locale" column="LABEL_LOCALE"/> + <property name="resourceName" column="LABEL_RES"/> + </component> + <array + name="usages" + table="JBP_REG_PROP_DESC_USAGES" + cascade="all" + fetch="join"> + <cache usage=&quot;@portal.hibernate.cache.usage(a)&quot;/&gt; + <key column="PK"/> + <index column="IDX"/> + <element + column="USAGE" + type="java.lang.String" + not-null="true" + unique="false"/> + </array> + <array + name="aliases" + table="JBP_REG_PROP_DESC_ALIASES" + cascade="all" + fetch="join"> + <cache usage=&quot;@portal.hibernate.cache.usage(a)&quot;/&gt; + <key column="PK"/> + <index column="IDX"/> + <element + column="ALIAS" + type="org.jboss.portal.jems.hibernate.QNameUserType" + not-null="true" + unique="false"/> + </array> + </class> +</hibernate-mapping> Added: trunk/wsrp/src/resources/portal-wsrp-sar/conf/consumer/hibernate/ehcache.xml =================================================================== --- trunk/wsrp/src/resources/portal-wsrp-sar/conf/consumer/hibernate/ehcache.xml (rev 0) +++ trunk/wsrp/src/resources/portal-wsrp-sar/conf/consumer/hibernate/ehcache.xml 2007-02-21 05:55:02 UTC (rev 6357) @@ -0,0 +1,60 @@ +<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ~ JBoss, a division of Red Hat ~ + ~ Copyright 2007, 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. ~ + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~--> +<ehcache> + + <!-- Sets the path to the directory where cache .data files are created. + + If the path is a Java System Property it is replaced by + its value in the running VM. + + The following properties are translated: + user.home - User's home directory + user.dir - User's current working directory + java.io.tmpdir - Default temp file path --> + <diskStore path="java.io.tmpdir/wsrpconsumer"/> + + + <!--Default Cache configuration. These will applied to caches programmatically created through + the CacheManager. + + The following attributes are required for defaultCache: + + maxInMemory - Sets the maximum number of objects that will be created in memory + eternal - Sets whether elements are eternal. If eternal, timeouts are ignored and the element + is never expired. + timeToIdleSeconds - Sets the time to idle for an element before it expires. Is only used + if the element is not eternal. Idle time is now - last accessed time + timeToLiveSeconds - Sets the time to live for an element before it expires. Is only used + if the element is not eternal. TTL is now - creation time + overflowToDisk - Sets whether elements can overflow to disk when the in-memory cache + has reached the maxInMemory limit. + + --> + <defaultCache + maxElementsInMemory="10000" + eternal="false" + timeToIdleSeconds="1800" + timeToLiveSeconds="1800" + overflowToDisk="false" + /> +</ehcache> \ No newline at end of file Added: trunk/wsrp/src/resources/portal-wsrp-sar/conf/consumer/hibernate/hibernate.cfg.xml =================================================================== --- trunk/wsrp/src/resources/portal-wsrp-sar/conf/consumer/hibernate/hibernate.cfg.xml (rev 0) +++ trunk/wsrp/src/resources/portal-wsrp-sar/conf/consumer/hibernate/hibernate.cfg.xml 2007-02-21 05:55:02 UTC (rev 6357) @@ -0,0 +1,58 @@ +<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ~ JBoss, a division of Red Hat ~ + ~ Copyright 2007, 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. ~ + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~--> + +<!DOCTYPE hibernate-configuration PUBLIC + "-//Hibernate/Hibernate Configuration DTD//EN" + "http://hibernate.sourceforge.net/hibernate-configuration-3.0.dtd"> +<hibernate-configuration> + <session-factory> + <property name="connection.datasource">java:@portal.datasource.name@</property> + <property name=&quot;show_sql&quot;&gt;@portal.sql.show(a)&lt;/property&gt; + <property name="cache.use_second_level_cache">true</property> + <property name="cache.use_query_cache">true</property> + + <!-- + | Uncomment in clustered mode : use transactional replicated cache + @portal.single.xml.close@ + <property name="cache.provider_class">org.jboss.portal.jems.hibernate.JMXTreeCacheProvider</property> + <property name="cache.object_name">portal:service=TreeCacheProvider,type=hibernate</property> + @portal.single.xml.open@ + --> + + <!-- + | Comment in clustered mode + @portal.clustered.xml.close@ + <property name="cache.provider_configuration_file_resource_path">conf/consumer/hibernate/ehcache.xml</property> + <property name="cache.provider_class">org.hibernate.cache.EhCacheProvider</property> + @portal.clustered.xml.open@ + --> + + <!-- Force the dialect instead of using autodetection --> + <!-- + <property name="dialect">org.hibernate.dialect.PostgreSQLDialect</property> + --> + + <!-- Mapping files --> + <mapping resource="conf/consumer/hibernate/domain.hbm.xml"/> + </session-factory> +</hibernate-configuration> \ No newline at end of file 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-20 22:07:16 UTC (rev 6356) +++ trunk/wsrp/src/resources/portal-wsrp-war/WEB-INF/jsp/consumers/consumer.jsp 2007-02-21 05:55:02 UTC (rev 6357) @@ -58,33 +58,33 @@ <tr> <th class="portlet-form-field-label">Service Description URL:</th> <td><input type="text" name='service-description-url' size='50' - value='<%=endInfo.getServiceDescriptionInterfaceURL()%>'/></td> + value='<%=endInfo.getServiceDescriptionURL()%>'/></td> </tr> <tr> <th class="portlet-form-field-label">Markup URL:</th> - <td><input type="text" name='markup-url' size='50' value='<%=endInfo.getMarkupInterfaceURL()%>'/></td> + <td><input type="text" name='markup-url' size='50' value='<%=endInfo.getMarkupURL()%>'/></td> </tr> <tr> <th class="portlet-form-field-label">Registration URL:</th> <td><input type="text" name='registration-url' size='50' - value='<%=endInfo.getRegistrationInterfaceURL()%>'/> + value='<%=endInfo.getRegistrationURL()%>'/> </td> </tr> <tr> <th class="portlet-form-field-label">Portlet Management URL:</th> <td><input type="text" name='portlet-management-url' size='50' - value='<%=endInfo.getPortletManagementInterfaceURL()%>'/></td> + value='<%=endInfo.getPortletManagementURL()%>'/></td> </tr> </table> <input type="radio" name="endpoint" <%=usesWSDL ? "checked='true'" : ""%> value="endpoint-wsdl-url"/> WSDL interface URL <input type='text' style='display:<%=usesWSDL ? "inline;" : "none;"%>' name='endpoint-wsdl-url' size='50' - value='<%=endInfo.getWSDLLocationIfAvailable()%>'/> + value='<%=endInfo.getWsdlDefinitionURL()%>'/> </td> </tr> <tr> <% - boolean requiresReg = regInfo.requiresRegistration(); + boolean requiresReg = regInfo.isRequiresRegistration(); %> <th><input type='checkbox' name='registration' value='registration' <%=requiresReg ? "checked='true'" : ""%>/>Requires registration? @@ -112,7 +112,7 @@ for (Iterator names = propertyNames.iterator(); names.hasNext();) { String name = (String)names.next(); - RegistrationInfo.RegistrationProperty prop = regInfo.getRegistrationProperty(name); + org.jboss.portal.wsrp.consumer.RegistrationProperty prop = regInfo.getRegistrationProperty(name); RegistrationPropertyDescription desc = prop.getDescription(); if (desc != null) { @@ -122,7 +122,7 @@ <tr> <td><input type="text" size="25" name="<%=formName + propIndex%>" value="<%=name%>"/> </td> - <td><input type="text" size="25" name="<%=formValue + propIndex%>" value="<%=prop.getValueAsString()%>"/> + <td><input type="text" size="25" name="<%=formValue + propIndex%>" value="<%=prop.getValue()%>"/> </td> <td><%=description%> </td>