...

.settings/org.eclipse.core.resources.prefs

@@ -0,0 +1,5 @@
+eclipse.preferences.version=1
+encoding//web/naviox/signIn.jsp=UTF-8
+encoding//web/xava/module.jsp=UTF-8
+encoding/<project>=UTF-8
+encoding/web=UTF-8

persistence/META-INF/persistence.xml

@@ -19,7 +19,10 @@
             <property name="hibernate.connection.driver_class" 	value="com.mysql.cj.jdbc.Driver"/>
 			<property name="hibernate.connection.username"		value="babydatenbank_usr" />
 			<property name="hibernate.connection.password"		value="mJq63*n1" />
-			<property name="hibernate.connection.url" 			value="jdbc:mysql://localhost:3306/admin_babydatenbank?serverTimezone=Europe/Berlin"/>
+			<property name="hibernate.connection.url" 			value="jdbc:mysql://localhost:3306/admin_babydatenbank?serverTimezone=Europe/Berlin&amp;useUnicode=true&amp;characterEncoding=UTF-8"/>
+			<property name="hibernate.connection.charSet"		value="UTF-8" />
+			<property name="hibernate.connection.characterEncoding" value="UTF-8" />
+			<property name="hibernate.connection.useUnicode" value="true" />
          
         </properties>
     </persistence-unit>
@@ -33,7 +36,10 @@
 			<property name="hibernate.dialect"					value="org.hibernate.dialect.MySQL8Dialect" />
 			<property name="hibernate.connection.username"		value="babydatenbank_usr" />
 			<property name="hibernate.connection.password"		value="mJq63*n1" />
-			<property name="hibernate.connection.url" 			value="jdbc:mysql://localhost:3306/admin_babydatenbank?serverTimezone=Europe/Berlin"/>
+			<property name="hibernate.connection.url" 			value="jdbc:mysql://localhost:3306/admin_babydatenbank?serverTimezone=Europe/Berlin&amp;useUnicode=true&amp;characterEncoding=UTF-8"/>
+			<property name="hibernate.connection.charSet"		value="UTF-8" />
+			<property name="hibernate.connection.characterEncoding" value="UTF-8" />
+			<property name="hibernate.connection.useUnicode" value="true" />
         </properties>
     </persistence-unit>    
     

web/META-INF/context.xml

@@ -29,7 +29,7 @@
     <Resource name="jdbc/BabydatenbankDS" auth="Container" type="javax.sql.DataSource"
 	      maxTotal="20" maxIdle="5" maxWaitMillis="10000"
 	      username="babydatenbank_usr" password="mJq63*n1" driverClassName="com.mysql.cj.jdbc.Driver"
-	      url="jdbc:mysql://localhost:3306/admin_babydatenbank?serverTimezone=Europe/Berlin"/>	      
+	      url="jdbc:mysql://localhost:3306/admin_babydatenbank?serverTimezone=Europe/Berlin&amp;useUnicode=true&amp;characterEncoding=UTF-8"/>	      
 	
 	<!-- PostgreSQL 
 	<Resource name="jdbc/BabydatenbankDS" auth="Container" type="javax.sql.DataSource"

web/index.jsp

@@ -6,10 +6,20 @@
 
 <%
 Users.setCurrent(request); 
-String module = Users.getCurrent() == null?"SignIn":modules.getCurrent(request);
+if (Users.getCurrent() != null || Organizations.getCurrent(request) != null) {
-String url = Browsers.isMobile(request) && !"Index".equals(modules.getCurrent(request))?"phone":"m/" + module;
+	String module = Users.getCurrent() == null?"SignIn":modules.getCurrent(request);
+	String url = Browsers.isMobile(request) && !"Index".equals(modules.getCurrent(request))?"phone":"m/" + module;
 %>
 
 <script type="text/javascript">
 window.location="<%=url%>";
 </script>
+
+<%
+}
+else {
+%>
+<jsp:include page="naviox/welcome.jsp"/>
+<%
+}
+%>

web/naviox/welcome.jsp

@@ -1,53 +1 @@
-<%@include file="../xava/imports.jsp"%>
+<jsp:forward page="/m/SignIn"/>
-
-<%@page import="org.openxava.application.meta.MetaApplications"%>
-<%@page import="org.openxava.application.meta.MetaApplication"%>
-<%@page import="org.openxava.util.Locales"%>
-<%@page import="org.openxava.web.style.XavaStyle"%>
-<%@page import="org.openxava.util.XavaPreferences"%>
-<%@page import="org.openxava.web.Browsers"%> 
-
-<%-- To put your own text add entries in the i18n messages files of your project 
-In MyApplication-labels_en.properties:
-MyApplication=My application
-MyApplication[description]=My application does this and that
-
-In MyApplication-messages_en.properties:
-welcome_point1=This is a additional explanatory line
---%>
-
-<%
-MetaApplication metaApplication = MetaApplications.getMainMetaApplication(); 
-Locales.setCurrent(request);
-String oxVersion = org.openxava.controller.ModuleManager.getVersion();
-String title = (String) request.getAttribute("naviox.pageTitle");
-if (title == null) title = metaApplication.getLabel();
-%>
-
-<!DOCTYPE html>
-
-<head>
-	<title><%=title%></title>
-	<meta name='viewport' content='width=device-width, initial-scale=1, maximum-scale=1'>
-	<link href="<%=request.getContextPath()%>/xava/style/<%=XavaPreferences.getInstance().getStyleCSS()%>?ox=<%=oxVersion%>" rel="stylesheet" type="text/css">
-	<% if (Browsers.isIE(request)) { %>
-	<script type='text/javascript' src="<%=request.getContextPath()%>/xava/js/css-vars-ponyfill.js?ox=<%=oxVersion%>"></script>
-	<script type='text/javascript'>cssVars({ }); </script>	
-	<% } %>
-	
-</head>
-
-<body id="welcome" <%=XavaStyle.getBodyClass(request)%>>
-
-<h1><%=metaApplication.getLabel()%></h1>
-<p><%=metaApplication.getDescription()%></p>
-<p><xava:message key="welcome_point1"/></p> 
-<p id="signin_tip"><xava:message key="signin_tip"/></p> 
-
-<div class="ox-bottom-buttons">
-	<input type="hidden">
-	<input type="button" tabindex="1" onclick="window.location='m/SignIn'" value="<xava:label key='SignIn'/>">   
-</div>
-
-</body>
-

web/xava/module.jsp

@@ -1,4 +1,7 @@
-<% Servlets.setCharacterEncoding(request, response); %> <%-- Must be the very first, in order character encoding takes effect --%>
+<% 
+	request.setCharacterEncoding("UTF-8");
+	Servlets.setCharacterEncoding(request, response); 
+%> <%-- Must be the very first, in order character encoding takes effect --%>
 
 <%@ include file="imports.jsp"%>
 
@@ -18,6 +21,7 @@
 <%@page import="org.apache.commons.logging.LogFactory" %>
 <%@page import="org.apache.commons.logging.Log" %>
 <%@page import="org.openxava.web.Browsers"%> 
+<%@page contentType="text/html; charset=UTF-8" %> 
 
 
 <%!private static Log log = LogFactory.getLog("module.jsp");