SuperX
/
kern
6
0
Fork 0
Code Issues 8 Pull Requests Projects Releases Wiki Activity
Browse Source

Bugfix ExecuteMask Excel #1

RELEASE_kern5.0
Daniel Quathamer 9 months ago
parent
9a0a5e1e4e
commit
799cf81280
6 changed files with 560 additions and 4 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 3
      src/de/superx/bin/ExecuteMask.java
  2. 2
      superx/WEB-INF/conf/edustore/db/install/conf/builddatum.txt
  3. 2
      superx/WEB-INF/conf/edustore/db/install/conf/kern.rtf
  4. 4
      superx/WEB-INF/conf/edustore/db/install/schluesseltabellen/release_unloads/fm_templates.unl
  5. BIN
      superx/WEB-INF/lib/superx5.0.jar
  6. 553
      superx/WEB-INF/web.xml

3
src/de/superx/bin/ExecuteMask.java
Unescape View File

@ -308,8 +308,9 @@ public class ExecuteMask { @@ -308,8 +308,9 @@ public class ExecuteMask {
method = "pdf";
if (contenttype.indexOf("xml") > -1)
method = "xml";
if (contenttype.indexOf("excel") > -1)
if (contenttype.indexOf("spreadsheetml") > -1) {
method = "xls";
}
// if
// (contenttype.indexOf("vnd.openxmlformats-officedocument.spreadsheetml.sheet")
// > -1) method = "xlsx";

2
superx/WEB-INF/conf/edustore/db/install/conf/builddatum.txt
Unescape View File

@ -1 +1 @@ @@ -1 +1 @@
15.01.2024
20.02.2024

2
superx/WEB-INF/conf/edustore/db/install/conf/kern.rtf
View File

File diff suppressed because one or more lines are too long

4
superx/WEB-INF/conf/edustore/db/install/schluesseltabellen/release_unloads/fm_templates.unl
Unescape View File

@ -30,7 +30,9 @@ CREATE TEMP TABLE tmp_konstanten (\ @@ -30,7 +30,9 @@ CREATE TEMP TABLE tmp_konstanten (\
wertebereich VARCHAR(250),\
ab_version VARCHAR(10),\
gruppe VARCHAR(255),\
sachgebiete_id INTEGER\
sachgebiete_id INTEGER,\
priority INTEGER,\
sourcesystem INTEGER\
);</#macro>\
\
<#macro update_existing_konstanten param_SQLdialect>\

BIN
superx/WEB-INF/lib/superx5.0.jar
View File

Binary file not shown.

553
superx/WEB-INF/web.xml
Unescape View File

@ -0,0 +1,553 @@ @@ -0,0 +1,553 @@
<?xml version="1.0" encoding="UTF-8"?>
<web-app xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd" version="2.4">
<display-name>SuperX</display-name>
<description>SuperX</description>
<!-- Define servlet-mapped and path-mapped example filters -->
<!--<filter>
<filter-name>Servlet Mapped Filter</filter-name>
<filter-class>filters.ExampleFilter</filter-class>
<init-param>
<param-name>attribute</param-name>
<param-value>filters.ExampleFilter.SERVLET_MAPPED</param-value>
</init-param>
</filter>
<filter>
<filter-name>Path Mapped Filter</filter-name>
<filter-class>filters.ExampleFilter</filter-class>
<init-param>
<param-name>attribute</param-name>
<param-value>filters.ExampleFilter.PATH_MAPPED</param-value>
</init-param>
</filter>
<filter>
<filter-name>Request Dumper Filter</filter-name>
<filter-class>filters.RequestDumperFilter</filter-class>
</filter>-->
<!-- Example filter to set character encoding on each request -->
<!--<filter>
<filter-name>Set Character Encoding</filter-name>
<filter-class>filters.SetCharacterEncodingFilter</filter-class>
<init-param>
<param-name>encoding</param-name>
<param-value>EUC_JP</param-value>
</init-param>
</filter>
<filter>
<filter-name>Compression Filter</filter-name>
<filter-class>compressionFilters.CompressionFilter</filter-class>
<init-param>
<param-name>compressionThreshold</param-name>
<param-value>10</param-value>
</init-param>
<init-param>
<param-name>debug</param-name>
<param-value>0</param-value>
</init-param>
</filter>
-->
<!-- Example filter mapping to apply the "Set Character Encoding" filter
to *all* requests processed by this web application -->
<!--
<filter-mapping>
<filter-name>Set Character Encoding</filter-name>
<url-pattern>/*</url-pattern>
</filter-mapping>
-->
<!--
<filter-mapping>
<filter-name>Compression Filter</filter-name>
<url-pattern>/CompressionTest</url-pattern>
</filter-mapping>
-->
<!--
<filter-mapping>
<filter-name>Request Dumper Filter</filter-name>
<url-pattern>/*</url-pattern>
</filter-mapping>
-->
<!-- Define example application events listeners -->
<!--<listener>
<listener-class>listeners.ContextListener</listener-class>
</listener>
<listener>
<listener-class>listeners.SessionListener</listener-class>
</listener>-->
<!-- MONDRIAN -->
<listener>
<listener-class>mondrian.web.taglib.Listener</listener-class>
</listener>
<!-- END MONDRIAN -->
<!-- Encoding fuer DBFORMS setzen -->
<filter>
<filter-name>Set Character Encoding</filter-name>
<filter-class>org.dbforms.util.external.SetCharacterEncodingFilter</filter-class>
<init-param>
<param-name>encoding</param-name>
<param-value>UTF-8</param-value>
</init-param>
</filter>
<filter-mapping>
<filter-name>Set Character Encoding</filter-name>
<url-pattern>/servlet/control</url-pattern>
</filter-mapping>
<!-- Define servlets that are included in the example application -->
<!--=========== DbForms Configuration Servlet ===========-->
<servlet>
<servlet-name>org.dbforms.ConfigServlet</servlet-name>
<!-- servlet-class>org.dbforms.servlets.ConfigServlet</servlet-class -->
<servlet-class>de.superx.servlet.SxDbformsConfigServlet</servlet-class>
<init-param>
<param-name>log4j.configuration</param-name>
<param-value>/WEB-INF/log4j.properties</param-value>
</init-param>
<init-param>
<param-name>digesterDebugLevel</param-name>
<param-value>0</param-value>
</init-param>
<init-param>
<param-name>localeKey</param-name>
<param-value>de_DE</param-value>
</init-param>
<init-param>
<param-name>resourceBundle</param-name>
<param-value>ApplicationResources</param-value>
</init-param>
<!--
<init-param>
<param-name>validation</param-name>
<param-value>/WEB-INF/validation.xml</param-value>
</init-param>
<init-param>
<param-name>validator-rules</param-name>
<param-value>/WEB-INF/validator-rules.xml</param-value>
</init-param>
-->
<load-on-startup>1</load-on-startup>
</servlet>
<!--=========== DbForms Controller Servlet ==============-->
<servlet>
<servlet-name>control</servlet-name>
<servlet-class>org.dbforms.servlets.Controller</servlet-class>
<init-param>
<param-name>maxUploadSize</param-name>
<param-value>800000</param-value>
</init-param>
</servlet>
<!--=========== DbForms FileServlet =====================-->
<servlet>
<servlet-name>file</servlet-name>
<servlet-class>org.dbforms.servlets.FileServlet</servlet-class>
<load-on-startup>2</load-on-startup>
</servlet>
<!--SuperX-Servlets -->
<!-- Das SuperXManager-Servlet initialisiert den ConnectionPool
und gecachte Object automatisch beim Tomcat-Start-->
<servlet>
<servlet-name>SuperXManager</servlet-name>
<servlet-class>de.superx.servlet.SuperXManager</servlet-class>
<load-on-startup>50</load-on-startup>
<init-param>
<param-name>sharedSecret</param-name>
<param-value>sYyOvWDtISVNG6Xgh7MBk4hC9uLuyPQ3i</param-value>
</init-param>
<init-param>
<param-name>xml_return_link</param-name>
<param-value>false</param-value>
</init-param>
<init-param>
<param-name>xsl_processor</param-name>
<param-value>net.sf.saxon.TransformerFactoryImpl</param-value>
<!--<param-value>org.apache.xalan.xsltc.trax.TransformerFactoryImpl</param-value> deprecated macht Probleme bei UT8-->
</init-param>
<init-param>
<!-- deaktiviert da manueller Datenupdate moeglich -->
<param-name>sichtenCaching</param-name>
<param-value>false</param-value>
</init-param>
<init-param>
<!-- statische Felder (Art=1) in Masken cachen? -->
<param-name>field1Cache</param-name>
<param-value>1=0</param-value>
<!-- (hier sql moegliche, z.B. bestimmte felder ausschließen-->
</init-param>
<init-param>
<param-name>defaultMaskXsl</param-name>
<param-value>maske_html.xsl</param-value>
</init-param>
<init-param>
<param-name>maxRows</param-name>
<param-value>30000</param-value>
</init-param>
<!--<init-param>
<param-name>defaultTableHtmlXsl</param-name>
<param-value>tabelle_html_his1.xsl</param-value>
</init-param>
<init-param>
<param-name>defaultTableXlsXsl</param-name>
<param-value>tabelle_xls_his1.xsl</param-value>
</init-param>
<init-param>
<param-name>defaultTablePdfXsl</param-name>
<param-value>tabelle_fo_pdf_his1.xsl</param-value>
</init-param>-->
</servlet>
<servlet>
<servlet-name>SuperXUpload</servlet-name>
<servlet-class>de.superx.servlet.SuperXUpload</servlet-class>
<init-param>
<!--MandantenID-->
<param-name>default</param-name>
<!--Filter * vorlage.xls,*.xsl-->
<param-value>vorlage.xls,*.gif,*.png,*.htm</param-value>
</init-param>
<!--ggfs weitere Einträge für weitere Mandanten hinzufuegen-->
</servlet>
<servlet>
<servlet-name>de.superx.servlet.Entwicklung</servlet-name>
<servlet-class>de.superx.servlet.Entwicklung</servlet-class>
</servlet>
<servlet>
<servlet-name>SuperXhtmlAnmeldung</servlet-name>
<servlet-class>de.superx.servlet.SuperXhtmlAnmeldung</servlet-class>
</servlet>
<!-- ************************* SUPERXDBSERVLET ************************************ -->
<servlet>
<servlet-name>SuperXDBServlet</servlet-name>
<servlet-class>de.superx.servlet.SuperXDBServlet</servlet-class>
<init-param>
<!--Dieser Parameter legt fest, wie viele Zeilen das Servlet maximal zurueckgeben soll.
Achtung: Diese Zahl muss groesser als die Zahl der Eintraege im Organigramm sein,
sonst funktioniert das AdminTool nicht.-->
<param-name>maxRows</param-name>
<param-value>17000</param-value>
</init-param>
</servlet>
<servlet>
<servlet-name>SuperXmlAnmeldung</servlet-name>
<servlet-class>de.superx.servlet.SuperXmlAnmeldung</servlet-class>
<init-param>
<param-name>maxRows</param-name>
<param-value>17000</param-value>
</init-param>
</servlet>
<servlet>
<servlet-name>SuperXmlAbmeldung</servlet-name>
<servlet-class>de.superx.servlet.SuperXmlAbmeldung</servlet-class>
<init-param>
<param-name>alt_redirect_url</param-name>
<param-value>/superx/xml</param-value>
</init-param>
</servlet>
<servlet>
<servlet-name>SuperXmlMaske</servlet-name>
<servlet-class>de.superx.servlet.SuperXmlMaske</servlet-class>
<init-param>
<param-name>maxRows</param-name>
<param-value>17000</param-value>
</init-param>
</servlet>
<servlet>
<servlet-name>SuperXmlTabelle</servlet-name>
<servlet-class>de.superx.servlet.SuperXmlTabelle</servlet-class>
<init-param>
<param-name>maxRows</param-name>
<param-value>17000</param-value>
</init-param>
<init-param>
<param-name>maxOffset</param-name>
<param-value>30</param-value>
</init-param>
</servlet>
<servlet>
<servlet-name>SuperXmlPwChanger</servlet-name>
<servlet-class>de.superx.servlet.SuperXmlPwChanger</servlet-class>
</servlet>
<servlet>
<servlet-name>de.superx.servlet.SuperXmlMenu</servlet-name>
<servlet-class>de.superx.servlet.SuperXmlMenu</servlet-class>
</servlet>
<servlet>
<servlet-name>SuperXmlMenu</servlet-name>
<servlet-class>de.superx.servlet.SuperXmlMenu</servlet-class>
</servlet>
<servlet>
<servlet-name>ImageServlet</servlet-name>
<servlet-class>net.sf.jasperreports.j2ee.servlets.ImageServlet</servlet-class>
</servlet>
<servlet-mapping>
<servlet-name>ImageServlet</servlet-name>
<url-pattern>/servlet/image</url-pattern>
</servlet-mapping>
<!--==== Controller Servlet and FileServlet Mappings========-->
<servlet-mapping>
<servlet-name>control</servlet-name>
<url-pattern>/servlet/control</url-pattern>
</servlet-mapping>
<servlet-mapping>
<servlet-name>file</servlet-name>
<url-pattern>/servlet/file</url-pattern>
</servlet-mapping>
<!-- SuperX Mappings-->
<servlet-mapping>
<servlet-name>SuperXmlAnmeldung</servlet-name>
<url-pattern>/servlet/SuperXmlAnmeldung</url-pattern>
</servlet-mapping>
<servlet-mapping>
<servlet-name>SuperXmlAnmeldung</servlet-name>
<url-pattern>/servlet/de.superx.servlet.SuperXmlAnmeldung</url-pattern>
</servlet-mapping>
<servlet-mapping>
<servlet-name>SuperXDBServlet</servlet-name>
<url-pattern>/servlet/SuperXDBServlet</url-pattern>
</servlet-mapping>
<servlet-mapping>
<servlet-name>SuperXmlAbmeldung</servlet-name>
<url-pattern>/servlet/SuperXmlAbmeldung</url-pattern>
</servlet-mapping>
<servlet-mapping>
<servlet-name>SuperXmlMaske</servlet-name>
<url-pattern>/servlet/SuperXmlMaske</url-pattern>
</servlet-mapping>
<servlet-mapping>
<servlet-name>SuperXmlTabelle</servlet-name>
<url-pattern>/servlet/SuperXmlTabelle</url-pattern>
</servlet-mapping>
<servlet-mapping>
<servlet-name>SuperXmlPwChanger</servlet-name>
<url-pattern>/servlet/de.superx.servlet.SuperXmlPwChanger</url-pattern>
</servlet-mapping>
<servlet-mapping>
<servlet-name>SuperXmlPwChanger</servlet-name>
<url-pattern>/servlet/SuperXmlPwChanger</url-pattern>
</servlet-mapping>
<servlet-mapping>
<servlet-name>SuperXManager</servlet-name>
<url-pattern>/servlet/SuperXManager</url-pattern>
</servlet-mapping>
<servlet-mapping>
<servlet-name>SuperXUpload</servlet-name>
<url-pattern>/servlet/SuperXUpload</url-pattern>
</servlet-mapping>
<servlet-mapping>
<servlet-name>SuperXmlMenu</servlet-name>
<url-pattern>/servlet/SuperXmlMenu</url-pattern>
</servlet-mapping>
<servlet-mapping>
<servlet-name>de.superx.servlet.Entwicklung</servlet-name>
<url-pattern>/servlet/de.superx.servlet.Entwicklung</url-pattern>
</servlet-mapping>
<jsp-config>
<taglib>
<taglib-uri>/WEB-INF/dbforms.tld</taglib-uri>
<taglib-location>/WEB-INF/dbforms.tld</taglib-location>
</taglib>
</jsp-config>
<!--
<taglib>
<taglib-uri>
http://jakarta.apache.org/tomcat/debug-taglib
</taglib-uri>
<taglib-location>
/WEB-INF/jsp/debug-taglib.tld
</taglib-location>
</taglib>
<taglib>
<taglib-uri>
http://jakarta.apache.org/tomcat/examples-taglib
</taglib-uri>
<taglib-location>
/WEB-INF/jsp/example-taglib.tld
</taglib-location>
</taglib>
<taglib>
<taglib-uri>
http://jakarta.apache.org/tomcat/jsp2-example-taglib
</taglib-uri>
<taglib-location>
/WEB-INF/jsp2/jsp2-example-taglib.tld
</taglib-location>
</taglib>
<jsp-property-group>
<description>
Special property group for JSP Configuration JSP example.
</description>
<display-name>JSPConfiguration</display-name>
<url-pattern>/jsp2/misc/config.jsp</url-pattern>
<el-ignored>true</el-ignored>
<page-encoding>ISO-8859-1</page-encoding>
<scripting-invalid>true</scripting-invalid>
<include-prelude>/jsp2/misc/prelude.jspf</include-prelude>
<include-coda>/jsp2/misc/coda.jspf</include-coda>
</jsp-property-group>
</jsp-config>
-->
<security-constraint>
<display-name>Example Security Constraint</display-name>
<web-resource-collection>
<web-resource-name>Protected Area</web-resource-name>
<!-- Define the context-relative URL(s) to be protected -->
<url-pattern>/security/protected/*</url-pattern>
<!-- If you list http methods, only those methods are protected -->
<http-method>DELETE</http-method>
<http-method>GET</http-method>
<http-method>POST</http-method>
<http-method>PUT</http-method>
</web-resource-collection>
<auth-constraint>
<!-- Anyone with one of the listed roles may access this area -->
<role-name>tomcat</role-name>
<role-name>role1</role-name>
</auth-constraint>
</security-constraint>
<!-- Default login configuration uses form-based authentication -->
<login-config>
<auth-method>FORM</auth-method>
<realm-name>Example Form-Based Authentication Area</realm-name>
<form-login-config>
<form-login-page>/security/protected/login.jsp</form-login-page>
<form-error-page>/security/protected/error.jsp</form-error-page>
</form-login-config>
</login-config>
<!-- Security roles referenced by this web application -->
<security-role>
<role-name>role1</role-name>
</security-role>
<security-role>
<role-name>tomcat</role-name>
</security-role>
<resource-ref>
<description>SuperX Datasource</description>
<res-ref-name>jdbc/superx</res-ref-name>
<res-type>javax.sql.DataSource</res-type>
<res-auth>Container</res-auth>
</resource-ref>
<!--<resource-env-ref>
<description>
SuperX Datasource
</description>
<resource-env-ref-name>
jdbc/superx
</resource-env-ref-name>
<resource-env-ref-type>
javax.sql.DataSource
</resource-env-ref-type>
</resource-env-ref>-->
<!--How long (in minutes) will a session be maintained in spite of inactivity?
A negative value means forever -->
<session-config>
<session-timeout>180</session-timeout>
</session-config>
<!--REST DQ-->
<servlet>
<servlet-name>Jersey REST Service</servlet-name>
<servlet-class>
com.sun.jersey.spi.container.servlet.ServletContainer
</servlet-class>
<init-param>
<param-name>com.sun.jersey.config.property.packages</param-name>
<param-value>de.superx.sxrest</param-value>
</init-param>
<load-on-startup>1</load-on-startup>
</servlet>
<servlet-mapping>
<servlet-name>Jersey REST Service</servlet-name>
<url-pattern>/sxrest/*</url-pattern>
</servlet-mapping>
<!--Ende REST DQ-->
<!-- SAIKU -->
<!--
<context-param>
<param-name>contextConfigLocation</param-name>
<param-value>/WEB-INF/saiku/applicationContext.xml</param-value>
</context-param>
<filter>
<filter-name>org.springframework.security.filterChainProxy</filter-name>
<filter-class>org.springframework.web.filter.DelegatingFilterProxy</filter-class>
</filter>
<filter>
<filter-name>http-request-context</filter-name>
<filter-class>org.codehaus.enunciate.webapp.HTTPRequestContextFilter</filter-class>
</filter>
<filter-mapping>
<filter-name>org.springframework.security.filterChainProxy</filter-name>
<url-pattern>/*</url-pattern>
</filter-mapping>
<filter-mapping>
<filter-name>http-request-context</filter-name>
<url-pattern>/*</url-pattern>
</filter-mapping>
<listener>
<listener-class>org.springframework.web.context.request.RequestContextListener</listener-class>
</listener>
<listener>
<listener-class>org.springframework.web.context.ContextLoaderListener</listener-class>
</listener>
<listener>
<listener-class>org.codehaus.enunciate.modules.spring_app.SpringComponentPostProcessor</listener-class>
</listener>
<servlet>
<servlet-name>spring</servlet-name>
<servlet-class>org.springframework.web.servlet.DispatcherServlet</servlet-class>
</servlet>
<servlet>
<servlet-name>jersey</servlet-name>
<servlet-class>org.codehaus.enunciate.modules.jersey.EnunciateJerseyServletContainer</servlet-class>
<init-param>
<param-name>com.sun.jersey.config.property.packages</param-name>
<param-value>org.saiku.web</param-value>
</init-param>
<init-param>
<param-name>com.sun.jersey.spi.container.ContainerRequestFilters</param-name>
<param-value>com.sun.jersey.api.container.filter.PostReplaceFilter</param-value>
</init-param>
<init-param>
<param-name>org.codehaus.enunciate.modules.jersey.config.ServletPath</param-name>
<param-value>/rest</param-value>
</init-param>
</servlet>
<servlet-mapping>
<servlet-name>spring</servlet-name>
<url-pattern>/oauth/*</url-pattern>
</servlet-mapping>
<servlet-mapping>
<servlet-name>jersey</servlet-name>
<url-pattern>/json/saiku/*</url-pattern>
</servlet-mapping>
<servlet-mapping>
<servlet-name>jersey</servlet-name>
<url-pattern>/json/saiku/session</url-pattern>
</servlet-mapping>
<servlet-mapping>
<servlet-name>jersey</servlet-name>
<url-pattern>/rest/saiku/*</url-pattern>
</servlet-mapping>
<servlet-mapping>
<servlet-name>jersey</servlet-name>
<url-pattern>/rest/saiku/session</url-pattern>
</servlet-mapping>
<servlet-mapping>
<servlet-name>jersey</servlet-name>
<url-pattern>/xml/saiku/*</url-pattern>
</servlet-mapping>
<servlet-mapping>
<servlet-name>jersey</servlet-name>
<url-pattern>/xml/saiku/session</url-pattern>
</servlet-mapping>
<mime-mapping>
<extension>wsdl</extension>
<mime-type>text/xml</mime-type>
</mime-mapping>
<mime-mapping>
<extension>xsd</extension>
<mime-type>text/xml</mime-type>
</mime-mapping>-->
</web-app>
Write Preview
Loading…
Cancel
Save