You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jackrabbit.apache.org by kw...@apache.org on 2020/06/02 11:34:47 UTC
[jackrabbit-filevault] branch feature/git-migration created (now
e506a4f)
This is an automated email from the ASF dual-hosted git repository.
kwin pushed a change to branch feature/git-migration
in repository https://gitbox.apache.org/repos/asf/jackrabbit-filevault.git.
at e506a4f JCRVLT-398 - migrate to git
This branch includes the following new commits:
new e506a4f JCRVLT-398 - migrate to git
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[jackrabbit-filevault] 01/01: JCRVLT-398 - migrate to git
Posted by kw...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
kwin pushed a commit to branch feature/git-migration
in repository https://gitbox.apache.org/repos/asf/jackrabbit-filevault.git
commit e506a4fa6e9b1338b43c2a3ae7c02133a4ccfa0f
Author: Konrad Windszus <kw...@apache.org>
AuthorDate: Tue Jun 2 13:31:04 2020 +0200
JCRVLT-398 - migrate to git
---
README.md | 12 ++----------
parent/pom.xml | 9 +++++----
pom.xml | 9 ---------
target-osgi-environment/pom.xml | 9 ---------
vault-cli/pom.xml | 9 ---------
vault-core/pom.xml | 9 ---------
vault-davex/pom.xml | 9 ---------
vault-doc/pom.xml | 15 ---------------
vault-doc/src/site/markdown/overview.md | 32 +++++++++++++++-----------------
vault-hook-example/pom.xml | 8 --------
vault-hook-externalclass-test/pom.xml | 10 ----------
vault-rcp/pom.xml | 9 ---------
vault-sync/pom.xml | 9 ---------
vault-validation/pom.xml | 9 ---------
vault-vlt/pom.xml | 10 ----------
15 files changed, 22 insertions(+), 146 deletions(-)
diff --git a/README.md b/README.md
index 305912f..68e751e 100644
--- a/README.md
+++ b/README.md
@@ -64,17 +64,9 @@ Jackrabbit mailing lists as well as links to list archives, please see:
Latest development
==================
-The latest FileVault source code is available via Subversion at
+The latest FileVault source code is available at
- <https://svn.apache.org/repos/asf/jackrabbit/commons/filevault/trunk/>
-
-or with ViewVC at
-
- <https://svn.apache.org/viewvc/jackrabbit/commons/filevault/trunk/>
-
-To checkout the main source tree, run
-
- svn checkout https://svn.apache.org/repos/asf/commons/filevault/trunk filevault
+ <https://github.com/apache/jackrabbit-filevault>
Credits
=======
diff --git a/parent/pom.xml b/parent/pom.xml
index e8fd228..adb798b 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -58,12 +58,13 @@ Apache Jackrabbit FileVault is a project of the Apache Software Foundation.
</properties>
<!-- ====================================================================== -->
- <!-- S C M D E F I N I T I O N -->
+ <!-- S C M D E F I N I T I O N -->
<!-- ====================================================================== -->
<scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/jackrabbit/commons/filevault/trunk/parent</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/jackrabbit/commons/filevault/trunk/parent</developerConnection>
- <url>https://svn.apache.org/viewvc/jackrabbit/commons/filevault/trunk/parent</url>
+ <connection>scm:git:https://gitbox.apache.org/repos/asf/jackrabbit-filevault.git</connection>
+ <developerConnection>scm:git:https://gitbox.apache.org/repos/asf/jackrabbit-filevault.git</developerConnection>
+ <url>https://github.com/apache/jackrabbit-filevault/tree/${project.scm.tag}</url>
+ <tag>trunk</tag>
</scm>
<mailingLists>
diff --git a/pom.xml b/pom.xml
index 1d9636e..59403a7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -35,15 +35,6 @@
<name>Apache Jackrabbit FileVault (Reactor Project)</name>
<!-- ====================================================================== -->
- <!-- S C M D E F I N I T I O N -->
- <!-- ====================================================================== -->
- <scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/jackrabbit/commons/filevault/trunk</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/jackrabbit/commons/filevault/trunk</developerConnection>
- <url>https://svn.apache.org/viewvc/jackrabbit/commons/filevault/trunk</url>
- </scm>
-
- <!-- ====================================================================== -->
<!-- M O D U L E S -->
<!-- ====================================================================== -->
<modules>
diff --git a/target-osgi-environment/pom.xml b/target-osgi-environment/pom.xml
index 70b5eb6..7abb60c 100644
--- a/target-osgi-environment/pom.xml
+++ b/target-osgi-environment/pom.xml
@@ -35,15 +35,6 @@
<name>Apache Jackrabbit FileVault Target OSGi Environment</name>
<description>The bndrun files and the used bundles for resolving all FileVault bundles in the minimum support OSGi container</description>
- <!-- ====================================================================== -->
- <!-- S C M D E F I N I T I O N -->
- <!-- ====================================================================== -->
- <scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/jackrabbit/commons/filevault/trunk/target-osgi-environment</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/jackrabbit/commons/filevault/trunk/target-osgi-environment</developerConnection>
- <url>https://svn.apache.org/viewvc/jackrabbit/commons/filevault/trunk/target-osgi-environment</url>
- </scm>
-
<properties>
<jackrabbit.version>2.14.0</jackrabbit.version>
</properties>
diff --git a/vault-cli/pom.xml b/vault-cli/pom.xml
index d7571bd..db6ae3e 100644
--- a/vault-cli/pom.xml
+++ b/vault-cli/pom.xml
@@ -39,15 +39,6 @@
</description>
<!-- ====================================================================== -->
- <!-- S C M D E F I N I T I O N -->
- <!-- ====================================================================== -->
- <scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/jackrabbit/commons/filevault/trunk/vault-cli</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/jackrabbit/commons/filevault/trunk/vault-cli</developerConnection>
- <url>https://svn.apache.org/viewvc/jackrabbit/commons/filevault/trunk/vault-cli</url>
- </scm>
-
- <!-- ====================================================================== -->
<!-- B U I L D D E F I N I T I O N -->
<!-- ====================================================================== -->
<build>
diff --git a/vault-core/pom.xml b/vault-core/pom.xml
index c4d28af..5b3b78b 100644
--- a/vault-core/pom.xml
+++ b/vault-core/pom.xml
@@ -36,15 +36,6 @@
<description>The core classes of Apache Jackrabbit FileVault</description>
<!-- ====================================================================== -->
- <!-- S C M D E F I N I T I O N -->
- <!-- ====================================================================== -->
- <scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/jackrabbit/commons/filevault/trunk/vault-core</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/jackrabbit/commons/filevault/trunk/vault-core</developerConnection>
- <url>https://svn.apache.org/viewvc/jackrabbit/commons/filevault/trunk/vault-core</url>
- </scm>
-
- <!-- ====================================================================== -->
<!-- B U I L D -->
<!-- ====================================================================== -->
<build>
diff --git a/vault-davex/pom.xml b/vault-davex/pom.xml
index e1c3bb2..0cf41a4 100644
--- a/vault-davex/pom.xml
+++ b/vault-davex/pom.xml
@@ -36,15 +36,6 @@
<name>Apache Jackrabbit FileVault JCR Remoting Service</name>
<!-- ====================================================================== -->
- <!-- S C M D E F I N I T I O N -->
- <!-- ====================================================================== -->
- <scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/jackrabbit/commons/filevault/trunk/vault-davex</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/jackrabbit/commons/filevault/trunk/vault-davex</developerConnection>
- <url>https://svn.apache.org/viewvc/jackrabbit/commons/filevault/trunk/vault-davex</url>
- </scm>
-
- <!-- ====================================================================== -->
<!-- D E P E N D E N C I E S -->
<!-- ====================================================================== -->
<dependencies>
diff --git a/vault-doc/pom.xml b/vault-doc/pom.xml
index efb5b70..4b73629 100644
--- a/vault-doc/pom.xml
+++ b/vault-doc/pom.xml
@@ -36,16 +36,6 @@
<name>Apache Jackrabbit FileVault Documentation</name>
<!-- ====================================================================== -->
- <!-- S C M D E F I N I T I O N -->
- <!-- ====================================================================== -->
- <scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/jackrabbit/commons/filevault/trunk/vault-doc</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/jackrabbit/commons/filevault/trunk/vault-doc
- </developerConnection>
- <url>https://svn.apache.org/viewvc/jackrabbit/commons/filevault/trunk/vault-doc</url>
- </scm>
-
- <!-- ====================================================================== -->
<!-- B U I L D -->
<!-- ====================================================================== -->
<build>
@@ -115,11 +105,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-project-info-reports-plugin</artifactId>
- <configuration>
- <webAccessUrl>https://svn.apache.org/viewvc/jackrabbit/commons/filevault/trunk</webAccessUrl>
- <anonymousConnection>scm:svn:http://svn.apache.org/repos/asf/jackrabbit/commons/filevault/trunk</anonymousConnection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/jackrabbit/commons/filevault/trunk</developerConnection>
- </configuration>
<reportSets>
<reportSet>
<reports>
diff --git a/vault-doc/src/site/markdown/overview.md b/vault-doc/src/site/markdown/overview.md
index cdf8d30..8ca14fd 100644
--- a/vault-doc/src/site/markdown/overview.md
+++ b/vault-doc/src/site/markdown/overview.md
@@ -24,19 +24,23 @@ Overview
Jackrabbit FileVault introduces a JCR repository to filesystem mapping. The mapping is exposed by an API and used by several tools:
* JackrabbitVaultPackaging that defines a package including the files, configuration and filter information that allows export/import packages of content.
-* Vault Command Line Interface aka `vlt` that provides a subversion like utility to work and develop with repository content.
+* Vault Command Line Interface aka `vlt` that provides a Subversion like utility to work and develop with repository content.
-The base of the Jackrabbit FileVault is the [VautFs](vaultfs.html) which provides the api for accessing repository through a filesystem like mapping.
+The base of the Jackrabbit FileVault is the [VaultFs](vaultfs.html) which provides the API for accessing a repository through a filesystem like mapping.
How it works
------------
-Jackrabbit FileVault works similar to subversion. Usually you checkout a local copy of the (partial) content of the repository and make modifications to it. Once you're finished you upload the modified stuff again. The content is mapped to a local filesystem structure using the JcrFs API. The mechanism works like subversion where you have a copy of the unmodified file and some information about the entries.
+Jackrabbit FileVault works similar to subversion. Usually you checkout a local copy of the (partial) content of the repository and make modifications to it. Once you're finished you upload the modified stuff again. The content is mapped to a local filesystem structure using the VaultFs API. The mechanism works like Subversion where you have a copy of the unmodified file and some information about the entries.
-Subversion & Vault living together
+SCM & FileVault living together
----------------------------------
-One of the goals of Jackrabbit FileVault is to provide the ability to store repository content in a SCM for example in subversion. One problem occurs that the _control files_ of vault are not to be checked into subversion since this could cause problem in concurrent development. Those files are kept in the `.vlt` directory which must be excluded from subversion. Using the `svn:ignore` property is not advisable because one can forget to define it. A better option is to use the `global-ign [...]
+One of the goals of Jackrabbit FileVault is to provide the ability to store repository content in an SCM for example in Subversion. One problem occurs that the _control files_ of FileVault are not to be added to an SCM since this could cause problem in concurrent development. Those files are kept in the `.vlt` directory which must be excluded from being committed.
+
+### Subversion
+
+Using the `svn:ignore` property is not advisable because one can forget to define it. A better option is to use the `global-ignores` option in the subversion user configuration:
...
### Section for configuring miscellaneous Subversion options.
@@ -45,9 +49,10 @@ One of the goals of Jackrabbit FileVault is to provide the ability to store repo
### which Subversion will ignore in its 'status' output, and
### while importing or adding files and directories.
global-ignores = .vlt
+
...
### Use Cases
-The following workflows illustrate that the Vault/Subversion coupling works and could easily be automated. Plans are to propagate additions and removals automatically using javahl or a similar java-svn binding.
+The following workflows illustrate that the FileVault/Subversion coupling works and could easily be automated. Plans are to propagate additions and removals automatically using javahl or a similar java-svn binding.
Imagine the following scenario:
@@ -82,26 +87,19 @@ Imagine the following scenario:
Export/Checkout directory structure
-----------------------------------
-The root directory of a vault checkout contains a `META-INF/vault` directory which holds the serialization configuration (`config.xml`) the filter information (`filter.xml`) and other settings. The repository content is placed in a directory named `jcr_root`. eg:
+The root directory of a FileVault checkout contains a `META-INF/vault` directory which holds the serialization configuration (`config.xml`) the filter information (`filter.xml`) and other settings. The repository content is placed in a directory named `jcr_root`. eg:
+ mycheckeout
+ META-INF
+ jcr_root
-### `META-INF/vault/config.xml`
-Contains the VaultFs configuration that is (was) used for this checkout (export).
-
-### `META-INF/vault/filter.xml`
-Contains the workspace filter that is (was) used for this checkout (export). also see [Workspace Filter](filter.html) for more details.
+All metadata below META-INF is described in [Metadata](metadata.html).
### User specific config files
Some configuration files are stored in the user's home directory. usually under `~/.vault`.
-#### `~/.vault/settings.xml`
-Holds some per user configuration like globally ignored files, etc.
-
-#### `~/.vault/auth.xml`
-Holds authorization information for known repositories.
+1. `~/.vault/settings.xml` - Holds some per user configuration like globally ignored files, etc.
+1. `~/.vault/auth.xml` - Holds authorization information for known repositories.
Usage
-----
diff --git a/vault-hook-example/pom.xml b/vault-hook-example/pom.xml
index 6a17fa7..71be6a8 100644
--- a/vault-hook-example/pom.xml
+++ b/vault-hook-example/pom.xml
@@ -38,14 +38,6 @@
Provides an example of a package install hook
</description>
- <!-- ====================================================================== -->
- <!-- S C M D E F I N I T I O N -->
- <!-- ====================================================================== -->
- <scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/jackrabbit/commons/filevault/trunk/vault-hook-example</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/jackrabbit/commons/filevault/trunk/vault-hook-example</developerConnection>
- <url>https://svn.apache.org/viewvc/jackrabbit/commons/filevault/trunk/vault-hook-example</url>
- </scm>
<!-- ====================================================================== -->
<!-- B U I L D D E F I N I T I O N -->
diff --git a/vault-hook-externalclass-test/pom.xml b/vault-hook-externalclass-test/pom.xml
index a417951..1c4ab38 100644
--- a/vault-hook-externalclass-test/pom.xml
+++ b/vault-hook-externalclass-test/pom.xml
@@ -39,16 +39,6 @@
</description>
<!-- ====================================================================== -->
- <!-- S C M D E F I N I T I O N -->
- <!-- ====================================================================== -->
- <scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/jackrabbit/commons/filevault/trunk/vault-hook-externalclass-test</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/jackrabbit/commons/filevault/trunk/vault-hook-externalclass-test</developerConnection>
- <url>https://svn.apache.org/viewvc/jackrabbit/commons/filevault/trunk/vault-hook-externalclass-test</url>
- </scm>
-
-
- <!-- ====================================================================== -->
<!-- B U I L D D E F I N I T I O N -->
<!-- ====================================================================== -->
<build>
diff --git a/vault-rcp/pom.xml b/vault-rcp/pom.xml
index 46e8eb9..e707d45 100644
--- a/vault-rcp/pom.xml
+++ b/vault-rcp/pom.xml
@@ -42,15 +42,6 @@
</properties>
<!-- ====================================================================== -->
- <!-- S C M D E F I N I T I O N -->
- <!-- ====================================================================== -->
- <scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/jackrabbit/commons/filevault/trunk/vault-rcp</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/jackrabbit/commons/filevault/trunk/vault-rcp</developerConnection>
- <url>https://svn.apache.org/viewvc/jackrabbit/commons/filevault/trunk/vault-rcp</url>
- </scm>
-
- <!-- ====================================================================== -->
<!-- B U I L D -->
<!-- ====================================================================== -->
<build>
diff --git a/vault-sync/pom.xml b/vault-sync/pom.xml
index 523da35..1d80c46 100644
--- a/vault-sync/pom.xml
+++ b/vault-sync/pom.xml
@@ -34,15 +34,6 @@
<name>Apache Jackrabbit FileVault Sync Service</name>
<description>Apache Jackrabbit FileVault supplemental bundle which allows to sync the repository with some folder on the filesystem</description>
- <!-- ====================================================================== -->
- <!-- S C M D E F I N I T I O N -->
- <!-- ====================================================================== -->
- <scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/jackrabbit/commons/filevault/trunk/vault-sync</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/jackrabbit/commons/filevault/trunk/vault-sync</developerConnection>
- <url>https://svn.apache.org/viewvc/jackrabbit/commons/filevault/trunk/vault-sync</url>
- </scm>
-
<properties>
<!-- downgrade dependencies to make compatible with the minimum supported version -->
<jackrabbit.version>2.14.0</jackrabbit.version>
diff --git a/vault-validation/pom.xml b/vault-validation/pom.xml
index 153d1c4..978c57c 100644
--- a/vault-validation/pom.xml
+++ b/vault-validation/pom.xml
@@ -34,15 +34,6 @@
<name>Apache Jackrabbit FileVault Validation</name>
<description>Provides a validation framework with SPI and API for performing validations on FileVault packages</description>
- <!-- ====================================================================== -->
- <!-- S C M D E F I N I T I O N -->
- <!-- ====================================================================== -->
- <scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/jackrabbit/commons/filevault/trunk/vault-validation</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/jackrabbit/commons/filevault/trunk/vault-validation</developerConnection>
- <url>https://svn.apache.org/viewvc/jackrabbit/commons/filevault/trunk/vault-validation</url>
- </scm>
-
<build>
<plugins>
<!-- ====================================================================== -->
diff --git a/vault-vlt/pom.xml b/vault-vlt/pom.xml
index ef52b6c..61b353a 100644
--- a/vault-vlt/pom.xml
+++ b/vault-vlt/pom.xml
@@ -36,16 +36,6 @@
<name>Apache Jackrabbit FileVault Platform Interaction</name>
<!-- ====================================================================== -->
- <!-- S C M D E F I N I T I O N -->
- <!-- ====================================================================== -->
- <scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/jackrabbit/commons/filevault/trunk/vault-vlt</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/jackrabbit/commons/filevault/trunk/vault-vlt</developerConnection>
- <url>https://svn.apache.org/viewvc/jackrabbit/commons/filevault/trunk/vault-vlt</url>
- </scm>
-
-
- <!-- ====================================================================== -->
<!-- D E P E N D E N C I E S -->
<!-- ====================================================================== -->
<dependencies>