Author: solomax
Date: Wed May 15 04:55:14 2013
New Revision: 1482679
URL: http://svn.apache.org/r1482679
Log:
[OPENMEETINGS-626] wicketstuff-urlfragment is moved to another location
Modified:
openmeetings/trunk/singlewebapp/ivy.xml
openmeetings/trunk/singlewebapp/ivysettings.xml
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/MainPage.java
Modified: openmeetings/trunk/singlewebapp/ivy.xml
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/ivy.xml?rev=1482679&r1=1482678&r2=1482679&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/ivy.xml (original)
+++ openmeetings/trunk/singlewebapp/ivy.xml Wed May 15 04:55:14 2013
@@ -273,7 +273,7 @@
<include type="jar" />
</dependency>
-->
- <dependency org="org.wicketstuff"
name="wicketstuff-urlfragment" rev="6.0-SNAPSHOT" conf="openmeetings->*"
transitive="false">
+ <dependency org="org.wicketstuff"
name="wicketstuff-urlfragment" rev="6.0-20130515.002826-2"
conf="openmeetings->*" transitive="false">
<include type="jar" />
</dependency>
Modified: openmeetings/trunk/singlewebapp/ivysettings.xml
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/ivysettings.xml?rev=1482679&r1=1482678&r2=1482679&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/ivysettings.xml (original)
+++ openmeetings/trunk/singlewebapp/ivysettings.xml Wed May 15 04:55:14 2013
@@ -34,8 +34,8 @@
<url name="smslib" m2compatible="true">
<artifact
pattern="http://smslib.org/maven2/v3/[organisation]/[artifact]/[revision]/[artifact]-[revision].[ext]";
/>
</url>
- <url name="urlfragment" m2compatible="false"
checksums=""> <!-- FIXME need to be removed in favor of wicketstuff -->
- <artifact
pattern="https://github.com/Horsed/WicketUrlFragment/raw/master/[artifact]-[revision].[ext]";
/>
+ <url name="urlfragment" m2compatible="true"> <!-- FIXME
need to be removed as soon wicketstuff will be released -->
+ <artifact
pattern="https://oss.sonatype.org/content/repositories/snapshots/[organisation]/[artifact]/6.0-SNAPSHOT/[artifact]-[revision].[ext]";
/>
</url>
</chain>
</resolvers>
Modified:
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/MainPage.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/MainPage.java?rev=1482679&r1=1482678&r2=1482679&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/MainPage.java
(original)
+++
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/MainPage.java
Wed May 15 04:55:14 2013
@@ -47,7 +47,6 @@ import org.apache.wicket.request.IReques
import org.apache.wicket.util.time.Duration;
import org.red5.logging.Red5LoggerFactory;
import org.slf4j.Logger;
-import org.wicketstuff.urlfragment.UrlParametersReceivingBehavior;
@AuthorizeInstantiation("USER")
public class MainPage extends BasePage {
@@ -133,8 +132,11 @@ public class MainPage extends BasePage {
BasePanel panel = getPanel(f.getArea(), f.getType());
if (panel != null) {
target.add(contents.replace(panel));
- //FIXME need to be uncommented later
UrlParametersReceivingBehavior.setFragment(target, f.getArea().name(),
f.getType());
-
UrlParametersReceivingBehavior.setFragmentParameter(target, f.getArea().name(),
f.getType());
+ //FIXME need to resolve name conflict
+ //FIXME need to implement 1 call instead of 2
+ org.wicketstuff.urlfragment.UrlFragment uf = new
org.wicketstuff.urlfragment.UrlFragment(target);
+ uf.set("");
+ uf.setParameter(f.getArea().name(), f.getType());
panel.onMenuPanelLoad(target);
}
}
