Author: solomax
Date: Tue Oct 27 19:12:52 2015
New Revision: 1710874
URL: http://svn.apache.org/viewvc?rev=1710874&view=rev
Log:
[OPENMEETINGS-980] debug bar redrawing removed until wicket 7.2.0; cxf version
is updated
Modified:
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/MainPage.java
openmeetings/trunk/singlewebapp/pom.xml
Modified:
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/MainPage.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/MainPage.java?rev=1710874&r1=1710873&r2=1710874&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/MainPage.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/MainPage.java
Tue Oct 27 19:12:52 2015
@@ -124,9 +124,11 @@ public class MainPage extends BaseInited
});
add(about);
if
(getApplication().getDebugSettings().isDevelopmentUtilitiesEnabled()) {
- add((dev = new DebugBar("dev")).setOutputMarkupId(true));
+ add(dev = new DebugBar("dev"));
+ dev.setOutputMarkupId(true);
} else {
- add((dev = new
EmptyPanel("dev")).setOutputMarkupPlaceholderTag(true).setVisible(false));
+ dev = null;
+ add(new EmptyPanel("dev").setVisible(false));
}
topLinks.add(new ExternalLink("bug",
"https://issues.apache.org/jira/browse/OPENMEETINGS";));//FIXME hardcoded
@@ -207,9 +209,12 @@ public class MainPage extends BaseInited
}
panel.onMenuPanelLoad(handler);
}
+ /* FIXME commented until wicket 7.2.0 will be released
+ TODO check if this call is necessary
if (dev != null){
- handler.add(dev);
+ target.add(dev);
}
+ */
}
@Override
Modified: openmeetings/trunk/singlewebapp/pom.xml
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/pom.xml?rev=1710874&r1=1710873&r2=1710874&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/pom.xml (original)
+++ openmeetings/trunk/singlewebapp/pom.xml Tue Oct 27 19:12:52 2015
@@ -49,7 +49,7 @@
<batik.version>1.7</batik.version>
<commons-transaction.version>1.2</commons-transaction.version>
<ical4j.version>1.0.6</ical4j.version>
- <cxf.version>3.1.2</cxf.version>
+ <cxf.version>3.1.3</cxf.version>
<selenium.version>2.48.2</selenium.version>
<simple-xml.version>2.7.1</simple-xml.version>
<jettison.version>1.3.5</jettison.version>
