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 cz...@apache.org on 2005/08/12 14:56:54 UTC
cvs commit: ws-wsrp4j/src/org/apache/wsrp4j/producer ProviderAccess.java ConsumerRegistryAccess.java
cziegeler 2005/08/12 05:56:54
Modified: src/org/apache/wsrp4j/producer/provider/pluto/driver
PortletStateImpl.java StoredResponse.java
PortletInvokerImpl.java
ServletRequestFactoryImpl.java
DescriptionHandlerImpl.java
PortletActionProviderImpl.java
WSRPPortletEntityImpl.java ProviderImpl.java
WSRPRenderResponseFactoryImpl.java
DynamicInformationProviderImpl.java
ResourceURLProviderImpl.java
ProviderFactoryImpl.java
WSRPRenderResponseImpl.java
PortletURLProviderImpl.java
PortletStateManagerImpl.java
WSRPServletRequestWrapperImpl.java
PortletPoolImpl.java
src/org/apache/wsrp4j/producer/driver WSRPEngine.java
ConsumerRegistryImpl.java
src/org/apache/wsrp4j/util HandleGeneratorImpl.java
PropertyListHelper.java ParameterChecker.java
DOMSupport.java StateChangedServiceImpl.java
WindowStates.java
src/org/apache/wsrp4j/producer/provider
ConsumerConfiguredPortlet.java
DescriptionHandler.java URLComposer.java
PortletStateManager.java PortletInvoker.java
PortletState.java
src/org/apache/wsrp4j/producer/provider/pluto
PlutoProvider.java PlutoPortletPool.java
src/org/apache/wsrp4j/producer/provider/driver
ConsumerPortletRegistrationImpl.java
ConsumerConfiguredPortletImpl.java PortletImpl.java
URLComposerImpl.java
ProducerOfferedPortletImpl.java
PortletRegistrationFilterImpl.java
src/org/apache/wsrp4j/producer ProviderAccess.java
ConsumerRegistryAccess.java
Log:
Cleanup code
Revision Changes Path
1.6 +21 -30 ws-wsrp4j/src/org/apache/wsrp4j/producer/provider/pluto/driver/PortletStateImpl.java
Index: PortletStateImpl.java
===================================================================
RCS file: /home/cvs/ws-wsrp4j/src/org/apache/wsrp4j/producer/provider/pluto/driver/PortletStateImpl.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- PortletStateImpl.java 10 Aug 2005 15:10:22 -0000 1.5
+++ PortletStateImpl.java 12 Aug 2005 12:56:52 -0000 1.6
@@ -26,8 +26,8 @@
import org.w3c.dom.Element;
/**
- Implementation of the PortletStat interface
-
+ * Implementation of the PortletStat interface
+ *
* @author <a href="mailto:Peter.Fischer@de.ibm.com">Peter Fischer</a>
* @see org.apache.wsrp4j.producer.provider.PortletState
* @version $Id$
@@ -35,18 +35,10 @@
public class PortletStateImpl implements PortletState, Serializable
{
//model description
- private ModelDescription desc = null;
+ private ModelDescription desc;
//portlet handle
- private String portletHandle = null;
-
- /**
- Default constructor
- */
- public PortletStateImpl()
- {
-
- }
+ private String portletHandle;
/**
* Returns the HashMap with Properties for persistent file
@@ -68,7 +60,7 @@
*/
public void setPropertyMap(HashMap propertyMap)
{
-
+ // nothing to do?
}
/**
@@ -93,18 +85,18 @@
}
/**
- Returns the WSRP ModelDescription for this state
- @return ModelDescription
- */
+ * Returns the WSRP ModelDescription for this state
+ * @return ModelDescription
+ */
public ModelDescription getModelDescription()
{
return desc;
}
/**
- Set the WSRP ModelDescription for this state
- @param modelDescription the WSRP model description
- */
+ * Set the WSRP ModelDescription for this state
+ * @param modelDescription the WSRP model description
+ */
public void setModelDescription(ModelDescription modelDescription)
{
desc = modelDescription;
@@ -134,10 +126,10 @@
PropertyList pl = new PropertyList();
return pl;
}
- /**
- * @see org.apache.wsrp4j.producer.provider.PortletState#getAsPropertylist(String[])
- */
+ /**
+ * @see org.apache.wsrp4j.producer.provider.PortletState#getAsPropertylist(String[])
+ */
public PropertyList getAsPropertylist(String[] names)
{
PropertyList pl = new PropertyList();
@@ -150,7 +142,7 @@
*/
public void setAsString(String portletState)
{
-
+ // nothing to do?
}
/**
@@ -158,8 +150,9 @@
*/
public void setAsPropertyList(PropertyList portletState)
{
-
+ // nothing to do?
}
+
/**
* @see org.apache.wsrp4j.producer.provider.PortletState#getAsString(String[])
*/
@@ -174,7 +167,7 @@
*/
public void setAsElement(Element propertyList)
{
-
+ // nothing to do?
}
/**
@@ -183,15 +176,13 @@
public Element getAsElement()
{
return null;
-
}
/**
- * @see org.apache.wsrp4j.producer.provider.PortletState#getAsElement(String[])
- */
+ * @see org.apache.wsrp4j.producer.provider.PortletState#getAsElement(String[])
+ */
public Element getAsElement(String[] names)
{
-
return null;
}
1.6 +76 -71 ws-wsrp4j/src/org/apache/wsrp4j/producer/provider/pluto/driver/StoredResponse.java
Index: StoredResponse.java
===================================================================
RCS file: /home/cvs/ws-wsrp4j/src/org/apache/wsrp4j/producer/provider/pluto/driver/StoredResponse.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- StoredResponse.java 10 Aug 2005 15:10:22 -0000 1.5
+++ StoredResponse.java 12 Aug 2005 12:56:52 -0000 1.6
@@ -65,8 +65,8 @@
private Locale _locale;
/**
- Default constructor
- */
+ * Default constructor
+ */
public StoredResponse()
{
_statusCode = DEFAULT_STATUS_CODE;
@@ -76,77 +76,77 @@
}
/**
- @see javax.servlet.http.HttpServletResponse#addCookie
- */
+ * @see javax.servlet.http.HttpServletResponse#addCookie
+ */
public void addCookie(Cookie cookie)
{
}
/**
- @see javax.servlet.http.HttpServletResponse#addDateHeader
- */
+ * @see javax.servlet.http.HttpServletResponse#addDateHeader
+ */
public void addDateHeader(String a, long b)
{
}
/**
- @see javax.servlet.http.HttpServletResponse#addHeader
- */
+ * @see javax.servlet.http.HttpServletResponse#addHeader
+ */
public void addHeader(String a, String b)
{
}
/**
- @see javax.servlet.http.HttpServletResponse#addIntHeader
- */
+ * @see javax.servlet.http.HttpServletResponse#addIntHeader
+ */
public void addIntHeader(String a, int b)
{
}
/**
- @see javax.servlet.http.HttpServletResponse#containsHeader
- */
+ * @see javax.servlet.http.HttpServletResponse#containsHeader
+ */
public boolean containsHeader(String s)
{
return false;
}
/**
- @see javax.servlet.http.HttpServletResponse#encodeRedirectURL
- */
+ * @see javax.servlet.http.HttpServletResponse#encodeRedirectURL
+ */
public String encodeRedirectURL(String s)
{
return s;
}
/**
- @see javax.servlet.http.HttpServletResponse#encodeRedirectUrl
- */
+ * @see javax.servlet.http.HttpServletResponse#encodeRedirectUrl
+ */
public String encodeRedirectUrl(String s)
{
return encodeRedirectURL(s);
}
/**
- @see javax.servlet.http.HttpServletResponse#encodeURL
- */
+ * @see javax.servlet.http.HttpServletResponse#encodeURL
+ */
public String encodeURL(String s)
{
return s;
}
/**
- @see javax.servlet.http.HttpServletResponse#encodeUrl
- */
+ * @see javax.servlet.http.HttpServletResponse#encodeUrl
+ */
public String encodeUrl(String s)
{
return encodeURL(s);
}
/**
- Internal method
- Finish the response.
- */
+ * Internal method
+ * Finish the response.
+ */
private void finish() throws IOException
{
synchronized (this)
@@ -166,40 +166,40 @@
}
/**
- @see javax.servlet.http.HttpServletResponse#flushBuffer()
- */
+ * @see javax.servlet.http.HttpServletResponse#flushBuffer()
+ */
public void flushBuffer()
{
}
/**
- @see javax.servlet.http.HttpServletResponse#getBufferSize()
- */
+ * @see javax.servlet.http.HttpServletResponse#getBufferSize()
+ */
public int getBufferSize()
{
return 4096;
}
/**
- @see javax.servlet.http.HttpServletResponse#getCharacterEncoding()
- */
+ * @see javax.servlet.http.HttpServletResponse#getCharacterEncoding()
+ */
public String getCharacterEncoding()
{
return System.getProperty("default.client.encoding");
}
/**
- @see javax.servlet.http.HttpServletResponse#getLocale()
- */
+ * @see javax.servlet.http.HttpServletResponse#getLocale()
+ */
public java.util.Locale getLocale()
{
return _locale;
}
/**
- Returns the output buffer content as String
- @return java.lang.String
- */
+ * Returns the output buffer content as String
+ * @return java.lang.String
+ */
public String getOutputBufferAsString() throws IOException
{
if (_stringWriter == null)
@@ -210,16 +210,16 @@
}
/**
- @see javax.servlet.http.HttpServletResponse#getOutputStream()
- */
+ * @see javax.servlet.http.HttpServletResponse#getOutputStream()
+ */
public ServletOutputStream getOutputStream()
{
return null;
}
/**
- @see javax.servlet.http.HttpServletResponse#getWriter()
- */
+ * @see javax.servlet.http.HttpServletResponse#getWriter()
+ */
public PrintWriter getWriter()
{
if ((_stringWriter == null) || (_writer == null))
@@ -232,118 +232,123 @@
}
/**
- @see javax.servlet.http.HttpServletResponse#isCommitted()
- */
+ * @see javax.servlet.http.HttpServletResponse#isCommitted()
+ */
public boolean isCommitted()
{
return false;
}
/**
- @see javax.servlet.http.HttpServletResponse#reset()
- */
+ * @see javax.servlet.http.HttpServletResponse#reset()
+ */
public void reset()
{
+ // nothing to do?
}
/**
- @see javax.servlet.http.HttpServletResponse#sendError(int)
- */
+ * @see javax.servlet.http.HttpServletResponse#sendError(int)
+ */
public void sendError(int i) throws IOException
{
+ // nothing to do?
}
/**
- @see javax.servlet.http.HttpServletResponse#sendError(int, String)
- */
+ * @see javax.servlet.http.HttpServletResponse#sendError(int, String)
+ */
public void sendError(int i, String s) throws IOException
{
+ // nothing to do?
}
/**
- @see javax.servlet.http.HttpServletResponse#sendRedirect(String)
- */
+ * @see javax.servlet.http.HttpServletResponse#sendRedirect(String)
+ */
public void sendRedirect(String s)
{
_redirectURI = s;
}
/**
- @see javax.servlet.http.HttpServletResponse#setBufferSize(int)
- */
+ * @see javax.servlet.http.HttpServletResponse#setBufferSize(int)
+ */
public void setBufferSize(int i)
{
+ // nothing to do?
}
/**
- @see javax.servlet.http.HttpServletResponse#setContentLength(int)
- */
+ * @see javax.servlet.http.HttpServletResponse#setContentLength(int)
+ */
public void setContentLength(int i)
{
setIntHeader("content-length", i);
}
/**
- @see javax.servlet.http.HttpServletResponse#setContentType(String)
- */
+ * @see javax.servlet.http.HttpServletResponse#setContentType(String)
+ */
public void setContentType(String s)
{
setHeader("content-type", s);
}
/**
- @see javax.servlet.http.HttpServletResponse#setDateHeader(String, long)
- */
+ * @see javax.servlet.http.HttpServletResponse#setDateHeader(String, long)
+ */
public void setDateHeader(String s, long l)
{
+ // nothing to do?
}
/**
- @see javax.servlet.http.HttpServletResponse#setHeader(String, String)
- */
+ * @see javax.servlet.http.HttpServletResponse#setHeader(String, String)
+ */
public void setHeader(String s, String s1)
{
+ // nothing to do?
}
/**
- @see javax.servlet.http.HttpServletResponse#setIntHeader
- */
+ * @see javax.servlet.http.HttpServletResponse#setIntHeader
+ */
public void setIntHeader(String s, int i)
{
+ // nothing to do?
}
/**
- @see javax.servlet.http.HttpServletResponse#setLocale(Locale)
- */
+ * @see javax.servlet.http.HttpServletResponse#setLocale(Locale)
+ */
public void setLocale(Locale locale)
{
_locale = locale;
}
/**
- @see javax.servlet.http.HttpServletResponse#setStatus(int)
- */
+ * @see javax.servlet.http.HttpServletResponse#setStatus(int)
+ */
public void setStatus(int i)
{
_statusCode = i;
}
/**
- @see javax.servlet.http.HttpServletResponse#setStatus(int, String)
- */
+ * @see javax.servlet.http.HttpServletResponse#setStatus(int, String)
+ */
public void setStatus(int i, String s)
{
_statusCode = i;
_statusMessage = s;
}
- /* (non-Javadoc)
+ /**
* @see javax.servlet.ServletResponse#resetBuffer()
*/
public void resetBuffer()
{
- // TODO Auto-generated method stub
-
+ // nothing to do?
}
-
}
1.12 +15 -14 ws-wsrp4j/src/org/apache/wsrp4j/producer/provider/pluto/driver/PortletInvokerImpl.java
Index: PortletInvokerImpl.java
===================================================================
RCS file: /home/cvs/ws-wsrp4j/src/org/apache/wsrp4j/producer/provider/pluto/driver/PortletInvokerImpl.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- PortletInvokerImpl.java 10 Aug 2005 15:10:22 -0000 1.11
+++ PortletInvokerImpl.java 12 Aug 2005 12:56:52 -0000 1.12
@@ -64,7 +64,7 @@
{
// provider
- private PlutoProvider provider = null;
+ private PlutoProvider provider;
// for logging and exception support
private Logger logger = LogManager.getLogManager().getLogger(this.getClass());
@@ -74,6 +74,7 @@
*/
private PortletInvokerImpl()
{
+ // private
}
/**
@@ -91,7 +92,7 @@
/**
*
- @see org.apache.wsrp4j.producer.provider.PortletInvoker#invokeGetMarkup
+ * @see org.apache.wsrp4j.producer.provider.PortletInvoker#invokeGetMarkup
*/
public MarkupResponse invokeGetMarkup(GetMarkup request)
{
@@ -205,7 +206,7 @@
/**
*
- @see org.apache.wsrp4j.producer.provider.PortletInvoker#invokePerformBlockingInteraction
+ * @see org.apache.wsrp4j.producer.provider.PortletInvoker#invokePerformBlockingInteraction
*/
public BlockingInteractionResponse invokePerformBlockingInteraction(
PerformBlockingInteraction request)
@@ -341,11 +342,11 @@
}
/**
- Internal method
- Return the portlet window for a portlet entity with a particular identifier
- @param portletEntity the portlet entity
- @param id String representing a portlet window idendtifier
- */
+ * Internal method
+ * Return the portlet window for a portlet entity with a particular identifier
+ * @param portletEntity the portlet entity
+ * @param id String representing a portlet window idendtifier
+ */
private PortletWindow getPortletWindow(PortletEntity portletEntity, String id)
{
String MN = "getPortletWindow";
@@ -444,11 +445,11 @@
}
/**
- Internal method.
- Return the FORM parameters as Map
- @param params array of NamedString objects
- @return java.util.Map containing the FORM parameters and values
- */
+ * Internal method.
+ * Return the FORM parameters as Map
+ * @param params array of NamedString objects
+ * @return java.util.Map containing the FORM parameters and values
+ */
private static Map getFormParameters(NamedString[] params)
{
1.5 +3 -5 ws-wsrp4j/src/org/apache/wsrp4j/producer/provider/pluto/driver/ServletRequestFactoryImpl.java
Index: ServletRequestFactoryImpl.java
===================================================================
RCS file: /home/cvs/ws-wsrp4j/src/org/apache/wsrp4j/producer/provider/pluto/driver/ServletRequestFactoryImpl.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ServletRequestFactoryImpl.java 10 Aug 2005 15:10:22 -0000 1.4
+++ ServletRequestFactoryImpl.java 12 Aug 2005 12:56:52 -0000 1.5
@@ -29,8 +29,6 @@
*/
public class ServletRequestFactoryImpl implements ServletRequestFactory {
- private javax.servlet.ServletConfig servletConfig;
-
/**
* @see org.apache.pluto.portalImpl.servlet.ServletRequestFactory#getServletRequest(javax.servlet.http.HttpServletRequest, org.apache.pluto.om.window.PortletWindow)
*/
@@ -46,13 +44,13 @@
* @see org.apache.pluto.factory.Factory#destroy()
*/
public void destroy() throws Exception {
-
+ // nothing to do
}
/**
* @see org.apache.pluto.factory.Factory#init(javax.servlet.ServletConfig, java.util.Map)
*/
public void init(ServletConfig config, Map properties) throws Exception {
- servletConfig = config;
+ // nothing to do?
}
}
1.9 +9 -9 ws-wsrp4j/src/org/apache/wsrp4j/producer/provider/pluto/driver/DescriptionHandlerImpl.java
Index: DescriptionHandlerImpl.java
===================================================================
RCS file: /home/cvs/ws-wsrp4j/src/org/apache/wsrp4j/producer/provider/pluto/driver/DescriptionHandlerImpl.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- DescriptionHandlerImpl.java 10 Aug 2005 15:10:22 -0000 1.8
+++ DescriptionHandlerImpl.java 12 Aug 2005 12:56:52 -0000 1.9
@@ -73,14 +73,14 @@
{
// Provider
- private PlutoProvider provider = null;
+ private PlutoProvider provider;
// PortletPool
- private PlutoPortletPool portletPool = null;
+ private PlutoPortletPool portletPool;
//persistence
- private PersistentDataObject persistentDataObject = null;
- private PersistentHandler persistentHandler = null;
+ private PersistentDataObject persistentDataObject;
+ private PersistentHandler persistentHandler;
// ServiceDescription
private ServiceDescription serviceDescription;
@@ -733,10 +733,10 @@
/**
* Returns the portlet description for a given portlet handle
-
- @param portletHandle String representing a portlet's handle
- @return PortletDescription
- @throws WSRPException
+ *
+ * @param portletHandle String representing a portlet's handle
+ * @return PortletDescription
+ * @throws WSRPException
*/
public PortletDescription getPortletDescription(String portletHandle) throws WSRPException
{
1.5 +3 -3 ws-wsrp4j/src/org/apache/wsrp4j/producer/provider/pluto/driver/PortletActionProviderImpl.java
Index: PortletActionProviderImpl.java
===================================================================
RCS file: /home/cvs/ws-wsrp4j/src/org/apache/wsrp4j/producer/provider/pluto/driver/PortletActionProviderImpl.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- PortletActionProviderImpl.java 10 Aug 2005 15:10:22 -0000 1.4
+++ PortletActionProviderImpl.java 12 Aug 2005 12:56:52 -0000 1.5
@@ -26,8 +26,8 @@
*/
public class PortletActionProviderImpl implements PortletActionProvider
{
- DynamicInformationProviderImpl dynamicInfoProvider = null;
- PortletWindow portletWindow = null;
+ DynamicInformationProviderImpl dynamicInfoProvider;
+ PortletWindow portletWindow;
/**
*
1.8 +6 -5 ws-wsrp4j/src/org/apache/wsrp4j/producer/provider/pluto/driver/WSRPPortletEntityImpl.java
Index: WSRPPortletEntityImpl.java
===================================================================
RCS file: /home/cvs/ws-wsrp4j/src/org/apache/wsrp4j/producer/provider/pluto/driver/WSRPPortletEntityImpl.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- WSRPPortletEntityImpl.java 10 Aug 2005 15:10:22 -0000 1.7
+++ WSRPPortletEntityImpl.java 12 Aug 2005 12:56:52 -0000 1.8
@@ -29,16 +29,16 @@
import org.apache.pluto.portalImpl.services.factorymanager.FactoryManager;
/**
- This class adds cloning to the pluto portlet entity.
+ * This class adds cloning to the pluto portlet entity.
* @version $Id$
*/
public class WSRPPortletEntityImpl extends PortletEntityImpl implements Cloneable
{
/**
- Creates a clone from portletEntity
- @return java.lang.Object
- */
+ * Creates a clone from portletEntity
+ * @return java.lang.Object
+ */
public Object clone()
{
@@ -84,6 +84,7 @@
support.postBuild(entityApp);
} catch (Exception e)
{
+ // ignore
}
return portletEntity;
1.10 +16 -15 ws-wsrp4j/src/org/apache/wsrp4j/producer/provider/pluto/driver/ProviderImpl.java
Index: ProviderImpl.java
===================================================================
RCS file: /home/cvs/ws-wsrp4j/src/org/apache/wsrp4j/producer/provider/pluto/driver/ProviderImpl.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- ProviderImpl.java 10 Aug 2005 15:10:22 -0000 1.9
+++ ProviderImpl.java 12 Aug 2005 12:56:52 -0000 1.10
@@ -45,25 +45,26 @@
public class ProviderImpl implements PlutoProvider
{
//portlet pool
- private PlutoPortletPool portletPool = null;
+ private PlutoPortletPool portletPool;
//description handler
- private DescriptionHandler descriptionHandler = null;
+ private DescriptionHandler descriptionHandler;
//portlet state manager
- private PortletStateManager portletStateManager = null;
+ private PortletStateManager portletStateManager;
//portlet invoker
- private PortletInvoker portletInvoker = null;
+ private PortletInvoker portletInvoker;
//url composer
- private URLComposer urlComposer = null;
+ private URLComposer urlComposer;
/**
* Private constructor
*/
private ProviderImpl()
{
+ // private
}
/**
@@ -80,8 +81,8 @@
}
/**
- Initialize Provider
- */
+ * Initialize Provider
+ */
private void init()
{
@@ -120,9 +121,9 @@
}
/**
- Returns an instance of the portlet containter
- @return PortletContainer
- */
+ * Returns an instance of the portlet containter
+ * @return PortletContainer
+ */
public PortletContainer getPortletContainer()
{
return PortletContainerFactory.getPortletContainer();
@@ -193,10 +194,10 @@
}
/**
- Return an instance of a pluto portlet pool
-
- @return PlutoPortletPool
- */
+ * Return an instance of a pluto portlet pool
+ *
+ * @return PlutoPortletPool
+ */
public PlutoPortletPool getPlutoPortletPool()
{
if (portletPool == null)
1.5 +18 -21 ws-wsrp4j/src/org/apache/wsrp4j/producer/provider/pluto/driver/WSRPRenderResponseFactoryImpl.java
Index: WSRPRenderResponseFactoryImpl.java
===================================================================
RCS file: /home/cvs/ws-wsrp4j/src/org/apache/wsrp4j/producer/provider/pluto/driver/WSRPRenderResponseFactoryImpl.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- WSRPRenderResponseFactoryImpl.java 10 Aug 2005 15:10:22 -0000 1.4
+++ WSRPRenderResponseFactoryImpl.java 12 Aug 2005 12:56:52 -0000 1.5
@@ -21,41 +21,38 @@
import org.apache.pluto.om.window.PortletWindow;
/**
- WSRP4J specific implementation of the pluto RenderResponseFactory.
+ * WSRP4J specific implementation of the pluto RenderResponseFactory.
* @version $Id$
*/
public class WSRPRenderResponseFactoryImpl implements RenderResponseFactory
{
- //servlet config
- private javax.servlet.ServletConfig servletConfig;
-
/**
- Initialize the factory
- @param config as javax.servlet.ServletConfig
- @param properties as java.util.Map
- @throws Exception
- */
+ * Initialize the factory
+ * @param config as javax.servlet.ServletConfig
+ * @param properties as java.util.Map
+ * @throws Exception
+ */
public void init(javax.servlet.ServletConfig config, java.util.Map properties) throws Exception
{
- servletConfig = config;
+ // nothing to do
}
/**
- Destroy the factory
- @throws Exception
- */
+ * Destroy the factory
+ * @throws Exception
+ */
public void destroy() throws Exception
{
-
+ // nothing to do
}
/**
- Returns an instance of RenderResponse
- @param portletWindow portlet window
- @servletRequest HTTP servlet request
- @servletResponse HTTP servlet response
- @return javax.portlet.RenderResponse
- */
+ * Returns an instance of RenderResponse
+ * @param portletWindow portlet window
+ * @servletRequest HTTP servlet request
+ * @servletResponse HTTP servlet response
+ * @return javax.portlet.RenderResponse
+ */
public RenderResponse getRenderResponse(
PortletWindow portletWindow,
javax.servlet.http.HttpServletRequest servletRequest,
1.11 +42 -44 ws-wsrp4j/src/org/apache/wsrp4j/producer/provider/pluto/driver/DynamicInformationProviderImpl.java
Index: DynamicInformationProviderImpl.java
===================================================================
RCS file: /home/cvs/ws-wsrp4j/src/org/apache/wsrp4j/producer/provider/pluto/driver/DynamicInformationProviderImpl.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- DynamicInformationProviderImpl.java 10 Aug 2005 15:10:22 -0000 1.10
+++ DynamicInformationProviderImpl.java 12 Aug 2005 12:56:52 -0000 1.11
@@ -84,12 +84,12 @@
private String[] mimeTypes;
/**
- Constructor
- Creates a new DynamicInformationProviderImpl using the information provided by
- the servlet request and servlet config.
-
- @param request HttpServletRequest
- */
+ * Constructor
+ * Creates a new DynamicInformationProviderImpl using the information provided by
+ * the servlet request and servlet config.
+ *
+ * @param request HttpServletRequest
+ */
public DynamicInformationProviderImpl(HttpServletRequest request)
{
this.servletRequest = request;
@@ -169,15 +169,14 @@
}
/**
- Return a PortletURLProvider for a given portlet window
- @param portletWindow portlet window
- @return PortletURLProvider
- */
+ * Return a PortletURLProvider for a given portlet window
+ * @param portletWindow portlet window
+ * @return PortletURLProvider
+ */
public PortletURLProvider getPortletURL(PortletWindow portletWindow)
{
return new PortletURLProviderImpl(
servletRequest,
- portletWindow,
provider,
runtimeContext,
portletContext,
@@ -185,45 +184,45 @@
}
/**
- Set the portlet mode
- @param mode portlte mode
- */
+ * Set the portlet mode
+ * @param mode portlte mode
+ */
public void changePortletMode(PortletMode mode)
{
this.mode = mode;
}
/**
- Set the portlet window state
- @param state portlet window state
- */
+ * Set the portlet window state
+ * @param state portlet window state
+ */
public void changePortletWindowState(WindowState state)
{
this.winState = state;
}
/**
- Return the default MIME type of the request
- @return String representing a MIME type
- */
+ * Return the default MIME type of the request
+ * @return String representing a MIME type
+ */
public String getRequestMimeType()
{
return this.mimeTypes[0];
}
/**
- Return the default MIME type of the response
- @return String representing a MIME type
- */
+ * Return the default MIME type of the response
+ * @return String representing a MIME type
+ */
public String getResponseMimeType()
{
return this.mimeTypes[0];
}
/**
- Return all MIME type of the request
- @return java.util.Enumeration
- */
+ * Return all MIME type of the request
+ * @return java.util.Enumeration
+ */
public Iterator getResponseMimeTypes()
{
Vector vector = new Vector();
@@ -233,40 +232,40 @@
}
/**
- Return the portlet mode
- @param portletWindow portlet window
- @return PortletMode
- */
+ * Return the portlet mode
+ * @param portletWindow portlet window
+ * @return PortletMode
+ */
public PortletMode getPortletMode(PortletWindow portletWindow)
{
return new PortletMode(this.mode.toString());
}
/**
- Return the previous portlet mode
- @param portletWindow portlet window
- @return PortletMode
- */
+ * Return the previous portlet mode
+ * @param portletWindow portlet window
+ * @return PortletMode
+ */
public PortletMode getPreviousPortletMode(PortletWindow portletWindow)
{
return new PortletMode(this.mode.toString());
}
/**
- Return the portlet window state
- @param portletWindow portlet window
- @return WindowState
- */
+ * Return the portlet window state
+ * @param portletWindow portlet window
+ * @return WindowState
+ */
public WindowState getWindowState(PortletWindow portletWindow)
{
return new WindowState(this.winState.toString());
}
/**
- Return the previous portlet window state
- @param portletWindow portlet window
- @return WindowState
- */
+ * Return the previous portlet window state
+ * @param portletWindow portlet window
+ * @return WindowState
+ */
public WindowState getPreviousWindowState(PortletWindow portletWindow)
{
return new WindowState(this.winState.toString());
@@ -439,7 +438,6 @@
public PortletURLProvider getPortletURLProvider(PortletWindow portletWindow)
{
return new PortletURLProviderImpl(this.servletRequest,
- portletWindow,
this.provider,
this.runtimeContext,
this.portletContext,
1.6 +13 -13 ws-wsrp4j/src/org/apache/wsrp4j/producer/provider/pluto/driver/ResourceURLProviderImpl.java
Index: ResourceURLProviderImpl.java
===================================================================
RCS file: /home/cvs/ws-wsrp4j/src/org/apache/wsrp4j/producer/provider/pluto/driver/ResourceURLProviderImpl.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ResourceURLProviderImpl.java 10 Aug 2005 15:10:22 -0000 1.5
+++ ResourceURLProviderImpl.java 12 Aug 2005 12:56:52 -0000 1.6
@@ -32,10 +32,10 @@
private boolean trace_high = logger.isLogging(Logger.TRACE_HIGH);
- private HttpServletRequest servletRequest = null;
- private DynamicInformationProviderImpl dynInfoProvider = null;
- private URLComposer urlComposer = null;
- private Provider wsrpProvider = null;
+ private HttpServletRequest servletRequest;
+ private DynamicInformationProviderImpl dynInfoProvider;
+ private URLComposer urlComposer;
+ private Provider wsrpProvider;
//inidcaates if secure client communication is used
private boolean isSecure = false;
@@ -48,12 +48,12 @@
private static final String GET_PROTOCOL_HOST_AND_PORT = "getProtocolHostAndPort";
/**
- Constructs a ResourceURLProviderImpl
- @param aServletRequest
- @param aProviderImpl - dynamic information provider that creates this instance
- @param aWsrpProvider - WSRP provider that provides the URL composer
- @param secure indicator, if a secure URL should be created
- */
+ * Constructs a ResourceURLProviderImpl
+ * @param aServletRequest
+ * @param aProviderImpl - dynamic information provider that creates this instance
+ * @param aWsrpProvider - WSRP provider that provides the URL composer
+ * @param secure indicator, if a secure URL should be created
+ */
public ResourceURLProviderImpl(HttpServletRequest aServletRequest,
DynamicInformationProviderImpl aProviderImpl,
Provider aWsrpProvider,
@@ -150,8 +150,8 @@
/**
- Returns the protocol, host and port without trailing "/" as String
- */
+ * Returns the protocol, host and port without trailing "/" as String
+ */
private String getProtocolHostAndPort()
{
if (trace_high)
1.6 +2 -2 ws-wsrp4j/src/org/apache/wsrp4j/producer/provider/pluto/driver/ProviderFactoryImpl.java
Index: ProviderFactoryImpl.java
===================================================================
RCS file: /home/cvs/ws-wsrp4j/src/org/apache/wsrp4j/producer/provider/pluto/driver/ProviderFactoryImpl.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ProviderFactoryImpl.java 10 Aug 2005 15:10:22 -0000 1.5
+++ ProviderFactoryImpl.java 12 Aug 2005 12:56:52 -0000 1.6
@@ -28,7 +28,7 @@
public class ProviderFactoryImpl implements ProviderFactory
{
- private static ProviderImpl provider = null;
+ private static ProviderImpl provider;
/**
* Returns an instance of Provider by calling the constructor
1.7 +17 -17 ws-wsrp4j/src/org/apache/wsrp4j/producer/provider/pluto/driver/WSRPRenderResponseImpl.java
Index: WSRPRenderResponseImpl.java
===================================================================
RCS file: /home/cvs/ws-wsrp4j/src/org/apache/wsrp4j/producer/provider/pluto/driver/WSRPRenderResponseImpl.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- WSRPRenderResponseImpl.java 10 Aug 2005 15:10:22 -0000 1.6
+++ WSRPRenderResponseImpl.java 12 Aug 2005 12:56:52 -0000 1.7
@@ -27,9 +27,9 @@
import org.apache.wsrp4j.producer.provider.Provider;
/**
- WSRP4J specific implementation of the pluto RenderResponse. This class extends
- the pluto RenderResponseImpl to provide a WSRP4J specific Provider implementation
- and encodeURL method.
+ * WSRP4J specific implementation of the pluto RenderResponse. This class extends
+ * the pluto RenderResponseImpl to provide a WSRP4J specific Provider implementation
+ * and encodeURL method.
* @version $Id$
*/
public class WSRPRenderResponseImpl extends org.apache.pluto.core.impl.RenderResponseImpl
@@ -40,11 +40,11 @@
private PortletEntity portletEntity;
/**
- Constructor
- @param portletWindow portlet window
- @param servletRequest HTTP servlet request
- @param servletResponse HTTP servlet response
- */
+ * Constructor
+ * @param portletWindow portlet window
+ * @param servletRequest HTTP servlet request
+ * @param servletResponse HTTP servlet response
+ */
public WSRPRenderResponseImpl(
PortletWindow portletWindow,
HttpServletRequest servletRequest,
@@ -60,10 +60,10 @@
}
/**
- Returns the encoded version of a URL string
- @param url String representing a URL
- @return java.lang.String representing an encoded URL
- */
+ * Returns the encoded version of a URL string
+ * @param url String representing a URL
+ * @return java.lang.String representing an encoded URL
+ */
public String encodeURL(String url)
{
@@ -118,10 +118,10 @@
}
/**
- Provides a specific namespace for a name/key
- @param aValue String representing a name or a key
- @return java.lang.String encoded name or key
- */
+ * Provides a specific namespace for a name/key
+ * @param aValue String representing a name or a key
+ * @return java.lang.String encoded name or key
+ */
public String encodeNamespace(String aValue)
{
1.7 +39 -49 ws-wsrp4j/src/org/apache/wsrp4j/producer/provider/pluto/driver/PortletURLProviderImpl.java
Index: PortletURLProviderImpl.java
===================================================================
RCS file: /home/cvs/ws-wsrp4j/src/org/apache/wsrp4j/producer/provider/pluto/driver/PortletURLProviderImpl.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- PortletURLProviderImpl.java 10 Aug 2005 15:10:22 -0000 1.6
+++ PortletURLProviderImpl.java 12 Aug 2005 12:56:52 -0000 1.7
@@ -28,7 +28,6 @@
import oasis.names.tc.wsrp.v1.types.UserContext;
import org.apache.pluto.services.information.PortletURLProvider;
-import org.apache.pluto.om.window.PortletWindow;
import org.apache.wsrp4j.log.LogManager;
import org.apache.wsrp4j.log.Logger;
import org.apache.wsrp4j.producer.provider.Provider;
@@ -38,24 +37,21 @@
import org.apache.wsrp4j.producer.util.MapSerializer;
/**
- Implementation of the PortletURLProvider interface
-
- @see org.apache.pluto.information.PortletURLProvider
+ * Implementation of the PortletURLProvider interface
+ *
+ * @see org.apache.pluto.services.information.PortletURLProvider
* @version $Id$
*/
public class PortletURLProviderImpl implements PortletURLProvider
{
//servlet request
- private HttpServletRequest request = null;
-
- //portlet window
- private PortletWindow portletWindow = null;
+ private HttpServletRequest request;
//portlet mode
- private PortletMode mode = null;
+ private PortletMode mode;
//portlet window state
- private WindowState state = null;
+ private WindowState state;
//action
private boolean action = false;
@@ -63,43 +59,37 @@
//secure
private boolean secure = false;
- //clear render parameters
- private boolean clearParameters = false;
-
// render params
- private Map parameters = null;
+ private Map parameters;
//provider
- private Provider provider = null;
+ private Provider provider;
//logging / tracing
private Logger logger = LogManager.getLogManager().getLogger(getClass());
// wsrp runtime context
- private RuntimeContext runtimeContext = null;
+ private RuntimeContext runtimeContext;
// wsrp user context
- private UserContext userContext = null;
+ private UserContext userContext;
// wsrp portlet context
- private PortletContext portletContext = null;
+ private PortletContext portletContext;
/**
- Default constructor
- @param request as HttpServletRequest
- @param portletWindow as PortletWindow
- @param provider as Provider
- */
+ * Default constructor
+ * @param request as HttpServletRequest
+ * @param provider as Provider
+ */
public PortletURLProviderImpl(
HttpServletRequest request,
- PortletWindow portletWindow,
Provider provider,
RuntimeContext runtimeContext,
PortletContext portletContext,
UserContext userContext)
{
this.request = request;
- this.portletWindow = portletWindow;
this.provider = provider;
this.runtimeContext = runtimeContext;
this.portletContext = portletContext;
@@ -107,51 +97,51 @@
}
/**
- Set the portlet mode
- @param mode portlet mode
- */
+ * Set the portlet mode
+ * @param mode portlet mode
+ */
public void setPortletMode(PortletMode mode)
{
this.mode = mode;
}
/**
- Set the portlet window state
- @param state portlet window state
- */
+ * Set the portlet window state
+ * @param state portlet window state
+ */
public void setWindowState(WindowState state)
{
this.state = state;
}
/**
- Set a flag that an action should be encoded
- */
+ * Set a flag that an action should be encoded
+ */
public void setAction()
{
action = true;
}
/**
- Set a flag that security is turned on
- */
+ * Set a flag that security is turned on
+ */
public void setSecure()
{
secure = true;
}
/**
- Set a flag that all render parameters should be cleared
- */
+ * Set a flag that all render parameters should be cleared
+ */
public void clearParameters()
{
- clearParameters = true;
+ // ignore
}
/**
- Set action parameters
- @param parameters java.util.Map
- */
+ * Set action parameters
+ * @param parameters java.util.Map
+ */
public void setParameters(Map parameters)
{
this.parameters = parameters;
@@ -167,9 +157,9 @@
}
/**
- Returns a String representation of a URL
- @return java.lang.String
- */
+ * Returns a String representation of a URL
+ * @return java.lang.String
+ */
public String toString()
{
if (logger.isLogging(Logger.TRACE_HIGH))
@@ -279,10 +269,10 @@
}
/**
- Internal method
- Converts parameter values represented as String objects to
- parameter values represented by an array of (a single) String object.
- */
+ * Internal method
+ * Converts parameter values represented as String objects to
+ * parameter values represented by an array of (a single) String object.
+ */
private void convertToArrayMap()
{
1.6 +17 -21 ws-wsrp4j/src/org/apache/wsrp4j/producer/provider/pluto/driver/PortletStateManagerImpl.java
Index: PortletStateManagerImpl.java
===================================================================
RCS file: /home/cvs/ws-wsrp4j/src/org/apache/wsrp4j/producer/provider/pluto/driver/PortletStateManagerImpl.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- PortletStateManagerImpl.java 10 Aug 2005 15:10:22 -0000 1.5
+++ PortletStateManagerImpl.java 12 Aug 2005 12:56:52 -0000 1.6
@@ -23,25 +23,25 @@
import org.apache.wsrp4j.producer.provider.Provider;
/**
- Implementation of the PortletStateManager interface
-
+ * Implementation of the PortletStateManager interface
+ *
* @author <a href="mailto:Peter.Fischer@de.ibm.com">Peter Fischer</a>
* @see org.apache.wsrp4j.producer.provider.PortletStateManager
* @version $Id$
*/
-
public class PortletStateManagerImpl implements PortletStateManager
{
//provider
- private Provider provider = null;
+ private Provider provider;
// TODO: cache access object to portlet states
/**
- Default constructor
- */
+ * Default constructor
+ */
private PortletStateManagerImpl()
{
+ // private
}
public static PortletStateManagerImpl create(Provider provider)
@@ -91,10 +91,8 @@
if (state != null)
{
return state.getAsPropertyList();
- } else
- {
- return null;
}
+ return null;
}
/**
@@ -106,10 +104,8 @@
if (es != null)
{
return es.getAsPropertyList();
- } else
- {
- return null;
}
+ return null;
}
/**
@@ -157,19 +153,19 @@
}
/**
- Destroy the portlet state information for a given portlet handle
- @param portletHandle portlet handle
- */
+ * Destroy the portlet state information for a given portlet handle
+ * @param portletHandle portlet handle
+ */
public void destroy(String portletHandle)
{
}
/**
- Return the WSRP model description
- @param portletHandle portlet handle
- @param desiredLocales array of String representing desired locales
- @param sendAllLocales boolean indicating if all locales should be sent
- */
+ * Return the WSRP model description
+ * @param portletHandle portlet handle
+ * @param desiredLocales array of String representing desired locales
+ * @param sendAllLocales boolean indicating if all locales should be sent
+ */
public ModelDescription getModelDescription(String portletHandle, String[] desiredLocales, boolean sendAllLocales)
{
// ignore locale arguments for now
1.5 +8 -8 ws-wsrp4j/src/org/apache/wsrp4j/producer/provider/pluto/driver/WSRPServletRequestWrapperImpl.java
Index: WSRPServletRequestWrapperImpl.java
===================================================================
RCS file: /home/cvs/ws-wsrp4j/src/org/apache/wsrp4j/producer/provider/pluto/driver/WSRPServletRequestWrapperImpl.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- WSRPServletRequestWrapperImpl.java 10 Aug 2005 15:10:22 -0000 1.4
+++ WSRPServletRequestWrapperImpl.java 12 Aug 2005 12:56:52 -0000 1.5
@@ -36,15 +36,15 @@
**/
public class WSRPServletRequestWrapperImpl extends ServletRequestImpl
{
- private Locale locale = null;
- private String mimeType = null;
- private Map parameters = null;
+ private Locale locale;
+ private String mimeType;
+ private Map parameters;
/**
- Constructor
- @param request HttpServletRequest
- @param window PortletWindow
- */
+ * Constructor
+ * @param request HttpServletRequest
+ * @param window PortletWindow
+ */
public WSRPServletRequestWrapperImpl(HttpServletRequest request, PortletWindow window,
Locale locale, String mimeType, Map parameters)
{
1.9 +26 -30 ws-wsrp4j/src/org/apache/wsrp4j/producer/provider/pluto/driver/PortletPoolImpl.java
Index: PortletPoolImpl.java
===================================================================
RCS file: /home/cvs/ws-wsrp4j/src/org/apache/wsrp4j/producer/provider/pluto/driver/PortletPoolImpl.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- PortletPoolImpl.java 10 Aug 2005 15:10:22 -0000 1.8
+++ PortletPoolImpl.java 12 Aug 2005 12:56:52 -0000 1.9
@@ -69,20 +69,20 @@
* @author <a href="mailto:Peter.Fischer@de.ibm.com">Peter Fischer</a>
*
* @version $Id$
- * @see PortletPool
+ * @see org.apache.wsrp4j.producer.provider.PortletPool
*
*/
public class PortletPoolImpl extends PortletEntityRegistryServiceFileImpl implements PlutoPortletPool
{
// provider
- private Provider provider = null;
+ private Provider provider;
//handle generator
- private HandleGenerator handleGenerator = null;
+ private HandleGenerator handleGenerator;
// persistence
- private PersistentDataObject persistentDataObject = null;
- private PersistentHandler persistentHandler = null;
+ private PersistentDataObject persistentDataObject;
+ private PersistentHandler persistentHandler;
//holds consumer configured portlets
private Map consumerConfiguredPortlets = new HashMap();
@@ -144,10 +144,10 @@
}
/**
- Initialize the portlet pool
- @param servletConfig servlet configuration
- @param properties
- */
+ * Initialize the portlet pool
+ * @param servletConfig servlet configuration
+ * @param properties
+ */
public void init(ServletConfig servletConfig, Properties properties) throws Exception
{
@@ -200,18 +200,18 @@
}
/**
- Return the provider
- @return Provider
- */
+ * Return the provider
+ * @return Provider
+ */
public Provider getProvider()
{
return provider;
}
/**
- Set the provider
- @param provider
- */
+ * Set the provider
+ * @param provider
+ */
public void setProvider(Provider provider)
{
this.provider = provider;
@@ -524,17 +524,13 @@
}
// deleting a producer offered portlet is not allowed
- else
+ if (logger.isLogging(Logger.TRACE_HIGH))
{
-
- if (logger.isLogging(Logger.TRACE_HIGH))
- {
- logger.exit(Logger.TRACE_HIGH, MN);
- }
-
- return false;
+ logger.exit(Logger.TRACE_HIGH, MN);
}
+ return false;
+
}
/**
@@ -580,11 +576,11 @@
}
/**
- * Store the object to persistent store
- *
- * @param persistentDataObject
- * @throws CommonException
- */
+ * Store the object to persistent store
+ *
+ * @param persistentDataObject
+ * @throws WSRPException
+ */
private void store(PersistentDataObject persistentDataObject) throws WSRPException
{
@@ -594,7 +590,7 @@
/**
* Restores all available ConsumerConfiguredPortlets from persistent file store
*
- * @throws CommonException
+ * @throws WSRPException
*/
private void restore() throws WSRPException
{
1.12 +26 -37 ws-wsrp4j/src/org/apache/wsrp4j/producer/driver/WSRPEngine.java
Index: WSRPEngine.java
===================================================================
RCS file: /home/cvs/ws-wsrp4j/src/org/apache/wsrp4j/producer/driver/WSRPEngine.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- WSRPEngine.java 10 Aug 2005 14:59:57 -0000 1.11
+++ WSRPEngine.java 12 Aug 2005 12:56:52 -0000 1.12
@@ -179,9 +179,9 @@
}
/**
- Internal method.
- Returns an instance of the WSRPEngine
- @return WSRPEngine
+ * Internal method.
+ * Returns an instance of the WSRPEngine
+ * @return WSRPEngine
*/
public synchronized static WSRPEngine getInstance() throws java.rmi.RemoteException
{
@@ -333,7 +333,7 @@
*
* @exception java.rmi.RemoteException
*
- * @throws InvalidRegistration
+ * @throws java.rmi.RemoteException
* The given registrationhandle is invalid / not yet registered
*/
public ReturnAny deregister(RegistrationContext request) throws java.rmi.RemoteException
@@ -435,8 +435,8 @@
* @param registrationContext
* the registration handle of the consumer
*
- * @throws InvalidRegistration
- * @throws MissingParameterFault
+ * @throws java.rmi.RemoteException
+ * @throws WSRPException
*/
private void checkRegistration(RegistrationContext registrationContext)
throws java.rmi.RemoteException, WSRPException
@@ -470,7 +470,6 @@
*
* @param registrationContext
* @param portletHandle
- * @return
* @exception java.rmi.RemoteException
*/
private Portlet getPortlet(RegistrationContext registrationContext, String portletHandle)
@@ -534,11 +533,11 @@
}
/**
- Internal method.
- Validates if a cookie/the session value has been expired. If the cookie/session is expired an invalid
- cookie fault will be thrown.
- */
- private void checkCookie() throws java.rmi.RemoteException, WSRPException
+ * Internal method.
+ * Validates if a cookie/the session value has been expired. If the cookie/session is expired an invalid
+ * cookie fault will be thrown.
+ */
+ private void checkCookie() throws WSRPException
{
// check if http-session has expired; if so throw InvalidCookie-Exception.
MessageContext msgContext = AxisEngine.getCurrentMessageContext();
@@ -565,7 +564,7 @@
* @param markupParams The markup params from the consumer request
* @return The <code>MarkupType</code> object which should be used to call the portlet.
* @throws WSRPException In case no match was found
- **/
+ */
private MarkupType checkMarkupParams(PortletDescription portletDescription, MarkupParams markupParams)
throws WSRPException
{
@@ -645,24 +644,21 @@
logger.exit(Logger.TRACE_HIGH, MN);
}
return match;
- } else
+ }
+ // lets see if at least a the language can be done
+ if (LocaleHelper
+ .getLanguageCode(locales[m])
+ .equalsIgnoreCase(LocaleHelper.getLanguageCode(reqLocales[n])))
{
- // lets see if at least a the language can be done
- if (LocaleHelper
- .getLanguageCode(locales[m])
- .equalsIgnoreCase(LocaleHelper.getLanguageCode(reqLocales[n])))
- {
- match.setLocales(
- new String[] { LocaleHelper.getLanguageCode(locales[m])});
-
- if (logger.isLogging(Logger.TRACE_HIGH))
- {
- logger.exit(Logger.TRACE_HIGH, MN);
- }
+ match.setLocales(
+ new String[] { LocaleHelper.getLanguageCode(locales[m])});
- return match;
+ if (logger.isLogging(Logger.TRACE_HIGH))
+ {
+ logger.exit(Logger.TRACE_HIGH, MN);
}
+ return match;
}
}
}
@@ -949,7 +945,7 @@
* @param request
*/
private PortletContext handleCloneBeforeWrite(PerformBlockingInteraction request)
- throws WSRPException, java.rmi.RemoteException
+ throws java.rmi.RemoteException
{
// clone the portlet
@@ -982,8 +978,7 @@
*
* @return null
*
- * @throws MissingParameterFault
- * @throws InvalidRegistration
+ * @throws java.rmi.RemoteException
*/
public ReturnAny initCookie(InitCookie request) throws java.rmi.RemoteException
{
@@ -1066,8 +1061,6 @@
*
* @param request a generated wrapper containing all input arguments for this method
*
- * @return
- *
* @exception java.rmi.RemoteException
*/
public PortletDescriptionResponse getPortletDescription(GetPortletDescription request)
@@ -1125,7 +1118,6 @@
* the ConsumerRegistry (case registration is required).</p>
*
* @param request a generated wrapper containing all input arguments for this method
- * @return
* @exception java.rmi.RemoteException
*/
public PortletContext clonePortlet(ClonePortlet request) throws java.rmi.RemoteException
@@ -1278,7 +1270,6 @@
*
* @param request a generated wrapper containing all input arguments for this method
*
- * @return
* @exception java.rmi.RemoteException
*/
public PortletContext setPortletProperties(SetPortletProperties request) throws java.rmi.RemoteException
@@ -1389,8 +1380,6 @@
*
* @param request a generated wrapper containing all input arguments for this method
*
- * @return
- *
* @exception java.rmi.RemoteException
*/
public PortletPropertyDescriptionResponse getPortletPropertyDescription(GetPortletPropertyDescription request)
1.6 +5 -9 ws-wsrp4j/src/org/apache/wsrp4j/producer/driver/ConsumerRegistryImpl.java
Index: ConsumerRegistryImpl.java
===================================================================
RCS file: /home/cvs/ws-wsrp4j/src/org/apache/wsrp4j/producer/driver/ConsumerRegistryImpl.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ConsumerRegistryImpl.java 10 Aug 2005 14:59:57 -0000 1.5
+++ ConsumerRegistryImpl.java 12 Aug 2005 12:56:52 -0000 1.6
@@ -64,16 +64,14 @@
private HandleGenerator generator;
//persistence
- private PersistentDataObject persistentDataObject = null;//container for stored objects (information+data)
- private PersistentHandler persistentHandler = null;//generic persistence mechansim (store/restore)
+ private PersistentDataObject persistentDataObject;//container for stored objects (information+data)
+ private PersistentHandler persistentHandler; //generic persistence mechansim (store/restore)
//indicates whether the consumer requires registration
private boolean requiresRegistration = false;
- //refernce to the provider
- private Provider provider = null;
//holds the actual consumer information
- private Map registrations = null;
+ private Map registrations;
// log and trace support
private Logger logger = LogManager.getLogManager().getLogger(this.getClass());
@@ -93,8 +91,6 @@
logger.entry(Logger.TRACE_HIGH, MN);
}
- this.provider = provider;
-
if (provider != null)
{
@@ -145,7 +141,7 @@
/**
* Creates a new ConsumerRegistryImpl-object. To be called within
* an implementation of the abstract factory ConsumerRegistryFactory.
- @param provider the provider interface
+ * @param provider the provider interface
*/
public static ConsumerRegistryImpl create(Provider provider) throws WSRPException
{
1.5 +2 -1 ws-wsrp4j/src/org/apache/wsrp4j/util/HandleGeneratorImpl.java
Index: HandleGeneratorImpl.java
===================================================================
RCS file: /home/cvs/ws-wsrp4j/src/org/apache/wsrp4j/util/HandleGeneratorImpl.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- HandleGeneratorImpl.java 10 Aug 2005 15:10:23 -0000 1.4
+++ HandleGeneratorImpl.java 12 Aug 2005 12:56:53 -0000 1.5
@@ -37,6 +37,7 @@
*/
private HandleGeneratorImpl()
{
+ // no public constructor
}
/**
1.7 +5 -10 ws-wsrp4j/src/org/apache/wsrp4j/util/PropertyListHelper.java
Index: PropertyListHelper.java
===================================================================
RCS file: /home/cvs/ws-wsrp4j/src/org/apache/wsrp4j/util/PropertyListHelper.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- PropertyListHelper.java 11 Aug 2005 13:00:01 -0000 1.6
+++ PropertyListHelper.java 12 Aug 2005 12:56:53 -0000 1.7
@@ -44,9 +44,9 @@
*/
public class PropertyListHelper
{
- DocumentBuilderFactory factory = null;
- DocumentBuilder docBuilder = null;
- Document doc = null;
+ DocumentBuilderFactory factory;
+ DocumentBuilder docBuilder;
+ Document doc;
public PropertyListHelper()
{
@@ -267,13 +267,8 @@
if (node != null)
{
return node.getNodeValue();
- } else
- {
- return null;
}
-
- //return sw.toString();
-
+ return null;
}
}
1.12 +4 -15 ws-wsrp4j/src/org/apache/wsrp4j/util/ParameterChecker.java
Index: ParameterChecker.java
===================================================================
RCS file: /home/cvs/ws-wsrp4j/src/org/apache/wsrp4j/util/ParameterChecker.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- ParameterChecker.java 11 Aug 2005 13:00:01 -0000 1.11
+++ ParameterChecker.java 12 Aug 2005 12:56:53 -0000 1.12
@@ -73,13 +73,6 @@
// for logging and exception support
private Logger logger = LogManager.getLogManager().getLogger(ParameterChecker.class);
- /**
- * Default Constructor
- */
- public ParameterChecker()
- {
- }
-
/**
* @return true if we check
*/
@@ -1140,13 +1133,9 @@
// check only, if object not null.
if (requiresInit != null)
{
- if (requiresInit.toString().equals(CookieProtocol._none))
- {
- } else if (requiresInit.toString().equals(CookieProtocol._perGroup))
- {
- } else if (requiresInit.toString().equals(CookieProtocol._perUser))
- {
- } else
+ if ( !requiresInit.toString().equals(CookieProtocol._none)
+ && !requiresInit.toString().equals(CookieProtocol._perGroup)
+ && !requiresInit.toString().equals(CookieProtocol._perUser))
{
throwMissingParametersFault(
"Invalid value (" + requiresInit.toString() + ") of CookieProtocol object.");
1.5 +18 -5 ws-wsrp4j/src/org/apache/wsrp4j/util/DOMSupport.java
Index: DOMSupport.java
===================================================================
RCS file: /home/cvs/ws-wsrp4j/src/org/apache/wsrp4j/util/DOMSupport.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- DOMSupport.java 10 Aug 2005 15:10:23 -0000 1.4
+++ DOMSupport.java 12 Aug 2005 12:56:53 -0000 1.5
@@ -51,7 +51,6 @@
public static final short OUTPUT_DOM_TREE_OUTPUT_COMMENT_NODES_HIDE_CONTENT = 2;
public static final short OUTPUT_DOM_TREE_OUTPUT_COMMENT_NODES_FULLY = 3;
- private static final String XML_OUTPUT_INDENTATION_SPACE = " ";
private static final int MAX_PRINTABLE_TREE_DEPTH = 256;
public static void dumpDOMNode(
PrintWriter outputTarget,
@@ -348,6 +347,7 @@
outputTarget.write("<?xml version=\"1.0\" encoding=\"UTF-8\"?>" + endLine);
} catch (IOException e)
{
+ // ignore
}
break;
@@ -357,6 +357,7 @@
outputTarget.write("<!DOCTYPE " + node.getNodeName() + ">" + endLine);
} catch (IOException e)
{
+ // ignore
}
break;
@@ -368,6 +369,7 @@
outputTarget.write(indentS + "<" + nodeName);
} catch (IOException e)
{
+ // ignore
}
nnm = node.getAttributes();
@@ -385,6 +387,7 @@
" " + attributeNode.getNodeName() + "=\"" + attributeNode.getNodeValue() + "\"");
} catch (IOException e)
{
+ // ignore
}
}
}
@@ -396,6 +399,7 @@
outputTarget.write(">" + endLine);
} catch (IOException e)
{
+ // ignore
}
child = node.getFirstChild();
@@ -411,6 +415,7 @@
outputTarget.write(indentS + "</" + nodeName + ">" + endLine);
} catch (IOException e)
{
+ // ignore
}
} else
{
@@ -419,6 +424,7 @@
outputTarget.write("/>" + endLine);
} catch (IOException e)
{
+ // ignore
}
}
break;
@@ -429,6 +435,7 @@
outputTarget.write("&" + node.getNodeName() + ";");
} catch (IOException e)
{
+ // ignore
}
break;
@@ -438,6 +445,7 @@
outputTarget.write(indentS + "<![CDATA[" + node.getNodeValue() + "]]>" + endLine);
} catch (IOException e)
{
+ // ignore
}
break;
@@ -447,6 +455,7 @@
outputTarget.write(normalize(node.getNodeValue()));
} catch (IOException e)
{
+ // ignore
}
break;
@@ -456,6 +465,7 @@
outputTarget.write(indentS + "<?" + node.getNodeName());
} catch (IOException e)
{
+ // ignore
}
piData = node.getNodeValue();
@@ -467,6 +477,7 @@
outputTarget.write(" " + piData);
} catch (IOException e)
{
+ // ignore
}
}
@@ -475,6 +486,7 @@
outputTarget.write("?>" + endLine);
} catch (IOException e)
{
+ // ignore
}
break;
@@ -488,6 +500,7 @@
outputTarget.write(indentS + "<!--");
} catch (IOException e)
{
+ // ignore
}
commentData = node.getNodeValue();
@@ -499,6 +512,7 @@
outputTarget.write(" " + commentData);
} catch (IOException e)
{
+ // ignore
}
}
try
@@ -506,6 +520,7 @@
outputTarget.write(" -->" + endLine);
} catch (IOException e)
{
+ // ignore
}
break;
@@ -562,10 +577,8 @@
if (doc != null)
{
return doc.getDocumentElement();
- } else
- {
- return null;
}
+ return null;
}
public static Document getOwnerDocument(Node node)
{
1.6 +1 -9 ws-wsrp4j/src/org/apache/wsrp4j/util/StateChangedServiceImpl.java
Index: StateChangedServiceImpl.java
===================================================================
RCS file: /home/cvs/ws-wsrp4j/src/org/apache/wsrp4j/util/StateChangedServiceImpl.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- StateChangedServiceImpl.java 10 Aug 2005 15:10:23 -0000 1.5
+++ StateChangedServiceImpl.java 12 Aug 2005 12:56:53 -0000 1.6
@@ -32,14 +32,6 @@
private ArrayList _listeners = new ArrayList();
/**
- * Constructor
- */
- public StateChangedServiceImpl()
- {
-
- }
-
- /**
* Adds a StateChangedListener object to the internal
* array list.
*
1.9 +3 -3 ws-wsrp4j/src/org/apache/wsrp4j/util/WindowStates.java
Index: WindowStates.java
===================================================================
RCS file: /home/cvs/ws-wsrp4j/src/org/apache/wsrp4j/util/WindowStates.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- WindowStates.java 11 Aug 2005 13:00:01 -0000 1.8
+++ WindowStates.java 12 Aug 2005 12:56:53 -0000 1.9
@@ -71,7 +71,7 @@
return fromValue(value);
}
- public boolean equals(java.lang.Object obj)
+ public boolean equals(Object obj)
{
return (obj == this);
}
@@ -86,7 +86,7 @@
return _value_;
}
- public java.lang.Object readResolve() throws java.io.ObjectStreamException
+ public Object readResolve()
{
return fromValue(_value_);
}
1.5 +3 -3 ws-wsrp4j/src/org/apache/wsrp4j/producer/provider/ConsumerConfiguredPortlet.java
Index: ConsumerConfiguredPortlet.java
===================================================================
RCS file: /home/cvs/ws-wsrp4j/src/org/apache/wsrp4j/producer/provider/ConsumerConfiguredPortlet.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ConsumerConfiguredPortlet.java 10 Aug 2005 15:10:24 -0000 1.4
+++ ConsumerConfiguredPortlet.java 12 Aug 2005 12:56:53 -0000 1.5
@@ -33,7 +33,7 @@
*
* @param handle String representing the portlet handle of the corresponding
* parent ProducerOfferedPortlet.
- **/
+ */
void setParentHandle(String handle);
/**
@@ -41,7 +41,7 @@
*
* @return String representing the portlet handle of the corresponding parent
* ProducerOfferedPortlet.
- **/
+ */
String getParentHandle();
/**
1.6 +6 -6 ws-wsrp4j/src/org/apache/wsrp4j/producer/provider/DescriptionHandler.java
Index: DescriptionHandler.java
===================================================================
RCS file: /home/cvs/ws-wsrp4j/src/org/apache/wsrp4j/producer/provider/DescriptionHandler.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- DescriptionHandler.java 10 Aug 2005 15:10:24 -0000 1.5
+++ DescriptionHandler.java 12 Aug 2005 12:56:53 -0000 1.6
@@ -42,14 +42,14 @@
* @param desiredLocales array of requested locales, if null request all available locales
*
*/
- public ServiceDescription getServiceDescription(RegistrationContext regContext, String[] desiredLocales) throws WSRPException;
+ ServiceDescription getServiceDescription(RegistrationContext regContext, String[] desiredLocales) throws WSRPException;
/**
* Indicates whether registration is required (for this Producer) or not.
*
* @return Returns true if registration is required, otherwise false.
*/
- public boolean isRegistrationRequired() throws WSRPException;
+ boolean isRegistrationRequired() throws WSRPException;
/**
* Returns an array containing all portlet descriptions, i.e. one portlet
@@ -61,7 +61,7 @@
*
* @return Array of PortletDescription-objects.
*/
- public PortletDescription[] getProducerOfferedPortletDescriptions(
+ PortletDescription[] getProducerOfferedPortletDescriptions(
RegistrationContext regContext,
String[] desiredLocales)
throws WSRPException;
@@ -79,7 +79,7 @@
*
* @return PortletDescription
*/
- public PortletDescription getPortletDescription(
+ PortletDescription getPortletDescription(
String portletHandle,
RegistrationContext regContext,
UserContext userContext,
@@ -93,6 +93,6 @@
*
* @return PortletDescription
*/
- public PortletDescription getPortletDescription(String portletHandle) throws WSRPException;
+ PortletDescription getPortletDescription(String portletHandle) throws WSRPException;
}
1.6 +4 -4 ws-wsrp4j/src/org/apache/wsrp4j/producer/provider/URLComposer.java
Index: URLComposer.java
===================================================================
RCS file: /home/cvs/ws-wsrp4j/src/org/apache/wsrp4j/producer/provider/URLComposer.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- URLComposer.java 10 Aug 2005 15:10:24 -0000 1.5
+++ URLComposer.java 12 Aug 2005 12:56:53 -0000 1.6
@@ -70,7 +70,7 @@
* @param portletContext If a portlet context is passed with a valid portlet handle
* then this handle is used to be inserted in the url only
* if the runtimecontext contained a valid blockingAction or default template.
- **/
+ */
String createBlockingActionURL(
String portletMode,
String navigationalState,
@@ -111,7 +111,7 @@
* @param portletContext If a portlet context is passed with a valid portlet handle
* then this handle is used to be inserted in the url only
* if the runtimecontext contained a valid render or default template.
- **/
+ */
String createRenderURL(
String portletMode,
String navigationalState,
@@ -147,7 +147,7 @@
* @param portletContext If a portlet context is passed with a valid portlet handle
* then this handle is used to be inserted in the url only
* if the runtimecontext contained a valid resource or default template.
- **/
+ */
String createResourceURL(
String url,
boolean rewriteResource,
1.6 +54 -54 ws-wsrp4j/src/org/apache/wsrp4j/producer/provider/PortletStateManager.java
Index: PortletStateManager.java
===================================================================
RCS file: /home/cvs/ws-wsrp4j/src/org/apache/wsrp4j/producer/provider/PortletStateManager.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- PortletStateManager.java 10 Aug 2005 15:10:24 -0000 1.5
+++ PortletStateManager.java 12 Aug 2005 12:56:53 -0000 1.6
@@ -31,92 +31,92 @@
static final int INITIALIZATION_FAILED = 3007;//TODO do we need this?
/**
- Returns the portlet's state for a given portlet handle
- @param portletHandle String representing a portlet handle
- @return PortletState
- */
+ * Returns the portlet's state for a given portlet handle
+ * @param portletHandle String representing a portlet handle
+ * @return PortletState
+ */
PortletState get(String portletHandle);
/**
- Returns the portlet's state as String for a given portlet handle
- @param portletHandle String representing a portlet handle
- @return String representing the portlet's state
- */
+ * Returns the portlet's state as String for a given portlet handle
+ * @param portletHandle String representing a portlet handle
+ * @return String representing the portlet's state
+ */
String getAsString(String portletHandle);
/**
- Converts a PortletState object to java.lang.String
- @param state PortletState
- @return java.lang.String representing a portlet state
- */
+ * Converts a PortletState object to java.lang.String
+ * @param state PortletState
+ * @return java.lang.String representing a portlet state
+ */
String getAsString(PortletState state);
/**
- Converts a subset of the portlet stateto java.lang.String.
- The subset of the state is represented by an array of names.
- @param portletHandle String representing a portlet handle
- @param names array of String
- @return String representing a subset of a portlte state
- */
+ * Converts a subset of the portlet stateto java.lang.String.
+ * The subset of the state is represented by an array of names.
+ * @param portletHandle String representing a portlet handle
+ * @param names array of String
+ * @return String representing a subset of a portlte state
+ */
String getAsString(String portletHandle, String[] names);
/**
- Returns the portlet's state as PropertyList
- @param portletHandle String representing a portlte handle
- @return PropertyList
- */
+ * Returns the portlet's state as PropertyList
+ * @param portletHandle String representing a portlte handle
+ * @return PropertyList
+ */
PropertyList getAsPropertyList(String portletHandle);
/**
- Converts a portlet's state to a PropertyList
- @param state the portlet's state
- @return PropertyList
- */
+ * Converts a portlet's state to a PropertyList
+ * @param state the portlet's state
+ * @return PropertyList
+ */
PropertyList getAsPropertyList(PortletState state);
/**
- Converts a subset of the portlet state to a PropertyList. The subset
- of the state is represented by an array of names.
- @param portletHandle String representing a portlet handle
- @param names array of String
- @return PropertyList
- */
+ * Converts a subset of the portlet state to a PropertyList. The subset
+ * of the state is represented by an array of names.
+ * @param portletHandle String representing a portlet handle
+ * @param names array of String
+ * @return PropertyList
+ */
PropertyList getAsPropertyList(String portletHandle, String[] names);
/**
- Set the portlet's state
- @param portletHandle String representing a portlet handle
- @param state PortletState
- */
+ * Set the portlet's state
+ * @param portletHandle String representing a portlet handle
+ * @param state PortletState
+ */
void set(String portletHandle, PortletState state);
/**
- Set the portlet state
- @param portletHandle String representing a portlet handle
- @param state String representing the portlet's state
- */
+ * Set the portlet state
+ * @param portletHandle String representing a portlet handle
+ * @param state String representing the portlet's state
+ */
void setAsString(String portletHandle, String state);
/**
- Set the portlet state
- @param portletHandle String representing a portlet handle
- @param state PropretyList representing the portlte's state
- */
+ * Set the portlet state
+ * @param portletHandle String representing a portlet handle
+ * @param state PropretyList representing the portlte's state
+ */
void setAsPropertyList(String portletHandle, PropertyList state);
/**
- Destroys a portlet state
- @param portletHandle String representing a portlet handle
- */
+ * Destroys a portlet state
+ * @param portletHandle String representing a portlet handle
+ */
void destroy(String portletHandle);
/**
- Returns the WSRP model description for a portlet's state.
- @param portletHandle String representing a portlet handle
- @param desiredLocales determine the desired locales
- @param sendAllLocales indicates if all locales are desired
- @return ModelDescription
- */
+ * Returns the WSRP model description for a portlet's state.
+ * @param portletHandle String representing a portlet handle
+ * @param desiredLocales determine the desired locales
+ * @param sendAllLocales indicates if all locales are desired
+ * @return ModelDescription
+ */
ModelDescription getModelDescription(String portletHandle,
String[] desiredLocales,
boolean sendAllLocales);
1.8 +11 -11 ws-wsrp4j/src/org/apache/wsrp4j/producer/provider/PortletInvoker.java
Index: PortletInvoker.java
===================================================================
RCS file: /home/cvs/ws-wsrp4j/src/org/apache/wsrp4j/producer/provider/PortletInvoker.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- PortletInvoker.java 10 Aug 2005 15:10:24 -0000 1.7
+++ PortletInvoker.java 12 Aug 2005 12:56:53 -0000 1.8
@@ -31,19 +31,19 @@
{
/**
- Generate the WSRP MarkupResponse for a given MarkupRequest
- @param request GetMarkup WSRP markup request
- @return MarkupResponse
- @throw WSRPException
- */
+ * Generate the WSRP MarkupResponse for a given MarkupRequest
+ * @param request GetMarkup WSRP markup request
+ * @return MarkupResponse
+ * @throw WSRPException
+ */
MarkupResponse invokeGetMarkup(GetMarkup request) throws WSRPException;
/**
- Invoke a portlet action for a given WSRP action request
- @param request WSRP blocking interaction request
- @return BlockingInteractionResponse
- @throw WSRPExceptin
- */
+ * Invoke a portlet action for a given WSRP action request
+ * @param request WSRP blocking interaction request
+ * @return BlockingInteractionResponse
+ * @throw WSRPExceptin
+ */
BlockingInteractionResponse invokePerformBlockingInteraction(
PerformBlockingInteraction request)
throws WSRPException;
1.6 +7 -7 ws-wsrp4j/src/org/apache/wsrp4j/producer/provider/PortletState.java
Index: PortletState.java
===================================================================
RCS file: /home/cvs/ws-wsrp4j/src/org/apache/wsrp4j/producer/provider/PortletState.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- PortletState.java 10 Aug 2005 15:10:24 -0000 1.5
+++ PortletState.java 12 Aug 2005 12:56:53 -0000 1.6
@@ -110,15 +110,15 @@
void setPropertyMap(HashMap propertyMap);
/**
- Set the WSRP model description
- @param modelDescription WSRP model description
- */
+ * Set the WSRP model description
+ * @param modelDescription WSRP model description
+ */
void setModelDescription(ModelDescription modelDescription);
/**
- Return the WSRP model description
- @return ModelDescription
- */
+ * Return the WSRP model description
+ * @return ModelDescription
+ */
ModelDescription getModelDescription();
}
1.6 +7 -7 ws-wsrp4j/src/org/apache/wsrp4j/producer/provider/pluto/PlutoProvider.java
Index: PlutoProvider.java
===================================================================
RCS file: /home/cvs/ws-wsrp4j/src/org/apache/wsrp4j/producer/provider/pluto/PlutoProvider.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- PlutoProvider.java 10 Aug 2005 15:10:25 -0000 1.5
+++ PlutoProvider.java 12 Aug 2005 12:56:53 -0000 1.6
@@ -28,15 +28,15 @@
public interface PlutoProvider extends Provider
{
/**
- Returns an interface to a 'Pluto'- specific portlet container implementation
- @return PortletContainer
- */
+ * Returns an interface to a 'Pluto'- specific portlet container implementation
+ * @return PortletContainer
+ */
PortletContainer getPortletContainer();
/**
- Returns an interface to a 'Pluto'- specific portlet pool implementation
- @return PlutoPortletPool
- */
+ * Returns an interface to a 'Pluto'- specific portlet pool implementation
+ * @return PlutoPortletPool
+ */
PlutoPortletPool getPlutoPortletPool();
}
1.5 +7 -7 ws-wsrp4j/src/org/apache/wsrp4j/producer/provider/pluto/PlutoPortletPool.java
Index: PlutoPortletPool.java
===================================================================
RCS file: /home/cvs/ws-wsrp4j/src/org/apache/wsrp4j/producer/provider/pluto/PlutoPortletPool.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- PlutoPortletPool.java 10 Aug 2005 15:10:25 -0000 1.4
+++ PlutoPortletPool.java 12 Aug 2005 12:56:53 -0000 1.5
@@ -30,15 +30,15 @@
public interface PlutoPortletPool extends PortletPool
{
/**
- Get the Provider the portlet pool belongs to.
- @return Provider
- */
+ * Get the Provider the portlet pool belongs to.
+ * @return Provider
+ */
Provider getProvider();
/**
- Set the Provider for the portlet pool
- @param provider
- */
+ * Set the Provider for the portlet pool
+ * @param provider
+ */
void setProvider(Provider provider);
}
1.5 +3 -12 ws-wsrp4j/src/org/apache/wsrp4j/producer/provider/driver/ConsumerPortletRegistrationImpl.java
Index: ConsumerPortletRegistrationImpl.java
===================================================================
RCS file: /home/cvs/ws-wsrp4j/src/org/apache/wsrp4j/producer/provider/driver/ConsumerPortletRegistrationImpl.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ConsumerPortletRegistrationImpl.java 10 Aug 2005 15:10:25 -0000 1.4
+++ ConsumerPortletRegistrationImpl.java 12 Aug 2005 12:56:53 -0000 1.5
@@ -30,24 +30,15 @@
{
// the registrationHandle of the consumer
- private String _registrationHandle = null;
+ private String _registrationHandle;
// collects all portletHandles for this registrationHandle
private HashSet _portletHandles = new HashSet();
/**
- * Default Constructor
- */
- public ConsumerPortletRegistrationImpl()
- {
-
- }
-
-
- /**
* Sets the registration handle for a specific consumer
*
- * @param regHandle, consumer registration handle
+ * @param regHandle consumer registration handle
*/
public void setRegistrationHandle(String regHandle)
{
1.5 +4 -4 ws-wsrp4j/src/org/apache/wsrp4j/producer/provider/driver/ConsumerConfiguredPortletImpl.java
Index: ConsumerConfiguredPortletImpl.java
===================================================================
RCS file: /home/cvs/ws-wsrp4j/src/org/apache/wsrp4j/producer/provider/driver/ConsumerConfiguredPortletImpl.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ConsumerConfiguredPortletImpl.java 10 Aug 2005 15:10:25 -0000 1.4
+++ ConsumerConfiguredPortletImpl.java 12 Aug 2005 12:56:53 -0000 1.5
@@ -23,7 +23,7 @@
*
* @author <a href="mailto:stefan.behl@de.ibm.com">Stefan Behl</a>
*
- * @see ConsumerConfiguredPortlet, PortletImpl
+ * @see ConsumerConfiguredPortlet PortletImpl
* @version $Id$
*/
public class ConsumerConfiguredPortletImpl extends PortletImpl implements ConsumerConfiguredPortlet
@@ -39,7 +39,7 @@
*
* @param handle String representing the portlet handle of the corresponding
* parent ProducerOfferedPortlet.
- **/
+ */
public void setParentHandle(String handle)
{
parentHandle = handle;
@@ -50,7 +50,7 @@
*
* @return String representing the portlet handle of the corresponding parent
* ProducerOfferedPortlet.
- **/
+ */
public String getParentHandle()
{
return parentHandle;
1.5 +2 -2 ws-wsrp4j/src/org/apache/wsrp4j/producer/provider/driver/PortletImpl.java
Index: PortletImpl.java
===================================================================
RCS file: /home/cvs/ws-wsrp4j/src/org/apache/wsrp4j/producer/provider/driver/PortletImpl.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- PortletImpl.java 10 Aug 2005 15:10:25 -0000 1.4
+++ PortletImpl.java 12 Aug 2005 12:56:53 -0000 1.5
@@ -28,7 +28,7 @@
*
* @author <a href="mailto:stefan.behl@de.ibm.com">Stefan Behl</a>
*
- * @see ProducerOfferedPortlet
+ * @see org.apache.wsrp4j.producer.provider.ProducerOfferedPortlet
* @version $Id$
*/
public abstract class PortletImpl implements Portlet, Serializable
1.5 +9 -74 ws-wsrp4j/src/org/apache/wsrp4j/producer/provider/driver/URLComposerImpl.java
Index: URLComposerImpl.java
===================================================================
RCS file: /home/cvs/ws-wsrp4j/src/org/apache/wsrp4j/producer/provider/driver/URLComposerImpl.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- URLComposerImpl.java 10 Aug 2005 15:10:25 -0000 1.4
+++ URLComposerImpl.java 12 Aug 2005 12:56:53 -0000 1.5
@@ -15,6 +15,7 @@
*/
package org.apache.wsrp4j.producer.provider.driver;
+import java.io.UnsupportedEncodingException;
import java.net.URLEncoder;
import oasis.names.tc.wsrp.v1.types.PortletContext;
@@ -45,20 +46,17 @@
*/
public class URLComposerImpl implements URLComposer
{
- // the provider implementation
- private Provider provider = null;
-
// for logging and exception support
private Logger logger = LogManager.getLogManager().getLogger(this.getClass());
private URLComposerImpl()
{
+ // private
}
public static URLComposerImpl getInstance(Provider provider)
{
URLComposerImpl urlComposer = new URLComposerImpl();
- urlComposer.provider = provider;
return urlComposer;
}
@@ -455,7 +453,12 @@
if (url != null && url.length() > 0)
{
resultURL.append(Constants.NEXT_PARAM_AMP);
- resultURL.append(appendNameValuePair(Constants.URL, URLEncoder.encode(url)));
+ try {
+ resultURL.append(appendNameValuePair(Constants.URL, URLEncoder.encode(url, "utf-8")));
+ } catch (UnsupportedEncodingException uee) {
+ // this should never happen
+ resultURL.append(appendNameValuePair(Constants.URL, url));
+ }
}
// rewriteResource
@@ -512,31 +515,6 @@
String portletMode,
String navigationalState,
String interactionState,
- String windowState)
- throws WSRPException
- {
-
- return processTemplate(
- blockingActionTemplate,
- Constants.URL_TYPE_BLOCKINGACTION,
- portletMode,
- navigationalState,
- interactionState,
- windowState,
- null,
- null,
- null,
- null,
- null,
- null);
-
- }
-
- private String createBlockingActionURLByTemplate(
- String blockingActionTemplate,
- String portletMode,
- String navigationalState,
- String interactionState,
String windowState,
String portletHandle,
String userContextKey,
@@ -565,29 +543,6 @@
String renderTemplate,
String portletMode,
String navigationalState,
- String windowState)
- throws WSRPException
- {
-
- return processTemplate(
- renderTemplate,
- Constants.URL_TYPE_RENDER,
- portletMode,
- navigationalState,
- null,
- windowState,
- null,
- null,
- null,
- null,
- null,
- null);
- }
-
- private String createRenderURLByTemplate(
- String renderTemplate,
- String portletMode,
- String navigationalState,
String windowState,
String portletHandle,
String userContextKey,
@@ -612,26 +567,6 @@
}
- private String createResourceURLByTemplate(String resourceTemplate, String url, boolean rewriteResource)
- throws WSRPException
- {
-
- return processTemplate(
- resourceTemplate,
- Constants.URL_TYPE_RESOURCE,
- null,
- null,
- null,
- null,
- url,
- java.lang.String.valueOf(rewriteResource),
- null,
- null,
- null,
- null);
-
- }
-
private String createResourceURLByTemplate(
String resourceTemplate,
String url,
1.6 +3 -5 ws-wsrp4j/src/org/apache/wsrp4j/producer/provider/driver/ProducerOfferedPortletImpl.java
Index: ProducerOfferedPortletImpl.java
===================================================================
RCS file: /home/cvs/ws-wsrp4j/src/org/apache/wsrp4j/producer/provider/driver/ProducerOfferedPortletImpl.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ProducerOfferedPortletImpl.java 10 Aug 2005 15:10:25 -0000 1.5
+++ ProducerOfferedPortletImpl.java 12 Aug 2005 12:56:53 -0000 1.6
@@ -39,7 +39,7 @@
private boolean requiresRegistration = false;
// list of clone handles for this ProducerOfferedPortlet
- public LinkedList cloneHandles = null;
+ public LinkedList cloneHandles;
/**
* constructor
@@ -106,9 +106,7 @@
*/
public void deleteClone(ConsumerConfiguredPortlet cce)
{
- if (cloneHandles.remove(cce))
- {
- }
+ cloneHandles.remove(cce);
}
/**
1.6 +16 -16 ws-wsrp4j/src/org/apache/wsrp4j/producer/provider/driver/PortletRegistrationFilterImpl.java
Index: PortletRegistrationFilterImpl.java
===================================================================
RCS file: /home/cvs/ws-wsrp4j/src/org/apache/wsrp4j/producer/provider/driver/PortletRegistrationFilterImpl.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- PortletRegistrationFilterImpl.java 10 Aug 2005 15:10:25 -0000 1.5
+++ PortletRegistrationFilterImpl.java 12 Aug 2005 12:56:53 -0000 1.6
@@ -43,13 +43,13 @@
{
// a filter
- private static PortletRegistrationFilterImpl filter = null;
+ private static PortletRegistrationFilterImpl filter;
// persistence support
- private PersistentDataObject persistentDataObject = null;
+ private PersistentDataObject persistentDataObject;
// persistence support
- private PersistentHandler persistentHandler = null;
+ private PersistentHandler persistentHandler;
// collects ConsumerPortletRegistration objects. RegistrationHandle
// is the key
@@ -314,13 +314,13 @@
}
/**
- * Abrogates the availability of a certain portlet (identified by portletHandle)
- * regarding a certain consumer (identified by regHandle). If there is no entry
- * for the provided regHandle and portletHandle, the method performs nothing.
- *
- * @param regHandle String representing the registration handle of a consumer
- * @param portletHandle String representing the portlet handle of a consumer
- */
+ * Abrogates the availability of a certain portlet (identified by portletHandle)
+ * regarding a certain consumer (identified by regHandle). If there is no entry
+ * for the provided regHandle and portletHandle, the method performs nothing.
+ *
+ * @param regHandle String representing the registration handle of a consumer
+ * @param portletHandle String representing the portlet handle of a consumer
+ */
public void remove(String regHandle, String portletHandle) throws WSRPException
{
@@ -414,11 +414,11 @@
}
/**
- * Store the ConsumerPortletRegistration object to persistent store
- *
- * @param persistentDataObject
- * @throws WSRPException
- */
+ * Store the ConsumerPortletRegistration object to persistent store
+ *
+ * @param persistentDataObject
+ * @throws WSRPException
+ */
private void store(PersistentDataObject persistentDataObject) throws WSRPException
{
String MN = "store";
1.6 +6 -6 ws-wsrp4j/src/org/apache/wsrp4j/producer/ProviderAccess.java
Index: ProviderAccess.java
===================================================================
RCS file: /home/cvs/ws-wsrp4j/src/org/apache/wsrp4j/producer/ProviderAccess.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ProviderAccess.java 10 Aug 2005 14:59:57 -0000 1.5
+++ ProviderAccess.java 12 Aug 2005 12:56:54 -0000 1.6
@@ -80,11 +80,11 @@
}
/**
- Internal mehtod.
- Returns a configured Factory class.
- @param type java.lang.String representing the factory type.
- @return java.lang.Object
- */
+ * Internal mehtod.
+ * Returns a configured Factory class.
+ * @param type java.lang.String representing the factory type.
+ * @return java.lang.Object
+ */
private static Object getFactory(String type) throws WSRPException
{
String MN = "getFactory";
1.6 +8 -8 ws-wsrp4j/src/org/apache/wsrp4j/producer/ConsumerRegistryAccess.java
Index: ConsumerRegistryAccess.java
===================================================================
RCS file: /home/cvs/ws-wsrp4j/src/org/apache/wsrp4j/producer/ConsumerRegistryAccess.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ConsumerRegistryAccess.java 10 Aug 2005 14:59:57 -0000 1.5
+++ ConsumerRegistryAccess.java 12 Aug 2005 12:56:54 -0000 1.6
@@ -41,10 +41,10 @@
public static String CONSUMER_REGISTRY_FACTORY = "consumer.registry.factory";
// the content of the properties file
- private static Properties pFactories = null;
+ private static Properties pFactories;
// holds an instance of a consumer registry
- private static ConsumerRegistry consumerRegistry = null;
+ private static ConsumerRegistry consumerRegistry;
// log and trace support
private static Logger logger = LogManager.getLogManager().getLogger(ConsumerRegistryAccess.class);
@@ -79,11 +79,11 @@
}
/**
- Internal mehtod.
- Returns a configured Factory class.
- @param type java.lang.String representing the factory type.
- @return java.lang.Object
- */
+ * Internal mehtod.
+ * Returns a configured Factory class.
+ * @param type java.lang.String representing the factory type.
+ * @return java.lang.Object
+ */
private static Object getFactory(String type) throws WSRPException
{
String MN = "getFactory";