You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lenya.apache.org by eg...@apache.org on 2003/06/02 11:28:43 UTC
cvs commit: cocoon-lenya/src/java/org/apache/lenya/cms/ac FileUser.java
egli 2003/06/02 02:28:43
Modified: src/java/org/apache/lenya/cms/ac FileUser.java
Log:
Replaced the configuration method with a constructor
that accepts a configuration.
Revision Changes Path
1.3 +16 -15 cocoon-lenya/src/java/org/apache/lenya/cms/ac/FileUser.java
Index: FileUser.java
===================================================================
RCS file: /home/cvs/cocoon-lenya/src/java/org/apache/lenya/cms/ac/FileUser.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- FileUser.java 30 May 2003 20:33:10 -0000 1.2
+++ FileUser.java 2 Jun 2003 09:28:43 -0000 1.3
@@ -53,9 +53,9 @@
import java.util.Iterator;
import org.apache.avalon.framework.configuration.Configuration;
+import org.apache.avalon.framework.configuration.ConfigurationException;
import org.apache.avalon.framework.configuration.DefaultConfiguration;
import org.apache.avalon.framework.configuration.DefaultConfigurationSerializer;
-import org.w3c.dom.Document;
/**
* @author egli
@@ -73,11 +73,6 @@
public static final String PASSWORD_ATTRIBUTE = "type";
public static final String ID_ATTRIBUTE = "id";
public static final String CLASS_ATTRIBUTE = "class";
- public static final String NAMESPACE_URI = "";
-
- private Document document;
- private File xmlfile;
- private DefaultConfiguration config;
/**
* @param id
@@ -85,12 +80,23 @@
public FileUser(String id) {
super(id);
}
+
+ public FileUser(Configuration config) throws ConfigurationException {
+ id = config.getAttribute(ID);
+ setEmail(config.getValue(EMAIL));
+ setFullName(config.getValue(FULL_NAME));
+ setPassword(config.getValue(PASSWORD));
+ Configuration[] groups = config.getChildren(GROUPS);
+ // for (int i = 0; i < groups.length; i++) {
+ // Configuration group = groups[i];
+ // }
+ }
/**
* @return
*/
- protected Configuration createDocument() {
+ protected Configuration createConfiguration() {
DefaultConfiguration config = new DefaultConfiguration(ID);
config.setAttribute(ID_ATTRIBUTE, id);
@@ -128,19 +134,14 @@
public void save() throws AccessControlException {
DefaultConfigurationSerializer serializer =
new DefaultConfigurationSerializer();
+ Configuration config = createConfiguration();
+ // TODO where do I get the file from?
+ File xmlfile = null;
try {
serializer.serializeToFile(xmlfile, config);
} catch (Exception e) {
throw new AccessControlException(e);
}
- }
-
- /* (non-Javadoc)
- * @see org.apache.lenya.cms.ac.User#configure(org.apache.avalon.framework.configuration.Configuration)
- */
- public void configure(Configuration config) {
- this.config.addAll(config);
-
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: lenya-cvs-unsubscribe@cocoon.apache.org
For additional commands, e-mail: lenya-cvs-help@cocoon.apache.org