JBoss Portal SVN: r6515 - docs/trunk/referenceGuide/en/modules.
by portal-commits＠lists.jboss.org
Author: bdaw
Date: 2007-03-03 18:14:55 -0500 (Sat, 03 Mar 2007)
New Revision: 6515
Modified:
docs/trunk/referenceGuide/en/modules/identity.xml
docs/trunk/referenceGuide/en/modules/ldap.xml
Log:
update
Modified: docs/trunk/referenceGuide/en/modules/identity.xml
===================================================================
--- docs/trunk/referenceGuide/en/modules/identity.xml 2007-03-03 22:33:19 UTC (rev 6514)
+++ docs/trunk/referenceGuide/en/modules/identity.xml 2007-03-03 23:14:55 UTC (rev 6515)
@@ -815,7 +815,7 @@
</sect2>
<sect2>
<title>Delegating UserProfile module</title>
- <para>Delegating UserProfile module implementation has very specific role. When we use storage mechanism like LDAP we may not be able to map all
+ <para>Delegating UserProfileModule implementation has very specific role. When we use storage mechanism like LDAP we may not be able to map all
user properties into LDAP attributes because of schema limitations. To solve this problem we use database to store such not mapped properties.
Delegating user profile module will recognize if property is mapped as <emphasis role="bold">ldap</emphasis> or <emphasis role="bold">database</emphasis>
end delegate <emphasis>setProperty()/getProperty()</emphasis> method invocation to proper module implementation. This is implemented in
@@ -868,7 +868,7 @@
</sect2>
<sect2>
<title>Database UserProfile module implementation</title>
- <para>Because of behaviour described in previous section database UserProfile module needs some special capabilities. If user is present in
+ <para>Because of behaviour described in previous section database UserProfileModule needs some special capabilities. If user is present in
LDAP server but property we want to store isn't mapped as LDAP attribute such property need to be stored in database. But to store
the property user need to be synchronized from ldap into database first</para>
<para>Class <emphasis>org.jboss.portal.identity.db.HibernateUserProfileModuleImpl</emphasis> has additional synchronization features.
@@ -876,25 +876,26 @@
<itemizedlist>
<listitem>
<emphasis role="bold">synchronizeNonExistingUsers</emphasis> - when set to "true" if user on which we want to perform operation doesn't exist it will
- create it in database
+ create it in database. Default is "true".
</listitem>
<listitem>
<emphasis role="bold">acceptOtherImplementations</emphasis> - if set to "true" module will accept user objects other than
<emphasis>org.jboss.portal.identity.db.HibernateUserImpl</emphasis>. This is needed to enable cooperation with UserModule implementations other
- than <emphasis>org.jboss.portal.identity.db.HibernateUserModuleImpl</emphasis>
+ than <emphasis>org.jboss.portal.identity.db.HibernateUserModuleImpl</emphasis>. Default is "true".
</listitem>
<listitem>
- <emphasis role="bold">defaultSynchronizePassword</emphasis> - if this option is set the value will be used as password for synchronized user.
+ <emphasis role="bold">defaultSynchronizePassword</emphasis> - if this option is set, the value will be used as a password for synchronized user.
</listitem>
<listitem>
<emphasis role="bold">randomSynchronizePassword</emphasis> - if this option is set to "true" synchronized user will have random generated password.
- This is mostly for the security reasons.
+ This is mostly used for the security reasons. Default is "false".
</listitem>
<listitem>
<emphasis role="bold">sessionFactoryJNDIName</emphasis> - JNDI name under which this user will be registered.
</listitem>
<listitem>
- <emphasis role="bold">profileConfigFile</emphasis> - file with user profile configuration
+ <emphasis role="bold">profileConfigFile</emphasis> - file with user profile configuration. If this option is not set, and we use delegating UserProfileModule,
+ profile configuration will be obtained from it.
</listitem>
</itemizedlist>
</para>
Modified: docs/trunk/referenceGuide/en/modules/ldap.xml
===================================================================
--- docs/trunk/referenceGuide/en/modules/ldap.xml 2007-03-03 22:33:19 UTC (rev 6514)
+++ docs/trunk/referenceGuide/en/modules/ldap.xml 2007-03-03 23:14:55 UTC (rev 6515)
@@ -152,10 +152,122 @@
<sect1 id="ldap.ldap_identity_modules">
<title>LDAP Identity Modules</title>
<para>TODO:</para>
+ <sect2>
+ <title>UserModule</title>
+ <sect3>
+ <title>LDAPUserModuleImpl</title>
+ <para>TODO:</para>
+ <para>org.jboss.portal.identity.ldap.LDAPUserModuleImpl options:
+ <itemizedlist>
+ <listitem>
+ <emphasis role="bold"></emphasis> -
+ </listitem>
+ <listitem>
+ <emphasis role="bold"></emphasis> -
+ </listitem>
+ </itemizedlist>
+ </para>
+ </sect3>
+ <sect3>
+ <title>LDAPExtUserModuleImpl</title>
+ <para>TODO:</para>
+ <para>org.jboss.portal.identity.ldap.LDAPExtUserModuleImpl options:
+ <itemizedlist>
+ <listitem>
+ <emphasis role="bold"></emphasis> -
+ </listitem>
+ <listitem>
+ <emphasis role="bold"></emphasis> -
+ </listitem>
+ </itemizedlist>
+ </para>
+ </sect3>
+ </sect2>
+ <sect2>
+ <title>RoleModule</title>
+ <sect3>
+ <title>LDAPRoleModuleImpl</title>
+ <para>TODO:</para>
+ <para>org.jboss.portal.identity.ldap.LDAPRoleModuleImpl options:
+ <itemizedlist>
+ <listitem>
+ <emphasis role="bold"></emphasis> -
+ </listitem>
+ <listitem>
+ <emphasis role="bold"></emphasis> -
+ </listitem>
+ </itemizedlist>
+ </para>
+ </sect3>
+ <sect3>
+ <title>LDAPExtRoleModuleImpl</title>
+ <para>TODO:</para>
+ <para>org.jboss.portal.identity.ldap.LDAPExtRoleModuleImpl options:
+ <itemizedlist>
+ <listitem>
+ <emphasis role="bold"></emphasis> -
+ </listitem>
+ <listitem>
+ <emphasis role="bold"></emphasis> -
+ </listitem>
+ </itemizedlist>
+ </para>
+ </sect3>
+ </sect2>
+ <sect2>
+ <title>MembershipModule</title>
+ <sect3>
+ <title>LDAPStaticRoleMembershipModuleImpl</title>
+ <para>TODO:</para>
+ <para>org.jboss.portal.identity.ldap.LDAPStaticRoleMembershipModuleImpl options:
+ <itemizedlist>
+ <listitem>
+ <emphasis role="bold"></emphasis> -
+ </listitem>
+ <listitem>
+ <emphasis role="bold"></emphasis> -
+ </listitem>
+ </itemizedlist>
+ </para>
+ </sect3>
+ <sect3>
+ <title>LDAPStaticGroupMembershipModuleImpl</title>
+ <para>TODO:</para>
+ <para>org.jboss.portal.identity.ldap.LDAPStaticGroupMembershipModuleImpl options:
+ <itemizedlist>
+ <listitem>
+ <emphasis role="bold"></emphasis> -
+ </listitem>
+ <listitem>
+ <emphasis role="bold"></emphasis> -
+ </listitem>
+ </itemizedlist>
+ </para>
+ </sect3>
+ </sect2>
+ <sect2>
+ <title>UserProfileModule</title>
+ <sect3>
+ <title>LDAPUserProfileModuleImpl</title>
+ <para>TODO:</para>
+ <para>org.jboss.portal.identity.ldap.LDAPUserModuleImpl options:
+ <itemizedlist>
+ <listitem>
+ <emphasis role="bold"></emphasis> -
+ </listitem>
+ <listitem>
+ <emphasis role="bold"></emphasis> -
+ </listitem>
+ </itemizedlist>
+ </para>
+ </sect3>
+ </sect2>
</sect1>
<sect1>
- <title>Place holder 3</title>
+ <title>LDAP server tree shapes</title>
+ </sect1>
+ <sect1>
+ <title>Supported LDAP servers</title>
<para>TODO:</para>
</sect1>
-
</chapter>
17 years, 8 months
JBoss Portal SVN: r6514 - trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf.
by portal-commits＠lists.jboss.org
Author: julien(a)jboss.com
Date: 2007-03-03 17:33:19 -0500 (Sat, 03 Mar 2007)
New Revision: 6514
Modified:
trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editContext.xhtml
trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editPage.xhtml
trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/objectTemplate.xhtml
Log:
rollback one change which is not good : don't display children nav on all pages, only on main pages
Modified: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editContext.xhtml
===================================================================
--- trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editContext.xhtml 2007-03-03 22:31:03 UTC (rev 6513)
+++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editContext.xhtml 2007-03-03 22:33:19 UTC (rev 6514)
@@ -14,6 +14,12 @@
<h:message for="name" errorClass="portlet-msg-error"/>
</h:form>
+ <!-- Separation -->
+ <hr/>
+
+ <!-- Navigation -->
+ <ui:include src="objectNavigation.xhtml"/>
+
</ui:define>
</ui:composition>
Modified: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editPage.xhtml
===================================================================
--- trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editPage.xhtml 2007-03-03 22:31:03 UTC (rev 6513)
+++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editPage.xhtml 2007-03-03 22:33:19 UTC (rev 6514)
@@ -26,6 +26,12 @@
<h:commandButton styleClass="portlet-form-button" value="Update" action="objects"/>
</h:form>
+ <!-- Separation -->
+ <hr/>
+
+ <!-- Navigation -->
+ <ui:include src="objectNavigation.xhtml"/>
+
</ui:define>
</ui:composition>
Modified: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/objectTemplate.xhtml
===================================================================
--- trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/objectTemplate.xhtml 2007-03-03 22:31:03 UTC (rev 6513)
+++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/objectTemplate.xhtml 2007-03-03 22:33:19 UTC (rev 6514)
@@ -46,10 +46,4 @@
<!-- Content -->
<ui:insert name="content">Content</ui:insert>
- <!-- Separation -->
- <hr/>
-
- <!-- Navigation -->
- <ui:include src="objectNavigation.xhtml"/>
-
</div>
17 years, 8 months
JBoss Portal SVN: r6513 - in trunk/core-admin/src/resources/portal-admin-war/WEB-INF: jsf and 1 other directory.
by portal-commits＠lists.jboss.org
Author: julien(a)jboss.com
Date: 2007-03-03 17:31:03 -0500 (Sat, 03 Mar 2007)
New Revision: 6513
Removed:
trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editPagePreferences.xhtml
trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editPortalPreferences.xhtml
trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editWindowPreferences.xhtml
Modified:
trunk/core-admin/src/resources/portal-admin-war/WEB-INF/faces-config.xml
trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editPage.xhtml
trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/objectNavigation.xhtml
Log:
remove portal/page/window pref page, rather put that in the main page of each object
Modified: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/faces-config.xml
===================================================================
--- trunk/core-admin/src/resources/portal-admin-war/WEB-INF/faces-config.xml 2007-03-03 22:22:56 UTC (rev 6512)
+++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/faces-config.xml 2007-03-03 22:31:03 UTC (rev 6513)
@@ -207,10 +207,6 @@
<to-view-id>/WEB-INF/jsf/objects.xhtml</to-view-id>
</navigation-case>
<navigation-case>
- <from-outcome>editPortalPreferences</from-outcome>
- <to-view-id>/WEB-INF/jsf/editPortalPreferences.xhtml</to-view-id>
- </navigation-case>
- <navigation-case>
<from-outcome>editPortalSecurity</from-outcome>
<to-view-id>/WEB-INF/jsf/editPortalSecurity.xhtml</to-view-id>
</navigation-case>
@@ -223,10 +219,6 @@
<to-view-id>/WEB-INF/jsf/editPageLayout.xhtml</to-view-id>
</navigation-case>
<navigation-case>
- <from-outcome>editPagePreferences</from-outcome>
- <to-view-id>/WEB-INF/jsf/editPagePreferences.xhtml</to-view-id>
- </navigation-case>
- <navigation-case>
<from-outcome>editPageSecurity</from-outcome>
<to-view-id>/WEB-INF/jsf/editPageSecurity.xhtml</to-view-id>
</navigation-case>
@@ -235,10 +227,6 @@
<to-view-id>/WEB-INF/jsf/editPageTheme.xhtml</to-view-id>
</navigation-case>
<navigation-case>
- <from-outcome>editWindowPreferences</from-outcome>
- <to-view-id>/WEB-INF/jsf/editWindowPreferences.xhtml</to-view-id>
- </navigation-case>
- <navigation-case>
<from-outcome>editWindowSecurity</from-outcome>
<to-view-id>/WEB-INF/jsf/editWindowSecurity.xhtml</to-view-id>
</navigation-case>
Modified: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editPage.xhtml
===================================================================
--- trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editPage.xhtml 2007-03-03 22:22:56 UTC (rev 6512)
+++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editPage.xhtml 2007-03-03 22:31:03 UTC (rev 6513)
@@ -1,5 +1,6 @@
<div
xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:f="http://java.sun.com/jsf/core"
xmlns:ui="http://java.sun.com/jsf/facelets"
xmlns:h="http://java.sun.com/jsf/html">
@@ -14,6 +15,17 @@
<h:message for="name" errorClass="portlet-msg-error"/>
</h:form>
+ <!-- Default page -->
+ <h:form>
+ <h:outputLabel for="name">
+ <h:outputText styleClass="portlet-form-field-label" value="Default Page:"/>
+ </h:outputLabel>
+ <h:selectOneMenu id="name" styleClass="portlet-form-field" value="#{portalAction.defaultPageName}">
+ <f:selectItems value="#{portalobjectmgr.portalPageItems}" />
+ </h:selectOneMenu>
+ <h:commandButton styleClass="portlet-form-button" value="Update" action="objects"/>
+ </h:form>
+
</ui:define>
</ui:composition>
Deleted: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editPagePreferences.xhtml
===================================================================
--- trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editPagePreferences.xhtml 2007-03-03 22:22:56 UTC (rev 6512)
+++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editPagePreferences.xhtml 2007-03-03 22:31:03 UTC (rev 6513)
@@ -1,25 +0,0 @@
-<div
- xmlns="http://www.w3.org/1999/xhtml"
- xmlns:ui="http://java.sun.com/jsf/facelets"
- xmlns:h="http://java.sun.com/jsf/html">
-
-<ui:composition template="objectTemplate.xhtml">
-
- <ui:define name="content">
-
- <h3>You are editing the page: <h:outputText value="#{portalobjectmgr.selectedObject.name}" /></h3>
-
- <h:form>
- <h:inputText id="name" value="#{addPageAction.pageName}" styleClass="portlet-form-input-field" required="true"/>
- <h:commandButton action="#{addPageAction.execute}" value="Add Portal sub-Page" styleClass="portlet-form-button"/>
- <h:message for="name" errorClass="portlet-msg-error"/>
- </h:form>
-
- </ui:define>
-
-</ui:composition>
-
-</div>
-
-
-
Deleted: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editPortalPreferences.xhtml
===================================================================
--- trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editPortalPreferences.xhtml 2007-03-03 22:22:56 UTC (rev 6512)
+++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editPortalPreferences.xhtml 2007-03-03 22:31:03 UTC (rev 6513)
@@ -1,31 +0,0 @@
-<div xmlns="http://www.w3.org/1999/xhtml"
- xmlns:ui="http://java.sun.com/jsf/facelets"
- xmlns:h="http://java.sun.com/jsf/html"
- xmlns:f="http://java.sun.com/jsf/core">
-
- <ui:composition
- template="objectTemplate.xhtml">
-
- <ui:define name="content">
-
- <h3>You are editing the portal: <h:outputText
- value="#{portalobjectmgr.selectedObject.name}" /></h3>
-
- <h:form>
- <h:outputLabel for="name">
- <h:outputText styleClass="portlet-form-field-label" value="Default Page:"/>
- </h:outputLabel>
- <h:selectOneMenu id="name" styleClass="portlet-form-field" value="#{portalAction.defaultPageName}">
- <f:selectItems value="#{portalobjectmgr.portalPageItems}" />
- </h:selectOneMenu>
- <h:commandButton styleClass="portlet-form-button" value="Update" action="objects"/>
- </h:form>
-
-
- </ui:define>
-
- </ui:composition>
-</div>
-
-
-
Deleted: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editWindowPreferences.xhtml
===================================================================
--- trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editWindowPreferences.xhtml 2007-03-03 22:22:56 UTC (rev 6512)
+++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editWindowPreferences.xhtml 2007-03-03 22:31:03 UTC (rev 6513)
@@ -1,20 +0,0 @@
-<div
- xmlns="http://www.w3.org/1999/xhtml"
- xmlns:ui="http://java.sun.com/jsf/facelets"
- xmlns:h="http://java.sun.com/jsf/html">
-
-<ui:composition template="objectTemplate.xhtml">
-
- <ui:define name="content">
-
- <h3>You are editing the window: <h:outputText
- value="#{portalobjectmgr.selectedObject.name}" /></h3>
-
- </ui:define>
-
-</ui:composition>
-
-</div>
-
-
-
Modified: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/objectNavigation.xhtml
===================================================================
--- trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/objectNavigation.xhtml 2007-03-03 22:22:56 UTC (rev 6512)
+++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/objectNavigation.xhtml 2007-03-03 22:31:03 UTC (rev 6513)
@@ -27,10 +27,7 @@
</h:commandLink>
</td>
<td>
- <h:commandLink action="editPortalPreferences" actionListener="#{portalobjectmgr.selectObject}">
- <h:outputText value="Edit"/>
- <f:param name="id" value="#{object.id}"/>
- </h:commandLink> | <h:commandLink action="editPortalSecurity" actionListener="#{portalobjectmgr.selectObject}">
+ <h:commandLink action="editPortalSecurity" actionListener="#{portalobjectmgr.selectObject}">
<h:outputText value="Security"/>
<f:param name="id" value="#{object.id}"/>
</h:commandLink> | <h:commandLink action="editPortalTheme" actionListener="#{portalobjectmgr.selectObject}">
@@ -99,10 +96,7 @@
</h:commandLink>
</td>
<td>
- <h:commandLink action="editWindowPreferences" actionListener="#{portalobjectmgr.selectObject}">
- <h:outputText value="Edit"/>
- <f:param name="id" value="#{object.id}"/>
- </h:commandLink> | <h:commandLink action="editWindowTheme" actionListener="#{portalobjectmgr.selectObject}">
+ <h:commandLink action="editWindowTheme" actionListener="#{portalobjectmgr.selectObject}">
<h:outputText value="Theme"/>
<f:param name="id" value="#{object.id}"/>
</h:commandLink> | <h:commandLink action="portals" actionListener="#{portalobjectmgr.destroyObject}">
17 years, 8 months
JBoss Portal SVN: r6512 - in trunk/core-admin/src/resources/portal-admin-war/WEB-INF: jsf and 1 other directory.
by portal-commits＠lists.jboss.org
Author: julien(a)jboss.com
Date: 2007-03-03 17:22:56 -0500 (Sat, 03 Mar 2007)
New Revision: 6512
Added:
trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editContext.xhtml
trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editPage.xhtml
trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editWindow.xhtml
Removed:
trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/pages.xhtml
trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/portals.xhtml
trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/windows.xhtml
Modified:
trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/objectTemplate.xhtml
trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/objects.xhtml
trunk/core-admin/src/resources/portal-admin-war/WEB-INF/portlet.xml
Log:
improve structure a bit
Copied: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editContext.xhtml (from rev 6511, trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/portals.xhtml)
===================================================================
--- trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editContext.xhtml (rev 0)
+++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editContext.xhtml 2007-03-03 22:22:56 UTC (rev 6512)
@@ -0,0 +1,21 @@
+<div
+ xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:ui="http://java.sun.com/jsf/facelets"
+ xmlns:h="http://java.sun.com/jsf/html">
+
+ <ui:composition template="objectTemplate.xhtml">
+
+ <ui:define name="content">
+
+ <!-- -->
+ <h:form id="portal_form">
+ <h:inputText id="name" value="#{portalAction.portalName}" styleClass="portlet-form-input-field" required="true"/>
+ <h:commandButton action="#{portalAction.addPortal}" value="Add portal" styleClass="portlet-form-button"/>
+ <h:message for="name" errorClass="portlet-msg-error"/>
+ </h:form>
+
+ </ui:define>
+
+ </ui:composition>
+
+</div>
Copied: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editPage.xhtml (from rev 6511, trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/pages.xhtml)
===================================================================
--- trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editPage.xhtml (rev 0)
+++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editPage.xhtml 2007-03-03 22:22:56 UTC (rev 6512)
@@ -0,0 +1,21 @@
+<div
+ xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:ui="http://java.sun.com/jsf/facelets"
+ xmlns:h="http://java.sun.com/jsf/html">
+
+ <ui:composition template="objectTemplate.xhtml">
+
+ <ui:define name="content">
+
+ <!-- Sub page addition -->
+ <h:form id="portal_form">
+ <h:inputText id="name" value="#{addPageAction.pageName}" styleClass="portlet-form-input-field" required="true"/>
+ <h:commandButton action="#{addPageAction.execute}" value="Add page" styleClass="portlet-form-button"/>
+ <h:message for="name" errorClass="portlet-msg-error"/>
+ </h:form>
+
+ </ui:define>
+
+ </ui:composition>
+
+</div>
Copied: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editWindow.xhtml (from rev 6511, trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/windows.xhtml)
===================================================================
--- trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editWindow.xhtml (rev 0)
+++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editWindow.xhtml 2007-03-03 22:22:56 UTC (rev 6512)
@@ -0,0 +1,24 @@
+<div
+ xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:ui="http://java.sun.com/jsf/facelets"
+ xmlns:ct="http://www.julien.com"
+ xmlns:h="http://java.sun.com/jsf/html">
+
+ <ui:composition template="objectTemplate.xhtml">
+
+ <ui:define name="content">
+
+ <!-- -->
+ <h:form id="window_form">
+ <ct:content
+ contentType="#{portalobjectmgr.selectedContentType}"
+ contentURI="#{portalobjectmgr.selectedContentURI}"
+ submitFunction="document.window_form.submit()"/>
+ <h:commandButton value="Update" action="#{assignContentToWindowAction.execute}" styleClass="portlet-form-button"/>
+ </h:form>
+
+ </ui:define>
+
+ </ui:composition>
+
+</div>
Modified: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/objectTemplate.xhtml
===================================================================
--- trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/objectTemplate.xhtml 2007-03-03 22:14:42 UTC (rev 6511)
+++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/objectTemplate.xhtml 2007-03-03 22:22:56 UTC (rev 6512)
@@ -45,5 +45,11 @@
<!-- Content -->
<ui:insert name="content">Content</ui:insert>
-
+
+ <!-- Separation -->
+ <hr/>
+
+ <!-- Navigation -->
+ <ui:include src="objectNavigation.xhtml"/>
+
</div>
Modified: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/objects.xhtml
===================================================================
--- trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/objects.xhtml 2007-03-03 22:14:42 UTC (rev 6511)
+++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/objects.xhtml 2007-03-03 22:22:56 UTC (rev 6512)
@@ -6,17 +6,18 @@
<c:choose>
<c:when test="#{portalobjectmgr.selectedObject.type == 0}">
- <ui:include src="portals.xhtml"/>
+ <ui:include src="editContext.xhtml"/>
</c:when>
<c:when test="#{portalobjectmgr.selectedObject.type == 1}">
- <ui:include src="pages.xhtml"/>
+ <ui:include src="editPage.xhtml"/>
</c:when>
<c:when test="#{portalobjectmgr.selectedObject.type == 2}">
- <ui:include src="pages.xhtml"/>
+ <ui:include src="editPage.xhtml"/>
</c:when>
<c:when test="#{portalobjectmgr.selectedObject.type == 3}">
- <ui:include src="windows.xhtml"/>
+ <ui:include src="editWindow.xhtml"/>
</c:when>
+ <c:otherwise>FIXME</c:otherwise>
</c:choose>
</div>
Deleted: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/pages.xhtml
===================================================================
--- trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/pages.xhtml 2007-03-03 22:14:42 UTC (rev 6511)
+++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/pages.xhtml 2007-03-03 22:22:56 UTC (rev 6512)
@@ -1,23 +0,0 @@
-<div
- xmlns="http://www.w3.org/1999/xhtml"
- xmlns:ui="http://java.sun.com/jsf/facelets"
- xmlns:h="http://java.sun.com/jsf/html">
-
- <ui:composition template="objectTemplate.xhtml">
-
- <ui:define name="content">
- <!-- Navigation -->
- <ui:include src="objectNavigation.xhtml"/>
-
- <!-- Sub page addition -->
- <hr/>
- <h:form id="portal_form">
- <h:inputText id="name" value="#{addPageAction.pageName}" styleClass="portlet-form-input-field" required="true"/>
- <h:commandButton action="#{addPageAction.execute}" value="Add page" styleClass="portlet-form-button"/>
- <h:message for="name" errorClass="portlet-msg-error"/>
- </h:form>
- </ui:define>
-
- </ui:composition>
-
-</div>
Deleted: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/portals.xhtml
===================================================================
--- trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/portals.xhtml 2007-03-03 22:14:42 UTC (rev 6511)
+++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/portals.xhtml 2007-03-03 22:22:56 UTC (rev 6512)
@@ -1,27 +0,0 @@
-<div
- xmlns="http://www.w3.org/1999/xhtml"
- xmlns:ui="http://java.sun.com/jsf/facelets"
- xmlns:h="http://java.sun.com/jsf/html">
-
- <ui:composition template="objectTemplate.xhtml">
-
- <ui:define name="content">
-
- <!-- -->
- <h:form id="portal_form">
- <h:inputText id="name" value="#{portalAction.portalName}" styleClass="portlet-form-input-field" required="true"/>
- <h:commandButton action="#{portalAction.addPortal}" value="Add portal" styleClass="portlet-form-button"/>
- <h:message for="name" errorClass="portlet-msg-error"/>
- </h:form>
-
- <!-- Separation -->
- <hr/>
-
- <!-- Navigation -->
- <ui:include src="objectNavigation.xhtml"/>
-
- </ui:define>
-
- </ui:composition>
-
-</div>
Deleted: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/windows.xhtml
===================================================================
--- trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/windows.xhtml 2007-03-03 22:14:42 UTC (rev 6511)
+++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/windows.xhtml 2007-03-03 22:22:56 UTC (rev 6512)
@@ -1,24 +0,0 @@
-<div
- xmlns="http://www.w3.org/1999/xhtml"
- xmlns:ui="http://java.sun.com/jsf/facelets"
- xmlns:ct="http://www.julien.com"
- xmlns:h="http://java.sun.com/jsf/html">
-
- <ui:composition template="objectTemplate.xhtml">
-
- <ui:define name="content">
-
- <!-- -->
- <h:form id="window_form">
- <ct:content
- contentType="#{portalobjectmgr.selectedContentType}"
- contentURI="#{portalobjectmgr.selectedContentURI}"
- submitFunction="document.window_form.submit()"/>
- <h:commandButton value="Update" action="#{assignContentToWindowAction.execute}" styleClass="portlet-form-button"/>
- </h:form>
-
- </ui:define>
-
- </ui:composition>
-
-</div>
Modified: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/portlet.xml
===================================================================
--- trunk/core-admin/src/resources/portal-admin-war/WEB-INF/portlet.xml 2007-03-03 22:14:42 UTC (rev 6511)
+++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/portlet.xml 2007-03-03 22:22:56 UTC (rev 6512)
@@ -34,7 +34,7 @@
<portlet-class>org.apache.myfaces.portlet.MyFacesGenericPortlet</portlet-class>
<init-param>
<name>default-view</name>
- <value>/WEB-INF/jsf/portals.xhtml</value>
+ <value>/WEB-INF/jsf/objects.xhtml</value>
</init-param>
<expiration-cache>-1</expiration-cache>
<supports>
17 years, 8 months
JBoss Portal SVN: r6511 - in trunk/core-admin/src: resources/portal-admin-war/WEB-INF and 1 other directories.
by portal-commits＠lists.jboss.org
Author: julien(a)jboss.com
Date: 2007-03-03 17:14:42 -0500 (Sat, 03 Mar 2007)
New Revision: 6511
Added:
trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/objects.xhtml
Modified:
trunk/core-admin/src/main/org/jboss/portal/core/admin/ui/PortalObjectManagerBean.java
trunk/core-admin/src/resources/portal-admin-war/WEB-INF/faces-config.xml
trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editPortalPreferences.xhtml
trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/objectNavigation.xhtml
trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/pages.xhtml
trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/portals.xhtml
trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/windows.xhtml
Log:
use only one page for displaying portal objects, simplify navigations
Modified: trunk/core-admin/src/main/org/jboss/portal/core/admin/ui/PortalObjectManagerBean.java
===================================================================
--- trunk/core-admin/src/main/org/jboss/portal/core/admin/ui/PortalObjectManagerBean.java 2007-03-03 21:34:34 UTC (rev 6510)
+++ trunk/core-admin/src/main/org/jboss/portal/core/admin/ui/PortalObjectManagerBean.java 2007-03-03 22:14:42 UTC (rev 6511)
@@ -531,7 +531,6 @@
public String selectObject()
{
- String next = "portals";
try
{
// Get id
@@ -551,16 +550,12 @@
switch(object.getType())
{
case PortalObject.TYPE_CONTEXT:
- next = "portals";
break;
case PortalObject.TYPE_PORTAL:
- next = "pages";
break;
case PortalObject.TYPE_PAGE:
- next = "pages";
break;
case PortalObject.TYPE_WINDOW:
- next = "windows";
break;
}
}
@@ -571,7 +566,7 @@
}
//
- return next;
+ return "objects";
}
public void selectPlugin()
Modified: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/faces-config.xml
===================================================================
--- trunk/core-admin/src/resources/portal-admin-war/WEB-INF/faces-config.xml 2007-03-03 21:34:34 UTC (rev 6510)
+++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/faces-config.xml 2007-03-03 22:14:42 UTC (rev 6511)
@@ -203,18 +203,10 @@
<navigation-rule>
<navigation-case>
- <from-outcome>portals</from-outcome>
- <to-view-id>/WEB-INF/jsf/portals.xhtml</to-view-id>
+ <from-outcome>objects</from-outcome>
+ <to-view-id>/WEB-INF/jsf/objects.xhtml</to-view-id>
</navigation-case>
<navigation-case>
- <from-outcome>windows</from-outcome>
- <to-view-id>/WEB-INF/jsf/windows.xhtml</to-view-id>
- </navigation-case>
- <navigation-case>
- <from-outcome>pages</from-outcome>
- <to-view-id>/WEB-INF/jsf/pages.xhtml</to-view-id>
- </navigation-case>
- <navigation-case>
<from-outcome>editPortalPreferences</from-outcome>
<to-view-id>/WEB-INF/jsf/editPortalPreferences.xhtml</to-view-id>
</navigation-case>
Modified: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editPortalPreferences.xhtml
===================================================================
--- trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editPortalPreferences.xhtml 2007-03-03 21:34:34 UTC (rev 6510)
+++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editPortalPreferences.xhtml 2007-03-03 22:14:42 UTC (rev 6511)
@@ -18,7 +18,7 @@
<h:selectOneMenu id="name" styleClass="portlet-form-field" value="#{portalAction.defaultPageName}">
<f:selectItems value="#{portalobjectmgr.portalPageItems}" />
</h:selectOneMenu>
- <h:commandButton styleClass="portlet-form-button" value="Update" action="portals"/>
+ <h:commandButton styleClass="portlet-form-button" value="Update" action="objects"/>
</h:form>
Modified: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/objectNavigation.xhtml
===================================================================
--- trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/objectNavigation.xhtml 2007-03-03 21:34:34 UTC (rev 6510)
+++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/objectNavigation.xhtml 2007-03-03 22:14:42 UTC (rev 6511)
@@ -36,7 +36,7 @@
</h:commandLink> | <h:commandLink action="editPortalTheme" actionListener="#{portalobjectmgr.selectObject}">
<h:outputText value="Theme"/>
<f:param name="id" value="#{object.id}"/>
- </h:commandLink> | <h:commandLink action="portals" actionListener="#{portalobjectmgr.destroyObject}">
+ </h:commandLink> | <h:commandLink action="objects" actionListener="#{portalobjectmgr.destroyObject}">
<h:outputText value="Destroy"/>
<f:param name="id" value="#{object.id}"/>
</h:commandLink>
@@ -72,7 +72,7 @@
</h:commandLink> | <h:commandLink action="editPageTheme" actionListener="#{portalobjectmgr.selectObject}">
<h:outputText value="Theme"/>
<f:param name="id" value="#{object.id}"/>
- </h:commandLink> | <h:commandLink action="pages" actionListener="#{portalobjectmgr.destroyObject}">
+ </h:commandLink> | <h:commandLink action="objects" actionListener="#{portalobjectmgr.destroyObject}">
<h:outputText value="Destroy"/>
<f:param name="id" value="#{object.id}"/>
</h:commandLink>
Added: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/objects.xhtml
===================================================================
--- trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/objects.xhtml (rev 0)
+++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/objects.xhtml 2007-03-03 22:14:42 UTC (rev 6511)
@@ -0,0 +1,22 @@
+<div
+ xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:ui="http://java.sun.com/jsf/facelets"
+ xmlns:h="http://java.sun.com/jsf/html"
+ xmlns:c="http://java.sun.com/jstl/core">
+
+ <c:choose>
+ <c:when test="#{portalobjectmgr.selectedObject.type == 0}">
+ <ui:include src="portals.xhtml"/>
+ </c:when>
+ <c:when test="#{portalobjectmgr.selectedObject.type == 1}">
+ <ui:include src="pages.xhtml"/>
+ </c:when>
+ <c:when test="#{portalobjectmgr.selectedObject.type == 2}">
+ <ui:include src="pages.xhtml"/>
+ </c:when>
+ <c:when test="#{portalobjectmgr.selectedObject.type == 3}">
+ <ui:include src="windows.xhtml"/>
+ </c:when>
+ </c:choose>
+
+</div>
Modified: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/pages.xhtml
===================================================================
--- trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/pages.xhtml 2007-03-03 21:34:34 UTC (rev 6510)
+++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/pages.xhtml 2007-03-03 22:14:42 UTC (rev 6511)
@@ -4,8 +4,8 @@
xmlns:h="http://java.sun.com/jsf/html">
<ui:composition template="objectTemplate.xhtml">
+
<ui:define name="content">
-
<!-- Navigation -->
<ui:include src="objectNavigation.xhtml"/>
@@ -16,8 +16,8 @@
<h:commandButton action="#{addPageAction.execute}" value="Add page" styleClass="portlet-form-button"/>
<h:message for="name" errorClass="portlet-msg-error"/>
</h:form>
+ </ui:define>
- </ui:define>
</ui:composition>
</div>
Modified: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/portals.xhtml
===================================================================
--- trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/portals.xhtml 2007-03-03 21:34:34 UTC (rev 6510)
+++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/portals.xhtml 2007-03-03 22:14:42 UTC (rev 6511)
@@ -4,19 +4,24 @@
xmlns:h="http://java.sun.com/jsf/html">
<ui:composition template="objectTemplate.xhtml">
+
<ui:define name="content">
- <!-- Navigation -->
- <ui:include src="objectNavigation.xhtml"/>
-
- <hr/>
+ <!-- -->
<h:form id="portal_form">
<h:inputText id="name" value="#{portalAction.portalName}" styleClass="portlet-form-input-field" required="true"/>
<h:commandButton action="#{portalAction.addPortal}" value="Add portal" styleClass="portlet-form-button"/>
<h:message for="name" errorClass="portlet-msg-error"/>
</h:form>
+ <!-- Separation -->
+ <hr/>
+
+ <!-- Navigation -->
+ <ui:include src="objectNavigation.xhtml"/>
+
</ui:define>
+
</ui:composition>
</div>
Modified: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/windows.xhtml
===================================================================
--- trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/windows.xhtml 2007-03-03 21:34:34 UTC (rev 6510)
+++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/windows.xhtml 2007-03-03 22:14:42 UTC (rev 6511)
@@ -5,17 +5,20 @@
xmlns:h="http://java.sun.com/jsf/html">
<ui:composition template="objectTemplate.xhtml">
- <ui:define name="content">
- <h:form id="window_form">
- <ct:content
- contentType="#{portalobjectmgr.selectedContentType}"
- contentURI="#{portalobjectmgr.selectedContentURI}"
- submitFunction="document.window_form.submit()"/>
- <h:commandButton value="Update" action="#{assignContentToWindowAction.execute}" styleClass="portlet-form-button"/>
- </h:form>
+ <ui:define name="content">
- </ui:define>
+ <!-- -->
+ <h:form id="window_form">
+ <ct:content
+ contentType="#{portalobjectmgr.selectedContentType}"
+ contentURI="#{portalobjectmgr.selectedContentURI}"
+ submitFunction="document.window_form.submit()"/>
+ <h:commandButton value="Update" action="#{assignContentToWindowAction.execute}" styleClass="portlet-form-button"/>
+ </h:form>
+
+ </ui:define>
+
</ui:composition>
</div>
17 years, 8 months
JBoss Portal SVN: r6510 - docs/trunk/referenceGuide/en/modules.
by portal-commits＠lists.jboss.org
Author: bdaw
Date: 2007-03-03 16:34:34 -0500 (Sat, 03 Mar 2007)
New Revision: 6510
Modified:
docs/trunk/referenceGuide/en/modules/identity.xml
Log:
update
Modified: docs/trunk/referenceGuide/en/modules/identity.xml
===================================================================
--- docs/trunk/referenceGuide/en/modules/identity.xml 2007-03-03 21:03:18 UTC (rev 6509)
+++ docs/trunk/referenceGuide/en/modules/identity.xml 2007-03-03 21:34:34 UTC (rev 6510)
@@ -815,6 +815,90 @@
</sect2>
<sect2>
<title>Delegating UserProfile module</title>
+ <para>Delegating UserProfile module implementation has very specific role. When we use storage mechanism like LDAP we may not be able to map all
+ user properties into LDAP attributes because of schema limitations. To solve this problem we use database to store such not mapped properties.
+ Delegating user profile module will recognize if property is mapped as <emphasis role="bold">ldap</emphasis> or <emphasis role="bold">database</emphasis>
+ end delegate <emphasis>setProperty()/getProperty()</emphasis> method invocation to proper module implementation. This is implemented in
+ <emphasis role="bold">org.jboss.portal.identity.DelegatingUserProfileModuleImpl</emphasis>. If property is mapped either as
+ <emphasis role="bold">ldap</emphasis> and <emphasis role="bold">database</emphasis> the <emphasis role="bold">ldap</emphasis> mapping will
+ have higher priority.
+ </para>
+ <programlisting>
+ <![CDATA[
+ <module>
+ <!--type used to correctly map in IdentityContext registry-->
+ <type>UserProfile</type>
+ <implementation>DELEGATING</implementation>
+
+ <!--name of service and class for creating mbean-->
+ <service-name>portal:service=Module,type=UserProfile</service-name>
+ <class>org.jboss.portal.identity.DelegatingUserProfileModuleImpl</class>
+ <!--set of options that are set in instantiated object-->
+ <config>
+ <option>
+ <name>jndiName</name>
+ <value>java:/portal/UserProfileModule</value>
+ </option>
+ <option>
+ <name>dbModuleJNDIName</name>
+ <value>java:/portal/DBUserProfileModule</value>
+ </option>
+ <option>
+ <name>profileConfigFile</name>
+ <value>conf/identity/profile-config.xml</value>
+ </option>
+ </config>
+ </module>
+ ]]>
+ </programlisting>
+ <para>
+ Module options are:
+ <itemizedlist>
+ <listitem>
+ <emphasis role="bold">dbModuleJNDIName</emphasis> - JNDI name under which database implementation of UserProfileModule is registered.
+ </listitem>
+ <listitem>
+ <emphasis role="bold">ldapModuleJNDIName</emphasis> - JNDI name under which ldap implementation of UserProfileModule is registered.
+ </listitem>
+ <listitem>
+ <emphasis role="bold">profileConfigFile</emphasis> - configuration file for user properties.
+ </listitem>
+ </itemizedlist>
+ </para>
</sect2>
+ <sect2>
+ <title>Database UserProfile module implementation</title>
+ <para>Because of behaviour described in previous section database UserProfile module needs some special capabilities. If user is present in
+ LDAP server but property we want to store isn't mapped as LDAP attribute such property need to be stored in database. But to store
+ the property user need to be synchronized from ldap into database first</para>
+ <para>Class <emphasis>org.jboss.portal.identity.db.HibernateUserProfileModuleImpl</emphasis> has additional synchronization features.
+ Here are the options:
+ <itemizedlist>
+ <listitem>
+ <emphasis role="bold">synchronizeNonExistingUsers</emphasis> - when set to "true" if user on which we want to perform operation doesn't exist it will
+ create it in database
+ </listitem>
+ <listitem>
+ <emphasis role="bold">acceptOtherImplementations</emphasis> - if set to "true" module will accept user objects other than
+ <emphasis>org.jboss.portal.identity.db.HibernateUserImpl</emphasis>. This is needed to enable cooperation with UserModule implementations other
+ than <emphasis>org.jboss.portal.identity.db.HibernateUserModuleImpl</emphasis>
+ </listitem>
+ <listitem>
+ <emphasis role="bold">defaultSynchronizePassword</emphasis> - if this option is set the value will be used as password for synchronized user.
+ </listitem>
+ <listitem>
+ <emphasis role="bold">randomSynchronizePassword</emphasis> - if this option is set to "true" synchronized user will have random generated password.
+ This is mostly for the security reasons.
+ </listitem>
+ <listitem>
+ <emphasis role="bold">sessionFactoryJNDIName</emphasis> - JNDI name under which this user will be registered.
+ </listitem>
+ <listitem>
+ <emphasis role="bold">profileConfigFile</emphasis> - file with user profile configuration
+ </listitem>
+ </itemizedlist>
+ </para>
+
+ </sect2>
</sect1>
</chapter>
17 years, 8 months
JBoss Portal SVN: r6509 - in trunk/core-admin/src: resources/portal-admin-war/WEB-INF/jsf and 1 other directory.
by portal-commits＠lists.jboss.org
Author: julien(a)jboss.com
Date: 2007-03-03 16:03:18 -0500 (Sat, 03 Mar 2007)
New Revision: 6509
Modified:
trunk/core-admin/src/bin/portal-admin-war/style.css
trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/objectTemplate.xhtml
Log:
put in bold the selected object on the object nav path
Modified: trunk/core-admin/src/bin/portal-admin-war/style.css
===================================================================
--- trunk/core-admin/src/bin/portal-admin-war/style.css 2007-03-03 20:53:19 UTC (rev 6508)
+++ trunk/core-admin/src/bin/portal-admin-war/style.css 2007-03-03 21:03:18 UTC (rev 6509)
@@ -70,6 +70,10 @@
margin-right: 3px;
}
+.admin-ui ul.objectpath li.selected {
+ font-weight: bold;
+}
+
/* */
.admin-ui select.contentType {
Modified: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/objectTemplate.xhtml
===================================================================
--- trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/objectTemplate.xhtml 2007-03-03 20:53:19 UTC (rev 6508)
+++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/objectTemplate.xhtml 2007-03-03 21:03:18 UTC (rev 6509)
@@ -19,21 +19,23 @@
<li>
>
</li>
- <li>
<c:choose>
<c:when test="#{node.id == portalobjectmgr.selectedObjectBean.id}">
- <c:if test="#{node.name == ''}">root</c:if>
- <c:if test="#{node.name != ''}">#{node.name}</c:if>
+ <li class="selected">
+ <c:if test="#{node.name == ''}">root</c:if>
+ <c:if test="#{node.name != ''}">#{node.name}</c:if>
+ </li>
</c:when>
<c:otherwise>
- <h:commandLink action="#{portalobjectmgr.selectObject}">
- <f:param name="id" value="#{node.id}"/>
- <c:if test="#{node.name == ''}">root</c:if>
- <c:if test="#{node.name != ''}">#{node.name}</c:if>
- </h:commandLink>
+ <li>
+ <h:commandLink action="#{portalobjectmgr.selectObject}">
+ <f:param name="id" value="#{node.id}"/>
+ <c:if test="#{node.name == ''}">root</c:if>
+ <c:if test="#{node.name != ''}">#{node.name}</c:if>
+ </h:commandLink>
+ </li>
</c:otherwise>
</c:choose>
- </li>
</c:forEach>
</ul>
</h:form>
17 years, 8 months
JBoss Portal SVN: r6508 - trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf.
by portal-commits＠lists.jboss.org
Author: julien(a)jboss.com
Date: 2007-03-03 15:53:19 -0500 (Sat, 03 Mar 2007)
New Revision: 6508
Modified:
trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editPortalPreferences.xhtml
Log:
fix portal preferences update
Modified: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editPortalPreferences.xhtml
===================================================================
--- trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editPortalPreferences.xhtml 2007-03-03 20:26:32 UTC (rev 6507)
+++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editPortalPreferences.xhtml 2007-03-03 20:53:19 UTC (rev 6508)
@@ -18,7 +18,7 @@
<h:selectOneMenu id="name" styleClass="portlet-form-field" value="#{portalAction.defaultPageName}">
<f:selectItems value="#{portalobjectmgr.portalPageItems}" />
</h:selectOneMenu>
- <h:commandButton styleClass="portlet-form-button" value="Update" action="portals" actionListener="#{portalobjectmgr.selectParentObject}"/>
+ <h:commandButton styleClass="portlet-form-button" value="Update" action="portals"/>
</h:form>
17 years, 8 months
JBoss Portal SVN: r6507 - in trunk/wsrp: src/main/org/jboss/portal/test/wsrp/deployment and 2 other directories.
by portal-commits＠lists.jboss.org
Author: chris.laprun(a)jboss.com
Date: 2007-03-03 15:26:32 -0500 (Sat, 03 Mar 2007)
New Revision: 6507
Modified:
trunk/wsrp/build.xml
trunk/wsrp/src/main/org/jboss/portal/test/wsrp/deployment/DeploymentTestCase.java
trunk/wsrp/src/main/org/jboss/portal/wsrp/services/RemoteSOAPInvokerServiceFactory.java
trunk/wsrp/src/resources/tests/test-deployment-lib-jar/test-wsrp.xml
Log:
- Fixed NPE when restoring initial values of System properties if there was no initial value.
- Fixed DeploymentTestCase.
Modified: trunk/wsrp/build.xml
===================================================================
--- trunk/wsrp/build.xml 2007-03-03 19:26:08 UTC (rev 6506)
+++ trunk/wsrp/build.xml 2007-03-03 20:26:32 UTC (rev 6507)
@@ -688,7 +688,7 @@
<!--<jvmarg value="-Xdebug"/>
<jvmarg value="-Xnoagent"/>
<jvmarg value="-Djava.compiler=NONE"/>
- <jvmarg value="-Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=8787"/>-->
+ <jvmarg value="-Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8787"/>-->
<sysproperty key="test.root" value="${build.lib}/tests"/>
</x-sysproperty>
<x-classpath>
Modified: trunk/wsrp/src/main/org/jboss/portal/test/wsrp/deployment/DeploymentTestCase.java
===================================================================
--- trunk/wsrp/src/main/org/jboss/portal/test/wsrp/deployment/DeploymentTestCase.java 2007-03-03 19:26:08 UTC (rev 6506)
+++ trunk/wsrp/src/main/org/jboss/portal/test/wsrp/deployment/DeploymentTestCase.java 2007-03-03 20:26:32 UTC (rev 6507)
@@ -105,11 +105,11 @@
consumer = ((WSRPConsumerService)service).getConsumer();
assertEquals("inDB2", consumer.getProducerId());
assertNull(consumer.getProducerInfo().getExpirationCacheSeconds());
+ // since inDB2 is loaded from MockConsumerRegistry, it shouldn't be processed by WSRPDeploymentFactory and should
+ // therefore return null for most values (as it's how MockWSRPConsumer is implemented)
EndpointConfigurationInfo endpoint = consumer.getProducerInfo().getEndpointConfigurationInfo();
- assertEquals("service-description-2", endpoint.getServiceDescriptionURL());
- assertEquals("markup-2", endpoint.getMarkupURL());
- assertEquals("registration-2", endpoint.getRegistrationURL());
- assertEquals("portlet-management-2", endpoint.getPortletManagementURL());
+ assertNull(endpoint.getServiceDescriptionURL());
+ assertNull(endpoint.getMarkupURL());
//
service = services.get(2);
Modified: trunk/wsrp/src/main/org/jboss/portal/wsrp/services/RemoteSOAPInvokerServiceFactory.java
===================================================================
--- trunk/wsrp/src/main/org/jboss/portal/wsrp/services/RemoteSOAPInvokerServiceFactory.java 2007-03-03 19:26:08 UTC (rev 6506)
+++ trunk/wsrp/src/main/org/jboss/portal/wsrp/services/RemoteSOAPInvokerServiceFactory.java 2007-03-03 20:26:32 UTC (rev 6507)
@@ -216,8 +216,15 @@
finally
{
// restore time outs
- System.setProperty("sun.net.client.defaultConnectTimeout", connectTimeOut);
- System.setProperty("sun.net.client.defaultReadTimeout", readTimeOut);
+ if (connectTimeOut != null)
+ {
+ System.setProperty("sun.net.client.defaultConnectTimeout", connectTimeOut);
+ }
+
+ if (readTimeOut != null)
+ {
+ System.setProperty("sun.net.client.defaultReadTimeout", readTimeOut);
+ }
}
}
Modified: trunk/wsrp/src/resources/tests/test-deployment-lib-jar/test-wsrp.xml
===================================================================
--- trunk/wsrp/src/resources/tests/test-deployment-lib-jar/test-wsrp.xml 2007-03-03 19:26:08 UTC (rev 6506)
+++ trunk/wsrp/src/resources/tests/test-deployment-lib-jar/test-wsrp.xml 2007-03-03 20:26:32 UTC (rev 6507)
@@ -50,8 +50,6 @@
<endpoint-config>
<service-description-url>service-description-2</service-description-url>
<markup-url>markup-2</markup-url>
- <registration-url>registration-2</registration-url>
- <portlet-management-url>portlet-management-2</portlet-management-url>
</endpoint-config>
</wsrp-producer>
</deployment>
17 years, 8 months
JBoss Portal SVN: r6506 - in trunk/wsrp/src: main/org/jboss/portal/test/wsrp/other and 3 other directories.
by portal-commits＠lists.jboss.org
Author: chris.laprun(a)jboss.com
Date: 2007-03-03 14:26:08 -0500 (Sat, 03 Mar 2007)
New Revision: 6506
Modified:
trunk/wsrp/src/main/org/jboss/portal/test/wsrp/deployment/DeploymentTestCase.java
trunk/wsrp/src/main/org/jboss/portal/test/wsrp/other/EndpointConfigurationInfoTestCase.java
trunk/wsrp/src/main/org/jboss/portal/wsrp/deployment/WSRPDeploymentFactory.java
trunk/wsrp/src/main/org/jboss/portal/wsrp/services/PerEndpointSOAPInvokerServiceFactory.java
trunk/wsrp/src/resources/tests/test-deployment-lib-jar/test-wsrp.xml
Log:
- Making sure that Consumer definitions are persisted whether the referred URLs are correct or not.
- Updated test cases.
Modified: trunk/wsrp/src/main/org/jboss/portal/test/wsrp/deployment/DeploymentTestCase.java
===================================================================
--- trunk/wsrp/src/main/org/jboss/portal/test/wsrp/deployment/DeploymentTestCase.java 2007-03-03 19:23:42 UTC (rev 6505)
+++ trunk/wsrp/src/main/org/jboss/portal/test/wsrp/deployment/DeploymentTestCase.java 2007-03-03 19:26:08 UTC (rev 6506)
@@ -35,7 +35,6 @@
import org.jboss.portal.wsrp.deployment.WSRPDeploymentFactory;
import org.jboss.portal.wsrp.services.PerEndpointSOAPInvokerServiceFactory;
import org.jboss.portal.wsrp.services.RemoteSOAPInvokerServiceFactory;
-import org.jboss.portal.wsrp.services.ServiceFactory;
import org.jboss.xb.binding.ObjectModelFactory;
import org.jboss.xb.binding.Unmarshaller;
import org.jboss.xb.binding.UnmarshallerFactory;
@@ -64,82 +63,63 @@
Collection consumers = registry.getConfiguredConsumers();
assertNotNull(consumers);
- assertEquals(7, consumers.size());
+ assertEquals(6, consumers.size());
assertNotNull(registry.getConsumer("endpoint1"));
- assertNotNull(registry.getConsumer("endpoint2"));
assertNotNull(registry.getConsumer("producer1"));
assertNotNull(registry.getConsumer("producer2"));
assertNotNull(registry.getConsumer("inDB"));
assertNotNull(registry.getConsumer("inDB2"));
assertNotNull(registry.getConsumer("unavailable"));
- // deployment should only contain
+ // deployment should only contains the consumers with available service factories
WSRPDeployment deployment = (WSRPDeployment)o;
List services = deployment.getServices();
assertNotNull(services);
- assertEquals(5, services.size());
+ assertEquals(4, services.size());
//
Object service = services.get(0);
assertTrue(service instanceof WSRPConsumerService);
- WSRPConsumerService service1 = (WSRPConsumerService)service;
- assertEquals("endpoint1", service1.getId());
- WSRPConsumer consumer1 = service1.getConsumer();
- ProducerInfo info = consumer1.getProducerInfo();
+ WSRPConsumerService consumerService = (WSRPConsumerService)service;
+ assertEquals("endpoint1", consumerService.getId());
+ WSRPConsumer consumer = consumerService.getConsumer();
+ ProducerInfo info = consumer.getProducerInfo();
assertNotNull(info);
- assertEquals(service1.getId(), info.getId());
+ assertEquals(consumerService.getId(), info.getId());
EndpointConfigurationInfo endInfo = info.getEndpointConfigurationInfo();
assertNotNull(endInfo);
- assertNotNull(consumer1.getServiceFactory());
- assertTrue(consumer1.getServiceFactory() instanceof PerEndpointSOAPInvokerServiceFactory);
- PerEndpointSOAPInvokerServiceFactory serviceFactory1 = (PerEndpointSOAPInvokerServiceFactory)consumer1.getServiceFactory();
- assertEquals("service-description-1", serviceFactory1.getServiceDescriptionURL());
- assertEquals("markup-1", serviceFactory1.getMarkupURL());
- assertEquals("registration-1", serviceFactory1.getRegistrationURL());
- assertEquals("portlet-management-1", serviceFactory1.getPortletManagementURL());
- assertEquals(endInfo.getServiceDescriptionURL(), serviceFactory1.getServiceDescriptionURL());
- assertEquals(endInfo.getMarkupURL(), serviceFactory1.getMarkupURL());
- assertEquals(endInfo.getRegistrationURL(), serviceFactory1.getRegistrationURL());
- assertEquals(endInfo.getPortletManagementURL(), serviceFactory1.getPortletManagementURL());
+ assertNotNull(consumer.getServiceFactory());
+ assertTrue(consumer.getServiceFactory() instanceof PerEndpointSOAPInvokerServiceFactory);
+ PerEndpointSOAPInvokerServiceFactory serviceFactory = (PerEndpointSOAPInvokerServiceFactory)consumer.getServiceFactory();
+ assertEquals("http://www.example.com", serviceFactory.getServiceDescriptionURL());
+ assertEquals("http://www.example.com", serviceFactory.getMarkupURL());
+ assertEquals("http://www.example.com", serviceFactory.getRegistrationURL());
+ assertEquals("http://www.example.com", serviceFactory.getPortletManagementURL());
+ assertEquals(endInfo.getServiceDescriptionURL(), serviceFactory.getServiceDescriptionURL());
+ assertEquals(endInfo.getMarkupURL(), serviceFactory.getMarkupURL());
+ assertEquals(endInfo.getRegistrationURL(), serviceFactory.getRegistrationURL());
+ assertEquals(endInfo.getPortletManagementURL(), serviceFactory.getPortletManagementURL());
- //
+ // inDB2 is active and configured from the DB (configured in MockConsumerRegistry)
service = services.get(1);
- assertTrue(service instanceof WSRPConsumerService);
- WSRPConsumerService service2 = (WSRPConsumerService)service;
- assertEquals("endpoint2", service2.getId());
- WSRPConsumer consumer2 = service2.getConsumer();
- assertNotNull(consumer2.getServiceFactory());
- assertTrue(consumer2.getServiceFactory() instanceof PerEndpointSOAPInvokerServiceFactory);
- PerEndpointSOAPInvokerServiceFactory serviceFactory2 = (PerEndpointSOAPInvokerServiceFactory)consumer2.getServiceFactory();
- assertEquals("service-description-2", serviceFactory2.getServiceDescriptionURL());
- assertEquals("markup-2", serviceFactory2.getMarkupURL());
- assertEquals("registration-2", serviceFactory2.getRegistrationURL());
- assertEquals("portlet-management-2", serviceFactory2.getPortletManagementURL());
+ consumer = ((WSRPConsumerService)service).getConsumer();
+ assertEquals("inDB2", consumer.getProducerId());
+ assertNull(consumer.getProducerInfo().getExpirationCacheSeconds());
+ EndpointConfigurationInfo endpoint = consumer.getProducerInfo().getEndpointConfigurationInfo();
+ assertEquals("service-description-2", endpoint.getServiceDescriptionURL());
+ assertEquals("markup-2", endpoint.getMarkupURL());
+ assertEquals("registration-2", endpoint.getRegistrationURL());
+ assertEquals("portlet-management-2", endpoint.getPortletManagementURL());
- // inDB2 is active and configured from the DB (configured in MockConsumerRegistry)
- service = services.get(2);
- consumer2 = ((WSRPConsumerService)service).getConsumer();
- assertEquals("inDB2", consumer2.getProducerId());
- assertNull(consumer2.getProducerInfo().getExpirationCacheSeconds());
- assertNotNull(consumer2.getServiceFactory());
- assertTrue(consumer2.getServiceFactory() instanceof PerEndpointSOAPInvokerServiceFactory);
- serviceFactory2 = (PerEndpointSOAPInvokerServiceFactory)consumer2.getServiceFactory();
- assertEquals("service-description-2", serviceFactory2.getServiceDescriptionURL());
- assertEquals("markup-2", serviceFactory2.getMarkupURL());
- assertEquals("registration-2", serviceFactory2.getRegistrationURL());
- assertEquals("portlet-management-2", serviceFactory2.getPortletManagementURL());
-
//
- service = services.get(3);
+ service = services.get(2);
assertTrue(service instanceof WSRPConsumerService);
- WSRPConsumerService service3 = (WSRPConsumerService)service;
- assertEquals("producer1", service3.getId());
- WSRPConsumer consumer3 = service3.getConsumer();
- info = consumer3.getProducerInfo();
+ consumerService = (WSRPConsumerService)service;
+ assertEquals("producer1", consumerService.getId());
+ consumer = consumerService.getConsumer();
+ info = consumer.getProducerInfo();
assertEquals(120, info.getExpirationCacheSeconds().intValue());
- ServiceFactory serviceFactory = consumer3.getServiceFactory();
- assertNotNull(serviceFactory);
- assertTrue(serviceFactory instanceof RemoteSOAPInvokerServiceFactory);
+ assertTrue(consumer.getServiceFactory() instanceof RemoteSOAPInvokerServiceFactory);
endInfo = info.getEndpointConfigurationInfo();
assertNotNull(endInfo);
assertTrue(endInfo.usesWSDL());
@@ -162,11 +142,11 @@
assertEquals("en-US", property.getLang());
assertEquals("value", property.getStringValue());
- service = services.get(4);
- service3 = (WSRPConsumerService)service;
- assertEquals("producer2", service3.getId());
- consumer3 = service3.getConsumer();
- registrationData = consumer3.getProducerInfo().getRegistrationInfo().getRegistrationData();
+ service = services.get(3);
+ consumerService = (WSRPConsumerService)service;
+ assertEquals("producer2", consumerService.getId());
+ consumer = consumerService.getConsumer();
+ registrationData = consumer.getProducerInfo().getRegistrationInfo().getRegistrationData();
assertNotNull(registrationData);
assertNotNull(registrationData.getConsumerName());
assertEquals(WSRPConstants.CONSUMER_AGENT, registrationData.getConsumerAgent());
Modified: trunk/wsrp/src/main/org/jboss/portal/test/wsrp/other/EndpointConfigurationInfoTestCase.java
===================================================================
--- trunk/wsrp/src/main/org/jboss/portal/test/wsrp/other/EndpointConfigurationInfoTestCase.java 2007-03-03 19:23:42 UTC (rev 6505)
+++ trunk/wsrp/src/main/org/jboss/portal/test/wsrp/other/EndpointConfigurationInfoTestCase.java 2007-03-03 19:26:08 UTC (rev 6506)
@@ -59,6 +59,7 @@
assertNotNull(info.getServiceFactory());
assertEquals(url, info.getServiceFactory().getServiceDescriptionURL());
assertEquals(url, info.getServiceFactory().getMarkupURL());
+ assertTrue(info.getServiceFactory().isAvailable());
}
public void testSetWSDLURL()
Modified: trunk/wsrp/src/main/org/jboss/portal/wsrp/deployment/WSRPDeploymentFactory.java
===================================================================
--- trunk/wsrp/src/main/org/jboss/portal/wsrp/deployment/WSRPDeploymentFactory.java 2007-03-03 19:23:42 UTC (rev 6505)
+++ trunk/wsrp/src/main/org/jboss/portal/wsrp/deployment/WSRPDeploymentFactory.java 2007-03-03 19:26:08 UTC (rev 6506)
@@ -280,9 +280,6 @@
{
message = "Added consumer for producer '" + service.getId() + "' from xml configuration.";
deployment.getServices().add(service);
-
- // only persist the consumer if the service factory is available
- consumerRegistry.persistConsumer(service.getConsumer());
}
else
{
@@ -290,6 +287,9 @@
+ service.getId() + "'. The consumer will NOT be available.";
}
+ // persist the consumer once the whole information is known
+ consumerRegistry.persistConsumer(service.getConsumer());
+
log.info(message);
}
}
Modified: trunk/wsrp/src/main/org/jboss/portal/wsrp/services/PerEndpointSOAPInvokerServiceFactory.java
===================================================================
--- trunk/wsrp/src/main/org/jboss/portal/wsrp/services/PerEndpointSOAPInvokerServiceFactory.java 2007-03-03 19:23:42 UTC (rev 6505)
+++ trunk/wsrp/src/main/org/jboss/portal/wsrp/services/PerEndpointSOAPInvokerServiceFactory.java 2007-03-03 19:26:08 UTC (rev 6506)
@@ -40,11 +40,14 @@
public class PerEndpointSOAPInvokerServiceFactory extends AbstractSOAPServiceFactory
{
+ // Used to ensure that even invalid values can be persisted to DB so that it can be accessed from the GUI
+ public final static String UNSET = "MUST BE SET";
+
/** . */
- protected String serviceDescriptionURL;
+ protected String serviceDescriptionURL = UNSET;
/** . */
- protected String markupURL;
+ protected String markupURL = UNSET;
/** . */
protected String registrationURL;
@@ -149,6 +152,6 @@
public boolean isAvailable()
{
- return markupURL != null && serviceDescriptionURL != null;
+ return !UNSET.equals(serviceDescriptionURL) && !UNSET.equals(markupURL);
}
}
Modified: trunk/wsrp/src/resources/tests/test-deployment-lib-jar/test-wsrp.xml
===================================================================
--- trunk/wsrp/src/resources/tests/test-deployment-lib-jar/test-wsrp.xml 2007-03-03 19:23:42 UTC (rev 6505)
+++ trunk/wsrp/src/resources/tests/test-deployment-lib-jar/test-wsrp.xml 2007-03-03 19:26:08 UTC (rev 6506)
@@ -23,6 +23,7 @@
<deployments>
<deployment>
+ <!-- unvailable -->
<wsrp-producer id="inDB">
<endpoint-config>
<service-description-url>service-description-1</service-description-url>
@@ -33,26 +34,18 @@
</wsrp-producer>
</deployment>
<deployment>
+ <!-- available -->
<wsrp-producer id="endpoint1">
<endpoint-config>
- <service-description-url>service-description-1</service-description-url>
- <markup-url>markup-1</markup-url>
- <registration-url>registration-1</registration-url>
- <portlet-management-url>portlet-management-1</portlet-management-url>
+ <service-description-url>http://www.example.com</service-description-url>
+ <markup-url>http://www.example.com</markup-url>
+ <registration-url>http://www.example.com</registration-url>
+ <portlet-management-url>http://www.example.com</portlet-management-url>
</endpoint-config>
</wsrp-producer>
</deployment>
<deployment>
- <wsrp-producer id="endpoint2">
- <endpoint-config>
- <service-description-url>service-description-2</service-description-url>
- <markup-url>markup-2</markup-url>
- <registration-url>registration-2</registration-url>
- <portlet-management-url>portlet-management-2</portlet-management-url>
- </endpoint-config>
- </wsrp-producer>
- </deployment>
- <deployment>
+ <!-- available -->
<wsrp-producer id="inDB2">
<endpoint-config>
<service-description-url>service-description-2</service-description-url>
@@ -63,6 +56,7 @@
</wsrp-producer>
</deployment>
<deployment>
+ <!-- available -->
<wsrp-producer id="producer1" expiration-cache='120'>
<endpoint-wsdl-url>http://wsrp.bea.com:7001/producer/producer?WSDL</endpoint-wsdl-url>
<registration-data>
@@ -81,12 +75,11 @@
</wsrp-producer>
</deployment>
<deployment>
+ <!-- available -->
<wsrp-producer id="producer2">
<endpoint-config>
- <service-description-url>service-description-3</service-description-url>
- <markup-url>markup-3</markup-url>
- <registration-url>registration-3</registration-url>
- <portlet-management-url>portlet-management-3</portlet-management-url>
+ <service-description-url>http://www.example.com</service-description-url>
+ <markup-url>http://www.example.com</markup-url>
</endpoint-config>
<registration-data/>
</wsrp-producer>
17 years, 8 months