JBoss Portal SVN: r7468 - trunk/server/src/main/org/jboss/portal/server.
by portal-commits＠lists.jboss.org
Author: julien(a)jboss.com
Date: 2007-06-19 08:47:31 -0400 (Tue, 19 Jun 2007)
New Revision: 7468
Modified:
trunk/server/src/main/org/jboss/portal/server/PortalConstants.java
Log:
CR3 version
Modified: trunk/server/src/main/org/jboss/portal/server/PortalConstants.java
===================================================================
--- trunk/server/src/main/org/jboss/portal/server/PortalConstants.java 2007-06-19 12:45:44 UTC (rev 7467)
+++ trunk/server/src/main/org/jboss/portal/server/PortalConstants.java 2007-06-19 12:47:31 UTC (rev 7468)
@@ -36,7 +36,7 @@
{
/** Current version. */
- public static final Version VERSION = new Version("JBoss Portal", 2, 6, 0, new Version.Qualifier(Version.Qualifier.Prefix.GA), "Ninja");
+ public static final Version VERSION = new Version("JBoss Portal", 2, 6, 0, new Version.Qualifier(Version.Qualifier.Prefix.CR, Version.Qualifier.Suffix.SUFFIX_3), "Ninja");
/** The default portal name. */
public static final String DEFAULT_PORTAL_NAME = "default";
18 years, 10 months
JBoss Portal SVN: r7467 - tags.
by portal-commits＠lists.jboss.org
Author: julien(a)jboss.com
Date: 2007-06-19 08:45:44 -0400 (Tue, 19 Jun 2007)
New Revision: 7467
Removed:
tags/JBoss_Portal_2_6_0_CR3/
Log:
portal CR3
18 years, 10 months
JBoss Portal SVN: r7466 - tags.
by portal-commits＠lists.jboss.org
Author: julien(a)jboss.com
Date: 2007-06-19 08:45:29 -0400 (Tue, 19 Jun 2007)
New Revision: 7466
Added:
tags/JBoss_Portal_2_6_0_CR3/
Log:
portal CR3
Copied: tags/JBoss_Portal_2_6_0_CR3 (from rev 7465, trunk)
18 years, 10 months
JBoss Portal SVN: r7465 - trunk/core.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2007-06-19 05:40:30 -0400 (Tue, 19 Jun 2007)
New Revision: 7465
Modified:
trunk/core/build.xml
Log:
Add jboss-backport-concurrent into the distribution
Modified: trunk/core/build.xml
===================================================================
--- trunk/core/build.xml 2007-06-19 09:38:39 UTC (rev 7464)
+++ trunk/core/build.xml 2007-06-19 09:40:30 UTC (rev 7465)
@@ -342,6 +342,7 @@
<fileset dir="${jakarta.io.lib}" includes="commons-io.jar"/>
<fileset dir="${freemarker.freemarker.lib}" includes="freemarker.jar"/>
<fileset dir="${portals.bridges.lib}" includes="portals-bridges-common.jar"/>
+ <fileset dir="${jboss/backport.concurrent.lib}" includes="jboss-backport-concurrent.jar"/>
</copy>
<!--dtd-->
18 years, 10 months
JBoss Portal SVN: r7464 - docs/trunk/referenceGuide/en/modules.
by portal-commits＠lists.jboss.org
Author: julien(a)jboss.com
Date: 2007-06-19 05:38:39 -0400 (Tue, 19 Jun 2007)
New Revision: 7464
Modified:
docs/trunk/referenceGuide/en/modules/ajax.xml
docs/trunk/referenceGuide/en/modules/urls.xml
Log:
added limitation section
Modified: docs/trunk/referenceGuide/en/modules/ajax.xml
===================================================================
--- docs/trunk/referenceGuide/en/modules/ajax.xml 2007-06-19 04:27:10 UTC (rev 7463)
+++ docs/trunk/referenceGuide/en/modules/ajax.xml 2007-06-19 09:38:39 UTC (rev 7464)
@@ -143,8 +143,8 @@
</para>
</sect2>
<sect2>
- <title>Partial refreshing</title>
- <para>Partial refreshing is a very powerful feature which allows the portal to optimize the refreshing
+ <title>Partial refresh</title>
+ <para>Partial refresh is a very powerful feature which allows the portal to optimize the refreshing
of portlets on a page. When one portlet is invoked, instead of redrawing the full page, the portal is able
to detect which portlets needs to be refreshed and will update only these portlets.</para>
<mediaobject>
@@ -155,14 +155,6 @@
<para>The portal providing partial refresh</para>
</caption>
</mediaobject>
- <warning>
- <title>Application scope session attributes</title>
- <para>When partial refresh is activated, the state of a page can potentially become inconsistent. for
- example, if some objects are shared in the application scope of the session between portlets. When one
- portlet update a session object, the other portlet won't be refreshed and will still display content based
- on the previous value of the object in the session. To avoid that, partial refresh can be desactivated
- for certain portlets by adding <portlet-refresh>false<portlet-refresh> in the jboss-portlet.xml file.</para>
- </warning>
<sect3>
<title>Portal objects configuration</title>
<para>Like with the drag and drop feature, partial page refresh is controlled via properties on portal objects.
@@ -247,6 +239,35 @@
the portlet will not be subject of a partial page refresh when it is invoked. However the portlet
markup can still be subject to a partial rendering.</para>
</sect3>
+ <sect3>
+ <title>Limitations</title>
+ <para>Partial refreshing of portlets has limitations both on the server side (portal) and on the client side (browser).</para>
+ <sect4>
+ <title>Application scoped session attributes</title>
+ <para>When partial refresh is activated, the state of a page can potentially become inconsistent. for
+ example, if some objects are shared in the application scope of the session between portlets. When one
+ portlet update a session object, the other portlet won't be refreshed and will still display content based
+ on the previous value of the object in the session. To avoid that, partial refresh can be desactivated
+ for certain portlets by adding <portlet-refresh>false<portlet-refresh> in the jboss-portlet.xml file.</para>
+ </sect4>
+ <sect4>
+ <title>Non ajax interactions</title>
+ <para>The solution developped by JBoss Portal on the client side is built on top of DOM events emitted
+ by the web browser when the user interracts with the page. If an interaction is done without an
+ emission of an event then JBoss Portal will not be able to transform it into a partial refresh and
+ it will result instead of a full refresh. This can happen with programmatic submission of forms.
+ </para>
+ <programlisting><![CDATA[
+<form id="<%= formId %>" action="<%= renderResponse.createActionURL() %>" method="post">
+ ...
+ <select onclick="document.getElementById('<%= formId %>').submit()">
+ ...
+ </select>
+ ...
+</form>
+]]></programlisting>
+ </sect4>
+ </sect3>
</sect2>
</sect1>
</chapter>
\ No newline at end of file
Modified: docs/trunk/referenceGuide/en/modules/urls.xml
===================================================================
--- docs/trunk/referenceGuide/en/modules/urls.xml 2007-06-19 04:27:10 UTC (rev 7463)
+++ docs/trunk/referenceGuide/en/modules/urls.xml 2007-06-19 09:38:39 UTC (rev 7464)
@@ -65,4 +65,19 @@
will be rendered independant of the portal. </listitem>
</itemizedlist>
</sect1>
+ <sect1>
+ <title>Advanced portal URLs</title>
+ <para>JBoss Portal can consume and produce URLs in a very flexible manner. Consuming means
+ that an URL is accepted by the portal, translated into some action and send a response to the
+ browser. Producing means to create an URL when the portal needs one. This part is an advanced
+ topic explaining the internal mechanisms developped in JBoss Portal to produce and consumer URLs.
+ It should be readen with care as it exposes internals of JBoss Portal that may change in later releases
+ of the product.</para>
+ <para>JBoss Portal is based on the Command Design Pattern which allow to encapsulate actions into
+ a class.</para>
+ <sect2>
+ <title>URL consumption</title>
+ <para></para>
+ </sect2>
+ </sect1>
</chapter>
18 years, 10 months
JBoss Portal SVN: r7463 - trunk/build/ide/intellij/idea60/modules/workflow.
by portal-commits＠lists.jboss.org
Author: chris.laprun(a)jboss.com
Date: 2007-06-19 00:27:10 -0400 (Tue, 19 Jun 2007)
New Revision: 7463
Modified:
trunk/build/ide/intellij/idea60/modules/workflow/workflow.iml
Log:
- Updated jBPM lib reference.
Modified: trunk/build/ide/intellij/idea60/modules/workflow/workflow.iml
===================================================================
--- trunk/build/ide/intellij/idea60/modules/workflow/workflow.iml 2007-06-19 04:21:41 UTC (rev 7462)
+++ trunk/build/ide/intellij/idea60/modules/workflow/workflow.iml 2007-06-19 04:27:10 UTC (rev 7463)
@@ -10,15 +10,6 @@
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="module" module-name="common" />
- <orderEntry type="module-library" exported="">
- <library>
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../thirdparty/jbpm/lib/jbpm-3.1.2.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
<orderEntry type="module" module-name="jems" />
<orderEntry type="module-library">
<library>
@@ -66,6 +57,15 @@
<SOURCES />
</library>
</orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/../../../../../../thirdparty/jbpm/jaronly/lib/jbpm.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
<orderEntryProperties />
</component>
<component name="VcsManagerConfiguration">
18 years, 10 months
JBoss Portal SVN: r7462 - in trunk/wsrp/src/main/org/jboss/portal: wsrp/consumer and 1 other directory.
by portal-commits＠lists.jboss.org
Author: chris.laprun(a)jboss.com
Date: 2007-06-19 00:21:41 -0400 (Tue, 19 Jun 2007)
New Revision: 7462
Modified:
trunk/wsrp/src/main/org/jboss/portal/test/wsrp/consumer/ProducerInfoTestCase.java
trunk/wsrp/src/main/org/jboss/portal/wsrp/consumer/ProducerInfo.java
trunk/wsrp/src/main/org/jboss/portal/wsrp/consumer/RegistrationInfo.java
Log:
- ProducerInfo.isRegistered now properly handles the case where registration properties have changed since registration.
- deregister and modifyRegistration throw IllegalStateException when called when the Consumer is not registered.
- RegistrationInfo now properly regenerates RegistrationData when needed and properly marks registration properties as valid after modifyRegistration or register.
- RegistrationInfo.resetRegistration doesn't reset as much information, just the information pertaining to the actual registration, not the producer metadata.
- Added tests for deregister and modifyRegistration.
Modified: trunk/wsrp/src/main/org/jboss/portal/test/wsrp/consumer/ProducerInfoTestCase.java
===================================================================
--- trunk/wsrp/src/main/org/jboss/portal/test/wsrp/consumer/ProducerInfoTestCase.java 2007-06-19 04:13:19 UTC (rev 7461)
+++ trunk/wsrp/src/main/org/jboss/portal/test/wsrp/consumer/ProducerInfoTestCase.java 2007-06-19 04:21:41 UTC (rev 7462)
@@ -37,6 +37,7 @@
import org.jboss.portal.wsrp.consumer.EndpointConfigurationInfo;
import org.jboss.portal.wsrp.consumer.ProducerInfo;
import org.jboss.portal.wsrp.consumer.RegistrationInfo;
+import org.jboss.portal.wsrp.consumer.RegistrationProperty;
import org.jboss.portal.wsrp.core.AccessDeniedFault;
import org.jboss.portal.wsrp.core.GetPortletDescription;
import org.jboss.portal.wsrp.core.InconsistentParametersFault;
@@ -44,11 +45,13 @@
import org.jboss.portal.wsrp.core.InvalidRegistrationFault;
import org.jboss.portal.wsrp.core.InvalidUserCategoryFault;
import org.jboss.portal.wsrp.core.MissingParametersFault;
+import org.jboss.portal.wsrp.core.ModifyRegistration;
import org.jboss.portal.wsrp.core.OperationFailedFault;
import org.jboss.portal.wsrp.core.PortletDescriptionResponse;
import org.jboss.portal.wsrp.core.Property;
import org.jboss.portal.wsrp.core.RegistrationContext;
import org.jboss.portal.wsrp.core.RegistrationData;
+import org.jboss.portal.wsrp.core.RegistrationState;
import java.rmi.RemoteException;
@@ -190,7 +193,7 @@
}
RegistrationInfo regInfo = info.getRegistrationInfo();
- regInfo.setRegistrationPropertyValue("prop0", "value");
+ regInfo.setRegistrationPropertyValue(TestRegistrationBehavior.PROP_NAME, TestRegistrationBehavior.ORIGINAL_VALUE);
info.register();
RegistrationContext registrationContext = info.getRegistrationContext();
@@ -201,6 +204,82 @@
assertTrue(info.isRegistrationRequired());
}
+ public void testDeregister() throws Exception
+ {
+ try
+ {
+ info.deregister();
+ fail("Shouldn't be able to deregister without being registered");
+ }
+ catch (IllegalStateException expected)
+ {
+ }
+
+ // setup registration
+ register();
+
+ info.deregister();
+ assertNull(info.getRegistrationContext());
+ assertFalse(info.isRegistered());
+ assertTrue(info.isRegistrationRequired());
+ assertTrue(info.isRegistrationChecked());
+ }
+
+ private void register() throws PortletInvokerException
+ {
+ ServiceDescriptionBehavior sd = new ServiceDescriptionBehavior();
+ sd.setServiceDescription(true, 1);
+ serviceFactory.getRegistry().setServiceDescriptionBehavior(sd);
+ RegistrationBehavior regBehavior = new TestRegistrationBehavior();
+ serviceFactory.getRegistry().setRegistrationBehavior(regBehavior);
+ info.refresh(false);
+ RegistrationInfo regInfo = info.getRegistrationInfo();
+ regInfo.setRegistrationPropertyValue(TestRegistrationBehavior.PROP_NAME, TestRegistrationBehavior.ORIGINAL_VALUE);
+
+ info.register();
+ }
+
+ public void testModifyRegistration() throws Exception
+ {
+ try
+ {
+ info.modifyRegistration();
+ fail("Shouldn't be able to modify registration without being registered");
+ }
+ catch (IllegalStateException expected)
+ {
+ }
+
+ register();
+
+ RegistrationInfo regInfo = info.getRegistrationInfo();
+ regInfo.setRegistrationPropertyValue(TestRegistrationBehavior.PROP_NAME, "invalid");
+ assertTrue(info.isRefreshNeeded(false));
+ assertTrue(info.isRegistered());
+ RegistrationProperty prop = regInfo.getRegistrationProperty(TestRegistrationBehavior.PROP_NAME);
+ assertNull(prop.isInvalid());
+
+ try
+ {
+ info.modifyRegistration();
+ fail("invalid value for property should fail to modify registration");
+ }
+ catch (PortletInvokerException expected)
+ {
+ }
+
+ regInfo.setRegistrationPropertyValue(TestRegistrationBehavior.PROP_NAME, TestRegistrationBehavior.MODIFIED_VALUE);
+ assertTrue(info.isRefreshNeeded(false));
+ assertNull(prop.isInvalid());
+
+ info.modifyRegistration();
+
+ assertFalse(info.isRefreshNeeded(false));
+ Boolean invalid = prop.isInvalid();
+ assertNotNull(invalid);
+ assertFalse(invalid.booleanValue());
+ }
+
private static class TestPortletManagementBehavior extends PortletManagementBehavior
{
public PortletDescriptionResponse getPortletDescription(GetPortletDescription getPortletDescription)
@@ -214,8 +293,27 @@
private static class TestRegistrationBehavior extends RegistrationBehavior
{
+ private static final String PROP_NAME = "prop0";
+ private static final String MODIFIED_VALUE = "value2";
+ private static final String ORIGINAL_VALUE = "value";
+
public RegistrationContext register(RegistrationData register) throws MissingParametersFault, OperationFailedFault, RemoteException
{
+ Property prop = checkRegistrationData(register);
+
+ String value = prop.getStringValue();
+ if (ORIGINAL_VALUE.equals(value) && PROP_NAME.equals(prop.getName()))
+ {
+ return super.register(register);
+ }
+
+ throw WSRPExceptionFactory.throwSOAPFaultException(WSRPExceptionFactory.OPERATION_FAILED,
+ value + " is not a valid value for " + PROP_NAME, null);
+ }
+
+ private Property checkRegistrationData(RegistrationData register)
+ throws OperationFailedFault
+ {
WSRPExceptionFactory.throwOperationFailedFaultIfValueIsMissing(register, "RegistrationData");
Property[] props = register.getRegistrationProperties();
@@ -223,15 +321,32 @@
Property prop = props[0];
WSRPExceptionFactory.throwOperationFailedFaultIfValueIsMissing(prop, "Registration property");
+ return prop;
+ }
+ public RegistrationState modifyRegistration(ModifyRegistration modifyRegistration) throws MissingParametersFault,
+ OperationFailedFault, InvalidRegistrationFault, RemoteException
+ {
+ WSRPExceptionFactory.throwOperationFailedFaultIfValueIsMissing(modifyRegistration, "ModifyRegistration");
+
+ RegistrationContext context = modifyRegistration.getRegistrationContext();
+ WSRPExceptionFactory.throwMissingParametersFaultIfValueIsMissing(context, "RegistrationContext", "ModifyRegistration");
+
+ if (!RegistrationBehavior.REGISTRATION_HANDLE.equals(context.getRegistrationHandle()))
+ {
+ WSRPExceptionFactory.throwSOAPFaultException(WSRPExceptionFactory.INVALID_REGISTRATION, "Invalid registration", null);
+ }
+
+ Property prop = checkRegistrationData(modifyRegistration.getRegistrationData());
+
String value = prop.getStringValue();
- if ("value".equals(value) && "prop0".equals(prop.getName()))
+ if (MODIFIED_VALUE.equals(value) && PROP_NAME.equals(prop.getName()))
{
- return super.register(register);
+ return null;
}
- throw WSRPExceptionFactory.throwSOAPFaultException(WSRPExceptionFactory.OPERATION_FAILED,
- value + " is not a valid value for 'prop0'", null);
+ throw WSRPExceptionFactory.throwSOAPFaultException(WSRPExceptionFactory.OPERATION_FAILED, value
+ + " is not a valid value for " + PROP_NAME, null);
}
}
}
Modified: trunk/wsrp/src/main/org/jboss/portal/wsrp/consumer/ProducerInfo.java
===================================================================
--- trunk/wsrp/src/main/org/jboss/portal/wsrp/consumer/ProducerInfo.java 2007-06-19 04:13:19 UTC (rev 7461)
+++ trunk/wsrp/src/main/org/jboss/portal/wsrp/consumer/ProducerInfo.java 2007-06-19 04:21:41 UTC (rev 7462)
@@ -166,7 +166,14 @@
if (persistentRegistrationInfo != null)
{
Boolean valid = persistentRegistrationInfo.isRegistrationValid();
- return valid != null && valid.booleanValue();
+ if (valid == null)
+ {
+ return persistentRegistrationInfo.getRegistrationHandle() != null;
+ }
+ else
+ {
+ return valid.booleanValue();
+ }
}
return false;
@@ -743,6 +750,10 @@
registry.updateProducerInfo(this);
}
}
+ else
+ {
+ throw new IllegalStateException("Cannot deregister producer '" + persistentId + "' as it's not registered");
+ }
}
@@ -777,6 +788,11 @@
registry.updateProducerInfo(this);
}
}
+ else
+ {
+ throw new IllegalStateException("Cannot modify registration for producer '" + persistentId
+ + "' as it's not registered");
+ }
}
public RefreshResult refreshRegistrationInfo(boolean mergeWithLocalInfo) throws PortletInvokerException
Modified: trunk/wsrp/src/main/org/jboss/portal/wsrp/consumer/RegistrationInfo.java
===================================================================
--- trunk/wsrp/src/main/org/jboss/portal/wsrp/consumer/RegistrationInfo.java 2007-06-19 04:13:19 UTC (rev 7461)
+++ trunk/wsrp/src/main/org/jboss/portal/wsrp/consumer/RegistrationInfo.java 2007-06-19 04:21:41 UTC (rev 7462)
@@ -196,7 +196,7 @@
public RegistrationData getRegistrationData()
{
- if (registrationData == null)
+ if (dirty || registrationData == null)
{
registrationData = WSRPTypeFactory.createDefaultRegistrationData();
registrationData.setConsumerName(persistentConsumerName);
@@ -516,11 +516,8 @@
void resetRegistration()
{
- registrationData = null;
persistentRegistrationHandle = null;
persistentRegistrationState = null;
- requiresRegistration = null;
- consistentWithProducerExpectations = null;
}
public void setRegistrationContext(RegistrationContext registrationContext)
@@ -538,6 +535,16 @@
consistentWithProducerExpectations = Boolean.TRUE; // since we have a registration context, we're consistent with the Producer
requiresRegistration = Boolean.TRUE; // we know we require registration
dirty = false; // our state is clean :)
+
+ // mark the registration properties as valid
+ if (persistentRegistrationProperties != null)
+ {
+ for (Iterator props = persistentRegistrationProperties.values().iterator(); props.hasNext();)
+ {
+ RegistrationProperty prop = (RegistrationProperty)props.next();
+ prop.setInvalid(Boolean.FALSE, null);
+ }
+ }
}
public RegistrationContext getRegistrationContext()
18 years, 10 months
JBoss Portal SVN: r7461 - trunk/wsrp/src/main/org/jboss/portal/wsrp.
by portal-commits＠lists.jboss.org
Author: chris.laprun(a)jboss.com
Date: 2007-06-19 00:13:19 -0400 (Tue, 19 Jun 2007)
New Revision: 7461
Modified:
trunk/wsrp/src/main/org/jboss/portal/wsrp/WSRPExceptionFactory.java
Log:
- Make createSOAPFaultException work even without an HTTP context.
Modified: trunk/wsrp/src/main/org/jboss/portal/wsrp/WSRPExceptionFactory.java
===================================================================
--- trunk/wsrp/src/main/org/jboss/portal/wsrp/WSRPExceptionFactory.java 2007-06-19 00:47:17 UTC (rev 7460)
+++ trunk/wsrp/src/main/org/jboss/portal/wsrp/WSRPExceptionFactory.java 2007-06-19 04:13:19 UTC (rev 7461)
@@ -131,8 +131,12 @@
}
}
+ String actor = null;
HttpServletRequest req = ServletAccess.getRequest();
- String actor = req.getScheme() + "://" + req.getServerName() + ":" + req.getServerPort() + "/" + req.getServletPath();
+ if (req != null)
+ {
+ actor = req.getScheme() + "://" + req.getServerName() + ":" + req.getServerPort() + "/" + req.getServletPath();
+ }
return new SOAPFaultException(new QName(NS, errorCode), message, actor, detail);
18 years, 10 months
JBoss Portal SVN: r7460 - trunk/wsrp/src/main/org/jboss/portal/wsrp/consumer.
by portal-commits＠lists.jboss.org
Author: chris.laprun(a)jboss.com
Date: 2007-06-18 20:47:17 -0400 (Mon, 18 Jun 2007)
New Revision: 7460
Modified:
trunk/wsrp/src/main/org/jboss/portal/wsrp/consumer/ProducerInfo.java
Log:
- Endpoint info is now refreshed if needed before calling methods that don't refresh the whole ProducerInfo.
- Simplified check protecting modifyRegistration.
Modified: trunk/wsrp/src/main/org/jboss/portal/wsrp/consumer/ProducerInfo.java
===================================================================
--- trunk/wsrp/src/main/org/jboss/portal/wsrp/consumer/ProducerInfo.java 2007-06-19 00:45:12 UTC (rev 7459)
+++ trunk/wsrp/src/main/org/jboss/portal/wsrp/consumer/ProducerInfo.java 2007-06-19 00:47:17 UTC (rev 7460)
@@ -667,6 +667,7 @@
if (!isRegistered())
{
+ persistentEndpointInfo.refresh();
if (serviceDescription == null)
{
@@ -725,6 +726,8 @@
{
if (isRegistered())
{
+ persistentEndpointInfo.refresh();
+
try
{
persistentEndpointInfo.getRegistrationService().deregister(getRegistrationContext());
@@ -745,10 +748,10 @@
public void modifyRegistration() throws PortletInvokerException
{
- Boolean consistentWithExpectations = persistentRegistrationInfo.isConsistentWithProducerExpectations();
- if (persistentRegistrationInfo != null && persistentRegistrationInfo.getRegistrationHandle() != null
- && consistentWithExpectations != null && !consistentWithExpectations.booleanValue())
+ if (isRegistered())
{
+ persistentEndpointInfo.refresh();
+
try
{
RegistrationContext registrationContext = getRegistrationContext();
18 years, 10 months
JBoss Portal SVN: r7459 - trunk/wsrp/src/main/org/jboss/portal/wsrp/consumer.
by portal-commits＠lists.jboss.org
Author: chris.laprun(a)jboss.com
Date: 2007-06-18 20:45:12 -0400 (Mon, 18 Jun 2007)
New Revision: 7459
Modified:
trunk/wsrp/src/main/org/jboss/portal/wsrp/consumer/EndpointConfigurationInfo.java
Log:
- Services are refreshed after the ServiceFactory is created.
Modified: trunk/wsrp/src/main/org/jboss/portal/wsrp/consumer/EndpointConfigurationInfo.java
===================================================================
--- trunk/wsrp/src/main/org/jboss/portal/wsrp/consumer/EndpointConfigurationInfo.java 2007-06-19 00:44:22 UTC (rev 7458)
+++ trunk/wsrp/src/main/org/jboss/portal/wsrp/consumer/EndpointConfigurationInfo.java 2007-06-19 00:45:12 UTC (rev 7459)
@@ -253,6 +253,7 @@
try
{
serviceFactory.start();
+ refreshServices();
}
catch (Exception e)
{
@@ -399,19 +400,24 @@
if (isRefreshNeeded())
{
initServiceFactoryIfNeeded();
- if (!usesWSDL())
+ refreshServices();
+ }
+ }
+
+ private void refreshServices() throws InvokerUnavailableException
+ {
+ if (areURLsDirty())
+ {
+ getServiceDescriptionService();
+ getMarkupService();
+ if (persistentPortletManagementURL != null)
{
- getServiceDescriptionService();
- getMarkupService();
- if (persistentPortletManagementURL != null)
- {
- getPortletManagementService();
- }
- if (persistentRegistrationURL != null)
- {
- getRegistrationService();
- }
+ getPortletManagementService();
}
+ if (persistentRegistrationURL != null)
+ {
+ getRegistrationService();
+ }
}
}
}
18 years, 10 months