Skip to content

The Unified and Autonomous Development Platform

Fix more 1.0 migration errors

Robin Shen86af696c53b5
diff --git a/core/src/main/java/io/onedev/server/command/UpgradeCommand.java b/core/src/main/java/io/onedev/server/command/UpgradeCommand.java
index e4344aa22a..f055f02eb1 100644
--- a/core/src/main/java/io/onedev/server/command/UpgradeCommand.java
+++ b/core/src/main/java/io/onedev/server/command/UpgradeCommand.java
@@ -123,6 +123,19 @@ public class UpgradeCommand extends DefaultPersistManager {
logger.error("Please stop server running at \"{}\" before upgrading", Bootstrap.installDir.getAbsolutePath());
System.exit(1);
}
+
+ for (File file: new File(upgradeDir, "lib").listFiles()) {
+ if (file.getName().contains("mariadb") || file.getName().contains("mysql")
+ || file.getName().contains("ojdbc") || file.getName().contains("postgresql")
+ || file.getName().contains("sqljdbc")) {
+ try {
+ FileUtils.moveFileToDirectory(file, new File(upgradeDir, "site/lib"), true);
+ } catch (IOException e) {
+ throw new RuntimeException(e);
+ }
+ }
+ }
+ cleanAndCopy(new File(upgradeDir, "site/lib"), new File(Bootstrap.installDir, "site/lib"));
AtomicReference<String> oldDataVersion = new AtomicReference<>(null);
int ret = buildCommandline(upgradeDir, "check_data_version").execute(new LineConsumer() {
diff --git a/core/src/main/java/io/onedev/server/migration/DatabaseMigrator.java b/core/src/main/java/io/onedev/server/migration/DatabaseMigrator.java
index 6ec8681848..ae456aa340 100644
--- a/core/src/main/java/io/onedev/server/migration/DatabaseMigrator.java
+++ b/core/src/main/java/io/onedev/server/migration/DatabaseMigrator.java
@@ -770,26 +770,16 @@ public class DatabaseMigrator {
String submitterClass = submitterElement.attributeValue("class");
submitterClass = submitterClass.replace("io.onedev.server.model.support.submitter.",
"io.onedev.server.model.support.usermatcher.");
- submitterClass = submitterClass.replace("SpecifiedGroup", "SpecifiedTeam");
submitterElement.attribute("class").setValue(submitterClass);
- Element groupNameElement = submitterElement.element("groupName");
- if (groupNameElement != null)
- groupNameElement.setName("teamName");
Element reviewRequirementSpecElement = branchProtectionElement.element("reviewRequirementSpec");
if (reviewRequirementSpecElement != null) {
reviewRequirementSpecElement.setName("reviewRequirement");
- String reviewRequirement = reviewRequirementSpecElement.getText();
- reviewRequirement = reviewRequirement.replace("group(", "team(");
- reviewRequirementSpecElement.setText(reviewRequirement);
}
for (Element fileProtectionElement: branchProtectionElement.element("fileProtections").elements()) {
reviewRequirementSpecElement = fileProtectionElement.element("reviewRequirementSpec");
reviewRequirementSpecElement.setName("reviewRequirement");
- String reviewRequirement = reviewRequirementSpecElement.getText();
- reviewRequirement = reviewRequirement.replace("group(", "team(");
- reviewRequirementSpecElement.setText(reviewRequirement);
}
}
for (Element tagProtectionElement: element.element("tagProtections").elements()) {
@@ -797,11 +787,7 @@ public class DatabaseMigrator {
String submitterClass = submitterElement.attributeValue("class");
submitterClass = submitterClass.replace("io.onedev.server.model.support.submitter.",
"io.onedev.server.model.support.usermatcher.");
- submitterClass = submitterClass.replace("SpecifiedGroup", "SpecifiedTeam");
submitterElement.attribute("class").setValue(submitterClass);
- Element groupNameElement = submitterElement.element("groupName");
- if (groupNameElement != null)
- groupNameElement.setName("teamName");
}
}
dom.writeToFile(file, false);
diff --git a/core/src/main/java/io/onedev/server/search/code/DefaultIndexManager.java b/core/src/main/java/io/onedev/server/search/code/DefaultIndexManager.java
index e5378f34da..fb35128edc 100644
--- a/core/src/main/java/io/onedev/server/search/code/DefaultIndexManager.java
+++ b/core/src/main/java/io/onedev/server/search/code/DefaultIndexManager.java
@@ -263,13 +263,18 @@ public class DefaultIndexManager implements IndexManager {
document.add(new TextField(BLOB_TEXT.name(), content, Store.NO));
if (extractor != null) {
+ List<Symbol> symbols = null;
try {
- List<Symbol> symbols = extractor.extract(blobName, StringUtils.removeBOM(content));
+ symbols = extractor.extract(blobName, StringUtils.removeBOM(content));
+ } catch (Throwable e) {
+ logger.trace("Can not extract symbols from blob (hash:" + blobId.name() + ", path:" + blobPath + ")", e);
+ }
+ if (symbols != null) {
for (Symbol symbol: symbols) {
String fieldValue = symbol.getName();
if (fieldValue != null && symbol.isSearchable()) {
fieldValue = fieldValue.toLowerCase();
-
+
String fieldName;
if (symbol.isPrimary())
fieldName = BLOB_PRIMARY_SYMBOLS.name();
@@ -280,8 +285,6 @@ public class DefaultIndexManager implements IndexManager {
}
byte[] bytesOfSymbols = SerializationUtils.serialize((Serializable) symbols);
document.add(new StoredField(BLOB_SYMBOL_LIST.name(), bytesOfSymbols));
- } catch (Throwable e) {
- logger.warn("Error extracting symbols from blob (hash:" + blobId.name() + ", path:" + blobPath + ")", e);
}
}
} else {
diff --git a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/SourceViewPanel.java b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/SourceViewPanel.java
index c5c1214766..02a7cd6367 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/SourceViewPanel.java
+++ b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/SourceViewPanel.java
@@ -161,16 +161,17 @@ public class SourceViewPanel extends BlobViewPanel implements Markable, SearchMe
String blobName = context.getBlobIdent().getName();
SymbolExtractor<Symbol> extractor = SymbolExtractorRegistry.getExtractor(blobName);
if (extractor != null) {
- try {
- SearchManager searchManager = OneDev.getInstance(SearchManager.class);
- List<Symbol> cachedSymbols = searchManager.getSymbols(context.getProject(), blob.getBlobId(),
- blob.getIdent().path);
- if (cachedSymbols != null)
- symbols.addAll(cachedSymbols);
- else
+ SearchManager searchManager = OneDev.getInstance(SearchManager.class);
+ List<Symbol> cachedSymbols = searchManager.getSymbols(context.getProject(), blob.getBlobId(),
+ blob.getIdent().path);
+ if (cachedSymbols != null) {
+ symbols.addAll(cachedSymbols);
+ } else {
+ try {
symbols.addAll(extractor.extract(null, StringUtils.removeBOM(blob.getText().getContent())));
- } catch (Throwable e) {
- logger.warn("Error extracting symbols from blob: " + context.getBlobIdent(), e);
+ } catch (Throwable e) {
+ logger.trace("Can not extract symbols from blob: " + context.getBlobIdent(), e);
+ }
}
}
diff --git a/product/build/package.gant b/product/build/package.gant
index ef0579f659..045e856670 100644
--- a/product/build/package.gant
+++ b/product/build/package.gant
@@ -7,7 +7,7 @@ target(default:"package the product") {
File destFile = new File(buildDir, "onedev-${productVersion}.zip");
zip(destfile: destFile) {
- zipfileset(dir: sandboxDir, prefix: "onedev-${productVersion}", excludes: "${executables}, boot/system.classpath")
+ zipfileset(dir: sandboxDir, prefix: "onedev-${productVersion}", excludes: "${executables}, boot/system.classpath, site/lib/*.jar")
zipfileset(dir: sandboxDir, prefix: "onedev-${productVersion}", includes: "${executables}", filemode: "755")
}
}