You are viewing a plain text version of this content. The canonical link for it is here.
Posted to wsrp4j-dev@portals.apache.org by es...@apache.org on 2007/08/25 21:35:37 UTC
svn commit: r569721 [3/3] - in /portals/wsrp4j/trunk/producer: ./
src/java/org/apache/wsrp4j/producer/configapp/controller/
src/java/org/apache/wsrp4j/producer/configapp/exception/
src/java/org/apache/wsrp4j/producer/configapp/model/delegate/ src/java/...
Modified: portals/wsrp4j/trunk/producer/src/java/org/apache/wsrp4j/producer/provider/pluto/driver/ProviderImpl.java
URL: http://svn.apache.org/viewvc/portals/wsrp4j/trunk/producer/src/java/org/apache/wsrp4j/producer/provider/pluto/driver/ProviderImpl.java?rev=569721&r1=569720&r2=569721&view=diff
==============================================================================
--- portals/wsrp4j/trunk/producer/src/java/org/apache/wsrp4j/producer/provider/pluto/driver/ProviderImpl.java (original)
+++ portals/wsrp4j/trunk/producer/src/java/org/apache/wsrp4j/producer/provider/pluto/driver/ProviderImpl.java Sat Aug 25 12:35:34 2007
@@ -15,182 +15,211 @@
*/
package org.apache.wsrp4j.producer.provider.pluto.driver;
-import java.util.Properties;
-
-import org.apache.pluto.PortletContainer;
-import org.apache.pluto.PortletContainerException;
-import org.apache.pluto.portalImpl.core.PortletContainerEnvironment;
-import org.apache.pluto.portalImpl.core.PortletContainerFactory;
-import org.apache.pluto.portalImpl.factory.FactoryAccess;
-import org.apache.pluto.portalImpl.services.Service;
-import org.apache.pluto.portalImpl.services.ServiceManager;
-import org.apache.pluto.portalImpl.services.config.Config;
-import org.apache.pluto.portalImpl.services.factorymanager.FactoryManager;
-//import org.apache.pluto.portalImpl.services.log.Log;
-import org.apache.pluto.portalImpl.services.portletentityregistry.
- PortletEntityRegistryService;
+import javax.servlet.ServletContext;
+import javax.servlet.ServletContextEvent;
+import javax.servlet.ServletContextListener;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-
-import org.apache.wsrp4j.commons.util.Utility;
-
-import org.apache.wsrp4j.commons.producer.provider.interfaces.
- DescriptionHandler;
+import org.apache.pluto.PortletContainer;
+import org.apache.pluto.PortletContainerException;
+import org.apache.pluto.PortletContainerFactory;
+import org.apache.pluto.RequiredContainerServices;
+import org.apache.pluto.spi.optional.PortletRegistryService;
+import org.apache.wsrp4j.commons.producer.provider.driver.PortletRegistrationFilterImpl;
+import org.apache.wsrp4j.commons.producer.provider.interfaces.DescriptionHandler;
import org.apache.wsrp4j.commons.producer.provider.interfaces.PortletInvoker;
import org.apache.wsrp4j.commons.producer.provider.interfaces.PortletPool;
-import org.apache.wsrp4j.commons.producer.provider.interfaces.
- PortletStateManager;
+import org.apache.wsrp4j.commons.producer.provider.interfaces.PortletRegistrationFilter;
+import org.apache.wsrp4j.commons.producer.provider.interfaces.PortletRegistrationFilterWriter;
+import org.apache.wsrp4j.commons.producer.provider.interfaces.PortletStateManager;
import org.apache.wsrp4j.commons.producer.provider.interfaces.URLComposer;
-import org.apache.wsrp4j.commons.producer.provider.interfaces.
- PortletRegistrationFilter;
-import org.apache.wsrp4j.commons.producer.provider.interfaces.
- PortletRegistrationFilterWriter;
-
-import org.apache.wsrp4j.commons.producer.provider.driver.URLComposerImpl;
-import org.apache.wsrp4j.commons.producer.provider.driver.
- PortletRegistrationFilterImpl;
-
-import org.apache.wsrp4j.commons.producer.util.ServletAccess;
-
-import org.apache.wsrp4j.producer.provider.pluto.interfaces.PlutoPortletPool;
import org.apache.wsrp4j.producer.provider.pluto.interfaces.PlutoProvider;
/**
* @version $Id$
*/
-public class ProviderImpl implements PlutoProvider {
+public class ProviderImpl implements PlutoProvider, ServletContextListener
+{
- private static final Log log = LogFactory.getLog(ProviderImpl.class);
+ /**
+ * Logger
+ */
+ private static final Log LOG = LogFactory.getLog( ProviderImpl.class) ;
- //portlet pool
- private PlutoPortletPool portletPool;
+ /**
+ * Stores whether the portlet container used supports buffering
+ */
+ private static String CONTAINER_SUPPORTS_BUFFERING = "portletcontainer.supportsBuffering";
- //description handler
- private DescriptionHandler descriptionHandler;
+ /**
+ * Portlet Pool
+ */
+ private PortletPool portletPool = null;
- //portlet state manager
- private PortletStateManager portletStateManager;
+ /**
+ * Description Handler
+ */
+ private DescriptionHandler descriptionHandler = null;
- //portlet invoker
- private PortletInvoker portletInvoker;
+ /**
+ * Portlet State Manager
+ */
+ private PortletStateManager portletStateManager = null;
+
+ /**
+ * Portlet Invoker
+ */
+ private PortletInvoker portletInvoker = null;
- //url composer
- private URLComposer urlComposer;
-
+ /**
+ * URL Composer
+ */
+ private URLComposer urlComposer = null;
/**
- * Stores whether the portlet container used supports buffering
+ * Portlet Container
*/
- private static String CONTAINER_SUPPORTS_BUFFERING =
- "portletcontainer.supportsBuffering";
-
+ private PortletContainer portletContainer = null;
/**
- * Private constructor
+ * Portlet Registry Service
*/
- private ProviderImpl() {
- // private
- }
+ private PortletRegistryService portletRegistrySvc = null;
/**
- * Creates a new ProviderImpl-object. To be called within
- * an implementation of the abstract factory ProviderFactory.
+ * Portlet Registration Filter Reader
*/
- public static ProviderImpl create() {
-
- ProviderImpl provider = new ProviderImpl();
- provider.init();
-
- return provider;
- }
+ private PortletRegistrationFilter filterReader = null;
/**
- * Initialize Provider
+ * Portlet Registration Filter Writer
*/
- private void init() {
-
- String MN = "init";
+ private PortletRegistrationFilterWriter filterWriter = null;
+
+ /**
+ * Required Container Services
+ */
+ private RequiredContainerServices requiredContainerServices = null;
+
+ /**
+ * Servlet Context
+ */
+ private static ServletContext servletContext = null;
+
+ public ProviderImpl( )
+// ProviderImpl( RequiredContainerServices requiredContainerServices, URLComposer urlComposer,
+// DescriptionHandler descHandler, PortletPool portletPool, PortletRegistryService portletRegistrySvc,
+// PortletRegistrationFilter filterReader, PortletRegistrationFilterWriter filterWriter )
+ {
+ /*
+ if ( requiredContainerServices == null )
+ {
+ final String msg = "Required container services must not be null";
+ LOG.error( msg );
+ throw new IllegalArgumentException( msg );
+ }
- if (log.isDebugEnabled()) {
- log.debug(Utility.strEnter(MN));
+ if ( urlComposer == null )
+ {
+ final String msg = "URL composer must not be null";
+ LOG.error( msg );
+ throw new IllegalArgumentException( msg );
}
- try {
- ServiceManager.init(ServletAccess.getServlet().getServletConfig());
- } catch (Throwable exc) {
- // TODO
- // what should we do here?
- exc.printStackTrace(System.err);
+ if ( descHandler == null )
+ {
+ final String msg = "Description handler must not be null";
+ LOG.error( msg );
+ throw new IllegalArgumentException( msg );
}
- if (log.isDebugEnabled()) {
- log.debug("Adding services to the container environment...");
+ if ( portletPool == null )
+ {
+ final String msg = "Portlet pool must not be null";
+ LOG.error( msg );
+ throw new IllegalArgumentException( msg );
}
- PortletContainerEnvironment environment =
- new PortletContainerEnvironment();
- environment.addContainerService(
- org.apache.pluto.portalImpl.services.log.Log.getService());
- environment.addContainerService(FactoryManager.getService());
- environment.addContainerService(
- FactoryAccess.getInformationProviderContainerService());
-
- if (log.isDebugEnabled()) {
- log.debug("Finished adding services to the container environment.");
+
+ if ( portletRegistrySvc == null )
+ {
+ final String msg = "Portlet registry service must not be null";
+ LOG.error( msg );
+ throw new IllegalArgumentException( msg );
}
- try {
- String uniqueContainerName =
- Config.getParameters().
- getString("portletcontainer.uniquename", "wsrp4j-producer");
-
- if (log.isDebugEnabled()) {
- log.debug("uniqueContainerName=" + uniqueContainerName);
- }
-
- String allowSetBufferSizeString =
- Config.getParameters().
- getString(CONTAINER_SUPPORTS_BUFFERING);
- boolean allowSetBufferSize = false;
- if (allowSetBufferSizeString == null) {
- if (log.isWarnEnabled()) {
- log.warn("Could not read property " +
- "'pluto.allowSetBufferSize' " +
- "from config file ConfigService.properties");
- }
- } else {
- allowSetBufferSize = allowSetBufferSizeString.equalsIgnoreCase("yes");
- }
- Properties containerProperties = new Properties();
- containerProperties.put(
- CONTAINER_SUPPORTS_BUFFERING,
- new Boolean(allowSetBufferSize));
-
- PortletContainerFactory.getPortletContainer().init(
- uniqueContainerName,
- ServletAccess.getServlet().getServletConfig(),
- environment,
- containerProperties);
- // we don't pass any preferences (pluto does nothing with it anyway)
- } catch (PortletContainerException exc) {
- // TODO
- // what should we do here?
- exc.printStackTrace(System.err);
+ if ( filterReader == null )
+ {
+ final String msg = "Portlet registry filter reader must not be null";
+ LOG.error( msg );
+ throw new IllegalArgumentException( msg );
}
- if (log.isDebugEnabled()) {
- log.debug(Utility.strExit(MN));
+ if ( filterWriter == null )
+ {
+ final String msg = "Portlet registry filter writer must not be null";
+ LOG.error( msg );
+ throw new IllegalArgumentException( msg );
}
+ */
+ // For now, the portletInvoker is not injected, it is instantiated
+ // by this impl.
+// if ( portletInvoker == null )
+// {
+// final String msg = "Portlet invoker must not be null";
+// LOG.error( msg );
+// throw new IllegalArgumentException( msg );
+// }
+
+
+
+ //init( requiredContainerServices );
+ /*
+ this.requiredContainerServices = requiredContainerServices;
+ this.urlComposer = urlComposer;
+ this.descriptionHandler = descHandler;
+ this.portletPool = portletPool;
+ this.portletRegistrySvc = portletRegistrySvc;
+ this.filterReader = filterReader;
+ this.filterWriter = filterWriter;
+ */
}
/**
+ * Initialize Provider
+ */
+ private void init( ServletContext context, RequiredContainerServices requiredServices )
+ {
+ LOG.info( "*** Initializing the WSRP4J Pluto Provider ***" );
+ LOG.debug( "Instantiating the portlet container factory." );
+ PortletContainerFactory containerFactory = PortletContainerFactory.getInstance();
+
+ try
+ {
+ LOG.debug( "Instantiating the portlet container." );
+ this.portletContainer = containerFactory.createContainer( "wsrp4j-producer", requiredServices );
+
+ LOG.debug( "Initializing the portlet container" );
+ this.portletContainer.init( context );
+ }
+ catch ( PortletContainerException e )
+ {
+ String msg = "Initialization of the portlet container failed: " + e.getMessage();
+ LOG.fatal( msg, e );
+ throw new RuntimeException( msg, e );
+ }
+ LOG.info( "*** Initialization complete ***" );
+ }
+
+ /**
* Returns an instance of the portlet containter
* @return PortletContainer
*/
- public PortletContainer getPortletContainer() {
- return PortletContainerFactory.getPortletContainer();
+ public PortletContainer getPortletContainer()
+ {
+ return portletContainer;
}
/**
@@ -198,14 +227,8 @@
*
* @return DescriptionHandler An instance of DescriptionHandlerImpl.
*/
- public DescriptionHandler getDescriptionHandler() {
-
- if (descriptionHandler == null) {
-
- descriptionHandler = DescriptionHandlerImpl.create(this);
-
- }
-
+ public DescriptionHandler getDescriptionHandler()
+ {
return descriptionHandler;
}
@@ -214,12 +237,12 @@
*
* @return PortletInvoker An instance of PortletInvokerImpl.
*/
- public PortletInvoker getPortletInvoker() {
-
- if (portletInvoker == null) {
- portletInvoker = PortletInvokerImpl.create(this);
+ public synchronized PortletInvoker getPortletInvoker()
+ {
+ if ( portletInvoker == null )
+ {
+ this.portletInvoker = new PortletInvokerImpl( portletContainer, portletPool, portletRegistrySvc );
}
-
return portletInvoker;
}
@@ -228,87 +251,100 @@
*
* @return PortletPool An instance of PortletPoolImpl.
*/
- public PortletPool getPortletPool() {
- Service pool =
- ServiceManager.getService(PortletEntityRegistryService.class);
- if (pool == null) {
- System.err.println("************** ProviderImpl: pool null!");
- }
-
- if (pool != null) {
- try {
- portletPool = (PlutoPortletPool)pool;
- portletPool.setProvider(this);
-
- return portletPool;
- } catch (ClassCastException e) {
- e.printStackTrace();
- }
- }
-
- return null;
- }
-
- /**
- * Return an instance of a pluto portlet pool
- *
- * @return PlutoPortletPool
- */
- public PlutoPortletPool getPlutoPortletPool() {
- if (portletPool == null) {
- portletPool = (PlutoPortletPool)getPortletPool();
- }
-
- return portletPool;
- }
+ public PortletPool getPortletPool()
+ {
+ return portletPool;
+ }
/**
* Returns an instance of the PortletStateManagerImpl-class.
*
* @return PortletStateManager An instance of PortletStateManagerImpl.
*/
- public PortletStateManager getPortletStateManager() {
- if (portletStateManager == null) {
+ public PortletStateManager getPortletStateManager()
+ {
+ if ( portletStateManager == null )
+ {
portletStateManager = PortletStateManagerImpl.create();
}
return portletStateManager;
}
-
-
+
/**
* Returns an instance of the PortletRegistrationFilterWriter
*
* @return PortletRegistrationFilterWriter
*/
- public PortletRegistrationFilterWriter
- getPortletRegistrationFilterWriter() {
+ public PortletRegistrationFilterWriter getPortletRegistrationFilterWriter()
+ {
return PortletRegistrationFilterImpl.createWriter();
}
-
-
+
/**
* Returns an instance of the PortletRegistrationFilter
*
* @return PortletRegistrationFilter
*/
- public PortletRegistrationFilter getPortletRegistrationFilter() {
+ public PortletRegistrationFilter getPortletRegistrationFilter()
+ {
return PortletRegistrationFilterImpl.createReader();
}
-
-
+
/**
* Returns an instance of the URLComposerImpl-class.
*
* @return URLComposer An instance of URLComposerImpl.
*/
- public URLComposer getURLComposer() {
-
- if (urlComposer == null) {
- urlComposer = URLComposerImpl.getInstance(this);
- }
-
- return urlComposer;
+ public URLComposer getURLComposer()
+ {
+ return urlComposer;
+ }
+
+ public void contextDestroyed( ServletContextEvent e )
+ {
+ // TODO Auto-generated method stub
+ }
+
+ public void contextInitialized( ServletContextEvent e )
+ {
+ this.servletContext = e.getServletContext();
+ }
+
+ public void setDescriptionHandler( DescriptionHandler descriptionHandler )
+ {
+ this.descriptionHandler = descriptionHandler;
+ }
+
+ public void setFilterReader( PortletRegistrationFilter filterReader )
+ {
+ this.filterReader = filterReader;
+ }
+
+ public void setFilterWriter( PortletRegistrationFilterWriter filterWriter )
+ {
+ this.filterWriter = filterWriter;
+ }
+
+ public void setPortletPool( PortletPool portletPool )
+ {
+ this.portletPool = portletPool;
+ }
+
+ public void setPortletRegistrySvc( PortletRegistryService portletRegistrySvc )
+ {
+ this.portletRegistrySvc = portletRegistrySvc;
+ }
+
+ public void setRequiredContainerServices( RequiredContainerServices requiredContainerServices )
+ {
+ this.requiredContainerServices = requiredContainerServices;
+ init( servletContext, requiredContainerServices );
+ }
+
+ public void setUrlComposer( URLComposer urlComposer )
+ {
+ this.urlComposer = urlComposer;
}
}
Modified: portals/wsrp4j/trunk/producer/src/java/org/apache/wsrp4j/producer/provider/pluto/driver/ResourceURLProviderImpl.java
URL: http://svn.apache.org/viewvc/portals/wsrp4j/trunk/producer/src/java/org/apache/wsrp4j/producer/provider/pluto/driver/ResourceURLProviderImpl.java?rev=569721&r1=569720&r2=569721&view=diff
==============================================================================
--- portals/wsrp4j/trunk/producer/src/java/org/apache/wsrp4j/producer/provider/pluto/driver/ResourceURLProviderImpl.java (original)
+++ portals/wsrp4j/trunk/producer/src/java/org/apache/wsrp4j/producer/provider/pluto/driver/ResourceURLProviderImpl.java Sat Aug 25 12:35:34 2007
@@ -19,58 +19,53 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-
-import org.apache.wsrp4j.commons.util.Utility;
-
-import org.apache.wsrp4j.commons.producer.provider.interfaces.Provider;
import org.apache.wsrp4j.commons.producer.provider.interfaces.URLComposer;
/**
* @version $Id$
*/
-public class ResourceURLProviderImpl
- implements org.apache.pluto.services.information.ResourceURLProvider {
+public class ResourceURLProviderImpl implements org.apache.pluto.spi.ResourceURLProvider
+{
- private static final Log log =
- LogFactory.getLog(ResourceURLProviderImpl.class);
+ /**
+ * Logger
+ */
+ private static final Log LOG = LogFactory.getLog( ResourceURLProviderImpl.class );
+
+ /**
+ * Servlet Request
+ */
+ private HttpServletRequest servletRequest = null;
- private HttpServletRequest servletRequest;
- private URLComposer urlComposer;
- private Provider wsrpProvider;
+ /**
+ * URL Composer
+ */
+ private URLComposer urlComposer = null;
- //inidcaates if secure client communication is used
+ /**
+ * Indicates if secure client communication is used
+ */
private boolean isSecure = false;
- private String url;//the resource URL that will be passed to URLComposer
+ /**
+ * The resource URL that will be passed to URLComposer
+ */
+ private String url = null;
/**
* Constructs a ResourceURLProviderImpl
- * @param aServletRequest
- * @param aWsrpProvider - WSRP provider that provides the URL composer
+ *
+ * @param request
+ * @param urlCompser - the URL composer
* @param secure indicator, if a secure URL should be created
*/
- public ResourceURLProviderImpl(HttpServletRequest aServletRequest,
- Provider aWsrpProvider,
- boolean secure ) {
-
- final String MN = "ResourceURLProviderImpl";
-
- if (log.isDebugEnabled()) {
- log.debug(Utility.strEnter(MN));
- }
-
- this.servletRequest = aServletRequest;
- this.wsrpProvider = aWsrpProvider;
+ public ResourceURLProviderImpl( HttpServletRequest request, URLComposer urlComposer, boolean secure )
+ {
+ this.servletRequest = request;
this.isSecure = secure;
-
- this.urlComposer = this.wsrpProvider.getURLComposer();
-
- if (log.isDebugEnabled()) {
- log.debug(Utility.strExit(MN));
- }
-
+ this.urlComposer = urlComposer;
}
/**
@@ -79,8 +74,10 @@
*
* @param path the new absolute url
*/
- public void setAbsoluteURL(String path) {
- if (path != null) {
+ public void setAbsoluteURL( String path )
+ {
+ if ( path != null )
+ {
this.url = path;
}
}
@@ -91,16 +88,19 @@
*
* @param path the new absolute url
*/
- public void setFullPath(String path) {
- if (path != null) {
+ public void setFullPath( String path )
+ {
+ if ( path != null )
+ {
//create absolute URL
- StringBuffer url = new StringBuffer(this.getProtocolHostAndPort());
+ StringBuffer url = new StringBuffer( this.getProtocolHostAndPort() );
- if (!path.startsWith("/")) {
+ if ( !path.startsWith("/") )
+ {
url.append("/");
}
- url.append(path);
+ url.append( path );
this.url = url.toString();
}
@@ -112,33 +112,19 @@
*
* @return the URL as string
*/
- public String toString() {
-
- final String MN = "toString";
-
- if (log.isDebugEnabled()) {
- log.debug(Utility.strEnter(MN));
- }
-
- String result = "";
-
- if(this.url != null) {
+ public String toString()
+ {
+ String result = "";
+ if ( this.url != null )
+ {
result = this.urlComposer.createResourceURL(this.url,
- false/*rewrite*/,
+ true/*rewrite*/,
this.isSecure,
null/*runtimeContext*/,
null/*portletContext*/,
null/*userContext*/);
}
-
- if (log.isDebugEnabled()) {
- log.debug("result: " + result);
- }
-
- if (log.isDebugEnabled()) {
- log.debug(Utility.strExit(MN));
- }
-
+ LOG.debug( "Url [" + this.url + "] as a string [" + result + "]" );
return result;
}
@@ -146,30 +132,12 @@
/**
* Returns the protocol, host and port without trailing "/" as String
*/
- private String getProtocolHostAndPort() {
-
- final String MN = "getProtocolHostAndPort";
-
- if (log.isDebugEnabled()) {
- log.debug(Utility.strEnter(MN));
- }
-
- String contextPath = this.servletRequest.getContextPath();
-
- String requestedUrl = this.servletRequest.getRequestURL().toString();
-
- int endOfHost = requestedUrl.indexOf(contextPath);
-
- String result = requestedUrl.substring(0,endOfHost);
-
- if (log.isDebugEnabled()) {
- log.debug("result: " + result);
- }
-
- if (log.isDebugEnabled()) {
- log.debug(Utility.strExit(MN));
- }
-
+ private String getProtocolHostAndPort()
+ {
+ String contextPath = this.servletRequest.getContextPath();
+ String requestedUrl = this.servletRequest.getRequestURL().toString();
+ int endOfHost = requestedUrl.indexOf( contextPath );
+ String result = requestedUrl.substring( 0, endOfHost );
return result;
}
Modified: portals/wsrp4j/trunk/producer/src/java/org/apache/wsrp4j/producer/provider/pluto/driver/WSRPServletRequestWrapperImpl.java
URL: http://svn.apache.org/viewvc/portals/wsrp4j/trunk/producer/src/java/org/apache/wsrp4j/producer/provider/pluto/driver/WSRPServletRequestWrapperImpl.java?rev=569721&r1=569720&r2=569721&view=diff
==============================================================================
--- portals/wsrp4j/trunk/producer/src/java/org/apache/wsrp4j/producer/provider/pluto/driver/WSRPServletRequestWrapperImpl.java (original)
+++ portals/wsrp4j/trunk/producer/src/java/org/apache/wsrp4j/producer/provider/pluto/driver/WSRPServletRequestWrapperImpl.java Sat Aug 25 12:35:34 2007
@@ -22,9 +22,7 @@
import java.util.Vector;
import javax.servlet.http.HttpServletRequest;
-
-import org.apache.pluto.om.window.PortletWindow;
-import org.apache.pluto.portalImpl.servlet.ServletRequestImpl;
+import javax.servlet.http.HttpServletRequestWrapper;
/**
@@ -33,7 +31,7 @@
*
* @version $Id$
*/
-public class WSRPServletRequestWrapperImpl extends ServletRequestImpl {
+public class WSRPServletRequestWrapperImpl extends HttpServletRequestWrapper {
private final Locale locale;
private final String mimeType;
@@ -44,10 +42,8 @@
* @param request HttpServletRequest
* @param window PortletWindow
*/
- public WSRPServletRequestWrapperImpl(HttpServletRequest request,
- PortletWindow window, Locale locale, String mimeType,
- Map parameters) {
- super(request, window);
+ public WSRPServletRequestWrapperImpl(HttpServletRequest request, Locale locale, String mimeType, Map parameters) {
+ super(request);
this.locale = locale;
this.mimeType = mimeType;
Modified: portals/wsrp4j/trunk/producer/src/java/org/apache/wsrp4j/producer/provider/pluto/interfaces/PlutoProvider.java
URL: http://svn.apache.org/viewvc/portals/wsrp4j/trunk/producer/src/java/org/apache/wsrp4j/producer/provider/pluto/interfaces/PlutoProvider.java?rev=569721&r1=569720&r2=569721&view=diff
==============================================================================
--- portals/wsrp4j/trunk/producer/src/java/org/apache/wsrp4j/producer/provider/pluto/interfaces/PlutoProvider.java (original)
+++ portals/wsrp4j/trunk/producer/src/java/org/apache/wsrp4j/producer/provider/pluto/interfaces/PlutoProvider.java Sat Aug 25 12:35:34 2007
@@ -39,5 +39,5 @@
* Returns an interface to a 'Pluto'- specific portlet pool implementation
* @return PlutoPortletPool
*/
- PlutoPortletPool getPlutoPortletPool();
+ //PlutoPortletPool getPlutoPortletPool();
}
Modified: portals/wsrp4j/trunk/producer/src/java/org/apache/wsrp4j/producer/provider/pluto/interfaces/WSRPDynamicInformationProvider.java
URL: http://svn.apache.org/viewvc/portals/wsrp4j/trunk/producer/src/java/org/apache/wsrp4j/producer/provider/pluto/interfaces/WSRPDynamicInformationProvider.java?rev=569721&r1=569720&r2=569721&view=diff
==============================================================================
--- portals/wsrp4j/trunk/producer/src/java/org/apache/wsrp4j/producer/provider/pluto/interfaces/WSRPDynamicInformationProvider.java (original)
+++ portals/wsrp4j/trunk/producer/src/java/org/apache/wsrp4j/producer/provider/pluto/interfaces/WSRPDynamicInformationProvider.java Sat Aug 25 12:35:34 2007
@@ -15,7 +15,6 @@
*/
package org.apache.wsrp4j.producer.provider.pluto.interfaces;
-import org.apache.pluto.services.information.DynamicInformationProvider;
/**
@@ -25,8 +24,7 @@
*
* @version $Id$
*/
-public interface WSRPDynamicInformationProvider
- extends DynamicInformationProvider {
+public interface WSRPDynamicInformationProvider {
/**
* String constant representing an attribute name of a servlet request.
Modified: portals/wsrp4j/trunk/producer/src/webapp/META-INF/context.xml
URL: http://svn.apache.org/viewvc/portals/wsrp4j/trunk/producer/src/webapp/META-INF/context.xml?rev=569721&r1=569720&r2=569721&view=diff
==============================================================================
--- portals/wsrp4j/trunk/producer/src/webapp/META-INF/context.xml (original)
+++ portals/wsrp4j/trunk/producer/src/webapp/META-INF/context.xml Sat Aug 25 12:35:34 2007
@@ -15,7 +15,7 @@
limitations under the License.
-->
-<Context docBase="wsrp4j-producer"
+<Context context="wsrp4j-producer" docBase="wsrp4j-producer"
crossContext="true">
<Resource name="jdbc/wsrp4j-producer-db" auth="Container"
Copied: portals/wsrp4j/trunk/producer/src/webapp/WEB-INF/classes/applicationContext.xml (from r559323, portals/wsrp4j/branches/wsrp4j-pluto11/src/webapp/WEB-INF/classes/applicationContext.xml)
URL: http://svn.apache.org/viewvc/portals/wsrp4j/trunk/producer/src/webapp/WEB-INF/classes/applicationContext.xml?p2=portals/wsrp4j/trunk/producer/src/webapp/WEB-INF/classes/applicationContext.xml&p1=portals/wsrp4j/branches/wsrp4j-pluto11/src/webapp/WEB-INF/classes/applicationContext.xml&r1=559323&r2=569721&rev=569721&view=diff
==============================================================================
--- portals/wsrp4j/branches/wsrp4j-pluto11/src/webapp/WEB-INF/classes/applicationContext.xml (original)
+++ portals/wsrp4j/trunk/producer/src/webapp/WEB-INF/classes/applicationContext.xml Sat Aug 25 12:35:34 2007
@@ -3,8 +3,10 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd">
- <!--
- Required Pluto Container Services
+ <!-- Pluto Beans ====================================================== -->
+
+ <!--
+ Pluto Required Container Services
-->
<bean id="RequiredContainerServices"
class="org.apache.wsrp4j.producer.provider.pluto.driver.ContainerServicesImpl">
@@ -20,14 +22,30 @@
<constructor-arg ref="UrlComposer"/>
</bean>
+ <!--
+ Pluto Portlet Registry
+ -->
<bean id="PortletRegistryService"
class="org.apache.pluto.core.PortletContextManager"
factory-method="getManager"/>
+
+ <!-- WSRP4J Beans ===================================================== -->
+
+ <!--
+ WSRP4J Engine
+ -->
+ <bean id="Wsrp4jEngine"
+ class="org.apache.wsrp4j.commons.producer.driver.WSRPEngine">
+ <constructor-arg ref="PlutoProvider"/>
+ <constructor-arg ref="ConsumerRegistry"/>
+ </bean>
+
<!--
The WSRP4J Provider
-->
- <bean id="PlutoProvider"
+
+ <!--<bean id="PlutoProvider"
class="org.apache.wsrp4j.producer.provider.pluto.driver.ProviderImpl">
<constructor-arg ref="RequiredContainerServices"/>
<constructor-arg ref="UrlComposer"/>
@@ -36,6 +54,17 @@
<constructor-arg ref="PortletRegistryService"/>
<constructor-arg ref="PortletRegistrationFilterReader"/>
<constructor-arg ref="PortletRegistrationFilterWriter"/>
+ </bean>-->
+
+ <bean id="PlutoProvider"
+ class="org.apache.wsrp4j.producer.provider.pluto.driver.ProviderImpl">
+ <property name="urlComposer" ref="UrlComposer"/>
+ <property name="descriptionHandler" ref="DescriptionHandler"/>
+ <property name="portletPool" ref="PortletPool"/>
+ <property name="portletRegistrySvc" ref="PortletRegistryService"/>
+ <property name="filterReader" ref="PortletRegistrationFilterReader"/>
+ <property name="filterWriter" ref="PortletRegistrationFilterWriter"/>
+ <property name="requiredContainerServices" ref="RequiredContainerServices"/>
</bean>
<!--
@@ -62,6 +91,7 @@
class="org.apache.wsrp4j.producer.provider.pluto.driver.DescriptionHandlerImpl">
<constructor-arg ref="PortletPool"/>
<constructor-arg ref="PortletRegistryService"/>
+ <constructor-arg ref="PersistenceFactory"/>
</bean>
<!--
@@ -111,5 +141,14 @@
<bean id="PersistenceFactory"
class="org.apache.wsrp4j.persistence.xml.driver.ProducerPersistentFactoryImpl"/>
+ <!--
+ WSRP Consumer Registry
+ -->
+ <bean id="ConsumerRegistry"
+ class="org.apache.wsrp4j.commons.producer.driver.ConsumerRegistryImpl">
+ <constructor-arg ref="HandleGenerator"/>
+ <constructor-arg ref="PersistenceFactory"/>
+ <constructor-arg ref="DescriptionHandler"/>
+ </bean>
</beans>
Modified: portals/wsrp4j/trunk/producer/src/webapp/WEB-INF/persistence/descriptions/org.apache.wsrp4j.commons.persistence.driver.WSRPServiceDescription.xml
URL: http://svn.apache.org/viewvc/portals/wsrp4j/trunk/producer/src/webapp/WEB-INF/persistence/descriptions/org.apache.wsrp4j.commons.persistence.driver.WSRPServiceDescription.xml?rev=569721&r1=569720&r2=569721&view=diff
==============================================================================
--- portals/wsrp4j/trunk/producer/src/webapp/WEB-INF/persistence/descriptions/org.apache.wsrp4j.commons.persistence.driver.WSRPServiceDescription.xml (original)
+++ portals/wsrp4j/trunk/producer/src/webapp/WEB-INF/persistence/descriptions/org.apache.wsrp4j.commons.persistence.driver.WSRPServiceDescription.xml Sat Aug 25 12:35:34 2007
@@ -17,4 +17,4 @@
<ServiceDescription id="wsrp4jproducer" requiresInitCookie="perGroup"
requiresRegistration="true">
-</ServiceDescription>
\ No newline at end of file
+</ServiceDescription>
Modified: portals/wsrp4j/trunk/producer/src/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/portals/wsrp4j/trunk/producer/src/webapp/WEB-INF/web.xml?rev=569721&r1=569720&r2=569721&view=diff
==============================================================================
--- portals/wsrp4j/trunk/producer/src/webapp/WEB-INF/web.xml (original)
+++ portals/wsrp4j/trunk/producer/src/webapp/WEB-INF/web.xml Sat Aug 25 12:35:34 2007
@@ -26,6 +26,19 @@
<param-name>javax.servlet.jsp.jstl.fmt.localizationContext</param-name>
<param-value>org.apache.wsrp4j.producer.configapp.messages.Messages</param-value>
</context-param>
+
+ <context-param>
+ <param-name>contextConfigLocation</param-name>
+ <param-value>classpath:/applicationContext.xml</param-value>
+ </context-param>
+
+ <listener>
+ <listener-class>org.apache.wsrp4j.producer.provider.pluto.driver.ProviderImpl</listener-class>
+ </listener>
+
+ <listener>
+ <listener-class>org.springframework.web.context.ContextLoaderListener</listener-class>
+ </listener>
<!-- Uncomment the following <filter> and <filter-mapping> if you want to
activate Hibernate based db persistence. You must also specify the