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/01/09 16:53:40 UTC
svn commit: r1872562 - in
/jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault:
fs/api/ fs/config/ packaging/ packaging/registry/ util/ util/xml/
util/xml/serialize/
Author: kwin
Date: Thu Jan 9 16:53:40 2020
New Revision: 1872562
URL: http://svn.apache.org/viewvc?rev=1872562&view=rev
Log:
JCRVLT-391 restore backwards compatibility by readding old write method
signatures (throwing UOE)
fix package versions
Modified:
jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/api/WorkspaceFilter.java
jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/api/package-info.java
jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/config/AbstractConfig.java
jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/config/CredentialsConfig.java
jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/config/MetaInf.java
jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/config/SimpleCredentialsConfig.java
jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/config/VaultAuthConfig.java
jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/config/VaultSettings.java
jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/config/package-info.java
jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/packaging/package-info.java
jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/packaging/registry/package-info.java
jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/util/ItemNameComparator.java
jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/util/package-info.java
jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/util/xml/package-info.java
jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/util/xml/serialize/package-info.java
Modified: jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/api/WorkspaceFilter.java
URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/api/WorkspaceFilter.java?rev=1872562&r1=1872561&r2=1872562&view=diff
==============================================================================
--- jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/api/WorkspaceFilter.java (original)
+++ jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/api/WorkspaceFilter.java Thu Jan 9 16:53:40 2020
@@ -26,10 +26,12 @@ import javax.jcr.Session;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
+import org.osgi.annotation.versioning.ProviderType;
/**
* {@code WorkspaceFilter} defined a filter for items (node or property).
*/
+@ProviderType
public interface WorkspaceFilter extends Dumpable {
/**
Modified: jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/api/package-info.java
URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/api/package-info.java?rev=1872562&r1=1872561&r2=1872562&view=diff
==============================================================================
--- jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/api/package-info.java (original)
+++ jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/api/package-info.java Thu Jan 9 16:53:40 2020
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-@Version("2.7.1")
+@Version("2.7.0")
package org.apache.jackrabbit.vault.fs.api;
import org.osgi.annotation.versioning.Version;
Modified: jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/config/AbstractConfig.java
URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/config/AbstractConfig.java?rev=1872562&r1=1872561&r2=1872562&view=diff
==============================================================================
--- jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/config/AbstractConfig.java (original)
+++ jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/config/AbstractConfig.java Thu Jan 9 16:53:40 2020
@@ -32,18 +32,21 @@ import org.apache.commons.io.FileUtils;
import org.apache.jackrabbit.vault.util.RejectingEntityResolver;
import org.apache.jackrabbit.vault.util.xml.serialize.FormattingXmlStreamWriter;
import org.apache.jackrabbit.vault.util.xml.serialize.OutputFormat;
+import org.osgi.annotation.versioning.ProviderType;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
+import org.xml.sax.ContentHandler;
import org.xml.sax.SAXException;
/**
* {@code VaultUserConfig}...
*
*/
+@ProviderType
abstract public class AbstractConfig {
protected static Logger log = LoggerFactory.getLogger(AbstractConfig.class);
@@ -143,6 +146,13 @@ abstract public class AbstractConfig {
return configDir;
}
+ @Deprecated
+ protected void write(ContentHandler handler) throws SAXException {
+ throw new UnsupportedOperationException("No longer supports write with a SAX contentHandler, user write with XMLStreamWriter instead!");
+ }
+
+ abstract protected void doWrite(ContentHandler handler) throws SAXException;
+
protected void write(XMLStreamWriter writer) throws XMLStreamException {
writer.writeStartDocument();
writer.writeStartElement(getRootElemName());
Modified: jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/config/CredentialsConfig.java
URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/config/CredentialsConfig.java?rev=1872562&r1=1872561&r2=1872562&view=diff
==============================================================================
--- jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/config/CredentialsConfig.java (original)
+++ jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/config/CredentialsConfig.java Thu Jan 9 16:53:40 2020
@@ -24,7 +24,6 @@ import javax.xml.stream.XMLStreamWriter;
import org.w3c.dom.Element;
import org.xml.sax.ContentHandler;
import org.xml.sax.SAXException;
-import org.xml.sax.helpers.AttributesImpl;
/**
* {@code CredentialsConfig}...
@@ -52,6 +51,13 @@ public abstract class CredentialsConfig
public abstract Credentials getCredentials();
+ @Deprecated
+ public void write(ContentHandler handler) throws SAXException {
+ throw new UnsupportedOperationException("No longer supports write with a SAX contentHandler, user write with XMLStreamWriter instead!");
+ }
+
+ protected abstract void writeInner(ContentHandler handler) throws SAXException;
+
public void write(XMLStreamWriter writer) throws XMLStreamException {
writer.writeStartElement(ELEM_CREDETIALS);
writer.writeAttribute(ATTR_TYPE, type);
Modified: jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/config/MetaInf.java
URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/config/MetaInf.java?rev=1872562&r1=1872561&r2=1872562&view=diff
==============================================================================
--- jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/config/MetaInf.java (original)
+++ jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/config/MetaInf.java Thu Jan 9 16:53:40 2020
@@ -27,11 +27,13 @@ import org.apache.jackrabbit.vault.fs.sp
import org.apache.jackrabbit.vault.packaging.PackageProperties;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
+import org.osgi.annotation.versioning.ProviderType;
/**
* Abstracts the way of accessing the vault specific meta-info of a checkout.
* TODO: merge with packageInfo
*/
+@ProviderType
public interface MetaInf {
/**
Modified: jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/config/SimpleCredentialsConfig.java
URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/config/SimpleCredentialsConfig.java?rev=1872562&r1=1872561&r2=1872562&view=diff
==============================================================================
--- jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/config/SimpleCredentialsConfig.java (original)
+++ jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/config/SimpleCredentialsConfig.java Thu Jan 9 16:53:40 2020
@@ -36,7 +36,6 @@ import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
import org.xml.sax.ContentHandler;
import org.xml.sax.SAXException;
-import org.xml.sax.helpers.AttributesImpl;
/**
* {@code SimpleCredentialsConfig}...
@@ -94,6 +93,12 @@ public class SimpleCredentialsConfig ext
throw new ConfigurationException("mandatory element <user> missing.");
}
+ @Deprecated
+ public void writeInner(ContentHandler handler) throws SAXException {
+ throw new UnsupportedOperationException("No longer supports write with a SAX contentHandler, user write with XMLStreamWriter instead!");
+ }
+
+
@Override
protected void writeInner(XMLStreamWriter writer) throws XMLStreamException {
if (creds != null) {
Modified: jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/config/VaultAuthConfig.java
URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/config/VaultAuthConfig.java?rev=1872562&r1=1872561&r2=1872562&view=diff
==============================================================================
--- jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/config/VaultAuthConfig.java (original)
+++ jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/config/VaultAuthConfig.java Thu Jan 9 16:53:40 2020
@@ -74,6 +74,11 @@ public class VaultAuthConfig extends Abs
repoConfigs.put(cfg.uri, cfg);
}
+ @Deprecated
+ protected void doWrite(ContentHandler handler) throws SAXException {
+ throw new UnsupportedOperationException("No longer supports write with a SAX contentHandler, user write with XMLStreamWriter instead!");
+ }
+
protected void doWrite(XMLStreamWriter writer) throws XMLStreamException {
for (RepositoryConfig cfg: repoConfigs.values()) {
cfg.write(writer);
@@ -135,6 +140,11 @@ public class VaultAuthConfig extends Abs
return cfg;
}
+ @Deprecated
+ public void write(ContentHandler contentHandler) throws XMLStreamException {
+ throw new UnsupportedOperationException("No longer supports write with a SAX contentHandler, user write with XMLStreamWriter instead!");
+ }
+
public void write(XMLStreamWriter writer) throws XMLStreamException {
writer.writeStartElement(ELEM_REPOSITORY);
writer.writeAttribute(ATTR_URI, uri);
Modified: jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/config/VaultSettings.java
URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/config/VaultSettings.java?rev=1872562&r1=1872561&r2=1872562&view=diff
==============================================================================
--- jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/config/VaultSettings.java (original)
+++ jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/config/VaultSettings.java Thu Jan 9 16:53:40 2020
@@ -26,7 +26,6 @@ import javax.xml.stream.XMLStreamWriter;
import org.w3c.dom.Element;
import org.xml.sax.ContentHandler;
import org.xml.sax.SAXException;
-import org.xml.sax.helpers.AttributesImpl;
/**
* {@code VaultUserConfig}...
@@ -71,6 +70,11 @@ public class VaultSettings extends Abstr
return 1.0;
}
+ @Deprecated
+ protected void doWrite(ContentHandler handler) throws SAXException {
+ throw new UnsupportedOperationException("No longer supports write with a SAX contentHandler, user write with XMLStreamWriter instead!");
+ }
+
protected void doWrite(XMLStreamWriter writer) throws XMLStreamException {
for (String ignore: ignores) {
writer.writeStartElement(ELEM_IGNORE);
Modified: jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/config/package-info.java
URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/config/package-info.java?rev=1872562&r1=1872561&r2=1872562&view=diff
==============================================================================
--- jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/config/package-info.java (original)
+++ jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/config/package-info.java Thu Jan 9 16:53:40 2020
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-@Version("2.6.1")
+@Version("2.7.0")
package org.apache.jackrabbit.vault.fs.config;
import org.osgi.annotation.versioning.Version;
Modified: jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/packaging/package-info.java
URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/packaging/package-info.java?rev=1872562&r1=1872561&r2=1872562&view=diff
==============================================================================
--- jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/packaging/package-info.java (original)
+++ jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/packaging/package-info.java Thu Jan 9 16:53:40 2020
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-@Version("2.10.1")
+@Version("2.10.0")
package org.apache.jackrabbit.vault.packaging;
import org.osgi.annotation.versioning.Version;
Modified: jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/packaging/registry/package-info.java
URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/packaging/registry/package-info.java?rev=1872562&r1=1872561&r2=1872562&view=diff
==============================================================================
--- jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/packaging/registry/package-info.java (original)
+++ jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/packaging/registry/package-info.java Thu Jan 9 16:53:40 2020
@@ -14,5 +14,5 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-@org.osgi.annotation.versioning.Version("1.3.0")
+@org.osgi.annotation.versioning.Version("1.3.1")
package org.apache.jackrabbit.vault.packaging.registry;
Modified: jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/util/ItemNameComparator.java
URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/util/ItemNameComparator.java?rev=1872562&r1=1872561&r2=1872562&view=diff
==============================================================================
--- jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/util/ItemNameComparator.java (original)
+++ jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/util/ItemNameComparator.java Thu Jan 9 16:53:40 2020
@@ -34,6 +34,8 @@ import org.apache.jackrabbit.spi.commons
*/
public class ItemNameComparator implements Comparator<Item> {
+ @Deprecated
+ public static final ItemNameComparator INSTANCE = new ItemNameComparator();
/**
* the session's namespace resolver
@@ -45,6 +47,11 @@ public class ItemNameComparator implemen
this.nsResolver = nsResolver;
}
+ @Deprecated
+ public ItemNameComparator() {
+ throw new UnsupportedOperationException("This constructor is no longer supported, please use constructor with argument instead");
+ }
+
private QName getQName(String rawName) throws RepositoryException {
try {
Name name = NameParser.parse(rawName, nsResolver, NameFactoryImpl.getInstance());
Modified: jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/util/package-info.java
URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/util/package-info.java?rev=1872562&r1=1872561&r2=1872562&view=diff
==============================================================================
--- jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/util/package-info.java (original)
+++ jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/util/package-info.java Thu Jan 9 16:53:40 2020
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-@Version("2.4.0")
+@Version("2.5.0")
package org.apache.jackrabbit.vault.util;
import org.osgi.annotation.versioning.Version;
\ No newline at end of file
Modified: jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/util/xml/package-info.java
URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/util/xml/package-info.java?rev=1872562&r1=1872561&r2=1872562&view=diff
==============================================================================
--- jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/util/xml/package-info.java (original)
+++ jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/util/xml/package-info.java Thu Jan 9 16:53:40 2020
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-@Version("2.4.0")
+@Version("3.0.0")
package org.apache.jackrabbit.vault.util.xml;
import org.osgi.annotation.versioning.Version;
\ No newline at end of file
Modified: jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/util/xml/serialize/package-info.java
URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/util/xml/serialize/package-info.java?rev=1872562&r1=1872561&r2=1872562&view=diff
==============================================================================
--- jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/util/xml/serialize/package-info.java (original)
+++ jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/util/xml/serialize/package-info.java Thu Jan 9 16:53:40 2020
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-@Version("2.5.0")
+@Version("3.0.0")
package org.apache.jackrabbit.vault.util.xml.serialize;
import org.osgi.annotation.versioning.Version;
\ No newline at end of file