You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jackrabbit.apache.org by tr...@apache.org on 2018/08/30 06:35:56 UTC
svn commit: r1839636 - in /jackrabbit/commons/filevault/trunk/vault-core: ./
src/main/java/org/apache/jackrabbit/vault/packaging/registry/
src/main/java/org/apache/jackrabbit/vault/packaging/registry/impl/
src/test/java/org/apache/jackrabbit/vault/pack...
Author: tripod
Date: Thu Aug 30 06:35:55 2018
New Revision: 1839636
URL: http://svn.apache.org/viewvc?rev=1839636&view=rev
Log:
JCRVLT-310 FSRegistry: store package properties in metainfo (closes #34)
Added:
jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/packaging/registry/impl/FsPackageProperties.java
jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/packaging/registry/impl/JcrPackageProperties.java
Modified:
jackrabbit/commons/filevault/trunk/vault-core/pom.xml
jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/packaging/registry/RegisteredPackage.java
jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/packaging/registry/impl/FSInstallState.java
jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/packaging/registry/impl/FSPackageRegistry.java
jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/packaging/registry/impl/FSRegisteredPackage.java
jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/packaging/registry/impl/JcrRegisteredPackage.java
jackrabbit/commons/filevault/trunk/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/TestFSInstallState.java
Modified: jackrabbit/commons/filevault/trunk/vault-core/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault/trunk/vault-core/pom.xml?rev=1839636&r1=1839635&r2=1839636&view=diff
==============================================================================
--- jackrabbit/commons/filevault/trunk/vault-core/pom.xml (original)
+++ jackrabbit/commons/filevault/trunk/vault-core/pom.xml Thu Aug 30 06:35:55 2018
@@ -246,6 +246,18 @@
<version>${oak.version}</version>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.xmlunit</groupId>
+ <artifactId>xmlunit-core</artifactId>
+ <version>2.6.0</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.xmlunit</groupId>
+ <artifactId>xmlunit-matchers</artifactId>
+ <version>2.6.0</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
Modified: jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/packaging/registry/RegisteredPackage.java
URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/packaging/registry/RegisteredPackage.java?rev=1839636&r1=1839635&r2=1839636&view=diff
==============================================================================
--- jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/packaging/registry/RegisteredPackage.java (original)
+++ jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/packaging/registry/RegisteredPackage.java Thu Aug 30 06:35:55 2018
@@ -22,7 +22,10 @@ import java.util.Calendar;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
+import org.apache.jackrabbit.vault.fs.api.WorkspaceFilter;
+import org.apache.jackrabbit.vault.packaging.Dependency;
import org.apache.jackrabbit.vault.packaging.PackageId;
+import org.apache.jackrabbit.vault.packaging.PackageProperties;
import org.apache.jackrabbit.vault.packaging.VaultPackage;
import org.osgi.annotation.versioning.ProviderType;
@@ -48,6 +51,28 @@ public interface RegisteredPackage exten
VaultPackage getPackage() throws IOException;
/**
+ * Returns the dependencies of this package
+ * @return the dependencies of this package.
+ */
+ @Nonnull
+ Dependency[] getDependencies();
+
+ /**
+ * Returns the {@code WorkspaceFilter} of this package
+ * @return {@code WorkspaceFilter} of this package
+ */
+ @Nonnull
+ WorkspaceFilter getWorkspaceFilter();
+
+ /**
+ * Returns the {@code PackageProperties} of this package
+ * @return {@code PackageProperties} of this package
+ * @throws IOException if an I/O error occurs
+ */
+ @Nonnull
+ PackageProperties getPackageProperties() throws IOException;
+
+ /**
* Returns the size of the underlying package.
* @return the size in bytes
*/
Modified: jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/packaging/registry/impl/FSInstallState.java
URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/packaging/registry/impl/FSInstallState.java?rev=1839636&r1=1839635&r2=1839636&view=diff
==============================================================================
--- jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/packaging/registry/impl/FSInstallState.java (original)
+++ jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/packaging/registry/impl/FSInstallState.java Thu Aug 30 06:35:55 2018
@@ -26,6 +26,7 @@ import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Map;
+import java.util.Properties;
import java.util.Set;
import javax.annotation.Nonnull;
@@ -35,14 +36,22 @@ import javax.xml.parsers.DocumentBuilder
import javax.xml.parsers.ParserConfigurationException;
import org.apache.commons.io.FileUtils;
+import org.apache.jackrabbit.vault.fs.api.FilterSet.Entry;
+import org.apache.jackrabbit.vault.fs.api.PathFilter;
+import org.apache.jackrabbit.vault.fs.api.PathFilterSet;
+import org.apache.jackrabbit.vault.fs.api.WorkspaceFilter;
+import org.apache.jackrabbit.vault.fs.config.DefaultWorkspaceFilter;
+import org.apache.jackrabbit.vault.fs.filter.DefaultPathFilter;
import org.apache.jackrabbit.vault.packaging.Dependency;
import org.apache.jackrabbit.vault.packaging.PackageId;
import org.apache.jackrabbit.vault.packaging.SubPackageHandling;
import org.apache.jackrabbit.vault.util.RejectingEntityResolver;
import org.apache.jackrabbit.vault.util.xml.serialize.OutputFormat;
import org.apache.jackrabbit.vault.util.xml.serialize.XMLSerializer;
+import org.w3c.dom.Attr;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
+import org.w3c.dom.NamedNodeMap;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
import org.xml.sax.SAXException;
@@ -63,6 +72,8 @@ public class FSInstallState {
private static final String ATTR_EXTERNAL = "external";
+ private static final String ATTR_SIZE = "size";
+
private static final String TAG_DEPENDENCY = "dependency";
private static final String TAG_SUBPACKAGE = "subpackage";
@@ -71,6 +82,20 @@ public class FSInstallState {
private static final String ATTR_SUBPACKAGE_HANDLING_OPTION = "sphoption";
+ private static final String TAG_FILTER = "filter";
+
+ private static final String TAG_WORKSPACEFILTER = "workspacefilter";
+
+ private static final String ATTR_ROOT = "root";
+
+ private static final String TAG_RULE = "rule";
+
+ private static final String ATTR_INCLUDE = "include";
+
+ private static final String ATTR_EXCLUDE = "exclude";
+
+ private static final String TAG_PACKAGEPROPERTIES = "packageproperties";
+
private final PackageId packageId;
private final FSPackageStatus status;
private Path filePath;
@@ -78,6 +103,9 @@ public class FSInstallState {
private Set<Dependency> dependencies = Collections.emptySet();
private Map<PackageId, SubPackageHandling.Option> subPackages = Collections.emptyMap();
private Long installTime;
+ private long size = 0;
+ private WorkspaceFilter filter;
+ private Properties properties = new Properties();
public FSInstallState(@Nonnull PackageId pid, @Nonnull FSPackageStatus status) {
this.packageId = pid;
@@ -113,6 +141,21 @@ public class FSInstallState {
return this;
}
+ public FSInstallState withSize(long size) {
+ this.size = size;
+ return this;
+ }
+
+ public FSInstallState withFilter(WorkspaceFilter filter) {
+ this.filter = filter;
+ return this;
+ }
+
+ public FSInstallState withProperties(Properties properties) {
+ this.properties = properties;
+ return this;
+ }
+
/**
* Parses {@code InstallState} from metafile.
*
@@ -159,10 +202,16 @@ public class FSInstallState {
installTime = Long.valueOf(doc.getAttribute(ATTR_INSTALLATION_TIME));
}
boolean external = Boolean.parseBoolean(doc.getAttribute(ATTR_EXTERNAL));
+ long size = 0;
+ if (doc.hasAttribute(ATTR_SIZE)) {
+ size = Long.valueOf(doc.getAttribute(ATTR_SIZE));
+ }
FSPackageStatus status = FSPackageStatus.valueOf(doc.getAttribute(ATTR_PACKAGE_STATUS).toUpperCase());
NodeList nl = doc.getChildNodes();
Set<Dependency> dependencies = new HashSet<>();
Map<PackageId, SubPackageHandling.Option> subPackages = new HashMap<>();
+ WorkspaceFilter filter = null;
+ Properties properties = new Properties();
for (int i = 0; i < nl.getLength(); i++) {
Node child = nl.item(i);
if (child.getNodeType() == Node.ELEMENT_NODE) {
@@ -171,16 +220,24 @@ public class FSInstallState {
dependencies.add(readDependency((Element) child));
} else if (TAG_SUBPACKAGE.equals(childName)) {
subPackages.put(readPackageId((Element) child), readSubPackgeHandlingOption((Element) child));
+ } else if (TAG_WORKSPACEFILTER.equals(childName)) {
+ filter = readWorkspaceFilter((Element) child);
+ } else if (TAG_PACKAGEPROPERTIES.equals(childName)) {
+ properties = readProperties((Element) child);
} else {
- throw new IOException("<" + TAG_DEPENDENCY + "> or <" + TAG_SUBPACKAGE + "> expected.");
+ throw new IOException("<" + TAG_DEPENDENCY + "> or <" + TAG_SUBPACKAGE + "> or <" + TAG_WORKSPACEFILTER + "> expected.");
}
}
+
}
return new FSInstallState(PackageId.fromString(packageId), status)
.withFilePath(filePath)
.withExternal(external)
+ .withSize(size)
+ .withFilter(filter)
.withDependencies(dependencies)
.withSubPackages(subPackages)
+ .withProperties(properties)
.withInstallTime(installTime);
} catch (ParserConfigurationException e) {
throw new IOException("Unable to create configuration XML parser", e);
@@ -189,6 +246,16 @@ public class FSInstallState {
}
}
+ private static Properties readProperties(Element child) {
+ Properties properties = new Properties();
+ NamedNodeMap attributes = child.getAttributes();
+ for (int i = 0; i < attributes.getLength(); i++) {
+ Attr attr = (Attr) attributes.item(i);
+ properties.put(attr.getNodeName(), attr.getNodeValue());
+ }
+ return properties;
+ }
+
private static Dependency readDependency(Element child) {
return Dependency.fromString(child.getAttribute(ATTR_PACKAGE_ID));
}
@@ -196,14 +263,41 @@ public class FSInstallState {
private static SubPackageHandling.Option readSubPackgeHandlingOption(Element child) {
return SubPackageHandling.Option.valueOf(child.getAttribute(ATTR_SUBPACKAGE_HANDLING_OPTION));
}
-
+
private static PackageId readPackageId(Element child) {
return PackageId.fromString(child.getAttribute(ATTR_PACKAGE_ID));
}
+ private static WorkspaceFilter readWorkspaceFilter(Element child) {
+ DefaultWorkspaceFilter wsfilter = new DefaultWorkspaceFilter();
+ NodeList nl = child.getChildNodes();
+ for (int i = 0; i < nl.getLength(); i++) {
+ Node filter = nl.item(i);
+ if (filter.getNodeType() == Node.ELEMENT_NODE) {
+ PathFilterSet pfs = new PathFilterSet(((Element) filter).getAttribute(ATTR_ROOT));
+ NodeList nlf = filter.getChildNodes();
+ for (int j = 0; j < nlf.getLength(); j++) {
+ Node rule = nlf.item(j);
+ if (rule.getNodeType() == Node.ELEMENT_NODE) {
+ if (((Element) rule).hasAttribute(ATTR_INCLUDE)) {
+ DefaultPathFilter pf = new DefaultPathFilter(((Element) rule).getAttribute(ATTR_INCLUDE));
+ pfs.addInclude(pf);
+ } else if (((Element) rule).hasAttribute(ATTR_EXCLUDE)) {
+ DefaultPathFilter pf = new DefaultPathFilter(((Element) rule).getAttribute(ATTR_INCLUDE));
+ pfs.addExclude(pf);
+ }
+ }
+ }
+ wsfilter.add(pfs);
+ }
+ }
+ return wsfilter;
+ }
+
/**
* Persists the installState to a metadatafile
+ *
* @param file The files to save the state to
* @throws IOException if an error occurs.
*/
@@ -215,6 +309,7 @@ public class FSInstallState {
/**
* Persists the installState to a metadatafile
+ *
* @param out Outputsteam to write to.
* @throws IOException if an error occurs.
*/
@@ -224,6 +319,7 @@ public class FSInstallState {
ser.startDocument();
AttributesImpl attrs = new AttributesImpl();
attrs.addAttribute(null, null, ATTR_PACKAGE_ID, "CDATA", packageId.toString());
+ attrs.addAttribute(null, null, ATTR_SIZE, "CDATA", Long.toString(size));
if (installTime != null) {
attrs.addAttribute(null, null, ATTR_INSTALLATION_TIME, "CDATA", Long.toString(installTime));
}
@@ -231,6 +327,28 @@ public class FSInstallState {
attrs.addAttribute(null, null, ATTR_EXTERNAL, "CDATA", Boolean.toString(external));
attrs.addAttribute(null, null, ATTR_PACKAGE_STATUS, "CDATA", status.name().toLowerCase());
ser.startElement(null, null, TAG_REGISTRY_METADATA, attrs);
+
+ if (filter != null && !filter.getFilterSets().isEmpty()) {
+ ser.startElement(null, null, TAG_WORKSPACEFILTER, null);
+ for (PathFilterSet pfs : filter.getFilterSets()) {
+ attrs = new AttributesImpl();
+ attrs.addAttribute(null, null, ATTR_ROOT, "CDATA", pfs.getRoot());
+ ser.startElement(null, null, TAG_FILTER, attrs);
+ for (Entry<PathFilter> pf : pfs.getEntries()) {
+ attrs = new AttributesImpl();
+ DefaultPathFilter dpf = (DefaultPathFilter) pf.getFilter();
+ if (pf.isInclude()) {
+ attrs.addAttribute(null, null, ATTR_INCLUDE, "CDATA", dpf.getPattern());
+ } else {
+ attrs.addAttribute(null, null, ATTR_EXCLUDE, "CDATA", dpf.getPattern());
+ }
+ ser.startElement(null, null, TAG_RULE, attrs);
+ ser.endElement(TAG_RULE);
+ }
+ ser.endElement(TAG_FILTER);
+ }
+ ser.endElement(TAG_WORKSPACEFILTER);
+ }
if (dependencies != null) {
for (Dependency dependency : dependencies) {
attrs = new AttributesImpl();
@@ -248,6 +366,14 @@ public class FSInstallState {
ser.endElement(TAG_SUBPACKAGE);
}
}
+ attrs = new AttributesImpl();
+ for (String key : properties.stringPropertyNames()) {
+ attrs.addAttribute(null, null, key, "CDATA", properties.getProperty(key));
+ }
+ if (attrs.getLength() > 0) {
+ ser.startElement(null, null, TAG_PACKAGEPROPERTIES, attrs);
+ ser.endElement(TAG_PACKAGEPROPERTIES);
+ }
ser.endElement(TAG_REGISTRY_METADATA);
ser.endDocument();
} catch (SAXException e) {
@@ -282,4 +408,16 @@ public class FSInstallState {
public Set<Dependency> getDependencies() {
return dependencies;
}
+
+ public long getSize() {
+ return size;
+ }
+
+ public WorkspaceFilter getFilter() {
+ return filter;
+ }
+
+ public Properties getProperties() {
+ return properties;
+ }
}
\ No newline at end of file
Modified: jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/packaging/registry/impl/FSPackageRegistry.java
URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/packaging/registry/impl/FSPackageRegistry.java?rev=1839636&r1=1839635&r2=1839636&view=diff
==============================================================================
--- jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/packaging/registry/impl/FSPackageRegistry.java (original)
+++ jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/packaging/registry/impl/FSPackageRegistry.java Thu Aug 30 06:35:55 2018
@@ -335,6 +335,9 @@ public class FSPackageRegistry extends A
.withFilePath(pkgFile.toPath())
.withDependencies(dependencies)
.withSubPackages(subpackages)
+ .withFilter(pkg.getArchive().getMetaInf().getFilter())
+ .withSize(pkg.getSize())
+ .withProperties(pkg.getArchive().getMetaInf().getProperties())
.withExternal(false);
setInstallState(state);
return pkg.getId();
@@ -500,6 +503,9 @@ public class FSPackageRegistry extends A
.withFilePath(pkgFile.toPath())
.withDependencies(dependencies)
.withSubPackages(subpackages)
+ .withFilter(pack.getArchive().getMetaInf().getFilter())
+ .withSize(pack.getSize())
+ .withProperties(pack.getArchive().getMetaInf().getProperties())
.withExternal(false);
setInstallState(state);
return pack.getId();
@@ -537,6 +543,9 @@ public class FSPackageRegistry extends A
.withFilePath(file.toPath())
.withDependencies(dependencies)
.withSubPackages(subpackages)
+ .withFilter(pack.getArchive().getMetaInf().getFilter())
+ .withSize(pack.getSize())
+ .withProperties(pack.getArchive().getMetaInf().getProperties())
.withExternal(true);
setInstallState(targetState);
return pack.getId();
@@ -668,6 +677,8 @@ public class FSPackageRegistry extends A
.withDependencies(state.getDependencies())
.withSubPackages(state.getSubPackages())
.withInstallTime(installTime)
+ .withSize(state.getSize())
+ .withProperties(state.getProperties())
.withExternal(state.isExternal());
setInstallState(targetState);
}
Modified: jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/packaging/registry/impl/FSRegisteredPackage.java
URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/packaging/registry/impl/FSRegisteredPackage.java?rev=1839636&r1=1839635&r2=1839636&view=diff
==============================================================================
--- jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/packaging/registry/impl/FSRegisteredPackage.java (original)
+++ jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/packaging/registry/impl/FSRegisteredPackage.java Thu Aug 30 06:35:55 2018
@@ -22,9 +22,11 @@ import java.util.Calendar;
import javax.annotation.CheckForNull;
import javax.annotation.Nonnull;
-import javax.jcr.RepositoryException;
+import org.apache.jackrabbit.vault.fs.api.WorkspaceFilter;
+import org.apache.jackrabbit.vault.packaging.Dependency;
import org.apache.jackrabbit.vault.packaging.PackageId;
+import org.apache.jackrabbit.vault.packaging.PackageProperties;
import org.apache.jackrabbit.vault.packaging.VaultPackage;
import org.apache.jackrabbit.vault.packaging.registry.RegisteredPackage;
import org.slf4j.Logger;
@@ -40,18 +42,25 @@ public class FSRegisteredPackage impleme
*/
private static final Logger log = LoggerFactory.getLogger(FSPackageRegistry.class);
- private final FSPackageRegistry registry;
+ private FSPackageRegistry registry;
- private final PackageId id;
+ private VaultPackage vltPkg = null;
- private final Path filepath;
-
- private VaultPackage vltPkg;
+ private PackageId id;
+ private Path filepath;
+ private PackageProperties packageProperties;
+ private Dependency[] dependencies;
+ private WorkspaceFilter filter;
+ private long size;
public FSRegisteredPackage(FSPackageRegistry registry, FSInstallState installState) throws IOException {
this.id = installState.getPackageId();
this.filepath = installState.getFilePath();
+ this.dependencies = installState.getDependencies().toArray(new Dependency[installState.getDependencies().size()]);
+ this.filter = installState.getFilter();
+ this.packageProperties = new FsPackageProperties(installState);
this.registry = registry;
+ this.size = installState.getSize();
}
@Nonnull
@@ -71,17 +80,17 @@ public class FSRegisteredPackage impleme
@Override
public boolean isInstalled() {
- try {
- return registry.isInstalled(getId());
- } catch (IOException e) {
- log.error("Packagestate couldn't be read for package {}", getId().toString(), e);
- return false;
- }
+ try {
+ return registry.isInstalled(getId());
+ } catch (IOException e) {
+ log.error("Packagestate couldn't be read for package {}", getId().toString(), e);
+ return false;
+ }
}
@Override
public long getSize() {
- return vltPkg.getSize();
+ return size;
}
@CheckForNull
@@ -93,7 +102,7 @@ public class FSRegisteredPackage impleme
installTime = registry.getInstallState(getId()).getInstallationTime();
if (installTime == null) {
cal = null;
- } else{
+ } else {
cal.setTimeInMillis(installTime);
}
} catch (IOException e) {
@@ -115,4 +124,19 @@ public class FSRegisteredPackage impleme
public int compareTo(RegisteredPackage o) {
return getId().compareTo(o.getId());
}
+
+ @Override
+ public Dependency[] getDependencies() {
+ return this.dependencies;
+ }
+
+ @Override
+ public WorkspaceFilter getWorkspaceFilter() {
+ return this.filter;
+ }
+
+ @Override
+ public PackageProperties getPackageProperties() throws IOException {
+ return this.packageProperties;
+ }
}
\ No newline at end of file
Added: jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/packaging/registry/impl/FsPackageProperties.java
URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/packaging/registry/impl/FsPackageProperties.java?rev=1839636&view=auto
==============================================================================
--- jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/packaging/registry/impl/FsPackageProperties.java (added)
+++ jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/packaging/registry/impl/FsPackageProperties.java Thu Aug 30 06:35:55 2018
@@ -0,0 +1,51 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.jackrabbit.vault.packaging.registry.impl;
+
+import java.util.Properties;
+
+import org.apache.jackrabbit.vault.packaging.Dependency;
+import org.apache.jackrabbit.vault.packaging.PackageId;
+import org.apache.jackrabbit.vault.packaging.impl.PackagePropertiesImpl;
+
+public class FsPackageProperties extends PackagePropertiesImpl {
+
+ private final FSInstallState installState;
+
+ public FsPackageProperties(FSInstallState installState) {
+ this.installState = installState;
+ }
+
+ @Override
+ public PackageId getId() {
+ return installState.getPackageId();
+ }
+
+ @Override
+ public Dependency[] getDependencies() {
+ if(installState.getDependencies() == null || installState.getDependencies().isEmpty()) {
+ return Dependency.EMPTY;
+ } else {
+ return installState.getDependencies().toArray(new Dependency[installState.getDependencies().size()]);
+ }
+ }
+
+ @Override
+ protected Properties getPropertiesMap() {
+ return installState.getProperties();
+ }
+}
Added: jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/packaging/registry/impl/JcrPackageProperties.java
URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/packaging/registry/impl/JcrPackageProperties.java?rev=1839636&view=auto
==============================================================================
--- jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/packaging/registry/impl/JcrPackageProperties.java (added)
+++ jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/packaging/registry/impl/JcrPackageProperties.java Thu Aug 30 06:35:55 2018
@@ -0,0 +1,44 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.jackrabbit.vault.packaging.registry.impl;
+
+import java.io.IOException;
+import java.util.Properties;
+
+import javax.jcr.RepositoryException;
+
+import org.apache.jackrabbit.vault.packaging.JcrPackage;
+import org.apache.jackrabbit.vault.packaging.impl.PackagePropertiesImpl;
+
+public class JcrPackageProperties extends PackagePropertiesImpl {
+
+ private JcrPackage pkg;
+
+ public JcrPackageProperties(JcrPackage pkg) {
+ this.pkg = pkg;
+ }
+
+ @Override
+ protected Properties getPropertiesMap() {
+ try {
+ return pkg.getPackage().getMetaInf().getProperties();
+ } catch (RepositoryException|IOException e) {
+ throw new IllegalStateException(e);
+ }
+ }
+
+}
Modified: jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/packaging/registry/impl/JcrRegisteredPackage.java
URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/packaging/registry/impl/JcrRegisteredPackage.java?rev=1839636&r1=1839635&r2=1839636&view=diff
==============================================================================
--- jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/packaging/registry/impl/JcrRegisteredPackage.java (original)
+++ jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/packaging/registry/impl/JcrRegisteredPackage.java Thu Aug 30 06:35:55 2018
@@ -23,10 +23,14 @@ import javax.annotation.CheckForNull;
import javax.annotation.Nonnull;
import javax.jcr.RepositoryException;
+import org.apache.jackrabbit.vault.fs.api.WorkspaceFilter;
+import org.apache.jackrabbit.vault.packaging.Dependency;
import org.apache.jackrabbit.vault.packaging.JcrPackage;
import org.apache.jackrabbit.vault.packaging.JcrPackageDefinition;
import org.apache.jackrabbit.vault.packaging.PackageId;
+import org.apache.jackrabbit.vault.packaging.PackageProperties;
import org.apache.jackrabbit.vault.packaging.VaultPackage;
+import org.apache.jackrabbit.vault.packaging.impl.JcrWorkspaceFilter;
import org.apache.jackrabbit.vault.packaging.registry.RegisteredPackage;
/**
@@ -96,4 +100,24 @@ public class JcrRegisteredPackage implem
public int compareTo(RegisteredPackage o) {
return getId().compareTo(o.getId());
}
+
+ @Override
+ public Dependency[] getDependencies() {
+ return vltPkg.getDependencies();
+ }
+
+ @Override
+ public WorkspaceFilter getWorkspaceFilter() {
+ // TODO Auto-generated method stub
+ try {
+ return JcrWorkspaceFilter.loadFilter(pkg.getDefNode());
+ } catch (RepositoryException e) {
+ throw new IllegalStateException(e);
+ }
+ }
+
+ @Override
+ public PackageProperties getPackageProperties() throws IOException {
+ return getPackage().getProperties();
+ }
}
\ No newline at end of file
Modified: jackrabbit/commons/filevault/trunk/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/TestFSInstallState.java
URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault/trunk/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/TestFSInstallState.java?rev=1839636&r1=1839635&r2=1839636&view=diff
==============================================================================
--- jackrabbit/commons/filevault/trunk/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/TestFSInstallState.java (original)
+++ jackrabbit/commons/filevault/trunk/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/TestFSInstallState.java Thu Aug 30 06:35:55 2018
@@ -33,8 +33,10 @@ import org.apache.jackrabbit.vault.packa
import org.apache.jackrabbit.vault.packaging.registry.impl.FSInstallState;
import org.apache.jackrabbit.vault.packaging.registry.impl.FSPackageStatus;
import org.junit.Test;
+import org.xmlunit.matchers.CompareMatcher;
import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertThat;
/**
* Test the Package registry interface
@@ -44,8 +46,8 @@ public class TestFSInstallState {
private static final PackageId TMP_PACKAGE_ID = new PackageId("my_packages", "tmp", "");
private static final String TEST_XML = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" +
- "<registryMetadata packageid=\"my_packages:tmp\" installtime=\"1234\"\n" +
- " filepath=\"test.zip\" external=\"true\" packagestatus=\"extracted\">\n" +
+ "<registryMetadata packageid=\"my_packages:tmp\" size=\"1234\"\n" +
+ " installtime=\"1234\" filepath=\"test.zip\" external=\"true\" packagestatus=\"extracted\">\n" +
" <dependency packageid=\"my_packages:tmp\"/>\n" +
" <subpackage packageid=\"my_packages:tmp\" sphoption=\"ADD\"/>\n" +
"</registryMetadata>\n";
@@ -63,11 +65,13 @@ public class TestFSInstallState {
.withExternal(true)
.withDependencies(deps)
.withSubPackages(subs)
+ .withSize(1234L)
.withInstallTime(1234L);
ByteArrayOutputStream out = new ByteArrayOutputStream();
state.save(out);
out.close();
+ assertThat(out.toString("utf-8"), CompareMatcher.isIdenticalTo(TEST_XML));
assertEquals(TEST_XML, out.toString("utf-8"));
}
@@ -89,6 +93,8 @@ public class TestFSInstallState {
assertEquals(true, state.isExternal());
assertEquals(deps, state.getDependencies());
assertEquals(subs, state.getSubPackages());
+ assertEquals(subs, state.getSubPackages());
+ assertEquals(1234L, state.getSize());
assertEquals((Long) 1234L, state.getInstallationTime());
}