You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jackrabbit.apache.org by re...@apache.org on 2023/02/21 15:28:55 UTC
[jackrabbit-filevault] branch JCRVLT-688 updated: JCRVLT-688: work in progress
This is an automated email from the ASF dual-hosted git repository.
reschke pushed a commit to branch JCRVLT-688
in repository https://gitbox.apache.org/repos/asf/jackrabbit-filevault.git
The following commit(s) were added to refs/heads/JCRVLT-688 by this push:
new 3109475d JCRVLT-688: work in progress
3109475d is described below
commit 3109475da958b898f817b855a1d8c0d1231f92ad
Author: Julian Reschke <ju...@gmx.de>
AuthorDate: Tue Feb 21 16:25:15 2023 +0100
JCRVLT-688: work in progress
---
.../main/java/org/apache/jackrabbit/vault/fs/config/MetaInf.java | 7 ++++++-
.../java/org/apache/jackrabbit/vault/fs/config/package-info.java | 2 +-
.../java/org/apache/jackrabbit/vault/fs/io/AbstractExporter.java | 1 +
.../org/apache/jackrabbit/vault/packaging/PackageProperties.java | 5 +++++
.../jackrabbit/vault/packaging/impl/JcrPackageDefinitionImpl.java | 2 +-
.../java/org/apache/jackrabbit/vault/packaging/package-info.java | 2 +-
6 files changed, 15 insertions(+), 4 deletions(-)
diff --git a/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/config/MetaInf.java b/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/config/MetaInf.java
index dbac756e..9bcc2097 100644
--- a/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/config/MetaInf.java
+++ b/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/config/MetaInf.java
@@ -63,7 +63,12 @@ public interface MetaInf {
* Name of the 'created by' property
*/
String CREATED_BY = "createdBy";
-
+
+ /**
+ * Name of the 'created' property
+ */
+ String GENERATOR = "generator";
+
/**
* Returns the package format version of this package. If the package
* lacks this information, {@link #FORMAT_VERSION_2} is returned, since this
diff --git a/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/config/package-info.java b/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/config/package-info.java
index 3339b772..5bcd0fc3 100644
--- a/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/config/package-info.java
+++ b/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/config/package-info.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-@Version("2.7.0")
+@Version("2.8.0")
package org.apache.jackrabbit.vault.fs.config;
import org.osgi.annotation.versioning.Version;
diff --git a/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/io/AbstractExporter.java b/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/io/AbstractExporter.java
index 48f89d43..8110025c 100644
--- a/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/io/AbstractExporter.java
+++ b/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/io/AbstractExporter.java
@@ -201,6 +201,7 @@ public abstract class AbstractExporter implements AutoCloseable {
// update properties
setProperty(MetaInf.CREATED, Calendar.getInstance());
setProperty(MetaInf.CREATED_BY, mgr.getUserId());
+ setProperty(MetaInf.GENERATOR, "foobar");
setProperty(MetaInf.PACKAGE_FORMAT_VERSION, String.valueOf(MetaInf.FORMAT_VERSION_2));
// get filter and translate if necessary
diff --git a/vault-core/src/main/java/org/apache/jackrabbit/vault/packaging/PackageProperties.java b/vault-core/src/main/java/org/apache/jackrabbit/vault/packaging/PackageProperties.java
index 065efc6d..672ab41f 100644
--- a/vault-core/src/main/java/org/apache/jackrabbit/vault/packaging/PackageProperties.java
+++ b/vault-core/src/main/java/org/apache/jackrabbit/vault/packaging/PackageProperties.java
@@ -90,6 +90,11 @@ public interface PackageProperties {
*/
String NAME_CREATED_BY = "createdBy";
+ /**
+ * Name of the 'generator' meta-inf property
+ */
+ String NAME_GENERATOR = "generator";
+
/**
* Name of the last wrapped meta-inf property
* @since 2.2.22
diff --git a/vault-core/src/main/java/org/apache/jackrabbit/vault/packaging/impl/JcrPackageDefinitionImpl.java b/vault-core/src/main/java/org/apache/jackrabbit/vault/packaging/impl/JcrPackageDefinitionImpl.java
index 656685fd..8c8009db 100644
--- a/vault-core/src/main/java/org/apache/jackrabbit/vault/packaging/impl/JcrPackageDefinitionImpl.java
+++ b/vault-core/src/main/java/org/apache/jackrabbit/vault/packaging/impl/JcrPackageDefinitionImpl.java
@@ -83,7 +83,6 @@ public class JcrPackageDefinitionImpl implements JcrPackageDefinition {
@Nullable
private String userId;
-
/**
* Creates a new definition base on the underlying node.
* @param definitionNode the definition node
@@ -751,6 +750,7 @@ public class JcrPackageDefinitionImpl implements JcrPackageDefinition {
setProperty(props, VaultPackage.NAME_LAST_WRAPPED_BY, get(PN_LAST_WRAPPED_BY));
setProperty(props, VaultPackage.NAME_CREATED, getCalendar(PN_CREATED));
setProperty(props, VaultPackage.NAME_CREATED_BY, get(PN_CREATED_BY));
+ setProperty(props, VaultPackage.NAME_GENERATOR, "qux");
setProperty(props, VaultPackage.NAME_DEPENDENCIES, Dependency.toString(getDependencies()));
setProperty(props, VaultPackage.NAME_AC_HANDLING, get(PN_AC_HANDLING));
setProperty(props, VaultPackage.NAME_CND_PATTERN, get(PN_CND_PATTERN));
diff --git a/vault-core/src/main/java/org/apache/jackrabbit/vault/packaging/package-info.java b/vault-core/src/main/java/org/apache/jackrabbit/vault/packaging/package-info.java
index 87722e1a..aa1413be 100644
--- a/vault-core/src/main/java/org/apache/jackrabbit/vault/packaging/package-info.java
+++ b/vault-core/src/main/java/org/apache/jackrabbit/vault/packaging/package-info.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-@Version("2.14.1")
+@Version("2.15.0")
package org.apache.jackrabbit.vault.packaging;
import org.osgi.annotation.versioning.Version;