- Buix-commits - mailman.cloud.codelutin.com

r652 - trunk/lutinvcs/ui/jaxx/src/main/uimodel/org/codelutin/vcs/ui
by tchemit＠users.labs.libre-entreprise.org May 13, 2008

May 13, 2008

Author: tchemit Date: 2008-05-13 14:15:29 +0000 (Tue, 13 May 2008) New Revision: 652 Modified: trunk/lutinvcs/ui/jaxx/src/main/uimodel/org/codelutin/vcs/ui/JaxxConnexionConfigUI.jaxx trunk/lutinvcs/ui/jaxx/src/main/uimodel/org/codelutin/vcs/ui/JaxxIdentityUI.jaxx trunk/lutinvcs/ui/jaxx/src/main/uimodel/org/codelutin/vcs/ui/config.css Log: refactor config + introduction factory de config Modified: trunk/lutinvcs/ui/jaxx/src/main/uimodel/org/codelutin/vcs/ui/JaxxConnexionConfigUI.jaxx =================================================================== --- trunk/lutinvcs/ui/jaxx/src/main/uimodel/org/codelutin/vcs/ui/JaxxConnexionConfigUI.jaxx 2008-05-13 14:14:17 UTC (rev 651) +++ trunk/lutinvcs/ui/jaxx/src/main/uimodel/org/codelutin/vcs/ui/JaxxConnexionConfigUI.jaxx 2008-05-13 14:15:29 UTC (rev 652) @@ -105,7 +105,7 @@ <row fill='horizontal'> <cell columns="2" fill='both'> <JToolBar id='rootHead' opaque='false' height='26'> - <JComboBox id='rootsList' /> + <JComboBox id='rootsList'/> <JButton id='editRoot' icon='{createActionIcon("editroot")}' borderPainted='false' onActionPerformed="editRoot()"/> <JButton id='addRoot' icon='{createActionIcon("addroot")}' borderPainted='false' onActionPerformed="addRoot()"/> <JButton id='deleteRoot' icon='{createActionIcon("deleteroot")}' borderPainted='false' onActionPerformed="deleteRoot()"/> @@ -121,6 +121,16 @@ </cell> </row> <row fill='horizontal'> + <cell columns="2" fill='horizontal'> + <JToolBar opaque='false' height="24"> + <JLabel id='workingCopyFileLabel'/> + <JTextField id='workingCopyFile' onKeyReleased="doCheck(Element.workingCopyFile)"/> + <JButton id='changeWorkingCopyFile' icon='{createActionIcon("filechooser")}' + onActionPerformed="changeWorkingCopyFile()"/> + </JToolBar> + </cell> + </row> + <row fill='horizontal'> <cell weightx='1'> <JButton id='ok' onActionPerformed="save()"/> </cell> Modified: trunk/lutinvcs/ui/jaxx/src/main/uimodel/org/codelutin/vcs/ui/JaxxIdentityUI.jaxx =================================================================== --- trunk/lutinvcs/ui/jaxx/src/main/uimodel/org/codelutin/vcs/ui/JaxxIdentityUI.jaxx 2008-05-13 14:14:17 UTC (rev 651) +++ trunk/lutinvcs/ui/jaxx/src/main/uimodel/org/codelutin/vcs/ui/JaxxIdentityUI.jaxx 2008-05-13 14:15:29 UTC (rev 652) @@ -17,18 +17,18 @@ <Table> <row fill='horizontal'> <cell> - <JLabel id='firstnameLabel'/> + <JLabel id='firstNameLabel'/> </cell> <cell> - <JTextField id='firstname' onKeyReleased="doCheck(Element.firstname)"/> + <JTextField id='firstName' onKeyReleased="doCheck(Element.firstName)"/> </cell> </row> <row fill='horizontal'> <cell> - <JLabel id='lastnameLabel'/> + <JLabel id='lastNameLabel'/> </cell> <cell> - <JTextField id='lastname' onKeyReleased="doCheck(Element.lastname)"/> + <JTextField id='lastName' onKeyReleased="doCheck(Element.lastName)"/> </cell> </row> <row fill='horizontal'> Modified: trunk/lutinvcs/ui/jaxx/src/main/uimodel/org/codelutin/vcs/ui/config.css =================================================================== --- trunk/lutinvcs/ui/jaxx/src/main/uimodel/org/codelutin/vcs/ui/config.css 2008-05-13 14:14:17 UTC (rev 651) +++ trunk/lutinvcs/ui/jaxx/src/main/uimodel/org/codelutin/vcs/ui/config.css 2008-05-13 14:15:29 UTC (rev 652) @@ -20,12 +20,12 @@ #identityLabel { text: "lutinvcs.config.identiy"; } -#firstnameLabel { - text: "lutinvcs.config.firstname"; +#firstNameLabel { + text: "lutinvcs.config.firstName"; } -#lastnameLabel { - text: "lutinvcs.config.lastname"; +#lastNameLabel { + text: "lutinvcs.config.lastName"; } #emailLabel { @@ -73,6 +73,10 @@ text: "lutinvcs.config.server.ssh.privateKeyFile"; } +#workingCopyFileLabel { + text: "lutinvcs.config.workingCopyFile"; +} + #changePrivateKeyFile { toolTipText: "lutinvcs.config.server.ssh.key.change"; opaque:false; @@ -80,6 +84,13 @@ margin:0; } +#changeWorkingCopyFile { + toolTipText: "lutinvcs.config.workingCopyFile.change"; + opaque:false; + borderPainted:false; + margin:0; +} + #changeDir { toolTipText: "lutinvcs.config.change.dir"; opaque:false;

1 0

r651 - trunk/lutinvcs/core/src/main/java/org/codelutin/vcs/util
by tchemit＠users.labs.libre-entreprise.org May 13, 2008

May 13, 2008

Author: tchemit Date: 2008-05-13 14:14:17 +0000 (Tue, 13 May 2008) New Revision: 651 Added: trunk/lutinvcs/core/src/main/java/org/codelutin/vcs/util/SimpleVCSConnexionConfig.java Log: refactor config + introduction factory de config Added: trunk/lutinvcs/core/src/main/java/org/codelutin/vcs/util/SimpleVCSConnexionConfig.java =================================================================== --- trunk/lutinvcs/core/src/main/java/org/codelutin/vcs/util/SimpleVCSConnexionConfig.java (rev 0) +++ trunk/lutinvcs/core/src/main/java/org/codelutin/vcs/util/SimpleVCSConnexionConfig.java 2008-05-13 14:14:17 UTC (rev 651) @@ -0,0 +1,121 @@ +/** + * # #% Copyright (C) 2008 Code Lutin, Tony Chemit + * This program is free software; you + * can redistribute it and/or modify it under the terms of the GNU General + * Public License as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. This program is + * distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A + * PARTICULAR PURPOSE. See the GNU General Public License for more details. You + * should have received a copy of the GNU General Public License along with this + * program; if not, write to the Free Software Foundation, Inc., 59 Temple Place + * - Suite 330, Boston, MA 02111-1307, USA. + * # #% + */ +package org.codelutin.vcs.util; + +import org.codelutin.vcs.VCSConnexionConfig; +import org.codelutin.vcs.VCSRootConfig; +import org.codelutin.vcs.type.VCSConnexionConfigProperty; +import static org.codelutin.vcs.type.VCSConnexionConfigProperty.*; +import org.codelutin.vcs.type.VCSConnexionMode; +import org.codelutin.vcs.type.VCSTypeRepo; + +import java.io.File; +import java.util.EnumMap; + +/** @author chemit */ +public class SimpleVCSConnexionConfig extends org.codelutin.util.config.SimpleConfig<VCSConnexionConfigProperty> implements VCSConnexionConfig { + + public SimpleVCSConnexionConfig() { + super(VCSConnexionConfigProperty.class); + } + + public SimpleVCSConnexionConfig(EnumMap<VCSConnexionConfigProperty, Object> properties) { + super(VCSConnexionConfigProperty.class, properties); + } + + public VCSRootConfig getRootConfig() { + return (VCSRootConfig) properties.get(rootConfig); + } + + public VCSTypeRepo getTypeRepo() { + return (VCSTypeRepo) properties.get(typeRepo); + } + + public String getTypeRepoValue() { + return (String) properties.get(typeRepoValue); + } + + public File getWorkingCopyFile() { + return (File) properties.get(workingCopyFile); + } + + public VCSConnexionMode getConnexionMode() { + return (VCSConnexionMode) properties.get(connexionMode); + } + + public String getLogin() { + return (String) properties.get(login); + } + + public String getPassword() { + return (String) properties.get(password); + } + + public String getSshLogin() { + return (String) properties.get(sshLogin); + } + + public String getSshPassphrase() { + return (String) properties.get(sshPassphrase); + } + + public File getSshPrivateKeyFile() { + return (File) properties.get(sshPrivateKeyFile); + } + + public void setRootConfig(VCSRootConfig newRootConfig) { + setProperty(rootConfig, newRootConfig); + } + + public void setTypeRepo(VCSTypeRepo newTypeRepo) { + setProperty(typeRepo, newTypeRepo); + } + + public void setTypeRepoValue(String newTypeRepoValue) { + setProperty(typeRepoValue, newTypeRepoValue); + } + + public void setWorkingCopyFile(File newLocalDatabasePath) { + setProperty(workingCopyFile, newLocalDatabasePath); + } + + public void setConnexionMode(VCSConnexionMode newConnexionMode) { + setProperty(connexionMode, newConnexionMode); + } + + public void setLogin(String newLogin) { + setProperty(login, newLogin); + } + + public void setPassword(String newPassword) { + setProperty(password, newPassword); + } + + public void setSshLogin(String newSshLogin) { + setProperty(sshLogin, newSshLogin); + } + + public void setSshPassphrase(String newSshPassphrase) { + setProperty(sshPassphrase, newSshPassphrase); + } + + public void setSshPrivateKeyFile(File newSshPrivateKeyFile) { + setProperty(sshPrivateKeyFile, newSshPrivateKeyFile); + } + + public boolean isNoPassPhrase() { + return getSshPassphrase() == null; + } +}

1 0

r650 - trunk/lutinvcs/core/src/main/java/org/codelutin/vcs
by tchemit＠users.labs.libre-entreprise.org May 13, 2008

May 13, 2008

Author: tchemit Date: 2008-05-13 14:14:09 +0000 (Tue, 13 May 2008) New Revision: 650 Added: trunk/lutinvcs/core/src/main/java/org/codelutin/vcs/VCSConfigFactory.java Log: refactor config + introduction factory de config Copied: trunk/lutinvcs/core/src/main/java/org/codelutin/vcs/VCSConfigFactory.java (from rev 630, trunk/lutinvcs/core/src/main/java/org/codelutin/vcs/VCSFactory.java) =================================================================== --- trunk/lutinvcs/core/src/main/java/org/codelutin/vcs/VCSConfigFactory.java (rev 0) +++ trunk/lutinvcs/core/src/main/java/org/codelutin/vcs/VCSConfigFactory.java 2008-05-13 14:14:09 UTC (rev 650) @@ -0,0 +1,116 @@ +/* *##% +* Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007 Code Lutin, +* Benjamin Poussin, Tony Chemit +* +* +* This program is free software; you can redistribute it and/or +* modify it under the terms of the GNU General Public License +* as published by the Free Software Foundation; either version 2 +* of the License, or (at your option) any later version. +* +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* +* You should have received a copy of the GNU General Public License +* along with this program; if not, write to the Free Software +* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +*##%*/ +package org.codelutin.vcs; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.codelutin.util.config.IdentityConfig; +import org.codelutin.util.config.SimpleIdentityConfig; +import org.codelutin.vcs.util.SimpleVCSConnexionConfig; +import org.codelutin.vcs.util.SimpleVCSRootConfig; +import org.codelutin.vcs.type.VCSConnexionConfigProperty; + +import java.util.ArrayList; +import java.util.List; +import java.util.EnumMap; + +/** + * This classes acts as a factory of {@link org.codelutin.vcs.VCSProvider}, and {@link org.codelutin.vcs.VCSConnexion}. + * + * @author chemit + * @see VCSConnexionConfig + * @see VCSRootConfig + */ +(a)org.codelutin.i18n.I18nable +public class VCSConfigFactory { + + static protected final Log log = LogFactory.getLog(VCSConfigFactory.class); + + /** + * shared instance + */ + static protected VCSConfigFactory instance; + + /** + * root configs indexed by their name + */ + protected final java.util.Map<String, VCSRootConfig> roots; + + /** + * connexion configs indexed by their rootConfig name + */ + protected final List<VCSConnexionConfig> connexions; + + + public static VCSConfigFactory getInstance() { + if (instance == null) { + instance = new VCSConfigFactory(); + } + return instance; + } + + public static IdentityConfig newIdentity(String firstName, String lastName, String email) { + IdentityConfig config = new SimpleIdentityConfig(firstName, lastName, email); + log.info(config); + return config; + } + + public List<VCSRootConfig> getRoots() { + return new ArrayList<VCSRootConfig>(roots.values()); + } + + public List<VCSConnexionConfig> getConnexions() { + return connexions; + } + + public static VCSRootConfig newRoot(String name, String type, String host, String repository, Integer port) { + if (getInstance().roots.containsKey(name)) { + // can not + throw new IllegalStateException("can not create roots " + name + ", already existing "); + } + VCSRootConfig config = new SimpleVCSRootConfig(name, type, host, repository, port); + log.info(config); + getInstance().roots.put(name, config); + return config; + } + + public static VCSConnexionConfig newConnexion(String rootName, EnumMap<VCSConnexionConfigProperty, Object> props) { + if (!getInstance().roots.containsKey(rootName)) { + // can not + throw new IllegalStateException("unfound root " + rootName); + } + + VCSConnexionConfig config = new SimpleVCSConnexionConfig(props); + if (props==null || !props.containsKey(VCSConnexionConfigProperty.rootConfig)) { + // force to add rootConfig + config.setRootConfig(getInstance().roots.get(rootName)); + } + log.info(config); + getInstance().connexions.add(config); + return config; + } + + + protected VCSConfigFactory() { + roots = new java.util.HashMap<String, VCSRootConfig>(); + connexions = new ArrayList<VCSConnexionConfig>(); + } + +} \ No newline at end of file

1 0

r649 - in trunk/lutinvcs/core/src/main/java/org/codelutin/vcs: . util
by tchemit＠users.labs.libre-entreprise.org May 13, 2008

May 13, 2008

Author: tchemit Date: 2008-05-13 14:14:01 +0000 (Tue, 13 May 2008) New Revision: 649 Modified: trunk/lutinvcs/core/src/main/java/org/codelutin/vcs/VCSConnexion.java trunk/lutinvcs/core/src/main/java/org/codelutin/vcs/VCSFactory.java trunk/lutinvcs/core/src/main/java/org/codelutin/vcs/util/AbstractVCSConnexion.java trunk/lutinvcs/core/src/main/java/org/codelutin/vcs/util/AbstractVCSHandler.java trunk/lutinvcs/core/src/main/java/org/codelutin/vcs/util/VCSConnexionConfigImpl.java Log: refactor config + introduction factory de config Modified: trunk/lutinvcs/core/src/main/java/org/codelutin/vcs/VCSConnexion.java =================================================================== --- trunk/lutinvcs/core/src/main/java/org/codelutin/vcs/VCSConnexion.java 2008-05-13 14:11:42 UTC (rev 648) +++ trunk/lutinvcs/core/src/main/java/org/codelutin/vcs/VCSConnexion.java 2008-05-13 14:14:01 UTC (rev 649) @@ -61,7 +61,7 @@ * @return the mode of this connexion * @throws IllegalStateException if {@link #init(VCSConnexionConfig)} was not invoked before. */ - VCSConnexionMode getMode() throws IllegalStateException; + VCSConnexionMode getConnexionMode() throws IllegalStateException; /** * @return the config of the connexion Modified: trunk/lutinvcs/core/src/main/java/org/codelutin/vcs/VCSFactory.java =================================================================== --- trunk/lutinvcs/core/src/main/java/org/codelutin/vcs/VCSFactory.java 2008-05-13 14:11:42 UTC (rev 648) +++ trunk/lutinvcs/core/src/main/java/org/codelutin/vcs/VCSFactory.java 2008-05-13 14:14:01 UTC (rev 649) @@ -80,7 +80,7 @@ VCSFactory factory = getInstance(); // obtain matching provider - VCSProvider<?, ?> provider = factory.getProvider(config.getType().toUpperCase()); + VCSProvider<?, ?> provider = factory.getProvider(config.getRootConfig().getType().toUpperCase()); // delegate instanciation of connexion to provider VCSConnexion connexion = provider.newConnection(config); Modified: trunk/lutinvcs/core/src/main/java/org/codelutin/vcs/util/AbstractVCSConnexion.java =================================================================== --- trunk/lutinvcs/core/src/main/java/org/codelutin/vcs/util/AbstractVCSConnexion.java 2008-05-13 14:11:42 UTC (rev 648) +++ trunk/lutinvcs/core/src/main/java/org/codelutin/vcs/util/AbstractVCSConnexion.java 2008-05-13 14:14:01 UTC (rev 649) @@ -43,8 +43,11 @@ static protected final Log log = LogFactory.getLog(AbstractVCSConnexion.class); protected File localRoot; + protected URI remoteRoot; + protected VCSConnectionState state; + protected VCSConnexionConfig config; protected H handler; @@ -65,19 +68,22 @@ public File getWorkingCopy() throws IllegalStateException { checkInit(); if (localRoot == null) { - localRoot = getConfig().getLocalDatabasePath(); + localRoot = getConfig().getWorkingCopyFile(); } return localRoot; } public URI getRemoteURI() throws IllegalStateException { checkInit(); + if (remoteRoot == null) { + remoteRoot = getURIResolver().resolv(config); + } return remoteRoot; } - public VCSConnexionMode getMode() throws IllegalStateException { + public VCSConnexionMode getConnexionMode() throws IllegalStateException { checkInit(); - return getConfig().getMode(); + return getConfig().getConnexionMode(); } public VCSConnexionConfig getConfig() throws IllegalStateException { @@ -108,7 +114,7 @@ } public boolean hasWriteAccess() { - return !getConfig().isUseSshConnexion() && getMode() != VCSConnexionMode.ANONYMOUS; + return getConnexionMode() != VCSConnexionMode.ANONYMOUS; } public void addVCSHandlerEventListener(VCSConnexionEventListener l) { Modified: trunk/lutinvcs/core/src/main/java/org/codelutin/vcs/util/AbstractVCSHandler.java =================================================================== --- trunk/lutinvcs/core/src/main/java/org/codelutin/vcs/util/AbstractVCSHandler.java 2008-05-13 14:11:42 UTC (rev 648) +++ trunk/lutinvcs/core/src/main/java/org/codelutin/vcs/util/AbstractVCSHandler.java 2008-05-13 14:14:01 UTC (rev 649) @@ -107,9 +107,9 @@ } public void deleteWorkingCopy() { - if (connexion.getConfig().getLocalDatabasePath().exists()) { - FileUtil.deleteRecursively(connexion.getConfig().getLocalDatabasePath()); - connexion.getConfig().getLocalDatabasePath().delete(); + if (connexion.getConfig().getWorkingCopyFile().exists()) { + FileUtil.deleteRecursively(connexion.getConfig().getWorkingCopyFile()); + connexion.getConfig().getWorkingCopyFile().delete(); } } @@ -192,7 +192,7 @@ public boolean isFileInWorkingCopy(File file, boolean underVCS) { if (file == null) throw new RuntimeException(AbstractVCSHandler.class.getName() + "#isFileInWorkingCopy can not be invoked with some null parameter but was. [" + file + "," + this + "]"); - String rootPath = connexion.getConfig().getLocalDatabasePath().getAbsolutePath(); + String rootPath = connexion.getConfig().getWorkingCopyFile().getAbsolutePath(); String localPath = file.getAbsolutePath(); if (localPath.startsWith(rootPath) && !underVCS) { return true; @@ -211,13 +211,13 @@ public void assertFileInWC(File file) { if (!isFileInWorkingCopy(file, false)) - throw new VCSRuntimeException("the file [" + file + "] is not in the working copy [" + connexion.getConfig().getLocalDatabasePath() + "]"); + throw new VCSRuntimeException("the file [" + file + "] is not in the working copy [" + connexion.getConfig().getWorkingCopyFile() + "]"); } public String getRemoteRelativePath(File f) { if (!isFileInWorkingCopy(f, false)) return null; //System.out.println("file on vcs working copy : "+f); - String rootPath = connexion.getConfig().getLocalDatabasePath().getAbsolutePath(); + String rootPath = connexion.getConfig().getWorkingCopyFile().getAbsolutePath(); String localPath = f.getAbsolutePath(); if (!localPath.startsWith(rootPath)) return null; localPath = localPath.substring(rootPath.length() + 1); @@ -226,7 +226,7 @@ public String getLocalRelativePath(String remoteRelativePath) { String localPath = convertToLocalName(remoteRelativePath); - final File file = new File(connexion.getConfig().getLocalDatabasePath(), localPath); + final File file = new File(connexion.getConfig().getWorkingCopyFile(), localPath); if (!isFileInWorkingCopy(file, false)) return null; return localPath; } Modified: trunk/lutinvcs/core/src/main/java/org/codelutin/vcs/util/VCSConnexionConfigImpl.java =================================================================== --- trunk/lutinvcs/core/src/main/java/org/codelutin/vcs/util/VCSConnexionConfigImpl.java 2008-05-13 14:11:42 UTC (rev 648) +++ trunk/lutinvcs/core/src/main/java/org/codelutin/vcs/util/VCSConnexionConfigImpl.java 2008-05-13 14:14:01 UTC (rev 649) @@ -15,13 +15,17 @@ package org.codelutin.vcs.util; import org.codelutin.vcs.VCSConnexionConfig; +import org.codelutin.vcs.type.VCSConnexionMode; import org.codelutin.vcs.type.VCSTypeRepo; -import org.codelutin.vcs.type.VCSConnexionMode; import java.io.File; -/** @author chemit */ -public class VCSConnexionConfigImpl implements VCSConnexionConfig { +/** + * POJO implementation of {@link VCSConnexionConfig} + * + * @author chemit + */ +public class VCSConnexionConfigImpl { protected String type; protected boolean useSshConnexion; @@ -65,8 +69,8 @@ } public String getPassphrase() { - if (passPhrase==null) { - passPhrase=""; + if (passPhrase == null) { + passPhrase = ""; } return passPhrase; } @@ -136,6 +140,6 @@ } public void setConnexionMode(VCSConnexionMode mode) { - this.mode=mode; + this.mode = mode; } }

1 0

r648 - trunk/lutinui/src/main/java/org/codelutin/ui
by tchemit＠users.labs.libre-entreprise.org May 13, 2008

May 13, 2008

Author: tchemit Date: 2008-05-13 14:11:42 +0000 (Tue, 13 May 2008) New Revision: 648 Modified: trunk/lutinui/src/main/java/org/codelutin/ui/DialogConfigUIHandler.java Log: refactor config Modified: trunk/lutinui/src/main/java/org/codelutin/ui/DialogConfigUIHandler.java =================================================================== --- trunk/lutinui/src/main/java/org/codelutin/ui/DialogConfigUIHandler.java 2008-05-13 13:24:16 UTC (rev 647) +++ trunk/lutinui/src/main/java/org/codelutin/ui/DialogConfigUIHandler.java 2008-05-13 14:11:42 UTC (rev 648) @@ -46,7 +46,7 @@ if (DialogConfigUIModel.CONFIG_PROPERTY_CHANGED.equals(action)) { // update ui with model values, - populateUI((M) evt.getNewValue()); + populateUI(); doCheck(null); return; } @@ -80,18 +80,7 @@ M model = getModel(); String value = ui.getElementValue(element); - - switch (element) { - case email: - modify = !model.getCurrent().getEmail().equals(value); - break; - case firstName: - modify = !model.getCurrent().getFirstName().equals(value); - break; - case lastName: - modify = !model.getCurrent().getLastName().equals(value); - break; - } + //TODO if (modify) { model.addModified(element); } else if (model.getModifieds().contains(element)) { @@ -158,7 +147,8 @@ } for (E element : getModel().getModifieds()) { String value = getUi().getElementValue(element); - getModel().save(element, value); + //TODO + //getModel().save(element, value); log.info("save " + element); } }

1 0

r647 - trunk/lutinvcs/core/src/main/java/org/codelutin/vcs/type
by tchemit＠users.labs.libre-entreprise.org May 13, 2008

May 13, 2008

Author: tchemit Date: 2008-05-13 13:24:16 +0000 (Tue, 13 May 2008) New Revision: 647 Modified: trunk/lutinvcs/core/src/main/java/org/codelutin/vcs/type/VCSConnexionConfigProperty.java trunk/lutinvcs/core/src/main/java/org/codelutin/vcs/type/VCSConnexionMode.java Log: refactor config Modified: trunk/lutinvcs/core/src/main/java/org/codelutin/vcs/type/VCSConnexionConfigProperty.java =================================================================== --- trunk/lutinvcs/core/src/main/java/org/codelutin/vcs/type/VCSConnexionConfigProperty.java 2008-05-13 12:47:51 UTC (rev 646) +++ trunk/lutinvcs/core/src/main/java/org/codelutin/vcs/type/VCSConnexionConfigProperty.java 2008-05-13 13:24:16 UTC (rev 647) @@ -9,33 +9,34 @@ * PARTICULAR PURPOSE. See the GNU General Public License for more details. You * should have received a copy of the GNU General Public License along with this * program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - * - Suite 330, Boston, MA 02111-1307, USA. + * - Suite 330, Boston, MA 02111-1307, USA. * ##% */ package org.codelutin.vcs.type; -import org.codelutin.vcs.VCSConnexionConfig; - /** - * Enumaration of properties useable in a {@link VCSConnexionConfig} + * Enumaration of properties useable in a {@link org.codelutin.vcs.VCSConnexionConfig} * * @author chemit - * @see VCSConnexionConfig + * @see org.codelutin.vcs.VCSConnexionConfig */ public enum VCSConnexionConfigProperty { /** property <code>rootConfig</code>, as a {@link org.codelutin.vcs.VCSRootConfig} */ rootConfig, - /** property <code>connexionMode</code>, as a {@link org.codelutin.vcs.type.VCSConnexionMode} */ - connexionMode, - /** property <code>typeRepo</code>, type of repo to use, as a {@link VCSTypeRepo} */ typeRepo, /** property <code>typeRepoValue</code>, the value associated to typeRepo (eg, branch or tag name, null for a head connexion) */ typeRepoValue, + /** property <code>workingCopyFile</code>, the location of local working copy, it null (no working copy declared) */ + workingCopyFile, + + /** property <code>connexionMode</code>, as a {@link org.codelutin.vcs.type.VCSConnexionMode} */ + connexionMode, + /** property <code>login</code>, login for a password connexion */ login, @@ -49,8 +50,5 @@ sshPassphrase, /** property <code>sshPrivateKey</code>, path of the ssh private key file for a ssh connexion */ - sshPrivateKeyFile, - - /** property <code>localDatabasePath</code>, path of the local working copy */ - localDatabasePath + sshPrivateKeyFile } \ No newline at end of file Modified: trunk/lutinvcs/core/src/main/java/org/codelutin/vcs/type/VCSConnexionMode.java =================================================================== --- trunk/lutinvcs/core/src/main/java/org/codelutin/vcs/type/VCSConnexionMode.java 2008-05-13 12:47:51 UTC (rev 646) +++ trunk/lutinvcs/core/src/main/java/org/codelutin/vcs/type/VCSConnexionMode.java 2008-05-13 13:24:16 UTC (rev 647) @@ -9,20 +9,19 @@ * PARTICULAR PURPOSE. See the GNU General Public License for more details. You * should have received a copy of the GNU General Public License along with this * program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - * - Suite 330, Boston, MA 02111-1307, USA. + * - Suite 330, Boston, MA 02111-1307, USA. * ##% */ package org.codelutin.vcs.type; -import org.codelutin.vcs.VCSConnexionConfig; import static org.codelutin.vcs.type.VCSConnexionConfigProperty.login; import static org.codelutin.vcs.type.VCSConnexionConfigProperty.password; import static org.codelutin.vcs.type.VCSConnexionConfigProperty.sshLogin; import static org.codelutin.vcs.type.VCSConnexionConfigProperty.sshPassphrase; import static org.codelutin.vcs.type.VCSConnexionConfigProperty.sshPrivateKeyFile; -import java.util.EnumSet; import java.util.Arrays; +import java.util.EnumSet; /** * Enumaration of connexion mode. @@ -31,7 +30,7 @@ * * @author chemit * @see VCSConnexionConfigProperty - * @see VCSConnexionConfig + * @see org.codelutin.vcs.VCSConnexionConfig */ public enum VCSConnexionMode { ANONYMOUS, @@ -42,10 +41,10 @@ private final EnumSet<VCSConnexionConfigProperty> authenticationProperties; VCSConnexionMode(VCSConnexionConfigProperty... authenticationProperties) { - this.authenticationProperties = EnumSet.copyOf(Arrays.asList(authenticationProperties)); + this.authenticationProperties = authenticationProperties.length == 0 ? EnumSet.noneOf(VCSConnexionConfigProperty.class) : EnumSet.copyOf(Arrays.asList(authenticationProperties)); } public EnumSet<VCSConnexionConfigProperty> getAuthenticationProperties() { return authenticationProperties; } -} +} \ No newline at end of file

1 0

April 27, 2008

Author: tchemit Date: 2008-04-27 14:15:39 +0000 (Sun, 27 Apr 2008) New Revision: 643 Added: trunk/lutinvcs/core/src/main/java/org/codelutin/vcs/VCSURIResolver.java trunk/lutinvcs/core/src/main/java/org/codelutin/vcs/type/VCSConnexionConfigProperty.java trunk/lutinvcs/provider/cvs/src/main/java/org/codelutin/vcs/provider/cvs/CVSURIResolver.java trunk/lutinvcs/provider/mock/src/main/java/org/codelutin/vcs/provider/mock/MockURIResolver.java trunk/lutinvcs/provider/svn/src/main/java/org/codelutin/vcs/provider/svn/SVNURIResolver.java Modified: trunk/lutinvcs/core/src/main/java/org/codelutin/vcs/VCSCommon.java trunk/lutinvcs/core/src/main/java/org/codelutin/vcs/VCSConnexion.java trunk/lutinvcs/core/src/main/java/org/codelutin/vcs/VCSFactory.java trunk/lutinvcs/core/src/main/java/org/codelutin/vcs/VCSProvider.java trunk/lutinvcs/core/src/main/java/org/codelutin/vcs/type/VCSConnectionState.java trunk/lutinvcs/core/src/main/java/org/codelutin/vcs/type/VCSConnexionMode.java trunk/lutinvcs/core/src/main/java/org/codelutin/vcs/util/AbstractVCSConnexion.java trunk/lutinvcs/core/src/main/java/org/codelutin/vcs/util/AbstractVCSHandler.java trunk/lutinvcs/core/src/main/java/org/codelutin/vcs/util/AbstractVCSProvider.java trunk/lutinvcs/provider/cvs/src/main/java/org/codelutin/vcs/provider/CVSProvider.java trunk/lutinvcs/provider/cvs/src/main/java/org/codelutin/vcs/provider/cvs/CVSConnexion.java trunk/lutinvcs/provider/mock/src/main/java/org/codelutin/vcs/provider/MockProvider.java trunk/lutinvcs/provider/mock/src/main/java/org/codelutin/vcs/provider/mock/MockConnexion.java trunk/lutinvcs/provider/mock/src/main/java/org/codelutin/vcs/provider/mock/MockHandler.java trunk/lutinvcs/provider/svn/src/main/java/org/codelutin/vcs/provider/SVNProvider.java trunk/lutinvcs/provider/svn/src/main/java/org/codelutin/vcs/provider/svn/SVNConnexion.java Log: introduc VCSURIResolver contract, to resolv remote URI from a VCSConnnexionConfg. Each provider acts as a VCSURIResolver factory via newURIResolver method. Handler has his own resolver. remove mode field from VCSConnexion, used the VCSConnexionConfig one instead. Modified: trunk/lutinvcs/core/src/main/java/org/codelutin/vcs/VCSCommon.java =================================================================== --- trunk/lutinvcs/core/src/main/java/org/codelutin/vcs/VCSCommon.java 2008-04-27 12:55:51 UTC (rev 642) +++ trunk/lutinvcs/core/src/main/java/org/codelutin/vcs/VCSCommon.java 2008-04-27 14:15:39 UTC (rev 643) @@ -36,6 +36,10 @@ public interface VCSCommon { + VCSURIResolver getURIResolver(); + + void setURIResolver(VCSURIResolver uriResolver); + /** * init working copy, says if it is the first we use it it, we will checkout * the databaseDirectory directory Modified: trunk/lutinvcs/core/src/main/java/org/codelutin/vcs/VCSConnexion.java =================================================================== --- trunk/lutinvcs/core/src/main/java/org/codelutin/vcs/VCSConnexion.java 2008-04-27 12:55:51 UTC (rev 642) +++ trunk/lutinvcs/core/src/main/java/org/codelutin/vcs/VCSConnexion.java 2008-04-27 14:15:39 UTC (rev 643) @@ -26,7 +26,7 @@ * The method {@link #init(VCSConnexionConfig)} must be invoked before using the connexion. * * Note: you should not instanciate directly this class but use - * {@link org.codelutin.vcs.VCSProvider#newConnection(org.codelutin.vcs.type.VCSConnexionMode , VCSConnexionConfig)} instead. + * {@link VCSProvider#newConnection(VCSConnexionConfig)} instead. * * @author chemit */ Modified: trunk/lutinvcs/core/src/main/java/org/codelutin/vcs/VCSFactory.java =================================================================== --- trunk/lutinvcs/core/src/main/java/org/codelutin/vcs/VCSFactory.java 2008-04-27 12:55:51 UTC (rev 642) +++ trunk/lutinvcs/core/src/main/java/org/codelutin/vcs/VCSFactory.java 2008-04-27 14:15:39 UTC (rev 643) @@ -83,7 +83,7 @@ VCSProvider<?, ?> provider = factory.getProvider(config.getType().toUpperCase()); // delegate instanciation of connexion to provider - VCSConnexion connexion = provider.newConnection(config.getMode(), config); + VCSConnexion connexion = provider.newConnection(config); // init connexion connexion.init(config); Modified: trunk/lutinvcs/core/src/main/java/org/codelutin/vcs/VCSProvider.java =================================================================== --- trunk/lutinvcs/core/src/main/java/org/codelutin/vcs/VCSProvider.java 2008-04-27 12:55:51 UTC (rev 642) +++ trunk/lutinvcs/core/src/main/java/org/codelutin/vcs/VCSProvider.java 2008-04-27 14:15:39 UTC (rev 643) @@ -17,11 +17,12 @@ /** * The contract to be realized to provide vcs communication. * - * The provider acts as a factory of {@link VCSConnexion}. - * + * The provider acts as a factory of {@link VCSConnexion} and {@link VCSURIResolver}. + * * @author chemit - * @see org.codelutin.vcs.VCSHandler - * @see org.codelutin.vcs.VCSConnexion + * @see VCSHandler + * @see VCSConnexion + * @see VCSURIResolver */ public interface VCSProvider<C extends VCSConnexion<H>, H extends VCSHandler<C>> { @@ -34,15 +35,17 @@ /** @return the imclass of implementation of connexion to use for this provider */ Class<C> getConnexionImpl(); + /** @return a new instance of {@link VCSURIResolver} */ + VCSURIResolver newURIResolver(); + /** * Instanciate an new connexion for a given config, and init it. * * Note : After this method connexion is init, but not opened. * - * @param mode the mode required * @param config the config to be used * @return the new connexion initialized but not opened. */ - C newConnection(org.codelutin.vcs.type.VCSConnexionMode mode, VCSConnexionConfig config); + C newConnection(VCSConnexionConfig config); } Added: trunk/lutinvcs/core/src/main/java/org/codelutin/vcs/VCSURIResolver.java =================================================================== --- trunk/lutinvcs/core/src/main/java/org/codelutin/vcs/VCSURIResolver.java (rev 0) +++ trunk/lutinvcs/core/src/main/java/org/codelutin/vcs/VCSURIResolver.java 2008-04-27 14:15:39 UTC (rev 643) @@ -0,0 +1,26 @@ +/** + * # #% Copyright (C) 2008 Code Lutin, Tony Chemit + * This program is free software; you + * can redistribute it and/or modify it under the terms of the GNU General + * Public License as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. This program is + * distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A + * PARTICULAR PURPOSE. See the GNU General Public License for more details. You + * should have received a copy of the GNU General Public License along with this + * program; if not, write to the Free Software Foundation, Inc., 59 Temple Place + * - Suite 330, Boston, MA 02111-1307, USA. + * # #% + */ +package org.codelutin.vcs; + +/** + * URI resolver from a config to build the remote vcs server uri to vcs root + * + * @author chemit + */ +public interface VCSURIResolver { + + java.net.URI resolv(VCSConnexionConfig config); + +} Modified: trunk/lutinvcs/core/src/main/java/org/codelutin/vcs/type/VCSConnectionState.java =================================================================== --- trunk/lutinvcs/core/src/main/java/org/codelutin/vcs/type/VCSConnectionState.java 2008-04-27 12:55:51 UTC (rev 642) +++ trunk/lutinvcs/core/src/main/java/org/codelutin/vcs/type/VCSConnectionState.java 2008-04-27 14:15:39 UTC (rev 643) @@ -33,7 +33,7 @@ UNDEFINED, /** * connexion was init, but not opened (default state after instanciate a new connexion from - * {@link VCSProvider#newConnection(VCSConnexionMode, VCSConnexionConfig)} + * {@link VCSProvider#newConnection(VCSConnexionConfig)} */ INIT, /** connexion was successfull opened, via {@link VCSConnexion#open()} */ Added: trunk/lutinvcs/core/src/main/java/org/codelutin/vcs/type/VCSConnexionConfigProperty.java =================================================================== --- trunk/lutinvcs/core/src/main/java/org/codelutin/vcs/type/VCSConnexionConfigProperty.java (rev 0) +++ trunk/lutinvcs/core/src/main/java/org/codelutin/vcs/type/VCSConnexionConfigProperty.java 2008-04-27 14:15:39 UTC (rev 643) @@ -0,0 +1,56 @@ +/** + * ##% Copyright (C) 2008 Code Lutin, Tony Chemit + * This program is free software; you + * can redistribute it and/or modify it under the terms of the GNU General + * Public License as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. This program is + * distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A + * PARTICULAR PURPOSE. See the GNU General Public License for more details. You + * should have received a copy of the GNU General Public License along with this + * program; if not, write to the Free Software Foundation, Inc., 59 Temple Place + * - Suite 330, Boston, MA 02111-1307, USA. + * ##% + */ +package org.codelutin.vcs.type; + +import org.codelutin.vcs.VCSConnexionConfig; + +/** + * Enumaration of properties useable in a {@link VCSConnexionConfig} + * + * @author chemit + * @see VCSConnexionConfig + */ +public enum VCSConnexionConfigProperty { + + /** property <code>rootConfig</code>, as a {@link org.codelutin.vcs.VCSRootConfig} */ + rootConfig, + + /** property <code>connexionMode</code>, as a {@link org.codelutin.vcs.type.VCSConnexionMode} */ + connexionMode, + + /** property <code>typeRepo</code>, type of repo to use, as a {@link VCSTypeRepo} */ + typeRepo, + + /** property <code>typeRepoValue</code>, the value associated to typeRepo (eg, branch or tag name, null for a head connexion) */ + typeRepoValue, + + /** property <code>login</code>, login for a password connexion */ + login, + + /** property <code>password</code>, password for a password connexion */ + password, + + /** property <code>sshLogin</code>, login for a ssh connexion */ + sshLogin, + + /** property <code>sshPassphrase</code>, passphrase for a ssh connexion */ + sshPassphrase, + + /** property <code>sshPrivateKey</code>, path of the ssh private key file for a ssh connexion */ + sshPrivateKeyFile, + + /** property <code>localDatabasePath</code>, path of the local working copy */ + localDatabasePath +} \ No newline at end of file Modified: trunk/lutinvcs/core/src/main/java/org/codelutin/vcs/type/VCSConnexionMode.java =================================================================== --- trunk/lutinvcs/core/src/main/java/org/codelutin/vcs/type/VCSConnexionMode.java 2008-04-27 12:55:51 UTC (rev 642) +++ trunk/lutinvcs/core/src/main/java/org/codelutin/vcs/type/VCSConnexionMode.java 2008-04-27 14:15:39 UTC (rev 643) @@ -14,33 +14,38 @@ */ package org.codelutin.vcs.type; -import static org.codelutin.vcs.VCSConnexionConfig.PROPERTY_LOGIN; -import static org.codelutin.vcs.VCSConnexionConfig.PROPERTY_PASSWORD; -import static org.codelutin.vcs.VCSConnexionConfig.PROPERTY_SSH_LOGIN; -import static org.codelutin.vcs.VCSConnexionConfig.PROPERTY_SSH_PASSPHRASE; -import static org.codelutin.vcs.VCSConnexionConfig.PROPERTY_SSH_PRIVATE_KEY_FILE; +import org.codelutin.vcs.VCSConnexionConfig; +import static org.codelutin.vcs.type.VCSConnexionConfigProperty.login; +import static org.codelutin.vcs.type.VCSConnexionConfigProperty.password; +import static org.codelutin.vcs.type.VCSConnexionConfigProperty.sshLogin; +import static org.codelutin.vcs.type.VCSConnexionConfigProperty.sshPassphrase; +import static org.codelutin.vcs.type.VCSConnexionConfigProperty.sshPrivateKeyFile; +import java.util.EnumSet; +import java.util.Arrays; + /** * Enumaration of connexion mode. * * Each mode known the list of authentication properties required for a connexion. * * @author chemit - * @see org.codelutin.vcs.VCSConnexionConfig + * @see VCSConnexionConfigProperty + * @see VCSConnexionConfig */ public enum VCSConnexionMode { ANONYMOUS, - PASSWORD(PROPERTY_LOGIN, PROPERTY_PASSWORD), - SSH(PROPERTY_SSH_LOGIN, PROPERTY_SSH_PASSPHRASE, PROPERTY_SSH_PRIVATE_KEY_FILE); + PASSWORD(login, password), + SSH(sshLogin, sshPassphrase, sshPrivateKeyFile); /** array of authentication properties required for this connexion mode. */ - private final String[] authenticationProperties; + private final EnumSet<VCSConnexionConfigProperty> authenticationProperties; - VCSConnexionMode(String... authenticationProperties) { - this.authenticationProperties = authenticationProperties; + VCSConnexionMode(VCSConnexionConfigProperty... authenticationProperties) { + this.authenticationProperties = EnumSet.copyOf(Arrays.asList(authenticationProperties)); } - public String[] getAuthenticationProperties() { + public EnumSet<VCSConnexionConfigProperty> getAuthenticationProperties() { return authenticationProperties; } } Modified: trunk/lutinvcs/core/src/main/java/org/codelutin/vcs/util/AbstractVCSConnexion.java =================================================================== --- trunk/lutinvcs/core/src/main/java/org/codelutin/vcs/util/AbstractVCSConnexion.java 2008-04-27 12:55:51 UTC (rev 642) +++ trunk/lutinvcs/core/src/main/java/org/codelutin/vcs/util/AbstractVCSConnexion.java 2008-04-27 14:15:39 UTC (rev 643) @@ -22,6 +22,7 @@ import org.codelutin.vcs.VCSConnexionConfig; import org.codelutin.vcs.VCSException; import org.codelutin.vcs.VCSHandler; +import org.codelutin.vcs.VCSURIResolver; import org.codelutin.vcs.event.VCSConnexionEvent; import org.codelutin.vcs.event.VCSConnexionEventListener; import org.codelutin.vcs.type.VCSConnectionState; @@ -43,7 +44,6 @@ protected File localRoot; protected URI remoteRoot; - protected VCSConnexionMode mode; protected VCSConnectionState state; protected VCSConnexionConfig config; protected H handler; @@ -51,8 +51,7 @@ protected ListenerSet<VCSConnexionEventListener> listeners = new ListenerSet<VCSConnexionEventListener>(); @SuppressWarnings({"unchecked"}) - protected AbstractVCSConnexion(VCSConnexionMode mode, H handler) { - this.mode = mode; + protected AbstractVCSConnexion(H handler) { this.handler = handler; this.handler.setConnexion(this); // by default, state is undefined before init @@ -78,7 +77,7 @@ public VCSConnexionMode getMode() throws IllegalStateException { checkInit(); - return mode; + return getConfig().getMode(); } public VCSConnexionConfig getConfig() throws IllegalStateException { @@ -252,6 +251,14 @@ return handler.hasProtocoleChanged(); } + public VCSURIResolver getURIResolver() { + return handler.getURIResolver(); + } + + public void setURIResolver(VCSURIResolver uriResolver) { + handler.setURIResolver(uriResolver); + } + protected void fireOpened() { VCSConnexionEvent e = new VCSConnexionEvent(this, VCSConnectionState.OPEN); for (VCSConnexionEventListener l : listeners) { @@ -270,6 +277,7 @@ if (state == VCSConnectionState.UNDEFINED) { throw new IllegalStateException(_("lutinvcs.error.connexion.noinit", this)); } + //TODO Should check config exists } protected void checkOpen() throws IllegalStateException { Modified: trunk/lutinvcs/core/src/main/java/org/codelutin/vcs/util/AbstractVCSHandler.java =================================================================== --- trunk/lutinvcs/core/src/main/java/org/codelutin/vcs/util/AbstractVCSHandler.java 2008-04-27 12:55:51 UTC (rev 642) +++ trunk/lutinvcs/core/src/main/java/org/codelutin/vcs/util/AbstractVCSHandler.java 2008-04-27 14:15:39 UTC (rev 643) @@ -26,6 +26,7 @@ import org.codelutin.vcs.VCSConnexion; import org.codelutin.vcs.VCSHandler; import org.codelutin.vcs.VCSRuntimeException; +import org.codelutin.vcs.VCSURIResolver; import org.codelutin.vcs.type.VCSTypeRepo; import java.io.File; @@ -55,6 +56,7 @@ protected final String confLocalDirName; protected final String confLocalEntriesFilename; protected C connexion; + protected VCSURIResolver uriResolver; protected AbstractVCSHandler(final String vCSConfLocalDirName, String vCSConfLocalEntriesFilename) { this.confLocalDirName = vCSConfLocalDirName; @@ -71,6 +73,14 @@ }; } + public VCSURIResolver getURIResolver() { + return uriResolver; + } + + public void setURIResolver(VCSURIResolver uriResolver) { + this.uriResolver = uriResolver; + } + public void setConnexion(C connexion) { this.connexion = connexion; } Modified: trunk/lutinvcs/core/src/main/java/org/codelutin/vcs/util/AbstractVCSProvider.java =================================================================== --- trunk/lutinvcs/core/src/main/java/org/codelutin/vcs/util/AbstractVCSProvider.java 2008-04-27 12:55:51 UTC (rev 642) +++ trunk/lutinvcs/core/src/main/java/org/codelutin/vcs/util/AbstractVCSProvider.java 2008-04-27 14:15:39 UTC (rev 643) @@ -14,14 +14,14 @@ */ package org.codelutin.vcs.util; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import static org.codelutin.i18n.I18n._; import org.codelutin.vcs.VCSConnexion; import org.codelutin.vcs.VCSConnexionConfig; import org.codelutin.vcs.VCSHandler; import org.codelutin.vcs.VCSProvider; -import org.codelutin.vcs.type.VCSConnexionMode; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.codelutin.vcs.VCSURIResolver; /** * base implementation of provider. @@ -41,10 +41,15 @@ /** implementation of connexion to use */ private final Class<C> connexionImpl; - protected AbstractVCSProvider(String name, Class<H> handlerImpl, Class<C> connexionImpl) { + /** implementation of {@link VCSURIResolver} to use */ + private final Class<? extends VCSURIResolver> resolverImpl; + + + protected AbstractVCSProvider(String name, Class<H> handlerImpl, Class<C> connexionImpl, Class<? extends VCSURIResolver> resolverImpl) { this.name = name; this.handlerImpl = handlerImpl; this.connexionImpl = connexionImpl; + this.resolverImpl = resolverImpl; } public final String getName() { @@ -59,18 +64,19 @@ return handlerImpl; } - public C newConnection(VCSConnexionMode mode, VCSConnexionConfig config) { + public C newConnection(VCSConnexionConfig config) { H handler; C connexion; try { handler = handlerImpl.newInstance(); + handler.setURIResolver(newURIResolver()); } catch (Exception e) { throw new RuntimeException(_("lutinvcs.error.provider.init.handler", handlerImpl, this, e.getCause())); } try { - connexion = connexionImpl.getConstructor(VCSConnexionMode.class, handlerImpl).newInstance(mode, handler); + connexion = connexionImpl.getConstructor(handlerImpl).newInstance(handler); // always init connexion from his config connexion.init(config); @@ -81,4 +87,13 @@ } } + public VCSURIResolver newURIResolver() { + try { + return resolverImpl.newInstance(); + } catch (InstantiationException e) { + throw new IllegalStateException(e); + } catch (IllegalAccessException e) { + throw new IllegalStateException(e); + } + } } Modified: trunk/lutinvcs/provider/cvs/src/main/java/org/codelutin/vcs/provider/CVSProvider.java =================================================================== --- trunk/lutinvcs/provider/cvs/src/main/java/org/codelutin/vcs/provider/CVSProvider.java 2008-04-27 12:55:51 UTC (rev 642) +++ trunk/lutinvcs/provider/cvs/src/main/java/org/codelutin/vcs/provider/CVSProvider.java 2008-04-27 14:15:39 UTC (rev 643) @@ -16,13 +16,14 @@ import org.codelutin.vcs.provider.cvs.CVSConnexion; import org.codelutin.vcs.provider.cvs.CVSHandler; +import org.codelutin.vcs.provider.cvs.CVSURIResolver; import org.codelutin.vcs.util.AbstractVCSProvider; /** @author chemit */ public class CVSProvider extends AbstractVCSProvider<CVSConnexion, CVSHandler> { public CVSProvider() { - super("CVS", CVSHandler.class, CVSConnexion.class); + super("CVS", CVSHandler.class, CVSConnexion.class, CVSURIResolver.class); } } \ No newline at end of file Modified: trunk/lutinvcs/provider/cvs/src/main/java/org/codelutin/vcs/provider/cvs/CVSConnexion.java =================================================================== --- trunk/lutinvcs/provider/cvs/src/main/java/org/codelutin/vcs/provider/cvs/CVSConnexion.java 2008-04-27 12:55:51 UTC (rev 642) +++ trunk/lutinvcs/provider/cvs/src/main/java/org/codelutin/vcs/provider/cvs/CVSConnexion.java 2008-04-27 14:15:39 UTC (rev 643) @@ -9,7 +9,7 @@ * PARTICULAR PURPOSE. See the GNU General Public License for more details. You * should have received a copy of the GNU General Public License along with this * program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - * - Suite 330, Boston, MA 02111-1307, USA. + * - Suite 330, Boston, MA 02111-1307, USA. * ##% */ package org.codelutin.vcs.provider.cvs; @@ -17,7 +17,6 @@ import org.codelutin.vcs.VCSConnexionConfig; import org.codelutin.vcs.VCSException; import org.codelutin.vcs.type.VCSConnectionState; -import org.codelutin.vcs.type.VCSConnexionMode; import org.codelutin.vcs.util.AbstractVCSConnexion; import org.netbeans.lib.cvsclient.CVSRoot; import org.netbeans.lib.cvsclient.Client; @@ -29,8 +28,8 @@ /** @author chemit */ public class CVSConnexion extends AbstractVCSConnexion<CVSHandler> { - public CVSConnexion(VCSConnexionMode mode, CVSHandler handler) { - super(mode, handler); + public CVSConnexion(CVSHandler handler) { + super(handler); } public void init(VCSConnexionConfig config) { Added: trunk/lutinvcs/provider/cvs/src/main/java/org/codelutin/vcs/provider/cvs/CVSURIResolver.java =================================================================== --- trunk/lutinvcs/provider/cvs/src/main/java/org/codelutin/vcs/provider/cvs/CVSURIResolver.java (rev 0) +++ trunk/lutinvcs/provider/cvs/src/main/java/org/codelutin/vcs/provider/cvs/CVSURIResolver.java 2008-04-27 14:15:39 UTC (rev 643) @@ -0,0 +1,27 @@ +/** + * # #% Copyright (C) 2008 Code Lutin, Tony Chemit + * This program is free software; you + * can redistribute it and/or modify it under the terms of the GNU General + * Public License as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. This program is + * distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A + * PARTICULAR PURPOSE. See the GNU General Public License for more details. You + * should have received a copy of the GNU General Public License along with this + * program; if not, write to the Free Software Foundation, Inc., 59 Temple Place + * - Suite 330, Boston, MA 02111-1307, USA. + * # #% + */ +package org.codelutin.vcs.provider.cvs; + +import org.codelutin.vcs.VCSConnexionConfig; + +import java.net.URI; + +/** @author chemit */ +public class CVSURIResolver implements org.codelutin.vcs.VCSURIResolver { + public URI resolv(VCSConnexionConfig config) { + //TODO + return null; + } +} Modified: trunk/lutinvcs/provider/mock/src/main/java/org/codelutin/vcs/provider/MockProvider.java =================================================================== --- trunk/lutinvcs/provider/mock/src/main/java/org/codelutin/vcs/provider/MockProvider.java 2008-04-27 12:55:51 UTC (rev 642) +++ trunk/lutinvcs/provider/mock/src/main/java/org/codelutin/vcs/provider/MockProvider.java 2008-04-27 14:15:39 UTC (rev 643) @@ -16,13 +16,14 @@ import org.codelutin.vcs.provider.mock.MockConnexion; import org.codelutin.vcs.provider.mock.MockHandler; +import org.codelutin.vcs.provider.mock.MockURIResolver; import org.codelutin.vcs.util.AbstractVCSProvider; /** @author chemit */ public class MockProvider extends AbstractVCSProvider<MockConnexion, MockHandler> { public MockProvider() { - super("MOCK", MockHandler.class, MockConnexion.class); + super("MOCK", MockHandler.class, MockConnexion.class, MockURIResolver.class); } } \ No newline at end of file Modified: trunk/lutinvcs/provider/mock/src/main/java/org/codelutin/vcs/provider/mock/MockConnexion.java =================================================================== --- trunk/lutinvcs/provider/mock/src/main/java/org/codelutin/vcs/provider/mock/MockConnexion.java 2008-04-27 12:55:51 UTC (rev 642) +++ trunk/lutinvcs/provider/mock/src/main/java/org/codelutin/vcs/provider/mock/MockConnexion.java 2008-04-27 14:15:39 UTC (rev 643) @@ -17,14 +17,13 @@ import org.codelutin.vcs.VCSConnexionConfig; import org.codelutin.vcs.VCSException; import org.codelutin.vcs.type.VCSConnectionState; -import org.codelutin.vcs.type.VCSConnexionMode; import org.codelutin.vcs.util.AbstractVCSConnexion; /** @author chemit */ public class MockConnexion extends AbstractVCSConnexion<MockHandler> { - public MockConnexion(VCSConnexionMode mode, MockHandler handler) { - super(mode, handler); + public MockConnexion(MockHandler handler) { + super(handler); } public void init(VCSConnexionConfig config) { Modified: trunk/lutinvcs/provider/mock/src/main/java/org/codelutin/vcs/provider/mock/MockHandler.java =================================================================== --- trunk/lutinvcs/provider/mock/src/main/java/org/codelutin/vcs/provider/mock/MockHandler.java 2008-04-27 12:55:51 UTC (rev 642) +++ trunk/lutinvcs/provider/mock/src/main/java/org/codelutin/vcs/provider/mock/MockHandler.java 2008-04-27 14:15:39 UTC (rev 643) @@ -110,15 +110,15 @@ } public String getChangeLog(File file) throws VCSException { - return this+" changelog for : \n"+file+"... mock"; + return this + " changelog for : \n" + file + "... mock"; } public String getDiff(File file) throws VCSException, IOException { - return this+" diff for : \n"+file+"... mock"; + return this + " diff for : \n" + file + "... mock"; } public String getDiff(File file, Object againstRevision) throws VCSException, IOException { - return this+" diff for : \n"+file+"... mock"; + return this + " diff for : \n" + file + "... mock"; } public boolean hasProtocoleChanged() throws VCSException { Added: trunk/lutinvcs/provider/mock/src/main/java/org/codelutin/vcs/provider/mock/MockURIResolver.java =================================================================== --- trunk/lutinvcs/provider/mock/src/main/java/org/codelutin/vcs/provider/mock/MockURIResolver.java (rev 0) +++ trunk/lutinvcs/provider/mock/src/main/java/org/codelutin/vcs/provider/mock/MockURIResolver.java 2008-04-27 14:15:39 UTC (rev 643) @@ -0,0 +1,25 @@ +/** + * # #% Copyright (C) 2008 Code Lutin, Tony Chemit + * This program is free software; you + * can redistribute it and/or modify it under the terms of the GNU General + * Public License as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. This program is + * distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A + * PARTICULAR PURPOSE. See the GNU General Public License for more details. You + * should have received a copy of the GNU General Public License along with this + * program; if not, write to the Free Software Foundation, Inc., 59 Temple Place + * - Suite 330, Boston, MA 02111-1307, USA. + * # #% + */ +package org.codelutin.vcs.provider.mock; + +import java.net.URI; + +/** @author chemit */ +public class MockURIResolver implements org.codelutin.vcs.VCSURIResolver { + public URI resolv(org.codelutin.vcs.VCSConnexionConfig config) { + //TODO + return null; + } +} Modified: trunk/lutinvcs/provider/svn/src/main/java/org/codelutin/vcs/provider/SVNProvider.java =================================================================== --- trunk/lutinvcs/provider/svn/src/main/java/org/codelutin/vcs/provider/SVNProvider.java 2008-04-27 12:55:51 UTC (rev 642) +++ trunk/lutinvcs/provider/svn/src/main/java/org/codelutin/vcs/provider/SVNProvider.java 2008-04-27 14:15:39 UTC (rev 643) @@ -16,6 +16,7 @@ import org.codelutin.vcs.provider.svn.SVNConnexion; import org.codelutin.vcs.provider.svn.SVNHandler; +import org.codelutin.vcs.provider.svn.SVNURIResolver; import org.codelutin.vcs.type.VCSTypeRepo; import org.codelutin.vcs.util.AbstractVCSHandler; import org.codelutin.vcs.util.AbstractVCSProvider; @@ -45,9 +46,7 @@ private static boolean libraryInit; public SVNProvider() { - - super("SVN", SVNHandler.class, SVNConnexion.class); - + super("SVN", SVNHandler.class, SVNConnexion.class, SVNURIResolver.class); setupLibrary(); } Modified: trunk/lutinvcs/provider/svn/src/main/java/org/codelutin/vcs/provider/svn/SVNConnexion.java =================================================================== --- trunk/lutinvcs/provider/svn/src/main/java/org/codelutin/vcs/provider/svn/SVNConnexion.java 2008-04-27 12:55:51 UTC (rev 642) +++ trunk/lutinvcs/provider/svn/src/main/java/org/codelutin/vcs/provider/svn/SVNConnexion.java 2008-04-27 14:15:39 UTC (rev 643) @@ -20,7 +20,6 @@ import org.codelutin.vcs.VCSRuntimeException; import org.codelutin.vcs.provider.SVNProvider; import org.codelutin.vcs.type.VCSConnectionState; -import org.codelutin.vcs.type.VCSConnexionMode; import org.codelutin.vcs.util.AbstractVCSConnexion; import org.tmatesoft.svn.core.SVNException; import org.tmatesoft.svn.core.SVNURL; @@ -44,8 +43,8 @@ protected SVNWCClient ourWcClient; - public SVNConnexion(VCSConnexionMode mode, SVNHandler handler) { - super(mode, handler); + public SVNConnexion(SVNHandler handler) { + super(handler); } public void init(VCSConnexionConfig config) { Added: trunk/lutinvcs/provider/svn/src/main/java/org/codelutin/vcs/provider/svn/SVNURIResolver.java =================================================================== --- trunk/lutinvcs/provider/svn/src/main/java/org/codelutin/vcs/provider/svn/SVNURIResolver.java (rev 0) +++ trunk/lutinvcs/provider/svn/src/main/java/org/codelutin/vcs/provider/svn/SVNURIResolver.java 2008-04-27 14:15:39 UTC (rev 643) @@ -0,0 +1,28 @@ +/** + * # #% Copyright (C) 2008 Code Lutin, Tony Chemit + * This program is free software; you + * can redistribute it and/or modify it under the terms of the GNU General + * Public License as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. This program is + * distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A + * PARTICULAR PURPOSE. See the GNU General Public License for more details. You + * should have received a copy of the GNU General Public License along with this + * program; if not, write to the Free Software Foundation, Inc., 59 Temple Place + * - Suite 330, Boston, MA 02111-1307, USA. + * # #% + */ +package org.codelutin.vcs.provider.svn; + +import org.codelutin.vcs.VCSConnexionConfig; + +import java.net.URI; + +/** @author chemit */ +public class SVNURIResolver implements org.codelutin.vcs.VCSURIResolver { + + public URI resolv(VCSConnexionConfig config) { + //TODO + return null; + } +}

1 0

r642 - in trunk/lutinvcs/core/src/main/java/org/codelutin/vcs: . type util
by tchemit＠users.labs.libre-entreprise.org April 27, 2008

April 27, 2008

Author: tchemit Date: 2008-04-27 12:55:51 +0000 (Sun, 27 Apr 2008) New Revision: 642 Added: trunk/lutinvcs/core/src/main/java/org/codelutin/vcs/VCSRootConfig.java trunk/lutinvcs/core/src/main/java/org/codelutin/vcs/type/VCSRootConfigProperty.java trunk/lutinvcs/core/src/main/java/org/codelutin/vcs/util/SimpleVCSRootConfig.java Log: introduce VCSRootConfig to represent a remote vcs host with a repository, no authentication is deal here. Added: trunk/lutinvcs/core/src/main/java/org/codelutin/vcs/VCSRootConfig.java =================================================================== --- trunk/lutinvcs/core/src/main/java/org/codelutin/vcs/VCSRootConfig.java (rev 0) +++ trunk/lutinvcs/core/src/main/java/org/codelutin/vcs/VCSRootConfig.java 2008-04-27 12:55:51 UTC (rev 642) @@ -0,0 +1,48 @@ +/** + * # #% Copyright (C) 2008 Code Lutin, Tony Chemit + * This program is free software; you + * can redistribute it and/or modify it under the terms of the GNU General + * Public License as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. This program is + * distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A + * PARTICULAR PURPOSE. See the GNU General Public License for more details. You + * should have received a copy of the GNU General Public License along with this + * program; if not, write to the Free Software Foundation, Inc., 59 Temple Place + * - Suite 330, Boston, MA 02111-1307, USA. + * # #% + */ +package org.codelutin.vcs; + +import org.codelutin.util.config.Config; +import org.codelutin.vcs.type.VCSRootConfigProperty; + +/** + * Definition of a vcs root config comparable on his name. + * + * @author chemit + * @see VCSRootConfigProperty + * @see Config + */ +public interface VCSRootConfig extends Comparable<VCSRootConfig>, Config<VCSRootConfigProperty> { + + String getName(); + + String getType(); + + String getHost(); + + String getRepository(); + + Integer getPort(); + + void setName(String name); + + void setType(String type); + + void setHost(String host); + + void setPort(Integer port); + + void setRepository(String repository); +} Copied: trunk/lutinvcs/core/src/main/java/org/codelutin/vcs/type/VCSRootConfigProperty.java (from rev 640, trunk/lutinvcs/core/src/main/java/org/codelutin/vcs/type/VCSConnexionMode.java) =================================================================== --- trunk/lutinvcs/core/src/main/java/org/codelutin/vcs/type/VCSRootConfigProperty.java (rev 0) +++ trunk/lutinvcs/core/src/main/java/org/codelutin/vcs/type/VCSRootConfigProperty.java 2008-04-27 12:55:51 UTC (rev 642) @@ -0,0 +1,42 @@ +/** + * ##% Copyright (C) 2008 Code Lutin, Tony Chemit + * This program is free software; you + * can redistribute it and/or modify it under the terms of the GNU General + * Public License as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. This program is + * distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A + * PARTICULAR PURPOSE. See the GNU General Public License for more details. You + * should have received a copy of the GNU General Public License along with this + * program; if not, write to the Free Software Foundation, Inc., 59 Temple Place + * - Suite 330, Boston, MA 02111-1307, USA. + * ##% + */ +package org.codelutin.vcs.type; + +import org.codelutin.vcs.VCSRootConfig; + +/** + * Enumaration of properties to be used in a {@link VCSRootConfig} + * + * @author chemit + * @see VCSRootConfig + */ +public enum VCSRootConfigProperty { + + /** property <code>name</code>, unique name of the root definition */ + name, + + /** property <code>type</code>, type of the root (eg, CVS,...), should match the name of a {@link org.codelutin.vcs.VCSProvider} */ + type, + + /** property <code>host</code>, host of the root (eg labs.libreentreprise.org) with no protocol information */ + host, + + /** property <code>repository</code>, relative path of vcs root on host (eg cvsroot/myModule) */ + repository, + + /** property <code>port</code>, the port used (if null, will use default vcs type port) */ + port + +} \ No newline at end of file Added: trunk/lutinvcs/core/src/main/java/org/codelutin/vcs/util/SimpleVCSRootConfig.java =================================================================== --- trunk/lutinvcs/core/src/main/java/org/codelutin/vcs/util/SimpleVCSRootConfig.java (rev 0) +++ trunk/lutinvcs/core/src/main/java/org/codelutin/vcs/util/SimpleVCSRootConfig.java 2008-04-27 12:55:51 UTC (rev 642) @@ -0,0 +1,111 @@ +/** + * # #% Copyright (C) 2008 Code Lutin, Tony Chemit + * This program is free software; you + * can redistribute it and/or modify it under the terms of the GNU General + * Public License as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. This program is + * distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A + * PARTICULAR PURPOSE. See the GNU General Public License for more details. You + * should have received a copy of the GNU General Public License along with this + * program; if not, write to the Free Software Foundation, Inc., 59 Temple Place + * - Suite 330, Boston, MA 02111-1307, USA. + * # #% + */ +package org.codelutin.vcs.util; + +import org.codelutin.util.config.SimpleConfig; +import org.codelutin.vcs.VCSRootConfig; +import org.codelutin.vcs.type.VCSRootConfigProperty; +import static org.codelutin.vcs.type.VCSRootConfigProperty.host; +import static org.codelutin.vcs.type.VCSRootConfigProperty.name; +import static org.codelutin.vcs.type.VCSRootConfigProperty.port; +import static org.codelutin.vcs.type.VCSRootConfigProperty.repository; +import static org.codelutin.vcs.type.VCSRootConfigProperty.type; + +import java.util.EnumMap; + +/** @author chemit */ +public class SimpleVCSRootConfig extends SimpleConfig<VCSRootConfigProperty> implements VCSRootConfig { + + public SimpleVCSRootConfig() { + super(VCSRootConfigProperty.class); + } + + public SimpleVCSRootConfig(EnumMap<VCSRootConfigProperty, Object> properties) { + super(VCSRootConfigProperty.class, properties); + } + + public SimpleVCSRootConfig(String name, String type, String host, String repository, Integer port) { + this(); + setName(name); + setType(type); + setHost(host); + setRepository(repository); + setPort(port); + } + + public String getName() { + return (String) properties.get(name); + } + + public String getType() { + return (String) properties.get(type); + } + + public String getHost() { + return (String) properties.get(host); + } + + public Integer getPort() { + return (Integer) properties.get(port); + } + + public String getRepository() { + return (String) properties.get(repository); + } + + public void setName(String newName) { + setProperty(name, newName); + } + + public void setType(String newType) { + setProperty(type, newType); + } + + public void setHost(String newHost) { + setProperty(host, newHost); + } + + public void setPort(Integer newPort) { + setProperty(port, newPort); + } + + public void setRepository(String newRepository) { + setProperty(repository, newRepository); + } + + public int compareTo(VCSRootConfig o) { + String name = getName(); + String oName = o.getName(); + return name == null ? -1 : oName == null ? 1 : name.compareTo(oName); + } + + @Override + public boolean equals(Object o) { + if (this == o) return true; + if (!(o instanceof SimpleConfig)) return false; + + SimpleVCSRootConfig that = (SimpleVCSRootConfig) o; + String name = getName(); + String oName = that.getName(); + return !(name != null ? !name.equals(oName) : oName != null); + } + + @Override + public int hashCode() { + String name = getName(); + return (name != null ? name.hashCode() : 0); + } + +} \ No newline at end of file

1 0

r641 - in trunk/lutinvcs/core/src/main/java/org/codelutin/vcs: . util
by tchemit＠users.labs.libre-entreprise.org April 27, 2008

April 27, 2008

Author: tchemit Date: 2008-04-27 10:24:07 +0000 (Sun, 27 Apr 2008) New Revision: 641 Modified: trunk/lutinvcs/core/src/main/java/org/codelutin/vcs/VCSProvider.java trunk/lutinvcs/core/src/main/java/org/codelutin/vcs/util/AbstractVCSProvider.java Log: improve generic type + remove unsued imports Modified: trunk/lutinvcs/core/src/main/java/org/codelutin/vcs/VCSProvider.java =================================================================== --- trunk/lutinvcs/core/src/main/java/org/codelutin/vcs/VCSProvider.java 2008-04-27 10:23:27 UTC (rev 640) +++ trunk/lutinvcs/core/src/main/java/org/codelutin/vcs/VCSProvider.java 2008-04-27 10:24:07 UTC (rev 641) @@ -14,21 +14,16 @@ */ package org.codelutin.vcs; -import org.codelutin.vcs.type.VCSConnexionMode; -import org.codelutin.vcs.VCSConnexion; -import org.codelutin.vcs.VCSHandler; -import org.codelutin.vcs.VCSConnexionConfig; - /** * The contract to be realized to provide vcs communication. * - * Acts as a handler and connexion factory and manage a single handler instance - * + * The provider acts as a factory of {@link VCSConnexion}. + * * @author chemit * @see org.codelutin.vcs.VCSHandler * @see org.codelutin.vcs.VCSConnexion */ -public interface VCSProvider<C extends VCSConnexion, H extends VCSHandler<C>> { +public interface VCSProvider<C extends VCSConnexion<H>, H extends VCSHandler<C>> { /** @return the identifier of the vcs provider (eg SVN, CVS, MOCK) */ String getName(); @@ -48,6 +43,6 @@ * @param config the config to be used * @return the new connexion initialized but not opened. */ - C newConnection(VCSConnexionMode mode, VCSConnexionConfig config); + C newConnection(org.codelutin.vcs.type.VCSConnexionMode mode, VCSConnexionConfig config); } Modified: trunk/lutinvcs/core/src/main/java/org/codelutin/vcs/util/AbstractVCSProvider.java =================================================================== --- trunk/lutinvcs/core/src/main/java/org/codelutin/vcs/util/AbstractVCSProvider.java 2008-04-27 10:23:27 UTC (rev 640) +++ trunk/lutinvcs/core/src/main/java/org/codelutin/vcs/util/AbstractVCSProvider.java 2008-04-27 10:24:07 UTC (rev 641) @@ -28,7 +28,7 @@ * * @author chemit */ -public abstract class AbstractVCSProvider<C extends VCSConnexion, H extends VCSHandler<C>> implements VCSProvider<C, H> { +public abstract class AbstractVCSProvider<C extends VCSConnexion<H>, H extends VCSHandler<C>> implements VCSProvider<C, H> { static protected final Log log = LogFactory.getLog(AbstractVCSProvider.class);

1 0

r640 - trunk/lutinvcs/core/src/main/java/org/codelutin/vcs/type
by tchemit＠users.labs.libre-entreprise.org April 27, 2008

April 27, 2008

Author: tchemit Date: 2008-04-27 10:23:27 +0000 (Sun, 27 Apr 2008) New Revision: 640 Modified: trunk/lutinvcs/core/src/main/java/org/codelutin/vcs/type/VCSConnexionMode.java Log: adding authentication properties list by connexion mode Modified: trunk/lutinvcs/core/src/main/java/org/codelutin/vcs/type/VCSConnexionMode.java =================================================================== --- trunk/lutinvcs/core/src/main/java/org/codelutin/vcs/type/VCSConnexionMode.java 2008-04-27 08:42:16 UTC (rev 639) +++ trunk/lutinvcs/core/src/main/java/org/codelutin/vcs/type/VCSConnexionMode.java 2008-04-27 10:23:27 UTC (rev 640) @@ -14,13 +14,33 @@ */ package org.codelutin.vcs.type; +import static org.codelutin.vcs.VCSConnexionConfig.PROPERTY_LOGIN; +import static org.codelutin.vcs.VCSConnexionConfig.PROPERTY_PASSWORD; +import static org.codelutin.vcs.VCSConnexionConfig.PROPERTY_SSH_LOGIN; +import static org.codelutin.vcs.VCSConnexionConfig.PROPERTY_SSH_PASSPHRASE; +import static org.codelutin.vcs.VCSConnexionConfig.PROPERTY_SSH_PRIVATE_KEY_FILE; + /** - * L'ensemble des typs de connexion VCS connues + * Enumaration of connexion mode. + * + * Each mode known the list of authentication properties required for a connexion. * * @author chemit + * @see org.codelutin.vcs.VCSConnexionConfig */ public enum VCSConnexionMode { ANONYMOUS, - PASSWORD, - SSH + PASSWORD(PROPERTY_LOGIN, PROPERTY_PASSWORD), + SSH(PROPERTY_SSH_LOGIN, PROPERTY_SSH_PASSPHRASE, PROPERTY_SSH_PRIVATE_KEY_FILE); + + /** array of authentication properties required for this connexion mode. */ + private final String[] authenticationProperties; + + VCSConnexionMode(String... authenticationProperties) { + this.authenticationProperties = authenticationProperties; + } + + public String[] getAuthenticationProperties() { + return authenticationProperties; + } }

1 0