diff --git a/magic-api-plugins/magic-api-plugin-git-store/pom.xml b/magic-api-plugins/magic-api-plugin-git/pom.xml
similarity index 83%
rename from magic-api-plugins/magic-api-plugin-git-store/pom.xml
rename to magic-api-plugins/magic-api-plugin-git/pom.xml
index 6579153c..888bd4b3 100644
--- a/magic-api-plugins/magic-api-plugin-git-store/pom.xml
+++ b/magic-api-plugins/magic-api-plugin-git/pom.xml
@@ -6,12 +6,12 @@
org.ssssssss
magic-api-plugins
- 2.0.0-alpha.4
+ 2.0.0-beta.1
- magic-api-plugin-git-store
+ magic-api-plugin-git
jar
- magic-api-plugin-git-store
- magic-api-plugin-git-store
+ magic-api-plugin-git
+ magic-api-plugin-git
5.13.0.202109080827-r
diff --git a/magic-api-plugins/magic-api-plugin-git-store/src/main/java/org/ssssssss/magicapi/git/GitRepo.java b/magic-api-plugins/magic-api-plugin-git/src/main/java/org/ssssssss/magicapi/git/GitRepo.java
similarity index 100%
rename from magic-api-plugins/magic-api-plugin-git-store/src/main/java/org/ssssssss/magicapi/git/GitRepo.java
rename to magic-api-plugins/magic-api-plugin-git/src/main/java/org/ssssssss/magicapi/git/GitRepo.java
diff --git a/magic-api-plugins/magic-api-plugin-git-store/src/main/java/org/ssssssss/magicapi/git/GitResource.java b/magic-api-plugins/magic-api-plugin-git/src/main/java/org/ssssssss/magicapi/git/GitResource.java
similarity index 100%
rename from magic-api-plugins/magic-api-plugin-git-store/src/main/java/org/ssssssss/magicapi/git/GitResource.java
rename to magic-api-plugins/magic-api-plugin-git/src/main/java/org/ssssssss/magicapi/git/GitResource.java
diff --git a/magic-api-plugins/magic-api-plugin-git-store/src/main/java/org/ssssssss/magicapi/git/GitStoreProperties.java b/magic-api-plugins/magic-api-plugin-git/src/main/java/org/ssssssss/magicapi/git/GitStoreProperties.java
similarity index 100%
rename from magic-api-plugins/magic-api-plugin-git-store/src/main/java/org/ssssssss/magicapi/git/GitStoreProperties.java
rename to magic-api-plugins/magic-api-plugin-git/src/main/java/org/ssssssss/magicapi/git/GitStoreProperties.java
diff --git a/magic-api-plugins/magic-api-plugin-git-store/src/main/java/org/ssssssss/magicapi/git/MagicGitStoreConfiguration.java b/magic-api-plugins/magic-api-plugin-git/src/main/java/org/ssssssss/magicapi/git/MagicGitConfiguration.java
similarity index 89%
rename from magic-api-plugins/magic-api-plugin-git-store/src/main/java/org/ssssssss/magicapi/git/MagicGitStoreConfiguration.java
rename to magic-api-plugins/magic-api-plugin-git/src/main/java/org/ssssssss/magicapi/git/MagicGitConfiguration.java
index d8aab900..fe6c09c9 100644
--- a/magic-api-plugins/magic-api-plugin-git-store/src/main/java/org/ssssssss/magicapi/git/MagicGitStoreConfiguration.java
+++ b/magic-api-plugins/magic-api-plugin-git/src/main/java/org/ssssssss/magicapi/git/MagicGitConfiguration.java
@@ -16,12 +16,12 @@ import java.io.IOException;
@Configuration
@EnableConfigurationProperties(GitStoreProperties.class)
-public class MagicGitStoreConfiguration implements MagicPluginConfiguration {
+public class MagicGitConfiguration implements MagicPluginConfiguration {
private final MagicAPIProperties properties;
private final GitStoreProperties gitStoreProperties;
- public MagicGitStoreConfiguration(MagicAPIProperties properties, GitStoreProperties gitStoreProperties) {
+ public MagicGitConfiguration(MagicAPIProperties properties, GitStoreProperties gitStoreProperties) {
this.properties = properties;
this.gitStoreProperties = gitStoreProperties;
}
diff --git a/magic-api-plugins/magic-api-plugin-git-store/src/main/resources/META-INF/spring.factories b/magic-api-plugins/magic-api-plugin-git/src/main/resources/META-INF/spring.factories
similarity index 54%
rename from magic-api-plugins/magic-api-plugin-git-store/src/main/resources/META-INF/spring.factories
rename to magic-api-plugins/magic-api-plugin-git/src/main/resources/META-INF/spring.factories
index 83c6a893..faf9674c 100644
--- a/magic-api-plugins/magic-api-plugin-git-store/src/main/resources/META-INF/spring.factories
+++ b/magic-api-plugins/magic-api-plugin-git/src/main/resources/META-INF/spring.factories
@@ -1,2 +1,2 @@
org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
- org.ssssssss.magicapi.git.MagicGitStoreConfiguration
+ org.ssssssss.magicapi.git.MagicGitConfiguration
diff --git a/magic-api-plugins/pom.xml b/magic-api-plugins/pom.xml
index 11ee112b..ad3d1d33 100644
--- a/magic-api-plugins/pom.xml
+++ b/magic-api-plugins/pom.xml
@@ -20,7 +20,7 @@
magic-api-plugin-mongo
magic-api-plugin-elasticsearch
magic-api-plugin-cluster
- magic-api-plugin-git-store
+ magic-api-plugin-git
diff --git a/magic-api/src/main/java/org/ssssssss/magicapi/core/resource/FileResource.java b/magic-api/src/main/java/org/ssssssss/magicapi/core/resource/FileResource.java
index f88a19dd..bf743ed2 100644
--- a/magic-api/src/main/java/org/ssssssss/magicapi/core/resource/FileResource.java
+++ b/magic-api/src/main/java/org/ssssssss/magicapi/core/resource/FileResource.java
@@ -19,8 +19,8 @@ import java.util.zip.ZipOutputStream;
public class FileResource implements Resource {
private final boolean readonly;
- private File file;
- private String rootPath;
+ protected File file;
+ protected String rootPath;
public FileResource(File file, boolean readonly, String rootPath) {
this.file = file;