You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by so...@apache.org on 2018/12/08 06:02:28 UTC
[openmeetings] branch master updated: [OPENMEETINGS-1859] wicket is
updated to 8.3.0-SNAPSHOT
This is an automated email from the ASF dual-hosted git repository.
solomax pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/openmeetings.git
The following commit(s) were added to refs/heads/master by this push:
new a34cbde [OPENMEETINGS-1859] wicket is updated to 8.3.0-SNAPSHOT
a34cbde is described below
commit a34cbde797797e8c6c0801d3d0bd325fbb217b29
Author: Maxim Solodovnik <so...@gmail.com>
AuthorDate: Sat Dec 8 13:02:14 2018 +0700
[OPENMEETINGS-1859] wicket is updated to 8.3.0-SNAPSHOT
---
.../src/main/java/org/apache/openmeetings/util/XmlExport.java | 7 ++++---
.../src/main/java/org/apache/openmeetings/web/pages/BasePage.html | 1 +
.../src/main/java/org/apache/openmeetings/web/pages/BasePage.java | 1 -
pom.xml | 2 +-
4 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/openmeetings-util/src/main/java/org/apache/openmeetings/util/XmlExport.java b/openmeetings-util/src/main/java/org/apache/openmeetings/util/XmlExport.java
index 1b9e8ea..b6a31c8 100644
--- a/openmeetings-util/src/main/java/org/apache/openmeetings/util/XmlExport.java
+++ b/openmeetings-util/src/main/java/org/apache/openmeetings/util/XmlExport.java
@@ -22,6 +22,7 @@ import static java.nio.charset.StandardCharsets.UTF_8;
import java.io.File;
import java.io.FileOutputStream;
+import java.io.IOException;
import java.io.OutputStream;
import java.io.OutputStreamWriter;
import java.io.Writer;
@@ -82,7 +83,7 @@ public class XmlExport {
return document.addElement(root);
}
- public static void toXml(Writer out, Document doc) throws Exception {
+ public static void toXml(Writer out, Document doc) throws IOException {
OutputFormat outformat = OutputFormat.createPrettyPrint();
outformat.setIndentSize(1);
outformat.setIndent("\t");
@@ -98,7 +99,7 @@ public class XmlExport {
toXml(new FileOutputStream(f), doc);
}
- public static void toXml(OutputStream out, Document doc) throws Exception {
- toXml(new OutputStreamWriter(out, "UTF8"), doc);
+ public static void toXml(OutputStream out, Document doc) throws IOException {
+ toXml(new OutputStreamWriter(out, UTF_8), doc);
}
}
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/BasePage.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/BasePage.html
index ff81973..bd8a915 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/BasePage.html
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/BasePage.html
@@ -59,6 +59,7 @@
</style>
<wicket:header-items/>
<title wicket:id="pageTitle">[title]</title>
+ <link rel="stylesheet" type="text/css" href="css/custom.css"/>
</head>
<body>
<div wicket:id="main-loader" style="height: 100%;" class="ui-widget-header">
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/BasePage.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/BasePage.java
index c300d87..b77c771 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/BasePage.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/BasePage.java
@@ -120,7 +120,6 @@ public abstract class BasePage extends AsyncUrlFragmentAwarePage {
script.append(getGaCode()).append("');").append(isMainPage() ? "initHash()" : "init()").append(';');
response.render(OnDomReadyHeaderItem.forScript(script));
}
- response.render(CssHeaderItem.forUrl("css/custom.css"));
}
@Override
diff --git a/pom.xml b/pom.xml
index a4e5e3d..a6a9343 100644
--- a/pom.xml
+++ b/pom.xml
@@ -73,7 +73,7 @@
<forbiddenapis.version>2.6</forbiddenapis.version>
<!-- dependency versions -->
<junit.version>4.12</junit.version>
- <wicket.version>8.2.0</wicket.version>
+ <wicket.version>8.3.0-SNAPSHOT</wicket.version>
<wicketju.version>8.1.0</wicketju.version>
<wickets.version>8.2.0</wickets.version>
<red5-client.version>1.0.10-M9</red5-client.version>