Skip to content

Commit

Permalink
frontend update to 19.10.000.119
Browse files Browse the repository at this point in the history
  • Loading branch information
Martin Aschoff committed Nov 15, 2019
1 parent 1d946a8 commit a12a4e1
Show file tree
Hide file tree
Showing 1,945 changed files with 152,773 additions and 172,106 deletions.
8 changes: 0 additions & 8 deletions frontend/build-birt.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -400,10 +400,6 @@
<filter>
<filter-name>BirtNoDocumentParameterInterceptor</filter-name>
<filter-class>com.agnitas.reporting.birt.external.web.filter.BirtNoDocumentParameterInterceptor</filter-class>
<init-param>
<param-name>errorpage</param-name>
<param-value>/webcontent/birt/pages/common/Error.jsp</param-value>
</init-param>
</filter>
<filter-mapping>
<filter-name>BirtNoDocumentParameterInterceptor</filter-name>
Expand All @@ -425,10 +421,6 @@
<filter>
<filter-name>BirtSecurityInterceptor</filter-name>
<filter-class>com.agnitas.reporting.birt.external.web.filter.BirtInterceptingFilter</filter-class>
<init-param>
<param-name>errorpage</param-name>
<param-value>/webcontent/birt/pages/common/Error.jsp</param-value>
</init-param>
</filter>
<filter-mapping>
<filter-name>BirtSecurityInterceptor</filter-name>
Expand Down
5 changes: 4 additions & 1 deletion frontend/build.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,10 @@
</condition>

<condition property="isBetaServer" value="true" else="false">
<contains string="${deploytarget}" substring=".beta" casesensitive="false" />
<or>
<contains string="${deploytarget}" substring="openemm" casesensitive="false" />
<contains string="${deploytarget}" substring=".beta" casesensitive="false" />
</or>
</condition>

<condition property="isLiveServer" value="true" else="false">
Expand Down
45 changes: 45 additions & 0 deletions frontend/build/properties/openemm.asp.beta.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
<?xml version="1.0" encoding="UTF-8"?>
<properties>
<server>
<url>http://[to be defined]</url>
</server>

<reporting>
<birt>
<url>http://[to be defined]/birt</url>
<drilldownurl>http://[to be defined]</drilldownurl>
</birt>
</reporting>

<mailgun>
<system>localhost</system>
<ini>
<domain>openemm.org</domain>
<mailer>Agnitas OpenEMM ${ApplicationMajorVersion}.${ApplicationMinorVersion}</mailer>
<metadir>/home/openemm/var/spool/META</metadir>
<xmlback>/home/openemm/bin/xmlback</xmlback>
<account_logfile>/home/openemm/log/account.log</account_logfile>
<directdir>/home/openemm/var/spool/DIRECT</directdir>
</ini>
</mailgun>

<mailaddresses>
<sender>openemm@example.com</sender>
<sender_name>OpenEMM</sender_name>
<replyto>openemm@example.com</replyto>
<replyto_name>OpenEMM</replyto_name>
<bounce>openemm@example.com</bounce>

<frontend>openemm@example.com</frontend>
<support>openemm@example.com</support>
<error>openemm@example.com</error>
<upload_database>openemm@example.com</upload_database>
<upload_support>openemm@example.com</upload_support>
<report_archive>openemm@example.com</report_archive>
</mailaddresses>

<htmlPdfConverter>${wkhtmltopdf}</htmlPdfConverter>
<htmlImageConverter>${wkhtmltoimage}</htmlImageConverter>

<birt-hostuser>openemm</birt-hostuser>
</properties>
1 change: 0 additions & 1 deletion frontend/build/properties/openemm.emm.license.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
pluginmanager.change
pluginmanager.show
recipient.profileField.html.allowed
statistic.individual.show
webservice.user.change
webservice.user.create
webservice.user.show
Expand Down
17 changes: 0 additions & 17 deletions frontend/build/templates/emm.properties.birt.xslt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,28 +14,11 @@ live.version=${isLiveServer}
# Show beta-text in application logo
beta.version=${isBetaServer}

<xsl:if test="properties/server/ignoreDeletedMessages" >
# Ignore deleted messages (Only Agnitas Beta server should do so)
ignoreDeletedMessages=<xsl:value-of select="properties/server/ignoreDeletedMessages"/>
</xsl:if>

#######################################################
# Database settings #
#######################################################
# Name of the configured jndi database used by the application
jdbc.emmDB.jndiName=emm_db
# Settings for embedded DB
jdbc.tmpDB.jndiName=embedded

#######################################################
# Birt Statistic #
#######################################################
# Url of the birt statistic application
birt.url=<xsl:value-of select="properties/reporting/birt/url"/>
# Path of public key file for secured statistics calls (public-private-key method)
birt.publickeyfile=<xsl:value-of select="properties/reporting/birt/publickeyfile"/>
# Path of private key file for secured statistics calls (public-private-key method)
birt.privatekeyfile=<xsl:value-of select="properties/reporting/birt/privatekeyfile"/>

#######################################################
# Extension System (Plugins) #
Expand Down
24 changes: 6 additions & 18 deletions frontend/build/templates/emm.properties.xslt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,19 +18,6 @@ beta.version=${isBetaServer}
# Show legacy-text in application logo
legacy.version=${isServiceServer}

<xsl:if test="properties/server/ignoreDeletedMessages" >
# Ignore deleted messages (Only Agnitas Beta server should do so)
ignoreDeletedMessages=<xsl:value-of select="properties/server/ignoreDeletedMessages"/>
</xsl:if>

#######################################################
# Database settings #
#######################################################
# Name of the configured jndi database used by the application
jdbc.emmDB.jndiName=emm_db
# Name of the configured internal jndi derby database for statistic purposes
jdbc.tmpDB.jndiName=embedded

<xsl:if test="properties/server/url" >
# URL for PDF reports
system.url=<xsl:value-of select="properties/server/url"/>
Expand Down Expand Up @@ -72,10 +59,6 @@ mailaddress.upload.support=<xsl:value-of select="properties/mailaddresses/upload
# Email address to archivate report mails
mailaddress.report_archive=<xsl:value-of select="properties/mailaddresses/report_archive"/>

# Directory for external components (images)
component.directory=<xsl:value-of select="properties/directory/component"/>
system.cdn=<xsl:value-of select="properties/cdn"/>

#######################################################
# Caching #
#######################################################
Expand All @@ -84,6 +67,11 @@ hostedImage.maxCache=<xsl:value-of select="properties/rdir/hostedImage/maxCache"
# Maximum cachetime of images delivered by rdir application
hostedImage.maxCacheTimeMillis=<xsl:value-of select="properties/rdir/hostedImage/maxCacheTimeMillis"/>

# Maximum cachesize of cdn-uuids of images delivered by rdir application
cdn.maxCache=10000
# Maximum cachetime of cdn-uuids of images delivered by rdir application
cdn.maxCacheTimeMillis=300000

# Maximum cachesize of eventmails delivered by mailgun
mailgun.maxCache=100
# Maximum cachetime of eventmails delivered by mailgun
Expand Down Expand Up @@ -219,7 +207,7 @@ birt.plugin.directory=<xsl:value-of select="properties/birt-plugins"/>
# Installpath of online help files
manual_install_path=<xsl:value-of select="properties/manual_install_path"/>
# Available languages of online help
onlinehelp.languages=de,en
onlinehelp.languages=de,en,fr

#######################################################
# Host authentication (Two-Way-Authentication) #
Expand Down
10 changes: 10 additions & 0 deletions frontend/build/templates/log4j.properties.xslt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -227,6 +227,16 @@ log4j.appender.TARGETGROUP_MIGRATION.layout.ConversionPattern=%d: %-5p [%t] %c -
log4j.logger.com.agnitas.emm.core.target.web.listener.TargetGroupMigrationListener=DEBUG, TARGETGROUP_MIGRATION
</xsl:if>

log4j.appender.FACEBOOKLOG=org.apache.log4j.DailyRollingFileAppender
log4j.appender.FACEBOOKLOG.DatePattern='.'yyyy-MM-dd
log4j.appender.FACEBOOKLOG.File=${HOME}/logs/webapps/facebook.log
log4j.appender.FACEBOOKLOG.Append=true
log4j.appender.FACEBOOKLOG.Threshold=DEBUG
log4j.appender.FACEBOOKLOG.layout=org.apache.log4j.PatternLayout
log4j.appender.FACEBOOKLOG.layout.ConversionPattern=%d: %-5p [%t] %c - %m%n
log4j.logger.com.agnitas.emm.facebook=DEBUG, FACEBOOKLOG


## Debuglog for CleanDBDao
log4j.appender.CLEANLOG=org.apache.log4j.DailyRollingFileAppender
log4j.appender.CLEANLOG.DatePattern='.'yyyy-MM-dd
Expand Down
9 changes: 7 additions & 2 deletions frontend/build/templates/web-basic.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -153,6 +153,11 @@
<listener-class>org.springframework.web.context.request.RequestContextListener</listener-class>
</listener>

<!-- Check validity of installation configuration -->
<listener>
<listener-class>com.agnitas.emm.core.ConfigurationValidityCheckListener</listener-class>
</listener>

<!-- Listener to initialize the backend datasource Note: This listener requires
that Springs ContextLoaderListener is loaded before this listener! -->
<listener>
Expand Down Expand Up @@ -448,7 +453,7 @@
<!--for JS file with translations-->
<servlet>
<servlet-name>jsLocalize</servlet-name>
<servlet-class>com.agnitas.web.JavascriptContentTypeJspServlet</servlet-class>
<servlet-class>org.apache.jasper.servlet.JspServlet</servlet-class>
</servlet>
<servlet-mapping>
<servlet-name>jsLocalize</servlet-name>
Expand All @@ -458,7 +463,7 @@
<!-- For JS file that contains some data from static context -->
<servlet>
<servlet-name>jsConfig</servlet-name>
<servlet-class>com.agnitas.web.JavascriptContentTypeJspServlet</servlet-class>
<servlet-class>org.apache.jasper.servlet.JspServlet</servlet-class>
</servlet>
<servlet-mapping>
<servlet-name>jsConfig</servlet-name>
Expand Down
5 changes: 0 additions & 5 deletions frontend/etc/reportdesigns/WEB-INF/applicationContext.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,4 @@
<bean id="WorkerExecutorService" class="java.util.concurrent.ScheduledThreadPoolExecutor">
<constructor-arg value="10" type="int" />
</bean>

<!-- public key for encryption, especially for birt report uid-parameter -->
<bean id="publickeyfile" class="java.lang.String">
<constructor-arg value="${birt.publickeyfile}" />
</bean>
</beans>
2 changes: 1 addition & 1 deletion frontend/etc/reportdesigns/WEB-INF/dataAccessContext.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,6 @@
</bean>

<bean id="dataSource" class="org.springframework.jndi.JndiObjectFactoryBean">
<property name="jndiName" value="java:comp/env/jdbc/${jdbc.emmDB.jndiName}" />
<property name="jndiName" value="java:comp/env/jdbc/emm_db" />
</bean>
</beans>
29 changes: 24 additions & 5 deletions frontend/etc/reportdesigns/devices_overview.rptdesign
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<report xmlns="http://www.eclipse.org/birt/2005/design" version="3.2.23" id="1">
<property name="createdBy">Eclipse BIRT Designer Version 4.4.0.v201405191524 Build &lt;4.4.0.v20140611-1043></property>
<property name="createdBy">Eclipse BIRT Designer Version 4.6.0.v201606072122</property>
<property name="units">in</property>
<method name="initialize"><![CDATA[var designHandle = reportContext.getReportRunnable().designHandle.getDesignHandle();
<method name="initialize"><![CDATA[
importPackage(Packages.com.agnitas.emm.core.birtstatistics.device.bean);
importPackage(Packages.com.agnitas.reporting.birt.external.dataset);
var designHandle = reportContext.getReportRunnable().designHandle.getDesignHandle();
if (reportContext.getOutputFormat() == "csv") {
designHandle.findElement("graphicalReport").drop();
Expand All @@ -13,7 +17,7 @@ if (reportContext.getOutputFormat() == "csv") {
designHandle.addCss("styles.css");
devicesStatDataSet = new Packages.com.agnitas.reporting.birt.external.dataset.DevicesStatDataSet();
dataList = devicesStatDataSet.getDevicesStat(params["companyID"], params["targetID"], params["mailinglistID"], params["maxdevices"], params["language"]);
dataList = devicesStatDataSet.getDevicesStat(params["companyID"], params["targetID"], params["mailinglistID"], params["maxdevices"], params["language"], params["statisticType"]);
reportContext.setPersistentGlobalVariable("dataList", dataList);]]></method>
<property name="iconFile">/templates/blank_report.gif</property>
<property name="layoutPreference">auto layout</property>
Expand Down Expand Up @@ -104,6 +108,21 @@ reportContext.setPersistentGlobalVariable("dataList", dataList);]]></method>
<property name="category">Unformatted</property>
</structure>
</scalar-parameter>
<scalar-parameter name="statisticType" id="738">
<property name="valueType">static</property>
<property name="isRequired">true</property>
<property name="dataType">integer</property>
<property name="distinct">true</property>
<simple-property-list name="defaultValue">
<value type="constant">1</value>
</simple-property-list>
<list-property name="selectionList"/>
<property name="paramType">simple</property>
<property name="controlType">text-box</property>
<structure name="format">
<property name="category">Unformatted</property>
</structure>
</scalar-parameter>
</parameters>
<data-sources>
<script-data-source name="DummyDataSource" id="259"/>
Expand Down Expand Up @@ -804,7 +823,7 @@ function beforeGeneration(chart, icsc)
setupPalette(paletteEntries, COLORS_15);
chart.getEmptyMessage().getCaption().setValue(Packages.com.agnitas.messages.I18nString.getLocaleString("birt.noDataAvailable", reportContext.getLocale()));
chart.getEmptyMessage().getCaption().setValue(Packages.com.agnitas.messages.I18nString.getLocaleString(&quot;birt.noDataAvailable&quot;, reportContext.getLocale()));
chart.setSeriesThickness(30);
}
Expand Down Expand Up @@ -1841,7 +1860,7 @@ function beforeGeneration(chart, icsc)
setupPalette(paletteEntries, COLORS_15);
chart.getEmptyMessage().getCaption().setValue(Packages.com.agnitas.messages.I18nString.getLocaleString("birt.noDataAvailable", reportContext.getLocale()));
chart.getEmptyMessage().getCaption().setValue(Packages.com.agnitas.messages.I18nString.getLocaleString(&quot;birt.noDataAvailable&quot;, reportContext.getLocale()));
chart.setSeriesThickness(30);
}
Expand Down
2 changes: 1 addition & 1 deletion frontend/etc/reportdesigns/domain_bydomain.rptdesign
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1719,7 +1719,7 @@ function beforeDrawDataPointLabel( dph, label, icsc )
<Definition>row[&quot;domain_index&quot;]</Definition>
</SortKey>
</SeriesDefinitions>
<Coverage>0.5</Coverage>
<Coverage>0.7</Coverage>
</model:ChartWithoutAxes>
]]></xml-property>
<property name="outputFormat">SVG</property>
Expand Down
2 changes: 1 addition & 1 deletion frontend/etc/reportdesigns/formula_click_stat.rptdesign
View file
Original file line number Diff line number Diff line change
Expand Up @@ -356,7 +356,7 @@ return false;]]></method>
<property name="paddingLeft">2pt</property>
<property name="paddingBottom">2pt</property>
<property name="paddingRight">2pt</property>
<expression name="valueExpr">Packages.com.agnitas.messages.I18nString.getLocaleString("ClickStat", reportContext.getLocale())</expression>
<expression name="valueExpr">Packages.com.agnitas.messages.I18nString.getLocaleString("statistic.KlickStats", reportContext.getLocale())</expression>
</text-data>
</cell>
</row>
Expand Down
13 changes: 0 additions & 13 deletions frontend/etc/reportdesigns/mailing_benchmark.rptdesign
View file
Original file line number Diff line number Diff line change
Expand Up @@ -73,19 +73,6 @@
<property name="category">Unformatted</property>
</structure>
</scalar-parameter>
<scalar-parameter name="uid" id="388">
<property name="valueType">static</property>
<property name="dataType">string</property>
<property name="distinct">true</property>
<simple-property-list name="defaultValue">
<value type="constant">1</value>
</simple-property-list>
<property name="paramType">simple</property>
<property name="controlType">text-box</property>
<structure name="format">
<property name="category">Unformatted</property>
</structure>
</scalar-parameter>
<scalar-parameter name="emmsession" id="100">
<property name="valueType">static</property>
<property name="isRequired">false</property>
Expand Down
Loading

0 comments on commit a12a4e1

Please sign in to comment.