Changeset 852 for java/SVNAccess

Timestamp:

May 3, 2013, 2:25:21 PM (12 years ago)

Author:

alloc

Message:

AEI2.08, AEIUpdater:

• Fixes #3

Location:

java/SVNAccess

Files:

• .classpath (modified) (1 diff)
• src/net/oni2/svnaccess/SVN.java (modified) (5 diffs)

java/SVNAccess/.classpath

@@ -7 +7 @@
         <classpathentry exported="true" kind="lib" path="/_ThirdPartyLibs/svnkit/sqljet-1.1.6.jar"/>
         <classpathentry exported="true" kind="lib" path="/_ThirdPartyLibs/svnkit/svnkit-1.7.8.jar" sourcepath="/home/ci/.m2/repository/org/tmatesoft/svnkit/svnkit/1.7.8/svnkit-1.7.8-sources.jar"/>
+        <classpathentry combineaccessrules="false" kind="src" path="/ProxySettings"/>
         <classpathentry kind="output" path="bin"/>
 </classpath>

java/SVNAccess/src/net/oni2/svnaccess/SVN.java

@@ -5 +5 @@
 import java.io.File;
 import java.util.Vector;
+
+import net.oni2.ProxySettings;
 
 import org.tmatesoft.svn.core.SVNDepth;
@@ -10 +12 @@
 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.SVNAuthentication;
 import org.tmatesoft.svn.core.internal.io.dav.DAVRepositoryFactory;
 import org.tmatesoft.svn.core.internal.io.fs.FSRepositoryFactory;
@@ -30 +34 @@
         SVNClientManager svnCManager = null;
 
-        /**
-         * Constructor
-         */
-        public SVN() {
+        private void setup() {
                 // For using over http:// and https://
                 DAVRepositoryFactory.setup();
@@ -40 +41 @@
                 // For using over file:///
                 FSRepositoryFactory.setup();
-
-                svnCManager = SVNClientManager.newInstance(SVNWCUtil
-                                .createDefaultOptions(true));
+        }
+
+        private void setProxy(BasicAuthenticationManager authMan) {
+                ProxySettings prox = ProxySettings.getInstance();
+                if (prox.validate()) {
+                        authMan.setProxy(prox.getHostOrIp(), prox.getPort(), null, null);
+                }
+        }
+
+        private BasicAuthenticationManager getAuthManager() {
+                BasicAuthenticationManager auth = new BasicAuthenticationManager(
+                                new SVNAuthentication[0]);
+                setProxy(auth);
+                return auth;
+        }
+
+        private BasicAuthenticationManager getAuthManager(String username,
+                        String password) {
+                BasicAuthenticationManager auth = new BasicAuthenticationManager(
+                                username, password);
+                setProxy(auth);
+                return auth;
+        }
+
+        /**
+         * Constructor
+         */
+        public SVN() {
+                setup();
+
+                svnCManager = SVNClientManager.newInstance(
+                                SVNWCUtil.createDefaultOptions(true), getAuthManager());
         }
 
@@ -54 +84 @@
          */
         public SVN(String username, String password) {
-                // For using over http:// and https://
-                DAVRepositoryFactory.setup();
-                // For using over svn:// and svn+xxx://
-                SVNRepositoryFactoryImpl.setup();
-                // For using over file:///
-                FSRepositoryFactory.setup();
+                setup();
 
                 svnCManager = SVNClientManager.newInstance(
-                                SVNWCUtil.createDefaultOptions(true), username, password);
+                                SVNWCUtil.createDefaultOptions(true),
+                                getAuthManager(username, password));
         }