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 19:15:01 UTC
cvs commit: cocoon-lenya/src/java/org/apache/lenya/cms/ac FileRole.java FileUser.java FileGroup.java
egli 2003/06/02 10:15:01
Modified: src/java/org/apache/lenya/cms/ac FileRole.java FileUser.java
FileGroup.java
Log:
The save method needs to be passed the publication so it can
ask the Manager for the path where the files are supposed
to be saved.
Revision Changes Path
1.2 +20 -4 cocoon-lenya/src/java/org/apache/lenya/cms/ac/FileRole.java
Index: FileRole.java
===================================================================
RCS file: /home/cvs/cocoon-lenya/src/java/org/apache/lenya/cms/ac/FileRole.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- FileRole.java 2 Jun 2003 09:26:36 -0000 1.1
+++ FileRole.java 2 Jun 2003 17:15:00 -0000 1.2
@@ -55,6 +55,7 @@
import org.apache.avalon.framework.configuration.ConfigurationException;
import org.apache.avalon.framework.configuration.DefaultConfiguration;
import org.apache.avalon.framework.configuration.DefaultConfigurationSerializer;
+import org.apache.lenya.cms.publication.Publication;
/**
* @author egli
@@ -68,16 +69,31 @@
public static final String CLASS_ATTRIBUTE = "class";
+ /**
+ * @param name
+ */
+ public FileRole(String name) {
+ super(name);
+ }
+
+ /**
+ * @param config
+ * @throws ConfigurationException
+ */
public FileRole(Configuration config) throws ConfigurationException {
super(config.getAttribute(NAME_ATTRIBUTE));
}
- public void save() throws AccessControlException {
+ /**
+ * @param publication
+ * @throws AccessControlException
+ */
+ public void save(Publication publication) throws AccessControlException {
DefaultConfigurationSerializer serializer =
new DefaultConfigurationSerializer();
Configuration config = createConfiguration();
- // TODO where do I get the file from?
- File xmlfile = null;
+ File xmlPath = RoleManager.instance(publication).getPath();
+ File xmlfile = new File(xmlPath, getName() + RoleManager.SUFFIX);
try {
serializer.serializeToFile(xmlfile, config);
} catch (Exception e) {
1.4 +5 -4 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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- FileUser.java 2 Jun 2003 09:28:43 -0000 1.3
+++ FileUser.java 2 Jun 2003 17:15:00 -0000 1.4
@@ -56,6 +56,7 @@
import org.apache.avalon.framework.configuration.ConfigurationException;
import org.apache.avalon.framework.configuration.DefaultConfiguration;
import org.apache.avalon.framework.configuration.DefaultConfigurationSerializer;
+import org.apache.lenya.cms.publication.Publication;
/**
* @author egli
@@ -131,12 +132,12 @@
/* (non-Javadoc)
* @see org.apache.lenya.cms.ac.User#save()
*/
- public void save() throws AccessControlException {
+ public void save(Publication publication) throws AccessControlException {
DefaultConfigurationSerializer serializer =
new DefaultConfigurationSerializer();
Configuration config = createConfiguration();
- // TODO where do I get the file from?
- File xmlfile = null;
+ File xmlPath = UserManager.instance(publication).getPath();
+ File xmlfile = new File(xmlPath, getId() + UserManager.SUFFIX);
try {
serializer.serializeToFile(xmlfile, config);
} catch (Exception e) {
1.2 +5 -4 cocoon-lenya/src/java/org/apache/lenya/cms/ac/FileGroup.java
Index: FileGroup.java
===================================================================
RCS file: /home/cvs/cocoon-lenya/src/java/org/apache/lenya/cms/ac/FileGroup.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- FileGroup.java 2 Jun 2003 09:27:23 -0000 1.1
+++ FileGroup.java 2 Jun 2003 17:15:00 -0000 1.2
@@ -56,6 +56,7 @@
import org.apache.avalon.framework.configuration.ConfigurationException;
import org.apache.avalon.framework.configuration.DefaultConfiguration;
import org.apache.avalon.framework.configuration.DefaultConfigurationSerializer;
+import org.apache.lenya.cms.publication.Publication;
/**
* @author egli
@@ -78,12 +79,12 @@
// }
}
- public void save() throws AccessControlException {
+ public void save(Publication publication) throws AccessControlException {
DefaultConfigurationSerializer serializer =
new DefaultConfigurationSerializer();
Configuration config = createConfiguration();
- // TODO where do I get the file from?
- File xmlfile = null;
+ File xmlPath = GroupManager.instance(publication).getPath();
+ File xmlfile = new File(xmlPath, name + GroupManager.SUFFIX);
try {
serializer.serializeToFile(xmlfile, config);
} catch (Exception e) {
---------------------------------------------------------------------
To unsubscribe, e-mail: lenya-cvs-unsubscribe@cocoon.apache.org
For additional commands, e-mail: lenya-cvs-help@cocoon.apache.org