[spring-extensions] branch master updated: JSE-28 - remove SVN resource support
Ian Young
ian at iay.org.uk
Mon Feb 26 11:53:31 EST 2018
This is an automated email from the git hooks/post-receive script.
iay pushed a commit to branch master
in repository spring-extensions.
View the commit online:
http://git.shibboleth.net/view/?p=spring-extensions.git;a=commit;h=37a42abcf2dd3eb474e2043ef257efe72df8a163
The following commit(s) were added to refs/heads/master by this push:
new 37a42ab JSE-28 - remove SVN resource support
37a42ab is described below
commit 37a42abcf2dd3eb474e2043ef257efe72df8a163
Author: Ian Young <ian at iay.org.uk>
AuthorDate: Mon Feb 26 16:51:41 2018 +0000
JSE-28 - remove SVN resource support
---
pom.xml | 6 -
.../resource/SVNBasicAuthenticationManager.java | 166 -------
.../ext/spring/resource/SVNResource.java | 477 ---------------------
.../ext/spring/resource/SVNResourceTest.java | 185 --------
.../ext/spring/resource/SVNRunnable.java | 274 ------------
.../ext/spring/resource/SVNRunnableTest.java | 186 --------
.../shibboleth/ext/spring/resource/SVN/README.txt | 5 -
.../shibboleth/ext/spring/resource/SVN/conf/authz | 32 --
.../shibboleth/ext/spring/resource/SVN/conf/passwd | 8 -
.../ext/spring/resource/SVN/conf/svnserve.conf | 61 ---
.../shibboleth/ext/spring/resource/SVN/db/current | 1 -
.../shibboleth/ext/spring/resource/SVN/db/format | 2 -
.../shibboleth/ext/spring/resource/SVN/db/fs-type | 1 -
.../ext/spring/resource/SVN/db/fsfs.conf | 38 --
.../ext/spring/resource/SVN/db/min-unpacked-rev | 1 -
.../ext/spring/resource/SVN/db/rep-cache.db | Bin 4096 -> 0 bytes
.../ext/spring/resource/SVN/db/revprops/0/0 | 5 -
.../ext/spring/resource/SVN/db/revprops/0/1 | 13 -
.../ext/spring/resource/SVN/db/revprops/0/2 | 13 -
.../shibboleth/ext/spring/resource/SVN/db/revs/0/0 | 11 -
.../shibboleth/ext/spring/resource/SVN/db/revs/0/1 | Bin 504 -> 0 bytes
.../shibboleth/ext/spring/resource/SVN/db/revs/0/2 | Bin 1850 -> 0 bytes
.../ext/spring/resource/SVN/db/txn-current | 1 -
.../ext/spring/resource/SVN/db/txn-current-lock | 0
.../net/shibboleth/ext/spring/resource/SVN/db/uuid | 1 -
.../ext/spring/resource/SVN/db/write-lock | 0
.../net/shibboleth/ext/spring/resource/SVN/format | 1 -
.../ext/spring/resource/SVN/hooks/post-commit.tmpl | 50 ---
.../ext/spring/resource/SVN/hooks/post-lock.tmpl | 44 --
.../resource/SVN/hooks/post-revprop-change.tmpl | 56 ---
.../ext/spring/resource/SVN/hooks/post-unlock.tmpl | 42 --
.../ext/spring/resource/SVN/hooks/pre-commit.tmpl | 81 ----
.../ext/spring/resource/SVN/hooks/pre-lock.tmpl | 73 ----
.../resource/SVN/hooks/pre-revprop-change.tmpl | 66 ---
.../ext/spring/resource/SVN/hooks/pre-unlock.tmpl | 65 ---
.../spring/resource/SVN/hooks/start-commit.tmpl | 65 ---
.../ext/spring/resource/SVN/locks/db-logs.lock | 3 -
.../ext/spring/resource/SVN/locks/db.lock | 3 -
.../net/shibboleth/ext/spring/resource/SVNBean.xml | 41 --
.../ext/spring/resource/TestResource.txt | 9 -
40 files changed, 2086 deletions(-)
diff --git a/pom.xml b/pom.xml
index 09e484c..b01b254 100644
--- a/pom.xml
+++ b/pom.xml
@@ -109,12 +109,6 @@
<groupId>joda-time</groupId>
<artifactId>joda-time</artifactId>
</dependency>
- <dependency>
- <groupId>org.tmatesoft.svnkit</groupId>
- <artifactId>svnkit</artifactId>
- <!-- Required for SVNResource. Constrained by licensing. -->
- <optional>true</optional>
- </dependency>
<!-- Provided dependencies -->
<dependency>
diff --git a/src/main/java/net/shibboleth/ext/spring/resource/SVNBasicAuthenticationManager.java b/src/main/java/net/shibboleth/ext/spring/resource/SVNBasicAuthenticationManager.java
deleted file mode 100644
index c02207a..0000000
--- a/src/main/java/net/shibboleth/ext/spring/resource/SVNBasicAuthenticationManager.java
+++ /dev/null
@@ -1,166 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID 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 net.shibboleth.ext.spring.resource;
-
-import java.io.File;
-import java.util.List;
-
-import javax.annotation.concurrent.ThreadSafe;
-
-import org.springframework.beans.factory.InitializingBean;
-import org.tmatesoft.svn.core.auth.BasicAuthenticationManager;
-import org.tmatesoft.svn.core.auth.SVNAuthentication;
-
-import net.shibboleth.utilities.java.support.annotation.ParameterName;
-import net.shibboleth.utilities.java.support.primitive.DeprecationSupport;
-import net.shibboleth.utilities.java.support.primitive.DeprecationSupport.ObjectType;
-
-/**
- * Authentication manager for SVN resources based on {@link BasicAuthenticationManager}. <br/>
- * Exbeds the proxy information into individual beans to allow setting from Spring.
- */
- at ThreadSafe
-public class SVNBasicAuthenticationManager extends BasicAuthenticationManager implements InitializingBean {
-
- /** Proxy Host - if needed. */
- private String proxyHost;
-
- /** Proxy Port - if needed. */
- private int proxyPort;
-
- /** Proxy User Name - if needed. */
- private String proxyUserName;
-
- /** Proxy Password - if needed. */
- private String proxyPassword;
-
- /** This is true if any of the setters for the proxy information have been called.*/
- private boolean proxySet;
-
- /**
- * Constructor. See http://svnkit.com/javadoc/org/tmatesoft/svn/core/auth/BasicAuthenticationManager.html
- *
- * @param authentications authentications
- */
- public SVNBasicAuthenticationManager(@ParameterName(name="") final List<SVNAuthentication> authentications) {
- super(authentications.toArray(new SVNAuthentication[authentications.size()]));
- }
-
- /**
- * Constructor. See http://svnkit.com/javadoc/org/tmatesoft/svn/core/auth/BasicAuthenticationManager.html
- *
- * @param userName username
- * @param keyFile a private key file
- * @param passphrase a password to the private key
- * @param portNumber a port number over which an ssh tunnel is established
- */
- @Deprecated
- public SVNBasicAuthenticationManager(
- @ParameterName(name="userName") final String userName,
- @ParameterName(name="keyFile" ) final File keyFile,
- @ParameterName(name="passphrase") final String passphrase,
- @ParameterName(name="portNumber") final int portNumber) {
- super(userName, keyFile, passphrase, portNumber);
- DeprecationSupport.warnOnce(ObjectType.CLASS, SVNBasicAuthenticationManager.class.getName(), null, null);
- }
-
- /**
- * Constructor. See http://svnkit.com/javadoc/org/tmatesoft/svn/core/auth/BasicAuthenticationManager.html
- *
- * @param userName a userName
- * @param password a password
- */
- @SuppressWarnings("deprecation")
- public SVNBasicAuthenticationManager(@ParameterName(name="userName") final String userName,
- @ParameterName(name="password") final String password) {
- super(userName, password);
- }
-
- /** {@inheritDoc} */
- @SuppressWarnings("deprecation")
- @Override public void afterPropertiesSet() {
- if (proxySet) {
- setProxy(proxyHost, proxyPort, proxyUserName, proxyPassword);
- }
- }
-
- /** Get the proxy host.
- * @return Returns the proxyHost.
- */
- @Override
- public String getProxyHost() {
- return proxyHost;
- }
-
- /** Set the proxy host.
- * @param host The proxyHost to set.
- */
- public void setProxyHost(final String host) {
- proxyHost = host;
- proxySet = true;
- }
-
- /** Get the proxy port.
- * @return Returns the proxyPort.
- */
- @Override
- public int getProxyPort() {
- return proxyPort;
- }
-
- /** Set the proxy port.
- * @param port The proxyPort to set.
- */
- public void setProxyPort(final int port) {
- proxyPort = port;
- proxySet = true;
- }
-
- /** Get the proxy user name.
- * @return Returns the proxyUserName.
- */
- @Override
- public String getProxyUserName() {
- return proxyUserName;
- }
-
- /** Set the proxy user name.
- * @param userName The proxyUserName to set.
- */
- public void setProxyUserName(final String userName) {
- proxyUserName = userName;
- proxySet = true;
- }
-
- /** Get the proxy password.
- * @return Returns the proxyPassword.
- */
- @Override
- public String getProxyPassword() {
- return proxyPassword;
- }
-
- /** Set the proxy password.
- * @param password The proxyPassword to set.
- */
- public void setProxyPassword(final String password) {
- proxyPassword = password;
- proxySet = true;
- }
-
-}
\ No newline at end of file
diff --git a/src/main/java/net/shibboleth/ext/spring/resource/SVNResource.java b/src/main/java/net/shibboleth/ext/spring/resource/SVNResource.java
deleted file mode 100644
index b63b579..0000000
--- a/src/main/java/net/shibboleth/ext/spring/resource/SVNResource.java
+++ /dev/null
@@ -1,477 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID 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 net.shibboleth.ext.spring.resource;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.net.URL;
-
-import javax.annotation.Nonnull;
-
-import org.joda.time.DateTime;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.BeanCreationException;
-import org.springframework.beans.factory.BeanNameAware;
-import org.springframework.beans.factory.InitializingBean;
-import org.springframework.core.io.Resource;
-import org.tmatesoft.svn.core.SVNDepth;
-import org.tmatesoft.svn.core.SVNException;
-import org.tmatesoft.svn.core.SVNURL;
-import org.tmatesoft.svn.core.internal.io.dav.DAVRepositoryFactory;
-import org.tmatesoft.svn.core.internal.io.fs.FSRepositoryFactory;
-import org.tmatesoft.svn.core.internal.io.svn.SVNRepositoryFactoryImpl;
-import org.tmatesoft.svn.core.wc.ISVNStatusHandler;
-import org.tmatesoft.svn.core.wc.SVNClientManager;
-import org.tmatesoft.svn.core.wc.SVNRevision;
-import org.tmatesoft.svn.core.wc.SVNStatus;
-
-import net.shibboleth.utilities.java.support.annotation.ParameterName;
-import net.shibboleth.utilities.java.support.component.AbstractIdentifiedInitializableComponent;
-import net.shibboleth.utilities.java.support.primitive.DeprecationSupport;
-import net.shibboleth.utilities.java.support.primitive.DeprecationSupport.ObjectType;
-import net.shibboleth.utilities.java.support.primitive.StringSupport;
-
-/**
- * Implementation of a Spring {@link Resource} that communications with a Subversion server (via a spool directory).
- *
- * This resource will fetch the given resource as follows:
- * <ul>
- * <li>If the revision is a positive number the resource will fetch the resource once during construction time and will
- * never attempt to fetch it again.</li>
- * <li>If the revision number is zero or less, signaling the HEAD revision, every call this resource will cause the
- * resource to check to see if the current working copy is the same as the revision in the remote repository. If it is
- * not the new revision will be retrieved.</li>
- * </ul>
- *
- * The behavior of multiple {@link SVNResource} operating on the same local copy are undefined.
- */
- at Deprecated
-public class SVNResource extends AbstractIdentifiedInitializableComponent implements Resource, BeanNameAware,
- InitializingBean, net.shibboleth.utilities.java.support.resource.Resource {
-
- /** Class logger. */
- private final Logger log = LoggerFactory.getLogger(SVNResource.class);
-
- /** SVN Client manager. */
- @Nonnull private final SVNClientManager clientManager;
-
- /** URL to the remote repository. */
- @Nonnull private SVNURL remoteRepository;
-
- /** Directory where the working copy will be kept. */
- @Nonnull private File workingCopyDirectory;
-
- /** Revision of the working copy. */
- private SVNRevision retrievalRevision;
-
- /** File, within the working copy, represented by this resource. */
- private String resourceFileName;
-
- /** Time the resource file was last modified. */
- private DateTime lastModified;
-
- /**
- * Constructor.
- *
- * @param svnClientMgr manager used to create SVN clients
- * @param repositoryUrl URL of the remote repository
- * @param workingCopy directory that will serve as the root of the local working copy
- * @param workingRevision revision of the resource to retrieve or -1 for HEAD revision
- * @param resourceFile file, within the working copy, represented by this resource
- *
- * @throws BeanCreationException thrown if there is a problem initializing the SVN resource
- */
- public SVNResource(
- @Nonnull @ParameterName(name="svnClientMgr") final SVNClientManager svnClientMgr,
- @Nonnull @ParameterName(name="repositoryUrl") final SVNURL repositoryUrl,
- @Nonnull @ParameterName(name="workingCopy") final File workingCopy,
- @ParameterName(name="workingRevision") final long workingRevision,
- @Nonnull @ParameterName(name="resourceFile") final String resourceFile) {
- DeprecationSupport.warnOnce(ObjectType.CLASS, SVNResource.class.getName(), null, null);
- DAVRepositoryFactory.setup();
- SVNRepositoryFactoryImpl.setup();
- FSRepositoryFactory.setup();
- if (svnClientMgr == null) {
- log.error("SVN client manager may not be null");
- throw new BeanCreationException("SVN client manager may not be null");
- }
- clientManager = svnClientMgr;
-
- if (repositoryUrl == null) {
- throw new BeanCreationException("SVN repository URL may not be null");
- }
- remoteRepository = repositoryUrl;
-
- try {
- checkWorkingCopyDirectory(workingCopy);
- workingCopyDirectory = workingCopy;
- } catch (final IOException e) {
- throw new BeanCreationException(e.getMessage());
- }
-
- if (workingRevision < 0) {
- this.retrievalRevision = SVNRevision.HEAD;
- } else {
- this.retrievalRevision = SVNRevision.create(workingRevision);
- }
-
- setFilename(resourceFile);
-
- try {
- checkoutOrUpdateResource();
- if (!getFile().exists()) {
- log.error("Resource file " + resourceFile + " does not exist in SVN working copy directory "
- + workingCopy.getAbsolutePath());
- }
- } catch (final IOException e) {
- throw new BeanCreationException(e.getMessage());
- }
- }
-
- /**
- * {@inheritDoc}
- */
- @Override public String getFilename() {
- return resourceFileName;
- }
-
- /**
- * Set the resourceFileName.
- *
- * @param fileName the name
- */
- public void setFilename(@Nonnull final String fileName) {
- resourceFileName = StringSupport.trimOrNull(fileName);
- if (resourceFileName == null) {
- log.error("SVN working copy resource file name may not be null or empty");
- throw new BeanCreationException("SVN working copy resource file name may not be null or empty");
- }
- }
-
- /**
- * Helper function to generate the full path for injecting into URLs and URIs.
- *
- * @return the directory path (from svn) pus the file.
- */
- protected String getFullPath() {
- final StringBuffer buffer = new StringBuffer(remoteRepository.getPath().length() + 1 + getFilename().length());
- buffer.append(remoteRepository.getPath()).append('/').append(getFilename());
- return buffer.toString();
- }
-
- /**
- * Helper function to return a complex scheme - a conjunction of 'svn' and the underlying protocol.
- *
- * @return 'svn+'protocol
- */
- protected String getProtocol() {
- final StringBuffer buffer = new StringBuffer(4 + remoteRepository.getProtocol().length());
- buffer.append("svn+").append(remoteRepository.getProtocol());
- return buffer.toString();
- }
-
- /**
- * Checks that the given file exists, or can be created, is a directory, and is read/writable by this process.
- *
- * @param directory the directory to check
- *
- * @throws IOException thrown if the file is invalid
- */
- protected void checkWorkingCopyDirectory(@Nonnull final File directory) throws IOException {
- if (directory == null) {
- log.error("SVN working copy directory cannot be null");
- throw new IOException("SVN working copy directory cannot be null");
- }
-
- if (!directory.exists()) {
- final boolean created = directory.mkdirs();
- if (!created) {
- final String msg = "SVN working copy directory " + directory.getAbsolutePath()
- + " does not exist and could not be created";
- log.error(msg);
- throw new IOException(msg);
- }
- }
-
- if (!directory.isDirectory()) {
- final String msg = "SVN working copy location " + directory.getAbsolutePath() + " is not a directory";
- log.error(msg);
- throw new IOException(msg);
- }
-
- if (!directory.canRead()) {
- final String msg = "SVN working copy directory " + directory.getAbsolutePath()
- + " cannot be read by this process";
- log.error(msg);
- throw new IOException(msg);
- }
-
- if (!directory.canWrite()) {
- final String msg = "SVN working copy directory " + directory.getAbsolutePath()
- + " cannot be written to by this process";
- log.error(msg);
- throw new IOException(msg);
- }
- }
-
- /**
- * Checks out the resource specified by the {@link #remoteRepository} in to the working copy
- * {@link #workingCopyDirectory}. If the working copy is empty than an SVN checkout is performed if the working copy
- * already exists then an SVN update is performed.
- *
- * @throws IOException thrown if there is a problem communicating with the remote repository, the revision does not
- * exist, or the working copy is unusable
- */
- protected void checkoutOrUpdateResource() throws IOException {
- log.debug("checking out or updating working copy");
- final SVNRevision newRevision;
-
- if (!workingCopyDirectoryExists()) {
- log.debug("Working copy does not yet exist, checking it out to {}", workingCopyDirectory.getAbsolutePath());
- newRevision = checkoutResourceDirectory();
- } else {
- if (retrievalRevision != SVNRevision.HEAD) {
- lastModified = getLastModificationForRevision(SVNRevision.HEAD);
- log.debug("Working copy exists and version is pegged at {}, no need to update",
- retrievalRevision.toString());
- return;
- }
- log.debug("Working copy exists, updating to latest version.");
- newRevision = updateResourceDirectory();
- }
-
- if (getFile().exists()) {
- log.debug("Determining last modification date of revision {}", newRevision.getNumber());
- lastModified = getLastModificationForRevision(newRevision);
- }
- }
-
- /**
- * Checks to see if the working copy directory exists.
- *
- * @return true if the working copy directory exists, false otherwise
- */
- private boolean workingCopyDirectoryExists() {
- final File svnMetadataDir = new File(workingCopyDirectory, ".svn");
- return svnMetadataDir.exists();
- }
-
- /**
- * Fetches the content from the SVN repository and creates the local working copy.
- *
- * @return the revision of the fetched content
- *
- * @throws IOException thrown if there is a problem checking out the content from the repository
- */
- private SVNRevision checkoutResourceDirectory() throws IOException {
- try {
- final long newRevision =
- clientManager.getUpdateClient().doCheckout(remoteRepository, workingCopyDirectory,
- retrievalRevision, retrievalRevision, SVNDepth.INFINITY, true);
- log.debug(
- "Checked out revision {} from remote repository {} and stored it in local working directory {}",
- new Object[] {newRevision, remoteRepository.toDecodedString(),
- workingCopyDirectory.getAbsolutePath(),});
- return SVNRevision.create(newRevision);
- } catch (final SVNException e) {
- final String errMsg =
- "Unable to check out revsion " + retrievalRevision.toString() + " from remote repository "
- + remoteRepository.toDecodedString() + " to local working directory "
- + workingCopyDirectory.getAbsolutePath();
- log.error(errMsg, e);
- throw new IOException(errMsg, e);
- }
- }
-
- /**
- * Gets the last modified time for the given revision.
- *
- * @param revision revision to get the last modified date for
- *
- * @return the last modified time
- *
- * @throws IOException thrown if there is a problem getting the last modified time
- */
- private DateTime getLastModificationForRevision(final SVNRevision revision) throws IOException {
- try {
- final SVNStatusHandler handler = new SVNStatusHandler();
- clientManager.getStatusClient().doStatus(getFile(), revision, SVNDepth.INFINITY, true, true, false, false,
- handler, null);
- final SVNStatus status = handler.getStatus();
-
- // We want the date when this was committed
- return new DateTime(status.getCommittedDate());
- } catch (final SVNException e) {
- final String errMsg =
- "Unable to check status of resource " + resourceFileName + " within working directory "
- + workingCopyDirectory.getAbsolutePath();
- log.error(errMsg, e);
- throw new IOException(errMsg, e);
- }
- }
-
- /**
- * Updates an existing local working copy from the repository.
- *
- * @return the revision of the fetched content
- *
- * @throws IOException thrown if there is a problem updating the working copy
- */
- private SVNRevision updateResourceDirectory() throws IOException {
- try {
- final long newRevision =
- clientManager.getUpdateClient().doUpdate(workingCopyDirectory, retrievalRevision,
- SVNDepth.INFINITY, true, true);
- log.debug("Updated local working directory {} to revision {} from remote repository {}", new Object[] {
- workingCopyDirectory.getAbsolutePath(), newRevision, remoteRepository.toDecodedString(),});
- return SVNRevision.create(newRevision);
- } catch (final SVNException e) {
- final String errMsg =
- "Unable to update working copy of resoure " + remoteRepository.toDecodedString()
- + " in working copy " + workingCopyDirectory.getAbsolutePath() + " to revsion "
- + retrievalRevision.toString();
- log.error(errMsg, e);
- throw new IOException(errMsg, e);
- }
- }
-
- /** {@inheritDoc} */
- @Override public InputStream getInputStream() throws IOException {
- checkoutOrUpdateResource();
- try {
- return new FileInputStream(getFile());
- } catch (final IOException e) {
- log.error("Unable to read resource file {} from local working copy {}", resourceFileName,
- workingCopyDirectory.getAbsolutePath(), e);
- throw e;
- }
- }
-
- /** {@inheritDoc} */
- @Override public boolean exists() {
- try {
- checkoutOrUpdateResource();
- return getFile().exists();
- } catch (final IOException e) {
- return false;
- }
- }
-
- /**
- * {@inheritDoc} We always say yes.
- */
- @Override public boolean isReadable() {
- return exists();
- }
-
- /**
- * {@inheritDoc} Our stream can be read multiple times.
- */
- @Override public boolean isOpen() {
- return false;
- }
-
- /** {@inheritDoc} */
- @Override public URL getURL() throws IOException {
-
- return new URL(getProtocol(), remoteRepository.getHost(), remoteRepository.getPort(), getFullPath());
- }
-
- /** {@inheritDoc} */
- @Override public URI getURI() throws IOException {
- try {
- return new URI(getProtocol(), null, remoteRepository.getHost(), remoteRepository.getPort(), getFullPath(),
- null, null);
- } catch (final URISyntaxException e) {
- throw new IOException(e);
- }
- }
-
- /** {@inheritDoc} */
- @Override public File getFile() throws IOException {
- return new File(workingCopyDirectory, resourceFileName);
- }
-
- /** {@inheritDoc} */
- @Override public long contentLength() throws IOException {
- return getFile().getTotalSpace();
- }
-
- /** {@inheritDoc} */
- @Override public long lastModified() throws IOException {
- checkoutOrUpdateResource();
- return lastModified.getMillis();
- }
-
- /** {@inheritDoc} */
- @Override public Resource createRelative(final String relativePath) throws IOException {
- throw new IOException("Cannot support relative open on SVN resources");
- }
-
- /** {@inheritDoc} */
- @Override public net.shibboleth.utilities.java.support.resource.Resource
- createRelativeResource(final String relativePath) throws IOException {
- throw new IOException("Cannot support relative open on SVN resources");
- }
-
- /** {@inheritDoc} */
- @Override public String getDescription() {
- final StringBuffer sb = new StringBuffer("SVN Resource: ");
- return sb.append(getFullPath()).toString();
- }
-
- /** {@inheritDoc} */
- @Override public void afterPropertiesSet() throws Exception {
- initialize();
- }
-
- /** {@inheritDoc} */
- @Override public void setBeanName(final String name) {
- // For some reason Spring will call this after initialization.
- if (!isInitialized()) {
- setId(name);
- }
- }
-
- /** Simple {@link ISVNStatusHandler} implementation that just stores and returns the status. */
- private class SVNStatusHandler implements ISVNStatusHandler {
-
- /** Current status of the resource. */
- private SVNStatus status;
-
- /**
- * Gets the current status of the resource.
- *
- * @return current status of the resource
- */
- public SVNStatus getStatus() {
- return status;
- }
-
- /** {@inheritDoc} */
- @Override public void handleStatus(final SVNStatus currentStatus) throws SVNException {
- status = currentStatus;
- }
- }
-
-}
diff --git a/src/test/java/net/shibboleth/ext/spring/resource/SVNResourceTest.java b/src/test/java/net/shibboleth/ext/spring/resource/SVNResourceTest.java
deleted file mode 100644
index 4afa6e2..0000000
--- a/src/test/java/net/shibboleth/ext/spring/resource/SVNResourceTest.java
+++ /dev/null
@@ -1,185 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID 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 net.shibboleth.ext.spring.resource;
-
-import java.io.File;
-import java.io.IOException;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.text.ParseException;
-import java.util.Collection;
-
-import org.joda.time.DateTime;
-import org.joda.time.DateTimeZone;
-import org.springframework.beans.factory.xml.XmlBeanDefinitionReader;
-import org.springframework.context.support.GenericApplicationContext;
-import org.springframework.context.support.PropertySourcesPlaceholderConfigurer;
-import org.springframework.core.env.MutablePropertySources;
-import org.springframework.core.env.StandardEnvironment;
-import org.springframework.core.io.ByteArrayResource;
-import org.springframework.core.io.ClassPathResource;
-import org.springframework.core.io.Resource;
-import org.springframework.mock.env.MockPropertySource;
-import org.testng.Assert;
-import org.testng.annotations.AfterMethod;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.Test;
-import org.tmatesoft.svn.core.SVNException;
-import org.tmatesoft.svn.core.SVNURL;
-import org.tmatesoft.svn.core.auth.BasicAuthenticationManager;
-import org.tmatesoft.svn.core.auth.ISVNAuthenticationManager;
-import org.tmatesoft.svn.core.wc.SVNClientManager;
-
-import net.shibboleth.ext.spring.util.SchemaTypeAwareXMLBeanDefinitionReader;
-
-/**
- * test,
- */
- at SuppressWarnings("deprecation")
-public class SVNResourceTest {
-
- static private final String ORIGINAL_TEXT = "This is a Test Resource which will be superseded by other Data";
-
- static private final int ORIGINAL_VERSION = 1;
-
- static private final String PATH = "net/shibboleth/ext/spring/resource/";
-
- static private final String FILENAME = "TestResource.txt";
-
- static private final String CLASSPATH_PATH = PATH + FILENAME;
-
- private SVNClientManager clientManager;
-
- private Resource comparer = new ClassPathResource(CLASSPATH_PATH);
-
- private SVNURL url;
-
- private File theDir;
-
- @BeforeClass public void setup() throws SVNException, IOException {
- final ISVNAuthenticationManager authnManager = new BasicAuthenticationManager(null);
- clientManager = SVNClientManager.newInstance();
- clientManager.setAuthenticationManager(authnManager);
-
- final String theDirPath = new ClassPathResource(PATH).getFile().getAbsolutePath();
-
- url = SVNURL.create("file", null, "", -1, theDirPath + "/SVN", false);
- }
-
- @BeforeMethod public void makeDir() throws IOException {
- final Path p = Files.createTempDirectory("SVNResourceTest");
- theDir = p.toFile();
- }
-
- private void emptyDir(final File dir) {
- for (final File f : dir.listFiles()) {
- if (f.isDirectory()) {
- emptyDir(f);
- }
- f.delete();
- }
- }
-
- @AfterMethod public void emptyDir() {
- emptyDir(theDir);
- theDir.delete();
- theDir = null;
- }
-
- @Test(enabled=true) public void testRevision() throws IOException, ParseException {
- final Resource resource = new SVNResource(clientManager, url, theDir, ORIGINAL_VERSION, FILENAME);
- Assert.assertTrue(resource.exists());
-
- final long delta =
- resource.lastModified() - new DateTime(2017, 3, 20, 13, 40, 50, 500, DateTimeZone.UTC).getMillis();
- Assert.assertTrue(delta < 501 && delta > -501);
-
- final Resource other = new ByteArrayResource(ORIGINAL_TEXT.getBytes());
-
- Assert.assertTrue(ResourceTestHelper.compare(other, resource));
- // Check rewind and check the compare code
- Assert.assertFalse(ResourceTestHelper.compare(comparer, resource));
- Assert.assertTrue(ResourceTestHelper.compare(other, resource));
- }
-
- @Test(enabled=true) public void testNotExist() {
- final Resource resource = new SVNResource(clientManager, url, theDir, 0, FILENAME);
- Assert.assertFalse(resource.exists());
-
- }
-
- @Test(enabled=true) public void testMain() throws IOException {
- final Resource resource = new SVNResource(clientManager, url, theDir, -1, FILENAME);
- Assert.assertTrue(resource.exists());
-
- // CHANGE IF WE CHECKIN A NEW FILE
- final long delta =
- resource.lastModified() - new DateTime(2017, 3, 20, 13, 41, 26, 500, DateTimeZone.UTC).getMillis();
- Assert.assertTrue(delta < 501 && delta > -501);
-
- Assert.assertTrue(ResourceTestHelper.compare(comparer, resource));
-
- }
-
- private GenericApplicationContext getContext(final String fileName) {
- final GenericApplicationContext parentContext = new GenericApplicationContext();
- parentContext.refresh(); // THIS IS REQUIRED
- parentContext.getBeanFactory().registerSingleton("theDir", theDir);
-
- final GenericApplicationContext context = new GenericApplicationContext(parentContext);
- final XmlBeanDefinitionReader beanDefinitionReader = new SchemaTypeAwareXMLBeanDefinitionReader(context);
-
- beanDefinitionReader.setValidationMode(XmlBeanDefinitionReader.VALIDATION_XSD);
- beanDefinitionReader.loadBeanDefinitions(fileName);
-
- final MockPropertySource mockEnvVars = new MockPropertySource();
- mockEnvVars.setProperty("the.SVN.Dir", url.getPath());
- final MutablePropertySources propertySources = context.getEnvironment().getPropertySources();
- propertySources.replace(StandardEnvironment.SYSTEM_PROPERTIES_PROPERTY_SOURCE_NAME, mockEnvVars);
-
- final PropertySourcesPlaceholderConfigurer placeholderConfig = new PropertySourcesPlaceholderConfigurer();
- placeholderConfig.setPlaceholderPrefix("%{");
- placeholderConfig.setPlaceholderSuffix("}");
- placeholderConfig.setPropertySources(propertySources);
-
- context.addBeanFactoryPostProcessor(placeholderConfig);
-
- context.refresh();
- return context;
-
- }
-
- @Test(enabled=true) public void testSpringLoad() {
-
- final GenericApplicationContext context = getContext("classpath:"+PATH+"SVNBean.xml");
-
-
- try {
- final Collection<Resource> beans = context.getBeansOfType(Resource.class).values();
- Assert.assertEquals(beans.size(), 1);
-
- final Resource r = beans.iterator().next();
-
- Assert.assertTrue(r.exists());
- } finally {
- ((GenericApplicationContext)context.getParent()).close();
- context.close();
- }
- }
-}
diff --git a/src/test/java/net/shibboleth/ext/spring/resource/SVNRunnable.java b/src/test/java/net/shibboleth/ext/spring/resource/SVNRunnable.java
deleted file mode 100644
index 5c6cd46..0000000
--- a/src/test/java/net/shibboleth/ext/spring/resource/SVNRunnable.java
+++ /dev/null
@@ -1,274 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID 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 net.shibboleth.ext.spring.resource;
-
-import java.io.File;
-import java.io.IOException;
-
-import javax.annotation.Nonnull;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.BeanCreationException;
-import org.springframework.beans.factory.BeanNameAware;
-import org.springframework.beans.factory.InitializingBean;
-import org.tmatesoft.svn.core.SVNDepth;
-import org.tmatesoft.svn.core.SVNException;
-import org.tmatesoft.svn.core.SVNURL;
-import org.tmatesoft.svn.core.internal.io.dav.DAVRepositoryFactory;
-import org.tmatesoft.svn.core.internal.io.fs.FSRepositoryFactory;
-import org.tmatesoft.svn.core.internal.io.svn.SVNRepositoryFactoryImpl;
-import org.tmatesoft.svn.core.wc.SVNClientManager;
-import org.tmatesoft.svn.core.wc.SVNRevision;
-
-import net.shibboleth.utilities.java.support.annotation.ParameterName;
-import net.shibboleth.utilities.java.support.component.AbstractIdentifiedInitializableComponent;
-
-/**
- * Implementation of a {@link Runnable} that communications with a Subversion server (via a spool directory).
- *
- */
-public class SVNRunnable extends AbstractIdentifiedInitializableComponent
- implements Runnable, BeanNameAware, InitializingBean {
-
- /** Class logger. */
- private final Logger log = LoggerFactory.getLogger(SVNRunnable.class);
-
- /** SVN Client manager. */
- @Nonnull private final SVNClientManager clientManager;
-
- /** URL to the remote repository. */
- @Nonnull private SVNURL remoteRepository;
-
- /** Directory where the working copy will be kept. */
- @Nonnull private File workingCopyDirectory;
-
- /** Revision of the working copy. */
- private SVNRevision retrievalRevision;
-
- /**
- * Constructor.
- *
- * @param svnClientMgr manager used to create SVN clients
- * @param repositoryUrl URL of the remote repository
- * @param workingCopy directory that will serve as the root of the local working copy
- * @param workingRevision revision of the resource to retrieve or -1 for HEAD revision
- *
- * @throws BeanCreationException thrown if there is a problem initializing the SVN resource
- */
- public SVNRunnable(@Nonnull @ParameterName(name = "svnClientMgr") final SVNClientManager svnClientMgr,
- @Nonnull @ParameterName(name = "repositoryUrl") final SVNURL repositoryUrl,
- @Nonnull @ParameterName(name = "workingCopy") final File workingCopy,
- @ParameterName(name = "workingRevision") final long workingRevision) {
-
- DAVRepositoryFactory.setup();
- SVNRepositoryFactoryImpl.setup();
- FSRepositoryFactory.setup();
- if (svnClientMgr == null) {
- log.error("SVN client manager may not be null");
- throw new BeanCreationException("SVN client manager may not be null");
- }
- clientManager = svnClientMgr;
-
- if (repositoryUrl == null) {
- throw new BeanCreationException("SVN repository URL may not be null");
- }
- remoteRepository = repositoryUrl;
-
- try {
- checkWorkingCopyDirectory(workingCopy);
- workingCopyDirectory = workingCopy;
- } catch (final IOException e) {
- throw new BeanCreationException(e.getMessage());
- }
-
- if (workingRevision < 0) {
- this.retrievalRevision = SVNRevision.HEAD;
- } else {
- this.retrievalRevision = SVNRevision.create(workingRevision);
- }
-
- try {
- checkoutOrUpdate();
- } catch (final IOException e) {
- throw new BeanCreationException(e.getMessage());
- }
- }
-
- /** Helper function to generate the full path for injecting into URLs and URIs.
- *
- * @return the directory path (from svn) pus the file.
- *
- * protected String getFullPath() { final StringBuffer buffer = new
- * StringBuffer(remoteRepository.getPath().length() + 1 + getFilename().length());
- * buffer.append(remoteRepository.getPath()).append('/').append(getFilename()); return buffer.toString(); }
- *
- * /** Helper function to return a complex scheme - a conjunction of 'svn' and the underlying protocol.
- *
- * @return 'svn+'protocol
- */
- protected String getProtocol() {
- final StringBuffer buffer = new StringBuffer(4 + remoteRepository.getProtocol().length());
- buffer.append("svn+").append(remoteRepository.getProtocol());
- return buffer.toString();
- }
-
- /**
- * Checks that the given file exists, or can be created, is a directory, and is read/writable by this process.
- *
- * @param directory the directory to check
- *
- * @throws IOException thrown if the file is invalid
- */
- protected void checkWorkingCopyDirectory(@Nonnull final File directory) throws IOException {
- if (directory == null) {
- log.error("SVN working copy directory cannot be null");
- throw new IOException("SVN working copy directory cannot be null");
- }
-
- if (!directory.exists()) {
- final boolean created = directory.mkdirs();
- if (!created) {
- final String msg = "SVN working copy directory " + directory.getAbsolutePath()
- + " does not exist and could not be created";
- log.error(msg);
- throw new IOException(msg);
- }
- }
-
- if (!directory.isDirectory()) {
- final String msg = "SVN working copy location " + directory.getAbsolutePath() + " is not a directory";
- log.error(msg);
- throw new IOException(msg);
- }
-
- if (!directory.canRead()) {
- final String msg =
- "SVN working copy directory " + directory.getAbsolutePath() + " cannot be read by this process";
- log.error(msg);
- throw new IOException(msg);
- }
-
- if (!directory.canWrite()) {
- final String msg = "SVN working copy directory " + directory.getAbsolutePath()
- + " cannot be written to by this process";
- log.error(msg);
- throw new IOException(msg);
- }
- }
-
- /**
- * Checks out the resource specified by the {@link #remoteRepository} in to the working copy
- * {@link #workingCopyDirectory}. If the working copy is empty than an SVN checkout is performed if the working copy
- * already exists then an SVN update is performed.
- *
- * @throws IOException thrown if there is a problem communicating with the remote repository, the revision does not
- * exist, or the working copy is unusable
- */
- protected void checkoutOrUpdate() throws IOException {
- log.debug("checking out or updating working copy");
-
- if (!workingCopyDirectoryExists()) {
- log.debug("Working copy does not yet exist, checking it out to {}", workingCopyDirectory.getAbsolutePath());
- checkoutResourceDirectory();
- } else {
- if (retrievalRevision != SVNRevision.HEAD) {
- log.debug("Working copy exists and version is pegged at {}, no need to update",
- retrievalRevision.toString());
- return;
- }
- log.debug("Working copy exists, updating to latest version.");
- updateResourceDirectory();
- }
- }
-
- /**
- * Checks to see if the working copy directory exists.
- *
- * @return true if the working copy directory exists, false otherwise
- */
- private boolean workingCopyDirectoryExists() {
- final File svnMetadataDir = new File(workingCopyDirectory, ".svn");
- return svnMetadataDir.exists();
- }
-
- /**
- * Fetches the content from the SVN repository and creates the local working copy.
- *
- * @return the revision of the fetched content
- *
- * @throws IOException thrown if there is a problem checking out the content from the repository
- */
- private SVNRevision checkoutResourceDirectory() throws IOException {
- try {
- final long newRevision = clientManager.getUpdateClient().doCheckout(remoteRepository, workingCopyDirectory,
- retrievalRevision, retrievalRevision, SVNDepth.INFINITY, true);
- log.debug("Checked out revision {} from remote repository {} and stored it in local working directory {}",
- new Object[] {newRevision, remoteRepository.toDecodedString(),
- workingCopyDirectory.getAbsolutePath(),});
- return SVNRevision.create(newRevision);
- } catch (final SVNException e) {
- final String errMsg = "Unable to check out revsion " + retrievalRevision.toString()
- + " from remote repository " + remoteRepository.toDecodedString() + " to local working directory "
- + workingCopyDirectory.getAbsolutePath();
- log.error(errMsg, e);
- throw new IOException(errMsg, e);
- }
- }
-
- /** Updates an existing local working copy from the repository.
- *
- * @throws IOException thrown if there is a problem updating the working copy
- */
- private void updateResourceDirectory() throws IOException {
- try {
- final long newRevision = clientManager.getUpdateClient().doUpdate(workingCopyDirectory, retrievalRevision,
- SVNDepth.INFINITY, true, true);
- log.debug("Updated local working directory {} to revision {} from remote repository {}", new Object[] {
- workingCopyDirectory.getAbsolutePath(), newRevision, remoteRepository.toDecodedString(),});
- } catch (final SVNException e) {
- final String errMsg = "Unable to update working copy of resoure " + remoteRepository.toDecodedString()
- + " in working copy " + workingCopyDirectory.getAbsolutePath() + " to revsion "
- + retrievalRevision.toString();
- log.error(errMsg, e);
- throw new IOException(errMsg, e);
- }
- }
-
- @Override public void afterPropertiesSet() throws Exception {
- initialize();
- }
-
- /** {@inheritDoc} */
- @Override public void setBeanName(final String name) {
- // For some reason Spring will call this after initialization.
- if (!isInitialized()) {
- setId(name);
- }
- }
-
- /** {@inheritDoc} */
- @Override public void run() {
- try {
- checkoutOrUpdate();
- } catch (final IOException e) {
- log.error("Failed to update", e);
- }
- }
-
-}
diff --git a/src/test/java/net/shibboleth/ext/spring/resource/SVNRunnableTest.java b/src/test/java/net/shibboleth/ext/spring/resource/SVNRunnableTest.java
deleted file mode 100644
index 758fe38..0000000
--- a/src/test/java/net/shibboleth/ext/spring/resource/SVNRunnableTest.java
+++ /dev/null
@@ -1,186 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID 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 net.shibboleth.ext.spring.resource;
-
-import java.io.File;
-import java.io.IOException;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.text.ParseException;
-import java.util.Collection;
-
-import org.springframework.beans.factory.xml.XmlBeanDefinitionReader;
-import org.springframework.context.support.GenericApplicationContext;
-import org.springframework.context.support.PropertySourcesPlaceholderConfigurer;
-import org.springframework.core.env.MutablePropertySources;
-import org.springframework.core.env.StandardEnvironment;
-import org.springframework.core.io.ByteArrayResource;
-import org.springframework.core.io.ClassPathResource;
-import org.springframework.core.io.Resource;
-import org.springframework.mock.env.MockPropertySource;
-import org.testng.Assert;
-import org.testng.annotations.AfterMethod;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.Test;
-import org.tmatesoft.svn.core.SVNException;
-import org.tmatesoft.svn.core.SVNURL;
-import org.tmatesoft.svn.core.auth.BasicAuthenticationManager;
-import org.tmatesoft.svn.core.auth.ISVNAuthenticationManager;
-import org.tmatesoft.svn.core.wc.SVNClientManager;
-
-import net.shibboleth.ext.spring.util.SchemaTypeAwareXMLBeanDefinitionReader;
-
-/**
- * test,
- */
-public class SVNRunnableTest {
-
- static private final String ORIGINAL_TEXT = "This is a Test Resource which will be superseded by other Data";
-
- static private final int ORIGINAL_VERSION = 1;
-
- static private final String PATH = "net/shibboleth/ext/spring/resource/";
-
- static private final String FILENAME = "TestResource.txt";
-
- static private final String CLASSPATH_PATH = PATH + FILENAME;
-
- private SVNClientManager clientManager;
-
- private Resource comparer = new ClassPathResource(CLASSPATH_PATH);
-
- private SVNURL url;
-
- private File theDir;
-
- @BeforeClass public void setup() throws SVNException, IOException {
- final ISVNAuthenticationManager authnManager = new BasicAuthenticationManager(null);
- clientManager = SVNClientManager.newInstance();
- clientManager.setAuthenticationManager(authnManager);
-
- final String theDirPath = new ClassPathResource(PATH).getFile().getAbsolutePath();
-
- url = SVNURL.create("file", null, "", -1, theDirPath + "/SVN", false);
- }
-
- @BeforeMethod public void makeDir() throws IOException {
- final Path p = Files.createTempDirectory("SVNRunnableTest");
- theDir = p.toFile();
- }
-
- private void emptyDir(final File dir) {
- for (final File f : dir.listFiles()) {
- if (f.isDirectory()) {
- emptyDir(f);
- }
- f.delete();
- }
- }
-
- @AfterMethod public void emptyDir() {
- emptyDir(theDir);
- theDir.delete();
- theDir = null;
- }
-
- private Resource makeResource(
- final SVNClientManager svnClientMgr,
- final SVNURL repositoryUrl,
- final File workingCopy,
- final long workingRevision,
- final String resourceFile)
- {
- final SVNRunnable runnable = new SVNRunnable(svnClientMgr, repositoryUrl, workingCopy, workingRevision);
-
- return new RunnableFileSystemResource(new File(workingCopy, resourceFile), runnable);
- }
-
-
- @Test(enabled=true) public void testRevision() throws IOException, ParseException {
- final Resource resource = makeResource(clientManager, url, theDir, ORIGINAL_VERSION, FILENAME);
- Assert.assertTrue(resource.exists());
-
- final Resource other = new ByteArrayResource(ORIGINAL_TEXT.getBytes());
-
- Assert.assertTrue(ResourceTestHelper.compare(other, resource));
- // Check rewind and check the compare code
- Assert.assertFalse(ResourceTestHelper.compare(comparer, resource));
- Assert.assertTrue(ResourceTestHelper.compare(other, resource));
- }
-
- @Test(enabled=true) public void testNotExist() {
- final Resource resource = makeResource(clientManager, url, theDir, 0, FILENAME);
- Assert.assertFalse(resource.exists());
-
- }
-
- @Test(enabled=true) public void testMain() throws IOException {
- final Resource resource = makeResource(clientManager, url, theDir, -1, FILENAME);
- Assert.assertTrue(resource.exists());
-
- Assert.assertTrue(ResourceTestHelper.compare(comparer, resource));
-
- }
-
- private GenericApplicationContext getContext(final String fileName) {
- final GenericApplicationContext parentContext = new GenericApplicationContext();
- parentContext.refresh(); // THIS IS REQUIRED
- parentContext.getBeanFactory().registerSingleton("theDir", theDir);
-
- final GenericApplicationContext context = new GenericApplicationContext(parentContext);
- final XmlBeanDefinitionReader beanDefinitionReader = new SchemaTypeAwareXMLBeanDefinitionReader(context);
-
- beanDefinitionReader.setValidationMode(XmlBeanDefinitionReader.VALIDATION_XSD);
- beanDefinitionReader.loadBeanDefinitions(fileName);
-
- final MockPropertySource mockEnvVars = new MockPropertySource();
- mockEnvVars.setProperty("the.SVN.Dir", url.getPath());
- final MutablePropertySources propertySources = context.getEnvironment().getPropertySources();
- propertySources.replace(StandardEnvironment.SYSTEM_PROPERTIES_PROPERTY_SOURCE_NAME, mockEnvVars);
-
- final PropertySourcesPlaceholderConfigurer placeholderConfig = new PropertySourcesPlaceholderConfigurer();
- placeholderConfig.setPlaceholderPrefix("%{");
- placeholderConfig.setPlaceholderSuffix("}");
- placeholderConfig.setPropertySources(propertySources);
-
- context.addBeanFactoryPostProcessor(placeholderConfig);
-
- context.refresh();
- return context;
-
- }
-
- @Test(enabled=true) public void testSpringLoad() {
-
- final GenericApplicationContext context = getContext("classpath:"+PATH+"SVNBean.xml");
-
-
- try {
- final Collection<Resource> beans = context.getBeansOfType(Resource.class).values();
- Assert.assertEquals(beans.size(), 1);
-
- final Resource r = beans.iterator().next();
-
- Assert.assertTrue(r.exists());
- } finally {
- ((GenericApplicationContext)context.getParent()).close();
- context.close();
- }
- }
-}
diff --git a/src/test/resources/net/shibboleth/ext/spring/resource/SVN/README.txt b/src/test/resources/net/shibboleth/ext/spring/resource/SVN/README.txt
deleted file mode 100644
index a692a6a..0000000
--- a/src/test/resources/net/shibboleth/ext/spring/resource/SVN/README.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-This is a Subversion repository; use the 'svnadmin' tool to examine
-it. Do not add, delete, or modify files here unless you know how
-to avoid corrupting the repository.
-
-Visit http://subversion.apache.org/ for more information.
diff --git a/src/test/resources/net/shibboleth/ext/spring/resource/SVN/conf/authz b/src/test/resources/net/shibboleth/ext/spring/resource/SVN/conf/authz
deleted file mode 100644
index 0b9a410..0000000
--- a/src/test/resources/net/shibboleth/ext/spring/resource/SVN/conf/authz
+++ /dev/null
@@ -1,32 +0,0 @@
-### This file is an example authorization file for svnserve.
-### Its format is identical to that of mod_authz_svn authorization
-### files.
-### As shown below each section defines authorizations for the path and
-### (optional) repository specified by the section name.
-### The authorizations follow. An authorization line can refer to:
-### - a single user,
-### - a group of users defined in a special [groups] section,
-### - an alias defined in a special [aliases] section,
-### - all authenticated users, using the '$authenticated' token,
-### - only anonymous users, using the '$anonymous' token,
-### - anyone, using the '*' wildcard.
-###
-### A match can be inverted by prefixing the rule with '~'. Rules can
-### grant read ('r') access, read-write ('rw') access, or no access
-### ('').
-
-[aliases]
-# joe = /C=XZ/ST=Dessert/L=Snake City/O=Snake Oil, Ltd./OU=Research Institute/CN=Joe Average
-
-[groups]
-# harry_and_sally = harry,sally
-# harry_sally_and_joe = harry,sally,&joe
-
-# [/foo/bar]
-# harry = rw
-# &joe = r
-# * =
-
-# [repository:/baz/fuz]
-# @harry_and_sally = rw
-# * = r
diff --git a/src/test/resources/net/shibboleth/ext/spring/resource/SVN/conf/passwd b/src/test/resources/net/shibboleth/ext/spring/resource/SVN/conf/passwd
deleted file mode 100644
index ecaa08d..0000000
--- a/src/test/resources/net/shibboleth/ext/spring/resource/SVN/conf/passwd
+++ /dev/null
@@ -1,8 +0,0 @@
-### This file is an example password file for svnserve.
-### Its format is similar to that of svnserve.conf. As shown in the
-### example below it contains one section labelled [users].
-### The name and password for each user follow, one account per line.
-
-[users]
-# harry = harryssecret
-# sally = sallyssecret
diff --git a/src/test/resources/net/shibboleth/ext/spring/resource/SVN/conf/svnserve.conf b/src/test/resources/net/shibboleth/ext/spring/resource/SVN/conf/svnserve.conf
deleted file mode 100644
index c198b0d..0000000
--- a/src/test/resources/net/shibboleth/ext/spring/resource/SVN/conf/svnserve.conf
+++ /dev/null
@@ -1,61 +0,0 @@
-### This file controls the configuration of the svnserve daemon, if you
-### use it to allow access to this repository. (If you only allow
-### access through http: and/or file: URLs, then this file is
-### irrelevant.)
-
-### Visit http://subversion.apache.org/ for more information.
-
-[general]
-### The anon-access and auth-access options control access to the
-### repository for unauthenticated (a.k.a. anonymous) users and
-### authenticated users, respectively.
-### Valid values are "write", "read", and "none".
-### Setting the value to "none" prohibits both reading and writing;
-### "read" allows read-only access, and "write" allows complete
-### read/write access to the repository.
-### The sample settings below are the defaults and specify that anonymous
-### users have read-only access to the repository, while authenticated
-### users have read and write access to the repository.
-# anon-access = read
-# auth-access = write
-### The password-db option controls the location of the password
-### database file. Unless you specify a path starting with a /,
-### the file's location is relative to the directory containing
-### this configuration file.
-### If SASL is enabled (see below), this file will NOT be used.
-### Uncomment the line below to use the default password file.
-# password-db = passwd
-### The authz-db option controls the location of the authorization
-### rules for path-based access control. Unless you specify a path
-### starting with a /, the file's location is relative to the the
-### directory containing this file. If you don't specify an
-### authz-db, no path-based access control is done.
-### Uncomment the line below to use the default authorization file.
-# authz-db = authz
-### This option specifies the authentication realm of the repository.
-### If two repositories have the same authentication realm, they should
-### have the same password database, and vice versa. The default realm
-### is repository's uuid.
-# realm = My First Repository
-### The force-username-case option causes svnserve to case-normalize
-### usernames before comparing them against the authorization rules in the
-### authz-db file configured above. Valid values are "upper" (to upper-
-### case the usernames), "lower" (to lowercase the usernames), and
-### "none" (to compare usernames as-is without case conversion, which
-### is the default behavior).
-# force-username-case = none
-
-[sasl]
-### This option specifies whether you want to use the Cyrus SASL
-### library for authentication. Default is false.
-### This section will be ignored if svnserve is not built with Cyrus
-### SASL support; to check, run 'svnserve --version' and look for a line
-### reading 'Cyrus SASL authentication is available.'
-# use-sasl = true
-### These options specify the desired strength of the security layer
-### that you want SASL to provide. 0 means no encryption, 1 means
-### integrity-checking only, values larger than 1 are correlated
-### to the effective key length for encryption (e.g. 128 means 128-bit
-### encryption). The values below are the defaults.
-# min-encryption = 0
-# max-encryption = 256
diff --git a/src/test/resources/net/shibboleth/ext/spring/resource/SVN/db/current b/src/test/resources/net/shibboleth/ext/spring/resource/SVN/db/current
deleted file mode 100644
index 0cfbf08..0000000
--- a/src/test/resources/net/shibboleth/ext/spring/resource/SVN/db/current
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/src/test/resources/net/shibboleth/ext/spring/resource/SVN/db/format b/src/test/resources/net/shibboleth/ext/spring/resource/SVN/db/format
deleted file mode 100644
index db06890..0000000
--- a/src/test/resources/net/shibboleth/ext/spring/resource/SVN/db/format
+++ /dev/null
@@ -1,2 +0,0 @@
-4
-layout sharded 1000
diff --git a/src/test/resources/net/shibboleth/ext/spring/resource/SVN/db/fs-type b/src/test/resources/net/shibboleth/ext/spring/resource/SVN/db/fs-type
deleted file mode 100644
index 4fdd953..0000000
--- a/src/test/resources/net/shibboleth/ext/spring/resource/SVN/db/fs-type
+++ /dev/null
@@ -1 +0,0 @@
-fsfs
diff --git a/src/test/resources/net/shibboleth/ext/spring/resource/SVN/db/fsfs.conf b/src/test/resources/net/shibboleth/ext/spring/resource/SVN/db/fsfs.conf
deleted file mode 100644
index 76e581b..0000000
--- a/src/test/resources/net/shibboleth/ext/spring/resource/SVN/db/fsfs.conf
+++ /dev/null
@@ -1,38 +0,0 @@
-### This file controls the configuration of the FSFS filesystem.
-
-[memcached-servers]
-### These options name memcached servers used to cache internal FSFS
-### data. See http://www.danga.com/memcached/ for more information on
-### memcached. To use memcached with FSFS, run one or more memcached
-### servers, and specify each of them as an option like so:
-# first-server = 127.0.0.1:11211
-# remote-memcached = mymemcached.corp.example.com:11212
-### The option name is ignored; the value is of the form HOST:PORT.
-### memcached servers can be shared between multiple repositories;
-### however, if you do this, you *must* ensure that repositories have
-### distinct UUIDs and paths, or else cached data from one repository
-### might be used by another accidentally. Note also that memcached has
-### no authentication for reads or writes, so you must ensure that your
-### memcached servers are only accessible by trusted users.
-
-[caches]
-### When a cache-related error occurs, normally Subversion ignores it
-### and continues, logging an error if the server is appropriately
-### configured (and ignoring it with file:// access). To make
-### Subversion never ignore cache errors, uncomment this line.
-# fail-stop = true
-
-[rep-sharing]
-### To conserve space, the filesystem can optionally avoid storing
-### duplicate representations. This comes at a slight cost in
-### performance, as maintaining a database of shared representations can
-### increase commit times. The space savings are dependent upon the size
-### of the repository, the number of objects it contains and the amount of
-### duplication between them, usually a function of the branching and
-### merging process.
-###
-### The following parameter enables rep-sharing in the repository. It can
-### be switched on and off at will, but for best space-saving results
-### should be enabled consistently over the life of the repository.
-### rep-sharing is enabled by default.
-# enable-rep-sharing = true
diff --git a/src/test/resources/net/shibboleth/ext/spring/resource/SVN/db/min-unpacked-rev b/src/test/resources/net/shibboleth/ext/spring/resource/SVN/db/min-unpacked-rev
deleted file mode 100644
index 573541a..0000000
--- a/src/test/resources/net/shibboleth/ext/spring/resource/SVN/db/min-unpacked-rev
+++ /dev/null
@@ -1 +0,0 @@
-0
diff --git a/src/test/resources/net/shibboleth/ext/spring/resource/SVN/db/rep-cache.db b/src/test/resources/net/shibboleth/ext/spring/resource/SVN/db/rep-cache.db
deleted file mode 100644
index 0ab472a..0000000
Binary files a/src/test/resources/net/shibboleth/ext/spring/resource/SVN/db/rep-cache.db and /dev/null differ
diff --git a/src/test/resources/net/shibboleth/ext/spring/resource/SVN/db/revprops/0/0 b/src/test/resources/net/shibboleth/ext/spring/resource/SVN/db/revprops/0/0
deleted file mode 100644
index 6c57310..0000000
--- a/src/test/resources/net/shibboleth/ext/spring/resource/SVN/db/revprops/0/0
+++ /dev/null
@@ -1,5 +0,0 @@
-K 8
-svn:date
-V 27
-2017-03-20T13:37:47.224947Z
-END
diff --git a/src/test/resources/net/shibboleth/ext/spring/resource/SVN/db/revprops/0/1 b/src/test/resources/net/shibboleth/ext/spring/resource/SVN/db/revprops/0/1
deleted file mode 100644
index 921187f..0000000
--- a/src/test/resources/net/shibboleth/ext/spring/resource/SVN/db/revprops/0/1
+++ /dev/null
@@ -1,13 +0,0 @@
-K 10
-svn:author
-V 13
-Rod Widdowson
-K 8
-svn:date
-V 27
-2017-03-20T13:40:50.629236Z
-K 7
-svn:log
-V 7
-initial
-END
diff --git a/src/test/resources/net/shibboleth/ext/spring/resource/SVN/db/revprops/0/2 b/src/test/resources/net/shibboleth/ext/spring/resource/SVN/db/revprops/0/2
deleted file mode 100644
index a166421..0000000
--- a/src/test/resources/net/shibboleth/ext/spring/resource/SVN/db/revprops/0/2
+++ /dev/null
@@ -1,13 +0,0 @@
-K 10
-svn:author
-V 13
-Rod Widdowson
-K 8
-svn:date
-V 27
-2017-03-20T13:41:26.788328Z
-K 7
-svn:log
-V 6
-second
-END
diff --git a/src/test/resources/net/shibboleth/ext/spring/resource/SVN/db/revs/0/0 b/src/test/resources/net/shibboleth/ext/spring/resource/SVN/db/revs/0/0
deleted file mode 100644
index 10f5c45..0000000
--- a/src/test/resources/net/shibboleth/ext/spring/resource/SVN/db/revs/0/0
+++ /dev/null
@@ -1,11 +0,0 @@
-PLAIN
-END
-ENDREP
-id: 0.0.r0/17
-type: dir
-count: 0
-text: 0 0 4 4 2d2977d1c96f487abe4a1e202dd03b4e
-cpath: /
-
-
-17 107
diff --git a/src/test/resources/net/shibboleth/ext/spring/resource/SVN/db/revs/0/1 b/src/test/resources/net/shibboleth/ext/spring/resource/SVN/db/revs/0/1
deleted file mode 100644
index 15bd9da..0000000
Binary files a/src/test/resources/net/shibboleth/ext/spring/resource/SVN/db/revs/0/1 and /dev/null differ
diff --git a/src/test/resources/net/shibboleth/ext/spring/resource/SVN/db/revs/0/2 b/src/test/resources/net/shibboleth/ext/spring/resource/SVN/db/revs/0/2
deleted file mode 100644
index 435c8a6..0000000
Binary files a/src/test/resources/net/shibboleth/ext/spring/resource/SVN/db/revs/0/2 and /dev/null differ
diff --git a/src/test/resources/net/shibboleth/ext/spring/resource/SVN/db/txn-current b/src/test/resources/net/shibboleth/ext/spring/resource/SVN/db/txn-current
deleted file mode 100644
index 0cfbf08..0000000
--- a/src/test/resources/net/shibboleth/ext/spring/resource/SVN/db/txn-current
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/src/test/resources/net/shibboleth/ext/spring/resource/SVN/db/txn-current-lock b/src/test/resources/net/shibboleth/ext/spring/resource/SVN/db/txn-current-lock
deleted file mode 100644
index e69de29..0000000
diff --git a/src/test/resources/net/shibboleth/ext/spring/resource/SVN/db/uuid b/src/test/resources/net/shibboleth/ext/spring/resource/SVN/db/uuid
deleted file mode 100644
index 4392d35..0000000
--- a/src/test/resources/net/shibboleth/ext/spring/resource/SVN/db/uuid
+++ /dev/null
@@ -1 +0,0 @@
-8323c542-3845-444b-8505-806bfb2352f1
diff --git a/src/test/resources/net/shibboleth/ext/spring/resource/SVN/db/write-lock b/src/test/resources/net/shibboleth/ext/spring/resource/SVN/db/write-lock
deleted file mode 100644
index e69de29..0000000
diff --git a/src/test/resources/net/shibboleth/ext/spring/resource/SVN/format b/src/test/resources/net/shibboleth/ext/spring/resource/SVN/format
deleted file mode 100644
index 7ed6ff8..0000000
--- a/src/test/resources/net/shibboleth/ext/spring/resource/SVN/format
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/src/test/resources/net/shibboleth/ext/spring/resource/SVN/hooks/post-commit.tmpl b/src/test/resources/net/shibboleth/ext/spring/resource/SVN/hooks/post-commit.tmpl
deleted file mode 100644
index 98e4f80..0000000
--- a/src/test/resources/net/shibboleth/ext/spring/resource/SVN/hooks/post-commit.tmpl
+++ /dev/null
@@ -1,50 +0,0 @@
-#!/bin/sh
-
-# POST-COMMIT HOOK
-#
-# The post-commit hook is invoked after a commit. Subversion runs
-# this hook by invoking a program (script, executable, binary, etc.)
-# named 'post-commit' (for which this file is a template) with the
-# following ordered arguments:
-#
-# [1] REPOS-PATH (the path to this repository)
-# [2] REV (the number of the revision just committed)
-#
-# The default working directory for the invocation is undefined, so
-# the program should set one explicitly if it cares.
-#
-# Because the commit has already completed and cannot be undone,
-# the exit code of the hook program is ignored. The hook program
-# can use the 'svnlook' utility to help it examine the
-# newly-committed tree.
-#
-# On a Unix system, the normal procedure is to have 'post-commit'
-# invoke other programs to do the real work, though it may do the
-# work itself too.
-#
-# Note that 'post-commit' must be executable by the user(s) who will
-# invoke it (typically the user httpd runs as), and that user must
-# have filesystem-level permission to access the repository.
-#
-# On a Windows system, you should name the hook program
-# 'post-commit.bat' or 'post-commit.exe',
-# but the basic idea is the same.
-#
-# The hook program typically does not inherit the environment of
-# its parent process. For example, a common problem is for the
-# PATH environment variable to not be set to its usual value, so
-# that subprograms fail to launch unless invoked via absolute path.
-# If you're having unexpected problems with a hook program, the
-# culprit may be unusual (or missing) environment variables.
-#
-# Here is an example hook script, for a Unix /bin/sh interpreter.
-# For more examples and pre-written hooks, see those in
-# the Subversion repository at
-# http://svn.apache.org/repos/asf/subversion/trunk/tools/hook-scripts/ and
-# http://svn.apache.org/repos/asf/subversion/trunk/contrib/hook-scripts/
-
-
-REPOS="$1"
-REV="$2"
-
-mailer.py commit "$REPOS" "$REV" /path/to/mailer.conf
diff --git a/src/test/resources/net/shibboleth/ext/spring/resource/SVN/hooks/post-lock.tmpl b/src/test/resources/net/shibboleth/ext/spring/resource/SVN/hooks/post-lock.tmpl
deleted file mode 100644
index c779f11..0000000
--- a/src/test/resources/net/shibboleth/ext/spring/resource/SVN/hooks/post-lock.tmpl
+++ /dev/null
@@ -1,44 +0,0 @@
-#!/bin/sh
-
-# POST-LOCK HOOK
-#
-# The post-lock hook is run after a path is locked. Subversion runs
-# this hook by invoking a program (script, executable, binary, etc.)
-# named 'post-lock' (for which this file is a template) with the
-# following ordered arguments:
-#
-# [1] REPOS-PATH (the path to this repository)
-# [2] USER (the user who created the lock)
-#
-# The paths that were just locked are passed to the hook via STDIN (as
-# of Subversion 1.2, only one path is passed per invocation, but the
-# plan is to pass all locked paths at once, so the hook program
-# should be written accordingly).
-#
-# The default working directory for the invocation is undefined, so
-# the program should set one explicitly if it cares.
-#
-# Because the lock has already been created and cannot be undone,
-# the exit code of the hook program is ignored. The hook program
-# can use the 'svnlook' utility to help it examine the
-# newly-created lock.
-#
-# On a Unix system, the normal procedure is to have 'post-lock'
-# invoke other programs to do the real work, though it may do the
-# work itself too.
-#
-# Note that 'post-lock' must be executable by the user(s) who will
-# invoke it (typically the user httpd runs as), and that user must
-# have filesystem-level permission to access the repository.
-#
-# On a Windows system, you should name the hook program
-# 'post-lock.bat' or 'post-lock.exe',
-# but the basic idea is the same.
-#
-# Here is an example hook script, for a Unix /bin/sh interpreter:
-
-REPOS="$1"
-USER="$2"
-
-# Send email to interested parties, let them know a lock was created:
-mailer.py lock "$REPOS" "$USER" /path/to/mailer.conf
diff --git a/src/test/resources/net/shibboleth/ext/spring/resource/SVN/hooks/post-revprop-change.tmpl b/src/test/resources/net/shibboleth/ext/spring/resource/SVN/hooks/post-revprop-change.tmpl
deleted file mode 100644
index 3254f5e..0000000
--- a/src/test/resources/net/shibboleth/ext/spring/resource/SVN/hooks/post-revprop-change.tmpl
+++ /dev/null
@@ -1,56 +0,0 @@
-#!/bin/sh
-
-# POST-REVPROP-CHANGE HOOK
-#
-# The post-revprop-change hook is invoked after a revision property
-# has been added, modified or deleted. Subversion runs this hook by
-# invoking a program (script, executable, binary, etc.) named
-# 'post-revprop-change' (for which this file is a template), with the
-# following ordered arguments:
-#
-# [1] REPOS-PATH (the path to this repository)
-# [2] REV (the revision that was tweaked)
-# [3] USER (the username of the person tweaking the property)
-# [4] PROPNAME (the property that was changed)
-# [5] ACTION (the property was 'A'dded, 'M'odified, or 'D'eleted)
-#
-# [STDIN] PROPVAL ** the old property value is passed via STDIN.
-#
-# Because the propchange has already completed and cannot be undone,
-# the exit code of the hook program is ignored. The hook program
-# can use the 'svnlook' utility to help it examine the
-# new property value.
-#
-# On a Unix system, the normal procedure is to have 'post-revprop-change'
-# invoke other programs to do the real work, though it may do the
-# work itself too.
-#
-# Note that 'post-revprop-change' must be executable by the user(s) who will
-# invoke it (typically the user httpd runs as), and that user must
-# have filesystem-level permission to access the repository.
-#
-# On a Windows system, you should name the hook program
-# 'post-revprop-change.bat' or 'post-revprop-change.exe',
-# but the basic idea is the same.
-#
-# The hook program typically does not inherit the environment of
-# its parent process. For example, a common problem is for the
-# PATH environment variable to not be set to its usual value, so
-# that subprograms fail to launch unless invoked via absolute path.
-# If you're having unexpected problems with a hook program, the
-# culprit may be unusual (or missing) environment variables.
-#
-# Here is an example hook script, for a Unix /bin/sh interpreter.
-# For more examples and pre-written hooks, see those in
-# the Subversion repository at
-# http://svn.apache.org/repos/asf/subversion/trunk/tools/hook-scripts/ and
-# http://svn.apache.org/repos/asf/subversion/trunk/contrib/hook-scripts/
-
-
-REPOS="$1"
-REV="$2"
-USER="$3"
-PROPNAME="$4"
-ACTION="$5"
-
-mailer.py propchange2 "$REPOS" "$REV" "$USER" "$PROPNAME" "$ACTION" /path/to/mailer.conf
diff --git a/src/test/resources/net/shibboleth/ext/spring/resource/SVN/hooks/post-unlock.tmpl b/src/test/resources/net/shibboleth/ext/spring/resource/SVN/hooks/post-unlock.tmpl
deleted file mode 100644
index ae95c4b..0000000
--- a/src/test/resources/net/shibboleth/ext/spring/resource/SVN/hooks/post-unlock.tmpl
+++ /dev/null
@@ -1,42 +0,0 @@
-#!/bin/sh
-
-# POST-UNLOCK HOOK
-#
-# The post-unlock hook runs after a path is unlocked. Subversion runs
-# this hook by invoking a program (script, executable, binary, etc.)
-# named 'post-unlock' (for which this file is a template) with the
-# following ordered arguments:
-#
-# [1] REPOS-PATH (the path to this repository)
-# [2] USER (the user who destroyed the lock)
-#
-# The paths that were just unlocked are passed to the hook via STDIN
-# (as of Subversion 1.2, only one path is passed per invocation, but
-# the plan is to pass all unlocked paths at once, so the hook program
-# should be written accordingly).
-#
-# The default working directory for the invocation is undefined, so
-# the program should set one explicitly if it cares.
-#
-# Because the lock has already been destroyed and cannot be undone,
-# the exit code of the hook program is ignored.
-#
-# On a Unix system, the normal procedure is to have 'post-unlock'
-# invoke other programs to do the real work, though it may do the
-# work itself too.
-#
-# Note that 'post-unlock' must be executable by the user(s) who will
-# invoke it (typically the user httpd runs as), and that user must
-# have filesystem-level permission to access the repository.
-#
-# On a Windows system, you should name the hook program
-# 'post-unlock.bat' or 'post-unlock.exe',
-# but the basic idea is the same.
-#
-# Here is an example hook script, for a Unix /bin/sh interpreter:
-
-REPOS="$1"
-USER="$2"
-
-# Send email to interested parties, let them know a lock was removed:
-mailer.py unlock "$REPOS" "$USER" /path/to/mailer.conf
diff --git a/src/test/resources/net/shibboleth/ext/spring/resource/SVN/hooks/pre-commit.tmpl b/src/test/resources/net/shibboleth/ext/spring/resource/SVN/hooks/pre-commit.tmpl
deleted file mode 100644
index c478262..0000000
--- a/src/test/resources/net/shibboleth/ext/spring/resource/SVN/hooks/pre-commit.tmpl
+++ /dev/null
@@ -1,81 +0,0 @@
-#!/bin/sh
-
-# PRE-COMMIT HOOK
-#
-# The pre-commit hook is invoked before a Subversion txn is
-# committed. Subversion runs this hook by invoking a program
-# (script, executable, binary, etc.) named 'pre-commit' (for which
-# this file is a template), with the following ordered arguments:
-#
-# [1] REPOS-PATH (the path to this repository)
-# [2] TXN-NAME (the name of the txn about to be committed)
-#
-# [STDIN] LOCK-TOKENS ** the lock tokens are passed via STDIN.
-#
-# If STDIN contains the line "LOCK-TOKENS:\n" (the "\n" denotes a
-# single newline), the lines following it are the lock tokens for
-# this commit. The end of the list is marked by a line containing
-# only a newline character.
-#
-# Each lock token line consists of a URI-escaped path, followed
-# by the separator character '|', followed by the lock token string,
-# followed by a newline.
-#
-# The default working directory for the invocation is undefined, so
-# the program should set one explicitly if it cares.
-#
-# If the hook program exits with success, the txn is committed; but
-# if it exits with failure (non-zero), the txn is aborted, no commit
-# takes place, and STDERR is returned to the client. The hook
-# program can use the 'svnlook' utility to help it examine the txn.
-#
-# On a Unix system, the normal procedure is to have 'pre-commit'
-# invoke other programs to do the real work, though it may do the
-# work itself too.
-#
-# *** NOTE: THE HOOK PROGRAM MUST NOT MODIFY THE TXN, EXCEPT ***
-# *** FOR REVISION PROPERTIES (like svn:log or svn:author). ***
-#
-# This is why we recommend using the read-only 'svnlook' utility.
-# In the future, Subversion may enforce the rule that pre-commit
-# hooks should not modify the versioned data in txns, or else come
-# up with a mechanism to make it safe to do so (by informing the
-# committing client of the changes). However, right now neither
-# mechanism is implemented, so hook writers just have to be careful.
-#
-# Note that 'pre-commit' must be executable by the user(s) who will
-# invoke it (typically the user httpd runs as), and that user must
-# have filesystem-level permission to access the repository.
-#
-# On a Windows system, you should name the hook program
-# 'pre-commit.bat' or 'pre-commit.exe',
-# but the basic idea is the same.
-#
-# The hook program typically does not inherit the environment of
-# its parent process. For example, a common problem is for the
-# PATH environment variable to not be set to its usual value, so
-# that subprograms fail to launch unless invoked via absolute path.
-# If you're having unexpected problems with a hook program, the
-# culprit may be unusual (or missing) environment variables.
-#
-# Here is an example hook script, for a Unix /bin/sh interpreter.
-# For more examples and pre-written hooks, see those in
-# the Subversion repository at
-# http://svn.apache.org/repos/asf/subversion/trunk/tools/hook-scripts/ and
-# http://svn.apache.org/repos/asf/subversion/trunk/contrib/hook-scripts/
-
-
-REPOS="$1"
-TXN="$2"
-
-# Make sure that the log message contains some text.
-SVNLOOK=/usr/local/bin/svnlook
-$SVNLOOK log -t "$TXN" "$REPOS" | \
- grep "[a-zA-Z0-9]" > /dev/null || exit 1
-
-# Check that the author of this commit has the rights to perform
-# the commit on the files and directories being modified.
-commit-access-control.pl "$REPOS" "$TXN" commit-access-control.cfg || exit 1
-
-# All checks passed, so allow the commit.
-exit 0
diff --git a/src/test/resources/net/shibboleth/ext/spring/resource/SVN/hooks/pre-lock.tmpl b/src/test/resources/net/shibboleth/ext/spring/resource/SVN/hooks/pre-lock.tmpl
deleted file mode 100644
index a2e1691..0000000
--- a/src/test/resources/net/shibboleth/ext/spring/resource/SVN/hooks/pre-lock.tmpl
+++ /dev/null
@@ -1,73 +0,0 @@
-#!/bin/sh
-
-# PRE-LOCK HOOK
-#
-# The pre-lock hook is invoked before an exclusive lock is
-# created. Subversion runs this hook by invoking a program
-# (script, executable, binary, etc.) named 'pre-lock' (for which
-# this file is a template), with the following ordered arguments:
-#
-# [1] REPOS-PATH (the path to this repository)
-# [2] PATH (the path in the repository about to be locked)
-# [3] USER (the user creating the lock)
-# [4] COMMENT (the comment of the lock)
-# [5] STEAL-LOCK (1 if the user is trying to steal the lock, else 0)
-#
-# If the hook program outputs anything on stdout, the output string will
-# be used as the lock token for this lock operation. If you choose to use
-# this feature, you must guarantee the tokens generated are unique across
-# the repository each time.
-#
-# The default working directory for the invocation is undefined, so
-# the program should set one explicitly if it cares.
-#
-# If the hook program exits with success, the lock is created; but
-# if it exits with failure (non-zero), the lock action is aborted
-# and STDERR is returned to the client.
-
-# On a Unix system, the normal procedure is to have 'pre-lock'
-# invoke other programs to do the real work, though it may do the
-# work itself too.
-#
-# Note that 'pre-lock' must be executable by the user(s) who will
-# invoke it (typically the user httpd runs as), and that user must
-# have filesystem-level permission to access the repository.
-#
-# On a Windows system, you should name the hook program
-# 'pre-lock.bat' or 'pre-lock.exe',
-# but the basic idea is the same.
-#
-# Here is an example hook script, for a Unix /bin/sh interpreter:
-
-REPOS="$1"
-PATH="$2"
-USER="$3"
-COMMENT="$4"
-STEAL="$5"
-
-# If a lock exists and is owned by a different person, don't allow it
-# to be stolen (e.g., with 'svn lock --force ...').
-
-# (Maybe this script could send email to the lock owner?)
-SVNLOOK=/usr/local/bin/svnlook
-GREP=/bin/grep
-SED=/bin/sed
-
-LOCK_OWNER=`$SVNLOOK lock "$REPOS" "$PATH" | \
- $GREP '^Owner: ' | $SED 's/Owner: //'`
-
-# If we get no result from svnlook, there's no lock, allow the lock to
-# happen:
-if [ "$LOCK_OWNER" = "" ]; then
- exit 0
-fi
-
-# If the person locking matches the lock's owner, allow the lock to
-# happen:
-if [ "$LOCK_OWNER" = "$USER" ]; then
- exit 0
-fi
-
-# Otherwise, we've got an owner mismatch, so return failure:
-echo "Error: $PATH already locked by ${LOCK_OWNER}." 1>&2
-exit 1
diff --git a/src/test/resources/net/shibboleth/ext/spring/resource/SVN/hooks/pre-revprop-change.tmpl b/src/test/resources/net/shibboleth/ext/spring/resource/SVN/hooks/pre-revprop-change.tmpl
deleted file mode 100644
index af127ad..0000000
--- a/src/test/resources/net/shibboleth/ext/spring/resource/SVN/hooks/pre-revprop-change.tmpl
+++ /dev/null
@@ -1,66 +0,0 @@
-#!/bin/sh
-
-# PRE-REVPROP-CHANGE HOOK
-#
-# The pre-revprop-change hook is invoked before a revision property
-# is added, modified or deleted. Subversion runs this hook by invoking
-# a program (script, executable, binary, etc.) named 'pre-revprop-change'
-# (for which this file is a template), with the following ordered
-# arguments:
-#
-# [1] REPOS-PATH (the path to this repository)
-# [2] REV (the revision being tweaked)
-# [3] USER (the username of the person tweaking the property)
-# [4] PROPNAME (the property being set on the revision)
-# [5] ACTION (the property is being 'A'dded, 'M'odified, or 'D'eleted)
-#
-# [STDIN] PROPVAL ** the new property value is passed via STDIN.
-#
-# If the hook program exits with success, the propchange happens; but
-# if it exits with failure (non-zero), the propchange doesn't happen.
-# The hook program can use the 'svnlook' utility to examine the
-# existing value of the revision property.
-#
-# WARNING: unlike other hooks, this hook MUST exist for revision
-# properties to be changed. If the hook does not exist, Subversion
-# will behave as if the hook were present, but failed. The reason
-# for this is that revision properties are UNVERSIONED, meaning that
-# a successful propchange is destructive; the old value is gone
-# forever. We recommend the hook back up the old value somewhere.
-#
-# On a Unix system, the normal procedure is to have 'pre-revprop-change'
-# invoke other programs to do the real work, though it may do the
-# work itself too.
-#
-# Note that 'pre-revprop-change' must be executable by the user(s) who will
-# invoke it (typically the user httpd runs as), and that user must
-# have filesystem-level permission to access the repository.
-#
-# On a Windows system, you should name the hook program
-# 'pre-revprop-change.bat' or 'pre-revprop-change.exe',
-# but the basic idea is the same.
-#
-# The hook program typically does not inherit the environment of
-# its parent process. For example, a common problem is for the
-# PATH environment variable to not be set to its usual value, so
-# that subprograms fail to launch unless invoked via absolute path.
-# If you're having unexpected problems with a hook program, the
-# culprit may be unusual (or missing) environment variables.
-#
-# Here is an example hook script, for a Unix /bin/sh interpreter.
-# For more examples and pre-written hooks, see those in
-# the Subversion repository at
-# http://svn.apache.org/repos/asf/subversion/trunk/tools/hook-scripts/ and
-# http://svn.apache.org/repos/asf/subversion/trunk/contrib/hook-scripts/
-
-
-REPOS="$1"
-REV="$2"
-USER="$3"
-PROPNAME="$4"
-ACTION="$5"
-
-if [ "$ACTION" = "M" -a "$PROPNAME" = "svn:log" ]; then exit 0; fi
-
-echo "Changing revision properties other than svn:log is prohibited" >&2
-exit 1
diff --git a/src/test/resources/net/shibboleth/ext/spring/resource/SVN/hooks/pre-unlock.tmpl b/src/test/resources/net/shibboleth/ext/spring/resource/SVN/hooks/pre-unlock.tmpl
deleted file mode 100644
index 74ba2d7..0000000
--- a/src/test/resources/net/shibboleth/ext/spring/resource/SVN/hooks/pre-unlock.tmpl
+++ /dev/null
@@ -1,65 +0,0 @@
-#!/bin/sh
-
-# PRE-UNLOCK HOOK
-#
-# The pre-unlock hook is invoked before an exclusive lock is
-# destroyed. Subversion runs this hook by invoking a program
-# (script, executable, binary, etc.) named 'pre-unlock' (for which
-# this file is a template), with the following ordered arguments:
-#
-# [1] REPOS-PATH (the path to this repository)
-# [2] PATH (the path in the repository about to be unlocked)
-# [3] USER (the user destroying the lock)
-# [4] TOKEN (the lock token to be destroyed)
-# [5] BREAK-UNLOCK (1 if the user is breaking the lock, else 0)
-#
-# The default working directory for the invocation is undefined, so
-# the program should set one explicitly if it cares.
-#
-# If the hook program exits with success, the lock is destroyed; but
-# if it exits with failure (non-zero), the unlock action is aborted
-# and STDERR is returned to the client.
-
-# On a Unix system, the normal procedure is to have 'pre-unlock'
-# invoke other programs to do the real work, though it may do the
-# work itself too.
-#
-# Note that 'pre-unlock' must be executable by the user(s) who will
-# invoke it (typically the user httpd runs as), and that user must
-# have filesystem-level permission to access the repository.
-#
-# On a Windows system, you should name the hook program
-# 'pre-unlock.bat' or 'pre-unlock.exe',
-# but the basic idea is the same.
-#
-# Here is an example hook script, for a Unix /bin/sh interpreter:
-
-REPOS="$1"
-PATH="$2"
-USER="$3"
-TOKEN="$4"
-BREAK="$5"
-
-# If a lock is owned by a different person, don't allow it be broken.
-# (Maybe this script could send email to the lock owner?)
-
-SVNLOOK=/usr/local/bin/svnlook
-GREP=/bin/grep
-SED=/bin/sed
-
-LOCK_OWNER=`$SVNLOOK lock "$REPOS" "$PATH" | \
- $GREP '^Owner: ' | $SED 's/Owner: //'`
-
-# If we get no result from svnlook, there's no lock, return success:
-if [ "$LOCK_OWNER" = "" ]; then
- exit 0
-fi
-
-# If the person unlocking matches the lock's owner, return success:
-if [ "$LOCK_OWNER" = "$USER" ]; then
- exit 0
-fi
-
-# Otherwise, we've got an owner mismatch, so return failure:
-echo "Error: $PATH locked by ${LOCK_OWNER}." 1>&2
-exit 1
diff --git a/src/test/resources/net/shibboleth/ext/spring/resource/SVN/hooks/start-commit.tmpl b/src/test/resources/net/shibboleth/ext/spring/resource/SVN/hooks/start-commit.tmpl
deleted file mode 100644
index 53690d1..0000000
--- a/src/test/resources/net/shibboleth/ext/spring/resource/SVN/hooks/start-commit.tmpl
+++ /dev/null
@@ -1,65 +0,0 @@
-#!/bin/sh
-
-# START-COMMIT HOOK
-#
-# The start-commit hook is invoked before a Subversion txn is created
-# in the process of doing a commit. Subversion runs this hook
-# by invoking a program (script, executable, binary, etc.) named
-# 'start-commit' (for which this file is a template)
-# with the following ordered arguments:
-#
-# [1] REPOS-PATH (the path to this repository)
-# [2] USER (the authenticated user attempting to commit)
-# [3] CAPABILITIES (a colon-separated list of capabilities reported
-# by the client; see note below)
-#
-# Note: The CAPABILITIES parameter is new in Subversion 1.5, and 1.5
-# clients will typically report at least the "mergeinfo" capability.
-# If there are other capabilities, then the list is colon-separated,
-# e.g.: "mergeinfo:some-other-capability" (the order is undefined).
-#
-# The list is self-reported by the client. Therefore, you should not
-# make security assumptions based on the capabilities list, nor should
-# you assume that clients reliably report every capability they have.
-#
-# The working directory for this hook program's invocation is undefined,
-# so the program should set one explicitly if it cares.
-#
-# If the hook program exits with success, the commit continues; but
-# if it exits with failure (non-zero), the commit is stopped before
-# a Subversion txn is created, and STDERR is returned to the client.
-#
-# On a Unix system, the normal procedure is to have 'start-commit'
-# invoke other programs to do the real work, though it may do the
-# work itself too.
-#
-# Note that 'start-commit' must be executable by the user(s) who will
-# invoke it (typically the user httpd runs as), and that user must
-# have filesystem-level permission to access the repository.
-#
-# On a Windows system, you should name the hook program
-# 'start-commit.bat' or 'start-commit.exe',
-# but the basic idea is the same.
-#
-# The hook program typically does not inherit the environment of
-# its parent process. For example, a common problem is for the
-# PATH environment variable to not be set to its usual value, so
-# that subprograms fail to launch unless invoked via absolute path.
-# If you're having unexpected problems with a hook program, the
-# culprit may be unusual (or missing) environment variables.
-#
-# Here is an example hook script, for a Unix /bin/sh interpreter.
-# For more examples and pre-written hooks, see those in
-# the Subversion repository at
-# http://svn.apache.org/repos/asf/subversion/trunk/tools/hook-scripts/ and
-# http://svn.apache.org/repos/asf/subversion/trunk/contrib/hook-scripts/
-
-
-REPOS="$1"
-USER="$2"
-
-commit-allower.pl --repository "$REPOS" --user "$USER" || exit 1
-special-auth-check.py --user "$USER" --auth-level 3 || exit 1
-
-# All checks passed, so allow the commit.
-exit 0
diff --git a/src/test/resources/net/shibboleth/ext/spring/resource/SVN/locks/db-logs.lock b/src/test/resources/net/shibboleth/ext/spring/resource/SVN/locks/db-logs.lock
deleted file mode 100644
index 20dd636..0000000
--- a/src/test/resources/net/shibboleth/ext/spring/resource/SVN/locks/db-logs.lock
+++ /dev/null
@@ -1,3 +0,0 @@
-This file is not used by Subversion 1.3.x or later.
-However, its existence is required for compatibility with
-Subversion 1.2.x or earlier.
diff --git a/src/test/resources/net/shibboleth/ext/spring/resource/SVN/locks/db.lock b/src/test/resources/net/shibboleth/ext/spring/resource/SVN/locks/db.lock
deleted file mode 100644
index 20dd636..0000000
--- a/src/test/resources/net/shibboleth/ext/spring/resource/SVN/locks/db.lock
+++ /dev/null
@@ -1,3 +0,0 @@
-This file is not used by Subversion 1.3.x or later.
-However, its existence is required for compatibility with
-Subversion 1.2.x or earlier.
diff --git a/src/test/resources/net/shibboleth/ext/spring/resource/SVNBean.xml b/src/test/resources/net/shibboleth/ext/spring/resource/SVNBean.xml
deleted file mode 100644
index 1d81634..0000000
--- a/src/test/resources/net/shibboleth/ext/spring/resource/SVNBean.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:p="http://www.springframework.org/schema/p"
- xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
-
- <bean id="AuthnMgr" class="org.tmatesoft.svn.core.auth.BasicAuthenticationManager">
-
- <constructor-arg>
- <null />
- </constructor-arg>
- <!-- alternatively username/pass, username/KeyStore/passphrase/port see
- http://svnkit.com/javadoc/org/tmatesoft/svn/core/auth/BasicAuthenticationManager.html#constructor_detail
-
- -->
- </bean>
-
- <bean id="ClientMgr" factory-method="newInstance"
- class="org.tmatesoft.svn.core.wc.SVNClientManager"
- p:authenticationManager-ref="AuthnMgr" />
-
- <bean id="TheSVNURL" factory-method="create" class="org.tmatesoft.svn.core.SVNURL">
- <!-- see http://svnkit.com/javadoc/org/tmatesoft/svn/core/SVNURL.html -->
- <constructor-arg value="file" />
- <constructor-arg>
- <null />
- </constructor-arg>
- <constructor-arg value="" />
- <constructor-arg value="-1" />
- <constructor-arg value="%{the.SVN.Dir}" />
- <constructor-arg value="false" />
- </bean>
-
- <bean id="TheBean" class="net.shibboleth.ext.spring.resource.SVNResource">
- <constructor-arg ref="ClientMgr" />
- <constructor-arg ref="TheSVNURL" />
- <constructor-arg ref="theDir" /> <!-- set up by the test -->
- <constructor-arg value="-1" />
- <constructor-arg value="TestResource.txt" />
- </bean>
-
-</beans>
\ No newline at end of file
diff --git a/src/test/resources/net/shibboleth/ext/spring/resource/TestResource.txt b/src/test/resources/net/shibboleth/ext/spring/resource/TestResource.txt
deleted file mode 100644
index eec216c..0000000
--- a/src/test/resources/net/shibboleth/ext/spring/resource/TestResource.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-Entirely Different Data
-
-Lorem ipsum dolor sit amet, consectetur adipiscing elit. Donec a diam lectus. Sed sit amet ipsum mauris. Maecenas congue ligula ac quam viverra nec consectetur ante hendrerit. Donec et mollis dolor. Praesent et diam eget libero egestas mattis sit amet vitae augue. Nam tincidunt congue enim, ut porta lorem lacinia consectetur. Donec ut libero sed arcu vehicula ultricies a non tortor. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aenean ut gravida lorem. Ut turpis felis, pulvina [...]
-
-Vivamus fermentum semper porta. Nunc diam velit, adipiscing ut tristique vitae, sagittis vel odio. Maecenas convallis ullamcorper ultricies. Curabitur ornare, ligula semper consectetur sagittis, nisi diam iaculis velit, id fringilla sem nunc vel mi. Nam dictum, odio nec pretium volutpat, arcu ante placerat erat, non tristique elit urna et turpis. Quisque mi metus, ornare sit amet fermentum et, tincidunt et orci. Fusce eget orci a orci congue vestibulum. Ut dolor diam, elementum et vestib [...]
-
-Suspendisse lectus leo, consectetur in tempor sit amet, placerat quis neque. Etiam luctus porttitor lorem, sed suscipit est rutrum non. Curabitur lobortis nisl a enim congue semper. Aenean commodo ultrices imperdiet. Vestibulum ut justo vel sapien venenatis tincidunt. Phasellus eget dolor sit amet ipsum dapibus condimentum vitae quis lectus. Aliquam ut massa in turpis dapibus convallis. Praesent elit lacus, vestibulum at malesuada et, ornare et est. Ut augue nunc, sodales ut euismod non, [...]
-
-Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos himenaeos. In euismod ultrices facilisis. Vestibulum porta sapien adipiscing augue congue id pretium lectus molestie. Proin quis dictum nisl. Morbi id quam sapien, sed vestibulum sem. Duis elementum rutrum mauris sed convallis. Proin vestibulum magna mi. Aenean tristique hendrerit magna, ac facilisis nulla hendrerit ut. Sed non tortor sodales quam auctor elementum. Donec hendrerit nunc eget elit pharetra pul [...]
\ No newline at end of file
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list