Rename dav_resource.rs to resource.rs

crates/caldav/src/resources/calendar.rs

@@ -2,8 +2,8 @@ use actix_web::{web::Data, HttpRequest};
 use anyhow::{anyhow, Result};
 use async_trait::async_trait;
 use rustical_auth::AuthInfo;
-use rustical_dav::dav_resource::{Resource, ResourceService};
 use rustical_dav::error::Error;
+use rustical_dav::resource::{Resource, ResourceService};
 use rustical_dav::xml_snippets::{HrefElement, TextNode};
 use rustical_store::calendar::{Calendar, CalendarStore};
 use serde::Serialize;

crates/caldav/src/resources/event.rs

@@ -2,9 +2,9 @@ use actix_web::{web::Data, HttpRequest};
 use anyhow::{anyhow, Result};
 use async_trait::async_trait;
 use rustical_auth::AuthInfo;
-use rustical_dav::dav_resource::Resource;
+use rustical_dav::error::Error;
+use rustical_dav::resource::{Resource, ResourceService};
 use rustical_dav::xml_snippets::TextNode;
-use rustical_dav::{dav_resource::ResourceService, error::Error};
 use rustical_store::calendar::CalendarStore;
 use rustical_store::event::Event;
 use serde::Serialize;

crates/caldav/src/resources/principal.rs

@@ -5,7 +5,7 @@ use actix_web::HttpRequest;
 use anyhow::{anyhow, Result};
 use async_trait::async_trait;
 use rustical_auth::AuthInfo;
-use rustical_dav::dav_resource::{Resource, ResourceService};
+use rustical_dav::resource::{Resource, ResourceService};
 use rustical_dav::xml_snippets::HrefElement;
 use rustical_store::calendar::CalendarStore;
 use serde::Serialize;

crates/caldav/src/resources/root.rs

@@ -2,8 +2,8 @@ use actix_web::HttpRequest;
 use anyhow::Result;
 use async_trait::async_trait;
 use rustical_auth::AuthInfo;
-use rustical_dav::dav_resource::{Resource, ResourceService};
 use rustical_dav::error::Error;
+use rustical_dav::resource::{Resource, ResourceService};
 use rustical_dav::xml_snippets::HrefElement;
 use serde::Serialize;
 use strum::{EnumString, IntoStaticStr, VariantNames};

crates/caldav/src/routes/calendar.rs

@@ -7,9 +7,9 @@ use actix_web::HttpResponse;
 use anyhow::Result;
 use roxmltree::{Node, NodeType};
 use rustical_auth::{AuthInfoExtractor, CheckAuthentication};
-use rustical_dav::dav_resource::HandlePropfind;
 use rustical_dav::namespace::Namespace;
 use rustical_dav::propfind::ServicePrefix;
+use rustical_dav::resource::HandlePropfind;
 use rustical_dav::xml_snippets::generate_multistatus;
 use rustical_store::calendar::{Calendar, CalendarStore};
 use rustical_store::event::Event;

crates/dav/src/lib.rs

@@ -1,6 +1,6 @@
-pub mod dav_resource;
 pub mod depth_extractor;
 pub mod error;
 pub mod namespace;
 pub mod propfind;
+pub mod resource;
 pub mod xml_snippets;

crates/dav/src/propfind.rs

@@ -1,7 +1,7 @@
-use crate::dav_resource::HandlePropfind;
-use crate::dav_resource::ResourceService;
 use crate::depth_extractor::Depth;
 use crate::namespace::Namespace;
+use crate::resource::HandlePropfind;
+use crate::resource::ResourceService;
 use crate::xml_snippets::generate_multistatus;
 use actix_web::http::header::ContentType;
 use actix_web::http::StatusCode;