gatein SVN: r2340 - components/wsrp/trunk/admin-gui/src/main/webapp/WEB-INF/classes.
by do-not-reply＠jboss.org
Author: chris.laprun(a)jboss.com
Date: 2010-03-22 12:06:53 -0400 (Mon, 22 Mar 2010)
New Revision: 2340
Modified:
components/wsrp/trunk/admin-gui/src/main/webapp/WEB-INF/classes/Resource.properties
components/wsrp/trunk/admin-gui/src/main/webapp/WEB-INF/classes/Resource_fr.properties
Log:
GTNWSRP-13: Renamed Endpoint configuration to Producer WSDL URL in WSRP admin GUI.
Modified: components/wsrp/trunk/admin-gui/src/main/webapp/WEB-INF/classes/Resource.properties
===================================================================
--- components/wsrp/trunk/admin-gui/src/main/webapp/WEB-INF/classes/Resource.properties 2010-03-22 12:02:51 UTC (rev 2339)
+++ components/wsrp/trunk/admin-gui/src/main/webapp/WEB-INF/classes/Resource.properties 2010-03-22 16:06:53 UTC (rev 2340)
@@ -82,7 +82,7 @@
edit_consumer_cache_seconds = (seconds before expiration)
edit_consumer_timeout = Timeout for WS operations:
edit_consumer_timeout_milliseconds = (milliseconds before timeout)
-edit_consumer_endpoint = Endpoint configuration:
+edit_consumer_endpoint = Producer WSDL URL:
edit_consumer_registration = Registration information:
edit_consumer_registration_current = Current registration information:
edit_consumer_prop_name = Name
Modified: components/wsrp/trunk/admin-gui/src/main/webapp/WEB-INF/classes/Resource_fr.properties
===================================================================
--- components/wsrp/trunk/admin-gui/src/main/webapp/WEB-INF/classes/Resource_fr.properties 2010-03-22 12:02:51 UTC (rev 2339)
+++ components/wsrp/trunk/admin-gui/src/main/webapp/WEB-INF/classes/Resource_fr.properties 2010-03-22 16:06:53 UTC (rev 2340)
@@ -65,7 +65,7 @@
edit_consumer_cache=Expiration du cache:
edit_consumer_cache_seconds=(secondes avant expiration)
edit_consumer_cancel=Annuler
-edit_consumer_endpoint=Configuration du endpoint:
+edit_consumer_endpoint=URL du WSDL du producteur:
edit_consumer_no_registration=Enregistrement non-requis par le producteur.
edit_consumer_producer=Identifiant du producteur:
edit_consumer_prop_desc=Description
14 years, 10 months
gatein SVN: r2339 - in components/wsrp/trunk: consumer/src/main/java/org/gatein/wsrp/consumer and 1 other directory.
by do-not-reply＠jboss.org
Author: chris.laprun(a)jboss.com
Date: 2010-03-22 08:02:51 -0400 (Mon, 22 Mar 2010)
New Revision: 2339
Added:
components/wsrp/trunk/consumer/src/main/java/org/gatein/wsrp/consumer/MarkupProcessor.java
Modified:
components/wsrp/trunk/consumer/src/main/java/org/gatein/wsrp/consumer/RenderHandler.java
components/wsrp/trunk/pom.xml
Log:
- GTNWSRP-11: Temporarily move new TextTools.replaceBoundedString implementation to a new MarkupProcessor
class to avoid having to release a new version of the common module.
Added: components/wsrp/trunk/consumer/src/main/java/org/gatein/wsrp/consumer/MarkupProcessor.java
===================================================================
--- components/wsrp/trunk/consumer/src/main/java/org/gatein/wsrp/consumer/MarkupProcessor.java (rev 0)
+++ components/wsrp/trunk/consumer/src/main/java/org/gatein/wsrp/consumer/MarkupProcessor.java 2010-03-22 12:02:51 UTC (rev 2339)
@@ -0,0 +1,291 @@
+/*
+ * JBoss, a division of Red Hat
+ * Copyright 2010, 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.wsrp.consumer;
+
+import org.gatein.common.net.URLTools;
+import org.gatein.common.util.ParameterValidation;
+import org.gatein.pc.api.URLFormat;
+import org.gatein.pc.api.spi.PortletInvocationContext;
+import org.gatein.wsrp.WSRPPortletURL;
+import org.gatein.wsrp.WSRPResourceURL;
+import org.gatein.wsrp.WSRPRewritingConstants;
+
+import java.util.Set;
+
+/**
+ * @author <a href="mailto:chris.laprun@jboss.com">Chris Laprun</a>
+ * @version $Revision$
+ */
+public class MarkupProcessor
+{
+ private final PortletInvocationContext context;
+ private final URLFormat format;
+ private final Set<String> supportedCustomModes;
+ private final Set<String> supportedCustomWindowStates;
+ private final String serverAddress;
+ private final String portletApplicationName;
+ private final String namespace;
+ public static final int URL_DELIMITER_LENGTH = WSRPRewritingConstants.RESOURCE_URL_DELIMITER.length();
+
+ protected MarkupProcessor(String namespace, PortletInvocationContext context, org.gatein.pc.api.PortletContext target, URLFormat format, ProducerInfo info)
+ {
+ this.namespace = namespace;
+ this.context = context;
+ this.format = format;
+ supportedCustomModes = info.getSupportedCustomModes();
+ supportedCustomWindowStates = info.getSupportedCustomWindowStates();
+ serverAddress = info.getEndpointConfigurationInfo().getRemoteHostAddress();
+ portletApplicationName = target.getApplicationName();
+ }
+
+ public String getReplacementFor(String match, String prefix, String suffix)
+ {
+ if (match.startsWith(WSRPRewritingConstants.RESOURCE_URL_DELIMITER))
+ {
+ // we have a resource URL coming from a template so extract URL
+ int index = match.lastIndexOf(WSRPRewritingConstants.RESOURCE_URL_DELIMITER);
+
+/*
+ // todo: right now, no need to extract value of require rewrite..
+ String requireRewriteStr = match.substring(index + URL_DELIMITER_LENGTH);
+ boolean requireRewrite = Boolean.valueOf(requireRewriteStr);
+ if (requireRewrite)
+ {
+ // FIX-ME: do something
+ log.debug("Required re-writing but this is not yet implemented...");
+ }*/
+
+ match = match.substring(URL_DELIMITER_LENGTH, index);
+ return URLTools.decodeXWWWFormURL(match);
+ }
+ else if (prefix.equals(match))
+ {
+ return namespace;
+ }
+ else if (match.startsWith(WSRPRewritingConstants.BEGIN_WSRP_REWRITE_END))
+ {
+ // remove end of rewrite token
+ match = match.substring(WSRPRewritingConstants.BEGIN_WSRP_REWRITE_END.length());
+
+ WSRPPortletURL portletURL = WSRPPortletURL.create(match, supportedCustomModes, supportedCustomWindowStates, true);
+ if (portletURL instanceof WSRPResourceURL)
+ {
+ WSRPResourceURL resource = (WSRPResourceURL)portletURL;
+ String replacement = getResourceURL(match, resource);
+
+ // if the URL starts with /, prepend the remote host address and the portlet application name so that we
+ // can attempt to create a remotely available URL
+ if (replacement.startsWith(URLTools.SLASH))
+ {
+ replacement = WSRPResourceURL.createAbsoluteURLFrom(replacement, serverAddress, portletApplicationName);
+ }
+
+ return replacement;
+
+/*
+ todo: use this code to reactivate primitive use of resources
+ // get the parsed URL and add marker to it so that the consumer can know it needs to be intercepted
+ URL url = resource.getResourceURL();
+ String query = url.getQuery();
+ if (ParameterValidation.isNullOrEmpty(query))
+ {
+ query = WSRPRewritingConstants.GTNRESOURCE;
+ }
+ else
+ {
+ query = "+" + WSRPRewritingConstants.GTNRESOURCE;
+ }
+
+ try
+ {
+ URI uri = new URI(url.getProtocol(), url.getUserInfo(), url.getHost(), url.getPort(),
+ url.getPath(), query, url.getRef());
+
+ // set the resulting URI as the new resource ID, must be encoded as it will be used in URLs
+ String s = URLTools.encodeXWWWFormURL(uri.toString());
+ resource.setResourceId(s);
+ }
+ catch (Exception e)
+ {
+ throw new IllegalArgumentException("Cannot parse specified Resource as a URI: " + url);
+ }*/
+
+ }
+
+ return context.renderURL(portletURL, format);
+ }
+ else
+ {
+ // match is not something we know how to process
+ return match;
+ }
+ }
+
+
+ static String getResourceURL(String urlAsString, WSRPResourceURL resource)
+ {
+ String resourceURL = resource.getResourceURL().toExternalForm();
+ if (InvocationHandler.log.isDebugEnabled())
+ {
+ InvocationHandler.log.debug("URL '" + urlAsString + "' refers to a resource which are not currently well supported. " +
+ "Attempting to craft a URL that we might be able to work with: '" + resourceURL + "'");
+ }
+
+ // right now the resourceURL should be output as is, because it will be used directly but it really should be encoded
+ return resourceURL;
+ }
+
+ /**
+ * TODO: This is a copy of the TextTools.replaceBoundedString method found in common module, copied here to avoid
+ * having to release a new version of the module TODO: REMOVE when a new version of common is released.
+ *
+ * @param initial
+ * @param prefix
+ * @param suffix
+ * @param generator
+ * @param replaceIfBoundedStringEmpty
+ * @param keepBoundaries
+ * @param suffixIsOptional
+ * @return
+ */
+ public static String replaceBoundedString(final String initial, final String prefix, final String suffix, final MarkupProcessor generator,
+ final boolean replaceIfBoundedStringEmpty, final boolean keepBoundaries, final boolean suffixIsOptional)
+ {
+ if (ParameterValidation.isNullOrEmpty(initial))
+ {
+ return initial;
+ }
+
+ ParameterValidation.throwIllegalArgExceptionIfNull(generator, "StringReplacementGenerator");
+
+ ParameterValidation.throwIllegalArgExceptionIfNullOrEmpty(prefix, "prefix", "Tools.replaceBoundedString");
+
+ StringBuilder tmp = new StringBuilder(initial);
+ int prefixIndex = tmp.indexOf(prefix);
+ final int prefixLength = prefix.length();
+ boolean suffixAbsent = suffix == null;
+
+ // nothing to do if didn't ask for an optional suffix and we have one and it's not present in our string
+ if (!suffixIsOptional && suffix != null && tmp.indexOf(suffix) == -1)
+ {
+ return initial;
+ }
+
+ // loop as long as we can find an instance of prefix in the String
+ while (prefixIndex != -1)
+ {
+ int suffixIndex;
+ if (suffixAbsent)
+ {
+ // replace prefix with replacement
+ if (keepBoundaries)
+ {
+ // just insert replacement for prefix
+ tmp.insert(prefixIndex + prefixLength, generator.getReplacementFor(prefix, prefix, suffix));
+ }
+ else
+ {
+ // delete prefix then insert remplacement instead
+ tmp.delete(prefixIndex, prefixIndex + prefixLength);
+ tmp.insert(prefixIndex, generator.getReplacementFor(prefix, prefix, suffix));
+ }
+
+ // new lookup starting position
+ prefixIndex = tmp.indexOf(prefix, prefixIndex + prefixLength);
+ }
+ else
+ {
+ // look for suffix
+ suffixIndex = tmp.indexOf(suffix, prefixIndex);
+
+ if (suffixIndex == -1)
+ {
+ // we haven't found suffix in the rest of the String so don't look for it again
+ suffixAbsent = true;
+ continue;
+ }
+ else
+ {
+ if (suffixIsOptional)
+ {
+ // if suffix is optional, look for potential next prefix instance that we'd need to replace
+ int nextPrefixIndex = tmp.indexOf(prefix, prefixIndex + prefixLength);
+
+ if (nextPrefixIndex != -1 && nextPrefixIndex <= suffixIndex)
+ {
+ // we've found an in-between prefix, use it as the suffix for the current match
+ // delete prefix then insert remplacement instead
+ tmp.delete(prefixIndex, prefixIndex + prefixLength);
+ String replacement = generator.getReplacementFor(prefix, prefix, suffix);
+ tmp.insert(prefixIndex, replacement);
+
+ prefixIndex = nextPrefixIndex - prefixLength + replacement.length();
+ continue;
+ }
+ }
+
+ // we don't care about empty bounded strings or prefix and suffix don't delimit an empty String => replace!
+ if (replaceIfBoundedStringEmpty || suffixIndex != prefixIndex + prefixLength)
+ {
+ String match = tmp.substring(prefixIndex + prefixLength, suffixIndex);
+ if (keepBoundaries)
+ {
+ if (suffix != null)
+ {
+ // delete only match
+ tmp.delete(prefixIndex + prefixLength, suffixIndex);
+ }
+ else
+ {
+ // delete nothing
+ }
+ tmp.insert(prefixIndex + prefixLength, generator.getReplacementFor(match, prefix, suffix));
+ }
+ else
+ {
+ int suffixLength = suffix != null ? suffix.length() : 0;
+
+ if (suffix != null)
+ {
+ // if we have a suffix, delete everything between start of prefix and end of suffix
+ tmp.delete(prefixIndex, suffixIndex + suffixLength);
+ }
+ else
+ {
+ // only delete prefix
+ tmp.delete(prefixIndex, prefixIndex + prefixLength);
+ }
+ tmp.insert(prefixIndex, generator.getReplacementFor(match, prefix, suffix));
+ }
+ }
+ }
+
+ prefixIndex = tmp.indexOf(prefix, prefixIndex + prefixLength);
+
+ }
+ }
+
+ return tmp.toString();
+ }
+}
Modified: components/wsrp/trunk/consumer/src/main/java/org/gatein/wsrp/consumer/RenderHandler.java
===================================================================
--- components/wsrp/trunk/consumer/src/main/java/org/gatein/wsrp/consumer/RenderHandler.java 2010-03-22 11:48:01 UTC (rev 2338)
+++ components/wsrp/trunk/consumer/src/main/java/org/gatein/wsrp/consumer/RenderHandler.java 2010-03-22 12:02:51 UTC (rev 2339)
@@ -23,8 +23,6 @@
package org.gatein.wsrp.consumer;
-import org.gatein.common.net.URLTools;
-import org.gatein.common.text.TextTools;
import org.gatein.pc.api.PortletInvokerException;
import org.gatein.pc.api.URLFormat;
import org.gatein.pc.api.cache.CacheScope;
@@ -36,8 +34,6 @@
import org.gatein.pc.api.spi.PortletInvocationContext;
import org.gatein.wsrp.WSRPConstants;
import org.gatein.wsrp.WSRPConsumer;
-import org.gatein.wsrp.WSRPPortletURL;
-import org.gatein.wsrp.WSRPResourceURL;
import org.gatein.wsrp.WSRPRewritingConstants;
import org.gatein.wsrp.WSRPTypeFactory;
import org.oasis.wsrp.v1.CacheControl;
@@ -52,7 +48,6 @@
import javax.xml.ws.Holder;
import java.util.List;
-import java.util.Set;
/**
* @author <a href="mailto:chris.laprun@jboss.com">Chris Laprun</a>
@@ -194,11 +189,11 @@
{
// fix-me: how to deal with fragment header? => interceptor?
- markup = TextTools.replaceBoundedString(
+ markup = MarkupProcessor.replaceBoundedString(
markup,
WSRPRewritingConstants.WSRP_REWRITE,
WSRPRewritingConstants.END_WSRP_REWRITE,
- new ResourceURLStringReplacementGenerator(namespace, context, target, format, consumer.getProducerInfo()),
+ new MarkupProcessor(namespace, context, target, format, consumer.getProducerInfo()),
true,
false,
true
@@ -242,123 +237,4 @@
return result;
}
-
- static class ResourceURLStringReplacementGenerator implements TextTools.StringReplacementGenerator
- {
- private final PortletInvocationContext context;
- private final URLFormat format;
- private final Set<String> supportedCustomModes;
- private final Set<String> supportedCustomWindowStates;
- private final String serverAddress;
- private final String portletApplicationName;
- private final String namespace;
- public static final int URL_DELIMITER_LENGTH = WSRPRewritingConstants.RESOURCE_URL_DELIMITER.length();
-
- private ResourceURLStringReplacementGenerator(String namespace, PortletInvocationContext context, org.gatein.pc.api.PortletContext target, URLFormat format, ProducerInfo info)
- {
- this.namespace = namespace;
- this.context = context;
- this.format = format;
- supportedCustomModes = info.getSupportedCustomModes();
- supportedCustomWindowStates = info.getSupportedCustomWindowStates();
- serverAddress = info.getEndpointConfigurationInfo().getRemoteHostAddress();
- portletApplicationName = target.getApplicationName();
- }
-
- public String getReplacementFor(String match, String prefix, String suffix)
- {
- if (match.startsWith(WSRPRewritingConstants.RESOURCE_URL_DELIMITER))
- {
- // we have a resource URL coming from a template so extract URL
- int index = match.lastIndexOf(WSRPRewritingConstants.RESOURCE_URL_DELIMITER);
-
-/*
- // todo: right now, no need to extract value of require rewrite..
- String requireRewriteStr = match.substring(index + URL_DELIMITER_LENGTH);
- boolean requireRewrite = Boolean.valueOf(requireRewriteStr);
- if (requireRewrite)
- {
- // FIX-ME: do something
- log.debug("Required re-writing but this is not yet implemented...");
- }*/
-
- match = match.substring(URL_DELIMITER_LENGTH, index);
- return URLTools.decodeXWWWFormURL(match);
- }
- else if (prefix.equals(match))
- {
- return namespace;
- }
- else if (match.startsWith(WSRPRewritingConstants.BEGIN_WSRP_REWRITE_END))
- {
- // remove end of rewrite token
- match = match.substring(WSRPRewritingConstants.BEGIN_WSRP_REWRITE_END.length());
-
- WSRPPortletURL portletURL = WSRPPortletURL.create(match, supportedCustomModes, supportedCustomWindowStates, true);
- if (portletURL instanceof WSRPResourceURL)
- {
- WSRPResourceURL resource = (WSRPResourceURL)portletURL;
- String replacement = getResourceURL(match, resource);
-
- // if the URL starts with /, prepend the remote host address and the portlet application name so that we
- // can attempt to create a remotely available URL
- if (replacement.startsWith(URLTools.SLASH))
- {
- replacement = WSRPResourceURL.createAbsoluteURLFrom(replacement, serverAddress, portletApplicationName);
- }
-
- return replacement;
-
-/*
- todo: use this code to reactivate primitive use of resources
- // get the parsed URL and add marker to it so that the consumer can know it needs to be intercepted
- URL url = resource.getResourceURL();
- String query = url.getQuery();
- if (ParameterValidation.isNullOrEmpty(query))
- {
- query = WSRPRewritingConstants.GTNRESOURCE;
- }
- else
- {
- query = "+" + WSRPRewritingConstants.GTNRESOURCE;
- }
-
- try
- {
- URI uri = new URI(url.getProtocol(), url.getUserInfo(), url.getHost(), url.getPort(),
- url.getPath(), query, url.getRef());
-
- // set the resulting URI as the new resource ID, must be encoded as it will be used in URLs
- String s = URLTools.encodeXWWWFormURL(uri.toString());
- resource.setResourceId(s);
- }
- catch (Exception e)
- {
- throw new IllegalArgumentException("Cannot parse specified Resource as a URI: " + url);
- }*/
-
- }
-
- return context.renderURL(portletURL, format);
- }
- else
- {
- // match is not something we know how to process
- return match;
- }
- }
- }
-
- private static String getResourceURL(String urlAsString, WSRPResourceURL resource)
- {
- String resourceURL = resource.getResourceURL().toExternalForm();
- if (log.isDebugEnabled())
- {
- log.debug("URL '" + urlAsString + "' refers to a resource which are not currently well supported. " +
- "Attempting to craft a URL that we might be able to work with: '" + resourceURL + "'");
- }
-
- // right now the resourceURL should be output as is, because it will be used directly but it really should be encoded
- return resourceURL;
- }
}
Modified: components/wsrp/trunk/pom.xml
===================================================================
--- components/wsrp/trunk/pom.xml 2010-03-22 11:48:01 UTC (rev 2338)
+++ components/wsrp/trunk/pom.xml 2010-03-22 12:02:51 UTC (rev 2339)
@@ -48,7 +48,7 @@
<properties>
<version.gatein.pc>2.1.0-GA</version.gatein.pc>
- <version.gatein.common>2.0.1-GA-SNAPSHOT</version.gatein.common>
+ <version.gatein.common>2.0.0-GA</version.gatein.common>
<version.gatein.wci>2.0.0-GA</version.gatein.wci>
<version.jsf>1.2_12</version.jsf>
14 years, 10 months
gatein SVN: r2338 - portal/trunk/component/identity/src/main/java/org/exoplatform/services/organization/idm.
by do-not-reply＠jboss.org
Author: bdaw
Date: 2010-03-22 07:48:01 -0400 (Mon, 22 Mar 2010)
New Revision: 2338
Modified:
portal/trunk/component/identity/src/main/java/org/exoplatform/services/organization/idm/UserProfileDAOImpl.java
Log:
- GTNPORTAL-886 - simple check to fix NPE
Modified: portal/trunk/component/identity/src/main/java/org/exoplatform/services/organization/idm/UserProfileDAOImpl.java
===================================================================
--- portal/trunk/component/identity/src/main/java/org/exoplatform/services/organization/idm/UserProfileDAOImpl.java 2010-03-22 10:12:00 UTC (rev 2337)
+++ portal/trunk/component/identity/src/main/java/org/exoplatform/services/organization/idm/UserProfileDAOImpl.java 2010-03-22 11:48:01 UTC (rev 2338)
@@ -261,7 +261,15 @@
// Check if attribute is part of User interface data
if (!UserDAOImpl.USER_NON_PROFILE_KEYS.contains(key))
{
- filteredAttrs.put(key, attrs.get(key).getValue().toString());
+ Object value = attrs.get(key).getValue();
+ if (value != null)
+ {
+ filteredAttrs.put(key, value.toString());
+ }
+ else
+ {
+ filteredAttrs.put(key, null);
+ }
}
}
14 years, 10 months
gatein SVN: r2337 - portal/trunk/docs.
by do-not-reply＠jboss.org
Author: thomas.heute(a)jboss.com
Date: 2010-03-22 06:12:00 -0400 (Mon, 22 Mar 2010)
New Revision: 2337
Removed:
portal/trunk/docs/testing/
Log:
It has moved to /testsuite
14 years, 10 months
gatein SVN: r2336 - portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/application.
by do-not-reply＠jboss.org
Author: julien_viet
Date: 2010-03-22 05:12:57 -0400 (Mon, 22 Mar 2010)
New Revision: 2336
Modified:
portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIPortletForm.java
Log:
GTNPORTAL-931 : Incorrect exception handling thrown by a Portlet render invocation in portlet edition in layout edition
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 2010-03-22 09:05:56 UTC (rev 2335)
+++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIPortletForm.java 2010-03-22 09:12:57 UTC (rev 2336)
@@ -221,6 +221,7 @@
{
PortletContainerException pcException;
+ //
if (portletResponse instanceof ErrorResponse)
{
ErrorResponse errorResponse = (ErrorResponse)portletResponse;
@@ -233,17 +234,24 @@
+ "]. Expected a FragmentResponse or an ErrorResponse");
}
- PortletExceptionHandleService portletExceptionService =
- (PortletExceptionHandleService)uiPortlet_.getApplicationComponent(PortletExceptionHandleService.class);
- portletExceptionService.handle(pcException);
+ //
+ PortletExceptionHandleService portletExceptionService = uiPortlet_.getApplicationComponent(PortletExceptionHandleService.class);
+ if (portletExceptionService != null)
+ {
+ portletExceptionService.handle(pcException);
+ }
+ else
+ {
+ log.warn("Could not find the PortletExceptionHandleService in the exo container");
+ }
+ //
+ log.error("Portlet render in edit mode threw an exception", pcException);
content = "An error has occured. Please see the logs for details.";
}
portletContent.setLength(0);
portletContent.append(content);
- //
-
}
catch (Throwable ex)
{
14 years, 10 months
gatein SVN: r2335 - portal/trunk/docs/reference-guide/en/modules.
by do-not-reply＠jboss.org
Author: thomas.heute(a)jboss.com
Date: 2010-03-22 05:05:56 -0400 (Mon, 22 Mar 2010)
New Revision: 2335
Modified:
portal/trunk/docs/reference-guide/en/modules/Introduction.xml
portal/trunk/docs/reference-guide/en/modules/WSRP.xml
Log:
Entity import and usage fixes
Modified: portal/trunk/docs/reference-guide/en/modules/Introduction.xml
===================================================================
--- portal/trunk/docs/reference-guide/en/modules/Introduction.xml 2010-03-22 08:58:48 UTC (rev 2334)
+++ portal/trunk/docs/reference-guide/en/modules/Introduction.xml 2010-03-22 09:05:56 UTC (rev 2335)
@@ -2,8 +2,6 @@
<!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 "../Reference_Guide.ent">
%BOOK_ENTITIES;
-<!ENTITY % BOOK_ENTITIES SYSTEM "../Reference_Guide.ent">
-%BOOK_ENTITIES;
]>
<chapter id="chap-Reference_Guide-Introduction">
<title>Introduction</title>
@@ -47,7 +45,7 @@
<listitem>
<para>
GateIn videos:
- <ulink url="http://www.jboss.org/gatein/videos.html">www.jboss.org/gatein/videos.html</ulink>
+ <ulink url="http://vimeo.com/channels/gatein">vimeo.com/channels/gatein</ulink>
</para>
<!-- <mediaobject>
<imageobject role="html">
Modified: portal/trunk/docs/reference-guide/en/modules/WSRP.xml
===================================================================
--- portal/trunk/docs/reference-guide/en/modules/WSRP.xml 2010-03-22 08:58:48 UTC (rev 2334)
+++ portal/trunk/docs/reference-guide/en/modules/WSRP.xml 2010-03-22 09:05:56 UTC (rev 2335)
@@ -2,9 +2,7 @@
<!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 "../Reference_Guide.ent">
%BOOK_ENTITIES;
- <!ENTITY % entities SYSTEM "../Reference_Guide.ent">
- %entities;
- ]>
+]>
<chapter id="wsrp">
<title>Web Services for Remote Portlets (WSRP)</title>
@@ -37,7 +35,7 @@
</sect1>
<sect1 id="wsrp_support">
- <title>Level of support in GateIn</title>
+ <title>Level of support in &PRODUCT;</title>
<para>The WSRP Technical Committee defined
<ulink url="http://www.oasis-open.org/committees/download.php/3073">WSRP Use Profiles</ulink>
to help with WSRP interoperability. We will refer to terms defined in that document in
14 years, 10 months
gatein SVN: r2334 - portal/trunk/docs/reference-guide/en/modules/configuration.
by do-not-reply＠jboss.org
Author: thomas.heute(a)jboss.com
Date: 2010-03-22 04:58:48 -0400 (Mon, 22 Mar 2010)
New Revision: 2334
Modified:
portal/trunk/docs/reference-guide/en/modules/configuration/EMailService_Configuration.xml
Log:
Too much copy/paste
Modified: portal/trunk/docs/reference-guide/en/modules/configuration/EMailService_Configuration.xml
===================================================================
--- portal/trunk/docs/reference-guide/en/modules/configuration/EMailService_Configuration.xml 2010-03-22 08:34:13 UTC (rev 2333)
+++ portal/trunk/docs/reference-guide/en/modules/configuration/EMailService_Configuration.xml 2010-03-22 08:58:48 UTC (rev 2334)
@@ -17,7 +17,7 @@
</section>
<section id="sect-Reference_Guide-EMail_Service_Configuration-Parameters">
- <title>Configuring the database for JCR</title>
+ <title>Configuring the e-mail outgoing account</title>
<para>The e-mail service can use any SMTP account that needs to be configured in
$JBOSS_HOME/server/default/conf/gatein/configuration.properties
14 years, 10 months
gatein SVN: r2333 - in portal/trunk/docs: reference-guide and 1 other directories.
by do-not-reply＠jboss.org
Author: thomas.heute(a)jboss.com
Date: 2010-03-22 04:34:13 -0400 (Mon, 22 Mar 2010)
New Revision: 2333
Modified:
portal/trunk/docs/pom.xml
portal/trunk/docs/reference-guide/pom.xml
portal/trunk/docs/user-guide/pom.xml
Log:
Put the doc back into the Maven hierarchy
Modified: portal/trunk/docs/pom.xml
===================================================================
--- portal/trunk/docs/pom.xml 2010-03-22 07:34:41 UTC (rev 2332)
+++ portal/trunk/docs/pom.xml 2010-03-22 08:34:13 UTC (rev 2333)
@@ -23,15 +23,89 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.exoplatform.portal</groupId>
+ <artifactId>exo.portal.parent</artifactId>
+ <version>3.0.1-GA-SNAPSHOT</version>
+ </parent>
+
<groupId>org.gatein.doc</groupId>
<artifactId>docs-aggregator</artifactId>
<packaging>pom</packaging>
<name>GateIn - Portal (docs-aggregator)</name>
- <version>3.0.0-GA</version>
<modules>
<module>user-guide</module>
<module>reference-guide</module>
</modules>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.jboss.maven.plugins</groupId>
+ <artifactId>maven-jdocbook-plugin</artifactId>
+ <version>2.1.1</version>
+ <extensions>true</extensions>
+ <dependencies>
+ <dependency>
+ <groupId>org.gatein.doc</groupId>
+ <artifactId>gatein-docbook-xslt</artifactId>
+ <version>1.0.0-CR2</version>
+ </dependency>
+ <dependency>
+ <groupId>org.gatein.doc</groupId>
+ <artifactId>gatein-jdocbook-style</artifactId>
+ <version>1.0.0-CR2</version>
+ <type>jdocbook-style</type>
+ </dependency>
+ </dependencies>
+ <configuration>
+ <sourceDocumentName>master.xml</sourceDocumentName>
+ <sourceDirectory>${pom.basedir}/en</sourceDirectory>
+ <imageResource>
+ <directory>${pom.basedir}/en</directory>
+ <includes>
+ <include>images/**/*</include>
+ </includes>
+ </imageResource>
+ <!--<cssResource>
+ <directory>src/main/css</directory>
+ </cssResource>-->
+ <formats>
+ <format>
+ <formatName>pdf</formatName>
+ <stylesheetResource>classpath://xslt/org/gatein/pdf.xsl</stylesheetResource>
+ <finalName>${pom.name}.pdf</finalName>
+ </format>
+ <format>
+ <formatName>html</formatName>
+ <stylesheetResource>classpath:/xslt/org/gatein/xhtml.xsl</stylesheetResource>
+ <finalName>index.html</finalName>
+ </format>
+ <format>
+ <formatName>html_single</formatName>
+ <stylesheetResource>classpath:/xslt/org/gatein/xhtml-single.xsl</stylesheetResource>
+ <finalName>index.html</finalName>
+ </format>
+ <format>
+ <formatName>eclipse</formatName>
+ <stylesheetResource>classpath:/xslt/org/gatein/eclipse.xsl</stylesheetResource>
+ <finalName>index.html</finalName>
+ </format>
+ </formats>
+ <options>
+ <xincludeSupported>true</xincludeSupported>
+ <xmlTransformerType>saxon</xmlTransformerType>
+ <!-- needed for uri-resolvers; can be ommitted if using 'current' uri scheme -->
+ <!-- could also locate the docbook dependency and inspect its version... -->
+ <docbookVersion>1.74.0</docbookVersion>
+ </options>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+ <properties>
+ <translation>en-US</translation>
+ </properties>
</project>
Modified: portal/trunk/docs/reference-guide/pom.xml
===================================================================
--- portal/trunk/docs/reference-guide/pom.xml 2010-03-22 07:34:41 UTC (rev 2332)
+++ portal/trunk/docs/reference-guide/pom.xml 2010-03-22 08:34:13 UTC (rev 2333)
@@ -25,65 +25,15 @@
<modelVersion>4.0.0</modelVersion>
- <!-- FIXME parent not in sync with current hierarchy -->
<parent>
<groupId>org.gatein.doc</groupId>
- <artifactId>doc-parent</artifactId>
- <version>1.0.0-CR1</version>
+ <artifactId>docs-aggregator</artifactId>
+ <version>3.0.1-GA-SNAPSHOT</version>
</parent>
<groupId>org.gatein.doc</groupId>
<artifactId>gatein-reference-guide-en</artifactId>
- <version>3.0.0-GA</version>
<packaging>jdocbook</packaging>
<name>GateIn Reference Guide en</name>
- <!-- TODO Remove when repositories are configured once for all -->
- <repositories>
- <repository>
- <id>repository.jboss.org</id>
- <name>JBoss Repository</name>
- <layout>default</layout>
- <url>http://repository.jboss.org/maven2/</url>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- </repository>
- <repository>
- <id>snapshots.jboss.org</id>
- <name>JBoss Snapshots Repository</name>
- <layout>default</layout>
- <url>http://snapshots.jboss.org/maven2/</url>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- <releases>
- <enabled>false</enabled>
- </releases>
- </repository>
- </repositories>
-
- <pluginRepositories>
- <pluginRepository>
- <id>repository.jboss.org</id>
- <name>JBoss Repository</name>
- <layout>default</layout>
- <url>http://repository.jboss.org/maven2/</url>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- </pluginRepository>
- <pluginRepository>
- <id>snapshots.jboss.org</id>
- <name>JBoss Snapshots Repository</name>
- <layout>default</layout>
- <url>http://snapshots.jboss.org/maven2/</url>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- <releases>
- <enabled>false</enabled>
- </releases>
- </pluginRepository>
- </pluginRepositories>
</project>
Modified: portal/trunk/docs/user-guide/pom.xml
===================================================================
--- portal/trunk/docs/user-guide/pom.xml 2010-03-22 07:34:41 UTC (rev 2332)
+++ portal/trunk/docs/user-guide/pom.xml 2010-03-22 08:34:13 UTC (rev 2333)
@@ -28,62 +28,12 @@
<!-- FIXME parent not in sync with current hierarchy -->
<parent>
<groupId>org.gatein.doc</groupId>
- <artifactId>doc-parent</artifactId>
- <version>1.0.0-CR1</version>
+ <artifactId>docs-aggregator</artifactId>
+ <version>3.0.1-GA-SNAPSHOT</version>
</parent>
- <groupId>org.gatein.doc</groupId>
<artifactId>gatein-user-guide-en</artifactId>
- <version>3.0.0-GA</version>
<packaging>jdocbook</packaging>
<name>GateIn User Guide en</name>
- <!-- TODO Remove when repositories are configured once for all -->
- <repositories>
- <repository>
- <id>repository.jboss.org</id>
- <name>JBoss Repository</name>
- <layout>default</layout>
- <url>http://repository.jboss.org/maven2/</url>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- </repository>
- <repository>
- <id>snapshots.jboss.org</id>
- <name>JBoss Snapshots Repository</name>
- <layout>default</layout>
- <url>http://snapshots.jboss.org/maven2/</url>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- <releases>
- <enabled>false</enabled>
- </releases>
- </repository>
- </repositories>
-
- <pluginRepositories>
- <pluginRepository>
- <id>repository.jboss.org</id>
- <name>JBoss Repository</name>
- <layout>default</layout>
- <url>http://repository.jboss.org/maven2/</url>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- </pluginRepository>
- <pluginRepository>
- <id>snapshots.jboss.org</id>
- <name>JBoss Snapshots Repository</name>
- <layout>default</layout>
- <url>http://snapshots.jboss.org/maven2/</url>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- <releases>
- <enabled>false</enabled>
- </releases>
- </pluginRepository>
- </pluginRepositories>
</project>
14 years, 10 months
gatein SVN: r2332 - portal/trunk.
by do-not-reply＠jboss.org
Author: thomas.heute(a)jboss.com
Date: 2010-03-22 03:34:41 -0400 (Mon, 22 Mar 2010)
New Revision: 2332
Removed:
portal/trunk/patch/
Log:
Patch is included with the shindig component
14 years, 10 months
gatein SVN: r2331 - portal/branches.
by do-not-reply＠jboss.org
Author: thomas.heute(a)jboss.com
Date: 2010-03-22 03:31:07 -0400 (Mon, 22 Mar 2010)
New Revision: 2331
Removed:
portal/branches/tmp_thomas_perf/
Log:
Delete temporary branch
14 years, 10 months