JBoss Portal SVN: r13257 - docs/enterprise/tags/Enterprise_Portal_Platform_4_3_GA_CP01/pdf.
by portal-commits＠lists.jboss.org
Author: prabhat.jha(a)jboss.com
Date: 2009-04-21 13:43:50 -0400 (Tue, 21 Apr 2009)
New Revision: 13257
Modified:
docs/enterprise/tags/Enterprise_Portal_Platform_4_3_GA_CP01/pdf/Reference_Guide.pdf
Log:
updated info for josso 1.8
Modified: docs/enterprise/tags/Enterprise_Portal_Platform_4_3_GA_CP01/pdf/Reference_Guide.pdf
===================================================================
(Binary files differ)
15 years, 2 months
JBoss Portal SVN: r13256 - docs/enterprise/tags/Enterprise_Portal_Platform_4_3_GA_CP01/Reference_Guide/en-US.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2009-04-21 12:51:16 -0400 (Tue, 21 Apr 2009)
New Revision: 13256
Modified:
docs/enterprise/tags/Enterprise_Portal_Platform_4_3_GA_CP01/Reference_Guide/en-US/SSO.xml
Log:
Updating josso part
Modified: docs/enterprise/tags/Enterprise_Portal_Platform_4_3_GA_CP01/Reference_Guide/en-US/SSO.xml
===================================================================
--- docs/enterprise/tags/Enterprise_Portal_Platform_4_3_GA_CP01/Reference_Guide/en-US/SSO.xml 2009-04-21 14:30:07 UTC (rev 13255)
+++ docs/enterprise/tags/Enterprise_Portal_Platform_4_3_GA_CP01/Reference_Guide/en-US/SSO.xml 2009-04-21 16:51:16 UTC (rev 13256)
@@ -278,7 +278,7 @@
</section>
<section>
<title><trademark class="trade">Java</trademark> Open Single Sign-On (JOSSO)</title>
- <para>JBoss Portal enables seamless integration with JOSSO server. More details on JOSSO can be found
+ <para>JBoss Portal enables seamless integration with JOSSO server version 1.8. More details on JOSSO can be found
<ulink url="http://www.josso.org/">here</ulink></para>
<note><title>Note</title><para>The steps below assume that JOSS server and JBoss Portal will be deployed on the same JBoss Application Server instance.
JOSSO will be configured to leverage identity services exposed by JBoss Portal to perform authentication. Procedure may be
@@ -308,43 +308,99 @@
</listitem>
<listitem>
<para>Edit <emphasis>$JBOSS_HOME/server/default/config/josso-agent-config.xml</emphasis> and mapping for portal web application:
+ <programlisting>
+ <![CDATA[
+.........
+<configuration>
+ <agent:agent-configuration>
+ <agent:partner-apps>
+ <agent:partner-app id="jboss_portal" context="/portal"/>
+ </agent:partner-apps>
+ </agent:agent-configuration>
+<configuration>
+...........
+ ]]>
+ </programlisting>
+ Complete config file can look as follows:
<programlisting>
<![CDATA[
-<partner-apps>
+<?xml version="1.0" encoding="UTF-8" ?>
+<!--
+ ~ JOSSO: Java Open Single Sign-On
+ ~
+ ~ Copyright 2004-2009, Atricore, Inc.
+ ~
+ ~ This is free software; you can redistribute it and/or modify it
+ ~ under the terms of the GNU Lesser General Public License as
+ ~ published by the Free Software Foundation; either version 2.1 of
+ ~ the License, or (at your option) any later version.
+ ~
+ ~ This software is distributed in the hope that it will be useful,
+ ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ ~ Lesser General Public License for more details.
+ ~
+ ~ You should have received a copy of the GNU Lesser General Public
+ ~ License along with this software; if not, write to the Free
+ ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ ~
+ -->
- ...
+<s:beans xmlns:s="http://www.springframework.org/schema/beans"
+ xmlns:jb42="urn:org:josso:agent:jboss42"
+ xmlns:agent="urn:org:josso:agent:core"
+ xmlns:protocol="urn:org:josso:protocol:client"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+ urn:org:josso:agent:jboss42 http://www.josso.org/schema/josso-jboss42-agent.xsd
+ urn:org:josso:agent:core http://www.josso.org/schema/josso-agent.xsd
+ urn:org:josso:protocol:client http://www.josso.org/schema/josso-protocol-client.xsd">
- <partner-app>
- <context>/portal</context>
- </partner-app>
+ <jb42:agent name="josso-jboss42-agent" sessionAccessMinInterval="1000" >
- ...
+ <!-- Gateway LOGIN and LOGOUT URLs -->
+ <gatewayLoginUrl>http://josso-01:8080/josso/signon/login.do</gatewayLoginUrl>
+ <gatewayLogoutUrl>http://josso-01:8080/josso/signon/logout.do</gatewayLogoutUrl>
- </partner-apps>
+ <!-- Gateway service locator -->
+ <gatewayServiceLocator>
+ <!-- Other properties for ws-service-locator :
+ username, password, servicesWebContext, transportSecurity
+ -->
+ <protocol:ws-service-locator endpoint="josso-01:8080" />
+ </gatewayServiceLocator>
+
+ <configuration>
+ <agent:agent-configuration>
+
+ <!-- ============================================================================= -->
+ <!-- -->
+ <!-- JOSSO Parnter application definicions : -->
+ <!-- -->
+ <!-- Configure all web applications that should be a josso partner application -->
+ <!-- within this server. -->
+ <!-- For each partner application you have to define the proper web-context. -->
+ <!-- ============================================================================= -->
+ <agent:partner-apps>
+ <agent:partner-app id="jboss_portal" context="/portal"/>
+
+ </agent:partner-apps>
+ </agent:agent-configuration>
+ </configuration>
+ <!-- Only useful when configuring multiple security domains -->
+ <!-- You can configure your own parameter builder to send parameters to your SecurityDomainMatcher -->
+ <!--
+ <parametersBuilders>
+ <agent:vhost-parameters-builder/>
+ <agent:appctx-parameters-builder/>
+ </parametersBuilders>
+ -->
+
+ </jb42:agent>
+
+</s:beans>
]]>
- </programlisting>
- Complete config file can look as follows:
- <programlisting>
- <![CDATA[
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-<agent>
- <class>org.josso.jb4.agent.JBossCatalinaSSOAgent</class>
- <gatewayLoginUrl>http://localhost:8080/josso/signon/login.do</gatewayLoginUrl>
- <gatewayLogoutUrl>http://localhost:8080/josso/signon/logout.do</gatewayLogoutUrl>
- <service-locator>
- <class>org.josso.gateway.WebserviceGatewayServiceLocator</class>
- <endpoint>localhost:8080</endpoint>
- </service-locator>
- <partner-apps>
- <partner-app>
- <context>/partnerapp</context>
- </partner-app>
- <partner-app>
- <context>/portal</context>
- </partner-app>
- </partner-apps>
-</agent>
- ]]>
</programlisting></para>
</listitem>
<listitem>
@@ -376,66 +432,162 @@
This will expose a special service in JBoss Portal that can be leveraged by JOSSO Credential and Identity Stores if the server is deployed on the same
application server instance.</para>
</listitem>
- <listitem>
- <para> Edit <emphasis>$JBOSS_HOME/server/default/deploy/josso.ear/josso.war/WEB-INF/classes/josso-gateway-config.xml</emphasis> and configure following elements:
- <itemizedlist>
- <listitem>
- <para> <emphasis>Credential Store: </emphasis>
+ <listitem>
+ <para>
+ Activate <emphasis>JAAS based Login Module</emphasis> by configuring the following:
+ <itemizedlist>
+ <listitem>
+ <para>
+ <emphasis>$JBOSS_HOME/server/default/deploy/conf/login-config.xml</emphasis>
<programlisting>
<![CDATA[
-<!-- Basic Authentication Scheme -->
-<authentication-scheme>
- <name>basic-authentication</name>
- <class>org.josso.auth.scheme.BindUsernamePasswordAuthScheme</class>
+<application-policy name="josso">
+ <authentication>
+ <login-module code="org.jboss.portal.identity.sso.josso.JOSSOLoginModule" flag="required">
+ <module-option name="debug">true</module-option>
+ </login-module>
+ </authentication>
+</application-policy>
+ ]]>
+ </programlisting>
+ </para>
+ </listitem>
+ <listitem>
+ <para><emphasis>$JBOSS_HOME/server/default/deploy/jboss-portal.sar/portal-server.war/WEB-INF/jboss-web.xml</emphasis>
+ <programlisting>
+ <![CDATA[
+<jboss-web>
+<security-domain>java:jaas/josso</security-domain>
+.........
+ ]]>
+ </programlisting>
+ </para>
+ </listitem>
+ </itemizedlist>
+ </para>
+ </listitem>
+ <listitem>
+ <para>Register the JBoss Portal Identity and Credential Store by configuring the following:
+ <itemizedlist>
+ <listitem>
+ <para>Add the file<emphasis>$JBOSS_HOME/server/default/deploy/conf/josso-gateway-portal-stores.xml</emphasis>
+ <programlisting>
+ <![CDATA[
+<s:beans xmlns:s="http://www.springframework.org/schema/beans"
+ xmlns:portal-istore="urn:org:jboss:portal:josso:identitystore"
+ xmlns:memory-sstore="urn:org:josso:memory:sessionstore"
+ xmlns:memory-astore="urn:org:josso:memory:assertionstore"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="
+ http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+ urn:org:josso:memory:sessionstore http://www.josso.org/schema/josso-memory-sessionstore.xsd
+ urn:org:josso:memory:assertionstore http://www.josso.org/schema/josso-memory-assertionstore.xsd
+ ">
+ <!-- ===================================================================== -->
+ <!-- JOSSO Identity Store, the id is very important because it is -->
+ <!-- referenced by the identity manager, auth schemes and who knows where -->
+ <!-- else. -->
+ <!-- ===================================================================== -->
+ <portal-istore:portal-store id="josso-identity-store" s:scope="singleton"/>
- <!-- ================================================= -->
- <!-- JBoss Portal Credential Store -->
- <!-- ================================================= -->
- <credential-store>
- <class>org.jboss.portal.identity.sso.josso.JOSSOIdentityStore</class>
- </credential-store>
+ <!-- ===================================================================== -->
+ <!-- JOSSO Session Store, the id is very important because it is -->
+ <!-- referenced by the session manager and who knows where else -->
+ <!-- ===================================================================== -->
+ <memory-sstore:memory-store id="josso-session-store"/>
-
- <!-- ================================================= -->
- <!-- Credential Store Key adapter -->
- <!-- ================================================= -->
- <credential-store-key-adapter>
- <class>org.josso.gateway.identity.service.store.SimpleIdentityStoreKeyAdapter</class>
- </credential-store-key-adapter>
-
-</authentication-scheme>
+ <!-- ===================================================================== -->
+ <!-- JOSSO Assertion Store, the id is very important because it is -->
+ <!-- referenced by the assertion manager and who knows where elese -->
+ <!-- ===================================================================== -->
+ <memory-astore:memory-store id="josso-assertion-store"/>
+</s:beans>
]]>
</programlisting></para>
- </listitem>
- <listitem>
- <para> <emphasis>SSO Identity Store: </emphasis>
- <programlisting>
+ </listitem>
+ <listitem>
+ <para>Register the Portal Identity Store with the file <emphasis>$JBOSS_HOME/server/default/deploy/conf/josso-gateway-config.xml</emphasis>
+ <programlisting>
<![CDATA[
-<sso-identity-manager>
+............
+<!-- Identity, Session and Assertion Stores configuration -->
+ <s:import resource="josso-gateway-portal-stores.xml" />
+ <!--
+ <s:import resource="josso-gateway-memory-stores.xml" />
+ <s:import resource="josso-gateway-db-stores.xml" />
+ <s:import resource="josso-gateway-ldap-stores.xml" />
+ -->
+............
+ ]]>
+ </programlisting>
+ </para>
+ </listitem>
+ </itemizedlist>
+ </para>
+ </listitem>
+ <listitem>
+ <para>Enable BIND Authentication Scheme by configuring the following:
+ <itemizedlist>
+ <listitem>
+ <para>Uncomment the BIND Authentication Scheme in <emphasis>$JBOSS_HOME/server/default/deploy/conf/josso-gateway-auth.xml</emphasis>
+ <programlisting>
+ <![CDATA[
+............
+<!-- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -->
+ <!-- BIND Authentication Scheme (normally LDAP) -->
+ <!-- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -->
+ <!-- Requires a be a bindalble credential store ! -->
+ <!-- name attribute is important and must not be changed -->
+ <bind-authscheme:bind-auth-scheme
+ id="josso-bind-authentication"
+ name="basic-authentication"
+ hashAlgorithm="MD5"
+ hashEncoding="HEX"
+ ignorePasswordCase="false"
+ ignoreUserCase="false">
- <class>org.josso.gateway.identity.service.SSOIdentityManagerImpl</class>
+ <bind-authscheme:credentialStore>
+ <s:ref bean="josso-identity-store"/>
+ </bind-authscheme:credentialStore>
- <!-- ================================================= -->
- <!-- JBoss Portal Credential Store -->
- <!-- ================================================= -->
- <sso-identity-store>
- <class>org.jboss.portal.identity.sso.josso.JOSSOIdentityStore</class>
- </sso-identity-store>
-
- <!-- ================================================= -->
- <!-- Identity Store Key adapter -->
- <!-- ================================================= -->
- <sso-identity-store-key-adapter>
- <class>org.josso.gateway.identity.service.store.SimpleIdentityStoreKeyAdapter</class>
- </sso-identity-store-key-adapter>
-
-</sso-identity-manager>
+ <bind-authscheme:credentialStoreKeyAdapter>
+ <s:ref bean="josso-simple-key-adapter"/>
+ </bind-authscheme:credentialStoreKeyAdapter>
+ </bind-authscheme:bind-auth-scheme>
+............
]]>
</programlisting></para>
- </listitem>
- </itemizedlist>
- </para>
</listitem>
+ <listitem>
+ <para>Register BIND Authentication Scheme with the JOSSO Authenticator in <emphasis>$JBOSS_HOME/server/default/deploy/conf/josso-gateway-config.xml</emphasis>
+ <programlisting>
+ <![CDATA[
+............
+<!-- ===================================================================== -->
+<!-- SSO Authenticator, all authentication schemes must be configured here -->
+<!-- ===================================================================== -->
+ <def-auth:authenticator id="josso-authenticator">
+ <def-auth:schemes>
+ <s:ref bean="josso-bind-authentication"/>
+ <!--
+ <s:ref bean="josso-basic-authentication"/>
+ <s:ref bean="josso-strong-authentication"/>
+ <s:ref bean="josso-rememberme-authentication"/>
+ -->
+ <!-- Others like NTLM and BIND go here -->
+ <!--
+ <s:ref bean="josso-bind-authentication"/>
+ -->
+ </def-auth:schemes>
+ </def-auth:authenticator>
+............
+ ]]>
+ </programlisting>
+ </para>
+ </listitem>
+ </itemizedlist>
+ </para>
+ </listitem>
</orderedlist>
</para>
<para>
15 years, 2 months
JBoss Portal SVN: r13255 - tags/Enterprise_Portal_Platform_4_3_GA_CP01/build.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2009-04-21 10:30:07 -0400 (Tue, 21 Apr 2009)
New Revision: 13255
Modified:
tags/Enterprise_Portal_Platform_4_3_GA_CP01/build/build-thirdparty.xml
Log:
using identity 1.1
Modified: tags/Enterprise_Portal_Platform_4_3_GA_CP01/build/build-thirdparty.xml
===================================================================
--- tags/Enterprise_Portal_Platform_4_3_GA_CP01/build/build-thirdparty.xml 2009-04-21 14:19:28 UTC (rev 13254)
+++ tags/Enterprise_Portal_Platform_4_3_GA_CP01/build/build-thirdparty.xml 2009-04-21 14:30:07 UTC (rev 13255)
@@ -45,7 +45,7 @@
<componentref name="jboss-portal/modules/web" version="1.2.3"/>
<componentref name="jboss-portal/modules/test" version="1.0.4"/>
<componentref name="jboss-portal/modules/portlet" version="2.0.7"/>
- <componentref name="jboss-portal/modules/identity" version="1.0.8"/>
+ <componentref name="jboss-portal/modules/identity" version="1.1.0"/>
<componentref name="jboss-portal/modules/cms" version="1.2.5"/>
<componentref name="antlr" version="2.7.6-brew"/>
<componentref name="apache-ant" version="1.6.5"/>
15 years, 2 months
JBoss Portal SVN: r13254 - branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/portal.
by portal-commits＠lists.jboss.org
Author: vrockai
Date: 2009-04-21 10:19:28 -0400 (Tue, 21 Apr 2009)
New Revision: 13254
Modified:
branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/portal/EndtoEndPortalAdminTestCase.java
Log:
[selenium] - catching alert
Modified: branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/portal/EndtoEndPortalAdminTestCase.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/portal/EndtoEndPortalAdminTestCase.java 2009-04-21 13:51:16 UTC (rev 13253)
+++ branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/portal/EndtoEndPortalAdminTestCase.java 2009-04-21 14:19:28 UTC (rev 13254)
@@ -172,7 +172,12 @@
private void assertPageContains(String pageName, String awaitStr) {
selenium.open(ADR_PORTAL);
selenium.waitForPageToLoad(PAGE_LOAD);
- waitFor(AJAX_LOAD);
+
+ if(selenium.isAlertPresent()){
+ selenium.getAlert();
+ debugPrint("[EndtoEndPortalAdminTestCase] - alert was caught");
+ }
+
selenium.click("link=" + pageName);
selenium.waitForPageToLoad(PAGE_LOAD);
15 years, 2 months
JBoss Portal SVN: r13253 - in branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests: lib and 1 other directories.
by portal-commits＠lists.jboss.org
Author: vrockai
Date: 2009-04-21 09:51:16 -0400 (Tue, 21 Apr 2009)
New Revision: 13253
Modified:
branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/build.xml
branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/lib/selenium-java-client-driver.jar
branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/selenium-rc-server/selenium-server.jar
Log:
[selenium] - nighly build + ant task fix
Modified: branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/build.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/build.xml 2009-04-21 11:05:19 UTC (rev 13252)
+++ branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/build.xml 2009-04-21 13:51:16 UTC (rev 13253)
@@ -141,18 +141,21 @@
<echo message="Runing TestNG" />
<mkdir dir="test-output" />
- <testng classpathref="test.cp" sourcedir="${test.src.dir}" outputdir="test-output" listeners="org.testng.reporters.JUnitXMLReporter" suitename="SeleniumSuite">
+ <testng classpathref="test.cp" sourcedir="${test.src.dir}" outputdir="${testng.output.dir}" suitename="SeleniumSuite">
- <xmlfileset dir="." includes="${testng.suite}" />
- <sysproperty key="browser" value="${browser}" />
- <sysproperty key="screenshot" value="${screenshot}" />
- <sysproperty key="workspace" value="${workspace}" />
- <sysproperty key="userCount" value="${userCount}" />
- <sysproperty key="html-src" value="${html-src}" />
- <sysproperty key="output-dir" value="${testng.output.dir}" />
- <jvmarg value="-ea" />
+ <xmlfileset dir="." includes="${test.suite}" />
- </testng>
+ <sysproperty key="browser" value="${browser}" />
+ <sysproperty key="screenshot" value="${screenshot}" />
+ <sysproperty key="debug" value="${debug}" />
+ <sysproperty key="workspace" value="${workspace}" />
+ <sysproperty key="userCount" value="${userCount}" />
+ <sysproperty key="html-src" value="${html-src}" />
+ <sysproperty key="output-dir" value="${testng.output.dir}" />
+
+ <jvmarg value="-ea" />
+
+ </testng>
<echo message="Stoping portal instance : ${portal.instance}" />
<server:stop name="${portal.instance}" />
<antcall target="cleanup" />
Modified: branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/lib/selenium-java-client-driver.jar
===================================================================
(Binary files differ)
Modified: branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/selenium-rc-server/selenium-server.jar
===================================================================
(Binary files differ)
15 years, 2 months
JBoss Portal SVN: r13252 - in modules/identity/branches/JBP_IDENTITY_BRANCH_1_1: build and 2 other directories.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2009-04-21 07:05:19 -0400 (Tue, 21 Apr 2009)
New Revision: 13252
Modified:
modules/identity/branches/JBP_IDENTITY_BRANCH_1_1/build/pom.xml
modules/identity/branches/JBP_IDENTITY_BRANCH_1_1/identity/pom.xml
modules/identity/branches/JBP_IDENTITY_BRANCH_1_1/pom.xml
modules/identity/branches/JBP_IDENTITY_BRANCH_1_1/sso/pom.xml
Log:
minor
Modified: modules/identity/branches/JBP_IDENTITY_BRANCH_1_1/build/pom.xml
===================================================================
--- modules/identity/branches/JBP_IDENTITY_BRANCH_1_1/build/pom.xml 2009-04-21 11:05:14 UTC (rev 13251)
+++ modules/identity/branches/JBP_IDENTITY_BRANCH_1_1/build/pom.xml 2009-04-21 11:05:19 UTC (rev 13252)
@@ -18,7 +18,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.portal.identity</groupId>
<artifactId>module-parent</artifactId>
- <version>1.1.0</version>
+ <version>1.1-SNAPSHOT</version>
<packaging>pom</packaging>
<name>JBoss Portal Identity</name>
<url>http://www.jboss.com/products/jbossmc</url>
Modified: modules/identity/branches/JBP_IDENTITY_BRANCH_1_1/identity/pom.xml
===================================================================
--- modules/identity/branches/JBP_IDENTITY_BRANCH_1_1/identity/pom.xml 2009-04-21 11:05:14 UTC (rev 13251)
+++ modules/identity/branches/JBP_IDENTITY_BRANCH_1_1/identity/pom.xml 2009-04-21 11:05:19 UTC (rev 13252)
@@ -4,7 +4,7 @@
<groupId>org.jboss.portal.identity</groupId>
<artifactId>module-parent</artifactId>
<relativePath>../build/pom.xml</relativePath>
- <version>1.1.0</version>
+ <version>1.1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>identity-identity</artifactId>
Modified: modules/identity/branches/JBP_IDENTITY_BRANCH_1_1/pom.xml
===================================================================
--- modules/identity/branches/JBP_IDENTITY_BRANCH_1_1/pom.xml 2009-04-21 11:05:14 UTC (rev 13251)
+++ modules/identity/branches/JBP_IDENTITY_BRANCH_1_1/pom.xml 2009-04-21 11:05:19 UTC (rev 13252)
@@ -5,7 +5,7 @@
<artifactId>module-aggregator</artifactId>
<packaging>pom</packaging>
<name>JBoss Portal Identity Module</name>
- <version>1.1.0</version>
+ <version>1.1-SNAPSHOT</version>
<url>http://labs.jboss.com/jbossportal</url>
<dependencies/>
Modified: modules/identity/branches/JBP_IDENTITY_BRANCH_1_1/sso/pom.xml
===================================================================
--- modules/identity/branches/JBP_IDENTITY_BRANCH_1_1/sso/pom.xml 2009-04-21 11:05:14 UTC (rev 13251)
+++ modules/identity/branches/JBP_IDENTITY_BRANCH_1_1/sso/pom.xml 2009-04-21 11:05:19 UTC (rev 13252)
@@ -4,7 +4,7 @@
<groupId>org.jboss.portal.identity</groupId>
<artifactId>module-parent</artifactId>
<relativePath>../build/pom.xml</relativePath>
- <version>1.1.0</version>
+ <version>1.1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>identity-sso</artifactId>
15 years, 2 months
JBoss Portal SVN: r13251 - branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium.
by portal-commits＠lists.jboss.org
Author: vrockai
Date: 2009-04-21 07:05:14 -0400 (Tue, 21 Apr 2009)
New Revision: 13251
Modified:
branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/EndToEndBeaPortlet.java
Log:
[JBPORTAL-2314] [selenium] - clicking on a final bea link
Modified: branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/EndToEndBeaPortlet.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/EndToEndBeaPortlet.java 2009-04-21 10:59:41 UTC (rev 13250)
+++ branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/EndToEndBeaPortlet.java 2009-04-21 11:05:14 UTC (rev 13251)
@@ -15,12 +15,16 @@
*
* @author <a href="mailto:vrockai@redhat.com">Viliam Rockai</a>
*/
-//TODO some refactoring of class fields needed
+// TODO some refactoring of class fields needed
@Test(groups = { "end2end" }, enabled = true, description = "Creating of new portal with content.")
public class EndToEndBeaPortlet extends JBossPortalSeleniumTestCase {
+
+
/** prefix for locator properties = e2e.wsrp. */
public static String casePfx = "e2e.wsrp.";
+ private final String LNK_BEA_PREV = getProp(casePfx + "lnk.bea.next", "link=Goto previous page");
+ private final String LNK_BEA_NEXT = getProp(casePfx + "lnk.bea.prev", "link=Click here to goto next page");
private final String SUB_VIEW_PORTLETS = "//input[contains(@id,'definition-form:view-portlets')]";
private final String SEL_CONS_TYPE = "//select[contains(@id,'definition-form:menu')]";
@@ -79,7 +83,10 @@
* then added to page "default" to portal "default" similar way as in
* {@link AdminPortalTestCase#testCreateWindow()}. The final assertion is
* made in the "default" page of "default" portal. The appearance of string
- * specific for bea portlet is asserted.
+ * specific for bea portlet is asserted. The link
+ * "Click here to goto next page." in Bea portlet is then clicked, the text
+ * "Welcome back!" is asserted. At the end the link "Goto previous page." is
+ * clicked and the previous text is asserted.
*/
// TODO - click on a link in BEA applet and assert
@Test(enabled = true, description = "Creating a standard BEA portlet.")
@@ -101,6 +108,12 @@
Assert.assertTrue(selenium.isTextPresent("1BeaPorWindow"));
Assert.assertTrue(selenium.isTextPresent("Welcome to WebLogic Portal WSRP Demo."));
+ selenium.click(LNK_BEA_NEXT);
+ selenium.waitForPageToLoad(PAGE_LOAD);
+ Assert.assertTrue(selenium.isTextPresent("Welcome back!"));
+ selenium.click(LNK_BEA_PREV);
+ selenium.waitForPageToLoad(PAGE_LOAD);
+
}
private void createConsumer(String consumerName) {
15 years, 2 months
JBoss Portal SVN: r13250 - in modules/identity/trunk: build and 2 other directories.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2009-04-21 06:59:41 -0400 (Tue, 21 Apr 2009)
New Revision: 13250
Modified:
modules/identity/trunk/build/pom.xml
modules/identity/trunk/identity/pom.xml
modules/identity/trunk/pom.xml
modules/identity/trunk/sso/pom.xml
Log:
changing version number
Modified: modules/identity/trunk/build/pom.xml
===================================================================
--- modules/identity/trunk/build/pom.xml 2009-04-21 10:54:40 UTC (rev 13249)
+++ modules/identity/trunk/build/pom.xml 2009-04-21 10:59:41 UTC (rev 13250)
@@ -18,7 +18,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.portal.identity</groupId>
<artifactId>module-parent</artifactId>
- <version>1.1.0-SNAPSHOT</version>
+ <version>trunk-SNAPSHOT</version>
<packaging>pom</packaging>
<name>JBoss Portal Identity</name>
<url>http://www.jboss.com/products/jbossmc</url>
Modified: modules/identity/trunk/identity/pom.xml
===================================================================
--- modules/identity/trunk/identity/pom.xml 2009-04-21 10:54:40 UTC (rev 13249)
+++ modules/identity/trunk/identity/pom.xml 2009-04-21 10:59:41 UTC (rev 13250)
@@ -4,7 +4,7 @@
<groupId>org.jboss.portal.identity</groupId>
<artifactId>module-parent</artifactId>
<relativePath>../build/pom.xml</relativePath>
- <version>1.1.0-SNAPSHOT</version>
+ <version>trunk-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>identity-identity</artifactId>
Modified: modules/identity/trunk/pom.xml
===================================================================
--- modules/identity/trunk/pom.xml 2009-04-21 10:54:40 UTC (rev 13249)
+++ modules/identity/trunk/pom.xml 2009-04-21 10:59:41 UTC (rev 13250)
@@ -5,7 +5,7 @@
<artifactId>module-aggregator</artifactId>
<packaging>pom</packaging>
<name>JBoss Portal Identity Module</name>
- <version>1.1.0-SNAPSHOT</version>
+ <version>trunk-SNAPSHOT</version>
<url>http://labs.jboss.com/jbossportal</url>
<dependencies/>
@@ -34,4 +34,4 @@
-</project>
\ No newline at end of file
+</project>
Modified: modules/identity/trunk/sso/pom.xml
===================================================================
--- modules/identity/trunk/sso/pom.xml 2009-04-21 10:54:40 UTC (rev 13249)
+++ modules/identity/trunk/sso/pom.xml 2009-04-21 10:59:41 UTC (rev 13250)
@@ -4,7 +4,7 @@
<groupId>org.jboss.portal.identity</groupId>
<artifactId>module-parent</artifactId>
<relativePath>../build/pom.xml</relativePath>
- <version>1.1.0-SNAPSHOT</version>
+ <version>trunk-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>identity-sso</artifactId>
15 years, 2 months
JBoss Portal SVN: r13249 - modules/identity/branches.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2009-04-21 06:54:40 -0400 (Tue, 21 Apr 2009)
New Revision: 13249
Added:
modules/identity/branches/JBP_IDENTITY_BRANCH_1_1/
Log:
Branching identity (Maven build and without API/SPI changes)
Copied: modules/identity/branches/JBP_IDENTITY_BRANCH_1_1 (from rev 13248, modules/identity/tags/JBP_IDENTITY_1_1_0)
15 years, 2 months
JBoss Portal SVN: r13248 - in modules/identity/tags/JBP_IDENTITY_1_1_0/identity/src: main/java/org/jboss/portal/identity/service and 3 other directories.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2009-04-21 06:46:09 -0400 (Tue, 21 Apr 2009)
New Revision: 13248
Modified:
modules/identity/tags/JBP_IDENTITY_1_1_0/identity/src/main/java/org/jboss/portal/identity/IdentityConfiguration.java
modules/identity/tags/JBP_IDENTITY_1_1_0/identity/src/main/java/org/jboss/portal/identity/RoleModule.java
modules/identity/tags/JBP_IDENTITY_1_1_0/identity/src/main/java/org/jboss/portal/identity/UserModule.java
modules/identity/tags/JBP_IDENTITY_1_1_0/identity/src/main/java/org/jboss/portal/identity/service/RoleModuleService.java
modules/identity/tags/JBP_IDENTITY_1_1_0/identity/src/main/java/org/jboss/portal/identity/service/UserModuleService.java
modules/identity/tags/JBP_IDENTITY_1_1_0/identity/src/test/java/org/jboss/portal/test/identity/db/DBGenericTest.java
modules/identity/tags/JBP_IDENTITY_1_1_0/identity/src/test/java/org/jboss/portal/test/identity/ldap/LDAPExtRoleModuleTest.java
modules/identity/tags/JBP_IDENTITY_1_1_0/identity/src/test/java/org/jboss/portal/test/identity/ldap/LDAPExtUserModuleTest.java
modules/identity/tags/JBP_IDENTITY_1_1_0/identity/src/test/resources/config/db-config.xml
modules/identity/tags/JBP_IDENTITY_1_1_0/identity/src/test/resources/config/standardidentity-config.xml
Log:
Removed change in the API/SPI
Modified: modules/identity/tags/JBP_IDENTITY_1_1_0/identity/src/main/java/org/jboss/portal/identity/IdentityConfiguration.java
===================================================================
--- modules/identity/tags/JBP_IDENTITY_1_1_0/identity/src/main/java/org/jboss/portal/identity/IdentityConfiguration.java 2009-04-21 10:11:03 UTC (rev 13247)
+++ modules/identity/tags/JBP_IDENTITY_1_1_0/identity/src/main/java/org/jboss/portal/identity/IdentityConfiguration.java 2009-04-21 10:46:09 UTC (rev 13248)
@@ -99,12 +99,8 @@
public static final String SEARCH_SCOPE = "searchScope";
- public static final String ADMIN_ROLES = "adminRoles";
- public static final String ADMIN_USERS = "adminUsers";
-
-
public Set getValues(String optionGroup, String option);
public String getValue(String optionGroup, String option);
Modified: modules/identity/tags/JBP_IDENTITY_1_1_0/identity/src/main/java/org/jboss/portal/identity/RoleModule.java
===================================================================
--- modules/identity/tags/JBP_IDENTITY_1_1_0/identity/src/main/java/org/jboss/portal/identity/RoleModule.java 2009-04-21 10:11:03 UTC (rev 13247)
+++ modules/identity/tags/JBP_IDENTITY_1_1_0/identity/src/main/java/org/jboss/portal/identity/RoleModule.java 2009-04-21 10:46:09 UTC (rev 13248)
@@ -97,13 +97,6 @@
* @return the roles
*/
Set findRoles() throws IdentityException;
-
- /**
- * Get all the administrator roles
- *
- * @return the role names
- */
- Set<String> getAdminRoles() throws IdentityException;
}
Modified: modules/identity/tags/JBP_IDENTITY_1_1_0/identity/src/main/java/org/jboss/portal/identity/UserModule.java
===================================================================
--- modules/identity/tags/JBP_IDENTITY_1_1_0/identity/src/main/java/org/jboss/portal/identity/UserModule.java 2009-04-21 10:11:03 UTC (rev 13247)
+++ modules/identity/tags/JBP_IDENTITY_1_1_0/identity/src/main/java/org/jboss/portal/identity/UserModule.java 2009-04-21 10:46:09 UTC (rev 13248)
@@ -100,11 +100,4 @@
* @return the number of users
*/
int getUserCount() throws IdentityException, IllegalArgumentException;
-
- /**
- * Get all the administrator roles
- *
- * @return the role names
- */
- Set<String> getAdminUsers() throws IdentityException;
}
Modified: modules/identity/tags/JBP_IDENTITY_1_1_0/identity/src/main/java/org/jboss/portal/identity/service/RoleModuleService.java
===================================================================
--- modules/identity/tags/JBP_IDENTITY_1_1_0/identity/src/main/java/org/jboss/portal/identity/service/RoleModuleService.java 2009-04-21 10:11:03 UTC (rev 13247)
+++ modules/identity/tags/JBP_IDENTITY_1_1_0/identity/src/main/java/org/jboss/portal/identity/service/RoleModuleService.java 2009-04-21 10:46:09 UTC (rev 13248)
@@ -21,9 +21,6 @@
*/
package org.jboss.portal.identity.service;
-import java.util.Set;
-
-import org.jboss.portal.identity.IdentityConfiguration;
import org.jboss.portal.identity.RoleModule;
import org.jboss.portal.identity.IdentityContext;
import org.jboss.portal.identity.IdentityException;
@@ -63,15 +60,5 @@
RoleUpdatedEvent event = new RoleUpdatedEvent(roleId, roleName, displayName);
getIdentityEventBroadcaster().fireEvent(event);
}
-
- public Set<String> getAdminRoles() throws IdentityException
- {
- Set<String> adminRoles = (Set<String>)getIdentityConfiguration().getOptions(IdentityConfiguration.GROUP_COMMON).get(IdentityConfiguration.ADMIN_ROLES);
- if (adminRoles == null)
- {
- throw new IdentityException("Configuration option missing: " + IdentityConfiguration.ADMIN_ROLES);
- }
- return adminRoles;
- }
}
Modified: modules/identity/tags/JBP_IDENTITY_1_1_0/identity/src/main/java/org/jboss/portal/identity/service/UserModuleService.java
===================================================================
--- modules/identity/tags/JBP_IDENTITY_1_1_0/identity/src/main/java/org/jboss/portal/identity/service/UserModuleService.java 2009-04-21 10:11:03 UTC (rev 13247)
+++ modules/identity/tags/JBP_IDENTITY_1_1_0/identity/src/main/java/org/jboss/portal/identity/service/UserModuleService.java 2009-04-21 10:46:09 UTC (rev 13248)
@@ -21,9 +21,6 @@
*/
package org.jboss.portal.identity.service;
-import java.util.Set;
-
-import org.jboss.portal.identity.IdentityConfiguration;
import org.jboss.portal.identity.UserModule;
import org.jboss.portal.identity.IdentityContext;
import org.jboss.portal.identity.IdentityException;
@@ -55,15 +52,5 @@
IdentityEvent event = new UserDestroyedEvent(userId, userName);
getIdentityEventBroadcaster().fireEvent(event);
}
-
- public Set<String> getAdminUsers() throws IdentityException
- {
- Set<String> adminUsers = (Set<String>)getIdentityConfiguration().getOptions(IdentityConfiguration.GROUP_COMMON).get(IdentityConfiguration.ADMIN_USERS);
- if (adminUsers == null)
- {
- throw new IdentityException("Configuration option missing: " + IdentityConfiguration.ADMIN_USERS);
- }
- return adminUsers;
- }
}
Modified: modules/identity/tags/JBP_IDENTITY_1_1_0/identity/src/test/java/org/jboss/portal/test/identity/db/DBGenericTest.java
===================================================================
--- modules/identity/tags/JBP_IDENTITY_1_1_0/identity/src/test/java/org/jboss/portal/test/identity/db/DBGenericTest.java 2009-04-21 10:11:03 UTC (rev 13247)
+++ modules/identity/tags/JBP_IDENTITY_1_1_0/identity/src/test/java/org/jboss/portal/test/identity/db/DBGenericTest.java 2009-04-21 10:46:09 UTC (rev 13248)
@@ -21,7 +21,6 @@
*/
package org.jboss.portal.test.identity.db;
-import org.jboss.portal.identity.IdentityException;
import org.jboss.portal.identity.ProfileMap;
import org.jboss.portal.identity.User;
import org.jboss.portal.identity.db.HibernateUserImpl;
@@ -189,30 +188,4 @@
{
genericTest.testStaticProperty();
}
-
- public void testGetAdminUsers() throws Exception
- {
- try
- {
- getUserModule().getAdminUsers();
- }
- catch (IdentityException e)
- {
- fail();
- }
-
- }
-
- public void testGetAdminRoles() throws Exception
- {
- try
- {
- getRoleModule().getAdminRoles();
- }
- catch (IdentityException e)
- {
- fail();
- }
-
- }
}
Modified: modules/identity/tags/JBP_IDENTITY_1_1_0/identity/src/test/java/org/jboss/portal/test/identity/ldap/LDAPExtRoleModuleTest.java
===================================================================
--- modules/identity/tags/JBP_IDENTITY_1_1_0/identity/src/test/java/org/jboss/portal/test/identity/ldap/LDAPExtRoleModuleTest.java 2009-04-21 10:11:03 UTC (rev 13247)
+++ modules/identity/tags/JBP_IDENTITY_1_1_0/identity/src/test/java/org/jboss/portal/test/identity/ldap/LDAPExtRoleModuleTest.java 2009-04-21 10:46:09 UTC (rev 13248)
@@ -203,17 +203,4 @@
}
-
- public void testGetAdminRoles() throws Exception
- {
- try
- {
- getRoleModule().getAdminRoles();
- }
- catch (IdentityException e)
- {
- fail();
- }
-
- }
}
Modified: modules/identity/tags/JBP_IDENTITY_1_1_0/identity/src/test/java/org/jboss/portal/test/identity/ldap/LDAPExtUserModuleTest.java
===================================================================
--- modules/identity/tags/JBP_IDENTITY_1_1_0/identity/src/test/java/org/jboss/portal/test/identity/ldap/LDAPExtUserModuleTest.java 2009-04-21 10:11:03 UTC (rev 13247)
+++ modules/identity/tags/JBP_IDENTITY_1_1_0/identity/src/test/java/org/jboss/portal/test/identity/ldap/LDAPExtUserModuleTest.java 2009-04-21 10:46:09 UTC (rev 13248)
@@ -1,7 +1,6 @@
package org.jboss.portal.test.identity.ldap;
//import org.jboss.portal.identity.IdentityServiceControllerImpl;
-import org.jboss.portal.identity.IdentityException;
import org.jboss.portal.identity.User;
import org.jboss.portal.identity.Role;
import org.jboss.portal.identity.NoSuchUserException;
@@ -146,17 +145,4 @@
assertTrue(roleNames.contains("Echo"));
}
-
- public void testGetAdminUsers() throws Exception
- {
- try
- {
- getUserModule().getAdminUsers();
- }
- catch (IdentityException e)
- {
- fail();
- }
-
- }
}
Modified: modules/identity/tags/JBP_IDENTITY_1_1_0/identity/src/test/resources/config/db-config.xml
===================================================================
--- modules/identity/tags/JBP_IDENTITY_1_1_0/identity/src/test/resources/config/db-config.xml 2009-04-21 10:11:03 UTC (rev 13247)
+++ modules/identity/tags/JBP_IDENTITY_1_1_0/identity/src/test/resources/config/db-config.xml 2009-04-21 10:46:09 UTC (rev 13248)
@@ -65,5 +65,5 @@
<config/>
</module>
</modules>
-<!-- <options/> -->
+ <options/>
</identity-configuration>
Modified: modules/identity/tags/JBP_IDENTITY_1_1_0/identity/src/test/resources/config/standardidentity-config.xml
===================================================================
--- modules/identity/tags/JBP_IDENTITY_1_1_0/identity/src/test/resources/config/standardidentity-config.xml 2009-04-21 10:11:03 UTC (rev 13247)
+++ modules/identity/tags/JBP_IDENTITY_1_1_0/identity/src/test/resources/config/standardidentity-config.xml 2009-04-21 10:46:09 UTC (rev 13248)
@@ -335,14 +335,6 @@
<name>defaultAdminRole</name>
<value>Admin</value>
</option>
- <option>
- <name>adminUsers</name>
- <value>admin</value>
- </option>
- <option>
- <name>adminRoles</name>
- <value>Admin</value>
- </option>
</option-group>
<option-group>
<group-name>userCreateAttibutes</group-name>
15 years, 2 months