Author: solomax
Date: Thu Oct 25 03:49:44 2012
New Revision: 1401969
URL: http://svn.apache.org/viewvc?rev=1401969&view=rev
Log:
Wicket: backup export is fixed
Added:
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/cli/DummyServletContext.java
Removed:
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/outputhandler/HttpServletRequestEx.java
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/outputhandler/ServletRequestExFilter.java
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/WEB-INF/web.xml
incubator/openmeetings/trunk/singlewebapp/build.xml
incubator/openmeetings/trunk/singlewebapp/ivy.xml
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/cli/Admin.java
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/outputhandler/BackupExport.java
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/backup/BackupPanel.java
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/WEB-INF/web.xml
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/WEB-INF/web.xml?rev=1401969&r1=1401968&r2=1401969&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/WEB-INF/web.xml
(original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/WEB-INF/web.xml Thu
Oct 25 03:49:44 2012
@@ -52,21 +52,6 @@
<url-pattern>/*</url-pattern>
</filter-mapping>
- <filter>
- <filter-name>ServletRequestExFilter</filter-name>
-
<filter-class>org.apache.openmeetings.servlet.outputhandler.ServletRequestExFilter</filter-class>
- <init-param>
- <param-name>uriEncoding</param-name>
- <param-value>UTF-8</param-value>
- </init-param>
- </filter>
-
-
- <filter-mapping>
- <filter-name>ServletRequestExFilter</filter-name>
- <url-pattern>/*</url-pattern>
- </filter-mapping>
-
<filter>
<filter-name>OpenmeetingsApplication</filter-name>
<filter-class>org.apache.wicket.protocol.http.WicketFilter</filter-class>
Modified: incubator/openmeetings/trunk/singlewebapp/build.xml
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/build.xml?rev=1401969&r1=1401968&r2=1401969&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/build.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/build.xml Thu Oct 25 03:49:44 2012
@@ -80,6 +80,7 @@
<!-- compile classpath -->
<path id="compile.classpath">
+ <fileset dir="${red5.lib}/plugins" includes="*.jar" />
<fileset dir="${red5.server.lib}" includes="*.jar" />
<fileset dir="${red5.client.lib}" includes="*.jar" />
<fileset dir="${red5.lib}" includes="*.jar" />
Modified: incubator/openmeetings/trunk/singlewebapp/ivy.xml
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/ivy.xml?rev=1401969&r1=1401968&r2=1401969&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/ivy.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/ivy.xml Thu Oct 25 03:49:44 2012
@@ -60,8 +60,7 @@
<include type="jar" />
</dependency>
<!-- include type="bundle" / FIXME unable to get openjpa
without sources -->
- <dependency org="org.apache.geronimo.specs"
name="geronimo-jpa_2.0_spec"
- rev="1.1" conf="mainlib.ext->*" transitive="false"/>
+ <dependency org="org.apache.geronimo.specs"
name="geronimo-jpa_2.0_spec" rev="1.1" conf="mainlib.ext->*"
transitive="false"/>
<!-- END OF mainlib -->
<!-- START OF ANAKIA -->
@@ -251,13 +250,10 @@
<include type="jar" />
</dependency>
- <!-- include type="bundle" / FIXME unable to get
openjpa without sources -->
+ <!-- include type="bundle" / FIXME unable to get openjpa
without sources -->
<dependency org="org.mnode.ical4j" name="ical4j" rev="1.0.3"
conf="openmeetings.ext->*" transitive="false"/>
<dependency org="org.apache.openjpa" name="openjpa" rev="2.2.0"
conf="openmeetings.ext->*" transitive="false"/>
- <dependency org="javax.servlet" name="servlet-api" rev="2.5"
conf="openmeetings.axis2->*" transitive="false">
- <include type="jar" />
- </dependency>
<dependency org="org.apache.ws.commons.axiom" name="axiom-impl"
rev="1.2.12" conf="openmeetings.axis2->*" transitive="true">
<exclude name='commons-io' />
<exclude name='commons-logging' />
@@ -340,6 +336,7 @@
<include type="jar" />
</dependency>
+ <exclude org="javax.servlet" module="servlet-api" type="*"
ext="*" conf="*" matcher="exact"/>
</dependencies>
</ivy-module>
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/cli/Admin.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/cli/Admin.java?rev=1401969&r1=1401968&r2=1401969&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/cli/Admin.java
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/cli/Admin.java
Thu Oct 25 03:49:44 2012
@@ -21,22 +21,13 @@ package org.apache.openmeetings.cli;
import java.io.BufferedReader;
import java.io.File;
import java.io.FileInputStream;
-import java.io.InputStream;
import java.io.InputStreamReader;
-import java.net.MalformedURLException;
-import java.net.URL;
import java.util.Date;
-import java.util.Enumeration;
import java.util.Map;
-import java.util.Set;
import javax.mail.internet.AddressException;
import javax.mail.internet.InternetAddress;
-import javax.servlet.RequestDispatcher;
-import javax.servlet.Servlet;
-import javax.servlet.ServletContext;
import javax.servlet.ServletContextEvent;
-import javax.servlet.ServletException;
import org.apache.commons.cli.CommandLine;
import org.apache.commons.cli.OptionGroup;
@@ -165,107 +156,7 @@ public class Admin {
private ClassPathXmlApplicationContext getApplicationContext(final
String ctxName) {
if (ctx == null) {
OMContextListener omcl = new OMContextListener();
- omcl.contextInitialized(new ServletContextEvent(new
ServletContext() {
- public void setAttribute(String arg0, Object
arg1) {
- }
-
- public void removeAttribute(String arg0) {
- }
-
- public void log(String arg0, Throwable arg1) {
- }
-
- public void log(Exception arg0, String arg1) {
- }
-
- public void log(String arg0) {
- }
-
- @SuppressWarnings("rawtypes")
- public Enumeration getServlets() {
- return null;
- }
-
- @SuppressWarnings("rawtypes")
- public Enumeration getServletNames() {
- return null;
- }
-
- public String getServletContextName() {
- return null;
- }
-
- public Servlet getServlet(String arg0) throws
ServletException {
- return null;
- }
-
- public String getServerInfo() {
- return null;
- }
-
- @SuppressWarnings("rawtypes")
- public Set getResourcePaths(String arg0) {
- return null;
- }
-
- public InputStream getResourceAsStream(String
arg0) {
- return null;
- }
-
- public URL getResource(String arg0) throws
MalformedURLException {
- return null;
- }
-
- public RequestDispatcher
getRequestDispatcher(String arg0) {
- return null;
- }
-
- public String getRealPath(String arg0) {
- return null;
- }
-
- public RequestDispatcher
getNamedDispatcher(String arg0) {
- return null;
- }
-
- public int getMinorVersion() {
- return 0;
- }
-
- public String getMimeType(String arg0) {
- return null;
- }
-
- public int getMajorVersion() {
- return 0;
- }
-
- @SuppressWarnings("rawtypes")
- public Enumeration getInitParameterNames() {
- return null;
- }
-
- public String getInitParameter(String arg0) {
- return null;
- }
-
- public String getContextPath() {
- return ctxName;
- }
-
- public ServletContext getContext(String arg0) {
- return null;
- }
-
- @SuppressWarnings("rawtypes")
- public Enumeration getAttributeNames() {
- return null;
- }
-
- public Object getAttribute(String arg0) {
- return null;
- }
- }));
+ omcl.contextInitialized(new ServletContextEvent(new
DummyServletContext()));
try {
ctx = new
ClassPathXmlApplicationContext("openmeetings-applicationContext.xml");
} catch (Exception e) {
Added:
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/cli/DummyServletContext.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/cli/DummyServletContext.java?rev=1401969&view=auto
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/cli/DummyServletContext.java
(added)
+++
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/cli/DummyServletContext.java
Thu Oct 25 03:49:44 2012
@@ -0,0 +1,299 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License") + you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.openmeetings.cli;
+
+import java.io.InputStream;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.util.Enumeration;
+import java.util.EventListener;
+import java.util.Map;
+import java.util.Set;
+
+import javax.servlet.Filter;
+import javax.servlet.FilterRegistration;
+import javax.servlet.RequestDispatcher;
+import javax.servlet.Servlet;
+import javax.servlet.ServletContext;
+import javax.servlet.ServletException;
+import javax.servlet.ServletRegistration;
+import javax.servlet.SessionCookieConfig;
+import javax.servlet.SessionTrackingMode;
+import javax.servlet.ServletRegistration.Dynamic;
+import javax.servlet.descriptor.JspConfigDescriptor;
+
+public class DummyServletContext implements ServletContext {
+ public ServletContext getContext(String uripath) {
+ // stab
+ return null;
+ }
+
+ public String getContextPath() {
+ // stab
+ return null;
+ }
+
+ public int getMajorVersion() {
+ // stab
+ return 0;
+ }
+
+ public int getMinorVersion() {
+ // stab
+ return 0;
+ }
+
+ public int getEffectiveMajorVersion() {
+ // stab
+ return 0;
+ }
+
+ public int getEffectiveMinorVersion() {
+ // stab
+ return 0;
+ }
+
+ public String getMimeType(String file) {
+ // stab
+ return null;
+ }
+
+ public Set<String> getResourcePaths(String path) {
+ // stab
+ return null;
+ }
+
+ public URL getResource(String path)
+ throws MalformedURLException {
+ // stab
+ return null;
+ }
+
+ public InputStream getResourceAsStream(String path) {
+ // stab
+ return null;
+ }
+
+ public RequestDispatcher getRequestDispatcher(String path) {
+ // stab
+ return null;
+ }
+
+ public RequestDispatcher getNamedDispatcher(String name) {
+ // stab
+ return null;
+ }
+
+ public Servlet getServlet(String name) throws ServletException {
+ // stab
+ return null;
+ }
+
+ public Enumeration<Servlet> getServlets() {
+ // stab
+ return null;
+ }
+
+ public Enumeration<String> getServletNames() {
+ // stab
+ return null;
+ }
+
+ public void log(String msg) {
+ // stab
+ }
+
+ public void log(Exception exception, String msg) {
+ // stab
+ }
+
+ public void log(String message, Throwable throwable) {
+ // stab
+ }
+
+ public String getRealPath(String path) {
+ // stab
+ return null;
+ }
+
+ public String getServerInfo() {
+ // stab
+ return null;
+ }
+
+ public String getInitParameter(String name) {
+ // stab
+ return null;
+ }
+
+ public Enumeration<String> getInitParameterNames() {
+ // stab
+ return null;
+ }
+
+ public boolean setInitParameter(String name, String value) {
+ // stab
+ return false;
+ }
+
+ public Object getAttribute(String name) {
+ // stab
+ return null;
+ }
+
+ public Enumeration<String> getAttributeNames() {
+ // stab
+ return null;
+ }
+
+ public void setAttribute(String name, Object object) {
+ // stab
+ }
+
+ public void removeAttribute(String name) {
+ // stab
+ }
+
+ public String getServletContextName() {
+ // stab
+ return null;
+ }
+
+ public Dynamic addServlet(String servletName, String className) {
+ // stab
+ return null;
+ }
+
+ public Dynamic addServlet(String servletName, Servlet servlet) {
+ // stab
+ return null;
+ }
+
+ public Dynamic addServlet(String servletName,
+ Class<? extends Servlet> servletClass) {
+ // stab
+ return null;
+ }
+
+ public <T extends Servlet> T createServlet(Class<T> c)
+ throws ServletException {
+ // stab
+ return null;
+ }
+
+ public ServletRegistration getServletRegistration(
+ String servletName) {
+ // stab
+ return null;
+ }
+
+ public Map<String, ? extends ServletRegistration>
getServletRegistrations() {
+ // stab
+ return null;
+ }
+
+ public javax.servlet.FilterRegistration.Dynamic addFilter(
+ String filterName, String className) {
+ // stab
+ return null;
+ }
+
+ public javax.servlet.FilterRegistration.Dynamic addFilter(
+ String filterName, Filter filter) {
+ // stab
+ return null;
+ }
+
+ public javax.servlet.FilterRegistration.Dynamic addFilter(
+ String filterName, Class<? extends Filter> filterClass)
{
+ // stab
+ return null;
+ }
+
+ public <T extends Filter> T createFilter(Class<T> c)
+ throws ServletException {
+ // stab
+ return null;
+ }
+
+ public FilterRegistration getFilterRegistration(
+ String filterName) {
+ // stab
+ return null;
+ }
+
+ public Map<String, ? extends FilterRegistration>
getFilterRegistrations() {
+ // stab
+ return null;
+ }
+
+ public SessionCookieConfig getSessionCookieConfig() {
+ // stab
+ return null;
+ }
+
+ public void setSessionTrackingModes(
+ Set<SessionTrackingMode> sessionTrackingModes)
+ throws IllegalStateException, IllegalArgumentException {
+ // stab
+ }
+
+ public Set<SessionTrackingMode> getDefaultSessionTrackingModes() {
+ // stab
+ return null;
+ }
+
+ public Set<SessionTrackingMode> getEffectiveSessionTrackingModes() {
+ // stab
+ return null;
+ }
+
+ public void addListener(
+ Class<? extends EventListener> listenerClass) {
+ // stab
+ }
+
+ public void addListener(String className) {
+ // stab
+ }
+
+ public <T extends EventListener> void addListener(T t) {
+ // stab
+ }
+
+ public <T extends EventListener> T createListener(Class<T> c)
+ throws ServletException {
+ // stab
+ return null;
+ }
+
+ public void declareRoles(String... roleNames) {
+ // stab
+ }
+
+ public ClassLoader getClassLoader() {
+ // stab
+ return null;
+ }
+
+ public JspConfigDescriptor getJspConfigDescriptor() {
+ // stab
+ return null;
+ }
+}
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/outputhandler/BackupExport.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/outputhandler/BackupExport.java?rev=1401969&r1=1401968&r2=1401969&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/outputhandler/BackupExport.java
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/outputhandler/BackupExport.java
Thu Oct 25 03:49:44 2012
@@ -334,6 +334,8 @@ public class BackupExport {
List<Configuration> list =
configurationDaoImpl.getConfigurations(
0, Integer.MAX_VALUE,
"c.configuration_id", true);
Registry registry = new Registry();
+ registry.bind(OmTimeZone.class,
OmTimeZoneConverter.class);
+ registry.bind(States.class, StateConverter.class);
Strategy strategy = new RegistryStrategy(registry);
Serializer serializer = new Persister(strategy);
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/backup/BackupPanel.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/backup/BackupPanel.java?rev=1401969&r1=1401968&r2=1401969&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/backup/BackupPanel.java
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/backup/BackupPanel.java
Thu Oct 25 03:49:44 2012
@@ -41,8 +41,6 @@ import org.apache.wicket.markup.html.for
import org.apache.wicket.markup.html.form.upload.FileUploadField;
import org.apache.wicket.markup.html.panel.FeedbackPanel;
import org.apache.wicket.model.Model;
-import org.apache.wicket.request.handler.resource.ResourceStreamRequestHandler;
-import org.apache.wicket.request.resource.ContentDisposition;
import org.apache.wicket.util.lang.Bytes;
import org.apache.wicket.util.resource.FileResourceStream;
import org.red5.logging.Red5LoggerFactory;
@@ -120,14 +118,9 @@ public class BackupPanel extends AdminPa
includeFilesInBackup.getConvertedInput()
.booleanValue());
-
/*download.setFileName(backupFile.getName());
+
download.setFileName(backupFile.getName());
download.setResourceStream(new
FileResourceStream(backupFile));
- download.initiate(target);*/
- ResourceStreamRequestHandler
handler
- = new
ResourceStreamRequestHandler(new FileResourceStream(backupFile),
backupFile.getName());
-
handler.setContentDisposition(ContentDisposition.ATTACHMENT);
-
-
getRequestCycle().scheduleRequestHandlerAfterCurrent(handler);
+ download.initiate(target);
} catch (Exception e) {
log.error("Exception on panel
backup download ", e);
uploadFeedback.error(e);
