svn commit: r742823 - in /lenya/trunk: org.apache.lenya.core.metadata/src/main/java/org/apache/lenya/modules/metadata/ org.apache.lenya.core.observation/src/main/java/org/apache/lenya/cms/observation/ org.apache.lenya.core.sitemanagement/src/main/java/...
[email protected] Tue, 10 Feb 2009 02:33:04 -0000
Newsgroups
gmane.comp.cms.lenya.cvs
Message-ID
<[email protected] >
Author: froethenbacher
Date: Tue Feb 10 02:33:01 2009
New Revision: 742823
URL: http://svn.apache.org/viewvc?rev=742823&view=rev
Log:
Cont'd replacing deprecated Assert with Validate. Finished now.
Modified:
lenya/trunk/org.apache.lenya.core.metadata/src/main/java/org/apache/lenya/modules/metadata/ChangeMetaData.java
lenya/trunk/org.apache.lenya.core.observation/src/main/java/org/apache/lenya/cms/observation/ObservationManager.java
lenya/trunk/org.apache.lenya.core.sitemanagement/src/main/java/org/apache/lenya/cms/site/usecases/MoveSubsite.java
lenya/trunk/org.apache.lenya.core.usecase/src/main/java/org/apache/lenya/cms/ac/usecase/impl/UsecaseRolesBuilder.java
lenya/trunk/org.apache.lenya.core.usecase/src/main/java/org/apache/lenya/cms/usecase/StateMachine.java
lenya/trunk/org.apache.lenya.core.usecase/src/main/java/org/apache/lenya/cms/usecase/UsecaseMessage.java
lenya/trunk/org.apache.lenya.core.workflow/src/main/java/org/apache/lenya/cms/workflow/usecases/MultiWorkflowInvoke.java
lenya/trunk/org.apache.lenya.module.editors/src/main/java/org/apache/lenya/cms/editors/SaveDocument.java
lenya/trunk/org.apache.lenya.module.lucene/src/main/java/org/apache/lenya/modules/lucene/impl/MetaDataFieldRegistryImpl.java
lenya/trunk/org.apache.lenya.module.notification/src/main/java/org/apache/lenya/inbox/AbstractInboxMessage.java
lenya/trunk/org.apache.lenya.module.notification/src/main/java/org/apache/lenya/inbox/usecases/SendMessage.java
lenya/trunk/org.apache.lenya.module.notification/src/main/java/org/apache/lenya/inbox/xml/XmlSourceInbox.java
lenya/trunk/org.apache.lenya.module.notification/src/main/java/org/apache/lenya/notification/Message.java
lenya/trunk/org.apache.lenya.module.notification/src/main/java/org/apache/lenya/notification/NotificationEventDescriptor.java
lenya/trunk/org.apache.lenya.module.notification/src/main/java/org/apache/lenya/notification/Text.java
lenya/trunk/org.apache.lenya.module.simplesite/src/main/java/org/apache/lenya/cms/site/simple/DocumentStore.java
lenya/trunk/org.apache.lenya.module.simplesite/src/main/java/org/apache/lenya/cms/site/simple/DocumentStoreFactory.java
lenya/trunk/org.apache.lenya.module.sitetree/src/main/java/org/apache/lenya/cms/cocoon/transformation/AccessControlSitetreeTransformer.java
lenya/trunk/org.apache.lenya.module.sitetree/src/main/java/org/apache/lenya/cms/site/tree/DefaultSiteTree.java
lenya/trunk/org.apache.lenya.module.sitetree/src/main/java/org/apache/lenya/cms/site/tree/SiteTreeNodeImpl.java
lenya/trunk/org.apache.lenya.module.sitetree/src/main/java/org/apache/lenya/cms/site/tree2/SiteTreeImpl.java
lenya/trunk/org.apache.lenya.module.sitetree/src/main/java/org/apache/lenya/cms/site/tree2/TreeNodeImpl.java
lenya/trunk/org.apache.lenya.module.sourcerepository/src/main/java/org/apache/lenya/cms/repository/SourceNodeRCML.java
lenya/trunk/org.apache.lenya.module.sourcerepository/src/main/java/org/apache/lenya/cms/repository/SourceWrapper.java
Modified: lenya/trunk/org.apache.lenya.core.metadata/src/main/java/org/apache/lenya/modules/metadata/ChangeMetaData.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.metadata/src/main/java/org/apache/lenya/modules/metadata/ChangeMetaData.java?rev=742823&r1=742822&r2=742823&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.metadata/src/main/java/org/apache/lenya/modules/metadata/ChangeMetaData.java (original)
+++ lenya/trunk/org.apache.lenya.core.metadata/src/main/java/org/apache/lenya/modules/metadata/ChangeMetaData.java Tue Feb 10 02:33:01 2009
@@ -22,7 +22,6 @@
import org.apache.lenya.cms.publication.Publication;
import org.apache.lenya.cms.usecase.UsecaseInvoker;
import org.apache.lenya.cms.workflow.usecases.InvokeWorkflow;
-import org.apache.lenya.util.Assert;
/**
* Save a meta data element.
@@ -54,13 +53,13 @@
}
String namespace = getParameterAsString(PARAM_NAMESPACE);
- Assert.notNull("namespace", namespace);
+ assert namespace != null;
String element = getParameterAsString(PARAM_ELEMENT);
- Assert.notNull("element", element);
+ assert element != null;
String value = getParameterAsString(PARAM_VALUE);
- Assert.notNull("value", value);
+ assert value != null;
String oldValue = getParameterAsString(PARAM_OLD_VALUE);
- Assert.notNull("old value", oldValue);
+ assert oldValue != null;
MetaData meta = getSourceDocument().getMetaData(namespace);
@@ -79,13 +78,13 @@
super.doExecute();
String namespace = getParameterAsString(PARAM_NAMESPACE);
- Assert.notNull("namespace", namespace);
+ assert namespace != null;
String element = getParameterAsString(PARAM_ELEMENT);
- Assert.notNull("element", element);
+ assert element != null;
String value = getParameterAsString(PARAM_VALUE);
- Assert.notNull("value", value);
+ assert value != null;
String oldValue = getParameterAsString(PARAM_OLD_VALUE);
- Assert.notNull("old value", oldValue);
+ assert oldValue != null;
MetaData meta = getSourceDocument().getMetaData(namespace);
meta.setValue(element, value);
Modified: lenya/trunk/org.apache.lenya.core.observation/src/main/java/org/apache/lenya/cms/observation/ObservationManager.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.observation/src/main/java/org/apache/lenya/cms/observation/ObservationManager.java?rev=742823&r1=742822&r2=742823&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.observation/src/main/java/org/apache/lenya/cms/observation/ObservationManager.java (original)
+++ lenya/trunk/org.apache.lenya.core.observation/src/main/java/org/apache/lenya/cms/observation/ObservationManager.java Tue Feb 10 02:33:01 2009
@@ -24,9 +24,9 @@
import java.util.Set;
import org.apache.cocoon.util.AbstractLogEnabled;
+import org.apache.commons.lang.Validate;
import org.apache.lenya.cms.publication.Document;
import org.apache.lenya.cms.publication.DocumentIdentifier;
-import org.apache.lenya.util.Assert;
/**
* Observation manager. Works as an observation registry and sends the notifications.
@@ -64,9 +64,9 @@
this.listeners.add(listener);
}
- protected DocumentIdentifier getIdentifier(DocumentEvent event) {
-
- Assert.notNull("event", event);
+ protected DocumentIdentifier getIdentifier(DocumentEvent event)
+ {
+ Validate.notNull(event);
DocumentIdentifier id = new DocumentIdentifier(event.getPublicationId(), event.getArea(),
event.getUuid(), event.getLanguage());
return id;
@@ -89,7 +89,7 @@
}
public void eventFired(RepositoryEvent event) {
- Assert.notNull("event", event);
+ Validate.notNull(event);
Set listeners;
if (event instanceof DocumentEvent) {
DocumentIdentifier id = getIdentifier((DocumentEvent) event);
Modified: lenya/trunk/org.apache.lenya.core.sitemanagement/src/main/java/org/apache/lenya/cms/site/usecases/MoveSubsite.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.sitemanagement/src/main/java/org/apache/lenya/cms/site/usecases/MoveSubsite.java?rev=742823&r1=742822&r2=742823&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.sitemanagement/src/main/java/org/apache/lenya/cms/site/usecases/MoveSubsite.java (original)
+++ lenya/trunk/org.apache.lenya.core.sitemanagement/src/main/java/org/apache/lenya/cms/site/usecases/MoveSubsite.java Tue Feb 10 02:33:01 2009
@@ -22,6 +22,7 @@
import java.util.List;
import java.util.Set;
+import org.apache.commons.lang.Validate;
import org.apache.lenya.cms.publication.Area;
import org.apache.lenya.cms.publication.Document;
import org.apache.lenya.cms.publication.DocumentLocator;
@@ -39,7 +40,6 @@
import org.apache.lenya.cms.usecase.UsecaseException;
import org.apache.lenya.cms.workflow.WorkflowUtil;
import org.apache.lenya.cms.workflow.usecases.UsecaseWorkflowHelper;
-import org.apache.lenya.util.Assert;
import org.apache.lenya.workflow.Workflowable;
/**
@@ -201,8 +201,8 @@
}
protected static String getParentPath(String path) {
- Assert.notNull("path", path);
- Assert.isTrue("not empty", path.length() > 0);
+ Validate.notNull(path);
+ Validate.notEmpty(path);
return path.substring(0, path.lastIndexOf("/"));
}
Modified: lenya/trunk/org.apache.lenya.core.usecase/src/main/java/org/apache/lenya/cms/ac/usecase/impl/UsecaseRolesBuilder.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.usecase/src/main/java/org/apache/lenya/cms/ac/usecase/impl/UsecaseRolesBuilder.java?rev=742823&r1=742822&r2=742823&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.usecase/src/main/java/org/apache/lenya/cms/ac/usecase/impl/UsecaseRolesBuilder.java (original)
+++ lenya/trunk/org.apache.lenya.core.usecase/src/main/java/org/apache/lenya/cms/ac/usecase/impl/UsecaseRolesBuilder.java Tue Feb 10 02:33:01 2009
@@ -27,7 +27,6 @@
import org.apache.lenya.ac.cache.BuildException;
import org.apache.lenya.ac.cache.InputStreamBuilder;
import org.apache.lenya.cms.cocoon.source.SourceUtil;
-import org.apache.lenya.util.Assert;
import org.apache.lenya.xml.DocumentHelper;
import org.apache.lenya.xml.NamespaceHelper;
import org.w3c.dom.Document;
@@ -58,8 +57,8 @@
} catch (Exception e) {
throw new BuildException(e);
}
- Assert.isTrue("Correct usecase policies XML", document.getDocumentElement().getLocalName()
- .equals(USECASES_ELEMENT));
+ assert document.getDocumentElement().getLocalName()
+ .equals(USECASES_ELEMENT);
NamespaceHelper helper = new NamespaceHelper(AccessController.NAMESPACE,
AccessController.DEFAULT_PREFIX, document);
Modified: lenya/trunk/org.apache.lenya.core.usecase/src/main/java/org/apache/lenya/cms/usecase/StateMachine.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.usecase/src/main/java/org/apache/lenya/cms/usecase/StateMachine.java?rev=742823&r1=742822&r2=742823&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.usecase/src/main/java/org/apache/lenya/cms/usecase/StateMachine.java (original)
+++ lenya/trunk/org.apache.lenya.core.usecase/src/main/java/org/apache/lenya/cms/usecase/StateMachine.java Tue Feb 10 02:33:01 2009
@@ -17,7 +17,7 @@
*/
package org.apache.lenya.cms.usecase;
-import org.apache.lenya.util.Assert;
+import org.apache.commons.lang.Validate;
/**
* A simple state machine.
@@ -42,7 +42,7 @@
}
protected Transition getTransition(String event) {
- Assert.notNull("event", event);
+ Validate.notNull(event);
Transition[] transitions = this.model.getTransitions();
Transition transition = null;
for (int i = 0; i < transitions.length; i++) {
Modified: lenya/trunk/org.apache.lenya.core.usecase/src/main/java/org/apache/lenya/cms/usecase/UsecaseMessage.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.usecase/src/main/java/org/apache/lenya/cms/usecase/UsecaseMessage.java?rev=742823&r1=742822&r2=742823&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.usecase/src/main/java/org/apache/lenya/cms/usecase/UsecaseMessage.java (original)
+++ lenya/trunk/org.apache.lenya.core.usecase/src/main/java/org/apache/lenya/cms/usecase/UsecaseMessage.java Tue Feb 10 02:33:01 2009
@@ -17,7 +17,7 @@
*/
package org.apache.lenya.cms.usecase;
-import org.apache.lenya.util.Assert;
+import org.apache.commons.lang.Validate;
/**
* A message in a usecase. This an encapsulation for an internationalizable
@@ -36,7 +36,7 @@
* @param _message The message.
*/
public UsecaseMessage(String _message) {
- Assert.notNull("message", _message);
+ Validate.notNull(_message);
this.message = _message;
}
@@ -48,10 +48,9 @@
public UsecaseMessage(String _message, String[] _params) {
this(_message);
- Assert.notNull("params", _params);
- for (int i = 0; i < _params.length; i++) {
- Assert.notNull("params[" + i + "]", _params[i]);
- }
+ Validate.notNull(_params);
+ Validate.noNullElements(_params);
+
this.params = (String[])_params.clone();
}
Modified: lenya/trunk/org.apache.lenya.core.workflow/src/main/java/org/apache/lenya/cms/workflow/usecases/MultiWorkflowInvoke.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.workflow/src/main/java/org/apache/lenya/cms/workflow/usecases/MultiWorkflowInvoke.java?rev=742823&r1=742822&r2=742823&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.workflow/src/main/java/org/apache/lenya/cms/workflow/usecases/MultiWorkflowInvoke.java (original)
+++ lenya/trunk/org.apache.lenya.core.workflow/src/main/java/org/apache/lenya/cms/workflow/usecases/MultiWorkflowInvoke.java Tue Feb 10 02:33:01 2009
@@ -24,7 +24,6 @@
import org.apache.lenya.cms.usecase.AbstractUsecase;
import org.apache.lenya.cms.usecase.UsecaseInvoker;
import org.apache.lenya.cms.usecase.UsecaseMessage;
-import org.apache.lenya.util.Assert;
/**
* Invocation usecase for the multi-workflow usecase.
@@ -40,9 +39,9 @@
super.doExecute();
String usecase = getParameterAsString(USECASE_NAME);
- Assert.notNull("usecase", usecase);
+ assert usecase != null;
String url = getParameterAsString(URL);
- Assert.notNull("url", url);
+ assert url != null;
UsecaseInvoker invoker = getUsecaseInvoker();
invoker.invoke(url, usecase, new HashMap());
Modified: lenya/trunk/org.apache.lenya.module.editors/src/main/java/org/apache/lenya/cms/editors/SaveDocument.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.module.editors/src/main/java/org/apache/lenya/cms/editors/SaveDocument.java?rev=742823&r1=742822&r2=742823&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.module.editors/src/main/java/org/apache/lenya/cms/editors/SaveDocument.java (original)
+++ lenya/trunk/org.apache.lenya.module.editors/src/main/java/org/apache/lenya/cms/editors/SaveDocument.java Tue Feb 10 02:33:01 2009
@@ -25,7 +25,6 @@
import org.apache.lenya.cms.usecase.DocumentUsecase;
import org.apache.lenya.cms.usecase.UsecaseInvoker;
import org.apache.lenya.cms.usecase.UsecaseMessage;
-import org.apache.lenya.util.Assert;
/**
* <p>
@@ -46,7 +45,7 @@
super.doCheckPreconditions();
String usecase = getParameterAsString(USECASE_NAME);
- Assert.notNull("usecase", usecase);
+ assert usecase != null;
UsecaseInvoker invoker = getUsecaseInvoker();
Map params = new HashMap();
Modified: lenya/trunk/org.apache.lenya.module.lucene/src/main/java/org/apache/lenya/modules/lucene/impl/MetaDataFieldRegistryImpl.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.module.lucene/src/main/java/org/apache/lenya/modules/lucene/impl/MetaDataFieldRegistryImpl.java?rev=742823&r1=742822&r2=742823&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.module.lucene/src/main/java/org/apache/lenya/modules/lucene/impl/MetaDataFieldRegistryImpl.java (original)
+++ lenya/trunk/org.apache.lenya.module.lucene/src/main/java/org/apache/lenya/modules/lucene/impl/MetaDataFieldRegistryImpl.java Tue Feb 10 02:33:01 2009
@@ -26,11 +26,11 @@
import org.apache.avalon.framework.service.Serviceable;
import org.apache.avalon.framework.thread.ThreadSafe;
import org.apache.cocoon.util.AbstractLogEnabled;
+import org.apache.commons.lang.Validate;
import org.apache.lenya.cms.metadata.Element;
import org.apache.lenya.cms.metadata.ElementSet;
import org.apache.lenya.cms.metadata.MetaDataRegistry;
import org.apache.lenya.modules.lucene.MetaDataFieldRegistry;
-import org.apache.lenya.util.Assert;
public class MetaDataFieldRegistryImpl extends AbstractLogEnabled implements MetaDataFieldRegistry,
ThreadSafe, Serviceable {
@@ -40,11 +40,11 @@
private Map namespace2prefix;
public String getFieldName(String namespace, String elementName) {
- Assert.notNull("namespace", namespace);
- Assert.notNull("element name", elementName);
+ Validate.notNull(namespace);
+ Validate.notNull(elementName);
initPrefixes();
- Assert.isTrue("namespace [" + namespace + "] exists", this.namespace2prefix
- .containsKey(namespace));
+ Validate.isTrue(this.namespace2prefix
+ .containsKey(namespace), "Namespace not found", namespace);
String prefix = (String) this.namespace2prefix.get(namespace);
return prefix + elementName;
}
Modified: lenya/trunk/org.apache.lenya.module.notification/src/main/java/org/apache/lenya/inbox/AbstractInboxMessage.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.module.notification/src/main/java/org/apache/lenya/inbox/AbstractInboxMessage.java?rev=742823&r1=742822&r2=742823&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.module.notification/src/main/java/org/apache/lenya/inbox/AbstractInboxMessage.java (original)
+++ lenya/trunk/org.apache.lenya.module.notification/src/main/java/org/apache/lenya/inbox/AbstractInboxMessage.java Tue Feb 10 02:33:01 2009
@@ -17,8 +17,8 @@
*/
package org.apache.lenya.inbox;
+import org.apache.commons.lang.Validate;
import org.apache.lenya.notification.Message;
-import org.apache.lenya.util.Assert;
/**
* Inbox message implementation.
@@ -35,9 +35,9 @@
* @param markedAsRead if the message is marked as read.
*/
public AbstractInboxMessage(String id, Message message, boolean markedAsRead) {
- Assert.notNull("id", id);
+ Validate.notNull(id);
+ Validate.notNull(message);
this.id = id;
- Assert.notNull("message", message);
this.message = message;
this.markedAsRead = markedAsRead;
}
Modified: lenya/trunk/org.apache.lenya.module.notification/src/main/java/org/apache/lenya/inbox/usecases/SendMessage.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.module.notification/src/main/java/org/apache/lenya/inbox/usecases/SendMessage.java?rev=742823&r1=742822&r2=742823&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.module.notification/src/main/java/org/apache/lenya/inbox/usecases/SendMessage.java (original)
+++ lenya/trunk/org.apache.lenya.module.notification/src/main/java/org/apache/lenya/inbox/usecases/SendMessage.java Tue Feb 10 02:33:01 2009
@@ -23,7 +23,6 @@
import org.apache.lenya.inbox.InboxMessage;
import org.apache.lenya.notification.Message;
import org.apache.lenya.notification.Notifier;
-import org.apache.lenya.util.Assert;
/**
* Show and manage an inbox.
@@ -99,7 +98,7 @@
try {
UserManager userManager = sender.getAccreditableManager().getUserManager();
recipient = userManager.getUser(recipientId);
- Assert.notNull("user " + recipientId, recipient);
+ assert recipient != null;
} catch (Exception e) {
throw new RuntimeException(e);
}
Modified: lenya/trunk/org.apache.lenya.module.notification/src/main/java/org/apache/lenya/inbox/xml/XmlSourceInbox.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.module.notification/src/main/java/org/apache/lenya/inbox/xml/XmlSourceInbox.java?rev=742823&r1=742822&r2=742823&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.module.notification/src/main/java/org/apache/lenya/inbox/xml/XmlSourceInbox.java (original)
+++ lenya/trunk/org.apache.lenya.module.notification/src/main/java/org/apache/lenya/inbox/xml/XmlSourceInbox.java Tue Feb 10 02:33:01 2009
@@ -25,6 +25,7 @@
import org.apache.avalon.framework.service.ServiceException;
import org.apache.avalon.framework.service.ServiceManager;
+import org.apache.commons.lang.Validate;
import org.apache.lenya.ac.AccessControlException;
import org.apache.lenya.ac.Group;
import org.apache.lenya.ac.Identifiable;
@@ -35,7 +36,6 @@
import org.apache.lenya.inbox.InboxMessage;
import org.apache.lenya.notification.Message;
import org.apache.lenya.notification.Notifier;
-import org.apache.lenya.util.Assert;
import org.apache.lenya.xml.DocumentHelper;
import org.apache.lenya.xml.NamespaceHelper;
import org.w3c.dom.Document;
@@ -76,7 +76,7 @@
}
public synchronized void remove(InboxMessage message) {
- Assert.isTrue("contained", messages().contains(message));
+ Validate.isTrue(messages().contains(message));
messages().remove(message);
save();
}
@@ -106,8 +106,7 @@
this.lastModified = SourceUtil.getLastModified(getSourceUri(), this.manager);
Document xml = SourceUtil.readDOM(getSourceUri(), this.manager);
- Assert.isTrue("document element is <inbox>", xml.getDocumentElement()
- .getLocalName().equals("inbox"));
+ assert xml.getDocumentElement().getLocalName().equals("inbox");
NamespaceHelper helper = new NamespaceHelper(Notifier.NAMESPACE, "", xml);
Element[] messageElements = helper.getChildren(xml.getDocumentElement(), "message");
Modified: lenya/trunk/org.apache.lenya.module.notification/src/main/java/org/apache/lenya/notification/Message.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.module.notification/src/main/java/org/apache/lenya/notification/Message.java?rev=742823&r1=742822&r2=742823&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.module.notification/src/main/java/org/apache/lenya/notification/Message.java (original)
+++ lenya/trunk/org.apache.lenya.module.notification/src/main/java/org/apache/lenya/notification/Message.java Tue Feb 10 02:33:01 2009
@@ -21,7 +21,6 @@
import java.util.Date;
import org.apache.lenya.ac.Identifiable;
-import org.apache.lenya.util.Assert;
/**
* A notification message.
@@ -42,10 +41,10 @@
* @param recipients The recipients.
*/
public Message(Text subject, Text body, Identifiable sender, Identifiable[] recipients) {
- Assert.notNull("subject", subject);
- Assert.notNull("body", body);
- Assert.notNull("sender", sender);
- Assert.notNull("recipients", recipients);
+ Validate.notNull(subject);
+ Validate.notNull(body);
+ Validate.notNull(sender);
+ Validate.notNull(recipients);
this.subject = subject;
this.body = body;
this.sender = sender;
@@ -61,7 +60,7 @@
* @param bodyParams The body parameters.
* @param sender The sender.
* @param recipients The recipients.
- * @deprecated Use {@link #Message(Text, Text, Identifiable, Identifiable[])}Êinstead.
+ * @deprecated Use {@link #Message(Text, Text, Identifiable, Identifiable[])}�instead.
*/
public Message(String subject, String[] subjectParams, String body, String[] bodyParams,
Identifiable sender, Identifiable[] recipients) {
Modified: lenya/trunk/org.apache.lenya.module.notification/src/main/java/org/apache/lenya/notification/NotificationEventDescriptor.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.module.notification/src/main/java/org/apache/lenya/notification/NotificationEventDescriptor.java?rev=742823&r1=742822&r2=742823&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.module.notification/src/main/java/org/apache/lenya/notification/NotificationEventDescriptor.java (original)
+++ lenya/trunk/org.apache.lenya.module.notification/src/main/java/org/apache/lenya/notification/NotificationEventDescriptor.java Tue Feb 10 02:33:01 2009
@@ -17,7 +17,7 @@
*/
package org.apache.lenya.notification;
-import org.apache.lenya.util.Assert;
+import org.apache.commons.lang.Validate;
/**
* Descriptor for notification events.
@@ -30,7 +30,7 @@
* @param message The message.
*/
public NotificationEventDescriptor(Message message) {
- Assert.notNull("message", message);
+ Validate.notNull(message);
this.message = message;
}
Modified: lenya/trunk/org.apache.lenya.module.notification/src/main/java/org/apache/lenya/notification/Text.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.module.notification/src/main/java/org/apache/lenya/notification/Text.java?rev=742823&r1=742822&r2=742823&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.module.notification/src/main/java/org/apache/lenya/notification/Text.java (original)
+++ lenya/trunk/org.apache.lenya.module.notification/src/main/java/org/apache/lenya/notification/Text.java Tue Feb 10 02:33:01 2009
@@ -19,7 +19,7 @@
import java.util.Arrays;
-import org.apache.lenya.util.Assert;
+import org.apache.commons.lang.Validate;
/**
* A translatable text with optional i18n parameters.
@@ -35,7 +35,7 @@
* @param translate if the text should be translated.
*/
public Text(String text, boolean translate) {
- Assert.notNull("text", text);
+ Validate.notNull(text);
this.text = text;
this.translate = translate;
}
Modified: lenya/trunk/org.apache.lenya.module.simplesite/src/main/java/org/apache/lenya/cms/site/simple/DocumentStore.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.module.simplesite/src/main/java/org/apache/lenya/cms/site/simple/DocumentStore.java?rev=742823&r1=742822&r2=742823&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.module.simplesite/src/main/java/org/apache/lenya/cms/site/simple/DocumentStore.java (original)
+++ lenya/trunk/org.apache.lenya.module.simplesite/src/main/java/org/apache/lenya/cms/site/simple/DocumentStore.java Tue Feb 10 02:33:01 2009
@@ -26,6 +26,7 @@
import java.util.Set;
import java.util.WeakHashMap;
+import org.apache.commons.lang.Validate;
import org.apache.commons.logging.Log;
import org.apache.lenya.cms.publication.Document;
import org.apache.lenya.cms.publication.DocumentBuildException;
@@ -44,7 +45,6 @@
import org.apache.lenya.cms.site.SiteStructure;
import org.apache.lenya.modules.collection.CollectionWrapper;
import org.apache.lenya.transaction.TransactionException;
-import org.apache.lenya.util.Assert;
import org.apache.lenya.xml.NamespaceHelper;
import org.w3c.dom.Element;
@@ -170,7 +170,7 @@
protected String getPath(String uuid, String language) {
String key = getKey(uuid, language);
- Assert.isTrue("contains [" + key + "]", containsByUuid(uuid, language));
+ Validate.isTrue(containsByUuid(uuid, language), "Doesn't contain key: ", key);
return (String) doc2path().get(key);
}
@@ -210,11 +210,10 @@
}
public Link add(String path, Document document) throws SiteException {
- Assert.notNull("path", path);
- Assert.notNull("document", document);
-
+ Validate.notNull(path);
+ Validate.notNull(document);
+ Validate.isTrue(!contains(document), "Document contained already", document);
try {
- Assert.isTrue("document [" + document + "] is already contained!", !contains(document));
String key = getKey(document.getUUID(), document.getLanguage());
if (!doc2path().containsKey(key)) {
doc2path().put(key, path);
@@ -235,8 +234,8 @@
* @throws TransactionException
*/
public void setPath(Document document, String path) throws TransactionException {
- Assert.notNull("path", path);
- Assert.notNull("document", document);
+ Validate.notNull(path);
+ Validate.notNull(document);
String key = getKey(document.getUUID(), document.getLanguage());
doc2path().put(key, path);
save();
Modified: lenya/trunk/org.apache.lenya.module.simplesite/src/main/java/org/apache/lenya/cms/site/simple/DocumentStoreFactory.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.module.simplesite/src/main/java/org/apache/lenya/cms/site/simple/DocumentStoreFactory.java?rev=742823&r1=742822&r2=742823&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.module.simplesite/src/main/java/org/apache/lenya/cms/site/simple/DocumentStoreFactory.java (original)
+++ lenya/trunk/org.apache.lenya.module.simplesite/src/main/java/org/apache/lenya/cms/site/simple/DocumentStoreFactory.java Tue Feb 10 02:33:01 2009
@@ -19,6 +19,7 @@
import org.apache.avalon.framework.service.ServiceException;
import org.apache.cocoon.util.AbstractLogEnabled;
+import org.apache.commons.lang.Validate;
import org.apache.lenya.cms.publication.Area;
import org.apache.lenya.cms.publication.Document;
import org.apache.lenya.cms.publication.DocumentManager;
@@ -28,7 +29,6 @@
import org.apache.lenya.cms.repository.RepositoryItem;
import org.apache.lenya.cms.repository.RepositoryItemFactory;
import org.apache.lenya.cms.repository.Session;
-import org.apache.lenya.util.Assert;
/**
* Factory for sitetree objects.
@@ -53,7 +53,7 @@
public RepositoryItem buildItem(Session session, String key) throws RepositoryException {
String[] snippets = key.split(":");
- Assert.isTrue("key [" + key + "] is invalid!", snippets.length == 3);
+ Validate.isTrue(snippets.length == 3, "key invalid: ", key);
String publicationId = snippets[0];
String areaName = snippets[1];
Modified: lenya/trunk/org.apache.lenya.module.sitetree/src/main/java/org/apache/lenya/cms/cocoon/transformation/AccessControlSitetreeTransformer.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.module.sitetree/src/main/java/org/apache/lenya/cms/cocoon/transformation/AccessControlSitetreeTransformer.java?rev=742823&r1=742822&r2=742823&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.module.sitetree/src/main/java/org/apache/lenya/cms/cocoon/transformation/AccessControlSitetreeTransformer.java (original)
+++ lenya/trunk/org.apache.lenya.module.sitetree/src/main/java/org/apache/lenya/cms/cocoon/transformation/AccessControlSitetreeTransformer.java Tue Feb 10 02:33:01 2009
@@ -42,7 +42,6 @@
import org.apache.lenya.ac.PolicyManager;
import org.apache.lenya.ac.Role;
import org.apache.lenya.cms.cocoon.generation.SitetreeFragmentGenerator;
-import org.apache.lenya.util.Assert;
import org.xml.sax.Attributes;
import org.xml.sax.SAXException;
import org.xml.sax.helpers.AttributesImpl;
@@ -137,7 +136,7 @@
if (isFragmentElement(uri, localName)) {
this.pubId = attr.getValue(SitetreeFragmentGenerator.ATTR_PUBLICATION);
- Assert.notNull("publication attribute", this.pubId);
+ assert this.pubId != null;
String area = attr.getValue("area");
if (area != null) {
@@ -158,10 +157,10 @@
} else if (isSiteElement(uri, localName)) {
this.area = attr.getValue("area");
- Assert.notNull("area attribute", this.area);
+ assert this.area != null;
} else if (isNodeElement(uri, localName)) {
String id = attr.getValue(SitetreeFragmentGenerator.ATTR_ID);
- Assert.notNull("id attribute", id);
+ assert id != null;
this.pathElements.push(id);
try {
@@ -182,9 +181,9 @@
}
protected String getUrl() {
- Assert.notNull("pub ID", this.pubId);
- Assert.notNull("area", this.area);
- Assert.notNull("base path", this.basePath);
+ assert this.pubId != null;
+ assert this.area != null;
+ assert this.basePath != null;
StringBuffer path = new StringBuffer();
for (Iterator i = this.pathElements.iterator(); i.hasNext();) {
path.append("/").append(i.next());
Modified: lenya/trunk/org.apache.lenya.module.sitetree/src/main/java/org/apache/lenya/cms/site/tree/DefaultSiteTree.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.module.sitetree/src/main/java/org/apache/lenya/cms/site/tree/DefaultSiteTree.java?rev=742823&r1=742822&r2=742823&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.module.sitetree/src/main/java/org/apache/lenya/cms/site/tree/DefaultSiteTree.java (original)
+++ lenya/trunk/org.apache.lenya.module.sitetree/src/main/java/org/apache/lenya/cms/site/tree/DefaultSiteTree.java Tue Feb 10 02:33:01 2009
@@ -27,6 +27,7 @@
import org.apache.cocoon.spring.configurator.WebAppContextUtils;
import org.apache.cocoon.util.AbstractLogEnabled;
+import org.apache.commons.lang.Validate;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.lenya.cms.publication.Area;
@@ -40,7 +41,6 @@
import org.apache.lenya.cms.site.Link;
import org.apache.lenya.cms.site.SiteException;
import org.apache.lenya.cms.site.SiteNode;
-import org.apache.lenya.util.Assert;
import org.apache.lenya.xml.DocumentHelper;
import org.apache.lenya.xml.NamespaceHelper;
import org.apache.xpath.XPathAPI;
@@ -342,7 +342,7 @@
* @throws SiteException
*/
private synchronized Node removeNodeInternal(String path) throws SiteException {
- Assert.isTrue("contains " + path, contains(path));
+ Validate.isTrue(contains(path), "Path not found: ", path);
Node node = this.getNodeInternal(path);
Node parentNode = node.getParentNode();
Node newNode = parentNode.removeChild(node);
Modified: lenya/trunk/org.apache.lenya.module.sitetree/src/main/java/org/apache/lenya/cms/site/tree/SiteTreeNodeImpl.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.module.sitetree/src/main/java/org/apache/lenya/cms/site/tree/SiteTreeNodeImpl.java?rev=742823&r1=742822&r2=742823&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.module.sitetree/src/main/java/org/apache/lenya/cms/site/tree/SiteTreeNodeImpl.java (original)
+++ lenya/trunk/org.apache.lenya.module.sitetree/src/main/java/org/apache/lenya/cms/site/tree/SiteTreeNodeImpl.java Tue Feb 10 02:33:01 2009
@@ -22,6 +22,7 @@
import java.util.List;
import org.apache.cocoon.util.AbstractLogEnabled;
+import org.apache.commons.lang.Validate;
import org.apache.commons.logging.Log;
import org.apache.lenya.cms.publication.DocumentException;
import org.apache.lenya.cms.publication.DocumentFactory;
@@ -29,7 +30,6 @@
import org.apache.lenya.cms.site.SiteException;
import org.apache.lenya.cms.site.SiteNode;
import org.apache.lenya.cms.site.SiteStructure;
-import org.apache.lenya.util.Assert;
import org.apache.lenya.xml.NamespaceHelper;
import org.w3c.dom.Element;
import org.w3c.dom.NamedNodeMap;
@@ -180,7 +180,7 @@
}
public void addLabel(String language, String label) throws SiteException {
- Assert.isTrue("not contains " + language, !hasLink(language));
+ Validate.isTrue(!hasLink(language), "Language label exists already: ", language);
NamespaceHelper helper = getNamespaceHelper();
Element labelElem = helper.createElement(SiteTreeNodeImpl.LABEL_NAME, label);
Modified: lenya/trunk/org.apache.lenya.module.sitetree/src/main/java/org/apache/lenya/cms/site/tree2/SiteTreeImpl.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.module.sitetree/src/main/java/org/apache/lenya/cms/site/tree2/SiteTreeImpl.java?rev=742823&r1=742822&r2=742823&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.module.sitetree/src/main/java/org/apache/lenya/cms/site/tree2/SiteTreeImpl.java (original)
+++ lenya/trunk/org.apache.lenya.module.sitetree/src/main/java/org/apache/lenya/cms/site/tree2/SiteTreeImpl.java Tue Feb 10 02:33:01 2009
@@ -23,6 +23,7 @@
import org.apache.cocoon.spring.configurator.WebAppContextUtils;
import org.apache.cocoon.util.AbstractLogEnabled;
+import org.apache.commons.lang.Validate;
import org.apache.commons.logging.Log;
import org.apache.lenya.cms.publication.Area;
import org.apache.lenya.cms.publication.Document;
@@ -39,7 +40,6 @@
import org.apache.lenya.cms.site.SiteNode;
import org.apache.lenya.cms.site.SiteStructure;
import org.apache.lenya.cms.site.tree.SiteTree;
-import org.apache.lenya.util.Assert;
/**
* Simple site tree implementation.
@@ -103,8 +103,7 @@
.getBean(TreeBuilder.ROLE);
reset();
builder.buildTree(this);
- Assert.isTrue("Latest revision loaded",
- getRevision() == getRevision(getRepositoryNode()));
+ assert getRevision() == getRevision(getRepositoryNode());
} finally {
this.loading = false;
}
@@ -215,10 +214,8 @@
protected void nodeAdded(SiteNode node) {
String path = node.getPath();
- Assert.notNull("path", path);
- if (node != this.root) {
- Assert.isTrue("path not empty", path.length() > 0);
- }
+ assert path != null;
+ assert node == this.root || path.length() > 0;
this.path2node.put(path, node);
}
@@ -230,21 +227,21 @@
protected String getKey(Link link) {
String uuid = link.getNode().getUuid();
- Assert.notNull("uuid", uuid);
+ assert uuid != null;
String language = link.getLanguage();
- Assert.notNull("language", language);
+ assert language != null;
return getKey(uuid, language);
}
protected String getKey(String uuid, String language) {
- Assert.notNull("uuid", uuid);
- Assert.notNull("language", language);
+ Validate.notNull(uuid);
+ Validate.notNull(language);
return uuid + ":" + language;
}
protected void nodeRemoved(String path) {
- Assert.notNull("path", path);
- Assert.isTrue("path [" + path + "] contained", this.path2node.containsKey(path));
+ Validate.notNull(path);
+ Validate.isTrue(this.path2node.containsKey(path), "Path not found: ", path);
this.path2node.remove(path);
}
@@ -259,19 +256,19 @@
}
public boolean contains(String path) {
+ Validate.notNull(path);
load();
- Assert.notNull("path", path);
return this.path2node.containsKey(path);
}
public boolean containsByUuid(String uuid, String language) {
- Assert.notNull("uuid", uuid);
- Assert.notNull("language", language);
+ Validate.notNull(uuid);
+ Validate.notNull(language);
return getUuidLanguage2Link().containsKey(getKey(uuid, language));
}
public boolean containsInAnyLanguage(String uuid) {
- Assert.notNull("uuid", uuid);
+ Validate.notNull(uuid);
Set set = getUuidLanguage2Link().keySet();
String[] keys = (String[]) set.toArray(new String[set.size()]);
for (int i = 0; i < keys.length; i++) {
@@ -287,8 +284,8 @@
}
public Link getByUuid(String uuid, String language) throws SiteException {
- Assert.notNull("uuid", uuid);
- Assert.notNull("language", language);
+ Validate.notNull(uuid);
+ Validate.notNull(language);
String key = getKey(uuid, language);
if (!getUuidLanguage2Link().containsKey(key)) {
throw new SiteException("No link for [" + key + "]");
@@ -297,7 +294,7 @@
}
public SiteNode getNode(String path) throws SiteException {
- Assert.notNull("path", path);
+ Validate.notNull(path);
if (!getPath2Node().containsKey(path)) {
throw new SiteException("No node for path [" + path + "]");
}
@@ -340,10 +337,10 @@
}
protected void linkRemoved(String uuid, String language) {
- Assert.notNull("uuid", uuid);
- Assert.notNull("language", language);
+ Validate.notNull(uuid);
+ Validate.notNull(language);
String key = getKey(uuid, language);
- Assert.isTrue("contained", this.uuidLanguage2link.containsKey(key));
+ assert this.uuidLanguage2link.containsKey(key);
this.uuidLanguage2link.remove(key);
}
Modified: lenya/trunk/org.apache.lenya.module.sitetree/src/main/java/org/apache/lenya/cms/site/tree2/TreeNodeImpl.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.module.sitetree/src/main/java/org/apache/lenya/cms/site/tree2/TreeNodeImpl.java?rev=742823&r1=742822&r2=742823&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.module.sitetree/src/main/java/org/apache/lenya/cms/site/tree2/TreeNodeImpl.java (original)
+++ lenya/trunk/org.apache.lenya.module.sitetree/src/main/java/org/apache/lenya/cms/site/tree2/TreeNodeImpl.java Tue Feb 10 02:33:01 2009
@@ -25,6 +25,7 @@
import java.util.Set;
import org.apache.cocoon.util.AbstractLogEnabled;
+import org.apache.commons.lang.Validate;
import org.apache.commons.logging.Log;
import org.apache.lenya.cms.publication.DocumentFactory;
import org.apache.lenya.cms.site.Link;
@@ -32,7 +33,6 @@
import org.apache.lenya.cms.site.SiteNode;
import org.apache.lenya.cms.site.SiteStructure;
import org.apache.lenya.cms.site.tree.SiteTreeNode;
-import org.apache.lenya.util.Assert;
import org.apache.lenya.util.StringUtil;
/**
@@ -52,7 +52,7 @@
* @param logger The logger.
*/
public TreeNodeImpl(TreeNode parent, String name, boolean visible, Log logger) {
- Assert.notNull("name", name);
+ Validate.notNull(name);
this.name = name;
this.parent = parent;
this.isVisible = visible;
@@ -63,7 +63,7 @@
* @param uuid The UUID.
*/
protected void setUuid(String uuid) {
- Assert.notNull("uuid", uuid);
+ Validate.notNull(uuid);
if (this.language2link.keySet().size() > 0) {
throw new RuntimeException("Can't set the UUID if the node has links.");
}
@@ -114,7 +114,7 @@
}
public Link getLink(String language) throws SiteException {
- Assert.notNull("language", language);
+ Validate.notNull(language);
if (!this.language2link.containsKey(language)) {
throw new SiteException("No link contained for language [" + language + "]");
}
@@ -150,7 +150,7 @@
}
public boolean hasLink(String language) {
- Assert.notNull("language", language);
+ Validate.notNull(language);
return this.language2link.containsKey(language);
}
@@ -197,16 +197,16 @@
}
protected Link addLink(String lang, String label) {
- Assert.notNull("language", lang);
- Assert.notNull("label", label);
+ Validate.notNull(lang);
+ Validate.notNull("label", label);
Link link = addLinkInternal(lang, label);
changed();
return link;
}
protected Link addLinkInternal(String lang, String label) {
- Assert.notNull("language", lang);
- Assert.notNull("label", label);
+ Validate.notNull("language", lang);
+ Validate.notNull("label", label);
if (this.language2link.containsKey(lang)) {
throw new RuntimeException("The language [" + lang + "] is already contained.");
}
@@ -223,7 +223,7 @@
}
protected void removeLinkInternal(String language) {
- Assert.notNull("language", language);
+ Validate.notNull(language);
this.language2link.remove(language);
getTree().linkRemoved(getUuid(), language);
}
@@ -260,7 +260,7 @@
}
protected void removeChild(String name) {
- Assert.notNull("name", name);
+ Validate.notNull(name);
if (!this.name2child.containsKey(name)) {
throw new RuntimeException("The node [" + name + "] is not contained!");
}
@@ -274,20 +274,20 @@
private Map name2child = new HashMap();
public SiteNode addChild(String name, boolean visible) {
- Assert.notNull("name", name);
+ Validate.notNull(name);
return addChild(name, this.children.size(), visible);
}
public SiteNode addChild(String name, String followingNodeName, boolean visible) {
- Assert.notNull("name", name);
- Assert.notNull("following node name", followingNodeName);
+ Validate.notNull(name);
+ Validate.notNull(followingNodeName);
SiteNode followingSibling = getChild(followingNodeName);
int pos = this.children.indexOf(followingSibling);
return addChild(name, pos, visible);
}
protected SiteNode addChild(String name, int pos, boolean visible) {
- Assert.notNull("name", name);
+ Validate.notNull(name);
if (this.name2child.containsKey(name)) {
throw new RuntimeException("The child [" + name + "] is already contained.");
@@ -302,7 +302,7 @@
}
protected SiteNode getChild(String name) {
- Assert.notNull("name", name);
+ Validate.notNull(name);
if (this.name2child.containsKey(name)) {
return (SiteNode) this.name2child.get(name);
} else {
@@ -311,15 +311,15 @@
}
protected int getPosition(SiteNode child) {
- Assert.notNull("child", child);
- Assert.isTrue("contains", this.children.contains(child));
+ Validate.notNull(child);
+ Validate.isTrue(this.children.contains(child), "Child not found", child);
return this.children.indexOf(child);
}
public void moveDown(String name) {
SiteNode child = getChild(name);
int pos = getPosition(child);
- Assert.isTrue("not last", pos < this.children.size() - 1);
+ assert pos < this.children.size() - 1;
this.children.remove(child);
this.children.add(pos + 1, child);
changed();
@@ -328,7 +328,7 @@
public void moveUp(String name) {
SiteNode child = getChild(name);
int pos = getPosition(child);
- Assert.isTrue("not first", pos > 0);
+ assert pos > 0;
this.children.remove(child);
this.children.add(pos - 1, child);
changed();
Modified: lenya/trunk/org.apache.lenya.module.sourcerepository/src/main/java/org/apache/lenya/cms/repository/SourceNodeRCML.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.module.sourcerepository/src/main/java/org/apache/lenya/cms/repository/SourceNodeRCML.java?rev=742823&r1=742822&r2=742823&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.module.sourcerepository/src/main/java/org/apache/lenya/cms/repository/SourceNodeRCML.java (original)
+++ lenya/trunk/org.apache.lenya.module.sourcerepository/src/main/java/org/apache/lenya/cms/repository/SourceNodeRCML.java Tue Feb 10 02:33:01 2009
@@ -119,7 +119,7 @@
*/
public synchronized void write() throws RevisionControlException {
NamespaceHelper helper = saveToXml();
- Validate.notNull(helper, "XML document");
+ assert helper != null;
try {
SourceUtil.writeDOM(helper.getDocument(), getRcmlSourceUri(), getSourceResolver());
} catch (Exception e) {
Modified: lenya/trunk/org.apache.lenya.module.sourcerepository/src/main/java/org/apache/lenya/cms/repository/SourceWrapper.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.module.sourcerepository/src/main/java/org/apache/lenya/cms/repository/SourceWrapper.java?rev=742823&r1=742822&r2=742823&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.module.sourcerepository/src/main/java/org/apache/lenya/cms/repository/SourceWrapper.java (original)
+++ lenya/trunk/org.apache.lenya.module.sourcerepository/src/main/java/org/apache/lenya/cms/repository/SourceWrapper.java Tue Feb 10 02:33:01 2009
@@ -29,13 +29,13 @@
import org.apache.avalon.framework.service.ServiceException;
import org.apache.cocoon.util.AbstractLogEnabled;
+import org.apache.commons.lang.Validate;
import org.apache.commons.logging.Log;
import org.apache.excalibur.source.ModifiableSource;
import org.apache.excalibur.source.SourceResolver;
import org.apache.excalibur.source.TraversableSource;
import org.apache.lenya.cms.cocoon.source.SourceUtil;
import org.apache.lenya.cms.publication.Publication;
-import org.apache.lenya.util.Assert;
/**
* Provide access to a source.
@@ -52,15 +52,13 @@
* @param sourceUri
* @param logger
*/
- public SourceWrapper(SourceNode node, String sourceUri, SourceResolver resolver, Log logger) {
-
- Assert.notNull("node", node);
+ public SourceWrapper(SourceNode node, String sourceUri, SourceResolver resolver, Log logger)
+ {
+ Validate.notNull(node);
+ Validate.notNull(sourceUri);
+ Validate.notNull(resolver);
this.node = node;
-
- Assert.notNull("source URI", sourceUri);
this.sourceUri = sourceUri;
-
- Assert.notNull("source resolver", resolver);
this.sourceResolver = resolver;
}