You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jetspeed-dev@portals.apache.org by at...@apache.org on 2008/10/30 15:49:27 UTC
svn commit: r709178 - in
/portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade:
components/jetspeed-portal/src/main/java/org/apache/jetspeed/tools/pamanager/
components/jetspeed-portal/src/main/java/org/apache/jetspeed/util/descriptor/
componen...
Author: ate
Date: Thu Oct 30 07:49:27 2008
New Revision: 709178
URL: http://svn.apache.org/viewvc?rev=709178&view=rev
Log:
JS2-871 - Upgrade Pluto container to version 2.0
See: http://issues.apache.org/jira/browse/JS2-871
- detangle ExtendedDescriptorService from the Pluto PortletAppDescriptorService (just use it internally)
- this service is no longer needed to be passed on as PlutoService
- moved all descriptor processing/loading logic into this one service: web.xml, portlet.xml, jetspeed-portlet.xml
- renamed the service to JetspeedDescriptorService to better reflect its expanded resposibilities (doing everything)
- loading/processing web.xml is not implemented yet but coming up soon
Added:
portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-registry/src/main/java/org/apache/jetspeed/descriptor/JetspeedDescriptorServiceImpl.java
- copied, changed from r709132, portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-registry/src/main/java/org/apache/jetspeed/descriptor/ExtendedDescriptorServiceImpl.java
portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/descriptor/JetspeedDescriptorService.java
- copied, changed from r709132, portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/descriptor/ExtendedDescriptorService.java
Removed:
portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-registry/src/main/java/org/apache/jetspeed/descriptor/ExtendedDescriptorServiceImpl.java
portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/descriptor/ExtendedDescriptorService.java
Modified:
portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portal/src/main/java/org/apache/jetspeed/tools/pamanager/PortletApplicationManager.java
portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portal/src/main/java/org/apache/jetspeed/tools/pamanager/VersionedPortletApplicationManager.java
portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portal/src/main/java/org/apache/jetspeed/util/descriptor/PortletApplicationWar.java
portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-portal-resources/src/main/resources/assembly/alternate/versioned-deployment/deployment.xml
portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-portal-resources/src/main/resources/assembly/deployment.xml
portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-portal-resources/src/main/resources/assembly/pluto-services.xml
Modified: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portal/src/main/java/org/apache/jetspeed/tools/pamanager/PortletApplicationManager.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portal/src/main/java/org/apache/jetspeed/tools/pamanager/PortletApplicationManager.java?rev=709178&r1=709177&r2=709178&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portal/src/main/java/org/apache/jetspeed/tools/pamanager/PortletApplicationManager.java (original)
+++ portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portal/src/main/java/org/apache/jetspeed/tools/pamanager/PortletApplicationManager.java Thu Oct 30 07:49:27 2008
@@ -32,7 +32,7 @@
import org.apache.jetspeed.components.portletregistry.RegistryException;
import org.apache.jetspeed.container.PortletEntity;
import org.apache.jetspeed.container.window.PortletWindowAccessor;
-import org.apache.jetspeed.descriptor.ExtendedDescriptorService;
+import org.apache.jetspeed.descriptor.JetspeedDescriptorService;
import org.apache.jetspeed.factory.PortletFactory;
import org.apache.jetspeed.om.portlet.PortletApplication;
import org.apache.jetspeed.om.portlet.PortletDefinition;
@@ -79,7 +79,7 @@
protected boolean started;
protected String appRoot;
protected NodeManager nodeManager;
- protected ExtendedDescriptorService descriptorService;
+ protected JetspeedDescriptorService descriptorService;
/**
* Creates a new PortletApplicationManager object.
@@ -88,7 +88,7 @@
PortletEntityAccessComponent entityAccess, PortletWindowAccessor windowAccess,
PermissionManager permissionManager, SearchEngine searchEngine,
RoleManager roleManager, List<String> permissionRoles, NodeManager nodeManager, String appRoot,
- ExtendedDescriptorService descriptorService)
+ JetspeedDescriptorService descriptorService)
{
this.portletFactory = portletFactory;
this.registry = registry;
Modified: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portal/src/main/java/org/apache/jetspeed/tools/pamanager/VersionedPortletApplicationManager.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portal/src/main/java/org/apache/jetspeed/tools/pamanager/VersionedPortletApplicationManager.java?rev=709178&r1=709177&r2=709178&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portal/src/main/java/org/apache/jetspeed/tools/pamanager/VersionedPortletApplicationManager.java (original)
+++ portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portal/src/main/java/org/apache/jetspeed/tools/pamanager/VersionedPortletApplicationManager.java Thu Oct 30 07:49:27 2008
@@ -27,7 +27,7 @@
import org.apache.jetspeed.components.portletregistry.PortletRegistry;
import org.apache.jetspeed.components.portletregistry.RegistryException;
import org.apache.jetspeed.container.window.PortletWindowAccessor;
-import org.apache.jetspeed.descriptor.ExtendedDescriptorService;
+import org.apache.jetspeed.descriptor.JetspeedDescriptorService;
import org.apache.jetspeed.factory.PortletFactory;
import org.apache.jetspeed.om.portlet.LocalizedField;
import org.apache.jetspeed.om.portlet.PortletApplication;
@@ -63,7 +63,7 @@
public VersionedPortletApplicationManager(PortletFactory portletFactory, PortletRegistry registry,
PortletEntityAccessComponent entityAccess, PortletWindowAccessor windowAccess,
PermissionManager permissionManager, SearchEngine searchEngine, RoleManager roleManager,
- List<String> permissionRoles, /* node manager, */ String appRoot, ExtendedDescriptorService descriptorService)
+ List<String> permissionRoles, /* node manager, */ String appRoot, JetspeedDescriptorService descriptorService)
{
super(portletFactory, registry, entityAccess, windowAccess, permissionManager,
searchEngine, roleManager, permissionRoles, null, appRoot, descriptorService);
Modified: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portal/src/main/java/org/apache/jetspeed/util/descriptor/PortletApplicationWar.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portal/src/main/java/org/apache/jetspeed/util/descriptor/PortletApplicationWar.java?rev=709178&r1=709177&r2=709178&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portal/src/main/java/org/apache/jetspeed/util/descriptor/PortletApplicationWar.java (original)
+++ portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portal/src/main/java/org/apache/jetspeed/util/descriptor/PortletApplicationWar.java Thu Oct 30 07:49:27 2008
@@ -33,7 +33,7 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.jetspeed.descriptor.ExtendedDescriptorService;
+import org.apache.jetspeed.descriptor.JetspeedDescriptorService;
import org.apache.jetspeed.om.portlet.PortletApplication;
import org.apache.jetspeed.om.portlet.PortletDefinition;
import org.apache.jetspeed.om.portlet.SecurityRole;
@@ -85,7 +85,7 @@
private PortletApplication portletApp;
private long paChecksum;
- protected ExtendedDescriptorService descriptorService;
+ protected JetspeedDescriptorService descriptorService;
protected static final String[] ELEMENTS_BEFORE_SERVLET = new String[]{"icon", "display-name", "description",
"distributable", "context-param", "filter", "filter-mapping", "listener", "servlet"};
@@ -103,12 +103,12 @@
* @param webAppContextRoot
* context root relative to the servlet container of this app
*/
- public PortletApplicationWar( FileSystemHelper warStruct, String paName, String webAppContextRoot, ExtendedDescriptorService descriptorService)
+ public PortletApplicationWar( FileSystemHelper warStruct, String paName, String webAppContextRoot, JetspeedDescriptorService descriptorService)
{
this(warStruct, paName, webAppContextRoot, 0, descriptorService);
}
- public PortletApplicationWar( FileSystemHelper warStruct, String paName, String webAppContextRoot, long paChecksum, ExtendedDescriptorService descriptorService)
+ public PortletApplicationWar( FileSystemHelper warStruct, String paName, String webAppContextRoot, long paChecksum, JetspeedDescriptorService descriptorService)
{
validatePortletApplicationName(paName);
@@ -167,6 +167,7 @@
*/
public PortletApplication createPortletApp(ClassLoader classLoader) throws PortletApplicationException, IOException
{
+ InputStream webXmlStream = getInputStream(WEB_XML_PATH);
InputStream portletXmlStream = getInputStream(PORTLET_XML_PATH);
InputStream extStream = null;
try
@@ -179,19 +180,17 @@
}
try
{
- portletApp = descriptorService.read(portletXmlStream);
- if (extStream != null)
- {
- descriptorService.readExtended(extStream, portletApp);
- }
- // TODO 2.2: load/parse web.xml and merge descriptions/display-names/roles/locale-encoding-mapping-list elements
- // within the pa, see Portlet Spec 2.0, PLT.25.1
+ portletApp = descriptorService.read(webXmlStream, portletXmlStream, extStream);
validate();
portletApp.setChecksum(paChecksum);
return portletApp;
}
finally
{
+ if (webXmlStream != null)
+ {
+ webXmlStream.close();
+ }
if (portletXmlStream != null)
{
portletXmlStream.close();
Copied: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-registry/src/main/java/org/apache/jetspeed/descriptor/JetspeedDescriptorServiceImpl.java (from r709132, portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-registry/src/main/java/org/apache/jetspeed/descriptor/ExtendedDescriptorServiceImpl.java)
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-registry/src/main/java/org/apache/jetspeed/descriptor/JetspeedDescriptorServiceImpl.java?p2=portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-registry/src/main/java/org/apache/jetspeed/descriptor/JetspeedDescriptorServiceImpl.java&p1=portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-registry/src/main/java/org/apache/jetspeed/descriptor/ExtendedDescriptorServiceImpl.java&r1=709132&r2=709178&rev=709178&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-registry/src/main/java/org/apache/jetspeed/descriptor/ExtendedDescriptorServiceImpl.java (original)
+++ portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-registry/src/main/java/org/apache/jetspeed/descriptor/JetspeedDescriptorServiceImpl.java Thu Oct 30 07:49:27 2008
@@ -18,7 +18,6 @@
import java.io.IOException;
import java.io.InputStream;
-import java.io.OutputStream;
import java.util.Locale;
import java.util.ResourceBundle;
@@ -51,45 +50,39 @@
import org.apache.jetspeed.om.portlet.jetspeed.jaxb.PortletApp;
import org.apache.jetspeed.om.portlet.jetspeed.jaxb.Service;
import org.apache.jetspeed.util.JetspeedLocale;
-import org.apache.pluto.descriptors.services.jaxb.PortletAppDescriptorServiceImpl;
import org.apache.pluto.om.portlet.CustomPortletMode;
import org.apache.pluto.om.portlet.CustomWindowState;
import org.apache.pluto.om.portlet.Description;
import org.apache.pluto.om.portlet.PortletApplicationDefinition;
+import org.apache.pluto.services.PortletAppDescriptorService;
/**
- * Extends Pluto Descriptor service for loading portlet applications in a Jetspeed format.
- * Additionally, has two APIs to load extended Jetspeed descriptor information (jetspeed-portlet.xml)
+ * Jetspeed Descriptor service for loading portlet applications in a Jetspeed format.
*
* @author <a href="mailto:taylor@apache.org">David Sean Taylor</a>
* @version $Id: $
*/
-public class ExtendedDescriptorServiceImpl extends PortletAppDescriptorServiceImpl implements ExtendedDescriptorService
+public class JetspeedDescriptorServiceImpl implements JetspeedDescriptorService
{
- public PortletApplication createPortletApplicationDefinition()
- {
- // TODO Auto-generated method stub
- return null;
- }
-
- public PortletApplication read(InputStream in) throws IOException
- {
- PortletApplicationDefinition pad = super.read(in);
- // TODO: do extended processing here
- return upgrade(pad);
- }
-
- public void write(PortletApplication portletDescriptor, OutputStream out)
- throws IOException
+ private PortletAppDescriptorService plutoDescriptorService;
+
+ public JetspeedDescriptorServiceImpl(PortletAppDescriptorService plutoDescriptorService)
{
- // TODO Auto-generated method stub
-
+ this.plutoDescriptorService = plutoDescriptorService;
}
-
- public void write(PortletApplicationDefinition portletDescriptor,
- OutputStream out) throws IOException
+
+ public PortletApplication read(InputStream webDescriptor, InputStream portletDescriptor, InputStream jetspeedPortletDescriptor) throws IOException
{
- throw new UnsupportedOperationException();
+ // TODO: do web.xml loading here
+ PortletApplicationDefinition pad = plutoDescriptorService.read(portletDescriptor);
+ // TODO 2.2: do web.xml merge descriptions/display-names/roles/locale-encoding-mapping-list elements
+ // within the pa, see Portlet Spec 2.0, PLT.25.1
+ PortletApplication pa = upgrade(pad);
+ if (jetspeedPortletDescriptor != null)
+ {
+ loadJetspeedPortletDescriptor(pa, jetspeedPortletDescriptor);
+ }
+ return pa;
}
protected PortletApplication upgrade(PortletApplicationDefinition pa)
@@ -369,7 +362,7 @@
return l;
}
- public void readExtended(InputStream in, PortletApplication app) throws IOException
+ protected void loadJetspeedPortletDescriptor(PortletApplication app, InputStream in) throws IOException
{
try
{
Copied: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/descriptor/JetspeedDescriptorService.java (from r709132, portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/descriptor/ExtendedDescriptorService.java)
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/descriptor/JetspeedDescriptorService.java?p2=portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/descriptor/JetspeedDescriptorService.java&p1=portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/descriptor/ExtendedDescriptorService.java&r1=709132&r2=709178&rev=709178&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/descriptor/ExtendedDescriptorService.java (original)
+++ portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/descriptor/JetspeedDescriptorService.java Thu Oct 30 07:49:27 2008
@@ -18,42 +18,22 @@
import java.io.IOException;
import java.io.InputStream;
-import java.io.OutputStream;
import org.apache.jetspeed.om.portlet.PortletApplication;
-import org.apache.pluto.spi.optional.PortletAppDescriptorService;
-
/**
- * Extends Pluto Descriptor service for loading portlet applications in a Jetspeed format.
- * Additionally, has two APIs to load extended Jetspeed descriptor information (jetspeed-portlet.xml)
+ * Jetspeed Descriptor service for loading portlet applications in a Jetspeed format.
*
* @author <a href="mailto:taylor@apache.org">David Sean Taylor</a>
* @version $Id: $
*/
-public interface ExtendedDescriptorService extends PortletAppDescriptorService
+public interface JetspeedDescriptorService
{
/**
- * Create a new portlet application definition
- */
- PortletApplication createPortletApplicationDefinition();
-
- /**
* Retrieve the PortletApp deployment descriptor
* (portlet.xml).
* @return Object representation of the descriptor.
* @throws IOException if an IO error occurs.
*/
- PortletApplication read(InputStream in) throws IOException;
-
- /**
- * Write the PortletApp deployment descriptor
- * (portlet.xml).
- * @param portletDescriptor
- * @param out
- * @throws IOException if an IO error occurs.
- */
- void write(PortletApplication portletDescriptor, OutputStream out) throws IOException;
-
- void readExtended(InputStream in, PortletApplication app) throws IOException;
+ PortletApplication read(InputStream webDescriptor, InputStream portletDescriptor, InputStream jetspeedPortletDescriptor) throws IOException;
}
Modified: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-portal-resources/src/main/resources/assembly/alternate/versioned-deployment/deployment.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-portal-resources/src/main/resources/assembly/alternate/versioned-deployment/deployment.xml?rev=709178&r1=709177&r2=709178&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-portal-resources/src/main/resources/assembly/alternate/versioned-deployment/deployment.xml (original)
+++ portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-portal-resources/src/main/resources/assembly/alternate/versioned-deployment/deployment.xml Thu Oct 30 07:49:27 2008
@@ -54,7 +54,7 @@
<value>${applicationRoot}</value>
</constructor-arg>
- <constructor-arg><ref bean="org.apache.pluto.services.DescriptorService"/></constructor-arg>
+ <constructor-arg><ref bean="org.apache.jetspeed.descriptor.JetspeedDescriptorService"/></constructor-arg>
<!-- optional configuration for automatic creation of not yet existing roles as defined in the deployed web.xml:
<property name="autoCreateRoles"><value>true</value></property>
Modified: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-portal-resources/src/main/resources/assembly/deployment.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-portal-resources/src/main/resources/assembly/deployment.xml?rev=709178&r1=709177&r2=709178&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-portal-resources/src/main/resources/assembly/deployment.xml (original)
+++ portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-portal-resources/src/main/resources/assembly/deployment.xml Thu Oct 30 07:49:27 2008
@@ -45,6 +45,12 @@
<meta key="j2:cat" value="default" />
</bean>
+ <bean id="org.apache.jetspeed.descriptor.JetspeedDescriptorService"
+ class="org.apache.jetspeed.descriptor.ExtendedDescriptorServiceImpl">
+ <meta key="j2:cat" value="default"/>
+ <constructor-arg><bean class="org.apache.pluto.descriptors.services.jaxb.PortletAppDescriptorServiceImpl"/></constructor-arg>
+ </bean>
+
<bean id="org.apache.jetspeed.tools.pamanager.PortletApplicationManager" class="org.apache.jetspeed.tools.pamanager.PortletApplicationManager" init-method="start"
destroy-method="stop">
<meta key="j2:cat" value="default" />
@@ -84,7 +90,7 @@
<value>${applicationRoot}</value>
</constructor-arg>
- <constructor-arg><ref bean="org.apache.pluto.services.DescriptorService"/></constructor-arg>
+ <constructor-arg><ref bean="org.apache.jetspeed.descriptor.JetspeedDescriptorService"/></constructor-arg>
<!-- optional configuration for automatic creation of not yet existing roles as defined in the deployed web.xml:
<property name="autoCreateRoles"><value>true</value></property>
Modified: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-portal-resources/src/main/resources/assembly/pluto-services.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-portal-resources/src/main/resources/assembly/pluto-services.xml?rev=709178&r1=709177&r2=709178&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-portal-resources/src/main/resources/assembly/pluto-services.xml (original)
+++ portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-portal-resources/src/main/resources/assembly/pluto-services.xml Thu Oct 30 07:49:27 2008
@@ -119,7 +119,6 @@
<constructor-arg><ref bean="org.apache.pluto.services.RequestAttributeService"/></constructor-arg>
<constructor-arg><ref bean="org.apache.pluto.services.PortletInvokerService"/></constructor-arg>
<constructor-arg><ref bean="org.apache.pluto.services.PlutoRegistryServiceAdaptor"/></constructor-arg>
- <constructor-arg><ref bean="org.apache.pluto.services.DescriptorService"/></constructor-arg>
<constructor-arg><ref bean="org.apache.pluto.services.PreferencesService"/></constructor-arg>
</bean>
@@ -167,9 +166,4 @@
<constructor-arg index="1"><ref bean="portletRegistry"/></constructor-arg>
</bean>
- <bean id="org.apache.pluto.services.DescriptorService"
- class="org.apache.jetspeed.descriptor.ExtendedDescriptorService">
- <meta key="j2:cat" value="default" />
- </bean>
-
</beans>
\ No newline at end of file
---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@portals.apache.org
For additional commands, e-mail: jetspeed-dev-help@portals.apache.org