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/03 13:08:08 UTC
svn commit: r374648 [2/2] - in /portals/wsrp4j/trunk/sandbox/wsrp4j:
commons-producer/src/java/org/apache/wsrp4j/commons/producer/provider/driver/
commons/ commons/src/java/org/apache/wsrp4j/commons/exception/
commons/src/java/org/apache/wsrp4j/commons...
Modified: portals/wsrp4j/trunk/sandbox/wsrp4j/commons/src/java/org/apache/wsrp4j/commons/persistence/PersistentDataObject.java
URL: http://svn.apache.org/viewcvs/portals/wsrp4j/trunk/sandbox/wsrp4j/commons/src/java/org/apache/wsrp4j/commons/persistence/PersistentDataObject.java?rev=374648&r1=374647&r2=374648&view=diff
==============================================================================
--- portals/wsrp4j/trunk/sandbox/wsrp4j/commons/src/java/org/apache/wsrp4j/commons/persistence/PersistentDataObject.java (original)
+++ portals/wsrp4j/trunk/sandbox/wsrp4j/commons/src/java/org/apache/wsrp4j/commons/persistence/PersistentDataObject.java Fri Feb 3 04:06:44 2006
@@ -13,12 +13,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.wsrp4j.commons.persistence;
import java.util.Iterator;
-
/**
* This class is the generic interface for the PersistentDataObject
* implementations used to store and retrieve objects from a persistent
@@ -28,8 +26,7 @@
*
* @version $Id$
*/
-public interface PersistentDataObject
-{
+public interface PersistentDataObject {
/**
* Sets the PersistentInformation object for this PersistentDataObject
@@ -37,7 +34,7 @@
* @param persistentInfo
* @see PersistentInformation
*/
- public void setPersistentInformation(PersistentInformation persistentInfo);
+ void setPersistentInformation(PersistentInformation persistentInfo);
/**
* Get the PersistentInformation for this PersistentDataObject
@@ -45,19 +42,19 @@
* @return PersistentInformation
* @see PersistentInformation
*/
- public PersistentInformation getPersistentInformation();
+ PersistentInformation getPersistentInformation();
/**
* Clear the internal object collection
*/
- public void clear();
+ void clear();
/**
* Returns all objects in the object map as an iterator
*
* @return Iterator
*/
- public Iterator getObjects();
+ Iterator getObjects();
/**
* Add an element to the internal map
@@ -65,13 +62,12 @@
* @param object Object as element
*
*/
- public void addObject(Object object);
+ void addObject(Object object);
/**
* Returns the last element added
*
* @return Object as last element
*/
- public Object getLastElement();
-
+ Object getLastElement();
}
Modified: portals/wsrp4j/trunk/sandbox/wsrp4j/commons/src/java/org/apache/wsrp4j/commons/persistence/PersistentFactory.java
URL: http://svn.apache.org/viewcvs/portals/wsrp4j/trunk/sandbox/wsrp4j/commons/src/java/org/apache/wsrp4j/commons/persistence/PersistentFactory.java?rev=374648&r1=374647&r2=374648&view=diff
==============================================================================
--- portals/wsrp4j/trunk/sandbox/wsrp4j/commons/src/java/org/apache/wsrp4j/commons/persistence/PersistentFactory.java (original)
+++ portals/wsrp4j/trunk/sandbox/wsrp4j/commons/src/java/org/apache/wsrp4j/commons/persistence/PersistentFactory.java Fri Feb 3 04:06:44 2006
@@ -13,11 +13,8 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.wsrp4j.commons.persistence;
-
-
/**
* This class is the base interface definition for the persistence
* support factory class.
@@ -26,21 +23,20 @@
*
* @version $Id$
*/
-public interface PersistentFactory
-{
+public interface PersistentFactory {
/**
* Returns the PersistentHandler
*
* @return PersistentHandler
*/
- public PersistentHandler getPersistentHandler();
+ PersistentHandler getPersistentHandler();
/**
* Returns the PersistentInformationProvider
*
* @return PersistentInformationProvider
*/
- public PersistentInformationProvider getPersistentInformationProvider();
+ PersistentInformationProvider getPersistentInformationProvider();
}
Modified: portals/wsrp4j/trunk/sandbox/wsrp4j/commons/src/java/org/apache/wsrp4j/commons/persistence/PersistentHandler.java
URL: http://svn.apache.org/viewcvs/portals/wsrp4j/trunk/sandbox/wsrp4j/commons/src/java/org/apache/wsrp4j/commons/persistence/PersistentHandler.java?rev=374648&r1=374647&r2=374648&view=diff
==============================================================================
--- portals/wsrp4j/trunk/sandbox/wsrp4j/commons/src/java/org/apache/wsrp4j/commons/persistence/PersistentHandler.java (original)
+++ portals/wsrp4j/trunk/sandbox/wsrp4j/commons/src/java/org/apache/wsrp4j/commons/persistence/PersistentHandler.java Fri Feb 3 04:06:44 2006
@@ -13,7 +13,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.wsrp4j.commons.persistence;
import org.apache.wsrp4j.commons.exception.WSRPException;
@@ -27,8 +26,7 @@
*
* @version $Id$
*/
-public interface PersistentHandler
-{
+public interface PersistentHandler {
/**
* Store a single object from the PersistentDataObject to persistent
@@ -37,7 +35,7 @@
* @param persistentDataObject
* @throws WSRPException
*/
- public void store(PersistentDataObject persistentDataObject)
+ void store(PersistentDataObject persistentDataObject)
throws WSRPException;
/**
@@ -47,7 +45,7 @@
* @param persistentDataObject
* @throws WSRPException
*/
- public PersistentDataObject restore(
+ PersistentDataObject restore(
PersistentDataObject persistentDataObject)
throws WSRPException;
@@ -57,13 +55,13 @@
* @param persistentDataObject
* @throws WSRPException
*/
- public PersistentDataObject restoreMultiple(
+ PersistentDataObject restoreMultiple(
PersistentDataObject persistentDataObject)
throws WSRPException;
/**
* Delete a object from the persistent store
*/
- public void delete(PersistentDataObject persistentDataObject);
+ void delete(PersistentDataObject persistentDataObject);
}
Modified: portals/wsrp4j/trunk/sandbox/wsrp4j/commons/src/java/org/apache/wsrp4j/commons/persistence/PersistentInformation.java
URL: http://svn.apache.org/viewcvs/portals/wsrp4j/trunk/sandbox/wsrp4j/commons/src/java/org/apache/wsrp4j/commons/persistence/PersistentInformation.java?rev=374648&r1=374647&r2=374648&view=diff
==============================================================================
--- portals/wsrp4j/trunk/sandbox/wsrp4j/commons/src/java/org/apache/wsrp4j/commons/persistence/PersistentInformation.java (original)
+++ portals/wsrp4j/trunk/sandbox/wsrp4j/commons/src/java/org/apache/wsrp4j/commons/persistence/PersistentInformation.java Fri Feb 3 04:06:44 2006
@@ -13,10 +13,8 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.wsrp4j.commons.persistence;
-
/**
* This class is the generic interface for the persistent information used
* with PersistentDataObjects.
@@ -24,8 +22,7 @@
* @author <a href="mailto:Ralf.Altrichter@de.ibm.com">Ralf Altrichter</a>
* @version $Id$
*/
-public interface PersistentInformation
-{
+public interface PersistentInformation {
/**
* Set a group identifier. All PersistentDataObjects with this
@@ -34,13 +31,13 @@
*
* @param groupID as String
*/
- public void setGroupID(String groupID);
+ void setGroupID(String groupID);
/**
* Returns a group identifier
*
* @return groupID as String
*/
- public String getGroupID();
+ String getGroupID();
}
Modified: portals/wsrp4j/trunk/sandbox/wsrp4j/commons/src/java/org/apache/wsrp4j/commons/persistence/PersistentInformationProvider.java
URL: http://svn.apache.org/viewcvs/portals/wsrp4j/trunk/sandbox/wsrp4j/commons/src/java/org/apache/wsrp4j/commons/persistence/PersistentInformationProvider.java?rev=374648&r1=374647&r2=374648&view=diff
==============================================================================
--- portals/wsrp4j/trunk/sandbox/wsrp4j/commons/src/java/org/apache/wsrp4j/commons/persistence/PersistentInformationProvider.java (original)
+++ portals/wsrp4j/trunk/sandbox/wsrp4j/commons/src/java/org/apache/wsrp4j/commons/persistence/PersistentInformationProvider.java Fri Feb 3 04:06:44 2006
@@ -13,17 +13,14 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.wsrp4j.commons.persistence;
-
/**
* This class is the generic interface for the PersistentInformationProviders.
*
* @author <a href="mailto:Ralf.Altrichter@de.ibm.com">Ralf Altrichter</a>
* @version $Id$
*/
-public interface PersistentInformationProvider
-{
-
+public interface PersistentInformationProvider {
+ // just a marker interface
}
Modified: portals/wsrp4j/trunk/sandbox/wsrp4j/commons/src/java/org/apache/wsrp4j/commons/persistence/ServerPersistentFactory.java
URL: http://svn.apache.org/viewcvs/portals/wsrp4j/trunk/sandbox/wsrp4j/commons/src/java/org/apache/wsrp4j/commons/persistence/ServerPersistentFactory.java?rev=374648&r1=374647&r2=374648&view=diff
==============================================================================
--- portals/wsrp4j/trunk/sandbox/wsrp4j/commons/src/java/org/apache/wsrp4j/commons/persistence/ServerPersistentFactory.java (original)
+++ portals/wsrp4j/trunk/sandbox/wsrp4j/commons/src/java/org/apache/wsrp4j/commons/persistence/ServerPersistentFactory.java Fri Feb 3 04:06:44 2006
@@ -13,11 +13,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.wsrp4j.commons.persistence;
import org.apache.wsrp4j.commons.exception.WSRPException;
-
/**
* This class is the interface definition for the server persistence
Modified: portals/wsrp4j/trunk/sandbox/wsrp4j/commons/src/java/org/apache/wsrp4j/commons/persistence/driver/PersistentAccess.java
URL: http://svn.apache.org/viewcvs/portals/wsrp4j/trunk/sandbox/wsrp4j/commons/src/java/org/apache/wsrp4j/commons/persistence/driver/PersistentAccess.java?rev=374648&r1=374647&r2=374648&view=diff
==============================================================================
--- portals/wsrp4j/trunk/sandbox/wsrp4j/commons/src/java/org/apache/wsrp4j/commons/persistence/driver/PersistentAccess.java (original)
+++ portals/wsrp4j/trunk/sandbox/wsrp4j/commons/src/java/org/apache/wsrp4j/commons/persistence/driver/PersistentAccess.java Fri Feb 3 04:06:44 2006
@@ -13,7 +13,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.wsrp4j.commons.persistence.driver;
import java.io.InputStream;
@@ -27,7 +26,6 @@
import org.apache.wsrp4j.commons.persistence.ClientPersistentFactory;
import org.apache.wsrp4j.commons.persistence.ServerPersistentFactory;
-
/**
* This class provides a static method to access the client and server
* persistent factories.It reads in the file "WSRPServices.properties"
@@ -37,8 +35,7 @@
*
* @version $Id$
*/
-public class PersistentAccess
-{
+public class PersistentAccess {
// the name of the .properties file for the server
private static String WSRP_SERVICES = "WSRPServices.properties";
@@ -55,7 +52,7 @@
"client.persistent.factory";
// the content of the properties file
- private static Properties pFactories = null;
+ private static Properties pFactories;
// holds the instance of the server factory after initializing
private static ServerPersistentFactory serverPersistentFactory;
Modified: portals/wsrp4j/trunk/sandbox/wsrp4j/commons/src/java/org/apache/wsrp4j/commons/persistence/driver/WSRPServiceDescription.java
URL: http://svn.apache.org/viewcvs/portals/wsrp4j/trunk/sandbox/wsrp4j/commons/src/java/org/apache/wsrp4j/commons/persistence/driver/WSRPServiceDescription.java?rev=374648&r1=374647&r2=374648&view=diff
==============================================================================
--- portals/wsrp4j/trunk/sandbox/wsrp4j/commons/src/java/org/apache/wsrp4j/commons/persistence/driver/WSRPServiceDescription.java (original)
+++ portals/wsrp4j/trunk/sandbox/wsrp4j/commons/src/java/org/apache/wsrp4j/commons/persistence/driver/WSRPServiceDescription.java Fri Feb 3 04:06:44 2006
@@ -13,7 +13,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.wsrp4j.commons.persistence.driver;
import oasis.names.tc.wsrp.v1.types.CookieProtocol;
@@ -30,20 +29,18 @@
*
* @version $Id$
*/
-public class WSRPServiceDescription extends ServiceDescription
-{
+public class WSRPServiceDescription extends ServiceDescription {
/**
* String representation of the CookieProtocol object, contained
* in the servicedescription and retured by method getRequiresInitCookie()
*/
- private String initCookieRequired = null;
+ private String initCookieRequired;
/**
* Default Constructor
*/
- public WSRPServiceDescription()
- {
+ public WSRPServiceDescription() {
}
Modified: portals/wsrp4j/trunk/sandbox/wsrp4j/commons/src/java/org/apache/wsrp4j/commons/util/AuthenticationInfoHelper.java
URL: http://svn.apache.org/viewcvs/portals/wsrp4j/trunk/sandbox/wsrp4j/commons/src/java/org/apache/wsrp4j/commons/util/AuthenticationInfoHelper.java?rev=374648&r1=374647&r2=374648&view=diff
==============================================================================
--- portals/wsrp4j/trunk/sandbox/wsrp4j/commons/src/java/org/apache/wsrp4j/commons/util/AuthenticationInfoHelper.java (original)
+++ portals/wsrp4j/trunk/sandbox/wsrp4j/commons/src/java/org/apache/wsrp4j/commons/util/AuthenticationInfoHelper.java Fri Feb 3 04:06:44 2006
@@ -13,11 +13,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.wsrp4j.commons.util;
import javax.portlet.PortletRequest;
-
/**
* @version $Id$
Modified: portals/wsrp4j/trunk/sandbox/wsrp4j/commons/src/java/org/apache/wsrp4j/commons/util/Constants.java
URL: http://svn.apache.org/viewcvs/portals/wsrp4j/trunk/sandbox/wsrp4j/commons/src/java/org/apache/wsrp4j/commons/util/Constants.java?rev=374648&r1=374647&r2=374648&view=diff
==============================================================================
--- portals/wsrp4j/trunk/sandbox/wsrp4j/commons/src/java/org/apache/wsrp4j/commons/util/Constants.java (original)
+++ portals/wsrp4j/trunk/sandbox/wsrp4j/commons/src/java/org/apache/wsrp4j/commons/util/Constants.java Fri Feb 3 04:06:44 2006
@@ -13,11 +13,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.wsrp4j.commons.util;
-/*
+/**
* @version $Id$
*/
public final class Constants
Modified: portals/wsrp4j/trunk/sandbox/wsrp4j/commons/src/java/org/apache/wsrp4j/commons/util/HandleGenerator.java
URL: http://svn.apache.org/viewcvs/portals/wsrp4j/trunk/sandbox/wsrp4j/commons/src/java/org/apache/wsrp4j/commons/util/HandleGenerator.java?rev=374648&r1=374647&r2=374648&view=diff
==============================================================================
--- portals/wsrp4j/trunk/sandbox/wsrp4j/commons/src/java/org/apache/wsrp4j/commons/util/HandleGenerator.java (original)
+++ portals/wsrp4j/trunk/sandbox/wsrp4j/commons/src/java/org/apache/wsrp4j/commons/util/HandleGenerator.java Fri Feb 3 04:06:44 2006
@@ -12,16 +12,14 @@
* 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.commons.util;
-
-/*
+/**
* @version $Id$
*/
-public interface HandleGenerator
-{
+public interface HandleGenerator {
/**
* Generates a new handle and returns it as a String.
@@ -29,6 +27,5 @@
*
* @return String representing the new handle.
*/
- public String generateHandle();
-
+ String generateHandle();
}
Modified: portals/wsrp4j/trunk/sandbox/wsrp4j/commons/src/java/org/apache/wsrp4j/commons/util/HandleGeneratorFactory.java
URL: http://svn.apache.org/viewcvs/portals/wsrp4j/trunk/sandbox/wsrp4j/commons/src/java/org/apache/wsrp4j/commons/util/HandleGeneratorFactory.java?rev=374648&r1=374647&r2=374648&view=diff
==============================================================================
--- portals/wsrp4j/trunk/sandbox/wsrp4j/commons/src/java/org/apache/wsrp4j/commons/util/HandleGeneratorFactory.java (original)
+++ portals/wsrp4j/trunk/sandbox/wsrp4j/commons/src/java/org/apache/wsrp4j/commons/util/HandleGeneratorFactory.java Fri Feb 3 04:06:44 2006
@@ -13,15 +13,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.wsrp4j.commons.util;
-
-/*
+/**
* @version $Id$
*/
-public interface HandleGeneratorFactory
-{
+public interface HandleGeneratorFactory {
/**
* Returns an instance of HandleGenerator by calling the constructor
@@ -30,6 +27,5 @@
* @return HandleGenerator An instance of a class implementing the
* HandleGenerator.
*/
- public HandleGenerator getHandleGenerator();
-
+ HandleGenerator getHandleGenerator();
}
Modified: portals/wsrp4j/trunk/sandbox/wsrp4j/commons/src/java/org/apache/wsrp4j/commons/util/LocaleHelper.java
URL: http://svn.apache.org/viewcvs/portals/wsrp4j/trunk/sandbox/wsrp4j/commons/src/java/org/apache/wsrp4j/commons/util/LocaleHelper.java?rev=374648&r1=374647&r2=374648&view=diff
==============================================================================
--- portals/wsrp4j/trunk/sandbox/wsrp4j/commons/src/java/org/apache/wsrp4j/commons/util/LocaleHelper.java (original)
+++ portals/wsrp4j/trunk/sandbox/wsrp4j/commons/src/java/org/apache/wsrp4j/commons/util/LocaleHelper.java Fri Feb 3 04:06:44 2006
@@ -13,7 +13,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.wsrp4j.commons.util;
import java.util.Locale;
Modified: portals/wsrp4j/trunk/sandbox/wsrp4j/commons/src/java/org/apache/wsrp4j/commons/util/Modes.java
URL: http://svn.apache.org/viewcvs/portals/wsrp4j/trunk/sandbox/wsrp4j/commons/src/java/org/apache/wsrp4j/commons/util/Modes.java?rev=374648&r1=374647&r2=374648&view=diff
==============================================================================
--- portals/wsrp4j/trunk/sandbox/wsrp4j/commons/src/java/org/apache/wsrp4j/commons/util/Modes.java (original)
+++ portals/wsrp4j/trunk/sandbox/wsrp4j/commons/src/java/org/apache/wsrp4j/commons/util/Modes.java Fri Feb 3 04:06:44 2006
@@ -13,18 +13,15 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.wsrp4j.commons.util;
-
import javax.portlet.PortletMode;
-
-/*
+/**
* @version $Id$
*/
-public class Modes implements java.io.Serializable
-{
+public class Modes implements java.io.Serializable {
+
private String _value_;
private static java.util.HashMap _table_ = new java.util.HashMap();
Modified: portals/wsrp4j/trunk/sandbox/wsrp4j/commons/src/java/org/apache/wsrp4j/commons/util/ParameterChecker.java
URL: http://svn.apache.org/viewcvs/portals/wsrp4j/trunk/sandbox/wsrp4j/commons/src/java/org/apache/wsrp4j/commons/util/ParameterChecker.java?rev=374648&r1=374647&r2=374648&view=diff
==============================================================================
--- portals/wsrp4j/trunk/sandbox/wsrp4j/commons/src/java/org/apache/wsrp4j/commons/util/ParameterChecker.java (original)
+++ portals/wsrp4j/trunk/sandbox/wsrp4j/commons/src/java/org/apache/wsrp4j/commons/util/ParameterChecker.java Fri Feb 3 04:06:44 2006
@@ -13,7 +13,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.wsrp4j.commons.util;
import javax.xml.namespace.QName;
@@ -68,8 +67,7 @@
* performed if the value is 'not null'. On null value, no checking is done.
* @version $Id$
*/
-public class ParameterChecker
-{
+public class ParameterChecker {
// for logging and exception support
private Logger logger = LogManager.getLogManager().getLogger(ParameterChecker.class);
Modified: portals/wsrp4j/trunk/sandbox/wsrp4j/commons/src/java/org/apache/wsrp4j/commons/util/StateChangedEvent.java
URL: http://svn.apache.org/viewcvs/portals/wsrp4j/trunk/sandbox/wsrp4j/commons/src/java/org/apache/wsrp4j/commons/util/StateChangedEvent.java?rev=374648&r1=374647&r2=374648&view=diff
==============================================================================
--- portals/wsrp4j/trunk/sandbox/wsrp4j/commons/src/java/org/apache/wsrp4j/commons/util/StateChangedEvent.java (original)
+++ portals/wsrp4j/trunk/sandbox/wsrp4j/commons/src/java/org/apache/wsrp4j/commons/util/StateChangedEvent.java Fri Feb 3 04:06:44 2006
@@ -13,12 +13,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.wsrp4j.commons.util;
import java.util.EventObject;
-
/**
* StateChangedEvent class, used as event for the StateChangedServiceImpl.
*
@@ -29,8 +27,7 @@
*
* @version $Id$
*/
-public class StateChangedEvent extends EventObject
-{
+public class StateChangedEvent extends EventObject {
/**
* Public default contructor
Modified: portals/wsrp4j/trunk/sandbox/wsrp4j/commons/src/java/org/apache/wsrp4j/commons/util/StateChangedListener.java
URL: http://svn.apache.org/viewcvs/portals/wsrp4j/trunk/sandbox/wsrp4j/commons/src/java/org/apache/wsrp4j/commons/util/StateChangedListener.java?rev=374648&r1=374647&r2=374648&view=diff
==============================================================================
--- portals/wsrp4j/trunk/sandbox/wsrp4j/commons/src/java/org/apache/wsrp4j/commons/util/StateChangedListener.java (original)
+++ portals/wsrp4j/trunk/sandbox/wsrp4j/commons/src/java/org/apache/wsrp4j/commons/util/StateChangedListener.java Fri Feb 3 04:06:44 2006
@@ -16,7 +16,6 @@
package org.apache.wsrp4j.commons.util;
-
/**
* This class defines the StateChangedListener Interface.
*
Modified: portals/wsrp4j/trunk/sandbox/wsrp4j/commons/src/java/org/apache/wsrp4j/commons/util/StateChangedService.java
URL: http://svn.apache.org/viewcvs/portals/wsrp4j/trunk/sandbox/wsrp4j/commons/src/java/org/apache/wsrp4j/commons/util/StateChangedService.java?rev=374648&r1=374647&r2=374648&view=diff
==============================================================================
--- portals/wsrp4j/trunk/sandbox/wsrp4j/commons/src/java/org/apache/wsrp4j/commons/util/StateChangedService.java (original)
+++ portals/wsrp4j/trunk/sandbox/wsrp4j/commons/src/java/org/apache/wsrp4j/commons/util/StateChangedService.java Fri Feb 3 04:06:44 2006
@@ -13,9 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.wsrp4j.commons.util;
-
/**
*
Modified: portals/wsrp4j/trunk/sandbox/wsrp4j/commons/src/java/org/apache/wsrp4j/commons/util/Utility.java
URL: http://svn.apache.org/viewcvs/portals/wsrp4j/trunk/sandbox/wsrp4j/commons/src/java/org/apache/wsrp4j/commons/util/Utility.java?rev=374648&r1=374647&r2=374648&view=diff
==============================================================================
--- portals/wsrp4j/trunk/sandbox/wsrp4j/commons/src/java/org/apache/wsrp4j/commons/util/Utility.java (original)
+++ portals/wsrp4j/trunk/sandbox/wsrp4j/commons/src/java/org/apache/wsrp4j/commons/util/Utility.java Fri Feb 3 04:06:44 2006
@@ -13,22 +13,25 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.wsrp4j.commons.util;
-
import java.io.InputStream;
+import java.io.UnsupportedEncodingException;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.net.URLDecoder;
+import java.net.URLEncoder;
import java.util.Properties;
+import org.apache.commons.lang.SystemUtils;
import org.apache.wsrp4j.commons.exception.ErrorCodes;
import org.apache.wsrp4j.commons.exception.WSRPException;
import org.apache.wsrp4j.commons.exception.WSRPXHelper;
-/*
+/**
* @version $Id$
*/
-public class Utility
-{
+public class Utility {
/**
* Loads a property file with the given name using the class loader.
@@ -38,11 +41,8 @@
* @throws WSRPException if any error occured
**/
public static Properties loadPropertiesFromFile(String fileName)
- throws WSRPException
- {
-
- try
- {
+ throws WSRPException {
+ try {
// read in .properties-file
InputStream in = Utility.class.getClassLoader().
getResourceAsStream(fileName);
@@ -51,11 +51,66 @@
return properties;
- } catch (Exception e)
- {
+ } catch (Exception e) {
WSRPXHelper.throwX(ErrorCodes.PROPERTY_FILE_NOT_FOUND, e);
}
return null;
}
+ // FIXME Remove when JDK1.3 support is removed.
+ private static Method urlEncode = null;
+ private static Method urlDecode = null;
+
+ static {
+ if (SystemUtils.isJavaVersionAtLeast(140)) {
+ try {
+ urlEncode = URLEncoder.class.getMethod("encode", new Class[]{String.class, String.class});
+ urlDecode = URLDecoder.class.getMethod("decode", new Class[]{String.class, String.class});
+ } catch (NoSuchMethodException e) {
+ // EMPTY
+ }
+ }
+ }
+
+ /**
+ * Pass through to the {@link java.net.URLEncoder}. If running under JDK < 1.4,
+ * default encoding will always be used.
+ */
+ public static String encode(String s, String enc) throws UnsupportedEncodingException {
+ if (urlEncode != null) {
+ try {
+ return (String)urlEncode.invoke(s, new Object[]{ s, enc } );
+ } catch (IllegalAccessException e) {
+ // EMPTY
+ } catch (InvocationTargetException e) {
+ if (e.getTargetException() instanceof UnsupportedEncodingException) {
+ throw (UnsupportedEncodingException)e.getTargetException();
+ } else if (e.getTargetException() instanceof RuntimeException) {
+ throw (RuntimeException)e.getTargetException();
+ }
+ }
+ }
+ return URLEncoder.encode(s);
+ }
+
+ /**
+ * Pass through to the {@link java.net.URLDecoder}. If running under JDK < 1.4,
+ * default encoding will always be used.
+ */
+ public static String decode(String s, String enc) throws UnsupportedEncodingException {
+ if (urlDecode != null) {
+ try {
+ return (String)urlDecode.invoke(s, new Object[]{ s, enc } );
+ } catch (IllegalAccessException e) {
+ // EMPTY
+ } catch (InvocationTargetException e) {
+ if (e.getTargetException() instanceof UnsupportedEncodingException) {
+ throw (UnsupportedEncodingException)e.getTargetException();
+ } else if (e.getTargetException() instanceof RuntimeException) {
+ throw (RuntimeException)e.getTargetException();
+ }
+ }
+ }
+ return URLDecoder.decode(s);
+ }
}
Modified: portals/wsrp4j/trunk/sandbox/wsrp4j/commons/src/java/org/apache/wsrp4j/commons/util/WindowStates.java
URL: http://svn.apache.org/viewcvs/portals/wsrp4j/trunk/sandbox/wsrp4j/commons/src/java/org/apache/wsrp4j/commons/util/WindowStates.java?rev=374648&r1=374647&r2=374648&view=diff
==============================================================================
--- portals/wsrp4j/trunk/sandbox/wsrp4j/commons/src/java/org/apache/wsrp4j/commons/util/WindowStates.java (original)
+++ portals/wsrp4j/trunk/sandbox/wsrp4j/commons/src/java/org/apache/wsrp4j/commons/util/WindowStates.java Fri Feb 3 04:06:44 2006
@@ -13,16 +13,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.wsrp4j.commons.util;
-
import java.util.HashMap;
-
import javax.portlet.WindowState;
-
-/*
+/**
* @version $Id$
*/
public class WindowStates implements java.io.Serializable
@@ -31,8 +27,7 @@
private static HashMap _table_ = new HashMap();
// Constructor
- protected WindowStates(String value)
- {
+ protected WindowStates(String value) {
_value_ = value;
_table_.put(_value_, this);
}
Modified: portals/wsrp4j/trunk/sandbox/wsrp4j/commons/src/java/org/apache/wsrp4j/commons/util/impl/HandleGeneratorFactoryImpl.java
URL: http://svn.apache.org/viewcvs/portals/wsrp4j/trunk/sandbox/wsrp4j/commons/src/java/org/apache/wsrp4j/commons/util/impl/HandleGeneratorFactoryImpl.java?rev=374648&r1=374647&r2=374648&view=diff
==============================================================================
--- portals/wsrp4j/trunk/sandbox/wsrp4j/commons/src/java/org/apache/wsrp4j/commons/util/impl/HandleGeneratorFactoryImpl.java (original)
+++ portals/wsrp4j/trunk/sandbox/wsrp4j/commons/src/java/org/apache/wsrp4j/commons/util/impl/HandleGeneratorFactoryImpl.java Fri Feb 3 04:06:44 2006
@@ -13,30 +13,25 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.wsrp4j.commons.util.impl;
import org.apache.wsrp4j.commons.util.HandleGenerator;
import org.apache.wsrp4j.commons.util.HandleGeneratorFactory;
-
-/*
+/**
* @version $Id$
*/
-public class HandleGeneratorFactoryImpl implements HandleGeneratorFactory
-{
+public class HandleGeneratorFactoryImpl implements HandleGeneratorFactory {
- private static HandleGeneratorImpl generator = null;
+ private static HandleGeneratorImpl generator;
/**
* Returns an new handle and returns it as a String.
*
* @return String representing the new handle.
*/
- public HandleGenerator getHandleGenerator()
- {
- if (generator == null)
- {
+ public HandleGenerator getHandleGenerator() {
+ if (generator == null) {
generator = HandleGeneratorImpl.create();
}
Modified: portals/wsrp4j/trunk/sandbox/wsrp4j/commons/src/java/org/apache/wsrp4j/commons/util/impl/HandleGeneratorImpl.java
URL: http://svn.apache.org/viewcvs/portals/wsrp4j/trunk/sandbox/wsrp4j/commons/src/java/org/apache/wsrp4j/commons/util/impl/HandleGeneratorImpl.java?rev=374648&r1=374647&r2=374648&view=diff
==============================================================================
--- portals/wsrp4j/trunk/sandbox/wsrp4j/commons/src/java/org/apache/wsrp4j/commons/util/impl/HandleGeneratorImpl.java (original)
+++ portals/wsrp4j/trunk/sandbox/wsrp4j/commons/src/java/org/apache/wsrp4j/commons/util/impl/HandleGeneratorImpl.java Fri Feb 3 04:06:44 2006
@@ -13,7 +13,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.wsrp4j.commons.util.impl;
import java.net.InetAddress;
@@ -21,7 +20,6 @@
import org.apache.wsrp4j.commons.util.HandleGenerator;
-
/**
* This class implements the HandleGenerator interface.
*
@@ -32,16 +30,14 @@
* @see HandleGenerator
*
*/
-public class HandleGeneratorImpl implements HandleGenerator
-{
+public class HandleGeneratorImpl implements HandleGenerator {
private static int counter = 0;
/**
* Private constructor of HandleGeneratorImpl.
*/
- private HandleGeneratorImpl()
- {
+ private HandleGeneratorImpl() {
}
/**
@@ -49,8 +45,7 @@
*
* @return String representing the new handle.
*/
- public static HandleGeneratorImpl create()
- {
+ public static HandleGeneratorImpl create() {
return new HandleGeneratorImpl();
}
@@ -59,17 +54,14 @@
*
* @return String representing the new handle.
*/
- synchronized public String generateHandle()
- {
+ synchronized public String generateHandle() {
String host = null;
- try
- {
+ try {
host = InetAddress.getLocalHost().getHostAddress().toString();
- } catch (Exception e)
- {
+ } catch (Exception e) {
host = Double.toString(
new Random(new Random().nextLong()).nextDouble());
Modified: portals/wsrp4j/trunk/sandbox/wsrp4j/commons/src/java/org/apache/wsrp4j/commons/util/impl/StateChangedServiceImpl.java
URL: http://svn.apache.org/viewcvs/portals/wsrp4j/trunk/sandbox/wsrp4j/commons/src/java/org/apache/wsrp4j/commons/util/impl/StateChangedServiceImpl.java?rev=374648&r1=374647&r2=374648&view=diff
==============================================================================
--- portals/wsrp4j/trunk/sandbox/wsrp4j/commons/src/java/org/apache/wsrp4j/commons/util/impl/StateChangedServiceImpl.java (original)
+++ portals/wsrp4j/trunk/sandbox/wsrp4j/commons/src/java/org/apache/wsrp4j/commons/util/impl/StateChangedServiceImpl.java Fri Feb 3 04:06:44 2006
@@ -13,7 +13,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.wsrp4j.commons.util.impl;
import java.util.ArrayList;
@@ -23,7 +22,6 @@
import org.apache.wsrp4j.commons.util.StateChangedListener;
import org.apache.wsrp4j.commons.util.StateChangedEvent;
-
/**
* This class implements the StateChangedService interface and is
* the parent of all classes with StateChangeService functionality.
@@ -32,7 +30,6 @@
*
* @version 1.0
*/
-
public class StateChangedServiceImpl implements StateChangedService {
// internal list of StateChangedListeners
@@ -41,8 +38,7 @@
/**
* Constructor
*/
- public StateChangedServiceImpl()
- {
+ public StateChangedServiceImpl() {
}
@@ -52,8 +48,7 @@
*
* @param changeListener to be added
*/
- public void addListener(StateChangedListener changeListener)
- {
+ public void addListener(StateChangedListener changeListener) {
_listeners.add(changeListener);
@@ -64,11 +59,9 @@
* stateChanged(StateChangedEvent e) method on the
* target object.
*/
- public void stateChanged()
- {
+ public void stateChanged() {
Iterator iterator = _listeners.iterator();
- while (iterator.hasNext())
- {
+ while (iterator.hasNext()) {
StateChangedListener listener =
(StateChangedListener)iterator.next();
listener.stateChanged(new StateChangedEvent(this));
Modified: portals/wsrp4j/trunk/sandbox/wsrp4j/consumer-swingconsumer/src/java/org/apache/wsrp4j/consumer/swingconsumer/driver/URLGeneratorImpl.java
URL: http://svn.apache.org/viewcvs/portals/wsrp4j/trunk/sandbox/wsrp4j/consumer-swingconsumer/src/java/org/apache/wsrp4j/consumer/swingconsumer/driver/URLGeneratorImpl.java?rev=374648&r1=374647&r2=374648&view=diff
==============================================================================
--- portals/wsrp4j/trunk/sandbox/wsrp4j/consumer-swingconsumer/src/java/org/apache/wsrp4j/consumer/swingconsumer/driver/URLGeneratorImpl.java (original)
+++ portals/wsrp4j/trunk/sandbox/wsrp4j/consumer-swingconsumer/src/java/org/apache/wsrp4j/consumer/swingconsumer/driver/URLGeneratorImpl.java Fri Feb 3 04:06:44 2006
@@ -17,13 +17,13 @@
package org.apache.wsrp4j.consumer.swingconsumer.driver;
import java.io.UnsupportedEncodingException;
-import java.net.URLDecoder;
import java.util.Iterator;
import java.util.Map;
import org.apache.wsrp4j.commons.log.LogManager;
import org.apache.wsrp4j.commons.log.Logger;
import org.apache.wsrp4j.commons.util.Constants;
+import org.apache.wsrp4j.commons.util.Utility;
import org.apache.wsrp4j.commons.consumer.interfaces.urlgenerator.URLGenerator;
@@ -106,7 +106,7 @@
if (resourceURL != null) {
try {
- return URLDecoder.decode(resourceURL, "utf-8");
+ return Utility.decode(resourceURL, "utf-8");
} catch (UnsupportedEncodingException uee) {
// ignore
}
Modified: portals/wsrp4j/trunk/sandbox/wsrp4j/consumer/src/java/org/apache/wsrp4j/consumer/proxyportlet/impl/ResourceProxy.java
URL: http://svn.apache.org/viewcvs/portals/wsrp4j/trunk/sandbox/wsrp4j/consumer/src/java/org/apache/wsrp4j/consumer/proxyportlet/impl/ResourceProxy.java?rev=374648&r1=374647&r2=374648&view=diff
==============================================================================
--- portals/wsrp4j/trunk/sandbox/wsrp4j/consumer/src/java/org/apache/wsrp4j/consumer/proxyportlet/impl/ResourceProxy.java (original)
+++ portals/wsrp4j/trunk/sandbox/wsrp4j/consumer/src/java/org/apache/wsrp4j/consumer/proxyportlet/impl/ResourceProxy.java Fri Feb 3 04:06:44 2006
@@ -20,13 +20,13 @@
import java.io.OutputStream;
import java.net.URL;
import java.net.URLConnection;
-import java.net.URLDecoder;
import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.apache.wsrp4j.commons.util.Constants;
+import org.apache.wsrp4j.commons.util.Utility;
/**
* This servlet acts as proxy for WSRP resources.
@@ -47,7 +47,7 @@
if (targetURL != null) {
try {
- URL url = new URL(URLDecoder.decode(targetURL,
+ URL url = new URL(Utility.decode(targetURL,
Constants.UTF_8));
URLConnection conn = url.openConnection();
Modified: portals/wsrp4j/trunk/sandbox/wsrp4j/etc/artifact-versions.ent
URL: http://svn.apache.org/viewcvs/portals/wsrp4j/trunk/sandbox/wsrp4j/etc/artifact-versions.ent?rev=374648&r1=374647&r2=374648&view=diff
==============================================================================
--- portals/wsrp4j/trunk/sandbox/wsrp4j/etc/artifact-versions.ent (original)
+++ portals/wsrp4j/trunk/sandbox/wsrp4j/etc/artifact-versions.ent Fri Feb 3 04:06:44 2006
@@ -20,6 +20,7 @@
<!ENTITY axis-version "1.3">
<!ENTITY castor-version "0.9.6">
+<!ENTITY commons-lang-version "2.1">
<!ENTITY commons-discovery-version "0.2">
<!ENTITY commons-logging-version "1.0.4">
<!ENTITY junit-version "3.8.1">
Modified: portals/wsrp4j/trunk/sandbox/wsrp4j/producer/src/java/org/apache/wsrp4j/producer/provider/pluto/driver/DescriptionHandlerImpl.java
URL: http://svn.apache.org/viewcvs/portals/wsrp4j/trunk/sandbox/wsrp4j/producer/src/java/org/apache/wsrp4j/producer/provider/pluto/driver/DescriptionHandlerImpl.java?rev=374648&r1=374647&r2=374648&view=diff
==============================================================================
--- portals/wsrp4j/trunk/sandbox/wsrp4j/producer/src/java/org/apache/wsrp4j/producer/provider/pluto/driver/DescriptionHandlerImpl.java (original)
+++ portals/wsrp4j/trunk/sandbox/wsrp4j/producer/src/java/org/apache/wsrp4j/producer/provider/pluto/driver/DescriptionHandlerImpl.java Fri Feb 3 04:06:44 2006
@@ -55,12 +55,9 @@
import org.apache.wsrp4j.commons.persistence.driver.WSRPServiceDescription;
import org.apache.wsrp4j.commons.producer.provider.interfaces.Portlet;
-import org.apache.wsrp4j.commons.producer.provider.interfaces.
- DescriptionHandler;
-import org.apache.wsrp4j.commons.producer.provider.interfaces.PortletPool;
+import org.apache.wsrp4j.commons.producer.provider.interfaces.DescriptionHandler;
import org.apache.wsrp4j.commons.producer.provider.interfaces.Provider;
-import org.apache.wsrp4j.producer.provider.pluto.interfaces.PlutoPortletPool;
import org.apache.wsrp4j.producer.provider.pluto.interfaces.PlutoProvider;
import org.apache.wsrp4j.commons.util.Constants;
@@ -82,9 +79,6 @@
// Provider
private PlutoProvider provider;
- // PortletPool
- private PlutoPortletPool portletPool;
-
//persistence
private PersistentDataObject persistentDataObject;
private PersistentHandler persistentHandler;
@@ -162,9 +156,6 @@
new DescriptionHandlerImpl();
descriptionHandler.provider = (PlutoProvider)provider;
-
- PortletPool portletPool = provider.getPortletPool();
- descriptionHandler.portletPool = (PlutoPortletPool)portletPool;
/* try {
Modified: portals/wsrp4j/trunk/sandbox/wsrp4j/producer/src/java/org/apache/wsrp4j/producer/provider/pluto/driver/DynamicInformationProviderImpl.java
URL: http://svn.apache.org/viewcvs/portals/wsrp4j/trunk/sandbox/wsrp4j/producer/src/java/org/apache/wsrp4j/producer/provider/pluto/driver/DynamicInformationProviderImpl.java?rev=374648&r1=374647&r2=374648&view=diff
==============================================================================
--- portals/wsrp4j/trunk/sandbox/wsrp4j/producer/src/java/org/apache/wsrp4j/producer/provider/pluto/driver/DynamicInformationProviderImpl.java (original)
+++ portals/wsrp4j/trunk/sandbox/wsrp4j/producer/src/java/org/apache/wsrp4j/producer/provider/pluto/driver/DynamicInformationProviderImpl.java Fri Feb 3 04:06:44 2006
@@ -28,7 +28,6 @@
import oasis.names.tc.wsrp.v1.types.MarkupType;
import oasis.names.tc.wsrp.v1.types.PortletContext;
import oasis.names.tc.wsrp.v1.types.PortletDescription;
-import oasis.names.tc.wsrp.v1.types.RegistrationContext;
import oasis.names.tc.wsrp.v1.types.RuntimeContext;
import oasis.names.tc.wsrp.v1.types.UserContext;
import oasis.names.tc.wsrp.v1.types.GetMarkup;
@@ -59,9 +58,6 @@
//references the provider
private Provider provider;
- //references the registration context
- private RegistrationContext regContext;
-
// reference to the runtime context of the request
private RuntimeContext runtimeContext;
@@ -119,7 +115,6 @@
GetMarkup markupRequest = (GetMarkup)wsrpRequest;
this.portletContext = markupRequest.getPortletContext();
- this.regContext = markupRequest.getRegistrationContext();
this.runtimeContext = markupRequest.getRuntimeContext();
this.userContext = markupRequest.getUserContext();
@@ -148,8 +143,6 @@
this.portletContext =
blockingInteractionRequest.getPortletContext();
- this.regContext =
- blockingInteractionRequest.getRegistrationContext();
this.runtimeContext =
blockingInteractionRequest.getRuntimeContext();
this.userContext =
@@ -472,7 +465,6 @@
PortletWindow portletWindow) {
return new ResourceURLProviderImpl(this.servletRequest,
- this,
this.provider,
this.isSecure );
}
Modified: portals/wsrp4j/trunk/sandbox/wsrp4j/producer/src/java/org/apache/wsrp4j/producer/provider/pluto/driver/ResourceURLProviderImpl.java
URL: http://svn.apache.org/viewcvs/portals/wsrp4j/trunk/sandbox/wsrp4j/producer/src/java/org/apache/wsrp4j/producer/provider/pluto/driver/ResourceURLProviderImpl.java?rev=374648&r1=374647&r2=374648&view=diff
==============================================================================
--- portals/wsrp4j/trunk/sandbox/wsrp4j/producer/src/java/org/apache/wsrp4j/producer/provider/pluto/driver/ResourceURLProviderImpl.java (original)
+++ portals/wsrp4j/trunk/sandbox/wsrp4j/producer/src/java/org/apache/wsrp4j/producer/provider/pluto/driver/ResourceURLProviderImpl.java Fri Feb 3 04:06:44 2006
@@ -37,7 +37,6 @@
private boolean trace_high = logger.isLogging(Logger.TRACE_HIGH);
private HttpServletRequest servletRequest;
- private DynamicInformationProviderImpl dynInfoProvider;
private URLComposer urlComposer;
private Provider wsrpProvider;
@@ -55,21 +54,17 @@
/**
* 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,
- boolean secure ) {
+ Provider aWsrpProvider,
+ boolean secure ) {
if (logger.isLogging(Logger.TRACE_HIGH)) {
logger.entry(Logger.TRACE_HIGH, CONSTRUCTOR);
}
this.servletRequest = aServletRequest;
- this.dynInfoProvider = aProviderImpl;
this.wsrpProvider = aWsrpProvider;
this.isSecure = secure;