JBoss Portal SVN: r11208 - branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/api/node.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2008-06-30 10:24:03 -0400 (Mon, 30 Jun 2008)
New Revision: 11208
Modified:
branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/api/node/PortalNodeImpl.java
Log:
JBPORTAL-2021: Tab Order does not work
Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/api/node/PortalNodeImpl.java
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/api/node/PortalNodeImpl.java 2008-06-30 14:08:18 UTC (rev 11207)
+++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/api/node/PortalNodeImpl.java 2008-06-30 14:24:03 UTC (rev 11208)
@@ -278,19 +278,7 @@
case PortalObject.TYPE_PORTAL:
return 1;
case PortalObject.TYPE_PAGE:
- String orderProperty = object.getDeclaredProperty(ORDER);
- if (orderProperty == null)
- {
- return 2.999f;
- }
- try
- {
- return Float.parseFloat("2." + orderProperty);
- }
- catch (NumberFormatException e)
- {
- return 2.999f;
- }
+ return 2;
case PortalObject.TYPE_WINDOW:
return 3;
default:
@@ -308,6 +296,35 @@
float weight2 = node2.getWeight();
if (weight1 == weight2)
{
+ if (PortalObject.TYPE_PAGE == node1.getType())
+ {
+ String orderProperty1S = (String)node1.getProperties().get(ORDER);
+ String orderProperty2S = (String)node2.getProperties().get(ORDER);
+
+ if (orderProperty1S != null && orderProperty2S !=null)
+ {
+ float orderProperty1 = -1;
+ float orderProperty2 = -1;
+
+ try
+ {
+ orderProperty1 = Float.parseFloat(orderProperty1S);
+ orderProperty2 = Float.parseFloat(orderProperty2S);
+ if (orderProperty1 > orderProperty2)
+ {
+ return 1;
+ }
+ else if (orderProperty1 < orderProperty2)
+ {
+ return -1;
+ }
+ }
+ catch (NumberFormatException e)
+ {
+ // ignore
+ }
+ }
+ }
return node1.getName().compareTo(node2.getName());
}
else if (weight1 < weight2)
15 years, 10 months
- 1
- 0
JBoss Portal SVN: r11207 - in branches/JBoss_Portal_Branch_2_7/portlet-server/src/main/org/jboss/portal/portlet/impl: invocation and 1 other directory.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2008-06-30 10:08:18 -0400 (Mon, 30 Jun 2008)
New Revision: 11207
Added:
branches/JBoss_Portal_Branch_2_7/portlet-server/src/main/org/jboss/portal/portlet/impl/invocation/
branches/JBoss_Portal_Branch_2_7/portlet-server/src/main/org/jboss/portal/portlet/impl/invocation/EmptyPortletInterceptorStackFactory.java
branches/JBoss_Portal_Branch_2_7/portlet-server/src/main/org/jboss/portal/portlet/impl/invocation/JBossPortletInterceptorStack.java
branches/JBoss_Portal_Branch_2_7/portlet-server/src/main/org/jboss/portal/portlet/impl/invocation/JBossPortletInterceptorStackFactory.java
branches/JBoss_Portal_Branch_2_7/portlet-server/src/main/org/jboss/portal/portlet/impl/invocation/PortletInterceptorStack.java
branches/JBoss_Portal_Branch_2_7/portlet-server/src/main/org/jboss/portal/portlet/impl/invocation/PortletInterceptorStackFactory.java
Log:
Command line rocks
Added: branches/JBoss_Portal_Branch_2_7/portlet-server/src/main/org/jboss/portal/portlet/impl/invocation/EmptyPortletInterceptorStackFactory.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/portlet-server/src/main/org/jboss/portal/portlet/impl/invocation/EmptyPortletInterceptorStackFactory.java (rev 0)
+++ branches/JBoss_Portal_Branch_2_7/portlet-server/src/main/org/jboss/portal/portlet/impl/invocation/EmptyPortletInterceptorStackFactory.java 2008-06-30 14:08:18 UTC (rev 11207)
@@ -0,0 +1,37 @@
+/*
+* JBoss, a division of Red Hat
+* Copyright 2008, 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.jboss.portal.portlet.impl.invocation;
+
+
+/**
+ * @author <a href="mailto:chris.laprun@jboss.com">Chris Laprun</a>
+ * @version $Revision$
+ */
+public class EmptyPortletInterceptorStackFactory implements PortletInterceptorStackFactory
+{
+ public PortletInterceptorStack getInterceptorStack()
+ {
+ return JBossPortletInterceptorStack.EMPTY_STACK;
+ }
+}
+
Added: branches/JBoss_Portal_Branch_2_7/portlet-server/src/main/org/jboss/portal/portlet/impl/invocation/JBossPortletInterceptorStack.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/portlet-server/src/main/org/jboss/portal/portlet/impl/invocation/JBossPortletInterceptorStack.java (rev 0)
+++ branches/JBoss_Portal_Branch_2_7/portlet-server/src/main/org/jboss/portal/portlet/impl/invocation/JBossPortletInterceptorStack.java 2008-06-30 14:08:18 UTC (rev 11207)
@@ -0,0 +1,64 @@
+/******************************************************************************
+ * 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. *
+ ******************************************************************************/
+package org.jboss.portal.portlet.impl.invocation;
+
+import org.jboss.portal.portlet.PortletInvokerInterceptor;
+
+/**
+ * @author <a href="mailto:theute@jboss.org">Thomas Heute</a>
+ * @version $Revision$
+ */
+public class JBossPortletInterceptorStack implements PortletInterceptorStack
+{
+
+ /** . */
+ public static final PortletInterceptorStack EMPTY_STACK = new JBossPortletInterceptorStack(new PortletInvokerInterceptor[0]);
+
+ /** . */
+ private final PortletInvokerInterceptor[] interceptors;
+
+ public JBossPortletInterceptorStack(PortletInvokerInterceptor interceptor)
+ {
+ this.interceptors = new PortletInvokerInterceptor[]{interceptor};
+ }
+
+ public JBossPortletInterceptorStack(PortletInvokerInterceptor[] interceptors)
+ {
+ if (interceptors == null)
+ {
+ throw new IllegalArgumentException();
+ }
+ this.interceptors = interceptors;
+ }
+
+ public int getLength()
+ {
+ return interceptors.length;
+ }
+
+ public PortletInvokerInterceptor getInterceptor(int index) throws ArrayIndexOutOfBoundsException
+ {
+ return interceptors[index];
+ }
+}
+
Added: branches/JBoss_Portal_Branch_2_7/portlet-server/src/main/org/jboss/portal/portlet/impl/invocation/JBossPortletInterceptorStackFactory.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/portlet-server/src/main/org/jboss/portal/portlet/impl/invocation/JBossPortletInterceptorStackFactory.java (rev 0)
+++ branches/JBoss_Portal_Branch_2_7/portlet-server/src/main/org/jboss/portal/portlet/impl/invocation/JBossPortletInterceptorStackFactory.java 2008-06-30 14:08:18 UTC (rev 11207)
@@ -0,0 +1,148 @@
+/******************************************************************************
+ * 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. *
+ ******************************************************************************/
+package org.jboss.portal.portlet.impl.invocation;
+
+import org.jboss.portal.jems.as.system.AbstractJBossService;
+import org.jboss.portal.portlet.PortletInvokerInterceptor;
+
+import javax.management.ObjectName;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+/**
+ * @author <a href="mailto:julien@jboss.org">Julien Viet</a>
+ * @version $Revision: 8784 $
+ */
+public class JBossPortletInterceptorStackFactory extends AbstractJBossService implements PortletInterceptorStackFactory
+{
+
+ /** . */
+ protected List<ObjectName> interceptorNames;
+
+ /** . */
+ protected List<ObjectName> dynamicInterceptorNames;
+
+ /** . */
+ protected PortletInterceptorStack stack;
+
+ public JBossPortletInterceptorStackFactory()
+ {
+ interceptorNames = null;
+ dynamicInterceptorNames = new ArrayList<ObjectName>();
+ }
+
+ public List<ObjectName> getInterceptorNames()
+ {
+ return interceptorNames;
+ }
+
+ public void setInterceptorNames(List<ObjectName> interceptorNames)
+ {
+ this.interceptorNames = interceptorNames;
+ }
+
+ public List<ObjectName> getDynamicInterceptorNames()
+ {
+ return Collections.unmodifiableList(dynamicInterceptorNames);
+ }
+
+ /**
+ * Add's the supplied name to the list of interceptor names.
+ *
+ * @param name the intercptor's ObjectName.
+ * @throws Exception
+ */
+ public void addInterceptor(ObjectName name) throws Exception
+ {
+ dynamicInterceptorNames.add(name);
+ }
+
+ /**
+ * Remove's the supplied name from the list of interceptor names.
+ *
+ * @param name the intercptor's ObjectName.
+ * @throws Exception
+ */
+ public void removeInterceptor(ObjectName name) throws Exception
+ {
+ dynamicInterceptorNames.remove(name);
+ }
+
+ public void startService() throws Exception
+ {
+ rebuild();
+ }
+
+ /** Rebuild the interceptor stack. */
+ public void rebuild() throws Exception
+ {
+ List<ObjectName> names = new ArrayList<ObjectName>();
+
+ //
+ if (interceptorNames != null)
+ {
+ names.addAll(interceptorNames);
+ }
+
+ //
+ names.addAll(dynamicInterceptorNames);
+
+ //
+ log.debug("Building interceptor stack " + getName());
+ PortletInvokerInterceptor[] interceptors = new PortletInvokerInterceptor[names.size()];
+ if (names.size() == 1)
+ {
+ ObjectName name = names.get(0);
+ log.debug("Adding interceptor " + name + " to the stack");
+ PortletInvokerInterceptor a = (PortletInvokerInterceptor)server.getAttribute(name, "ManagedResource");
+ interceptors[0] = a;
+ }
+ for (int i = 0; i < names.size()-1; i++)
+ {
+ ObjectName name = names.get(i);
+ log.debug("Adding interceptor " + name + " to the stack");
+ PortletInvokerInterceptor a = (PortletInvokerInterceptor)server.getAttribute(name, "ManagedResource");
+ name = names.get(i+1);
+ log.debug("Adding interceptor " + name + " to the stack");
+ PortletInvokerInterceptor b = (PortletInvokerInterceptor)server.getAttribute(name, "ManagedResource");
+ a.setNext(b);
+ interceptors[i] = a;
+ interceptors[i+1] = b;
+ }
+
+ //
+ stack = new JBossPortletInterceptorStack(interceptors);
+
+ }
+
+ public void stopService()
+ {
+ this.stack = JBossPortletInterceptorStack.EMPTY_STACK;
+ }
+
+ public PortletInterceptorStack getInterceptorStack()
+ {
+ return stack;
+ }
+}
Added: branches/JBoss_Portal_Branch_2_7/portlet-server/src/main/org/jboss/portal/portlet/impl/invocation/PortletInterceptorStack.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/portlet-server/src/main/org/jboss/portal/portlet/impl/invocation/PortletInterceptorStack.java (rev 0)
+++ branches/JBoss_Portal_Branch_2_7/portlet-server/src/main/org/jboss/portal/portlet/impl/invocation/PortletInterceptorStack.java 2008-06-30 14:08:18 UTC (rev 11207)
@@ -0,0 +1,49 @@
+/******************************************************************************
+ * 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. *
+ ******************************************************************************/
+package org.jboss.portal.portlet.impl.invocation;
+
+import org.jboss.portal.portlet.PortletInvokerInterceptor;
+
+/**
+ * @author <a href="mailto:theute@jboss.org">Thomas Heute</a>
+ * @version $Revision$
+ */
+public interface PortletInterceptorStack
+{
+ /**
+ * Returns the stack length.
+ *
+ * @return the length
+ */
+ int getLength();
+
+ /**
+ * Return the interceptor at the specified index.
+ *
+ * @param index the interceptor index in the stack
+ * @return the specified interceptor
+ * @throws ArrayIndexOutOfBoundsException if the index is not valid
+ */
+ PortletInvokerInterceptor getInterceptor(int index) throws ArrayIndexOutOfBoundsException;
+}
+
Added: branches/JBoss_Portal_Branch_2_7/portlet-server/src/main/org/jboss/portal/portlet/impl/invocation/PortletInterceptorStackFactory.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/portlet-server/src/main/org/jboss/portal/portlet/impl/invocation/PortletInterceptorStackFactory.java (rev 0)
+++ branches/JBoss_Portal_Branch_2_7/portlet-server/src/main/org/jboss/portal/portlet/impl/invocation/PortletInterceptorStackFactory.java 2008-06-30 14:08:18 UTC (rev 11207)
@@ -0,0 +1,35 @@
+/******************************************************************************
+ * 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. *
+ ******************************************************************************/
+package org.jboss.portal.portlet.impl.invocation;
+
+
+/**
+ * @author <a href="mailto:theute@jboss.org">Thomas Heute</a>
+ * @version $Revision$
+ */
+public interface PortletInterceptorStackFactory
+{
+ PortletInterceptorStack getInterceptorStack();
+
+}
+
15 years, 10 months
- 1
- 0
JBoss Portal SVN: r11206 - branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-sar/META-INF.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2008-06-30 08:28:16 -0400 (Mon, 30 Jun 2008)
New Revision: 11206
Modified:
branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-sar/META-INF/jboss-service.xml
Log:
JBPORTAL-2060:Error customization not working on page restricted access
Modified: branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-sar/META-INF/jboss-service.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-sar/META-INF/jboss-service.xml 2008-06-30 12:14:51 UTC (rev 11205)
+++ branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-sar/META-INF/jboss-service.xml 2008-06-30 12:28:16 UTC (rev 11206)
@@ -287,10 +287,10 @@
<depends-list-element>portal:service=Interceptor,type=Command,name=Ajax</depends-list-element>
<!-- depends-list-element>portal:service=Interceptor,type=Command,name=CleanNS</depends-list-element -->
<depends-list-element>portal:service=Interceptor,type=Command,name=NavigationalState</depends-list-element>
+ <depends-list-element>portal:service=Interceptor,type=Command,name=Control</depends-list-element>
<depends-list-element>portal:service=Interceptor,type=Command,name=PortalNode</depends-list-element>
<depends-list-element>portal:service=Interceptor,type=Command,name=PolicyEnforcement</depends-list-element>
<depends-list-element>portal:service=Interceptor,type=Command,name=PageCustomizer</depends-list-element>
- <depends-list-element>portal:service=Interceptor,type=Command,name=Control</depends-list-element>
<depends-list-element>portal:service=Interceptor,type=Command,name=EventBroadcaster</depends-list-element>
</depends-list>
</mbean>
15 years, 10 months
- 1
- 0
JBoss Portal SVN: r11205 - branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-sar/META-INF.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2008-06-30 08:14:51 -0400 (Mon, 30 Jun 2008)
New Revision: 11205
Modified:
branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-sar/META-INF/jboss-service.xml
Log:
JBPORTAL-2060: error customization not working on page restricted access
Controller interceptor needs to be earlier in the stack
Modified: branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-sar/META-INF/jboss-service.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-sar/META-INF/jboss-service.xml 2008-06-30 11:35:11 UTC (rev 11204)
+++ branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-sar/META-INF/jboss-service.xml 2008-06-30 12:14:51 UTC (rev 11205)
@@ -233,10 +233,10 @@
<depends-list-element>portal:service=Interceptor,type=Command,name=Ajax</depends-list-element>
<!-- depends-list-element>portal:service=Interceptor,type=Command,name=CleanNS</depends-list-element -->
<depends-list-element>portal:service=Interceptor,type=Command,name=NavigationalState</depends-list-element>
+ <depends-list-element>portal:service=Interceptor,type=Command,name=Control</depends-list-element>
<depends-list-element>portal:service=Interceptor,type=Command,name=PortalNode</depends-list-element>
<depends-list-element>portal:service=Interceptor,type=Command,name=PolicyEnforcement</depends-list-element>
<depends-list-element>portal:service=Interceptor,type=Command,name=PageCustomizer</depends-list-element>
- <depends-list-element>portal:service=Interceptor,type=Command,name=Control</depends-list-element>
<depends-list-element>portal:service=Interceptor,type=Command,name=EventBroadcaster</depends-list-element>
</depends-list>
</mbean>
15 years, 10 months
- 1
- 0
JBoss Portal SVN: r11204 - in branches/JBoss_Portal_Branch_2_7/core-cms/src/bin/portal-cms-sar/portal/cms/conf/default-content/default: images and 2 other directories.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2008-06-30 07:35:11 -0400 (Mon, 30 Jun 2008)
New Revision: 11204
Added:
branches/JBoss_Portal_Branch_2_7/core-cms/src/bin/portal-cms-sar/portal/cms/conf/default-content/default/images/jbosslogo.png
branches/JBoss_Portal_Branch_2_7/core-cms/src/bin/portal-cms-sar/portal/cms/conf/default-content/default/private/confidential/confidential1.html
branches/JBoss_Portal_Branch_2_7/core-cms/src/bin/portal-cms-sar/portal/cms/conf/default-content/default/private/private1.html
branches/JBoss_Portal_Branch_2_7/core-cms/src/bin/portal-cms-sar/portal/cms/conf/default-content/default/private/private2.html
Removed:
branches/JBoss_Portal_Branch_2_7/core-cms/src/bin/portal-cms-sar/portal/cms/conf/default-content/default/images/homeimg_cornerelement.gif
branches/JBoss_Portal_Branch_2_7/core-cms/src/bin/portal-cms-sar/portal/cms/conf/default-content/default/images/homeimg_cornerelement.png
branches/JBoss_Portal_Branch_2_7/core-cms/src/bin/portal-cms-sar/portal/cms/conf/default-content/default/images/homeimg_jbosslogo.png
branches/JBoss_Portal_Branch_2_7/core-cms/src/bin/portal-cms-sar/portal/cms/conf/default-content/default/images/homeimg_main.png
branches/JBoss_Portal_Branch_2_7/core-cms/src/bin/portal-cms-sar/portal/cms/conf/default-content/default/images/logo.gif
branches/JBoss_Portal_Branch_2_7/core-cms/src/bin/portal-cms-sar/portal/cms/conf/default-content/default/private/code.html
branches/JBoss_Portal_Branch_2_7/core-cms/src/bin/portal-cms-sar/portal/cms/conf/default-content/default/private/confidential/license.html
branches/JBoss_Portal_Branch_2_7/core-cms/src/bin/portal-cms-sar/portal/cms/conf/default-content/default/private/license.html
Modified:
branches/JBoss_Portal_Branch_2_7/core-cms/src/bin/portal-cms-sar/portal/cms/conf/default-content/default/index.html
branches/JBoss_Portal_Branch_2_7/core-cms/src/bin/portal-cms-sar/portal/cms/conf/default-content/default/support.html
Log:
Simplified default CMS content
Deleted: branches/JBoss_Portal_Branch_2_7/core-cms/src/bin/portal-cms-sar/portal/cms/conf/default-content/default/images/homeimg_cornerelement.gif
===================================================================
(Binary files differ)
Deleted: branches/JBoss_Portal_Branch_2_7/core-cms/src/bin/portal-cms-sar/portal/cms/conf/default-content/default/images/homeimg_cornerelement.png
===================================================================
(Binary files differ)
Deleted: branches/JBoss_Portal_Branch_2_7/core-cms/src/bin/portal-cms-sar/portal/cms/conf/default-content/default/images/homeimg_jbosslogo.png
===================================================================
(Binary files differ)
Deleted: branches/JBoss_Portal_Branch_2_7/core-cms/src/bin/portal-cms-sar/portal/cms/conf/default-content/default/images/homeimg_main.png
===================================================================
(Binary files differ)
Copied: branches/JBoss_Portal_Branch_2_7/core-cms/src/bin/portal-cms-sar/portal/cms/conf/default-content/default/images/jbosslogo.png (from rev 11201, branches/JBoss_Portal_Branch_2_7/core-cms/src/bin/portal-cms-sar/portal/cms/conf/default-content/default/images/homeimg_jbosslogo.png)
===================================================================
(Binary files differ)
Deleted: branches/JBoss_Portal_Branch_2_7/core-cms/src/bin/portal-cms-sar/portal/cms/conf/default-content/default/images/logo.gif
===================================================================
(Binary files differ)
Modified: branches/JBoss_Portal_Branch_2_7/core-cms/src/bin/portal-cms-sar/portal/cms/conf/default-content/default/index.html
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-cms/src/bin/portal-cms-sar/portal/cms/conf/default-content/default/index.html 2008-06-30 10:33:39 UTC (rev 11203)
+++ branches/JBoss_Portal_Branch_2_7/core-cms/src/bin/portal-cms-sar/portal/cms/conf/default-content/default/index.html 2008-06-30 11:35:11 UTC (rev 11204)
@@ -1,134 +1,8 @@
-<style type="text/css">
- .welcomelogo {
- margin: 10px;
- }
-
- #welcometext {
-
- }
-
- #welcomegreybox {
- width: 626px;
- }
-
- .welcomegreyboxTD {
- }
-
- #welcomegreybox h3 {
- color: #5078aa;
- font: bold 13px Helvetica, Arial, sans-serif;
-
- }
-
- .home-img {
- padding: 10px 0 0 10px;
- }
-
- /*---------------------------------------------Rounded corner boxes*/
- .services-box{
- float: left;
- width: 30%;
- }
-
- .forum-box{
- float: left;
- width: 30%;
- }
-
- .info-box {
- float: left;
- width: 30%;
- }
-
- .box-content .content{
- padding: 3px;
- height: 70px;
- }
-
- .whiteWithLtGreyHeader .header {
- background-color: #ececec;
- background-image: url("/portal-core/images/corners/gray-header.gif");
- background-repeat: repeat-x;
- padding: 2px 2px 2px 5px;
- color: #000;
- font-weight: bold;
- }
-
- /*------------------------------------------White Rounded Box with light grey Header-----*/
-
- .whiteWithLtGreyHeader {
- position: relative;
- margin: 5px 0 5px 10px;
- text-align: left;
- }
-
- .whiteWithLtGreyHeader p{
- margin: 0;
- padding: 0;
- }
-
- .whiteWithLtGreyHeader .box-header,
- .whiteWithLtGreyHeader .box-footer {
- padding: 0 7px 0 7px;
- position: relative;
- }
-
- .whiteWithLtGreyHeader .img-top-left {
- position: absolute;
- top: 0;
- left: 0;
- }
-
- .whiteWithLtGreyHeader .img-top-right {
- position: absolute;
- top: 0;
- right: 0;
- }
-
- .whiteWithLtGreyHeader .img-bottom-left {
- position: absolute;
- bottom: 0;
- left: 0;
- }
-
- .whiteWithLtGreyHeader .img-bottom-right {
- position: absolute;
- bottom: 0;
- right: 0;
- }
-
- .whiteWithLtGreyHeader .box-header-content {
- border-top: 1px solid #a5a5a5;
- background-color: #ececec;
- width: 100%;
- height: 6px;
- }
-
- .whiteWithLtGreyHeader .box-content {
- border-left: 1px solid #a5a5a5;
- border-right: 1px solid #a5a5a5;
- }
-
- .whiteWithLtGreyHeader .box-footer-content {
- border-bottom: 1px solid #a5a5a5;
- width: 100%;
- height: 6px;
- }
-
- .main-box .box-header-content {
- background-color: transparent;
- }
-
- .main-box .box-content {
- padding: 12px;
- }
-</style>
-
-<div class="home-img">
- <img src="default/images/2_7-go-faster.gif" width="624" height="148" alt="JBoss Portal 2.7: Go Faster!"/>
+<div>
+ <img src="default/images/2_7-go-faster.gif" width="626" height="148" alt="JBoss Portal 2.7: Go Faster!"/>
</div>
<br/>
-<div id="welcomegreybox">
+<div>
<img src="default/images/info-banner.gif" width="626" height="73" border="0" usemap="#Map" style="margin:0 0 0 7px">
<map name="Map">
<area shape="rect" coords="1,1,201,72" href="/portal/content/default/support.html">
@@ -136,24 +10,3 @@
<area shape="rect" coords="439,1,626,73" href="/portal/content/default/project.html">
</map>
</div>
-<br/>
-
- <!--<div class="box-content" style="width:624px">
-
- <img src="default/images/homeimg_jbosslogo.png" alt="JBoss, a division of Red Hat" width="143" class="welcomelogo"
- height="64" align="left"/>
- <div id="welcometext">JBoss Portal provides an open source platform for hosting and serving a portal Web interface,
- publishing and managing its content, and customizing its experience. While most packaged Portal frameworks help
- enterprises launch Portals more quickly, only JBoss Portal delivers the benefits of a zero-cost open source license
- combined with a flexible and scalable underling platform.</div>
- <br/>
-
- <p>Thank you for downloading and deploying JBoss Portal. We hope your enjoy working with it as much as we enjoy
- developing it!</p>
- <p>Baci e abbracci,<br/>
- The JBoss Portal Team.</p>
-
- </div>-->
-
-
-
Deleted: branches/JBoss_Portal_Branch_2_7/core-cms/src/bin/portal-cms-sar/portal/cms/conf/default-content/default/private/code.html
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-cms/src/bin/portal-cms-sar/portal/cms/conf/default-content/default/private/code.html 2008-06-30 10:33:39 UTC (rev 11203)
+++ branches/JBoss_Portal_Branch_2_7/core-cms/src/bin/portal-cms-sar/portal/cms/conf/default-content/default/private/code.html 2008-06-30 11:35:11 UTC (rev 11204)
@@ -1,36 +0,0 @@
-<table width="100%" border="0" cellpadding="2">
-<tr>
-<td valign="top" align="left" class="portlet-section-body"><font class="portlet-font"><b>Document2: This is a protected document. This is used to test the fine grained access control</b></font></td>
-<td valign="top" align="right"><img src="default/images/jboss_logo.gif"></td>
-</tr>
-<tr>
-<td colspan="2">
-<table width="100%" border="0" cellpadding="2">
-<tr>
-<td class="portlet-section-alternate" width="16" valign="top" align="left"><img src="default/images/check.gif"></td>
-<td align="left" valign="top" class="portlet-section-alternate"><font class="portlet-font">
-<a href="http://www.jboss.com/services/profsupport" target="_blank">Professional Support</a>
-<br/>
-The JBoss Subscription is a set of services and tools that assist you during every stage of the application lifecycle - from design and development, thru testing and deployment, to on-going management and monitoring of your enterprise application deployments. JBoss Subscriptions allow you to reduce business, legal, and technical risks while enabling you to more effectively utilize your team's resources. A JBoss Subscription will ensure that you achieve a much greater success rate for all of your JEMS-based projects.
-</font></td>
-</tr>
-<tr>
-<td class="portlet-section-alternate" width="16" valign="top" align="left"><img src="default/images/check.gif"></td>
-<td align="left" valign="top" class="portlet-section-alternate"><font class="portlet-font">
-<a href="http://www.jboss.com/services/consulting" target="_blank">Consulting Services</a>
-<br/>
-JBoss offers short-term on-site JEMS consulting engagements that provide you expert assistance at various stages of the application lifecycle. All engagements are delivered by certified JEMS consultants.
-</font></td>
-</tr>
-<tr>
-<td class="portlet-section-alternate" width="16" valign="top" align="left"><img src="default/images/check.gif"></td>
-<td align="left" valign="top" class="portlet-section-alternate"><font class="portlet-font">
-<a href="http://www.jboss.com/services/training" target="_blank">Training and Certification</a>
-<br/>
-A Certified JBoss Web Developer is capable of implementing presentation tier components for J2EE applications. They have the base knowledge on Servlet and JSP technology, Portlet specification, Tomcat Servlet container and JBoss Portal. A Certified JBoss Developer for web tier is able to implement and deploy presentation components (Web Archives) on Tomcat server and Portlet components on JBoss Portal implementation.
-</font></td>
-</tr>
-</table>
-</table>
-<br/>
-<a href="default/index.html"><img src="default/images/back.gif" border="0" alt="back"></a>
Copied: branches/JBoss_Portal_Branch_2_7/core-cms/src/bin/portal-cms-sar/portal/cms/conf/default-content/default/private/confidential/confidential1.html (from rev 11201, branches/JBoss_Portal_Branch_2_7/core-cms/src/bin/portal-cms-sar/portal/cms/conf/default-content/default/private/confidential/license.html)
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-cms/src/bin/portal-cms-sar/portal/cms/conf/default-content/default/private/confidential/confidential1.html (rev 0)
+++ branches/JBoss_Portal_Branch_2_7/core-cms/src/bin/portal-cms-sar/portal/cms/conf/default-content/default/private/confidential/confidential1.html 2008-06-30 11:35:11 UTC (rev 11204)
@@ -0,0 +1 @@
+This is confidential 1 document
\ No newline at end of file
Deleted: branches/JBoss_Portal_Branch_2_7/core-cms/src/bin/portal-cms-sar/portal/cms/conf/default-content/default/private/confidential/license.html
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-cms/src/bin/portal-cms-sar/portal/cms/conf/default-content/default/private/confidential/license.html 2008-06-30 10:33:39 UTC (rev 11203)
+++ branches/JBoss_Portal_Branch_2_7/core-cms/src/bin/portal-cms-sar/portal/cms/conf/default-content/default/private/confidential/license.html 2008-06-30 11:35:11 UTC (rev 11204)
@@ -1,36 +0,0 @@
-<table width="100%" border="0" cellpadding="2">
-<tr>
-<td valign="top" align="left" class="portlet-section-body"><font class="portlet-font"><b>Document3: This is a protected document. This is used to test the fine grained access control</b></font></td>
-<td valign="top" align="right"><img src="default/images/jboss_logo.gif"></td>
-</tr>
-<tr>
-<td colspan="2">
-<table width="100%" border="0" cellpadding="2">
-<tr>
-<td class="portlet-section-alternate" width="16" valign="top" align="left"><img src="default/images/check.gif"></td>
-<td align="left" valign="top" class="portlet-section-alternate"><font class="portlet-font">
-<a href="http://www.jboss.com/services/profsupport" target="_blank">Professional Support</a>
-<br/>
-The JBoss Subscription is a set of services and tools that assist you during every stage of the application lifecycle - from design and development, thru testing and deployment, to on-going management and monitoring of your enterprise application deployments. JBoss Subscriptions allow you to reduce business, legal, and technical risks while enabling you to more effectively utilize your team's resources. A JBoss Subscription will ensure that you achieve a much greater success rate for all of your JEMS-based projects.
-</font></td>
-</tr>
-<tr>
-<td class="portlet-section-alternate" width="16" valign="top" align="left"><img src="default/images/check.gif"></td>
-<td align="left" valign="top" class="portlet-section-alternate"><font class="portlet-font">
-<a href="http://www.jboss.com/services/consulting" target="_blank">Consulting Services</a>
-<br/>
-JBoss offers short-term on-site JEMS consulting engagements that provide you expert assistance at various stages of the application lifecycle. All engagements are delivered by certified JEMS consultants.
-</font></td>
-</tr>
-<tr>
-<td class="portlet-section-alternate" width="16" valign="top" align="left"><img src="default/images/check.gif"></td>
-<td align="left" valign="top" class="portlet-section-alternate"><font class="portlet-font">
-<a href="http://www.jboss.com/services/training" target="_blank">Training and Certification</a>
-<br/>
-A Certified JBoss Web Developer is capable of implementing presentation tier components for J2EE applications. They have the base knowledge on Servlet and JSP technology, Portlet specification, Tomcat Servlet container and JBoss Portal. A Certified JBoss Developer for web tier is able to implement and deploy presentation components (Web Archives) on Tomcat server and Portlet components on JBoss Portal implementation.
-</font></td>
-</tr>
-</table>
-</table>
-<br/>
-<a href="default/index.html"><img src="default/images/back.gif" border="0" alt="back"></a>
Deleted: branches/JBoss_Portal_Branch_2_7/core-cms/src/bin/portal-cms-sar/portal/cms/conf/default-content/default/private/license.html
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-cms/src/bin/portal-cms-sar/portal/cms/conf/default-content/default/private/license.html 2008-06-30 10:33:39 UTC (rev 11203)
+++ branches/JBoss_Portal_Branch_2_7/core-cms/src/bin/portal-cms-sar/portal/cms/conf/default-content/default/private/license.html 2008-06-30 11:35:11 UTC (rev 11204)
@@ -1,36 +0,0 @@
-<table width="100%" border="0" cellpadding="2">
-<tr>
-<td valign="top" align="left" class="portlet-section-body"><font class="portlet-font"><b>Document1: This is a protected document. This is used to test the fine grained access control</b></font></td>
-<td valign="top" align="right"><img src="default/images/jboss_logo.gif"></td>
-</tr>
-<tr>
-<td colspan="2">
-<table width="100%" border="0" cellpadding="2">
-<tr>
-<td class="portlet-section-alternate" width="16" valign="top" align="left"><img src="default/images/check.gif"></td>
-<td align="left" valign="top" class="portlet-section-alternate"><font class="portlet-font">
-<a href="http://www.jboss.com/services/profsupport" target="_blank">Professional Support</a>
-<br/>
-The JBoss Subscription is a set of services and tools that assist you during every stage of the application lifecycle - from design and development, thru testing and deployment, to on-going management and monitoring of your enterprise application deployments. JBoss Subscriptions allow you to reduce business, legal, and technical risks while enabling you to more effectively utilize your team's resources. A JBoss Subscription will ensure that you achieve a much greater success rate for all of your JEMS-based projects.
-</font></td>
-</tr>
-<tr>
-<td class="portlet-section-alternate" width="16" valign="top" align="left"><img src="default/images/check.gif"></td>
-<td align="left" valign="top" class="portlet-section-alternate"><font class="portlet-font">
-<a href="http://www.jboss.com/services/consulting" target="_blank">Consulting Services</a>
-<br/>
-JBoss offers short-term on-site JEMS consulting engagements that provide you expert assistance at various stages of the application lifecycle. All engagements are delivered by certified JEMS consultants.
-</font></td>
-</tr>
-<tr>
-<td class="portlet-section-alternate" width="16" valign="top" align="left"><img src="default/images/check.gif"></td>
-<td align="left" valign="top" class="portlet-section-alternate"><font class="portlet-font">
-<a href="http://www.jboss.com/services/training" target="_blank">Training and Certification</a>
-<br/>
-A Certified JBoss Web Developer is capable of implementing presentation tier components for J2EE applications. They have the base knowledge on Servlet and JSP technology, Portlet specification, Tomcat Servlet container and JBoss Portal. A Certified JBoss Developer for web tier is able to implement and deploy presentation components (Web Archives) on Tomcat server and Portlet components on JBoss Portal implementation.
-</font></td>
-</tr>
-</table>
-</table>
-<br/>
-<a href="default/index.html"><img src="default/images/back.gif" border="0" alt="back"></a>
Copied: branches/JBoss_Portal_Branch_2_7/core-cms/src/bin/portal-cms-sar/portal/cms/conf/default-content/default/private/private1.html (from rev 11201, branches/JBoss_Portal_Branch_2_7/core-cms/src/bin/portal-cms-sar/portal/cms/conf/default-content/default/private/code.html)
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-cms/src/bin/portal-cms-sar/portal/cms/conf/default-content/default/private/private1.html (rev 0)
+++ branches/JBoss_Portal_Branch_2_7/core-cms/src/bin/portal-cms-sar/portal/cms/conf/default-content/default/private/private1.html 2008-06-30 11:35:11 UTC (rev 11204)
@@ -0,0 +1 @@
+This is private 1 document
\ No newline at end of file
Copied: branches/JBoss_Portal_Branch_2_7/core-cms/src/bin/portal-cms-sar/portal/cms/conf/default-content/default/private/private2.html (from rev 11201, branches/JBoss_Portal_Branch_2_7/core-cms/src/bin/portal-cms-sar/portal/cms/conf/default-content/default/private/license.html)
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-cms/src/bin/portal-cms-sar/portal/cms/conf/default-content/default/private/private2.html (rev 0)
+++ branches/JBoss_Portal_Branch_2_7/core-cms/src/bin/portal-cms-sar/portal/cms/conf/default-content/default/private/private2.html 2008-06-30 11:35:11 UTC (rev 11204)
@@ -0,0 +1 @@
+This is private 2 document
\ No newline at end of file
Modified: branches/JBoss_Portal_Branch_2_7/core-cms/src/bin/portal-cms-sar/portal/cms/conf/default-content/default/support.html
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-cms/src/bin/portal-cms-sar/portal/cms/conf/default-content/default/support.html 2008-06-30 10:33:39 UTC (rev 11203)
+++ branches/JBoss_Portal_Branch_2_7/core-cms/src/bin/portal-cms-sar/portal/cms/conf/default-content/default/support.html 2008-06-30 11:35:11 UTC (rev 11204)
@@ -1,7 +1,7 @@
<table width="100%" border="0" cellpadding="2">
<tr>
<td valign="top" align="left" class="portlet-section-body"><font class="portlet-font">JBoss Inc. delivers the Professional Support, Consulting, and Training that you need whether you are testing a proof of concept, deploying a mission-critical application, or rolling out JEMS across your enterprise. </font></td>
-<td valign="top" align="right"><img src="default/images/jboss_logo.gif"></td>
+<td valign="top" align="right"><img src="default/images/jbosslogo.png"></td>
</tr>
<tr>
<td colspan="2">
15 years, 10 months
- 1
- 0
JBoss Portal SVN: r11203 - branches/JBoss_Portal_Branch_2_7/portlet-server/src/main/org/jboss/portal/portlet.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2008-06-30 06:33:39 -0400 (Mon, 30 Jun 2008)
New Revision: 11203
Removed:
branches/JBoss_Portal_Branch_2_7/portlet-server/src/main/org/jboss/portal/portlet/interceptors/
Log:
Weird SVN commit failure... fixing
15 years, 10 months
- 1
- 0
JBoss Portal SVN: r11202 - docs/branches/JBoss_Portal_Branch_2_7/referenceGuide/en/modules.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2008-06-30 06:25:54 -0400 (Mon, 30 Jun 2008)
New Revision: 11202
Modified:
docs/branches/JBoss_Portal_Branch_2_7/referenceGuide/en/modules/contentintegration.xml
Log:
Oups
Modified: docs/branches/JBoss_Portal_Branch_2_7/referenceGuide/en/modules/contentintegration.xml
===================================================================
--- docs/branches/JBoss_Portal_Branch_2_7/referenceGuide/en/modules/contentintegration.xml 2008-06-30 10:09:21 UTC (rev 11201)
+++ docs/branches/JBoss_Portal_Branch_2_7/referenceGuide/en/modules/contentintegration.xml 2008-06-30 10:25:54 UTC (rev 11202)
@@ -409,6 +409,7 @@
<para>Note that here we need to use a JSR-286 portlet, this portlet will use the event <emphasis>urn:jboss:portal:content select</emphasis> and have a payload of type
<emphasis>java.lang.String</emphasis>. This event will be used to tell the portal the URI selected by the user. This same portlet will also be in charge of
rendering the content based on that URI, it will then also need to access the public render parameter qualified with the name: <emphasis>urn:jboss:portal:content uri</emphasis>.
+ </para>
<para>The portlet.xml descriptor</para>
<programlisting><![CDATA[
<deployments>
15 years, 10 months
- 1
- 0
JBoss Portal SVN: r11201 - in branches/JBoss_Portal_Branch_2_7: core/src/resources/portal-core-sar/META-INF and 7 other directories.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2008-06-30 06:09:21 -0400 (Mon, 30 Jun 2008)
New Revision: 11201
Added:
branches/JBoss_Portal_Branch_2_7/portlet-server/src/main/org/jboss/portal/portlet/interceptors/
branches/JBoss_Portal_Branch_2_7/portlet-server/src/main/org/jboss/portal/portlet/interceptors/EmptyPortletInterceptorStackFactory.java
branches/JBoss_Portal_Branch_2_7/portlet-server/src/main/org/jboss/portal/portlet/interceptors/JBossPortletInterceptorStack.java
branches/JBoss_Portal_Branch_2_7/portlet-server/src/main/org/jboss/portal/portlet/interceptors/JBossPortletInterceptorStackFactory.java
branches/JBoss_Portal_Branch_2_7/portlet-server/src/main/org/jboss/portal/portlet/interceptors/PortletInterceptorStack.java
branches/JBoss_Portal_Branch_2_7/portlet-server/src/main/org/jboss/portal/portlet/interceptors/PortletInterceptorStackFactory.java
Removed:
branches/JBoss_Portal_Branch_2_7/server/src/main/org/jboss/portal/server/impl/invocation/EmptyPortletInterceptorStackFactory.java
branches/JBoss_Portal_Branch_2_7/server/src/main/org/jboss/portal/server/impl/invocation/JBossPortletInterceptorStack.java
branches/JBoss_Portal_Branch_2_7/server/src/main/org/jboss/portal/server/impl/invocation/JBossPortletInterceptorStackFactory.java
branches/JBoss_Portal_Branch_2_7/server/src/main/org/jboss/portal/server/impl/invocation/PortletInterceptorStack.java
branches/JBoss_Portal_Branch_2_7/server/src/main/org/jboss/portal/server/impl/invocation/PortletInterceptorStackFactory.java
Modified:
branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/impl/model/instance/InstanceContainerImpl.java
branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-sar/META-INF/jboss-service.xml
branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-test-jar/org/jboss/portal/test/core/model/instance/persistent-jboss-beans.xml
branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-test-jar/org/jboss/portal/test/core/model/instance/transient-jboss-beans.xml
branches/JBoss_Portal_Branch_2_7/portlet-server/.classpath
branches/JBoss_Portal_Branch_2_7/server/.classpath
branches/JBoss_Portal_Branch_2_7/wsrp/src/resources/tests/test-wsrp-producer-sar/META-INF/jboss-service.xml
Log:
Moving JBossPortletInterceptorsStack from server to portlet-server
(Removing 'portlet' dependency from 'server'
Modified: branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/impl/model/instance/InstanceContainerImpl.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/impl/model/instance/InstanceContainerImpl.java 2008-06-30 10:06:51 UTC (rev 11200)
+++ branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/impl/model/instance/InstanceContainerImpl.java 2008-06-30 10:09:21 UTC (rev 11201)
@@ -34,6 +34,8 @@
import org.jboss.portal.portlet.PortletInvoker;
import org.jboss.portal.portlet.PortletInvokerException;
import org.jboss.portal.portlet.PortletInvokerInterceptor;
+import org.jboss.portal.portlet.impl.invocation.PortletInterceptorStack;
+import org.jboss.portal.portlet.impl.invocation.PortletInterceptorStackFactory;
import org.jboss.portal.portlet.invocation.PortletInvocation;
import org.jboss.portal.portlet.invocation.response.PortletInvocationResponse;
import org.jboss.portal.portlet.state.DestroyCloneFailure;
@@ -50,8 +52,6 @@
import org.jboss.portal.security.spi.provider.PermissionFactory;
import org.jboss.portal.security.spi.provider.PermissionRepository;
import org.jboss.portal.security.spi.provider.SecurityConfigurationException;
-import org.jboss.portal.server.impl.invocation.PortletInterceptorStack;
-import org.jboss.portal.server.impl.invocation.PortletInterceptorStackFactory;
import java.util.ArrayList;
import java.util.Collection;
Modified: branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-sar/META-INF/jboss-service.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-sar/META-INF/jboss-service.xml 2008-06-30 10:06:51 UTC (rev 11200)
+++ branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-sar/META-INF/jboss-service.xml 2008-06-30 10:09:21 UTC (rev 11201)
@@ -261,7 +261,7 @@
<xmbean/>
</mbean>
- <mbean code="org.jboss.portal.server.impl.invocation.JBossPortletInterceptorStackFactory"
+ <mbean code="org.jboss.portal.portlet.impl.invocation.JBossPortletInterceptorStackFactory"
name="portal:service=InterceptorStackFactory,type=Instance" xmbean-dd=""
xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
@@ -340,7 +340,7 @@
</mbean>
- <mbean code="org.jboss.portal.server.impl.invocation.JBossPortletInterceptorStackFactory"
+ <mbean code="org.jboss.portal.portlet.impl.invocation.JBossPortletInterceptorStackFactory"
name="portal:service=InterceptorStackFactory,type=Producer" xmbean-dd=""
xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
Modified: branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-test-jar/org/jboss/portal/test/core/model/instance/persistent-jboss-beans.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-test-jar/org/jboss/portal/test/core/model/instance/persistent-jboss-beans.xml 2008-06-30 10:06:51 UTC (rev 11200)
+++ branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-test-jar/org/jboss/portal/test/core/model/instance/persistent-jboss-beans.xml 2008-06-30 10:09:21 UTC (rev 11201)
@@ -99,7 +99,7 @@
<property name="stateConverter"><inject bean="StateConverter"/></property>
</bean>
- <bean name="StackFactory" class="org.jboss.portal.server.impl.invocation.EmptyPortletInterceptorStackFactory"/>
+ <bean name="StackFactory" class="org.jboss.portal.portlet.impl.invocation.EmptyPortletInterceptorStackFactory"/>
<bean name="ContainerContext"
class="org.jboss.portal.core.impl.model.instance.persistent.PersistentInstanceContainerContext">
<property name="sessionFactoryJNDIName">java:/InstanceSessionFactory</property>
Modified: branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-test-jar/org/jboss/portal/test/core/model/instance/transient-jboss-beans.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-test-jar/org/jboss/portal/test/core/model/instance/transient-jboss-beans.xml 2008-06-30 10:06:51 UTC (rev 11200)
+++ branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-test-jar/org/jboss/portal/test/core/model/instance/transient-jboss-beans.xml 2008-06-30 10:09:21 UTC (rev 11201)
@@ -98,7 +98,7 @@
<property name="stateConverter"><inject bean="StateConverter"/></property>
</bean>
- <bean name="StackFactory" class="org.jboss.portal.server.impl.invocation.EmptyPortletInterceptorStackFactory"/>
+ <bean name="StackFactory" class="org.jboss.portal.portlet.impl.invocation.EmptyPortletInterceptorStackFactory"/>
<bean name="ContainerContext" class="org.jboss.portal.core.impl.model.instance.TransientContainerContext"/>
<bean name="InstanceContainer" class="org.jboss.portal.core.impl.model.instance.InstanceContainerImpl">
<property name="cloneOnCreate"><inject bean="TestCaseConfig" property="cloneOnCreate"/></property>
Modified: branches/JBoss_Portal_Branch_2_7/portlet-server/.classpath
===================================================================
--- branches/JBoss_Portal_Branch_2_7/portlet-server/.classpath 2008-06-30 10:06:51 UTC (rev 11200)
+++ branches/JBoss_Portal_Branch_2_7/portlet-server/.classpath 2008-06-30 10:09:21 UTC (rev 11201)
@@ -19,5 +19,6 @@
<classpathentry kind="lib" path="/thirdparty/portlet/lib/portlet-api.jar"/>
<classpathentry kind="lib" path="/thirdparty/jboss-portal/modules/portlet/lib/portal-portlet-federation-lib.jar"/>
<classpathentry kind="lib" path="/thirdparty/jboss-portal/modules/web/lib/portal-web-lib.jar"/>
+ <classpathentry combineaccessrules="false" kind="src" path="/jems"/>
<classpathentry kind="output" path="bin"/>
</classpath>
Copied: branches/JBoss_Portal_Branch_2_7/portlet-server/src/main/org/jboss/portal/portlet/interceptors/EmptyPortletInterceptorStackFactory.java (from rev 11157, branches/JBoss_Portal_Branch_2_7/server/src/main/org/jboss/portal/server/impl/invocation/EmptyPortletInterceptorStackFactory.java)
===================================================================
--- branches/JBoss_Portal_Branch_2_7/portlet-server/src/main/org/jboss/portal/portlet/interceptors/EmptyPortletInterceptorStackFactory.java (rev 0)
+++ branches/JBoss_Portal_Branch_2_7/portlet-server/src/main/org/jboss/portal/portlet/interceptors/EmptyPortletInterceptorStackFactory.java 2008-06-30 10:09:21 UTC (rev 11201)
@@ -0,0 +1,37 @@
+/*
+* JBoss, a division of Red Hat
+* Copyright 2008, 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.jboss.portal.portlet.impl.invocation;
+
+
+/**
+ * @author <a href="mailto:chris.laprun@jboss.com">Chris Laprun</a>
+ * @version $Revision$
+ */
+public class EmptyPortletInterceptorStackFactory implements PortletInterceptorStackFactory
+{
+ public PortletInterceptorStack getInterceptorStack()
+ {
+ return JBossPortletInterceptorStack.EMPTY_STACK;
+ }
+}
+
Copied: branches/JBoss_Portal_Branch_2_7/portlet-server/src/main/org/jboss/portal/portlet/interceptors/JBossPortletInterceptorStack.java (from rev 11157, branches/JBoss_Portal_Branch_2_7/server/src/main/org/jboss/portal/server/impl/invocation/JBossPortletInterceptorStack.java)
===================================================================
--- branches/JBoss_Portal_Branch_2_7/portlet-server/src/main/org/jboss/portal/portlet/interceptors/JBossPortletInterceptorStack.java (rev 0)
+++ branches/JBoss_Portal_Branch_2_7/portlet-server/src/main/org/jboss/portal/portlet/interceptors/JBossPortletInterceptorStack.java 2008-06-30 10:09:21 UTC (rev 11201)
@@ -0,0 +1,64 @@
+/******************************************************************************
+ * 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. *
+ ******************************************************************************/
+package org.jboss.portal.portlet.impl.invocation;
+
+import org.jboss.portal.portlet.PortletInvokerInterceptor;
+
+/**
+ * @author <a href="mailto:theute@jboss.org">Thomas Heute</a>
+ * @version $Revision$
+ */
+public class JBossPortletInterceptorStack implements PortletInterceptorStack
+{
+
+ /** . */
+ public static final PortletInterceptorStack EMPTY_STACK = new JBossPortletInterceptorStack(new PortletInvokerInterceptor[0]);
+
+ /** . */
+ private final PortletInvokerInterceptor[] interceptors;
+
+ public JBossPortletInterceptorStack(PortletInvokerInterceptor interceptor)
+ {
+ this.interceptors = new PortletInvokerInterceptor[]{interceptor};
+ }
+
+ public JBossPortletInterceptorStack(PortletInvokerInterceptor[] interceptors)
+ {
+ if (interceptors == null)
+ {
+ throw new IllegalArgumentException();
+ }
+ this.interceptors = interceptors;
+ }
+
+ public int getLength()
+ {
+ return interceptors.length;
+ }
+
+ public PortletInvokerInterceptor getInterceptor(int index) throws ArrayIndexOutOfBoundsException
+ {
+ return interceptors[index];
+ }
+}
+
Copied: branches/JBoss_Portal_Branch_2_7/portlet-server/src/main/org/jboss/portal/portlet/interceptors/JBossPortletInterceptorStackFactory.java (from rev 11157, branches/JBoss_Portal_Branch_2_7/server/src/main/org/jboss/portal/server/impl/invocation/JBossPortletInterceptorStackFactory.java)
===================================================================
--- branches/JBoss_Portal_Branch_2_7/portlet-server/src/main/org/jboss/portal/portlet/interceptors/JBossPortletInterceptorStackFactory.java (rev 0)
+++ branches/JBoss_Portal_Branch_2_7/portlet-server/src/main/org/jboss/portal/portlet/interceptors/JBossPortletInterceptorStackFactory.java 2008-06-30 10:09:21 UTC (rev 11201)
@@ -0,0 +1,148 @@
+/******************************************************************************
+ * 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. *
+ ******************************************************************************/
+package org.jboss.portal.portlet.impl.invocation;
+
+import org.jboss.portal.jems.as.system.AbstractJBossService;
+import org.jboss.portal.portlet.PortletInvokerInterceptor;
+
+import javax.management.ObjectName;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+/**
+ * @author <a href="mailto:julien@jboss.org">Julien Viet</a>
+ * @version $Revision: 8784 $
+ */
+public class JBossPortletInterceptorStackFactory extends AbstractJBossService implements PortletInterceptorStackFactory
+{
+
+ /** . */
+ protected List<ObjectName> interceptorNames;
+
+ /** . */
+ protected List<ObjectName> dynamicInterceptorNames;
+
+ /** . */
+ protected PortletInterceptorStack stack;
+
+ public JBossPortletInterceptorStackFactory()
+ {
+ interceptorNames = null;
+ dynamicInterceptorNames = new ArrayList<ObjectName>();
+ }
+
+ public List<ObjectName> getInterceptorNames()
+ {
+ return interceptorNames;
+ }
+
+ public void setInterceptorNames(List<ObjectName> interceptorNames)
+ {
+ this.interceptorNames = interceptorNames;
+ }
+
+ public List<ObjectName> getDynamicInterceptorNames()
+ {
+ return Collections.unmodifiableList(dynamicInterceptorNames);
+ }
+
+ /**
+ * Add's the supplied name to the list of interceptor names.
+ *
+ * @param name the intercptor's ObjectName.
+ * @throws Exception
+ */
+ public void addInterceptor(ObjectName name) throws Exception
+ {
+ dynamicInterceptorNames.add(name);
+ }
+
+ /**
+ * Remove's the supplied name from the list of interceptor names.
+ *
+ * @param name the intercptor's ObjectName.
+ * @throws Exception
+ */
+ public void removeInterceptor(ObjectName name) throws Exception
+ {
+ dynamicInterceptorNames.remove(name);
+ }
+
+ public void startService() throws Exception
+ {
+ rebuild();
+ }
+
+ /** Rebuild the interceptor stack. */
+ public void rebuild() throws Exception
+ {
+ List<ObjectName> names = new ArrayList<ObjectName>();
+
+ //
+ if (interceptorNames != null)
+ {
+ names.addAll(interceptorNames);
+ }
+
+ //
+ names.addAll(dynamicInterceptorNames);
+
+ //
+ log.debug("Building interceptor stack " + getName());
+ PortletInvokerInterceptor[] interceptors = new PortletInvokerInterceptor[names.size()];
+ if (names.size() == 1)
+ {
+ ObjectName name = names.get(0);
+ log.debug("Adding interceptor " + name + " to the stack");
+ PortletInvokerInterceptor a = (PortletInvokerInterceptor)server.getAttribute(name, "ManagedResource");
+ interceptors[0] = a;
+ }
+ for (int i = 0; i < names.size()-1; i++)
+ {
+ ObjectName name = names.get(i);
+ log.debug("Adding interceptor " + name + " to the stack");
+ PortletInvokerInterceptor a = (PortletInvokerInterceptor)server.getAttribute(name, "ManagedResource");
+ name = names.get(i+1);
+ log.debug("Adding interceptor " + name + " to the stack");
+ PortletInvokerInterceptor b = (PortletInvokerInterceptor)server.getAttribute(name, "ManagedResource");
+ a.setNext(b);
+ interceptors[i] = a;
+ interceptors[i+1] = b;
+ }
+
+ //
+ stack = new JBossPortletInterceptorStack(interceptors);
+
+ }
+
+ public void stopService()
+ {
+ this.stack = JBossPortletInterceptorStack.EMPTY_STACK;
+ }
+
+ public PortletInterceptorStack getInterceptorStack()
+ {
+ return stack;
+ }
+}
Copied: branches/JBoss_Portal_Branch_2_7/portlet-server/src/main/org/jboss/portal/portlet/interceptors/PortletInterceptorStack.java (from rev 11157, branches/JBoss_Portal_Branch_2_7/server/src/main/org/jboss/portal/server/impl/invocation/PortletInterceptorStack.java)
===================================================================
--- branches/JBoss_Portal_Branch_2_7/portlet-server/src/main/org/jboss/portal/portlet/interceptors/PortletInterceptorStack.java (rev 0)
+++ branches/JBoss_Portal_Branch_2_7/portlet-server/src/main/org/jboss/portal/portlet/interceptors/PortletInterceptorStack.java 2008-06-30 10:09:21 UTC (rev 11201)
@@ -0,0 +1,49 @@
+/******************************************************************************
+ * 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. *
+ ******************************************************************************/
+package org.jboss.portal.portlet.impl.invocation;
+
+import org.jboss.portal.portlet.PortletInvokerInterceptor;
+
+/**
+ * @author <a href="mailto:theute@jboss.org">Thomas Heute</a>
+ * @version $Revision$
+ */
+public interface PortletInterceptorStack
+{
+ /**
+ * Returns the stack length.
+ *
+ * @return the length
+ */
+ int getLength();
+
+ /**
+ * Return the interceptor at the specified index.
+ *
+ * @param index the interceptor index in the stack
+ * @return the specified interceptor
+ * @throws ArrayIndexOutOfBoundsException if the index is not valid
+ */
+ PortletInvokerInterceptor getInterceptor(int index) throws ArrayIndexOutOfBoundsException;
+}
+
Copied: branches/JBoss_Portal_Branch_2_7/portlet-server/src/main/org/jboss/portal/portlet/interceptors/PortletInterceptorStackFactory.java (from rev 11157, branches/JBoss_Portal_Branch_2_7/server/src/main/org/jboss/portal/server/impl/invocation/PortletInterceptorStackFactory.java)
===================================================================
--- branches/JBoss_Portal_Branch_2_7/portlet-server/src/main/org/jboss/portal/portlet/interceptors/PortletInterceptorStackFactory.java (rev 0)
+++ branches/JBoss_Portal_Branch_2_7/portlet-server/src/main/org/jboss/portal/portlet/interceptors/PortletInterceptorStackFactory.java 2008-06-30 10:09:21 UTC (rev 11201)
@@ -0,0 +1,35 @@
+/******************************************************************************
+ * 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. *
+ ******************************************************************************/
+package org.jboss.portal.portlet.impl.invocation;
+
+
+/**
+ * @author <a href="mailto:theute@jboss.org">Thomas Heute</a>
+ * @version $Revision$
+ */
+public interface PortletInterceptorStackFactory
+{
+ PortletInterceptorStack getInterceptorStack();
+
+}
+
Modified: branches/JBoss_Portal_Branch_2_7/server/.classpath
===================================================================
--- branches/JBoss_Portal_Branch_2_7/server/.classpath 2008-06-30 10:06:51 UTC (rev 11200)
+++ branches/JBoss_Portal_Branch_2_7/server/.classpath 2008-06-30 10:09:21 UTC (rev 11201)
@@ -16,6 +16,5 @@
<classpathentry kind="lib" path="/thirdparty/jboss-portal/modules/web/lib/portal-web-lib.jar" sourcepath="/module-web"/>
<classpathentry kind="lib" path="/thirdparty/jboss-portal/modules/test/lib/portal-test-lib.jar"/>
<classpathentry kind="lib" path="/thirdparty/jboss-portal/modules/test/lib/portal-test-jboss-lib.jar"/>
- <classpathentry kind="lib" path="/thirdparty/jboss-portal/modules/portlet/lib/portal-portlet-lib.jar" sourcepath="/module-portlet-trunk"/>
<classpathentry kind="output" path="bin"/>
</classpath>
Deleted: branches/JBoss_Portal_Branch_2_7/server/src/main/org/jboss/portal/server/impl/invocation/EmptyPortletInterceptorStackFactory.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/server/src/main/org/jboss/portal/server/impl/invocation/EmptyPortletInterceptorStackFactory.java 2008-06-30 10:06:51 UTC (rev 11200)
+++ branches/JBoss_Portal_Branch_2_7/server/src/main/org/jboss/portal/server/impl/invocation/EmptyPortletInterceptorStackFactory.java 2008-06-30 10:09:21 UTC (rev 11201)
@@ -1,36 +0,0 @@
-/*
-* JBoss, a division of Red Hat
-* Copyright 2008, 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.jboss.portal.server.impl.invocation;
-
-/**
- * @author <a href="mailto:chris.laprun@jboss.com">Chris Laprun</a>
- * @version $Revision$
- */
-public class EmptyPortletInterceptorStackFactory implements PortletInterceptorStackFactory
-{
- public PortletInterceptorStack getInterceptorStack()
- {
- return JBossPortletInterceptorStack.EMPTY_STACK;
- }
-}
-
Deleted: branches/JBoss_Portal_Branch_2_7/server/src/main/org/jboss/portal/server/impl/invocation/JBossPortletInterceptorStack.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/server/src/main/org/jboss/portal/server/impl/invocation/JBossPortletInterceptorStack.java 2008-06-30 10:06:51 UTC (rev 11200)
+++ branches/JBoss_Portal_Branch_2_7/server/src/main/org/jboss/portal/server/impl/invocation/JBossPortletInterceptorStack.java 2008-06-30 10:09:21 UTC (rev 11201)
@@ -1,64 +0,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. *
- ******************************************************************************/
-package org.jboss.portal.server.impl.invocation;
-
-import org.jboss.portal.portlet.PortletInvokerInterceptor;
-
-/**
- * @author <a href="mailto:theute@jboss.org">Thomas Heute</a>
- * @version $Revision$
- */
-public class JBossPortletInterceptorStack implements PortletInterceptorStack
-{
-
- /** . */
- public static final PortletInterceptorStack EMPTY_STACK = new JBossPortletInterceptorStack(new PortletInvokerInterceptor[0]);
-
- /** . */
- private final PortletInvokerInterceptor[] interceptors;
-
- public JBossPortletInterceptorStack(PortletInvokerInterceptor interceptor)
- {
- this.interceptors = new PortletInvokerInterceptor[]{interceptor};
- }
-
- public JBossPortletInterceptorStack(PortletInvokerInterceptor[] interceptors)
- {
- if (interceptors == null)
- {
- throw new IllegalArgumentException();
- }
- this.interceptors = interceptors;
- }
-
- public int getLength()
- {
- return interceptors.length;
- }
-
- public PortletInvokerInterceptor getInterceptor(int index) throws ArrayIndexOutOfBoundsException
- {
- return interceptors[index];
- }
-}
-
Deleted: branches/JBoss_Portal_Branch_2_7/server/src/main/org/jboss/portal/server/impl/invocation/JBossPortletInterceptorStackFactory.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/server/src/main/org/jboss/portal/server/impl/invocation/JBossPortletInterceptorStackFactory.java 2008-06-30 10:06:51 UTC (rev 11200)
+++ branches/JBoss_Portal_Branch_2_7/server/src/main/org/jboss/portal/server/impl/invocation/JBossPortletInterceptorStackFactory.java 2008-06-30 10:09:21 UTC (rev 11201)
@@ -1,148 +0,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. *
- ******************************************************************************/
-package org.jboss.portal.server.impl.invocation;
-
-import org.jboss.portal.jems.as.system.AbstractJBossService;
-import org.jboss.portal.portlet.PortletInvokerInterceptor;
-
-import javax.management.ObjectName;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-/**
- * @author <a href="mailto:julien@jboss.org">Julien Viet</a>
- * @version $Revision: 8784 $
- */
-public class JBossPortletInterceptorStackFactory extends AbstractJBossService implements PortletInterceptorStackFactory
-{
-
- /** . */
- protected List<ObjectName> interceptorNames;
-
- /** . */
- protected List<ObjectName> dynamicInterceptorNames;
-
- /** . */
- protected PortletInterceptorStack stack;
-
- public JBossPortletInterceptorStackFactory()
- {
- interceptorNames = null;
- dynamicInterceptorNames = new ArrayList<ObjectName>();
- }
-
- public List<ObjectName> getInterceptorNames()
- {
- return interceptorNames;
- }
-
- public void setInterceptorNames(List<ObjectName> interceptorNames)
- {
- this.interceptorNames = interceptorNames;
- }
-
- public List<ObjectName> getDynamicInterceptorNames()
- {
- return Collections.unmodifiableList(dynamicInterceptorNames);
- }
-
- /**
- * Add's the supplied name to the list of interceptor names.
- *
- * @param name the intercptor's ObjectName.
- * @throws Exception
- */
- public void addInterceptor(ObjectName name) throws Exception
- {
- dynamicInterceptorNames.add(name);
- }
-
- /**
- * Remove's the supplied name from the list of interceptor names.
- *
- * @param name the intercptor's ObjectName.
- * @throws Exception
- */
- public void removeInterceptor(ObjectName name) throws Exception
- {
- dynamicInterceptorNames.remove(name);
- }
-
- public void startService() throws Exception
- {
- rebuild();
- }
-
- /** Rebuild the interceptor stack. */
- public void rebuild() throws Exception
- {
- List<ObjectName> names = new ArrayList<ObjectName>();
-
- //
- if (interceptorNames != null)
- {
- names.addAll(interceptorNames);
- }
-
- //
- names.addAll(dynamicInterceptorNames);
-
- //
- log.debug("Building interceptor stack " + getName());
- PortletInvokerInterceptor[] interceptors = new PortletInvokerInterceptor[names.size()];
- if (names.size() == 1)
- {
- ObjectName name = names.get(0);
- log.debug("Adding interceptor " + name + " to the stack");
- PortletInvokerInterceptor a = (PortletInvokerInterceptor)server.getAttribute(name, "ManagedResource");
- interceptors[0] = a;
- }
- for (int i = 0; i < names.size()-1; i++)
- {
- ObjectName name = names.get(i);
- log.debug("Adding interceptor " + name + " to the stack");
- PortletInvokerInterceptor a = (PortletInvokerInterceptor)server.getAttribute(name, "ManagedResource");
- name = names.get(i+1);
- log.debug("Adding interceptor " + name + " to the stack");
- PortletInvokerInterceptor b = (PortletInvokerInterceptor)server.getAttribute(name, "ManagedResource");
- a.setNext(b);
- interceptors[i] = a;
- interceptors[i+1] = b;
- }
-
- //
- stack = new JBossPortletInterceptorStack(interceptors);
-
- }
-
- public void stopService()
- {
- this.stack = JBossPortletInterceptorStack.EMPTY_STACK;
- }
-
- public PortletInterceptorStack getInterceptorStack()
- {
- return stack;
- }
-}
Deleted: branches/JBoss_Portal_Branch_2_7/server/src/main/org/jboss/portal/server/impl/invocation/PortletInterceptorStack.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/server/src/main/org/jboss/portal/server/impl/invocation/PortletInterceptorStack.java 2008-06-30 10:06:51 UTC (rev 11200)
+++ branches/JBoss_Portal_Branch_2_7/server/src/main/org/jboss/portal/server/impl/invocation/PortletInterceptorStack.java 2008-06-30 10:09:21 UTC (rev 11201)
@@ -1,49 +0,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. *
- ******************************************************************************/
-package org.jboss.portal.server.impl.invocation;
-
-import org.jboss.portal.portlet.PortletInvokerInterceptor;
-
-/**
- * @author <a href="mailto:theute@jboss.org">Thomas Heute</a>
- * @version $Revision$
- */
-public interface PortletInterceptorStack
-{
- /**
- * Returns the stack length.
- *
- * @return the length
- */
- int getLength();
-
- /**
- * Return the interceptor at the specified index.
- *
- * @param index the interceptor index in the stack
- * @return the specified interceptor
- * @throws ArrayIndexOutOfBoundsException if the index is not valid
- */
- PortletInvokerInterceptor getInterceptor(int index) throws ArrayIndexOutOfBoundsException;
-}
-
Deleted: branches/JBoss_Portal_Branch_2_7/server/src/main/org/jboss/portal/server/impl/invocation/PortletInterceptorStackFactory.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/server/src/main/org/jboss/portal/server/impl/invocation/PortletInterceptorStackFactory.java 2008-06-30 10:06:51 UTC (rev 11200)
+++ branches/JBoss_Portal_Branch_2_7/server/src/main/org/jboss/portal/server/impl/invocation/PortletInterceptorStackFactory.java 2008-06-30 10:09:21 UTC (rev 11201)
@@ -1,34 +0,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. *
- ******************************************************************************/
-package org.jboss.portal.server.impl.invocation;
-
-/**
- * @author <a href="mailto:theute@jboss.org">Thomas Heute</a>
- * @version $Revision$
- */
-public interface PortletInterceptorStackFactory
-{
- PortletInterceptorStack getInterceptorStack();
-
-}
-
Modified: branches/JBoss_Portal_Branch_2_7/wsrp/src/resources/tests/test-wsrp-producer-sar/META-INF/jboss-service.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_7/wsrp/src/resources/tests/test-wsrp-producer-sar/META-INF/jboss-service.xml 2008-06-30 10:06:51 UTC (rev 11200)
+++ branches/JBoss_Portal_Branch_2_7/wsrp/src/resources/tests/test-wsrp-producer-sar/META-INF/jboss-service.xml 2008-06-30 10:09:21 UTC (rev 11201)
@@ -72,7 +72,7 @@
xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
</mbean>
- <mbean code="org.jboss.portal.server.impl.invocation.JBossPortletInterceptorStackFactory"
+ <mbean code="org.jboss.portal.portlet.impl.invocation.JBossPortletInterceptorStackFactory"
name="portal:service=InterceptorStackFactory,type=Container" xmbean-dd=""
xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
15 years, 10 months
- 1
- 0
JBoss Portal SVN: r11199 - branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-basic-samples-war/WEB-INF.
by portal-commits＠lists.jboss.org
Author: sviluppatorefico
Date: 2008-06-29 11:49:01 -0400 (Sun, 29 Jun 2008)
New Revision: 11199
Modified:
branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-basic-samples-war/WEB-INF/default-object.xml
Log:
added internationalization for TestWithAjax word
Modified: branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-basic-samples-war/WEB-INF/default-object.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-basic-samples-war/WEB-INF/default-object.xml 2008-06-29 15:26:04 UTC (rev 11198)
+++ branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-basic-samples-war/WEB-INF/default-object.xml 2008-06-29 15:49:01 UTC (rev 11199)
@@ -364,6 +364,8 @@
<if-exists>keep</if-exists>
<page>
<page-name>TestWithAjax</page-name>
+ <display-name xml:lang="en">TestWithAjax</display-name>
+ <display-name xml:lang="it">TestConAjax</display-name>
<properties>
<property>
<name>theme.dyna.partial_refresh_enabled</name>
15 years, 10 months
- 1
- 0
JBoss Portal SVN: r11198 - modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/ajax/server/model.
by portal-commits＠lists.jboss.org
Author: julien(a)jboss.com
Date: 2008-06-29 11:26:04 -0400 (Sun, 29 Jun 2008)
New Revision: 11198
Modified:
modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/ajax/server/model/AjaxViewPortContext.java
Log:
minor
Modified: modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/ajax/server/model/AjaxViewPortContext.java
===================================================================
--- modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/ajax/server/model/AjaxViewPortContext.java 2008-06-29 15:13:14 UTC (rev 11197)
+++ modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/ajax/server/model/AjaxViewPortContext.java 2008-06-29 15:26:04 UTC (rev 11198)
@@ -105,6 +105,7 @@
public void updateObject(String objectId)
{
+ throw new NotYetImplemented();
}
public void removeObject(String objectId)
15 years, 10 months
- 1
- 0