JBoss Portal SVN: r6744 - trunk/portlet-server/src/main/org/jboss/portal/portlet/test.
by portal-commits＠lists.jboss.org
Author: julien(a)jboss.com
Date: 2007-03-19 08:55:43 -0400 (Mon, 19 Mar 2007)
New Revision: 6744
Modified:
trunk/portlet-server/src/main/org/jboss/portal/portlet/test/PortletController.java
Log:
removed useless method
Modified: trunk/portlet-server/src/main/org/jboss/portal/portlet/test/PortletController.java
===================================================================
--- trunk/portlet-server/src/main/org/jboss/portal/portlet/test/PortletController.java 2007-03-19 12:49:35 UTC (rev 6743)
+++ trunk/portlet-server/src/main/org/jboss/portal/portlet/test/PortletController.java 2007-03-19 12:55:43 UTC (rev 6744)
@@ -123,12 +123,6 @@
public void handle(ServerInvocation invocation) throws ServerException
{
- //
-// if (HttpTestContext.isCurrentRequestCount(0))
-// {
-// invocation.getServerContext().getClientRequest().getSession().invalidate();
-// }
-
try
{
String requestPath = invocation.getServerContext().getPortalRequestPath();
@@ -420,11 +414,6 @@
req.getSession().setAttribute(CLONE_OF + this.portletContext.getId(), event.getPortletContext());
}
- public void portletCloned(String cloneId)
- {
- throw new UnsupportedOperationException();
- }
-
public AccessMode getAccessMode()
{
return accessMode;
19 years, 1 month
JBoss Portal SVN: r6743 - in trunk/build/ide/intellij/idea60/modules: portlet-server and 1 other directory.
by portal-commits＠lists.jboss.org
Author: julien(a)jboss.com
Date: 2007-03-19 08:49:35 -0400 (Mon, 19 Mar 2007)
New Revision: 6743
Modified:
trunk/build/ide/intellij/idea60/modules/portlet-server/portlet-server.iml
trunk/build/ide/intellij/idea60/modules/portlet/portlet.iml
Log:
update iml files
Modified: trunk/build/ide/intellij/idea60/modules/portlet/portlet.iml
===================================================================
--- trunk/build/ide/intellij/idea60/modules/portlet/portlet.iml 2007-03-19 12:41:22 UTC (rev 6742)
+++ trunk/build/ide/intellij/idea60/modules/portlet/portlet.iml 2007-03-19 12:49:35 UTC (rev 6743)
@@ -20,7 +20,6 @@
</library>
</orderEntry>
<orderEntry type="module" module-name="common" />
- <orderEntry type="module" module-name="security" />
<orderEntry type="module-library">
<library>
<CLASSES>
@@ -139,7 +138,6 @@
<SOURCES />
</library>
</orderEntry>
- <orderEntry type="module" module-name="jems" />
<orderEntry type="module" module-name="api" />
<orderEntryProperties />
</component>
Modified: trunk/build/ide/intellij/idea60/modules/portlet-server/portlet-server.iml
===================================================================
--- trunk/build/ide/intellij/idea60/modules/portlet-server/portlet-server.iml 2007-03-19 12:41:22 UTC (rev 6742)
+++ trunk/build/ide/intellij/idea60/modules/portlet-server/portlet-server.iml 2007-03-19 12:49:35 UTC (rev 6743)
@@ -22,6 +22,60 @@
<orderEntry type="module" module-name="security" />
<orderEntry type="module" module-name="api" />
<orderEntry type="module" module-name="common" />
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/../../../../../../thirdparty/jboss/microcontainer/lib/jboss-dependency.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/../../../../../../thirdparty/jboss/microcontainer/lib/jboss-microcontainer.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/../../../../../../thirdparty/jbossas/core-libs/lib/jboss-system.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/../../../../../../thirdparty/jbossas/core-libs/lib/jboss-jmx.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/../../../../../../thirdparty/jbossas/core-libs/lib/jboss-xml-binding.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/../../../../../../thirdparty/jbossas/core-libs/lib/jboss-common.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
<orderEntryProperties />
</component>
<component name="VcsManagerConfiguration">
19 years, 1 month
JBoss Portal SVN: r6742 - trunk/portlet/src/main/org/jboss/portal/portlet/impl/container.
by portal-commits＠lists.jboss.org
Author: julien(a)jboss.com
Date: 2007-03-19 08:41:22 -0400 (Mon, 19 Mar 2007)
New Revision: 6742
Modified:
trunk/portlet/src/main/org/jboss/portal/portlet/impl/container/PortletApplicationContextImpl.java
Log:
fixed portlet container not picking up the metadata of jboss-portlet.xml
Modified: trunk/portlet/src/main/org/jboss/portal/portlet/impl/container/PortletApplicationContextImpl.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/portlet/impl/container/PortletApplicationContextImpl.java 2007-03-19 10:27:07 UTC (rev 6741)
+++ trunk/portlet/src/main/org/jboss/portal/portlet/impl/container/PortletApplicationContextImpl.java 2007-03-19 12:41:22 UTC (rev 6742)
@@ -106,7 +106,7 @@
//
JBossPortletMetaData jBossPortletMD = null;
- if (jBossPortletMD != null)
+ if (jbossAppMD != null)
{
jBossPortletMD = (JBossPortletMetaData)jbossAppMD.getPortlets().get(portletMD.getName());
}
19 years, 1 month
JBoss Portal SVN: r6741 - docs/trunk/referenceGuide/en/modules.
by portal-commits＠lists.jboss.org
Author: bdaw
Date: 2007-03-19 06:27:07 -0400 (Mon, 19 Mar 2007)
New Revision: 6741
Modified:
docs/trunk/referenceGuide/en/modules/sso.xml
Log:
update
Modified: docs/trunk/referenceGuide/en/modules/sso.xml
===================================================================
--- docs/trunk/referenceGuide/en/modules/sso.xml 2007-03-19 09:39:08 UTC (rev 6740)
+++ docs/trunk/referenceGuide/en/modules/sso.xml 2007-03-19 10:27:07 UTC (rev 6741)
@@ -147,9 +147,9 @@
authentication cache you may need to restart browser.</note>
</sect2>
</sect1>
- <sect1>
+ <!--<sect1>
<title>Using external authentication providers</title>
<para>TODO:</para>
- </sect1>
+ </sect1>-->
</chapter>
19 years, 1 month
JBoss Portal SVN: r6740 - in trunk: core and 2 other directories.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2007-03-19 05:39:08 -0400 (Mon, 19 Mar 2007)
New Revision: 6740
Added:
trunk/portlet-server/.classpath
trunk/portlet-server/.project
Modified:
trunk/common/.classpath
trunk/core-samples/.classpath
trunk/core/.classpath
Log:
Update for Eclipse
Modified: trunk/common/.classpath
===================================================================
--- trunk/common/.classpath 2007-03-19 09:36:28 UTC (rev 6739)
+++ trunk/common/.classpath 2007-03-19 09:39:08 UTC (rev 6740)
@@ -16,5 +16,6 @@
<classpathentry kind="lib" path="/tools/lib/ant-junit.jar"/>
<classpathentry kind="lib" path="/thirdparty/apache-httpclient/lib/commons-httpclient.jar"/>
<classpathentry kind="lib" path="/thirdparty/jboss/backport-concurrent/lib/jboss-backport-concurrent.jar"/>
+ <classpathentry kind="lib" path="/thirdparty/sun-servlet/lib/servlet-api.jar"/>
<classpathentry kind="output" path="bin"/>
</classpath>
Modified: trunk/core/.classpath
===================================================================
--- trunk/core/.classpath 2007-03-19 09:36:28 UTC (rev 6739)
+++ trunk/core/.classpath 2007-03-19 09:39:08 UTC (rev 6740)
@@ -47,5 +47,6 @@
<classpathentry combineaccessrules="false" kind="src" path="/workflow"/>
<classpathentry combineaccessrules="false" kind="src" path="/portlet-federation"/>
<classpathentry kind="lib" path="/thirdparty/jbpm/jaronly/lib/jbpm.jar"/>
+ <classpathentry combineaccessrules="false" kind="src" path="/portlet-server"/>
<classpathentry kind="output" path="bin"/>
</classpath>
Modified: trunk/core-samples/.classpath
===================================================================
--- trunk/core-samples/.classpath 2007-03-19 09:36:28 UTC (rev 6739)
+++ trunk/core-samples/.classpath 2007-03-19 09:39:08 UTC (rev 6740)
@@ -1,5 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
+ <classpathentry kind="src" path="src/main"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="output" path=""/>
+ <classpathentry kind="lib" path="/thirdparty/apache-log4j/lib/log4j.jar"/>
+ <classpathentry combineaccessrules="false" kind="src" path="/api"/>
+ <classpathentry combineaccessrules="false" kind="src" path="/format"/>
+ <classpathentry combineaccessrules="false" kind="src" path="/core"/>
+ <classpathentry combineaccessrules="false" kind="src" path="/common"/>
+ <classpathentry combineaccessrules="false" kind="src" path="/identity"/>
+ <classpathentry combineaccessrules="false" kind="src" path="/portlet"/>
+ <classpathentry combineaccessrules="false" kind="src" path="/theme"/>
+ <classpathentry kind="output" path="bin"/>
</classpath>
Added: trunk/portlet-server/.classpath
===================================================================
--- trunk/portlet-server/.classpath (rev 0)
+++ trunk/portlet-server/.classpath 2007-03-19 09:39:08 UTC (rev 6740)
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="src" path="src/main"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry combineaccessrules="false" kind="src" path="/common"/>
+ <classpathentry combineaccessrules="false" kind="src" path="/portlet"/>
+ <classpathentry combineaccessrules="false" kind="src" path="/server"/>
+ <classpathentry kind="lib" path="/thirdparty/sun-servlet/lib/servlet-api.jar"/>
+ <classpathentry combineaccessrules="false" kind="src" path="/api"/>
+ <classpathentry kind="lib" path="/thirdparty/jbossas/core-libs/lib/jboss-common.jar"/>
+ <classpathentry kind="lib" path="/thirdparty/jbossas/core-libs/lib/jboss-xml-binding.jar"/>
+ <classpathentry kind="lib" path="/thirdparty/jbossas/core-libs/lib/jboss-system.jar"/>
+ <classpathentry kind="lib" path="/thirdparty/jbossas/core-libs/lib/jboss-jmx.jar"/>
+ <classpathentry kind="lib" path="/thirdparty/apache-log4j/lib/log4j.jar"/>
+ <classpathentry combineaccessrules="false" kind="src" path="/security"/>
+ <classpathentry kind="lib" path="/thirdparty/oswego-concurrent/lib/concurrent.jar"/>
+ <classpathentry kind="output" path="bin"/>
+</classpath>
Added: trunk/portlet-server/.project
===================================================================
--- trunk/portlet-server/.project (rev 0)
+++ trunk/portlet-server/.project 2007-03-19 09:39:08 UTC (rev 6740)
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>portlet-server</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ </natures>
+</projectDescription>
19 years, 1 month
JBoss Portal SVN: r6739 - trunk/core/src/main/org/jboss/portal/core/portlet/user.
by portal-commits＠lists.jboss.org
Author: bdaw
Date: 2007-03-19 05:36:28 -0400 (Mon, 19 Mar 2007)
New Revision: 6739
Modified:
trunk/core/src/main/org/jboss/portal/core/portlet/user/UserPortlet.java
Log:
- make UserPortlet little less fragile
Modified: trunk/core/src/main/org/jboss/portal/core/portlet/user/UserPortlet.java
===================================================================
--- trunk/core/src/main/org/jboss/portal/core/portlet/user/UserPortlet.java 2007-03-19 08:44:14 UTC (rev 6738)
+++ trunk/core/src/main/org/jboss/portal/core/portlet/user/UserPortlet.java 2007-03-19 09:36:28 UTC (rev 6739)
@@ -194,7 +194,7 @@
resp.setContentType("text/html");
PrintWriter writer = resp.getWriter();
- if ((req.getUser() != null) && (!((getProperty(req.getUser(), User.INFO_USER_ENABLED)).equals("true"))))
+ if ((req.getUser() != null) && (!(isEnabled(req.getUser()))))
{
req.getPortletSession().invalidate();
PortletRequestDispatcher rd = getPortletContext().getRequestDispatcher("/WEB-INF/jsp/user/login.jsp");
@@ -1277,6 +1277,19 @@
return null;
}
+ private boolean isEnabled(User user)
+ {
+ Object enabled = getProperty(user, User.INFO_USER_ENABLED);
+
+ if (enabled == null || !(enabled instanceof Boolean))
+ {
+ return false;
+ }
+
+ return enabled.equals("true");
+
+ }
+
/*
19 years, 1 month
JBoss Portal SVN: r6738 - trunk/theme/src/main/org/jboss/portal/theme/tag.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2007-03-19 04:44:14 -0400 (Mon, 19 Mar 2007)
New Revision: 6738
Modified:
trunk/theme/src/main/org/jboss/portal/theme/tag/PortletTagHandler.java
Log:
If the window doesn't exist, display nothing instead of the latest of the list.
Patch contribution from Antoine Herzog.
Modified: trunk/theme/src/main/org/jboss/portal/theme/tag/PortletTagHandler.java
===================================================================
--- trunk/theme/src/main/org/jboss/portal/theme/tag/PortletTagHandler.java 2007-03-19 05:00:52 UTC (rev 6737)
+++ trunk/theme/src/main/org/jboss/portal/theme/tag/PortletTagHandler.java 2007-03-19 08:44:14 UTC (rev 6738)
@@ -97,55 +97,54 @@
}
String windowID = null;
+ boolean wIdFound = false;
// we have the windowName (which is the window name), but we need the
// window id
Map portletContexts = page.getWindowContextMap();
- for (Iterator i = portletContexts.keySet().iterator(); i.hasNext();)
- {
- windowID = (String) i.next();
- WindowContext portletContext = (WindowContext) portletContexts.get(windowID);
- if (windowName.equals(portletContext.getWindowName()))
- {
- if (log.isDebugEnabled())
- {
- log.debug("found the portlet to render: " + windowName);
- }
- break;
- }
+ for (Iterator i = portletContexts.keySet().iterator(); i.hasNext();) {
+ windowID = (String) i.next();
+ WindowContext portletContext = (WindowContext) portletContexts
+ .get(windowID);
+ if (windowName.equals(portletContext.getWindowName())) {
+ wIdFound = true;
+ if (log.isDebugEnabled()) {
+ log.debug("found the portlet to render: " + windowName);
+ }
+ break;
+ }
}
- if (windowID == null)
- {
- log.warn("can't find the window id of the window name on this page. Page [" + page.getPageName()
- + "] Window [" + windowName + "]. This window won't be shown in page.");
- return;
+ if (!wIdFound) {
+ log
+ .warn("can't find the window id of the window name on this page. Page=["
+ + page.getPageName()
+ + "] and Window=["
+ + windowName
+ + "]. This window won't be shown in page.");
+ return;
}
-
- if (page.getWindowContext(windowID) == null)
- {
- log.warn("no such window on this page. Page [" + page.getPageName() + "] Window name [" + windowName + "]"
- + "] Window Id [" + windowID + "]");
- return;
+ if (page.getWindowContext(windowID) == null) {
+ log.warn("no such window on this page. Page [" + page.getPageName()
+ + "] Window name [" + windowName + "]" + "] Window Id ["
+ + windowID + "]");
+ return;
}
WindowContext windowContext = page.getWindowContext(windowID);
- RenderContext renderContext = (RenderContext) request.getAttribute(LayoutConstants.ATTR_RENDERCONTEXT);
+ RenderContext renderContext = (RenderContext) request
+ .getAttribute(LayoutConstants.ATTR_RENDERCONTEXT);
renderContext = renderContext.getContext(windowContext);
- try
- {
- renderContext.render();
- out.write(renderContext.getMarkupFragment().toString());
- out.flush();
+ try {
+ renderContext.render();
+ out.write(renderContext.getMarkupFragment().toString());
+ out.flush();
+ } catch (RenderException e) {
+ throw new JspException(e);
}
- catch (RenderException e)
- {
- throw new JspException(e);
- }
+ }
- }
-
public String getWindowName()
{
return windowName;
19 years, 1 month
JBoss Portal SVN: r6737 - trunk/wsrp/src/main/org/jboss/portal/wsrp/consumer.
by portal-commits＠lists.jboss.org
Author: chris.laprun(a)jboss.com
Date: 2007-03-19 01:00:52 -0400 (Mon, 19 Mar 2007)
New Revision: 6737
Modified:
trunk/wsrp/src/main/org/jboss/portal/wsrp/consumer/ProducerInfo.java
Log:
- Fixed logging messages on getPortlet.
Modified: trunk/wsrp/src/main/org/jboss/portal/wsrp/consumer/ProducerInfo.java
===================================================================
--- trunk/wsrp/src/main/org/jboss/portal/wsrp/consumer/ProducerInfo.java 2007-03-19 05:00:05 UTC (rev 6736)
+++ trunk/wsrp/src/main/org/jboss/portal/wsrp/consumer/ProducerInfo.java 2007-03-19 05:00:52 UTC (rev 6737)
@@ -412,7 +412,7 @@
// First try POP cache if cache is still valid or we just refreshed
if (justRefreshed || (useCache() && !isCacheExpired()))
{
- log.debug("Retrieving portlet '" + portletHandle + "' from cached service description");
+ log.debug("Trying to retrieve portlet '" + portletHandle + "' from cached service description");
portlet = (Portlet)popsMap.get(portletHandle);
}
@@ -420,6 +420,7 @@
if (portlet != null) // we had a match on a POP, return it
{
+ log.debug("Portlet '" + portletHandle + "' was in cached service description");
return portlet;
}
else // otherwise, retrieve just the information for the appropriate portlet
19 years, 1 month
JBoss Portal SVN: r6736 - trunk/core/src/main/org/jboss/portal/core/impl/model/instance.
by portal-commits＠lists.jboss.org
Author: chris.laprun(a)jboss.com
Date: 2007-03-19 01:00:05 -0400 (Mon, 19 Mar 2007)
New Revision: 6736
Modified:
trunk/core/src/main/org/jboss/portal/core/impl/model/instance/InstanceCustomizationImpl.java
trunk/core/src/main/org/jboss/portal/core/impl/model/instance/InstanceDefinitionImpl.java
Log:
- Use PortletContext of the InstanceCustomization to retrieve the portlet. Might not work in all contexts...
Modified: trunk/core/src/main/org/jboss/portal/core/impl/model/instance/InstanceCustomizationImpl.java
===================================================================
--- trunk/core/src/main/org/jboss/portal/core/impl/model/instance/InstanceCustomizationImpl.java 2007-03-19 01:50:24 UTC (rev 6735)
+++ trunk/core/src/main/org/jboss/portal/core/impl/model/instance/InstanceCustomizationImpl.java 2007-03-19 05:00:05 UTC (rev 6736)
@@ -93,7 +93,7 @@
public Portlet getPortlet() throws PortletInvokerException
{
- return def.getPortlet();
+ return def.getPortlet(getPortletContext());
}
public InstanceContainer getContainer()
Modified: trunk/core/src/main/org/jboss/portal/core/impl/model/instance/InstanceDefinitionImpl.java
===================================================================
--- trunk/core/src/main/org/jboss/portal/core/impl/model/instance/InstanceDefinitionImpl.java 2007-03-19 01:50:24 UTC (rev 6735)
+++ trunk/core/src/main/org/jboss/portal/core/impl/model/instance/InstanceDefinitionImpl.java 2007-03-19 05:00:05 UTC (rev 6736)
@@ -153,9 +153,14 @@
public Portlet getPortlet() throws PortletInvokerException
{
+ return getPortlet(getPortletContext());
+ }
+
+ Portlet getPortlet(PortletContext portletContext) throws PortletInvokerException
+ {
PersistentInstanceContainer container = containerContext.container;
PortletInvoker invoker = container.getPortletInvoker();
- return invoker.getPortlet(getPortletContext());
+ return invoker.getPortlet(portletContext);
}
19 years, 1 month