May 2007 - portal-commits - Jboss List Archives

JBoss Portal SVN: r7358 - trunk/core/src/resources/portal-core-sar/conf/identity.

by portal-commits＠lists.jboss.org

Author: bdaw Date: 2007-05-30 06:58:35 -0400 (Wed, 30 May 2007) New Revision: 7358 Modified: trunk/core/src/resources/portal-core-sar/conf/identity/ldap_identity-config.xml Log: typo Modified: trunk/core/src/resources/portal-core-sar/conf/identity/ldap_identity-config.xml =================================================================== --- trunk/core/src/resources/portal-core-sar/conf/identity/ldap_identity-config.xml 2007-05-30 09:43:51 UTC (rev 7357) +++ trunk/core/src/resources/portal-core-sar/conf/identity/ldap_identity-config.xml 2007-05-30 10:58:35 UTC (rev 7358) @@ -140,7 +140,7 @@  <option> <name>member</name> - <value>uid=admin,ou=People,o=test,c=portal,dc=example,dc=com</value> + <value>uid=admin,ou=People,o=test,dc=portal,dc=example,dc=com</value> </option> </option-group> </options>

16 years, 11 months

1
0
0 / 0

JBoss Portal SVN: r7357 - trunk/core/src/resources/portal-core-sar/conf/identity.

by portal-commits＠lists.jboss.org

Author: bdaw Date: 2007-05-30 05:43:51 -0400 (Wed, 30 May 2007) New Revision: 7357 Modified: trunk/core/src/resources/portal-core-sar/conf/identity/ldap_identity-config.xml Log: typo Modified: trunk/core/src/resources/portal-core-sar/conf/identity/ldap_identity-config.xml =================================================================== --- trunk/core/src/resources/portal-core-sar/conf/identity/ldap_identity-config.xml 2007-05-30 09:43:01 UTC (rev 7356) +++ trunk/core/src/resources/portal-core-sar/conf/identity/ldap_identity-config.xml 2007-05-30 09:43:51 UTC (rev 7357) @@ -140,7 +140,7 @@  <option> <name>member</name> - <value>uid=admin,ou=People,o=test,dc=portal,dc=example,dc=com</value> + <value>uid=admin,ou=People,o=test,c=portal,dc=example,dc=com</value> </option> </option-group> </options>

16 years, 11 months

1
0
0 / 0

JBoss Portal SVN: r7356 - trunk/core/src/resources/portal-core-sar/conf/identity.

by portal-commits＠lists.jboss.org

Author: bdaw Date: 2007-05-30 05:43:01 -0400 (Wed, 30 May 2007) New Revision: 7356 Modified: trunk/core/src/resources/portal-core-sar/conf/identity/ldap_identity-config.xml Log: correct sample config to be preconfigured for local OpenDS Modified: trunk/core/src/resources/portal-core-sar/conf/identity/ldap_identity-config.xml =================================================================== --- trunk/core/src/resources/portal-core-sar/conf/identity/ldap_identity-config.xml 2007-05-30 09:37:19 UTC (rev 7355) +++ trunk/core/src/resources/portal-core-sar/conf/identity/ldap_identity-config.xml 2007-05-30 09:43:01 UTC (rev 7356) @@ -33,7 +33,7 @@ <config> <option> <name>host</name> - <value>example.com</value> + <value>localhost</value> </option> <option> <name>port</name> @@ -45,7 +45,7 @@ </option> <option> <name>adminPassword</name> - <value>lolo</value> + <value>password</value> </option>  <option> <name>member</name> - <value>uid=admin,ou=People,o=test,dc=portal,dc=qa,dc=atl,dc=jboss,dc=com</value> + <value>uid=admin,ou=People,o=test,dc=portal,dc=example,dc=com</value> </option> </option-group> </options>

16 years, 11 months

1
0
0 / 0

JBoss Portal SVN: r7355 - trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf.

by portal-commits＠lists.jboss.org

Author: thomas.heute(a)jboss.com Date: 2007-05-30 05:37:19 -0400 (Wed, 30 May 2007) New Revision: 7355 Modified: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editPageTheme.xhtml trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editPortalTheme.xhtml trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editWindowTheme.xhtml Log: Modifying theme had no effect, thanks rharari for the patch ! Modified: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editPageTheme.xhtml =================================================================== --- trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editPageTheme.xhtml 2007-05-30 08:00:51 UTC (rev 7354) +++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editPageTheme.xhtml 2007-05-30 09:37:19 UTC (rev 7355) @@ -8,12 +8,10 @@ <h3>Page theme properties:</h3> <ui:decorate template="common/editTheme.xhtml"> <ui:define name="form_submit"> - <h:form> - <h:commandButton value="Update" action="#{themePropertyAction.execute}" styleClass="portlet-form-button"/> - <h:commandButton value="Cancel" action="#{portalobjectmgr.selectObject}" styleClass="portlet-form-button"> - <f:param name="id" value="#{node.id}"/> - </h:commandButton> - </h:form> + <h:commandButton value="Update" action="#{themePropertyAction.execute}" styleClass="portlet-form-button"/> + <h:commandButton value="Cancel" action="#{portalobjectmgr.selectObject}" styleClass="portlet-form-button"> + <f:param name="id" value="#{node.id}"/> + </h:commandButton> </ui:define> </ui:decorate> </ui:define> Modified: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editPortalTheme.xhtml =================================================================== --- trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editPortalTheme.xhtml 2007-05-30 08:00:51 UTC (rev 7354) +++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editPortalTheme.xhtml 2007-05-30 09:37:19 UTC (rev 7355) @@ -12,12 +12,10 @@ <br/> <ui:decorate template="common/editTheme.xhtml"> <ui:define name="form_submit"> - <h:form> - <h:commandButton value="Update" action="#{themePropertyAction.execute}" styleClass="portlet-form-button"/> - <h:commandButton value="Cancel" action="#{portalobjectmgr.selectObject}" styleClass="portlet-form-button"> - <f:param name="id" value="#{node.id}"/> - </h:commandButton> - </h:form> + <h:commandButton value="Update" action="#{themePropertyAction.execute}" styleClass="portlet-form-button"/> + <h:commandButton value="Cancel" action="#{portalobjectmgr.selectObject}" styleClass="portlet-form-button"> + <f:param name="id" value="#{node.id}"/> + </h:commandButton> </ui:define> </ui:decorate> Modified: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editWindowTheme.xhtml =================================================================== --- trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editWindowTheme.xhtml 2007-05-30 08:00:51 UTC (rev 7354) +++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editWindowTheme.xhtml 2007-05-30 09:37:19 UTC (rev 7355) @@ -8,12 +8,10 @@ <h3>Window theme properties:</h3> <ui:decorate template="common/editWindowTheme.xhtml"> <ui:define name="form_submit"> - <h:form> - <h:commandButton value="Update" action="#{themePropertyAction.execute}" styleClass="portlet-form-button"/> - <h:commandButton value="Cancel" action="#{portalobjectmgr.selectObject}" styleClass="portlet-form-button"> - <f:param name="id" value="#{node.id}"/> - </h:commandButton> - </h:form> + <h:commandButton value="Update" action="#{themePropertyAction.execute}" styleClass="portlet-form-button"/> + <h:commandButton value="Cancel" action="#{portalobjectmgr.selectObject}" styleClass="portlet-form-button"> + <f:param name="id" value="#{node.id}"/> + </h:commandButton> </ui:define> </ui:decorate> </ui:define>

16 years, 11 months

1
0
0 / 0

JBoss Portal SVN: r7354 - docs/trunk/referenceGuide/en/modules.

by portal-commits＠lists.jboss.org

Author: bdaw Date: 2007-05-30 04:00:51 -0400 (Wed, 30 May 2007) New Revision: 7354 Modified: docs/trunk/referenceGuide/en/modules/ldap.xml Log: small docu update Modified: docs/trunk/referenceGuide/en/modules/ldap.xml =================================================================== --- docs/trunk/referenceGuide/en/modules/ldap.xml 2007-05-30 07:51:45 UTC (rev 7353) +++ docs/trunk/referenceGuide/en/modules/ldap.xml 2007-05-30 08:00:51 UTC (rev 7354) @@ -306,7 +306,7 @@ <emphasis role="bold">common</emphasis>: <itemizedlist> <listitem> - <emphasis role="bold">userCtxDN</emphasis> - DN that will be used as context for user searches + <emphasis role="bold">userCtxDN</emphasis> - DN that will be used as context for user searches. More than one value can be specified. </listitem> <listitem> <emphasis role="bold">userSearchFilter</emphasis> - ldap filter to search users with. {0} will be substitute with user name. Example filter can look like this: @@ -437,7 +437,7 @@ <emphasis role="bold">common</emphasis>: <itemizedlist> <listitem> - <emphasis role="bold">roleCtxDN</emphasis> - DN that will be used as context for role searches + <emphasis role="bold">roleCtxDN</emphasis> - DN that will be used as context for role searches. More than one value can be specified. </listitem> <listitem> <emphasis role="bold">roleSearchFilter</emphasis> - ldap filter to search roles with. {0} will be substitute with role name. Example filter can look like this: @@ -1175,36 +1175,6 @@ <entry align="center"><emphasis>Not Supported</emphasis></entry> <entry align="center"><emphasis>Supported</emphasis></entry> </row> -  </tbody> </tgroup> </table>

16 years, 11 months

1
0
0 / 0

JBoss Portal SVN: r7353 - in trunk: identity/src/resources/test/config/extrole and 2 other directories.

by portal-commits＠lists.jboss.org

Author: bdaw Date: 2007-05-30 03:51:45 -0400 (Wed, 30 May 2007) New Revision: 7353 Modified: trunk/identity/src/main/org/jboss/portal/test/identity/ldap/LDAPExtRoleModuleTestCase.java trunk/identity/src/main/org/jboss/portal/test/identity/ldap/LDAPExtUserModuleTestCase.java trunk/identity/src/resources/test/config/extrole/opends-config.xml trunk/identity/src/resources/test/config/extrole/openldap-config.xml trunk/identity/src/resources/test/config/extrole/rhds-config.xml trunk/identity/src/resources/test/config/extuser/opends-config.xml trunk/identity/src/resources/test/config/extuser/openldap-config.xml trunk/identity/src/resources/test/config/extuser/rhds-config.xml trunk/test/src/etc/ldap/ldif/initial-tests-qa-opends.ldif trunk/test/src/etc/ldap/ldif/initial-tests-qa-openldap.ldif trunk/test/src/etc/ldap/ldif/initial-tests-qa.ldif Log: testcases for multiply search contexts in LDAP Ext modules Modified: trunk/identity/src/main/org/jboss/portal/test/identity/ldap/LDAPExtRoleModuleTestCase.java =================================================================== --- trunk/identity/src/main/org/jboss/portal/test/identity/ldap/LDAPExtRoleModuleTestCase.java 2007-05-29 22:53:56 UTC (rev 7352) +++ trunk/identity/src/main/org/jboss/portal/test/identity/ldap/LDAPExtRoleModuleTestCase.java 2007-05-30 07:51:45 UTC (rev 7353) @@ -5,6 +5,7 @@ import org.jboss.portal.identity.IdentityServiceControllerImpl; import org.jboss.portal.identity.IdentityContext; import org.jboss.portal.identity.IdentityException; +import org.jboss.portal.identity.NoSuchUserException; import org.jboss.portal.identity.ldap.LDAPRoleImpl; import java.util.Set; @@ -131,7 +132,7 @@ assertEquals(ldapr.getName(), "Echo"); int count = roleModule.getRolesCount(); - assertEquals(3, count); + assertEquals(4, count); } public void testFindRolesByNames() throws Exception @@ -181,4 +182,22 @@ assertTrue(roleNames.contains(("cn=Echo1,ou=Roles," + suffix).toLowerCase())); assertTrue(roleNames.contains(("cn=TheDuke,ou=Roles," + suffix).toLowerCase())); } + + public void testSearchCtx() throws Exception + { + LDAPRoleImpl ldapr = (LDAPRoleImpl)roleModule.findRoleByName("User11"); + assertEquals(ldapr.getDn().toLowerCase(), ("cn=User11,ou=Roles1," + suffix).toLowerCase()); + assertEquals(ldapr.getName(), "User11"); + + try + { + ldapr = (LDAPRoleImpl)roleModule.findRoleByName("User21"); + fail(); + } + catch (IdentityException e) + { + //expected + } + + } } Modified: trunk/identity/src/main/org/jboss/portal/test/identity/ldap/LDAPExtUserModuleTestCase.java =================================================================== --- trunk/identity/src/main/org/jboss/portal/test/identity/ldap/LDAPExtUserModuleTestCase.java 2007-05-29 22:53:56 UTC (rev 7352) +++ trunk/identity/src/main/org/jboss/portal/test/identity/ldap/LDAPExtUserModuleTestCase.java 2007-05-30 07:51:45 UTC (rev 7353) @@ -11,6 +11,7 @@ import org.jboss.portal.identity.IdentityException; import org.jboss.portal.identity.User; import org.jboss.portal.identity.Role; +import org.jboss.portal.identity.NoSuchUserException; import org.jboss.portal.identity.ldap.LDAPUserImpl; import org.apache.log4j.Appender; import org.apache.log4j.ConsoleAppender; @@ -100,7 +101,7 @@ assertEquals(ldapu.getUserName(), "jduke"); int count = userModule.getUserCount(); - assertEquals(5, count); + assertEquals(7, count); } //TODO: test findUsers @@ -129,4 +130,26 @@ assertTrue(u.validatePassword("dodo")); } + + public void testSearchCtx() throws Exception + { + //users should be visable in both configured search contexts + User u = userModule.findUserByUserName("user11"); + assertNotNull(u); + assertEquals("user11", u.getUserName()); + assertTrue(u.validatePassword("theduke")); + + //and not in not configured context + try + { + u = userModule.findUserByUserName("user21"); + fail(); + } + catch (NoSuchUserException e) + { + //expected + } + + + } } Modified: trunk/identity/src/resources/test/config/extrole/opends-config.xml =================================================================== --- trunk/identity/src/resources/test/config/extrole/opends-config.xml 2007-05-29 22:53:56 UTC (rev 7352) +++ trunk/identity/src/resources/test/config/extrole/opends-config.xml 2007-05-30 07:51:45 UTC (rev 7353) @@ -102,6 +102,7 @@ <option> <name>userCtxDN</name> <value>ou=People,dc=example,dc=com</value> + <value>ou=People1,dc=example,dc=com</value> </option> <option> <name>userSearchFilter</name> @@ -110,6 +111,7 @@ <option> <name>roleCtxDN</name> <value>ou=Roles,dc=example,dc=com</value> + <value>ou=Roles1,dc=example,dc=com</value> </option> <option> <name>roleSearchFilter</name> Modified: trunk/identity/src/resources/test/config/extrole/openldap-config.xml =================================================================== --- trunk/identity/src/resources/test/config/extrole/openldap-config.xml 2007-05-29 22:53:56 UTC (rev 7352) +++ trunk/identity/src/resources/test/config/extrole/openldap-config.xml 2007-05-30 07:51:45 UTC (rev 7353) @@ -102,10 +102,12 @@ <option> <name>userCtxDN</name> <value>ou=People,dc=testsuite,dc=portal,dc=my-domain,dc=com</value> + <value>ou=People1,dc=testsuite,dc=portal,dc=my-domain,dc=com</value> </option> <option> <name>roleCtxDN</name> <value>ou=Roles,dc=testsuite,dc=portal,dc=my-domain,dc=com</value> + <value>ou=Roles1,dc=testsuite,dc=portal,dc=my-domain,dc=com</value> </option> <option> <name>userSearchFilter</name> Modified: trunk/identity/src/resources/test/config/extrole/rhds-config.xml =================================================================== --- trunk/identity/src/resources/test/config/extrole/rhds-config.xml 2007-05-29 22:53:56 UTC (rev 7352) +++ trunk/identity/src/resources/test/config/extrole/rhds-config.xml 2007-05-30 07:51:45 UTC (rev 7353) @@ -102,10 +102,12 @@ <option> <name>userCtxDN</name> <value>ou=People,dc=testsuite,dc=portal,dc=qa,dc=atl,dc=jboss,dc=com</value> + <value>ou=People1,dc=testsuite,dc=portal,dc=qa,dc=atl,dc=jboss,dc=com</value> </option> <option> <name>roleCtxDN</name> <value>ou=Roles,dc=testsuite,dc=portal,dc=qa,dc=atl,dc=jboss,dc=com</value> + <value>ou=Roles1,dc=testsuite,dc=portal,dc=qa,dc=atl,dc=jboss,dc=com</value> </option> <option> <name>userSearchFilter</name> Modified: trunk/identity/src/resources/test/config/extuser/opends-config.xml =================================================================== --- trunk/identity/src/resources/test/config/extuser/opends-config.xml 2007-05-29 22:53:56 UTC (rev 7352) +++ trunk/identity/src/resources/test/config/extuser/opends-config.xml 2007-05-30 07:51:45 UTC (rev 7353) @@ -101,6 +101,7 @@ <option> <name>userCtxDN</name> <value>ou=People,dc=example,dc=com</value> + <value>ou=People1,dc=example,dc=com</value> </option> <option> <name>userSearchFilter</name> @@ -109,6 +110,7 @@ <option> <name>roleCtxDN</name> <value>ou=Roles,dc=example,dc=com</value> + <value>ou=Roles1,dc=example,dc=com</value> </option> </option-group> </options> Modified: trunk/identity/src/resources/test/config/extuser/openldap-config.xml =================================================================== --- trunk/identity/src/resources/test/config/extuser/openldap-config.xml 2007-05-29 22:53:56 UTC (rev 7352) +++ trunk/identity/src/resources/test/config/extuser/openldap-config.xml 2007-05-30 07:51:45 UTC (rev 7353) @@ -101,10 +101,12 @@ <option> <name>userCtxDN</name> <value>ou=People,dc=testsuite,dc=portal,dc=my-domain,dc=com</value> + <value>ou=People1,dc=testsuite,dc=portal,dc=my-domain,dc=com</value> </option> <option> <name>roleCtxDN</name> <value>ou=Roles,dc=testsuite,dc=portal,dc=my-domain,dc=com</value> + <value>ou=Roles1,dc=testsuite,dc=portal,dc=my-domain,dc=com</value> </option> <option> <name>userSearchFilter</name> Modified: trunk/identity/src/resources/test/config/extuser/rhds-config.xml =================================================================== --- trunk/identity/src/resources/test/config/extuser/rhds-config.xml 2007-05-29 22:53:56 UTC (rev 7352) +++ trunk/identity/src/resources/test/config/extuser/rhds-config.xml 2007-05-30 07:51:45 UTC (rev 7353) @@ -101,10 +101,12 @@ <option> <name>userCtxDN</name> <value>ou=People,dc=testsuite,dc=portal,dc=qa,dc=atl,dc=jboss,dc=com</value> + <value>ou=People1,dc=testsuite,dc=portal,dc=qa,dc=atl,dc=jboss,dc=com</value> </option> <option> <name>roleCtxDN</name> <value>ou=Roles,dc=testsuite,dc=portal,dc=qa,dc=atl,dc=jboss,dc=com</value> + <value>ou=Roles1,dc=testsuite,dc=portal,dc=qa,dc=atl,dc=jboss,dc=com</value> </option> <option> <name>userSearchFilter</name> Modified: trunk/test/src/etc/ldap/ldif/initial-tests-qa-opends.ldif =================================================================== --- trunk/test/src/etc/ldap/ldif/initial-tests-qa-opends.ldif 2007-05-29 22:53:56 UTC (rev 7352) +++ trunk/test/src/etc/ldap/ldif/initial-tests-qa-opends.ldif 2007-05-30 07:51:45 UTC (rev 7353) @@ -61,6 +61,57 @@ userPassword: theduke mail: email(a)email.com +dn: ou=People1,dc=example,dc=com +objectclass: top +objectclass: organizationalUnit +ou: People1 + +dn: uid=user11,ou=People1,dc=example,dc=com +objectclass: top +objectclass: inetOrgPerson +objectclass: person +uid: user11 +cn: Java Duke +sn: Duke +userPassword: theduke +mail: email(a)email.com + +dn: uid=user12,ou=People1,dc=example,dc=com +objectclass: top +objectclass: inetOrgPerson +objectclass: person +uid: user12 +cn: Java Duke1 +sn: Duke1 +userPassword: theduke +mail: email(a)email.com + +dn: ou=People2,dc=example,dc=com +objectclass: top +objectclass: organizationalUnit +ou: People2 + +dn: uid=user21,ou=People2,dc=example,dc=com +objectclass: top +objectclass: inetOrgPerson +objectclass: person +uid: user21 +cn: Java Duke +sn: Duke +userPassword: theduke +mail: email(a)email.com + +dn: uid=user22,ou=People2,dc=example,dc=com +objectclass: top +objectclass: inetOrgPerson +objectclass: person +uid: user22 +cn: Java Duke1 +sn: Duke1 +userPassword: theduke +mail: email(a)email.com + + dn: ou=Roles,dc=example,dc=com objectclass: top objectclass: organizationalUnit @@ -91,7 +142,37 @@ description: TheDuke role context member: uid=jduke,ou=People,dc=example,dc=com +dn: ou=Roles1,dc=example,dc=com +objectclass: top +objectclass: organizationalUnit +ou: Roles1 +dn: cn=User11,ou=Roles1,dc=example,dc=com +objectClass: top +objectClass: groupOfNames +cn: User11 +description: the JBossAdmin group +member: uid=jduke1,ou=People,dc=example,dc=com +member: uid=jduke3,ou=People,dc=example,dc=com +member: uid=jduke4,ou=People,dc=example,dc=com + +dn: ou=Roles2,dc=example,dc=com +objectclass: top +objectclass: organizationalUnit +ou: Roles2 + +dn: cn=User21,ou=Roles2,dc=example,dc=com +objectClass: top +objectClass: groupOfNames +cn: User21 +description: the JBossAdmin group +member: uid=jduke1,ou=People,dc=example,dc=com +member: uid=jduke3,ou=People,dc=example,dc=com +member: uid=jduke4,ou=People,dc=example,dc=com + + + + # tree2 dn: o=example2,dc=example,dc=com objectclass: top Modified: trunk/test/src/etc/ldap/ldif/initial-tests-qa-openldap.ldif =================================================================== --- trunk/test/src/etc/ldap/ldif/initial-tests-qa-openldap.ldif 2007-05-29 22:53:56 UTC (rev 7352) +++ trunk/test/src/etc/ldap/ldif/initial-tests-qa-openldap.ldif 2007-05-30 07:51:45 UTC (rev 7353) @@ -61,6 +61,57 @@ userPassword: theduke mail: email(a)email.com +dn: ou=People1,dc=testsuite,dc=portal,dc=my-domain,dc=com +objectclass: top +objectclass: organizationalUnit +ou: People1 + +dn: uid=user11,ou=People1,dc=testsuite,dc=portal,dc=my-domain,dc=com +objectclass: top +objectclass: inetOrgPerson +objectclass: person +uid: user11 +cn: Java Duke +sn: Duke +userPassword: theduke +mail: email(a)email.com + +dn: uid=user12,ou=People1,dc=testsuite,dc=portal,dc=my-domain,dc=com +objectclass: top +objectclass: inetOrgPerson +objectclass: person +uid: user12 +cn: Java Duke +sn: Duke +userPassword: theduke +mail: email(a)email.com + +dn: ou=People2,dc=testsuite,dc=portal,dc=my-domain,dc=com +objectclass: top +objectclass: organizationalUnit +ou: People2 + +dn: uid=user21,ou=People2,dc=testsuite,dc=portal,dc=my-domain,dc=com +objectclass: top +objectclass: inetOrgPerson +objectclass: person +uid: user21 +cn: Java Duke +sn: Duke +userPassword: theduke +mail: email(a)email.com + +dn: uid=user22,ou=People2,dc=testsuite,dc=portal,dc=my-domain,dc=com +objectclass: top +objectclass: inetOrgPerson +objectclass: person +uid: user22 +cn: Java Duke +sn: Duke +userPassword: theduke +mail: email(a)email.com + + dn: ou=Roles,dc=testsuite,dc=portal,dc=my-domain,dc=com objectclass: top objectclass: organizationalUnit @@ -92,6 +143,35 @@ member: uid=jduke,ou=People,dc=testsuite,dc=portal,dc=my-domain,dc=com +dn: ou=Roles1,dc=testsuite,dc=portal,dc=my-domain,dc=com +objectclass: top +objectclass: organizationalUnit +ou: Roles1 + +dn: cn=User11,ou=Roles1,dc=testsuite,dc=portal,dc=my-domain,dc=com +objectClass: top +objectClass: groupOfNames +cn: User11 +description: the JBossAdmin group +member: uid=jduke1,ou=People,dc=testsuite,dc=portal,dc=my-domain,dc=com +member: uid=jduke3,ou=People,dc=testsuite,dc=portal,dc=my-domain,dc=com +member: uid=jduke4,ou=People,dc=testsuite,dc=portal,dc=my-domain,dc=com + +dn: ou=Roles2,dc=testsuite,dc=portal,dc=my-domain,dc=com +objectclass: top +objectclass: organizationalUnit +ou: Roles2 + +dn: cn=User21,ou=Roles2,dc=testsuite,dc=portal,dc=my-domain,dc=com +objectClass: top +objectClass: groupOfNames +cn: User21 +description: the JBossAdmin group +member: uid=jduke1,ou=People,dc=testsuite,dc=portal,dc=my-domain,dc=com +member: uid=jduke3,ou=People,dc=testsuite,dc=portal,dc=my-domain,dc=com +member: uid=jduke4,ou=People,dc=testsuite,dc=portal,dc=my-domain,dc=com + + # tree2 dn: o=example2,dc=testsuite,dc=portal,dc=my-domain,dc=com objectclass: top Modified: trunk/test/src/etc/ldap/ldif/initial-tests-qa.ldif =================================================================== --- trunk/test/src/etc/ldap/ldif/initial-tests-qa.ldif 2007-05-29 22:53:56 UTC (rev 7352) +++ trunk/test/src/etc/ldap/ldif/initial-tests-qa.ldif 2007-05-30 07:51:45 UTC (rev 7353) @@ -61,6 +61,57 @@ userPassword: theduke mail: email(a)email.com +dn: ou=People1,dc=testsuite,dc=portal,dc=qa,dc=atl,dc=jboss,dc=com +objectclass: top +objectclass: organizationalUnit +ou: People1 + +dn: uid=user11,ou=People1,dc=testsuite,dc=portal,dc=qa,dc=atl,dc=jboss,dc=com +objectclass: top +objectclass: inetOrgPerson +objectclass: person +uid: user11 +cn: Java Duke +sn: Duke +userPassword: theduke +mail: email(a)email.com + +dn: uid=user12,ou=People1,dc=testsuite,dc=portal,dc=qa,dc=atl,dc=jboss,dc=com +objectclass: top +objectclass: inetOrgPerson +objectclass: person +uid: user12 +cn: Java Duke +sn: Duke +userPassword: theduke +mail: email(a)email.com + +dn: ou=People2,dc=testsuite,dc=portal,dc=qa,dc=atl,dc=jboss,dc=com +objectclass: top +objectclass: organizationalUnit +ou: People2 + +dn: uid=user21,ou=People2,dc=testsuite,dc=portal,dc=qa,dc=atl,dc=jboss,dc=com +objectclass: top +objectclass: inetOrgPerson +objectclass: person +uid: user21 +cn: Java Duke +sn: Duke +userPassword: theduke +mail: email(a)email.com + +dn: uid=user22,ou=People2,dc=testsuite,dc=portal,dc=qa,dc=atl,dc=jboss,dc=com +objectclass: top +objectclass: inetOrgPerson +objectclass: person +uid: user22 +cn: Java Duke +sn: Duke +userPassword: theduke +mail: email(a)email.com + + dn: ou=Roles,dc=testsuite,dc=portal,dc=qa,dc=atl,dc=jboss,dc=com objectclass: top objectclass: organizationalUnit @@ -91,7 +142,35 @@ description: TheDuke role context member: uid=jduke,ou=People,dc=testsuite,dc=portal,dc=qa,dc=atl,dc=jboss,dc=com +dn: ou=Roles1,dc=testsuite,dc=portal,dc=qa,dc=atl,dc=jboss,dc=com +objectclass: top +objectclass: organizationalUnit +ou: Roles1 +dn: cn=User11,ou=Roles1,dc=testsuite,dc=portal,dc=qa,dc=atl,dc=jboss,dc=com +objectClass: top +objectClass: groupOfNames +cn: User11 +description: the JBossAdmin group +member: uid=jduke1,ou=People,dc=testsuite,dc=portal,dc=qa,dc=atl,dc=jboss,dc=com +member: uid=jduke3,ou=People,dc=testsuite,dc=portal,dc=qa,dc=atl,dc=jboss,dc=com +member: uid=jduke4,ou=People,dc=testsuite,dc=portal,dc=qa,dc=atl,dc=jboss,dc=com + +dn: ou=Roles2,dc=testsuite,dc=portal,dc=qa,dc=atl,dc=jboss,dc=com +objectclass: top +objectclass: organizationalUnit +ou: Roles2 + +dn: cn=User21,ou=Roles2,dc=testsuite,dc=portal,dc=qa,dc=atl,dc=jboss,dc=com +objectClass: top +objectClass: groupOfNames +cn: User21 +description: the JBossAdmin group +member: uid=jduke1,ou=People,dc=testsuite,dc=portal,dc=qa,dc=atl,dc=jboss,dc=com +member: uid=jduke3,ou=People,dc=testsuite,dc=portal,dc=qa,dc=atl,dc=jboss,dc=com +member: uid=jduke4,ou=People,dc=testsuite,dc=portal,dc=qa,dc=atl,dc=jboss,dc=com + + # tree2 dn: o=example2,dc=testsuite,dc=portal,dc=qa,dc=atl,dc=jboss,dc=com objectclass: top

16 years, 11 months

1
0
0 / 0

JBoss Portal SVN: r7352 - in trunk/wsrp/src: main/org/jboss/portal/test/wsrp/v1/producer and 2 other directories.

by portal-commits＠lists.jboss.org

Author: chris.laprun(a)jboss.com Date: 2007-05-29 18:53:56 -0400 (Tue, 29 May 2007) New Revision: 7352 Added: trunk/wsrp/src/resources/tests/test-session-portlet-war/WEB-INF/jboss-portlet.xml Modified: trunk/wsrp/src/main/org/jboss/portal/test/wsrp/portlet/SessionPortlet.java trunk/wsrp/src/main/org/jboss/portal/test/wsrp/v1/producer/MarkupTestCase.java trunk/wsrp/src/resources/tests/test-wsrp-producer-sar/META-INF/jboss-service.xml Log: - Added ProducerCache interceptor to Producer stack in test WSRP producer to allow for correct behavior of response processing and CacheControl generation. - Made SessionPortlet remotable and simplified the markup. - Improved robustness of markup checking in MarkupTestCase. Modified: trunk/wsrp/src/main/org/jboss/portal/test/wsrp/portlet/SessionPortlet.java =================================================================== --- trunk/wsrp/src/main/org/jboss/portal/test/wsrp/portlet/SessionPortlet.java 2007-05-29 19:29:30 UTC (rev 7351) +++ trunk/wsrp/src/main/org/jboss/portal/test/wsrp/portlet/SessionPortlet.java 2007-05-29 22:53:56 UTC (rev 7352) @@ -56,12 +56,10 @@ count = ((Integer)session.getAttribute(COUNT)).intValue() + 1; } session.setAttribute(COUNT, new Integer(count)); - writer.write("<p>"); - writer.write("" + count); - writer.write("</p>"); + writer.write("<p>Session id: " + session.getId() + "</p>"); + writer.write("<p>count = " + count + "</p>"); + writer.write("<a href='" + resp.createRenderURL() + "'>render</a>"); - writer.write("<div><a href=\"" + resp.createRenderURL() + "\">render</a></div>"); - // writer.close(); } Modified: trunk/wsrp/src/main/org/jboss/portal/test/wsrp/v1/producer/MarkupTestCase.java =================================================================== --- trunk/wsrp/src/main/org/jboss/portal/test/wsrp/v1/producer/MarkupTestCase.java 2007-05-29 19:29:30 UTC (rev 7351) +++ trunk/wsrp/src/main/org/jboss/portal/test/wsrp/v1/producer/MarkupTestCase.java 2007-05-29 22:53:56 UTC (rev 7352) @@ -490,8 +490,9 @@ // Markup context MarkupContext markupContext = response.getMarkupContext(); ExtendedAssert.assertNotNull(markupContext); - ExtendedAssert.assertEquals("<p>" + count + "</p><div><a href=\"wsrp_rewrite?wsrp-urlType=render" + - "&wsrp-navigationalState=JBPNS_/wsrp_rewrite\">render</a></div>", markupContext.getMarkupString()); + String markupString = markupContext.getMarkupString(); + ExtendedAssert.assertTrue(markupString.contains("count = " + count)); + ExtendedAssert.assertTrue(markupString.contains("<a href='wsrp_rewrite?wsrp-urlType=render&wsrp-navigationalState=JBPNS_/wsrp_rewrite'>render</a>")); // checking session checkSessionForCurrentlyDeployedPortlet(response); Added: trunk/wsrp/src/resources/tests/test-session-portlet-war/WEB-INF/jboss-portlet.xml =================================================================== --- trunk/wsrp/src/resources/tests/test-session-portlet-war/WEB-INF/jboss-portlet.xml (rev 0) +++ trunk/wsrp/src/resources/tests/test-session-portlet-war/WEB-INF/jboss-portlet.xml 2007-05-29 22:53:56 UTC (rev 7352) @@ -0,0 +1,32 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<!DOCTYPE portlet-app PUBLIC "-//JBoss Portal//DTD JBoss Portlet 2.6//EN" + "http://www.jboss.org/portal/dtd/jboss-portlet_2_6.dtd"> + +<portlet-app> + <portlet> + <portlet-name>Session Test Portlet</portlet-name> + <remotable>true</remotable> + </portlet> +</portlet-app> \ No newline at end of file Modified: trunk/wsrp/src/resources/tests/test-wsrp-producer-sar/META-INF/jboss-service.xml =================================================================== --- trunk/wsrp/src/resources/tests/test-wsrp-producer-sar/META-INF/jboss-service.xml 2007-05-29 19:29:30 UTC (rev 7351) +++ trunk/wsrp/src/resources/tests/test-wsrp-producer-sar/META-INF/jboss-service.xml 2007-05-29 22:53:56 UTC (rev 7352) @@ -97,6 +97,13 @@ <xmbean/> </mbean> <mbean + code="org.jboss.portal.portlet.aspects.portlet.ProducerCacheInterceptor" + name="portal:service=Interceptor,type=Portlet,name=ProducerCache" + xmbean-dd="" + xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean"> + <xmbean/> + </mbean> + <mbean code="org.jboss.portal.server.impl.invocation.JBossInterceptorStackFactory" name="portal:service=InterceptorStackFactory,type=Container" xmbean-dd="" @@ -106,6 +113,7 @@ <depends-list-element>portal:service=Interceptor,type=Portlet,name=ContextDispatcher</depends-list-element> <depends-list-element>portal:service=Interceptor,type=Portlet,name=WindowStates</depends-list-element> <depends-list-element>portal:service=Interceptor,type=Portlet,name=Modes</depends-list-element> + <depends-list-element>portal:service=Interceptor,type=Portlet,name=ProducerCache</depends-list-element> </depends-list> </mbean>

16 years, 11 months

1
0
0 / 0

JBoss Portal SVN: r7351 - trunk/wsrp/src/resources/portal-wsrp-sar/conf/consumer/hibernate.

by portal-commits＠lists.jboss.org

Author: chris.laprun(a)jboss.com Date: 2007-05-29 15:29:30 -0400 (Tue, 29 May 2007) New Revision: 7351 Modified: trunk/wsrp/src/resources/portal-wsrp-sar/conf/consumer/hibernate/domain.hbm.xml Log: - Renamed id on ProducerInfo to persistentId and use direct field access to bypass issue with HIBERNATE-65. Modified: trunk/wsrp/src/resources/portal-wsrp-sar/conf/consumer/hibernate/domain.hbm.xml =================================================================== --- trunk/wsrp/src/resources/portal-wsrp-sar/conf/consumer/hibernate/domain.hbm.xml 2007-05-29 15:10:27 UTC (rev 7350) +++ trunk/wsrp/src/resources/portal-wsrp-sar/conf/consumer/hibernate/domain.hbm.xml 2007-05-29 19:29:30 UTC (rev 7351) @@ -49,7 +49,7 @@ lazy="false"/> <property name="expirationCacheSeconds" column="EXPIRATION_CACHE_SECONDS" type="java.lang.Integer"/> <property name="active" not-null="true" type="boolean"/> - <property name="id" not-null="true" unique="true" type="java.lang.String"/> + <property name="persistentId" not-null="true" unique="true" type="java.lang.String" access="field"/> </class> <class name="org.jboss.portal.wsrp.consumer.EndpointConfigurationInfo" table="JBP_ENDPOINT_INFO">

16 years, 11 months

1
0
0 / 0

JBoss Portal SVN: r7350 - in trunk: portlet-server/src/main/org/jboss/portal/portlet/deployment/jboss and 1 other directory.

by portal-commits＠lists.jboss.org

Author: chris.laprun(a)jboss.com Date: 2007-05-29 11:10:27 -0400 (Tue, 29 May 2007) New Revision: 7350 Modified: trunk/faces/src/main/org/jboss/portal/faces/portlet/JSFMetaBridgePortlet.java trunk/portlet-server/src/main/org/jboss/portal/portlet/deployment/jboss/PortletAppDeployment.java Log: - Better logging. Modified: trunk/faces/src/main/org/jboss/portal/faces/portlet/JSFMetaBridgePortlet.java =================================================================== --- trunk/faces/src/main/org/jboss/portal/faces/portlet/JSFMetaBridgePortlet.java 2007-05-29 11:39:06 UTC (rev 7349) +++ trunk/faces/src/main/org/jboss/portal/faces/portlet/JSFMetaBridgePortlet.java 2007-05-29 15:10:27 UTC (rev 7350) @@ -24,11 +24,11 @@ import org.apache.log4j.Logger; +import javax.portlet.ActionRequest; +import javax.portlet.ActionResponse; import javax.portlet.Portlet; import javax.portlet.PortletConfig; import javax.portlet.PortletException; -import javax.portlet.ActionRequest; -import javax.portlet.ActionResponse; import javax.portlet.PortletSecurityException; import javax.portlet.RenderRequest; import javax.portlet.RenderResponse; @@ -68,15 +68,15 @@ } catch (ClassNotFoundException e) { - log.error("Bridge class not available " + metaBridge.getPortletClassName(), e); + log.error("Bridge class not available: " + metaBridge.getPortletClassName(), e); } catch (IllegalAccessException e) { - log.error("Bridge class not accessible" + metaBridge.getPortletClassName(), e); + log.error("Bridge class not accessible: " + metaBridge.getPortletClassName(), e); } catch (InstantiationException e) { - log.error("Bridge class not instantiable" + metaBridge.getPortletClassName(), e); + log.error("Bridge class not instantiable: " + metaBridge.getPortletClassName(), e); } // Proceed to life cycle Modified: trunk/portlet-server/src/main/org/jboss/portal/portlet/deployment/jboss/PortletAppDeployment.java =================================================================== --- trunk/portlet-server/src/main/org/jboss/portal/portlet/deployment/jboss/PortletAppDeployment.java 2007-05-29 11:39:06 UTC (rev 7349) +++ trunk/portlet-server/src/main/org/jboss/portal/portlet/deployment/jboss/PortletAppDeployment.java 2007-05-29 15:10:27 UTC (rev 7350) @@ -287,7 +287,7 @@ in = Tools.safeBufferedWrapper(servletContext.getResourceAsStream("/WEB-INF/jboss-portlet.xml")); if (in != null) { - log.info("Parsing jboss-portlet.xml" + contextPath); + log.info("Parsing " + contextPath + "jboss-portlet.xml"); // JBossApplicationMetaDataFactory factory = this.factory.createJBossApplicationMetaDataFactory();

16 years, 11 months

1
0
0 / 0

JBoss Portal SVN: r7349 - trunk/core/src/main/org/jboss/portal/core/impl.

by portal-commits＠lists.jboss.org

Author: julien(a)jboss.com Date: 2007-05-29 07:39:06 -0400 (Tue, 29 May 2007) New Revision: 7349 Removed: trunk/core/src/main/org/jboss/portal/core/impl/invocation/ Log: remove empty dir

16 years, 11 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

portal-commits May 2007