You are viewing a plain text version of this content. The canonical link for it is here.
Posted to wsrp4j-dev@portals.apache.org by cz...@apache.org on 2005/08/09 08:19:39 UTC
cvs commit: ws-wsrp4j/src/org/apache/wsrp4j/log LoggerImpl.java LogManager.java Logger.java
cziegeler 2005/08/08 23:19:39
Modified: src/org/apache/wsrp4j/persistence PersistentInformation.java
PersistentFactory.java PersistentHandler.java
PersistentInformationProvider.java
PersistentDataObject.java
ClientPersistentFactory.java
ServerPersistentFactory.java
src/org/apache/wsrp4j/log LoggerImpl.java LogManager.java
Logger.java
Log:
Just code formatting
Revision Changes Path
1.3 +3 -11 ws-wsrp4j/src/org/apache/wsrp4j/persistence/PersistentInformation.java
Index: PersistentInformation.java
===================================================================
RCS file: /home/cvs/ws-wsrp4j/src/org/apache/wsrp4j/persistence/PersistentInformation.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- PersistentInformation.java 9 Mar 2004 21:42:15 -0000 1.2
+++ PersistentInformation.java 9 Aug 2005 06:19:39 -0000 1.3
@@ -13,12 +13,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
-/*
-
- */
-
-
package org.apache.wsrp4j.persistence;
/**
@@ -27,8 +21,7 @@
*
* @author <a href="mailto:Ralf.Altrichter@de.ibm.com">Ralf Altrichter</a>
*/
-public interface PersistentInformation
-{
+public interface PersistentInformation {
/**
* Set a group identifier. All PersistentDataObjects with this
@@ -37,13 +30,12 @@
*
* @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();
}
1.3 +6 -15 ws-wsrp4j/src/org/apache/wsrp4j/persistence/PersistentFactory.java
Index: PersistentFactory.java
===================================================================
RCS file: /home/cvs/ws-wsrp4j/src/org/apache/wsrp4j/persistence/PersistentFactory.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- PersistentFactory.java 9 Mar 2004 21:42:15 -0000 1.2
+++ PersistentFactory.java 9 Aug 2005 06:19:39 -0000 1.3
@@ -13,12 +13,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
-/*
-
- */
-
-
package org.apache.wsrp4j.persistence;
import org.apache.wsrp4j.persistence.PersistentDataObject;
@@ -32,22 +26,21 @@
*
* @version 1.0
*/
-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();
/**
@@ -55,21 +48,19 @@
*
* @return PersistentDataObject
*/
- public PersistentDataObject getPortletList() throws WSRPException;
+ PersistentDataObject getPortletList() throws WSRPException;
/**
* Returns the UserList
*
* @return PersistentDataObject
*/
- public PersistentDataObject getUserList() throws WSRPException;
+ PersistentDataObject getUserList() throws WSRPException;
/**
* Returns the ProducerList
*
* @return PersistentDataObject
*/
- public PersistentDataObject getProducerList() throws WSRPException;
-
-
+ PersistentDataObject getProducerList() throws WSRPException;
}
1.3 +5 -12 ws-wsrp4j/src/org/apache/wsrp4j/persistence/PersistentHandler.java
Index: PersistentHandler.java
===================================================================
RCS file: /home/cvs/ws-wsrp4j/src/org/apache/wsrp4j/persistence/PersistentHandler.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- PersistentHandler.java 9 Mar 2004 21:42:15 -0000 1.2
+++ PersistentHandler.java 9 Aug 2005 06:19:39 -0000 1.3
@@ -13,12 +13,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
-/*
-
- */
-
-
package org.apache.wsrp4j.persistence;
import org.apache.wsrp4j.exception.WSRPException;
@@ -32,8 +26,7 @@
*
* @version 1.0
*/
-public interface PersistentHandler
-{
+public interface PersistentHandler {
/**
* Store a single object from the PersistentDataObject to persistent
@@ -42,7 +35,7 @@
* @param persistentDataObject
* @throws WSRPException
*/
- public void store(PersistentDataObject persistentDataObject) throws WSRPException;
+ void store(PersistentDataObject persistentDataObject) throws WSRPException;
/**
* Restore a single object into the persistentDataObject from the persistent store
@@ -50,7 +43,7 @@
* @param persistentDataObject
* @throws WSRPException
*/
- public PersistentDataObject restore(PersistentDataObject persistentDataObject) throws WSRPException;
+ PersistentDataObject restore(PersistentDataObject persistentDataObject) throws WSRPException;
/**
* Restore all known objects into the persistentDataObject from the persistent store
@@ -58,11 +51,11 @@
* @param persistentDataObject
* @throws WSRPException
*/
- public PersistentDataObject restoreMultiple(PersistentDataObject persistentDataObject) throws WSRPException;
+ PersistentDataObject restoreMultiple(PersistentDataObject persistentDataObject) throws WSRPException;
/**
* Delete a object from the persistent store
*/
- public void delete(PersistentDataObject persistentDataObject);
+ void delete(PersistentDataObject persistentDataObject);
}
1.3 +2 -9 ws-wsrp4j/src/org/apache/wsrp4j/persistence/PersistentInformationProvider.java
Index: PersistentInformationProvider.java
===================================================================
RCS file: /home/cvs/ws-wsrp4j/src/org/apache/wsrp4j/persistence/PersistentInformationProvider.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- PersistentInformationProvider.java 9 Mar 2004 21:42:15 -0000 1.2
+++ PersistentInformationProvider.java 9 Aug 2005 06:19:39 -0000 1.3
@@ -13,12 +13,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
-/*
-
- */
-
-
package org.apache.wsrp4j.persistence;
@@ -27,8 +21,7 @@
*
* @author <a href="mailto:Ralf.Altrichter@de.ibm.com">Ralf Altrichter</a>
*/
-public interface PersistentInformationProvider
-{
-
+public interface PersistentInformationProvider {
+ // just a marker interface
}
1.4 +7 -14 ws-wsrp4j/src/org/apache/wsrp4j/persistence/PersistentDataObject.java
Index: PersistentDataObject.java
===================================================================
RCS file: /home/cvs/ws-wsrp4j/src/org/apache/wsrp4j/persistence/PersistentDataObject.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- PersistentDataObject.java 1 Jun 2004 10:48:55 -0000 1.3
+++ PersistentDataObject.java 9 Aug 2005 06:19:39 -0000 1.4
@@ -13,12 +13,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
-/*
-
- */
-
-
package org.apache.wsrp4j.persistence;
import java.util.Iterator;
@@ -34,8 +28,7 @@
*
* @version 1.0
*/
-public interface PersistentDataObject
-{
+public interface PersistentDataObject {
/**
* Sets the PersistentInformation object for this PersistentDataObject
@@ -43,7 +36,7 @@
* @param persistentInfo
* @see PersistentInformation
*/
- public void setPersistentInformation(PersistentInformation persistentInfo);
+ void setPersistentInformation(PersistentInformation persistentInfo);
/**
* Get the PersistentInformation for this PersistentDataObject
@@ -51,19 +44,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
@@ -71,13 +64,13 @@
* @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();
}
1.3 +3 -10 ws-wsrp4j/src/org/apache/wsrp4j/persistence/ClientPersistentFactory.java
Index: ClientPersistentFactory.java
===================================================================
RCS file: /home/cvs/ws-wsrp4j/src/org/apache/wsrp4j/persistence/ClientPersistentFactory.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ClientPersistentFactory.java 9 Mar 2004 21:42:15 -0000 1.2
+++ ClientPersistentFactory.java 9 Aug 2005 06:19:39 -0000 1.3
@@ -13,12 +13,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
-/*
-
- */
-
-
package org.apache.wsrp4j.persistence;
import org.apache.wsrp4j.persistence.PersistentDataObject;
@@ -33,8 +27,7 @@
*
* @version 1.0
*/
-public interface ClientPersistentFactory extends PersistentFactory
-{
+public interface ClientPersistentFactory extends PersistentFactory {
/**
* Returns a PageList
@@ -42,7 +35,7 @@
* @return PersistentDataObject
* @throws WSRPException
*/
- public PersistentDataObject getPageList() throws WSRPException;
+ PersistentDataObject getPageList() throws WSRPException;
/**
@@ -51,7 +44,7 @@
* @return PersistentDataObject
* @throws WSRPException
*/
- public PersistentDataObject getConsumerPortletContextList() throws WSRPException;
+ PersistentDataObject getConsumerPortletContextList() throws WSRPException;
}
1.3 +6 -15 ws-wsrp4j/src/org/apache/wsrp4j/persistence/ServerPersistentFactory.java
Index: ServerPersistentFactory.java
===================================================================
RCS file: /home/cvs/ws-wsrp4j/src/org/apache/wsrp4j/persistence/ServerPersistentFactory.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ServerPersistentFactory.java 9 Mar 2004 21:42:15 -0000 1.2
+++ ServerPersistentFactory.java 9 Aug 2005 06:19:39 -0000 1.3
@@ -13,12 +13,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
-/*
-
- */
-
-
package org.apache.wsrp4j.persistence;
import org.apache.wsrp4j.persistence.PersistentDataObject;
@@ -33,8 +27,7 @@
*
* @version 1.0
*/
-public interface ServerPersistentFactory extends PersistentFactory
-{
+public interface ServerPersistentFactory extends PersistentFactory {
/**
* Returns the RegistrationList
@@ -42,7 +35,7 @@
* @return PersistentDataObject
* @throws WSRPException
*/
- public PersistentDataObject getRegistrationList() throws WSRPException;
+ PersistentDataObject getRegistrationList() throws WSRPException;
/**
@@ -51,7 +44,7 @@
* @return PersistentDataObject
* @throws WSRPException
*/
- public PersistentDataObject getConsumerConfiguredPortletList() throws WSRPException;
+ PersistentDataObject getConsumerConfiguredPortletList() throws WSRPException;
/**
* Returns the PortletDescriptionList
@@ -59,7 +52,7 @@
* @return PersistentDataObject
* @throws WSRPException
*/
- public PersistentDataObject getPortletDescriptionList() throws WSRPException;
+ PersistentDataObject getPortletDescriptionList() throws WSRPException;
/**
* Returns the ServiceDescriptionList
@@ -67,7 +60,7 @@
* @return PersistentDataObject
* @throws WSRPException
*/
- public PersistentDataObject getServiceDescriptionList() throws WSRPException;
+ PersistentDataObject getServiceDescriptionList() throws WSRPException;
/**
* Returns the ConsumerPortletRegistrationList
@@ -75,7 +68,5 @@
* @return PersistentDataObject
* @throws WSRPException
*/
- public PersistentDataObject getConsumerPortletRegistrationList() throws WSRPException;
-
-
+ PersistentDataObject getConsumerPortletRegistrationList() throws WSRPException;
}
1.5 +3 -3 ws-wsrp4j/src/org/apache/wsrp4j/log/LoggerImpl.java
Index: LoggerImpl.java
===================================================================
RCS file: /home/cvs/ws-wsrp4j/src/org/apache/wsrp4j/log/LoggerImpl.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- LoggerImpl.java 9 Aug 2005 06:14:58 -0000 1.4
+++ LoggerImpl.java 9 Aug 2005 06:19:39 -0000 1.5
@@ -16,11 +16,11 @@
package org.apache.wsrp4j.log;
/**
- Wrapper class for a log4j logger
-*/
+ * Wrapper class for a log4j logger
+ */
public final class LoggerImpl implements Logger
{
- private org.apache.log4j.Logger logger = null;
+ private org.apache.log4j.Logger logger;
private int level = Logger.ERROR; // default logLevel defined by wsrp4j
LoggerImpl(org.apache.log4j.Logger aLogger, int logLevel)
1.7 +1 -1 ws-wsrp4j/src/org/apache/wsrp4j/log/LogManager.java
Index: LogManager.java
===================================================================
RCS file: /home/cvs/ws-wsrp4j/src/org/apache/wsrp4j/log/LogManager.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- LogManager.java 9 Aug 2005 06:14:58 -0000 1.6
+++ LogManager.java 9 Aug 2005 06:19:39 -0000 1.7
@@ -36,7 +36,7 @@
*/
private LogManager()
{
- try
+ try
{
InputStream propertiesInputStream;
propertiesInputStream = this.getClass().getClassLoader().getResourceAsStream(LOG_PROPERTIES_FILE);
1.4 +27 -28 ws-wsrp4j/src/org/apache/wsrp4j/log/Logger.java
Index: Logger.java
===================================================================
RCS file: /home/cvs/ws-wsrp4j/src/org/apache/wsrp4j/log/Logger.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Logger.java 26 Jul 2005 14:02:17 -0000 1.3
+++ Logger.java 9 Aug 2005 06:19:39 -0000 1.4
@@ -58,14 +58,13 @@
trace messages to avoid unnecessary round-trips and object creation.<BR>
<P>
*/
+public interface Logger {
-public interface Logger
-{
/**
Defines an error message.<BR>
Use this type to inform the user of a serious failure in the execution of the application.
*/
- public static final int ERROR = 10;
+ int ERROR = 10;
/**
Defines a warning message.<BR>
@@ -74,7 +73,7 @@
ultimately failing.<BR>
A warning message is less severe than an error message.
*/
- public static final int WARN = 20;
+ int WARN = 20;
/**
Defines an informational message.<BR>
@@ -83,22 +82,22 @@
repeating events.<BR>
An informational message is less severe than a warning message.
*/
- public static final int INFO = 30;
+ int INFO = 30;
/**
Defines a low-detail trace message.
*/
- public static final int TRACE_LOW = 40;
+ int TRACE_LOW = 40;
/**
Defines a medium-detail trace message.
*/
- public static final int TRACE_MEDIUM = 50;
+ int TRACE_MEDIUM = 50;
/**
Defines a high-detail trace message.
*/
- public static final int TRACE_HIGH = 60;
+ int TRACE_HIGH = 60;
/**
Determines if this logger is logging data for a given log level or not.
@@ -107,7 +106,7 @@
@return <code>true</code> when the object is logging the log level;
<code>false</code> otherwise.
*/
- public boolean isLogging(int logLevel);
+ boolean isLogging(int logLevel);
/**
Logs a text message with no parameters.
@@ -116,7 +115,7 @@
@param loggingMethod The name of the logging method.
@param text The message text.
*/
- public void text(int logLevel, String loggingMethod, String text);
+ void text(int logLevel, String loggingMethod, String text);
/**
Logs a text message with one parameter.
@@ -126,7 +125,7 @@
@param text The message text.
@param parm1 An element to be displayed with the message.
*/
- public void text(int logLevel, String loggingMethod, String text, Object parm1);
+ void text(int logLevel, String loggingMethod, String text, Object parm1);
/**
Logs a text message with an array of parameters.
@@ -136,7 +135,7 @@
@param text The message text.
@param parms An array of elements to be displayed with the message.
*/
- public void text(int logLevel, String loggingMethod, String text, Object[] parms);
+ void text(int logLevel, String loggingMethod, String text, Object[] parms);
/**
Logs a text message with no parameters.
@@ -146,7 +145,7 @@
@param t The throwable that is cause for this log entry.
@param text The message text.
*/
- public void text(int logLevel, String loggingMethod, Throwable t, String text);
+ void text(int logLevel, String loggingMethod, Throwable t, String text);
/**
Logs a text message with an array of parameters.
@@ -157,7 +156,7 @@
@param text The message text.
@param parms An array of elements to be displayed with the message.
*/
- public void text(int logLevel, String loggingMethod, Throwable t, String text, Object[] parms);
+ void text(int logLevel, String loggingMethod, Throwable t, String text, Object[] parms);
/**
Logs entry into a method.
@@ -165,7 +164,7 @@
@param logLevel The level of the log entry.
@param loggingMethod The name of the logging method.
*/
- public void entry(int logLevel, String loggingMethod);
+ void entry(int logLevel, String loggingMethod);
/**
Logs entry into a method.
@@ -174,7 +173,7 @@
@param loggingMethod The name of the logging method.
@param parm1 An element to be displayed as trace data.
*/
- public void entry(int logLevel, String loggingMethod, Object parm1);
+ void entry(int logLevel, String loggingMethod, Object parm1);
/**
Logs entry into a method.
@@ -183,7 +182,7 @@
@param loggingMethod The name of the logging method.
@param parms An array of parameters passed to the method.
*/
- public void entry(int logLevel, String loggingMethod, Object[] parms);
+ void entry(int logLevel, String loggingMethod, Object[] parms);
/**
Logs exit from a method.
@@ -191,7 +190,7 @@
@param logLevel The level of the log entry.
@param loggingMethod The name of the logging method.
*/
- public void exit(int logLevel, String loggingMethod);
+ void exit(int logLevel, String loggingMethod);
/**
Logs exit from a method.
@@ -200,7 +199,7 @@
@param loggingMethod The name of the logging method.
@param retValue The returned value.
*/
- public void exit(int logLevel, String loggingMethod, byte retValue);
+ void exit(int logLevel, String loggingMethod, byte retValue);
/**
Logs exit from a method.
@@ -209,7 +208,7 @@
@param loggingMethod The name of the logging method.
@param retValue The returned value.
*/
- public void exit(int logLevel, String loggingMethod, short retValue);
+ void exit(int logLevel, String loggingMethod, short retValue);
/**
Logs exit from a method.
@@ -218,7 +217,7 @@
@param loggingMethod The name of the logging method.
@param retValue The returned value.
*/
- public void exit(int logLevel, String loggingMethod, int retValue);
+ void exit(int logLevel, String loggingMethod, int retValue);
/**
Logs exit from a method.
@@ -227,7 +226,7 @@
@param loggingMethod The name of the logging method.
@param retValue The returned value.
*/
- public void exit(int logLevel, String loggingMethod, long retValue);
+ void exit(int logLevel, String loggingMethod, long retValue);
/**
Logs exit from a method.
@@ -236,7 +235,7 @@
@param loggingMethod The name of the logging method.
@param retValue The returned value.
*/
- public void exit(int logLevel, String loggingMethod, float retValue);
+ void exit(int logLevel, String loggingMethod, float retValue);
/**
Logs exit from a method.
@@ -245,7 +244,7 @@
@param loggingMethod The name of the logging method.
@param retValue The returned value.
*/
- public void exit(int logLevel, String loggingMethod, double retValue);
+ void exit(int logLevel, String loggingMethod, double retValue);
/**
Logs exit from a method.
@@ -254,7 +253,7 @@
@param loggingMethod The name of the logging method.
@param retValue The returned value.
*/
- public void exit(int logLevel, String loggingMethod, char retValue);
+ void exit(int logLevel, String loggingMethod, char retValue);
/**
Logs exit from a method.
@@ -263,7 +262,7 @@
@param loggingMethod The name of the logging method.
@param retValue The returned value.
*/
- public void exit(int logLevel, String loggingMethod, boolean retValue);
+ void exit(int logLevel, String loggingMethod, boolean retValue);
/**
Logs exit from a method.
@@ -272,7 +271,7 @@
@param loggingMethod The name of the logging method.
@param retValue The returned value.
*/
- public void exit(int logLevel, String loggingMethod, Object retValue);
+ void exit(int logLevel, String loggingMethod, Object retValue);
/**
Logs the call stack.
@@ -281,5 +280,5 @@
@param loggingMethod The name of the logging method.
@param text The message text.
*/
- public void stackTrace(int logLevel, String loggingMethod, String text);
+ void stackTrace(int logLevel, String loggingMethod, String text);
}