Author: smumford Date: 2010-08-10 03:38:03 -0400 (Tue, 10 Aug 2010) New Revision: 3788 Removed: epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/extras/Gadget_Development_SetupGadgetServer/default142.java epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/extras/PortletBridge_Portlet_Development/default226.xml epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/extras/PortletBridge_Portlet_Development/default227.java epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/extras/PortletBridge_Portlet_Development/default228.xml epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/extras/PortletBridge_Portlet_Development/default229.xml epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/extras/PortletBridge_Portlet_Development/default234.java epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/extras/PortletBridge_Portlet_Development/default237.java epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/extras/PortletBridge_Portlet_Development/default240.java Modified: epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/extras/Authentication_Identity_AuthenticationTokenConfiguration/default94.java epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/extras/Authentication_Identity_SSO/default109.xml epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/extras/Authentication_Identity_SSO/default112.xml epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/extras/Authentication_Identity_SSO/default115.xml epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/extras/Authentication_Identity_SSO/default122.xml epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/extras/Authentication_Identity_SSO/default124.xml epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/extras/Authentication_Identity_SSO/default128.xml epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/extras/Authentication_Identity_SSO/default129.java epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/extras/Gadget_Development_SetupGadgetServer/default141.java epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/extras/PortletBridge_Portlet_Development/default223.xml epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/extras/PortletBridge_Portlet_Development/default224.xml epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/extras/PortletBridge_Portlet_Development/default225.xml epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/extras/PortletBridge_Portlet_Development/default230.xml epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/extras/PortletBridge_Portlet_Development/default231.xml epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/extras/PortletBridge_Portlet_Development/default232.xml epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/extras/PortletBridge_Portlet_Development/default233.xml epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/extras/PortletBridge_Portlet_Development/default235.java epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/extras/PortletBridge_Portlet_Development/default236.java epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/extras/PortletBridge_Portlet_Development/default238.xml epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/extras/PortletBridge_Portlet_Development/default239.xml epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/extras/PortletBridge_Portlet_Development/default241.xml epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/extras/PortletBridge_Portlet_Development/default242.java epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/modules/AuthenticationAndIdentity/AuthenticationTokenConfiguration.xml epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/modules/GadgetDevelopment/SetupGadgetServer.xml epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/modules/PortletDevelopment/PortletBridge/portlet_development.xml Log: JBEPP-370: Final programlisting edits. Fixed callout positioning and removed whitespaces breaking formatting Modified: epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/extras/Authentication_Identity_AuthenticationTokenConfiguration/default94.java =================================================================== --- epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/extras/Authentication_Identity_AuthenticationTokenConfiguration/default94.java 2010-08-10 06:50:03 UTC (rev 3787) +++ epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/extras/Authentication_Identity_AuthenticationTokenConfiguration/default94.java 2010-08-10 07:38:03 UTC (rev 3788) @@ -1,6 +1,6 @@ - public Token getToken(String id) throws PathNotFoundException, RepositoryException; - public Token deleteToken(String id) throws PathNotFoundException, RepositoryException; - public String[] getAllTokens(); - public long getNumberTokens() throws Exception; - public String createToken(Credentials credentials) throws IllegalArgumentException,NullPointerException; - public Credentials validateToken(String tokenKey, boolean remove) throws NullPointerException; +public Token getToken(String id) throws PathNotFoundException, RepositoryException; +public Token deleteToken(String id) throws PathNotFoundException, RepositoryException; +public String[] getAllTokens(); +public long getNumberTokens() throws Exception; +public String createToken(Credentials credentials) throws IllegalArgumentException,NullPointerException; +public Credentials validateToken(String tokenKey, boolean remove) throws NullPointerException; \ No newline at end of file Modified: epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/extras/Authentication_Identity_SSO/default109.xml =================================================================== --- epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/extras/Authentication_Identity_SSO/default109.xml 2010-08-10 06:50:03 UTC (rev 3787) +++ epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/extras/Authentication_Identity_SSO/default109.xml 2010-08-10 07:38:03 UTC (rev 3788) @@ -1,38 +1,30 @@ - <filter> - <filter-name>LoginRedirectFilter</filter-name> +<filter> + <filter-name>LoginRedirectFilter</filter-name> <filter-class>org.gatein.sso.agent.filter.LoginRedirectFilter</filter-class> <init-param> - <!-- This should point to your SSO authentication server --> + <!-- This should point to your SSO authentication server --> <param-name>LOGIN_URL</param-name> - <!-- - If casRenewTicket param value of InitiateLoginServlet is: not specified or false - --> + <!-- If casRenewTicket param value of InitiateLoginServlet is: not specified or false --> <param-value>http://localhost:8888/cas/login?service=http://localhost:8080/portal/private/classic</param-value> - <!-- - If casRenewTicket param value of InitiateLoginServlet is : true - --> - <!-- - <param-value>http://localhost:8888/cas/login?service=http://localhost:8080/portal/private - /classic&amp;renew=true</param-value> - --> + <!-- If casRenewTicket param value of InitiateLoginServlet is : true --> + <!-- <param-value>http://localhost:8888/cas/login?service=http://localhost:8080/portal/private/classic&amp;renew=true</param-value> --> </init-param> </filter> <filter> - <filter-name>CASLogoutFilter</filter-name> - <filter-class>org.gatein.sso.agent.filter.CASLogoutFilter</filter-class> - <init-param> - <!-- This should point to your JOSSO authentication server --> - <param-name>LOGOUT_URL</param-name> - <param-value>http://localhost:8888/cas/logout</param-value> - </init-param> - </filter> - + <filter-name>CASLogoutFilter</filter-name> + <filter-class>org.gatein.sso.agent.filter.CASLogoutFilter</filter-class> + <init-param> + <!-- This should point to your JOSSO authentication server --> + <param-name>LOGOUT_URL</param-name> + <param-value>http://localhost:8888/cas/logout</param-value> + </init-param> + </filter> <!-- Mapping the filters at the very top of the filter chain --> <filter-mapping> <filter-name>LoginRedirectFilter</filter-name> - <url-pattern>/*</url-pattern> + <url-pattern>/*</url-pattern> </filter-mapping> <filter-mapping> <filter-name>CASLogoutFilter</filter-name> <url-pattern>/*</url-pattern> - </filter-mapping> + </filter-mapping> \ No newline at end of file Modified: epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/extras/Authentication_Identity_SSO/default112.xml =================================================================== --- epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/extras/Authentication_Identity_SSO/default112.xml 2010-08-10 06:50:03 UTC (rev 3787) +++ epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/extras/Authentication_Identity_SSO/default112.xml 2010-08-10 07:38:03 UTC (rev 3788) @@ -1,4 +1,2 @@ -<!-- -<a class="Login" onclick="$signInAction"><%=_ctx.appRes("UILoginForm.label.Signin")%></a> ---> -<a class="Login" href="/portal/sso"><%=_ctx.appRes("UILoginForm.label.Signin")%></a> +<!--<a class="Login" onclick="$signInAction"><%=_ctx.appRes("UILoginForm.label.Signin")%></a>--> +<a class="Login" href="/portal/sso"><%=_ctx.appRes("UILoginForm.label.Signin")%></a> \ No newline at end of file Modified: epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/extras/Authentication_Identity_SSO/default115.xml =================================================================== --- epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/extras/Authentication_Identity_SSO/default115.xml 2010-08-10 06:50:03 UTC (rev 3787) +++ epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/extras/Authentication_Identity_SSO/default115.xml 2010-08-10 07:38:03 UTC (rev 3788) @@ -2,28 +2,26 @@ <filter-name>LoginRedirectFilter</filter-name> <filter-class>org.gatein.sso.agent.filter.LoginRedirectFilter</filter-class> <init-param> - <!-- This should point to your SSO authentication server --> - <param-name>LOGIN_URL</param-name> - <param-value>http://localhost:8888/josso/signon/login.do?josso_back_to=http://localhost:8080/portal - /private/classic</param-value> + <!-- This should point to your SSO authentication server --> + <param-name>LOGIN_URL</param-name> + <param-value>http://localhost:8888/josso/signon/login.do?josso_back_to=http://localhost:8080/portal/private/classic</param-value> </init-param> </filter> <filter> - <filter-name>JOSSOLogoutFilter</filter-name> - <filter-class>org.gatein.sso.agent.filter.JOSSOLogoutFilter</filter-class> + <filter-name>JOSSOLogoutFilter</filter-name> + <filter-class>org.gatein.sso.agent.filter.JOSSOLogoutFilter</filter-class> <init-param> - <!-- This should point to your JOSSO authentication server --> - <param-name>LOGOUT_URL</param-name> - <param-value>http://localhost:8888/josso/signon/logout.do</param-value> - </init-param> - </filter> - + <!-- This should point to your JOSSO authentication server --> + <param-name>LOGOUT_URL</param-name> + <param-value>http://localhost:8888/josso/signon/logout.do</param-value> + </init-param> + </filter> <!-- filters should be placed at the very top of the filter chain --> <filter-mapping> <filter-name>LoginRedirectFilter</filter-name> - <url-pattern>/*</url-pattern> - </filter-mapping> + <url-pattern>/*</url-pattern> + </filter-mapping> <filter-mapping> <filter-name>JOSSOLogoutFilter</filter-name> <url-pattern>/*</url-pattern> - </filter-mapping> + </filter-mapping> \ No newline at end of file Modified: epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/extras/Authentication_Identity_SSO/default122.xml =================================================================== --- epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/extras/Authentication_Identity_SSO/default122.xml 2010-08-10 06:50:03 UTC (rev 3787) +++ epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/extras/Authentication_Identity_SSO/default122.xml 2010-08-10 07:38:03 UTC (rev 3788) @@ -1,29 +1,27 @@ <filter> <filter-name>LoginRedirectFilter</filter-name> <filter-class>org.gatein.sso.agent.filter.LoginRedirectFilter</filter-class> - <init-param> - <!-- This should point to your SSO authentication server --> - <param-name>LOGIN_URL</param-name> - <param-value>http://localhost:8888/opensso/UI/Login?realm=gatein&amp;amp;goto=http://localhost:8080 - /portal/private/classic</param-value> + <init-param> + <!-- This should point to your SSO authentication server --> + <param-name>LOGIN_URL</param-name> + <param-value>http://localhost:8888/opensso/UI/Login?realm=gatein&amp;amp;goto=http://localhost:8080/portal/private/classic</param-value> </init-param> </filter> <filter> - <filter-name>OpenSSOLogoutFilter</filter-name> - <filter-class>org.gatein.sso.agent.filter.OpenSSOLogoutFilter</filter-class> - <init-param> - <!-- This should point to your OpenSSO authentication server --> - <param-name>LOGOUT_URL</param-name> - <param-value>http://localhost:8888/opensso/UI/Logout</param-value> - </init-param> - </filter> - + <filter-name>OpenSSOLogoutFilter</filter-name> + <filter-class>org.gatein.sso.agent.filter.OpenSSOLogoutFilter</filter-class> + <init-param> + <!-- This should point to your OpenSSO authentication server --> + <param-name>LOGOUT_URL</param-name> + <param-value>http://localhost:8888/opensso/UI/Logout</param-value> + </init-param> + </filter> <!-- place the filters at the top of the filter chain --> <filter-mapping> <filter-name>LoginRedirectFilter</filter-name> - <url-pattern>/*</url-pattern> + <url-pattern>/*</url-pattern> </filter-mapping> <filter-mapping> <filter-name>OpenSSOLogoutFilter</filter-name> <url-pattern>/*</url-pattern> - </filter-mapping> + </filter-mapping> \ No newline at end of file Modified: epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/extras/Authentication_Identity_SSO/default124.xml =================================================================== --- epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/extras/Authentication_Identity_SSO/default124.xml 2010-08-10 06:50:03 UTC (rev 3787) +++ epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/extras/Authentication_Identity_SSO/default124.xml 2010-08-10 07:38:03 UTC (rev 3788) @@ -1,14 +1,13 @@ <!-- SPNEGO domain --> <application-policy name="host"> <authentication> - <login-module code="com.sun.security.auth.module.Krb5LoginModule" - flag="required"> + <login-module code="com.sun.security.auth.module.Krb5LoginModule" flag="required"> <module-option name="storeKey">true</module-option> - <module-option name="useKeyTab">true</module-option> - <module-option name=&quot;principal&quot;&gt;HTTP/server.local.network(a)LOCAL.NETWORK&lt;/module-option&gt; + <module-option name="useKeyTab">true</module-option> + <module-option name=&quot;principal&quot;&gt;HTTP/server.local.network(a)LOCAL.NETWORK&lt;/module-option&gt; <module-option name="keyTab">/home/user/krb5keytabs/jboss.keytab</module-option> <module-option name="doNotPrompt">true</module-option> <module-option name="debug">true</module-option> </login-module> </authentication> - </application-policy> + </application-policy> \ No newline at end of file Modified: epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/extras/Authentication_Identity_SSO/default128.xml =================================================================== --- epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/extras/Authentication_Identity_SSO/default128.xml 2010-08-10 06:50:03 UTC (rev 3787) +++ epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/extras/Authentication_Identity_SSO/default128.xml 2010-08-10 07:38:03 UTC (rev 3788) @@ -1,22 +1,20 @@ <filter> <filter-name>LoginRedirectFilter</filter-name> <filter-class>org.gatein.sso.agent.filter.LoginRedirectFilter</filter-class> - <init-param> - <!-- This should point to your SSO authentication server --> - <param-name>LOGIN_URL</param-name> - <param-value>/portal/private/classic</param-value> - </init-param> + <init-param> + <!-- This should point to your SSO authentication server --> + <param-name>LOGIN_URL</param-name> + <param-value>/portal/private/classic</param-value> </filter> <filter> <filter-name>SPNEGOFilter</filter-name> <filter-class>org.gatein.sso.agent.filter.SPNEGOFilter</filter-class> </filter> - <filter-mapping> <filter-name>LoginRedirectFilter</filter-name> - <url-pattern>/*</url-pattern> + <url-pattern>/*</url-pattern> </filter-mapping> - <filter-mapping> + <filter-mapping> <filter-name>SPNEGOFilter</filter-name> <url-pattern>/*</url-pattern> - </filter-mapping> + </filter-mapping> \ No newline at end of file Modified: epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/extras/Authentication_Identity_SSO/default129.java =================================================================== --- epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/extras/Authentication_Identity_SSO/default129.java 2010-08-10 06:50:03 UTC (rev 3787) +++ epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/extras/Authentication_Identity_SSO/default129.java 2010-08-10 07:38:03 UTC (rev 3788) @@ -1,4 +1,2 @@ -<!-- -<a onclick="$signInAction"><%=_ctx.appRes("UILoginForm.label.Signin")%></a> ---> -<a href="/portal/sso"><%=_ctx.appRes("UILoginForm.label.Signin")%></a> +<!--<a onclick="$signInAction"><%=_ctx.appRes("UILoginForm.label.Signin")%></a>--> +<a href="/portal/sso"><%=_ctx.appRes("UILoginForm.label.Signin")%></a> \ No newline at end of file Modified: epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/extras/Gadget_Development_SetupGadgetServer/default141.java =================================================================== --- epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/extras/Gadget_Development_SetupGadgetServer/default141.java 2010-08-10 06:50:03 UTC (rev 3787) +++ epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/extras/Gadget_Development_SetupGadgetServer/default141.java 2010-08-10 07:38:03 UTC (rev 3788) @@ -5,4 +5,4 @@ "expires": "86400", "proxy-url": "http://localhost:8080/eXoGadgetServer/gadgets/proxy?url=", "concat-url": "http://localhost:8080/eXoGadgetServer/gadgets/concat?" -}, +}, \ No newline at end of file Deleted: epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/extras/Gadget_Development_SetupGadgetServer/default142.java =================================================================== --- epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/extras/Gadget_Development_SetupGadgetServer/default142.java 2010-08-10 06:50:03 UTC (rev 3787) +++ epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/extras/Gadget_Development_SetupGadgetServer/default142.java 2010-08-10 07:38:03 UTC (rev 3788) @@ -1 +0,0 @@ --Dhttp.proxyHost=proxyhostURL -Dhttp.proxyPort=proxyPortNumber -Dhttp.proxyUser=someUserName -Dhttp.proxyPassword=somePassword Modified: epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/extras/PortletBridge_Portlet_Development/default223.xml =================================================================== --- epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/extras/PortletBridge_Portlet_Development/default223.xml 2010-08-10 06:50:03 UTC (rev 3787) +++ epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/extras/PortletBridge_Portlet_Development/default223.xml 2010-08-10 07:38:03 UTC (rev 3788) @@ -1,8 +1,8 @@ - <application> - <application-extension> - <bridge:excluded-attributes> - <bridge:excluded-attribute>foo.bar</bridge:excluded-attribute> - <bridge:excluded-attribute>foo.baz.*</bridge:excluded-attribute> - </bridge:excluded-attributes> - </application-extension> - </application> +<application> + <application-extension> + <bridge:excluded-attributes> + <bridge:excluded-attribute>foo.bar</bridge:excluded-attribute> + <bridge:excluded-attribute>foo.baz.*</bridge:excluded-attribute> + </bridge:excluded-attributes> + </application-extension> +</application> \ No newline at end of file Modified: epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/extras/PortletBridge_Portlet_Development/default224.xml =================================================================== --- epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/extras/PortletBridge_Portlet_Development/default224.xml 2010-08-10 06:50:03 UTC (rev 3787) +++ epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/extras/PortletBridge_Portlet_Development/default224.xml 2010-08-10 07:38:03 UTC (rev 3788) @@ -1,7 +1,7 @@ - <navigation-rule> - <from-view-id>/register.jspx</from-view-id> - <navigation-case> - <from-outcome>edit</from-outcome> - <to-view-id>/edit.jspx?javax.portlet.faces.PortletMode=edit</to-view-id> - </navigation-case> - </navigation-rule> +<navigation-rule> + <from-view-id>/register.jspx</from-view-id> + <navigation-case> + <from-outcome>edit</from-outcome> + <to-view-id>/edit.jspx?javax.portlet.faces.PortletMode=edit</to-view-id> + </navigation-case> +</navigation-rule> \ No newline at end of file Modified: epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/extras/PortletBridge_Portlet_Development/default225.xml =================================================================== --- epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/extras/PortletBridge_Portlet_Development/default225.xml 2010-08-10 06:50:03 UTC (rev 3787) +++ epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/extras/PortletBridge_Portlet_Development/default225.xml 2010-08-10 07:38:03 UTC (rev 3788) @@ -1,7 +1,7 @@ - <navigation-rule> - <from-view-id>/edit.jspx*</from-view-id> - <navigation-case> - <from-outcome>view</from-outcome> - <to-view-id>#{sessionScope['javax.portlet.faces.viewIdHistory.view']}</to-view-id> - </navigation-case> - </navigation-rule> +<navigation-rule> + <from-view-id>/edit.jspx*</from-view-id> + <navigation-case> + <from-outcome>view</from-outcome> + <to-view-id>#{sessionScope['javax.portlet.faces.viewIdHistory.view']}</to-view-id> + </navigation-case> +</navigation-rule> \ No newline at end of file Deleted: epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/extras/PortletBridge_Portlet_Development/default226.xml =================================================================== --- epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/extras/PortletBridge_Portlet_Development/default226.xml 2010-08-10 06:50:03 UTC (rev 3787) +++ epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/extras/PortletBridge_Portlet_Development/default226.xml 2010-08-10 07:38:03 UTC (rev 3788) @@ -1 +0,0 @@ -<to-view-id> Deleted: epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/extras/PortletBridge_Portlet_Development/default227.java =================================================================== --- epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/extras/PortletBridge_Portlet_Development/default227.java 2010-08-10 06:50:03 UTC (rev 3787) +++ epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/extras/PortletBridge_Portlet_Development/default227.java 2010-08-10 07:38:03 UTC (rev 3788) @@ -1 +0,0 @@ -/viewId?javax.portlet.faces.PortletMode=view&.... Deleted: epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/extras/PortletBridge_Portlet_Development/default228.xml =================================================================== --- epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/extras/PortletBridge_Portlet_Development/default228.xml 2010-08-10 06:50:03 UTC (rev 3787) +++ epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/extras/PortletBridge_Portlet_Development/default228.xml 2010-08-10 07:38:03 UTC (rev 3788) @@ -1 +0,0 @@ -<from-view-id> Deleted: epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/extras/PortletBridge_Portlet_Development/default229.xml =================================================================== --- epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/extras/PortletBridge_Portlet_Development/default229.xml 2010-08-10 06:50:03 UTC (rev 3787) +++ epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/extras/PortletBridge_Portlet_Development/default229.xml 2010-08-10 07:38:03 UTC (rev 3788) @@ -1 +0,0 @@ -<to-view-id> /edit.jspx?javax.portlet.faces.PortletMode=edit </to-view-id> Modified: epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/extras/PortletBridge_Portlet_Development/default230.xml =================================================================== --- epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/extras/PortletBridge_Portlet_Development/default230.xml 2010-08-10 06:50:03 UTC (rev 3787) +++ epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/extras/PortletBridge_Portlet_Development/default230.xml 2010-08-10 07:38:03 UTC (rev 3788) @@ -1,4 +1,4 @@ - <init-param> - <name>javax.portlet.faces.extension.resetModeViewId</name> - <value>true</value> - </init-param> +<init-param> + <name>javax.portlet.faces.extension.resetModeViewId</name> + <value>true</value> +</init-param> \ No newline at end of file Modified: epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/extras/PortletBridge_Portlet_Development/default231.xml =================================================================== --- epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/extras/PortletBridge_Portlet_Development/default231.xml 2010-08-10 06:50:03 UTC (rev 3787) +++ epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/extras/PortletBridge_Portlet_Development/default231.xml 2010-08-10 07:38:03 UTC (rev 3788) @@ -1,8 +1,8 @@ - <error-page> - <exception-type>javax.servlet.ServletException</exception-type> - <location>/faces/error.xhtml</location> - </error-page> - <error-page> - <exception-type>javax.faces.application.ViewExpiredException</exception-type> - <location>/faces/error.xhtml</location> - </error-page> +<error-page> + <exception-type>javax.servlet.ServletException</exception-type> + <location>/faces/error.xhtml</location> +</error-page> +<error-page> + <exception-type>javax.faces.application.ViewExpiredException</exception-type> + <location>/faces/error.xhtml</location> +</error-page> \ No newline at end of file Modified: epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/extras/PortletBridge_Portlet_Development/default232.xml =================================================================== --- epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/extras/PortletBridge_Portlet_Development/default232.xml 2010-08-10 06:50:03 UTC (rev 3787) +++ epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/extras/PortletBridge_Portlet_Development/default232.xml 2010-08-10 07:38:03 UTC (rev 3788) @@ -1,13 +1,13 @@ - <script type="text/javascript"> - A4J.AJAX.onError = function(req,status,message){ - window.alert("Custom onError handler "+message); - } +<script type="text/javascript"> + A4J.AJAX.onError = function(req,status,message){ + window.alert("Custom onError handler "+message); + } - A4J.AJAX.onExpired = function(loc,expiredMsg){ - if(window.confirm("Custom onExpired handler "+expiredMsg+" for a location: "+loc)){ - return loc; - } else { - return false; - } - } - </script> + A4J.AJAX.onExpired = function(loc,expiredMsg){ + if(window.confirm("Custom onExpired handler "+expiredMsg+" for a location: "+loc)){ + return loc; + } else { + return false; + } + } +</script> \ No newline at end of file Modified: epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/extras/PortletBridge_Portlet_Development/default233.xml =================================================================== --- epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/extras/PortletBridge_Portlet_Development/default233.xml 2010-08-10 06:50:03 UTC (rev 3787) +++ epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/extras/PortletBridge_Portlet_Development/default233.xml 2010-08-10 07:38:03 UTC (rev 3788) @@ -1,4 +1,4 @@ - <context-param> - <param-name>org.ajax4jsf.handleViewExpiredOnClient</param-name> - <param-value>true</param-value> - </context-param> +<context-param> + <param-name>org.ajax4jsf.handleViewExpiredOnClient</param-name> + <param-value>true</param-value> +</context-param> \ No newline at end of file Deleted: epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/extras/PortletBridge_Portlet_Development/default234.java =================================================================== --- epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/extras/PortletBridge_Portlet_Development/default234.java 2010-08-10 06:50:03 UTC (rev 3787) +++ epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/extras/PortletBridge_Portlet_Development/default234.java 2010-08-10 07:38:03 UTC (rev 3788) @@ -1 +0,0 @@ - @PortletScope(PortletScope.ScopeType.APPLICATION_SCOPE) Modified: epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/extras/PortletBridge_Portlet_Development/default235.java =================================================================== --- epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/extras/PortletBridge_Portlet_Development/default235.java 2010-08-10 06:50:03 UTC (rev 3787) +++ epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/extras/PortletBridge_Portlet_Development/default235.java 2010-08-10 07:38:03 UTC (rev 3788) @@ -1 +1 @@ -YourSessionClass yourSessionClass = (YourSessionClass)getRenderRequest().getAttribute("javax.portlet.p./default/seamproject/seamprojectPortletWindow?textHolder"); +YourSessionClass yourSessionClass = (YourSessionClass)getRenderRequest().getAttribute("javax.portlet.p./default/seamproject/seamprojectPortletWindow?textHolder"); \ No newline at end of file Modified: epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/extras/PortletBridge_Portlet_Development/default236.java =================================================================== --- epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/extras/PortletBridge_Portlet_Development/default236.java 2010-08-10 06:50:03 UTC (rev 3787) +++ epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/extras/PortletBridge_Portlet_Development/default236.java 2010-08-10 07:38:03 UTC (rev 3788) @@ -1,8 +1,8 @@ - Object objSession = FacesContext.getCurrentInstance().getExternalContext().getSession(false); - try - { - if (objSession instanceof PortletSession) - { - PortletSession portalSession = (PortletSession)objSession; - portalSession.setAttribute("your parameter name","parameter value",PortletSession.APPLICATION_SCOPE); - ... +Object objSession = FacesContext.getCurrentInstance().getExternalContext().getSession(false); +try +{ + if (objSession instanceof PortletSession) + { + PortletSession portalSession = (PortletSession)objSession; + portalSession.setAttribute("your parameter name","parameter value",PortletSession.APPLICATION_SCOPE); + ... \ No newline at end of file Deleted: epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/extras/PortletBridge_Portlet_Development/default237.java =================================================================== --- epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/extras/PortletBridge_Portlet_Development/default237.java 2010-08-10 06:50:03 UTC (rev 3787) +++ epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/extras/PortletBridge_Portlet_Development/default237.java 2010-08-10 07:38:03 UTC (rev 3788) @@ -1 +0,0 @@ - #{httpSessionScope['your parameter name']} Modified: epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/extras/PortletBridge_Portlet_Development/default238.xml =================================================================== --- epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/extras/PortletBridge_Portlet_Development/default238.xml 2010-08-10 06:50:03 UTC (rev 3787) +++ epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/extras/PortletBridge_Portlet_Development/default238.xml 2010-08-10 07:38:03 UTC (rev 3788) @@ -1,4 +1,4 @@ - <h:outputLink value="#{facesContext.externalContext.requestContextPath}/home.xhtml"> - <f:param name="javax.portlet.faces.ViewLink" value="true"/> - navigate to the test page - </h:outputLink> +<h:outputLink value="#{facesContext.externalContext.requestContextPath}/home.xhtml"> + <f:param name="javax.portlet.faces.ViewLink" value="true"/> + navigate to the test page +</h:outputLink> \ No newline at end of file Modified: epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/extras/PortletBridge_Portlet_Development/default239.xml =================================================================== --- epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/extras/PortletBridge_Portlet_Development/default239.xml 2010-08-10 06:50:03 UTC (rev 3787) +++ epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/extras/PortletBridge_Portlet_Development/default239.xml 2010-08-10 07:38:03 UTC (rev 3788) @@ -1,4 +1,4 @@ - <h:commandLink actionListener="#{yourBean.yourListenr}"> - <f:param name="javax.portlet.faces.DirectLink" value="true"/> - navigate to the test page - </h:commandLink> +<h:commandLink actionListener="#{yourBean.yourListenr}"> + <f:param name="javax.portlet.faces.DirectLink" value="true"/> + navigate to the test page +</h:commandLink> \ No newline at end of file Deleted: epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/extras/PortletBridge_Portlet_Development/default240.java =================================================================== --- epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/extras/PortletBridge_Portlet_Development/default240.java 2010-08-10 06:50:03 UTC (rev 3787) +++ epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/extras/PortletBridge_Portlet_Development/default240.java 2010-08-10 07:38:03 UTC (rev 3788) @@ -1 +0,0 @@ - FacesContext.getCurrentInstance().getExternalContext().redirect("http://www.jboss.org"); Modified: epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/extras/PortletBridge_Portlet_Development/default241.xml =================================================================== --- epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/extras/PortletBridge_Portlet_Development/default241.xml 2010-08-10 06:50:03 UTC (rev 3787) +++ epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/extras/PortletBridge_Portlet_Development/default241.xml 2010-08-10 07:38:03 UTC (rev 3788) @@ -1,4 +1,4 @@ - <h:form> - <h:inputText id="pref" required="true" value="#{mutablePortletPreferencesValues['userName'].value}" /> - <h:commandButton actionListener="#{myBean.savePref}" value="Save Preferences" /> - </h:form> +<h:form> + <h:inputText id="pref" required="true" value="#{mutablePortletPreferencesValues['userName'].value}" /> + <h:commandButton actionListener="#{myBean.savePref}" value="Save Preferences" /> +</h:form> \ No newline at end of file Modified: epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/extras/PortletBridge_Portlet_Development/default242.java =================================================================== --- epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/extras/PortletBridge_Portlet_Development/default242.java 2010-08-10 06:50:03 UTC (rev 3787) +++ epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/extras/PortletBridge_Portlet_Development/default242.java 2010-08-10 07:38:03 UTC (rev 3788) @@ -1,6 +1,6 @@ - Object request = FacesContext.getCurrentInstance().getExternalContext().getRequest(); - PortletRequest portletRequest = (PortletRequest)request; - if (request instanceof PortletRequest) { - try { - PortletPreferences portletPreferences = portletRequest.getPreferences(); - portletPreferences.store(); +Object request = FacesContext.getCurrentInstance().getExternalContext().getRequest(); +PortletRequest portletRequest = (PortletRequest)request; +if (request instanceof PortletRequest) { + try { + PortletPreferences portletPreferences = portletRequest.getPreferences(); + portletPreferences.store(); \ No newline at end of file Modified: epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/modules/AuthenticationAndIdentity/AuthenticationTokenConfiguration.xml =================================================================== --- epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/modules/AuthenticationAndIdentity/AuthenticationTokenConfiguration.xml 2010-08-10 06:50:03 UTC (rev 3787) +++ epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/modules/AuthenticationAndIdentity/AuthenticationTokenConfiguration.xml 2010-08-10 07:38:03 UTC (rev 3788) @@ -57,9 +57,9 @@ </para> <programlistingco> <areaspec> - <area coords="7" id="area-Reference_Guide-Authentication_Token_Configuration-Configure_token_services-name" /> - <area coords="8" id="area-Reference_Guide-Authentication_Token_Configuration-Configure_token_services-time" /> - <area coords="9" id="area-Reference_Guide-Authentication_Token_Configuration-Configure_token_services-unit" /> + <area coords="7 50" id="area-Reference_Guide-Authentication_Token_Configuration-Configure_token_services-name" /> + <area coords="8 50" id="area-Reference_Guide-Authentication_Token_Configuration-Configure_token_services-time" /> + <area coords="9 50" id="area-Reference_Guide-Authentication_Token_Configuration-Configure_token_services-unit" /> </areaspec> <programlisting language="XML" role="XML"><xi:include parse="text" href="../../extras/Authentication_Identity_AuthenticationTokenConfiguration/default95.xml" xmlns:xi="http://www.w3.org/2001/XInclude" /></programlisting> Modified: epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/modules/GadgetDevelopment/SetupGadgetServer.xml =================================================================== --- epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/modules/GadgetDevelopment/SetupGadgetServer.xml 2010-08-10 06:50:03 UTC (rev 3787) +++ epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/modules/GadgetDevelopment/SetupGadgetServer.xml 2010-08-10 07:38:03 UTC (rev 3788) @@ -80,10 +80,8 @@ To allow external gadgets when the server is behind a proxy, add the following code to the beginning of the JVM: </para> -<programlisting language="Java" role="Java"><xi:include parse="text" href="../../extras/Gadget_Development_SetupGadgetServer/default142.java" xmlns:xi="http://www.w3.org/2001/XInclude" /></programlisting> - -<!--<programlisting>-Dhttp.proxyHost=proxyhostURL -Dhttp.proxyPort=proxyPortNumber -Dhttp.proxyUser=someUserName -Dhttp.proxyPassword=somePassword -</programlisting>--> +<programlisting language="Java" role="Java"><![CDATA[-Dhttp.proxyHost=proxyhostURL -Dhttp.proxyPort=proxyPortNumber -Dhttp.proxyUser=someUserName -Dhttp.proxyPassword=somePassword]]> +</programlisting> </section> </section> Modified: epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/modules/PortletDevelopment/PortletBridge/portlet_development.xml =================================================================== --- epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/modules/PortletDevelopment/PortletBridge/portlet_development.xml 2010-08-10 06:50:03 UTC (rev 3787) +++ epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/modules/PortletDevelopment/PortletBridge/portlet_development.xml 2010-08-10 07:38:03 UTC (rev 3788) @@ -88,35 +88,30 @@ Depending on the bridge implementation, when using values from these session scoped attributes or any viewIds which may contain query string parameters it may be necessary to use the wildcard syntax when identifying the rule target. In the above, for example, the </para> -<programlisting language="XML" role="XML"><xi:include parse="text" href="../../../extras/PortletBridge_Portlet_Development/default226.xml" xmlns:xi="http://www.w3.org/2001/XInclude" /></programlisting> - -<!--<programlisting language="XML" role="XML"><![CDATA[<to-view-id> -]]></programlisting>--> +<programlisting language="XML" role="XML"><![CDATA[<to-view-id> +]]></programlisting> <para> expression returns a <parameter>viewId</parameter> of the form </para> -<programlisting language="Java" role="Java"><xi:include parse="text" href="../../../extras/PortletBridge_Portlet_Development/default227.java" xmlns:xi="http://www.w3.org/2001/XInclude" /></programlisting> +<programlisting language="XML" role="XML"><![CDATA[/viewId?javax.portlet.faces.PortletMode=view&.... +]]></programlisting> -<!--<programlisting language="XML" role="XML"><![CDATA[/viewId?javax.portlet.faces.PortletMode=view&.... -]]></programlisting>--> <para> Without wildcarding, when a subsequent navigation occurs from this new view, the navigation rules wouldn't resolve because there wouldn't be an exact match. Likewise, the above <literal>edit.jspx</literal> </para> -<programlisting language="XML" role="XML"><xi:include parse="text" href="../../../extras/PortletBridge_Portlet_Development/default228.xml" xmlns:xi="http://www.w3.org/2001/XInclude" /></programlisting> +<programlisting language="XML" role="XML"><![CDATA[<from-view-id> +]]></programlisting> -<!--<programlisting language="XML" role="XML"><![CDATA[<from-view-id> -]]></programlisting>--> <para> is wildcarded because there are navigation rules that target it that use a query string: </para> -<programlisting language="XML" role="XML"><xi:include parse="text" href="../../../extras/PortletBridge_Portlet_Development/default229.xml" xmlns:xi="http://www.w3.org/2001/XInclude" /></programlisting> - -<!--<programlisting language="XML" role="XML"><![CDATA[ +<programlisting language="XML" role="XML"><![CDATA[ <to-view-id> /edit.jspx?javax.portlet.faces.PortletMode=edit </to-view-id> -]]></programlisting>--> +]]></programlisting> + <para> Developers are encouraged to use such wildcarding to ensure they execute properly in the broadest set of bridge implementations. </para> @@ -236,11 +231,9 @@ By default, these objects are stored in the <parameter>PORTLET_SCOPE</parameter> but with the annotation below, this class can be pulled out of the <literal>PortletSession</literal> and its values used in other portlets across different <application>Seam</application> applications. </para> -<programlisting language="Java" role="Java"><xi:include parse="text" href="../../../extras/PortletBridge_Portlet_Development/default234.java" xmlns:xi="http://www.w3.org/2001/XInclude" /></programlisting> +<programlisting language="Java" role=&quot;JAVA&quot;&gt;&lt;![CDATA[(a)PortletScope(PortletScope.ScopeType.APPLICATION_SCOPE) +]]></programlisting> -<!--<programlisting language="XML" role="XML"> - @PortletScope(PortletScope.ScopeType.APPLICATION_SCOPE) -</programlisting>--> <para> Then you would pull the statefull object from the session: </para> @@ -277,11 +270,9 @@ Then, in your JSP or Facelets page, you can use: </para> -<programlisting language="Java" role="Java"><xi:include parse="text" href="../../../extras/PortletBridge_Portlet_Development/default237.java" xmlns:xi="http://www.w3.org/2001/XInclude" /></programlisting> +<programlisting language="XML" role="XML"><![CDATA[#{httpSessionScope['your parameter name']} +]]></programlisting> -<!--<programlisting language="XML" role="XML"><![CDATA[ - #{httpSessionScope['your parameter name']} -]]></programlisting>--> <para> <note> <title>Note to Portlet Developers</title> @@ -329,11 +320,8 @@ Then in your backing bean, you must call a <parameter>redirect()</parameter>. </para> -<programlisting language="Java" role="Java"><xi:include parse="text" href="../../../extras/PortletBridge_Portlet_Development/default240.java" xmlns:xi="http://www.w3.org/2001/XInclude" /></programlisting> - -<!--<programlisting language="Java" role="JAVA"><![CDATA[ - FacesContext.getCurrentInstance().getExternalContext().redirect("http://www.jboss.org"); -]]></programlisting>--> +<programlisting language="Java" role="JAVA"><![CDATA[FacesContext.getCurrentInstance().getExternalContext().redirect("http://www.jboss.org"); +]]></programlisting> </section> <section id="sect-Reference_Guide-Developing_Portlets_with_the_Bridge-Using_Provided_EL_Variables">