Skip to content

Commit

Permalink
disabling wicket-atmosphere for now (was used only for task notificat…
Browse files Browse the repository at this point in the history 
…ions POC).
  • Loading branch information
@1azyman
1azyman committed Feb 22, 2014
1 parent a7aa2d2 commit 9d85c21
Show file tree
Hide file tree
Showing 2 changed files with 83 additions and 76 deletions.
17 changes: 12 additions & 5 deletions gui/admin-gui/src/main/java/com/evolveum/midpoint/web/security/MidPointApplication.java
View file
Expand Up @@ -61,6 +61,7 @@
import org.apache.wicket.settings.IApplicationSettings;
import org.apache.wicket.settings.IResourceSettings;
import org.apache.wicket.spring.injection.annot.SpringComponentInjector;
import org.apache.wicket.util.lang.Bytes;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;

Expand All @@ -73,6 +74,11 @@
@Component("midpointApplication")
public class MidPointApplication extends AuthenticatedWebApplication {

/**
* Max. photo size for user/jpegPhoto
*/
public static final Bytes USER_PHOTO_MAX_FILE_SIZE = Bytes.kilobytes(192);

private static final String WEB_APP_CONFIGURATION = "midpoint.webApplication";

private static final Trace LOGGER = TraceManager.getTrace(MidPointApplication.class);
Expand Down Expand Up @@ -150,11 +156,12 @@ public IRequestHandler onException(RequestCycle cycle, Exception ex) {
}
});

//ajax push (just an experiment)
eventBus = new EventBus(this);
eventBus.getParameters().setLogLevel(AtmosphereLogLevel.DEBUG);

//enable simple task notifications here
// todo wicket atmosphere was disabled because of form file upload and redirection url problems.
// //ajax push (just an experiment)
// eventBus = new EventBus(this);
// eventBus.getParameters().setLogLevel(AtmosphereLogLevel.DEBUG);
//
// //enable simple task notifications here
// taskManager.registerTaskListener(new TaskListener() {
//
// @Override
Expand Down
142 changes: 71 additions & 71 deletions gui/admin-gui/src/main/webapp/WEB-INF/web.xml
View file
Expand Up @@ -65,23 +65,23 @@
<url-pattern>/*</url-pattern>
</filter-mapping>

<!--<filter>-->
<!--<filter-name>wicket</filter-name>-->
<!--<filter-class>org.apache.wicket.protocol.http.WicketFilter</filter-class>-->
<!--<init-param>-->
<!--<param-name>configuration</param-name>-->
<!--<param-value>development</param-value>-->
<!--&lt;!&ndash;<param-value>deployment</param-value>&ndash;&gt;-->
<!--</init-param>-->
<!--<init-param>-->
<!--<param-name>applicationBean</param-name>-->
<!--<param-value>midpointApplication</param-value>-->
<!--</init-param>-->
<!--<init-param>-->
<!--<param-name>applicationFactoryClassName</param-name>-->
<!--<param-value>org.apache.wicket.spring.SpringWebApplicationFactory</param-value>-->
<!--</init-param>-->
<!--</filter>-->
<filter>
<filter-name>wicket</filter-name>
<filter-class>org.apache.wicket.protocol.http.WicketFilter</filter-class>
<init-param>
<param-name>configuration</param-name>
<param-value>development</param-value>
<!--<param-value>deployment</param-value>-->
</init-param>
<init-param>
<param-name>applicationBean</param-name>
<param-value>midpointApplication</param-value>
</init-param>
<init-param>
<param-name>applicationFactoryClassName</param-name>
<param-value>org.apache.wicket.spring.SpringWebApplicationFactory</param-value>
</init-param>
</filter>

<filter>
<filter-name>springSecurityFilterChain</filter-name>
Expand All @@ -102,61 +102,61 @@
<url-pattern>/wro/*</url-pattern>
</filter-mapping>

<!--<filter-mapping>-->
<!--<filter-name>wicket</filter-name>-->
<!--<url-pattern>/*</url-pattern>-->
<!--<dispatcher>REQUEST</dispatcher>-->
<!--<dispatcher>ERROR</dispatcher>-->
<!--</filter-mapping>-->

<servlet>
<description>Atmospherefilter</description>
<servlet-name>Atmospherefilter</servlet-name>
<servlet-class>org.atmosphere.cpr.AtmosphereServlet</servlet-class>
<init-param>
<param-name>configuration</param-name>
<param-value>development</param-value>
<!--<param-value>deployment</param-value>-->
</init-param>
<init-param>
<param-name>applicationBean</param-name>
<param-value>midpointApplication</param-value>
</init-param>
<init-param>
<param-name>applicationFactoryClassName</param-name>
<param-value>org.apache.wicket.spring.SpringWebApplicationFactory</param-value>
</init-param>
<init-param>
<param-name>org.atmosphere.useWebSocket</param-name>
<param-value>true</param-value>
</init-param>
<init-param>
<param-name>org.atmosphere.useNative</param-name>
<param-value>true</param-value>
</init-param>
<init-param>
<param-name>org.atmosphere.cpr.sessionSupport</param-name>
<param-value>true</param-value>
</init-param>
<init-param>
<param-name>filterMappingUrlPattern</param-name>
<param-value>/*</param-value>
</init-param>
<init-param>
<param-name>org.atmosphere.websocket.WebSocketProtocol</param-name>
<param-value>org.atmosphere.websocket.protocol.EchoProtocol</param-value>
</init-param>
<init-param>
<param-name>org.atmosphere.cpr.broadcastFilterClasses</param-name>
<param-value>org.apache.wicket.atmosphere.TrackMessageSizeFilter</param-value>
</init-param>
<load-on-startup>1</load-on-startup>
<!--<async-supported>true</async-supported> supported in servlet 3.0 (tomcat 7) -->
</servlet>
<servlet-mapping>
<servlet-name>Atmospherefilter</servlet-name>
<filter-mapping>
<filter-name>wicket</filter-name>
<url-pattern>/*</url-pattern>
</servlet-mapping>
<dispatcher>REQUEST</dispatcher>
<dispatcher>ERROR</dispatcher>
</filter-mapping>

<!--<servlet>-->
<!--<description>Atmospherefilter</description>-->
<!--<servlet-name>Atmospherefilter</servlet-name>-->
<!--<servlet-class>org.atmosphere.cpr.AtmosphereServlet</servlet-class>-->
<!--<init-param>-->
<!--<param-name>configuration</param-name>-->
<!--<param-value>development</param-value>-->
<!--&lt;!&ndash;<param-value>deployment</param-value>&ndash;&gt;-->
<!--</init-param>-->
<!--<init-param>-->
<!--<param-name>applicationBean</param-name>-->
<!--<param-value>midpointApplication</param-value>-->
<!--</init-param>-->
<!--<init-param>-->
<!--<param-name>applicationFactoryClassName</param-name>-->
<!--<param-value>org.apache.wicket.spring.SpringWebApplicationFactory</param-value>-->
<!--</init-param>-->
<!--<init-param>-->
<!--<param-name>org.atmosphere.useWebSocket</param-name>-->
<!--<param-value>true</param-value>-->
<!--</init-param>-->
<!--<init-param>-->
<!--<param-name>org.atmosphere.useNative</param-name>-->
<!--<param-value>true</param-value>-->
<!--</init-param>-->
<!--<init-param>-->
<!--<param-name>org.atmosphere.cpr.sessionSupport</param-name>-->
<!--<param-value>true</param-value>-->
<!--</init-param>-->
<!--<init-param>-->
<!--<param-name>filterMappingUrlPattern</param-name>-->
<!--<param-value>/*</param-value>-->
<!--</init-param>-->
<!--<init-param>-->
<!--<param-name>org.atmosphere.websocket.WebSocketProtocol</param-name>-->
<!--<param-value>org.atmosphere.websocket.protocol.EchoProtocol</param-value>-->
<!--</init-param>-->
<!--<init-param>-->
<!--<param-name>org.atmosphere.cpr.broadcastFilterClasses</param-name>-->
<!--<param-value>org.apache.wicket.atmosphere.TrackMessageSizeFilter</param-value>-->
<!--</init-param>-->
<!--<load-on-startup>1</load-on-startup>-->
<!--&lt;!&ndash;<async-supported>true</async-supported> supported in servlet 3.0 (tomcat 7) &ndash;&gt;-->
<!--</servlet>-->
<!--<servlet-mapping>-->
<!--<servlet-name>Atmospherefilter</servlet-name>-->
<!--<url-pattern>/*</url-pattern>-->
<!--</servlet-mapping>-->

<servlet>
<servlet-name>CXFServlet</servlet-name>
Expand Down

0 comments on commit 9d85c21

Please sign in to comment.