August 2008 - portal-commits - Jboss List Archives

JBoss Portal SVN: r11709 - in docs/template/user-guide: en and 1 other directories.

by portal-commits＠lists.jboss.org

Author: thomas.heute(a)jboss.com Date: 2008-08-20 08:56:13 -0400 (Wed, 20 Aug 2008) New Revision: 11709 Added: docs/template/user-guide/pom.xml Removed: docs/template/user-guide/build.xml Modified: docs/template/user-guide/en/master.xml docs/template/user-guide/en/modules/sample.xml Log: Use new build mechanism Deleted: docs/template/user-guide/build.xml =================================================================== --- docs/template/user-guide/build.xml 2008-08-20 11:54:15 UTC (rev 11708) +++ docs/template/user-guide/build.xml 2008-08-20 12:56:13 UTC (rev 11709) @@ -1,26 +0,0 @@ -<project name="CHANGE ME IN BUILD.XML" default="all.doc" basedir="."> - -  -  - - <property name="pdf.name" value="ChangeMeInBuildXML.pdf" /> - <import file="../docbook-support/support.xml" /> - - <target name="en"> - <antcall target="lang.dochtml"> - <param name="lang" value="en"/> - </antcall> - </target> - - <target name="all.doc" depends="clean"> - <antcall target="lang.all"><param name="lang" value="en"/></antcall> - </target> - -  - -</project> Modified: docs/template/user-guide/en/master.xml =================================================================== --- docs/template/user-guide/en/master.xml 2008-08-20 11:54:15 UTC (rev 11708) +++ docs/template/user-guide/en/master.xml 2008-08-20 12:56:13 UTC (rev 11709) @@ -1,8 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.3CR3//EN" - "../../docbook-support/support/docbook-dtd/docbookx.dtd" [ - <!ENTITY sample SYSTEM "modules/sample.xml"> - ]> +<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" + "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd"> <book lang="en"> <bookinfo> <title>Change Title in master.xml</title> @@ -16,6 +14,7 @@ </author> </bookinfo> <toc/> -  &sample; + <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="modules/sample.xml" /> + </book> Modified: docs/template/user-guide/en/modules/sample.xml =================================================================== --- docs/template/user-guide/en/modules/sample.xml 2008-08-20 11:54:15 UTC (rev 11708) +++ docs/template/user-guide/en/modules/sample.xml 2008-08-20 12:56:13 UTC (rev 11709) @@ -199,7 +199,64 @@ ]]></screen> </para> </sect2> - + + <sect2> + <title>Coloration</title> + <programlisting><![CDATA[ +<programlisting role="JAVA"><![CDATA[ +package org.jboss.portal.foo; +public class Bar +{ +}]]></programlisting>]]></programlisting> + <programlisting role="JAVA"><![CDATA[ +package org.jboss.portal.foo; +public class Bar +{ +}]]></programlisting> + </sect2> + <sect2> + <title>Annotations</title> + <programlisting><![CDATA[ +<programlistingco> + <areaspec> + <area id="sample.annotation.line2" coords='2' /> + <area id="sample.annotation.line4" coords='4' /> + </areaspec> + <programlisting><![CDATA[Line 1: Foo +Line 2: Bar +Line 3: Toto +Line 4: FooBar +Line 5: Titi]]></programlisting> + <calloutlist> + <callout arearefs="sample.annotation.line2"> + <para>This is line 2</para> + </callout> + <callout arearefs="sample.annotation.line4"> + <para>This is line 4</para> + </callout> + </calloutlist> +</programlistingco> +]]></programlisting> + <programlistingco> + <areaspec> + <area id="sample.annotation.line2" coords='2' /> + <area id="sample.annotation.line4" coords='4' /> + </areaspec> + <programlisting><![CDATA[Line 1: Foo +Line 2: Bar +Line 3: Toto +Line 4: FooBar +Line 5: Titi]]></programlisting> + <calloutlist> + <callout arearefs="sample.annotation.line2"> + <para>This is line 2</para> + </callout> + <callout arearefs="sample.annotation.line4"> + <para>This is line 4</para> + </callout> + </calloutlist> + </programlistingco> + </sect2> </sect1> </chapter> Added: docs/template/user-guide/pom.xml =================================================================== --- docs/template/user-guide/pom.xml (rev 0) +++ docs/template/user-guide/pom.xml 2008-08-20 12:56:13 UTC (rev 11709) @@ -0,0 +1,68 @@ +<project xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + + <modelVersion>4.0.0</modelVersion> + + <parent> + <groupId>org.jboss.portal</groupId> + <artifactId>jboss-portal-docs-parent</artifactId> + <version>1.0.0</version> + </parent> + + <groupId>org.jboss.portal</groupId> + <artifactId>userGuide-${translation}</artifactId> + <version>2.7.0</version> + <packaging>jdocbook</packaging> + <name>User_Guide_(${translation})</name> + + + <repositories> + <repository> + <id>repository.jboss.org</id> + <name>JBoss Repository</name> + <layout>default</layout> + <url>http://repository.jboss.org/maven2/</url> + <snapshots> + <enabled>false</enabled> + </snapshots> + </repository> + <repository> + <id>snapshots.jboss.org</id> + <name>JBoss Snapshots Repository</name> + <layout>default</layout> + <url>http://snapshots.jboss.org/maven2/</url> + <snapshots> + <enabled>true</enabled> + </snapshots> + <releases> + <enabled>false</enabled> + </releases> + </repository> + </repositories> + + <pluginRepositories> + <pluginRepository> + <id>repository.jboss.org</id> + <name>JBoss Repository</name> + <layout>default</layout> + <url>http://repository.jboss.org/maven2/</url> + <snapshots> + <enabled>false</enabled> + </snapshots> + </pluginRepository> + <pluginRepository> + <id>snapshots.jboss.org</id> + <name>JBoss Snapshots Repository</name> + <layout>default</layout> + <url>http://snapshots.jboss.org/maven2/</url> + <snapshots> + <enabled>true</enabled> + </snapshots> + <releases> + <enabled>false</enabled> + </releases> + </pluginRepository> + </pluginRepositories> + +</project>

17 years, 8 months

1
0
0 / 0

JBoss Portal SVN: r11708 - branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/aspects/server.

by portal-commits＠lists.jboss.org

Author: thomas.heute(a)jboss.com Date: 2008-08-20 07:54:15 -0400 (Wed, 20 Aug 2008) New Revision: 11708 Modified: branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/aspects/server/UserInterceptor.java Log: javadoc Modified: branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/aspects/server/UserInterceptor.java =================================================================== --- branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/aspects/server/UserInterceptor.java 2008-08-20 11:53:56 UTC (rev 11707) +++ branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/aspects/server/UserInterceptor.java 2008-08-20 11:54:15 UTC (rev 11708) @@ -46,8 +46,6 @@ * The interceptor is responsible for managing the user identity lifecycle based on the principal name returned by the * <code>HttpServletRequest.getUserPrincipal()</code> method. * <p/> - * It manages also the user finalization that will set the last login date to the current value when the user is not - * used anymore. * * @author <a href="mailto:julien@jboss.org">Julien Viet</a> * @version $Revision$

17 years, 8 months

1
0
0 / 0

JBoss Portal SVN: r11707 - branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/aspects/server.

by portal-commits＠lists.jboss.org

Author: thomas.heute(a)jboss.com Date: 2008-08-20 07:53:56 -0400 (Wed, 20 Aug 2008) New Revision: 11707 Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/aspects/server/UserInterceptor.java Log: JBPORTAL-2098: Last-login date feature creates deadlocks Now it records the last login date on the login (not logout). Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/aspects/server/UserInterceptor.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/aspects/server/UserInterceptor.java 2008-08-20 11:05:29 UTC (rev 11706) +++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/aspects/server/UserInterceptor.java 2008-08-20 11:53:56 UTC (rev 11707) @@ -22,10 +22,18 @@ ******************************************************************************/ package org.jboss.portal.core.aspects.server; +import java.security.Principal; +import java.util.Date; +import java.util.HashMap; +import java.util.Map; + +import javax.naming.InitialContext; +import javax.naming.NamingException; +import javax.servlet.http.HttpServletRequest; + import org.jboss.logging.Logger; import org.jboss.portal.common.invocation.AttributeResolver; import org.jboss.portal.common.invocation.InvocationException; -import org.jboss.portal.core.CoreConstants; import org.jboss.portal.identity.CachedUserImpl; import org.jboss.portal.identity.NoSuchUserException; import org.jboss.portal.identity.User; @@ -34,27 +42,10 @@ import org.jboss.portal.server.ServerInterceptor; import org.jboss.portal.server.ServerInvocation; -import javax.naming.InitialContext; -import javax.naming.NameNotFoundException; -import javax.naming.NamingException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpSession; -import javax.servlet.http.HttpSessionBindingEvent; -import javax.servlet.http.HttpSessionBindingListener; -import javax.transaction.UserTransaction; -import javax.transaction.Transaction; -import java.io.Serializable; -import java.security.Principal; -import java.util.Date; -import java.util.HashMap; -import java.util.Map; - /** * The interceptor is responsible for managing the user identity lifecycle based on the principal name returned by the * <code>HttpServletRequest.getUserPrincipal()</code> method. * <p/> - * It manages also the user finalization that will set the last login date to the current value when the user is not - * used anymore. * * @author <a href="mailto:julien@jboss.org">Julien Viet</a> * @version $Revision$ @@ -122,7 +113,6 @@ { boolean trace = log.isTraceEnabled(); HttpServletRequest req = invocation.getServerContext().getClientRequest(); - HttpSession httpSession = req.getSession(); // Get scope AttributeResolver principalScopeResolver = invocation.getContext().getAttributeResolver(ServerInvocation.PRINCIPAL_SCOPE); @@ -132,7 +122,7 @@ // The user and its profile User user = null; - Map profile = null; + Map<String, String> profile = null; // Fetch user if we can if (userPrincipal != null) @@ -156,6 +146,9 @@ // Fetch user info user = getUserModule().findUserByUserName(userName); + // Set Last login date + getUserProfileModule().setProperty(user, User.INFO_USER_LAST_LOGIN_DATE, "" + new Date()); + // Get profile profile = getUserProfileModule().getProperties(user); @@ -170,6 +163,8 @@ // Cache invocation.getContext().setAttribute(ServerInvocation.PRINCIPAL_SCOPE, PROFILE_KEY, profile); + + } // @@ -192,54 +187,6 @@ } } - // - if (user == null) - { - // Erase any previous user finalizer, the side effect of unbinding the session attribute will finalize the previous user - UserFinalizer finalizer = (UserFinalizer)httpSession.getAttribute(CoreConstants.Servlet.Session.USER_FINALIZER); - if (finalizer != null) - { - if (trace) - { - log.trace("Removing finalizer for user=" + finalizer.userId); - } - httpSession.setAttribute(CoreConstants.Servlet.Session.USER_FINALIZER, null); - } - } - else - { - // Get the current finalizer if any - UserFinalizer finalizer = (UserFinalizer)httpSession.getAttribute(CoreConstants.Servlet.Session.USER_FINALIZER); - - // Get the user id from the request user - if (finalizer == null) - { - if (trace) - { - log.trace("Adding finalizer for user=" + user.getUserName()); - } - - // Set the user finalizer - finalizer = new UserFinalizer(user.getId()); - - // Bind the new one, the side effect finalizes the previous user - httpSession.setAttribute(CoreConstants.Servlet.Session.USER_FINALIZER, finalizer); - } - else if (!finalizer.userId.equals(user.getId())) - { - if (trace) - { - log.trace("Replacing the finalizer for user=" + finalizer.userId + " with user=" + user.getId()); - } - - // Set the user finalizer - finalizer = new UserFinalizer(user.getId()); - - // Bind the new one, the side effect finalizes the previous user - httpSession.setAttribute(CoreConstants.Servlet.Session.USER_FINALIZER, finalizer); - } - } - try { // Continue the invocation @@ -255,7 +202,6 @@ } } - public boolean isCacheUser() { return cacheUser; @@ -266,117 +212,4 @@ this.cacheUser = cacheUser; } - /** Implement the last login date feature. */ - private static class UserFinalizer implements Serializable, HttpSessionBindingListener - { - - /** The serialVersionUID */ - private static final long serialVersionUID = -8534276945533635226L; - - private static final Logger log = Logger.getLogger(UserFinalizer.class); - - private final Object userId; - - public UserFinalizer(Object userId) - { - if (userId == null) - { - throw new IllegalArgumentException("No user id present"); - } - this.userId = userId; - } - - public void valueBound(HttpSessionBindingEvent event) - { - } - - public void valueUnbound(HttpSessionBindingEvent event) - { - try - { - finalizeUser(); - } - catch (Exception e) - { - log.warn("Cannot set last login date for user with id '" + userId + "' : " + e.getMessage()); - log.debug("Failed to set user last login date (may happen during server shutdown): ", e); - } - } - - protected void finalizeUser() throws Exception - { - /** - * Note: Due to a possible bug in JBoss Cache Transaction propagation within a cluster, - * We need to spawn a separate thread with its own new transaction to perform the finalizeUser - * logic. - * - * Without that, it results in data deadlocks in the cluster. - */ - Thread thread = new Thread(new FinalizeRunner()); - thread.start(); - thread.join(); - } - - /** - * - * @author soshah - * - */ - private class FinalizeRunner implements Runnable - { - public void run() - { - UserTransaction tx = null; - try - { - // - if (log.isTraceEnabled()) - { - log.trace("Finalizing user " + userId); - } - - // - // Here we use JNDI to locate the module as this finalizer could have been - // migrated in the session of another node of the cluster - UserModule userModule = null; - UserProfileModule userProfileModule = null; - InitialContext ctx = new InitialContext(); - tx = (UserTransaction)ctx.lookup("UserTransaction"); - tx.begin(); - try - { - userModule = (UserModule)new InitialContext().lookup("java:portal/UserModule"); - userProfileModule = (UserProfileModule)new InitialContext().lookup("java:portal/UserProfileModule"); - } - catch (NameNotFoundException ignore) - { - // Name is not bound anymore, it could happen during a shutdown, we don't do anything - } - - // Get user and set last visit date to now if we can - if (userModule != null && userProfileModule != null) - { - try - { - User user = userModule.findUserById(userId); - //user.setLastVisitDate(new Date()); - userProfileModule.setProperty(user, User.INFO_USER_LAST_LOGIN_DATE, new Date().toString()); - - } - catch (NoSuchUserException e) - { - // User is not found - log.warn("Trying to finalize non existing user " + userId); - } - } - tx.commit(); - } - catch(Exception e) - { - try{tx.rollback();}catch(Exception rbe){} - log.debug(this, e); - } - } - } - } }

17 years, 8 months

1
0
0 / 0

JBoss Portal SVN: r11706 - branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/aspects/server.

by portal-commits＠lists.jboss.org

Author: thomas.heute(a)jboss.com Date: 2008-08-20 07:05:29 -0400 (Wed, 20 Aug 2008) New Revision: 11706 Modified: branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/aspects/server/UserInterceptor.java Log: JBPORTAL-2098: Last-login date feature creates deadlocks Now it records the last login date on the login (not logout). Also instead of storing the date as a display String it records the value as the 'time' (long). Modified: branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/aspects/server/UserInterceptor.java =================================================================== --- branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/aspects/server/UserInterceptor.java 2008-08-19 17:56:52 UTC (rev 11705) +++ branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/aspects/server/UserInterceptor.java 2008-08-20 11:05:29 UTC (rev 11706) @@ -22,10 +22,18 @@ ******************************************************************************/ package org.jboss.portal.core.aspects.server; +import java.security.Principal; +import java.util.Date; +import java.util.HashMap; +import java.util.Map; + +import javax.naming.InitialContext; +import javax.naming.NamingException; +import javax.servlet.http.HttpServletRequest; + import org.jboss.logging.Logger; import org.jboss.portal.common.invocation.AttributeResolver; import org.jboss.portal.common.invocation.InvocationException; -import org.jboss.portal.core.CoreConstants; import org.jboss.portal.identity.CachedUserImpl; import org.jboss.portal.identity.NoSuchUserException; import org.jboss.portal.identity.User; @@ -34,21 +42,6 @@ import org.jboss.portal.server.ServerInterceptor; import org.jboss.portal.server.ServerInvocation; -import javax.naming.InitialContext; -import javax.naming.NameNotFoundException; -import javax.naming.NamingException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpSession; -import javax.servlet.http.HttpSessionBindingEvent; -import javax.servlet.http.HttpSessionBindingListener; -import javax.transaction.UserTransaction; -import javax.transaction.Transaction; -import java.io.Serializable; -import java.security.Principal; -import java.util.Date; -import java.util.HashMap; -import java.util.Map; - /** * The interceptor is responsible for managing the user identity lifecycle based on the principal name returned by the * <code>HttpServletRequest.getUserPrincipal()</code> method. @@ -122,7 +115,6 @@ { boolean trace = log.isTraceEnabled(); HttpServletRequest req = invocation.getServerContext().getClientRequest(); - HttpSession httpSession = req.getSession(); // Get scope AttributeResolver principalScopeResolver = invocation.getContext().getAttributeResolver(ServerInvocation.PRINCIPAL_SCOPE); @@ -132,7 +124,7 @@ // The user and its profile User user = null; - Map profile = null; + Map<String, String> profile = null; // Fetch user if we can if (userPrincipal != null) @@ -156,6 +148,9 @@ // Fetch user info user = getUserModule().findUserByUserName(userName); + // Set Last login date + getUserProfileModule().setProperty(user, User.INFO_USER_LAST_LOGIN_DATE, "" + new Date().getTime()); + // Get profile profile = getUserProfileModule().getProperties(user); @@ -170,6 +165,8 @@ // Cache invocation.getContext().setAttribute(ServerInvocation.PRINCIPAL_SCOPE, PROFILE_KEY, profile); + + } // @@ -192,54 +189,6 @@ } } - // - if (user == null) - { - // Erase any previous user finalizer, the side effect of unbinding the session attribute will finalize the previous user - UserFinalizer finalizer = (UserFinalizer)httpSession.getAttribute(CoreConstants.Servlet.Session.USER_FINALIZER); - if (finalizer != null) - { - if (trace) - { - log.trace("Removing finalizer for user=" + finalizer.userId); - } - httpSession.setAttribute(CoreConstants.Servlet.Session.USER_FINALIZER, null); - } - } - else - { - // Get the current finalizer if any - UserFinalizer finalizer = (UserFinalizer)httpSession.getAttribute(CoreConstants.Servlet.Session.USER_FINALIZER); - - // Get the user id from the request user - if (finalizer == null) - { - if (trace) - { - log.trace("Adding finalizer for user=" + user.getUserName()); - } - - // Set the user finalizer - finalizer = new UserFinalizer(user.getId()); - - // Bind the new one, the side effect finalizes the previous user - httpSession.setAttribute(CoreConstants.Servlet.Session.USER_FINALIZER, finalizer); - } - else if (!finalizer.userId.equals(user.getId())) - { - if (trace) - { - log.trace("Replacing the finalizer for user=" + finalizer.userId + " with user=" + user.getId()); - } - - // Set the user finalizer - finalizer = new UserFinalizer(user.getId()); - - // Bind the new one, the side effect finalizes the previous user - httpSession.setAttribute(CoreConstants.Servlet.Session.USER_FINALIZER, finalizer); - } - } - try { // Continue the invocation @@ -255,7 +204,6 @@ } } - public boolean isCacheUser() { return cacheUser; @@ -266,117 +214,4 @@ this.cacheUser = cacheUser; } - /** Implement the last login date feature. */ - private static class UserFinalizer implements Serializable, HttpSessionBindingListener - { - - /** The serialVersionUID */ - private static final long serialVersionUID = -8534276945533635226L; - - private static final Logger log = Logger.getLogger(UserFinalizer.class); - - private final Object userId; - - public UserFinalizer(Object userId) - { - if (userId == null) - { - throw new IllegalArgumentException("No user id present"); - } - this.userId = userId; - } - - public void valueBound(HttpSessionBindingEvent event) - { - } - - public void valueUnbound(HttpSessionBindingEvent event) - { - try - { - finalizeUser(); - } - catch (Exception e) - { - log.warn("Cannot set last login date for user with id '" + userId + "' : " + e.getMessage()); - log.debug("Failed to set user last login date (may happen during server shutdown): ", e); - } - } - - protected void finalizeUser() throws Exception - { - /** - * Note: Due to a possible bug in JBoss Cache Transaction propagation within a cluster, - * We need to spawn a separate thread with its own new transaction to perform the finalizeUser - * logic. - * - * Without that, it results in data deadlocks in the cluster. - */ - Thread thread = new Thread(new FinalizeRunner()); - thread.start(); - thread.join(); - } - - /** - * - * @author soshah - * - */ - private class FinalizeRunner implements Runnable - { - public void run() - { - UserTransaction tx = null; - try - { - // - if (log.isTraceEnabled()) - { - log.trace("Finalizing user " + userId); - } - - // - // Here we use JNDI to locate the module as this finalizer could have been - // migrated in the session of another node of the cluster - UserModule userModule = null; - UserProfileModule userProfileModule = null; - InitialContext ctx = new InitialContext(); - tx = (UserTransaction)ctx.lookup("UserTransaction"); - tx.begin(); - try - { - userModule = (UserModule)new InitialContext().lookup("java:portal/UserModule"); - userProfileModule = (UserProfileModule)new InitialContext().lookup("java:portal/UserProfileModule"); - } - catch (NameNotFoundException ignore) - { - // Name is not bound anymore, it could happen during a shutdown, we don't do anything - } - - // Get user and set last visit date to now if we can - if (userModule != null && userProfileModule != null) - { - try - { - User user = userModule.findUserById(userId); - //user.setLastVisitDate(new Date()); - userProfileModule.setProperty(user, User.INFO_USER_LAST_LOGIN_DATE, new Date().toString()); - - } - catch (NoSuchUserException e) - { - // User is not found - log.warn("Trying to finalize non existing user " + userId); - } - } - tx.commit(); - } - catch(Exception e) - { - try{tx.rollback();}catch(Exception rbe){} - log.debug(this, e); - } - } - } - } }

17 years, 8 months

1
0
0 / 0

JBoss Portal SVN: r11705 - in branches/JBoss_Portal_Branch_2_7: widget/src/main/org/jboss/portal/widget and 2 other directories.

by portal-commits＠lists.jboss.org

Author: thomas.heute(a)jboss.com Date: 2008-08-19 13:56:52 -0400 (Tue, 19 Aug 2008) New Revision: 11705 Modified: branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/impl/model/content/generic/InternalGenericContentProvider.java branches/JBoss_Portal_Branch_2_7/widget/src/main/org/jboss/portal/widget/AbstractWidgetProvider.java branches/JBoss_Portal_Branch_2_7/widget/src/main/org/jboss/portal/widget/netvibes/provider/NetvibesProvider.java branches/JBoss_Portal_Branch_2_7/widget/src/main/org/jboss/portal/widget/netvibes/provider/NetvibesQuery.java branches/JBoss_Portal_Branch_2_7/widget/src/resources/portal-widget-netvibes-war/WEB-INF/jsp/edit_content.jsp Log: JBPORTAL-2126: Fixed Netvibes support with the new API Modified: branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/impl/model/content/generic/InternalGenericContentProvider.java =================================================================== --- branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/impl/model/content/generic/InternalGenericContentProvider.java 2008-08-19 13:56:03 UTC (rev 11704) +++ branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/impl/model/content/generic/InternalGenericContentProvider.java 2008-08-19 17:56:52 UTC (rev 11705) @@ -250,7 +250,10 @@ } invocation.setNavigationalState(ParametersStateString.create(parameterMap2)); - parameterMap.put(id_parameters, paramNames.toArray(new String[paramNames.size()])); + if (paramNames.size() != 0) + { + parameterMap.put(id_parameters, paramNames.toArray(new String[paramNames.size()])); + } } invocation.setPublicNavigationalState(parameterMap); } Modified: branches/JBoss_Portal_Branch_2_7/widget/src/main/org/jboss/portal/widget/AbstractWidgetProvider.java =================================================================== --- branches/JBoss_Portal_Branch_2_7/widget/src/main/org/jboss/portal/widget/AbstractWidgetProvider.java 2008-08-19 13:56:03 UTC (rev 11704) +++ branches/JBoss_Portal_Branch_2_7/widget/src/main/org/jboss/portal/widget/AbstractWidgetProvider.java 2008-08-19 17:56:52 UTC (rev 11705) @@ -65,7 +65,7 @@ private boolean fetchWidgetsOnDirectoryLookup = false; /** The connection timeout */ - protected int connectionTimeout = 5000; + protected int connectionTimeout = 10000; /** Eviction thread timing */ protected long timing = TimeUnit.MILLISECONDS.convert(60, TimeUnit.SECONDS); Modified: branches/JBoss_Portal_Branch_2_7/widget/src/main/org/jboss/portal/widget/netvibes/provider/NetvibesProvider.java =================================================================== --- branches/JBoss_Portal_Branch_2_7/widget/src/main/org/jboss/portal/widget/netvibes/provider/NetvibesProvider.java 2008-08-19 13:56:03 UTC (rev 11704) +++ branches/JBoss_Portal_Branch_2_7/widget/src/main/org/jboss/portal/widget/netvibes/provider/NetvibesProvider.java 2008-08-19 17:56:52 UTC (rev 11705) @@ -22,21 +22,27 @@ ******************************************************************************/ package org.jboss.portal.widget.netvibes.provider; +import java.net.MalformedURLException; import java.net.URL; +import java.util.ArrayList; import java.util.Collection; import java.util.Collections; import java.util.List; -import org.jboss.portal.common.util.CollectionBuilder; +import org.jboss.portal.common.net.URLTools; import org.jboss.portal.widget.AbstractWidgetProvider; import org.jboss.portal.widget.DirectoryQueryResult; import org.jboss.portal.widget.ExpiringFutureTask; import org.jboss.portal.widget.Widget; import org.jboss.portal.widget.WidgetQuery; import org.jboss.portal.widget.netvibes.directory.NetvibesWidgetCategory; +import org.jboss.portal.widget.netvibes.json.JSONArray; +import org.jboss.portal.widget.netvibes.json.JSONException; +import org.jboss.portal.widget.netvibes.json.JSONObject; /** * @author <a href="mailto:emuckenh@redhat.com">Emanuel Muckenhuber</a> + * @author <a href="mailto:theute@redhat.com">Thomas Heute</a> * @version $Revision$ */ @@ -44,25 +50,40 @@ { /** The netvibes categories */ - private static final Collection CATEGORIES = Collections.unmodifiableList((List)CollectionBuilder.arrayList() - .add(new NetvibesWidgetCategory("0", "All")) - .add(new NetvibesWidgetCategory("4", "News")) - .add(new NetvibesWidgetCategory("5", "Tools & Reference")) - .add(new NetvibesWidgetCategory("6", "Communication")) - .add(new NetvibesWidgetCategory("7", "Arts & Entertainment")) - .add(new NetvibesWidgetCategory("8", "Fun & Games")) - .add(new NetvibesWidgetCategory("9", "Shopping")) - .add(new NetvibesWidgetCategory("10", "Sports")) - .add(new NetvibesWidgetCategory("11", "Travels")) - .add(new NetvibesWidgetCategory("12", "Business")) - .add(new NetvibesWidgetCategory("13", "Lifestyle")) - .add(new NetvibesWidgetCategory("14", "Technology")) - .add(new NetvibesWidgetCategory("15", "Sciences")) - .get()); + private Collection<NetvibesWidgetCategory> categories; - public Collection getCategories() + public Collection<NetvibesWidgetCategory> getCategories() { - return CATEGORIES; + if (categories == null) + { + List<NetvibesWidgetCategory> list = new ArrayList<NetvibesWidgetCategory>(); + try + { + URL url = new URL("http://api.eco.netvibes.com/categories?format=json"); + byte[] bytes = URLTools.getContent(url, connectionTimeout, connectionTimeout); + // Create JSONObject + JSONObject jsonResponse = new JSONObject(new String(bytes)); + + JSONArray array = jsonResponse.getJSONArray("categories"); + + for (int i=0; i<array.length(); i++) + { + JSONObject object = array.getJSONObject(i); + list.add(new NetvibesWidgetCategory(object.getString("id"), object.getString("label"))); + } + // TODO: Do not cache forever the list of categories + categories = Collections.unmodifiableList(list); + } + catch (MalformedURLException e) + { + e.printStackTrace(); + } + catch (JSONException e) + { + e.printStackTrace(); + } + } + return categories; } @Override Modified: branches/JBoss_Portal_Branch_2_7/widget/src/main/org/jboss/portal/widget/netvibes/provider/NetvibesQuery.java =================================================================== --- branches/JBoss_Portal_Branch_2_7/widget/src/main/org/jboss/portal/widget/netvibes/provider/NetvibesQuery.java 2008-08-19 13:56:03 UTC (rev 11704) +++ branches/JBoss_Portal_Branch_2_7/widget/src/main/org/jboss/portal/widget/netvibes/provider/NetvibesQuery.java 2008-08-19 17:56:52 UTC (rev 11705) @@ -133,18 +133,18 @@ public URL buildQueryURL() throws MalformedURLException { // Building url - and only allow UWA compatible widgets (type=uwa) - StringBuffer buffer = new StringBuffer("http://eco.netvibes.com/rss-partner.php?synd=jboss&type=" + type); + StringBuffer buffer = new StringBuffer("http://api.eco.netvibes.com/search/?type=" + type); if( start > 0 ) { - buffer.append("&start=").append(start); + buffer.append("&page=").append(start); } if (count > 0) { - buffer.append("&count=").append(count); + buffer.append("&limit=").append(count); } if (cat != null) { - buffer.append("&cat=").append(cat); + buffer.append("&category=").append(cat); } if(sort != null) { @@ -152,7 +152,7 @@ } if (q != null) { - buffer.append("&q=").append(FastURLEncoder.getUTF8Instance().encode(q)); + buffer.append("&query=").append(FastURLEncoder.getUTF8Instance().encode(q)); } return new URL(buffer.toString()); } Modified: branches/JBoss_Portal_Branch_2_7/widget/src/resources/portal-widget-netvibes-war/WEB-INF/jsp/edit_content.jsp =================================================================== --- branches/JBoss_Portal_Branch_2_7/widget/src/resources/portal-widget-netvibes-war/WEB-INF/jsp/edit_content.jsp 2008-08-19 13:56:03 UTC (rev 11704) +++ branches/JBoss_Portal_Branch_2_7/widget/src/resources/portal-widget-netvibes-war/WEB-INF/jsp/edit_content.jsp 2008-08-19 17:56:52 UTC (rev 11705) @@ -67,7 +67,8 @@ String catTerm = request.getParameter("cat"); if (catTerm == null) { - catTerm = "0"; // all + NetvibesWidgetCategory category = (NetvibesWidgetCategory)provider.getCategories().iterator().next(); + catTerm = category.getId(); } // Compute query @@ -239,7 +240,7 @@ <tr class="<%= rowClass %>"> <td> <a - href="<%= selectURL %>"><%= result.getTitle() %> + href="<%= selectURL %>"><%= (result.getTitle() != null) ? result.getTitle() : "Untitled" %> </a> </td> </tr>

17 years, 8 months

1
0
0 / 0

JBoss Portal SVN: r11704 - in branches/JBoss_Portal_Branch_2_7: server and 1 other directory.

by portal-commits＠lists.jboss.org

Author: thomas.heute(a)jboss.com Date: 2008-08-19 09:56:03 -0400 (Tue, 19 Aug 2008) New Revision: 11704 Modified: branches/JBoss_Portal_Branch_2_7/build/build-thirdparty.xml branches/JBoss_Portal_Branch_2_7/server/build.xml Log: Remove unused dependency Modified: branches/JBoss_Portal_Branch_2_7/build/build-thirdparty.xml =================================================================== --- branches/JBoss_Portal_Branch_2_7/build/build-thirdparty.xml 2008-08-19 11:47:25 UTC (rev 11703) +++ branches/JBoss_Portal_Branch_2_7/build/build-thirdparty.xml 2008-08-19 13:56:03 UTC (rev 11704) @@ -80,7 +80,6 @@ <componentref name="jakarta-io" version="1.0"/> <componentref name="jbossas/core-libs" version="4.0.4.GA"/> <componentref name="jboss/aop" version="1.5.2.GA"/> - <componentref name="jboss/backport-concurrent" version="2.1.0.GA"/> <componentref name="jboss/cache" version="1.4.1.SP9-brew"/> <componentref name="jboss/jbossretro-rt" version="1.0.3.GA"/> <componentref name="jboss/jbossws" version="2.0.1.SP2"/> Modified: branches/JBoss_Portal_Branch_2_7/server/build.xml =================================================================== --- branches/JBoss_Portal_Branch_2_7/server/build.xml 2008-08-19 11:47:25 UTC (rev 11703) +++ branches/JBoss_Portal_Branch_2_7/server/build.xml 2008-08-19 13:56:03 UTC (rev 11704) @@ -107,7 +107,6 @@ <path refid="junit.junit.classpath"/> <path refid="jboss.test.classpath"/> <path refid="sun.servlet.classpath"/> - <path refid="jboss/backport.concurrent.classpath"/> <pathelement location="jboss-bean-deployer.jar"/> <pathelement location="jboss-container.jar"/> <pathelement location="jboss-dependency.jar"/>

17 years, 8 months

1
0
0 / 0

JBoss Portal SVN: r11703 - in branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war: jsf and 2 other directories.

by portal-commits＠lists.jboss.org

Author: thomas.heute(a)jboss.com Date: 2008-08-19 07:47:25 -0400 (Tue, 19 Aug 2008) New Revision: 11703 Added: branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/common/editProfileInfo.xhtml branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/common/viewProfileInfo.xhtml Modified: branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/WEB-INF/portlet.xml branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/common/confirm.xhtml branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/common/profile.xhtml branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/common/register.xhtml branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/profile/viewProfile.xhtml branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/startTemplate.xhtml Log: JBPORTAL-1816: abillity to create profile at registration Thank you Andy ! Modified: branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/WEB-INF/portlet.xml =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/WEB-INF/portlet.xml 2008-08-19 09:43:42 UTC (rev 11702) +++ branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/WEB-INF/portlet.xml 2008-08-19 11:47:25 UTC (rev 11703) @@ -70,6 +70,11 @@ <name>captcha</name> <value>true</value> </preference> + <preference> +  + <name>profileAtRegistration</name> + <value>false</value> + </preference> <preference>  <h:outputText value="#{bundle.IDENTITY_MANAGEMENT_ROLE_ASSIGNED}" /> Added: branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/common/editProfileInfo.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/common/editProfileInfo.xhtml (rev 0) +++ branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/common/editProfileInfo.xhtml 2008-08-19 11:47:25 UTC (rev 11703) @@ -0,0 +1,204 @@ +<div + xmlns="http://www.w3.org/1999/xhtml" + xmlns:ui="http://java.sun.com/jsf/facelets" + xmlns:h="http://java.sun.com/jsf/html" + xmlns:f="http://java.sun.com/jsf/core" + xmlns:c="http://java.sun.com/jstl/core" + class="identity-ui"> + +  + <h:panelGrid columns="2" cellpadding="3"> + <h:panelGroup/> + <h:panelGroup> + <ul class="topnav"> + <li id="currentTab"> + <h:outputText value="#{bundle.IDENTITY_CATEGORY_GENERAL}" /> + </li> + </ul> + </h:panelGroup> + + <h:panelGroup> + <h:outputText value="#{bundle.IDENTITY_TIMEZONE}"/> + <h:outputText value=" *" rendered="#{metadataservice.timezone.required}" /> + </h:panelGroup> + <h:selectOneMenu id="timezone" value="#{manager.uiUser.attribute.timezone}" required="#{metadataservice.timezone.required}"> + <f:selectItems value="#{metadataservice.timezone.values}" /> + </h:selectOneMenu> + <h:panelGroup /> + <h:message for="timezone" infoClass="portlet-msg-success" errorClass="portlet-msg-error" fatalClass="portlet-msg-error" warnClass="portlet-msg-alert"/> + + <h:panelGroup> + <h:outputText value="#{bundle.IDENTITY_THEME}"/> + <h:outputText value=" *" rendered="#{metadataservice.theme.required}" /> + </h:panelGroup> + <h:selectOneMenu id="theme" value="#{manager.uiUser.attribute.theme}" required="#{metadataservice.theme.required}"> + <f:selectItems value="#{metadataservice.theme.values}" /> + </h:selectOneMenu> + <h:panelGroup /> + <h:message for="theme" infoClass="portlet-msg-success" errorClass="portlet-msg-error" fatalClass="portlet-msg-error" warnClass="portlet-msg-alert"/> + + + <h:panelGroup> + <h:outputText value="#{bundle.IDENTITY_LOCALE}"/> + <h:outputText value=" *" rendered="#{metadataservice.locale.required}" /> + </h:panelGroup> + <h:selectOneMenu id="locale" value="#{manager.uiUser.attribute.locale}" required="#{metadataservice.locale.required}"> + <f:selectItems value="#{metadataservice.locale.values}" /> + </h:selectOneMenu> + <h:panelGroup /> + <h:message for="locale" infoClass="portlet-msg-success" errorClass="portlet-msg-error" fatalClass="portlet-msg-error" warnClass="portlet-msg-alert"/> + + <h:panelGroup/> + <h:panelGroup> + <ul class="topnav"> + <li id="currentTab"> + <h:outputText value="#{bundle.IDENTITY_CATEGORY_PERSONAL}" /> + </li> + </ul> + </h:panelGroup> + + + <h:panelGroup> + <h:outputText value="#{bundle.IDENTITY_GIVENNAME}"/> + <h:outputText value=" *" rendered="#{metadataservice.givenname.required}" /> + </h:panelGroup> + <h:inputText id="givenname" value="#{manager.uiUser.attribute.givenname}" required="#{metadataservice.givenname.required}"/> + <h:panelGroup /> + <h:message for="givenname" infoClass="portlet-msg-success" errorClass="portlet-msg-error" fatalClass="portlet-msg-error" warnClass="portlet-msg-alert"/> + + <h:panelGroup> + <h:outputText value="#{bundle.IDENTITY_FAMILYNAME}"/> + <h:outputText value=" *" rendered="#{metadataservice.familyname.required}" /> + </h:panelGroup> + <h:inputText id="lastname" value="#{manager.uiUser.attribute.familyname}" required="#{metadataservice.familyname.required}"/> + <h:panelGroup /> + <h:message for="lastname" infoClass="portlet-msg-success" errorClass="portlet-msg-error" fatalClass="portlet-msg-error" warnClass="portlet-msg-alert"/> + + <h:panelGroup> + <h:outputText value="#{bundle.IDENTITY_LOCATION}"/> + <h:outputText value=" *" rendered="#{metadataservice.location.required}" /> + </h:panelGroup> + <h:inputText id="location" value="#{manager.uiUser.attribute.location}" required="#{metadataservice.location.required}"/> + <h:panelGroup /> + <h:message for="location" infoClass="portlet-msg-success" errorClass="portlet-msg-error" fatalClass="portlet-msg-error" warnClass="portlet-msg-alert"/> + + <h:panelGroup/> + <h:panelGroup> + <ul class="topnav"> + <li id="currentTab"> + <h:outputText value="#{bundle.IDENTITY_CATEGORY_INSTANT}" /> + </li> + </ul> + </h:panelGroup> + + + <h:panelGroup> + <h:outputText value="#{bundle.IDENTITY_SKYPE}"/> + <h:outputText value=" *" rendered="#{metadataservice.skype.required}" /> + </h:panelGroup> + <h:inputText id="skype" value="#{manager.uiUser.attribute.skype}" required="#{metadataservice.skype.required}"/> + <h:panelGroup /> + <h:message for="skype" infoClass="portlet-msg-success" errorClass="portlet-msg-error" fatalClass="portlet-msg-error" warnClass="portlet-msg-alert"/> + + <h:panelGroup> + <h:outputText value="#{bundle.IDENTITY_ICQ}"/> + <h:outputText value=" *" rendered="#{metadataservice.icq.required}" /> + </h:panelGroup> + <h:inputText id="icq" value="#{manager.uiUser.attribute.icq}" required="#{metadataservice.icq.required}"/> + <h:panelGroup /> + <h:message for="icq" infoClass="portlet-msg-success" errorClass="portlet-msg-error" fatalClass="portlet-msg-error" warnClass="portlet-msg-alert"/> + + <h:panelGroup> + <h:outputText value="#{bundle.IDENTITY_AIM}"/> + <h:outputText value=" *" rendered="#{metadataservice.aim.required}" /> + </h:panelGroup> + <h:inputText id="aim" value="#{manager.uiUser.attribute.aim}" required="#{metadataservice.aim.required}"/> + <h:panelGroup /> + <h:message for="aim" infoClass="portlet-msg-success" errorClass="portlet-msg-error" fatalClass="portlet-msg-error" warnClass="portlet-msg-alert"/> + + <h:panelGroup> + <h:outputText value="#{bundle.IDENTITY_MSNM}"/> + <h:outputText value=" *" rendered="#{metadataservice.msnm.required}" /> + </h:panelGroup> + <h:inputText id="msnm" value="#{manager.uiUser.attribute.msnm}" required="#{metadataservice.msnm.required}"/> + <h:panelGroup /> + <h:message for="msnm" infoClass="portlet-msg-success" errorClass="portlet-msg-error" fatalClass="portlet-msg-error" warnClass="portlet-msg-alert"/> + + <h:panelGroup> + <h:outputText value="#{bundle.IDENTITY_YIM}"/> + <h:outputText value=" *" rendered="#{metadataservice.yim.required}" /> + </h:panelGroup> + <h:inputText id="yim" value="#{manager.uiUser.attribute.yim}" required="#{metadataservice.yim.required}"/> + <h:panelGroup /> + <h:message for="yim" infoClass="portlet-msg-success" errorClass="portlet-msg-error" fatalClass="portlet-msg-error" warnClass="portlet-msg-alert"/> + + <h:panelGroup> + <h:outputText value="#{bundle.IDENTITY_XMMP}"/> + <h:outputText value=" *" rendered="#{metadataservice.xmmp.required}" /> + </h:panelGroup> + <h:inputText id="xmmp" value="#{manager.uiUser.attribute.xmmp}" required="#{metadataservice.xmmp.required}"/> + <h:panelGroup /> + <h:message for="xmmp" infoClass="portlet-msg-success" errorClass="portlet-msg-error" fatalClass="portlet-msg-error" warnClass="portlet-msg-alert"/> + + <h:panelGroup/> + <h:panelGroup> + <ul class="topnav"> + <li id="currentTab"> + <h:outputText value="#{bundle.IDENTITY_CATEGORY_ADDITIONAL}" /> + </li> + </ul> + </h:panelGroup> + + <h:panelGroup> + <h:outputText value="#{bundle.IDENTITY_HOMEPAGE}"/> + <h:outputText value=" *" rendered="#{metadataservice.homepage.required}" /> + </h:panelGroup> + <h:inputText id="homepage" value="#{manager.uiUser.attribute.homepage}" required="#{metadataservice.homepage.required}"/> + <h:panelGroup /> + <h:message for="homepage" infoClass="portlet-msg-success" errorClass="portlet-msg-error" fatalClass="portlet-msg-error" warnClass="portlet-msg-alert"/> + + + <h:panelGroup> + <h:outputText value="#{bundle.IDENTITY_OCCUPATION}"/> + <h:outputText value=" *" rendered="#{metadataservice.occupation.required}" /> + </h:panelGroup> + <h:inputText id="occupation" value="#{manager.uiUser.attribute.occupation}" required="#{metadataservice.occupation.required}"/> + <h:panelGroup /> + <h:message for="occupation" infoClass="portlet-msg-success" errorClass="portlet-msg-error" fatalClass="portlet-msg-error" warnClass="portlet-msg-alert"/> + + + <h:panelGroup> + <h:outputText value="#{bundle.IDENTITY_INTERESTS}"/> + <h:outputText value=" *" rendered="#{metadataservice.interests.required}" /> + </h:panelGroup> + <h:inputText id="interests" value="#{manager.uiUser.attribute.interests}" required="#{metadataservice.interests.required}"/> + <h:panelGroup /> + <h:message for="interests" infoClass="portlet-msg-success" errorClass="portlet-msg-error" fatalClass="portlet-msg-error" warnClass="portlet-msg-alert"/> + + + <h:panelGroup> + <h:outputText value="#{bundle.IDENTITY_SIGNATURE}"/> + <h:outputText value=" *" rendered="#{metadataservice.signature.required}" /> + </h:panelGroup> + <h:panelGroup> + <h:inputTextarea id="signature" value="#{manager.uiUser.attribute.signature}" cols="50" rows="5" required="#{metadataservice.signature.required}"/><br/> + <h:outputText value="#{bundle.IDENTITY_CATEGORY_ADDITIONAL_SIGNATURE}" /> + </h:panelGroup> + <h:panelGroup /> + <h:message for="signature" infoClass="portlet-msg-success" errorClass="portlet-msg-error" fatalClass="portlet-msg-error" warnClass="portlet-msg-alert"/> + + + <h:panelGroup> + <h:outputText value="#{bundle.IDENTITY_EXTRA}"/> + <h:outputText value=" *" rendered="#{metadataservice.extra.required}" /> + </h:panelGroup> + <h:panelGroup> + <h:inputTextarea id="extra" value="#{manager.uiUser.attribute.extra}" cols="50" rows="5" required="#{metadataservice.extra.required}"/><br/> + <h:outputText value="#{bundle.IDENTITY_CATEGORY_ADDITIONAL_EXTRA}" /> + </h:panelGroup> + <h:panelGroup /> + <h:message for="extra" infoClass="portlet-msg-success" errorClass="portlet-msg-error" fatalClass="portlet-msg-error" warnClass="portlet-msg-alert"/> + + </h:panelGrid> + +</div> \ No newline at end of file Modified: branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/common/profile.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/common/profile.xhtml 2008-08-19 09:43:42 UTC (rev 11702) +++ branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/common/profile.xhtml 2008-08-19 11:47:25 UTC (rev 11703) @@ -10,201 +10,13 @@ <ui:include src="/jsf/common/userInfo.xhtml" /> -  - <h:panelGrid columns="2" cellpadding="3"> - <h:panelGroup/> - <h:panelGroup> - <ul class="topnav"> - <li id="currentTab"> - <h:outputText value="#{bundle.IDENTITY_CATEGORY_GENERAL}" /> - </li> - </ul> - </h:panelGroup> + <ui:define name="content"> + <ui:decorate template="/jsf/common/editProfileInfo.xhtml"> + <ui:param name="manager" value="#{editprofilemgr}"/> + <ui:param name="adminMode" value="false"/> + </ui:decorate> + </ui:define> - <h:panelGroup> - <h:outputText value="#{bundle.IDENTITY_TIMEZONE}"/> - <h:outputText value=" *" rendered="#{metadataservice.timezone.required}" /> - </h:panelGroup> - <h:selectOneMenu id="timezone" value="#{manager.uiUser.attribute.timezone}" required="#{metadataservice.timezone.required}"> - <f:selectItems value="#{metadataservice.timezone.values}" /> - </h:selectOneMenu> - <h:panelGroup /> - <h:message for="timezone" infoClass="portlet-msg-success" errorClass="portlet-msg-error" fatalClass="portlet-msg-error" warnClass="portlet-msg-alert"/> - - <h:panelGroup> - <h:outputText value="#{bundle.IDENTITY_THEME}"/> - <h:outputText value=" *" rendered="#{metadataservice.theme.required}" /> - </h:panelGroup> - <h:selectOneMenu id="theme" value="#{manager.uiUser.attribute.theme}" required="#{metadataservice.theme.required}"> - <f:selectItems value="#{metadataservice.theme.values}" /> - </h:selectOneMenu> - <h:panelGroup /> - <h:message for="theme" infoClass="portlet-msg-success" errorClass="portlet-msg-error" fatalClass="portlet-msg-error" warnClass="portlet-msg-alert"/> - - - <h:panelGroup> - <h:outputText value="#{bundle.IDENTITY_LOCALE}"/> - <h:outputText value=" *" rendered="#{metadataservice.locale.required}" /> - </h:panelGroup> - <h:selectOneMenu id="locale" value="#{manager.uiUser.attribute.locale}" required="#{metadataservice.locale.required}"> - <f:selectItems value="#{metadataservice.locale.values}" /> - </h:selectOneMenu> - <h:panelGroup /> - <h:message for="locale" infoClass="portlet-msg-success" errorClass="portlet-msg-error" fatalClass="portlet-msg-error" warnClass="portlet-msg-alert"/> - - <h:panelGroup/> - <h:panelGroup> - <ul class="topnav"> - <li id="currentTab"> - <h:outputText value="#{bundle.IDENTITY_CATEGORY_PERSONAL}" /> - </li> - </ul> - </h:panelGroup> - - - <h:panelGroup> - <h:outputText value="#{bundle.IDENTITY_GIVENNAME}"/> - <h:outputText value=" *" rendered="#{metadataservice.givenname.required}" /> - </h:panelGroup> - <h:inputText id="givenname" value="#{manager.uiUser.attribute.givenname}" required="#{metadataservice.givenname.required}"/> - <h:panelGroup /> - <h:message for="givenname" infoClass="portlet-msg-success" errorClass="portlet-msg-error" fatalClass="portlet-msg-error" warnClass="portlet-msg-alert"/> - - <h:panelGroup> - <h:outputText value="#{bundle.IDENTITY_FAMILYNAME}"/> - <h:outputText value=" *" rendered="#{metadataservice.familyname.required}" /> - </h:panelGroup> - <h:inputText id="lastname" value="#{manager.uiUser.attribute.familyname}" required="#{metadataservice.familyname.required}"/> - <h:panelGroup /> - <h:message for="lastname" infoClass="portlet-msg-success" errorClass="portlet-msg-error" fatalClass="portlet-msg-error" warnClass="portlet-msg-alert"/> - - <h:panelGroup> - <h:outputText value="#{bundle.IDENTITY_LOCATION}"/> - <h:outputText value=" *" rendered="#{metadataservice.location.required}" /> - </h:panelGroup> - <h:inputText id="location" value="#{manager.uiUser.attribute.location}" required="#{metadataservice.location.required}"/> - <h:panelGroup /> - <h:message for="location" infoClass="portlet-msg-success" errorClass="portlet-msg-error" fatalClass="portlet-msg-error" warnClass="portlet-msg-alert"/> - - <h:panelGroup/> - <h:panelGroup> - <ul class="topnav"> - <li id="currentTab"> - <h:outputText value="#{bundle.IDENTITY_CATEGORY_INSTANT}" /> - </li> - </ul> - </h:panelGroup> - - - <h:panelGroup> - <h:outputText value="#{bundle.IDENTITY_SKYPE}"/> - <h:outputText value=" *" rendered="#{metadataservice.skype.required}" /> - </h:panelGroup> - <h:inputText id="skype" value="#{manager.uiUser.attribute.skype}" required="#{metadataservice.skype.required}"/> - <h:panelGroup /> - <h:message for="skype" infoClass="portlet-msg-success" errorClass="portlet-msg-error" fatalClass="portlet-msg-error" warnClass="portlet-msg-alert"/> - - <h:panelGroup> - <h:outputText value="#{bundle.IDENTITY_ICQ}"/> - <h:outputText value=" *" rendered="#{metadataservice.icq.required}" /> - </h:panelGroup> - <h:inputText id="icq" value="#{manager.uiUser.attribute.icq}" required="#{metadataservice.icq.required}"/> - <h:panelGroup /> - <h:message for="icq" infoClass="portlet-msg-success" errorClass="portlet-msg-error" fatalClass="portlet-msg-error" warnClass="portlet-msg-alert"/> - - <h:panelGroup> - <h:outputText value="#{bundle.IDENTITY_AIM}"/> - <h:outputText value=" *" rendered="#{metadataservice.aim.required}" /> - </h:panelGroup> - <h:inputText id="aim" value="#{manager.uiUser.attribute.aim}" required="#{metadataservice.aim.required}"/> - <h:panelGroup /> - <h:message for="aim" infoClass="portlet-msg-success" errorClass="portlet-msg-error" fatalClass="portlet-msg-error" warnClass="portlet-msg-alert"/> - - <h:panelGroup> - <h:outputText value="#{bundle.IDENTITY_MSNM}"/> - <h:outputText value=" *" rendered="#{metadataservice.msnm.required}" /> - </h:panelGroup> - <h:inputText id="msnm" value="#{manager.uiUser.attribute.msnm}" required="#{metadataservice.msnm.required}"/> - <h:panelGroup /> - <h:message for="msnm" infoClass="portlet-msg-success" errorClass="portlet-msg-error" fatalClass="portlet-msg-error" warnClass="portlet-msg-alert"/> - - <h:panelGroup> - <h:outputText value="#{bundle.IDENTITY_YIM}"/> - <h:outputText value=" *" rendered="#{metadataservice.yim.required}" /> - </h:panelGroup> - <h:inputText id="yim" value="#{manager.uiUser.attribute.yim}" required="#{metadataservice.yim.required}"/> - <h:panelGroup /> - <h:message for="yim" infoClass="portlet-msg-success" errorClass="portlet-msg-error" fatalClass="portlet-msg-error" warnClass="portlet-msg-alert"/> - - <h:panelGroup> - <h:outputText value="#{bundle.IDENTITY_XMMP}"/> - <h:outputText value=" *" rendered="#{metadataservice.xmmp.required}" /> - </h:panelGroup> - <h:inputText id="xmmp" value="#{manager.uiUser.attribute.xmmp}" required="#{metadataservice.xmmp.required}"/> - <h:panelGroup /> - <h:message for="xmmp" infoClass="portlet-msg-success" errorClass="portlet-msg-error" fatalClass="portlet-msg-error" warnClass="portlet-msg-alert"/> - - <h:panelGroup/> - <h:panelGroup> - <ul class="topnav"> - <li id="currentTab"> - <h:outputText value="#{bundle.IDENTITY_CATEGORY_ADDITIONAL}" /> - </li> - </ul> - </h:panelGroup> - - <h:panelGroup> - <h:outputText value="#{bundle.IDENTITY_HOMEPAGE}"/> - <h:outputText value=" *" rendered="#{metadataservice.homepage.required}" /> - </h:panelGroup> - <h:inputText id="homepage" value="#{manager.uiUser.attribute.homepage}" required="#{metadataservice.homepage.required}"/> - <h:panelGroup /> - <h:message for="homepage" infoClass="portlet-msg-success" errorClass="portlet-msg-error" fatalClass="portlet-msg-error" warnClass="portlet-msg-alert"/> - - - <h:panelGroup> - <h:outputText value="#{bundle.IDENTITY_OCCUPATION}"/> - <h:outputText value=" *" rendered="#{metadataservice.occupation.required}" /> - </h:panelGroup> - <h:inputText id="occupation" value="#{manager.uiUser.attribute.occupation}" required="#{metadataservice.occupation.required}"/> - <h:panelGroup /> - <h:message for="occupation" infoClass="portlet-msg-success" errorClass="portlet-msg-error" fatalClass="portlet-msg-error" warnClass="portlet-msg-alert"/> - - - <h:panelGroup> - <h:outputText value="#{bundle.IDENTITY_INTERESTS}"/> - <h:outputText value=" *" rendered="#{metadataservice.interests.required}" /> - </h:panelGroup> - <h:inputText id="interests" value="#{manager.uiUser.attribute.interests}" required="#{metadataservice.interests.required}"/> - <h:panelGroup /> - <h:message for="interests" infoClass="portlet-msg-success" errorClass="portlet-msg-error" fatalClass="portlet-msg-error" warnClass="portlet-msg-alert"/> - - - <h:panelGroup> - <h:outputText value="#{bundle.IDENTITY_SIGNATURE}"/> - <h:outputText value=" *" rendered="#{metadataservice.signature.required}" /> - </h:panelGroup> - <h:panelGroup> - <h:inputTextarea id="signature" value="#{manager.uiUser.attribute.signature}" cols="50" rows="5" required="#{metadataservice.signature.required}"/><br/> - <h:outputText value="#{bundle.IDENTITY_CATEGORY_ADDITIONAL_SIGNATURE}" /> - </h:panelGroup> - <h:panelGroup /> - <h:message for="signature" infoClass="portlet-msg-success" errorClass="portlet-msg-error" fatalClass="portlet-msg-error" warnClass="portlet-msg-alert"/> - - - <h:panelGroup> - <h:outputText value="#{bundle.IDENTITY_EXTRA}"/> - <h:outputText value=" *" rendered="#{metadataservice.extra.required}" /> - </h:panelGroup> - <h:panelGroup> - <h:inputTextarea id="extra" value="#{manager.uiUser.attribute.extra}" cols="50" rows="5" required="#{metadataservice.extra.required}"/><br/> - <h:outputText value="#{bundle.IDENTITY_CATEGORY_ADDITIONAL_EXTRA}" /> - </h:panelGroup> - <h:panelGroup /> - <h:message for="extra" infoClass="portlet-msg-success" errorClass="portlet-msg-error" fatalClass="portlet-msg-error" warnClass="portlet-msg-alert"/> - - </h:panelGrid> - <hr/> <p style="text-align: left;"> <h:outputText value="* #{bundle.IDENTITY_REGISTER_REQUIRED_INFORMATION}" /> Modified: branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/common/register.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/common/register.xhtml 2008-08-19 09:43:42 UTC (rev 11702) +++ branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/common/register.xhtml 2008-08-19 11:47:25 UTC (rev 11703) @@ -44,6 +44,16 @@  <ui:include src="/jsf/common/captcha.xhtml" /> + + <c:if test="#{portletPreferenceValue.profileAtRegistration == true}"> + <ui:define name="content"> + <ui:decorate template="/jsf/common/editProfileInfo.xhtml"> + <ui:param name="manager" value="#{userregistermgr}"/> + <ui:param name="adminMode" value="false"/> + </ui:decorate> + </ui:define> + </c:if> + <hr/> <p style="text-align: left;"> <h:outputText value="* #{bundle.IDENTITY_REGISTER_REQUIRED_INFORMATION}" /> Added: branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/common/viewProfileInfo.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/common/viewProfileInfo.xhtml (rev 0) +++ branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/common/viewProfileInfo.xhtml 2008-08-19 11:47:25 UTC (rev 11703) @@ -0,0 +1,33 @@ +<div + xmlns="http://www.w3.org/1999/xhtml" + xmlns:ui="http://java.sun.com/jsf/facelets" + xmlns:h="http://java.sun.com/jsf/html" + xmlns:f="http://java.sun.com/jsf/core" + xmlns:c="http://java.sun.com/jstl/core" + class="identity-ui"> + + <f:loadBundle var="bundle" basename="conf.bundles.Identity" /> + <h:message id="status" for="status" infoClass="portlet-msg-success" errorClass="portlet-msg-error" + fatalClass="portlet-msg-error" warnClass="portlet-msg-alert"/> + + <h:panelGrid columns="2"> + <h:outputText value="#{bundle.IDENTITY_USERNAME}:"/> + <h:outputText value="#{editprofilemgr.uiUser.username}"/> + + <h:outputText value="#{bundle.IDENTITY_EMAIL}:" rendered="#{editprofilemgr.uiUser.attribute.email != null}"/> + <h:outputText value="#{editprofilemgr.uiUser.attribute.email}" rendered="#{editprofilemgr.uiUser.attribute.email != null}"/> + + <h:outputText value="#{bundle.IDENTITY_GIVENNAME}:" rendered="#{editprofilemgr.uiUser.attribute.givenname != null}"/> + <h:outputText value="#{editprofilemgr.uiUser.attribute.givenname}" rendered="#{editprofilemgr.uiUser.attribute.givenname != null}"/> + + <h:outputText value="#{bundle.IDENTITY_FAMILYNAME}:" rendered="#{editprofilemgr.uiUser.attribute.familyname != null}"/> + <h:outputText value="#{editprofilemgr.uiUser.attribute.familyname}" rendered="#{editprofilemgr.uiUser.attribute.familyname != null}"/> + + <h:outputText value="#{bundle.IDENTITY_LOCATION}:" rendered="#{editprofilemgr.uiUser.attribute.location != null}"/> + <h:outputText value="#{editprofilemgr.uiUser.attribute.location}" rendered="#{editprofilemgr.uiUser.attribute.location != null}"/> + + <h:outputText value="#{bundle.IDENTITY_HOMEPAGE}:" rendered="#{editprofilemgr.uiUser.attribute.homepage != null}"/> + <h:outputText value="#{editprofilemgr.uiUser.attribute.homepage}" rendered="#{editprofilemgr.uiUser.attribute.homepage != null}"/> + + </h:panelGrid> +</div> Modified: branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/profile/viewProfile.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/profile/viewProfile.xhtml 2008-08-19 09:43:42 UTC (rev 11702) +++ branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/profile/viewProfile.xhtml 2008-08-19 11:47:25 UTC (rev 11703) @@ -15,29 +15,11 @@ </ui:define> <ui:define name="content"> - <h:message id="status" for="status" infoClass="portlet-msg-success" errorClass="portlet-msg-error" - fatalClass="portlet-msg-error" warnClass="portlet-msg-alert"/> - - <h:panelGrid columns="2"> - <h:outputText value="#{bundle.IDENTITY_USERNAME}:"/> - <h:outputText value="#{editprofilemgr.uiUser.username}"/> - - <h:outputText value="#{bundle.IDENTITY_EMAIL}:" rendered="#{editprofilemgr.uiUser.attribute.email != null}"/> - <h:outputText value="#{editprofilemgr.uiUser.attribute.email}" rendered="#{editprofilemgr.uiUser.attribute.email != null}"/> - - <h:outputText value="#{bundle.IDENTITY_GIVENNAME}:" rendered="#{editprofilemgr.uiUser.attribute.givenname != null}"/> - <h:outputText value="#{editprofilemgr.uiUser.attribute.givenname}" rendered="#{editprofilemgr.uiUser.attribute.givenname != null}"/> - - <h:outputText value="#{bundle.IDENTITY_FAMILYNAME}:" rendered="#{editprofilemgr.uiUser.attribute.familyname != null}"/> - <h:outputText value="#{editprofilemgr.uiUser.attribute.familyname}" rendered="#{editprofilemgr.uiUser.attribute.familyname != null}"/> - - <h:outputText value="#{bundle.IDENTITY_LOCATION}:" rendered="#{editprofilemgr.uiUser.attribute.location != null}"/> - <h:outputText value="#{editprofilemgr.uiUser.attribute.location}" rendered="#{editprofilemgr.uiUser.attribute.location != null}"/> - - <h:outputText value="#{bundle.IDENTITY_HOMEPAGE}:" rendered="#{editprofilemgr.uiUser.attribute.homepage != null}"/> - <h:outputText value="#{editprofilemgr.uiUser.attribute.homepage}" rendered="#{editprofilemgr.uiUser.attribute.homepage != null}"/> - - </h:panelGrid> + <ui:define name="content"> + <ui:decorate template="/jsf/common/viewProfileInfo.xhtml"> + <ui:param name="manager" value="#{editprofilemgr}"/> + </ui:decorate> + </ui:define> </ui:define> </ui:composition> Modified: branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/startTemplate.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/startTemplate.xhtml 2008-08-19 09:43:42 UTC (rev 11702) +++ branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/startTemplate.xhtml 2008-08-19 11:47:25 UTC (rev 11703) @@ -16,7 +16,7 @@ <h:outputText value="#{bundle.IDENTITY_WELCOME}"/> </li> <li> - <h:commandLink value="#{bundle.IDENTITY_REGISTER}" action="register"/> + <h:commandLink value="#{bundle.IDENTITY_REGISTER}" action="register" /> </li>  <c:if test="#{portletPreferenceValue.lostPassword == true}">

17 years, 8 months

1
0
0 / 0

JBoss Portal SVN: r11702 - branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/api/node.

by portal-commits＠lists.jboss.org

Author: thomas.heute(a)jboss.com Date: 2008-08-19 05:43:42 -0400 (Tue, 19 Aug 2008) New Revision: 11702 Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/api/node/PortalNodeImpl.java Log: Returns an empty mutable map Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/api/node/PortalNodeImpl.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/api/node/PortalNodeImpl.java 2008-08-19 08:01:46 UTC (rev 11701) +++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/api/node/PortalNodeImpl.java 2008-08-19 09:43:42 UTC (rev 11702) @@ -385,23 +385,23 @@ } /** Compute and returns a modifiable map made of the children nodes. */ - protected final Map buildChildMap(PortalNodeImpl objectNode) + protected final Map<String, PortalNode> buildChildMap(PortalNodeImpl objectNode) { PortalObject object = objectNode.object; // - Collection tmp = object.getChildren(); + Collection<PortalObject> tmp = object.getChildren(); // if (tmp.size() > 0) { - Map childrenMap = new HashMap(); + Map<String, PortalNode> childrenMap = new HashMap<String, PortalNode>(); // See if we have recursive permission on the provided node that will avoid to make a check for each of them boolean allVisible = portalAuthorizationManager.checkPermission(new PortalObjectPermission(objectNode.object.getId(), PortalObjectPermission.VIEW_RECURSIVE_ACTION)); // - for (Iterator i = tmp.iterator(); i.hasNext();) + for (Iterator<PortalObject> i = tmp.iterator(); i.hasNext();) { PortalObject childObject = (PortalObject)i.next(); @@ -427,7 +427,7 @@ } else { - return Collections.EMPTY_MAP; + return new HashMap<String, PortalNode>(); } } }

17 years, 8 months

1
0
0 / 0

JBoss Portal SVN: r11701 - branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/impl/api/node.

by portal-commits＠lists.jboss.org

Author: thomas.heute(a)jboss.com Date: 2008-08-19 04:01:46 -0400 (Tue, 19 Aug 2008) New Revision: 11701 Modified: branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/impl/api/node/PortalNodeImpl.java Log: Returns an empty mutable map Modified: branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/impl/api/node/PortalNodeImpl.java =================================================================== --- branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/impl/api/node/PortalNodeImpl.java 2008-08-19 02:41:14 UTC (rev 11700) +++ branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/impl/api/node/PortalNodeImpl.java 2008-08-19 08:01:46 UTC (rev 11701) @@ -385,23 +385,23 @@ } /** Compute and returns a modifiable map made of the children nodes. */ - protected final Map buildChildMap(PortalNodeImpl objectNode) + protected final Map<String, PortalNode> buildChildMap(PortalNodeImpl objectNode) { PortalObject object = objectNode.object; // - Collection tmp = object.getChildren(); + Collection<PortalObject> tmp = object.getChildren(); // if (tmp.size() > 0) { - Map childrenMap = new HashMap(); + Map<String, PortalNode> childrenMap = new HashMap<String, PortalNode>(); // See if we have recursive permission on the provided node that will avoid to make a check for each of them boolean allVisible = portalAuthorizationManager.checkPermission(new PortalObjectPermission(objectNode.object.getId(), PortalObjectPermission.VIEW_RECURSIVE_ACTION)); // - for (Iterator i = tmp.iterator(); i.hasNext();) + for (Iterator<PortalObject> i = tmp.iterator(); i.hasNext();) { PortalObject childObject = (PortalObject)i.next(); @@ -427,7 +427,7 @@ } else { - return Collections.EMPTY_MAP; + return new HashMap<String, PortalNode>(); } } }

17 years, 8 months

1
0
0 / 0

JBoss Portal SVN: r11700 - branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-server-war.

by portal-commits＠lists.jboss.org

Author: wesleyhales Date: 2008-08-18 22:41:14 -0400 (Mon, 18 Aug 2008) New Revision: 11700 Modified: branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-server-war/login.jsp Log: oops Modified: branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-server-war/login.jsp =================================================================== --- branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-server-war/login.jsp 2008-08-19 02:20:27 UTC (rev 11699) +++ branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-server-war/login.jsp 2008-08-19 02:41:14 UTC (rev 11700) @@ -25,7 +25,7 @@ <%@page import="java.util.ResourceBundle"%> <% - ResourceBundle rb = ResourceBundle.getBundle("conf.bundles.Resource", request.getLocale()); + ResourceBundle rb = ResourceBundle.getBundle("Resource", request.getLocale()); %> <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">

17 years, 8 months

1
0
0 / 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

portal-commits August 2008