gatein SVN: r6011 - in components/wsrp/trunk/producer/src/main/java/org/gatein: wsrp/producer/config/impl and 1 other directory.
by do-not-reply＠jboss.org
Author: chris.laprun(a)jboss.com
Date: 2011-03-12 09:32:13 -0500 (Sat, 12 Mar 2011)
New Revision: 6011
Modified:
components/wsrp/trunk/producer/src/main/java/org/gatein/registration/policies/DefaultRegistrationPolicy.java
components/wsrp/trunk/producer/src/main/java/org/gatein/wsrp/producer/config/impl/ProducerRegistrationRequirementsImpl.java
Log:
- Use length() == 0 instead of isEmpty() so that I can release with the current parent.
Modified: components/wsrp/trunk/producer/src/main/java/org/gatein/registration/policies/DefaultRegistrationPolicy.java
===================================================================
--- components/wsrp/trunk/producer/src/main/java/org/gatein/registration/policies/DefaultRegistrationPolicy.java 2011-03-11 15:48:16 UTC (rev 6010)
+++ components/wsrp/trunk/producer/src/main/java/org/gatein/registration/policies/DefaultRegistrationPolicy.java 2011-03-12 14:32:13 UTC (rev 6011)
@@ -132,7 +132,7 @@
QName name = entry.getKey();
Object value = registrationProperties.get(name);
- if (value == null || (value instanceof String && ((String)value).isEmpty()))
+ if (value == null || (value instanceof String && ((String)value).length() == 0))
{
message.append(MISSING_VALUE_ERROR_MSG_BEGIN).append(name.getLocalPart()).append("' property.\n");
consistentWithExpectations = false;
Modified: components/wsrp/trunk/producer/src/main/java/org/gatein/wsrp/producer/config/impl/ProducerRegistrationRequirementsImpl.java
===================================================================
--- components/wsrp/trunk/producer/src/main/java/org/gatein/wsrp/producer/config/impl/ProducerRegistrationRequirementsImpl.java 2011-03-11 15:48:16 UTC (rev 6010)
+++ components/wsrp/trunk/producer/src/main/java/org/gatein/wsrp/producer/config/impl/ProducerRegistrationRequirementsImpl.java 2011-03-12 14:32:13 UTC (rev 6011)
@@ -397,7 +397,7 @@
{
log.debug("Using default registration policy: " + DEFAULT_POLICY_CLASS_NAME);
RegistrationPropertyValidator validator;
- if (validatorClassName != null && !validatorClassName.isEmpty() && !DEFAULT_VALIDATOR_CLASS_NAME.equals(validatorClassName))
+ if (validatorClassName != null && validatorClassName.length() > 0 && !DEFAULT_VALIDATOR_CLASS_NAME.equals(validatorClassName))
{
log.debug("Using registration property validator: " + validatorClassName);
ClassLoader loader = Thread.currentThread().getContextClassLoader();
13 years, 9 months
- 1
- 0
gatein SVN: r6010 - in components/wci/trunk: jboss/jboss6/src/main/java/org/gatein/wci/jboss and 9 other directories.
by do-not-reply＠jboss.org
Author: mstruk
Date: 2011-03-11 10:48:16 -0500 (Fri, 11 Mar 2011)
New Revision: 6010
Added:
components/wci/trunk/wci/src/main/java/org/gatein/wci/ServletContainerVisitor.java
Modified:
components/wci/trunk/
components/wci/trunk/jboss/jboss6/src/main/java/org/gatein/wci/jboss/JB6ContainerServlet.java
components/wci/trunk/jboss/jboss6/src/main/java/org/gatein/wci/jboss/JB6ServletContainerContext.java
components/wci/trunk/jboss/jboss6/src/main/java/org/gatein/wci/jboss/JB6WebAppContext.java
components/wci/trunk/jetty/src/main/java/org/gatein/wci/jetty/Jetty6WebAppContext.java
components/wci/trunk/test/core/src/main/java/org/gatein/wci/container/WebAppContextImpl.java
components/wci/trunk/tomcat/tomcat6/src/main/java/org/gatein/wci/tomcat/TC6ContainerServlet.java
components/wci/trunk/tomcat/tomcat6/src/main/java/org/gatein/wci/tomcat/TC6ServletContainerContext.java
components/wci/trunk/tomcat/tomcat6/src/main/java/org/gatein/wci/tomcat/TC6WebAppContext.java
components/wci/trunk/tomcat/tomcat7/src/main/java/org/gatein/wci/tomcat/TC7ContainerServlet.java
components/wci/trunk/tomcat/tomcat7/src/main/java/org/gatein/wci/tomcat/TC7ServletContainerContext.java
components/wci/trunk/tomcat/tomcat7/src/main/java/org/gatein/wci/tomcat/TC7WebAppContext.java
components/wci/trunk/wci/src/main/java/org/gatein/wci/ServletContainer.java
components/wci/trunk/wci/src/main/java/org/gatein/wci/WebApp.java
components/wci/trunk/wci/src/main/java/org/gatein/wci/authentication/GenericAuthentication.java
components/wci/trunk/wci/src/main/java/org/gatein/wci/impl/DefaultServletContainer.java
components/wci/trunk/wci/src/main/java/org/gatein/wci/impl/generic/GenericWebAppContext.java
components/wci/trunk/wci/src/main/java/org/gatein/wci/spi/WebAppContext.java
Log:
GTNPORTAL-1706 session cleanup after logout
Property changes on: components/wci/trunk
___________________________________________________________________
Added: svn:mergeinfo
+ /components/wci/branches/logout:5894-6009
Modified: components/wci/trunk/jboss/jboss6/src/main/java/org/gatein/wci/jboss/JB6ContainerServlet.java
===================================================================
--- components/wci/trunk/jboss/jboss6/src/main/java/org/gatein/wci/jboss/JB6ContainerServlet.java 2011-03-11 14:27:41 UTC (rev 6009)
+++ components/wci/trunk/jboss/jboss6/src/main/java/org/gatein/wci/jboss/JB6ContainerServlet.java 2011-03-11 15:48:16 UTC (rev 6010)
@@ -29,6 +29,8 @@
import org.apache.catalina.ContainerServlet;
import org.apache.catalina.Engine;
import org.apache.catalina.Wrapper;
+import org.gatein.common.logging.Logger;
+import org.gatein.common.logging.LoggerFactory;
/**
* @author <a href="mailto:mwringe@redhat.com">Matt Wringe</a>
@@ -36,6 +38,11 @@
*/
public class JB6ContainerServlet extends HttpServlet implements ContainerServlet
{
+ private static final Logger log = LoggerFactory.getLogger(JB6ContainerServlet.class);
+
+ /** Servlet context init parameter name that can be used to turn off cross-context logout */
+ private static final String CROSS_CONTEXT_LOGOUT_KEY = "org.gatein.wci.cross_context_logout";
+
/** . */
private Wrapper wrapper;
@@ -107,6 +114,7 @@
{
Engine engine = (Engine) container;
containerContext = new JB6ServletContainerContext(engine);
+ containerContext.setCrossContextLogout(getCrossContextLogoutConfig());
containerContext.start();
break;
}
@@ -123,4 +131,21 @@
containerContext = null;
}
}
+
+ private boolean getCrossContextLogoutConfig()
+ {
+ String val = getServletContext().getInitParameter(CROSS_CONTEXT_LOGOUT_KEY);
+ if (val == null || Boolean.valueOf(val))
+ {
+ return true;
+ }
+
+ if (!"false".equalsIgnoreCase(val))
+ {
+ log.warn("Context init param " + CROSS_CONTEXT_LOGOUT_KEY + " value is invalid: " + val + " - falling back to: false");
+ }
+
+ log.info("Cross-context session invalidation on logout disabled");
+ return false;
+ }
}
Modified: components/wci/trunk/jboss/jboss6/src/main/java/org/gatein/wci/jboss/JB6ServletContainerContext.java
===================================================================
--- components/wci/trunk/jboss/jboss6/src/main/java/org/gatein/wci/jboss/JB6ServletContainerContext.java 2011-03-11 14:27:41 UTC (rev 6009)
+++ components/wci/trunk/jboss/jboss6/src/main/java/org/gatein/wci/jboss/JB6ServletContainerContext.java 2011-03-11 15:48:16 UTC (rev 6010)
@@ -35,6 +35,8 @@
import org.gatein.common.logging.Logger;
import org.gatein.common.logging.LoggerFactory;
import org.gatein.wci.RequestDispatchCallback;
+import org.gatein.wci.ServletContainerVisitor;
+import org.gatein.wci.WebApp;
import org.gatein.wci.authentication.GenericAuthentication;
import org.gatein.wci.authentication.TicketService;
import org.gatein.wci.command.CommandDispatcher;
@@ -46,6 +48,7 @@
import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpSession;
import java.io.IOException;
import java.util.HashSet;
import java.util.Set;
@@ -75,8 +78,8 @@
/** . */
private Registration registration;
- /** . */
- private GenericAuthentication authentication = new GenericAuthentication();
+ /** Perform cross-context session invalidation on logout, or not */
+ private boolean crossContextLogout = true;
public JB6ServletContainerContext(Engine engine)
{
@@ -99,6 +102,11 @@
this.registration = null;
}
+ public void setCrossContextLogout(boolean val)
+ {
+ crossContextLogout = val;
+ }
+
public void login(HttpServletRequest request, HttpServletResponse response, Credentials credentials, long validityMillis) throws ServletException, IOException
{
login(request, response, credentials, validityMillis, null);
@@ -133,10 +141,26 @@
}
}
+
public void logout(HttpServletRequest request, HttpServletResponse response) throws ServletException
{
+ HttpSession sess = request.getSession(false);
request.logout();
- request.getSession().invalidate();
+
+ if (sess == null)
+ return;
+
+ if (!crossContextLogout)
+ return;
+
+ final String sessId = sess.getId();
+ DefaultServletContainerFactory.getInstance().getServletContainer().visit(new ServletContainerVisitor()
+ {
+ public void accept(WebApp webApp)
+ {
+ webApp.invalidateSession(sessId);
+ }
+ });
}
public String getContainerInfo()
Modified: components/wci/trunk/jboss/jboss6/src/main/java/org/gatein/wci/jboss/JB6WebAppContext.java
===================================================================
--- components/wci/trunk/jboss/jboss6/src/main/java/org/gatein/wci/jboss/JB6WebAppContext.java 2011-03-11 14:27:41 UTC (rev 6009)
+++ components/wci/trunk/jboss/jboss6/src/main/java/org/gatein/wci/jboss/JB6WebAppContext.java 2011-03-11 15:48:16 UTC (rev 6010)
@@ -28,6 +28,8 @@
import javax.servlet.ServletContext;
import org.apache.catalina.Context;
+import org.apache.catalina.Manager;
+import org.apache.catalina.Session;
import org.apache.catalina.Wrapper;
import org.gatein.wci.command.CommandServlet;
import org.gatein.wci.spi.WebAppContext;
@@ -125,4 +127,25 @@
{
return false;
}
+
+ public boolean invalidateSession(String sessId)
+ {
+ Manager mgr = context.getManager();
+ if (mgr != null)
+ {
+ try
+ {
+ Session sess = mgr.findSession(sessId);
+ if (sess != null)
+ {
+ sess.expire();
+ return true;
+ }
+ }
+ catch (IOException ignored)
+ {
+ }
+ }
+ return false;
+ }
}
Modified: components/wci/trunk/jetty/src/main/java/org/gatein/wci/jetty/Jetty6WebAppContext.java
===================================================================
--- components/wci/trunk/jetty/src/main/java/org/gatein/wci/jetty/Jetty6WebAppContext.java 2011-03-11 14:27:41 UTC (rev 6009)
+++ components/wci/trunk/jetty/src/main/java/org/gatein/wci/jetty/Jetty6WebAppContext.java 2011-03-11 15:48:16 UTC (rev 6010)
@@ -119,4 +119,9 @@
{
return false;
}
+
+ public boolean invalidateSession(String sessId)
+ {
+ return false;
+ }
}
Modified: components/wci/trunk/test/core/src/main/java/org/gatein/wci/container/WebAppContextImpl.java
===================================================================
--- components/wci/trunk/test/core/src/main/java/org/gatein/wci/container/WebAppContextImpl.java 2011-03-11 14:27:41 UTC (rev 6009)
+++ components/wci/trunk/test/core/src/main/java/org/gatein/wci/container/WebAppContextImpl.java 2011-03-11 15:48:16 UTC (rev 6010)
@@ -76,4 +76,9 @@
{
throw new UnsupportedOperationException();
}
+
+ public boolean invalidateSession(String sessId)
+ {
+ return false;
+ }
}
Modified: components/wci/trunk/tomcat/tomcat6/src/main/java/org/gatein/wci/tomcat/TC6ContainerServlet.java
===================================================================
--- components/wci/trunk/tomcat/tomcat6/src/main/java/org/gatein/wci/tomcat/TC6ContainerServlet.java 2011-03-11 14:27:41 UTC (rev 6009)
+++ components/wci/trunk/tomcat/tomcat6/src/main/java/org/gatein/wci/tomcat/TC6ContainerServlet.java 2011-03-11 15:48:16 UTC (rev 6010)
@@ -26,6 +26,8 @@
import org.apache.catalina.Wrapper;
import org.apache.catalina.Container;
import org.apache.catalina.Engine;
+import org.gatein.common.logging.Logger;
+import org.gatein.common.logging.LoggerFactory;
import javax.servlet.http.HttpServlet;
import javax.servlet.ServletException;
@@ -36,7 +38,11 @@
*/
public class TC6ContainerServlet extends HttpServlet implements ContainerServlet
{
+ private static final Logger log = LoggerFactory.getLogger(TC6ContainerServlet.class);
+ /** Servlet context init parameter name that can be used to turn off cross-context logout */
+ private static final String CROSS_CONTEXT_LOGOUT_KEY = "org.gatein.wci.cross_context_logout";
+
/** . */
private Wrapper wrapper;
@@ -108,6 +114,7 @@
{
Engine engine = (Engine)container;
containerContext = new TC6ServletContainerContext(engine);
+ containerContext.setCrossContextLogout(getCrossContextLogoutConfig());
containerContext.start();
break;
}
@@ -124,4 +131,16 @@
containerContext = null;
}
}
+
+ private boolean getCrossContextLogoutConfig() {
+ String val = getServletContext().getInitParameter(CROSS_CONTEXT_LOGOUT_KEY);
+ if (val == null || Boolean.valueOf(val))
+ return true;
+
+ if (!"false".equalsIgnoreCase(val))
+ log.warn("Context init param " + CROSS_CONTEXT_LOGOUT_KEY + " value is invalid: " + val + " - falling back to: false");
+
+ log.info("Cross-context session invalidation on logout disabled");
+ return false;
+ }
}
Modified: components/wci/trunk/tomcat/tomcat6/src/main/java/org/gatein/wci/tomcat/TC6ServletContainerContext.java
===================================================================
--- components/wci/trunk/tomcat/tomcat6/src/main/java/org/gatein/wci/tomcat/TC6ServletContainerContext.java 2011-03-11 14:27:41 UTC (rev 6009)
+++ components/wci/trunk/tomcat/tomcat6/src/main/java/org/gatein/wci/tomcat/TC6ServletContainerContext.java 2011-03-11 15:48:16 UTC (rev 6010)
@@ -34,6 +34,9 @@
import org.gatein.common.logging.Logger;
import org.gatein.common.logging.LoggerFactory;
import org.gatein.wci.RequestDispatchCallback;
+import org.gatein.wci.ServletContainerVisitor;
+import org.gatein.wci.WebApp;
+
import org.gatein.wci.authentication.GenericAuthentication;
import org.gatein.wci.command.CommandDispatcher;
import org.gatein.wci.impl.DefaultServletContainerFactory;
@@ -45,6 +48,7 @@
import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpSession;
import java.io.IOException;
import java.util.HashSet;
import java.util.Set;
@@ -74,6 +78,9 @@
/** . */
private Registration registration;
+ /** Perform cross-context session invalidation on logout, or not */
+ private boolean crossContextLogout = true;
+
/** . */
private GenericAuthentication authentication = new GenericAuthentication();
@@ -102,6 +109,11 @@
this.registration = null;
}
+ public void setCrossContextLogout(boolean val)
+ {
+ crossContextLogout = val;
+ }
+
public void login(HttpServletRequest request, HttpServletResponse response, Credentials credentials, long validityMillis) throws IOException
{
authentication.login(credentials, request, response, validityMillis);
@@ -112,9 +124,26 @@
authentication.login(credentials, request, response, validityMillis, initialURI);
}
- public void logout(HttpServletRequest request, HttpServletResponse response) throws ServletException
+ public void logout(HttpServletRequest request, HttpServletResponse response)
{
- authentication.logout(request, response);
+ HttpSession sess = request.getSession(false);
+
+ if (sess == null)
+ return;
+
+ sess.invalidate();
+
+ if (!crossContextLogout)
+ return;
+
+ final String sessId = sess.getId();
+ DefaultServletContainerFactory.getInstance().getServletContainer().visit(new ServletContainerVisitor()
+ {
+ public void accept(WebApp webApp)
+ {
+ webApp.invalidateSession(sessId);
+ }
+ });
}
public String getContainerInfo()
Modified: components/wci/trunk/tomcat/tomcat6/src/main/java/org/gatein/wci/tomcat/TC6WebAppContext.java
===================================================================
--- components/wci/trunk/tomcat/tomcat6/src/main/java/org/gatein/wci/tomcat/TC6WebAppContext.java 2011-03-11 14:27:41 UTC (rev 6009)
+++ components/wci/trunk/tomcat/tomcat6/src/main/java/org/gatein/wci/tomcat/TC6WebAppContext.java 2011-03-11 15:48:16 UTC (rev 6010)
@@ -22,6 +22,8 @@
******************************************************************************/
package org.gatein.wci.tomcat;
+import org.apache.catalina.Manager;
+import org.apache.catalina.Session;
import org.w3c.dom.Document;
import org.apache.catalina.Context;
import org.apache.catalina.Wrapper;
@@ -124,4 +126,25 @@
{
return false;
}
+
+ public boolean invalidateSession(String sessId)
+ {
+ Manager mgr = context.getManager();
+ if (mgr != null)
+ {
+ try
+ {
+ Session sess = mgr.findSession(sessId);
+ if (sess != null)
+ {
+ sess.expire();
+ return true;
+ }
+ }
+ catch (IOException ignored)
+ {
+ }
+ }
+ return false;
+ }
}
Modified: components/wci/trunk/tomcat/tomcat7/src/main/java/org/gatein/wci/tomcat/TC7ContainerServlet.java
===================================================================
--- components/wci/trunk/tomcat/tomcat7/src/main/java/org/gatein/wci/tomcat/TC7ContainerServlet.java 2011-03-11 14:27:41 UTC (rev 6009)
+++ components/wci/trunk/tomcat/tomcat7/src/main/java/org/gatein/wci/tomcat/TC7ContainerServlet.java 2011-03-11 15:48:16 UTC (rev 6010)
@@ -26,6 +26,8 @@
import org.apache.catalina.ContainerServlet;
import org.apache.catalina.Engine;
import org.apache.catalina.Wrapper;
+import org.gatein.common.logging.Logger;
+import org.gatein.common.logging.LoggerFactory;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServlet;
@@ -36,7 +38,11 @@
*/
public class TC7ContainerServlet extends HttpServlet implements ContainerServlet
{
+ private static final Logger log = LoggerFactory.getLogger(TC7ContainerServlet.class);
+ /** Servlet context init parameter name that can be used to turn off cross-context logout */
+ private static final String CROSS_CONTEXT_LOGOUT_KEY = "org.gatein.wci.cross_context_logout";
+
/** . */
private Wrapper wrapper;
@@ -108,6 +114,7 @@
{
Engine engine = (Engine)container;
containerContext = new TC7ServletContainerContext(engine);
+ containerContext.setCrossContextLogout(getCrossContextLogoutConfig());
containerContext.start();
break;
}
@@ -124,4 +131,16 @@
containerContext = null;
}
}
+
+ private boolean getCrossContextLogoutConfig() {
+ String val = getServletContext().getInitParameter(CROSS_CONTEXT_LOGOUT_KEY);
+ if (val == null || Boolean.valueOf(val))
+ return true;
+
+ if (!"false".equalsIgnoreCase(val))
+ log.warn("Context init param " + CROSS_CONTEXT_LOGOUT_KEY + " value is invalid: " + val + " - falling back to: false");
+
+ log.info("Cross-context session invalidation on logout disabled");
+ return false;
+ }
}
Modified: components/wci/trunk/tomcat/tomcat7/src/main/java/org/gatein/wci/tomcat/TC7ServletContainerContext.java
===================================================================
--- components/wci/trunk/tomcat/tomcat7/src/main/java/org/gatein/wci/tomcat/TC7ServletContainerContext.java 2011-03-11 14:27:41 UTC (rev 6009)
+++ components/wci/trunk/tomcat/tomcat7/src/main/java/org/gatein/wci/tomcat/TC7ServletContainerContext.java 2011-03-11 15:48:16 UTC (rev 6010)
@@ -36,7 +36,11 @@
import org.gatein.common.logging.Logger;
import org.gatein.common.logging.LoggerFactory;
import org.gatein.wci.RequestDispatchCallback;
+import org.gatein.wci.ServletContainerVisitor;
+import org.gatein.wci.WebApp;
+
import org.gatein.wci.authentication.GenericAuthentication;
+
import org.gatein.wci.authentication.TicketService;
import org.gatein.wci.command.CommandDispatcher;
import org.gatein.wci.impl.DefaultServletContainerFactory;
@@ -47,6 +51,7 @@
import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpSession;
import java.io.IOException;
import java.util.HashSet;
import java.util.Set;
@@ -76,6 +81,9 @@
/** . */
private Registration registration;
+ /** Perform cross-context session invalidation on logout, or not */
+ private boolean crossContextLogout = true;
+
public TC7ServletContainerContext(Engine engine)
{
this.engine = engine;
@@ -101,6 +109,11 @@
this.registration = null;
}
+ public void setCrossContextLogout(boolean val)
+ {
+ crossContextLogout = val;
+ }
+
public void login(HttpServletRequest request, HttpServletResponse response, Credentials credentials, long validityMillis) throws ServletException, IOException
{
login(request, response, credentials, validityMillis, null);
@@ -135,8 +148,23 @@
public void logout(HttpServletRequest request, HttpServletResponse response) throws ServletException
{
+ HttpSession sess = request.getSession(false);
request.logout();
- request.getSession().invalidate();
+
+ if (sess == null)
+ return;
+
+ if (!crossContextLogout)
+ return;
+
+ final String sessId = sess.getId();
+ DefaultServletContainerFactory.getInstance().getServletContainer().visit(new ServletContainerVisitor()
+ {
+ public void accept(WebApp webApp)
+ {
+ webApp.invalidateSession(sessId);
+ }
+ });
}
public String getContainerInfo()
Modified: components/wci/trunk/tomcat/tomcat7/src/main/java/org/gatein/wci/tomcat/TC7WebAppContext.java
===================================================================
--- components/wci/trunk/tomcat/tomcat7/src/main/java/org/gatein/wci/tomcat/TC7WebAppContext.java 2011-03-11 14:27:41 UTC (rev 6009)
+++ components/wci/trunk/tomcat/tomcat7/src/main/java/org/gatein/wci/tomcat/TC7WebAppContext.java 2011-03-11 15:48:16 UTC (rev 6010)
@@ -23,6 +23,8 @@
package org.gatein.wci.tomcat;
import org.apache.catalina.Context;
+import org.apache.catalina.Manager;
+import org.apache.catalina.Session;
import org.apache.catalina.Wrapper;
import org.gatein.wci.command.CommandServlet;
import org.gatein.wci.spi.WebAppContext;
@@ -124,4 +126,25 @@
{
return false;
}
+
+ public boolean invalidateSession(String sessId)
+ {
+ Manager mgr = context.getManager();
+ if (mgr != null)
+ {
+ try
+ {
+ Session sess = mgr.findSession(sessId);
+ if (sess != null)
+ {
+ sess.expire();
+ return true;
+ }
+ }
+ catch (IOException ignored)
+ {
+ }
+ }
+ return false;
+ }
}
Modified: components/wci/trunk/wci/src/main/java/org/gatein/wci/ServletContainer.java
===================================================================
--- components/wci/trunk/wci/src/main/java/org/gatein/wci/ServletContainer.java 2011-03-11 14:27:41 UTC (rev 6009)
+++ components/wci/trunk/wci/src/main/java/org/gatein/wci/ServletContainer.java 2011-03-11 15:48:16 UTC (rev 6010)
@@ -145,4 +145,11 @@
* @return the string containing at least name and version number
*/
public String getContainerInfo();
+
+ /**
+ * Visit the registered WebApps
+ *
+ * @param visitor ServletContainerVisitor instance
+ */
+ void visit(ServletContainerVisitor visitor);
}
Added: components/wci/trunk/wci/src/main/java/org/gatein/wci/ServletContainerVisitor.java
===================================================================
--- components/wci/trunk/wci/src/main/java/org/gatein/wci/ServletContainerVisitor.java (rev 0)
+++ components/wci/trunk/wci/src/main/java/org/gatein/wci/ServletContainerVisitor.java 2011-03-11 15:48:16 UTC (rev 6010)
@@ -0,0 +1,14 @@
+package org.gatein.wci;
+
+/**
+ * @author <a href="mailto:mstrukel@redhat.com">Marko Strukelj</a>
+ */
+public interface ServletContainerVisitor
+{
+ /**
+ * During visitation get reference to current WebApp
+ *
+ * @param webApp Currently visited WebApp
+ */
+ public void accept(WebApp webApp);
+}
Modified: components/wci/trunk/wci/src/main/java/org/gatein/wci/WebApp.java
===================================================================
--- components/wci/trunk/wci/src/main/java/org/gatein/wci/WebApp.java 2011-03-11 14:27:41 UTC (rev 6009)
+++ components/wci/trunk/wci/src/main/java/org/gatein/wci/WebApp.java 2011-03-11 15:48:16 UTC (rev 6010)
@@ -72,4 +72,12 @@
* @throws IOException if the file cannot be created
*/
boolean importFile(String parentDirRelativePath, String name, InputStream source, boolean overwrite) throws IOException;
+
+ /**
+ * Invalidate session for the specified id.
+ *
+ * @param sessId Session id
+ * @return true if session was found, false otherwise
+ */
+ public boolean invalidateSession(String sessId);
}
Modified: components/wci/trunk/wci/src/main/java/org/gatein/wci/authentication/GenericAuthentication.java
===================================================================
--- components/wci/trunk/wci/src/main/java/org/gatein/wci/authentication/GenericAuthentication.java 2011-03-11 14:27:41 UTC (rev 6009)
+++ components/wci/trunk/wci/src/main/java/org/gatein/wci/authentication/GenericAuthentication.java 2011-03-11 15:48:16 UTC (rev 6010)
@@ -19,8 +19,6 @@
package org.gatein.wci.authentication;
-import org.gatein.wci.impl.DefaultServletContainer;
-import org.gatein.wci.impl.DefaultServletContainerFactory;
import org.gatein.wci.security.Credentials;
import javax.servlet.http.HttpServletRequest;
Modified: components/wci/trunk/wci/src/main/java/org/gatein/wci/impl/DefaultServletContainer.java
===================================================================
--- components/wci/trunk/wci/src/main/java/org/gatein/wci/impl/DefaultServletContainer.java 2011-03-11 14:27:41 UTC (rev 6009)
+++ components/wci/trunk/wci/src/main/java/org/gatein/wci/impl/DefaultServletContainer.java 2011-03-11 15:48:16 UTC (rev 6010)
@@ -22,6 +22,7 @@
******************************************************************************/
package org.gatein.wci.impl;
+import org.gatein.wci.ServletContainerVisitor;
import org.gatein.wci.authentication.AuthenticationEvent;
import org.gatein.wci.authentication.AuthenticationListener;
import org.gatein.wci.security.Credentials;
@@ -270,6 +271,17 @@
return registration.context.include(targetServletContext, request, response, callback, handback);
}
+ public void visit(ServletContainerVisitor visitor)
+ {
+ synchronized (lock)
+ {
+ for (WebApp webApp: webAppMap.values())
+ {
+ visitor.accept(webApp);
+ }
+ }
+ }
+
public static enum EventType {
LOGIN, LOGOUT
}
@@ -433,5 +445,10 @@
{
return context.importFile(parentDirRelativePath, name, source, overwrite);
}
+
+ public boolean invalidateSession(String sessId)
+ {
+ return context.invalidateSession(sessId);
+ }
}
}
\ No newline at end of file
Modified: components/wci/trunk/wci/src/main/java/org/gatein/wci/impl/generic/GenericWebAppContext.java
===================================================================
--- components/wci/trunk/wci/src/main/java/org/gatein/wci/impl/generic/GenericWebAppContext.java 2011-03-11 14:27:41 UTC (rev 6009)
+++ components/wci/trunk/wci/src/main/java/org/gatein/wci/impl/generic/GenericWebAppContext.java 2011-03-11 15:48:16 UTC (rev 6010)
@@ -78,4 +78,9 @@
{
return false;
}
+
+ public boolean invalidateSession(String sessId)
+ {
+ return false;
+ }
}
\ No newline at end of file
Modified: components/wci/trunk/wci/src/main/java/org/gatein/wci/spi/WebAppContext.java
===================================================================
--- components/wci/trunk/wci/src/main/java/org/gatein/wci/spi/WebAppContext.java 2011-03-11 14:27:41 UTC (rev 6009)
+++ components/wci/trunk/wci/src/main/java/org/gatein/wci/spi/WebAppContext.java 2011-03-11 15:48:16 UTC (rev 6010)
@@ -86,4 +86,12 @@
* @throws java.io.IOException if the file cannot be created
*/
boolean importFile(String parentDirRelativePath, String name, InputStream source, boolean overwrite) throws IOException;
+
+ /**
+ * Invalidate session for the specified id.
+ *
+ * @param sessId Session id
+ * @return true if session was found, false otherwise
+ */
+ boolean invalidateSession(String sessId);
}
13 years, 9 months
- 1
- 0
gatein SVN: r6009 - in components/wci/branches/logout: tomcat/tomcat6/src/main/java/org/gatein/wci/tomcat and 1 other directories.
by do-not-reply＠jboss.org
Author: mstruk
Date: 2011-03-11 09:27:41 -0500 (Fri, 11 Mar 2011)
New Revision: 6009
Modified:
components/wci/branches/logout/jboss/jboss6/src/main/java/org/gatein/wci/jboss/JB6ContainerServlet.java
components/wci/branches/logout/jboss/jboss6/src/main/java/org/gatein/wci/jboss/JB6ServletContainerContext.java
components/wci/branches/logout/tomcat/tomcat6/src/main/java/org/gatein/wci/tomcat/TC6ContainerServlet.java
components/wci/branches/logout/tomcat/tomcat6/src/main/java/org/gatein/wci/tomcat/TC6ServletContainerContext.java
components/wci/branches/logout/tomcat/tomcat7/src/main/java/org/gatein/wci/tomcat/TC7ContainerServlet.java
components/wci/branches/logout/tomcat/tomcat7/src/main/java/org/gatein/wci/tomcat/TC7ServletContainerContext.java
Log:
Renamed off-switch init param and consistently renamed fields and methods + applied off-switch to JB6, and TC7
Modified: components/wci/branches/logout/jboss/jboss6/src/main/java/org/gatein/wci/jboss/JB6ContainerServlet.java
===================================================================
--- components/wci/branches/logout/jboss/jboss6/src/main/java/org/gatein/wci/jboss/JB6ContainerServlet.java 2011-03-11 10:58:08 UTC (rev 6008)
+++ components/wci/branches/logout/jboss/jboss6/src/main/java/org/gatein/wci/jboss/JB6ContainerServlet.java 2011-03-11 14:27:41 UTC (rev 6009)
@@ -29,6 +29,8 @@
import org.apache.catalina.ContainerServlet;
import org.apache.catalina.Engine;
import org.apache.catalina.Wrapper;
+import org.gatein.common.logging.Logger;
+import org.gatein.common.logging.LoggerFactory;
/**
* @author <a href="mailto:mwringe@redhat.com">Matt Wringe</a>
@@ -36,6 +38,11 @@
*/
public class JB6ContainerServlet extends HttpServlet implements ContainerServlet
{
+ private static final Logger log = LoggerFactory.getLogger(JB6ContainerServlet.class);
+
+ /** Servlet context init parameter name that can be used to turn off cross-context logout */
+ private static final String CROSS_CONTEXT_LOGOUT_KEY = "org.gatein.wci.cross_context_logout";
+
/** . */
private Wrapper wrapper;
@@ -107,6 +114,7 @@
{
Engine engine = (Engine) container;
containerContext = new JB6ServletContainerContext(engine);
+ containerContext.setCrossContextLogout(getCrossContextLogoutConfig());
containerContext.start();
break;
}
@@ -123,4 +131,21 @@
containerContext = null;
}
}
+
+ private boolean getCrossContextLogoutConfig()
+ {
+ String val = getServletContext().getInitParameter(CROSS_CONTEXT_LOGOUT_KEY);
+ if (val == null || Boolean.valueOf(val))
+ {
+ return true;
+ }
+
+ if (!"false".equalsIgnoreCase(val))
+ {
+ log.warn("Context init param " + CROSS_CONTEXT_LOGOUT_KEY + " value is invalid: " + val + " - falling back to: false");
+ }
+
+ log.info("Cross-context session invalidation on logout disabled");
+ return false;
+ }
}
Modified: components/wci/branches/logout/jboss/jboss6/src/main/java/org/gatein/wci/jboss/JB6ServletContainerContext.java
===================================================================
--- components/wci/branches/logout/jboss/jboss6/src/main/java/org/gatein/wci/jboss/JB6ServletContainerContext.java 2011-03-11 10:58:08 UTC (rev 6008)
+++ components/wci/branches/logout/jboss/jboss6/src/main/java/org/gatein/wci/jboss/JB6ServletContainerContext.java 2011-03-11 14:27:41 UTC (rev 6009)
@@ -78,6 +78,9 @@
/** . */
private Registration registration;
+ /** Perform cross-context session invalidation on logout, or not */
+ private boolean crossContextLogout = true;
+
public JB6ServletContainerContext(Engine engine)
{
this.engine = engine;
@@ -99,6 +102,11 @@
this.registration = null;
}
+ public void setCrossContextLogout(boolean val)
+ {
+ crossContextLogout = val;
+ }
+
public void login(HttpServletRequest request, HttpServletResponse response, Credentials credentials, long validityMillis) throws ServletException, IOException
{
login(request, response, credentials, validityMillis, null);
@@ -142,8 +150,10 @@
if (sess == null)
return;
+ if (!crossContextLogout)
+ return;
+
final String sessId = sess.getId();
-
DefaultServletContainerFactory.getInstance().getServletContainer().visit(new ServletContainerVisitor()
{
public void accept(WebApp webApp)
Modified: components/wci/branches/logout/tomcat/tomcat6/src/main/java/org/gatein/wci/tomcat/TC6ContainerServlet.java
===================================================================
--- components/wci/branches/logout/tomcat/tomcat6/src/main/java/org/gatein/wci/tomcat/TC6ContainerServlet.java 2011-03-11 10:58:08 UTC (rev 6008)
+++ components/wci/branches/logout/tomcat/tomcat6/src/main/java/org/gatein/wci/tomcat/TC6ContainerServlet.java 2011-03-11 14:27:41 UTC (rev 6009)
@@ -40,7 +40,8 @@
{
private static final Logger log = LoggerFactory.getLogger(TC6ContainerServlet.class);
- private static final String INVALIDATE_SESSION_IN_ALL_CTX = "org.gatein.invalidate_session_in_all_ctx";
+ /** Servlet context init parameter name that can be used to turn off cross-context logout */
+ private static final String CROSS_CONTEXT_LOGOUT_KEY = "org.gatein.wci.cross_context_logout";
/** . */
private Wrapper wrapper;
@@ -113,7 +114,7 @@
{
Engine engine = (Engine)container;
containerContext = new TC6ServletContainerContext(engine);
- containerContext.setInvalidateSessionInAllContexts(getInvalidateSessionInAllContextsConfig());
+ containerContext.setCrossContextLogout(getCrossContextLogoutConfig());
containerContext.start();
break;
}
@@ -131,13 +132,13 @@
}
}
- public boolean getInvalidateSessionInAllContextsConfig() {
- String val = getServletContext().getInitParameter(INVALIDATE_SESSION_IN_ALL_CTX);
+ private boolean getCrossContextLogoutConfig() {
+ String val = getServletContext().getInitParameter(CROSS_CONTEXT_LOGOUT_KEY);
if (val == null || Boolean.valueOf(val))
return true;
if (!"false".equalsIgnoreCase(val))
- log.warn("Context init param " + INVALIDATE_SESSION_IN_ALL_CTX + " value is invalid: " + val + " - falling back to: false");
+ log.warn("Context init param " + CROSS_CONTEXT_LOGOUT_KEY + " value is invalid: " + val + " - falling back to: false");
log.info("Cross-context session invalidation on logout disabled");
return false;
Modified: components/wci/branches/logout/tomcat/tomcat6/src/main/java/org/gatein/wci/tomcat/TC6ServletContainerContext.java
===================================================================
--- components/wci/branches/logout/tomcat/tomcat6/src/main/java/org/gatein/wci/tomcat/TC6ServletContainerContext.java 2011-03-11 10:58:08 UTC (rev 6008)
+++ components/wci/branches/logout/tomcat/tomcat6/src/main/java/org/gatein/wci/tomcat/TC6ServletContainerContext.java 2011-03-11 14:27:41 UTC (rev 6009)
@@ -78,8 +78,8 @@
/** . */
private Registration registration;
- /** perform cross context session invalidation on logout, or not */
- private boolean invalidateSessionInAllCtx = true;
+ /** Perform cross-context session invalidation on logout, or not */
+ private boolean crossContextLogout = true;
/** . */
private GenericAuthentication authentication = new GenericAuthentication();
@@ -109,6 +109,11 @@
this.registration = null;
}
+ public void setCrossContextLogout(boolean val)
+ {
+ crossContextLogout = val;
+ }
+
public void login(HttpServletRequest request, HttpServletResponse response, Credentials credentials, long validityMillis) throws IOException
{
authentication.login(credentials, request, response, validityMillis);
@@ -128,7 +133,7 @@
sess.invalidate();
- if (!invalidateSessionInAllCtx)
+ if (!crossContextLogout)
return;
final String sessId = sess.getId();
@@ -352,8 +357,4 @@
e.printStackTrace();
}
}
-
- public void setInvalidateSessionInAllContexts(boolean val) {
- invalidateSessionInAllCtx = val;
- }
}
Modified: components/wci/branches/logout/tomcat/tomcat7/src/main/java/org/gatein/wci/tomcat/TC7ContainerServlet.java
===================================================================
--- components/wci/branches/logout/tomcat/tomcat7/src/main/java/org/gatein/wci/tomcat/TC7ContainerServlet.java 2011-03-11 10:58:08 UTC (rev 6008)
+++ components/wci/branches/logout/tomcat/tomcat7/src/main/java/org/gatein/wci/tomcat/TC7ContainerServlet.java 2011-03-11 14:27:41 UTC (rev 6009)
@@ -26,6 +26,8 @@
import org.apache.catalina.ContainerServlet;
import org.apache.catalina.Engine;
import org.apache.catalina.Wrapper;
+import org.gatein.common.logging.Logger;
+import org.gatein.common.logging.LoggerFactory;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServlet;
@@ -36,7 +38,11 @@
*/
public class TC7ContainerServlet extends HttpServlet implements ContainerServlet
{
+ private static final Logger log = LoggerFactory.getLogger(TC7ContainerServlet.class);
+ /** Servlet context init parameter name that can be used to turn off cross-context logout */
+ private static final String CROSS_CONTEXT_LOGOUT_KEY = "org.gatein.wci.cross_context_logout";
+
/** . */
private Wrapper wrapper;
@@ -108,6 +114,7 @@
{
Engine engine = (Engine)container;
containerContext = new TC7ServletContainerContext(engine);
+ containerContext.setCrossContextLogout(getCrossContextLogoutConfig());
containerContext.start();
break;
}
@@ -124,4 +131,16 @@
containerContext = null;
}
}
+
+ private boolean getCrossContextLogoutConfig() {
+ String val = getServletContext().getInitParameter(CROSS_CONTEXT_LOGOUT_KEY);
+ if (val == null || Boolean.valueOf(val))
+ return true;
+
+ if (!"false".equalsIgnoreCase(val))
+ log.warn("Context init param " + CROSS_CONTEXT_LOGOUT_KEY + " value is invalid: " + val + " - falling back to: false");
+
+ log.info("Cross-context session invalidation on logout disabled");
+ return false;
+ }
}
Modified: components/wci/branches/logout/tomcat/tomcat7/src/main/java/org/gatein/wci/tomcat/TC7ServletContainerContext.java
===================================================================
--- components/wci/branches/logout/tomcat/tomcat7/src/main/java/org/gatein/wci/tomcat/TC7ServletContainerContext.java 2011-03-11 10:58:08 UTC (rev 6008)
+++ components/wci/branches/logout/tomcat/tomcat7/src/main/java/org/gatein/wci/tomcat/TC7ServletContainerContext.java 2011-03-11 14:27:41 UTC (rev 6009)
@@ -81,6 +81,9 @@
/** . */
private Registration registration;
+ /** Perform cross-context session invalidation on logout, or not */
+ private boolean crossContextLogout = true;
+
public TC7ServletContainerContext(Engine engine)
{
this.engine = engine;
@@ -106,6 +109,11 @@
this.registration = null;
}
+ public void setCrossContextLogout(boolean val)
+ {
+ crossContextLogout = val;
+ }
+
public void login(HttpServletRequest request, HttpServletResponse response, Credentials credentials, long validityMillis) throws ServletException, IOException
{
login(request, response, credentials, validityMillis, null);
@@ -146,8 +154,10 @@
if (sess == null)
return;
+ if (!crossContextLogout)
+ return;
+
final String sessId = sess.getId();
-
DefaultServletContainerFactory.getInstance().getServletContainer().visit(new ServletContainerVisitor()
{
public void accept(WebApp webApp)
13 years, 9 months
- 1
- 0
gatein SVN: r6007 - in epp/docs/branches/EPP_5_1_Branch/Installation_Guide/en-US: fallback_content and 1 other directory.
by do-not-reply＠jboss.org
Author: smumford
Date: 2011-03-11 01:08:50 -0500 (Fri, 11 Mar 2011)
New Revision: 6007
Modified:
epp/docs/branches/EPP_5_1_Branch/Installation_Guide/en-US/ClusteringConfiguration.xml
epp/docs/branches/EPP_5_1_Branch/Installation_Guide/en-US/DatabaseConfiguration.xml
epp/docs/branches/EPP_5_1_Branch/Installation_Guide/en-US/EMailServiceConfiguration.xml
epp/docs/branches/EPP_5_1_Branch/Installation_Guide/en-US/Getting_Started.xml
epp/docs/branches/EPP_5_1_Branch/Installation_Guide/en-US/Installation.xml
epp/docs/branches/EPP_5_1_Branch/Installation_Guide/en-US/Introduction.xml
epp/docs/branches/EPP_5_1_Branch/Installation_Guide/en-US/Launching.xml
epp/docs/branches/EPP_5_1_Branch/Installation_Guide/en-US/Post_Installation.xml
epp/docs/branches/EPP_5_1_Branch/Installation_Guide/en-US/Revision_History.xml
epp/docs/branches/EPP_5_1_Branch/Installation_Guide/en-US/Test_Your_Installation.xml
epp/docs/branches/EPP_5_1_Branch/Installation_Guide/en-US/fallback_content/Conventions.xml
Log:
Committing aspell corrections
Modified: epp/docs/branches/EPP_5_1_Branch/Installation_Guide/en-US/ClusteringConfiguration.xml
===================================================================
--- epp/docs/branches/EPP_5_1_Branch/Installation_Guide/en-US/ClusteringConfiguration.xml 2011-03-11 05:54:08 UTC (rev 6006)
+++ epp/docs/branches/EPP_5_1_Branch/Installation_Guide/en-US/ClusteringConfiguration.xml 2011-03-11 06:08:50 UTC (rev 6007)
@@ -31,7 +31,7 @@
<itemizedlist>
<listitem>
<para>
- a rapid shared filesystem is required such as a Storage Area Network (SAN) and;
+ a rapid shared file system is required such as a Storage Area Network (SAN) and;
</para>
</listitem>
<listitem>
@@ -64,7 +64,7 @@
<itemizedlist>
<listitem>
<para>
- To specify the location on a shared filesystem to store the JCR index. If the directory is deleted, the JCR will recreate the indexes on next start of the server. (This operation may take a very long time, depending on the size of the data stored in the JCR).
+ To specify the location on a shared file system to store the JCR index. If the directory is deleted, the JCR will recreate the indexes on next start of the server. (This operation may take a very long time, depending on the size of the data stored in the JCR).
</para>
</listitem>
</itemizedlist>
Modified: epp/docs/branches/EPP_5_1_Branch/Installation_Guide/en-US/DatabaseConfiguration.xml
===================================================================
--- epp/docs/branches/EPP_5_1_Branch/Installation_Guide/en-US/DatabaseConfiguration.xml 2011-03-11 05:54:08 UTC (rev 6006)
+++ epp/docs/branches/EPP_5_1_Branch/Installation_Guide/en-US/DatabaseConfiguration.xml 2011-03-11 06:08:50 UTC (rev 6007)
@@ -66,7 +66,7 @@
other database you will need to firstly create the database.</para>
<para>Make sure the user has rights to create tables on the database and
- to update them as, during the first startup, they will be automatically
+ to update them as, during the first start up, they will be automatically
created.</para>
<para>Add the JDBC driver to the classpath, by copying the relevant
@@ -112,7 +112,7 @@
<warning>
<title>Do not delete <filename><replaceable>JBOSS_HOME</replaceable>/server/<replaceable><PROFILE></replaceable>/data</filename></title>
<para>
- The JCR can store information both in a database and on the filesystem depending on the configuration of the value storage. Refer to the &PRODUCT; Reference Guide for more information.
+ The JCR can store information both in a database and on the file system depending on the configuration of the value storage. Refer to the &PRODUCT; Reference Guide for more information.
</para>
<para>
By default, the portal will store information required to run the portal in <filename><replaceable>JBOSS_HOME</replaceable>/server/<replaceable><PROFILE></replaceable>/data/gatein/jcr/values/</filename>.
Modified: epp/docs/branches/EPP_5_1_Branch/Installation_Guide/en-US/EMailServiceConfiguration.xml
===================================================================
--- epp/docs/branches/EPP_5_1_Branch/Installation_Guide/en-US/EMailServiceConfiguration.xml 2011-03-11 05:54:08 UTC (rev 6006)
+++ epp/docs/branches/EPP_5_1_Branch/Installation_Guide/en-US/EMailServiceConfiguration.xml 2011-03-11 06:08:50 UTC (rev 6007)
@@ -34,7 +34,7 @@
gatein.email.smtp.socketFactory.port=465
gatein.email.smtp.socketFactory.class=javax.net.ssl.SSLSocketFactory</programlisting>
- <para>The email service is preconfigured for GMail, so that any GMail account can be used with minimal configuration. Simply enter the full GMail address
+ <para>The email service is pre-configured for GMail, so that any GMail account can be used with minimal configuration. Simply enter the full GMail address
as the username and fill in the corresponding password.</para>
<para>In corporate environments you will want to use your corporate SMTP gateway. When using it over SSL,
Modified: epp/docs/branches/EPP_5_1_Branch/Installation_Guide/en-US/Getting_Started.xml
===================================================================
--- epp/docs/branches/EPP_5_1_Branch/Installation_Guide/en-US/Getting_Started.xml 2011-03-11 05:54:08 UTC (rev 6006)
+++ epp/docs/branches/EPP_5_1_Branch/Installation_Guide/en-US/Getting_Started.xml 2011-03-11 06:08:50 UTC (rev 6007)
@@ -331,18 +331,18 @@
</row>
<row>
<entry>
- Postgres SQL 8.3.7
+ PostgresSQL 8.3.7
</entry>
<entry>
- Postgres Driver JDBC4, 8.3-605
+ PostgresSQL Driver JDBC4, 8.3-605
</entry>
</row>
<row>
<entry>
- Postgres SQL 8.2.4 (Supported)
+ PostgresSQL 8.2.4 (Supported)
</entry>
<entry>
- Postgres Driver JDBC4, 8.2-510
+ PostgresSQL Driver JDBC4, 8.2-510
</entry>
</row>
<row>
Modified: epp/docs/branches/EPP_5_1_Branch/Installation_Guide/en-US/Installation.xml
===================================================================
--- epp/docs/branches/EPP_5_1_Branch/Installation_Guide/en-US/Installation.xml 2011-03-11 05:54:08 UTC (rev 6006)
+++ epp/docs/branches/EPP_5_1_Branch/Installation_Guide/en-US/Installation.xml 2011-03-11 06:08:50 UTC (rev 6007)
@@ -73,7 +73,7 @@
</listitem>
<listitem>
<para>
- the <literal>production</literal> server configuration includes Portal components and clustering services. It is preconfigured with default settings which would be more accurate for a production environment.
+ the <literal>production</literal> server configuration includes Portal components and clustering services. It is pre-configured with default settings which would be more accurate for a production environment.
</para>
</listitem>
</itemizedlist>
Modified: epp/docs/branches/EPP_5_1_Branch/Installation_Guide/en-US/Introduction.xml
===================================================================
--- epp/docs/branches/EPP_5_1_Branch/Installation_Guide/en-US/Introduction.xml 2011-03-11 05:54:08 UTC (rev 6006)
+++ epp/docs/branches/EPP_5_1_Branch/Installation_Guide/en-US/Introduction.xml 2011-03-11 06:08:50 UTC (rev 6007)
@@ -7,7 +7,7 @@
<chapter id="Introduction">
<title>Introduction</title>
<para>
- &PRODUCT; is the open source implementation of the Java EE suite of services and Portal services running atop &JBEAP;. It comprises a set of offerings for enterprise customers who are looking for preconfigured profiles of JBoss Enterprise Middleware components that have been tested and certified together to provide an integrated experience. Its easy-to-use server architecture and high flexibility makes JBoss the ideal choice for users just starting out with J2EE, as well as senior architects looking for a customizable middleware platform.
+ &PRODUCT; is the open source implementation of the Java EE suite of services and Portal services running atop &JBEAP;. It comprises a set of offerings for enterprise customers who are looking for pre-configured profiles of JBoss Enterprise Middleware components that have been tested and certified together to provide an integrated experience. Its easy-to-use server architecture and high flexibility makes JBoss the ideal choice for users just starting out with J2EE, as well as senior architects looking for a customizable middleware platform.
</para>
<para>
Because it is Java-based, &PRODUCT; is cross-platform and easy to install and use on any operating system that supports Java.
Modified: epp/docs/branches/EPP_5_1_Branch/Installation_Guide/en-US/Launching.xml
===================================================================
--- epp/docs/branches/EPP_5_1_Branch/Installation_Guide/en-US/Launching.xml 2011-03-11 05:54:08 UTC (rev 6006)
+++ epp/docs/branches/EPP_5_1_Branch/Installation_Guide/en-US/Launching.xml 2011-03-11 06:08:50 UTC (rev 6007)
@@ -57,7 +57,7 @@
<section id="sect-Install_Guide-Launching_PRODUCT-Shutting_Down">
<title>Shutting Down</title>
<para>
- The methods to shut the &PRODUCT; down are similiar to those for launching it.
+ The methods to shut the &PRODUCT; down are similar to those for launching it.
</para>
<procedure>
<step>
Modified: epp/docs/branches/EPP_5_1_Branch/Installation_Guide/en-US/Post_Installation.xml
===================================================================
--- epp/docs/branches/EPP_5_1_Branch/Installation_Guide/en-US/Post_Installation.xml 2011-03-11 05:54:08 UTC (rev 6006)
+++ epp/docs/branches/EPP_5_1_Branch/Installation_Guide/en-US/Post_Installation.xml 2011-03-11 06:08:50 UTC (rev 6007)
@@ -257,7 +257,7 @@
<formalpara>
<title>Disabling Pre-configured Accounts</title>
<para>
- &PRODUCT; includes four pre-configured user accounts for testing and evaluation puposes. These accounts can be used for direct access to the portal.
+ &PRODUCT; includes four pre-configured user accounts for testing and evaluation purposes. These accounts can be used for direct access to the portal.
</para>
</formalpara>
<para>
Modified: epp/docs/branches/EPP_5_1_Branch/Installation_Guide/en-US/Revision_History.xml
===================================================================
--- epp/docs/branches/EPP_5_1_Branch/Installation_Guide/en-US/Revision_History.xml 2011-03-11 05:54:08 UTC (rev 6006)
+++ epp/docs/branches/EPP_5_1_Branch/Installation_Guide/en-US/Revision_History.xml 2011-03-11 06:08:50 UTC (rev 6007)
@@ -32,7 +32,7 @@
</author>
<revdescription>
<simplelist>
- <member>Incorprated QE feedback.</member>
+ <member>Incorporated QE feedback.</member>
</simplelist>
</revdescription>
</revision>
@@ -88,7 +88,7 @@
</author>
<revdescription>
<simplelist>
- <member>Added Installing Addons chapter. Updated .ent file</member>
+ <member>Added Installing Add-ons chapter. Updated .ent file</member>
</simplelist>
</revdescription>
</revision>
Modified: epp/docs/branches/EPP_5_1_Branch/Installation_Guide/en-US/Test_Your_Installation.xml
===================================================================
--- epp/docs/branches/EPP_5_1_Branch/Installation_Guide/en-US/Test_Your_Installation.xml 2011-03-11 05:54:08 UTC (rev 6006)
+++ epp/docs/branches/EPP_5_1_Branch/Installation_Guide/en-US/Test_Your_Installation.xml 2011-03-11 06:08:50 UTC (rev 6007)
@@ -8,7 +8,7 @@
<title>Test your Installation</title>
<para>
- After you have installed the JBoss Enterprise Portal Platform, it is wise to perform a simple startup test to validate that there are no major problems with your Java VM/operating system combination. Make sure you have set the <literal>JBOSS_HOME</literal> environment variables as explained in <xref linkend="Post_Installation_Configuration"/>.
+ After you have installed the JBoss Enterprise Portal Platform, it is wise to perform a simple start up test to validate that there are no major problems with your Java VM/operating system combination. Make sure you have set the <literal>JBOSS_HOME</literal> environment variables as explained in <xref linkend="Post_Installation_Configuration"/>.
</para>
<para>
To test your installation:
Modified: epp/docs/branches/EPP_5_1_Branch/Installation_Guide/en-US/fallback_content/Conventions.xml
===================================================================
--- epp/docs/branches/EPP_5_1_Branch/Installation_Guide/en-US/fallback_content/Conventions.xml 2011-03-11 05:54:08 UTC (rev 6006)
+++ epp/docs/branches/EPP_5_1_Branch/Installation_Guide/en-US/fallback_content/Conventions.xml 2011-03-11 06:08:50 UTC (rev 6007)
@@ -49,7 +49,7 @@
</para>
<blockquote>
<para>
- File-related classes include <classname>filesystem</classname> for file systems, <classname>file</classname> for files, and <classname>dir</classname> for directories. Each class has its own associated set of permissions.
+ File-related classes include <classname>file system</classname> for file systems, <classname>file</classname> for files, and <classname>dir</classname> for directories. Each class has its own associated set of permissions.
</para>
</blockquote>
<para>
13 years, 9 months
- 1
- 0
gatein SVN: r6006 - in epp/docs/branches/EPP_5_1_Branch/User_Guide/en-US: Common_Content and 5 other directories.
by do-not-reply＠jboss.org
Author: smumford
Date: 2011-03-11 00:54:08 -0500 (Fri, 11 Mar 2011)
New Revision: 6006
Modified:
epp/docs/branches/EPP_5_1_Branch/User_Guide/en-US/Common_Content/Conventions.xml
epp/docs/branches/EPP_5_1_Branch/User_Guide/en-US/Revision_History.xml
epp/docs/branches/EPP_5_1_Branch/User_Guide/en-US/modules/Further_Documentation.xml
epp/docs/branches/EPP_5_1_Branch/User_Guide/en-US/modules/account/Change_User_Password.xml
epp/docs/branches/EPP_5_1_Branch/User_Guide/en-US/modules/gadgetsAdmin/Manage_Gadgets_in_User_Workspace.xml
epp/docs/branches/EPP_5_1_Branch/User_Guide/en-US/modules/gadgetsAdmin/Manage_Portlets_and_Gadgets.xml
epp/docs/branches/EPP_5_1_Branch/User_Guide/en-US/modules/portal/Manage_Page_Navigation.xml
epp/docs/branches/EPP_5_1_Branch/User_Guide/en-US/modules/portal/Manage_Pages.xml
epp/docs/branches/EPP_5_1_Branch/User_Guide/en-US/modules/portal/Manage_Portals.xml
epp/docs/branches/EPP_5_1_Branch/User_Guide/en-US/modules/portal/Toolbar.xml
epp/docs/branches/EPP_5_1_Branch/User_Guide/en-US/modules/portal/User_Management.xml
epp/docs/branches/EPP_5_1_Branch/User_Guide/en-US/modules/portletsUser/FCK_Portlet.xml
epp/docs/branches/EPP_5_1_Branch/User_Guide/en-US/modules/portletsUser/Interface_Portlets.xml
Log:
Committing aspell corrections
Modified: epp/docs/branches/EPP_5_1_Branch/User_Guide/en-US/Common_Content/Conventions.xml
===================================================================
--- epp/docs/branches/EPP_5_1_Branch/User_Guide/en-US/Common_Content/Conventions.xml 2011-03-11 05:43:02 UTC (rev 6005)
+++ epp/docs/branches/EPP_5_1_Branch/User_Guide/en-US/Common_Content/Conventions.xml 2011-03-11 05:54:08 UTC (rev 6006)
@@ -47,7 +47,7 @@
</para>
<blockquote>
<para>
- File-related classes include <classname>filesystem</classname> for file systems, <classname>file</classname> for files, and <classname>dir</classname> for directories. Each class has its own associated set of permissions.
+ File-related classes include <classname>file system</classname> for file systems, <classname>file</classname> for files, and <classname>dir</classname> for directories. Each class has its own associated set of permissions.
</para>
</blockquote>
<para>
Modified: epp/docs/branches/EPP_5_1_Branch/User_Guide/en-US/Revision_History.xml
===================================================================
--- epp/docs/branches/EPP_5_1_Branch/User_Guide/en-US/Revision_History.xml 2011-03-11 05:43:02 UTC (rev 6005)
+++ epp/docs/branches/EPP_5_1_Branch/User_Guide/en-US/Revision_History.xml 2011-03-11 05:54:08 UTC (rev 6006)
@@ -31,7 +31,7 @@
</author>
<revdescription>
<simplelist>
- <member>Incorporated futher QE feedback.</member>
+ <member>Incorporated further QE feedback.</member>
</simplelist>
</revdescription>
</revision>
Modified: epp/docs/branches/EPP_5_1_Branch/User_Guide/en-US/modules/Further_Documentation.xml
===================================================================
--- epp/docs/branches/EPP_5_1_Branch/User_Guide/en-US/modules/Further_Documentation.xml 2011-03-11 05:43:02 UTC (rev 6005)
+++ epp/docs/branches/EPP_5_1_Branch/User_Guide/en-US/modules/Further_Documentation.xml 2011-03-11 05:54:08 UTC (rev 6006)
@@ -4,7 +4,7 @@
%BOOK_ENTITIES;
]>
<chapter id="chap-User_Guide-Futher_Documentation">
- <title>Futher Documentation</title>
+ <title>Further Documentation</title>
<para>
Further documentation about using and configuring the &PRODUCT; can be found in the &PRODUCT; Install Guide or the &PRODUCT; Reference Guide which are hosted at <ulink type="http" url="http://www.redhat.com/docs/en-US/JBoss_Enterprise_Portal_Platform/">www.redhat.com</ulink>.
</para>
Modified: epp/docs/branches/EPP_5_1_Branch/User_Guide/en-US/modules/account/Change_User_Password.xml
===================================================================
--- epp/docs/branches/EPP_5_1_Branch/User_Guide/en-US/modules/account/Change_User_Password.xml 2011-03-11 05:43:02 UTC (rev 6005)
+++ epp/docs/branches/EPP_5_1_Branch/User_Guide/en-US/modules/account/Change_User_Password.xml 2011-03-11 05:54:08 UTC (rev 6006)
@@ -77,7 +77,7 @@
</step>
<step>
<para>
- If all fields have been enetered correctly click <emphasis role="bold">Save</emphasis> to save the new passowrd, or click <emphasis role="bold">Reset</emphasis> to empty the form and start again.
+ If all fields have been entered correctly click <emphasis role="bold">Save</emphasis> to save the new password, or click <emphasis role="bold">Reset</emphasis> to empty the form and start again.
</para>
</step>
</procedure>
Modified: epp/docs/branches/EPP_5_1_Branch/User_Guide/en-US/modules/gadgetsAdmin/Manage_Gadgets_in_User_Workspace.xml
===================================================================
--- epp/docs/branches/EPP_5_1_Branch/User_Guide/en-US/modules/gadgetsAdmin/Manage_Gadgets_in_User_Workspace.xml 2011-03-11 05:43:02 UTC (rev 6005)
+++ epp/docs/branches/EPP_5_1_Branch/User_Guide/en-US/modules/gadgetsAdmin/Manage_Gadgets_in_User_Workspace.xml 2011-03-11 05:54:08 UTC (rev 6006)
@@ -130,7 +130,7 @@
</step>
<step>
<para>
- Select a gadget by clicking the add icon (located next to the the gadget). The selected gadget is displayed immediately in the user workspace. Normally, you can see only two gadgets in the User Workspace. When there are more gadgets, some gadgets are not visible.
+ Select a gadget by clicking the add icon (located next to the gadget). The selected gadget is displayed immediately in the user workspace. Normally, you can see only two gadgets in the User Workspace. When there are more gadgets, some gadgets are not visible.
</para>
</step>
<step>
Modified: epp/docs/branches/EPP_5_1_Branch/User_Guide/en-US/modules/gadgetsAdmin/Manage_Portlets_and_Gadgets.xml
===================================================================
--- epp/docs/branches/EPP_5_1_Branch/User_Guide/en-US/modules/gadgetsAdmin/Manage_Portlets_and_Gadgets.xml 2011-03-11 05:43:02 UTC (rev 6005)
+++ epp/docs/branches/EPP_5_1_Branch/User_Guide/en-US/modules/gadgetsAdmin/Manage_Portlets_and_Gadgets.xml 2011-03-11 05:54:08 UTC (rev 6006)
@@ -22,7 +22,7 @@
</step>
<step>
<para>
- Hover over <emphasis role="bold">Dashboard Editor</emphasis> and click <emphasis role="bold">Edit Page</emphasis> in the dropdown menu.
+ Hover over <emphasis role="bold">Dashboard Editor</emphasis> and click <emphasis role="bold">Edit Page</emphasis> in the drop-down menu.
</para>
</step>
<step>
@@ -233,7 +233,7 @@
</step>
<step>
<para>
- Select an application by checking the radio button. Note that there several pages of Portlet applications to choose from and that the content of the list changes when you select a different type of application from the <emphasis role="bold">Application Type</emphasis> dropdown menu.
+ Select an application by checking the radio button. Note that there several pages of Portlet applications to choose from and that the content of the list changes when you select a different type of application from the <emphasis role="bold">Application Type</emphasis> drop-down menu.
</para>
</step>
<step>
Modified: epp/docs/branches/EPP_5_1_Branch/User_Guide/en-US/modules/portal/Manage_Page_Navigation.xml
===================================================================
--- epp/docs/branches/EPP_5_1_Branch/User_Guide/en-US/modules/portal/Manage_Page_Navigation.xml 2011-03-11 05:43:02 UTC (rev 6005)
+++ epp/docs/branches/EPP_5_1_Branch/User_Guide/en-US/modules/portal/Manage_Page_Navigation.xml 2011-03-11 05:54:08 UTC (rev 6006)
@@ -80,7 +80,7 @@
<section id="User_Guide-Manage_Page_Navigation-Deleting_a_portals_navigation">
<title>Deleting a portal's navigation</title>
<para>
- A navigation is deleted automatically after you delete the portal it correseponds to.
+ A navigation is deleted automatically after you delete the portal it corresponds to.
</para>
</section>
Modified: epp/docs/branches/EPP_5_1_Branch/User_Guide/en-US/modules/portal/Manage_Pages.xml
===================================================================
--- epp/docs/branches/EPP_5_1_Branch/User_Guide/en-US/modules/portal/Manage_Pages.xml 2011-03-11 05:43:02 UTC (rev 6005)
+++ epp/docs/branches/EPP_5_1_Branch/User_Guide/en-US/modules/portal/Manage_Pages.xml 2011-03-11 05:54:08 UTC (rev 6006)
@@ -82,7 +82,7 @@
This checkbox toggles the global visibility of this page.
</para>
<para>
- If checked the page or the page node appears on on the navigation bar, the page navigation and the site map. If "visible" is checked the visibility depends on the "publication date & time" attribute.
+ If checked the page or the page node appears on the navigation bar, the page navigation and the site map. If "visible" is checked the visibility depends on the "publication date & time" attribute.
</para>
<para>
If unchecked the page is not shown under any circumstances, even if the publication period valid.
@@ -149,7 +149,7 @@
</step>
<step>
<para>
- Click the <emphasis role="bold">Next</emphasis> button or number '3' of the wizard step to go to step 3. You can drag portlets from the popup panel into the main pane to create the content of this page.
+ Click the <emphasis role="bold">Next</emphasis> button or number '3' of the wizard step to go to step 3. You can drag portlets from the pop-up panel into the main pane to create the content of this page.
</para>
<mediaobject>
<imageobject role="html">
@@ -279,7 +279,7 @@
<term><emphasis role="bold">Page title</emphasis></term>
<listitem>
<para>
- The title of the the page. This is an optional field. If you choose to add a title to the page it must be at least 3 and no more than 30 characters in length.
+ The title of the page. This is an optional field. If you choose to add a title to the page it must be at least 3 and no more than 30 characters in length.
</para>
</listitem>
</varlistentry>
Modified: epp/docs/branches/EPP_5_1_Branch/User_Guide/en-US/modules/portal/Manage_Portals.xml
===================================================================
--- epp/docs/branches/EPP_5_1_Branch/User_Guide/en-US/modules/portal/Manage_Portals.xml 2011-03-11 05:43:02 UTC (rev 6005)
+++ epp/docs/branches/EPP_5_1_Branch/User_Guide/en-US/modules/portal/Manage_Portals.xml 2011-03-11 05:54:08 UTC (rev 6006)
@@ -185,7 +185,7 @@
</imageobject>
</mediaobject>
<para>
- Elements already in place in the portal body can be rearranged or removed as required. Use the relevent button in the overlay that appears when you mouse over each element:
+ Elements already in place in the portal body can be rearranged or removed as required. Use the relevant button in the overlay that appears when you mouse over each element:
</para>
<mediaobject>
<imageobject role="html">
Modified: epp/docs/branches/EPP_5_1_Branch/User_Guide/en-US/modules/portal/Toolbar.xml
===================================================================
--- epp/docs/branches/EPP_5_1_Branch/User_Guide/en-US/modules/portal/Toolbar.xml 2011-03-11 05:43:02 UTC (rev 6005)
+++ epp/docs/branches/EPP_5_1_Branch/User_Guide/en-US/modules/portal/Toolbar.xml 2011-03-11 05:54:08 UTC (rev 6006)
@@ -83,7 +83,7 @@
</imageobject>
</mediaobject>
<para>
- The name shown in the image above is the default and can easily be overtyped when the Dashboard is open.
+ The name shown in the image above is the default and can easily be over-typed when the Dashboard is open.
</para>
</listitem>
</varlistentry>
Modified: epp/docs/branches/EPP_5_1_Branch/User_Guide/en-US/modules/portal/User_Management.xml
===================================================================
--- epp/docs/branches/EPP_5_1_Branch/User_Guide/en-US/modules/portal/User_Management.xml 2011-03-11 05:43:02 UTC (rev 6005)
+++ epp/docs/branches/EPP_5_1_Branch/User_Guide/en-US/modules/portal/User_Management.xml 2011-03-11 05:54:08 UTC (rev 6006)
@@ -94,7 +94,7 @@
</step>
<step>
<para>
- Type in a partial/full string which identifies the user record being searched. The <emphasis role="bold">*</emphasis> character can be used as a wildcard.
+ Type in a partial/full string which identifies the user record being searched. The <emphasis role="bold">*</emphasis> character can be used as a wild-card.
</para>
</step>
<step>
Modified: epp/docs/branches/EPP_5_1_Branch/User_Guide/en-US/modules/portletsUser/FCK_Portlet.xml
===================================================================
--- epp/docs/branches/EPP_5_1_Branch/User_Guide/en-US/modules/portletsUser/FCK_Portlet.xml 2011-03-11 05:43:02 UTC (rev 6005)
+++ epp/docs/branches/EPP_5_1_Branch/User_Guide/en-US/modules/portletsUser/FCK_Portlet.xml 2011-03-11 05:54:08 UTC (rev 6006)
@@ -21,7 +21,7 @@
<term>Toolbar</term>
<listitem>
<para>
- The area at the top of the editor which, like a desktop word-processsor, contains buttons used to perform various functions.
+ The area at the top of the editor which, like a desktop word-processor, contains buttons used to perform various functions.
</para>
<mediaobject>
<imageobject>
Modified: epp/docs/branches/EPP_5_1_Branch/User_Guide/en-US/modules/portletsUser/Interface_Portlets.xml
===================================================================
--- epp/docs/branches/EPP_5_1_Branch/User_Guide/en-US/modules/portletsUser/Interface_Portlets.xml 2011-03-11 05:43:02 UTC (rev 6005)
+++ epp/docs/branches/EPP_5_1_Branch/User_Guide/en-US/modules/portletsUser/Interface_Portlets.xml 2011-03-11 05:54:08 UTC (rev 6006)
@@ -75,10 +75,10 @@
</listitem>
</varlistentry>
<varlistentry>
- <term><emphasis role="bold">Breadcumbs Portlet</emphasis></term>
+ <term><emphasis role="bold">Breadcrumbs Portlet</emphasis></term>
<listitem>
<para>
- This Portlet displays the 'path' the user has taken from the home page to arrive at the currrent page.
+ This Portlet displays the 'path' the user has taken from the home page to arrive at the current page.
</para>
<mediaobject>
<imageobject role="html">
13 years, 9 months
- 1
- 0
gatein SVN: r6005 - in epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US: modules and 7 other directories.
by do-not-reply＠jboss.org
Author: smumford
Date: 2011-03-11 00:43:02 -0500 (Fri, 11 Mar 2011)
New Revision: 6005
Modified:
epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/Common_Content/Conventions.xml
epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/modules/Advanced/Foundations.xml
epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/modules/Advanced/JCR/cluster-config.xml
epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/modules/Advanced/JCR/configuration-persister.xml
epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/modules/Advanced/JCR/configuration.xml
epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/modules/Advanced/JCR/intro.xml
epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/modules/Advanced/JCR/jbosscache-configuration-templates.xml
epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/modules/Advanced/JCR/jdbc-data-container-config.xml
epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/modules/Advanced/JCR/lock-manager-config.xml
epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/modules/Advanced/JCR/multilanguage-support.xml
epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/modules/Advanced/JCR/query-handler-config.xml
epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/modules/Advanced/JCR/search-configuration.xml
epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/modules/Advanced/JCR/statistics.xml
epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/modules/AuthenticationAndIdentity/BackendConfiguration.xml
epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/modules/AuthenticationAndIdentity/OrganizationAPI.xml
epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/modules/AuthenticationAndIdentity/PredefinedUserConfiguration.xml
epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/modules/AuthenticationAndIdentity/SSO.xml
epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/modules/Configuration/DatabaseConfiguration.xml
epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/modules/Configuration/EMailServiceConfiguration.xml
epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/modules/Introduction.xml
epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/modules/PortalDevelopment/JavascriptConfiguration.xml
epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/modules/PortalDevelopment/LocalizationConfiguration.xml
epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/modules/PortalDevelopment/Skinning.xml
epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/modules/PortletDevelopment/PortletBridge/gettingstarted.xml
epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/modules/PortletDevelopment/PortletBridge/overview.xml
epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/modules/PortletDevelopment/PortletBridge/portlet_development.xml
epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/modules/PortletDevelopment/Standard.xml
epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/modules/WSRP.xml
Log:
Committing aspell corrections
Modified: epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/Common_Content/Conventions.xml
===================================================================
--- epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/Common_Content/Conventions.xml 2011-03-10 15:46:21 UTC (rev 6004)
+++ epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/Common_Content/Conventions.xml 2011-03-11 05:43:02 UTC (rev 6005)
@@ -49,7 +49,7 @@
</para>
<blockquote>
<para>
- File-related classes include <classname>filesystem</classname> for file systems, <classname>file</classname> for files, and <classname>dir</classname> for directories. Each class has its own associated set of permissions.
+ File-related classes include <classname>file system</classname> for file systems, <classname>file</classname> for files, and <classname>dir</classname> for directories. Each class has its own associated set of permissions.
</para>
</blockquote>
<para>
Modified: epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/modules/Advanced/Foundations.xml
===================================================================
--- epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/modules/Advanced/Foundations.xml 2011-03-10 15:46:21 UTC (rev 6004)
+++ epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/modules/Advanced/Foundations.xml 2011-03-11 05:43:02 UTC (rev 6005)
@@ -8,7 +8,7 @@
<section id="sect-Reference_Guide-Foundations-The_eXo_Kernel">
<title>The eXo Kernel</title>
<para>
- &PRODUCT; is built as a set of services on top of a dependency injection kernel. The kernel provides configuration, lifecycle handling, component scopes, and some core services.
+ &PRODUCT; is built as a set of services on top of a dependency injection kernel. The kernel provides configuration, life-cycle handling, component scopes, and some core services.
</para>
<para>
Service components exist in two scopes. The first scope is represented by the <literal>RootContainer</literal>. It contains services that exist independently of any portal, and can be accessed by all portals.
@@ -84,7 +84,7 @@
<section id="sect-Reference_Guide-Configuration_syntax-External_Plugins">
- <title>External Plugins</title>
+ <title>External Plug-ins</title>
<para>
The eXo Kernel supports non-component objects that can be configured, instantiated, and injected into registered components using method calls. This '<emphasis>plugin</emphasis>' method allows portal extensions to add additional configurations to core services.
</para>
@@ -140,7 +140,7 @@
</para>
</note>
<para>
- Through the extension mechanism the servlet context used for resource loading is a <emphasis role="bold">unified servlet context</emphasis> (this is explaned in a later section).
+ Through the extension mechanism the servlet context used for resource loading is a <emphasis role="bold">unified servlet context</emphasis> (this is explained in a later section).
</para>
<para>
To have an 'include' path resolved relative to current classpath (context classloader), use a <code>'jar:'</code> URL schema.
Modified: epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/modules/Advanced/JCR/cluster-config.xml
===================================================================
--- epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/modules/Advanced/JCR/cluster-config.xml 2011-03-10 15:46:21 UTC (rev 6004)
+++ epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/modules/Advanced/JCR/cluster-config.xml 2011-03-11 05:43:02 UTC (rev 6005)
@@ -15,7 +15,7 @@
<procedure>
<step>
<para>
- Dowload the latest version of the eXo JCR <filename>ear</filename> distribution.
+ Download the latest version of the eXo JCR <filename>ear</filename> distribution.
</para>
</step>
<step>
Modified: epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/modules/Advanced/JCR/configuration-persister.xml
===================================================================
--- epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/modules/Advanced/JCR/configuration-persister.xml 2011-03-10 15:46:21 UTC (rev 6004)
+++ epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/modules/Advanced/JCR/configuration-persister.xml 2011-03-11 05:43:02 UTC (rev 6005)
@@ -21,7 +21,7 @@
<section id="sect-Reference_Guide-The_JCR_Configuration_persister-Usage">
<title>Usage</title>
<para>
- On startup, the <classname>RepositoryServiceConfiguration</classname> component checks if a configuration persister has been configured.
+ On start up, the <classname>RepositoryServiceConfiguration</classname> component checks if a configuration persister has been configured.
</para>
<para>
It one has been, it uses the provided <classname>ConfigurationPersister</classname> implementation class to instantiate the persister object.
@@ -67,7 +67,7 @@
The JCR Core implementation contains a persister which stores the repository configuration in the relational database using JDBC calls (<classname>org.exoplatform.services.jcr.impl.config.JDBCConfigurationPersister</classname>).
</para>
<para>
- The implementation will create and use the table <parameter>JCR_CONFIG</parameter> in the provided database. However, a developer can implement another persister for any particular usecase.
+ The implementation will create and use the table <parameter>JCR_CONFIG</parameter> in the provided database. However, a developer can implement another persister for any particular use case.
</para>
</section>
Modified: epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/modules/Advanced/JCR/configuration.xml
===================================================================
--- epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/modules/Advanced/JCR/configuration.xml 2011-03-10 15:46:21 UTC (rev 6004)
+++ epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/modules/Advanced/JCR/configuration.xml 2011-03-11 05:43:02 UTC (rev 6005)
@@ -94,7 +94,7 @@
</listitem>
<listitem>
<para>
- <emphasis role="bold">T</emphasis> or <emphasis role="bold">TB</emphasis> for terraBytes.
+ <emphasis role="bold">T</emphasis> or <emphasis role="bold">TB</emphasis> for terabytes.
</para>
</listitem>
<listitem>
Modified: epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/modules/Advanced/JCR/intro.xml
===================================================================
--- epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/modules/Advanced/JCR/intro.xml 2011-03-10 15:46:21 UTC (rev 6004)
+++ epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/modules/Advanced/JCR/intro.xml 2011-03-11 05:43:02 UTC (rev 6005)
@@ -18,7 +18,7 @@
The term <emphasis role="bold">JCR</emphasis> refers to the Java Content Repository. The JCR is the data store of JBoss Enterprise Portal Platform. All content is stored and managed via the JCR.
</para>
<para>
- The eXo JCR included with JBoss Enterprise Portal Platform 5.1 is a (<ulink type="http" url="http://www.jcp.org/en/jsr/detail?id=170">JSR-170</ulink>) compliant implementation of the JCR 1.0 specification. The JCR provides versioning, textual search, access control, content event monitoring, and is used to storing text and binary data for the portal internal usage. The backend storage of the JCR is configurable and can be a file system or a database.
+ The eXo JCR included with JBoss Enterprise Portal Platform 5.1 is a (<ulink type="http" url="http://www.jcp.org/en/jsr/detail?id=170">JSR-170</ulink>) compliant implementation of the JCR 1.0 specification. The JCR provides versioning, textual search, access control, content event monitoring, and is used to storing text and binary data for the portal internal usage. The back-end storage of the JCR is configurable and can be a file system or a database.
</para>
<section id="sect-Reference_Guide-Introduction-Concepts">
<title>Concepts</title>
Modified: epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/modules/Advanced/JCR/jbosscache-configuration-templates.xml
===================================================================
--- epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/modules/Advanced/JCR/jbosscache-configuration-templates.xml 2011-03-10 15:46:21 UTC (rev 6004)
+++ epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/modules/Advanced/JCR/jbosscache-configuration-templates.xml 2011-03-11 05:43:02 UTC (rev 6005)
@@ -85,7 +85,7 @@
<section id="sect-Reference_Guide-JBoss_Cache_configuration-JGroups_configuration">
<title>JGroups configuration</title>
<para>
- JGroups is used by JBoss Cache for network communications and transport in a clustered environment. If the property "<parameter>jgroups-configuration</parameter>" is defined in the component configuration, it will be injected into the JBoss Cache instance on startup.
+ JGroups is used by JBoss Cache for network communications and transport in a clustered environment. If the property "<parameter>jgroups-configuration</parameter>" is defined in the component configuration, it will be injected into the JBoss Cache instance on start up.
</para>
<programlisting language="XML" role="XML"><property name="jgroups-configuration" value="your/path/to/modified-udp.xml" />
Modified: epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/modules/Advanced/JCR/jdbc-data-container-config.xml
===================================================================
--- epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/modules/Advanced/JCR/jdbc-data-container-config.xml 2011-03-10 15:46:21 UTC (rev 6004)
+++ epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/modules/Advanced/JCR/jdbc-data-container-config.xml 2011-03-11 05:43:02 UTC (rev 6005)
@@ -223,7 +223,7 @@
A more detailed configuration of the database is possible through editing the metadata SQL-script files.
</para>
<para>
- If the non-ANSI node name is used, a database with MultiLanguage support is required (refer to <xref linkend="sect-Reference_Guide-Multilanguage_support_in_eXo_JCR_RDB_backend" /> for more information).
+ If the non-ANSI node name is used, a database with Multilingual support is required (refer to <xref linkend="sect-Reference_Guide-Multilanguage_support_in_eXo_JCR_RDB_backend" /> for more information).
</para>
<para>
Some JDBC drivers need additional parameters for establishing a Unicode friendly connection.
@@ -487,7 +487,7 @@
</listitem>
</itemizedlist>
<para>
- The dialect can also be set to "auto" to allow dialect autodetection.
+ The dialect can also be set to "auto" to allow dialect auto-detection.
</para>
</listitem>
</varlistentry>
@@ -561,7 +561,7 @@
<container class="org.exoplatform.services.jcr.impl.storage.jdbc.JDBCWorkspaceDataContainer">
...
</workspace>
-</worksapces></programlisting>
+</workspaces></programlisting>
<para>
Simple queries are implemented in such a way so as to support as many database dialects as possible. They do not use sub queries, or left or right joins.
</para>
@@ -574,7 +574,7 @@
<container class="org.exoplatform.services.jcr.impl.storage.jdbc.optimisation.CQJDBCWorkspaceDataContainer">
...
</workspace>
-</worksapces></programlisting>
+</workspaces></programlisting>
<para>
Complex queries are optimized to reduce the number of requests made to a database.
</para>
Modified: epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/modules/Advanced/JCR/lock-manager-config.xml
===================================================================
--- epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/modules/Advanced/JCR/lock-manager-config.xml 2011-03-10 15:46:21 UTC (rev 6004)
+++ epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/modules/Advanced/JCR/lock-manager-config.xml 2011-03-11 05:43:02 UTC (rev 6005)
@@ -39,7 +39,7 @@
The LockManager in &PRODUCT; is implemented with <classname>org.exoplatform.services.jcr.impl.core.lock.jbosscache.CacheableLockManagerImpl</classname>.
</para>
<para>
- It is is enabled by adding <literal>lock-manager-configuration</literal> to <literal>workspace-configuration</literal>.
+ It is enabled by adding <literal>lock-manager-configuration</literal> to <literal>workspace-configuration</literal>.
</para>
<para>
For example:
Modified: epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/modules/Advanced/JCR/multilanguage-support.xml
===================================================================
--- epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/modules/Advanced/JCR/multilanguage-support.xml 2011-03-10 15:46:21 UTC (rev 6004)
+++ epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/modules/Advanced/JCR/multilanguage-support.xml 2011-03-11 05:43:02 UTC (rev 6005)
@@ -4,10 +4,10 @@
%BOOK_ENTITIES;
]>
<section id="sect-Reference_Guide-Multilanguage_support_in_eXo_JCR_RDB_backend">
- <title>Multilanguage support in eXo JCR RDB backend</title>
+ <title>Multi-language support in eXo JCR RDB back end</title>
<para>
Whenever a relational database is used to store multilingual text data in the eXo Java Content Repository the configuration must be adapted to support UTF-8 encoding.
- Dialect is automatically detected for certified database. You can still enforce it in case fof failure, see below.
+ Dialect is automatically detected for certified database. You can still enforce it in case of failure, see below.
</para>
<para>
The following sections describe enabling UTF-8 support with various databases.
@@ -51,7 +51,7 @@
<section id="sect-Reference_Guide-Multilanguage_support_in_eXo_JCR_RDB_backend-Oracle">
<title>Oracle</title>
<para>
- In order to run a multi-language instance of JCR on an Oracle backend, Unicode encoding should be applied to the database.
+ In order to run a multi-language instance of JCR on an Oracle back end, Unicode encoding should be applied to the database.
</para>
<para>
To create a database with Unicode encoding using Oracle dialect for the Workspace Container, implement the following settings:
@@ -89,7 +89,7 @@
<section id="sect-Reference_Guide-Multilanguage_support_in_eXo_JCR_RDB_backend-MySQL">
<title>MySQL</title>
<para>
- Using JCR with a MySQL-backend requires a special dialect <ulink url="http://jira.exoplatform.org/browse/JCR-375">MySQL-UTF8</ulink> to be used for internationalization support.
+ Using JCR with a MySQL-back end requires a special dialect <ulink url="http://jira.exoplatform.org/browse/JCR-375">MySQL-UTF8</ulink> to be used for internationalization support.
</para>
<para>
The database default charset should be <parameter>latin1</parameter> so as to use limited index space effectively (1000 bytes for an <literal>MyISAM</literal> engine and 767 for <literal>InnoDB</literal>).
@@ -98,7 +98,7 @@
If the database default charset is multibyte, a JCR database initialization error is encountered concerning index creation failure.
</para>
<para>
- JCR can work on any singlebyte default charset of database, with UTF8 supported by MySQL server. However it has only been tested using the <parameter>latin1</parameter> charset.
+ JCR can work on any single byte default charset of database, with UTF8 supported by MySQL server. However it has only been tested using the <parameter>latin1</parameter> charset.
</para>
<para>
An example entry:
@@ -111,7 +111,7 @@
<section id="sect-Reference_Guide-Multilanguage_support_in_eXo_JCR_RDB_backend-PostgreSQL">
<title>PostgreSQL</title>
<para>
- Multilingual support can be enabled with a PostgreSQL-backend in <ulink url="http://www.postgresql.org/docs/8.3/interactive/charset.html">different ways</ulink>:
+ Multilingual support can be enabled with a PostgreSQL-back end in <ulink url="http://www.postgresql.org/docs/8.3/interactive/charset.html">different ways</ulink>:
</para>
<orderedlist>
<listitem>
Modified: epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/modules/Advanced/JCR/query-handler-config.xml
===================================================================
--- epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/modules/Advanced/JCR/query-handler-config.xml 2011-03-10 15:46:21 UTC (rev 6004)
+++ epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/modules/Advanced/JCR/query-handler-config.xml 2011-03-11 05:43:02 UTC (rev 6005)
@@ -102,7 +102,7 @@
</callout>
<callout arearefs="area-Reference_Guide-QueryHandler_configuration-Configuration-jgroups-multiplexer-stack">
<para>
- When the <parameter>jgroups-multiplexer-stack</parameter> property is set to <emphasis>true</emphasis> (and appropriate <parameter>jgroups-configuration</parameter> paramters are set) then Multiplexing stack is enabled in JBoss Cache.
+ When the <parameter>jgroups-multiplexer-stack</parameter> property is set to <emphasis>true</emphasis> (and appropriate <parameter>jgroups-configuration</parameter> parameters are set) then Multiplexing stack is enabled in JBoss Cache.
</para>
</callout>
<callout arearefs="area-Reference_Guide-QueryHandler_configuration-Configuration-jbosscache-cluster-name">
Modified: epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/modules/Advanced/JCR/search-configuration.xml
===================================================================
--- epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/modules/Advanced/JCR/search-configuration.xml 2011-03-10 15:46:21 UTC (rev 6004)
+++ epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/modules/Advanced/JCR/search-configuration.xml 2011-03-11 05:43:02 UTC (rev 6005)
@@ -183,7 +183,7 @@
</entry>
<entry>
<para>
- The number of words that are fulltext indexed at most per property.
+ The number of words that are full-text indexed at most per property.
</para>
</entry>
<entry>
@@ -203,7 +203,7 @@
</entry>
<entry>
<para>
- Size of the document number cache. This cache maps uuids to lucene document numbers
+ Size of the document number cache. This cache maps UUID to lucene document numbers
</para>
</entry>
<entry>
@@ -223,7 +223,7 @@
</entry>
<entry>
<para>
- Runs a consistency check on every startup. If false, a consistency check is only performed when the search index detects a prior forced shutdown.
+ Runs a consistency check on every start up. If false, a consistency check is only performed when the search index detects a prior forced shutdown.
</para>
</entry>
<entry>
@@ -448,7 +448,7 @@
</entry>
<entry>
<para>
- If set to true a consistency check is performed depending on the parameter <literal>forceConsistencyCheck</literal>. If set to false no consistency check is performed on startup, even if a redo log had been applied.
+ If set to true a consistency check is performed depending on the parameter <literal>forceConsistencyCheck</literal>. If set to false no consistency check is performed on start up, even if a redo log had been applied.
</para>
</entry>
<entry>
@@ -528,7 +528,7 @@
On subsequent starts this option is no longer needed. The old index is replaced and a back conversion is not possible
</para>
<para>
- It is reccommended that a backup of the index be made before conversion. (Only for migrations from JCR 1.9 and later.)
+ It is recommended that a backup of the index be made before conversion. (Only for migrations from JCR 1.9 and later.)
</para>
</entry>
<entry>
@@ -548,7 +548,7 @@
</entry>
<entry>
<para>
- Class name of a lucene analyzer to use for fulltext indexing of text.
+ Class name of a lucene analyzer to use for full-text indexing of text.
</para>
</entry>
<entry>
@@ -756,7 +756,7 @@
<formalpara id="form-Reference_Guide-IndexingConfiguration-Exclusion_from_the_Node_Scope_Index">
<title>Exclusion from the Node Scope Index</title>
<para>
- All configured properties are fulltext indexed by default (if they are of type STRING and included in the node scope index).
+ All configured properties are full-text indexed by default (if they are of type STRING and included in the node scope index).
</para>
</formalpara>
<para>
@@ -788,7 +788,7 @@
<programlisting language="XML" role="XML"><xi:include href="../../../extras/Advanced_Development_JCR_search-configuration/default79.xml" parse="text" xmlns:xi="http://www.w3.org/2001/XInclude" /></programlisting>
<para>
- The <emphasis role="bold">*</emphasis> wildcard can be used to match all child nodes:
+ The <emphasis role="bold">*</emphasis> wild-card can be used to match all child nodes:
</para>
<programlisting language="XML" role="XML"><xi:include href="../../../extras/Advanced_Development_JCR_search-configuration/default80.xml" parse="text" xmlns:xi="http://www.w3.org/2001/XInclude" /></programlisting>
Modified: epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/modules/Advanced/JCR/statistics.xml
===================================================================
--- epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/modules/Advanced/JCR/statistics.xml 2011-03-10 15:46:21 UTC (rev 6004)
+++ epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/modules/Advanced/JCR/statistics.xml 2011-03-11 05:43:02 UTC (rev 6005)
@@ -44,7 +44,7 @@
</listitem>
</itemizedlist>
<para>
- Those figures are also available globaly for all the methods which gives us the global behavior of this layer.
+ Those figures are also available globally for all the methods which gives us the global behavior of this layer.
</para>
<para>
To enable the statistics, the JVM parameter called <emphasis>JDBCWorkspaceDataContainer.statistics.enabled</emphasis> must be set to <emphasis>true</emphasis>. The corresponding CSV file is <filename>StatisticsJDBCStorageConnection-${creation-timestamp}.csv</filename>.
Modified: epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/modules/AuthenticationAndIdentity/BackendConfiguration.xml
===================================================================
--- epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/modules/AuthenticationAndIdentity/BackendConfiguration.xml 2011-03-10 15:46:21 UTC (rev 6004)
+++ epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/modules/AuthenticationAndIdentity/BackendConfiguration.xml 2011-03-11 05:43:02 UTC (rev 6005)
@@ -128,7 +128,7 @@
</callout>
<callout arearefs="area-Reference_Guide-PicketLink_IDM_integration-Configuration_files-JBossIDMOrganizationServiceImpl">
<para>
- The <emphasis role="bold">org.exoplatform.services.organization.idm.PicketLinkIDMOrganizationServiceImpl</emphasis> key is a main entrypoint implementing <emphasis role="bold">org.exoplatform.services.organization.OrganizationService</emphasis> and is dependant on <emphasis role="bold">org.exoplatform.services.organization.idm.PicketLinkIDMService</emphasis>
+ The <emphasis role="bold">org.exoplatform.services.organization.idm.PicketLinkIDMOrganizationServiceImpl</emphasis> key is a main entrypoint implementing <emphasis role="bold">org.exoplatform.services.organization.OrganizationService</emphasis> and is dependent on <emphasis role="bold">org.exoplatform.services.organization.idm.PicketLinkIDMService</emphasis>
</para>
<para>
The <emphasis role="bold">org.exoplatform.services.organization.idm.PicketLinkIDMOrganizationServiceImpl</emphasis> service has the following options defined as fields of <parameter>object-param</parameter> of type <emphasis role="bold">org.exoplatform.services.organization.idm.Config</emphasis>:
Modified: epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/modules/AuthenticationAndIdentity/OrganizationAPI.xml
===================================================================
--- epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/modules/AuthenticationAndIdentity/OrganizationAPI.xml 2011-03-10 15:46:21 UTC (rev 6004)
+++ epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/modules/AuthenticationAndIdentity/OrganizationAPI.xml 2011-03-11 05:43:02 UTC (rev 6005)
@@ -100,7 +100,7 @@
The five central API components are designed to be similar to persistent entities and handlers are specified similarly to data access objects (DAO).
</para>
<para>
- <emphasis>Organization API</emphasis> simply describes a contract, meaning it is not a concrete implementation. The described components are interfaces, allowing for different concrete implementations. In practial terms the existing implementation can be replaced with a different one.
+ <emphasis>Organization API</emphasis> simply describes a contract, meaning it is not a concrete implementation. The described components are interfaces, allowing for different concrete implementations. In practical terms the existing implementation can be replaced with a different one.
</para>
</section>
Modified: epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/modules/AuthenticationAndIdentity/PredefinedUserConfiguration.xml
===================================================================
--- epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/modules/AuthenticationAndIdentity/PredefinedUserConfiguration.xml 2011-03-10 15:46:21 UTC (rev 6004)
+++ epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/modules/AuthenticationAndIdentity/PredefinedUserConfiguration.xml 2011-03-11 05:43:02 UTC (rev 6005)
@@ -9,7 +9,7 @@
<section id="sect-Reference_Guide-Predefined_User_Configuration-Overview">
<title>Overview</title>
<para>
- The initial Organization configuration should be specified by editing the content of <filename><replaceable>JBOSS_HOME</replaceable>/server/<replaceable><PROFILE></replaceable>/deploy/gatein.ear/02portal.war:/WEB-INF/conf/organization/organization-configuration.xml</filename>. This file uses the portal XML configuration schema. It lists several configuration plugins.
+ The initial Organization configuration should be specified by editing the content of <filename><replaceable>JBOSS_HOME</replaceable>/server/<replaceable><PROFILE></replaceable>/deploy/gatein.ear/02portal.war:/WEB-INF/conf/organization/organization-configuration.xml</filename>. This file uses the portal XML configuration schema. It lists several configuration plug-ins.
</para>
</section>
Modified: epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/modules/AuthenticationAndIdentity/SSO.xml
===================================================================
--- epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/modules/AuthenticationAndIdentity/SSO.xml 2011-03-10 15:46:21 UTC (rev 6004)
+++ epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/modules/AuthenticationAndIdentity/SSO.xml 2011-03-11 05:43:02 UTC (rev 6005)
@@ -17,7 +17,7 @@
There are many different Identity Management solutions available. In most cases each SSO framework provides a unique way to plug into a Java EE application.
</para>
<para>
- This section will cover the implemenation of four different SSO plugins with &PRODUCT;:
+ This section will cover the implementation of four different SSO plug-ins with &PRODUCT;:
</para>
<itemizedlist>
<listitem>
@@ -549,7 +549,7 @@
</step>
<step>
<para>
- Login as <literal>amadmin</literal>.
+ Login as <literal>admin</literal>.
</para>
<important>
<para>
Modified: epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/modules/Configuration/DatabaseConfiguration.xml
===================================================================
--- epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/modules/Configuration/DatabaseConfiguration.xml 2011-03-10 15:46:21 UTC (rev 6004)
+++ epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/modules/Configuration/DatabaseConfiguration.xml 2011-03-11 05:43:02 UTC (rev 6005)
@@ -50,7 +50,7 @@
Note that some databases don't accept '-' in the database name, so you may have to remove <filename><replaceable>JBOSS_AS</replaceable>/server/<replaceable>PROFILE</replaceable>/deploy/gatein-sample-portal.ear</filename>)
</para>
<para>
- Make sure the user has rights to create tables on jdbcjcr_portal, and to update them as they will be automatically created during the first startup .
+ Make sure the user has rights to create tables on jdbcjcr_portal, and to update them as they will be automatically created during the first start up .
</para>
<para>
Also add your database's JDBC driver into the classpath - you can put it in <replaceable>JBOSS_AS</replaceable>/server/<replaceable>PROFILE</replaceable>/lib (or <replaceable>TOMCAT_HOME</replaceable>/lib, if you are running on Tomcat)
Modified: epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/modules/Configuration/EMailServiceConfiguration.xml
===================================================================
--- epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/modules/Configuration/EMailServiceConfiguration.xml 2011-03-10 15:46:21 UTC (rev 6004)
+++ epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/modules/Configuration/EMailServiceConfiguration.xml 2011-03-11 05:43:02 UTC (rev 6005)
@@ -33,7 +33,7 @@
gatein.email.smtp.socketFactory.class=javax.net.ssl.SSLSocketFactory
</programlisting>
<para>
- It is preconfigured for GMail, so that any GMail account can easily be used (simply use the full GMail address as username, and fill-in the password.
+ It is pre-configured for GMail, so that any GMail account can easily be used (simply use the full GMail address as username, and fill-in the password.
</para>
<para>
In corporate environments you will want to use your corporate SMTP gateway. When using it over SSL, like in default configuration, you may need to configure a certificate truststore, containing your SMTP server's public certificate. Depending on the key sizes, you may then also need to install Java Cryptography Extension (JCE) Unlimited Strength Jurisdiction Policy Files for your Java Runtime Environment.
Modified: epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/modules/Introduction.xml
===================================================================
--- epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/modules/Introduction.xml 2011-03-10 15:46:21 UTC (rev 6004)
+++ epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/modules/Introduction.xml 2011-03-11 05:43:02 UTC (rev 6005)
@@ -23,7 +23,7 @@
<title>Related Links</title>
<variablelist>
<varlistentry>
- <term>Tecnical documentation</term>
+ <term>Technical documentation</term>
<listitem>
<para>
Other technical documentation, including an <emphasis role="bold">Installation Guide</emphasis>, and a <emphasis role="bold">User Guide</emphasis> can be found at <ulink type="http" url="http://www.redhat.com/docs/en-US/JBoss_Enterprise_Portal_Platform">www.redhat.com/docs</ulink>
Modified: epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/modules/PortalDevelopment/JavascriptConfiguration.xml
===================================================================
--- epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/modules/PortalDevelopment/JavascriptConfiguration.xml 2011-03-10 15:46:21 UTC (rev 6004)
+++ epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/modules/PortalDevelopment/JavascriptConfiguration.xml 2011-03-11 05:43:02 UTC (rev 6005)
@@ -12,7 +12,7 @@
Managing Javascript scripts in an application like &PRODUCT; is a critical part of the configuration work. Configuring the scripts correctly will result in a faster response time from the portal.
</para>
<para>
- Every portlet can have its own javscript code but in many cases it is more convenient to reuse some existing shared libraries. For that reason, &PRODUCT; has a mechanism to easily register the libraries that will be loaded when the first page is rendered.
+ Every portlet can have its own javascript code but in many cases it is more convenient to reuse some existing shared libraries. For that reason, &PRODUCT; has a mechanism to easily register the libraries that will be loaded when the first page is rendered.
</para>
<para>
To do so, every WAR deployed in &PRODUCT; can register the <filename>.js</filename> files with the groovy script <filename>WEB-INF/conf/script/groovy/JavascriptScript.groovy</filename>.
@@ -45,7 +45,7 @@
To see or use the merged file set this property to <literal>false</literal>.
</para>
<para>
- The property can be passed as a JVM parameter with the <literal>-D</literal> option in your <literal>run.sh</literal> or <literal>run.bat</literal> startup script.
+ The property can be passed as a JVM parameter with the <literal>-D</literal> option in your <literal>run.sh</literal> or <literal>run.bat</literal> start-up script.
</para>
<para>
Every javascript file is associated with a module name which acts as a namespace. The module name is passed as a first parameter to <literal>JavascriptService.addJavascript()</literal> function as in the following example:
Modified: epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/modules/PortalDevelopment/LocalizationConfiguration.xml
===================================================================
--- epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/modules/PortalDevelopment/LocalizationConfiguration.xml 2011-03-10 15:46:21 UTC (rev 6004)
+++ epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/modules/PortalDevelopment/LocalizationConfiguration.xml 2011-03-11 05:43:02 UTC (rev 6005)
@@ -71,8 +71,8 @@
<title>Default <literal>LocalePolicy</literal></title>
<para>
By default, <literal>org.exoplatform.portal.application.localization.DefaultLocalePolicyService</literal>, an implementation
- of <literal>LocalePolicy</literal>, is installed to provide the default behaviour.
- This, however, can easily be extended and overriden. A completely new implementation can also be written from scratch.
+ of <literal>LocalePolicy</literal>, is installed to provide the default behavior.
+ This, however, can easily be extended and overridden. A completely new implementation can also be written from scratch.
</para>
<para>
<literal>DefaultLocalePolicyService</literal> treats logged-in users slightly differently than anonymous users.
Modified: epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/modules/PortalDevelopment/Skinning.xml
===================================================================
--- epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/modules/PortalDevelopment/Skinning.xml 2011-03-10 15:46:21 UTC (rev 6004)
+++ epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/modules/PortalDevelopment/Skinning.xml 2011-03-11 05:43:02 UTC (rev 6005)
@@ -31,7 +31,7 @@
<term>Window Styles</term>
<listitem>
<para>
- The CSS styles associated with the porlet window decorators. The window decorators contain the control buttons and borders surrounding each portlet. Individual portlets can have their own window decorator selected or be rendered without one.
+ The CSS styles associated with the portlet window decorators. The window decorators contain the control buttons and borders surrounding each portlet. Individual portlets can have their own window decorator selected or be rendered without one.
</para>
</listitem>
</varlistentry>
Modified: epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/modules/PortletDevelopment/PortletBridge/gettingstarted.xml
===================================================================
--- epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/modules/PortletDevelopment/PortletBridge/gettingstarted.xml 2011-03-10 15:46:21 UTC (rev 6004)
+++ epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/modules/PortletDevelopment/PortletBridge/gettingstarted.xml 2011-03-11 05:43:02 UTC (rev 6005)
@@ -36,7 +36,7 @@
If the request is for a non-JSF resource, the bridge handles the request by acquiring a request dispatcher and forwarding the request to the named resource.
</para>
<para>
- If the request is for a JSF resource, the bridge runs the full JSF lifecycle ensuring that data is processed and the resource (markup) is rendered.
+ If the request is for a JSF resource, the bridge runs the full JSF life-cycle ensuring that data is processed and the resource (markup) is rendered.
</para>
<para>
See <xref linkend="sect-Reference_Guide-Portlet_2.0_Coordination-Serving_Your_JSF_Resources_in_a_Portlet" /> for details and examples.
Modified: epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/modules/PortletDevelopment/PortletBridge/overview.xml
===================================================================
--- epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/modules/PortletDevelopment/PortletBridge/overview.xml 2011-03-10 15:46:21 UTC (rev 6004)
+++ epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/modules/PortletDevelopment/PortletBridge/overview.xml 2011-03-11 05:43:02 UTC (rev 6005)
@@ -33,7 +33,7 @@
Part of this implementation acts as a <literal>Faces</literal> controller much as the FacesServlet does in the direct client request environment.
</para>
<para>
- The other part of this implementation is provided by implementating a variety of (standard) <literal>Faces</literal> extensions.
+ The other part of this implementation is provided by implementing a variety of (standard) <literal>Faces</literal> extensions.
</para>
<important>
<title>Disclaimer</title>
Modified: epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/modules/PortletDevelopment/PortletBridge/portlet_development.xml
===================================================================
--- epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/modules/PortletDevelopment/PortletBridge/portlet_development.xml 2011-03-10 15:46:21 UTC (rev 6004)
+++ epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/modules/PortletDevelopment/PortletBridge/portlet_development.xml 2011-03-11 05:43:02 UTC (rev 6005)
@@ -14,7 +14,7 @@
When your application uses request attributes on a per request basis and you do not want that particular attribute to be managed in the extended bridge request scope, you must use the following configuration in your <filename>faces-config.xml</filename>.
</para>
<para>
- In the code sample below you can see that any attribute namespaced as <literal>foo.bar</literal> or any attribute beginning with <literal>foo.baz(wildcard)</literal> will be excluded from the bridge request scope and only be used per that application's request.
+ In the code sample below you can see that any attribute namespaced as <literal>foo.bar</literal> or any attribute beginning with <literal>foo.baz(wild-card)</literal> will be excluded from the bridge request scope and only be used per that application's request.
</para>
<programlisting language="XML" role="XML"><xi:include href="../../../extras/PortletBridge_Portlet_Development/default223.xml" parse="text" xmlns:xi="http://www.w3.org/2001/XInclude" /></programlisting>
@@ -57,7 +57,7 @@
<section id="sect-Reference_Guide-Navigating_to_a_modes_last_viewId-Note_to_Portlet_Developers">
<title>Note to Portlet Developers</title>
<para>
- Depending on the bridge implementation, when using values from these session scoped attributes or any viewIds which may contain query string parameters it may be necessary to use the wildcard syntax when identifying the rule target. In the above, for example, the
+ Depending on the bridge implementation, when using values from these session scoped attributes or any viewIds which may contain query string parameters it may be necessary to use the wild-card syntax when identifying the rule target. In the above, for example, the
</para>
<programlisting language="XML" role="XML"><to-view-id>
@@ -69,20 +69,20 @@
<programlisting language="XML" role="XML">/viewId?javax.portlet.faces.PortletMode=view&....
</programlisting>
<para>
- Without wildcarding, when a subsequent navigation occurs from this new view, the navigation rules wouldn't resolve because there wouldn't be an exact match. Likewise, the above <literal>edit.jspx</literal>
+ Without wild-carding, when a subsequent navigation occurs from this new view, the navigation rules wouldn't resolve because there wouldn't be an exact match. Likewise, the above <literal>edit.jspx</literal>
</para>
<programlisting language="XML" role="XML"><from-view-id>
</programlisting>
<para>
- is wildcarded because there are navigation rules that target it that use a query string:
+ is wild-carded because there are navigation rules that target it that use a query string:
</para>
<programlisting language="XML" role="XML">
<to-view-id> /edit.jspx?javax.portlet.faces.PortletMode=edit </to-view-id>
</programlisting>
<para>
- Developers are encouraged to use such wildcarding to ensure they execute properly in the broadest set of bridge implementations.
+ Developers are encouraged to use such wild-carding to ensure they execute properly in the broadest set of bridge implementations.
</para>
</section>
Modified: epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/modules/PortletDevelopment/Standard.xml
===================================================================
--- epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/modules/PortletDevelopment/Standard.xml 2011-03-10 15:46:21 UTC (rev 6004)
+++ epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/modules/PortletDevelopment/Standard.xml 2011-03-11 05:43:02 UTC (rev 6005)
@@ -284,7 +284,7 @@
<section id="sect-Reference_Guide-Deploying_your_first_Portlet-Application_Descriptors">
<title>Application Descriptors</title>
<para>
- &PRODUCT; requires certain descriptors to be included in a portlet <literal>WAR</literal> file. These descriptors are defined by the Jave EE (<filename>web.xml</filename>) and Portlet Specification (<filename>portlet.xml</filename>).
+ &PRODUCT; requires certain descriptors to be included in a portlet <literal>WAR</literal> file. These descriptors are defined by the Java EE (<filename>web.xml</filename>) and Portlet Specification (<filename>portlet.xml</filename>).
</para>
<para>
Below is an example of the <filename>SimplestHelloWorldPortlet/WEB-INF/portlet.xml</filename> file. This file must adhere to its definition in the JSR-286 Portlet Specification. More than one portlet application may be defined in this file:
Modified: epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/modules/WSRP.xml
===================================================================
--- epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/modules/WSRP.xml 2011-03-10 15:46:21 UTC (rev 6004)
+++ epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/modules/WSRP.xml 2011-03-11 05:43:02 UTC (rev 6005)
@@ -47,7 +47,7 @@
&PRODUCT; provides a <emphasis>Medium</emphasis> level of support for the Consumer, excepting HTML markup (as &PRODUCT; itself does not handle other markup types). Explicit portlet cloning and the <literal>PortletManagement</literal> interface are supported.
</para>
<para>
- The WSRP component has Level 1 Producer and Consumer caching. Cookie handling is supported properly on the Consumer. The Producer requires cookie initialization (as this improves interoperabilty with some consumers).
+ The WSRP component has Level 1 Producer and Consumer caching. Cookie handling is supported properly on the Consumer. The Producer requires cookie initialization (as this improves interoperability with some consumers).
</para>
<para>
&PRODUCT; does not support custom window states or modes, therefore neither does the WSRP component. It does, however, support CSS on both the Producer (although this is more a function of the portlets than an inherent Producer capability) and Consumer.
@@ -527,7 +527,7 @@
<section id="sect-Reference_Guide-Configuring_a_Remote_Producer-Adding_remote_portlets_to_categories">
<title>Adding remote portlets to categories</title>
<para>
- Clicking on the Portlet link in the Application Registry will now show the remote potlets in the <emphasis role="bold">REMOTE</emphasis> tab in the left column:
+ Clicking on the Portlet link in the Application Registry will now show the remote portlets in the <emphasis role="bold">REMOTE</emphasis> tab in the left column:
</para>
<mediaobject>
<imageobject role="html">
@@ -740,7 +740,7 @@
</step>
<step>
<para>
- Click on <emphasis role="bold">Modify registration</emphasis> and, if the updated registration details have been been accepted by the remote producer the following should appear:
+ Click on <emphasis role="bold">Modify registration</emphasis> and, if the updated registration details have been accepted by the remote producer the following should appear:
</para>
<mediaobject>
<imageobject role="html">
@@ -867,7 +867,7 @@
<term>Register/De-register</term>
<listitem>
<para>
- Registers or deregisters a consumer based on whether registration is required and/or acquired.
+ Registers or de-registers a consumer based on whether registration is required and/or acquired.
</para>
</listitem>
</varlistentry>
@@ -1305,7 +1305,7 @@
Note that the our validation algorithm is only relaxed on aspects of the specification that are deemed harmless such as invalid language codes.
</para>
<para>
- By default, the WSRP producer is configured in strict mode. If you experience issues with a given consumer, you may attempt to relax the validation mode. Unchecking the "Use strict WSRP compliance" checkbox on the Producer configuration screen to do this.
+ By default, the WSRP producer is configured in strict mode. If you experience issues with a given consumer, you may attempt to relax the validation mode. Un-checking the "Use strict WSRP compliance" checkbox on the Producer configuration screen to do this.
</para>
</section>
13 years, 9 months
- 1
- 0
gatein SVN: r6004 - in epp/portal/branches/EPP_5_1_Branch: webui/portal/src/main/java/org/exoplatform/portal/application and 1 other directory.
by do-not-reply＠jboss.org
Author: thomas.heute(a)jboss.com
Date: 2011-03-10 10:46:21 -0500 (Thu, 10 Mar 2011)
New Revision: 6004
Modified:
epp/portal/branches/EPP_5_1_Branch/
epp/portal/branches/EPP_5_1_Branch/webui/portal/src/main/java/org/exoplatform/portal/application/PortalRequestContext.java
Log:
JBEPP-794: The header will be duplicated if contains a portlet adding more one resource to header
Property changes on: epp/portal/branches/EPP_5_1_Branch
___________________________________________________________________
Modified: svn:mergeinfo
- /portal/branches/branch-GTNPORTAL-1731:5668
+ /epp/portal/branches/EPP_5_1_0_GA_JBEPP-795:5868
/portal/branches/branch-GTNPORTAL-1731:5668
Modified: epp/portal/branches/EPP_5_1_Branch/webui/portal/src/main/java/org/exoplatform/portal/application/PortalRequestContext.java
===================================================================
--- epp/portal/branches/EPP_5_1_Branch/webui/portal/src/main/java/org/exoplatform/portal/application/PortalRequestContext.java 2011-03-10 14:51:31 UTC (rev 6003)
+++ epp/portal/branches/EPP_5_1_Branch/webui/portal/src/main/java/org/exoplatform/portal/application/PortalRequestContext.java 2011-03-10 15:46:21 UTC (rev 6004)
@@ -429,9 +429,9 @@
List<String> markupHeaders = new ArrayList<String>();
if (extraMarkupHeaders != null && !extraMarkupHeaders.isEmpty())
{
- StringWriter sw = new StringWriter();
for (Element element : extraMarkupHeaders)
{
+ StringWriter sw = new StringWriter();
DOMSerializer.serialize(element, sw);
markupHeaders.add(sw.toString());
}
13 years, 9 months
- 1
- 0
gatein SVN: r6003 - in epp/portal/branches/EPP_5_1_Branch: webui/portal/src/main/java/org/exoplatform/portal/webui/navigation and 1 other directory.
by do-not-reply＠jboss.org
Author: thomas.heute(a)jboss.com
Date: 2011-03-10 09:51:31 -0500 (Thu, 10 Mar 2011)
New Revision: 6003
Modified:
epp/portal/branches/EPP_5_1_Branch/
epp/portal/branches/EPP_5_1_Branch/webui/portal/src/main/java/org/exoplatform/portal/webui/navigation/UIPageNavigationForm.java
Log:
JBEPP-848: Changing ordering of group navigation isn't reflected immediately
Property changes on: epp/portal/branches/EPP_5_1_Branch
___________________________________________________________________
Added: svn:mergeinfo
+ /portal/branches/branch-GTNPORTAL-1731:5668
Modified: epp/portal/branches/EPP_5_1_Branch/webui/portal/src/main/java/org/exoplatform/portal/webui/navigation/UIPageNavigationForm.java
===================================================================
--- epp/portal/branches/EPP_5_1_Branch/webui/portal/src/main/java/org/exoplatform/portal/webui/navigation/UIPageNavigationForm.java 2011-03-10 08:53:39 UTC (rev 6002)
+++ epp/portal/branches/EPP_5_1_Branch/webui/portal/src/main/java/org/exoplatform/portal/webui/navigation/UIPageNavigationForm.java 2011-03-10 14:51:31 UTC (rev 6003)
@@ -42,6 +42,8 @@
import org.exoplatform.webui.form.UIFormStringInput;
import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
import java.util.List;
/*
@@ -158,60 +160,48 @@
}
WebuiRequestContext pcontext = event.getRequestContext();
-
- // if edit navigation
- if (pageNav != null)
- {
- uiForm.invokeSetBindingBean(pageNav);
- UIFormSelectBox uiSelectBox = uiForm.findComponentById("priority");
- int priority = Integer.parseInt(uiSelectBox.getValue());
- pageNav.setPriority(priority);
-
- // update navigation
- dataService.save(pageNav);
-
- UIPopupWindow uiPopup = uiForm.getParent();
- uiPopup.setShow(false);
- UIComponent opener = uiPopup.getParent();
- pcontext.addUIComponentToUpdateByAjax(opener);
- return;
- }
-
- // if add navigation
- pageNav = new PageNavigation();
- // set properties for navigation
uiForm.invokeSetBindingBean(pageNav);
- UIFormStringInput uiOwnerId = uiForm.findComponentById("ownerId");
- UIFormStringInput uiOwnerType = uiForm.findComponentById("ownerType");
UIFormSelectBox uiSelectBox = uiForm.findComponentById("priority");
int priority = Integer.parseInt(uiSelectBox.getValue());
pageNav.setPriority(priority);
- pageNav.setModifiable(true);
- pageNav.setOwnerId(uiOwnerId.getValue());
- pageNav.setOwnerType(uiOwnerType.getValue());
- //UIPortalApplication uiPortalApp = uiForm.getAncestorOfType(UIPortalApplication.class);
- UIPortalApplication uiPortalApp = Util.getUIPortal().getAncestorOfType(UIPortalApplication.class);
- // ensure this navigation is not exist
- if (dataService.getPageNavigation(pageNav.getOwnerType(), pageNav.getOwnerId()) != null)
- {
- uiPortalApp.addMessage(new ApplicationMessage("UIPageNavigationForm.msg.existPageNavigation",
- new String[]{pageNav.getOwnerId()}));;
- return;
- }
+ // update navigation
+ dataService.save(pageNav);
- // create navigation for group
- dataService.create(pageNav);
+ pageNav = dataService.getPageNavigation(pageNav.getOwnerType(), pageNav.getOwnerId());
- // close popup window, update popup window
+ UIPortalApplication uiPortalApp = Util.getUIPortalApplication();
+ updateNavPriority(uiPortalApp.getNavigations(), pageNav);
+
+ uiPortalApp.localizeNavigations();
+
UIPopupWindow uiPopup = uiForm.getParent();
uiPopup.setShow(false);
UIComponent opener = uiPopup.getParent();
+ UIWorkingWorkspace uiWorkingWS =
+ Util.getUIPortal().getAncestorOfType(UIPortalApplication.class).getChild(UIWorkingWorkspace.class);
+ uiWorkingWS.updatePortletsByName("UserToolbarGroupPortlet");
pcontext.addUIComponentToUpdateByAjax(opener);
+ }
+
+ private void updateNavPriority(List<PageNavigation> navs, PageNavigation nav)
+ {
+ for (int i = 0; i < navs.size(); i++)
+ {
+ if (navs.get(i).getId() == nav.getId())
+ {
+ navs.set(i, nav);
+ break;
+ }
+ }
- UIWorkingWorkspace uiWorkingWS = uiPortalApp.getChild(UIWorkingWorkspace.class);
- uiWorkingWS.updatePortletsByName("GroupNavigationPortlet");
-
+ Collections.sort(navs, new Comparator<PageNavigation>()
+ {
+ public int compare(PageNavigation nav1, PageNavigation nav2)
+ {
+ return nav1.getPriority() - nav2.getPriority();
+ }
+ });
}
}
13 years, 9 months
- 1
- 0
gatein SVN: r6002 - components/wci/trunk/test/servers/tomcat6.
by do-not-reply＠jboss.org
Author: thomas.heute(a)jboss.com
Date: 2011-03-10 03:53:39 -0500 (Thu, 10 Mar 2011)
New Revision: 6002
Removed:
components/wci/trunk/test/servers/tomcat6/.pom.xml.swp
Log:
I guess this wasn't intentional
Deleted: components/wci/trunk/test/servers/tomcat6/.pom.xml.swp
===================================================================
(Binary files differ)
13 years, 9 months
- 1
- 0
gatein SVN: r6001 - in components/common/trunk: common and 2 other directories.
by do-not-reply＠jboss.org
Author: thomas.heute(a)jboss.com
Date: 2011-03-10 03:37:04 -0500 (Thu, 10 Mar 2011)
New Revision: 6001
Modified:
components/common/trunk/common/pom.xml
components/common/trunk/logging/pom.xml
components/common/trunk/mc/pom.xml
components/common/trunk/pom.xml
Log:
[maven-release-plugin] prepare for next development iteration
Modified: components/common/trunk/common/pom.xml
===================================================================
--- components/common/trunk/common/pom.xml 2011-03-10 08:36:52 UTC (rev 6000)
+++ components/common/trunk/common/pom.xml 2011-03-10 08:37:04 UTC (rev 6001)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.common</groupId>
<artifactId>common-parent</artifactId>
- <version>2.0.4-Beta01</version>
+ <version>2.0.4-Beta02-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>common-common</artifactId>
@@ -14,7 +14,7 @@
<dependency>
<groupId>org.gatein.common</groupId>
<artifactId>common-logging</artifactId>
- <version>2.0.4-Beta01</version>
+ <version>2.0.4-Beta02-SNAPSHOT</version>
</dependency>
<dependency>
Modified: components/common/trunk/logging/pom.xml
===================================================================
--- components/common/trunk/logging/pom.xml 2011-03-10 08:36:52 UTC (rev 6000)
+++ components/common/trunk/logging/pom.xml 2011-03-10 08:37:04 UTC (rev 6001)
@@ -21,7 +21,7 @@
<parent>
<groupId>org.gatein.common</groupId>
<artifactId>common-parent</artifactId>
- <version>2.0.4-Beta01</version>
+ <version>2.0.4-Beta02-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>common-logging</artifactId>
Modified: components/common/trunk/mc/pom.xml
===================================================================
--- components/common/trunk/mc/pom.xml 2011-03-10 08:36:52 UTC (rev 6000)
+++ components/common/trunk/mc/pom.xml 2011-03-10 08:37:04 UTC (rev 6001)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.common</groupId>
<artifactId>common-parent</artifactId>
- <version>2.0.4-Beta01</version>
+ <version>2.0.4-Beta02-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>common-mc</artifactId>
@@ -14,7 +14,7 @@
<dependency>
<groupId>org.gatein.common</groupId>
<artifactId>common-logging</artifactId>
- <version>2.0.4-Beta01</version>
+ <version>2.0.4-Beta02-SNAPSHOT</version>
</dependency>
<dependency>
Modified: components/common/trunk/pom.xml
===================================================================
--- components/common/trunk/pom.xml 2011-03-10 08:36:52 UTC (rev 6000)
+++ components/common/trunk/pom.xml 2011-03-10 08:37:04 UTC (rev 6001)
@@ -6,7 +6,7 @@
<groupId>org.gatein.common</groupId>
<artifactId>common-parent</artifactId>
- <version>2.0.4-Beta01</version>
+ <version>2.0.4-Beta02-SNAPSHOT</version>
<packaging>pom</packaging>
<parent>
@@ -16,9 +16,9 @@
</parent>
<scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/gatein/components/common/tags/2.0....</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/gatein/components/common/tags/2.0.4-B...</developerConnection>
- <url>http://fisheye.jboss.org/browse/gatein/components/common/tags/2.0.4-Beta01</url>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/gatein/components/common/trunk</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/gatein/components/common/trunk</developerConnection>
+ <url>http://fisheye.jboss.org/browse/gatein/components/common/trunk</url>
</scm>
<!-- Import dependency management configuration -->
13 years, 9 months
- 1
- 0