November 2010 - gatein-commits - Jboss List Archives

gatein SVN: r5300 - epp/portal/branches/EPP_5_1_Branch/web/portal/src/main/webapp/WEB-INF/conf/jcr.

by do-not-reply＠jboss.org

Author: thomas.heute(a)jboss.com Date: 2010-11-26 10:46:30 -0500 (Fri, 26 Nov 2010) New Revision: 5300 Modified: epp/portal/branches/EPP_5_1_Branch/web/portal/src/main/webapp/WEB-INF/conf/jcr/repository-configuration.xml Log: JBEPP-692: JCR workspaces wsrp-sytem and pc-system use same Value Storage id "gadgets" Modified: epp/portal/branches/EPP_5_1_Branch/web/portal/src/main/webapp/WEB-INF/conf/jcr/repository-configuration.xml =================================================================== --- epp/portal/branches/EPP_5_1_Branch/web/portal/src/main/webapp/WEB-INF/conf/jcr/repository-configuration.xml 2010-11-26 14:43:44 UTC (rev 5299) +++ epp/portal/branches/EPP_5_1_Branch/web/portal/src/main/webapp/WEB-INF/conf/jcr/repository-configuration.xml 2010-11-26 15:46:30 UTC (rev 5300) @@ -237,7 +237,7 @@ <property name="swap-directory" value="${gatein.jcr.data.dir}/swap/wsrp${container.name.suffix}"/> </properties> <value-storages> - <value-storage id="gadgets" + <value-storage id="wsrp-system" class="org.exoplatform.services.jcr.impl.storage.value.fs.TreeFileValueStorage"> <properties> <property name="path" value="${gatein.jcr.storage.data.dir}/wsrp${container.name.suffix}"/> @@ -304,7 +304,7 @@ <property name="swap-directory" value="${gatein.jcr.data.dir}/swap/pc${container.name.suffix}"/> </properties> <value-storages> - <value-storage id="gadgets" class="org.exoplatform.services.jcr.impl.storage.value.fs.TreeFileValueStorage"> + <value-storage id="pc-system" class="org.exoplatform.services.jcr.impl.storage.value.fs.TreeFileValueStorage"> <properties> <property name="path" value="${gatein.jcr.storage.data.dir}/pc${container.name.suffix}"/> </properties>

14 years, 1 month

1
0
0 / 0

gatein SVN: r5299 - epp/portal/branches/EPP_5_1_Branch/webui/portal/src/main/java/org/exoplatform/portal/webui/application.

by do-not-reply＠jboss.org

Author: thomas.heute(a)jboss.com Date: 2010-11-26 09:43:44 -0500 (Fri, 26 Nov 2010) New Revision: 5299 Modified: epp/portal/branches/EPP_5_1_Branch/webui/portal/src/main/java/org/exoplatform/portal/webui/application/ModelAdapter.java epp/portal/branches/EPP_5_1_Branch/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIPortlet.java epp/portal/branches/EPP_5_1_Branch/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIPortletActionListener.java Log: JBEPP-674: Properly support consumer-side WSRP state management Modified: epp/portal/branches/EPP_5_1_Branch/webui/portal/src/main/java/org/exoplatform/portal/webui/application/ModelAdapter.java =================================================================== --- epp/portal/branches/EPP_5_1_Branch/webui/portal/src/main/java/org/exoplatform/portal/webui/application/ModelAdapter.java 2010-11-26 14:38:50 UTC (rev 5298) +++ epp/portal/branches/EPP_5_1_Branch/webui/portal/src/main/java/org/exoplatform/portal/webui/application/ModelAdapter.java 2010-11-26 14:43:44 UTC (rev 5299) @@ -152,6 +152,36 @@ return pref; } } + + @Override + public ExoPortletState getStateFromModifiedContext(PortletContext originalPortletContext, + PortletContext modifiedPortletContext) + { + if (modifiedPortletContext != null && modifiedPortletContext instanceof StatefulPortletContext) + { + StatefulPortletContext statefulContext = (StatefulPortletContext) modifiedPortletContext; + if (statefulContext.getState() instanceof ExoPortletState) + { + return (ExoPortletState)statefulContext.getState(); + } + } + return null; + } + + @Override + public ExoPortletState getstateFromClonedContext(PortletContext originalPortletContext, + PortletContext clonedPortletContext) + { + if (clonedPortletContext != null && clonedPortletContext instanceof StatefulPortletContext) + { + StatefulPortletContext statefulContext = (StatefulPortletContext) clonedPortletContext; + if (statefulContext.getState() instanceof ExoPortletState) + { + return (ExoPortletState)statefulContext.getState(); + } + } + return null; + } }; private static final ModelAdapter<Gadget, ExoPortletState> GADGET = new ModelAdapter<Gadget, ExoPortletState>() @@ -195,6 +225,36 @@ // For now we return null as it does not make sense to edit the gadget preferences return null; } + + @Override + public ExoPortletState getStateFromModifiedContext(PortletContext originalPortletContext, + PortletContext modifiedPortletContext) + { + if (modifiedPortletContext != null && modifiedPortletContext instanceof StatefulPortletContext) + { + StatefulPortletContext statefulContext = (StatefulPortletContext) modifiedPortletContext; + if (statefulContext.getState() instanceof ExoPortletState) + { + return (ExoPortletState)statefulContext.getState(); + } + } + return null; + } + + @Override + public ExoPortletState getstateFromClonedContext(PortletContext originalPortletContext, + PortletContext clonedPortletContext) + { + if (clonedPortletContext != null && clonedPortletContext instanceof StatefulPortletContext) + { + StatefulPortletContext statefulContext = (StatefulPortletContext) clonedPortletContext; + if (statefulContext.getState() instanceof ExoPortletState) + { + return (ExoPortletState)statefulContext.getState(); + } + } + return null; + } }; /** @@ -256,6 +316,52 @@ return dataStorage.save(state, updateState); } } + + @Override + public WSRP getStateFromModifiedContext(PortletContext originalPortletContext, + PortletContext modifiedPortletContext) + { + WSRP wsrp = new WSRP(); + wsrp.setPortletId(modifiedPortletContext.getId()); + + // from the originalPortletContext see if we are dealing with a cloned context or not. + if (originalPortletContext instanceof StatefulPortletContext) + { + Object originalState = ((StatefulPortletContext)originalPortletContext).getState(); + if (originalState instanceof WSRP) + { + wsrp.setCloned(((WSRP)originalState).isCloned()); + } + } + + if (modifiedPortletContext instanceof StatefulPortletContext) + { + Object modifiedState = ((StatefulPortletContext)modifiedPortletContext).getState(); + if (modifiedState instanceof byte[]) + { + wsrp.setState((byte[])modifiedState); + } + } + + return wsrp; + } + + @Override + public WSRP getstateFromClonedContext(PortletContext originalPortletContext, PortletContext clonedPortletContext) + { + WSRP wsrp = new WSRP(); + wsrp.setPortletId(clonedPortletContext.getId()); + wsrp.setCloned(true); + + // if we have an associated state, record it as well... + if (clonedPortletContext instanceof StatefulPortletContext) + { + StatefulPortletContext statefulPortletContext = (StatefulPortletContext)clonedPortletContext; + wsrp.setState((byte[])statefulPortletContext.getState()); + } + + return wsrp; + } }; public abstract PortletContext getProducerOfferedPortletContext(String applicationId); @@ -275,5 +381,23 @@ * @throws Exception any exception */ public abstract Portlet getState(ExoContainer container, ApplicationState<S> applicationState) throws Exception; + + /** + * Extracts the state based on what the current PortletContext is and the new modified PortletContext. + * + * @param originalPortletContext The current PortletContext for the Portlet + * @param modifiedPortletContext The new modified PortletContext + * @return + */ + public abstract C getStateFromModifiedContext(PortletContext originalPortletContext, PortletContext modifiedPortletContext); + + /** + * Extracts the state based on what the current PortletContext is and the new cloned PortletContext + * + * @param originalPortletContext The current PortletContext for the Portlet + * @param clonedPortletContext The new cloned PortletContext + * @return + */ + public abstract C getstateFromClonedContext(PortletContext originalPortletContext, PortletContext clonedPortletContext); } Modified: epp/portal/branches/EPP_5_1_Branch/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIPortlet.java =================================================================== --- epp/portal/branches/EPP_5_1_Branch/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIPortlet.java 2010-11-26 14:38:50 UTC (rev 5298) +++ epp/portal/branches/EPP_5_1_Branch/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIPortlet.java 2010-11-26 14:43:44 UTC (rev 5299) @@ -56,6 +56,7 @@ import org.gatein.pc.api.PortletContext; import org.gatein.pc.api.PortletInvoker; import org.gatein.pc.api.PortletInvokerException; +import org.gatein.pc.api.PortletStateType; import org.gatein.pc.api.StateString; import org.gatein.pc.api.StatefulPortletContext; import org.gatein.pc.api.cache.CacheLevel; @@ -472,7 +473,14 @@ if (portlet == null) { - log.info("Could not find portlet with ID : " + producerOfferedPortletContext.getId()); + if (producerOfferedPortletContext != null) + { + log.info("Could not find portlet with ID : " + producerOfferedPortletContext.getId()); + } + else + { + log.info("Could not find portlet. The producerOfferedPortletContext is null"); + } return false; } @@ -843,10 +851,25 @@ // instance context ExoPortletInstanceContext instanceContext; + // TODO: we should not be having these wsrp specific conditions through the code like + // this, it should either work the same was as normal portlets or abstracted out to another class. if (ApplicationType.WSRP_PORTLET.equals(state.getApplicationType())) { WSRP wsrp = (WSRP)preferencesPortletContext.getState(); AccessMode accessMode = AccessMode.CLONE_BEFORE_WRITE; + + if (wsrp.getState() != null) + { + StatefulPortletContext statefulPortletContext = StatefulPortletContext.create(preferencesPortletContext.getId(), + PortletStateType.OPAQUE, wsrp.getState()); + + invocation.setTarget(statefulPortletContext); + } + else + { + PortletContext portletContext = PortletContext.createPortletContext(preferencesPortletContext.getId()); + invocation.setTarget(portletContext); + } // if the portlet is a cloned one already, we can modify it directly instead of requesting a clone if (wsrp.isCloned()) @@ -858,6 +881,7 @@ else { instanceContext = new ExoPortletInstanceContext(preferencesPortletContext.getId()); + invocation.setTarget(preferencesPortletContext); } invocation.setInstanceContext(instanceContext); @@ -869,9 +893,6 @@ invocation.setSecurityContext(new AbstractSecurityContext(servletRequest)); // - invocation.setTarget(preferencesPortletContext); - - // return invocation; } @@ -980,10 +1001,19 @@ public void update(C updateState) throws Exception { WebuiRequestContext context = WebuiRequestContext.getCurrentInstance(); - ExoContainer container = context.getApplication().getApplicationServiceContainer(); - state.setApplicationState(adapter.update(container, updateState, state.getApplicationState())); + ExoContainer container = context.getApplication().getApplicationServiceContainer(); state.setApplicationState(adapter.update(container, updateState, state.getApplicationState())); setState(state); } + + public C getModifiedState(PortletContext modifiedContext) throws Exception + { + return adapter.getStateFromModifiedContext(this.getPortletContext(), modifiedContext); + } + + public C getClonedState(PortletContext clonedContext) throws Exception + { + return adapter.getstateFromClonedContext(this.getPortletContext(), clonedContext); + } /** This is used by the dashboard portlet and should not be used else where. It will be removed some day. */ private static final ThreadLocal<UIPortlet> currentPortlet = new ThreadLocal<UIPortlet>(); Modified: epp/portal/branches/EPP_5_1_Branch/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIPortletActionListener.java =================================================================== --- epp/portal/branches/EPP_5_1_Branch/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIPortletActionListener.java 2010-11-26 14:38:50 UTC (rev 5298) +++ epp/portal/branches/EPP_5_1_Branch/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIPortletActionListener.java 2010-11-26 14:43:44 UTC (rev 5299) @@ -25,7 +25,6 @@ import org.exoplatform.portal.Constants; import org.exoplatform.portal.application.PortalRequestContext; -import org.exoplatform.portal.pom.spi.wsrp.WSRP; import org.exoplatform.portal.webui.page.UIPage; import org.exoplatform.portal.webui.page.UIPageBody; import org.exoplatform.portal.webui.portal.UIPortal; @@ -121,7 +120,7 @@ if (instanceCtx.getModifiedContext() != null) { StatefulPortletContext<C> updatedCtx = (StatefulPortletContext<C>)instanceCtx.getModifiedContext(); - C portletState = updatedCtx.getState(); + C portletState = uiPortlet.getModifiedState(updatedCtx); uiPortlet.update(portletState); } else @@ -130,17 +129,8 @@ PortletContext clonedContext = instanceCtx.getClonedContext(); if (clonedContext != null) { - WSRP wsrp = new WSRP(); - wsrp.setPortletId(clonedContext.getId()); - wsrp.setCloned(true); // mark the state as cloned - - // if we have an associated state, record it as well... - if (clonedContext instanceof StatefulPortletContext) - { - StatefulPortletContext statefulPortletContext = (StatefulPortletContext)clonedContext; - wsrp.setState((byte[])statefulPortletContext.getState()); - } - uiPortlet.update((C)wsrp); + C state = uiPortlet.getClonedState(clonedContext); + uiPortlet.update(state); } }

14 years, 1 month

1
0
0 / 0

gatein SVN: r5298 - in epp/portal/branches/EPP_5_1_Branch: component/pc/src/main/java/org/exoplatform/portal/pc and 7 other directories.

by do-not-reply＠jboss.org

Author: thomas.heute(a)jboss.com Date: 2010-11-26 09:38:50 -0500 (Fri, 26 Nov 2010) New Revision: 5298 Modified: epp/portal/branches/EPP_5_1_Branch/component/pc/src/main/java/org/exoplatform/portal/pc/ExoKernelIntegration.java epp/portal/branches/EPP_5_1_Branch/component/wsrp/src/main/java/org/gatein/portal/wsrp/WSRPServiceIntegration.java epp/portal/branches/EPP_5_1_Branch/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/JCRPersister.java epp/portal/branches/EPP_5_1_Branch/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/consumer/JCRConsumerRegistry.java epp/portal/branches/EPP_5_1_Branch/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/consumer/mapping/ProducerInfosMapping.java epp/portal/branches/EPP_5_1_Branch/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/migration/JCRMigrationService.java epp/portal/branches/EPP_5_1_Branch/pom.xml epp/portal/branches/EPP_5_1_Branch/portlet/exoadmin/src/main/java/org/exoplatform/applicationregistry/webui/component/PortletExtraSerializer.java epp/portal/branches/EPP_5_1_Branch/portlet/exoadmin/src/main/java/org/exoplatform/applicationregistry/webui/component/UIAddApplicationForm.java epp/portal/branches/EPP_5_1_Branch/portlet/exoadmin/src/main/java/org/exoplatform/applicationregistry/webui/component/UIPortletManagement.java epp/portal/branches/EPP_5_1_Branch/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIPortletActionListener.java Log: JBEPP-664: Upgrade to WSRP 2.0.0-CR03 + related portal updates Modified: epp/portal/branches/EPP_5_1_Branch/component/pc/src/main/java/org/exoplatform/portal/pc/ExoKernelIntegration.java =================================================================== --- epp/portal/branches/EPP_5_1_Branch/component/pc/src/main/java/org/exoplatform/portal/pc/ExoKernelIntegration.java 2010-11-26 13:56:38 UTC (rev 5297) +++ epp/portal/branches/EPP_5_1_Branch/component/pc/src/main/java/org/exoplatform/portal/pc/ExoKernelIntegration.java 2010-11-26 14:38:50 UTC (rev 5298) @@ -86,6 +86,10 @@ //Container Stack ContainerPortletDispatcher portletContainerDispatcher = new ContainerPortletDispatcher(); + + // Federating portlet invoker + FederatingPortletInvoker federatingPortletInvoker = new FederatingPortletInvokerService(); + EventPayloadInterceptor eventPayloadInterceptor = new EventPayloadInterceptor(); eventPayloadInterceptor.setNext(portletContainerDispatcher); RequestAttributeConversationInterceptor requestAttributeConversationInterceptor = @@ -129,26 +133,24 @@ // The producer portlet invoker ProducerPortletInvoker producerPortletInvoker = new ProducerPortletInvoker(); producerPortletInvoker.setNext(containerPortletInvoker); + federatingPortletInvoker.registerInvoker(PortletInvoker.LOCAL_PORTLET_INVOKER_ID, producerPortletInvoker); + producerPortletInvoker.setPersistenceManager(producerPersistenceManager); producerPortletInvoker.setStateManagementPolicy(producerStateManagementPolicy); producerPortletInvoker.setStateConverter(producerStateConverter); // The consumer portlet invoker PortletCustomizationInterceptor portletCustomizationInterceptor = new PortletCustomizationInterceptor(); - portletCustomizationInterceptor.setNext(producerPortletInvoker); + portletCustomizationInterceptor.setNext(federatingPortletInvoker); ConsumerCacheInterceptor consumerCacheInterceptor = new ConsumerCacheInterceptor(); consumerCacheInterceptor.setNext(portletCustomizationInterceptor); PortletInvokerInterceptor consumerPortletInvoker = new PortletInvokerInterceptor(); consumerPortletInvoker.setNext(consumerCacheInterceptor); - // Federating portlet invoker - FederatingPortletInvoker federatingPortletInvoker = new FederatingPortletInvokerService(); + // register federating portlet and consumerPortletInvoker invoker with container + container.registerComponentInstance(PortletInvoker.class, consumerPortletInvoker); + container.registerComponentInstance(FederatingPortletInvoker.class, federatingPortletInvoker); - // register local portlet invoker with federating portlet invoker - federatingPortletInvoker.registerInvoker(PortletInvoker.LOCAL_PORTLET_INVOKER_ID, consumerPortletInvoker); - // register federating portlet invoker with container - container.registerComponentInstance(PortletInvoker.class, federatingPortletInvoker); - portletApplicationRegistry.start(); } Modified: epp/portal/branches/EPP_5_1_Branch/component/wsrp/src/main/java/org/gatein/portal/wsrp/WSRPServiceIntegration.java =================================================================== --- epp/portal/branches/EPP_5_1_Branch/component/wsrp/src/main/java/org/gatein/portal/wsrp/WSRPServiceIntegration.java 2010-11-26 13:56:38 UTC (rev 5297) +++ epp/portal/branches/EPP_5_1_Branch/component/wsrp/src/main/java/org/gatein/portal/wsrp/WSRPServiceIntegration.java 2010-11-26 14:38:50 UTC (rev 5298) @@ -267,7 +267,7 @@ { // retrieve federating portlet invoker from container FederatingPortletInvoker federatingPortletInvoker = - (FederatingPortletInvoker)container.getComponentInstanceOfType(PortletInvoker.class); + (FederatingPortletInvoker)container.getComponentInstanceOfType(FederatingPortletInvoker.class); // add our Session event listener to the ListenerService for use in org.exoplatform.web.GenericHttpListener ListenerService listenerService = (ListenerService)container.getComponentInstanceOfType(ListenerService.class); Modified: epp/portal/branches/EPP_5_1_Branch/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/JCRPersister.java =================================================================== --- epp/portal/branches/EPP_5_1_Branch/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/JCRPersister.java 2010-11-26 13:56:38 UTC (rev 5297) +++ epp/portal/branches/EPP_5_1_Branch/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/JCRPersister.java 2010-11-26 14:38:50 UTC (rev 5298) @@ -103,7 +103,8 @@ public ChromatticSession getSession() { - if (sessionHolder.get() == null) + ChromatticSession chromatticSession = sessionHolder.get(); + if (chromatticSession == null) { ChromatticSession session = chrome.openSession(); sessionHolder.set(session); @@ -111,13 +112,13 @@ } else { - return sessionHolder.get(); + return chromatticSession; } } public void closeSession(boolean save) { - ChromatticSession session = getSession(); + ChromatticSession session = getOpenedSessionOrFail(); if (save) { synchronized (this) @@ -126,11 +127,22 @@ } } session.close(); + sessionHolder.set(null); } + private ChromatticSession getOpenedSessionOrFail() + { + ChromatticSession session = sessionHolder.get(); + if(session == null) + { + throw new IllegalStateException("Cannot close the session as it hasn't been opened first!"); + } + return session; + } + public synchronized void save() { - getSession().save(); + getOpenedSessionOrFail().save(); } public <T> boolean delete(T toDelete, StoresByPathManager<T> manager) Modified: epp/portal/branches/EPP_5_1_Branch/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/consumer/JCRConsumerRegistry.java =================================================================== --- epp/portal/branches/EPP_5_1_Branch/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/consumer/JCRConsumerRegistry.java 2010-11-26 13:56:38 UTC (rev 5297) +++ epp/portal/branches/EPP_5_1_Branch/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/consumer/JCRConsumerRegistry.java 2010-11-26 14:38:50 UTC (rev 5298) @@ -34,6 +34,7 @@ import org.gatein.portal.wsrp.state.consumer.mapping.RegistrationPropertyMapping; import org.gatein.portal.wsrp.state.mapping.RegistrationPropertyDescriptionMapping; import org.gatein.wsrp.WSRPConsumer; +import org.gatein.wsrp.consumer.ConsumerException; import org.gatein.wsrp.consumer.ProducerInfo; import org.gatein.wsrp.consumer.registry.AbstractConsumerRegistry; import org.gatein.wsrp.consumer.registry.xml.XMLConsumerRegistry; @@ -42,6 +43,7 @@ import java.util.Collections; import java.util.Iterator; import java.util.List; +import java.util.Map; /** * @author <a href="mailto:chris.laprun@jboss.com">Chris Laprun</a> @@ -68,10 +70,11 @@ @Override protected void save(ProducerInfo info, String messageOnError) { - ChromatticSession session = persister.getSession(); try { + ChromatticSession session = persister.getSession(); + ProducerInfosMapping pims = getProducerInfosMapping(session); ProducerInfoMapping pim = pims.createProducerInfo(info.getId()); String key = session.persist(pims, pim, info.getId()); @@ -82,15 +85,18 @@ } catch (Exception e) { - e.printStackTrace(); // todo: fix me persister.closeSession(false); + throw new ConsumerException(messageOnError, e); } } @Override protected void delete(ProducerInfo info) { - persister.delete(info, this); + if (!persister.delete(info, this)) + { + throw new ConsumerException("Couldn't delete ProducerInfo " + info); + } } @Override @@ -103,20 +109,37 @@ + "' hasn't been persisted and thus cannot be updated."); } + String oldId; + String newId; + boolean idUnchanged; + ChromatticSession session = persister.getSession(); - ProducerInfoMapping pim = session.findById(ProducerInfoMapping.class, key); - if (pim == null) + + synchronized (this) { - throw new IllegalArgumentException("Couldn't find ProducerInfoMapping associated with key " + key); + ProducerInfoMapping pim = session.findById(ProducerInfoMapping.class, key); + if (pim == null) + { + throw new IllegalArgumentException("Couldn't find ProducerInfoMapping associated with key " + key); + } + oldId = pim.getId(); + newId = producerInfo.getId(); + pim.initFrom(producerInfo); + + idUnchanged = oldId.equals(newId); + + if (!idUnchanged) + { + ProducerInfosMapping pims = getProducerInfosMapping(session); + Map<String,ProducerInfoMapping> nameToProducerInfoMap = pims.getNameToProducerInfoMap(); + nameToProducerInfoMap.put(pim.getId(), pim); + } + + persister.closeSession(true); } - String oldId = pim.getId(); - String newId = producerInfo.getId(); - pim.initFrom(producerInfo); - persister.closeSession(true); - // if the consumer's id has changed, return the old one so that state can be updated - return (oldId.equals(newId)) ? null : oldId; + return idUnchanged ? null : oldId; } @Override Modified: epp/portal/branches/EPP_5_1_Branch/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/consumer/mapping/ProducerInfosMapping.java =================================================================== --- epp/portal/branches/EPP_5_1_Branch/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/consumer/mapping/ProducerInfosMapping.java 2010-11-26 13:56:38 UTC (rev 5297) +++ epp/portal/branches/EPP_5_1_Branch/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/consumer/mapping/ProducerInfosMapping.java 2010-11-26 14:38:50 UTC (rev 5298) @@ -28,6 +28,7 @@ import org.chromattic.api.annotations.OneToMany; import java.util.List; +import java.util.Map; /** * @author <a href="mailto:chris.laprun@jboss.com">Chris Laprun</a> @@ -41,6 +42,9 @@ @OneToMany public abstract List<ProducerInfoMapping> getProducerInfos(); + @OneToMany + public abstract Map<String, ProducerInfoMapping> getNameToProducerInfoMap(); + @Create public abstract ProducerInfoMapping createProducerInfo(String producerId); } Modified: epp/portal/branches/EPP_5_1_Branch/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/migration/JCRMigrationService.java =================================================================== --- epp/portal/branches/EPP_5_1_Branch/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/migration/JCRMigrationService.java 2010-11-26 13:56:38 UTC (rev 5297) +++ epp/portal/branches/EPP_5_1_Branch/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/migration/JCRMigrationService.java 2010-11-26 14:38:50 UTC (rev 5298) @@ -110,13 +110,20 @@ ExportInfoMapping eim = session.findByPath(ExportInfoMapping.class, getPathFor(exportTime)); - if (eim != null) + try { - return eim.toModel(null); + if (eim != null) + { + return eim.toModel(null); + } + else + { + return null; + } } - else + finally { - return null; + persister.closeSession(false); } } @@ -128,6 +135,7 @@ long exportTime = info.getExportTime(); if (eim != null) { + persister.closeSession(false); throw new IllegalArgumentException("An ExportInfo with export time " + exportTime + " already exists!"); } @@ -164,6 +172,7 @@ ChromatticSession session = persister.getSession(); ExportInfosMapping mappings = getExportInfosMapping(session); exportInfosCount = mappings.getExportInfos().size(); + persister.closeSession(false); } return exportInfosCount == 0; Modified: epp/portal/branches/EPP_5_1_Branch/pom.xml =================================================================== --- epp/portal/branches/EPP_5_1_Branch/pom.xml 2010-11-26 13:56:38 UTC (rev 5297) +++ epp/portal/branches/EPP_5_1_Branch/pom.xml 2010-11-26 14:38:50 UTC (rev 5298) @@ -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.7.GA</org.picketlink.idm> - <org.gatein.wsrp.version>2.0.0-CR02</org.gatein.wsrp.version> + <org.gatein.wsrp.version>2.0.0-CR03</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> Modified: epp/portal/branches/EPP_5_1_Branch/portlet/exoadmin/src/main/java/org/exoplatform/applicationregistry/webui/component/PortletExtraSerializer.java =================================================================== --- epp/portal/branches/EPP_5_1_Branch/portlet/exoadmin/src/main/java/org/exoplatform/applicationregistry/webui/component/PortletExtraSerializer.java 2010-11-26 13:56:38 UTC (rev 5297) +++ epp/portal/branches/EPP_5_1_Branch/portlet/exoadmin/src/main/java/org/exoplatform/applicationregistry/webui/component/PortletExtraSerializer.java 2010-11-26 14:38:50 UTC (rev 5298) @@ -44,7 +44,7 @@ public UIPortletManagement.PortletExtra read(PortletContext output) throws Exception { ExoContainer manager = ExoContainerContext.getCurrentContainer(); - FederatingPortletInvoker portletInvoker = (FederatingPortletInvoker)manager.getComponentInstance(PortletInvoker.class); + FederatingPortletInvoker portletInvoker = (FederatingPortletInvoker)manager.getComponentInstance(FederatingPortletInvoker.class); Portlet portlet = portletInvoker.getPortlet(output); return new UIPortletManagement.PortletExtra(portlet); } Modified: epp/portal/branches/EPP_5_1_Branch/portlet/exoadmin/src/main/java/org/exoplatform/applicationregistry/webui/component/UIAddApplicationForm.java =================================================================== --- epp/portal/branches/EPP_5_1_Branch/portlet/exoadmin/src/main/java/org/exoplatform/applicationregistry/webui/component/UIAddApplicationForm.java 2010-11-26 13:56:38 UTC (rev 5297) +++ epp/portal/branches/EPP_5_1_Branch/portlet/exoadmin/src/main/java/org/exoplatform/applicationregistry/webui/component/UIAddApplicationForm.java 2010-11-26 14:38:50 UTC (rev 5298) @@ -186,7 +186,7 @@ ExoContainer manager = ExoContainerContext.getCurrentContainer(); FederatingPortletInvoker portletInvoker = - (FederatingPortletInvoker)manager.getComponentInstance(PortletInvoker.class); + (FederatingPortletInvoker)manager.getComponentInstance(FederatingPortletInvoker.class); Set<Portlet> portlets = remote ? portletInvoker.getRemotePortlets() : portletInvoker.getLocalPortlets(); List<Application> applications = new ArrayList<Application>(portlets.size()); for (Portlet portlet : portlets) Modified: epp/portal/branches/EPP_5_1_Branch/portlet/exoadmin/src/main/java/org/exoplatform/applicationregistry/webui/component/UIPortletManagement.java =================================================================== --- epp/portal/branches/EPP_5_1_Branch/portlet/exoadmin/src/main/java/org/exoplatform/applicationregistry/webui/component/UIPortletManagement.java 2010-11-26 13:56:38 UTC (rev 5297) +++ epp/portal/branches/EPP_5_1_Branch/portlet/exoadmin/src/main/java/org/exoplatform/applicationregistry/webui/component/UIPortletManagement.java 2010-11-26 14:38:50 UTC (rev 5298) @@ -100,7 +100,7 @@ ExoContainer manager = ExoContainerContext.getCurrentContainer(); FederatingPortletInvoker portletInvoker = - (FederatingPortletInvoker)manager.getComponentInstance(PortletInvoker.class); + (FederatingPortletInvoker)manager.getComponentInstance(FederatingPortletInvoker.class); boolean remote = REMOTE.equals(type); Set<Portlet> portlets; Modified: epp/portal/branches/EPP_5_1_Branch/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIPortletActionListener.java =================================================================== --- epp/portal/branches/EPP_5_1_Branch/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIPortletActionListener.java 2010-11-26 13:56:38 UTC (rev 5297) +++ epp/portal/branches/EPP_5_1_Branch/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIPortletActionListener.java 2010-11-26 14:38:50 UTC (rev 5298) @@ -447,7 +447,7 @@ log.trace("Try to get a resource of type: " + contentType + " for the portlet: " + uiPortlet.getPortletContext()); - if (contentType.startsWith("text")) + if (piResponse.getChars() != null || contentType.startsWith("text")) { context.getResponse().setContentType(contentType); context.getWriter().write(piResponse.getContent());

14 years, 1 month

1
0
0 / 0

gatein SVN: r5297 - portal/trunk.

by do-not-reply＠jboss.org

Author: chris.laprun(a)jboss.com Date: 2010-11-26 08:56:38 -0500 (Fri, 26 Nov 2010) New Revision: 5297 Modified: portal/trunk/pom.xml Log: - Updated to use WSRP 2.0.0-CR03. Modified: portal/trunk/pom.xml =================================================================== --- portal/trunk/pom.xml 2010-11-26 13:30:36 UTC (rev 5296) +++ portal/trunk/pom.xml 2010-11-26 13:56:38 UTC (rev 5297) @@ -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.7.GA</org.picketlink.idm> - <org.gatein.wsrp.version>2.0.0-CR02</org.gatein.wsrp.version> + <org.gatein.wsrp.version>2.0.0-CR03</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>

14 years, 1 month

1
0
0 / 0

gatein SVN: r5296 - in components/wsrp/trunk: admin-gui and 9 other directories.

by do-not-reply＠jboss.org

Author: chris.laprun(a)jboss.com Date: 2010-11-26 08:30:36 -0500 (Fri, 26 Nov 2010) New Revision: 5296 Modified: components/wsrp/trunk/admin-gui/pom.xml components/wsrp/trunk/api/pom.xml components/wsrp/trunk/common/pom.xml components/wsrp/trunk/consumer/pom.xml components/wsrp/trunk/hibernate-impl/pom.xml components/wsrp/trunk/pom.xml components/wsrp/trunk/producer/pom.xml components/wsrp/trunk/test/pom.xml components/wsrp/trunk/wsrp-producer-war/pom.xml components/wsrp/trunk/wsrp1-ws/pom.xml components/wsrp/trunk/wsrp2-ws/pom.xml Log: [maven-release-plugin] prepare for next development iteration Modified: components/wsrp/trunk/admin-gui/pom.xml =================================================================== --- components/wsrp/trunk/admin-gui/pom.xml 2010-11-26 13:30:14 UTC (rev 5295) +++ components/wsrp/trunk/admin-gui/pom.xml 2010-11-26 13:30:36 UTC (rev 5296) @@ -25,7 +25,7 @@ <parent> <groupId>org.gatein.wsrp</groupId> <artifactId>wsrp-parent</artifactId> - <version>2.0.0-CR03</version> + <version>2.0.0-GA-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>wsrp-admin-gui</artifactId> Modified: components/wsrp/trunk/api/pom.xml =================================================================== --- components/wsrp/trunk/api/pom.xml 2010-11-26 13:30:14 UTC (rev 5295) +++ components/wsrp/trunk/api/pom.xml 2010-11-26 13:30:36 UTC (rev 5296) @@ -25,7 +25,7 @@ <parent> <groupId>org.gatein.wsrp</groupId> <artifactId>wsrp-parent</artifactId> - <version>2.0.0-CR03</version> + <version>2.0.0-GA-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>wsrp-integration-api</artifactId> Modified: components/wsrp/trunk/common/pom.xml =================================================================== --- components/wsrp/trunk/common/pom.xml 2010-11-26 13:30:14 UTC (rev 5295) +++ components/wsrp/trunk/common/pom.xml 2010-11-26 13:30:36 UTC (rev 5296) @@ -25,7 +25,7 @@ <parent> <groupId>org.gatein.wsrp</groupId> <artifactId>wsrp-parent</artifactId> - <version>2.0.0-CR03</version> + <version>2.0.0-GA-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>wsrp-common</artifactId> Modified: components/wsrp/trunk/consumer/pom.xml =================================================================== --- components/wsrp/trunk/consumer/pom.xml 2010-11-26 13:30:14 UTC (rev 5295) +++ components/wsrp/trunk/consumer/pom.xml 2010-11-26 13:30:36 UTC (rev 5296) @@ -25,7 +25,7 @@ <parent> <groupId>org.gatein.wsrp</groupId> <artifactId>wsrp-parent</artifactId> - <version>2.0.0-CR03</version> + <version>2.0.0-GA-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>wsrp-consumer</artifactId> Modified: components/wsrp/trunk/hibernate-impl/pom.xml =================================================================== --- components/wsrp/trunk/hibernate-impl/pom.xml 2010-11-26 13:30:14 UTC (rev 5295) +++ components/wsrp/trunk/hibernate-impl/pom.xml 2010-11-26 13:30:36 UTC (rev 5296) @@ -28,7 +28,7 @@ <parent> <groupId>org.gatein.wsrp</groupId> <artifactId>wsrp-parent</artifactId> - <version>2.0.0-CR03</version> + <version>2.0.0-GA-SNAPSHOT</version> </parent> <groupId>org.gatein.wsrp</groupId> Modified: components/wsrp/trunk/pom.xml =================================================================== --- components/wsrp/trunk/pom.xml 2010-11-26 13:30:14 UTC (rev 5295) +++ components/wsrp/trunk/pom.xml 2010-11-26 13:30:36 UTC (rev 5296) @@ -29,7 +29,7 @@ <groupId>org.gatein.wsrp</groupId> <artifactId>wsrp-parent</artifactId> - <version>2.0.0-CR03</version> + <version>2.0.0-GA-SNAPSHOT</version> <packaging>pom</packaging> @@ -40,9 +40,9 @@ </parent> <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/gatein/components/wsrp/tags/2.0.0-...</connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/gatein/components/wsrp/tags/2.0.0-CR03</developerConnection> - <url>http://fisheye.jboss.org/browse/gatein/components/wsrp/tags/2.0.0-CR03</url> + <connection>scm:svn:http://anonsvn.jboss.org/repos/gatein/components/wsrp/trunk/</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/gatein/components/wsrp/trunk/</developerConnection> + <url>http://fisheye.jboss.org/browse/gatein/components/wsrp/trunk/</url> </scm> <properties> Modified: components/wsrp/trunk/producer/pom.xml =================================================================== --- components/wsrp/trunk/producer/pom.xml 2010-11-26 13:30:14 UTC (rev 5295) +++ components/wsrp/trunk/producer/pom.xml 2010-11-26 13:30:36 UTC (rev 5296) @@ -25,7 +25,7 @@ <parent> <groupId>org.gatein.wsrp</groupId> <artifactId>wsrp-parent</artifactId> - <version>2.0.0-CR03</version> + <version>2.0.0-GA-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>wsrp-producer-lib</artifactId> Modified: components/wsrp/trunk/test/pom.xml =================================================================== --- components/wsrp/trunk/test/pom.xml 2010-11-26 13:30:14 UTC (rev 5295) +++ components/wsrp/trunk/test/pom.xml 2010-11-26 13:30:36 UTC (rev 5296) @@ -26,7 +26,7 @@ <parent> <groupId>org.gatein.wsrp</groupId> <artifactId>wsrp-parent</artifactId> - <version>2.0.0-CR03</version> + <version>2.0.0-GA-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: components/wsrp/trunk/wsrp-producer-war/pom.xml =================================================================== --- components/wsrp/trunk/wsrp-producer-war/pom.xml 2010-11-26 13:30:14 UTC (rev 5295) +++ components/wsrp/trunk/wsrp-producer-war/pom.xml 2010-11-26 13:30:36 UTC (rev 5296) @@ -26,7 +26,7 @@ <parent> <groupId>org.gatein.wsrp</groupId> <artifactId>wsrp-parent</artifactId> - <version>2.0.0-CR03</version> + <version>2.0.0-GA-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: components/wsrp/trunk/wsrp1-ws/pom.xml =================================================================== --- components/wsrp/trunk/wsrp1-ws/pom.xml 2010-11-26 13:30:14 UTC (rev 5295) +++ components/wsrp/trunk/wsrp1-ws/pom.xml 2010-11-26 13:30:36 UTC (rev 5296) @@ -25,7 +25,7 @@ <parent> <groupId>org.gatein.wsrp</groupId> <artifactId>wsrp-parent</artifactId> - <version>2.0.0-CR03</version> + <version>2.0.0-GA-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>wsrp-wsrp1-ws</artifactId> Modified: components/wsrp/trunk/wsrp2-ws/pom.xml =================================================================== --- components/wsrp/trunk/wsrp2-ws/pom.xml 2010-11-26 13:30:14 UTC (rev 5295) +++ components/wsrp/trunk/wsrp2-ws/pom.xml 2010-11-26 13:30:36 UTC (rev 5296) @@ -26,7 +26,7 @@ <parent> <artifactId>wsrp-parent</artifactId> <groupId>org.gatein.wsrp</groupId> - <version>2.0.0-CR03</version> + <version>2.0.0-GA-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>wsrp-wsrp2-ws</artifactId>

14 years, 1 month

1
0
0 / 0

gatein SVN: r5295 - components/wsrp/tags.

by do-not-reply＠jboss.org

Author: chris.laprun(a)jboss.com Date: 2010-11-26 08:30:14 -0500 (Fri, 26 Nov 2010) New Revision: 5295 Added: components/wsrp/tags/2.0.0-CR03/ Log: [maven-scm] copy for tag 2.0.0-CR03 Copied: components/wsrp/tags/2.0.0-CR03 (from rev 5294, components/wsrp/trunk)

14 years, 1 month

1
0
0 / 0

gatein SVN: r5294 - in components/wsrp/trunk: admin-gui and 9 other directories.

by do-not-reply＠jboss.org

Author: chris.laprun(a)jboss.com Date: 2010-11-26 08:29:53 -0500 (Fri, 26 Nov 2010) New Revision: 5294 Modified: components/wsrp/trunk/admin-gui/pom.xml components/wsrp/trunk/api/pom.xml components/wsrp/trunk/common/pom.xml components/wsrp/trunk/consumer/pom.xml components/wsrp/trunk/hibernate-impl/pom.xml components/wsrp/trunk/pom.xml components/wsrp/trunk/producer/pom.xml components/wsrp/trunk/test/pom.xml components/wsrp/trunk/wsrp-producer-war/pom.xml components/wsrp/trunk/wsrp1-ws/pom.xml components/wsrp/trunk/wsrp2-ws/pom.xml Log: [maven-release-plugin] prepare release 2.0.0-CR03 Modified: components/wsrp/trunk/admin-gui/pom.xml =================================================================== --- components/wsrp/trunk/admin-gui/pom.xml 2010-11-26 13:07:53 UTC (rev 5293) +++ components/wsrp/trunk/admin-gui/pom.xml 2010-11-26 13:29:53 UTC (rev 5294) @@ -21,12 +21,11 @@ ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org. --> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <parent> <groupId>org.gatein.wsrp</groupId> <artifactId>wsrp-parent</artifactId> - <version>2.0.0-CR03-SNAPSHOT</version> + <version>2.0.0-CR03</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>wsrp-admin-gui</artifactId> Modified: components/wsrp/trunk/api/pom.xml =================================================================== --- components/wsrp/trunk/api/pom.xml 2010-11-26 13:07:53 UTC (rev 5293) +++ components/wsrp/trunk/api/pom.xml 2010-11-26 13:29:53 UTC (rev 5294) @@ -21,12 +21,11 @@ ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org. --> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <parent> <groupId>org.gatein.wsrp</groupId> <artifactId>wsrp-parent</artifactId> - <version>2.0.0-CR03-SNAPSHOT</version> + <version>2.0.0-CR03</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>wsrp-integration-api</artifactId> Modified: components/wsrp/trunk/common/pom.xml =================================================================== --- components/wsrp/trunk/common/pom.xml 2010-11-26 13:07:53 UTC (rev 5293) +++ components/wsrp/trunk/common/pom.xml 2010-11-26 13:29:53 UTC (rev 5294) @@ -21,12 +21,11 @@ ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org. --> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <parent> <groupId>org.gatein.wsrp</groupId> <artifactId>wsrp-parent</artifactId> - <version>2.0.0-CR03-SNAPSHOT</version> + <version>2.0.0-CR03</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>wsrp-common</artifactId> Modified: components/wsrp/trunk/consumer/pom.xml =================================================================== --- components/wsrp/trunk/consumer/pom.xml 2010-11-26 13:07:53 UTC (rev 5293) +++ components/wsrp/trunk/consumer/pom.xml 2010-11-26 13:29:53 UTC (rev 5294) @@ -21,12 +21,11 @@ ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org. --> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <parent> <groupId>org.gatein.wsrp</groupId> <artifactId>wsrp-parent</artifactId> - <version>2.0.0-CR03-SNAPSHOT</version> + <version>2.0.0-CR03</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>wsrp-consumer</artifactId> Modified: components/wsrp/trunk/hibernate-impl/pom.xml =================================================================== --- components/wsrp/trunk/hibernate-impl/pom.xml 2010-11-26 13:07:53 UTC (rev 5293) +++ components/wsrp/trunk/hibernate-impl/pom.xml 2010-11-26 13:29:53 UTC (rev 5294) @@ -22,14 +22,13 @@ ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org. --> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.gatein.wsrp</groupId> <artifactId>wsrp-parent</artifactId> - <version>2.0.0-CR03-SNAPSHOT</version> + <version>2.0.0-CR03</version> </parent> <groupId>org.gatein.wsrp</groupId> Modified: components/wsrp/trunk/pom.xml =================================================================== --- components/wsrp/trunk/pom.xml 2010-11-26 13:07:53 UTC (rev 5293) +++ components/wsrp/trunk/pom.xml 2010-11-26 13:29:53 UTC (rev 5294) @@ -21,8 +21,7 @@ ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org. --> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> @@ -30,7 +29,7 @@ <groupId>org.gatein.wsrp</groupId> <artifactId>wsrp-parent</artifactId> - <version>2.0.0-CR03-SNAPSHOT</version> + <version>2.0.0-CR03</version> <packaging>pom</packaging> @@ -41,9 +40,9 @@ </parent> <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/gatein/components/wsrp/trunk/</connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/gatein/components/wsrp/trunk/</developerConnection> - <url>http://fisheye.jboss.org/browse/gatein/components/wsrp/trunk/</url> + <connection>scm:svn:http://anonsvn.jboss.org/repos/gatein/components/wsrp/tags/2.0.0-...</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/gatein/components/wsrp/tags/2.0.0-CR03</developerConnection> + <url>http://fisheye.jboss.org/browse/gatein/components/wsrp/tags/2.0.0-CR03</url> </scm> <properties> Modified: components/wsrp/trunk/producer/pom.xml =================================================================== --- components/wsrp/trunk/producer/pom.xml 2010-11-26 13:07:53 UTC (rev 5293) +++ components/wsrp/trunk/producer/pom.xml 2010-11-26 13:29:53 UTC (rev 5294) @@ -21,12 +21,11 @@ ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org. --> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <parent> <groupId>org.gatein.wsrp</groupId> <artifactId>wsrp-parent</artifactId> - <version>2.0.0-CR03-SNAPSHOT</version> + <version>2.0.0-CR03</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>wsrp-producer-lib</artifactId> Modified: components/wsrp/trunk/test/pom.xml =================================================================== --- components/wsrp/trunk/test/pom.xml 2010-11-26 13:07:53 UTC (rev 5293) +++ components/wsrp/trunk/test/pom.xml 2010-11-26 13:29:53 UTC (rev 5294) @@ -22,12 +22,11 @@ ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org. --> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <parent> <groupId>org.gatein.wsrp</groupId> <artifactId>wsrp-parent</artifactId> - <version>2.0.0-CR03-SNAPSHOT</version> + <version>2.0.0-CR03</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: components/wsrp/trunk/wsrp-producer-war/pom.xml =================================================================== --- components/wsrp/trunk/wsrp-producer-war/pom.xml 2010-11-26 13:07:53 UTC (rev 5293) +++ components/wsrp/trunk/wsrp-producer-war/pom.xml 2010-11-26 13:29:53 UTC (rev 5294) @@ -22,12 +22,11 @@ ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org. --> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <parent> <groupId>org.gatein.wsrp</groupId> <artifactId>wsrp-parent</artifactId> - <version>2.0.0-CR03-SNAPSHOT</version> + <version>2.0.0-CR03</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: components/wsrp/trunk/wsrp1-ws/pom.xml =================================================================== --- components/wsrp/trunk/wsrp1-ws/pom.xml 2010-11-26 13:07:53 UTC (rev 5293) +++ components/wsrp/trunk/wsrp1-ws/pom.xml 2010-11-26 13:29:53 UTC (rev 5294) @@ -21,12 +21,11 @@ ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org. --> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <parent> <groupId>org.gatein.wsrp</groupId> <artifactId>wsrp-parent</artifactId> - <version>2.0.0-CR03-SNAPSHOT</version> + <version>2.0.0-CR03</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>wsrp-wsrp1-ws</artifactId> Modified: components/wsrp/trunk/wsrp2-ws/pom.xml =================================================================== --- components/wsrp/trunk/wsrp2-ws/pom.xml 2010-11-26 13:07:53 UTC (rev 5293) +++ components/wsrp/trunk/wsrp2-ws/pom.xml 2010-11-26 13:29:53 UTC (rev 5294) @@ -22,12 +22,11 @@ ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org. --> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <parent> <artifactId>wsrp-parent</artifactId> <groupId>org.gatein.wsrp</groupId> - <version>2.0.0-CR03-SNAPSHOT</version> + <version>2.0.0-CR03</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>wsrp-wsrp2-ws</artifactId>

14 years, 1 month

1
0
0 / 0

gatein SVN: r5293 - in components/wsrp/trunk: admin-gui and 9 other directories.

by do-not-reply＠jboss.org

Author: chris.laprun(a)jboss.com Date: 2010-11-26 08:07:53 -0500 (Fri, 26 Nov 2010) New Revision: 5293 Modified: components/wsrp/trunk/admin-gui/pom.xml components/wsrp/trunk/api/pom.xml components/wsrp/trunk/common/pom.xml components/wsrp/trunk/consumer/pom.xml components/wsrp/trunk/hibernate-impl/pom.xml components/wsrp/trunk/pom.xml components/wsrp/trunk/producer/pom.xml components/wsrp/trunk/test/pom.xml components/wsrp/trunk/wsrp-producer-war/pom.xml components/wsrp/trunk/wsrp1-ws/pom.xml components/wsrp/trunk/wsrp2-ws/pom.xml Log: - Changed version to 2.0.0-CR03-SNAPSHOT. Modified: components/wsrp/trunk/admin-gui/pom.xml =================================================================== --- components/wsrp/trunk/admin-gui/pom.xml 2010-11-26 12:59:51 UTC (rev 5292) +++ components/wsrp/trunk/admin-gui/pom.xml 2010-11-26 13:07:53 UTC (rev 5293) @@ -21,11 +21,12 @@ ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org. --> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <parent> <groupId>org.gatein.wsrp</groupId> <artifactId>wsrp-parent</artifactId> - <version>2.0.0-GA-SNAPSHOT</version> + <version>2.0.0-CR03-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>wsrp-admin-gui</artifactId> Modified: components/wsrp/trunk/api/pom.xml =================================================================== --- components/wsrp/trunk/api/pom.xml 2010-11-26 12:59:51 UTC (rev 5292) +++ components/wsrp/trunk/api/pom.xml 2010-11-26 13:07:53 UTC (rev 5293) @@ -21,11 +21,12 @@ ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org. --> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <parent> <groupId>org.gatein.wsrp</groupId> <artifactId>wsrp-parent</artifactId> - <version>2.0.0-GA-SNAPSHOT</version> + <version>2.0.0-CR03-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>wsrp-integration-api</artifactId> Modified: components/wsrp/trunk/common/pom.xml =================================================================== --- components/wsrp/trunk/common/pom.xml 2010-11-26 12:59:51 UTC (rev 5292) +++ components/wsrp/trunk/common/pom.xml 2010-11-26 13:07:53 UTC (rev 5293) @@ -20,11 +20,13 @@ ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org. --> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <parent> <groupId>org.gatein.wsrp</groupId> <artifactId>wsrp-parent</artifactId> - <version>2.0.0-GA-SNAPSHOT</version> + <version>2.0.0-CR03-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>wsrp-common</artifactId> Modified: components/wsrp/trunk/consumer/pom.xml =================================================================== --- components/wsrp/trunk/consumer/pom.xml 2010-11-26 12:59:51 UTC (rev 5292) +++ components/wsrp/trunk/consumer/pom.xml 2010-11-26 13:07:53 UTC (rev 5293) @@ -21,11 +21,12 @@ ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org. --> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <parent> <groupId>org.gatein.wsrp</groupId> <artifactId>wsrp-parent</artifactId> - <version>2.0.0-GA-SNAPSHOT</version> + <version>2.0.0-CR03-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>wsrp-consumer</artifactId> Modified: components/wsrp/trunk/hibernate-impl/pom.xml =================================================================== --- components/wsrp/trunk/hibernate-impl/pom.xml 2010-11-26 12:59:51 UTC (rev 5292) +++ components/wsrp/trunk/hibernate-impl/pom.xml 2010-11-26 13:07:53 UTC (rev 5293) @@ -1,34 +1,35 @@ <?xml version="1.0" encoding="UTF-8"?>  -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.gatein.wsrp</groupId> <artifactId>wsrp-parent</artifactId> - <version>2.0.0-GA-SNAPSHOT</version> + <version>2.0.0-CR03-SNAPSHOT</version> </parent> <groupId>org.gatein.wsrp</groupId> Modified: components/wsrp/trunk/pom.xml =================================================================== --- components/wsrp/trunk/pom.xml 2010-11-26 12:59:51 UTC (rev 5292) +++ components/wsrp/trunk/pom.xml 2010-11-26 13:07:53 UTC (rev 5293) @@ -30,7 +30,7 @@ <groupId>org.gatein.wsrp</groupId> <artifactId>wsrp-parent</artifactId> - <version>2.0.0-GA-SNAPSHOT</version> + <version>2.0.0-CR03-SNAPSHOT</version> <packaging>pom</packaging> Modified: components/wsrp/trunk/producer/pom.xml =================================================================== --- components/wsrp/trunk/producer/pom.xml 2010-11-26 12:59:51 UTC (rev 5292) +++ components/wsrp/trunk/producer/pom.xml 2010-11-26 13:07:53 UTC (rev 5293) @@ -21,11 +21,12 @@ ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org. --> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <parent> <groupId>org.gatein.wsrp</groupId> <artifactId>wsrp-parent</artifactId> - <version>2.0.0-GA-SNAPSHOT</version> + <version>2.0.0-CR03-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>wsrp-producer-lib</artifactId> Modified: components/wsrp/trunk/test/pom.xml =================================================================== --- components/wsrp/trunk/test/pom.xml 2010-11-26 12:59:51 UTC (rev 5292) +++ components/wsrp/trunk/test/pom.xml 2010-11-26 13:07:53 UTC (rev 5293) @@ -22,11 +22,12 @@ ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org. --> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <parent> <groupId>org.gatein.wsrp</groupId> <artifactId>wsrp-parent</artifactId> - <version>2.0.0-GA-SNAPSHOT</version> + <version>2.0.0-CR03-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: components/wsrp/trunk/wsrp-producer-war/pom.xml =================================================================== --- components/wsrp/trunk/wsrp-producer-war/pom.xml 2010-11-26 12:59:51 UTC (rev 5292) +++ components/wsrp/trunk/wsrp-producer-war/pom.xml 2010-11-26 13:07:53 UTC (rev 5293) @@ -22,11 +22,12 @@ ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org. --> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <parent> <groupId>org.gatein.wsrp</groupId> <artifactId>wsrp-parent</artifactId> - <version>2.0.0-GA-SNAPSHOT</version> + <version>2.0.0-CR03-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: components/wsrp/trunk/wsrp1-ws/pom.xml =================================================================== --- components/wsrp/trunk/wsrp1-ws/pom.xml 2010-11-26 12:59:51 UTC (rev 5292) +++ components/wsrp/trunk/wsrp1-ws/pom.xml 2010-11-26 13:07:53 UTC (rev 5293) @@ -21,11 +21,12 @@ ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org. --> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <parent> <groupId>org.gatein.wsrp</groupId> <artifactId>wsrp-parent</artifactId> - <version>2.0.0-GA-SNAPSHOT</version> + <version>2.0.0-CR03-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>wsrp-wsrp1-ws</artifactId> Modified: components/wsrp/trunk/wsrp2-ws/pom.xml =================================================================== --- components/wsrp/trunk/wsrp2-ws/pom.xml 2010-11-26 12:59:51 UTC (rev 5292) +++ components/wsrp/trunk/wsrp2-ws/pom.xml 2010-11-26 13:07:53 UTC (rev 5293) @@ -22,11 +22,12 @@ ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org. --> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <parent> <artifactId>wsrp-parent</artifactId> <groupId>org.gatein.wsrp</groupId> - <version>2.0.0-GA-SNAPSHOT</version> + <version>2.0.0-CR03-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>wsrp-wsrp2-ws</artifactId>

14 years, 1 month

1
0
0 / 0

gatein SVN: r5292 - components/wsrp/trunk/consumer/src/test/resources/wsdl.

by do-not-reply＠jboss.org

Author: chris.laprun(a)jboss.com Date: 2010-11-26 07:59:51 -0500 (Fri, 26 Nov 2010) New Revision: 5292 Added: components/wsrp/trunk/consumer/src/test/resources/wsdl/wlp-wsrp-2.0-bindings.wsdl components/wsrp/trunk/consumer/src/test/resources/wsdl/wlp-wsrp-2.0-types.xsd Modified: components/wsrp/trunk/consumer/src/test/resources/wsdl/extra-ports.wsdl Log: - Fixed tests by removing references to internal test system and adding linked files. Modified: components/wsrp/trunk/consumer/src/test/resources/wsdl/extra-ports.wsdl =================================================================== --- components/wsrp/trunk/consumer/src/test/resources/wsdl/extra-ports.wsdl 2010-11-26 11:16:01 UTC (rev 5291) +++ components/wsrp/trunk/consumer/src/test/resources/wsdl/extra-ports.wsdl 2010-11-26 12:59:51 UTC (rev 5292) @@ -26,12 +26,8 @@ xmlns:s1="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utilit..." xmlns:s2="urn:oasis:names:tc:wsrp:v2:bind" xmlns:s3="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:s4="urn:bea:wsrp:ext:v2:bind" xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy"> - <s0:import - location="http://stacks3.mw.lab.eng.bos.redhat.com:7001/wsrp/producer/wsrp-2.0/mark..." - namespace="urn:oasis:names:tc:wsrp:v2:bind"/> - <s0:import - location="http://stacks3.mw.lab.eng.bos.redhat.com:7001/wsrp/producer/wsrp-2.0/mark..." - namespace="urn:bea:wsrp:ext:v2:bind"/> + <s0:import location="wsrp-2.0-bindings.wsdl" namespace="urn:oasis:names:tc:wsrp:v2:bind"/> + <s0:import location="wlp-wsrp-2.0-bindings.wsdl" namespace="urn:bea:wsrp:ext:v2:bind"/> <wsp:UsingPolicy s0:Required="true"/> <wsp:Policy s1:Id="ProducerDefaultPolicy"> <wsp:All> @@ -49,20 +45,20 @@ </wsp:Policy> <s0:service name="WSRP_v2_Service"> <s0:port binding="s2:WSRP_v2_Markup_Binding_SOAP" name="WSRP_v2_Markup_Service"> - <s3:address location="http://stacks3.mw.lab.eng.bos.redhat.com:7001/wsrp/producer/wsrp-2.0/markup"/> + <s3:address location="http://localhost:7001/wsrp/producer/wsrp-2.0/markup"/> </s0:port> <s0:port binding="s2:WSRP_v2_ServiceDescription_Binding_SOAP" name="WSRP_v2_ServiceDescription_Service"> <s3:address - location="http://stacks3.mw.lab.eng.bos.redhat.com:7001/wsrp/producer/wsrp-2.0/serv..."/> + location="http://localhost:7001/wsrp/producer/wsrp-2.0/serviceDescription"/> </s0:port> <s0:port binding="s2:WSRP_v2_Registration_Binding_SOAP" name="WSRP_v2_Registration_Service"> - <s3:address location="http://stacks3.mw.lab.eng.bos.redhat.com:7001/wsrp/producer/wsrp-2.0/regi..."/> + <s3:address location="http://localhost:7001/wsrp/producer/wsrp-2.0/registration"/> </s0:port> <s0:port binding="s2:WSRP_v2_PortletManagement_Binding_SOAP" name="WSRP_v2_PortletManagement_Service"> - <s3:address location="http://stacks3.mw.lab.eng.bos.redhat.com:7001/wsrp/producer/wsrp-2.0/port..."/> + <s3:address location="http://localhost:7001/wsrp/producer/wsrp-2.0/portletManagement"/> </s0:port> <s0:port binding="s4:WLP_WSRP_v2_Markup_Ext_Binding_SOAP" name="WLP_WSRP_v2_Ext_Service"> - <s3:address location="http://stacks3.mw.lab.eng.bos.redhat.com:7001/wsrp/producer/wsrp-wlp-ext-..."/> + <s3:address location="http://localhost :7001/wsrp/producer/wsrp-wlp-ext-2.0/markup"/> </s0:port> </s0:service> </s0:definitions> \ No newline at end of file Added: components/wsrp/trunk/consumer/src/test/resources/wsdl/wlp-wsrp-2.0-bindings.wsdl =================================================================== --- components/wsrp/trunk/consumer/src/test/resources/wsdl/wlp-wsrp-2.0-bindings.wsdl (rev 0) +++ components/wsrp/trunk/consumer/src/test/resources/wsdl/wlp-wsrp-2.0-bindings.wsdl 2010-11-26 12:59:51 UTC (rev 5292) @@ -0,0 +1,573 @@ +<?xml version='1.0' encoding='UTF-8'?> + + +<s0:definitions targetNamespace="urn:bea:wsrp:ext:v2:bind" xmlns="" xmlns:s0="http://schemas.xmlsoap.org/wsdl/" + xmlns:s1="urn:oasis:names:tc:wsrp:v2:types" xmlns:s2="urn:bea:wsrp:ext:v2:types" + xmlns:s3="urn:bea:wsrp:ext:v2:bind" xmlns:s4="http://schemas.xmlsoap.org/wsdl/soap/" + xmlns:s5="http://schemas.xmlsoap.org/ws/2004/09/policy" xmlns:s6="http://schemas.xmlsoap.org/wsdl/mime/" + xmlns:xs="http://www.w3.org/2001/XMLSchema"> + <xs:import namespace="urn:bea:wsrp:ext:v2:types" schemaLocation="wlp-wsrp-2.0-types.xsd"/> + <s0:message name="AccessDenied"> + <s0:part element="s1:AccessDenied" name="fault"/> + </s0:message> + <s0:message name="InvalidUserCategory"> + <s0:part element="s1:InvalidUserCategory" name="fault"/> + </s0:message> + <s0:message name="InconsistentParameters"> + <s0:part element="s1:InconsistentParameters" name="fault"/> + </s0:message> + <s0:message name="InvalidRegistration"> + <s0:part element="s1:InvalidRegistration" name="fault"/> + </s0:message> + <s0:message name="ModifyRegistrationRequired"> + <s0:part element="s1:ModifyRegistrationRequired" name="fault"/> + </s0:message> + <s0:message name="MissingParameters"> + <s0:part element="s1:MissingParameters" name="fault"/> + </s0:message> + <s0:message name="OperationFailed"> + <s0:part element="s1:OperationFailed" name="fault"/> + </s0:message> + <s0:message name="OperationNotSupported"> + <s0:part element="s1:OperationNotSupported" name="fault"/> + </s0:message> + <s0:message name="InvalidHandle"> + <s0:part element="s1:InvalidHandle" name="fault"/> + </s0:message> + <s0:message name="PortletStateChangeRequired"> + <s0:part element="s1:PortletStateChangeRequired" name="fault"/> + </s0:message> + <s0:message name="ResourceSuspended"> + <s0:part element="s1:ResourceSuspended" name="fault"/> + </s0:message> + <s0:message name="InvalidCookie"> + <s0:part element="s1:InvalidCookie" name="fault"/> + </s0:message> + <s0:message name="InvalidSession"> + <s0:part element="s1:InvalidSession" name="fault"/> + </s0:message> + <s0:message name="UnsupportedMode"> + <s0:part element="s1:UnsupportedMode" name="fault"/> + </s0:message> + <s0:message name="UnsupportedWindowState"> + <s0:part element="s1:UnsupportedWindowState" name="fault"/> + </s0:message> + <s0:message name="UnsupportedLocale"> + <s0:part element="s1:UnsupportedLocale" name="fault"/> + </s0:message> + <s0:message name="UnsupportedMimeType"> + <s0:part element="s1:UnsupportedMimeType" name="fault"/> + </s0:message> + <s0:message name="getMarkup"> + <s0:part element="s1:getMarkup" name="getMarkup"/> + </s0:message> + <s0:message name="getMarkupResponse"> + <s0:part element="s1:getMarkupResponse" name="getMarkupResponse"/> + </s0:message> + <s0:message name="getResource"> + <s0:part element="s1:getResource" name="getResource"/> + </s0:message> + <s0:message name="getResourceResponse"> + <s0:part element="s1:getResourceResponse" name="getResourceResponse"/> + <s0:part element="s2:Markup" name="markup"/> + </s0:message> + <s0:message name="performBlockingInteraction"> + <s0:part element="s1:performBlockingInteraction" name="performBlockingInteraction"/> + </s0:message> + <s0:message name="performBlockingInteractionResponse"> + <s0:part element="s1:performBlockingInteractionResponse" name="performBlockingInteractionResponse"/> + </s0:message> + <s0:message name="handleEvents"> + <s0:part element="s1:handleEvents" name="handleEvents"/> + </s0:message> + <s0:message name="handleEventsResponse"> + <s0:part element="s1:handleEventsResponse" name="handleEventsResponse"/> + </s0:message> + <s0:message name="getRenderDependencies"> + <s0:part element="s2:getRenderDependencies" name="getRenderDependencies"/> + </s0:message> + <s0:message name="getRenderDependenciesResponse"> + <s0:part element="s2:RenderDependenciesResponse" name="getRenderDependenciesResponse"/> + </s0:message> + <s0:message name="releaseSessions"> + <s0:part element="s1:releaseSessions" name="releaseSessions"/> + </s0:message> + <s0:message name="releaseSessionsResponse"> + <s0:part element="s1:releaseSessionsResponse" name="releaseSessionsResponse"/> + </s0:message> + <s0:message name="initCookie"> + <s0:part element="s1:initCookie" name="initCookie"/> + </s0:message> + <s0:message name="initCookieResponse"> + <s0:part element="s1:initCookieResponse" name="initCookieResponse"/> + </s0:message> + <s0:portType name="WLP_WSRP_v2_Markup_Ext_PortType"> + <s0:operation name="getMarkup"> + <s0:input message="s3:getMarkup" name="getMarkup"/> + <s0:output message="s3:getMarkupResponse" name="getMarkupResponse"/> + <s0:fault message="s3:AccessDenied" name="AccessDenied"/> + <s0:fault message="s3:InvalidUserCategory" name="InvalidUserCategory"/> + <s0:fault message="s3:InconsistentParameters" name="InconsistentParameters"/> + <s0:fault message="s3:InvalidRegistration" name="InvalidRegistration"/> + <s0:fault message="s3:MissingParameters" name="MissingParameters"/> + <s0:fault message="s3:OperationFailed" name="OperationFailed"/> + <s0:fault message="s3:InvalidHandle" name="InvalidHandle"/> + <s0:fault message="s3:InvalidCookie" name="InvalidCookie"/> + <s0:fault message="s3:InvalidSession" name="InvalidSession"/> + <s0:fault message="s3:UnsupportedMode" name="UnsupportedMode"/> + <s0:fault message="s3:UnsupportedWindowState" name="UnsupportedWindowState"/> + <s0:fault message="s3:UnsupportedLocale" name="UnsupportedLocale"/> + <s0:fault message="s3:UnsupportedMimeType" name="UnsupportedMimeType"/> + </s0:operation> + <s0:operation name="getResource"> + <s0:input message="s3:getResource" name="getResource"/> + <s0:output message="s3:getResourceResponse" name="getResourceResponse"/> + <s0:fault message="s3:AccessDenied" name="AccessDenied"/> + <s0:fault message="s3:InvalidUserCategory" name="InvalidUserCategory"/> + <s0:fault message="s3:InconsistentParameters" name="InconsistentParameters"/> + <s0:fault message="s3:InvalidRegistration" name="InvalidRegistration"/> + <s0:fault message="s3:MissingParameters" name="MissingParameters"/> + <s0:fault message="s3:OperationFailed" name="OperationFailed"/> + <s0:fault message="s3:InvalidHandle" name="InvalidHandle"/> + <s0:fault message="s3:InvalidCookie" name="InvalidCookie"/> + <s0:fault message="s3:InvalidSession" name="InvalidSession"/> + <s0:fault message="s3:UnsupportedMode" name="UnsupportedMode"/> + <s0:fault message="s3:UnsupportedWindowState" name="UnsupportedWindowState"/> + <s0:fault message="s3:UnsupportedLocale" name="UnsupportedLocale"/> + <s0:fault message="s3:UnsupportedMimeType" name="UnsupportedMimeType"/> + </s0:operation> + <s0:operation name="performBlockingInteraction"> + <s0:input message="s3:performBlockingInteraction" name="performBlockingInteraction"/> + <s0:output message="s3:performBlockingInteractionResponse" name="performBlockingInteractionResponse"/> + <s0:fault message="s3:AccessDenied" name="AccessDenied"/> + <s0:fault message="s3:InvalidUserCategory" name="InvalidUserCategory"/> + <s0:fault message="s3:InconsistentParameters" name="InconsistentParameters"/> + <s0:fault message="s3:InvalidRegistration" name="InvalidRegistration"/> + <s0:fault message="s3:MissingParameters" name="MissingParameters"/> + <s0:fault message="s3:OperationFailed" name="OperationFailed"/> + <s0:fault message="s3:InvalidHandle" name="InvalidHandle"/> + <s0:fault message="s3:PortletStateChangeRequired" name="PortletStateChangeRequired"/> + <s0:fault message="s3:InvalidCookie" name="InvalidCookie"/> + <s0:fault message="s3:InvalidSession" name="InvalidSession"/> + <s0:fault message="s3:UnsupportedMode" name="UnsupportedMode"/> + <s0:fault message="s3:UnsupportedWindowState" name="UnsupportedWindowState"/> + <s0:fault message="s3:UnsupportedLocale" name="UnsupportedLocale"/> + <s0:fault message="s3:UnsupportedMimeType" name="UnsupportedMimeType"/> + </s0:operation> + <s0:operation name="releaseSessions"> + <s0:input message="s3:releaseSessions" name="releaseSessions"/> + <s0:output message="s3:releaseSessionsResponse" name="releaseSessionsResponse"/> + <s0:fault message="s3:AccessDenied" name="AccessDenied"/> + <s0:fault message="s3:InvalidRegistration" name="InvalidRegistration"/> + <s0:fault message="s3:MissingParameters" name="MissingParameters"/> + <s0:fault message="s3:OperationFailed" name="OperationFailed"/> + </s0:operation> + <s0:operation name="initCookie"> + <s0:input message="s3:initCookie" name="initCookie"/> + <s0:output message="s3:initCookieResponse" name="initCookieResponse"/> + <s0:fault message="s3:AccessDenied" name="AccessDenied"/> + <s0:fault message="s3:InvalidRegistration" name="InvalidRegistration"/> + <s0:fault message="s3:OperationFailed" name="OperationFailed"/> + </s0:operation> + <s0:operation name="handleEvents"> + <s0:input message="s3:handleEvents"/> + <s0:output message="s3:handleEventsResponse"/> + <s0:fault message="s3:AccessDenied" name="AccessDenied"/> + <s0:fault message="s3:InconsistentParameters" name="InconsistentParameters"/> + <s0:fault message="s3:InvalidCookie" name="InvalidCookie"/> + <s0:fault message="s3:InvalidHandle" name="InvalidHandle"/> + <s0:fault message="s3:InvalidRegistration" name="InvalidRegistration"/> + <s0:fault message="s3:InvalidSession" name="InvalidSession"/> + <s0:fault message="s3:InvalidUserCategory" name="InvalidUserCategory"/> + <s0:fault message="s3:MissingParameters" name="MissingParameters"/> + <s0:fault message="s3:ModifyRegistrationRequired" name="ModifyRegistrationRequired"/> + <s0:fault message="s3:OperationFailed" name="OperationFailed"/> + <s0:fault message="s3:OperationNotSupported" name="OperationNotSupported"/> + <s0:fault message="s3:PortletStateChangeRequired" name="PortletStateChangeRequired"/> + <s0:fault message="s3:ResourceSuspended" name="ResourceSuspended"/> + <s0:fault message="s3:UnsupportedLocale" name="UnsupportedLocale"/> + <s0:fault message="s3:UnsupportedMimeType" name="UnsupportedMimeType"/> + <s0:fault message="s3:UnsupportedMode" name="UnsupportedMode"/> + <s0:fault message="s3:UnsupportedWindowState" name="UnsupportedWindowState"/> + </s0:operation> + <s0:operation name="getRenderDependencies"> + <s0:input message="s3:getRenderDependencies"/> + <s0:output message="s3:getRenderDependenciesResponse"/> + <s0:fault message="s3:AccessDenied" name="AccessDenied"/> + <s0:fault message="s3:InconsistentParameters" name="InconsistentParameters"/> + <s0:fault message="s3:InvalidCookie" name="InvalidCookie"/> + <s0:fault message="s3:InvalidHandle" name="InvalidHandle"/> + <s0:fault message="s3:InvalidRegistration" name="InvalidRegistration"/> + <s0:fault message="s3:InvalidSession" name="InvalidSession"/> + <s0:fault message="s3:InvalidUserCategory" name="InvalidUserCategory"/> + <s0:fault message="s3:MissingParameters" name="MissingParameters"/> + <s0:fault message="s3:ModifyRegistrationRequired" name="ModifyRegistrationRequired"/> + <s0:fault message="s3:OperationFailed" name="OperationFailed"/> + <s0:fault message="s3:ResourceSuspended" name="ResourceSuspended"/> + <s0:fault message="s3:UnsupportedLocale" name="UnsupportedLocale"/> + <s0:fault message="s3:UnsupportedMimeType" name="UnsupportedMimeType"/> + <s0:fault message="s3:UnsupportedMode" name="UnsupportedMode"/> + <s0:fault message="s3:UnsupportedWindowState" name="UnsupportedWindowState"/> + </s0:operation> + </s0:portType> + <s0:binding name="WLP_WSRP_v2_Markup_Ext_Binding_SOAP" type="s3:WLP_WSRP_v2_Markup_Ext_PortType"> + <s4:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/> + <s0:operation name="getMarkup"> + <s4:operation soapAction="urn:bea:wsrp:ext:v2:getMarkup"/> + <s0:input name="getMarkup"> + <s5:Policy> + <s5:PolicyReference URI="#ProducerDefaultPolicy"/> + </s5:Policy> + <s4:body use="literal"/> + </s0:input> + <s0:output name="getMarkupResponse"> + <s6:multipartRelated> + <s6:part> + <s4:body parts="getMarkupResponse" use="literal"/> + </s6:part> + </s6:multipartRelated> + </s0:output> + <s0:fault name="AccessDenied"> + <s4:fault name="AccessDenied" use="literal"/> + </s0:fault> + <s0:fault name="InvalidUserCategory"> + <s4:fault name="InvalidUserCategory" use="literal"/> + </s0:fault> + <s0:fault name="InconsistentParameters"> + <s4:fault name="InconsistentParameters" use="literal"/> + </s0:fault> + <s0:fault name="InvalidRegistration"> + <s4:fault name="InvalidRegistration" use="literal"/> + </s0:fault> + <s0:fault name="MissingParameters"> + <s4:fault name="MissingParameters" use="literal"/> + </s0:fault> + <s0:fault name="OperationFailed"> + <s4:fault name="OperationFailed" use="literal"/> + </s0:fault> + <s0:fault name="InvalidHandle"> + <s4:fault name="InvalidHandle" use="literal"/> + </s0:fault> + <s0:fault name="InvalidCookie"> + <s4:fault name="InvalidCookie" use="literal"/> + </s0:fault> + <s0:fault name="InvalidSession"> + <s4:fault name="InvalidSession" use="literal"/> + </s0:fault> + <s0:fault name="UnsupportedMode"> + <s4:fault name="UnsupportedMode" use="literal"/> + </s0:fault> + <s0:fault name="UnsupportedWindowState"> + <s4:fault name="UnsupportedWindowState" use="literal"/> + </s0:fault> + <s0:fault name="UnsupportedLocale"> + <s4:fault name="UnsupportedLocale" use="literal"/> + </s0:fault> + <s0:fault name="UnsupportedMimeType"> + <s4:fault name="UnsupportedMimeType" use="literal"/> + </s0:fault> + </s0:operation> + <s0:operation name="getResource"> + <s4:operation soapAction="urn:bea:wsrp:ext:v2:getResource"/> + <s0:input name="getResource"> + <s5:Policy> + <s5:PolicyReference URI="#ProducerDefaultPolicy"/> + </s5:Policy> + <s4:body use="literal"/> + </s0:input> + <s0:output name="getResourceResponse"> + <s6:multipartRelated> + <s6:part> + <s4:body parts="getResourceResponse" use="literal"/> + </s6:part> + <s6:part> + <s6:content part="markup" type="application/octetstream"/> + </s6:part> + </s6:multipartRelated> + </s0:output> + <s0:fault name="AccessDenied"> + <s4:fault name="AccessDenied" use="literal"/> + </s0:fault> + <s0:fault name="InvalidUserCategory"> + <s4:fault name="InvalidUserCategory" use="literal"/> + </s0:fault> + <s0:fault name="InconsistentParameters"> + <s4:fault name="InconsistentParameters" use="literal"/> + </s0:fault> + <s0:fault name="InvalidRegistration"> + <s4:fault name="InvalidRegistration" use="literal"/> + </s0:fault> + <s0:fault name="MissingParameters"> + <s4:fault name="MissingParameters" use="literal"/> + </s0:fault> + <s0:fault name="OperationFailed"> + <s4:fault name="OperationFailed" use="literal"/> + </s0:fault> + <s0:fault name="InvalidHandle"> + <s4:fault name="InvalidHandle" use="literal"/> + </s0:fault> + <s0:fault name="InvalidCookie"> + <s4:fault name="InvalidCookie" use="literal"/> + </s0:fault> + <s0:fault name="InvalidSession"> + <s4:fault name="InvalidSession" use="literal"/> + </s0:fault> + <s0:fault name="UnsupportedMode"> + <s4:fault name="UnsupportedMode" use="literal"/> + </s0:fault> + <s0:fault name="UnsupportedWindowState"> + <s4:fault name="UnsupportedWindowState" use="literal"/> + </s0:fault> + <s0:fault name="UnsupportedLocale"> + <s4:fault name="UnsupportedLocale" use="literal"/> + </s0:fault> + <s0:fault name="UnsupportedMimeType"> + <s4:fault name="UnsupportedMimeType" use="literal"/> + </s0:fault> + </s0:operation> + <s0:operation name="performBlockingInteraction"> + <s4:operation soapAction="urn:bea:wsrp:ext:v2:performBlockingInteraction"/> + <s0:input name="performBlockingInteraction"> + <s5:Policy> + <s5:PolicyReference URI="#ProducerDefaultPolicy"/> + </s5:Policy> + <s6:multipartRelated> + <s6:part> + <s4:body parts="performBlockingInteraction" use="literal"/> + </s6:part> + </s6:multipartRelated> + </s0:input> + <s0:output name="performBlockingInteractionResponse"> + <s4:body use="literal"/> + </s0:output> + <s0:fault name="AccessDenied"> + <s4:fault name="AccessDenied" use="literal"/> + </s0:fault> + <s0:fault name="InvalidUserCategory"> + <s4:fault name="InvalidUserCategory" use="literal"/> + </s0:fault> + <s0:fault name="InconsistentParameters"> + <s4:fault name="InconsistentParameters" use="literal"/> + </s0:fault> + <s0:fault name="InvalidRegistration"> + <s4:fault name="InvalidRegistration" use="literal"/> + </s0:fault> + <s0:fault name="MissingParameters"> + <s4:fault name="MissingParameters" use="literal"/> + </s0:fault> + <s0:fault name="OperationFailed"> + <s4:fault name="OperationFailed" use="literal"/> + </s0:fault> + <s0:fault name="InvalidHandle"> + <s4:fault name="InvalidHandle" use="literal"/> + </s0:fault> + <s0:fault name="PortletStateChangeRequired"> + <s4:fault name="PortletStateChangeRequired" use="literal"/> + </s0:fault> + <s0:fault name="InvalidCookie"> + <s4:fault name="InvalidCookie" use="literal"/> + </s0:fault> + <s0:fault name="InvalidSession"> + <s4:fault name="InvalidSession" use="literal"/> + </s0:fault> + <s0:fault name="UnsupportedMode"> + <s4:fault name="UnsupportedMode" use="literal"/> + </s0:fault> + <s0:fault name="UnsupportedWindowState"> + <s4:fault name="UnsupportedWindowState" use="literal"/> + </s0:fault> + <s0:fault name="UnsupportedLocale"> + <s4:fault name="UnsupportedLocale" use="literal"/> + </s0:fault> + <s0:fault name="UnsupportedMimeType"> + <s4:fault name="UnsupportedMimeType" use="literal"/> + </s0:fault> + </s0:operation> + <s0:operation name="releaseSessions"> + <s4:operation soapAction="urn:bea:wsrp:ext:v2:releaseSessions"/> + <s0:input name="releaseSessions"> + <s5:Policy> + <s5:PolicyReference URI="#ProducerDefaultPolicy"/> + </s5:Policy> + <s4:body use="literal"/> + </s0:input> + <s0:output name="releaseSessionsResponse"> + <s4:body use="literal"/> + </s0:output> + <s0:fault name="AccessDenied"> + <s4:fault name="AccessDenied" use="literal"/> + </s0:fault> + <s0:fault name="InvalidRegistration"> + <s4:fault name="InvalidRegistration" use="literal"/> + </s0:fault> + <s0:fault name="MissingParameters"> + <s4:fault name="MissingParameters" use="literal"/> + </s0:fault> + <s0:fault name="OperationFailed"> + <s4:fault name="OperationFailed" use="literal"/> + </s0:fault> + </s0:operation> + <s0:operation name="initCookie"> + <s4:operation soapAction="urn:bea:wsrp:ext:v2:initCookie"/> + <s0:input name="initCookie"> + <s5:Policy> + <s5:PolicyReference URI="#ProducerDefaultPolicy"/> + </s5:Policy> + <s4:body use="literal"/> + </s0:input> + <s0:output name="initCookieResponse"> + <s4:body use="literal"/> + </s0:output> + <s0:fault name="AccessDenied"> + <s4:fault name="AccessDenied" use="literal"/> + </s0:fault> + <s0:fault name="InvalidRegistration"> + <s4:fault name="InvalidRegistration" use="literal"/> + </s0:fault> + <s0:fault name="OperationFailed"> + <s4:fault name="OperationFailed" use="literal"/> + </s0:fault> + </s0:operation> + <s0:operation name="handleEvents"> + <s4:operation soapAction="urn:bea:wsrp:ext:v2:handleEvents"/> + <s0:input> + <s5:Policy> + <s5:PolicyReference URI="#ProducerDefaultPolicy"/> + </s5:Policy> + <s4:body use="literal"/> + </s0:input> + <s0:output> + <s4:body use="literal"/> + </s0:output> + <s0:fault name="AccessDenied"> + <s4:fault name="AccessDenied" use="literal"/> + </s0:fault> + <s0:fault name="InconsistentParameters"> + <s4:fault name="InconsistentParameters" use="literal"/> + </s0:fault> + <s0:fault name="InvalidCookie"> + <s4:fault name="InvalidCookie" use="literal"/> + </s0:fault> + <s0:fault name="InvalidHandle"> + <s4:fault name="InvalidHandle" use="literal"/> + </s0:fault> + <s0:fault name="InvalidRegistration"> + <s4:fault name="InvalidRegistration" use="literal"/> + </s0:fault> + <s0:fault name="InvalidSession"> + <s4:fault name="InvalidSession" use="literal"/> + </s0:fault> + <s0:fault name="InvalidUserCategory"> + <s4:fault name="InvalidUserCategory" use="literal"/> + </s0:fault> + <s0:fault name="MissingParameters"> + <s4:fault name="MissingParameters" use="literal"/> + </s0:fault> + <s0:fault name="ModifyRegistrationRequired"> + <s4:fault name="ModifyRegistrationRequired" use="literal"/> + </s0:fault> + <s0:fault name="OperationFailed"> + <s4:fault name="OperationFailed" use="literal"/> + </s0:fault> + <s0:fault name="OperationNotSupported"> + <s4:fault name="OperationNotSupported" use="literal"/> + </s0:fault> + <s0:fault name="PortletStateChangeRequired"> + <s4:fault name="PortletStateChangeRequired" use="literal"/> + </s0:fault> + <s0:fault name="ResourceSuspended"> + <s4:fault name="ResourceSuspended" use="literal"/> + </s0:fault> + <s0:fault name="UnsupportedLocale"> + <s4:fault name="UnsupportedLocale" use="literal"/> + </s0:fault> + <s0:fault name="UnsupportedMimeType"> + <s4:fault name="UnsupportedMimeType" use="literal"/> + </s0:fault> + <s0:fault name="UnsupportedMode"> + <s4:fault name="UnsupportedMode" use="literal"/> + </s0:fault> + <s0:fault name="UnsupportedWindowState"> + <s4:fault name="UnsupportedWindowState" use="literal"/> + </s0:fault> + </s0:operation> + <s0:operation name="getRenderDependencies"> + <s4:operation soapAction="urn:bea:wsrp:ext:v2:getRenderDependencies"/> + <s0:input> + <s5:Policy> + <s5:PolicyReference URI="#ProducerDefaultPolicy"/> + </s5:Policy> + <s4:body use="literal"/> + </s0:input> + <s0:output> + <s4:body use="literal"/> + </s0:output> + <s0:fault name="AccessDenied"> + <s4:fault name="AccessDenied" use="literal"/> + </s0:fault> + <s0:fault name="InconsistentParameters"> + <s4:fault name="InconsistentParameters" use="literal"/> + </s0:fault> + <s0:fault name="InvalidCookie"> + <s4:fault name="InvalidCookie" use="literal"/> + </s0:fault> + <s0:fault name="InvalidHandle"> + <s4:fault name="InvalidHandle" use="literal"/> + </s0:fault> + <s0:fault name="InvalidRegistration"> + <s4:fault name="InvalidRegistration" use="literal"/> + </s0:fault> + <s0:fault name="InvalidSession"> + <s4:fault name="InvalidSession" use="literal"/> + </s0:fault> + <s0:fault name="InvalidUserCategory"> + <s4:fault name="InvalidUserCategory" use="literal"/> + </s0:fault> + <s0:fault name="MissingParameters"> + <s4:fault name="MissingParameters" use="literal"/> + </s0:fault> + <s0:fault name="ModifyRegistrationRequired"> + <s4:fault name="ModifyRegistrationRequired" use="literal"/> + </s0:fault> + <s0:fault name="OperationFailed"> + <s4:fault name="OperationFailed" use="literal"/> + </s0:fault> + <s0:fault name="ResourceSuspended"> + <s4:fault name="ResourceSuspended" use="literal"/> + </s0:fault> + <s0:fault name="UnsupportedLocale"> + <s4:fault name="UnsupportedLocale" use="literal"/> + </s0:fault> + <s0:fault name="UnsupportedMimeType"> + <s4:fault name="UnsupportedMimeType" use="literal"/> + </s0:fault> + <s0:fault name="UnsupportedMode"> + <s4:fault name="UnsupportedMode" use="literal"/> + </s0:fault> + <s0:fault name="UnsupportedWindowState"> + <s4:fault name="UnsupportedWindowState" use="literal"/> + </s0:fault> + </s0:operation> + </s0:binding> +</s0:definitions> \ No newline at end of file Added: components/wsrp/trunk/consumer/src/test/resources/wsdl/wlp-wsrp-2.0-types.xsd =================================================================== --- components/wsrp/trunk/consumer/src/test/resources/wsdl/wlp-wsrp-2.0-types.xsd (rev 0) +++ components/wsrp/trunk/consumer/src/test/resources/wsdl/wlp-wsrp-2.0-types.xsd 2010-11-26 12:59:51 UTC (rev 5292) @@ -0,0 +1,600 @@ +<?xml version='1.0' encoding='UTF-8'?> + + +<xs:schema elementFormDefault="qualified" targetNamespace="urn:bea:wsrp:ext:v2:types" + xmlns:types="urn:oasis:names:tc:wsrp:v2:types" xmlns:wlp-types="urn:bea:wsrp:ext:v2:types" + xmlns:xs="http://www.w3.org/2001/XMLSchema"> +  + <xs:import namespace="urn:oasis:names:tc:wsrp:v2:types" schemaLocation="wsrp-2.0-types.xsd"/> + <xs:element name="FaultDetail"> + <xs:annotation> + <xs:documentation>Specifies fault detail</xs:documentation> + </xs:annotation> + <xs:complexType> + <xs:sequence> + <xs:element minOccurs="1" name="created" type="xs:dateTime"/> + <xs:element minOccurs="1" name="trace" type="xs:string"/> + </xs:sequence> + </xs:complexType> + </xs:element> + <xs:element name="Markup"> + <xs:complexType> + <xs:sequence> + <xs:element name="binary" type="xs:base64Binary"/> + </xs:sequence> + </xs:complexType> + </xs:element> + <xs:element name="Upload"> + <xs:complexType> + <xs:sequence> + <xs:element name="binary" type="xs:base64Binary"/> + </xs:sequence> + </xs:complexType> + </xs:element> +  + <xs:element name="EventDescription" type="wlp-types:EventDescription"/> + <xs:complexType name="EventDescription"> + <xs:sequence> + <xs:element name="eventName" type="xs:QName"/> + <xs:element maxOccurs="unbounded" minOccurs="0" name="alias" type="xs:QName"/> + <xs:element maxOccurs="1" minOccurs="0" name="portalEventType" type="wlp-types:PortalEventType"/> + <xs:element minOccurs="0" name="description" type="types:LocalizedString"/> + <xs:element minOccurs="0" name="handleEventDescription" type="wlp-types:FrameworkEventDescription"/> + </xs:sequence> + <xs:attribute default="true" name="chainWildcardAliases" type="xs:boolean"/> + </xs:complexType> + <xs:element name="portletEventDescriptions" type="wlp-types:handledEvents"/> + <xs:complexType name="PortalEventType"> + <xs:attribute name="type" type="xs:string"/> + </xs:complexType> +  + <xs:element name="EventInformation" type="wlp-types:EventInformation"/> + <xs:complexType name="EventInformation"> + <xs:attribute name="class" type="xs:string" use="optional"/> + </xs:complexType> + <xs:complexType name="handledEvents"> + <xs:sequence> + <xs:element maxOccurs="unbounded" minOccurs="0" name="event" type="wlp-types:EventDescription"/> + </xs:sequence> + </xs:complexType> +  + <xs:element name="eventSource" type="wlp-types:EventSource"/> + <xs:complexType name="EventSource"> + <xs:sequence> + <xs:element minOccurs="0" name="sourceDefinitionLabel" type="xs:string"/> + <xs:element minOccurs="0" name="sourceInstanceLabel" type="xs:string"/> + <xs:element minOccurs="0" name="windowInfo" type="xs:string"/> + </xs:sequence> + <xs:attribute name="class" type="xs:string" use="optional"/> + </xs:complexType> + <xs:complexType name="EventPayload"> + <xs:sequence> + <xs:element name="binary" type="xs:base64Binary"/> + </xs:sequence> + </xs:complexType> + <xs:complexType name="SimpleEventPayload"> + <xs:sequence> + <xs:choice maxOccurs="1" minOccurs="0"> + <xs:element name="boolean" type="xs:boolean"/> + <xs:element name="byte" type="xs:byte"/> + <xs:element name="short" type="xs:short"/> + <xs:element name="int" type="xs:int"/> + <xs:element name="long" type="xs:long"/> + <xs:element name="float" type="xs:float"/> + <xs:element name="double" type="xs:double"/> + <xs:element name="string" type="xs:string"/> + <xs:element name="integer" type="xs:integer"/> + <xs:element name="decimal" type="xs:decimal"/> + <xs:element name="QName" type="xs:QName"/> + <xs:element name="duration" type="xs:duration"/> + <xs:element name="dateTime" type="xs:dateTime"/> + </xs:choice> + </xs:sequence> + </xs:complexType> + <xs:complexType name="FrameworkEventDescription"> + <xs:sequence> + <xs:choice maxOccurs="unbounded" minOccurs="0"> + <xs:element ref="wlp-types:changeWindowState"/> + <xs:element ref="wlp-types:changeWindowMode"/> + <xs:element ref="wlp-types:activatePage"/> + <xs:element ref="wlp-types:invokePageFlowAction"/> + <xs:element ref="wlp-types:invokeStrutsAction"/> + <xs:element ref="wlp-types:fireCustomEvent"/> + <xs:element ref="wlp-types:fireEvent"/> + <xs:element ref="wlp-types:invokeBackingFileMethod"/> + <xs:element ref="wlp-types:dispatchToRemotePortlet"/> + <xs:element ref="wlp-types:invokeJavaPortletMethod"/> + </xs:choice> + </xs:sequence> + <xs:attribute name="eventLabel" type="xs:string"/> +  + <xs:attribute name="filterable" type="xs:boolean"/> + <xs:attribute name="onlyIfDisplayed" type="xs:boolean"/> + <xs:attribute name="sourceDefinitionLabels" type="xs:string"/> + <xs:attribute name="fromSelfInstanceOnly" type="xs:boolean"/> + <xs:attribute name="sourceDefinitionWildcard"> + <xs:simpleType> + <xs:restriction base="xs:string"> + <xs:enumeration value="this"/> + <xs:enumeration value="any"/> + </xs:restriction> + </xs:simpleType> + </xs:attribute> +  + </xs:complexType> + <xs:complexType name="FrameworkPortalEventDescription"> + <xs:complexContent> + <xs:extension base="wlp-types:FrameworkEventDescription"> + <xs:sequence> + <xs:element maxOccurs="unbounded" minOccurs="0" name="filterEvent" type="wlp-types:filterEventType"/> + </xs:sequence> + <xs:attribute name="event"> + <xs:simpleType> + <xs:restriction base="xs:string"> + <xs:enumeration value="onActivation"/> + <xs:enumeration value="onDeactivation"/> + <xs:enumeration value="onMinimize"/> + <xs:enumeration value="onMaximize"/> + <xs:enumeration value="onNormal"/> + <xs:enumeration value="onDelete"/> + <xs:enumeration value="onFloat"/> + <xs:enumeration value="onHelp"/> + <xs:enumeration value="onEdit"/> + <xs:enumeration value="onView"/> + <xs:enumeration value="onRefresh"/> + </xs:restriction> + </xs:simpleType> + </xs:attribute> + </xs:extension> + </xs:complexContent> + </xs:complexType> + <xs:element name="FrameworkEventDescription" type="wlp-types:FrameworkEventDescription"/> + <xs:element name="handlePortalEventDescription" substitutionGroup="wlp-types:FrameworkEventDescription" + type="wlp-types:FrameworkPortalEventDescription"/> + <xs:complexType name="filterEventType"> + <xs:attribute name="eventLabel" type="xs:string"/> +  + <xs:attribute name="sourceInstanceLabels" type="xs:string"/> + <xs:attribute name="sourceInstanceWildcard"> + <xs:simpleType> + <xs:restriction base="xs:string"> + <xs:enumeration value="this"/> + <xs:enumeration value="any"/> + <xs:enumeration value="none"/> + </xs:restriction> + </xs:simpleType> + </xs:attribute> + </xs:complexType> + <xs:element name="changeWindowState" type="wlp-types:changeWindowStateType"/> + <xs:element name="changeWindowMode" type="wlp-types:changeWindowModeType"/> + <xs:element name="activatePage" type="wlp-types:activatePageType"/> + <xs:element name="invokePageFlowAction" type="wlp-types:invokePageFlowActionType"/> + <xs:element name="invokeStrutsAction" type="wlp-types:invokeStrutsActionType"/> + <xs:element name="fireEvent" type="wlp-types:fireEventType"/> + <xs:element name="fireCustomEvent" type="xs:QName"/> + <xs:element name="invokeBackingFileMethod" type="wlp-types:invokeBackingFileMethodType"/> + <xs:element name="invokeJavaPortletMethod" type="wlp-types:invokeJavaPortletMethodType"/> + <xs:element name="dispatchToRemotePortlet" type="wlp-types:dispatchToRemotePortletType"/> + <xs:complexType name="changeWindowStateType"> + <xs:attribute name="newState"> + <xs:simpleType> + <xs:restriction base="xs:string"> + <xs:enumeration value="minimized"/> + <xs:enumeration value="maximized"/> + <xs:enumeration value="normal"/> + <xs:enumeration value="delete"/> + </xs:restriction> + </xs:simpleType> + </xs:attribute> + </xs:complexType> + <xs:complexType name="changeWindowModeType"> + <xs:attribute name="newMode" type="xs:string"/> + </xs:complexType> + <xs:complexType name="activatePageType"/> + <xs:complexType name="invokePageFlowActionType"> + <xs:attribute name="action" type="xs:string"/> + </xs:complexType> + <xs:complexType name="invokeStrutsActionType"> + <xs:attribute name="action" type="xs:string"/> + </xs:complexType> + <xs:complexType name="invokeBackingFileMethodType"> + <xs:attribute name="method" type="xs:string"/> + </xs:complexType> + <xs:complexType name="invokeJavaPortletMethodType"> + <xs:attribute name="method" type="xs:string"/> + </xs:complexType> + <xs:complexType name="fireEventType"> + <xs:attribute name="event" type="xs:string"/> + </xs:complexType> + <xs:complexType name="dispatchToRemotePortletType"/> + <xs:element name="InteractionRequestState"> + <xs:complexType> + <xs:sequence> + <xs:element name="state" type="xs:base64Binary"/> + </xs:sequence> + </xs:complexType> + </xs:element> + <xs:element name="InteractionResponseState"> + <xs:complexType> + <xs:sequence> + <xs:element name="state" type="xs:base64Binary"/> + </xs:sequence> + </xs:complexType> + </xs:element> + <xs:element name="MarkupRequestState"> + <xs:complexType> + <xs:sequence> + <xs:element name="state" type="xs:base64Binary"/> + </xs:sequence> + </xs:complexType> + </xs:element> + <xs:element name="MarkupResponseState"> + <xs:complexType> + <xs:sequence> + <xs:element name="state" type="xs:base64Binary"/> + </xs:sequence> + </xs:complexType> + </xs:element> + <xs:element name="XmlMarkupRequestState"> + <xs:complexType> + <xs:sequence> + <xs:any maxOccurs="1" minOccurs="1" processContents="skip"/> + </xs:sequence> + </xs:complexType> + </xs:element> + <xs:element name="XmlMarkupResponseState"> + <xs:complexType> + <xs:sequence> + <xs:any maxOccurs="1" minOccurs="1" processContents="skip"/> + </xs:sequence> + </xs:complexType> + </xs:element> + <xs:element name="XmlInteractionRequestState"> + <xs:complexType> + <xs:sequence> + <xs:any maxOccurs="1" minOccurs="1" processContents="skip"/> + </xs:sequence> + </xs:complexType> + </xs:element> + <xs:element name="XmlInteractionResponseState"> + <xs:complexType> + <xs:sequence> + <xs:any maxOccurs="1" minOccurs="1" processContents="skip"/> + </xs:sequence> + </xs:complexType> + </xs:element> + <xs:element name="MarkupRef"> + <xs:annotation> + <xs:documentation>Specifies how markup is being returned.</xs:documentation> + </xs:annotation> + <xs:complexType> + <xs:attribute name="refId"> + <xs:simpleType> + <xs:restriction base="xs:string"> + <xs:enumeration value="attachment"/> + <xs:enumeration value="stream"/> + <xs:enumeration value="inline"/> + </xs:restriction> + </xs:simpleType> + </xs:attribute> + </xs:complexType> + </xs:element> + <xs:element name="LookAndFeelDescriptor"> + <xs:complexType> + <xs:sequence> + <xs:element name="skeletonId" type="xs:string"/> + <xs:element name="skeletonPath" type="xs:string"/> + <xs:element name="skinId" type="xs:string"/> + <xs:element name="skinPath" type="xs:string"/> + </xs:sequence> + </xs:complexType> + </xs:element> + <xs:complexType abstract="true" name="ProxiableType"> + <xs:attribute name="theme" type="xs:string"/> + </xs:complexType> + <xs:complexType abstract="true" name="PlaceableType"> + <xs:complexContent> + <xs:extension base="wlp-types:ProxiableType"> + <xs:attribute name="placeholder" type="xs:int"/> + <xs:attribute name="placement" type="xs:int"/> + <xs:attribute name="position" type="xs:int"/> + <xs:attribute name="alignment" type="xs:int"/> + <xs:attribute name="default" type="xs:boolean"/> + </xs:extension> + </xs:complexContent> + </xs:complexType> + <xs:complexType abstract="true" name="NavigableType"> + <xs:complexContent> + <xs:extension base="wlp-types:PlaceableType"> + <xs:sequence> + <xs:element minOccurs="0" name="description" type="types:LocalizedString"/> + <xs:element minOccurs="1" name="title" type="types:LocalizedString"/> + </xs:sequence> + <xs:attribute name="hidden" type="xs:boolean"/> + <xs:attribute name="public" type="xs:boolean"/> + <xs:attribute name="active" type="xs:boolean"/> + <xs:attribute name="orientation" type="xs:string"/> + </xs:extension> + </xs:complexContent> + </xs:complexType> + <xs:complexType name="PageDescriptionType"> + <xs:complexContent> + <xs:extension base="wlp-types:NavigableType"> + <xs:sequence> + <xs:element name="layout" type="xs:string"/> + <xs:element maxOccurs="unbounded" minOccurs="0" name="placeable" type="wlp-types:PlaceableType"/> + </xs:sequence> + <xs:attribute name="pageContentUri" type="xs:string"/> + <xs:attribute name="pageHandle" type="xs:string"/> + </xs:extension> + </xs:complexContent> + </xs:complexType> + <xs:element name="PageDescription" type="wlp-types:PageDescriptionType"/> +  + <xs:complexType name="BookDescriptionType"> + <xs:complexContent> + <xs:extension base="wlp-types:NavigableType"> + <xs:sequence> + <xs:element maxOccurs="1" minOccurs="0" name="menu" type="xs:string"/> + <xs:choice maxOccurs="unbounded" minOccurs="0"> + <xs:element name="PageDescription" type="wlp-types:PageDescriptionType"/> + <xs:element name="BookDescription" type="wlp-types:BookDescriptionType"/> + </xs:choice> + </xs:sequence> + <xs:attribute name="bookHandle" type="xs:string"/> + <xs:attribute name="defaultPage" type="xs:string"/> + <xs:attribute name="bookContentUri" type="xs:string"/> + </xs:extension> + </xs:complexContent> + </xs:complexType> + <xs:element name="BookDescription" type="wlp-types:BookDescriptionType"/> + <xs:complexType name="PortletRefType"> + <xs:complexContent> + <xs:extension base="wlp-types:PlaceableType"> + <xs:sequence> + <xs:element name="title" type="types:LocalizedString"/> + </xs:sequence> + <xs:attribute name="portletHandle" type="xs:string"/> + <xs:attribute name="defaultMinimized" type="xs:boolean"/> + <xs:attribute name="orientation" type="xs:string"/> + </xs:extension> + </xs:complexContent> + </xs:complexType> + <xs:element name="PortletRef" type="wlp-types:PortletRefType"/> + <xs:complexType name="AbstractProperty"> + <xs:attribute name="name" type="xs:string" use="optional"/> +  + <xs:attribute default="false" name="isList" type="xs:boolean" use="optional"/> + </xs:complexType> + <xs:element name="stringProperty"> + <xs:complexType> + <xs:complexContent> + <xs:extension base="wlp-types:AbstractProperty"> + <xs:sequence> + <xs:element maxOccurs="unbounded" minOccurs="1" name="value" type="xs:string"/> + </xs:sequence> + </xs:extension> + </xs:complexContent> + </xs:complexType> + </xs:element> + <xs:element name="longProperty"> + <xs:complexType> + <xs:complexContent> + <xs:extension base="wlp-types:AbstractProperty"> + <xs:sequence> + <xs:element maxOccurs="unbounded" minOccurs="1" name="value" type="xs:long"/> + </xs:sequence> + </xs:extension> + </xs:complexContent> + </xs:complexType> + </xs:element> + <xs:element name="LongProperty"> + <xs:complexType> + <xs:complexContent> + <xs:extension base="wlp-types:AbstractProperty"> + <xs:sequence> + <xs:element maxOccurs="unbounded" minOccurs="1" name="value" type="xs:long"/> + </xs:sequence> + </xs:extension> + </xs:complexContent> + </xs:complexType> + </xs:element> + <xs:element name="doubleProperty"> + <xs:complexType> + <xs:complexContent> + <xs:extension base="wlp-types:AbstractProperty"> + <xs:sequence> + <xs:element maxOccurs="unbounded" minOccurs="1" name="value" type="xs:double"/> + </xs:sequence> + </xs:extension> + </xs:complexContent> + </xs:complexType> + </xs:element> + <xs:element name="DoubleProperty"> + <xs:complexType> + <xs:complexContent> + <xs:extension base="wlp-types:AbstractProperty"> + <xs:sequence> + <xs:element maxOccurs="unbounded" minOccurs="1" name="value" type="xs:double"/> + </xs:sequence> + </xs:extension> + </xs:complexContent> + </xs:complexType> + </xs:element> + <xs:element name="booleanProperty"> + <xs:complexType> + <xs:complexContent> + <xs:extension base="wlp-types:AbstractProperty"> + <xs:sequence> + <xs:element maxOccurs="unbounded" minOccurs="1" name="value" type="xs:boolean"/> + </xs:sequence> + </xs:extension> + </xs:complexContent> + </xs:complexType> + </xs:element> + <xs:element name="BooleanProperty"> + <xs:complexType> + <xs:complexContent> + <xs:extension base="wlp-types:AbstractProperty"> + <xs:sequence> + <xs:element maxOccurs="unbounded" minOccurs="1" name="value" type="xs:boolean"/> + </xs:sequence> + </xs:extension> + </xs:complexContent> + </xs:complexType> + </xs:element> + <xs:element name="dateTimeProperty"> + <xs:complexType> + <xs:complexContent> + <xs:extension base="wlp-types:AbstractProperty"> + <xs:sequence> + <xs:element maxOccurs="unbounded" minOccurs="1" name="value" type="xs:dateTime"/> + </xs:sequence> + </xs:extension> + </xs:complexContent> + </xs:complexType> + </xs:element> + <xs:element name="DateTimeProperty"> + <xs:complexType> + <xs:complexContent> + <xs:extension base="wlp-types:AbstractProperty"> + <xs:sequence> + <xs:element maxOccurs="unbounded" minOccurs="1" name="value" type="xs:dateTime"/> + </xs:sequence> + </xs:extension> + </xs:complexContent> + </xs:complexType> + </xs:element> + <xs:element name="emptyListProperty"> + <xs:complexType> + <xs:complexContent> + <xs:extension base="wlp-types:AbstractProperty"/> + </xs:complexContent> + </xs:complexType> + </xs:element> +  + <xs:element name="propertyWrapper"> + <xs:complexType> + <xs:sequence maxOccurs="unbounded" minOccurs="0"> + <xs:choice> + <xs:element ref="wlp-types:stringProperty"/> + <xs:element ref="wlp-types:longProperty"/> + <xs:element ref="wlp-types:LongProperty"/> + <xs:element ref="wlp-types:doubleProperty"/> + <xs:element ref="wlp-types:DoubleProperty"/> + <xs:element ref="wlp-types:booleanProperty"/> + <xs:element ref="wlp-types:BooleanProperty"/> + <xs:element ref="wlp-types:dateTimeProperty"/> + <xs:element ref="wlp-types:DateTimeProperty"/> + <xs:element ref="wlp-types:emptyListProperty"/> + </xs:choice> + </xs:sequence> + <xs:attribute name="name" type="xs:string" use="required"/> + </xs:complexType> + </xs:element> +  + <xs:element name="renderDependenciesDescription"> + <xs:complexType> + <xs:attribute default="false" name="hasRenderDependencies" type="xs:boolean"/> +  + <xs:attribute default="true" name="cacheRenderDependencies" type="xs:boolean"/> + </xs:complexType> + </xs:element> + <xs:complexType name="DependenciesContext"> + <xs:sequence> + <xs:element maxOccurs="unbounded" minOccurs="0" name="tags" type="wlp-types:RenderDependencyTag"/> + <xs:element maxOccurs="unbounded" minOccurs="0" name="scripts" type="wlp-types:ScriptFragment"/> + <xs:element maxOccurs="unbounded" minOccurs="0" name="clientAttributes" type="types:NamedString"/> + <xs:element default="false" minOccurs="0" name="requiresRewriting" type="xs:boolean"/> + <xs:element minOccurs="0" name="preferredTitle" type="xs:string"/> + <xs:element maxOccurs="unbounded" minOccurs="0" name="validNewModes" type="xs:string"/> + </xs:sequence> + </xs:complexType> + <xs:complexType name="RenderDependencyTag"> + <xs:sequence> + <xs:element name="text" nillable="true" type="xs:string"/> + <xs:element maxOccurs="unbounded" minOccurs="0" name="attribute"> + <xs:complexType> + <xs:attribute name="name" type="xs:string" use="required"/> + <xs:attribute name="value" type="xs:string" use="required"/> + </xs:complexType> + </xs:element> + </xs:sequence> + <xs:attribute name="name" type="xs:string" use="required"/> + </xs:complexType> + <xs:complexType name="ScriptFragment"> + <xs:sequence> +  + <xs:element minOccurs="1" name="eventHandler" type="xs:string"/> + <xs:element maxOccurs="unbounded" minOccurs="0" name="fragment" type="xs:string"/> + </xs:sequence> + </xs:complexType> +  + <xs:element name="getRenderDependencies"> + <xs:complexType> + <xs:sequence> + <xs:element name="registrationContext" nillable="true" type="types:RegistrationContext"/> + <xs:element name="portletContext" type="types:PortletContext"/> + <xs:element name="runtimeContext" type="types:RuntimeContext"/> + <xs:element name="userContext" nillable="true" type="types:UserContext"/> + <xs:element name="markupParams" type="types:MarkupParams"/> + </xs:sequence> + </xs:complexType> + </xs:element> +  + <xs:complexType name="RenderDependenciesResponse"> + <xs:sequence> + <xs:element maxOccurs="1" minOccurs="0" name="dependenciesContext" type="wlp-types:DependenciesContext"/> + <xs:element maxOccurs="1" minOccurs="0" name="sessionContext" type="types:SessionContext"/> + </xs:sequence> + </xs:complexType> + <xs:element name="RenderDependenciesResponse" type="wlp-types:RenderDependenciesResponse"/> +  + <xs:element name="getRegistrationPropertyValues"> + <xs:complexType/> + </xs:element> +  + <xs:complexType name="ResourceStatus"> + <xs:sequence> + <xs:element default="200" maxOccurs="1" minOccurs="0" name="resourceStatusCode" type="xs:integer"/> + <xs:element maxOccurs="1" minOccurs="0" name="resourceStatusMessage" type="xs:string"/> + <xs:element maxOccurs="1" minOccurs="0" name="resourceRedirectLocation" type="xs:string"/> + </xs:sequence> + </xs:complexType> + <xs:element name="ResourceStatus" type="wlp-types:ResourceStatus"/> +</xs:schema>

14 years, 1 month

1
0
0 / 0

gatein SVN: r5291 - epp/portal/branches/EPP_5_1_Branch/webui/portal/src/main/java/org/exoplatform/portal/application/localization.

by do-not-reply＠jboss.org

Author: thomas.heute(a)jboss.com Date: 2010-11-26 06:16:01 -0500 (Fri, 26 Nov 2010) New Revision: 5291 Modified: epp/portal/branches/EPP_5_1_Branch/webui/portal/src/main/java/org/exoplatform/portal/application/localization/LocalizationFilter.java Log: JBEPP-691: Add the ability to configure the LocalizationFilters' portalLocale Modified: epp/portal/branches/EPP_5_1_Branch/webui/portal/src/main/java/org/exoplatform/portal/application/localization/LocalizationFilter.java =================================================================== --- epp/portal/branches/EPP_5_1_Branch/webui/portal/src/main/java/org/exoplatform/portal/application/localization/LocalizationFilter.java 2010-11-26 11:12:13 UTC (rev 5290) +++ epp/portal/branches/EPP_5_1_Branch/webui/portal/src/main/java/org/exoplatform/portal/application/localization/LocalizationFilter.java 2010-11-26 11:16:01 UTC (rev 5291) @@ -56,15 +56,27 @@ * override for extra-portlet requests (i.e. unbridged .jsp). Thanks to it dynamic resources can be localized * to keep in sync with the rest of the portal. This filter is re-entrant, and can safely be installed for * INCLUDE, FORWARD, and ERROR dispatch methods. - * + * * A concrete example of re-entrant use is login/jsp/login.jsp used when authentication fails at portal login. - * + * * By default {@link HttpServletRequest#getLocale()} and {@link HttpServletRequest#getLocales()} reflect * browser language preference. When using this filter these two calls employ the same Locale determination algorithm - * as LocalizationLifecycle does. - * + * as {@link LocalizationLifecycle} does. + * * This filter can be activated / deactivated via portal module's web.xml - * + * + * If default portal language is other than English, it can be configured for the filter by using PortalLocale init param: + * + * <pre><filter> + * <filter-name>LocalizationFilter</filter-name> + * <filter-class>org.exoplatform.portal.application.localization.LocalizationFilter</filter-class> + * <init-param> + * <param-name>PortalLocale</param-name> + * <param-value>fr_FR</param-value> + * </init-param> + * </filter> + * </pre> + * * @author <a href="mailto:mstrukel@redhat.com">Marko Strukelj</a> */ public class LocalizationFilter implements Filter @@ -73,8 +85,14 @@ private static ThreadLocal<Locale> currentLocale = new ThreadLocal<Locale>(); + private Locale portalLocale = Locale.ENGLISH; + public void init(FilterConfig filterConfig) throws ServletException { + String locale = filterConfig.getInitParameter("PortalLocale"); + locale = locale != null ? locale.trim() : null; + if (locale != null && locale.length() > 0) + portalLocale = LocaleContextInfo.getLocale(locale); } public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain) throws IOException, ServletException @@ -141,7 +159,7 @@ localeCtx.setUserProfileLocale(getUserProfileLocale(container, req.getRemoteUser())); localeCtx.setRemoteUser(req.getRemoteUser()); - localeCtx.setPortalLocale(Locale.ENGLISH); + localeCtx.setPortalLocale(checkPortalLocaleSupported(portalLocale, supportedLocales)); Locale locale = localePolicy.determineLocale(localeCtx); boolean supported = supportedLocales.contains(locale); @@ -170,6 +188,27 @@ } } + private Locale checkPortalLocaleSupported(Locale portalLocale, Set<Locale> supportedLocales) + { + if (supportedLocales.contains(portalLocale)) + return portalLocale; + if ("".equals(portalLocale.getCountry()) == false) + { + Locale loc = new Locale(portalLocale.getLanguage()); + if (supportedLocales.contains(loc)) + { + log.warn("portalLocale not supported: " + LocaleContextInfo.getLocaleAsString(portalLocale) + + ". Falling back to '" + portalLocale.getLanguage()+ "'."); + this.portalLocale = loc; + return loc; + } + } + + log.warn("portalLocale not supported: " + LocaleContextInfo.getLocaleAsString(portalLocale) + ". Falling back to Locale.ENGLISH."); + this.portalLocale = Locale.ENGLISH; + return portalLocale; + } + private Locale getUserProfileLocale(ExoContainer container, String user) { UserProfile userProfile = null;

14 years, 1 month

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

gatein-commits November 2010