Menu
▾
▴
[Jboss-svn-commits] JBL Code SVN: r2734 - in trunk/forge/portal-extensions: forge-login forge-login/to-copy forge-login/to-copy/jboss-portal.sar forge-login/to-copy/jboss-portal.sar/conf forge-login/to-copy/jboss-portal.sar/portal-server.war forge-login/to-copy/jboss-portal.sar/portal-server.war/WEB-INF forge-login/to-copy/jbossweb-tomcat55.sar jbosswiki/forge-wiki/src/java/org/jboss/wiki jbosswiki/forge-wiki/src/web/WEB-INF/jsp jbosswiki/wiki-common/src/java/org/jboss/wiki jbosswiki/wiki-common/src/java/org/jboss/wiki/plugins
Author: szimano Date: 2006-03-04 06:27:08 -0500 (Sat, 04 Mar 2006) New Revision: 2734 Added: trunk/forge/portal-extensions/forge-login/to-copy/jboss-portal.sar/ trunk/forge/portal-extensions/forge-login/to-copy/jboss-portal.sar/conf/ trunk/forge/portal-extensions/forge-login/to-copy/jboss-portal.sar/conf/login-config.xml trunk/forge/portal-extensions/forge-login/to-copy/jboss-portal.sar/portal-server.war/ trunk/forge/portal-extensions/forge-login/to-copy/jboss-portal.sar/portal-server.war/WEB-INF/ trunk/forge/portal-extensions/forge-login/to-copy/jboss-portal.sar/portal-server.war/WEB-INF/web.xml trunk/forge/portal-extensions/forge-login/to-copy/jboss-sso-nukes.jar.jar trunk/forge/portal-extensions/forge-login/to-copy/jbossweb-tomcat55.sar/ trunk/forge/portal-extensions/forge-login/to-copy/jbossweb-tomcat55.sar/catalina.jar trunk/forge/portal-extensions/forge-login/to-copy/jbossweb-tomcat55.sar/jboss-identity-management.jar trunk/forge/portal-extensions/forge-login/to-copy/jbossweb-tomcat55.sar/jboss-saml.jar trunk/forge/portal-extensions/forge-login/to-copy/jbossweb-tomcat55.sar/jboss-sso-common.jar trunk/forge/portal-extensions/forge-login/to-copy/jbossweb-tomcat55.sar/jboss-sso-tomcat5.jar trunk/forge/portal-extensions/forge-login/to-copy/jbossweb-tomcat55.sar/jboss-sso.xml trunk/forge/portal-extensions/forge-login/to-copy/jbossweb-tomcat55.sar/jbwebsite-security-1.0.jar trunk/forge/portal-extensions/forge-login/to-copy/jbossweb-tomcat55.sar/opensaml-1.1.jar trunk/forge/portal-extensions/forge-login/to-copy/jbossweb-tomcat55.sar/server.xml trunk/forge/portal-extensions/forge-login/to-copy/jbossweb-tomcat55.sar/xmlsec-20050514.jar Removed: trunk/forge/portal-extensions/forge-login/to-copy/login-config.xml Modified: trunk/forge/portal-extensions/forge-login/maven.xml trunk/forge/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/WikiPortlet.java trunk/forge/portal-extensions/jbosswiki/forge-wiki/src/web/WEB-INF/jsp/Edit.jsp trunk/forge/portal-extensions/jbosswiki/forge-wiki/src/web/WEB-INF/jsp/Wiki.jsp trunk/forge/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/WikiEngine.java trunk/forge/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/plugins/AdminConsolePlugin.java Log: SSO in portal 2.2 plus some wiki modifications JBWIKI-7 Modified: trunk/forge/portal-extensions/forge-login/maven.xml =================================================================== --- trunk/forge/portal-extensions/forge-login/maven.xml 2006-03-04 01:18:46 UTC (rev 2733) +++ trunk/forge/portal-extensions/forge-login/maven.xml 2006-03-04 11:27:08 UTC (rev 2734) @@ -4,6 +4,13 @@ See terms of license at gnu.org. --> <project xmlns:j="jelly:core" xmlns:ant="jelly:ant" xmlns:u="jelly:util"> + + <goal name="prj-install"> + <ant:copy todir="${local.deploy.dir}" overwrite="true"> + <ant:fileset dir="to-copy" excludes="portal-login-ds.xml.sample" /> + </ant:copy> + </goal> + <goal name="all"> <attainGoal name="build" /> <attainGoal name="deploy" /> @@ -18,16 +25,15 @@ </goal> <goal name="deploy"> - <ant:copy todir="${local.deploy.dir}" flatten="true"> - <ant:fileset dir="."> - <ant:filename name="target/*.jar" /> - </ant:fileset> - </ant:copy> - <ant:copy - todir="${local.deploy.dir}/jboss-portal.sar/conf" - file="to-copy/login-config.xml" overwrite="true" /> - <ant:copy - todir="${local.deploy.dir}" - file="to-copy/portal-login-ds.xml" overwrite="true" /> - </goal> + <ant:copy todir="${local.deploy.dir}" flatten="true"> + <ant:fileset dir="."> + <ant:filename name="target/*.jar" /> + </ant:fileset> + </ant:copy> + + <ant:copy + todir="${local.deploy.dir}" + file="to-copy/portal-login-ds.xml" overwrite="true" /> + </goal> + </project> Added: trunk/forge/portal-extensions/forge-login/to-copy/jboss-portal.sar/conf/login-config.xml =================================================================== --- trunk/forge/portal-extensions/forge-login/to-copy/jboss-portal.sar/conf/login-config.xml 2006-03-04 01:18:46 UTC (rev 2733) +++ trunk/forge/portal-extensions/forge-login/to-copy/jboss-portal.sar/conf/login-config.xml 2006-03-04 11:27:08 UTC (rev 2734) @@ -0,0 +1,57 @@ +<?xml version='1.0'?> +<!-- + JBoss, the OpenSource J2EE webOS + Distributable under LGPL license. + See terms of license at gnu.org. + --> +<!DOCTYPE policy PUBLIC + "-//JBoss//DTD JBOSS Security Config 3.0//EN" + "http://www.jboss.org/j2ee/dtd/security_config.dtd"> +<policy> + <application-policy name="portal"> + <authentication> + <!-- this JAAS module is used by manual user initiated Login --> + <login-module code="org.jboss.labs.login.LabsLoginModule" flag="sufficient"> + <module-option name="unauthenticatedIdentity">guest</module-option> + <module-option name="hashAlgorithm">MD5</module-option> + <module-option name="hashEncoding">HEX</module-option> + <module-option name="userModuleJNDIName">java:/portal/UserModule</module-option> + <module-option name="principalsQuery">SELECT u.password FROM UserImpl AS u WHERE u.userName=:username</module-option> + <module-option name="rolesQuery">SELECT g.name FROM UserImpl AS u LEFT JOIN u.roles AS g WHERE u.userName=:username</module-option> + <module-option name="additionalRole">Authenticated</module-option> + <module-option name="password-stacking">useFirstPass</module-option> + <module-option name="jbossdb">java:JBossDS</module-option> + </login-module> + + <!-- this JAAS module is used for SSO AutoLogin --> + <login-module code="org.jboss.labs.login.LabsLoginModule" flag="sufficient"> + <module-option name="unauthenticatedIdentity">guest</module-option> + <!--module-option name="hashAlgorithm">MD5</module-option--> + <!--module-option name="hashEncoding">HEX</module-option--> + <module-option name="userModuleJNDIName">java:/portal/UserModule</module-option> + <module-option name="principalsQuery">SELECT u.password FROM UserImpl AS u WHERE u.userName=:username</module-option> + <module-option name="rolesQuery">SELECT g.name FROM UserImpl AS u LEFT JOIN u.roles AS g WHERE u.userName=:username</module-option> + <module-option name="additionalRole">Authenticated</module-option> + <module-option name="password-stacking">useFirstPass</module-option> + <module-option name="jbossdb">java:JBossDS</module-option> + </login-module> + + </authentication> + </application-policy> + + <application-policy name="webdav"> + <authentication> + <login-module code="org.jboss.labs.login.LabsLoginModule" flag="sufficient"> + <module-option name="unauthenticatedIdentity">guest</module-option> + <module-option name="hashAlgorithm">MD5</module-option> + <module-option name="hashEncoding">HEX</module-option> + <module-option name="userModuleJNDIName">java:/portal/UserModule</module-option> + <module-option name="principalsQuery">SELECT u.password FROM UserImpl AS u LEFT JOIN u.roles AS g WHERE u.userName=:username AND g.name='Admin'</module-option> + <module-option name="rolesQuery">SELECT u.userName FROM UserImpl AS u WHERE :username='a' AND :username='b'</module-option> + <module-option name="additionalRole">root</module-option> + </login-module> + <login-module code="org.jboss.portal.core.security.jaas.IdentityPropagationLoginModule" flag="sufficient"> + </login-module> + </authentication> + </application-policy> +</policy> Added: trunk/forge/portal-extensions/forge-login/to-copy/jboss-portal.sar/portal-server.war/WEB-INF/web.xml =================================================================== --- trunk/forge/portal-extensions/forge-login/to-copy/jboss-portal.sar/portal-server.war/WEB-INF/web.xml 2006-03-04 01:18:46 UTC (rev 2733) +++ trunk/forge/portal-extensions/forge-login/to-copy/jboss-portal.sar/portal-server.war/WEB-INF/web.xml 2006-03-04 11:27:08 UTC (rev 2734) @@ -0,0 +1,179 @@ +<?xml version="1.0"?> +<!DOCTYPE web-app PUBLIC + "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN" + "http://java.sun.com/dtd/web-app_2_3.dtd"> +<web-app> + <description>JBoss Portal</description> + + + <!-- The server manager located by the main servlet. --> + <context-param> + <param-name>org.jboss.portal.server#SERVER_MANAGER</param-name> + <param-value>portal:service=ServerManager</param-value> + </context-param> + + <!-- BlockPages filter --> + <filter> + <filter-name>BlockPagesFilter</filter-name> + <filter-class>org.jboss.forge.portal.BlockPagesFilter</filter-class> + </filter> + + <filter-mapping> + <filter-name>BlockPagesFilter</filter-name> + <servlet-name>PortalServlet</servlet-name> + </filter-mapping> + + <!-- SSL Processor --> + <filter> + <filter-name>SSLProcessor</filter-name> + <filter-class>org.jboss.forge.portal.SSLProcessor</filter-class> + </filter> + + <filter-mapping> + <filter-name>SSLProcessor</filter-name> + <servlet-name>PortalServlet</servlet-name> + </filter-mapping> + + <!-- Forge filter --> + <filter> + <filter-name>AttributesFilter</filter-name> + <filter-class>org.jboss.forge.portal.AttributesFilter</filter-class> + </filter> + + <filter-mapping> + <filter-name>AttributesFilter</filter-name> + <servlet-name>PortalServlet</servlet-name> + </filter-mapping> + + <!-- The transaction filter start and stop a JTA transaction around the request. --> + <filter> + <filter-name>TransactionFilter</filter-name> + <filter-class>org.jboss.portal.core.servlet.TransactionFilter</filter-class> + </filter> + + <!-- We wrap the portal request with a transaction --> + <filter-mapping> + <filter-name>TransactionFilter</filter-name> + <servlet-name>PortalServlet</servlet-name> + </filter-mapping> + + <!-- The portal servlet is the main entrance point --> + <servlet> + <servlet-name>PortalServlet</servlet-name> + <servlet-class>org.jboss.portal.core.servlet.CoreServlet</servlet-class> + <load-on-startup>0</load-on-startup> + <security-role-ref> + <role-name>Authenticated</role-name> + <role-link>Authenticated</role-link> + </security-role-ref> + </servlet> + + <!-- Provide access to unauthenticated users --> + <servlet-mapping> + <servlet-name>PortalServlet</servlet-name> + <url-pattern>/*</url-pattern> + </servlet-mapping> + + <!-- Provide secure access to unauthenticated users --> + <servlet-mapping> + <servlet-name>PortalServlet</servlet-name> + <url-pattern>/sec/*</url-pattern> + </servlet-mapping> + + <!-- Provide access to authenticated users --> + <servlet-mapping> + <servlet-name>PortalServlet</servlet-name> + <url-pattern>/auth/*</url-pattern> + </servlet-mapping> + + <!-- Provide secure access to authenticated users --> + <servlet-mapping> + <servlet-name>PortalServlet</servlet-name> + <url-pattern>/authsec/*</url-pattern> + </servlet-mapping> + + <!-- Force the mapping of the index.jsp --> + <servlet-mapping> + <servlet-name>jsp</servlet-name> + <url-pattern>/login.jsp</url-pattern> + </servlet-mapping> + + <session-config> + <session-timeout>15</session-timeout> + </session-config> + + <!-- + | JDBC usage must be done with + | DataSource ds = (DataSource)ctx.lookup("java:comp/env/jdbc/PortalDS"; + --> + <resource-ref> + <res-ref-name>jdbc/PortalDS</res-ref-name> + <res-type>javax.sql.DataSource</res-type> + <res-auth>Container</res-auth> + <res-sharing-scope>Shareable</res-sharing-scope> + </resource-ref> + + <security-constraint> + <web-resource-collection> + <web-resource-name>Authenticated</web-resource-name> + <description></description> + <url-pattern>/auth/*</url-pattern> + </web-resource-collection> + <auth-constraint> + <role-name>Authenticated</role-name> + </auth-constraint> + </security-constraint> + + <security-constraint> + <web-resource-collection> + <web-resource-name>Secure</web-resource-name> + <url-pattern>/sec/*</url-pattern> + </web-resource-collection> + <user-data-constraint> + <transport-guarantee>CONFIDENTIAL</transport-guarantee> + </user-data-constraint> + </security-constraint> + + <security-constraint> + <web-resource-collection> + <web-resource-name>Secure+Authenticated</web-resource-name> + <url-pattern>/authsec/*</url-pattern> + </web-resource-collection> + <auth-constraint> + <role-name>Authenticated</role-name> + </auth-constraint> + <user-data-constraint> + <transport-guarantee>CONFIDENTIAL</transport-guarantee> + </user-data-constraint> + </security-constraint> + + <!-- + | Uncomment to use BASIC authentication scheme. Don't forget to comment other + | form authentication. + --> + <!-- + <login-config> + <auth-method>BASIC</auth-method> + <realm-name>JBoss Portal</realm-name> + </login-config> + --> + + <!-- + | Uncomment to use FORM authentication scheme. Don't forget to comment other + | form authentication. + --> + <!-- + --> + <login-config> + <auth-method>JBOSS-FEDERATED-SSO</auth-method> + <realm-name>JBoss Portal</realm-name> + <form-login-config> + <form-login-page>/index.html?ctrl:id=page.default.login</form-login-page> + <form-error-page>/index.html?ctrl:id=window.default.LoginWindow&ctrl:type=action&action=loginFailed</form-error-page> + </form-login-config> + </login-config> + + <security-role> + <role-name>Authenticated</role-name> + </security-role> +</web-app> Added: trunk/forge/portal-extensions/forge-login/to-copy/jboss-sso-nukes.jar.jar =================================================================== (Binary files differ) Property changes on: trunk/forge/portal-extensions/forge-login/to-copy/jboss-sso-nukes.jar.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/forge/portal-extensions/forge-login/to-copy/jbossweb-tomcat55.sar/catalina.jar =================================================================== (Binary files differ) Property changes on: trunk/forge/portal-extensions/forge-login/to-copy/jbossweb-tomcat55.sar/catalina.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/forge/portal-extensions/forge-login/to-copy/jbossweb-tomcat55.sar/jboss-identity-management.jar =================================================================== (Binary files differ) Property changes on: trunk/forge/portal-extensions/forge-login/to-copy/jbossweb-tomcat55.sar/jboss-identity-management.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/forge/portal-extensions/forge-login/to-copy/jbossweb-tomcat55.sar/jboss-saml.jar =================================================================== (Binary files differ) Property changes on: trunk/forge/portal-extensions/forge-login/to-copy/jbossweb-tomcat55.sar/jboss-saml.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/forge/portal-extensions/forge-login/to-copy/jbossweb-tomcat55.sar/jboss-sso-common.jar =================================================================== (Binary files differ) Property changes on: trunk/forge/portal-extensions/forge-login/to-copy/jbossweb-tomcat55.sar/jboss-sso-common.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/forge/portal-extensions/forge-login/to-copy/jbossweb-tomcat55.sar/jboss-sso-tomcat5.jar =================================================================== (Binary files differ) Property changes on: trunk/forge/portal-extensions/forge-login/to-copy/jbossweb-tomcat55.sar/jboss-sso-tomcat5.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/forge/portal-extensions/forge-login/to-copy/jbossweb-tomcat55.sar/jboss-sso.xml =================================================================== --- trunk/forge/portal-extensions/forge-login/to-copy/jbossweb-tomcat55.sar/jboss-sso.xml 2006-03-04 01:18:46 UTC (rev 2733) +++ trunk/forge/portal-extensions/forge-login/to-copy/jbossweb-tomcat55.sar/jboss-sso.xml 2006-03-04 11:27:08 UTC (rev 2734) @@ -0,0 +1,18 @@ +<?xml version='1.0' encoding='ISO-8859-1'?> + +<jboss-sso> + + <!-- identity management related configuration, this is the LDAP based module used by the JBoss Corporate web sites + Technically, this can be a provider that can integrate with thirdparty identity systems like SiteMinder etc + --> + <identity-management> + <provider id="si:jbosslabs:nukes:singleIdentity" class="org.jboss.forge.security.NukesIdentityProvider"/> + </identity-management> + + <!-- sso processor for SingleSignOn, the default JBossSingleSignOn processor uses OpenSAML-1.0, + the next version of this processor will use the latest SAML specification --> + <sso-processor> + <processor class="org.jboss.security.saml.JBossSingleSignOn"/> + </sso-processor> + +</jboss-sso> \ No newline at end of file Added: trunk/forge/portal-extensions/forge-login/to-copy/jbossweb-tomcat55.sar/jbwebsite-security-1.0.jar =================================================================== (Binary files differ) Property changes on: trunk/forge/portal-extensions/forge-login/to-copy/jbossweb-tomcat55.sar/jbwebsite-security-1.0.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/forge/portal-extensions/forge-login/to-copy/jbossweb-tomcat55.sar/opensaml-1.1.jar =================================================================== (Binary files differ) Property changes on: trunk/forge/portal-extensions/forge-login/to-copy/jbossweb-tomcat55.sar/opensaml-1.1.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/forge/portal-extensions/forge-login/to-copy/jbossweb-tomcat55.sar/server.xml =================================================================== --- trunk/forge/portal-extensions/forge-login/to-copy/jbossweb-tomcat55.sar/server.xml 2006-03-04 01:18:46 UTC (rev 2733) +++ trunk/forge/portal-extensions/forge-login/to-copy/jbossweb-tomcat55.sar/server.xml 2006-03-04 11:27:08 UTC (rev 2734) @@ -0,0 +1,135 @@ +<Server> + + <!-- Use a custom version of StandardService that allows the + connectors to be started independent of the normal lifecycle + start to allow web apps to be deployed before starting the + connectors. + --> + <Service name="jboss.web" + className="org.jboss.web.tomcat.tc5.StandardService"> + + <!-- A HTTP/1.1 Connector on port 8080 --> + <Connector port="8080" address="${jboss.bind.address}" + maxThreads="250" strategy="ms" maxHttpHeaderSize="8192" + emptySessionPath="true" + enableLookups="false" redirectPort="8443" acceptCount="100" + connectionTimeout="20000" disableUploadTimeout="true"/> + + <!-- Add this option to the connector to avoid problems with + .NET clients that don't implement HTTP/1.1 correctly + restrictedUserAgents="^.*MS Web Services Client Protocol 1.1.4322.*$" + --> + + <!-- A AJP 1.3 Connector on port 8009 --> + <Connector port="8009" address="${jboss.bind.address}" + emptySessionPath="true" enableLookups="false" redirectPort="8443" + protocol="AJP/1.3"/> + + <!-- SSL/TLS Connector configuration using the admin devl guide keystore + <Connector port="8443" address="${jboss.bind.address}" + maxThreads="100" strategy="ms" maxHttpHeaderSize="8192" + emptySessionPath="true" + scheme="https" secure="true" clientAuth="false" + keystoreFile="${jboss.server.home.dir}/conf/chap8.keystore" + keystorePass="rmi+ssl" sslProtocol = "TLS" /> + --> + + <Engine name="jboss.web" defaultHost="localhost"> + + <!-- The JAAS based authentication and authorization realm implementation + that is compatible with the jboss 3.2.x realm implementation. + - certificatePrincipal : the class name of the + org.jboss.security.auth.certs.CertificatePrincipal impl + used for mapping X509[] cert chains to a Princpal. + --> + <Realm className="org.jboss.web.tomcat.security.JBossSecurityMgrRealm" + certificatePrincipal="org.jboss.security.auth.certs.SubjectDNMapping" + /> + <!-- A subclass of JBossSecurityMgrRealm that uses the authentication + behavior of JBossSecurityMgrRealm, but overrides the authorization + checks to use JACC permissions with the current java.security.Policy + to determine authorized access. + <Realm className="org.jboss.web.tomcat.security.JaccAuthorizationRealm" + certificatePrincipal="org.jboss.security.auth.certs.SubjectDNMapping" + /> + --> + + <Host name="localhost" + autoDeploy="false" deployOnStartup="false" deployXML="false"> + + <!-- Uncomment to enable request dumper. This Valve "logs interesting + contents from the specified Request (before processing) and the + corresponding Response (after processing). It is especially useful + in debugging problems related to headers and cookies." + --> + <!-- + <Valve className="org.apache.catalina.valves.RequestDumperValve" /> + --> + + <!-- Access logger --> + <!-- + <Valve className="org.apache.catalina.valves.FastCommonAccessLogValve" + prefix="localhost_access_log." suffix=".log" + pattern="common" directory="${jboss.server.home.dir}/log" + resolveHosts="false" /> + --> + + <!-- Uncomment to enable single sign-on across web apps + deployed to this host. Does not provide SSO across a cluster. + + If this valve is used, do not use the JBoss ClusteredSingleSignOn + valve shown below. + --> + <!-- + <Valve className="org.apache.catalina.authenticator.SingleSignOn" /> + --> + + <!-- Uncomment to enable single sign-on across web apps + deployed to this host AND to all other hosts in the cluster. + + If this valve is used, do not use the standard Tomcat SingleSignOn + valve shown above. + + Valve uses a JBossCache instance to support SSO credential + caching and replication across the cluster. The JBossCache + instance must be configured separately. By default, the valve + shares a JBossCache with the service that supports HttpSession + replication. See the "tc5-cluster-service.xml" file in the + server/all/deploy directory for cache configuration details. + + Besides the attributes supported by the standard Tomcat + SingleSignOn valve (see the Tomcat docs), this version also + supports the following attribute: + + treeCacheName JMX ObjectName of the JBossCache MBean used to + support credential caching and replication across + the cluster. If not set, the default value is + "jboss.cache:service=TomcatClusteringCache", the + standard ObjectName of the JBossCache MBean used + to support session replication. + --> + <!-- + <Valve className="org.jboss.web.tomcat.tc5.sso.ClusteredSingleSignOn" /> + --> + + + <!-- Uncomment to check for unclosed connections and transaction terminated checks + in servlets/jsps. + Important: You need to uncomment the dependency on the CachedConnectionManager + in META-INF/jboss-service.xml + <Valve className="org.jboss.web.tomcat.tc5.jca.CachedConnectionValve" + cachedConnectionManagerObjectName="jboss.jca:service=CachedConnectionManager" + transactionManagerObjectName="jboss:service=TransactionManager" /> + --> + + <!-- mod = JBoss SSO Framework components --> + <Valve className="org.jboss.security.valve.SSOAutoLogout" logoutURL="/index.html?ctrl:id=window.default.UserPortletWindowDefaultAdmin&ctrl:type=action&ctrl:windowstate=normal&op=userLogout&noproject=true"/> + <Valve className="org.jboss.security.valve.SSOTokenManager" assertingParty="jboss_dotorg"/> + + </Host> + + </Engine> + + </Service> + +</Server> Added: trunk/forge/portal-extensions/forge-login/to-copy/jbossweb-tomcat55.sar/xmlsec-20050514.jar =================================================================== (Binary files differ) Property changes on: trunk/forge/portal-extensions/forge-login/to-copy/jbossweb-tomcat55.sar/xmlsec-20050514.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Deleted: trunk/forge/portal-extensions/forge-login/to-copy/login-config.xml =================================================================== --- trunk/forge/portal-extensions/forge-login/to-copy/login-config.xml 2006-03-04 01:18:46 UTC (rev 2733) +++ trunk/forge/portal-extensions/forge-login/to-copy/login-config.xml 2006-03-04 11:27:08 UTC (rev 2734) @@ -1,26 +0,0 @@ -<?xml version='1.0'?> -<!DOCTYPE policy PUBLIC - "-//JBoss//DTD JBOSS Security Config 3.0//EN" - "http://www.jboss.org/j2ee/dtd/security_config.dtd"> -<policy> - <!-- For the JCR CMS --> - <application-policy name="cms"> - <authentication> - <login-module code="org.apache.jackrabbit.core.security.SimpleLoginModule" flag="required"/> - </authentication> - </application-policy> - - <application-policy name="portal"> - <authentication> - <login-module code="org.jboss.labs.login.LabsLoginModule" flag="required"> - <module-option name="unauthenticatedIdentity">guest</module-option> - <module-option name="hashAlgorithm">MD5</module-option> - <module-option name="hashEncoding">HEX</module-option> - <module-option name="userModuleJNDIName">java:/portal/UserModule</module-option> - <module-option name="additionalRole">Authenticated</module-option> - <module-option name="password-stacking">useFirstPass</module-option> - <module-option name="jbossdb">java:JBossDS</module-option> - </login-module> - </authentication> - </application-policy> -</policy> Modified: trunk/forge/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/WikiPortlet.java =================================================================== --- trunk/forge/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/WikiPortlet.java 2006-03-04 01:18:46 UTC (rev 2733) +++ trunk/forge/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/WikiPortlet.java 2006-03-04 11:27:08 UTC (rev 2734) @@ -210,7 +210,7 @@ } else { rResp.setRenderParameter("language", wikiEngine.defaultLangugeCode); } - + if (rReq.getParameter("editAction") != null) { log.debug("EDITING PAGE"); @@ -277,11 +277,12 @@ Credentials credentials = wikiEngine.getCredentialsInstance(rReq); - PortletURL wikiURL = rRes.createActionURL(); + String langCode = rReq.getParameter("language"); - rReq.setAttribute("actionURL", wikiURL.toString()); + String wikiURL = rRes.createActionURL().toString() + "&language=" + + langCode; - String langCode = rReq.getParameter("language"); + rReq.setAttribute("actionURL", wikiURL); if (langCode == null) { langCode = wikiEngine.defaultLangugeCode; @@ -299,7 +300,7 @@ // prepare some data for plugins in session rReq.getPortletSession().setAttribute("credentials", credentials); rReq.getPortletSession().setAttribute("hostURL", hostURL); - rReq.getPortletSession().setAttribute("actionURL", wikiURL.toString()); + rReq.getPortletSession().setAttribute("actionURL", wikiURL); rReq.getPortletSession().setAttribute("isSecure", new Boolean(rReq.isSecure())); @@ -489,8 +490,10 @@ rReq.setAttribute("currentLanguage", langCode); - rReq.setAttribute("friendlyLink", hostURL + "/wiki/" - + pageToShow.getName()); + rReq.setAttribute("friendlyLink", hostURL + + "/wiki/" + + ((!langCode.equals(wikiEngine.defaultLangugeCode)) ? langCode.toLowerCase() + + "/" : "") + pageToShow.getName()); rReq.setAttribute("rssLink", hostURL + "/wiki/rss/" + pageToShow.getName()); rReq.setAttribute("rdfLink", hostURL + "/wiki/rdf/" Modified: trunk/forge/portal-extensions/jbosswiki/forge-wiki/src/web/WEB-INF/jsp/Edit.jsp =================================================================== --- trunk/forge/portal-extensions/jbosswiki/forge-wiki/src/web/WEB-INF/jsp/Edit.jsp 2006-03-04 01:18:46 UTC (rev 2733) +++ trunk/forge/portal-extensions/jbosswiki/forge-wiki/src/web/WEB-INF/jsp/Edit.jsp 2006-03-04 11:27:08 UTC (rev 2734) @@ -30,7 +30,7 @@ <hr /> <div style="color:#FF0000"><%=lockMsg%></div> -<form method="post" action="<%=actionURL%>"> +<form method="post" action="<%=actionURL%>" accept-charset="UTF-8"> Choose language: <select name="language"> <% java.util.Iterator it = usedLangs.keySet().iterator(); Modified: trunk/forge/portal-extensions/jbosswiki/forge-wiki/src/web/WEB-INF/jsp/Wiki.jsp =================================================================== --- trunk/forge/portal-extensions/jbosswiki/forge-wiki/src/web/WEB-INF/jsp/Wiki.jsp 2006-03-04 01:18:46 UTC (rev 2733) +++ trunk/forge/portal-extensions/jbosswiki/forge-wiki/src/web/WEB-INF/jsp/Wiki.jsp 2006-03-04 11:27:08 UTC (rev 2734) @@ -79,6 +79,7 @@ } %> <input type="text" name="searchQuery" /> +<input type="hidden" name="language" value="<%=curLang%>" /> <input type="submit" value="SEARCH" /> </td> </tr> Modified: trunk/forge/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/WikiEngine.java =================================================================== --- trunk/forge/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/WikiEngine.java 2006-03-04 01:18:46 UTC (rev 2733) +++ trunk/forge/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/WikiEngine.java 2006-03-04 11:27:08 UTC (rev 2734) @@ -613,6 +613,8 @@ Map<String, Integer> resPages = new HashMap<String, Integer>(); + log.info(langCode); + Set<String> pages = languageDataSources.get(langCode).getMediaDataSource().getAllPageNames(); for (String name : pages) { Modified: trunk/forge/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/plugins/AdminConsolePlugin.java =================================================================== --- trunk/forge/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/plugins/AdminConsolePlugin.java 2006-03-04 01:18:46 UTC (rev 2733) +++ trunk/forge/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/plugins/AdminConsolePlugin.java 2006-03-04 11:27:08 UTC (rev 2734) @@ -122,7 +122,7 @@ adminConsole.append("\n<hr><h3>Admin console</h3>\n"); adminConsole.append("Go to <a href=\"").append(actionURL).append( - "&type=admin").append( + "&type=admin").append("&language=").append(wikiPage.getLangCode()).append( "\">ADMIN GENERAL CONSOLE</a><br />\n"); if (errorMsg.length() > 0) { adminConsole.append("<i>" + errorMsg + "</i><br />\n"); |