gatein SVN: r8458 - epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/WEB-INF/conf/organization/picketlink-idm/examples.
by do-not-reply＠jboss.org
Author: hfnukal
Date: 2012-02-24 11:08:19 -0500 (Fri, 24 Feb 2012)
New Revision: 8458
Modified:
epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/WEB-INF/conf/organization/picketlink-idm/examples/picketlink-idm-msad-config.xml
epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/WEB-INF/conf/organization/picketlink-idm/examples/picketlink-idm-msad-readonly-config.xml
Log:
Bug 793319 Remove IP addresses from picketlink msad example config files
Modified: epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/WEB-INF/conf/organization/picketlink-idm/examples/picketlink-idm-msad-config.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/WEB-INF/conf/organization/picketlink-idm/examples/picketlink-idm-msad-config.xml 2012-02-24 15:37:53 UTC (rev 8457)
+++ epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/WEB-INF/conf/organization/picketlink-idm/examples/picketlink-idm-msad-config.xml 2012-02-24 16:08:19 UTC (rev 8458)
@@ -343,19 +343,15 @@
<options>
<option>
<name>providerURL</name>
- <value>ldaps://192.168.0.12:636</value>
+ <value>[ldap|ldaps]://[msad-host]:[port]</value>
</option>
- <!--<option>-->
- <!--<name>providerURL</name>-->
- <!--<value>ldaps://msad-host:636</value>-->
- <!--</option>-->
<option>
<name>adminDN</name>
<value>TEST\Administrator</value>
</option>
<option>
<name>adminPassword</name>
- <value>!Q@W3e4r</value>
+ <value>[adminPasswordValue]</value>
</option>
<option>
<name>authenticationMethod</name>
@@ -363,7 +359,7 @@
</option>
<option>
<name>customSystemProperties</name>
- <value>javax.net.ssl.trustStore=/Users/bdaw/Workshop/msad.truststore</value>
+ <value>javax.net.ssl.trustStore=/path/to/msad.truststore</value>
<value>javax.net.ssl.trustStorePassword=password</value>
</option>
<option>
Modified: epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/WEB-INF/conf/organization/picketlink-idm/examples/picketlink-idm-msad-readonly-config.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/WEB-INF/conf/organization/picketlink-idm/examples/picketlink-idm-msad-readonly-config.xml 2012-02-24 15:37:53 UTC (rev 8457)
+++ epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/WEB-INF/conf/organization/picketlink-idm/examples/picketlink-idm-msad-readonly-config.xml 2012-02-24 16:08:19 UTC (rev 8458)
@@ -297,19 +297,15 @@
<options>
<option>
<name>providerURL</name>
- <value>ldap://192.168.0.12:389</value>
+ <value>[ldap|ldaps]://[msad-host]:[port]</value>
</option>
- <!--<option>-->
- <!--<name>providerURL</name>-->
- <!--<value>ldaps://msad-host:636</value>-->
- <!--</option>-->
<option>
<name>adminDN</name>
<value>TEST\Administrator</value>
</option>
<option>
<name>adminPassword</name>
- <value>!Q@W3e4r</value>
+ <value>[adminPasswordValue]</value>
</option>
<option>
<name>authenticationMethod</name>
@@ -317,7 +313,7 @@
</option>
<!--<option>-->
<!--<name>customSystemProperties</name>-->
- <!--<value>javax.net.ssl.trustStore=/home/root/msad.truststore</value>-->
+ <!--<value>javax.net.ssl.trustStore=/path/to/msad.truststore</value>-->
<!--<value>javax.net.ssl.trustStorePassword=password</value>-->
<!--</option>-->
<option>
12 years, 3 months
- 1
- 0
gatein SVN: r8457 - in sandbox/as7_support/branches/gatein-as7/exo.kernel.container: src/main/java/org/exoplatform/container and 11 other directories.
by do-not-reply＠jboss.org
Author: mstruk
Date: 2012-02-24 10:37:53 -0500 (Fri, 24 Feb 2012)
New Revision: 8457
Added:
sandbox/as7_support/branches/gatein-as7/exo.kernel.container/src/main/java/org/exoplatform/container/util/TemplateConfigurationHelper.java
sandbox/as7_support/branches/gatein-as7/exo.kernel.container/src/test/java/org/exoplatform/container/TestStandaloneContainer.java
sandbox/as7_support/branches/gatein-as7/exo.kernel.container/src/test/java/org/exoplatform/container/util/TestTemplateConfigurationHelper.java
sandbox/as7_support/branches/gatein-as7/exo.kernel.container/src/test/resources/tsm-excludes.properties
Modified:
sandbox/as7_support/branches/gatein-as7/exo.kernel.container/pom.xml
sandbox/as7_support/branches/gatein-as7/exo.kernel.container/src/main/java/org/exoplatform/container/ConcurrentPicoContainer.java
sandbox/as7_support/branches/gatein-as7/exo.kernel.container/src/main/java/org/exoplatform/container/PropertyConfigurator.java
sandbox/as7_support/branches/gatein-as7/exo.kernel.container/src/main/java/org/exoplatform/container/StandaloneContainer.java
sandbox/as7_support/branches/gatein-as7/exo.kernel.container/src/main/java/org/exoplatform/container/component/RequestLifeCycle.java
sandbox/as7_support/branches/gatein-as7/exo.kernel.container/src/main/java/org/exoplatform/container/configuration/ConfigurationUnmarshaller.java
sandbox/as7_support/branches/gatein-as7/exo.kernel.container/src/main/java/org/exoplatform/container/configuration/Namespaces.java
sandbox/as7_support/branches/gatein-as7/exo.kernel.container/src/main/java/org/exoplatform/container/management/ManageableContainer.java
sandbox/as7_support/branches/gatein-as7/exo.kernel.container/src/main/java/org/exoplatform/container/management/ManagementContextImpl.java
sandbox/as7_support/branches/gatein-as7/exo.kernel.container/src/main/java/org/exoplatform/container/management/MetaDataBuilder.java
sandbox/as7_support/branches/gatein-as7/exo.kernel.container/src/main/java/org/exoplatform/container/monitor/jvm/J2EEServerInfo.java
sandbox/as7_support/branches/gatein-as7/exo.kernel.container/src/main/java/org/exoplatform/container/util/ContainerUtil.java
sandbox/as7_support/branches/gatein-as7/exo.kernel.container/src/main/java/org/exoplatform/container/util/ExoWurflSource.java
sandbox/as7_support/branches/gatein-as7/exo.kernel.container/src/main/java/org/exoplatform/container/xml/Configuration.java
sandbox/as7_support/branches/gatein-as7/exo.kernel.container/src/main/java/org/exoplatform/container/xml/ObjectParam.java
sandbox/as7_support/branches/gatein-as7/exo.kernel.container/src/main/java/org/exoplatform/management/jmx/impl/JMXManagementProvider.java
sandbox/as7_support/branches/gatein-as7/exo.kernel.container/src/main/java/org/exoplatform/management/spi/ManagedMethodMetaData.java
sandbox/as7_support/branches/gatein-as7/exo.kernel.container/src/main/java/org/exoplatform/management/spi/ManagedPropertyMetaData.java
sandbox/as7_support/branches/gatein-as7/exo.kernel.container/src/main/java/org/exoplatform/management/spi/ManagedTypeMetaData.java
sandbox/as7_support/branches/gatein-as7/exo.kernel.container/src/test/java/org/exoplatform/container/TestPortalContainer.java
Log:
Updated exo.kernel.container to version 2.3.6-GA
Modified: sandbox/as7_support/branches/gatein-as7/exo.kernel.container/pom.xml
===================================================================
--- sandbox/as7_support/branches/gatein-as7/exo.kernel.container/pom.xml 2012-02-24 14:34:41 UTC (rev 8456)
+++ sandbox/as7_support/branches/gatein-as7/exo.kernel.container/pom.xml 2012-02-24 15:37:53 UTC (rev 8457)
@@ -12,15 +12,15 @@
<parent>
<groupId>org.exoplatform.kernel</groupId>
<artifactId>kernel-parent</artifactId>
- <version>2.3.2-GA</version>
+ <version>2.3.6-GA</version>
</parent>
<artifactId>exo.kernel.container</artifactId>
- <version>2.3.2-GA-AS7-Beta02</version>
+ <version>2.3.6-GA-AS7-Beta03</version>
<name>eXo Kernel :: Container</name>
<description>eXo Kernel Container</description>
<properties>
- <version.exo.kernel>2.3.0-GA</version.exo.kernel>
+ <version.exo.kernel>2.3.6-GA</version.exo.kernel>
</properties>
<dependencies>
<dependency>
Modified: sandbox/as7_support/branches/gatein-as7/exo.kernel.container/src/main/java/org/exoplatform/container/ConcurrentPicoContainer.java
===================================================================
--- sandbox/as7_support/branches/gatein-as7/exo.kernel.container/src/main/java/org/exoplatform/container/ConcurrentPicoContainer.java 2012-02-24 14:34:41 UTC (rev 8456)
+++ sandbox/as7_support/branches/gatein-as7/exo.kernel.container/src/main/java/org/exoplatform/container/ConcurrentPicoContainer.java 2012-02-24 15:37:53 UTC (rev 8457)
@@ -111,7 +111,9 @@
public ConcurrentPicoContainer(ComponentAdapterFactory componentAdapterFactory, PicoContainer parent)
{
if (componentAdapterFactory == null)
- throw new NullPointerException("componentAdapterFactory");
+ {
+ throw new IllegalArgumentException("componentAdapterFactory");
+ }
this.componentAdapterFactory = componentAdapterFactory;
this.parent = parent == null ? null : new ImmutablePicoContainer(parent);
}
Modified: sandbox/as7_support/branches/gatein-as7/exo.kernel.container/src/main/java/org/exoplatform/container/PropertyConfigurator.java
===================================================================
--- sandbox/as7_support/branches/gatein-as7/exo.kernel.container/src/main/java/org/exoplatform/container/PropertyConfigurator.java 2012-02-24 14:34:41 UTC (rev 8456)
+++ sandbox/as7_support/branches/gatein-as7/exo.kernel.container/src/main/java/org/exoplatform/container/PropertyConfigurator.java 2012-02-24 15:37:53 UTC (rev 8457)
@@ -62,32 +62,38 @@
/** The logger. */
private final Log log = ExoLogger.getExoLogger(PropertyConfigurator.class);
+ public PropertyConfigurator(ConfigurationManager confManager)
+ {
+ this(null, confManager);
+ }
+
public PropertyConfigurator(InitParams params, ConfigurationManager confManager)
{
- PropertiesParam propertiesParam = params.getPropertiesParam("properties");
- if (propertiesParam != null)
+ String path = null;
+ if (params != null)
{
- log.debug("Going to initialize properties from init param");
- for (Iterator<Property> i = propertiesParam.getPropertyIterator();i.hasNext();)
+ PropertiesParam propertiesParam = params.getPropertiesParam("properties");
+ if (propertiesParam != null)
{
- Property property = i.next();
- String name = property.getName();
- String value = property.getValue();
- log.debug("Adding property from init param " + name + " = " + value);
- PropertyManager.setProperty(name, value);
+ log.debug("Going to initialize properties from init param");
+ for (Iterator<Property> i = propertiesParam.getPropertyIterator();i.hasNext();)
+ {
+ Property property = i.next();
+ String name = property.getName();
+ String value = property.getValue();
+ log.debug("Adding property from init param " + name + " = " + value);
+ PropertyManager.setProperty(name, value);
+ }
+ }
+ ValueParam pathParam = params.getValueParam("properties.url");
+ if (pathParam != null)
+ {
+ log.debug("Using file path " + path + " found from configuration");
+ path = pathParam.getValue();
}
}
//
- String path = null;
- ValueParam pathParam = params.getValueParam("properties.url");
- if (pathParam != null)
- {
- log.debug("Using file path " + path + " found from configuration");
- path = pathParam.getValue();
- }
-
- //
String systemPath = PropertyManager.getProperty(PropertyManager.PROPERTIES_URL);
if (systemPath != null)
{
Modified: sandbox/as7_support/branches/gatein-as7/exo.kernel.container/src/main/java/org/exoplatform/container/StandaloneContainer.java
===================================================================
--- sandbox/as7_support/branches/gatein-as7/exo.kernel.container/src/main/java/org/exoplatform/container/StandaloneContainer.java 2012-02-24 14:34:41 UTC (rev 8456)
+++ sandbox/as7_support/branches/gatein-as7/exo.kernel.container/src/main/java/org/exoplatform/container/StandaloneContainer.java 2012-02-24 15:37:53 UTC (rev 8457)
@@ -36,6 +36,7 @@
import org.exoplatform.services.log.Log;
import java.io.File;
+import java.io.IOException;
import java.net.MalformedURLException;
import java.net.URL;
import java.security.PrivilegedAction;
@@ -96,6 +97,10 @@
{
registerComponentInstance(ConfigurationManager.class, configurationManager);
registerComponentImplementation(SessionManagerImpl.class);
+ // Workaround used to allow to use the PropertyConfigurator with the StandaloneContainer
+ // If the system property PropertyManager.PROPERTIES_URL has been set properly, it will load the properties
+ // from the file and load them as system properties
+ new PropertyConfigurator(configurationManager);
return null;
}
});
@@ -329,6 +334,7 @@
{
super.stop();
ExoContainerContext.setTopContainer(null);
+ container = null;
}
// -------------- Helpers ----------
@@ -349,7 +355,7 @@
{
SecurityHelper.doPrivilegedIOExceptionAction(new PrivilegedExceptionAction<Void>()
{
- public Void run() throws Exception
+ public Void run() throws IOException
{
url.openStream().close();
return null;
@@ -357,7 +363,7 @@
});
return true;
}
- catch (Exception e)
+ catch (IOException e)
{
return false;
}
@@ -419,7 +425,10 @@
}
catch (Exception ex)
{
- // ignore me
+ if (LOG.isTraceEnabled())
+ {
+ LOG.trace("An exception occurred: " + ex.getMessage());
+ }
}
}
Modified: sandbox/as7_support/branches/gatein-as7/exo.kernel.container/src/main/java/org/exoplatform/container/component/RequestLifeCycle.java
===================================================================
--- sandbox/as7_support/branches/gatein-as7/exo.kernel.container/src/main/java/org/exoplatform/container/component/RequestLifeCycle.java 2012-02-24 14:34:41 UTC (rev 8456)
+++ sandbox/as7_support/branches/gatein-as7/exo.kernel.container/src/main/java/org/exoplatform/container/component/RequestLifeCycle.java 2012-02-24 15:37:53 UTC (rev 8457)
@@ -96,7 +96,7 @@
{
if (container == null)
{
- throw new NullPointerException();
+ throw new IllegalArgumentException("The container cannot be null");
}
RequestLifeCycleStack lf = current.get();
if (lf == null)
@@ -118,7 +118,7 @@
{
if (lifeCycle == null)
{
- throw new NullPointerException();
+ throw new IllegalArgumentException("The lifeCycle cannot be null");
}
RequestLifeCycleStack lf = current.get();
if (lf == null)
Modified: sandbox/as7_support/branches/gatein-as7/exo.kernel.container/src/main/java/org/exoplatform/container/configuration/ConfigurationUnmarshaller.java
===================================================================
--- sandbox/as7_support/branches/gatein-as7/exo.kernel.container/src/main/java/org/exoplatform/container/configuration/ConfigurationUnmarshaller.java 2012-02-24 14:34:41 UTC (rev 8456)
+++ sandbox/as7_support/branches/gatein-as7/exo.kernel.container/src/main/java/org/exoplatform/container/configuration/ConfigurationUnmarshaller.java 2012-02-24 15:37:53 UTC (rev 8457)
@@ -70,7 +70,7 @@
public class ConfigurationUnmarshaller
{
- private static final Log log = ExoLogger.getLogger("exo.kernel.container.ConfigurationUnmarshaller");
+ private static final Log LOG = ExoLogger.getLogger("exo.kernel.container.ConfigurationUnmarshaller");
/**
* A private copy of the list of kernel namespaces
@@ -92,14 +92,14 @@
public void warning(SAXParseException exception) throws SAXException
{
- log.warn(exception.getMessage(), exception);
+ LOG.warn(exception.getMessage(), exception);
}
public void error(SAXParseException exception) throws SAXException
{
if (exception.getMessage().equals("cvc-elt.1: Cannot find the declaration of element 'configuration'."))
{
- log.info("The document "
+ LOG.info("The document "
+ url
+ " does not contain a schema declaration, it should have an "
+ "XML declaration similar to\n"
@@ -111,7 +111,7 @@
}
else
{
- log.error("In document " + url + " at (" + exception.getLineNumber() + "," + exception.getColumnNumber()
+ LOG.error("In document " + url + " at (" + exception.getLineNumber() + "," + exception.getColumnNumber()
+ ") :" + exception.getMessage());
}
valid = false;
@@ -119,7 +119,7 @@
public void fatalError(SAXParseException exception) throws SAXException
{
- log.fatal("In document " + url + " at (" + exception.getLineNumber() + "," + exception.getColumnNumber()
+ LOG.fatal("In document " + url + " at (" + exception.getLineNumber() + "," + exception.getColumnNumber()
+ ") :" + exception.getMessage());
valid = false;
}
@@ -172,12 +172,12 @@
}
catch (ParserConfigurationException e)
{
- log.error("Got a parser configuration exception when doing XSD validation");
+ LOG.error("Got a parser configuration exception when doing XSD validation");
return false;
}
catch (SAXException e)
{
- log.error("Got a sax exception when doing XSD validation");
+ LOG.error("Got a sax exception when doing XSD validation");
return false;
}
}
@@ -204,7 +204,10 @@
}
catch (Exception e)
{
- // ignore me
+ if (LOG.isTraceEnabled())
+ {
+ LOG.trace("An exception occurred: " + e.getMessage());
+ }
}
}
}
@@ -216,7 +219,7 @@
boolean valid = isValid(url);
if (!valid)
{
- log.info("The configuration file " + url + " was not found valid according to its XSD");
+ LOG.info("The configuration file " + url + " was not found valid according to its XSD");
}
}
@@ -239,7 +242,7 @@
if (cause instanceof FactoryConfigurationError)
{
// do nothing and let try to instantiate later
- log.debug("Was not able to find document builder factory class in Java > 5, will use default", cause);
+ LOG.debug("Was not able to find document builder factory class in Java > 5, will use default", cause);
}
else
{
@@ -249,7 +252,10 @@
}
catch (NoSuchMethodException e)
{
- // Java < 6
+ if (LOG.isTraceEnabled())
+ {
+ LOG.trace("An exception occurred: " + e.getMessage());
+ }
}
//
@@ -295,8 +301,8 @@
String document = buffer.toString();
// Debug
- if (log.isTraceEnabled())
- log.trace("About to parse configuration file " + document);
+ if (LOG.isTraceEnabled())
+ LOG.trace("About to parse configuration file " + document);
//
IBindingFactory bfact = BindingDirectory.getFactory(Configuration.class);
Modified: sandbox/as7_support/branches/gatein-as7/exo.kernel.container/src/main/java/org/exoplatform/container/configuration/Namespaces.java
===================================================================
--- sandbox/as7_support/branches/gatein-as7/exo.kernel.container/src/main/java/org/exoplatform/container/configuration/Namespaces.java 2012-02-24 14:34:41 UTC (rev 8456)
+++ sandbox/as7_support/branches/gatein-as7/exo.kernel.container/src/main/java/org/exoplatform/container/configuration/Namespaces.java 2012-02-24 15:37:53 UTC (rev 8457)
@@ -90,7 +90,8 @@
*/
public static String[] getKernelNamespaces()
{
- return new String[]{KERNEL_1_0_URI, KERNEL_1_1_URI, KERNEL_1_2_URI, KERNEL_1_0_URI_OLD, KERNEL_1_1_URI_OLD, KERNEL_1_2_URI_OLD};
+ return new String[]{KERNEL_1_0_URI, KERNEL_1_1_URI, KERNEL_1_2_URI, KERNEL_1_0_URI_OLD, KERNEL_1_1_URI_OLD,
+ KERNEL_1_2_URI_OLD};
}
/**
Modified: sandbox/as7_support/branches/gatein-as7/exo.kernel.container/src/main/java/org/exoplatform/container/management/ManageableContainer.java
===================================================================
--- sandbox/as7_support/branches/gatein-as7/exo.kernel.container/src/main/java/org/exoplatform/container/management/ManageableContainer.java 2012-02-24 14:34:41 UTC (rev 8456)
+++ sandbox/as7_support/branches/gatein-as7/exo.kernel.container/src/main/java/org/exoplatform/container/management/ManageableContainer.java 2012-02-24 15:37:53 UTC (rev 8457)
@@ -46,6 +46,7 @@
import java.util.Set;
import javax.management.MBeanServer;
+import javax.management.MalformedObjectNameException;
import javax.management.ObjectName;
/**
@@ -201,7 +202,7 @@
{
this.objectName = JMX.createObjectName("exo", props);
}
- catch (Exception e)
+ catch (MalformedObjectNameException e)
{
LOG.error("Could not create the object name", e);
}
@@ -246,7 +247,10 @@
}
catch (Exception e)
{
- // Ignore, may be caused by lazy initialization mechanism
+ if (LOG.isTraceEnabled())
+ {
+ LOG.trace("An exception occurred: " + e.getMessage());
+ }
}
return super.unregisterComponent(componentKey);
}
Modified: sandbox/as7_support/branches/gatein-as7/exo.kernel.container/src/main/java/org/exoplatform/container/management/ManagementContextImpl.java
===================================================================
--- sandbox/as7_support/branches/gatein-as7/exo.kernel.container/src/main/java/org/exoplatform/container/management/ManagementContextImpl.java 2012-02-24 14:34:41 UTC (rev 8456)
+++ sandbox/as7_support/branches/gatein-as7/exo.kernel.container/src/main/java/org/exoplatform/container/management/ManagementContextImpl.java 2012-02-24 15:37:53 UTC (rev 8457)
@@ -75,7 +75,7 @@
{
if (container == null)
{
- throw new NullPointerException();
+ throw new IllegalArgumentException("The container cannot be null");
}
//
@@ -102,11 +102,11 @@
{
if (parent == null)
{
- throw new NullPointerException();
+ throw new IllegalArgumentException("The parent cannot be null");
}
if (container == null)
{
- throw new NullPointerException();
+ throw new IllegalArgumentException("The container cannot be null");
}
//
@@ -133,7 +133,7 @@
{
if (parent == null)
{
- throw new NullPointerException();
+ throw new IllegalArgumentException("The parent cannot be null");
}
if ((resource != null && typeMD == null) && (resource == null && typeMD != null))
{
Modified: sandbox/as7_support/branches/gatein-as7/exo.kernel.container/src/main/java/org/exoplatform/container/management/MetaDataBuilder.java
===================================================================
--- sandbox/as7_support/branches/gatein-as7/exo.kernel.container/src/main/java/org/exoplatform/container/management/MetaDataBuilder.java 2012-02-24 14:34:41 UTC (rev 8456)
+++ sandbox/as7_support/branches/gatein-as7/exo.kernel.container/src/main/java/org/exoplatform/container/management/MetaDataBuilder.java 2012-02-24 15:37:53 UTC (rev 8457)
@@ -91,7 +91,7 @@
{
if (clazz == null)
{
- throw new NullPointerException();
+ throw new IllegalArgumentException("The clazz cannot be null");
}
//
Modified: sandbox/as7_support/branches/gatein-as7/exo.kernel.container/src/main/java/org/exoplatform/container/monitor/jvm/J2EEServerInfo.java
===================================================================
--- sandbox/as7_support/branches/gatein-as7/exo.kernel.container/src/main/java/org/exoplatform/container/monitor/jvm/J2EEServerInfo.java 2012-02-24 14:34:41 UTC (rev 8456)
+++ sandbox/as7_support/branches/gatein-as7/exo.kernel.container/src/main/java/org/exoplatform/container/monitor/jvm/J2EEServerInfo.java 2012-02-24 15:37:53 UTC (rev 8457)
@@ -27,6 +27,7 @@
import java.lang.management.ManagementFactory;
import java.lang.reflect.Method;
import java.net.URI;
+import java.net.URISyntaxException;
import java.security.PrivilegedAction;
import java.security.PrivilegedExceptionAction;
@@ -42,7 +43,7 @@
/**
* The logger
*/
- private static final Log log = ExoLogger.getLogger("exo.kernel.container.J2EEServerInfo");
+ private static final Log LOG = ExoLogger.getLogger("exo.kernel.container.J2EEServerInfo");
/**
* The name of the JVM parameter that allows us to change the location of the
@@ -101,10 +102,27 @@
{
exoConfDir_ = new File(new File(new URI(jbossConfigUrl)), confDirName).getAbsolutePath();
}
- catch (Throwable e)
+ catch (SecurityException e)
{
- // don't care about it
+ if (LOG.isTraceEnabled())
+ {
+ LOG.trace("An exception occurred: " + e.getMessage());
+ }
}
+ catch (URISyntaxException e)
+ {
+ if (LOG.isTraceEnabled())
+ {
+ LOG.trace("An exception occurred: " + e.getMessage());
+ }
+ }
+ catch (IllegalArgumentException e)
+ {
+ if (LOG.isTraceEnabled())
+ {
+ LOG.trace("An exception occurred: " + e.getMessage());
+ }
+ }
}
//
@@ -124,7 +142,7 @@
}
catch (Exception ignore)
{
- log.debug(ignore.getLocalizedMessage(), ignore);
+ LOG.debug(ignore.getLocalizedMessage(), ignore);
}
}
else if (jettyHome != null)
@@ -182,7 +200,7 @@
String exoConfHome = PrivilegedSystemHelper.getProperty(EXO_CONF_PARAM);
if (exoConfHome != null && exoConfHome.length() > 0)
{
- log.info("Override exo-conf directory '" + exoConfDir_ + "' with location '" + exoConfHome
+ LOG.info("Override exo-conf directory '" + exoConfDir_ + "' with location '" + exoConfHome
+ "'");
exoConfDir_ = exoConfHome;
}
Modified: sandbox/as7_support/branches/gatein-as7/exo.kernel.container/src/main/java/org/exoplatform/container/util/ContainerUtil.java
===================================================================
--- sandbox/as7_support/branches/gatein-as7/exo.kernel.container/src/main/java/org/exoplatform/container/util/ContainerUtil.java 2012-02-24 14:34:41 UTC (rev 8456)
+++ sandbox/as7_support/branches/gatein-as7/exo.kernel.container/src/main/java/org/exoplatform/container/util/ContainerUtil.java 2012-02-24 15:37:53 UTC (rev 8457)
@@ -52,7 +52,7 @@
public class ContainerUtil
{
/** The logger. */
- private static final Log log = ExoLogger.getExoLogger(ContainerUtil.class);
+ private static final Log LOG = ExoLogger.getExoLogger(ContainerUtil.class);
static public Constructor<?>[] getSortedConstructors(Class<?> clazz) throws NoClassDefFoundError
{
@@ -142,7 +142,7 @@
}
catch (Exception ex)
{
- log.error("Failed to instanciate plugin " + plugin.getType() + ": " + ex.getMessage(), ex);
+ LOG.error("Failed to instanciate plugin " + plugin.getType() + ": " + ex.getMessage(), ex);
}
}
@@ -163,7 +163,7 @@
}
catch (Exception ex)
{
- log.error("Failed to instanciate plugin " + plugin.getType() + ": " + ex.getMessage(), ex);
+ LOG.error("Failed to instanciate plugin " + plugin.getType() + ": " + ex.getMessage(), ex);
}
}
}
@@ -188,7 +188,7 @@
if (component.isMultiInstance())
{
container.registerComponent(new ConstructorInjectionComponentAdapter(classType, classType));
- log.debug("===>>> Thread local component " + classType.getName() + " registered.");
+ LOG.debug("===>>> Thread local component " + classType.getName() + " registered.");
}
else
{
@@ -203,7 +203,7 @@
if (component.isMultiInstance())
{
container.registerComponent(new ConstructorInjectionComponentAdapter(keyType, classType));
- log.debug("===>>> Thread local component " + classType.getName() + " registered.");
+ LOG.debug("===>>> Thread local component " + classType.getName() + " registered.");
}
else
{
@@ -218,7 +218,7 @@
}
catch (ClassNotFoundException ex)
{
- log.error("Cannot register the component corresponding to key = '" + key + "' and type = '" + type + "'", ex);
+ LOG.error("Cannot register the component corresponding to key = '" + key + "' and type = '" + type + "'", ex);
}
}
}
@@ -259,19 +259,19 @@
String fileName = url.getFile();
if (Tools.endsWithIgnoreCase(path, ".properties"))
{
- if (log.isDebugEnabled())
- log.debug("Attempt to load property file " + path);
+ if (LOG.isDebugEnabled())
+ LOG.debug("Attempt to load property file " + path);
props = PropertiesLoader.load(in);
}
else if (Tools.endsWithIgnoreCase(fileName, ".xml"))
{
- if (log.isDebugEnabled())
- log.debug("Attempt to load property file " + path + " with XML format");
+ if (LOG.isDebugEnabled())
+ LOG.debug("Attempt to load property file " + path + " with XML format");
props = PropertiesLoader.loadFromXML(in);
}
- else if (log.isDebugEnabled())
+ else if (LOG.isDebugEnabled())
{
- log.debug("Will not load property file" + path + " because its format is not recognized");
+ LOG.debug("Will not load property file" + path + " because its format is not recognized");
}
if (props != null && resolveVariables)
{
@@ -289,12 +289,12 @@
}
else
{
- log.error("Could not load property file " + path);
+ LOG.error("Could not load property file " + path);
}
}
catch (Exception e)
{
- log.error("Cannot load property file " + path, e);
+ LOG.error("Cannot load property file " + path, e);
}
finally
{
@@ -306,6 +306,10 @@
}
catch (IOException ignore)
{
+ if (LOG.isTraceEnabled())
+ {
+ LOG.trace("An exception occurred: " + ignore.getMessage());
+ }
}
}
}
Modified: sandbox/as7_support/branches/gatein-as7/exo.kernel.container/src/main/java/org/exoplatform/container/util/ExoWurflSource.java
===================================================================
--- sandbox/as7_support/branches/gatein-as7/exo.kernel.container/src/main/java/org/exoplatform/container/util/ExoWurflSource.java 2012-02-24 14:34:41 UTC (rev 8456)
+++ sandbox/as7_support/branches/gatein-as7/exo.kernel.container/src/main/java/org/exoplatform/container/util/ExoWurflSource.java 2012-02-24 15:37:53 UTC (rev 8457)
@@ -21,6 +21,7 @@
import org.exoplatform.services.log.ExoLogger;
import org.exoplatform.services.log.Log;
+import java.io.IOException;
import java.io.InputStream;
//import net.sourceforge.wurfl.wurflapi.WurflSource;
@@ -41,7 +42,7 @@
{
return wurflUrl.openStream();
}
- catch (Exception e)
+ catch (IOException e)
{
LOG.error(e.getLocalizedMessage(), e);
return null;
Added: sandbox/as7_support/branches/gatein-as7/exo.kernel.container/src/main/java/org/exoplatform/container/util/TemplateConfigurationHelper.java
===================================================================
--- sandbox/as7_support/branches/gatein-as7/exo.kernel.container/src/main/java/org/exoplatform/container/util/TemplateConfigurationHelper.java (rev 0)
+++ sandbox/as7_support/branches/gatein-as7/exo.kernel.container/src/main/java/org/exoplatform/container/util/TemplateConfigurationHelper.java 2012-02-24 15:37:53 UTC (rev 8457)
@@ -0,0 +1,260 @@
+/*
+ * Copyright (C) 2010 eXo Platform SAS.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.exoplatform.container.util;
+
+import org.exoplatform.commons.utils.PrivilegedFileHelper;
+import org.exoplatform.container.configuration.ConfigurationManager;
+import org.exoplatform.services.log.ExoLogger;
+import org.exoplatform.services.log.Log;
+
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.regex.Pattern;
+
+/**
+ * Builds configuration from template using map of template-variables <--> value.
+ * Class provides extra functionality for filtering parameters by pattern, excluding
+ * unnecessary parameters.
+ *
+ * @author <a href="mailto:nikolazius@gmail.com">Nikolay Zamosenchuk</a>
+ * @version $Id: TemplateConfigurationHelper.java 34360 2009-07-22 23:58:59Z nzamosenchuk $
+ *
+ */
+public class TemplateConfigurationHelper
+{
+
+ private static final Log LOG = ExoLogger.getLogger("exo.kernel.container.TemplateConfigurationHelper");
+
+ // list with include-patterns
+ private List<Pattern> includes = new ArrayList<Pattern>();
+
+ // list with exclude-patterns
+ private List<Pattern> excludes = new ArrayList<Pattern>();
+
+ private ConfigurationManager cfm;
+
+ /**
+ * Creates instance of template configuration helper with given lists of filtering
+ * patterns. Parameter will be included only if it matches any include-pattern and
+ * doesn't match any exclude-pattern. I.e. You can include "extended-*" and exclude
+ * "extended-type". Please refer to Java regexp documentation. Filtering for this
+ * example, should be defined as following:
+ * include: "^extended-.*"
+ * exclude: "^extended-type"
+ *
+ * @param includes Array with string representation of include reg-exp patterns
+ * @param excludes Array with string representation of exclude reg-exp patterns
+ * @param ConfigurationManager instance for looking up resources
+ */
+ public TemplateConfigurationHelper(String[] includes, String[] excludes, ConfigurationManager cfm)
+ {
+ super();
+ this.cfm = cfm;
+ // compile include patterns
+ for (String regex : includes)
+ {
+ this.includes.add(Pattern.compile(regex));
+ }
+ // compile exclude patterns
+ for (String regex : excludes)
+ {
+ this.excludes.add(Pattern.compile(regex));
+ }
+ }
+
+ /**
+ * Reads configuration file from a stream and replaces all the occurrences of template-variables
+ * (like : "${parameter.name}") with values provided in the map.
+ *
+ * @param inputStream
+ * @param parameters
+ * @return
+ * @throws IOException
+ */
+ public InputStream fillTemplate(InputStream inputStream, Map<String, String> parameters) throws IOException
+ {
+ if (inputStream == null || parameters == null || parameters.size() == 0)
+ {
+ return inputStream;
+ }
+ // parameters filtering
+ Map<String, String> preparedParams = prepareParameters(parameters);
+ // read stream
+ String configuration = readStream(inputStream);
+ for (Entry<String, String> entry : preparedParams.entrySet())
+ {
+ configuration = configuration.replace(entry.getKey(), entry.getValue());
+ }
+ // create new stream
+ InputStream configurationStream = new ByteArrayInputStream(configuration.getBytes());
+ return configurationStream;
+ }
+
+ /**
+ * Reads configuration file from a stream and replaces all the occurrences of template-variables
+ * (like : "${parameter.name}") with values provided in the map.
+ *
+ * @param filename
+ * @param parameters
+ * @return
+ * @throws IOException
+ */
+ public InputStream fillTemplate(String filename, Map<String, String> parameters) throws IOException
+ {
+ InputStream inputStream = getInputStream(cfm, filename);
+ // inputStream still remains null, so file was not opened
+ if (inputStream == null)
+ {
+ throw new IOException("Can't find or open file:" + filename);
+ }
+ return fillTemplate(inputStream, parameters);
+ }
+
+ /**
+ * Tries first to get the file content using the configuration manager, if it cannot
+ * be found it will then try to get it from the context class loader of the current thread,
+ * if it cannot be found it will try to get it from the class loader of the current class and
+ * finally it still cannot be found it will try to use the file name as a file path.
+ * @param cfm the configuration manager from which we want to try to find the file content
+ * @param filename the name of the file to found
+ * @return the {@link InputStream} corresponding to the file content if it can be found
+ * <code>null</code> otherwise
+ */
+ public static InputStream getInputStream(ConfigurationManager cfm, String filename)
+ {
+ InputStream inputStream = null;
+ // try to get using configuration manager
+ try
+ {
+ inputStream = cfm.getInputStream(filename);
+ }
+ catch (Exception e)
+ {
+ if (LOG.isTraceEnabled())
+ {
+ LOG.trace("An exception occurred: " + e.getMessage());
+ }
+ }
+
+ // try to get resource by class loader
+ if (inputStream == null)
+ {
+ ClassLoader cl = Thread.currentThread().getContextClassLoader();
+ inputStream = cl == null ? null : cl.getResourceAsStream(filename);
+ }
+
+ // check system class loader
+ if (inputStream == null)
+ {
+ inputStream = TemplateConfigurationHelper.class.getClassLoader().getResourceAsStream(filename);
+ }
+
+ // try to get as file stream
+ if (inputStream == null)
+ {
+ try
+ {
+ inputStream = PrivilegedFileHelper.fileInputStream(filename);
+ }
+ catch (IOException e)
+ {
+ if (LOG.isTraceEnabled())
+ {
+ LOG.trace("An exception occurred: " + e.getMessage());
+ }
+ }
+ }
+ return inputStream;
+ }
+
+ /**
+ * Checks if String mathes to any pattern from the list
+ *
+ * @param patterns
+ * @param parameter
+ * @return
+ */
+ private boolean matches(List<Pattern> patterns, String parameter)
+ {
+ for (Pattern pattern : patterns)
+ {
+ if (pattern.matcher(parameter).matches())
+ {
+ // string matched
+ return true;
+ }
+ }
+ return false;
+ }
+
+ /**
+ * Filters the map of parameters, leaving only those than matches filtering regular expressions.
+ * Also adds "${}" to the parameter key: <br>
+ * I.e. such map provided on input:
+ *
+ * "jbosscache-cache.loader":"org.exoplatform"
+ * "jbosscache-configuration":"/conf/test.xml"
+ * "max-volatile-size":"100Kb"
+ *
+ * the output will be like:
+ *
+ * "${jbosscache-cache.loader}":"org.exoplatform"
+ *
+ * Other will be ignored (depending on includes/excludes lists provided in constructor).
+ *
+ * @param parameters
+ * @return
+ */
+ protected Map<String, String> prepareParameters(Map<String, String> parameters)
+ {
+ Map<String, String> map = new HashMap<String, String>();
+ for (Entry<String, String> entry : parameters.entrySet())
+ {
+ if (matches(includes, entry.getKey()) && !matches(excludes, entry.getKey()))
+ {
+ map.put("${" + entry.getKey() + "}", entry.getValue());
+ }
+ }
+ return map;
+ }
+
+ /**
+ * Reads bytes from input stream and builds a string from them
+ *
+ * @param inputStream
+ * @return
+ * @throws IOException
+ */
+ protected String readStream(InputStream inputStream) throws IOException
+ {
+ StringBuffer out = new StringBuffer();
+ byte[] b = new byte[4096];
+ for (int n; (n = inputStream.read(b)) != -1;)
+ {
+ out.append(new String(b, 0, n));
+ }
+ return out.toString();
+ }
+}
Modified: sandbox/as7_support/branches/gatein-as7/exo.kernel.container/src/main/java/org/exoplatform/container/xml/Configuration.java
===================================================================
--- sandbox/as7_support/branches/gatein-as7/exo.kernel.container/src/main/java/org/exoplatform/container/xml/Configuration.java 2012-02-24 14:34:41 UTC (rev 8456)
+++ sandbox/as7_support/branches/gatein-as7/exo.kernel.container/src/main/java/org/exoplatform/container/xml/Configuration.java 2012-02-24 15:37:53 UTC (rev 8457)
@@ -47,7 +47,7 @@
public static final String KERNEL_CONFIGURATION_1_0_URI = "http://www.exoplaform.org/xml/ns/kernel_1_0.xsd";
- private static final Log log = ExoLogger.getLogger("exo.kernel.container.Configuration");
+ private static final Log LOG = ExoLogger.getLogger("exo.kernel.container.Configuration");
private Map<String, ContainerLifecyclePlugin> containerLifecyclePlugin_ =
new HashMap<String, ContainerLifecyclePlugin>();
@@ -257,16 +257,8 @@
}
else if (result == null)
{
- try
- {
- // Initialize with the clone of the first non null configuration
- result = (Configuration)conf.clone();
- }
- catch (CloneNotSupportedException e)
- {
- log.warn("Could not clone the configuration", e);
- break;
- }
+ // Initialize with the clone of the first non null configuration
+ result = (Configuration)conf.clone();
}
else
{
@@ -276,6 +268,42 @@
}
return result;
}
+
+ /**
+ * {@inheritDoc}
+ */
+ @SuppressWarnings("unchecked")
+ @Override
+ protected Object clone()
+ {
+ try
+ {
+ Configuration conf = (Configuration)super.clone();
+ conf.component_ = (Map<String, Component>)((HashMap<String, Component>)component_).clone();
+ conf.componentLifecyclePlugin_ =
+ (Map<String, ComponentLifecyclePlugin>)((HashMap<String, ComponentLifecyclePlugin>)componentLifecyclePlugin_)
+ .clone();
+ conf.containerLifecyclePlugin_ =
+ (Map<String, ContainerLifecyclePlugin>)((HashMap<String, ContainerLifecyclePlugin>)containerLifecyclePlugin_)
+ .clone();
+ conf.externalComponentPlugins_ =
+ (Map<String, ExternalComponentPlugins>)((HashMap<String, ExternalComponentPlugins>)externalComponentPlugins_)
+ .clone();
+ if (imports_ != null)
+ {
+ conf.imports_ = (ArrayList<String>)imports_.clone();
+ }
+ if (removeConfiguration_ != null)
+ {
+ conf.removeConfiguration_ = (ArrayList<String>)removeConfiguration_.clone();
+ }
+ return conf;
+ }
+ catch (CloneNotSupportedException e)
+ {
+ throw new AssertionError("Could not clone the configuration");
+ }
+ }
/**
* Dumps the configuration in XML format into the given {@link Writer}
@@ -291,7 +319,7 @@
}
catch (Exception e)
{
- log.warn("Couldn't dump the runtime configuration in XML Format", e);
+ LOG.warn("Couldn't dump the runtime configuration in XML Format", e);
}
}
@@ -308,7 +336,7 @@
}
catch (Exception e)
{
- log.warn("Cannot convert the configuration to XML format", e);
+ LOG.warn("Cannot convert the configuration to XML format", e);
return null;
}
finally
@@ -319,6 +347,10 @@
}
catch (IOException ignore)
{
+ if (LOG.isTraceEnabled())
+ {
+ LOG.trace("An exception occurred: " + ignore.getMessage());
+ }
}
}
return sw.toString();
Modified: sandbox/as7_support/branches/gatein-as7/exo.kernel.container/src/main/java/org/exoplatform/container/xml/ObjectParam.java
===================================================================
--- sandbox/as7_support/branches/gatein-as7/exo.kernel.container/src/main/java/org/exoplatform/container/xml/ObjectParam.java 2012-02-24 14:34:41 UTC (rev 8456)
+++ sandbox/as7_support/branches/gatein-as7/exo.kernel.container/src/main/java/org/exoplatform/container/xml/ObjectParam.java 2012-02-24 15:37:53 UTC (rev 8457)
@@ -100,7 +100,7 @@
}
}
}
- catch (Throwable ex)
+ catch (Exception ex)
{
// if(prop != null) {
// S ystem.out.println("Exception when try setting the prop.name " +
@@ -149,10 +149,15 @@
{
String[] temp = value.split(" ");
String className = temp[1];
+
if (className.indexOf(".") < 0)
{
- className = package_ + "." + className;
- Class clazz = Class.forName(className);
+ StringBuilder fullName = new StringBuilder();
+ fullName.append(package_);
+ fullName.append(".");
+ fullName.append(className);
+
+ Class clazz = Class.forName(fullName.toString());
return clazz.newInstance();
}
}
Modified: sandbox/as7_support/branches/gatein-as7/exo.kernel.container/src/main/java/org/exoplatform/management/jmx/impl/JMXManagementProvider.java
===================================================================
--- sandbox/as7_support/branches/gatein-as7/exo.kernel.container/src/main/java/org/exoplatform/management/jmx/impl/JMXManagementProvider.java 2012-02-24 14:34:41 UTC (rev 8456)
+++ sandbox/as7_support/branches/gatein-as7/exo.kernel.container/src/main/java/org/exoplatform/management/jmx/impl/JMXManagementProvider.java 2012-02-24 15:37:53 UTC (rev 8457)
@@ -32,11 +32,14 @@
import java.util.Map;
import javax.management.InstanceNotFoundException;
+import javax.management.MBeanException;
import javax.management.MBeanRegistrationException;
import javax.management.MBeanServer;
import javax.management.MBeanServerFactory;
import javax.management.MalformedObjectNameException;
import javax.management.ObjectName;
+import javax.management.RuntimeOperationsException;
+import javax.management.modelmbean.InvalidTargetObjectTypeException;
import javax.management.modelmbean.ModelMBeanInfo;
/**
@@ -73,11 +76,41 @@
ModelMBeanInfo info = infoBuilder.build();
mbean = new ExoModelMBean(context, context.getResource(), info);
}
- catch (Exception e)
+ catch (IllegalArgumentException e)
{
- LOG.warn("Could not create the ExoModelMBean for the class " +
- (context == null ? null : (context.getResource() == null ? null : context.getResource().getClass())), e);
+ LOG.warn(
+ "Could not create the ExoModelMBean for the class "
+ + (context == null ? null : (context.getResource() == null ? null : context.getResource().getClass())),
+ e);
}
+ catch (RuntimeOperationsException e)
+ {
+ LOG.warn(
+ "Could not create the ExoModelMBean for the class "
+ + (context == null ? null : (context.getResource() == null ? null : context.getResource().getClass())),
+ e);
+ }
+ catch (InstanceNotFoundException e)
+ {
+ LOG.warn(
+ "Could not create the ExoModelMBean for the class "
+ + (context == null ? null : (context.getResource() == null ? null : context.getResource().getClass())),
+ e);
+ }
+ catch (MBeanException e)
+ {
+ LOG.warn(
+ "Could not create the ExoModelMBean for the class "
+ + (context == null ? null : (context.getResource() == null ? null : context.getResource().getClass())),
+ e);
+ }
+ catch (InvalidTargetObjectTypeException e)
+ {
+ LOG.warn(
+ "Could not create the ExoModelMBean for the class "
+ + (context == null ? null : (context.getResource() == null ? null : context.getResource().getClass())),
+ e);
+ }
//
if (mbean != null)
@@ -166,7 +199,7 @@
}
});
}
- catch (Exception e)
+ catch (PrivilegedActionException e)
{
throw new RuntimeException("Failed to unregister MBean '" + name + " due to " + e.getMessage(), e);
}
@@ -182,7 +215,7 @@
}
});
}
- catch (Exception e)
+ catch (PrivilegedActionException e)
{
throw new RuntimeException("Failed to register MBean '" + name + " due to " + e.getMessage(), e);
}
Modified: sandbox/as7_support/branches/gatein-as7/exo.kernel.container/src/main/java/org/exoplatform/management/spi/ManagedMethodMetaData.java
===================================================================
--- sandbox/as7_support/branches/gatein-as7/exo.kernel.container/src/main/java/org/exoplatform/management/spi/ManagedMethodMetaData.java 2012-02-24 14:34:41 UTC (rev 8456)
+++ sandbox/as7_support/branches/gatein-as7/exo.kernel.container/src/main/java/org/exoplatform/management/spi/ManagedMethodMetaData.java 2012-02-24 15:37:53 UTC (rev 8457)
@@ -49,17 +49,17 @@
*
* @param method the method
* @param impactType the access mode
- * @throws NullPointerException if the method is null or the impact is null
+ * @throws IllegalArgumentException if the method is null or the impact is null
*/
- public ManagedMethodMetaData(Method method, ImpactType impactType) throws NullPointerException
+ public ManagedMethodMetaData(Method method, ImpactType impactType) throws IllegalArgumentException
{
if (method == null)
{
- throw new NullPointerException();
+ throw new IllegalArgumentException("The method cannot be null");
}
if (impactType == null)
{
- throw new NullPointerException();
+ throw new IllegalArgumentException("The impactType cannot be null");
}
//
@@ -87,7 +87,7 @@
{
if (parameter == null)
{
- throw new NullPointerException("No null parameter accepted");
+ throw new IllegalArgumentException("No null parameter accepted");
}
parameters.put(parameter.getIndex(), parameter);
}
Modified: sandbox/as7_support/branches/gatein-as7/exo.kernel.container/src/main/java/org/exoplatform/management/spi/ManagedPropertyMetaData.java
===================================================================
--- sandbox/as7_support/branches/gatein-as7/exo.kernel.container/src/main/java/org/exoplatform/management/spi/ManagedPropertyMetaData.java 2012-02-24 14:34:41 UTC (rev 8456)
+++ sandbox/as7_support/branches/gatein-as7/exo.kernel.container/src/main/java/org/exoplatform/management/spi/ManagedPropertyMetaData.java 2012-02-24 15:37:53 UTC (rev 8457)
@@ -48,12 +48,11 @@
private final ManagedParameterMetaData setterParameter;
public ManagedPropertyMetaData(String name, Method getter, String getterDescription, Method setter,
- String setterDescription, ManagedParameterMetaData setterParameter) throws NullPointerException,
- IllegalArgumentException
+ String setterDescription, ManagedParameterMetaData setterParameter) throws IllegalArgumentException
{
if (name == null)
{
- throw new NullPointerException("No null name accepted");
+ throw new IllegalArgumentException("No null name accepted");
}
if (setter != null)
{
Modified: sandbox/as7_support/branches/gatein-as7/exo.kernel.container/src/main/java/org/exoplatform/management/spi/ManagedTypeMetaData.java
===================================================================
--- sandbox/as7_support/branches/gatein-as7/exo.kernel.container/src/main/java/org/exoplatform/management/spi/ManagedTypeMetaData.java 2012-02-24 14:34:41 UTC (rev 8456)
+++ sandbox/as7_support/branches/gatein-as7/exo.kernel.container/src/main/java/org/exoplatform/management/spi/ManagedTypeMetaData.java 2012-02-24 15:37:53 UTC (rev 8457)
@@ -43,11 +43,11 @@
/** . */
private final Map<MethodKey, ManagedMethodMetaData> methods;
- public ManagedTypeMetaData(Class type) throws NullPointerException
+ public ManagedTypeMetaData(Class type) throws IllegalArgumentException
{
if (type == null)
{
- throw new NullPointerException();
+ throw new IllegalArgumentException("The type cannot be null");
}
//
Modified: sandbox/as7_support/branches/gatein-as7/exo.kernel.container/src/test/java/org/exoplatform/container/TestPortalContainer.java
===================================================================
--- sandbox/as7_support/branches/gatein-as7/exo.kernel.container/src/test/java/org/exoplatform/container/TestPortalContainer.java 2012-02-24 14:34:41 UTC (rev 8456)
+++ sandbox/as7_support/branches/gatein-as7/exo.kernel.container/src/test/java/org/exoplatform/container/TestPortalContainer.java 2012-02-24 15:37:53 UTC (rev 8457)
@@ -161,6 +161,36 @@
assertNull(PortalContainer.getCurrentSetting("boolean"));
}
+ public void testGetConfigurationXML()
+ {
+ URL rootURL = getClass().getResource("test-exo-container.xml");
+ URL portalURL = getClass().getResource("/conf/test-configuration.xml");
+ assertNotNull(rootURL);
+ assertNotNull(portalURL);
+ //
+ new ContainerBuilder().withRoot(rootURL).withPortal(portalURL).build();
+
+ String configXML = RootContainer.getInstance().getConfigurationXML();
+ assertNotNull(configXML);
+ int size = configXML.length();
+ int hash = configXML.hashCode();
+ configXML = RootContainer.getInstance().getConfigurationXML();
+ assertNotNull(configXML);
+ assertTrue(size > 0);
+ assertEquals(size, configXML.length());
+ assertEquals(hash, configXML.hashCode());
+
+ configXML = PortalContainer.getInstance().getConfigurationXML();
+ assertNotNull(configXML);
+ assertTrue(size > 0);
+ size = configXML.length();
+ hash = configXML.hashCode();
+ configXML = PortalContainer.getInstance().getConfigurationXML();
+ assertNotNull(configXML);
+ assertEquals(size, configXML.length());
+ assertEquals(hash, configXML.hashCode());
+ }
+
public static class MyComponent
{
private final InitParams params;
Added: sandbox/as7_support/branches/gatein-as7/exo.kernel.container/src/test/java/org/exoplatform/container/TestStandaloneContainer.java
===================================================================
--- sandbox/as7_support/branches/gatein-as7/exo.kernel.container/src/test/java/org/exoplatform/container/TestStandaloneContainer.java (rev 0)
+++ sandbox/as7_support/branches/gatein-as7/exo.kernel.container/src/test/java/org/exoplatform/container/TestStandaloneContainer.java 2012-02-24 15:37:53 UTC (rev 8457)
@@ -0,0 +1,47 @@
+/*
+ * Copyright (C) 2011 eXo Platform SAS.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.exoplatform.container;
+
+import junit.framework.TestCase;
+
+/**
+ * @author <a href="mailto:nfilotto@exoplatform.com">Nicolas Filotto</a>
+ * @version $Id$
+ *
+ */
+public class TestStandaloneContainer extends TestCase
+{
+
+ public void testHotDeploy() throws Exception
+ {
+ StandaloneContainer.getInstance();
+ ExoContainer container = ExoContainerContext.getTopContainer();
+ assertEquals(container.getClass(), StandaloneContainer.class);
+ container = ExoContainerContext.getCurrentContainer();
+ assertEquals(container.getClass(), StandaloneContainer.class);
+
+ container.stop();
+
+ StandaloneContainer.getInstance();
+ container = ExoContainerContext.getTopContainer();
+ assertEquals(container.getClass(), StandaloneContainer.class);
+ container = ExoContainerContext.getCurrentContainer();
+ assertEquals(container.getClass(), StandaloneContainer.class);
+ }
+}
Added: sandbox/as7_support/branches/gatein-as7/exo.kernel.container/src/test/java/org/exoplatform/container/util/TestTemplateConfigurationHelper.java
===================================================================
--- sandbox/as7_support/branches/gatein-as7/exo.kernel.container/src/test/java/org/exoplatform/container/util/TestTemplateConfigurationHelper.java (rev 0)
+++ sandbox/as7_support/branches/gatein-as7/exo.kernel.container/src/test/java/org/exoplatform/container/util/TestTemplateConfigurationHelper.java 2012-02-24 15:37:53 UTC (rev 8457)
@@ -0,0 +1,106 @@
+/*
+ * Copyright (C) 2010 eXo Platform SAS.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.exoplatform.container.util;
+
+import junit.framework.TestCase;
+
+import org.exoplatform.container.configuration.ConfigurationManagerImpl;
+
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * @author <a href="mailto:nikolazius@gmail.com">Nikolay Zamosenchuk</a>
+ * @version $Id: TestTemplateHelper.java 34360 2009-07-22 23:58:59Z nzamosenchuk $
+ *
+ */
+public class TestTemplateConfigurationHelper extends TestCase
+{
+
+ public void testFilters()
+ {
+ // create helper with predefined include and exclude patterns
+ TemplateConfigurationHelper helper =
+ new TemplateConfigurationHelper(new String[]{"^jbosscache-.*", "^jgroups-configuration"},
+ new String[]{"^jbosscache-configuration"}, new ConfigurationManagerImpl());
+ Map<String, String> parameters = new HashMap<String, String>();
+ parameters.put("jbosscache-configuration", "");
+ parameters.put("jbosscache-cache.loader", "");
+ parameters.put("jbosscache-clustername", "");
+ parameters.put("max-volatile-size", "");
+ Map<String, String> preparedParameters = helper.prepareParameters(parameters);
+ assertEquals(2, preparedParameters.size());
+ // "jbosscache-configuration" and "max-volatile-size" should be excluded
+ assertFalse(preparedParameters.containsKey("${jbosscache-configuration}"));
+ assertFalse(preparedParameters.containsKey("${max-volatile-size}"));
+ assertTrue(preparedParameters.containsKey("${jbosscache-cache.loader}"));
+ assertTrue(preparedParameters.containsKey("${jbosscache-clustername}"));
+ }
+
+ public void testFilters2()
+ {
+ // create helper with predefined include and exclude patterns
+ TemplateConfigurationHelper helper =
+ new TemplateConfigurationHelper(new String[]{"^jbosscache-.*", "^jgroups-configuration"},
+ new String[]{"^jbosscache-configuration"}, new ConfigurationManagerImpl());
+ Map<String, String> parameters = new HashMap<String, String>();
+ parameters.put("jgroups-configuration", "");
+ parameters.put("jbosscache-cache.loader", "");
+ parameters.put("jbosscache-clustername", "");
+ parameters.put("max-volatile-size", "");
+ Map<String, String> preparedParameters = helper.prepareParameters(parameters);
+ assertEquals(3, preparedParameters.size());
+ // "jbosscache-configuration" and "max-volatile-size" should be excluded
+ assertFalse(preparedParameters.containsKey("${max-volatile-size}"));
+ assertTrue(preparedParameters.containsKey("${jbosscache-cache.loader}"));
+ assertTrue(preparedParameters.containsKey("${jbosscache-clustername}"));
+ }
+
+ public void testTemplating() throws IOException
+ {
+ TemplateConfigurationHelper helper =
+ new TemplateConfigurationHelper(new String[]{"^jbosscache-.*", "^jgroups-configuration"},
+ new String[]{"^jbosscache-configuration"}, new ConfigurationManagerImpl());
+ String template = "configuration in any format, containing ${jbosscache-template-variable} and many others";
+ String expectedConfig = "configuration in any format, containing pretty good parameter and many others";
+
+ InputStream templateStream = new ByteArrayInputStream(template.getBytes());
+
+ Map<String, String> parameters = new HashMap<String, String>();
+ parameters.put("jbosscache-template-variable", "pretty good parameter");
+
+ InputStream configStream = helper.fillTemplate(templateStream, parameters);
+ String config = readStream(configStream);
+ assertTrue(expectedConfig.equals(config));
+ }
+
+ private String readStream(InputStream inputStream) throws IOException
+ {
+ StringBuffer out = new StringBuffer();
+ byte[] b = new byte[4096];
+ for (int n; (n = inputStream.read(b)) != -1;)
+ {
+ out.append(new String(b, 0, n));
+ }
+ return out.toString();
+ }
+}
Added: sandbox/as7_support/branches/gatein-as7/exo.kernel.container/src/test/resources/tsm-excludes.properties
===================================================================
--- sandbox/as7_support/branches/gatein-as7/exo.kernel.container/src/test/resources/tsm-excludes.properties (rev 0)
+++ sandbox/as7_support/branches/gatein-as7/exo.kernel.container/src/test/resources/tsm-excludes.properties 2012-02-24 15:37:53 UTC (rev 8457)
@@ -0,0 +1 @@
+org.exoplatform.container.TestPortalContainer.testGetConfigurationXML=getConfigurationXML
\ No newline at end of file
12 years, 3 months
- 1
- 0
gatein SVN: r8456 - portal/trunk.
by do-not-reply＠jboss.org
Author: mstruk
Date: 2012-02-24 09:34:41 -0500 (Fri, 24 Feb 2012)
New Revision: 8456
Modified:
portal/trunk/pom.xml
Log:
GTNPORTAL-2360 Upgrade JCR 1.14.6-GA
Modified: portal/trunk/pom.xml
===================================================================
--- portal/trunk/pom.xml 2012-02-24 03:19:39 UTC (rev 8455)
+++ portal/trunk/pom.xml 2012-02-24 14:34:41 UTC (rev 8456)
@@ -37,10 +37,10 @@
<name>GateIn - Portal</name>
<properties>
- <org.exoplatform.kernel.version>2.3.2-GA</org.exoplatform.kernel.version>
- <org.exoplatform.core.version>2.4.2-GA</org.exoplatform.core.version>
- <org.exoplatform.ws.version>2.2.2-GA</org.exoplatform.ws.version>
- <org.exoplatform.jcr.version>1.14.2-GA</org.exoplatform.jcr.version>
+ <org.exoplatform.kernel.version>2.3.6-GA</org.exoplatform.kernel.version>
+ <org.exoplatform.core.version>2.4.6-GA</org.exoplatform.core.version>
+ <org.exoplatform.ws.version>2.2.6-GA</org.exoplatform.ws.version>
+ <org.exoplatform.jcr.version>1.14.6-GA</org.exoplatform.jcr.version>
<org.shindig.version>2.0.2-CP01</org.shindig.version>
<nl.captcha.simplecaptcha.version>1.1.1-GA-Patch01</nl.captcha.simplecaptcha.version>
<org.gatein.common.version>2.0.4-GA</org.gatein.common.version>
12 years, 3 months
- 1
- 0
gatein SVN: r8455 - in epp/docs/branches/5.2/User_Guide/en-US: modules and 2 other directories.
by do-not-reply＠jboss.org
Author: jaredmorgs
Date: 2012-02-23 22:19:39 -0500 (Thu, 23 Feb 2012)
New Revision: 8455
Modified:
epp/docs/branches/5.2/User_Guide/en-US/Book_Info.xml
epp/docs/branches/5.2/User_Guide/en-US/Revision_History.xml
epp/docs/branches/5.2/User_Guide/en-US/User_Guide.ent
epp/docs/branches/5.2/User_Guide/en-US/modules/Account.xml
epp/docs/branches/5.2/User_Guide/en-US/modules/account/Register_New_Accounts.xml
epp/docs/branches/5.2/User_Guide/en-US/modules/portal/Manage_Pages.xml
epp/docs/branches/5.2/User_Guide/en-US/modules/portal/Manage_Portals.xml
Log:
Added a Captcha section to the User management chapter of the guide as part of https://bugzilla.redhat.com/show_bug.cgi?id=794451
Modified: epp/docs/branches/5.2/User_Guide/en-US/Book_Info.xml
===================================================================
--- epp/docs/branches/5.2/User_Guide/en-US/Book_Info.xml 2012-02-23 23:15:23 UTC (rev 8454)
+++ epp/docs/branches/5.2/User_Guide/en-US/Book_Info.xml 2012-02-24 03:19:39 UTC (rev 8455)
@@ -8,7 +8,7 @@
<productname>JBoss Enterprise Portal Platform</productname>
<productnumber>5.2</productnumber>
<edition>5.2.1</edition>
- <pubsnumber>3</pubsnumber>
+ <pubsnumber>5</pubsnumber>
<abstract>
<para>
This document provides an easy to follow guide to the functions and
Modified: epp/docs/branches/5.2/User_Guide/en-US/Revision_History.xml
===================================================================
--- epp/docs/branches/5.2/User_Guide/en-US/Revision_History.xml 2012-02-23 23:15:23 UTC (rev 8454)
+++ epp/docs/branches/5.2/User_Guide/en-US/Revision_History.xml 2012-02-24 03:19:39 UTC (rev 8455)
@@ -8,6 +8,34 @@
<simpara>
<revhistory>
<revision>
+ <revnumber>5.2.1-5</revnumber>
+ <date>Fri Feb 24 2012</date>
+ <author>
+ <firstname>Jared</firstname>
+ <surname>Morgan</surname>
+ <email/>
+ </author>
+ <revdescription>
+ <simplelist>
+ <member>Added a Captcha section to the User management chapter of the guide as part of https://bugzilla.redhat.com/show_bug.cgi?id=794451 .</member>
+ </simplelist>
+ </revdescription>
+ </revision>
+ <revision>
+ <revnumber>5.2.1-4</revnumber>
+ <date>Fri Feb 24 2012</date>
+ <author>
+ <firstname>Jared</firstname>
+ <surname>Morgan</surname>
+ <email/>
+ </author>
+ <revdescription>
+ <simplelist>
+ <member>Finalized content for https://bugzilla.redhat.com/show_bug.cgi?id=794408 .</member>
+ </simplelist>
+ </revdescription>
+ </revision>
+ <revision>
<revnumber>5.2.1-3</revnumber>
<date>Wed Feb 22 2012</date>
<author>
Modified: epp/docs/branches/5.2/User_Guide/en-US/User_Guide.ent
===================================================================
--- epp/docs/branches/5.2/User_Guide/en-US/User_Guide.ent 2012-02-23 23:15:23 UTC (rev 8454)
+++ epp/docs/branches/5.2/User_Guide/en-US/User_Guide.ent 2012-02-24 03:19:39 UTC (rev 8455)
@@ -10,10 +10,10 @@
<!ENTITY BZURL "<ulink url='https://bugzilla.redhat.com/enter_bug.cgi?product=JBoss%20Enterpri...'>http://bugzilla.redhat.com/</ulink>">
<!-- Corporate Specifics: -->
-<!ENTITY YEAR "2011">
+<!ENTITY YEAR "2012">
<!ENTITY HOLDER "Red Hat, Inc">
<!-- Version Specifcs: -->
<!ENTITY VX "5">
<!ENTITY VY "5.2">
-<!ENTITY VZ "5.2.0">
\ No newline at end of file
+<!ENTITY VZ "5.2.1">
Modified: epp/docs/branches/5.2/User_Guide/en-US/modules/Account.xml
===================================================================
--- epp/docs/branches/5.2/User_Guide/en-US/modules/Account.xml 2012-02-23 23:15:23 UTC (rev 8454)
+++ epp/docs/branches/5.2/User_Guide/en-US/modules/Account.xml 2012-02-24 03:19:39 UTC (rev 8455)
@@ -1,10 +1,10 @@
-<?xml version='1.0' encoding='utf-8' ?>
+<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
<!ENTITY % BOOK_ENTITIES SYSTEM "../User_Guide.ent">
%BOOK_ENTITIES;
]>
<chapter id="chap-User_Guide-Account">
- <!--
+<!--
Copyright (C) 2009 eXo Platform SAS.
@@ -23,13 +23,10 @@
Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
02110-1301 USA, or see the FSF site: http://www.fsf.org.
- --><title>Accounts</title>
- <xi:include href="account/Register_New_Accounts.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
- <xi:include href="account/Sign_in_and_Sign_out.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
- <xi:include href="account/Remember_User_Account.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
- <xi:include href="account/Change_Account_Settings.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
-<!-- <xi:include href="account/Change_User_Password.xml" xmlns:xi="http://www.w3.org/2001/XInclude" /> - Covered in Change_Account_Setings.xml -->
- <xi:include href="account/Account_and_Password_Retrieval.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
-
+ --> <title>Accounts</title>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="account/Register_New_Accounts.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="account/Sign_in_and_Sign_out.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="account/Remember_User_Account.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="account/Change_Account_Settings.xml"/>
+<!-- <xi:include href="account/Change_User_Password.xml" xmlns:xi="http://www.w3.org/2001/XInclude" /> - Covered in Change_Account_Setings.xml --> <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="account/Account_and_Password_Retrieval.xml"/>
</chapter>
-
Modified: epp/docs/branches/5.2/User_Guide/en-US/modules/account/Register_New_Accounts.xml
===================================================================
--- epp/docs/branches/5.2/User_Guide/en-US/modules/account/Register_New_Accounts.xml 2012-02-23 23:15:23 UTC (rev 8454)
+++ epp/docs/branches/5.2/User_Guide/en-US/modules/account/Register_New_Accounts.xml 2012-02-24 03:19:39 UTC (rev 8455)
@@ -1,114 +1,116 @@
-<?xml version='1.0' encoding='utf-8' ?>
+<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
<!ENTITY % BOOK_ENTITIES SYSTEM "../../User_Guide.ent">
%BOOK_ENTITIES;
]>
<section id="sect-User_Guide-Register_New_Accounts">
- <title>Register New Accounts</title>
- <para>
+ <title>Register New Accounts</title>
+ <para>
Unregistered users visiting a portal in public mode are limited in the content they can see.
</para>
- <para>
+ <para>
Users who need access to deeper content or who need to perform actions within the portal should register themselves and then contact the portal administrator to gain appropriate access permissions to their account.
</para>
- <para>
+ <para>
Users can quickly and easily register a new account for themselves.
</para>
- <procedure>
- <step>
- <para>
+ <procedure>
+ <step>
+ <para>
Click <emphasis role="bold">Register</emphasis> on the Navigation bar.
</para>
-
- <mediaobject>
- <imageobject role="html">
- <imagedata fileref="images/Register.png" format="PNG" align="center" scale="100"/>
- </imageobject>
- <imageobject role="fo">
- <imagedata fileref="images/Register.png" format="PNG" align="center" scalefit="1" contentwidth="150mm" />
- </imageobject>
- </mediaobject>
- <para>
+ <mediaobject>
+ <imageobject role="html">
+ <imagedata align="center" scale="100" fileref="images/Register.png" format="PNG"/>
+ </imageobject>
+ <imageobject role="fo">
+ <imagedata contentwidth="150mm" align="center" scalefit="1" fileref="images/Register.png" format="PNG"/>
+ </imageobject>
+ </mediaobject>
+ <para>
The <emphasis role="bold">Register New Account</emphasis> page appears:
</para>
- <mediaobject>
- <imageobject role="html">
- <imagedata fileref="images/AccountSetting.png" format="PNG" align="center" scale="100"/>
- </imageobject>
- <imageobject role="fo">
- <imagedata fileref="images/AccountSetting.png" format="PNG" align="center" scalefit="1" contentwidth="150mm"/>
- </imageobject>
- </mediaobject>
-
- <para>
+ <mediaobject>
+ <imageobject role="html">
+ <imagedata align="center" scale="100" fileref="images/AccountSetting.png" format="PNG"/>
+ </imageobject>
+ <imageobject role="fo">
+ <imagedata contentwidth="150mm" align="center" scalefit="1" fileref="images/AccountSetting.png" format="PNG"/>
+ </imageobject>
+ </mediaobject>
+ <para>
Complete the form with the required information:
</para>
-
- <variablelist>
- <varlistentry>
- <term><emphasis role="bold">User Name</emphasis></term>
- <listitem>
- <para>
+ <variablelist>
+ <varlistentry>
+ <term>
+ <emphasis role="bold">User Name</emphasis>
+ </term>
+ <listitem>
+ <para>
The name used to log in. This username must be between 3 and 30 characters long, start with a character. Only alpha, digit, underscore, dash and dot characters are allowed for the username. Click the magnifying glass icon beside the user name to check whether the chosen username is available.
</para>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term><emphasis role="bold">Password</emphasis></term>
- <listitem>
- <para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term>
+ <emphasis role="bold">Password</emphasis>
+ </term>
+ <listitem>
+ <para>
The password must be between 6 and 30 characters and can contain spaces.
</para>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term><emphasis role="bold">Confirm Password</emphasis></term>
- <listitem>
- <para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term>
+ <emphasis role="bold">Confirm Password</emphasis>
+ </term>
+ <listitem>
+ <para>
Re-type the password above. The <emphasis>Password</emphasis> and <emphasis>Confirm Password</emphasis> fields must be the same.
</para>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term><emphasis role="bold">First Name</emphasis></term>
- <listitem>
- <para>
- The user's first name. This name must be between 1 and 45 characters long.
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term>
+ <emphasis role="bold">First Name</emphasis>
+ </term>
+ <listitem>
+ <para>
+ The user's first name. This name must be between 1 and 45 characters long.
</para>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term><emphasis role="bold">Last Name</emphasis></term>
- <listitem>
- <para>
- The user's last name. This name must also be between 1 and 45 characters long.
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term>
+ <emphasis role="bold">Last Name</emphasis>
+ </term>
+ <listitem>
+ <para>
+ The user's last name. This name must also be between 1 and 45 characters long.
</para>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term><emphasis role="bold">Email Address</emphasis></term>
- <listitem>
- <para>
- The user's email address. This must be in the appropriate format. For example: <replaceable>username(a)abc.com</replaceable>.
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term>
+ <emphasis role="bold">Email Address</emphasis>
+ </term>
+ <listitem>
+ <para>
+ The user's email address. This must be in the appropriate format. For example: <replaceable>username(a)abc.com</replaceable>.
</para>
- </listitem>
- </varlistentry>
- </variablelist>
- </step>
- <step>
- <para>
- Enter the text displayed at <literal>Text Validation</literal> into the empty field below it:
+ </listitem>
+ </varlistentry>
+ </variablelist>
+ </step>
+ <step>
+ <para>Enter the text displayed at <literal>Text Validation</literal> into the empty field below it.
</para>
- <mediaobject>
- <imageobject role="html">
- <imagedata fileref="images/Verification.png" format="PNG" align="center" scale="100" />
- </imageobject>
- <imageobject role="fo">
- <imagedata fileref="images/Verification.png" format="PNG" align="center" contentwidth="90mm" />
- </imageobject>
- </mediaobject>
- </step>
-
+ <note>
+ <para>This field can be disabled by an administrator by following the instructions in <xref linkend="task-Set_Register_Account_Capcha_Behavior"/>.</para>
+ </note>
+ </step>
<!-- <step>
<para>
Input values in the <emphasis role="bold">User Profile</emphasis> tab, include: Profile information, Home information, Business information. These fields are not required.
@@ -121,58 +123,106 @@
<imagedata fileref="images/UserProfile.png" format="PNG" align="center" width="444" />
</imageobject>
</mediaobject>
- </step> -->
- <step>
- <para>
+ </step> --> <step>
+ <para>
Click <emphasis role="bold">Subscribe</emphasis> to register a new account or <emphasis role="bold">Reset</emphasis> to refresh all entered values. You cannot add a new account if one of the following cases occurs:
</para>
- <itemizedlist>
- <listitem>
- <para>
+ <itemizedlist>
+ <listitem>
+ <para>
The chosen <emphasis role="bold">User name</emphasis> already exists or is invalid.
</para>
- </listitem>
- <listitem>
- <para>
+ </listitem>
+ <listitem>
+ <para>
The <emphasis role="bold">User name</emphasis> has less than 3 characters or more than 30 characters.
</para>
- </listitem>
- <listitem>
- <para>
+ </listitem>
+ <listitem>
+ <para>
The <emphasis role="bold">Password</emphasis> has less than 6 characters or more than 30 characters.
</para>
- </listitem>
- <listitem>
- <para>
+ </listitem>
+ <listitem>
+ <para>
The <emphasis role="bold">Password</emphasis> and <emphasis role="bold">Confirm Password</emphasis> fields are not the same.
</para>
- </listitem>
- <listitem>
- <para>
+ </listitem>
+ <listitem>
+ <para>
The <emphasis role="bold">Email Address</emphasis> format is not valid.
</para>
- </listitem>
- <listitem>
- <para>
+ </listitem>
+ <listitem>
+ <para>
The <emphasis role="bold">text verification</emphasis> is not correct.
</para>
- </listitem>
- <listitem>
- <para>
+ </listitem>
+ <listitem>
+ <para>
A required field (or fields) is empty.
</para>
- </listitem>
- </itemizedlist>
- </step>
- </procedure>
- <para>
+ </listitem>
+ </itemizedlist>
+ </step>
+ </procedure>
+ <para>
After adding a new account, you should contact the administrator to set appropriate permissions on your account.
<note>
- <para>
+ <para>
Be sure you enter your email address carefully. Should you forget your user name or password, you can recover it from this email address.
</para>
- </note>
+ </note>
</para>
+ <section id="Captcha_Behavior">
+ <title><remark>BZ#794451 </remark>Captcha Behavior</title>
+ <para>You can set whether Captcha is used to verify the an actual person. The Captcha behavior is enabled by default in the Register Account portlet.</para>
+ <task id="task-Set_Register_Account_Capcha_Behavior_1">
+ <title><remark>BZ#794451 </remark>Task: Disable "Register New Account" Captcha Behavior</title>
+ <tasksummary>
+ <para>Complete this task to control how Captcha behaves when a user registers an account.</para>
+ </tasksummary>
+ <taskprerequisites>
+ <title>Prerequisites</title>
+ <itemizedlist>
+ <listitem>
+ <para>You are logged into the portal using an account with Administrator privileges.</para>
+ </listitem>
+ </itemizedlist>
+ </taskprerequisites>
+ <procedure>
+ <step>
+ <para>Click <menuchoice>
+ <guimenu>Group</guimenu>
+ <guimenu>Administration</guimenu>
+ <guimenu>Page Management</guimenu>
+ </menuchoice>.</para>
+ </step>
+ <step>
+ <para>Click the <guibutton>Edit Page</guibutton> icon in the Action column for the portal::classic::register Page ID.</para>
+ </step>
+ <step>
+ <para>Click on the Register Account portlet, and then click the Edit Portal icon (pencil icon) to open portlet properties.</para>
+ <note>
+ <para>Click the <guibutton>Switch View mode</guibutton> button in the Page Editor control to switch between WYSIWYG and Object mode.</para>
+ </note>
+ </step>
+ <step>
+ <para>Click the Edit Mode tab (if not already selected), and clear the <guilabel>Use captcha</guilabel> box to disable Captcha verification for new users.</para>
+ </step>
+ <step>
+ <para>Click <guibutton>Save</guibutton>, and then click <guibutton>Close</guibutton> to commit the changes.</para>
+ </step>
+ <step>
+ <para>In the Page Editor control, click <guibutton>Switch View mode</guibutton> to refresh the portlet. </para>
+ </step>
+ <step>
+ <formalpara>
+ <title>Result</title>
+ <para>The Register New Account portlet will no longer display the Captcha field.</para>
+ </formalpara>
+ </step>
+ </procedure>
+ </task>
+ </section>
</section>
-
-
Modified: epp/docs/branches/5.2/User_Guide/en-US/modules/portal/Manage_Pages.xml
===================================================================
--- epp/docs/branches/5.2/User_Guide/en-US/modules/portal/Manage_Pages.xml 2012-02-23 23:15:23 UTC (rev 8454)
+++ epp/docs/branches/5.2/User_Guide/en-US/modules/portal/Manage_Pages.xml 2012-02-24 03:19:39 UTC (rev 8455)
@@ -1,332 +1,354 @@
-<?xml version='1.0' encoding='utf-8' ?>
+<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
<!ENTITY % BOOK_ENTITIES SYSTEM "../../User_Guide.ent">
%BOOK_ENTITIES;
]>
<section id="sect-User_Guide-Manage_Pages">
- <title>Manage Pages</title>
- <section id="sect-User_Guide-Manage_Pages-Adding_a_new_Page">
- <title>Adding a new Page</title>
-
- <section id="sect-User_Guide-Page_Creation_Wizard">
- <title>Adding a new Page using Page Creation Wizard</title>
- <para>
+ <title>Manage Pages</title>
+ <section id="sect-User_Guide-Manage_Pages-Adding_a_new_Page">
+ <title>Adding a new Page</title>
+ <section id="sect-User_Guide-Page_Creation_Wizard">
+ <title>Adding a new Page using Page Creation Wizard</title>
+ <para>
A page creation wizard is available to administrators in order to create and publish portal pages quickly and easily.
</para>
- <procedure>
- <step>
- <para>
+ <procedure>
+ <step>
+ <para>
Mouse over <emphasis role="bold">Site Editor</emphasis> then select <emphasis role="bold">Add New Page</emphasis>.
</para>
- <mediaobject>
- <imageobject role="html">
- <imagedata fileref="images/Wizard1.png" format="PNG" align="center" scale="100" />
- </imageobject>
- <imageobject role="fo">
- <imagedata fileref="images/Wizard1.png" format="PNG" align="center" contentwidth="150mm" />
- </imageobject>
- </mediaobject>
- </step>
- <step>
- <para>
+ <mediaobject>
+ <imageobject role="html">
+ <imagedata align="center" scale="100" fileref="images/Wizard1.png" format="PNG"/>
+ </imageobject>
+ <imageobject role="fo">
+ <imagedata contentwidth="150mm" align="center" fileref="images/Wizard1.png" format="PNG"/>
+ </imageobject>
+ </mediaobject>
+ </step>
+ <step>
+ <para>
The wizard window is divided into two sections: the left pane contains the existing page/node hierarchy and the right pane displays the <emphasis role="bold">Page Editor</emphasis>.
</para>
-
- </step>
- <step>
- <para>
+ </step>
+ <step>
+ <para>
In the left pane, you can navigate up and down the node/page structure:
</para>
- <mediaobject>
- <imageobject role="html">
- <imagedata fileref="images/Pagewizard1.png" format="PNG" align="center" scale="100" />
- </imageobject>
- <imageobject role="fo">
- <imagedata fileref="images/Pagewizard1.png" format="PNG" align="center" contentwidth="150mm" />
- </imageobject>
- </mediaobject>
- </step>
- <step>
- <para>
+ <mediaobject>
+ <imageobject role="html">
+ <imagedata align="center" scale="100" fileref="images/Pagewizard1.png" format="PNG"/>
+ </imageobject>
+ <imageobject role="fo">
+ <imagedata contentwidth="150mm" align="center" fileref="images/Pagewizard1.png" format="PNG"/>
+ </imageobject>
+ </mediaobject>
+ </step>
+ <step>
+ <para>
In the right pane are the required parameters for a new page:
</para>
- <variablelist>
- <varlistentry>
- <term><emphasis role="bold">Current Selected Page Node</emphasis></term>
- <listitem>
- <para>
+ <variablelist>
+ <varlistentry>
+ <term>
+ <emphasis role="bold">Current Selected Page Node</emphasis>
+ </term>
+ <listitem>
+ <para>
The path of the selected node to add a new sub page
</para>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term><emphasis role="bold">Node Name</emphasis></term>
- <listitem>
- <para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term>
+ <emphasis role="bold">Node Name</emphasis>
+ </term>
+ <listitem>
+ <para>
The node name of the added page. It is required field. This field must start with a character and must have a length between 3 and 30 characters.
</para>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term>Extended label mode</term>
- <listitem>
- <para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term>Extended label mode</term>
+ <listitem>
+ <para>
This is a new feature which allows Administrators to add labels to pages in multiple supported languages. When the language of the site is changed, the pages will display the appropriate localized label.
</para>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term>Language</term>
- <listitem>
- <para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term>Language</term>
+ <listitem>
+ <para>
Set the language for the page.
</para>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term><emphasis role="bold">Display Name</emphasis></term>
- <listitem>
- <para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term>
+ <emphasis role="bold">Display Name</emphasis>
+ </term>
+ <listitem>
+ <para>
The display name of the node which contains the added page and must have a length between 3 and 30 characters.
</para>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term><emphasis role="bold">Visible</emphasis></term>
- <listitem>
- <para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term>
+ <emphasis role="bold">Visible</emphasis>
+ </term>
+ <listitem>
+ <para>
This checkbox toggles the global visibility of this page.
</para>
- <para>
- 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>
+ 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>
+ <para>
If unchecked, the page is not shown in the site map or navigation bar.
</para>
- <important>
- <title>Non-visible Pages and Security</title>
- <para>
- The <guilabel>Visible</guilabel> checkbox should <emphasis role="bold">not</emphasis> be used as a security measure, as <emphasis role="bold">non-visible pages will still be accessible using a direct URL</emphasis>, such as <ulink type="http" url="http://localhost:8080/portal/private/classic/pagename"></ulink>.
+ <important>
+ <title>Non-visible Pages and Security</title>
+ <para>
+ The <guilabel>Visible</guilabel> checkbox should <emphasis role="bold">not</emphasis> be used as a security measure, as <emphasis role="bold">non-visible pages will still be accessible using a direct URL</emphasis>, such as <ulink url="http://localhost:8080/portal/private/classic/pagename" type="http"/>.
</para>
- </important>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term><emphasis role="bold">Publication date & time</emphasis></term>
- <listitem>
- <para>
+ </important>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term>
+ <emphasis role="bold">Publication date & time</emphasis>
+ </term>
+ <listitem>
+ <para>
This option allows publishing the page for a period of time. If this option is checked the visibility of the page depends on the publication period start and end date.
</para>
- <important>
- <title>Publication Dates and Security</title>
- <para>
+ <important>
+ <title>Publication Dates and Security</title>
+ <para>
The <guilabel>Publication Date & Time</guilabel> functionality should <emphasis role="bold">not</emphasis> be used as a security measure, as pages configured for time-specific publication <emphasis role="bold">will always be accessible using a direct URL</emphasis> regardless of publication dates.
</para>
- </important>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term><emphasis role="bold">Start Publication Date</emphasis></term>
- <listitem>
- <para>
+ </important>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term>
+ <emphasis role="bold">Start Publication Date</emphasis>
+ </term>
+ <listitem>
+ <para>
The start date and time to publish the page. <emphasis role="bold">This field is only visible if the <emphasis>Publication date & time</emphasis> box is checked</emphasis>.
</para>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term><emphasis role="bold">End Publication Date</emphasis></term>
- <listitem>
- <para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term>
+ <emphasis role="bold">End Publication Date</emphasis>
+ </term>
+ <listitem>
+ <para>
The end date and time to publish the page. <emphasis role="bold">This field is only visible if the <emphasis>Publication date & time</emphasis> box is checked</emphasis>.
</para>
- </listitem>
- </varlistentry>
- </variablelist>
- <note>
- <title><emphasis role="bold">Setting Time and Date</emphasis></title>
- <para>
+ </listitem>
+ </varlistentry>
+ </variablelist>
+ <note>
+ <title>
+ <emphasis role="bold">Setting Time and Date</emphasis>
+ </title>
+ <para>
You can set date and time by clicking the <emphasis role="bold">Start Publication Date</emphasis> field and <emphasis role="bold">End Publication Date</emphasis> field and select a date in the calendar pop up.
</para>
- </note>
+ </note>
<!--
<mediaobject>
<imageobject>
<imagedata fileref="images/Calendar.png" format="PNG" />
</imageobject>
</mediaobject>
--->
-
- </step>
- <step>
- <para>
- Click <emphasis role="bold">Next</emphasis> or number '2' of the wizard steps to go to step 2.
+--> </step>
+ <step>
+ <para>
+ Click <emphasis role="bold">Next</emphasis> or number '2' of the wizard steps to go to step 2.
</para>
- <mediaobject>
- <imageobject role="html">
- <imagedata fileref="images/PageWizard2.png" format="PNG" align="center" scale="100" />
- </imageobject>
- <imageobject role="fo">
- <imagedata fileref="images/PageWizard2.png" format="PNG" align="center" contentwidth="150mm" />
- </imageobject>
- </mediaobject>
- </step>
- <step>
- <para>
+ <mediaobject>
+ <imageobject role="html">
+ <imagedata align="center" scale="100" fileref="images/PageWizard2.png" format="PNG"/>
+ </imageobject>
+ <imageobject role="fo">
+ <imagedata contentwidth="150mm" align="center" fileref="images/PageWizard2.png" format="PNG"/>
+ </imageobject>
+ </mediaobject>
+ </step>
+ <step>
+ <para>
Select <emphasis role="bold">Empty Layout</emphasis> or click the drop-down arrow at the top of the right pane to see more templates to select.
</para>
- </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 pop-up panel into the main pane to create the content of this page.
+ </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 pop-up panel into the main pane to create the content of this page.
</para>
- <mediaobject>
- <imageobject role="html">
- <imagedata fileref="images/PageWizard3.png" format="PNG" align="center" scale="100" />
- </imageobject>
- <imageobject role="fo">
- <imagedata fileref="images/PageWizard3.png" format="PNG" align="center" contentwidth="150mm" />
- </imageobject>
- </mediaobject>
- <variablelist>
- <varlistentry>
- <term>Applications</term>
- <listitem>
- <para>
+ <mediaobject>
+ <imageobject role="html">
+ <imagedata align="center" scale="100" fileref="images/PageWizard3.png" format="PNG"/>
+ </imageobject>
+ <imageobject role="fo">
+ <imagedata contentwidth="150mm" align="center" fileref="images/PageWizard3.png" format="PNG"/>
+ </imageobject>
+ </mediaobject>
+ <variablelist>
+ <varlistentry>
+ <term>Applications</term>
+ <listitem>
+ <para>
Allows listing all existing portlets
</para>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term>Containers</term>
- <listitem>
- <para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term>Containers</term>
+ <listitem>
+ <para>
Allows listing all existing containers
</para>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term>View Page properties</term>
- <listitem>
- <para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term>View Page properties</term>
+ <listitem>
+ <para>
Allows reviewing or changing various page settings (<guilabel>title</guilabel>, <guilabel>Page ID</guilabel> and more) and/or page permissions.
</para>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term>Switch View mode</term>
- <listitem>
- <para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term>Switch View mode</term>
+ <listitem>
+ <para>
Allows viewing a page in preview mode
</para>
- </listitem>
- </varlistentry>
- </variablelist>
- </step>
- <step>
- <para>
+ </listitem>
+ </varlistentry>
+ </variablelist>
+ </step>
+ <step>
+ <para>
You can click on the <emphasis role="bold">Switch View mode</emphasis> button to view the content of this page. You can switch between viewing the page by layout (showing containers and portlets) or to preview how the page will look when live. The contents of the page can be edited in either mode.
</para>
- </step>
- <step>
- <para>
+ </step>
+ <step>
+ <para>
Once you have configured the new page, use the icons located in the top right corner of the <emphasis role="bold">Page Editor</emphasis> window to navigate as required:
</para>
- <para>
+ <para>
Click <emphasis role="bold">Back</emphasis> (the small left-facing arrow) to return the previous step, <emphasis role="bold">Save</emphasis> (the small disk icon) to create the new page or <emphasis role="bold">Abort</emphasis> (the small cross) to quit without creating a new page.
</para>
- </step>
- </procedure>
- </section>
-
-
- <section id="sect-User_Guide-Manage_Pages-Add_a_new_Page_in_the_Page_List">
- <title>Adding a new Page using Page Management</title>
- <procedure>
- <step>
- <para>
+ </step>
+ </procedure>
+ </section>
+ <section id="sect-User_Guide-Manage_Pages-Add_a_new_Page_in_the_Page_List">
+ <title>Adding a new Page using Page Management</title>
+ <procedure>
+ <step>
+ <para>
Mouse over <emphasis role="bold">Group</emphasis> in the Toolbar, highlight <emphasis role="bold">Administration</emphasis> then select <emphasis role="bold">Page Management</emphasis>.
</para>
- <mediaobject>
- <imageobject>
- <imagedata fileref="images/ManagePage.png" format="PNG" align="center" scale="100"/>
- </imageobject>
- </mediaobject>
- </step>
- <step>
- <para>
+ <mediaobject>
+ <imageobject>
+ <imagedata align="center" scale="100" fileref="images/ManagePage.png" format="PNG"/>
+ </imageobject>
+ </mediaobject>
+ </step>
+ <step>
+ <para>
Click on <emphasis role="bold">Add New Page</emphasis>.
</para>
- </step>
- <step>
- <para>
+ </step>
+ <step>
+ <para>
The fields in this window are:
</para>
- <variablelist>
- <varlistentry>
- <term><emphasis role="bold">Page Id</emphasis></term>
- <listitem>
- <para>
+ <variablelist>
+ <varlistentry>
+ <term>
+ <emphasis role="bold">Page Id</emphasis>
+ </term>
+ <listitem>
+ <para>
A string that identifies the page. It is automatically generated when you finish creating the page.
</para>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term><emphasis role="bold">Owner type</emphasis></term>
- <listitem>
- <para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term>
+ <emphasis role="bold">Owner type</emphasis>
+ </term>
+ <listitem>
+ <para>
If the page <emphasis role="bold">Owner type</emphasis> is set to <emphasis>portal</emphasis> the page is created with shared ownership portal. Therefore users who have <emphasis>edit</emphasis> permissions on the <emphasis>portal</emphasis> level can edit this page type.
</para>
- <para>
+ <para>
If the page <emphasis role="bold">Owner type</emphasis> is <emphasis>group</emphasis> the page is created for a group. Therefore users who have <emphasis>manager</emphasis> permissions for that <emphasis>group</emphasis> can edit this page type.
</para>
- <mediaobject>
- <imageobject role="html">
- <imagedata fileref="images/PageSetting1.png" format="PNG" align="center" scale="100" />
- </imageobject>
- <imageobject role="fo">
- <imagedata fileref="images/PageSetting1.png" format="PNG" align="center" contentwidth="150mm" />
- </imageobject>
- </mediaobject>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term><emphasis role="bold">Owner Id</emphasis></term>
- <listitem>
- <para>
+ <mediaobject>
+ <imageobject role="html">
+ <imagedata align="center" scale="100" fileref="images/PageSetting1.png" format="PNG"/>
+ </imageobject>
+ <imageobject role="fo">
+ <imagedata contentwidth="150mm" align="center" fileref="images/PageSetting1.png" format="PNG"/>
+ </imageobject>
+ </mediaobject>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term>
+ <emphasis role="bold">Owner Id</emphasis>
+ </term>
+ <listitem>
+ <para>
The name of the current portal is automatically selected for <emphasis role="bold">Owner id</emphasis> ensuring the edit permissions are assigned to users who can edit the current portal.
</para>
- <para>
- When the owner type is set to <emphasis>group</emphasis>, a list of groups will allow you to select one user as the 'owner'.
+ <para>
+ When the owner type is set to <emphasis>group</emphasis>, a list of groups will allow you to select one user as the 'owner'.
</para>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term><emphasis role="bold">Page Name</emphasis></term>
- <listitem>
- <para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term>
+ <emphasis role="bold">Page Name</emphasis>
+ </term>
+ <listitem>
+ <para>
The name of the page. This is a required field and must be unique. Only alphabetical, numerical, dash and underscore characters are allowed to be used for this field and the name must be at least 3 and no more than 30 characters in length.
</para>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term><emphasis role="bold">Page title</emphasis></term>
- <listitem>
- <para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term>
+ <emphasis role="bold">Page title</emphasis>
+ </term>
+ <listitem>
+ <para>
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 120 characters in length.
</para>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term><emphasis role="bold">Show Max Window</emphasis></term>
- <listitem>
- <para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term>
+ <emphasis role="bold">Show Max Window</emphasis>
+ </term>
+ <listitem>
+ <para>
The option allows users to choose whether the page is shown at maximum size or not.
</para>
- </listitem>
- </varlistentry>
- </variablelist>
- </step>
- <!-- <step>
+ </listitem>
+ </varlistentry>
+ </variablelist>
+ </step>
+<!-- <step>
<para>
Enter values for fields in the <emphasis role="bold">Permission Setting</emphasis> tab
</para>
@@ -375,73 +397,71 @@
</listitem>
</varlistentry>
</variablelist>
- </step> -->
- <step>
- <para>
+ </step> --> <step>
+ <para>
Click <emphasis role="bold">Save</emphasis>.
</para>
- </step>
- </procedure>
- </section>
+ </step>
+ </procedure>
</section>
-
- <section id="sect-User_Guide-Manage_Pages-Edit_a_Page">
- <title>Edit a Page</title>
- <procedure>
- <step>
- <para>
+ </section>
+ <section id="sect-User_Guide-Manage_Pages-Edit_a_Page">
+ <title>Edit a Page</title>
+ <procedure>
+ <step>
+ <para>
Mouse over <emphasis role="bold">Group</emphasis> in the Toolbar. Highlight <emphasis role="bold">Administration</emphasis> and then click on <emphasis role="bold">Page Management</emphasis>.
</para>
- </step>
- <step>
- <para>
+ </step>
+ <step>
+ <para>
Click the edit icon on the row of page you want to edit in the existing page list.
</para>
- <para>
+ <para>
Click View Page properties icon to show a form to edit page properties.
</para>
- </step>
- <step>
- <para>
+ </step>
+ <step>
+ <para>
The properties presented in the <emphasis role="bold">Page Properties</emphasis> window are the same as those outlined in <xref linkend="sect-User_Guide-Manage_Pages-Add_a_new_Page_in_the_Page_List"/>.
</para>
- <variablelist>
- <varlistentry>
- <term>Permission Setting</term>
- <listitem>
- <para>
+ <variablelist>
+ <varlistentry>
+ <term>Permission Setting</term>
+ <listitem>
+ <para>
Permission on each page is set in two levels: <emphasis role="bold">Access right</emphasis> and <emphasis role="bold">Edit right</emphasis>.
</para>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term>Access right</term>
- <listitem>
- <para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term>Access right</term>
+ <listitem>
+ <para>
<emphasis role="bold">Access right</emphasis> can be set to specific user groups or set to everyone (this includes unregistered users).
</para>
- <para>
+ <para>
Current access permissions on page are listed in <guilabel>Access Permission Setting</guilabel> tab and you can remove permissions (by clicking the <guilabel>delete</guilabel> icon) or add further permission (by clicking the <guilabel>Add Permission</guilabel> button).
</para>
- <para>
+ <para>
Populating the <emphasis role="bold">Make it public</emphasis> check box will allow all users (registered or unregistered) to access the page.
</para>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term>Edit right</term>
- <listitem>
- <para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term>Edit right</term>
+ <listitem>
+ <para>
The <emphasis role="bold">Edit right</emphasis> allows users to change information on a page. <emphasis role="bold">Edit right</emphasis> only is set for a group of users.
</para>
- <para>
+ <para>
<emphasis role="bold">Edit right</emphasis> can be set for one specific membership type within a particular group (<emphasis role="bold">*</emphasis> allows every membership type in a group). If you want to re-assign this right to another group, click <guilabel>Select Permission</guilabel> in <guilabel>Edit Permission Setting</guilabel> tab to choose another one.
</para>
- </listitem>
- </varlistentry>
- </variablelist>
- </step>
- <!--<step>
+ </listitem>
+ </varlistentry>
+ </variablelist>
+ </step>
+<!--<step>
<variablelist>
<varlistentry>
<term>Editing page container layout</term>
@@ -478,79 +498,121 @@
</listitem>
</varlistentry>
</variablelist>
- </step> -->
- </procedure>
- </section>
-
+ </step> --> </procedure>
+ </section>
<!-- <section id="sect-User_Guide-Manage_Pages-View_a_Page">
<title>View a Page</title>
<para>
View any page in the existing pages list by clicking on the <emphasis role="bold">View</emphasis> icon corresponding to the page you want to view.
</para>
- </section> -->
-
- <section id="sect-User_Guide-Manage_Pages-Delete_a_Page">
- <title>Delete a Page</title>
- <procedure>
- <step>
- <para>
+ </section> --> <section id="sect-User_Guide-Manage_Pages-Delete_a_Page">
+ <title>Delete a Page</title>
+ <procedure>
+ <step>
+ <para>
Mouse over <emphasis role="bold">Group</emphasis> in the Toolbar. Highlight <emphasis role="bold">Administration</emphasis> and then click on <emphasis role="bold">Page Management</emphasis>. You will be presented with a list of all existing pages.
</para>
- </step>
- <step>
- <para>
+ </step>
+ <step>
+ <para>
Click the trash can icon in the row of the page you want to delete. It will display the confirmation message.
</para>
- <mediaobject>
- <imageobject>
- <imagedata fileref="images/httpPage.png" format="PNG" align="center" />
- </imageobject>
- </mediaobject>
- </step>
- <step>
- <para>
+ <mediaobject>
+ <imageobject>
+ <imagedata align="center" fileref="images/httpPage.png" format="PNG"/>
+ </imageobject>
+ </mediaobject>
+ </step>
+ <step>
+ <para>
Click the <emphasis role="bold">OK</emphasis> button to complete the deletion or <emphasis role="bold">Cancel</emphasis> button to quit without deleting the page.
</para>
- </step>
- </procedure>
- </section>
-
- <section id="sect-User_Guide-Drag_and_Drop_the_Page_Body">
- <title>Drag and Drop the Page Body</title>
- <para>
+ </step>
+ </procedure>
+ </section>
+ <section id="sect-User_Guide-Drag_and_Drop_the_Page_Body">
+ <title>Drag and Drop the Page Body</title>
+ <para>
To assist administrators to modify or personalize their portal JBoss Enterprise Portal Platform allows you to easily drag and drop page content within the page.
</para>
- <procedure>
- <step>
- <para>
+ <procedure>
+ <step>
+ <para>
Mouse over <emphasis role="bold">Site Editor</emphasis> in the toolbar and click on <emphasis role="bold">Edit Layout</emphasis> It will display :
</para>
- <mediaobject>
- <imageobject role="html">
- <imagedata fileref="images/DragPage1.png" format="PNG" align="center" scale="100" />
- </imageobject>
- <imageobject role="fo">
- <imagedata fileref="images/DragPage1.png" format="PNG" align="center" contentwidth="150mm" />
- </imageobject>
- </mediaobject>
- </step>
- <step>
- <para>
+ <mediaobject>
+ <imageobject role="html">
+ <imagedata align="center" scale="100" fileref="images/DragPage1.png" format="PNG"/>
+ </imageobject>
+ <imageobject role="fo">
+ <imagedata contentwidth="150mm" align="center" fileref="images/DragPage1.png" format="PNG"/>
+ </imageobject>
+ </mediaobject>
+ </step>
+ <step>
+ <para>
Click on the <emphasis role="bold">Portal Page</emphasis>, drag and drop within the portal page.
</para>
- <mediaobject>
- <imageobject role="html">
- <imagedata fileref="images/DragPage3.png" format="PNG" align="center" scale="100" />
- </imageobject>
- <imageobject role="fo">
- <imagedata fileref="images/DragPage3.png" format="PNG" align="center" contentwidth="150mm" />
- </imageobject>
- </mediaobject>
- </step>
- </procedure>
- </section>
-
-
+ <mediaobject>
+ <imageobject role="html">
+ <imagedata align="center" scale="100" fileref="images/DragPage3.png" format="PNG"/>
+ </imageobject>
+ <imageobject role="fo">
+ <imagedata contentwidth="150mm" align="center" fileref="images/DragPage3.png" format="PNG"/>
+ </imageobject>
+ </mediaobject>
+ </step>
+ </procedure>
+ </section>
+ <section>
+ <title>Captcha</title>
+ <para>You can set whether Captcha is used to verify a user is an actual person. The Captcha behavior is set in the Register Account portlet by default.</para>
+ <task id="task-Set_Register_Account_Capcha_Behavior">
+ <title>Task: Disable "Register New Account" Captcha Behavior</title>
+ <tasksummary>
+ <para>Complete this task to control how Captcha behaves when a user registers an account.</para>
+ </tasksummary>
+ <taskprerequisites>
+ <title>Prerequisites</title>
+ <itemizedlist>
+ <listitem>
+ <para>You are logged into the portal using an account with Administrator privileges.</para>
+ </listitem>
+ </itemizedlist>
+ </taskprerequisites>
+ <procedure>
+ <step>
+ <para>Click <menuchoice>
+ <guimenu>Group</guimenu>
+ <guimenu>Administration</guimenu>
+ <guimenu>Page Management</guimenu>
+ </menuchoice> to display a page containing the .</para>
+ </step>
+ <step>
+ <para>Click the <guibutton>Edit Page</guibutton> icon in the Action column for the portal::classic::register Page ID.</para>
+ </step>
+ <step>
+ <para>Click on the Register Account portlet, and then click the Edit Portal icon (pencil icon) to open portlet properties.</para>
+ <note>
+ <para>Click the <guibutton>Switch View mode</guibutton> button in the Page Editor control to switch between WYSIWYG and Object mode.</para>
+ </note>
+ </step>
+ <step>
+ <para>Click the Edit Mode tab (if not already selected), and clear the <guilabel>Use captcha</guilabel> box to disable Captcha verification for new users.</para>
+ </step>
+ <step>
+ <para>Click Save, and then click Close to commit the changes.</para>
+ </step>
+ <step>
+ <para>In the Page Editor control, click Switch View mode to refresh the portlet. </para>
+ </step>
+ <step>
+ <formalpara>
+ <title>Result</title>
+ <para>The Register New Account portlet will no longer display the Captcha field.</para>
+ </formalpara>
+ </step>
+ </procedure>
+ </task>
+ </section>
</section>
-
-
Modified: epp/docs/branches/5.2/User_Guide/en-US/modules/portal/Manage_Portals.xml
===================================================================
--- epp/docs/branches/5.2/User_Guide/en-US/modules/portal/Manage_Portals.xml 2012-02-23 23:15:23 UTC (rev 8454)
+++ epp/docs/branches/5.2/User_Guide/en-US/modules/portal/Manage_Portals.xml 2012-02-24 03:19:39 UTC (rev 8455)
@@ -246,7 +246,7 @@
More information about actions possible in this window can be found in <xref linkend="sect-User_Guide-Manage_Navigation_Nodes"/>
</para>
</section>
- <section>
+ <section id="Export_and_Import">
<title><remark>BZ#794408 NEEDINFO </remark>Export and Import</title>
<para>You can export and import portals and groups using the controls provided in the <menuchoice>
<guimenu>Group</guimenu>
@@ -363,25 +363,25 @@
<varlistentry>
<term>Conserve</term>
<listitem>
- <para><remark>NEEDINFO</remark></para>
+ <para>Import data only if no artifacts exist. For example, if one page exists for the site 'classic', and you attempt to import a 'classic' site archive, the import will fail.</para>
</listitem>
</varlistentry>
<varlistentry>
<term>Insert</term>
<listitem>
- <para><remark>NEEDINFO</remark></para>
+ <para>Import data when no data exists. If data already exists, the import will fail.</para>
</listitem>
</varlistentry>
<varlistentry>
<term>Merge</term>
<listitem>
- <para><remark>Guessing what this option means because I have no links to source information.</remark>Merges the differences between the existing portal or group.</para>
+ <para>Import data when no data exists for the site. If data already exists, the site is updated with the differences from the imported archive.</para>
</listitem>
</varlistentry>
<varlistentry>
<term>Overwrite</term>
<listitem>
- <para><remark>Guessing what this option means because I have no links to source information.</remark>Overwrites the portal if a portal of the same name exists.</para>
+ <para>Delete all existing site data for the artifact, and import all data from the archive.</para>
</listitem>
</varlistentry>
</variablelist>
@@ -390,7 +390,7 @@
<para>Click <guibutton>Import</guibutton></para>
<formalpara>
<title>Result</title>
- <para>The selected archive is imported, with the import mode applied to the files contained within the Zip.</para>
+ <para>The selected archive is imported, with the import mode behavior applied to the files contained within the Zip.</para>
</formalpara>
</step>
</procedure>
12 years, 3 months
- 1
- 0
gatein SVN: r8454 - in epp/docs/branches/5.2/Admin_Guide: en-US and 1 other directory.
by do-not-reply＠jboss.org
Author: jaredmorgs
Date: 2012-02-23 18:15:23 -0500 (Thu, 23 Feb 2012)
New Revision: 8454
Modified:
epp/docs/branches/5.2/Admin_Guide/en-US/Administration_Guide.xml
epp/docs/branches/5.2/Admin_Guide/en-US/Book_Info.xml
epp/docs/branches/5.2/Admin_Guide/en-US/Revision_History.xml
epp/docs/branches/5.2/Admin_Guide/en-US/chapter-4-Management_Extensions.xml
epp/docs/branches/5.2/Admin_Guide/publican.cfg
Log:
Added link back to User Guide for export-resource and import-resource GUI (Export/Import Site) as part of https://bugzilla.redhat.com/show_bug.cgi?id=794408
Modified: epp/docs/branches/5.2/Admin_Guide/en-US/Administration_Guide.xml
===================================================================
--- epp/docs/branches/5.2/Admin_Guide/en-US/Administration_Guide.xml 2012-02-22 19:27:28 UTC (rev 8453)
+++ epp/docs/branches/5.2/Admin_Guide/en-US/Administration_Guide.xml 2012-02-23 23:15:23 UTC (rev 8454)
@@ -1,15 +1,15 @@
-<?xml version='1.0' encoding='utf-8' ?>
+<?xml version='1.0' encoding='UTF-8'?>
+<!-- This document was created with Syntext Serna Free. -->
<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-<!ENTITY % BOOK_ENTITIES SYSTEM "Admin_Guide.ent">
+<!ENTITY % BOOK_ENTITIES SYSTEM "Administration_Guide.ent">
%BOOK_ENTITIES;
]>
<book>
- <xi:include href="Book_Info.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
- <xi:include href="Preface.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
- <xi:include href="chapter-1-Introduction.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
- <xi:include href="chapter-2-REST.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
- <xi:include href="chapter-3-Command_Line_Interface.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
- <xi:include href="chapter-4-Management_Extensions.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
- <xi:include href="Revision_History.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Book_Info.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Preface.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="chapter-1-Introduction.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="chapter-2-REST.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="chapter-3-Command_Line_Interface.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="chapter-4-Management_Extensions.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Revision_History.xml"/>
</book>
-
Modified: epp/docs/branches/5.2/Admin_Guide/en-US/Book_Info.xml
===================================================================
--- epp/docs/branches/5.2/Admin_Guide/en-US/Book_Info.xml 2012-02-22 19:27:28 UTC (rev 8453)
+++ epp/docs/branches/5.2/Admin_Guide/en-US/Book_Info.xml 2012-02-23 23:15:23 UTC (rev 8454)
@@ -1,31 +1,27 @@
-<?xml version='1.0' encoding='utf-8' ?>
+<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE bookinfo PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
<!ENTITY % BOOK_ENTITIES SYSTEM "Admin_Guide.ent">
%BOOK_ENTITIES;
]>
<bookinfo id="book-Admin_Guide-Admin_Guide">
- <title>Administration Guide</title>
- <subtitle>For use with JBoss Enterprise Portal Platform 5</subtitle>
- <productname>JBoss Enterprise Portal Platform</productname>
- <productnumber>5.2</productnumber>
- <edition>5.2.0</edition>
- <pubsnumber>100</pubsnumber>
- <abstract>
- <para>
+ <title>Administration Guide</title>
+ <subtitle>For use with JBoss Enterprise Portal Platform 5</subtitle>
+ <productname>JBoss Enterprise Portal Platform</productname>
+ <productnumber>5.2</productnumber>
+ <edition>5.2.1</edition>
+ <pubsnumber>1</pubsnumber>
+ <abstract>
+ <para>
This document is a guide to administering an implementation of JBoss Enterprise Portal Platform. It is intended for System Administrators and assumes a high level of technical knowledge.
</para>
-
- </abstract>
- <corpauthor>
- <inlinemediaobject>
- <imageobject>
- <imagedata fileref="Common_Content/images/title_logo.png" format="PNG" />
- </imageobject>
-
- </inlinemediaobject>
-
- </corpauthor>
- <xi:include href="Common_Content/Legal_Notice.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
- <xi:include href="Author_Group.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+ </abstract>
+ <corpauthor>
+ <inlinemediaobject>
+ <imageobject>
+ <imagedata fileref="Common_Content/images/title_logo.png" format="PNG"/>
+ </imageobject>
+ </inlinemediaobject>
+ </corpauthor>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Common_Content/Legal_Notice.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Author_Group.xml"/>
</bookinfo>
-
Modified: epp/docs/branches/5.2/Admin_Guide/en-US/Revision_History.xml
===================================================================
--- epp/docs/branches/5.2/Admin_Guide/en-US/Revision_History.xml 2012-02-22 19:27:28 UTC (rev 8453)
+++ epp/docs/branches/5.2/Admin_Guide/en-US/Revision_History.xml 2012-02-23 23:15:23 UTC (rev 8454)
@@ -1,107 +1,110 @@
-<?xml version='1.0' encoding='utf-8' ?>
+<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE appendix PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
<!ENTITY % BOOK_ENTITIES SYSTEM "Admin_Guide.ent">
%BOOK_ENTITIES;
]>
<appendix id="appe-Admin_Guide-Revision_History">
- <title>Revision History</title>
- <simpara>
- <revhistory>
- <revision>
- <revnumber>5.2.0-100</revnumber>
- <date>Wed Dec 14 2011</date>
- <author>
- <firstname>Scott</firstname>
- <surname>Mumford</surname>
- <email></email>
- </author>
- <revdescription>
- <simplelist>
- <member>Publication build.</member>
- </simplelist>
- </revdescription>
- </revision>
- <revision>
- <revnumber>5.2.0-8</revnumber>
- <date>Mon Dec 12 2011</date>
- <author>
- <firstname>Scott</firstname>
- <surname>Mumford</surname>
- <email></email>
- </author>
- <revdescription>
- <simplelist>
- <member>JBEPP-1450: Changed gatein-management-cli deploy instructions for production docs.</member>
- </simplelist>
- </revdescription>
- </revision>
- <revision>
- <revnumber>5.2.0-7</revnumber>
- <date>Wed Dec 7 2011</date>
- <author>
- <firstname>Scott</firstname>
- <surname>Mumford</surname>
- <email></email>
- </author>
- <revdescription>
- <simplelist>
- <member>Updated with 'xml-escaping during export' problem fix.</member>
- </simplelist>
- </revdescription>
- </revision>
- <revision>
- <revnumber>5.2.0-4</revnumber>
- <date>Tue Nov 15 2011</date>
- <author>
- <firstname>Scott</firstname>
- <surname>Mumford</surname>
- <email></email>
- </author>
- <revdescription>
- <simplelist>
- <member>Staged for beta release.</member>
- </simplelist>
- </revdescription>
- </revision>
- <revision>
- <revnumber>5.2.0-3</revnumber>
- <date>Wed Oct 19 2011</date>
- <author>
- <firstname>Scott</firstname>
- <surname>Mumford</surname>
- <email></email>
-
- </author>
- <revdescription>
- <simplelist>
- <member>Added to brew system.</member>
-
- </simplelist>
-
- </revdescription>
-
- </revision>
- <revision>
- <revnumber>5.2.0-1</revnumber>
- <date>Wed Oct 12 2011</date>
- <author>
- <firstname>Nick</firstname>
- <surname>Scavelli</surname>
- <email>nscavell(a)redhat.com</email>
-
- </author>
- <revdescription>
- <simplelist>
- <member>Initial creation of book.</member>
-
- </simplelist>
-
- </revdescription>
-
- </revision>
-
- </revhistory>
-
- </simpara>
+ <title>Revision History</title>
+ <simpara>
+ <revhistory>
+ <revision>
+ <revnumber>5.2.1-1</revnumber>
+ <date>Fri Feb 24 2012</date>
+ <author>
+ <firstname>Jared</firstname>
+ <surname>Morgan</surname>
+ <email/>
+ </author>
+ <revdescription>
+ <simplelist>
+ <member>Added link back to User Guide for export-resource and import-resource GUI (Export/Import Site) as part of https://bugzilla.redhat.com/show_bug.cgi?id=794408.</member>
+ </simplelist>
+ </revdescription>
+ </revision>
+ <revision>
+ <revnumber>5.2.0-100</revnumber>
+ <date>Wed Dec 14 2011</date>
+ <author>
+ <firstname>Scott</firstname>
+ <surname>Mumford</surname>
+ <email/>
+ </author>
+ <revdescription>
+ <simplelist>
+ <member>Publication build.</member>
+ </simplelist>
+ </revdescription>
+ </revision>
+ <revision>
+ <revnumber>5.2.0-8</revnumber>
+ <date>Mon Dec 12 2011</date>
+ <author>
+ <firstname>Scott</firstname>
+ <surname>Mumford</surname>
+ <email/>
+ </author>
+ <revdescription>
+ <simplelist>
+ <member>JBEPP-1450: Changed gatein-management-cli deploy instructions for production docs.</member>
+ </simplelist>
+ </revdescription>
+ </revision>
+ <revision>
+ <revnumber>5.2.0-7</revnumber>
+ <date>Wed Dec 7 2011</date>
+ <author>
+ <firstname>Scott</firstname>
+ <surname>Mumford</surname>
+ <email/>
+ </author>
+ <revdescription>
+ <simplelist>
+ <member>Updated with 'xml-escaping during export' problem fix.</member>
+ </simplelist>
+ </revdescription>
+ </revision>
+ <revision>
+ <revnumber>5.2.0-4</revnumber>
+ <date>Tue Nov 15 2011</date>
+ <author>
+ <firstname>Scott</firstname>
+ <surname>Mumford</surname>
+ <email/>
+ </author>
+ <revdescription>
+ <simplelist>
+ <member>Staged for beta release.</member>
+ </simplelist>
+ </revdescription>
+ </revision>
+ <revision>
+ <revnumber>5.2.0-3</revnumber>
+ <date>Wed Oct 19 2011</date>
+ <author>
+ <firstname>Scott</firstname>
+ <surname>Mumford</surname>
+ <email/>
+ </author>
+ <revdescription>
+ <simplelist>
+ <member>Added to brew system.</member>
+ </simplelist>
+ </revdescription>
+ </revision>
+ <revision>
+ <revnumber>5.2.0-1</revnumber>
+ <date>Wed Oct 12 2011</date>
+ <author>
+ <firstname>Nick</firstname>
+ <surname>Scavelli</surname>
+ <email>nscavell(a)redhat.com</email>
+ </author>
+ <revdescription>
+ <simplelist>
+ <member>Initial creation of book.</member>
+ </simplelist>
+ </revdescription>
+ </revision>
+ </revhistory>
+ </simpara>
</appendix>
-
Modified: epp/docs/branches/5.2/Admin_Guide/en-US/chapter-4-Management_Extensions.xml
===================================================================
--- epp/docs/branches/5.2/Admin_Guide/en-US/chapter-4-Management_Extensions.xml 2012-02-22 19:27:28 UTC (rev 8453)
+++ epp/docs/branches/5.2/Admin_Guide/en-US/chapter-4-Management_Extensions.xml 2012-02-23 23:15:23 UTC (rev 8454)
@@ -1,151 +1,102 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" []>
<chapter id="sid-8094332_GateInManagement-ManagementExtensions">
-
- <title>Management Extensions</title>
- <para>The following management extensions supported in the portal are:</para>
- <itemizedlist>
- <listitem>
- <para>MOP Management Extension</para>
- </listitem>
- </itemizedlist>
- <section id="sid-8094332_GateInManagement-MOPManagementExtension">
-
- <title>MOP Management Extension</title>
- <para>The MOP management extension registers the 'mop' managed component which is responsible for managing pages, navigation, and site layout. It primarily supports exporting and importing this data through the export-resource and import-resource operations. It also supports the read-config-as-xml operation to expose the portal meta data as xml.</para>
- <section id="sid-8094332_GateInManagement-Operationsxx">
-
- <title>Operations</title>
- <section id="sid-8094332_GateInManagement-readconfigasxml">
-
- <title>config-as-xml</title>
- <para>
+ <title>Management Extensions</title>
+ <para>The following management extensions supported in the portal are:</para>
+ <itemizedlist>
+ <listitem>
+ <para>MOP Management Extension</para>
+ </listitem>
+ </itemizedlist>
+ <section id="sid-8094332_GateInManagement-MOPManagementExtension">
+ <title>MOP Management Extension</title>
+ <para>The MOP management extension registers the 'mop' managed component which is responsible for managing pages, navigation, and site layout. It primarily supports exporting and importing this data through the export-resource and import-resource operations. It also supports the read-config-as-xml operation to expose the portal meta data as xml.</para>
+ <section id="sid-8094332_GateInManagement-Operationsxx">
+ <title><remark>BZ#794408 </remark>Operations</title>
+ <section id="sid-8094332_GateInManagement-readconfigasxml">
+ <title>config-as-xml</title>
+ <para>
The
<code>read-config-as-xml</code>
operation can only be executed on the site layout, pages, and navigation managed resources. The xml format returned is that of which is defined in by the
<ulink url="http://www.gatein.org/xml/ns/">gatein-objects</ulink>
xsd. This means that these resources are exposed in the same format as what a portal extension would accept for importing data into the portal.
</para>
- </section>
- <section id="sid-8094332_GateInManagement-exportresource">
-
- <title>export-resource</title>
- <para>
+ </section>
+ <section id="sid-8094332_GateInManagement-exportresource">
+ <title><remark>BZ#794408 </remark>export-resource</title>
+ <para>
The
<code>export-resource</code>
operation can be executed on any resource of the MOP extension (including the mop component itself). Since the management system recursively searches for all sub-resources that have export-resource defined (which they are defined at the site layout, page, and navigation level), exports can be very granular.
</para>
- </section>
- <section id="sid-8094332_GateInManagement-importresource">
-
- <title>import-resource</title>
- <para>
+ <para>This operation is accessed through the portal using the <application>Import/Export Site</application> tool. For more information about this tool, refer to the <citetitle>Import and Export</citetitle> section in the <citetitle>User Guide</citetitle>.</para>
+ </section>
+ <section id="sid-8094332_GateInManagement-importresource">
+ <title><remark>BZ#794408 </remark>import-resource</title>
+ <para>
The
<code>import-resource</code>
operation can only be executed at the mop component (root managed resource of the mop extension). This is because the exported zip file contains the path information (like site type and site name). So executing an
<code>import-resource</code>
- operation on a group site, when the zip contains data from a portal site, doesn't make sense.
+ operation on a group site, when the zip contains data from a portal site, doesn't make sense.
</para>
- <para>
+ <para>This operation is accessed through the portal using the <application>Import/Export Site</application> tool. For more information about this tool, refer to the <citetitle>Import and Export</citetitle> section in the <citetitle>User Guide</citetitle>.</para>
+ <para>
The MOP
<code>import-resource</code>
operation defines the
<code>importMode</code>
attribute as follows during import.
</para>
- <informaltable>
- <tgroup cols="2">
- <thead>
- <row>
- <entry>
- <para>
- Mode
+ <variablelist>
+ <varlistentry>
+ <term>Conserve</term>
+ <listitem>
+ <para>
+ Import data only if no artifacts exist for that site. For example if one page exists for site 'classic', nothing will be imported.
</para>
- </entry>
- <entry>
- <para>
- Description
-
- </para>
- </entry>
- </row>
- </thead>
- <tbody>
- <row>
- <entry>
- <para>
- conserve
-
- </para>
- </entry>
- <entry>
- <para>
- Import data only if no artifacts exist for that site. For example if one page exists for site 'classic', nothing will be imported.
-
- </para>
- </entry>
- </row>
- <row>
- <entry>
- <para>
- insert
-
- </para>
- </entry>
- <entry>
- <para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term>Insert</term>
+ <listitem>
+ <para>
Import data when data does not exist, otherwise do nothing.
</para>
- </entry>
- </row>
- <row>
- <entry>
- <para>
- merge
-
- </para>
- </entry>
- <entry>
- <para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term>Merge (default)</term>
+ <listitem>
+ <para>
Import when data does not exist, update data when it does exist.
</para>
- </entry>
- </row>
- <row>
- <entry>
- <para>
- overwrite
-
- </para>
- </entry>
- <entry>
- <para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term>Overwrite</term>
+ <listitem>
+ <para>
Delete all data for that artifact of the site, import new data. For example if the zip file only contains pages for site classic, then
all pages for that site are deleted and imported.
</para>
- </entry>
- </row>
- </tbody>
- </tgroup>
- </informaltable>
- <note>
- <title>Note</title>
- <para>'merge' is the default importMode.</para>
- </note>
- </section>
+ </listitem>
+ </varlistentry>
+ </variablelist>
</section>
- <section id="sid-8094332_GateInManagement-PathTemplatesx">
-
- <title>Path Templates</title>
- <para>Below are the list of path template variables defined in the MOP management extension. These path template variables are used for filtering during export.</para>
- <itemizedlist>
- <listitem>
- <para>
+ </section>
+ <section id="sid-8094332_GateInManagement-PathTemplatesx">
+ <title>Path Templates</title>
+ <para>Below are the list of path template variables defined in the MOP management extension. These path template variables are used for filtering during export.</para>
+ <itemizedlist>
+ <listitem>
+ <para>
<code>site-type</code>
These are the site types of the portal to include or exclude. Available values are:
@@ -156,9 +107,9 @@
<code>user</code>
.
</para>
- </listitem>
- <listitem>
- <para>
+ </listitem>
+ <listitem>
+ <para>
<code>site-name</code>
The sites to include or exclude. Examples could be
@@ -167,9 +118,9 @@
<code>/platform/administrators</code>
.
</para>
- </listitem>
- <listitem>
- <para>
+ </listitem>
+ <listitem>
+ <para>
<code>site-layout</code>
The name of the site layout depending on the site type. Available values are:
@@ -180,63 +131,60 @@
<code>user</code>
.
</para>
- </listitem>
- <listitem>
- <para>
+ </listitem>
+ <listitem>
+ <para>
<code>page-name</code>
The name of the page(s) to include or exclude.
</para>
- </listitem>
- <listitem>
- <para>
+ </listitem>
+ <listitem>
+ <para>
<code>nav-uri</code>
The URI of the navigation node to include or exclude.
</para>
- </listitem>
- </itemizedlist>
- </section>
- <section id="sid-8094332_GateInManagement-RESTAPI">
-
- <title>REST API</title>
- <note>
- <title>Note</title>
- <para>All URL's below are relative to the REST management entry point of the portal container.</para>
- </note>
- <note>
- <title>Note</title>
- <para>
+ </listitem>
+ </itemizedlist>
+ </section>
+ <section id="sid-8094332_GateInManagement-RESTAPI">
+ <title>REST API</title>
+ <note>
+ <title>Note</title>
+ <para>All URL's below are relative to the REST management entry point of the portal container.</para>
+ </note>
+ <note>
+ <title>Note</title>
+ <para>
For all read-config-as-xml refer
<ulink url="http://www.gatein.org/xml/ns/gatein_objects_1_2"/>
for the format of the XML.
</para>
- </note>
- <section id="sid-8094332_GateInManagement-MOPComponentResource">
-
- <title>MOP Component Resource</title>
- <para>
+ </note>
+ <section id="sid-8094332_GateInManagement-MOPComponentResource">
+ <title>MOP Component Resource</title>
+ <para>
The mop managed component resource (root managed resource) is the only resource that accepts the
<code>import-resource</code>
operation.
</para>
- <example>
- <title>HTTP Request</title>
- <programlisting>PUT /mop
+ <example>
+ <title>HTTP Request</title>
+ <programlisting>PUT /mop
Headers:
Content-Type: application/zip</programlisting>
- </example>
- <example>
- <title>HTTP Response</title>
- <programlisting>HTTP/1.1 200 OK</programlisting>
- </example>
- </section>
- <section id="sid-8094332_GateInManagement-SiteLayoutResource">
-
- <title>Site Layout Resource</title>
- <para>
- The site layout resource represents the site layout of the portal. It's the data defined in the
+ </example>
+ <example>
+ <title>HTTP Response</title>
+ <programlisting>HTTP/1.1 200 OK</programlisting>
+ </example>
+ </section>
+ <section id="sid-8094332_GateInManagement-SiteLayoutResource">
+ <title>Site Layout Resource</title>
+ <para>
+ The site layout resource represents the site layout of the portal. It's the data defined in the
<emphasis role="strong">portal.xml</emphasis>
,
<emphasis role="strong">group.xml</emphasis>
@@ -244,25 +192,24 @@
<emphasis role="strong">user.xml</emphasis>
files (depending on site type) used in portal extensions to configure data.
</para>
+ <example>
+ <title>URL</title>
+ <programlisting>URL: /mop/{site-type}sites/{site-name}/{site-layout}</programlisting>
+ </example>
+ <section id="sid-8094332_GateInManagement-readconfigasxmlx">
+ <title>config-as-xml</title>
+ <para>Example of reading the site layout as xml for site classic.</para>
<example>
- <title>URL</title>
- <programlisting>URL: /mop/{site-type}sites/{site-name}/{site-layout}</programlisting>
- </example>
- <section id="sid-8094332_GateInManagement-readconfigasxmlx">
-
- <title>config-as-xml</title>
- <para>Example of reading the site layout as xml for site classic.</para>
- <example>
- <title>HTTP Request</title>
- <programlisting>GET /mop/portalsites/classic/portal.xml
+ <title>HTTP Request</title>
+ <programlisting>GET /mop/portalsites/classic/portal.xml
or
GET /mop/portalsites/classic/portal?op=read-config-as-xml</programlisting>
- </example>
- <example>
- <title>HTTP Response</title>
- <programlisting>HTTP/1.1 200 OK
+ </example>
+ <example>
+ <title>HTTP Response</title>
+ <programlisting>HTTP/1.1 200 OK
Content-Type: application/xml
<portal-config>
@@ -272,52 +219,49 @@
<locale>en</locale>
...
</portal-config></programlisting>
- </example>
- </section>
- <section id="sid-8094332_GateInManagement-exportresourcex">
-
- <title>export-resource</title>
- <para>Example of exporting the site layout for site classic.</para>
- <example>
- <title>HTTP Request</title>
- <programlisting>GET /mop/portalsites/classic/portal.zip
+ </example>
+ </section>
+ <section id="sid-8094332_GateInManagement-exportresourcex">
+ <title>export-resource</title>
+ <para>Example of exporting the site layout for site classic.</para>
+ <example>
+ <title>HTTP Request</title>
+ <programlisting>GET /mop/portalsites/classic/portal.zip
or
GET /mop/portalsites/classic/portal?op=export-resource</programlisting>
- </example>
- <example>
- <title>HTTP Response</title>
- <programlisting>HTTP/1.1 200 OK
+ </example>
+ <example>
+ <title>HTTP Response</title>
+ <programlisting>HTTP/1.1 200 OK
Content-Type: application/zip
[binary data]</programlisting>
- </example>
- </section>
+ </example>
</section>
- <section id="sid-8094332_GateInManagement-PagesResource">
-
- <title>Pages Resource</title>
- <para>The pages resource represents the pages of the portal. It's the data defined in the pages.xml used in portal extensions to configure data.</para>
+ </section>
+ <section id="sid-8094332_GateInManagement-PagesResource">
+ <title>Pages Resource</title>
+ <para>The pages resource represents the pages of the portal. It's the data defined in the pages.xml used in portal extensions to configure data.</para>
+ <example>
+ <title>URL</title>
+ <programlisting>URL: /mop/{site-type}sites/{site-name}/pages/{page-name}</programlisting>
+ </example>
+ <section id="sid-8094332_GateInManagement-readconfigasxmlxx">
+ <title>config-as-xml</title>
+ <para>Example of reading all pages as xml for site classic.</para>
<example>
- <title>URL</title>
- <programlisting>URL: /mop/{site-type}sites/{site-name}/pages/{page-name}</programlisting>
- </example>
- <section id="sid-8094332_GateInManagement-readconfigasxmlxx">
-
- <title>config-as-xml</title>
- <para>Example of reading all pages as xml for site classic.</para>
- <example>
- <title>HTTP Request</title>
- <programlisting>GET /mop/portalsites/classic/pages.xml
+ <title>HTTP Request</title>
+ <programlisting>GET /mop/portalsites/classic/pages.xml
or
GET /mop/portalsites/classic/pages?op=read-config-as-xml</programlisting>
- </example>
- <example>
- <title>HTTP Response</title>
- <programlisting>HTTP/1.1 200 OK
+ </example>
+ <example>
+ <title>HTTP Response</title>
+ <programlisting>HTTP/1.1 200 OK
Content-Type: application/xml
<page-set>
@@ -330,19 +274,19 @@
<portlet-application>
...
</page-set></programlisting>
- </example>
- <para>Example of reading the homepage as xml for site classic.</para>
- <example>
- <title>HTTP Request</title>
- <programlisting>GET /mop/portalsites/classic/pages/homepage.xml
+ </example>
+ <para>Example of reading the homepage as xml for site classic.</para>
+ <example>
+ <title>HTTP Request</title>
+ <programlisting>GET /mop/portalsites/classic/pages/homepage.xml
or
GET /mop/portalsites/classic/pages/homepage?op=read-config-as-xml</programlisting>
- </example>
- <example>
- <title>HTTP Response</title>
- <programlisting>HTTP/1.1 200 OK
+ </example>
+ <example>
+ <title>HTTP Response</title>
+ <programlisting>HTTP/1.1 200 OK
Content-Type: application/xml
<page-set>
@@ -355,52 +299,49 @@
<portlet-application>
...
</page-set></programlisting>
- </example>
- </section>
- <section id="sid-8094332_GateInManagement-exportresourcexx">
-
- <title>export-resource</title>
- <para>Example of exporting all pages of site classic.</para>
- <example>
- <title>HTTP Request</title>
- <programlisting>GET /mop/portalsites/classic/pages.zip
+ </example>
+ </section>
+ <section id="sid-8094332_GateInManagement-exportresourcexx">
+ <title>export-resource</title>
+ <para>Example of exporting all pages of site classic.</para>
+ <example>
+ <title>HTTP Request</title>
+ <programlisting>GET /mop/portalsites/classic/pages.zip
or
GET /mop/portalsites/classic/pages?op=export-resource</programlisting>
- </example>
- <example>
- <title>HTTP Response</title>
- <programlisting>HTTP/1.1 200 OK
+ </example>
+ <example>
+ <title>HTTP Response</title>
+ <programlisting>HTTP/1.1 200 OK
Content-Type: application/zip
[binary data]</programlisting>
- </example>
- </section>
+ </example>
</section>
- <section id="sid-8094332_GateInManagement-NavigationResource">
-
- <title>Navigation Resource</title>
- <para>The navigation resource represents the navigation of the portal. It's the data defined in the navigation.xml used in portal extensions to configure data.</para>
+ </section>
+ <section id="sid-8094332_GateInManagement-NavigationResource">
+ <title>Navigation Resource</title>
+ <para>The navigation resource represents the navigation of the portal. It's the data defined in the navigation.xml used in portal extensions to configure data.</para>
+ <example>
+ <title>URL</title>
+ <programlisting>URL: /mop/{site-type}sites/{site-name}/navigation/{nav-uri}</programlisting>
+ </example>
+ <section id="sid-8094332_GateInManagement-readconfigasxmlxxx">
+ <title>config-as-xml</title>
+ <para>Example of reading all navigation as xml for site classic.</para>
<example>
- <title>URL</title>
- <programlisting>URL: /mop/{site-type}sites/{site-name}/navigation/{nav-uri}</programlisting>
- </example>
- <section id="sid-8094332_GateInManagement-readconfigasxmlxxx">
-
- <title>config-as-xml</title>
- <para>Example of reading all navigation as xml for site classic.</para>
- <example>
- <title>HTTP Request</title>
- <programlisting>GET /mop/portalsites/classic/navigation.xml
+ <title>HTTP Request</title>
+ <programlisting>GET /mop/portalsites/classic/navigation.xml
or
GET /mop/portalsites/classic/navigation?op=read-config-as-xml</programlisting>
- </example>
- <example>
- <title>HTTP Response</title>
- <programlisting>HTTP/1.1 200 OK
+ </example>
+ <example>
+ <title>HTTP Response</title>
+ <programlisting>HTTP/1.1 200 OK
Content-Type: application/xml
<node-navigation>
@@ -408,7 +349,7 @@
<page-nodes>
<node>
<name>home</name>
- <label xml:lang="en">Home</label>
+ <label xml:lang="en">Home</label>
...
<visibility>DISPLAYED</visibility>
<page-reference>portal::classic::homepage</page-reference>
@@ -417,19 +358,19 @@
<name>sitemap</name>
...
</node-navigation></programlisting>
- </example>
- <para>Example of reading the home node as xml for site classic.</para>
- <example>
- <title>HTTP Request</title>
- <programlisting>GET /mop/portalsites/classic/navigation/home.xml
+ </example>
+ <para>Example of reading the home node as xml for site classic.</para>
+ <example>
+ <title>HTTP Request</title>
+ <programlisting>GET /mop/portalsites/classic/navigation/home.xml
or
GET /mop/portalsites/classic/navigation/home?op=read-config-as-xml</programlisting>
- </example>
- <example>
- <title>HTTP Response</title>
- <programlisting>HTTP/1.1 200 OK
+ </example>
+ <example>
+ <title>HTTP Response</title>
+ <programlisting>HTTP/1.1 200 OK
Content-Type: application/xml
<node-navigation>
@@ -438,84 +379,79 @@
<parent-uri></parent-uri>
<node>
<name>home</name>
- <label xml:lang="en">Home</label>
+ <label xml:lang="en">Home</label>
...
<visibility>DISPLAYED</visibility>
<page-reference>portal::classic::homepage</page-reference>
</node>
</page-nodes>
</node-navigation></programlisting>
- </example>
- </section>
- <section id="sid-8094332_GateInManagement-exportresourcexxx">
-
- <title>export-resource</title>
- <para>Example of exporting all navigation of site classic.</para>
- <example>
- <title>HTTP Request</title>
- <programlisting>GET /mop/portalsites/classic/navigation.zip
+ </example>
+ </section>
+ <section id="sid-8094332_GateInManagement-exportresourcexxx">
+ <title>export-resource</title>
+ <para>Example of exporting all navigation of site classic.</para>
+ <example>
+ <title>HTTP Request</title>
+ <programlisting>GET /mop/portalsites/classic/navigation.zip
or
GET /mop/portalsites/classic/navigation?op=export-resource</programlisting>
- </example>
- <example>
- <title>HTTP Response</title>
- <programlisting>HTTP/1.1 200 OK
+ </example>
+ <example>
+ <title>HTTP Response</title>
+ <programlisting>HTTP/1.1 200 OK
Content-Type: application/zip
[binary data]</programlisting>
- </example>
- </section>
+ </example>
</section>
- <section id="sid-8094332_GateInManagement-ExportandFiltering">
-
- <title>Export and Filtering</title>
- <para>
+ </section>
+ <section id="sid-8094332_GateInManagement-ExportandFiltering">
+ <title>Export and Filtering</title>
+ <para>
Filtering is activated when the
<code>filter</code>
attribute is passed to an
<code>export-resource</code>
operation. The filter attribute is a multi-value attribute that is passed as request parameters of the HTTP request.
</para>
- <note>
- <title>Note</title>
- <para>You can either include multiple filter parameters (?filter=foo:bar&filter=baz:foo-bar) or separate via ';' character (?filter=foo:bar;baz:foo-bar)</para>
- </note>
- <example>
- <title>Export only registry and pageManagement navigation nodes</title>
- <programlisting>GET /mop/groupsites/platform/administrators/navigation.zip?filter=nav-uri:/administration/registry,/administration/pageManagement</programlisting>
- </example>
- <example>
- <title>Export all site types but user and group</title>
- <programlisting>GET /mop.zip?filter=site-type:!user,group</programlisting>
- </example>
- </section>
+ <note>
+ <title>Note</title>
+ <para>You can either include multiple filter parameters (?filter=foo:bar&filter=baz:foo-bar) or separate via ';' character (?filter=foo:bar;baz:foo-bar)</para>
+ </note>
+ <example>
+ <title>Export only registry and pageManagement navigation nodes</title>
+ <programlisting>GET /mop/groupsites/platform/administrators/navigation.zip?filter=nav-uri:/administration/registry,/administration/pageManagement</programlisting>
+ </example>
+ <example>
+ <title>Export all site types but user and group</title>
+ <programlisting>GET /mop.zip?filter=site-type:!user,group</programlisting>
+ </example>
</section>
- <section id="sid-8094332_GateInManagement-CommandLineInterfacex">
-
- <title>Command Line Interface</title>
- <para>The commands included in the management component provide us the tools to perform management operations on these MOP artifacts: site layout, pages, and navigation.</para>
- <section id="sid-8094332_GateInManagement-ResourcePaths">
-
- <title>Resource Paths</title>
- <para>The paths of the MOP resources are exactly the same as the REST URL's (of course without the URL syntax). For example the path of the homepage for the classic site would be:</para>
- <example>
- <title>Example</title>
- <programlisting>[ /]% cd /mop/portalsites/classic/pages/homepage
+ </section>
+ <section id="sid-8094332_GateInManagement-CommandLineInterfacex">
+ <title>Command Line Interface</title>
+ <para>The commands included in the management component provide us the tools to perform management operations on these MOP artifacts: site layout, pages, and navigation.</para>
+ <section id="sid-8094332_GateInManagement-ResourcePaths">
+ <title>Resource Paths</title>
+ <para>The paths of the MOP resources are exactly the same as the REST URL's (of course without the URL syntax). For example the path of the homepage for the classic site would be:</para>
+ <example>
+ <title>Example</title>
+ <programlisting>[ /]% cd /mop/portalsites/classic/pages/homepage
[homepage]% pwd
/mop/portalsites/classic/pages/homepage</programlisting>
- </example>
- <note>
- <title>Note</title>
- <para>All resources/paths can be autocompleted by hitting the tab key.</para>
- </note>
- </section>
- <section id="sid-8094332_GateInManagement-ExportandFilteringx">
-
- <title>Export and Filtering</title>
- <para>
+ </example>
+ <note>
+ <title>Note</title>
+ <para>All resources/paths can be autocompleted by hitting the tab key.</para>
+ </note>
+ </section>
+ <section id="sid-8094332_GateInManagement-ExportandFilteringx">
+ <title>Export and Filtering</title>
+ <para>
Filtering is activated when the
<code>filter</code>
attribute is passed to an
@@ -526,33 +462,33 @@
<code>export</code>
command.
</para>
- <example>
- <title>Export all portal site types</title>
- <programlisting>export --file /tmp/mop.zip --filter site-type:portal /mop</programlisting>
- </example>
- <example>
- <title>Export all sites types but user</title>
- <programlisting>export --file /tmp/mop.zip --filter site-type:!user /mop</programlisting>
- </example>
- <para>The option can be specified multiple times for multiple values.</para>
- <example>
- <title>Export only the /platform/administrators group site</title>
- <programlisting>export --file /tmp/mop.zip --filter site-type:group --filter site-name:/platform/administrators /mop</programlisting>
- </example>
- <para>
+ <example>
+ <title>Export all portal site types</title>
+ <programlisting>export --file /tmp/mop.zip --filter site-type:portal /mop</programlisting>
+ </example>
+ <example>
+ <title>Export all sites types but user</title>
+ <programlisting>export --file /tmp/mop.zip --filter site-type:!user /mop</programlisting>
+ </example>
+ <para>The option can be specified multiple times for multiple values.</para>
+ <example>
+ <title>Export only the /platform/administrators group site</title>
+ <programlisting>export --file /tmp/mop.zip --filter site-type:group --filter site-name:/platform/administrators /mop</programlisting>
+ </example>
+ <para>
Also as discussed in the Path Templates section in this document, the filter attribute can separate different path templates by the
<code>;</code>
character.
</para>
- <example>
- <title>Export only pages named homepage, navigation named home for site classic</title>
- <programlisting>export --file /tmp/classic.zip --filter page-name:homepage;nav-uri:home /mop/portalsites/classic</programlisting>
- </example>
- <important>
- <title>Important</title>
- <para>All three artifacts (site layout, navigation, and pages) are included in export by default. In other words if you don't specify their path template in the filter, the data will be included.</para>
- </important>
- </section>
+ <example>
+ <title>Export only pages named homepage, navigation named home for site classic</title>
+ <programlisting>export --file /tmp/classic.zip --filter page-name:homepage;nav-uri:home /mop/portalsites/classic</programlisting>
+ </example>
+ <important>
+ <title>Important</title>
+ <para>All three artifacts (site layout, navigation, and pages) are included in export by default. In other words if you don't specify their path template in the filter, the data will be included.</para>
+ </important>
</section>
</section>
- </chapter>
+ </section>
+</chapter>
Modified: epp/docs/branches/5.2/Admin_Guide/publican.cfg
===================================================================
--- epp/docs/branches/5.2/Admin_Guide/publican.cfg 2012-02-22 19:27:28 UTC (rev 8453)
+++ epp/docs/branches/5.2/Admin_Guide/publican.cfg 2012-02-23 23:15:23 UTC (rev 8454)
@@ -1,13 +1,6 @@
-# Config::Simple 4.59
-# Wed Nov 25 09:17:17 2009
-
-
xml_lang: en-US
type: Book
brand: JBoss
debug:1
-#show_remarks:1
-
-cvs_branch: DOCS-RHEL-6
-cvs_root: :ext:cvs.devel.redhat.com:/cvs/dist
-cvs_pkg: JBoss_Enterprise_Portal_Platform-Administration_Guide-5.2-web-__LANG__
\ No newline at end of file
+show_remarks:1
+git_branch: docs-rhel-6
12 years, 3 months
- 1
- 0
gatein SVN: r8453 - in sandbox/as7_support/branches/gatein-as7/wci: exo and 41 other directories.
by do-not-reply＠jboss.org
Author: mstruk
Date: 2012-02-22 14:27:28 -0500 (Wed, 22 Feb 2012)
New Revision: 8453
Added:
sandbox/as7_support/branches/gatein-as7/wci/test/portlets/native-skipped-portlet/
sandbox/as7_support/branches/gatein-as7/wci/test/portlets/native-skipped-portlet/pom.xml
sandbox/as7_support/branches/gatein-as7/wci/test/portlets/native-skipped-portlet/src/
sandbox/as7_support/branches/gatein-as7/wci/test/portlets/native-skipped-portlet/src/main/
sandbox/as7_support/branches/gatein-as7/wci/test/portlets/native-skipped-portlet/src/main/webapp/
sandbox/as7_support/branches/gatein-as7/wci/test/portlets/native-skipped-portlet/src/main/webapp/WEB-INF/
sandbox/as7_support/branches/gatein-as7/wci/test/portlets/native-skipped-portlet/src/main/webapp/WEB-INF/web.xml
sandbox/as7_support/branches/gatein-as7/wci/test/portlets/native-skipped-with-gateinservlet-portlet/
sandbox/as7_support/branches/gatein-as7/wci/test/portlets/native-skipped-with-gateinservlet-portlet/.settings/
sandbox/as7_support/branches/gatein-as7/wci/test/portlets/native-skipped-with-gateinservlet-portlet/pom.xml
sandbox/as7_support/branches/gatein-as7/wci/test/portlets/native-skipped-with-gateinservlet-portlet/src/
sandbox/as7_support/branches/gatein-as7/wci/test/portlets/native-skipped-with-gateinservlet-portlet/src/main/
sandbox/as7_support/branches/gatein-as7/wci/test/portlets/native-skipped-with-gateinservlet-portlet/src/main/webapp/
sandbox/as7_support/branches/gatein-as7/wci/test/portlets/native-skipped-with-gateinservlet-portlet/src/main/webapp/WEB-INF/
sandbox/as7_support/branches/gatein-as7/wci/test/portlets/native-skipped-with-gateinservlet-portlet/src/main/webapp/WEB-INF/web.xml
sandbox/as7_support/branches/gatein-as7/wci/wci/src/main/java/org/gatein/wci/api/GateInServletRegistrations.java
Modified:
sandbox/as7_support/branches/gatein-as7/wci/exo/pom.xml
sandbox/as7_support/branches/gatein-as7/wci/jboss/jboss6/pom.xml
sandbox/as7_support/branches/gatein-as7/wci/jboss/jboss6/src/main/java/org/gatein/wci/jboss/JB6ServletContainerContext.java
sandbox/as7_support/branches/gatein-as7/wci/jboss/pom.xml
sandbox/as7_support/branches/gatein-as7/wci/jetty/pom.xml
sandbox/as7_support/branches/gatein-as7/wci/jetty/src/main/java/org/gatein/wci/jetty/Jetty6ServletContainerContext.java
sandbox/as7_support/branches/gatein-as7/wci/pom.xml
sandbox/as7_support/branches/gatein-as7/wci/test/core/pom.xml
sandbox/as7_support/branches/gatein-as7/wci/test/core/src/main/java/org/gatein/wci/container/ServletContainerContextImpl.java
sandbox/as7_support/branches/gatein-as7/wci/test/pom.xml
sandbox/as7_support/branches/gatein-as7/wci/test/portlets/exo-portlet/pom.xml
sandbox/as7_support/branches/gatein-as7/wci/test/portlets/gatein-portlet/pom.xml
sandbox/as7_support/branches/gatein-as7/wci/test/portlets/native-portlet/pom.xml
sandbox/as7_support/branches/gatein-as7/wci/test/portlets/pom.xml
sandbox/as7_support/branches/gatein-as7/wci/test/servers/jboss51/pom.xml
sandbox/as7_support/branches/gatein-as7/wci/test/servers/jboss6/pom.xml
sandbox/as7_support/branches/gatein-as7/wci/test/servers/jetty6/pom.xml
sandbox/as7_support/branches/gatein-as7/wci/test/servers/pom.xml
sandbox/as7_support/branches/gatein-as7/wci/test/servers/src/common/resources/common.xml
sandbox/as7_support/branches/gatein-as7/wci/test/servers/tomcat6/pom.xml
sandbox/as7_support/branches/gatein-as7/wci/test/servers/tomcat7/pom.xml
sandbox/as7_support/branches/gatein-as7/wci/tomcat/pom.xml
sandbox/as7_support/branches/gatein-as7/wci/tomcat/tomcat6/pom.xml
sandbox/as7_support/branches/gatein-as7/wci/tomcat/tomcat6/src/main/java/org/gatein/wci/tomcat/TC6ServletContainerContext.java
sandbox/as7_support/branches/gatein-as7/wci/tomcat/tomcat7/pom.xml
sandbox/as7_support/branches/gatein-as7/wci/tomcat/tomcat7/src/main/java/org/gatein/wci/tomcat/TC7ServletContainerContext.java
sandbox/as7_support/branches/gatein-as7/wci/wci/pom.xml
sandbox/as7_support/branches/gatein-as7/wci/wci/src/main/java/org/gatein/wci/api/GateInServlet.java
sandbox/as7_support/branches/gatein-as7/wci/wci/src/main/java/org/gatein/wci/api/GateInServletListener.java
sandbox/as7_support/branches/gatein-as7/wci/wci/src/main/java/org/gatein/wci/endpoint/EndPointServlet.java
sandbox/as7_support/branches/gatein-as7/wci/wci/src/main/java/org/gatein/wci/impl/DefaultServletContainer.java
sandbox/as7_support/branches/gatein-as7/wci/wci/src/main/java/org/gatein/wci/impl/generic/GenericServletContainerContext.java
sandbox/as7_support/branches/gatein-as7/wci/wci/src/main/java/org/gatein/wci/security/WCILoginController.java
sandbox/as7_support/branches/gatein-as7/wci/wci/src/main/java/org/gatein/wci/spi/ServletContainerContext.java
Log:
Updated wci to 2.1.1-Beta03
Modified: sandbox/as7_support/branches/gatein-as7/wci/exo/pom.xml
===================================================================
--- sandbox/as7_support/branches/gatein-as7/wci/exo/pom.xml 2012-02-22 16:10:35 UTC (rev 8452)
+++ sandbox/as7_support/branches/gatein-as7/wci/exo/pom.xml 2012-02-22 19:27:28 UTC (rev 8453)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.wci</groupId>
<artifactId>wci-parent</artifactId>
- <version>2.1.0-Beta07-AS7-Beta02</version>
+ <version>2.1.1-Beta03-AS7-Beta03</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wci-exo</artifactId>
Modified: sandbox/as7_support/branches/gatein-as7/wci/jboss/jboss6/pom.xml
===================================================================
--- sandbox/as7_support/branches/gatein-as7/wci/jboss/jboss6/pom.xml 2012-02-22 16:10:35 UTC (rev 8452)
+++ sandbox/as7_support/branches/gatein-as7/wci/jboss/jboss6/pom.xml 2012-02-22 19:27:28 UTC (rev 8453)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.wci</groupId>
<artifactId>wci-jboss</artifactId>
- <version>2.1.0-Beta07-AS7-Beta02</version>
+ <version>2.1.1-Beta03-AS7-Beta03</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wci-jboss6</artifactId>
Modified: sandbox/as7_support/branches/gatein-as7/wci/jboss/jboss6/src/main/java/org/gatein/wci/jboss/JB6ServletContainerContext.java
===================================================================
--- sandbox/as7_support/branches/gatein-as7/wci/jboss/jboss6/src/main/java/org/gatein/wci/jboss/JB6ServletContainerContext.java 2012-02-22 16:10:35 UTC (rev 8452)
+++ sandbox/as7_support/branches/gatein-as7/wci/jboss/jboss6/src/main/java/org/gatein/wci/jboss/JB6ServletContainerContext.java 2012-02-22 19:27:28 UTC (rev 8453)
@@ -37,12 +37,15 @@
import org.gatein.wci.RequestDispatchCallback;
import org.gatein.wci.ServletContainerVisitor;
import org.gatein.wci.WebApp;
+import org.gatein.wci.api.GateInServlet;
+import org.gatein.wci.api.GateInServletRegistrations;
import org.gatein.wci.authentication.GenericAuthentication;
import org.gatein.wci.authentication.TicketService;
import org.gatein.wci.command.CommandDispatcher;
import org.gatein.wci.impl.DefaultServletContainerFactory;
import org.gatein.wci.security.Credentials;
import org.gatein.wci.spi.ServletContainerContext;
+import org.gatein.wci.spi.WebAppContext;
import javax.servlet.ServletContext;
import javax.servlet.ServletException;
@@ -50,7 +53,9 @@
import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.HttpSession;
import java.io.IOException;
+import java.util.HashMap;
import java.util.HashSet;
+import java.util.Map;
import java.util.Set;
/**
@@ -71,6 +76,9 @@
/** The monitored contexts. */
private final Set<String> monitoredContexts = new HashSet<String>();
+
+ /** The monitored contexts which were manually added. */
+ private static Map<String, String> manualMonitoredContexts = new HashMap<String, String>();
/** . */
private final Engine engine;
@@ -88,13 +96,23 @@
public Object include(ServletContext targetServletContext, HttpServletRequest request, HttpServletResponse response,
RequestDispatchCallback callback, Object handback) throws ServletException, IOException
- {
- return dispatcher.include(targetServletContext, request, response, callback, handback);
- }
+ {
+ if (manualMonitoredContexts.containsKey(targetServletContext.getServletContextName()))
+ {
+ String dispatherPath = manualMonitoredContexts.get(targetServletContext.getServletContextName());
+ CommandDispatcher dispatcher = new CommandDispatcher(dispatherPath);
+ return dispatcher.include(targetServletContext, request, response, callback, handback);
+ }
+ else
+ {
+ return dispatcher.include(targetServletContext, request, response, callback, handback);
+ }
+ }
public void setCallback(Registration registration)
{
this.registration = registration;
+ GateInServletRegistrations.setServletContainerContext(this);
}
public void unsetCallback(Registration registration)
@@ -345,13 +363,18 @@
{
try
{
- log.debug("Context added " + context.getPath());
- JB6WebAppContext webAppContext = new JB6WebAppContext(context);
+ // skip if the webapp has explicitly stated it doesn't want native registration
+ // usefull when portlets are dependent on servlet ordering
+ if (!isDisabledNativeRegistration(context.getServletContext()))
+ {
+ log.debug("Context added " + context.getPath());
+ JB6WebAppContext webAppContext = new JB6WebAppContext(context);
- //
- if (registration != null)
- {
- registration.registerWebApp(webAppContext);
+ //
+ if (registration != null)
+ {
+ registration.registerWebApp(webAppContext);
+ }
}
}
catch (Exception e)
@@ -364,9 +387,14 @@
{
try
{
- if (registration != null)
+ // skip if the webapp has explicitly stated it doesn't want native registration
+ // usefull when portlets are dependent on servlet ordering
+ if (!isDisabledNativeRegistration(context.getServletContext()))
{
- registration.unregisterWebApp(context.getPath());
+ if (registration != null)
+ {
+ registration.unregisterWebApp(context.getPath());
+ }
}
}
catch (Exception e)
@@ -374,4 +402,49 @@
e.printStackTrace();
}
}
+
+ private boolean isDisabledNativeRegistration(ServletContext servletContext)
+ {
+ if (servletContext != null)
+ {
+ String disableWCINativeRegistration = servletContext.getInitParameter(GateInServlet.WCIDISABLENATIVEREGISTRATION);
+ if (disableWCINativeRegistration != null && disableWCINativeRegistration.equalsIgnoreCase("true"))
+ {
+ return true;
+ }
+ else
+ {
+ return false;
+ }
+ }
+ else
+ {
+ return false;
+ }
+ }
+
+ @Override
+ public void registerWebApp(WebAppContext webappContext, String dispatchPath)
+ {
+ if (isDisabledNativeRegistration(webappContext.getServletContext()))
+ {
+ this.manualMonitoredContexts.put(webappContext.getServletContext().getServletContextName(), dispatchPath);
+ registration.registerWebApp(webappContext);
+ }
+ }
+
+ @Override
+ public void unregisterWebApp(ServletContext servletContext)
+ {
+ if (isDisabledNativeRegistration(servletContext))
+ {
+ this.manualMonitoredContexts.remove(servletContext.getServletContextName());
+ //if the registration is null, then this ServletContainerContext has been stopped already
+ //and all the registrations have already been removed.
+ if (registration != null)
+ {
+ registration.unregisterWebApp(servletContext.getContextPath());
+ }
+ }
+ }
}
Modified: sandbox/as7_support/branches/gatein-as7/wci/jboss/pom.xml
===================================================================
--- sandbox/as7_support/branches/gatein-as7/wci/jboss/pom.xml 2012-02-22 16:10:35 UTC (rev 8452)
+++ sandbox/as7_support/branches/gatein-as7/wci/jboss/pom.xml 2012-02-22 19:27:28 UTC (rev 8453)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.wci</groupId>
<artifactId>wci-parent</artifactId>
- <version>2.1.0-Beta07-AS7-Beta02</version>
+ <version>2.1.1-Beta03-AS7-Beta03</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wci-jboss</artifactId>
Modified: sandbox/as7_support/branches/gatein-as7/wci/jetty/pom.xml
===================================================================
--- sandbox/as7_support/branches/gatein-as7/wci/jetty/pom.xml 2012-02-22 16:10:35 UTC (rev 8452)
+++ sandbox/as7_support/branches/gatein-as7/wci/jetty/pom.xml 2012-02-22 19:27:28 UTC (rev 8453)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.wci</groupId>
<artifactId>wci-parent</artifactId>
- <version>2.1.0-Beta07-AS7-Beta02</version>
+ <version>2.1.1-Beta03-AS7-Beta03</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wci-jetty</artifactId>
Modified: sandbox/as7_support/branches/gatein-as7/wci/jetty/src/main/java/org/gatein/wci/jetty/Jetty6ServletContainerContext.java
===================================================================
--- sandbox/as7_support/branches/gatein-as7/wci/jetty/src/main/java/org/gatein/wci/jetty/Jetty6ServletContainerContext.java 2012-02-22 16:10:35 UTC (rev 8452)
+++ sandbox/as7_support/branches/gatein-as7/wci/jetty/src/main/java/org/gatein/wci/jetty/Jetty6ServletContainerContext.java 2012-02-22 19:27:28 UTC (rev 8453)
@@ -1,7 +1,9 @@
package org.gatein.wci.jetty;
import java.io.IOException;
+import java.util.HashMap;
import java.util.HashSet;
+import java.util.Map;
import java.util.Set;
import javax.servlet.ServletContext;
@@ -13,6 +15,8 @@
import org.gatein.wci.RequestDispatchCallback;
import org.gatein.wci.ServletContainerVisitor;
import org.gatein.wci.WebApp;
+import org.gatein.wci.api.GateInServlet;
+import org.gatein.wci.api.GateInServletRegistrations;
import org.gatein.wci.authentication.GenericAuthentication;
import org.gatein.wci.command.CommandDispatcher;
import org.gatein.wci.impl.DefaultServletContainerFactory;
@@ -41,6 +45,9 @@
/** The monitored contexts. */
private final Set<String> monitoredContexts = new HashSet<String>();
+ /** The monitored contexts which were manually added. */
+ private static Map<String, String> manualMonitoredContexts = new HashMap<String, String>();
+
private final Set<String> monitoredContextHandlerCollection = new HashSet<String>();
/** Perform cross-context session invalidation on logout, or not */
@@ -58,13 +65,22 @@
HttpServletRequest request, HttpServletResponse response,
RequestDispatchCallback callback, Object handback)
throws ServletException, IOException
- {
- return dispatcher.include(targetServletContext, request, response,
- callback, handback);
- }
+ {
+ if (manualMonitoredContexts.containsKey(targetServletContext.getServletContextName()))
+ {
+ String dispatherPath = manualMonitoredContexts.get(targetServletContext.getServletContextName());
+ CommandDispatcher dispatcher = new CommandDispatcher(dispatherPath);
+ return dispatcher.include(targetServletContext, request, response, callback, handback);
+ }
+ else
+ {
+ return dispatcher.include(targetServletContext, request, response, callback, handback);
+ }
+ }
public void setCallback(Registration registration) {
this.registration = registration;
+ GateInServletRegistrations.setServletContainerContext(this);
}
public void unsetCallback(Registration registration) {
@@ -182,36 +198,46 @@
private void startWebAppContext(WebAppContext webappContext)
{
- try
+ try
+ {
+ // skip if the webapp has explicitly stated it doesn't want native registration
+ // usefull when portlets are dependent on servlet ordering
+ if (!isDisabledNativeRegistration(webappContext.getServletContext()))
{
Jetty6WebAppContext context = new Jetty6WebAppContext(webappContext);
-
+
//
if (registration != null)
{
registration.registerWebApp(context);
}
}
- catch (Exception e)
- {
- e.printStackTrace();
- }
-
+ }
+ catch (Exception e)
+ {
+ e.printStackTrace();
+ }
+
}
private void stopWebAppContext(WebAppContext webappContext)
{
- try
+ try
+ {
+ // skip if the webapp has explicitly stated it doesn't want native registration
+ // usefull when portlets are dependent on servlet ordering
+ if (!isDisabledNativeRegistration(webappContext.getServletContext()))
{
if (registration != null)
{
registration.unregisterWebApp(webappContext.getContextPath());
}
}
- catch (Exception e)
- {
- e.printStackTrace();
- }
+ }
+ catch (Exception e)
+ {
+ e.printStackTrace();
+ }
}
private void registerWebAppContext(WebAppContext wac)
@@ -302,5 +328,49 @@
//Ignore event
}
+ private boolean isDisabledNativeRegistration(ServletContext servletContext)
+ {
+ if (servletContext != null)
+ {
+ String disableWCINativeRegistration = servletContext.getInitParameter(GateInServlet.WCIDISABLENATIVEREGISTRATION);
+ if (disableWCINativeRegistration != null && disableWCINativeRegistration.equalsIgnoreCase("true"))
+ {
+ return true;
+ }
+ else
+ {
+ return false;
+ }
+ }
+ else
+ {
+ return false;
+ }
+ }
+
+ @Override
+ public void registerWebApp(org.gatein.wci.spi.WebAppContext webappContext, String dispatchPath)
+ {
+ if (isDisabledNativeRegistration(webappContext.getServletContext()))
+ {
+ this.manualMonitoredContexts.put(webappContext.getServletContext().getServletContextName(), dispatchPath);
+ registration.registerWebApp(webappContext);
+ }
+ }
+
+ @Override
+ public void unregisterWebApp(ServletContext servletContext)
+ {
+ if (isDisabledNativeRegistration(servletContext))
+ {
+ this.manualMonitoredContexts.remove(servletContext.getServletContextName());
+ //if the registration is null, then this ServletContainerContext has been stopped already
+ //and all the registrations have already been removed.
+ if (registration != null)
+ {
+ registration.unregisterWebApp(servletContext.getContextPath());
+ }
+ }
+ }
}
Modified: sandbox/as7_support/branches/gatein-as7/wci/pom.xml
===================================================================
--- sandbox/as7_support/branches/gatein-as7/wci/pom.xml 2012-02-22 16:10:35 UTC (rev 8452)
+++ sandbox/as7_support/branches/gatein-as7/wci/pom.xml 2012-02-22 19:27:28 UTC (rev 8453)
@@ -6,23 +6,23 @@
<groupId>org.gatein.wci</groupId>
<artifactId>wci-parent</artifactId>
- <version>2.1.0-Beta07-AS7-Beta02</version>
+ <version>2.1.1-Beta03-AS7-Beta03</version>
<packaging>pom</packaging>
<parent>
<groupId>org.gatein</groupId>
<artifactId>gatein-parent</artifactId>
- <version>1.1.0-Beta02</version>
+ <version>1.1.0-GA</version>
</parent>
<scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/gatein/components/wci/trunk/</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/gatein/components/wci/trunk/</developerConnection>
- <url>http://fisheye.jboss.org/browse/gatein/components/wci/trunk/</url>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/gatein/components/wci/tags/2.1.1-B...</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/gatein/components/wci/tags/2.1.1-Beta03</developerConnection>
+ <url>http://fisheye.jboss.org/browse/gatein/components/wci/tags/2.1.1-Beta03</url>
</scm>
<properties>
- <version.gatein.common>2.0.4-Beta03</version.gatein.common>
+ <version.gatein.common>2.0.4-GA</version.gatein.common>
<version.junit>3.8.2-brew</version.junit>
<version.jboss.unit>1.2.3</version.jboss.unit>
@@ -44,7 +44,7 @@
<dependency>
<groupId>org.gatein</groupId>
<artifactId>gatein-dep</artifactId>
- <version>1.1.0-Beta06</version>
+ <version>1.1.0-GA</version>
<type>pom</type>
<scope>import</scope>
</dependency>
Modified: sandbox/as7_support/branches/gatein-as7/wci/test/core/pom.xml
===================================================================
--- sandbox/as7_support/branches/gatein-as7/wci/test/core/pom.xml 2012-02-22 16:10:35 UTC (rev 8452)
+++ sandbox/as7_support/branches/gatein-as7/wci/test/core/pom.xml 2012-02-22 19:27:28 UTC (rev 8453)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.wci</groupId>
<artifactId>wci-test-parent</artifactId>
- <version>2.1.0-Beta07-SNAPSHOT</version>
+ <version>2.1.1-Beta03-AS7-Beta03</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wci-test-core</artifactId>
Modified: sandbox/as7_support/branches/gatein-as7/wci/test/core/src/main/java/org/gatein/wci/container/ServletContainerContextImpl.java
===================================================================
--- sandbox/as7_support/branches/gatein-as7/wci/test/core/src/main/java/org/gatein/wci/container/ServletContainerContextImpl.java 2012-02-22 16:10:35 UTC (rev 8452)
+++ sandbox/as7_support/branches/gatein-as7/wci/test/core/src/main/java/org/gatein/wci/container/ServletContainerContextImpl.java 2012-02-22 19:27:28 UTC (rev 8453)
@@ -24,6 +24,7 @@
import org.gatein.wci.security.Credentials;
import org.gatein.wci.spi.ServletContainerContext;
+import org.gatein.wci.spi.WebAppContext;
import org.gatein.wci.RequestDispatchCallback;
import javax.servlet.ServletContext;
@@ -39,45 +40,59 @@
public class ServletContainerContextImpl implements ServletContainerContext
{
- Registration registration;
+ Registration registration;
- public Object include(
- ServletContext targetServletContext,
- HttpServletRequest request,
- HttpServletResponse response,
- RequestDispatchCallback callback,
- Object handback) throws ServletException, IOException
- {
- throw new UnsupportedOperationException();
- }
+ public Object include(
+ ServletContext targetServletContext,
+ HttpServletRequest request,
+ HttpServletResponse response,
+ RequestDispatchCallback callback,
+ Object handback) throws ServletException, IOException
+ {
+ throw new UnsupportedOperationException();
+ }
- public void setCallback(Registration registration)
- {
- this.registration = registration;
- }
+ public void setCallback(Registration registration)
+ {
+ this.registration = registration;
+ }
- public void unsetCallback(Registration registration)
- {
- this.registration = null;
- }
+ public void unsetCallback(Registration registration)
+ {
+ this.registration = null;
+ }
- public void login(HttpServletRequest request, HttpServletResponse response, Credentials credentials, long validityMillis)
- {
- throw new UnsupportedOperationException();
- }
+ public void login(HttpServletRequest request, HttpServletResponse response, Credentials credentials, long validityMillis)
+ {
+ throw new UnsupportedOperationException();
+ }
- public void login(HttpServletRequest request, HttpServletResponse response, Credentials credentials, long validityMillis, String initialURI)
- {
- throw new UnsupportedOperationException();
- }
+ public void login(HttpServletRequest request, HttpServletResponse response, Credentials credentials, long validityMillis, String initialURI)
+ {
+ throw new UnsupportedOperationException();
+ }
- public void logout(HttpServletRequest request, HttpServletResponse response)
- {
- throw new UnsupportedOperationException();
- }
+ public void logout(HttpServletRequest request, HttpServletResponse response)
+ {
+ throw new UnsupportedOperationException();
+ }
- public String getContainerInfo()
- {
- return "Impl";
- }
+ public String getContainerInfo()
+ {
+ return "Impl";
+ }
+
+ @Override
+ public void registerWebApp(WebAppContext webappContext, String dispatchPath)
+ {
+ // FIXME registerWebApp
+
+ }
+
+ @Override
+ public void unregisterWebApp(ServletContext servletContext)
+ {
+ // FIXME unregisterWebApp
+
+ }
}
Modified: sandbox/as7_support/branches/gatein-as7/wci/test/pom.xml
===================================================================
--- sandbox/as7_support/branches/gatein-as7/wci/test/pom.xml 2012-02-22 16:10:35 UTC (rev 8452)
+++ sandbox/as7_support/branches/gatein-as7/wci/test/pom.xml 2012-02-22 19:27:28 UTC (rev 8453)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.wci</groupId>
<artifactId>wci-parent</artifactId>
- <version>2.1.0-Beta07-AS7-Beta02</version>
+ <version>2.1.1-Beta03-AS7-Beta03</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wci-test-parent</artifactId>
@@ -32,6 +32,18 @@
</dependency>
<dependency>
<groupId>org.gatein.wci</groupId>
+ <artifactId>wci-test-native-skipped-portlet</artifactId>
+ <type>war</type>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.gatein.wci</groupId>
+ <artifactId>wci-test-native-skipped-with-gateinservlet-portlet</artifactId>
+ <type>war</type>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.gatein.wci</groupId>
<artifactId>wci-test-gatein-portlet</artifactId>
<type>war</type>
<version>${project.version}</version>
Modified: sandbox/as7_support/branches/gatein-as7/wci/test/portlets/exo-portlet/pom.xml
===================================================================
--- sandbox/as7_support/branches/gatein-as7/wci/test/portlets/exo-portlet/pom.xml 2012-02-22 16:10:35 UTC (rev 8452)
+++ sandbox/as7_support/branches/gatein-as7/wci/test/portlets/exo-portlet/pom.xml 2012-02-22 19:27:28 UTC (rev 8453)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.wci</groupId>
<artifactId>wci-test-portlets</artifactId>
- <version>2.1.0-Beta07-AS7-Beta02</version>
+ <version>2.1.1-Beta03-AS7-Beta03</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wci-test-exo-portlet</artifactId>
Modified: sandbox/as7_support/branches/gatein-as7/wci/test/portlets/gatein-portlet/pom.xml
===================================================================
--- sandbox/as7_support/branches/gatein-as7/wci/test/portlets/gatein-portlet/pom.xml 2012-02-22 16:10:35 UTC (rev 8452)
+++ sandbox/as7_support/branches/gatein-as7/wci/test/portlets/gatein-portlet/pom.xml 2012-02-22 19:27:28 UTC (rev 8453)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.wci</groupId>
<artifactId>wci-test-portlets</artifactId>
- <version>2.1.0-Beta07-AS7-Beta02</version>
+ <version>2.1.1-Beta03-AS7-Beta03</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wci-test-gatein-portlet</artifactId>
Modified: sandbox/as7_support/branches/gatein-as7/wci/test/portlets/native-portlet/pom.xml
===================================================================
--- sandbox/as7_support/branches/gatein-as7/wci/test/portlets/native-portlet/pom.xml 2012-02-22 16:10:35 UTC (rev 8452)
+++ sandbox/as7_support/branches/gatein-as7/wci/test/portlets/native-portlet/pom.xml 2012-02-22 19:27:28 UTC (rev 8453)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.wci</groupId>
<artifactId>wci-test-portlets</artifactId>
- <version>2.1.0-Beta07-AS7-Beta02</version>
+ <version>2.1.1-Beta03-AS7-Beta03</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wci-test-native-portlet</artifactId>
Added: sandbox/as7_support/branches/gatein-as7/wci/test/portlets/native-skipped-portlet/pom.xml
===================================================================
--- sandbox/as7_support/branches/gatein-as7/wci/test/portlets/native-skipped-portlet/pom.xml (rev 0)
+++ sandbox/as7_support/branches/gatein-as7/wci/test/portlets/native-skipped-portlet/pom.xml 2012-02-22 19:27:28 UTC (rev 8453)
@@ -0,0 +1,11 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <parent>
+ <groupId>org.gatein.wci</groupId>
+ <artifactId>wci-test-portlets</artifactId>
+ <version>2.1.1-Beta03-AS7-Beta03</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>wci-test-native-skipped-portlet</artifactId>
+ <packaging>war</packaging>
+ <name>GateIn - WCI Native Skip Test Portlet</name>
+</project>
Added: sandbox/as7_support/branches/gatein-as7/wci/test/portlets/native-skipped-portlet/src/main/webapp/WEB-INF/web.xml
===================================================================
--- sandbox/as7_support/branches/gatein-as7/wci/test/portlets/native-skipped-portlet/src/main/webapp/WEB-INF/web.xml (rev 0)
+++ sandbox/as7_support/branches/gatein-as7/wci/test/portlets/native-skipped-portlet/src/main/webapp/WEB-INF/web.xml 2012-02-22 19:27:28 UTC (rev 8453)
@@ -0,0 +1,35 @@
+<?xml version="1.0"?>
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ ~ JBoss, a division of Red Hat ~
+ ~ Copyright 2006, Red Hat Middleware, LLC, and individual ~
+ ~ contributors as indicated by the @authors tag. See the ~
+ ~ copyright.txt in the distribution for a full listing of ~
+ ~ individual contributors. ~
+ ~ ~
+ ~ This is free software; you can redistribute it and/or modify it ~
+ ~ under the terms of the GNU Lesser General Public License as ~
+ ~ published by the Free Software Foundation; either version 2.1 of ~
+ ~ the License, or (at your option) any later version. ~
+ ~ ~
+ ~ This software is distributed in the hope that it will be useful, ~
+ ~ but WITHOUT ANY WARRANTY; without even the implied warranty of ~
+ ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ~
+ ~ Lesser General Public License for more details. ~
+ ~ ~
+ ~ You should have received a copy of the GNU Lesser General Public ~
+ ~ License along with this software; if not, write to the Free ~
+ ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA ~
+ ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org. ~
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
+<!DOCTYPE web-app PUBLIC
+ "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
+ "http://java.sun.com/dtd/web-app_2_3.dtd">
+<web-app>
+ <!-- Disable the Native Application Registration -->
+ <context-param>
+ <param-name>gatein.wci.native.DisableRegistration</param-name>
+ <param-value>true</param-value>
+ </context-param>
+</web-app>
+
Added: sandbox/as7_support/branches/gatein-as7/wci/test/portlets/native-skipped-with-gateinservlet-portlet/pom.xml
===================================================================
--- sandbox/as7_support/branches/gatein-as7/wci/test/portlets/native-skipped-with-gateinservlet-portlet/pom.xml (rev 0)
+++ sandbox/as7_support/branches/gatein-as7/wci/test/portlets/native-skipped-with-gateinservlet-portlet/pom.xml 2012-02-22 19:27:28 UTC (rev 8453)
@@ -0,0 +1,11 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <parent>
+ <groupId>org.gatein.wci</groupId>
+ <artifactId>wci-test-portlets</artifactId>
+ <version>2.1.1-Beta03-AS7-Beta03</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>wci-test-native-skipped-with-gateinservlet-portlet</artifactId>
+ <packaging>war</packaging>
+ <name>GateIn - WCI Native Skip Test Portlet With GateInServlet Registration</name>
+</project>
Added: sandbox/as7_support/branches/gatein-as7/wci/test/portlets/native-skipped-with-gateinservlet-portlet/src/main/webapp/WEB-INF/web.xml
===================================================================
--- sandbox/as7_support/branches/gatein-as7/wci/test/portlets/native-skipped-with-gateinservlet-portlet/src/main/webapp/WEB-INF/web.xml (rev 0)
+++ sandbox/as7_support/branches/gatein-as7/wci/test/portlets/native-skipped-with-gateinservlet-portlet/src/main/webapp/WEB-INF/web.xml 2012-02-22 19:27:28 UTC (rev 8453)
@@ -0,0 +1,49 @@
+<?xml version="1.0"?>
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ ~ JBoss, a division of Red Hat ~
+ ~ Copyright 2006, Red Hat Middleware, LLC, and individual ~
+ ~ contributors as indicated by the @authors tag. See the ~
+ ~ copyright.txt in the distribution for a full listing of ~
+ ~ individual contributors. ~
+ ~ ~
+ ~ This is free software; you can redistribute it and/or modify it ~
+ ~ under the terms of the GNU Lesser General Public License as ~
+ ~ published by the Free Software Foundation; either version 2.1 of ~
+ ~ the License, or (at your option) any later version. ~
+ ~ ~
+ ~ This software is distributed in the hope that it will be useful, ~
+ ~ but WITHOUT ANY WARRANTY; without even the implied warranty of ~
+ ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ~
+ ~ Lesser General Public License for more details. ~
+ ~ ~
+ ~ You should have received a copy of the GNU Lesser General Public ~
+ ~ License along with this software; if not, write to the Free ~
+ ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA ~
+ ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org. ~
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
+<!DOCTYPE web-app PUBLIC
+ "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
+ "http://java.sun.com/dtd/web-app_2_3.dtd">
+<web-app>
+
+ <!-- Disable the Native Application Registration -->
+ <context-param>
+ <param-name>gatein.wci.native.DisableRegistration</param-name>
+ <param-value>true</param-value>
+ </context-param>
+
+ <!-- Register Using the Generic Method -->
+ <servlet>
+ <servlet-name>GateInServlet</servlet-name>
+ <servlet-class>org.gatein.wci.api.GateInServlet</servlet-class>
+ <load-on-startup>1</load-on-startup>
+ </servlet>
+
+ <servlet-mapping>
+ <servlet-name>GateInServlet</servlet-name>
+ <url-pattern>/gateinservlet</url-pattern>
+ </servlet-mapping>
+
+</web-app>
+
Modified: sandbox/as7_support/branches/gatein-as7/wci/test/portlets/pom.xml
===================================================================
--- sandbox/as7_support/branches/gatein-as7/wci/test/portlets/pom.xml 2012-02-22 16:10:35 UTC (rev 8452)
+++ sandbox/as7_support/branches/gatein-as7/wci/test/portlets/pom.xml 2012-02-22 19:27:28 UTC (rev 8453)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.wci</groupId>
<artifactId>wci-test-parent</artifactId>
- <version>2.1.0-Beta07-AS7-Beta02</version>
+ <version>2.1.1-Beta03-AS7-Beta03</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wci-test-portlets</artifactId>
@@ -13,5 +13,7 @@
<module>exo-portlet</module>
<module>gatein-portlet</module>
<module>native-portlet</module>
+ <module>native-skipped-portlet</module>
+ <module>native-skipped-with-gateinservlet-portlet</module>
</modules>
</project>
Modified: sandbox/as7_support/branches/gatein-as7/wci/test/servers/jboss51/pom.xml
===================================================================
--- sandbox/as7_support/branches/gatein-as7/wci/test/servers/jboss51/pom.xml 2012-02-22 16:10:35 UTC (rev 8452)
+++ sandbox/as7_support/branches/gatein-as7/wci/test/servers/jboss51/pom.xml 2012-02-22 19:27:28 UTC (rev 8453)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.wci</groupId>
<artifactId>wci-test-server-parent</artifactId>
- <version>2.1.0-Beta07-AS7-Beta02</version>
+ <version>2.1.1-Beta03-AS7-Beta03</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wci-test-jboss51</artifactId>
@@ -38,6 +38,18 @@
</dependency>
<dependency>
<groupId>org.gatein.wci</groupId>
+ <artifactId>wci-test-native-skipped-portlet</artifactId>
+ <scope>test</scope>
+ <type>war</type>
+ </dependency>
+ <dependency>
+ <groupId>org.gatein.wci</groupId>
+ <artifactId>wci-test-native-skipped-with-gateinservlet-portlet</artifactId>
+ <scope>test</scope>
+ <type>war</type>
+ </dependency>
+ <dependency>
+ <groupId>org.gatein.wci</groupId>
<artifactId>wci-test-gatein-portlet</artifactId>
<scope>test</scope>
<type>war</type>
@@ -375,6 +387,8 @@
<property name="test.generic.portlet.war" value="${maven.dependency.org.gatein.wci.wci-test-gatein-portlet.war.path}" />
<property name="test.native.portlet.war" value="${maven.dependency.org.gatein.wci.wci-test-native-portlet.war.path}" />
+ <property name="test.native-skip.portlet.war" value="${maven.dependency.org.gatein.wci.wci-test-native-skipped-portlet.war.path}" />
+ <property name="test.native-skip-with-gateinservlet.portlet.war" value="${maven.dependency.org.gatein.wci.wci-test-native-skipped-with-gateinservlet-portlet.war.path}" />
<property name="test.exo.portlet.war" value="${maven.dependency.org.gatein.wci.wci-test-exo-portlet.war.path}" />
<!-- location of common.xml shared between the different server's build.xml -->
Modified: sandbox/as7_support/branches/gatein-as7/wci/test/servers/jboss6/pom.xml
===================================================================
--- sandbox/as7_support/branches/gatein-as7/wci/test/servers/jboss6/pom.xml 2012-02-22 16:10:35 UTC (rev 8452)
+++ sandbox/as7_support/branches/gatein-as7/wci/test/servers/jboss6/pom.xml 2012-02-22 19:27:28 UTC (rev 8453)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.wci</groupId>
<artifactId>wci-test-server-parent</artifactId>
- <version>2.1.0-Beta07-AS7-Beta02</version>
+ <version>2.1.1-Beta03-AS7-Beta03</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wci-test-jboss6</artifactId>
@@ -34,15 +34,33 @@
<groupId>org.gatein.wci</groupId>
<artifactId>wci-test-core</artifactId>
<scope>test</scope>
- </dependency>
+ </dependency>
<dependency>
<groupId>org.gatein.wci</groupId>
+ <artifactId>wci-test-native-skipped-portlet</artifactId>
+ <scope>test</scope>
+ <type>war</type>
+ </dependency>
+ <dependency>
+ <groupId>org.gatein.wci</groupId>
<artifactId>wci-test-native-portlet</artifactId>
<scope>test</scope>
<type>war</type>
</dependency>
<dependency>
<groupId>org.gatein.wci</groupId>
+ <artifactId>wci-test-native-skipped-with-gateinservlet-portlet</artifactId>
+ <scope>test</scope>
+ <type>war</type>
+ </dependency>
+ <dependency>
+ <groupId>org.gatein.wci</groupId>
+ <artifactId>wci-test-native-portlet</artifactId>
+ <scope>test</scope>
+ <type>war</type>
+ </dependency>
+ <dependency>
+ <groupId>org.gatein.wci</groupId>
<artifactId>wci-test-gatein-portlet</artifactId>
<scope>test</scope>
<type>war</type>
@@ -397,6 +415,8 @@
<property name="test.generic.portlet.war" value="${maven.dependency.org.gatein.wci.wci-test-gatein-portlet.war.path}" />
<property name="test.native.portlet.war" value="${maven.dependency.org.gatein.wci.wci-test-native-portlet.war.path}" />
+ <property name="test.native-skip.portlet.war" value="${maven.dependency.org.gatein.wci.wci-test-native-skipped-portlet.war.path}" />
+ <property name="test.native-skip-with-gateinservlet.portlet.war" value="${maven.dependency.org.gatein.wci.wci-test-native-skipped-with-gateinservlet-portlet.war.path}" />
<property name="test.exo.portlet.war" value="${maven.dependency.org.gatein.wci.wci-test-exo-portlet.war.path}" />
<!-- location of common.xml shared between the different server's build.xml -->
Modified: sandbox/as7_support/branches/gatein-as7/wci/test/servers/jetty6/pom.xml
===================================================================
--- sandbox/as7_support/branches/gatein-as7/wci/test/servers/jetty6/pom.xml 2012-02-22 16:10:35 UTC (rev 8452)
+++ sandbox/as7_support/branches/gatein-as7/wci/test/servers/jetty6/pom.xml 2012-02-22 19:27:28 UTC (rev 8453)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.wci</groupId>
<artifactId>wci-test-server-parent</artifactId>
- <version>2.1.0-Beta07-AS7-Beta02</version>
+ <version>2.1.1-Beta03-AS7-Beta03</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wci-test-jetty6</artifactId>
@@ -38,6 +38,18 @@
</dependency>
<dependency>
<groupId>org.gatein.wci</groupId>
+ <artifactId>wci-test-native-skipped-portlet</artifactId>
+ <scope>test</scope>
+ <type>war</type>
+ </dependency>
+ <dependency>
+ <groupId>org.gatein.wci</groupId>
+ <artifactId>wci-test-native-skipped-with-gateinservlet-portlet</artifactId>
+ <scope>test</scope>
+ <type>war</type>
+ </dependency>
+ <dependency>
+ <groupId>org.gatein.wci</groupId>
<artifactId>wci-test-gatein-portlet</artifactId>
<scope>test</scope>
<type>war</type>
@@ -392,6 +404,9 @@
<property name="test.generic.portlet.war" value="${maven.dependency.org.gatein.wci.wci-test-gatein-portlet.war.path}" />
<property name="test.native.portlet.war" value="${maven.dependency.org.gatein.wci.wci-test-native-portlet.war.path}" />
<property name="test.exo.portlet.war" value="${maven.dependency.org.gatein.wci.wci-test-exo-portlet.war.path}" />
+ <property name="test.native-skip.portlet.war" value="${maven.dependency.org.gatein.wci.wci-test-native-skipped-portlet.war.path}" />
+ <property name="test.native-skip-with-gateinservlet.portlet.war" value="${maven.dependency.org.gatein.wci.wci-test-native-skipped-with-gateinservlet-portlet.war.path}" />
+ <property name="test.exo.portlet.war" value="${maven.dependency.org.gatein.wci.wci-test-exo-portlet.war.path}" />
<!-- location of common.xml shared between the different server's build.xml -->
<property name="common.xml.file" value="${test.common.xml}" />
Modified: sandbox/as7_support/branches/gatein-as7/wci/test/servers/pom.xml
===================================================================
--- sandbox/as7_support/branches/gatein-as7/wci/test/servers/pom.xml 2012-02-22 16:10:35 UTC (rev 8452)
+++ sandbox/as7_support/branches/gatein-as7/wci/test/servers/pom.xml 2012-02-22 19:27:28 UTC (rev 8453)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.wci</groupId>
<artifactId>wci-test-parent</artifactId>
- <version>2.1.0-Beta07-AS7-Beta02</version>
+ <version>2.1.1-Beta03-AS7-Beta03</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wci-test-server-parent</artifactId>
Modified: sandbox/as7_support/branches/gatein-as7/wci/test/servers/src/common/resources/common.xml
===================================================================
--- sandbox/as7_support/branches/gatein-as7/wci/test/servers/src/common/resources/common.xml 2012-02-22 16:10:35 UTC (rev 8452)
+++ sandbox/as7_support/branches/gatein-as7/wci/test/servers/src/common/resources/common.xml 2012-02-22 19:27:28 UTC (rev 8453)
@@ -64,14 +64,15 @@
<target name="test-native" if="test.native.enable">
<property name="test.archive.path" value="${test.apps.dir}/${test.server.name}-${test.server.version}-native"/>
- <!-- setup the generic tests -->
+ <!-- setup the native tests -->
<mkdir dir="${test.archive.path}"/>
<copy file="${test.native.portlet.war}" tofile="${test.archive.path}/test-spi-app.war"/>
<copy file="${test.native.server.war}" tofile="${test.archive.path}/test-spi-server.war"/>
<copy file="${test.generic.portlet.war}" tofile="${test.archive.path}/test-generic-app.war"/>
<copy file="${test.exo.portlet.war}" tofile="${test.archive.path}/test-exo-app.war"/>
+ <copy file="${test.native-skip.portlet.war}" tofile="${test.archive.path}/test-native-skip-app.war"/>
+ <copy file="${test.native-skip-with-gateinservlet.portlet.war}" tofile="${test.archive.path}/test-native-skip-with-gateinservlet-app.war"/>
-
<antcall target="tests.execute">
<param name="test.id" value="${test.remote.server.name}-spi-native"/>
<param name="test.war" value="${test.native.server.war}"/>
Modified: sandbox/as7_support/branches/gatein-as7/wci/test/servers/tomcat6/pom.xml
===================================================================
--- sandbox/as7_support/branches/gatein-as7/wci/test/servers/tomcat6/pom.xml 2012-02-22 16:10:35 UTC (rev 8452)
+++ sandbox/as7_support/branches/gatein-as7/wci/test/servers/tomcat6/pom.xml 2012-02-22 19:27:28 UTC (rev 8453)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.wci</groupId>
<artifactId>wci-test-server-parent</artifactId>
- <version>2.1.0-Beta07-AS7-Beta02</version>
+ <version>2.1.1-Beta03-AS7-Beta03</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wci-test-tomcat6</artifactId>
@@ -38,6 +38,18 @@
</dependency>
<dependency>
<groupId>org.gatein.wci</groupId>
+ <artifactId>wci-test-native-skipped-portlet</artifactId>
+ <scope>test</scope>
+ <type>war</type>
+ </dependency>
+ <dependency>
+ <groupId>org.gatein.wci</groupId>
+ <artifactId>wci-test-native-skipped-with-gateinservlet-portlet</artifactId>
+ <scope>test</scope>
+ <type>war</type>
+ </dependency>
+ <dependency>
+ <groupId>org.gatein.wci</groupId>
<artifactId>wci-test-gatein-portlet</artifactId>
<scope>test</scope>
<type>war</type>
@@ -387,6 +399,8 @@
<property name="test.generic.portlet.war" value="${maven.dependency.org.gatein.wci.wci-test-gatein-portlet.war.path}" />
<property name="test.native.portlet.war" value="${maven.dependency.org.gatein.wci.wci-test-native-portlet.war.path}" />
+ <property name="test.native-skip.portlet.war" value="${maven.dependency.org.gatein.wci.wci-test-native-skipped-portlet.war.path}" />
+ <property name="test.native-skip-with-gateinservlet.portlet.war" value="${maven.dependency.org.gatein.wci.wci-test-native-skipped-with-gateinservlet-portlet.war.path}" />
<property name="test.exo.portlet.war" value="${maven.dependency.org.gatein.wci.wci-test-exo-portlet.war.path}" />
<!-- location of common.xml shared between the different server's build.xml -->
Modified: sandbox/as7_support/branches/gatein-as7/wci/test/servers/tomcat7/pom.xml
===================================================================
--- sandbox/as7_support/branches/gatein-as7/wci/test/servers/tomcat7/pom.xml 2012-02-22 16:10:35 UTC (rev 8452)
+++ sandbox/as7_support/branches/gatein-as7/wci/test/servers/tomcat7/pom.xml 2012-02-22 19:27:28 UTC (rev 8453)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.wci</groupId>
<artifactId>wci-test-server-parent</artifactId>
- <version>2.1.0-Beta07-AS7-Beta02</version>
+ <version>2.1.1-Beta03-AS7-Beta03</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wci-test-tomcat7</artifactId>
@@ -38,6 +38,18 @@
</dependency>
<dependency>
<groupId>org.gatein.wci</groupId>
+ <artifactId>wci-test-native-skipped-portlet</artifactId>
+ <scope>test</scope>
+ <type>war</type>
+ </dependency>
+ <dependency>
+ <groupId>org.gatein.wci</groupId>
+ <artifactId>wci-test-native-skipped-with-gateinservlet-portlet</artifactId>
+ <scope>test</scope>
+ <type>war</type>
+ </dependency>
+ <dependency>
+ <groupId>org.gatein.wci</groupId>
<artifactId>wci-test-gatein-portlet</artifactId>
<scope>test</scope>
<type>war</type>
@@ -381,6 +393,8 @@
<property name="test.generic.portlet.war" value="${maven.dependency.org.gatein.wci.wci-test-gatein-portlet.war.path}" />
<property name="test.native.portlet.war" value="${maven.dependency.org.gatein.wci.wci-test-native-portlet.war.path}" />
+ <property name="test.native-skip.portlet.war" value="${maven.dependency.org.gatein.wci.wci-test-native-skipped-portlet.war.path}" />
+ <property name="test.native-skip-with-gateinservlet.portlet.war" value="${maven.dependency.org.gatein.wci.wci-test-native-skipped-with-gateinservlet-portlet.war.path}" />
<property name="test.exo.portlet.war" value="${maven.dependency.org.gatein.wci.wci-test-exo-portlet.war.path}" />
<!-- location of common.xml shared between the different server's build.xml -->
Modified: sandbox/as7_support/branches/gatein-as7/wci/tomcat/pom.xml
===================================================================
--- sandbox/as7_support/branches/gatein-as7/wci/tomcat/pom.xml 2012-02-22 16:10:35 UTC (rev 8452)
+++ sandbox/as7_support/branches/gatein-as7/wci/tomcat/pom.xml 2012-02-22 19:27:28 UTC (rev 8453)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.wci</groupId>
<artifactId>wci-parent</artifactId>
- <version>2.1.0-Beta07-AS7-Beta02</version>
+ <version>2.1.1-Beta03-AS7-Beta03</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wci-tomcat</artifactId>
Modified: sandbox/as7_support/branches/gatein-as7/wci/tomcat/tomcat6/pom.xml
===================================================================
--- sandbox/as7_support/branches/gatein-as7/wci/tomcat/tomcat6/pom.xml 2012-02-22 16:10:35 UTC (rev 8452)
+++ sandbox/as7_support/branches/gatein-as7/wci/tomcat/tomcat6/pom.xml 2012-02-22 19:27:28 UTC (rev 8453)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.wci</groupId>
<artifactId>wci-tomcat</artifactId>
- <version>2.1.0-Beta07-AS7-Beta02</version>
+ <version>2.1.1-Beta03-AS7-Beta03</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wci-tomcat6</artifactId>
Modified: sandbox/as7_support/branches/gatein-as7/wci/tomcat/tomcat6/src/main/java/org/gatein/wci/tomcat/TC6ServletContainerContext.java
===================================================================
--- sandbox/as7_support/branches/gatein-as7/wci/tomcat/tomcat6/src/main/java/org/gatein/wci/tomcat/TC6ServletContainerContext.java 2012-02-22 16:10:35 UTC (rev 8452)
+++ sandbox/as7_support/branches/gatein-as7/wci/tomcat/tomcat6/src/main/java/org/gatein/wci/tomcat/TC6ServletContainerContext.java 2012-02-22 19:27:28 UTC (rev 8453)
@@ -22,6 +22,17 @@
******************************************************************************/
package org.gatein.wci.tomcat;
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Set;
+
+import javax.servlet.ServletContext;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpSession;
+
import org.apache.catalina.Container;
import org.apache.catalina.ContainerEvent;
import org.apache.catalina.ContainerListener;
@@ -31,28 +42,21 @@
import org.apache.catalina.Lifecycle;
import org.apache.catalina.LifecycleEvent;
import org.apache.catalina.LifecycleListener;
+import org.apache.catalina.core.StandardContext;
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.api.GateInServlet;
+import org.gatein.wci.api.GateInServletRegistrations;
import org.gatein.wci.authentication.GenericAuthentication;
import org.gatein.wci.command.CommandDispatcher;
import org.gatein.wci.impl.DefaultServletContainerFactory;
import org.gatein.wci.security.Credentials;
import org.gatein.wci.spi.ServletContainerContext;
-import org.apache.catalina.core.StandardContext;
+import org.gatein.wci.spi.WebAppContext;
-import javax.servlet.ServletContext;
-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;
-
/**
* An implementation of the <code>ServletContainerContext</code> for Tomcat.
*
@@ -71,6 +75,9 @@
/** The monitored contexts. */
private final Set<String> monitoredContexts = new HashSet<String>();
+
+ /** The monitored contexts which were manually added. */
+ private static HashMap<String, String> manualMonitoredContexts = new HashMap<String, String>();
/** . */
private final Engine engine;
@@ -96,12 +103,22 @@
RequestDispatchCallback callback,
Object handback) throws ServletException, IOException
{
- return dispatcher.include(targetServletContext, request, response, callback, handback);
+ if (manualMonitoredContexts.containsKey(targetServletContext.getServletContextName()))
+ {
+ String dispatherPath = manualMonitoredContexts.get(targetServletContext.getServletContextName());
+ CommandDispatcher dispatcher = new CommandDispatcher(dispatherPath);
+ return dispatcher.include(targetServletContext, request, response, callback, handback);
+ }
+ else
+ {
+ return dispatcher.include(targetServletContext, request, response, callback, handback);
+ }
}
public void setCallback(Registration registration)
{
this.registration = registration;
+ GateInServletRegistrations.setServletContainerContext(this);
}
public void unsetCallback(Registration registration)
@@ -328,13 +345,19 @@
{
try
{
- log.debug("Context added " + context.getPath());
- TC6WebAppContext webAppContext = new TC6WebAppContext(context);
+ // skip if the webapp has explicitly stated it doesn't want native registration
+ // usefull when portlets are dependent on servlet ordering
+ if (!isDisabledNativeRegistration(context.getServletContext()))
+ {
- //
- if (registration != null)
- {
- registration.registerWebApp(webAppContext);
+ log.debug("Context added " + context.getPath());
+ TC6WebAppContext webAppContext = new TC6WebAppContext(context);
+
+ //
+ if (registration != null)
+ {
+ registration.registerWebApp(webAppContext);
+ }
}
}
catch (Exception e)
@@ -347,9 +370,14 @@
{
try
{
- if (registration != null)
+ // skip if the webapp has explicitly stated it doesn't want native registration
+ // usefull when portlets are dependent on servlet ordering
+ if (!isDisabledNativeRegistration(context.getServletContext()))
{
- registration.unregisterWebApp(context.getPath());
+ if (registration != null)
+ {
+ registration.unregisterWebApp(context.getPath());
+ }
}
}
catch (Exception e)
@@ -357,4 +385,49 @@
e.printStackTrace();
}
}
+
+ private boolean isDisabledNativeRegistration(ServletContext servletContext)
+ {
+ if (servletContext != null)
+ {
+ String disableWCINativeRegistration = servletContext.getInitParameter(GateInServlet.WCIDISABLENATIVEREGISTRATION);
+ if (disableWCINativeRegistration != null && disableWCINativeRegistration.equalsIgnoreCase("true"))
+ {
+ return true;
+ }
+ else
+ {
+ return false;
+ }
+ }
+ else
+ {
+ return false;
+ }
+ }
+
+ @Override
+ public void registerWebApp(WebAppContext webappContext, String dispatchPath)
+ {
+ if (isDisabledNativeRegistration(webappContext.getServletContext()))
+ {
+ this.manualMonitoredContexts.put(webappContext.getServletContext().getServletContextName(), dispatchPath);
+ registration.registerWebApp(webappContext);
+ }
+ }
+
+ @Override
+ public void unregisterWebApp(ServletContext servletContext)
+ {
+ if (isDisabledNativeRegistration(servletContext))
+ {
+ this.manualMonitoredContexts.remove(servletContext.getServletContextName());
+ //if the registration is null, then this ServletContainerContext has been stopped already
+ //and all the registrations have already been removed.
+ if (registration != null)
+ {
+ registration.unregisterWebApp(servletContext.getContextPath());
+ }
+ }
+ }
}
Modified: sandbox/as7_support/branches/gatein-as7/wci/tomcat/tomcat7/pom.xml
===================================================================
--- sandbox/as7_support/branches/gatein-as7/wci/tomcat/tomcat7/pom.xml 2012-02-22 16:10:35 UTC (rev 8452)
+++ sandbox/as7_support/branches/gatein-as7/wci/tomcat/tomcat7/pom.xml 2012-02-22 19:27:28 UTC (rev 8453)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.wci</groupId>
<artifactId>wci-tomcat</artifactId>
- <version>2.1.0-Beta07-AS7-Beta02</version>
+ <version>2.1.1-Beta03-AS7-Beta03</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wci-tomcat7</artifactId>
Modified: sandbox/as7_support/branches/gatein-as7/wci/tomcat/tomcat7/src/main/java/org/gatein/wci/tomcat/TC7ServletContainerContext.java
===================================================================
--- sandbox/as7_support/branches/gatein-as7/wci/tomcat/tomcat7/src/main/java/org/gatein/wci/tomcat/TC7ServletContainerContext.java 2012-02-22 16:10:35 UTC (rev 8452)
+++ sandbox/as7_support/branches/gatein-as7/wci/tomcat/tomcat7/src/main/java/org/gatein/wci/tomcat/TC7ServletContainerContext.java 2012-02-22 19:27:28 UTC (rev 8453)
@@ -39,6 +39,8 @@
import org.gatein.wci.ServletContainerVisitor;
import org.gatein.wci.WebApp;
+import org.gatein.wci.api.GateInServlet;
+import org.gatein.wci.api.GateInServletRegistrations;
import org.gatein.wci.authentication.GenericAuthentication;
import org.gatein.wci.authentication.TicketService;
@@ -46,6 +48,7 @@
import org.gatein.wci.impl.DefaultServletContainerFactory;
import org.gatein.wci.security.Credentials;
import org.gatein.wci.spi.ServletContainerContext;
+import org.gatein.wci.spi.WebAppContext;
import javax.servlet.ServletContext;
import javax.servlet.ServletException;
@@ -53,7 +56,9 @@
import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.HttpSession;
import java.io.IOException;
+import java.util.HashMap;
import java.util.HashSet;
+import java.util.Map;
import java.util.Set;
/**
@@ -74,6 +79,9 @@
/** The monitored contexts. */
private final Set<String> monitoredContexts = new HashSet<String>();
+
+ /** The monitored contexts which were manually added. */
+ private static Map<String, String> manualMonitoredContexts = new HashMap<String, String>();
/** . */
private final Engine engine;
@@ -96,12 +104,22 @@
RequestDispatchCallback callback,
Object handback) throws ServletException, IOException
{
- return dispatcher.include(targetServletContext, request, response, callback, handback);
+ if (manualMonitoredContexts.containsKey(targetServletContext.getServletContextName()))
+ {
+ String dispatherPath = manualMonitoredContexts.get(targetServletContext.getServletContextName());
+ CommandDispatcher dispatcher = new CommandDispatcher(dispatherPath);
+ return dispatcher.include(targetServletContext, request, response, callback, handback);
+ }
+ else
+ {
+ return dispatcher.include(targetServletContext, request, response, callback, handback);
+ }
}
public void setCallback(Registration registration)
{
this.registration = registration;
+ GateInServletRegistrations.setServletContainerContext(this);
}
public void unsetCallback(Registration registration)
@@ -349,13 +367,18 @@
{
try
{
- log.debug("Context added " + context.getPath());
- TC7WebAppContext webAppContext = new TC7WebAppContext(context);
+ // skip if the webapp has explicitly stated it doesn't want native registration
+ // usefull when portlets are dependent on servlet ordering
+ if (!isDisabledNativeRegistration(context.getServletContext()))
+ {
+ log.debug("Context added " + context.getPath());
+ TC7WebAppContext webAppContext = new TC7WebAppContext(context);
- //
- if (registration != null)
- {
- registration.registerWebApp(webAppContext);
+ //
+ if (registration != null)
+ {
+ registration.registerWebApp(webAppContext);
+ }
}
}
catch (Exception e)
@@ -368,9 +391,14 @@
{
try
{
- if (registration != null)
+ // skip if the webapp has explicitly stated it doesn't want native registration
+ // usefull when portlets are dependent on servlet ordering
+ if (!isDisabledNativeRegistration(context.getServletContext()))
{
- registration.unregisterWebApp(context.getPath());
+ if (registration != null)
+ {
+ registration.unregisterWebApp(context.getPath());
+ }
}
}
catch (Exception e)
@@ -378,4 +406,49 @@
e.printStackTrace();
}
}
+
+ private boolean isDisabledNativeRegistration(ServletContext servletContext)
+ {
+ if (servletContext != null)
+ {
+ String disableWCINativeRegistration = servletContext.getInitParameter(GateInServlet.WCIDISABLENATIVEREGISTRATION);
+ if (disableWCINativeRegistration != null && disableWCINativeRegistration.equalsIgnoreCase("true"))
+ {
+ return true;
+ }
+ else
+ {
+ return false;
+ }
+ }
+ else
+ {
+ return false;
+ }
+ }
+
+ @Override
+ public void registerWebApp(WebAppContext webappContext, String dispatchPath)
+ {
+ if (isDisabledNativeRegistration(webappContext.getServletContext()))
+ {
+ this.manualMonitoredContexts.put(webappContext.getServletContext().getServletContextName(), dispatchPath);
+ registration.registerWebApp(webappContext);
+ }
+ }
+
+ @Override
+ public void unregisterWebApp(ServletContext servletContext)
+ {
+ if (isDisabledNativeRegistration(servletContext))
+ {
+ this.manualMonitoredContexts.remove(servletContext.getServletContextName());
+ //if the registration is null, then this ServletContainerContext has been stopped already
+ //and all the registrations have already been removed.
+ if (registration != null)
+ {
+ registration.unregisterWebApp(servletContext.getContextPath());
+ }
+ }
+ }
}
Modified: sandbox/as7_support/branches/gatein-as7/wci/wci/pom.xml
===================================================================
--- sandbox/as7_support/branches/gatein-as7/wci/wci/pom.xml 2012-02-22 16:10:35 UTC (rev 8452)
+++ sandbox/as7_support/branches/gatein-as7/wci/wci/pom.xml 2012-02-22 19:27:28 UTC (rev 8453)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.wci</groupId>
<artifactId>wci-parent</artifactId>
- <version>2.1.0-Beta07-AS7-Beta02</version>
+ <version>2.1.1-Beta03-AS7-Beta03</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wci-wci</artifactId>
Modified: sandbox/as7_support/branches/gatein-as7/wci/wci/src/main/java/org/gatein/wci/api/GateInServlet.java
===================================================================
--- sandbox/as7_support/branches/gatein-as7/wci/wci/src/main/java/org/gatein/wci/api/GateInServlet.java 2012-02-22 16:10:35 UTC (rev 8452)
+++ sandbox/as7_support/branches/gatein-as7/wci/wci/src/main/java/org/gatein/wci/api/GateInServlet.java 2012-02-22 19:27:28 UTC (rev 8453)
@@ -25,6 +25,7 @@
import org.gatein.wci.command.CommandServlet;
import org.gatein.wci.impl.generic.GenericServletContainerContext;
import org.gatein.wci.impl.generic.GenericWebAppContext;
+import org.gatein.wci.spi.WebAppContext;
import javax.servlet.ServletException;
import javax.servlet.ServletContext;
@@ -41,6 +42,8 @@
private String contextPath;
private ServletContext servletContext;
+
+ public static final String WCIDISABLENATIVEREGISTRATION = "gatein.wci.native.DisableRegistration";
public void init() throws ServletException
{
@@ -52,10 +55,11 @@
//
String contextPath = (String)m.invoke(servletContext);
ClassLoader classLoader = Thread.currentThread().getContextClassLoader();
- GenericWebAppContext webAppContext = new GenericWebAppContext(servletContext, contextPath, classLoader);
+
+ WebAppContext webAppContext = new GenericWebAppContext(servletContext, contextPath, classLoader);
- //
- GenericServletContainerContext.register(webAppContext, "/gateinservlet");
+ GateInServletRegistrations.register(webAppContext, "/gateinservlet");
+
this.contextPath = contextPath;
this.servletContext = servletContext;
}
@@ -69,8 +73,7 @@
{
if (contextPath != null)
{
- //GenericServletContainerContext.unregister(contextPath);
- GenericServletContainerContext.unregister(servletContext);
+ GateInServletRegistrations.unregister(servletContext);
}
}
}
\ No newline at end of file
Modified: sandbox/as7_support/branches/gatein-as7/wci/wci/src/main/java/org/gatein/wci/api/GateInServletListener.java
===================================================================
--- sandbox/as7_support/branches/gatein-as7/wci/wci/src/main/java/org/gatein/wci/api/GateInServletListener.java 2012-02-22 16:10:35 UTC (rev 8452)
+++ sandbox/as7_support/branches/gatein-as7/wci/wci/src/main/java/org/gatein/wci/api/GateInServletListener.java 2012-02-22 19:27:28 UTC (rev 8453)
@@ -45,13 +45,13 @@
GenericWebAppContext webAppContext = new GenericWebAppContext(servletContext, contextPath, classLoader);
- GenericServletContainerContext.register(webAppContext, "/PortletWrapper");
+ GateInServletRegistrations.register(webAppContext, "/PortletWrapper");
}
public void contextDestroyed(ServletContextEvent event)
{
ServletContext servletContext = event.getServletContext();
- GenericServletContainerContext.unregister(servletContext);
+ GateInServletRegistrations.unregister(servletContext);
}
}
Added: sandbox/as7_support/branches/gatein-as7/wci/wci/src/main/java/org/gatein/wci/api/GateInServletRegistrations.java
===================================================================
--- sandbox/as7_support/branches/gatein-as7/wci/wci/src/main/java/org/gatein/wci/api/GateInServletRegistrations.java (rev 0)
+++ sandbox/as7_support/branches/gatein-as7/wci/wci/src/main/java/org/gatein/wci/api/GateInServletRegistrations.java 2012-02-22 19:27:28 UTC (rev 8453)
@@ -0,0 +1,99 @@
+/******************************************************************************
+ * JBoss, a division of Red Hat *
+ * Copyright 2011, Red Hat Middleware, LLC, and individual *
+ * contributors as indicated by the @authors tag. See the *
+ * copyright.txt in the distribution for a full listing of *
+ * individual contributors. *
+ * *
+ * This is free software; you can redistribute it and/or modify it *
+ * under the terms of the GNU Lesser General Public License as *
+ * published by the Free Software Foundation; either version 2.1 of *
+ * the License, or (at your option) any later version. *
+ * *
+ * This software is distributed in the hope that it will be useful, *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU *
+ * Lesser General Public License for more details. *
+ * *
+ * You should have received a copy of the GNU Lesser General Public *
+ * License along with this software; if not, write to the Free *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org. *
+ ******************************************************************************/
+package org.gatein.wci.api;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import javax.servlet.ServletContext;
+
+import org.gatein.wci.ServletContainer;
+import org.gatein.wci.impl.DefaultServletContainer;
+import org.gatein.wci.impl.DefaultServletContainerFactory;
+import org.gatein.wci.impl.generic.GenericWebAppContext;
+import org.gatein.wci.spi.ServletContainerContext;
+import org.gatein.wci.spi.ServletContainerContext.Registration;
+import org.gatein.wci.spi.WebAppContext;
+
+/**
+ * @author <a href="mailto:mwringe@redhat.com">Matt Wringe</a>
+ * @version $Revision$
+ */
+public class GateInServletRegistrations
+{
+ /** . */
+ private static final Map<String, WebAppContext> pendingContexts = Collections.synchronizedMap(new LinkedHashMap<String, WebAppContext>(16, 0.5f, false));
+ private static HashMap<ServletContext, String> requestDispatchMap = new HashMap<ServletContext, String>();
+
+ private static ServletContainerContext servletContainerContext;
+
+ public static void register(WebAppContext webAppContext, String dispatcherPath)
+ {
+ requestDispatchMap.put(webAppContext.getServletContext(), dispatcherPath);
+
+ if (servletContainerContext != null)
+ {
+ servletContainerContext.registerWebApp(webAppContext, dispatcherPath);
+ }
+ else
+ {
+ pendingContexts.put(webAppContext.getContextPath(), webAppContext);
+ }
+ }
+
+ public static void unregister(ServletContext servletContext)
+ {
+ requestDispatchMap.remove(servletContext);
+
+ String contextPath = servletContext.getContextPath();
+
+ if (servletContainerContext != null)
+ {
+ servletContainerContext.unregisterWebApp(servletContext);
+ }
+
+ //
+ if (pendingContexts.containsKey(contextPath))
+ {
+ pendingContexts.remove(contextPath);
+ }
+ }
+
+ public static void setServletContainerContext(ServletContainerContext context)
+ {
+ servletContainerContext = context;
+
+ for (String contextPath : pendingContexts.keySet())
+ {
+ WebAppContext webAppContext = pendingContexts.get(contextPath);
+ String dispatcherPath = requestDispatchMap.get(webAppContext.getServletContext());
+ servletContainerContext.registerWebApp(webAppContext, dispatcherPath);
+ }
+ }
+}
+
Modified: sandbox/as7_support/branches/gatein-as7/wci/wci/src/main/java/org/gatein/wci/endpoint/EndPointServlet.java
===================================================================
--- sandbox/as7_support/branches/gatein-as7/wci/wci/src/main/java/org/gatein/wci/endpoint/EndPointServlet.java 2012-02-22 16:10:35 UTC (rev 8452)
+++ sandbox/as7_support/branches/gatein-as7/wci/wci/src/main/java/org/gatein/wci/endpoint/EndPointServlet.java 2012-02-22 19:27:28 UTC (rev 8453)
@@ -44,6 +44,7 @@
import javax.xml.xpath.XPathExpressionException;
import javax.xml.xpath.XPathConstants;
import javax.xml.xpath.XPathExpression;
+import javax.xml.parsers.DocumentBuilderFactory;
import javax.xml.parsers.ParserConfigurationException;
import java.io.IOException;
import java.io.InputStream;
@@ -122,7 +123,13 @@
//
try
{
- Document doc = XMLTools.getDocumentBuilderFactory().newDocumentBuilder().parse(new ByteArrayInputStream(bytes));
+ DocumentBuilderFactory factory = XMLTools.getDocumentBuilderFactory();
+ factory.setValidating(false);
+ factory.setFeature("http://xml.org/sax/features/namespaces", false);
+ factory.setFeature("http://xml.org/sax/features/validation", false);
+ factory.setFeature("http://apache.org/xml/features/nonvalidating/load-dtd-grammar", false);
+ factory.setFeature("http://apache.org/xml/features/nonvalidating/load-external-dtd", false);
+ Document doc = factory.newDocumentBuilder().parse(new ByteArrayInputStream(bytes));
//
NodeList nodes = (NodeList)expr.evaluate(doc, XPathConstants.NODESET);
Modified: sandbox/as7_support/branches/gatein-as7/wci/wci/src/main/java/org/gatein/wci/impl/DefaultServletContainer.java
===================================================================
--- sandbox/as7_support/branches/gatein-as7/wci/wci/src/main/java/org/gatein/wci/impl/DefaultServletContainer.java 2012-02-22 16:10:35 UTC (rev 8452)
+++ sandbox/as7_support/branches/gatein-as7/wci/wci/src/main/java/org/gatein/wci/impl/DefaultServletContainer.java 2012-02-22 19:27:28 UTC (rev 8453)
@@ -354,37 +354,27 @@
{
throw new IllegalStateException("Disposed registration");
}
-
- if (webAppId == null)
+ synchronized (container.lock)
{
- throw new IllegalArgumentException("No null web app id accepted");
- }
+ if (webAppId == null)
+ {
+ throw new IllegalArgumentException("No null web app id accepted");
+ }
- WebAppImpl webApp = container.webAppMap.get(webAppId);
- if (webApp == null)
- {
- log.debug("Web application " + webAppId + " was not registered");
- return false;
- }
- // lock context before locking container to prevent deadlocks
- synchronized (webApp.context)
- {
- synchronized (container.lock)
+ //
+ WebAppImpl webApp = container.webAppMap.remove(webAppId);
+ if (webApp != null)
{
- webApp = container.webAppMap.remove(webAppId);
- if (webApp != null)
- {
- log.debug("Web application " + webAppId + " cleanup");
- container.fireEvent(new WebAppLifeCycleEvent(webApp, WebAppLifeCycleEvent.REMOVED));
- webApp.context.stop();
- return true;
- }
- else
- {
- log.debug("Web application " + webAppId + " was not registered");
- return false;
- }
+ log.debug("Web application " + webAppId + " cleanup");
+ container.fireEvent(new WebAppLifeCycleEvent(webApp, WebAppLifeCycleEvent.REMOVED));
+ webApp.context.stop();
+ return true;
}
+ else
+ {
+ log.debug("Web application " + webAppId + " was not registered");
+ return false;
+ }
}
}
Modified: sandbox/as7_support/branches/gatein-as7/wci/wci/src/main/java/org/gatein/wci/impl/generic/GenericServletContainerContext.java
===================================================================
--- sandbox/as7_support/branches/gatein-as7/wci/wci/src/main/java/org/gatein/wci/impl/generic/GenericServletContainerContext.java 2012-02-22 16:10:35 UTC (rev 8452)
+++ sandbox/as7_support/branches/gatein-as7/wci/wci/src/main/java/org/gatein/wci/impl/generic/GenericServletContainerContext.java 2012-02-22 19:27:28 UTC (rev 8453)
@@ -23,10 +23,13 @@
package org.gatein.wci.impl.generic;
import org.gatein.wci.RequestDispatchCallback;
+import org.gatein.wci.api.GateInServletRegistrations;
import org.gatein.wci.authentication.GenericAuthentication;
+import org.gatein.wci.impl.DefaultServletContainer;
import org.gatein.wci.impl.DefaultServletContainerFactory;
import org.gatein.wci.security.Credentials;
import org.gatein.wci.spi.ServletContainerContext;
+import org.gatein.wci.spi.WebAppContext;
import org.gatein.wci.command.CommandDispatcher;
import javax.servlet.ServletContext;
@@ -46,11 +49,7 @@
*/
public class GenericServletContainerContext implements ServletContainerContext, ServletContextListener
{
-
/** . */
- private static final Map<String, GenericWebAppContext> pendingContexts = Collections.synchronizedMap(new HashMap<String, GenericWebAppContext>());
-
- /** . */
private static GenericServletContainerContext instance;
private static HashMap<ServletContext, String> requestDispatchMap = new HashMap<ServletContext, String>();
@@ -70,37 +69,6 @@
{
}
- public static void register(GenericWebAppContext webAppContext, String dispatcherPath)
- {
- requestDispatchMap.put(webAppContext.getServletContext(), dispatcherPath);
- if (instance != null && instance.registration != null)
- {
- instance.registration.registerWebApp(webAppContext);
- }
- else
- {
- pendingContexts.put(webAppContext.getContextPath(), webAppContext);
- }
- }
-
- public static void unregister(ServletContext servletContext)
- {
- requestDispatchMap.remove(servletContext);
-
- String contextPath = servletContext.getContextPath();
-
- if (instance != null && instance.registration != null)
- {
- instance.registration.unregisterWebApp(contextPath);
- }
-
- //
- if (pendingContexts.containsKey(contextPath))
- {
- pendingContexts.remove(contextPath);
- }
- }
-
/** . */
public Object include(
@@ -119,12 +87,7 @@
public void setCallback(Registration registration)
{
this.registration = registration;
-
- //
- for (GenericWebAppContext pendingContext : pendingContexts.values())
- {
- registration.registerWebApp(pendingContext);
- }
+ GateInServletRegistrations.setServletContainerContext(this);
}
public void unsetCallback(Registration registration)
@@ -172,4 +135,18 @@
{
// Should we really do something ?
}
+
+ @Override
+ public void registerWebApp(WebAppContext webappContext, String dispatcherPath)
+ {
+ requestDispatchMap.put(webappContext.getServletContext(), dispatcherPath);
+ instance.registration.registerWebApp(webappContext);
+ }
+
+ @Override
+ public void unregisterWebApp(ServletContext servletContext)
+ {
+ requestDispatchMap.remove(servletContext);
+ instance.registration.unregisterWebApp(servletContext.getContextPath());
+ }
}
\ No newline at end of file
Modified: sandbox/as7_support/branches/gatein-as7/wci/wci/src/main/java/org/gatein/wci/security/WCILoginController.java
===================================================================
--- sandbox/as7_support/branches/gatein-as7/wci/wci/src/main/java/org/gatein/wci/security/WCILoginController.java 2012-02-22 16:10:35 UTC (rev 8452)
+++ sandbox/as7_support/branches/gatein-as7/wci/wci/src/main/java/org/gatein/wci/security/WCILoginController.java 2012-02-22 19:27:28 UTC (rev 8453)
@@ -43,7 +43,7 @@
String password = req.getParameter("password");
if (
- req.getSession().getAttribute(Credentials.CREDENTIALS) != null
+ getCredentials(req) != null
&& username == null
&& password == null
) return;
@@ -52,9 +52,9 @@
if (username != null && password != null)
{
- log.debug("Found username and password and set credentials in http session");
+ log.debug("Found username and password. Save credentials for later use.");
Credentials credentials = new Credentials(username, password);
- req.getSession().setAttribute(Credentials.CREDENTIALS, credentials);
+ setCredentials(req, credentials);
}
}
@@ -62,4 +62,14 @@
{
doGet(req, resp);
}
+
+ protected Credentials getCredentials(HttpServletRequest req)
+ {
+ return (Credentials)req.getSession().getAttribute(Credentials.CREDENTIALS);
+ }
+
+ protected void setCredentials(HttpServletRequest req, Credentials credentials)
+ {
+ req.getSession().setAttribute(Credentials.CREDENTIALS, credentials);
+ }
}
Modified: sandbox/as7_support/branches/gatein-as7/wci/wci/src/main/java/org/gatein/wci/spi/ServletContainerContext.java
===================================================================
--- sandbox/as7_support/branches/gatein-as7/wci/wci/src/main/java/org/gatein/wci/spi/ServletContainerContext.java 2012-02-22 16:10:35 UTC (rev 8452)
+++ sandbox/as7_support/branches/gatein-as7/wci/wci/src/main/java/org/gatein/wci/spi/ServletContainerContext.java 2012-02-22 19:27:28 UTC (rev 8453)
@@ -43,111 +43,126 @@
*/
public interface ServletContainerContext
{
- /**
- * Generic detyped request dispatch to a servlet context using the include mechanism.
- *
- * @param targetServletContext the target servlet context to dispatch to
- * @param request the request valid in the current servlet context
- * @param response the response valid in the current servlet context
- * @param callback the callback to perform after the dispatch operation
- * @param handback the handback object that will be provided to the callback
- * @return the object returned by the callback
- * @throws ServletException any servlet exception
- * @throws IOException any io exception
- */
- Object include(
- ServletContext targetServletContext, HttpServletRequest request,
- HttpServletResponse response,
- RequestDispatchCallback callback,
- Object handback) throws ServletException, IOException;
+ /**
+ * Generic detyped request dispatch to a servlet context using the include mechanism.
+ *
+ * @param targetServletContext the target servlet context to dispatch to
+ * @param request the request valid in the current servlet context
+ * @param response the response valid in the current servlet context
+ * @param callback the callback to perform after the dispatch operation
+ * @param handback the handback object that will be provided to the callback
+ * @return the object returned by the callback
+ * @throws ServletException any servlet exception
+ * @throws IOException any io exception
+ */
+ Object include(
+ ServletContext targetServletContext, HttpServletRequest request,
+ HttpServletResponse response,
+ RequestDispatchCallback callback,
+ Object handback) throws ServletException, IOException;
- /**
- * Install the call back object.
- *
- * @param registration the call back
- */
- void setCallback(Registration registration);
+ /**
+ * Install the call back object.
+ *
+ * @param registration the call back
+ */
+ void setCallback(Registration registration);
- /**
- * Uninstall the call back object.
- *
- * @param registration the call back
- */
- void unsetCallback(Registration registration);
+ /**
+ * Uninstall the call back object.
+ *
+ * @param registration the call back
+ */
+ void unsetCallback(Registration registration);
- /**
- * Authentication support.
- *
- * @param request the request valid in the current servlet context
- * @param response the response valid in the current servlet context
- * @param credentials the credentials which try to authenticate
- * @param validityMillis the validity of the authentication
- */
- void login(HttpServletRequest request, HttpServletResponse response, Credentials credentials, long validityMillis) throws ServletException, IOException;
+ /**
+ * Manually register a webapp with this ServletContainerContext.
+ *
+ * @param webappContext the WebAppContext associated with the application
+ * @param dispathPath the path to be used
+ */
+ void registerWebApp(WebAppContext webappContext, String dispatchPath);
- /**
- * Authentication support.
- *
- * @param request the request valid in the current servlet context
- * @param response the response valid in the current servlet context
- * @param credentials the credentials which try to authenticate
- * @param validityMillis the validity of the authentication
- */
- void login(HttpServletRequest request, HttpServletResponse response, Credentials credentials, long validityMillis, String initialURI) throws ServletException, IOException;
+ /**
+ * Manually unregister a webapp associated with this ServletContainerContext.
+ *
+ * @param servletContext the servletContext of the application to be deregistered
+ */
+ void unregisterWebApp(ServletContext servletContext);
- /**
- * Authentication support.
- *
- * @param request the request valid in the current servlet context
- * @param response the response valid in the current servlet context
- */
- void logout(HttpServletRequest request, HttpServletResponse response) throws ServletException;
+ /**
+ * Authentication support.
+ *
+ * @param request the request valid in the current servlet context
+ * @param response the response valid in the current servlet context
+ * @param credentials the credentials which try to authenticate
+ * @param validityMillis the validity of the authentication
+ */
+ void login(HttpServletRequest request, HttpServletResponse response, Credentials credentials, long validityMillis) throws ServletException, IOException;
- /**
- * Returns the name and version of the servlet container in which the
- * context is running.
- *
- * <P>
- * The form of the returned string is <code>containername/versionnumber</code>.
- *
- *
- * @return the string containing at least name and version number
- */
- public String getContainerInfo();
+ /**
+ * Authentication support.
+ *
+ * @param request the request valid in the current servlet context
+ * @param response the response valid in the current servlet context
+ * @param credentials the credentials which try to authenticate
+ * @param validityMillis the validity of the authentication
+ */
+ void login(HttpServletRequest request, HttpServletResponse response, Credentials credentials, long validityMillis, String initialURI) throws ServletException, IOException;
- /**
- * The callback interface that a servlet container context can obtain from its registration against
- * the <code>org.jboss.portal.web.ServletContainer</code> singleton.
- */
- interface Registration
- {
+ /**
+ * Authentication support.
+ *
+ * @param request the request valid in the current servlet context
+ * @param response the response valid in the current servlet context
+ */
+ void logout(HttpServletRequest request, HttpServletResponse response) throws ServletException;
- /**
- * Registers a web application.
- *
- * @param webAppContext the web application context
- * @return true if the registration was done
- * @throws IllegalArgumentException if the argument is null
- * @throws IllegalStateException if the registration is cancelled
- */
- boolean registerWebApp(WebAppContext webAppContext) throws IllegalStateException, IllegalArgumentException;
+ /**
+ * Returns the name and version of the servlet container in which the
+ * context is running.
+ *
+ * <P>
+ * The form of the returned string is <code>containername/versionnumber</code>.
+ *
+ *
+ * @return the string containing at least name and version number
+ */
+ public String getContainerInfo();
- /**
- * Unregister a web application.
- *
- * @param contextPath the web application id
- * @return true if the unregistration was done
- * @throws IllegalArgumentException if the argument is null
- * @throws IllegalStateException if the registration is cancelled
- */
- boolean unregisterWebApp(String contextPath) throws IllegalStateException, IllegalArgumentException;
+ /**
+ * The callback interface that a servlet container context can obtain from its registration against
+ * the <code>org.jboss.portal.web.ServletContainer</code> singleton.
+ */
+ interface Registration
+ {
- /**
- * Cancel the registration against the servlet container.
- *
- * @throws IllegalStateException if the registration is cancelled
- */
- void cancel() throws IllegalStateException;
- }
+ /**
+ * Registers a web application.
+ *
+ * @param webAppContext the web application context
+ * @return true if the registration was done
+ * @throws IllegalArgumentException if the argument is null
+ * @throws IllegalStateException if the registration is cancelled
+ */
+ boolean registerWebApp(WebAppContext webAppContext) throws IllegalStateException, IllegalArgumentException;
+ /**
+ * Unregister a web application.
+ *
+ * @param contextPath the web application id
+ * @return true if the unregistration was done
+ * @throws IllegalArgumentException if the argument is null
+ * @throws IllegalStateException if the registration is cancelled
+ */
+ boolean unregisterWebApp(String contextPath) throws IllegalStateException, IllegalArgumentException;
+
+ /**
+ * Cancel the registration against the servlet container.
+ *
+ * @throws IllegalStateException if the registration is cancelled
+ */
+ void cancel() throws IllegalStateException;
+ }
+
}
12 years, 3 months
- 1
- 0
gatein SVN: r8452 - in sandbox/as7_support/branches/gatein-as7/wci: exo and 19 other directories.
by do-not-reply＠jboss.org
Author: mstruk
Date: 2012-02-22 11:10:35 -0500 (Wed, 22 Feb 2012)
New Revision: 8452
Modified:
sandbox/as7_support/branches/gatein-as7/wci/exo/pom.xml
sandbox/as7_support/branches/gatein-as7/wci/jboss/jboss6/pom.xml
sandbox/as7_support/branches/gatein-as7/wci/jboss/jboss7/pom.xml
sandbox/as7_support/branches/gatein-as7/wci/jboss/pom.xml
sandbox/as7_support/branches/gatein-as7/wci/jetty/pom.xml
sandbox/as7_support/branches/gatein-as7/wci/pom.xml
sandbox/as7_support/branches/gatein-as7/wci/test/pom.xml
sandbox/as7_support/branches/gatein-as7/wci/test/portlets/exo-portlet/pom.xml
sandbox/as7_support/branches/gatein-as7/wci/test/portlets/gatein-portlet/pom.xml
sandbox/as7_support/branches/gatein-as7/wci/test/portlets/native-portlet/pom.xml
sandbox/as7_support/branches/gatein-as7/wci/test/portlets/pom.xml
sandbox/as7_support/branches/gatein-as7/wci/test/servers/jboss51/pom.xml
sandbox/as7_support/branches/gatein-as7/wci/test/servers/jboss6/pom.xml
sandbox/as7_support/branches/gatein-as7/wci/test/servers/jetty6/pom.xml
sandbox/as7_support/branches/gatein-as7/wci/test/servers/pom.xml
sandbox/as7_support/branches/gatein-as7/wci/test/servers/tomcat6/pom.xml
sandbox/as7_support/branches/gatein-as7/wci/test/servers/tomcat7/pom.xml
sandbox/as7_support/branches/gatein-as7/wci/tomcat/pom.xml
sandbox/as7_support/branches/gatein-as7/wci/tomcat/tomcat6/pom.xml
sandbox/as7_support/branches/gatein-as7/wci/tomcat/tomcat7/pom.xml
sandbox/as7_support/branches/gatein-as7/wci/wci/pom.xml
Log:
Bring up to date with AS7-Beta02
Modified: sandbox/as7_support/branches/gatein-as7/wci/exo/pom.xml
===================================================================
--- sandbox/as7_support/branches/gatein-as7/wci/exo/pom.xml 2012-02-22 02:34:28 UTC (rev 8451)
+++ sandbox/as7_support/branches/gatein-as7/wci/exo/pom.xml 2012-02-22 16:10:35 UTC (rev 8452)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.wci</groupId>
<artifactId>wci-parent</artifactId>
- <version>2.1.0-Beta07-SNAPSHOT</version>
+ <version>2.1.0-Beta07-AS7-Beta02</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wci-exo</artifactId>
Modified: sandbox/as7_support/branches/gatein-as7/wci/jboss/jboss6/pom.xml
===================================================================
--- sandbox/as7_support/branches/gatein-as7/wci/jboss/jboss6/pom.xml 2012-02-22 02:34:28 UTC (rev 8451)
+++ sandbox/as7_support/branches/gatein-as7/wci/jboss/jboss6/pom.xml 2012-02-22 16:10:35 UTC (rev 8452)
@@ -2,11 +2,10 @@
<parent>
<groupId>org.gatein.wci</groupId>
<artifactId>wci-jboss</artifactId>
- <version>2.1.0-Beta07-SNAPSHOT</version>
+ <version>2.1.0-Beta07-AS7-Beta02</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wci-jboss6</artifactId>
- <version>2.1.0-Beta07-SNAPSHOT</version>
<packaging>jar</packaging>
<name>GateIn - WCI JBoss 6 compatibility component</name>
Modified: sandbox/as7_support/branches/gatein-as7/wci/jboss/jboss7/pom.xml
===================================================================
--- sandbox/as7_support/branches/gatein-as7/wci/jboss/jboss7/pom.xml 2012-02-22 02:34:28 UTC (rev 8451)
+++ sandbox/as7_support/branches/gatein-as7/wci/jboss/jboss7/pom.xml 2012-02-22 16:10:35 UTC (rev 8452)
@@ -2,11 +2,10 @@
<parent>
<groupId>org.gatein.wci</groupId>
<artifactId>wci-jboss</artifactId>
- <version>2.1.0-Beta07-SNAPSHOT</version>
+ <version>2.1.0-Beta07-AS7-Beta02</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wci-jboss7</artifactId>
- <version>2.1.0-Beta07-AS7-Beta01</version>
<packaging>jar</packaging>
<name>GateIn - WCI JBoss 7 compatibility component</name>
Modified: sandbox/as7_support/branches/gatein-as7/wci/jboss/pom.xml
===================================================================
--- sandbox/as7_support/branches/gatein-as7/wci/jboss/pom.xml 2012-02-22 02:34:28 UTC (rev 8451)
+++ sandbox/as7_support/branches/gatein-as7/wci/jboss/pom.xml 2012-02-22 16:10:35 UTC (rev 8452)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.wci</groupId>
<artifactId>wci-parent</artifactId>
- <version>2.1.0-Beta07-SNAPSHOT</version>
+ <version>2.1.0-Beta07-AS7-Beta02</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wci-jboss</artifactId>
Modified: sandbox/as7_support/branches/gatein-as7/wci/jetty/pom.xml
===================================================================
--- sandbox/as7_support/branches/gatein-as7/wci/jetty/pom.xml 2012-02-22 02:34:28 UTC (rev 8451)
+++ sandbox/as7_support/branches/gatein-as7/wci/jetty/pom.xml 2012-02-22 16:10:35 UTC (rev 8452)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.wci</groupId>
<artifactId>wci-parent</artifactId>
- <version>2.1.0-Beta07-SNAPSHOT</version>
+ <version>2.1.0-Beta07-AS7-Beta02</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wci-jetty</artifactId>
Modified: sandbox/as7_support/branches/gatein-as7/wci/pom.xml
===================================================================
--- sandbox/as7_support/branches/gatein-as7/wci/pom.xml 2012-02-22 02:34:28 UTC (rev 8451)
+++ sandbox/as7_support/branches/gatein-as7/wci/pom.xml 2012-02-22 16:10:35 UTC (rev 8452)
@@ -6,7 +6,7 @@
<groupId>org.gatein.wci</groupId>
<artifactId>wci-parent</artifactId>
- <version>2.1.0-Beta07-SNAPSHOT</version>
+ <version>2.1.0-Beta07-AS7-Beta02</version>
<packaging>pom</packaging>
<parent>
Modified: sandbox/as7_support/branches/gatein-as7/wci/test/pom.xml
===================================================================
--- sandbox/as7_support/branches/gatein-as7/wci/test/pom.xml 2012-02-22 02:34:28 UTC (rev 8451)
+++ sandbox/as7_support/branches/gatein-as7/wci/test/pom.xml 2012-02-22 16:10:35 UTC (rev 8452)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.wci</groupId>
<artifactId>wci-parent</artifactId>
- <version>2.1.0-Beta07-SNAPSHOT</version>
+ <version>2.1.0-Beta07-AS7-Beta02</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wci-test-parent</artifactId>
Modified: sandbox/as7_support/branches/gatein-as7/wci/test/portlets/exo-portlet/pom.xml
===================================================================
--- sandbox/as7_support/branches/gatein-as7/wci/test/portlets/exo-portlet/pom.xml 2012-02-22 02:34:28 UTC (rev 8451)
+++ sandbox/as7_support/branches/gatein-as7/wci/test/portlets/exo-portlet/pom.xml 2012-02-22 16:10:35 UTC (rev 8452)
@@ -2,11 +2,10 @@
<parent>
<groupId>org.gatein.wci</groupId>
<artifactId>wci-test-portlets</artifactId>
- <version>2.1.0-Beta07-SNAPSHOT</version>
+ <version>2.1.0-Beta07-AS7-Beta02</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wci-test-exo-portlet</artifactId>
- <version>2.1.0-Beta07-SNAPSHOT</version>
<packaging>war</packaging>
<name>GateIn - WCI eXo Backwards Compatibility Test Portlet</name>
</project>
Modified: sandbox/as7_support/branches/gatein-as7/wci/test/portlets/gatein-portlet/pom.xml
===================================================================
--- sandbox/as7_support/branches/gatein-as7/wci/test/portlets/gatein-portlet/pom.xml 2012-02-22 02:34:28 UTC (rev 8451)
+++ sandbox/as7_support/branches/gatein-as7/wci/test/portlets/gatein-portlet/pom.xml 2012-02-22 16:10:35 UTC (rev 8452)
@@ -2,11 +2,10 @@
<parent>
<groupId>org.gatein.wci</groupId>
<artifactId>wci-test-portlets</artifactId>
- <version>2.1.0-Beta07-SNAPSHOT</version>
+ <version>2.1.0-Beta07-AS7-Beta02</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wci-test-gatein-portlet</artifactId>
- <version>2.1.0-Beta07-SNAPSHOT</version>
<packaging>war</packaging>
<name>GateIn - WCI Gatein Test Portlet</name>
</project>
Modified: sandbox/as7_support/branches/gatein-as7/wci/test/portlets/native-portlet/pom.xml
===================================================================
--- sandbox/as7_support/branches/gatein-as7/wci/test/portlets/native-portlet/pom.xml 2012-02-22 02:34:28 UTC (rev 8451)
+++ sandbox/as7_support/branches/gatein-as7/wci/test/portlets/native-portlet/pom.xml 2012-02-22 16:10:35 UTC (rev 8452)
@@ -2,11 +2,10 @@
<parent>
<groupId>org.gatein.wci</groupId>
<artifactId>wci-test-portlets</artifactId>
- <version>2.1.0-Beta07-SNAPSHOT</version>
+ <version>2.1.0-Beta07-AS7-Beta02</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wci-test-native-portlet</artifactId>
- <version>2.1.0-Beta07-SNAPSHOT</version>
<packaging>war</packaging>
<name>GateIn - WCI Native Test Portlet</name>
</project>
Modified: sandbox/as7_support/branches/gatein-as7/wci/test/portlets/pom.xml
===================================================================
--- sandbox/as7_support/branches/gatein-as7/wci/test/portlets/pom.xml 2012-02-22 02:34:28 UTC (rev 8451)
+++ sandbox/as7_support/branches/gatein-as7/wci/test/portlets/pom.xml 2012-02-22 16:10:35 UTC (rev 8452)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.wci</groupId>
<artifactId>wci-test-parent</artifactId>
- <version>2.1.0-Beta07-SNAPSHOT</version>
+ <version>2.1.0-Beta07-AS7-Beta02</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wci-test-portlets</artifactId>
Modified: sandbox/as7_support/branches/gatein-as7/wci/test/servers/jboss51/pom.xml
===================================================================
--- sandbox/as7_support/branches/gatein-as7/wci/test/servers/jboss51/pom.xml 2012-02-22 02:34:28 UTC (rev 8451)
+++ sandbox/as7_support/branches/gatein-as7/wci/test/servers/jboss51/pom.xml 2012-02-22 16:10:35 UTC (rev 8452)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.wci</groupId>
<artifactId>wci-test-server-parent</artifactId>
- <version>2.1.0-Beta07-SNAPSHOT</version>
+ <version>2.1.0-Beta07-AS7-Beta02</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wci-test-jboss51</artifactId>
Modified: sandbox/as7_support/branches/gatein-as7/wci/test/servers/jboss6/pom.xml
===================================================================
--- sandbox/as7_support/branches/gatein-as7/wci/test/servers/jboss6/pom.xml 2012-02-22 02:34:28 UTC (rev 8451)
+++ sandbox/as7_support/branches/gatein-as7/wci/test/servers/jboss6/pom.xml 2012-02-22 16:10:35 UTC (rev 8452)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.wci</groupId>
<artifactId>wci-test-server-parent</artifactId>
- <version>2.1.0-Beta07-SNAPSHOT</version>
+ <version>2.1.0-Beta07-AS7-Beta02</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wci-test-jboss6</artifactId>
Modified: sandbox/as7_support/branches/gatein-as7/wci/test/servers/jetty6/pom.xml
===================================================================
--- sandbox/as7_support/branches/gatein-as7/wci/test/servers/jetty6/pom.xml 2012-02-22 02:34:28 UTC (rev 8451)
+++ sandbox/as7_support/branches/gatein-as7/wci/test/servers/jetty6/pom.xml 2012-02-22 16:10:35 UTC (rev 8452)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.wci</groupId>
<artifactId>wci-test-server-parent</artifactId>
- <version>2.1.0-Beta07-SNAPSHOT</version>
+ <version>2.1.0-Beta07-AS7-Beta02</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wci-test-jetty6</artifactId>
Modified: sandbox/as7_support/branches/gatein-as7/wci/test/servers/pom.xml
===================================================================
--- sandbox/as7_support/branches/gatein-as7/wci/test/servers/pom.xml 2012-02-22 02:34:28 UTC (rev 8451)
+++ sandbox/as7_support/branches/gatein-as7/wci/test/servers/pom.xml 2012-02-22 16:10:35 UTC (rev 8452)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.wci</groupId>
<artifactId>wci-test-parent</artifactId>
- <version>2.1.0-Beta07-SNAPSHOT</version>
+ <version>2.1.0-Beta07-AS7-Beta02</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wci-test-server-parent</artifactId>
Modified: sandbox/as7_support/branches/gatein-as7/wci/test/servers/tomcat6/pom.xml
===================================================================
--- sandbox/as7_support/branches/gatein-as7/wci/test/servers/tomcat6/pom.xml 2012-02-22 02:34:28 UTC (rev 8451)
+++ sandbox/as7_support/branches/gatein-as7/wci/test/servers/tomcat6/pom.xml 2012-02-22 16:10:35 UTC (rev 8452)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.wci</groupId>
<artifactId>wci-test-server-parent</artifactId>
- <version>2.1.0-Beta07-SNAPSHOT</version>
+ <version>2.1.0-Beta07-AS7-Beta02</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wci-test-tomcat6</artifactId>
Modified: sandbox/as7_support/branches/gatein-as7/wci/test/servers/tomcat7/pom.xml
===================================================================
--- sandbox/as7_support/branches/gatein-as7/wci/test/servers/tomcat7/pom.xml 2012-02-22 02:34:28 UTC (rev 8451)
+++ sandbox/as7_support/branches/gatein-as7/wci/test/servers/tomcat7/pom.xml 2012-02-22 16:10:35 UTC (rev 8452)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.wci</groupId>
<artifactId>wci-test-server-parent</artifactId>
- <version>2.1.0-Beta07-SNAPSHOT</version>
+ <version>2.1.0-Beta07-AS7-Beta02</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wci-test-tomcat7</artifactId>
Modified: sandbox/as7_support/branches/gatein-as7/wci/tomcat/pom.xml
===================================================================
--- sandbox/as7_support/branches/gatein-as7/wci/tomcat/pom.xml 2012-02-22 02:34:28 UTC (rev 8451)
+++ sandbox/as7_support/branches/gatein-as7/wci/tomcat/pom.xml 2012-02-22 16:10:35 UTC (rev 8452)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.wci</groupId>
<artifactId>wci-parent</artifactId>
- <version>2.1.0-Beta07-SNAPSHOT</version>
+ <version>2.1.0-Beta07-AS7-Beta02</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wci-tomcat</artifactId>
Modified: sandbox/as7_support/branches/gatein-as7/wci/tomcat/tomcat6/pom.xml
===================================================================
--- sandbox/as7_support/branches/gatein-as7/wci/tomcat/tomcat6/pom.xml 2012-02-22 02:34:28 UTC (rev 8451)
+++ sandbox/as7_support/branches/gatein-as7/wci/tomcat/tomcat6/pom.xml 2012-02-22 16:10:35 UTC (rev 8452)
@@ -2,11 +2,10 @@
<parent>
<groupId>org.gatein.wci</groupId>
<artifactId>wci-tomcat</artifactId>
- <version>2.1.0-Beta07-SNAPSHOT</version>
+ <version>2.1.0-Beta07-AS7-Beta02</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wci-tomcat6</artifactId>
- <version>2.1.0-Beta07-SNAPSHOT</version>
<packaging>jar</packaging>
<name>GateIn - WCI Tomcat 6 compatibility component</name>
Modified: sandbox/as7_support/branches/gatein-as7/wci/tomcat/tomcat7/pom.xml
===================================================================
--- sandbox/as7_support/branches/gatein-as7/wci/tomcat/tomcat7/pom.xml 2012-02-22 02:34:28 UTC (rev 8451)
+++ sandbox/as7_support/branches/gatein-as7/wci/tomcat/tomcat7/pom.xml 2012-02-22 16:10:35 UTC (rev 8452)
@@ -2,11 +2,10 @@
<parent>
<groupId>org.gatein.wci</groupId>
<artifactId>wci-tomcat</artifactId>
- <version>2.1.0-Beta07-SNAPSHOT</version>
+ <version>2.1.0-Beta07-AS7-Beta02</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wci-tomcat7</artifactId>
- <version>2.1.0-Beta07-SNAPSHOT</version>
<packaging>jar</packaging>
<name>GateIn - WCI Tomcat 7 compatibility component</name>
Modified: sandbox/as7_support/branches/gatein-as7/wci/wci/pom.xml
===================================================================
--- sandbox/as7_support/branches/gatein-as7/wci/wci/pom.xml 2012-02-22 02:34:28 UTC (rev 8451)
+++ sandbox/as7_support/branches/gatein-as7/wci/wci/pom.xml 2012-02-22 16:10:35 UTC (rev 8452)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.wci</groupId>
<artifactId>wci-parent</artifactId>
- <version>2.1.0-Beta07-SNAPSHOT</version>
+ <version>2.1.0-Beta07-AS7-Beta02</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wci-wci</artifactId>
12 years, 3 months
- 1
- 0
gatein SVN: r8451 - in epp/docs/branches/5.2/User_Guide: en-US and 1 other directories.
by do-not-reply＠jboss.org
Author: jaredmorgs
Date: 2012-02-21 21:34:28 -0500 (Tue, 21 Feb 2012)
New Revision: 8451
Modified:
epp/docs/branches/5.2/User_Guide/en-US/Book_Info.xml
epp/docs/branches/5.2/User_Guide/en-US/Revision_History.xml
epp/docs/branches/5.2/User_Guide/en-US/User_Guide.xml
epp/docs/branches/5.2/User_Guide/en-US/modules/portal/Manage_Portals.xml
epp/docs/branches/5.2/User_Guide/publican.cfg
Log:
Draft content for https://bugzilla.redhat.com/show_bug.cgi?id=794408. Require info for Import Modes in Import and Export section of User Guide
Modified: epp/docs/branches/5.2/User_Guide/en-US/Book_Info.xml
===================================================================
--- epp/docs/branches/5.2/User_Guide/en-US/Book_Info.xml 2012-02-21 21:30:26 UTC (rev 8450)
+++ epp/docs/branches/5.2/User_Guide/en-US/Book_Info.xml 2012-02-22 02:34:28 UTC (rev 8451)
@@ -8,7 +8,7 @@
<productname>JBoss Enterprise Portal Platform</productname>
<productnumber>5.2</productnumber>
<edition>5.2.1</edition>
- <pubsnumber>2</pubsnumber>
+ <pubsnumber>3</pubsnumber>
<abstract>
<para>
This document provides an easy to follow guide to the functions and
Modified: epp/docs/branches/5.2/User_Guide/en-US/Revision_History.xml
===================================================================
--- epp/docs/branches/5.2/User_Guide/en-US/Revision_History.xml 2012-02-21 21:30:26 UTC (rev 8450)
+++ epp/docs/branches/5.2/User_Guide/en-US/Revision_History.xml 2012-02-22 02:34:28 UTC (rev 8451)
@@ -8,6 +8,20 @@
<simpara>
<revhistory>
<revision>
+ <revnumber>5.2.1-3</revnumber>
+ <date>Wed Feb 22 2012</date>
+ <author>
+ <firstname>Jared</firstname>
+ <surname>Morgan</surname>
+ <email/>
+ </author>
+ <revdescription>
+ <simplelist>
+ <member>First draft of content for https://bugzilla.redhat.com/show_bug.cgi?id=794408. NEEDINFO marked as required.</member>
+ </simplelist>
+ </revdescription>
+ </revision>
+ <revision>
<revnumber>5.2.1-2</revnumber>
<date>Mon Jan 09 2012</date>
<author>
Modified: epp/docs/branches/5.2/User_Guide/en-US/User_Guide.xml
===================================================================
--- epp/docs/branches/5.2/User_Guide/en-US/User_Guide.xml 2012-02-21 21:30:26 UTC (rev 8450)
+++ epp/docs/branches/5.2/User_Guide/en-US/User_Guide.xml 2012-02-22 02:34:28 UTC (rev 8451)
@@ -1,10 +1,9 @@
<?xml version='1.0' encoding='UTF-8'?>
-<!-- This document was created with Syntext Serna Free. -->
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<!-- This document was created with Syntext Serna Free. --><!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
<!ENTITY % BOOK_ENTITIES SYSTEM "User_Guide.ent">
%BOOK_ENTITIES;
]>
-<book>
+<book status="draft">
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Book_Info.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Preface.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="modules/Introduction.xml"/>
@@ -17,5 +16,4 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="modules/GadgetsAdmin.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="modules/Further_Documentation.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Revision_History.xml"/>
- <index/>
</book>
Modified: epp/docs/branches/5.2/User_Guide/en-US/modules/portal/Manage_Portals.xml
===================================================================
--- epp/docs/branches/5.2/User_Guide/en-US/modules/portal/Manage_Portals.xml 2012-02-21 21:30:26 UTC (rev 8450)
+++ epp/docs/branches/5.2/User_Guide/en-US/modules/portal/Manage_Portals.xml 2012-02-22 02:34:28 UTC (rev 8451)
@@ -1,426 +1,565 @@
-<?xml version='1.0' encoding='utf-8' ?>
+<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
<!ENTITY % BOOK_ENTITIES SYSTEM "../../User_Guide.ent">
%BOOK_ENTITIES;
]>
<section id="sect-User_Guide-Manage_Portals">
- <title>Manage Portals</title>
-
-
-<section id="sect-User_Guide-Create_a_New_Portal">
+ <title>Manage Portals</title>
+ <section id="sect-User_Guide-Create_a_New_Portal">
<title>Create a New Portal</title>
<para>
Creating a new portal requires you to have a special permission that only an administrator can give you (if you are not an administrator).
</para>
<procedure>
- <step>
- <para>
+ <step>
+ <para>
Click on <emphasis role="bold">Site</emphasis> in the toolbar then click the <emphasis role="bold">Add New Portal</emphasis> button.
</para>
- <mediaobject>
- <imageobject role="html">
- <imagedata fileref="images/AddPortal.png" format="PNG" align="center" scale="90" />
- </imageobject>
- <imageobject role="fo">
- <imagedata fileref="images/AddPortal.png" format="PNG" align="center" contentwidth="150mm" />
- </imageobject>
- </mediaobject>
- </step>
- <step>
- <para>
+ <mediaobject>
+ <imageobject role="html">
+ <imagedata align="center" scale="90" fileref="images/AddPortal.png" format="PNG"/>
+ </imageobject>
+ <imageobject role="fo">
+ <imagedata contentwidth="150mm" align="center" fileref="images/AddPortal.png" format="PNG"/>
+ </imageobject>
+ </mediaobject>
+ </step>
+ <step>
+ <para>
This opens the <emphasis role="bold">Create New Portal</emphasis> window.
</para>
- <mediaobject>
- <imageobject role="html">
- <imagedata fileref="images/PortalSetting2.5.png" format="PNG" align="center" scale="90" />
- </imageobject>
- <imageobject role="fo">
- <imagedata fileref="images/PortalSetting2.5.png" format="PNG" align="center" contentwidth="150mm" />
- </imageobject>
- </mediaobject>
-
- </step>
+ <mediaobject>
+ <imageobject role="html">
+ <imagedata align="center" scale="90" fileref="images/PortalSetting2.5.png" format="PNG"/>
+ </imageobject>
+ <imageobject role="fo">
+ <imagedata contentwidth="150mm" align="center" fileref="images/PortalSetting2.5.png" format="PNG"/>
+ </imageobject>
+ </mediaobject>
+ </step>
<step>
- <para>
+ <para>
The first tab in the window is the <emphasis role="bold">Portal Templates</emphasis> tab. This tab lets you choose a template for the new portal from templates that are saved in the installation.
</para>
- <mediaobject>
- <imageobject role="html">
- <imagedata fileref="images/PortalTemplates.png" format="PNG" align="center" scale="90" />
- </imageobject>
- <imageobject role="fo">
- <imagedata fileref="images/PortalTemplates.png" format="PNG" align="center" contentwidth="150mm" />
- </imageobject>
- </mediaobject>
- <para>
+ <mediaobject>
+ <imageobject role="html">
+ <imagedata align="center" scale="90" fileref="images/PortalTemplates.png" format="PNG"/>
+ </imageobject>
+ <imageobject role="fo">
+ <imagedata contentwidth="150mm" align="center" fileref="images/PortalTemplates.png" format="PNG"/>
+ </imageobject>
+ </mediaobject>
+ <para>
Click this tab if you have custom templates stored, or if you wish to use a default template for your portal.
</para>
</step>
- <step>
- <para>
+ <step>
+ <para>
Click the next <emphasis role="bold">Portal Setting</emphasis> tab to configure some aspects of the new portal.
</para>
- <para>
+ <para>
Enter a string for the <emphasis role="bold">Portal Name</emphasis> field. This field is required and must be unique. Only alphabetical, numerical, dash and underscore characters are allowed for this field and the name must be between 3 and 30 characters.
</para>
- </step>
- <step>
- <para>
+ </step>
+ <step>
+ <para>
Select the default display language for the portal.
</para>
- </step>
- <step>
- <para>
+ </step>
+ <step>
+ <para>
Enter a Label for the new portal. This field is optional.
</para>
- </step>
- <step>
- <para>
+ </step>
+ <step>
+ <para>
Enter a description of the portal. This field is optional.
</para>
- </step>
- <step>
- <para>
+ </step>
+ <step>
+ <para>
Select a skin for a portal.
</para>
- </step>
- <step>
- <para>
+ </step>
+ <step>
+ <para>
Click on the <guilabel>Properties</guilabel> tab to fill in the <guilabel>Keep session alive</guilabel> property. There are three options:
<variablelist>
- <varlistentry>
- <term>Never</term>
- <listitem>
- <para>
+ <varlistentry>
+ <term>Never</term>
+ <listitem>
+ <para>
The session will never timeout, even if an application requests it.
</para>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term>On-demand</term>
- <listitem>
- <para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term>On-demand</term>
+ <listitem>
+ <para>
The session will timeout if an application requests it
</para>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term>Always</term>
- <listitem>
- <para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term>Always</term>
+ <listitem>
+ <para>
The session will time out after a set period.
</para>
- </listitem>
- </varlistentry>
- </variablelist>
+ </listitem>
+ </varlistentry>
+ </variablelist>
</para>
- </step>
- <step>
- <para>
- Also while on the <guilabel>Properties</guilabel> tab, check or uncheck the box labeled <guilabel>Show info bar by default</guilabel>. If checked, portlets show an information bar containing the portlet's name, a <emphasis>help</emphasis> drop-down menu and <guilabel>minimize/maximize</guilabel> buttons after being added to a page.
+ </step>
+ <step>
+ <para>
+ Also while on the <guilabel>Properties</guilabel> tab, check or uncheck the box labeled <guilabel>Show info bar by default</guilabel>. If checked, portlets show an information bar containing the portlet's name, a <emphasis>help</emphasis> drop-down menu and <guilabel>minimize/maximize</guilabel> buttons after being added to a page.
</para>
- </step>
- <step>
- <para>
+ </step>
+ <step>
+ <para>
Click on the <emphasis role="bold">Permission Setting</emphasis> tab and set the permissions for the Portal.
</para>
- <itemizedlist>
- <listitem>
- <para>
+ <itemizedlist>
+ <listitem>
+ <para>
Two types of permissions need to be set for a new portal; <emphasis>Access Permission</emphasis> and <emphasis>Edit Permission</emphasis>.
</para>
- </listitem>
- <listitem>
- <para>
+ </listitem>
+ <listitem>
+ <para>
<emphasis>Access Permission</emphasis> can be set to allow global access by checking the <emphasis role="bold">Make it Public</emphasis> box. Alternatively, specific permission for groups can be added by clicking <emphasis role="bold">Add Permission</emphasis>, then selecting a group in the left pane of the box and then a membership level in the right pane.
</para>
- </listitem>
- <listitem>
- <para>
+ </listitem>
+ <listitem>
+ <para>
<emphasis>Edit Permission</emphasis> requires specific permissions to be set. Click on <emphasis role="bold">Select Permission</emphasis> and choose a group and level as above.
</para>
- </listitem>
- </itemizedlist>
- <para>
+ </listitem>
+ </itemizedlist>
+ <para>
See <xref linkend="sect-User_Guide-User_management"/> and <xref linkend="sect-User_Guide-Manage_Permissions"/> for further information.
</para>
- </step>
- <step>
- <para>
+ </step>
+ <step>
+ <para>
Click <emphasis role="bold">Save</emphasis>
</para>
- </step>
+ </step>
</procedure>
<para>
- You also can edit or delete a portal. See <xref linkend="sect-User_Guide-Manage_Portals-Access_a_Portal" /> or <xref linkend="sect-User_Guide-Manage_Portals-Delete_a_Portal" /> for more details.
+ You also can edit or delete a portal. See <xref linkend="sect-User_Guide-Manage_Portals-Access_a_Portal"/> or <xref linkend="sect-User_Guide-Manage_Portals-Delete_a_Portal"/> for more details.
</para>
-</section>
-
-
- <section id="sect-User_Guide-Manage_Portals-Access_a_Portal">
- <title>Access a Portal</title>
- <para>
+ </section>
+ <section id="sect-User_Guide-Manage_Portals-Access_a_Portal">
+ <title>Access a Portal</title>
+ <para>
An administrator can easily access numerous portals running in the JBoss Enterprise Portal Platform instance.
</para>
- <para>
+ <para>
To access a portal, click <emphasis role="bold">Site</emphasis> on the Toolbar. You will be taken to the Site Management page, which shows a list of portals and possible actions:
</para>
- <mediaobject>
- <imageobject role="html">
- <imagedata fileref="images/ActivePortals.png" format="PNG" align="center" scale="110" />
- </imageobject>
- <imageobject role="fo">
- <imagedata fileref="images/ActivePortals.png" format="PNG" align="center" contentwidth="150mm" />
- </imageobject>
- </mediaobject>
-
- </section>
- <section id="proc-User_Guide-Manage_Portals-Edit_Layout">
- <title>Edit Layout</title>
- <para>
+ <mediaobject>
+ <imageobject role="html">
+ <imagedata align="center" scale="110" fileref="images/ActivePortals.png" format="PNG"/>
+ </imageobject>
+ <imageobject role="fo">
+ <imagedata contentwidth="150mm" align="center" fileref="images/ActivePortals.png" format="PNG"/>
+ </imageobject>
+ </mediaobject>
+ </section>
+ <section id="proc-User_Guide-Manage_Portals-Edit_Layout">
+ <title>Edit Layout</title>
+ <para>
To edit the layout of a portal, click the <emphasis>Edit Layout</emphasis> key beside the active portal you wish to edit:
</para>
- <mediaobject>
- <imageobject role="html">
- <imagedata fileref="images/EditLayout.png" format="PNG" align="center" scale="110" />
- </imageobject>
- <imageobject role="fo">
- <imagedata fileref="images/EditLayout.png" format="PNG" align="center" contentwidth="150mm" />
- </imageobject>
- </mediaobject>
- <para>
+ <mediaobject>
+ <imageobject role="html">
+ <imagedata align="center" scale="110" fileref="images/EditLayout.png" format="PNG"/>
+ </imageobject>
+ <imageobject role="fo">
+ <imagedata contentwidth="150mm" align="center" fileref="images/EditLayout.png" format="PNG"/>
+ </imageobject>
+ </mediaobject>
+ <para>
New applications, containers or gadgets can be dragged from the <emphasis role="bold">Edit Inline Composer</emphasis> window (inset on the right of the screen) onto the main portal body.
</para>
- <mediaobject>
- <imageobject role="html">
- <imagedata fileref="images/EditLayout2.png" format="PNG" align="center" scale="110" />
- </imageobject>
- <imageobject role="fo">
- <imagedata fileref="images/EditLayout2.png" format="PNG" align="center" contentwidth="150mm" />
- </imageobject>
- </mediaobject>
- <para>
+ <mediaobject>
+ <imageobject role="html">
+ <imagedata align="center" scale="110" fileref="images/EditLayout2.png" format="PNG"/>
+ </imageobject>
+ <imageobject role="fo">
+ <imagedata contentwidth="150mm" align="center" fileref="images/EditLayout2.png" format="PNG"/>
+ </imageobject>
+ </mediaobject>
+ <para>
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">
- <imagedata fileref="images/EditLayout3.png" format="PNG" align="center" scale="110" />
- </imageobject>
- <imageobject role="fo">
- <imagedata fileref="images/EditLayout3.png" format="PNG" align="center" contentwidth="150mm" />
- </imageobject>
- </mediaobject>
+ <mediaobject>
+ <imageobject role="html">
+ <imagedata align="center" scale="110" fileref="images/EditLayout3.png" format="PNG"/>
+ </imageobject>
+ <imageobject role="fo">
+ <imagedata contentwidth="150mm" align="center" fileref="images/EditLayout3.png" format="PNG"/>
+ </imageobject>
+ </mediaobject>
+ <para>
+ Click the <guilabel>Finish</guilabel> or <guilabel>Abort</guilabel> buttons on the <emphasis role="bold">Edit Inline Composer</emphasis> window to save or discard your changes. <inlinemediaobject>
+ <imageobject>
+ <imagedata fileref="images/FinishAbortButtons.png"/>
+ </imageobject>
+ </inlinemediaobject>
+ </para>
+ <note>
+ <title>Custom Portlets</title>
<para>
- Click the <guilabel>Finish</guilabel> or <guilabel>Abort</guilabel> buttons on the <emphasis role="bold">Edit Inline Composer</emphasis> window to save or discard your changes. <inlinemediaobject><imageobject><imagedata fileref="images/FinishAbortButtons.png"/></imageobject></inlinemediaobject>
- </para>
- <note>
- <title>Custom Portlets</title>
- <para>
- If you want to include a custom portlet or gadget on a page, you may wish to refer to the <emphasis>JBoss Portlet Tools User Guide</emphasis> in the JBoss Developer Studio documentation (<ulink type="http" url="http://docs.redhat.com/docs/en-US/JBoss_Developer_Studio/"></ulink>) and/or the <emphasis role="bold">Portlet development</emphasis> section of the <emphasis>JBoss Enterprise Portal Platform Reference Guide</emphasis> (<ulink type="http" url="http://docs.redhat.com/docs/en-US/JBoss_Enterprise_Portal_Platform/"></ulink>) for more information about creating and deploying portlets.
+ If you want to include a custom portlet or gadget on a page, you may wish to refer to the <emphasis>JBoss Portlet Tools User Guide</emphasis> in the JBoss Developer Studio documentation (<ulink url="http://docs.redhat.com/docs/en-US/JBoss_Developer_Studio/" type="http"/>) and/or the <emphasis role="bold">Portlet development</emphasis> section of the <emphasis>JBoss Enterprise Portal Platform Reference Guide</emphasis> (<ulink url="http://docs.redhat.com/docs/en-US/JBoss_Enterprise_Portal_Platform/" type="http"/>) for more information about creating and deploying portlets.
</para>
- </note>
- </section>
-
-
- <section id="proc-User_Guide-Manage_Portals-Edit_Navigation">
- <title>Edit Navigation</title>
- <para>
+ </note>
+ </section>
+ <section id="proc-User_Guide-Manage_Portals-Edit_Navigation">
+ <title>Edit Navigation</title>
+ <para>
The portal navigation can be edited by clicking <emphasis role="bold">Site</emphasis> in the <emphasis role="bold">Toolbar</emphasis> and selecting the <emphasis>Edit Navigation</emphasis> link next to the portal you wish to edit:
</para>
- <mediaobject>
- <imageobject role="html">
- <imagedata fileref="images/EditNavigation1.png" format="PNG" align="center" scale="110" />
- </imageobject>
- <imageobject role="fo">
- <imagedata fileref="images/EditNavigation1.png" format="PNG" align="center" contentwidth="150mm" />
- </imageobject>
- </mediaobject>
- <para>
+ <mediaobject>
+ <imageobject role="html">
+ <imagedata align="center" scale="110" fileref="images/EditNavigation1.png" format="PNG"/>
+ </imageobject>
+ <imageobject role="fo">
+ <imagedata contentwidth="150mm" align="center" fileref="images/EditNavigation1.png" format="PNG"/>
+ </imageobject>
+ </mediaobject>
+ <para>
The <emphasis>Navigation Management</emphasis> window appears:
- </para>
- <mediaobject>
- <imageobject role="html">
- <imagedata fileref="images/NavigationManagement.png" format="PNG" align="center" scale="100" />
- </imageobject>
- <imageobject role="fo">
- <imagedata fileref="images/NavigationManagement.png" format="PNG" align="center" contentwidth="70mm" />
- </imageobject>
- </mediaobject>
- <para>
+ </para>
+ <mediaobject>
+ <imageobject role="html">
+ <imagedata align="center" scale="100" fileref="images/NavigationManagement.png" format="PNG"/>
+ </imageobject>
+ <imageobject role="fo">
+ <imagedata contentwidth="70mm" align="center" fileref="images/NavigationManagement.png" format="PNG"/>
+ </imageobject>
+ </mediaobject>
+ <para>
More information about actions possible in this window can be found in <xref linkend="sect-User_Guide-Manage_Navigation_Nodes"/>
</para>
- </section>
-
- <section id="proc-User_Guide-Manage_Portals-Edit_Properties">
- <title>Edit Properties</title>
- <para>
+ </section>
+ <section>
+ <title><remark>BZ#794408 NEEDINFO </remark>Export and Import</title>
+ <para>You can export and import portals and groups using the controls provided in the <menuchoice>
+ <guimenu>Group</guimenu>
+ <guimenu>Administration</guimenu>
+ <guimenu>Site Export/Import</guimenu>
+ </menuchoice> screen.</para>
+ <para>Exported sites and groups are saved in a zip archive, with the directory structure and XML configuration files preserved exactly as they appear on the source site.</para>
+ <para>The data included in the XML files includes the following:</para>
+ <variablelist>
+ <varlistentry>
+ <term>portal.xml</term>
+ <listitem>
+ <para>Contains the site layout information for the site.</para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term>pages.xml</term>
+ <listitem>
+ <para>Contains all pages for the site.</para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term>navigation.xml</term>
+ <listitem>
+ <para>Contains the navigation for the site.</para>
+ </listitem>
+ </varlistentry>
+ </variablelist>
+ <task id="task-Export_Sites_or_Groups">
+ <title>Task: Export Sites or Groups</title>
+ <tasksummary>
+ <para>Follow this procedure to export a site or group using the Export/Import Sites tool. </para>
+ </tasksummary>
+ <taskprerequisites>
+ <title>Prerequisites</title>
+ <itemizedlist>
+ <listitem>
+ <para>You are logged into the portal with an Administrator account</para>
+ </listitem>
+ </itemizedlist>
+ </taskprerequisites>
+ <procedure>
+ <step>
+ <para>Click <menuchoice>
+ <guimenu>Group</guimenu>
+ <guimenu>Administration</guimenu>
+ <guimenu>Site Export/Import</guimenu>
+ </menuchoice> screen.</para>
+ <formalpara>
+ <title>Result</title>
+ <para>The Export/Import Sites screen displays.</para>
+ </formalpara>
+ </step>
+ <step>
+ <para>Expand the Sites menu.</para>
+ </step>
+ <step>
+ <para>The portal and group menus display, and contain all the portal types and group types (represented as gear icons) for the instance.</para>
+ </step>
+ <step>
+ <para>Select the portal or group you want to export.</para>
+ <formalpara>
+ <title>Result</title>
+ <para>The Export site button becomes available.</para>
+ </formalpara>
+ </step>
+ <step>
+ <para>Click <guibutton>Export site</guibutton>.</para>
+ <formalpara>
+ <title>Result</title>
+ <para>The site or group selected is exported and saved in your web browser Download directory.</para>
+ </formalpara>
+ </step>
+ </procedure>
+ </task>
+ <task id="task-Import_Sites_or_Groups">
+ <title>Task: Import Sites or Groups</title>
+ <tasksummary>
+ <para>Follow this procedure to import a site or group using the Export/Import Sites tool. </para>
+ </tasksummary>
+ <taskprerequisites>
+ <title>Prerequisites</title>
+ <itemizedlist>
+ <listitem>
+ <para>You are logged into the portal with an Administrator account.</para>
+ </listitem>
+ </itemizedlist>
+ </taskprerequisites>
+ <procedure>
+ <step>
+ <para>Click <menuchoice>
+ <guimenu>Group</guimenu>
+ <guimenu>Administration</guimenu>
+ <guimenu>Site Export/Import</guimenu>
+ </menuchoice> screen.</para>
+ <formalpara>
+ <title>Result</title>
+ <para>The Export/Import Sites screen displays.</para>
+ </formalpara>
+ </step>
+ <step>
+ <para>Click <guimenu>Import site</guimenu> to display the Import site dialog.</para>
+ </step>
+ <step>
+ <para>Click Choose File, and select a portal or group Zip archive to import.</para>
+ <formalpara>
+ <title>Result</title>
+ <para>The selected Zip archive is appended to the Import site screen.</para>
+ </formalpara>
+ </step>
+ <step>
+ <para>Select the Import Mode to apply to the portal or group.</para>
+ <variablelist>
+ <varlistentry>
+ <term>Conserve</term>
+ <listitem>
+ <para><remark>NEEDINFO</remark></para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term>Insert</term>
+ <listitem>
+ <para><remark>NEEDINFO</remark></para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term>Merge</term>
+ <listitem>
+ <para><remark>Guessing what this option means because I have no links to source information.</remark>Merges the differences between the existing portal or group.</para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term>Overwrite</term>
+ <listitem>
+ <para><remark>Guessing what this option means because I have no links to source information.</remark>Overwrites the portal if a portal of the same name exists.</para>
+ </listitem>
+ </varlistentry>
+ </variablelist>
+ </step>
+ <step>
+ <para>Click <guibutton>Import</guibutton></para>
+ <formalpara>
+ <title>Result</title>
+ <para>The selected archive is imported, with the import mode applied to the files contained within the Zip.</para>
+ </formalpara>
+ </step>
+ </procedure>
+ </task>
+ </section>
+ <section id="proc-User_Guide-Manage_Portals-Edit_Properties">
+ <title>Edit Properties</title>
+ <para>
Portal properties such as language, skin and permissions can be set by clicking on <emphasis role="bold">Site</emphasis> in the <emphasis role="bold">Toolbar</emphasis> and selecting the <emphasis role="bold">Edit Portal Properties</emphasis> link for the portal you wish to edit:
</para>
- <mediaobject>
- <imageobject role="html">
- <imagedata fileref="images/PortalProperties.png" format="PNG" align="center" scale="100" />
- </imageobject>
- <imageobject role="fo">
- <imagedata fileref="images/PortalProperties.png" format="PNG" align="center" contentwidth="130mm" />
- </imageobject>
- </mediaobject>
- <para>
+ <mediaobject>
+ <imageobject role="html">
+ <imagedata align="center" scale="100" fileref="images/PortalProperties.png" format="PNG"/>
+ </imageobject>
+ <imageobject role="fo">
+ <imagedata contentwidth="130mm" align="center" fileref="images/PortalProperties.png" format="PNG"/>
+ </imageobject>
+ </mediaobject>
+ <para>
The various tabs available in the edit properties window give access to the properties that can be edited for the chosen portal:
</para>
- <mediaobject>
- <imageobject role="html">
- <imagedata fileref="images/EditPortal2.6New.png" format="PNG" align="center" scale="110" />
- </imageobject>
- <imageobject role="fo">
- <imagedata fileref="images/EditPortal2.6New.png" format="PNG" align="center" contentwidth="150mm" />
- </imageobject>
- </mediaobject>
- <para>
+ <mediaobject>
+ <imageobject role="html">
+ <imagedata align="center" scale="110" fileref="images/EditPortal2.6New.png" format="PNG"/>
+ </imageobject>
+ <imageobject role="fo">
+ <imagedata contentwidth="150mm" align="center" fileref="images/EditPortal2.6New.png" format="PNG"/>
+ </imageobject>
+ </mediaobject>
+ <para>
Click on <emphasis role="bold">Save</emphasis> or <emphasis role="bold">Cancel</emphasis> to either set or discard any changes you have made in the portal.
</para>
- </section>
-
- <section id="sect-User_Guide-Manage_Portals-Delete_a_Portal">
- <title>Delete a Portal</title>
- <procedure>
- <step>
- <para>
+ </section>
+ <section id="sect-User_Guide-Manage_Portals-Delete_a_Portal">
+ <title>Delete a Portal</title>
+ <procedure>
+ <step>
+ <para>
To delete a portal click on the Delete icon beside the portal you no longer require.
</para>
- <para>
+ <para>
The confirmation message will appear:
</para>
- <mediaobject>
- <imageobject role="html">
- <imagedata fileref="images/SureDelete.png" format="PNG" align="center" scale="100" />
- </imageobject>
- <imageobject role="fo">
- <imagedata fileref="images/SureDelete.png" format="PNG" align="center" contentwidth="100mm" />
- </imageobject>
- </mediaobject>
- </step>
- <step>
- <para>
+ <mediaobject>
+ <imageobject role="html">
+ <imagedata align="center" scale="100" fileref="images/SureDelete.png" format="PNG"/>
+ </imageobject>
+ <imageobject role="fo">
+ <imagedata contentwidth="100mm" align="center" fileref="images/SureDelete.png" format="PNG"/>
+ </imageobject>
+ </mediaobject>
+ </step>
+ <step>
+ <para>
Click <emphasis role="bold">OK</emphasis>
</para>
- </step>
- </procedure>
- </section>
-
- <section id="sect-User_Guide-Change_Portal_Skins">
- <title>Change Portal Skins</title>
- <para>
+ </step>
+ </procedure>
+ </section>
+ <section id="sect-User_Guide-Change_Portal_Skins">
+ <title>Change Portal Skins</title>
+ <para>
Skins are graphic styles used to provide an attractive user interface. Each skin has its own characteristics with different backgrounds, icons, and other visual elements.
</para>
- <para>
+ <para>
There are two ways to change the portal skin, each offering differing effects on the user experience.
</para>
-
- <para>
+ <para>
When you set skin using <emphasis role="bold">method one</emphasis> change is applied to this portal, and every user that accesses this portal will see it in the chosen skin.
</para>
- <para>
+ <para>
When you change skin using <emphasis role="bold">method two</emphasis>, the skin is set for the logged in user and all portals within the domain will be shown with the chosen skin.
</para>
- <para>
+ <para>
Portal skins set via method two have a higher priority when the portal is rendered.
</para>
- <variablelist>
- <varlistentry>
- <term><emphasis role="bold">Method One</emphasis></term>
- <listitem>
- <procedure>
- <step>
- <para>
- Click on <emphasis role="bold">Site</emphasis>, then <emphasis role="bold">Edit Portal's Properties</emphasis>.
+ <variablelist>
+ <varlistentry>
+ <term>
+ <emphasis role="bold">Method One</emphasis>
+ </term>
+ <listitem>
+ <procedure>
+ <step>
+ <para>
+ Click on <emphasis role="bold">Site</emphasis>, then <emphasis role="bold">Edit Portal's Properties</emphasis>.
</para>
- </step>
-
- <step>
- <para>
+ </step>
+ <step>
+ <para>
In the <emphasis role="bold">Portal Setting</emphasis> tab, select another skin <emphasis role="bold">Skin</emphasis> list
</para>
- <mediaobject>
- <imageobject role="html">
- <imagedata fileref="images/Skin1.png" format="PNG" scale="90"/>
- </imageobject>
- <imageobject role="fo">
- <imagedata fileref="images/Skin1.png" format="PNG" contentwidth="120mm"/>
- </imageobject>
- </mediaobject>
- </step>
- <step>
- <para>
+ <mediaobject>
+ <imageobject role="html">
+ <imagedata scale="90" fileref="images/Skin1.png" format="PNG"/>
+ </imageobject>
+ <imageobject role="fo">
+ <imagedata contentwidth="120mm" fileref="images/Skin1.png" format="PNG"/>
+ </imageobject>
+ </mediaobject>
+ </step>
+ <step>
+ <para>
Click <emphasis role="bold">Save</emphasis> to <emphasis role="bold">Finish</emphasis>.
</para>
- </step>
- </procedure>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term><emphasis role="bold">Method Two</emphasis></term>
- <listitem>
- <procedure>
- <step>
- <para>
+ </step>
+ </procedure>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term>
+ <emphasis role="bold">Method Two</emphasis>
+ </term>
+ <listitem>
+ <procedure>
+ <step>
+ <para>
Mouse over the Start menu and click on <emphasis role="bold">Change Skin</emphasis>.
</para>
- <mediaobject>
- <imageobject role="html">
- <imagedata fileref="images/StarPortlet.png" format="PNG" scale="100" />
- </imageobject>
- <imageobject role="fo">
- <imagedata fileref="images/StarPortlet.png" format="PNG" contentwidth="120mm" />
- </imageobject>
- </mediaobject>
- </step>
- <step>
- <para>
+ <mediaobject>
+ <imageobject role="html">
+ <imagedata scale="100" fileref="images/StarPortlet.png" format="PNG"/>
+ </imageobject>
+ <imageobject role="fo">
+ <imagedata contentwidth="120mm" fileref="images/StarPortlet.png" format="PNG"/>
+ </imageobject>
+ </mediaobject>
+ </step>
+ <step>
+ <para>
Select a new skin from the Skin list. By clicking on the skin name a picture will appear in the preview pane.
</para>
- <mediaobject>
- <imageobject role="html">
- <imagedata fileref="images/SkinSet1.png" format="PNG" scale="90"/>
- </imageobject>
- <imageobject role="fo">
- <imagedata fileref="images/SkinSet1.png" format="PNG" contentwidth="120mm" />
- </imageobject>
- </mediaobject>
- </step>
- <step>
- <para>
+ <mediaobject>
+ <imageobject role="html">
+ <imagedata scale="90" fileref="images/SkinSet1.png" format="PNG"/>
+ </imageobject>
+ <imageobject role="fo">
+ <imagedata contentwidth="120mm" fileref="images/SkinSet1.png" format="PNG"/>
+ </imageobject>
+ </mediaobject>
+ </step>
+ <step>
+ <para>
Click <emphasis role="bold">Apply</emphasis> to apply to the portal.
</para>
- </step>
- </procedure>
- </listitem>
- </varlistentry>
- </variablelist>
- <para>
- More information about adding skins to a portal can be found in the <ulink type="http" url="http://www.redhat.com/docs/en-US/JBoss_Enterprise_Portal_Platform/">Reference Guide</ulink> for this product.
+ </step>
+ </procedure>
+ </listitem>
+ </varlistentry>
+ </variablelist>
+ <para>
+ More information about adding skins to a portal can be found in the <ulink url="http://www.redhat.com/docs/en-US/JBoss_Enterprise_Portal_Platform/" type="http">Reference Guide</ulink> for this product.
</para>
-
- </section>
-
- <section id="sect-User_Guide-Switching_between_Portals">
- <title>Switching between portals</title>
- <para>
+ </section>
+ <section id="sect-User_Guide-Switching_between_Portals">
+ <title>Switching between portals</title>
+ <para>
Mouse over <emphasis role="bold">Site</emphasis> on the Toolbar for a list all portals in which you have at least access rights:
</para>
- <mediaobject>
- <imageobject role="html">
- <imagedata fileref="images/SitePortlet.png" format="PNG" align="center" scale="100" />
- </imageobject>
- <imageobject role="fo">
- <imagedata fileref="images/SitePortlet.png" format="PNG" align="center" scalefit="1" contentwidth="130mm" />
- </imageobject>
- </mediaobject>
- <para>
+ <mediaobject>
+ <imageobject role="html">
+ <imagedata align="center" scale="100" fileref="images/SitePortlet.png" format="PNG"/>
+ </imageobject>
+ <imageobject role="fo">
+ <imagedata contentwidth="130mm" align="center" scalefit="1" fileref="images/SitePortlet.png" format="PNG"/>
+ </imageobject>
+ </mediaobject>
+ <para>
Users switch between portals by clicking on the desired portal. Please wait a few seconds for the change to take effect.
</para>
- </section>
-
-
+ </section>
</section>
-
-
Modified: epp/docs/branches/5.2/User_Guide/publican.cfg
===================================================================
--- epp/docs/branches/5.2/User_Guide/publican.cfg 2012-02-21 21:30:26 UTC (rev 8450)
+++ epp/docs/branches/5.2/User_Guide/publican.cfg 2012-02-22 02:34:28 UTC (rev 8451)
@@ -1,11 +1,6 @@
-# Config::Simple 4.59
-# Tue Nov 17 15:59:35 2009
-
xml_lang: en-US
type: Book
brand: JBoss
debug:1
-#show_remarks: 1
-cvs_branch: DOCS-RHEL-6
-cvs_root: :ext:cvs.devel.redhat.com:/cvs/dist
-cvs_pkg: JBoss_Enterprise_Portal_Platform-User_Guide-5.2-web-__LANG__
\ No newline at end of file
+show_remarks: 1
+git_branch: docs-rhel-6
12 years, 3 months
- 1
- 0
gatein SVN: r8450 - in portal/trunk/webui: core/src/test/java/org/exoplatform/webui/test/validator and 1 other directories.
by do-not-reply＠jboss.org
Author: mwringe
Date: 2012-02-21 16:30:26 -0500 (Tue, 21 Feb 2012)
New Revision: 8450
Added:
portal/trunk/webui/core/src/main/java/org/exoplatform/webui/form/validator/NumberRangeValidator.java
Modified:
portal/trunk/webui/core/src/test/java/org/exoplatform/webui/test/validator/TestWebuiValidator.java
portal/trunk/webui/dashboard/src/main/java/org/exoplatform/dashboard/webui/component/UIDashboardEditForm.java
Log:
GTNPORTAL-2357: add a new NumberRangeValidator to specify the range of valid numbers. Update the UIDashboardEditForm to use this new validator to display a helpful error message if the number of columns in the dashboard is out of range.
Added: portal/trunk/webui/core/src/main/java/org/exoplatform/webui/form/validator/NumberRangeValidator.java
===================================================================
--- portal/trunk/webui/core/src/main/java/org/exoplatform/webui/form/validator/NumberRangeValidator.java (rev 0)
+++ portal/trunk/webui/core/src/main/java/org/exoplatform/webui/form/validator/NumberRangeValidator.java 2012-02-21 21:30:26 UTC (rev 8450)
@@ -0,0 +1,70 @@
+/******************************************************************************
+ * JBoss, a division of Red Hat *
+ * Copyright 2011, Red Hat Middleware, LLC, and individual *
+ * contributors as indicated by the @authors tag. See the *
+ * copyright.txt in the distribution for a full listing of *
+ * individual contributors. *
+ * *
+ * This is free software; you can redistribute it and/or modify it *
+ * under the terms of the GNU Lesser General Public License as *
+ * published by the Free Software Foundation; either version 2.1 of *
+ * the License, or (at your option) any later version. *
+ * *
+ * This software is distributed in the hope that it will be useful, *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU *
+ * Lesser General Public License for more details. *
+ * *
+ * You should have received a copy of the GNU Lesser General Public *
+ * License along with this software; if not, write to the Free *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org. *
+ ******************************************************************************/
+package org.exoplatform.webui.form.validator;
+
+import java.io.Serializable;
+
+import org.exoplatform.web.application.CompoundApplicationMessage;
+
+/**
+ * @author <a href="mailto:mwringe@redhat.com">Matt Wringe</a>
+ * @version $Revision$
+ */
+public class NumberRangeValidator extends NumberFormatValidator
+{
+ private int min;
+ private int max;
+
+ public NumberRangeValidator(int min, int max)
+ {
+ this.min = min;
+ this.max = max;
+ }
+
+ @Override
+ protected String getMessageLocalizationKey()
+ {
+ return "NumberRangeValidator.msg.Invalid-number";
+ }
+
+ @Override
+ protected Integer validateInteger(String value, String label, CompoundApplicationMessage messages)
+ {
+ Integer integer = super.validateInteger(value, label, messages);
+
+ if (integer == null)
+ {
+ return null;
+ }
+ else if (integer < min || integer > max)
+ {
+ messages.addMessage(getMessageLocalizationKey(), new Object[]{label, min, max});
+ return null;
+ }
+ else
+ {
+ return integer;
+ }
+ }
+}
+
Property changes on: portal/trunk/webui/core/src/main/java/org/exoplatform/webui/form/validator/NumberRangeValidator.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Modified: portal/trunk/webui/core/src/test/java/org/exoplatform/webui/test/validator/TestWebuiValidator.java
===================================================================
--- portal/trunk/webui/core/src/test/java/org/exoplatform/webui/test/validator/TestWebuiValidator.java 2012-02-21 21:23:23 UTC (rev 8449)
+++ portal/trunk/webui/core/src/test/java/org/exoplatform/webui/test/validator/TestWebuiValidator.java 2012-02-21 21:30:26 UTC (rev 8450)
@@ -27,6 +27,7 @@
import org.exoplatform.webui.form.validator.IdentifierValidator;
import org.exoplatform.webui.form.validator.NameValidator;
import org.exoplatform.webui.form.validator.NumberFormatValidator;
+import org.exoplatform.webui.form.validator.NumberRangeValidator;
import org.exoplatform.webui.form.validator.PositiveNumberFormatValidator;
import org.exoplatform.webui.form.validator.ResourceValidator;
import org.exoplatform.webui.form.validator.SpecialCharacterValidator;
@@ -158,6 +159,21 @@
assertFalse(expected(validator, "-01"));
}
+ public void testNumberRangeValidator()
+ {
+ Validator validator = new NumberRangeValidator(-5, 5);
+ assertTrue(expected(validator, "-5"));
+ assertTrue(expected(validator, "-1"));
+ assertTrue(expected(validator, "0"));
+ assertTrue(expected(validator, "1"));
+ assertTrue(expected(validator, "5"));
+
+ assertFalse(expected(validator, "-10"));
+ assertFalse(expected(validator, "-6"));
+ assertFalse(expected(validator, "6"));
+ assertFalse(expected(validator, "10"));
+ }
+
public void testSpecialCharacterValidator()
{
Validator validator= new SpecialCharacterValidator();
Modified: portal/trunk/webui/dashboard/src/main/java/org/exoplatform/dashboard/webui/component/UIDashboardEditForm.java
===================================================================
--- portal/trunk/webui/dashboard/src/main/java/org/exoplatform/dashboard/webui/component/UIDashboardEditForm.java 2012-02-21 21:23:23 UTC (rev 8449)
+++ portal/trunk/webui/dashboard/src/main/java/org/exoplatform/dashboard/webui/component/UIDashboardEditForm.java 2012-02-21 21:30:26 UTC (rev 8450)
@@ -91,7 +91,7 @@
catch (Exception e)
{
uiInput.setValue(lastValue);
- throw new MessageException(new ApplicationMessage("NumberFormatValidator.msg.Invalid-number", args));
+ throw new MessageException(new ApplicationMessage("NumberRangeValidator.msg.Invalid-number", args));
}
UIDashboardContainer uiDashboardContainer =
12 years, 3 months
- 1
- 0
gatein SVN: r8449 - in portal/trunk: webui/portal/src/main/java/org/exoplatform/portal/webui/application and 1 other directory.
by do-not-reply＠jboss.org
Author: mwringe
Date: 2012-02-21 16:23:23 -0500 (Tue, 21 Feb 2012)
New Revision: 8449
Modified:
portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_en.properties
portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIPortletForm.java
Log:
GTNPORTAL-2356: default numbers in the UIPortletForm to include 'px' if they are not already set. Add to the input box string that 'px' is expected.
Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_en.properties
===================================================================
--- portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_en.properties 2012-02-21 18:10:25 UTC (rev 8448)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_en.properties 2012-02-21 21:23:23 UTC (rev 8449)
@@ -75,6 +75,8 @@
PositiveNumberFormatValidator.msg.Invalid-number=The "{0}" field must contain a positive number.
+NumberRangeValidator.msg.Invalid-number=The number in field "{0}" must be between {1} and {2}.
+
#############################################################################
# Empty Iterator Validator #
#############################################################################
@@ -318,8 +320,8 @@
UIPortletForm.title=View/Edit Portlet
UIPortletForm.label.title=Portlet Title :
-UIPortletForm.label.width=#{word.width}:
-UIPortletForm.label.height=#{word.height}:
+UIPortletForm.label.width=#{word.width} (px):
+UIPortletForm.label.height=#{word.height} (px):
UIPortletForm.label.showInfoBar=Show Info Bar :
UIPortletForm.label.windowId=Window Id :
UIPortletForm.label.showPortletMode=Show Portlet Mode :
Modified: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIPortletForm.java
===================================================================
--- portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIPortletForm.java 2012-02-21 18:10:25 UTC (rev 8448)
+++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIPortletForm.java 2012-02-21 21:23:23 UTC (rev 8449)
@@ -102,10 +102,10 @@
new UIFormStringInput("title", "title", null).addValidator(StringLengthValidator.class, 3, 60).addValidator(NotHTMLTagValidator.class,
"UIPortletForm.msg.InvalidPortletTitle"))
.addUIFormInput(
- new UIFormStringInput("width", "width", null).addValidator(ExpressionValidator.class, "(^([1-9]\\d*)px$)?",
+ new UIFormStringInput("width", "width", null).addValidator(ExpressionValidator.class, "(^([1-9]\\d*)(px$|$))?",
"UIPortletForm.msg.InvalidWidthHeight")).addUIFormInput(
new UIFormStringInput("height", "height", null).addValidator(ExpressionValidator.class,
- "(^([1-9]\\d*)px$)?", "UIPortletForm.msg.InvalidWidthHeight")).addUIFormInput(
+ "(^([1-9]\\d*)(px$|$))?", "UIPortletForm.msg.InvalidWidthHeight")).addUIFormInput(
new UIFormCheckBoxInput("showInfoBar", "showInfoBar", false)).addUIFormInput(
new UIFormCheckBoxInput("showPortletMode", "showPortletMode", false)).addUIFormInput(
new UIFormCheckBoxInput("showWindowState", "showWindowState", false)).addUIFormInput(
@@ -385,6 +385,10 @@
}
else
{
+ if (!width.endsWith("px"))
+ {
+ width.concat("px");
+ }
uiPortlet.setWidth(width);
}
@@ -395,6 +399,10 @@
}
else
{
+ if (!height.endsWith("px"))
+ {
+ height.concat("px");
+ }
uiPortlet.setHeight(height);
}
12 years, 3 months
- 1
- 0