Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2026-03-06 12:20:56 +01:00
Code Issues Packages Projects Releases Activity

Revert changes to jaxb context

Browse Source
This commit is contained in:
René Pfeuffer
2020-05-07 11:04:17 +02:00
parent bdd4c244d5
commit 3d5dda5bd8
2 changed files with 25 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/HgRepositoryHandler.java
View File

@@ -31,6 +31,7 @@ import com.google.inject.Provider;
import com.google.inject.Singleton;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import sonia.scm.ConfigurationException;
import sonia.scm.SCMContextProvider;
import sonia.scm.installer.HgInstaller;
import sonia.scm.installer.HgInstallerFactory;
@@ -47,6 +48,7 @@ import sonia.scm.util.IOUtil;
import sonia.scm.util.SystemUtil;
import javax.xml.bind.JAXBContext;
import javax.xml.bind.JAXBException;
import java.io.File;
import java.io.FileOutputStream;
import java.io.IOException;
@@ -78,7 +80,7 @@ public class HgRepositoryHandler
private final HgWorkdirFactory workdirFactory;
private JAXBContext jaxbContext;
private final JAXBContext jaxbContext;
@Inject
public HgRepositoryHandler(ConfigurationStoreFactory storeFactory,
@@ -88,6 +90,17 @@ public class HgRepositoryHandler
super(storeFactory, repositoryLocationResolver, pluginLoader);
this.hgContextProvider = hgContextProvider;
this.workdirFactory = workdirFactory;
try
{
this.jaxbContext = JAXBContext.newInstance(BrowserResult.class,
BlameResult.class, Changeset.class, ChangesetPagingResult.class,
HgVersion.class);
}
catch (JAXBException ex)
{
throw new ConfigurationException("could not create jaxbcontext", ex);
}
}
public void doAutoConfiguration(HgConfig autoConfig) {

12
scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/HgVersion.java
View File

@@ -29,10 +29,20 @@ import lombok.Getter;
import lombok.Setter;
import lombok.ToString;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlRootElement;
/**
*
* @author Sebastian Sdorra
*/
@XmlRootElement(name = "version")
@XmlAccessorType(XmlAccessType.FIELD)
@EqualsAndHashCode
@ToString
@Getter
@Setter
@ToString
public class HgVersion {
private String mercurial;
private String python;