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 2006/02/05 18:29:18 UTC
svn commit: r375059 - in /portals/wsrp4j/trunk:
commons/src/java/org/apache/wsrp4j/commons/exception/
consumer-swingconsumer/src/java/org/apache/wsrp4j/consumer/swingconsumer/driver/
persistence-xml/src/java/org/apache/wsrp4j/persistence/xml/driver/ pr...
Author: cziegeler
Date: Sun Feb 5 09:29:15 2006
New Revision: 375059
URL: http://svn.apache.org/viewcvs?rev=375059&view=rev
Log:
Code cleanup
Modified:
portals/wsrp4j/trunk/commons/src/java/org/apache/wsrp4j/commons/exception/ErrorCodes.java
portals/wsrp4j/trunk/commons/src/java/org/apache/wsrp4j/commons/exception/Messages.java
portals/wsrp4j/trunk/commons/src/java/org/apache/wsrp4j/commons/exception/WSRPException.java
portals/wsrp4j/trunk/commons/src/java/org/apache/wsrp4j/commons/exception/WSRPXHelper.java
portals/wsrp4j/trunk/consumer-swingconsumer/src/java/org/apache/wsrp4j/consumer/swingconsumer/driver/SwingConsumer.java
portals/wsrp4j/trunk/persistence-xml/src/java/org/apache/wsrp4j/persistence/xml/driver/ServerPersistentInformationProviderImpl.java
portals/wsrp4j/trunk/producer/pom.xml
portals/wsrp4j/trunk/producer/src/java/org/apache/wsrp4j/producer/provider/pluto/driver/DescriptionHandlerImpl.java
portals/wsrp4j/trunk/producer/src/java/org/apache/wsrp4j/producer/provider/pluto/driver/DynamicInformationProviderImpl.java
portals/wsrp4j/trunk/producer/src/java/org/apache/wsrp4j/producer/provider/pluto/driver/InformationProviderServiceFactoryImpl.java
portals/wsrp4j/trunk/producer/src/java/org/apache/wsrp4j/producer/provider/pluto/driver/PortletActionProviderImpl.java
portals/wsrp4j/trunk/producer/src/java/org/apache/wsrp4j/producer/provider/pluto/driver/PortletInvokerImpl.java
portals/wsrp4j/trunk/producer/src/java/org/apache/wsrp4j/producer/provider/pluto/driver/PortletPoolImpl.java
portals/wsrp4j/trunk/producer/src/java/org/apache/wsrp4j/producer/provider/pluto/driver/PortletStateImpl.java
portals/wsrp4j/trunk/producer/src/java/org/apache/wsrp4j/producer/provider/pluto/driver/PortletStateManagerImpl.java
portals/wsrp4j/trunk/producer/src/java/org/apache/wsrp4j/producer/provider/pluto/driver/PortletURLProviderImpl.java
portals/wsrp4j/trunk/producer/src/java/org/apache/wsrp4j/producer/provider/pluto/driver/ProviderFactoryImpl.java
portals/wsrp4j/trunk/producer/src/java/org/apache/wsrp4j/producer/provider/pluto/driver/ProviderImpl.java
portals/wsrp4j/trunk/producer/src/java/org/apache/wsrp4j/producer/provider/pluto/driver/ResourceURLProviderImpl.java
portals/wsrp4j/trunk/producer/src/java/org/apache/wsrp4j/producer/provider/pluto/driver/ServletRequestFactoryImpl.java
portals/wsrp4j/trunk/producer/src/java/org/apache/wsrp4j/producer/provider/pluto/driver/StoredResponse.java
portals/wsrp4j/trunk/producer/src/java/org/apache/wsrp4j/producer/provider/pluto/driver/WSRPPortletEntityImpl.java
portals/wsrp4j/trunk/producer/src/java/org/apache/wsrp4j/producer/provider/pluto/driver/WSRPRenderResponseFactoryImpl.java
portals/wsrp4j/trunk/producer/src/java/org/apache/wsrp4j/producer/provider/pluto/driver/WSRPRenderResponseImpl.java
portals/wsrp4j/trunk/producer/src/java/org/apache/wsrp4j/producer/provider/pluto/driver/WSRPServletRequestWrapperImpl.java
portals/wsrp4j/trunk/producer/src/java/org/apache/wsrp4j/producer/provider/pluto/interfaces/PlutoPortletPool.java
portals/wsrp4j/trunk/producer/src/java/org/apache/wsrp4j/producer/provider/pluto/interfaces/PlutoProvider.java
portals/wsrp4j/trunk/producer/src/java/org/apache/wsrp4j/producer/provider/pluto/interfaces/WSRPDynamicInformationProvider.java
portals/wsrp4j/trunk/testportlet/src/java/org/apache/wsrp4j/testportlet/TestPortlet.java
Modified: portals/wsrp4j/trunk/commons/src/java/org/apache/wsrp4j/commons/exception/ErrorCodes.java
URL: http://svn.apache.org/viewcvs/portals/wsrp4j/trunk/commons/src/java/org/apache/wsrp4j/commons/exception/ErrorCodes.java?rev=375059&r1=375058&r2=375059&view=diff
==============================================================================
--- portals/wsrp4j/trunk/commons/src/java/org/apache/wsrp4j/commons/exception/ErrorCodes.java (original)
+++ portals/wsrp4j/trunk/commons/src/java/org/apache/wsrp4j/commons/exception/ErrorCodes.java Sun Feb 5 09:29:15 2006
@@ -1,12 +1,12 @@
/*
* Copyright 2003-2005 The Apache Software Foundation.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
Modified: portals/wsrp4j/trunk/commons/src/java/org/apache/wsrp4j/commons/exception/Messages.java
URL: http://svn.apache.org/viewcvs/portals/wsrp4j/trunk/commons/src/java/org/apache/wsrp4j/commons/exception/Messages.java?rev=375059&r1=375058&r2=375059&view=diff
==============================================================================
--- portals/wsrp4j/trunk/commons/src/java/org/apache/wsrp4j/commons/exception/Messages.java (original)
+++ portals/wsrp4j/trunk/commons/src/java/org/apache/wsrp4j/commons/exception/Messages.java Sun Feb 5 09:29:15 2006
@@ -64,7 +64,7 @@
private static Logger logger =
LogManager.getLogManager().getLogger(Messages.class);
private static Properties msgMap = new Properties();
-
+
/**
* Private constructor loads messages from <code>messages.properties</code>
* file in
Modified: portals/wsrp4j/trunk/commons/src/java/org/apache/wsrp4j/commons/exception/WSRPException.java
URL: http://svn.apache.org/viewcvs/portals/wsrp4j/trunk/commons/src/java/org/apache/wsrp4j/commons/exception/WSRPException.java?rev=375059&r1=375058&r2=375059&view=diff
==============================================================================
--- portals/wsrp4j/trunk/commons/src/java/org/apache/wsrp4j/commons/exception/WSRPException.java (original)
+++ portals/wsrp4j/trunk/commons/src/java/org/apache/wsrp4j/commons/exception/WSRPException.java Sun Feb 5 09:29:15 2006
@@ -1,12 +1,12 @@
/*
* Copyright 2003-2005 The Apache Software Foundation.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -55,10 +55,10 @@
}
/**
- Creates a new common excpetion. The message to be passed will be ignored
- @param errorCode integer representing an error code
- @param t Throwable to be wrapped
- */
+ * Creates a new common excpetion. The message to be passed will be ignored
+ * @param errorCode integer representing an error code
+ * @param t Throwable to be wrapped
+ */
public WSRPException(int errorCode, Throwable t) {
super(Messages.get(errorCode), t);
errCode = errorCode;
Modified: portals/wsrp4j/trunk/commons/src/java/org/apache/wsrp4j/commons/exception/WSRPXHelper.java
URL: http://svn.apache.org/viewcvs/portals/wsrp4j/trunk/commons/src/java/org/apache/wsrp4j/commons/exception/WSRPXHelper.java?rev=375059&r1=375058&r2=375059&view=diff
==============================================================================
--- portals/wsrp4j/trunk/commons/src/java/org/apache/wsrp4j/commons/exception/WSRPXHelper.java (original)
+++ portals/wsrp4j/trunk/commons/src/java/org/apache/wsrp4j/commons/exception/WSRPXHelper.java Sun Feb 5 09:29:15 2006
@@ -1,12 +1,12 @@
/*
* Copyright 2003-2005 The Apache Software Foundation.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
Modified: portals/wsrp4j/trunk/consumer-swingconsumer/src/java/org/apache/wsrp4j/consumer/swingconsumer/driver/SwingConsumer.java
URL: http://svn.apache.org/viewcvs/portals/wsrp4j/trunk/consumer-swingconsumer/src/java/org/apache/wsrp4j/consumer/swingconsumer/driver/SwingConsumer.java?rev=375059&r1=375058&r2=375059&view=diff
==============================================================================
--- portals/wsrp4j/trunk/consumer-swingconsumer/src/java/org/apache/wsrp4j/consumer/swingconsumer/driver/SwingConsumer.java (original)
+++ portals/wsrp4j/trunk/consumer-swingconsumer/src/java/org/apache/wsrp4j/consumer/swingconsumer/driver/SwingConsumer.java Sun Feb 5 09:29:15 2006
@@ -874,7 +874,7 @@
(Constants.INTERACTION_STATE +
Constants.EQUALS).length());
- } else if ((index = prop.indexOf(Constants.URL +
+/* } else if ((index = prop.indexOf(Constants.URL +
Constants.EQUALS)) != -1) {
String url = prop.substring(index + (
Constants.URL + Constants.EQUALS).length());
@@ -904,12 +904,13 @@
Constants.EQUALS)) != -1) {
String sessionID = prop.substring(index +
(Constants.SESSION_ID + Constants.EQUALS).length());
+*/
} else if ((index = prop.indexOf(Constants.PORTLET_INSTANCE_KEY +
Constants.EQUALS)) != -1) {
instanceKey = prop.substring(index +
(Constants.PORTLET_INSTANCE_KEY +
Constants.EQUALS).length());
- } else if ((index = prop.indexOf(Constants.USER_CONTEXT_KEY +
+/* } else if ((index = prop.indexOf(Constants.USER_CONTEXT_KEY +
Constants.EQUALS)) != -1) {
String userContextKey = prop.substring(index +
(Constants.USER_CONTEXT_KEY +
@@ -918,6 +919,7 @@
Constants.EQUALS)) != -1) {
String portletHandle = prop.substring(index +
(Constants.PORTLET_HANDLE + Constants.EQUALS).length());
+*/
} else {
// The rest are form parameters
int indexEquals = prop.indexOf(Constants.EQUALS);
Modified: portals/wsrp4j/trunk/persistence-xml/src/java/org/apache/wsrp4j/persistence/xml/driver/ServerPersistentInformationProviderImpl.java
URL: http://svn.apache.org/viewcvs/portals/wsrp4j/trunk/persistence-xml/src/java/org/apache/wsrp4j/persistence/xml/driver/ServerPersistentInformationProviderImpl.java?rev=375059&r1=375058&r2=375059&view=diff
==============================================================================
--- portals/wsrp4j/trunk/persistence-xml/src/java/org/apache/wsrp4j/persistence/xml/driver/ServerPersistentInformationProviderImpl.java (original)
+++ portals/wsrp4j/trunk/persistence-xml/src/java/org/apache/wsrp4j/persistence/xml/driver/ServerPersistentInformationProviderImpl.java Sun Feb 5 09:29:15 2006
@@ -70,25 +70,25 @@
private static final String PORTLETS = "portlets";
// sub directory for descriptions
- private static final String PORTLETSTATES = "portletstates";
+ //private static final String PORTLETSTATES = "portletstates";
// sub directory for descriptions
private static final String REGISTRIES = "registries";
// sub directory for users
- private static final String USERS = "users";
+ //private static final String USERS = "users";
// sub directory for producers
- private static final String PRODUCERS = "producers";
+ //private static final String PRODUCERS = "producers";
// user mapping file name
- private static final String USER_MAPPING = "UserMapping";
+ //private static final String USER_MAPPING = "UserMapping";
// producer mapping file name
- private static final String PRODUCER_MAPPING = "ProducerMapping";
+ //private static final String PRODUCER_MAPPING = "ProducerMapping";
// portlet mapping file name
- private static final String PORTLET_MAPPING = "PortletMapping";
+ //private static final String PORTLET_MAPPING = "PortletMapping";
// mapping file name of the servicedescription
private static final String SERVICE_DESCRIPTION_MAPPING =
@@ -101,10 +101,10 @@
private static final String PLUTO_PORTLET_MAPPING = "PlutoPortletMapping";
// mapping file name of the portlet (pluto)
- private static final String SIMPLE_PORTLET_MAPPING = "SimplePortletMapping";
+ //private static final String SIMPLE_PORTLET_MAPPING = "SimplePortletMapping";
// mapping file name of the portlet states
- private static final String PORTLET_STATE_MAPPING = "PortletStateMapping";
+ //private static final String PORTLET_STATE_MAPPING = "PortletStateMapping";
// This will be the root of all the persistent files
Modified: portals/wsrp4j/trunk/producer/pom.xml
URL: http://svn.apache.org/viewcvs/portals/wsrp4j/trunk/producer/pom.xml?rev=375059&r1=375058&r2=375059&view=diff
==============================================================================
--- portals/wsrp4j/trunk/producer/pom.xml (original)
+++ portals/wsrp4j/trunk/producer/pom.xml Sun Feb 5 09:29:15 2006
@@ -74,7 +74,7 @@
<dependency>
<artifactId>pluto-portal</artifactId>
<groupId>org.apache.pluto</groupId>
- <version>${pluto.version}-rc4</version>
+ <version>${pluto.version}</version>
</dependency>
<dependency>
<artifactId>commons-discovery</artifactId>
Modified: portals/wsrp4j/trunk/producer/src/java/org/apache/wsrp4j/producer/provider/pluto/driver/DescriptionHandlerImpl.java
URL: http://svn.apache.org/viewcvs/portals/wsrp4j/trunk/producer/src/java/org/apache/wsrp4j/producer/provider/pluto/driver/DescriptionHandlerImpl.java?rev=375059&r1=375058&r2=375059&view=diff
==============================================================================
--- portals/wsrp4j/trunk/producer/src/java/org/apache/wsrp4j/producer/provider/pluto/driver/DescriptionHandlerImpl.java (original)
+++ portals/wsrp4j/trunk/producer/src/java/org/apache/wsrp4j/producer/provider/pluto/driver/DescriptionHandlerImpl.java Sun Feb 5 09:29:15 2006
@@ -1,12 +1,12 @@
/*
* Copyright 2003-2005 The Apache Software Foundation.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -62,34 +62,32 @@
import org.apache.wsrp4j.commons.util.Constants;
import org.apache.wsrp4j.commons.util.WindowStates;
-
/**
*
* @version $Id$
*
* @see DescriptionHandler
- *
*/
public class DescriptionHandlerImpl implements DescriptionHandler {
-
+
// Provider
private PlutoProvider provider;
-
+
//persistence
private PersistentDataObject persistentDataObject;
private PersistentHandler persistentHandler;
-
+
// ServiceDescription
private ServiceDescription serviceDescription;
-
+
// name of the properties which is read
// private static final String WSRP_SERVICE_PROP =
// "WSRPServices.properties";
-
+
//defines an internal property name/key
// private static final String URL_TEMPLATE_PROCESSING =
// "provider.doesurltemplateprocessing";
-
+
//indicates if a producer supports URL template processing
private Boolean doesUrlTemplateProcessing = Boolean.FALSE;
Modified: portals/wsrp4j/trunk/producer/src/java/org/apache/wsrp4j/producer/provider/pluto/driver/DynamicInformationProviderImpl.java
URL: http://svn.apache.org/viewcvs/portals/wsrp4j/trunk/producer/src/java/org/apache/wsrp4j/producer/provider/pluto/driver/DynamicInformationProviderImpl.java?rev=375059&r1=375058&r2=375059&view=diff
==============================================================================
--- portals/wsrp4j/trunk/producer/src/java/org/apache/wsrp4j/producer/provider/pluto/driver/DynamicInformationProviderImpl.java (original)
+++ portals/wsrp4j/trunk/producer/src/java/org/apache/wsrp4j/producer/provider/pluto/driver/DynamicInformationProviderImpl.java Sun Feb 5 09:29:15 2006
@@ -1,19 +1,18 @@
/*
* Copyright 2003-2005 The Apache Software Foundation.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.wsrp4j.producer.provider.pluto.driver;
import java.util.ArrayList;
@@ -51,7 +50,7 @@
*/
public class DynamicInformationProviderImpl
implements WSRPDynamicInformationProvider {
-
+
//references the servlet request
private HttpServletRequest servletRequest;
Modified: portals/wsrp4j/trunk/producer/src/java/org/apache/wsrp4j/producer/provider/pluto/driver/InformationProviderServiceFactoryImpl.java
URL: http://svn.apache.org/viewcvs/portals/wsrp4j/trunk/producer/src/java/org/apache/wsrp4j/producer/provider/pluto/driver/InformationProviderServiceFactoryImpl.java?rev=375059&r1=375058&r2=375059&view=diff
==============================================================================
--- portals/wsrp4j/trunk/producer/src/java/org/apache/wsrp4j/producer/provider/pluto/driver/InformationProviderServiceFactoryImpl.java (original)
+++ portals/wsrp4j/trunk/producer/src/java/org/apache/wsrp4j/producer/provider/pluto/driver/InformationProviderServiceFactoryImpl.java Sun Feb 5 09:29:15 2006
@@ -1,19 +1,18 @@
/*
* Copyright 2003-2005 The Apache Software Foundation.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.wsrp4j.producer.provider.pluto.driver;
import javax.servlet.http.HttpServletRequest;
@@ -27,22 +26,21 @@
public class InformationProviderServiceFactoryImpl
extends org.apache.pluto.portalImpl.core.
InformationProviderServiceFactoryImpl {
-
+
public DynamicInformationProvider getDynamicProvider(
HttpServletRequest request) {
-
+
DynamicInformationProvider provider =
(DynamicInformationProvider) request.
getAttribute("org.apache.pluto.portalImpl." +
"DynamicInformationProvider");
-
+
if (provider==null) {
provider = new DynamicInformationProviderImpl(request);
request.setAttribute("org.apache.pluto.portalImpl." +
"DynamicInformationProvider", provider);
}
-
+
return provider;
}
-
}
Modified: portals/wsrp4j/trunk/producer/src/java/org/apache/wsrp4j/producer/provider/pluto/driver/PortletActionProviderImpl.java
URL: http://svn.apache.org/viewcvs/portals/wsrp4j/trunk/producer/src/java/org/apache/wsrp4j/producer/provider/pluto/driver/PortletActionProviderImpl.java?rev=375059&r1=375058&r2=375059&view=diff
==============================================================================
--- portals/wsrp4j/trunk/producer/src/java/org/apache/wsrp4j/producer/provider/pluto/driver/PortletActionProviderImpl.java (original)
+++ portals/wsrp4j/trunk/producer/src/java/org/apache/wsrp4j/producer/provider/pluto/driver/PortletActionProviderImpl.java Sun Feb 5 09:29:15 2006
@@ -1,19 +1,18 @@
/*
* Copyright 2003-2005 The Apache Software Foundation.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.wsrp4j.producer.provider.pluto.driver;
import javax.portlet.PortletMode;
@@ -26,7 +25,7 @@
* @version $Id$
*/
public class PortletActionProviderImpl implements PortletActionProvider {
-
+
DynamicInformationProviderImpl dynamicInfoProvider;
PortletWindow portletWindow;
Modified: portals/wsrp4j/trunk/producer/src/java/org/apache/wsrp4j/producer/provider/pluto/driver/PortletInvokerImpl.java
URL: http://svn.apache.org/viewcvs/portals/wsrp4j/trunk/producer/src/java/org/apache/wsrp4j/producer/provider/pluto/driver/PortletInvokerImpl.java?rev=375059&r1=375058&r2=375059&view=diff
==============================================================================
--- portals/wsrp4j/trunk/producer/src/java/org/apache/wsrp4j/producer/provider/pluto/driver/PortletInvokerImpl.java (original)
+++ portals/wsrp4j/trunk/producer/src/java/org/apache/wsrp4j/producer/provider/pluto/driver/PortletInvokerImpl.java Sun Feb 5 09:29:15 2006
@@ -1,19 +1,18 @@
/*
* Copyright 2003-2005 The Apache Software Foundation.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.wsrp4j.producer.provider.pluto.driver;
import java.io.IOException;
@@ -70,7 +69,7 @@
* @version $Id$
**/
public class PortletInvokerImpl implements PortletInvoker {
-
+
// provider
private PlutoProvider provider;
Modified: portals/wsrp4j/trunk/producer/src/java/org/apache/wsrp4j/producer/provider/pluto/driver/PortletPoolImpl.java
URL: http://svn.apache.org/viewcvs/portals/wsrp4j/trunk/producer/src/java/org/apache/wsrp4j/producer/provider/pluto/driver/PortletPoolImpl.java?rev=375059&r1=375058&r2=375059&view=diff
==============================================================================
--- portals/wsrp4j/trunk/producer/src/java/org/apache/wsrp4j/producer/provider/pluto/driver/PortletPoolImpl.java (original)
+++ portals/wsrp4j/trunk/producer/src/java/org/apache/wsrp4j/producer/provider/pluto/driver/PortletPoolImpl.java Sun Feb 5 09:29:15 2006
@@ -1,19 +1,18 @@
/*
* Copyright 2003-2005 The Apache Software Foundation.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.wsrp4j.producer.provider.pluto.driver;
import java.util.HashMap;
Modified: portals/wsrp4j/trunk/producer/src/java/org/apache/wsrp4j/producer/provider/pluto/driver/PortletStateImpl.java
URL: http://svn.apache.org/viewcvs/portals/wsrp4j/trunk/producer/src/java/org/apache/wsrp4j/producer/provider/pluto/driver/PortletStateImpl.java?rev=375059&r1=375058&r2=375059&view=diff
==============================================================================
--- portals/wsrp4j/trunk/producer/src/java/org/apache/wsrp4j/producer/provider/pluto/driver/PortletStateImpl.java (original)
+++ portals/wsrp4j/trunk/producer/src/java/org/apache/wsrp4j/producer/provider/pluto/driver/PortletStateImpl.java Sun Feb 5 09:29:15 2006
@@ -13,7 +13,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.wsrp4j.producer.provider.pluto.driver;
import java.io.Serializable;
Modified: portals/wsrp4j/trunk/producer/src/java/org/apache/wsrp4j/producer/provider/pluto/driver/PortletStateManagerImpl.java
URL: http://svn.apache.org/viewcvs/portals/wsrp4j/trunk/producer/src/java/org/apache/wsrp4j/producer/provider/pluto/driver/PortletStateManagerImpl.java?rev=375059&r1=375058&r2=375059&view=diff
==============================================================================
--- portals/wsrp4j/trunk/producer/src/java/org/apache/wsrp4j/producer/provider/pluto/driver/PortletStateManagerImpl.java (original)
+++ portals/wsrp4j/trunk/producer/src/java/org/apache/wsrp4j/producer/provider/pluto/driver/PortletStateManagerImpl.java Sun Feb 5 09:29:15 2006
@@ -1,12 +1,12 @@
/*
* Copyright 2003-2005 The Apache Software Foundation.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
Modified: portals/wsrp4j/trunk/producer/src/java/org/apache/wsrp4j/producer/provider/pluto/driver/PortletURLProviderImpl.java
URL: http://svn.apache.org/viewcvs/portals/wsrp4j/trunk/producer/src/java/org/apache/wsrp4j/producer/provider/pluto/driver/PortletURLProviderImpl.java?rev=375059&r1=375058&r2=375059&view=diff
==============================================================================
--- portals/wsrp4j/trunk/producer/src/java/org/apache/wsrp4j/producer/provider/pluto/driver/PortletURLProviderImpl.java (original)
+++ portals/wsrp4j/trunk/producer/src/java/org/apache/wsrp4j/producer/provider/pluto/driver/PortletURLProviderImpl.java Sun Feb 5 09:29:15 2006
@@ -13,7 +13,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.wsrp4j.producer.provider.pluto.driver;
import java.io.IOException;
Modified: portals/wsrp4j/trunk/producer/src/java/org/apache/wsrp4j/producer/provider/pluto/driver/ProviderFactoryImpl.java
URL: http://svn.apache.org/viewcvs/portals/wsrp4j/trunk/producer/src/java/org/apache/wsrp4j/producer/provider/pluto/driver/ProviderFactoryImpl.java?rev=375059&r1=375058&r2=375059&view=diff
==============================================================================
--- portals/wsrp4j/trunk/producer/src/java/org/apache/wsrp4j/producer/provider/pluto/driver/ProviderFactoryImpl.java (original)
+++ portals/wsrp4j/trunk/producer/src/java/org/apache/wsrp4j/producer/provider/pluto/driver/ProviderFactoryImpl.java Sun Feb 5 09:29:15 2006
@@ -13,7 +13,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.wsrp4j.producer.provider.pluto.driver;
import org.apache.wsrp4j.commons.producer.provider.interfaces.Provider;
@@ -26,9 +25,9 @@
* @version $Id$
*/
public class ProviderFactoryImpl implements ProviderFactory {
-
+
private static ProviderImpl provider;
-
+
/**
* Returns an instance of Provider by calling the constructor
* of the corresponding class implementing the Provider-Interface
@@ -38,9 +37,7 @@
public Provider getProvider() {
if (provider == null) {
provider = ProviderImpl.create();
- }
-
+ }
return provider;
}
-
}
Modified: portals/wsrp4j/trunk/producer/src/java/org/apache/wsrp4j/producer/provider/pluto/driver/ProviderImpl.java
URL: http://svn.apache.org/viewcvs/portals/wsrp4j/trunk/producer/src/java/org/apache/wsrp4j/producer/provider/pluto/driver/ProviderImpl.java?rev=375059&r1=375058&r2=375059&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 Sun Feb 5 09:29:15 2006
@@ -13,7 +13,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.wsrp4j.producer.provider.pluto.driver;
import java.util.Properties;
@@ -54,7 +53,6 @@
import org.apache.wsrp4j.commons.log.LogManager;
import org.apache.wsrp4j.commons.log.Logger;
-
/**
* @version $Id$
Modified: portals/wsrp4j/trunk/producer/src/java/org/apache/wsrp4j/producer/provider/pluto/driver/ResourceURLProviderImpl.java
URL: http://svn.apache.org/viewcvs/portals/wsrp4j/trunk/producer/src/java/org/apache/wsrp4j/producer/provider/pluto/driver/ResourceURLProviderImpl.java?rev=375059&r1=375058&r2=375059&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 Sun Feb 5 09:29:15 2006
@@ -13,7 +13,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.wsrp4j.producer.provider.pluto.driver;
import javax.servlet.http.HttpServletRequest;
@@ -30,27 +29,27 @@
*/
public class ResourceURLProviderImpl
implements org.apache.pluto.services.information.ResourceURLProvider {
-
+
private Logger logger =
LogManager.getLogManager().getLogger(ResourceURLProviderImpl.class);
-
+
private boolean trace_high = logger.isLogging(Logger.TRACE_HIGH);
-
+
private HttpServletRequest servletRequest;
private URLComposer urlComposer;
private Provider wsrpProvider;
-
+
//inidcaates if secure client communication is used
private boolean isSecure = false;
-
- private String url = null;//the resource URL that will be passed to URLComposer
-
+
+ private String url;//the resource URL that will be passed to URLComposer
+
// method trace entry/exit name string definitions
private static final String CONSTRUCTOR = "Constructor";
private static final String TO_STRING = "toString";
private static final String GET_PROTOCOL_HOST_AND_PORT =
"getProtocolHostAndPort";
-
+
/**
* Constructs a ResourceURLProviderImpl
* @param aServletRequest
@@ -63,13 +62,13 @@
if (logger.isLogging(Logger.TRACE_HIGH)) {
logger.entry(Logger.TRACE_HIGH, CONSTRUCTOR);
}
-
+
this.servletRequest = aServletRequest;
this.wsrpProvider = aWsrpProvider;
this.isSecure = secure;
-
+
this.urlComposer = this.wsrpProvider.getURLComposer();
-
+
if (logger.isLogging(Logger.TRACE_HIGH)) {
logger.exit(Logger.TRACE_HIGH, CONSTRUCTOR);
}
Modified: portals/wsrp4j/trunk/producer/src/java/org/apache/wsrp4j/producer/provider/pluto/driver/ServletRequestFactoryImpl.java
URL: http://svn.apache.org/viewcvs/portals/wsrp4j/trunk/producer/src/java/org/apache/wsrp4j/producer/provider/pluto/driver/ServletRequestFactoryImpl.java?rev=375059&r1=375058&r2=375059&view=diff
==============================================================================
--- portals/wsrp4j/trunk/producer/src/java/org/apache/wsrp4j/producer/provider/pluto/driver/ServletRequestFactoryImpl.java (original)
+++ portals/wsrp4j/trunk/producer/src/java/org/apache/wsrp4j/producer/provider/pluto/driver/ServletRequestFactoryImpl.java Sun Feb 5 09:29:15 2006
@@ -1,19 +1,18 @@
/*
* Copyright 2003-2005 The Apache Software Foundation.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.wsrp4j.producer.provider.pluto.driver;
import java.util.Map;
@@ -28,7 +27,7 @@
*/
public class ServletRequestFactoryImpl
implements org.apache.pluto.portalImpl.servlet.ServletRequestFactory {
-
+
/**
* @see org.apache.pluto.portalImpl.servlet.
* ServletRequestFactory#getServletRequest(
@@ -42,14 +41,14 @@
// since we (wsrp4j) pass already a wrapper, simply return it...
return request;
}
-
+
/**
* @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)
Modified: portals/wsrp4j/trunk/producer/src/java/org/apache/wsrp4j/producer/provider/pluto/driver/StoredResponse.java
URL: http://svn.apache.org/viewcvs/portals/wsrp4j/trunk/producer/src/java/org/apache/wsrp4j/producer/provider/pluto/driver/StoredResponse.java?rev=375059&r1=375058&r2=375059&view=diff
==============================================================================
--- portals/wsrp4j/trunk/producer/src/java/org/apache/wsrp4j/producer/provider/pluto/driver/StoredResponse.java (original)
+++ portals/wsrp4j/trunk/producer/src/java/org/apache/wsrp4j/producer/provider/pluto/driver/StoredResponse.java Sun Feb 5 09:29:15 2006
@@ -1,19 +1,18 @@
/*
* Copyright 2003-2005 The Apache Software Foundation.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.wsrp4j.producer.provider.pluto.driver;
import java.io.IOException;
@@ -40,99 +39,99 @@
* @version $Id$
*/
public class StoredResponse implements HttpServletResponse, Serializable {
+
//default status code
private static final int DEFAULT_STATUS_CODE = 200;
-
+
//writer
private PrintWriter _writer;
-
+
//finished
private boolean _isFinished;
-
+
//status code
private int _statusCode;
-
+
//status message
private String _statusMessage;
-
+
//redirect URL
private String _redirectURI;
-
+
//string writer
private StringWriter _stringWriter;
-
+
//locale
private Locale _locale;
-
+
/**
* Default constructor
*/
public StoredResponse() {
_statusCode = DEFAULT_STATUS_CODE;
_locale = new Locale("en", "US");
-
setContentType("text/html");
}
-
+
/**
* @see javax.servlet.http.HttpServletResponse#addCookie
*/
public void addCookie(Cookie cookie) {
}
-
+
/**
* @see javax.servlet.http.HttpServletResponse#addDateHeader
*/
public void addDateHeader(String a, long b) {
}
-
+
/**
* @see javax.servlet.http.HttpServletResponse#addHeader
*/
public void addHeader(String a, String b) {
}
-
+
/**
* @see javax.servlet.http.HttpServletResponse#addIntHeader
*/
public void addIntHeader(String a, int b) {
}
-
+
/**
* @see javax.servlet.http.HttpServletResponse#containsHeader
*/
public boolean containsHeader(String s) {
return false;
}
-
+
/**
* @see javax.servlet.http.HttpServletResponse#encodeRedirectURL
*/
public String encodeRedirectURL(String s) {
return s;
}
-
+
/**
* @see javax.servlet.http.HttpServletResponse#encodeRedirectUrl
*/
public String encodeRedirectUrl(String s) {
return encodeRedirectURL(s);
}
-
+
/**
* @see javax.servlet.http.HttpServletResponse#encodeURL
*/
public String encodeURL(String s) {
return s;
}
-
+
/**
* @see javax.servlet.http.HttpServletResponse#encodeUrl
*/
public String encodeUrl(String s) {
return encodeURL(s);
}
-
+
/**
* Internal method
* Finish the response.
@@ -151,34 +150,34 @@
_writer = null;
}
}
-
+
/**
* @see javax.servlet.http.HttpServletResponse#flushBuffer()
*/
public void flushBuffer() {
}
-
+
/**
* @see javax.servlet.http.HttpServletResponse#getBufferSize()
*/
public int getBufferSize() {
return 4096;
}
-
+
/**
* @see javax.servlet.http.HttpServletResponse#getCharacterEncoding()
*/
public String getCharacterEncoding() {
return System.getProperty("default.client.encoding");
}
-
+
/**
* @see javax.servlet.http.HttpServletResponse#getLocale()
*/
public java.util.Locale getLocale() {
return _locale;
}
-
+
/**
* Returns the output buffer content as String
* @return java.lang.String
@@ -189,14 +188,14 @@
}
return _stringWriter.getBuffer().toString();
}
-
+
/**
* @see javax.servlet.http.HttpServletResponse#getOutputStream()
*/
public ServletOutputStream getOutputStream() {
return null;
}
-
+
/**
* @see javax.servlet.http.HttpServletResponse#getWriter()
*/
@@ -205,101 +204,101 @@
_stringWriter = new StringWriter();
_writer = new PrintWriter(_stringWriter);
}
-
+
return _writer;
}
-
+
/**
* @see javax.servlet.http.HttpServletResponse#isCommitted()
*/
public boolean isCommitted() {
return false;
}
-
+
/**
* @see javax.servlet.http.HttpServletResponse#reset()
*/
public void reset() {
// nothing to do?
}
-
+
/**
* @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)
*/
public void sendError(int i, String s) throws IOException {
// nothing to do?
}
-
+
/**
* @see javax.servlet.http.HttpServletResponse#sendRedirect(String)
*/
public void sendRedirect(String s) {
_redirectURI = s;
}
-
+
/**
* @see javax.servlet.http.HttpServletResponse#setBufferSize(int)
*/
public void setBufferSize(int i) {
// nothing to do?
}
-
+
/**
* @see javax.servlet.http.HttpServletResponse#setContentLength(int)
*/
public void setContentLength(int i) {
setIntHeader("content-length", i);
}
-
+
/**
* @see javax.servlet.http.HttpServletResponse#setContentType(String)
*/
public void setContentType(String s) {
setHeader("content-type", s);
}
-
+
/**
* @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)
*/
public void setHeader(String s, String s1) {
// nothing to do?
}
-
+
/**
* @see javax.servlet.http.HttpServletResponse#setIntHeader
*/
public void setIntHeader(String s, int i) {
// nothing to do?
}
-
+
/**
* @see javax.servlet.http.HttpServletResponse#setLocale(Locale)
*/
public void setLocale(Locale locale) {
_locale = locale;
}
-
+
/**
* @see javax.servlet.http.HttpServletResponse#setStatus(int)
*/
public void setStatus(int i) {
_statusCode = i;
}
-
+
/**
* @see javax.servlet.http.HttpServletResponse#setStatus(int, String)
*/
@@ -307,7 +306,7 @@
_statusCode = i;
_statusMessage = s;
}
-
+
/**
* @see javax.servlet.ServletResponse#resetBuffer()
*/
Modified: portals/wsrp4j/trunk/producer/src/java/org/apache/wsrp4j/producer/provider/pluto/driver/WSRPPortletEntityImpl.java
URL: http://svn.apache.org/viewcvs/portals/wsrp4j/trunk/producer/src/java/org/apache/wsrp4j/producer/provider/pluto/driver/WSRPPortletEntityImpl.java?rev=375059&r1=375058&r2=375059&view=diff
==============================================================================
--- portals/wsrp4j/trunk/producer/src/java/org/apache/wsrp4j/producer/provider/pluto/driver/WSRPPortletEntityImpl.java (original)
+++ portals/wsrp4j/trunk/producer/src/java/org/apache/wsrp4j/producer/provider/pluto/driver/WSRPPortletEntityImpl.java Sun Feb 5 09:29:15 2006
@@ -1,19 +1,18 @@
/*
* Copyright 2003-2005 The Apache Software Foundation.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.wsrp4j.producer.provider.pluto.driver;
import java.util.ArrayList;
@@ -33,34 +32,34 @@
* This class adds cloning to the pluto portlet entity.
* @version $Id$
*/
-public class WSRPPortletEntityImpl extends PortletEntityImpl
- implements Cloneable {
-
+public class WSRPPortletEntityImpl
+ extends PortletEntityImpl
+ implements Cloneable {
+
/**
* Creates a clone from portletEntity
* @return java.lang.Object
*/
public Object clone() {
-
WSRPPortletEntityImpl portletEntity = new WSRPPortletEntityImpl();
-
+
PortletApplicationEntity entityApp = getPortletApplicationEntity();
-
+
portletEntity.setPortletApplicationEntity(entityApp);
portletEntity.setDefinitionId(getDefinitionId());
-
+
PreferenceSet preferenceSet = portletEntity.getPreferenceSet();
ControllerFactory ctrlFactory =
(ControllerFactory) FactoryManager.getFactory(
ControllerFactory.class);
PreferenceSetCtrl preferenceSetCtrl =
(PreferenceSetCtrl) ctrlFactory.get(preferenceSet);
-
+
Iterator oldPrefs = this.getPreferenceSet().iterator();
-
+
while (oldPrefs.hasNext()) {
Preference pref = (Preference)oldPrefs.next();
-
+
ArrayList values = null;
Iterator iter = pref.getValues();
if (iter != null) {
@@ -69,13 +68,13 @@
values.add(iter.next());
}
}
-
+
Preference newPref = preferenceSetCtrl.add(pref.getName(), values);
PreferenceCtrl newPrefCtrl = (PreferenceCtrl)newPref;
Boolean isRO = new Boolean(pref.isReadOnly());
newPrefCtrl.setReadOnly(isRO.toString());
}
-
+
try {
// call support interface methods
Support support = portletEntity;
@@ -85,8 +84,7 @@
} catch (Exception e) {
// ignore
}
-
+
return portletEntity;
}
-
}
Modified: portals/wsrp4j/trunk/producer/src/java/org/apache/wsrp4j/producer/provider/pluto/driver/WSRPRenderResponseFactoryImpl.java
URL: http://svn.apache.org/viewcvs/portals/wsrp4j/trunk/producer/src/java/org/apache/wsrp4j/producer/provider/pluto/driver/WSRPRenderResponseFactoryImpl.java?rev=375059&r1=375058&r2=375059&view=diff
==============================================================================
--- portals/wsrp4j/trunk/producer/src/java/org/apache/wsrp4j/producer/provider/pluto/driver/WSRPRenderResponseFactoryImpl.java (original)
+++ portals/wsrp4j/trunk/producer/src/java/org/apache/wsrp4j/producer/provider/pluto/driver/WSRPRenderResponseFactoryImpl.java Sun Feb 5 09:29:15 2006
@@ -1,19 +1,18 @@
/*
* Copyright 2003-2005 The Apache Software Foundation.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.wsrp4j.producer.provider.pluto.driver;
import java.util.Map;
@@ -32,6 +31,7 @@
* @version $Id$
*/
public class WSRPRenderResponseFactoryImpl implements RenderResponseFactory {
+
/**
* Initialize the factory
* @param config as javax.servlet.ServletConfig
@@ -42,7 +42,7 @@
throws Exception {
// nothing to do
}
-
+
/**
* Destroy the factory
* @throws Exception
@@ -50,7 +50,7 @@
public void destroy() throws Exception {
// nothing to do
}
-
+
/**
* Returns an instance of RenderResponse
* @param portletWindow portlet window
@@ -62,11 +62,9 @@
HttpServletRequest servletRequest,
HttpServletResponse servletResponse,
boolean containerSupportsBuffering) {
-
RenderResponse renderResponse =
new WSRPRenderResponseImpl(portletWindow, servletRequest,
servletResponse, containerSupportsBuffering);
return renderResponse;
}
-
}
Modified: portals/wsrp4j/trunk/producer/src/java/org/apache/wsrp4j/producer/provider/pluto/driver/WSRPRenderResponseImpl.java
URL: http://svn.apache.org/viewcvs/portals/wsrp4j/trunk/producer/src/java/org/apache/wsrp4j/producer/provider/pluto/driver/WSRPRenderResponseImpl.java?rev=375059&r1=375058&r2=375059&view=diff
==============================================================================
--- portals/wsrp4j/trunk/producer/src/java/org/apache/wsrp4j/producer/provider/pluto/driver/WSRPRenderResponseImpl.java (original)
+++ portals/wsrp4j/trunk/producer/src/java/org/apache/wsrp4j/producer/provider/pluto/driver/WSRPRenderResponseImpl.java Sun Feb 5 09:29:15 2006
@@ -13,7 +13,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.wsrp4j.producer.provider.pluto.driver;
import javax.servlet.http.HttpServletRequest;
@@ -29,7 +28,6 @@
import org.apache.wsrp4j.commons.producer.provider.interfaces.Provider;
-
/**
* WSRP4J specific implementation of the pluto RenderResponse. This class
* extends the pluto RenderResponseImpl to provide a WSRP4J specific Provider
@@ -38,12 +36,13 @@
* @version $Id$
*/
public class WSRPRenderResponseImpl extends RenderResponseImpl {
-
- //wspr4j specific provider
- private static Provider provider;
- //portlet entity
- private PortletEntity portletEntity;
-
+
+ /** wspr4j specific provider. */
+ private final Provider provider;
+
+ /** portlet entity. */
+ private final PortletEntity portletEntity;
+
/**
* Constructor
* @param portletWindow portlet window
@@ -55,31 +54,27 @@
HttpServletRequest servletRequest,
HttpServletResponse servletResponse,
boolean containerSupportsBuffering) {
-
super(portletWindow, servletRequest, servletResponse,
containerSupportsBuffering);
-
+
ProviderFactoryImpl providerFactory = new ProviderFactoryImpl();
- provider = providerFactory.getProvider();
-
+ this.provider = providerFactory.getProvider();
+
this.portletEntity = portletWindow.getPortletEntity();
}
-
+
/**
* 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) {
-
String resourceUrl = "";
-
try {
-
PortletDescription desc =
provider.getDescriptionHandler().
getPortletDescription(portletEntity.getId().toString());
-
+
if (url.indexOf("://") != -1) {
if (desc.getDoesUrlTemplateProcessing().booleanValue()) {
// TODO: create url by template processing
@@ -99,7 +94,7 @@
buffer.append(request.getServerPort());
}
String base = buffer.toString();
-
+
if (desc.getDoesUrlTemplateProcessing().booleanValue()) {
// TODO: create url by template processing
} else {
@@ -112,25 +107,20 @@
null,
null);
}
-
}
} catch (WSRPException e) {
-
//TODO: log error
}
-
return resourceUrl;
}
-
+
/**
* 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) {
-
// TODO: template processing
return provider.getURLComposer().createNamespacedToken(aValue, null);
}
-
}
Modified: portals/wsrp4j/trunk/producer/src/java/org/apache/wsrp4j/producer/provider/pluto/driver/WSRPServletRequestWrapperImpl.java
URL: http://svn.apache.org/viewcvs/portals/wsrp4j/trunk/producer/src/java/org/apache/wsrp4j/producer/provider/pluto/driver/WSRPServletRequestWrapperImpl.java?rev=375059&r1=375058&r2=375059&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 Sun Feb 5 09:29:15 2006
@@ -13,7 +13,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.wsrp4j.producer.provider.pluto.driver;
import java.util.Collections;
@@ -27,7 +26,6 @@
import org.apache.pluto.om.window.PortletWindow;
import org.apache.pluto.portalImpl.servlet.ServletRequestImpl;
-
/**
* WSRP4J specific servlet response implementation. This allows
* to set the locale.
@@ -35,10 +33,11 @@
* @version $Id$
*/
public class WSRPServletRequestWrapperImpl extends ServletRequestImpl {
- private Locale locale;
- private String mimeType;
- private Map parameters;
-
+
+ private final Locale locale;
+ private final String mimeType;
+ private final Map parameters;
+
/**
* Constructor
* @param request HttpServletRequest
@@ -47,43 +46,58 @@
public WSRPServletRequestWrapperImpl(HttpServletRequest request,
PortletWindow window, Locale locale, String mimeType,
Map parameters) {
-
super(request, window);
-
+
this.locale = locale;
this.mimeType = mimeType;
this.parameters = parameters;
}
-
+
+ /**
+ * @see javax.servlet.ServletRequestWrapper#getLocale()
+ */
public Locale getLocale() {
return this.locale;
}
-
+
+ /**
+ * @see javax.servlet.ServletRequestWrapper#getLocales()
+ */
public Enumeration getLocales() {
Vector v = new Vector();
v.add(this.locale);
return v.elements();
}
-
+
+ /**
+ * @see org.apache.pluto.portalImpl.servlet.ServletRequestImpl#getContentType()
+ */
public String getContentType() {
return this.mimeType+"; charset=UTF-8"; // TODO
}
-
+
public Map getParameterMap() {
return parameters;
}
-
+
+ /**
+ * @see org.apache.pluto.portalImpl.servlet.ServletRequestImpl#getParameter(java.lang.String)
+ */
public String getParameter(String name) {
return (String) this.getParameterMap().get(name);
-
}
-
+
+ /**
+ * @see org.apache.pluto.portalImpl.servlet.ServletRequestImpl#getParameterNames()
+ */
public Enumeration getParameterNames() {
return Collections.enumeration(this.getParameterMap().keySet());
}
+ /**
+ * @see org.apache.pluto.portalImpl.servlet.ServletRequestImpl#getParameterValues(java.lang.String)
+ */
public String[] getParameterValues(String name) {
return (String[]) this.getParameterMap().get(name);
}
-
}
Modified: portals/wsrp4j/trunk/producer/src/java/org/apache/wsrp4j/producer/provider/pluto/interfaces/PlutoPortletPool.java
URL: http://svn.apache.org/viewcvs/portals/wsrp4j/trunk/producer/src/java/org/apache/wsrp4j/producer/provider/pluto/interfaces/PlutoPortletPool.java?rev=375059&r1=375058&r2=375059&view=diff
==============================================================================
--- portals/wsrp4j/trunk/producer/src/java/org/apache/wsrp4j/producer/provider/pluto/interfaces/PlutoPortletPool.java (original)
+++ portals/wsrp4j/trunk/producer/src/java/org/apache/wsrp4j/producer/provider/pluto/interfaces/PlutoPortletPool.java Sun Feb 5 09:29:15 2006
@@ -1,19 +1,18 @@
/*
* Copyright 2003-2005 The Apache Software Foundation.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.wsrp4j.producer.provider.pluto.interfaces;
import org.apache.wsrp4j.commons.producer.provider.interfaces.PortletPool;
@@ -21,12 +20,12 @@
/**
* <p>This class provides an internal add-on to the Provider interface.</p>
- *
+ *
* @version $Id$
* @see org.apache.wsrp4j.producer.provider.Provider
- *
*/
public interface PlutoPortletPool extends PortletPool {
+
/**
* Get the Provider the portlet pool belongs to.
* @return Provider
@@ -38,5 +37,4 @@
* @param provider
*/
void setProvider(Provider provider);
-
}
Modified: portals/wsrp4j/trunk/producer/src/java/org/apache/wsrp4j/producer/provider/pluto/interfaces/PlutoProvider.java
URL: http://svn.apache.org/viewcvs/portals/wsrp4j/trunk/producer/src/java/org/apache/wsrp4j/producer/provider/pluto/interfaces/PlutoProvider.java?rev=375059&r1=375058&r2=375059&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 Sun Feb 5 09:29:15 2006
@@ -1,26 +1,24 @@
/*
* Copyright 2003-2005 The Apache Software Foundation.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.wsrp4j.producer.provider.pluto.interfaces;
import org.apache.pluto.PortletContainer;
import org.apache.wsrp4j.commons.producer.provider.interfaces.Provider;
-
/**
* <p>This class provides an internal add-on to the Provider interface.</p>
*
@@ -29,17 +27,17 @@
* @version $Id$
*/
public interface PlutoProvider extends Provider {
+
/**
* 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
*/
PlutoPortletPool getPlutoPortletPool();
-
}
Modified: portals/wsrp4j/trunk/producer/src/java/org/apache/wsrp4j/producer/provider/pluto/interfaces/WSRPDynamicInformationProvider.java
URL: http://svn.apache.org/viewcvs/portals/wsrp4j/trunk/producer/src/java/org/apache/wsrp4j/producer/provider/pluto/interfaces/WSRPDynamicInformationProvider.java?rev=375059&r1=375058&r2=375059&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 Sun Feb 5 09:29:15 2006
@@ -27,23 +27,22 @@
*/
public interface WSRPDynamicInformationProvider
extends DynamicInformationProvider {
-
+
/**
* String constant representing an attribute name of a servlet request.
* Serves to store the getMarkup-, performInteraction- or
* performBlockingInteraction- request within the current ServletRequest.
*/
String REQUEST = "wsrp.request";
-
+
/**
* String constant representing an attribute name of a servlet request.
* Serves to store the Provider within the current ServletRequest.
*/
String PROVIDER = "wsrp.provider";
-
+
/** String constant representing an attribute name of a servlet request.
* Serves to store the render params within the current ServletRequest
*/
String RENDER_PARAMS = "wsrp.renderParams";
-
}
Modified: portals/wsrp4j/trunk/testportlet/src/java/org/apache/wsrp4j/testportlet/TestPortlet.java
URL: http://svn.apache.org/viewcvs/portals/wsrp4j/trunk/testportlet/src/java/org/apache/wsrp4j/testportlet/TestPortlet.java?rev=375059&r1=375058&r2=375059&view=diff
==============================================================================
--- portals/wsrp4j/trunk/testportlet/src/java/org/apache/wsrp4j/testportlet/TestPortlet.java (original)
+++ portals/wsrp4j/trunk/testportlet/src/java/org/apache/wsrp4j/testportlet/TestPortlet.java Sun Feb 5 09:29:15 2006
@@ -48,7 +48,7 @@
actionResponse.setRenderParameter("name", nameValue);
}
}
-
+
private void handleCounter(ActionRequest request) {
String counter1 = (String) request.getPortletSession().
getAttribute("counter1", PortletSession.APPLICATION_SCOPE);
@@ -57,13 +57,12 @@
} else {
counter1 = "1";
}
-
+
request.getPortletSession().setAttribute(
"counter1",
counter1,
PortletSession.APPLICATION_SCOPE);
-
-
+
String counter2 = (String) request.getPortletSession().
getAttribute("counter2", PortletSession.PORTLET_SCOPE);
if (counter2 != null) {
@@ -71,20 +70,19 @@
} else {
counter2 = "1";
}
-
+
request.getPortletSession().setAttribute(
"counter2",
counter2,
PortletSession.PORTLET_SCOPE);
}
-
-
+
/**
* @see javax.portlet.GenericPortlet#doDispatch(javax.portlet.RenderRequest, javax.portlet.RenderResponse)
*/
public void doDispatch(RenderRequest request, RenderResponse response)
throws PortletException, IOException {
-
+
WindowState state = request.getWindowState();
if ( ! state.equals(WindowState.MINIMIZED)) {
String jspName = request.getParameter("jspName");
@@ -102,7 +100,7 @@
PortletSession.PORTLET_SCOPE);
}
}
-
+
PortletContext context = getPortletContext();
PortletRequestDispatcher rd =
context.getRequestDispatcher("/jsp/"+jspName);