shuber 2004/09/24 17:21:47 CEST
Modified files:
core project.xml
core/src/java/org/jahia/services/webdav/stores
PagesDescriptorsStore.java
Log:
Updates to be able to generate site documentation for Jahia core project.
Revision Changes Path
1.31 +18 -0 jahia/core/project.xml
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/project.xml.diff?r1=1.30&r2=1.31&f=h
1.3 +246 -246
jahia/core/src/java/org/jahia/services/webdav/stores/PagesDescriptorsStore.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/java/org/jahia/services/webdav/stores/PagesDescriptorsStore.java.diff?r1=1.2&r2=1.3&f=h
Index: project.xml
===================================================================
RCS file: /cvs/jahia/core/project.xml,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- project.xml 24 Sep 2004 13:56:20 -0000 1.30
+++ project.xml 24 Sep 2004 15:21:47 -0000 1.31
@@ -823,4 +823,22 @@
</resource>
</resources>
</build>
+ <reports>
+ <report>maven-jdepend-plugin</report>
+<!--
+ <report>maven-checkstyle-plugin</report>
+-->
+ <report>maven-pmd-plugin</report>
+ <report>maven-changelog-plugin</report>
+ <report>maven-file-activity-plugin</report>
+ <report>maven-developer-activity-plugin</report>
+ <report>maven-license-plugin</report>
+ <report>maven-javadoc-plugin</report>
+ <report>maven-jxr-plugin</report>
+ <report>maven-junit-report-plugin</report>
+ <report>maven-jcoverage-plugin</report>
+ <report>maven-linkcheck-plugin</report>
+ <report>maven-tasklist-plugin</report>
+ </reports>
+
</project>
Index: PagesDescriptorsStore.java
===================================================================
RCS file:
/cvs/jahia/core/src/java/org/jahia/services/webdav/stores/PagesDescriptorsStore.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- PagesDescriptorsStore.java 17 Sep 2004 10:14:50 -0000 1.2
+++ PagesDescriptorsStore.java 24 Sep 2004 15:21:47 -0000 1.3
@@ -1,152 +1,112 @@
-//package org.jahia.services.webdav.stores;
+package org.jahia.services.webdav.stores;
+
+import org.apache.slide.store.NodeStore;
+import org.apache.slide.store.RevisionDescriptorStore;
+import org.apache.slide.store.RevisionDescriptorsStore;
+import org.apache.slide.store.SecurityStore;
+
+/**
+ * Created by IntelliJ IDEA.
+ * User: toto
+ * Date: Apr 24, 2003
+ * Time: 11:43:34 PM
+ * To change this template use Options | File Templates.
+ */
+public class PagesDescriptorsStore extends JahiaJDBCDescriptorsStore
+ implements NodeStore, RevisionDescriptorsStore,
+ RevisionDescriptorStore, SecurityStore {
//
-//import org.apache.slide.store.NodeStore;
-//import org.apache.slide.store.RevisionDescriptorStore;
-//import org.apache.slide.store.RevisionDescriptorsStore;
-//import org.apache.slide.store.SecurityStore;
-//
-///**
-// * Created by IntelliJ IDEA.
-// * User: toto
-// * Date: Apr 24, 2003
-// * Time: 11:43:34 PM
-// * To change this template use Options | File Templates.
-// */
-//public class PagesDescriptorsStore extends JahiaJDBCDescriptorsStore
-// implements NodeStore, RevisionDescriptorsStore,
-// RevisionDescriptorStore, SecurityStore {
-////
-////
-//// public void storeObject(Uri uri, ObjectNode object)
-//// throws ServiceAccessException, ObjectNotFoundException {
-//// }
-////
-//// public void createObject(Uri uri, ObjectNode object)
-//// throws ServiceAccessException, ObjectAlreadyExistsException {
-//// }
-////
-//// public void removeObject(Uri uri, ObjectNode object)
-//// throws ServiceAccessException, ObjectNotFoundException {
-//// }
-////
-//// public ObjectNode retrieveObject(Uri uri)
-//// throws ServiceAccessException, ObjectNotFoundException {
-//// try {
-//// try {
-//// JahiaPage page = findPage(uri);
-//// System.out.println("page:"+page);
-//// return createPageNode(uri, page);
-//// } catch (JahiaException e) { �
-//// e.printStackTrace(); //To change body of catch statement use
Options | File Templates.
-//// throw new ServiceAccessException(this,e);
-//// } catch (ObjectNotFoundException e) {
-//// e.printStackTrace(); //To change body of catch statement use
Options | File Templates.
-//// throw new ObjectNotFoundException(uri);
-//// }
-//// } catch (Throwable e) {
-//// e.printStackTrace(); //To change body of catch statement use
Options | File Templates.
-//// throw new ObjectNotFoundException(uri);
-//// }
-//// }
-////
-//// private JahiaPage findPage(Uri uri) throws JahiaException,
ObjectNotFoundException {
-//// int homeId =
ServicesRegistry.getInstance().getJahiaSitesService().getSite(siteId).getHomePageID();
-////// JahiaUser root =
ServicesRegistry.getInstance().getJahiaUserManagerService().lookupUser(0,"root");
-//// JahiaPage home =
ServicesRegistry.getInstance().getJahiaPageService().lookupPage(homeId,
EntryLoadRequest.CURRENT, ParamBean.NORMAL,root,false);
-////
-//// JahiaPage current = home;
-////
-//// StringTokenizer tok = new StringTokenizer(uri.toString(),"/");
-//// tok.nextToken();
-//// while (tok.hasMoreTokens()) {
-//// String pageTitle = tok.nextToken();
-//// JahiaPage found = null;
-//// Enumeration children =
ServicesRegistry.getInstance().getJahiaPageService().getPageChilds(current.getID(),PageLoadFlags.DIRECT,root).elements();
-//// while (children.hasMoreElements() && found == null) {
-//// JahiaPage jahiaPage = (JahiaPage) children.nextElement();
-//// if (jahiaPage.getTitle().equals(pageTitle)) {
-//// found = jahiaPage;
-//// }
-//// }
-//// if (found != null) {
-//// current = found;
-//// } else {
-//// throw new ObjectNotFoundException(uri);
-//// }
-//// }
-//// return current;
-//// }
-////
-//// private SubjectNode createPageNode(Uri uri, JahiaPage page) throws
JahiaException {
-////// JahiaUser root =
ServicesRegistry.getInstance().getJahiaUserManagerService().lookupUser(0,"root");
-//// Enumeration children =
ServicesRegistry.getInstance().getJahiaPageService().getPageChilds(page.getID(),PageLoadFlags.DIRECT,root).elements();
-//// Vector childrenPaths = new Vector();
-//// while (children.hasMoreElements()) {
-//// JahiaPage jahiaPage = (JahiaPage) children.nextElement();
-//// childrenPaths.add(uri.toString() + "/" + jahiaPage.getTitle());
-//// }
-//// return new SubjectNode(uri.toString(),childrenPaths,new Vector());
-//// }
-////
-//// public void createRevisionDescriptors(Uri uri,
-//// NodeRevisionDescriptors
revisionDescriptors)
-//// throws ServiceAccessException {
-//// }
-////
-//// public void storeRevisionDescriptors(Uri uri,
-//// NodeRevisionDescriptors
revisionDescriptors)
-//// throws ServiceAccessException, RevisionDescriptorNotFoundException {
-//// }
-////
-//// public void removeRevisionDescriptors(Uri uri)
-//// throws ServiceAccessException {
-//// }
-////
-//// public NodeRevisionDescriptors retrieveRevisionDescriptors(Uri uri)
-//// throws ServiceAccessException, RevisionDescriptorNotFoundException {
-////
-//// throw new RevisionDescriptorNotFoundException(uri.toString());
-//////
-////// try {
-////// findPage(uri);
-////// } catch (JahiaException e) {
-////// e.printStackTrace(); //To change body of catch statement use
Options | File Templates.
-////// throw new ServiceAccessException(this,e);
-////// } catch (ObjectNotFoundException e) {
-////// e.printStackTrace(); //To change body of catch statement use
Options | File Templates.
-////// throw new RevisionDescriptorNotFoundException(uri.toString());
-////// }
-//////
-////// NodeRevisionNumber initialRevision = new NodeRevisionNumber();
-////// Hashtable workingRevisions = new Hashtable();
-////// Hashtable latestRevisionNumbers = new Hashtable();
-////// Hashtable branches = new Hashtable();
-////// boolean isVersioned = false;
-//////
-//////
latestRevisionNumbers.put(NodeRevisionDescriptors.MAIN_BRANCH,initialRevision);
-//////
-////// return new NodeRevisionDescriptors
-////// (uri.toString(), initialRevision, workingRevisions,
-////// latestRevisionNumbers, branches, isVersioned);
-//// }
-////
-//// public void createRevisionDescriptor(Uri uri,
-//// NodeRevisionDescriptor
revisionDescriptor)
-//// throws ServiceAccessException {
-//// }
-////
-//// public void storeRevisionDescriptor(Uri uri,
-//// NodeRevisionDescriptor
revisionDescriptor)
-//// throws ServiceAccessException, RevisionDescriptorNotFoundException {
-//// }
-////
-//// public void removeRevisionDescriptor(Uri uri, NodeRevisionNumber number)
-//// throws ServiceAccessException {
-//// }
+//
+// public void storeObject(Uri uri, ObjectNode object)
+// throws ServiceAccessException, ObjectNotFoundException {
+// }
+//
+// public void createObject(Uri uri, ObjectNode object)
+// throws ServiceAccessException, ObjectAlreadyExistsException {
+// }
+//
+// public void removeObject(Uri uri, ObjectNode object)
+// throws ServiceAccessException, ObjectNotFoundException {
+// }
+//
+// public ObjectNode retrieveObject(Uri uri)
+// throws ServiceAccessException, ObjectNotFoundException {
+// try {
+// try {
+// JahiaPage page = findPage(uri);
+// System.out.println("page:"+page);
+// return createPageNode(uri, page);
+// } catch (JahiaException e) { �
+// e.printStackTrace(); //To change body of catch statement use
Options | File Templates.
+// throw new ServiceAccessException(this,e);
+// } catch (ObjectNotFoundException e) {
+// e.printStackTrace(); //To change body of catch statement use
Options | File Templates.
+// throw new ObjectNotFoundException(uri);
+// }
+// } catch (Throwable e) {
+// e.printStackTrace(); //To change body of catch statement use Options
| File Templates.
+// throw new ObjectNotFoundException(uri);
+// }
+// }
+//
+// private JahiaPage findPage(Uri uri) throws JahiaException,
ObjectNotFoundException {
+// int homeId =
ServicesRegistry.getInstance().getJahiaSitesService().getSite(siteId).getHomePageID();
+//// JahiaUser root =
ServicesRegistry.getInstance().getJahiaUserManagerService().lookupUser(0,"root");
+// JahiaPage home =
ServicesRegistry.getInstance().getJahiaPageService().lookupPage(homeId,
EntryLoadRequest.CURRENT, ParamBean.NORMAL,root,false);
+//
+// JahiaPage current = home;
+//
+// StringTokenizer tok = new StringTokenizer(uri.toString(),"/");
+// tok.nextToken();
+// while (tok.hasMoreTokens()) {
+// String pageTitle = tok.nextToken();
+// JahiaPage found = null;
+// Enumeration children =
ServicesRegistry.getInstance().getJahiaPageService().getPageChilds(current.getID(),PageLoadFlags.DIRECT,root).elements();
+// while (children.hasMoreElements() && found == null) {
+// JahiaPage jahiaPage = (JahiaPage) children.nextElement();
+// if (jahiaPage.getTitle().equals(pageTitle)) {
+// found = jahiaPage;
+// }
+// }
+// if (found != null) {
+// current = found;
+// } else {
+// throw new ObjectNotFoundException(uri);
+// }
+// }
+// return current;
+// }
+//
+// private SubjectNode createPageNode(Uri uri, JahiaPage page) throws
JahiaException {
+//// JahiaUser root =
ServicesRegistry.getInstance().getJahiaUserManagerService().lookupUser(0,"root");
+// Enumeration children =
ServicesRegistry.getInstance().getJahiaPageService().getPageChilds(page.getID(),PageLoadFlags.DIRECT,root).elements();
+// Vector childrenPaths = new Vector();
+// while (children.hasMoreElements()) {
+// JahiaPage jahiaPage = (JahiaPage) children.nextElement();
+// childrenPaths.add(uri.toString() + "/" + jahiaPage.getTitle());
+// }
+// return new SubjectNode(uri.toString(),childrenPaths,new Vector());
+// }
+//
+// public void createRevisionDescriptors(Uri uri,
+// NodeRevisionDescriptors
revisionDescriptors)
+// throws ServiceAccessException {
+// }
+//
+// public void storeRevisionDescriptors(Uri uri,
+// NodeRevisionDescriptors
revisionDescriptors)
+// throws ServiceAccessException, RevisionDescriptorNotFoundException {
+// }
+//
+// public void removeRevisionDescriptors(Uri uri)
+// throws ServiceAccessException {
+// }
+//
+// public NodeRevisionDescriptors retrieveRevisionDescriptors(Uri uri)
+// throws ServiceAccessException, RevisionDescriptorNotFoundException {
+//
+// throw new RevisionDescriptorNotFoundException(uri.toString());
////
-//// public NodeRevisionDescriptor retrieveRevisionDescriptor
-//// (Uri uri, NodeRevisionNumber revisionNumber)
-//// throws ServiceAccessException, RevisionDescriptorNotFoundException {
//// try {
//// findPage(uri);
//// } catch (JahiaException e) {
@@ -157,102 +117,142 @@
//// throw new RevisionDescriptorNotFoundException(uri.toString());
//// }
////
-//// String branchName = null;
-//// Vector labels = new Vector();
-//// Hashtable properties = new Hashtable();
-////
-//// properties.put("DAV:resourcetype", new
NodeProperty("resourcetype","<collection/>","DAV:","",true));
-////
-//// return new NodeRevisionDescriptor(revisionNumber, branchName,
-//// labels, properties);
-//// }
-////
-////
-//// /**
-//// * Grant a new permission.
-//// *
-//// * @param permission Permission we want to create
-//// * @exception ServiceAccessException Error accessing the Data Source
-//// */
-//// public void grantPermission(Uri uri, NodePermission permission)
-//// throws ServiceAccessException {
-//// }
-////
-//// /**
-//// * Revoke a permission.
-//// *
-//// * @param permission Permission we want to create
-//// * @exception ServiceAccessException Error accessing the Data Source
-//// */
-//// public void revokePermission(Uri uri, NodePermission permission)
-//// throws ServiceAccessException {
-//// }
-////
-//// /**
-//// * Revoke all the permissions on an object.
-//// *
-//// * @exception ServiceAccessException Error accessing the Data Source
-//// */
-//// public void revokePermissions(Uri uri)
-//// throws ServiceAccessException {
-//// }
-////
-//// /**
-//// * Enumerate permissions on an object.
-//// *
-//// * @exception ServiceAccessException Error accessing the Data Source
-//// */
-//// public Enumeration enumeratePermissions(Uri uri)
-//// throws ServiceAccessException {
-//// Vector permissionVector = new Vector();
-////
-//// try {
-//// JahiaPage page = findPage(uri);
-//// JahiaBaseACL acl = page.getACL();
-//// Vector users = acl.getUsernameList(null);
-//// JahiaUserManagerService userManager =
ServicesRegistry.getInstance().getJahiaUserManagerService();
-//// for (Iterator iterator = users.iterator(); iterator.hasNext();) {
-//// String username = (String) iterator.next();
-//// JahiaUser user = userManager.lookupUser(username);
-//// JahiaACLEntry ace = acl.getUserEntry(user);
-//// if (ace != null) {
-//// String name = user.getUsername();
-//// addPermissions(uri, name, ace, permissionVector);
-//// }
-//// }
-//// Vector groups = acl.getGroupnameList(null);
-//// JahiaGroupManagerService groupManager =
ServicesRegistry.getInstance().getJahiaGroupManagerService();
-//// for (Iterator iterator = groups.iterator(); iterator.hasNext();) {
-//// String groupname = (String) iterator.next();
-//// JahiaGroup group = groupManager.lookupGroup(groupname);
-//// JahiaACLEntry ace = acl.getGroupEntry(group);
-//// if (ace != null) {
-//// String name = "groups/" + group.getGroupname();
-//// addPermissions(uri, name, ace, permissionVector);
-//// }
-////
-//// }
-//// } catch (JahiaException e) {
-//// e.printStackTrace(); //To change body of catch statement use
Options | File Templates.
-//// } catch (ObjectNotFoundException e) {
-//// e.printStackTrace(); //To change body of catch statement use
Options | File Templates.
-//// }
-//// return permissionVector.elements();
-//// }
-////
-//// private void addPermissions(Uri uri, String subject, JahiaACLEntry ace,
Vector permissionVector) {
-//// if (ace.getPermission(JahiaBaseACL.READ_RIGHTS) ==
JahiaACLEntry.ACL_YES) {
-//// permissionVector.addElement(new
NodePermission(uri.toString(),subject,
-////
"/actions/read",true,ace.getPermission(JahiaBaseACL.READ_RIGHTS)==JahiaACLEntry.ACL_NO));
-//// }
-//// if (ace.getPermission(JahiaBaseACL.WRITE_RIGHTS) ==
JahiaACLEntry.ACL_YES) {
-//// permissionVector.addElement(new
NodePermission(uri.toString(),subject,
-////
"/actions/write",true,ace.getPermission(JahiaBaseACL.WRITE_RIGHTS)==JahiaACLEntry.ACL_NO));
-//// }
-//// if (ace.getPermission(JahiaBaseACL.ADMIN_RIGHTS) ==
JahiaACLEntry.ACL_YES) {
-//// permissionVector.addElement(new
NodePermission(uri.toString(),subject,
-////
"/actions/manage",true,ace.getPermission(JahiaBaseACL.ADMIN_RIGHTS)==JahiaACLEntry.ACL_NO));
-//// }
-//// }
-////
-//}
+//// NodeRevisionNumber initialRevision = new NodeRevisionNumber();
+//// Hashtable workingRevisions = new Hashtable();
+//// Hashtable latestRevisionNumbers = new Hashtable();
+//// Hashtable branches = new Hashtable();
+//// boolean isVersioned = false;
+////
+////
latestRevisionNumbers.put(NodeRevisionDescriptors.MAIN_BRANCH,initialRevision);
+////
+//// return new NodeRevisionDescriptors
+//// (uri.toString(), initialRevision, workingRevisions,
+//// latestRevisionNumbers, branches, isVersioned);
+// }
+//
+// public void createRevisionDescriptor(Uri uri,
+// NodeRevisionDescriptor
revisionDescriptor)
+// throws ServiceAccessException {
+// }
+//
+// public void storeRevisionDescriptor(Uri uri,
+// NodeRevisionDescriptor revisionDescriptor)
+// throws ServiceAccessException, RevisionDescriptorNotFoundException {
+// }
+//
+// public void removeRevisionDescriptor(Uri uri, NodeRevisionNumber number)
+// throws ServiceAccessException {
+// }
+//
+// public NodeRevisionDescriptor retrieveRevisionDescriptor
+// (Uri uri, NodeRevisionNumber revisionNumber)
+// throws ServiceAccessException, RevisionDescriptorNotFoundException {
+// try {
+// findPage(uri);
+// } catch (JahiaException e) {
+// e.printStackTrace(); //To change body of catch statement use Options
| File Templates.
+// throw new ServiceAccessException(this,e);
+// } catch (ObjectNotFoundException e) {
+// e.printStackTrace(); //To change body of catch statement use Options
| File Templates.
+// throw new RevisionDescriptorNotFoundException(uri.toString());
+// }
+//
+// String branchName = null;
+// Vector labels = new Vector();
+// Hashtable properties = new Hashtable();
+//
+// properties.put("DAV:resourcetype", new
NodeProperty("resourcetype","<collection/>","DAV:","",true));
+//
+// return new NodeRevisionDescriptor(revisionNumber, branchName,
+// labels, properties);
+// }
+//
+//
+// /**
+// * Grant a new permission.
+// *
+// * @param permission Permission we want to create
+// * @exception ServiceAccessException Error accessing the Data Source
+// */
+// public void grantPermission(Uri uri, NodePermission permission)
+// throws ServiceAccessException {
+// }
+//
+// /**
+// * Revoke a permission.
+// *
+// * @param permission Permission we want to create
+// * @exception ServiceAccessException Error accessing the Data Source
+// */
+// public void revokePermission(Uri uri, NodePermission permission)
+// throws ServiceAccessException {
+// }
+//
+// /**
+// * Revoke all the permissions on an object.
+// *
+// * @exception ServiceAccessException Error accessing the Data Source
+// */
+// public void revokePermissions(Uri uri)
+// throws ServiceAccessException {
+// }
+//
+// /**
+// * Enumerate permissions on an object.
+// *
+// * @exception ServiceAccessException Error accessing the Data Source
+// */
+// public Enumeration enumeratePermissions(Uri uri)
+// throws ServiceAccessException {
+// Vector permissionVector = new Vector();
+//
+// try {
+// JahiaPage page = findPage(uri);
+// JahiaBaseACL acl = page.getACL();
+// Vector users = acl.getUsernameList(null);
+// JahiaUserManagerService userManager =
ServicesRegistry.getInstance().getJahiaUserManagerService();
+// for (Iterator iterator = users.iterator(); iterator.hasNext();) {
+// String username = (String) iterator.next();
+// JahiaUser user = userManager.lookupUser(username);
+// JahiaACLEntry ace = acl.getUserEntry(user);
+// if (ace != null) {
+// String name = user.getUsername();
+// addPermissions(uri, name, ace, permissionVector);
+// }
+// }
+// Vector groups = acl.getGroupnameList(null);
+// JahiaGroupManagerService groupManager =
ServicesRegistry.getInstance().getJahiaGroupManagerService();
+// for (Iterator iterator = groups.iterator(); iterator.hasNext();) {
+// String groupname = (String) iterator.next();
+// JahiaGroup group = groupManager.lookupGroup(groupname);
+// JahiaACLEntry ace = acl.getGroupEntry(group);
+// if (ace != null) {
+// String name = "groups/" + group.getGroupname();
+// addPermissions(uri, name, ace, permissionVector);
+// }
+//
+// }
+// } catch (JahiaException e) {
+// e.printStackTrace(); //To change body of catch statement use Options
| File Templates.
+// } catch (ObjectNotFoundException e) {
+// e.printStackTrace(); //To change body of catch statement use Options
| File Templates.
+// }
+// return permissionVector.elements();
+// }
+//
+// private void addPermissions(Uri uri, String subject, JahiaACLEntry ace,
Vector permissionVector) {
+// if (ace.getPermission(JahiaBaseACL.READ_RIGHTS) == JahiaACLEntry.ACL_YES)
{
+// permissionVector.addElement(new NodePermission(uri.toString(),subject,
+//
"/actions/read",true,ace.getPermission(JahiaBaseACL.READ_RIGHTS)==JahiaACLEntry.ACL_NO));
+// }
+// if (ace.getPermission(JahiaBaseACL.WRITE_RIGHTS) ==
JahiaACLEntry.ACL_YES) {
+// permissionVector.addElement(new NodePermission(uri.toString(),subject,
+//
"/actions/write",true,ace.getPermission(JahiaBaseACL.WRITE_RIGHTS)==JahiaACLEntry.ACL_NO));
+// }
+// if (ace.getPermission(JahiaBaseACL.ADMIN_RIGHTS) ==
JahiaACLEntry.ACL_YES) {
+// permissionVector.addElement(new NodePermission(uri.toString(),subject,
+//
"/actions/manage",true,ace.getPermission(JahiaBaseACL.ADMIN_RIGHTS)==JahiaACLEntry.ACL_NO));
+// }
+// }
+//
+}
