From def64d338043d2aad17fc8f875d40f6b3fab6445 Mon Sep 17 00:00:00 2001
From: sockenklaus <socki@rote-socke.org>
Date: Wed, 27 May 2020 06:39:06 +0200
Subject: [PATCH] ...

---
 .settings/org.eclipse.core.resources.prefs |   5 +
 persistence/META-INF/persistence.xml       |  86 +++++-----
 web/META-INF/context.xml                   |   2 +-
 web/index.jsp                              |  16 +-
 web/naviox/welcome.jsp                     |  54 +------
 web/xava/module.jsp                        |   6 +-
 xava/dtds/aplicacion.dtd                   | 150 +++++++++---------
 xava/dtds/application.dtd                  | 124 +++++++--------
 xava/dtds/code-generators.dtd              |  18 +--
 xava/dtds/controladores.dtd                | 150 +++++++++---------
 xava/dtds/controllers.dtd                  | 144 ++++++++---------
 xava/dtds/conversores.dtd                  |  30 ++--
 xava/dtds/converters.dtd                   |  30 ++--
 xava/dtds/default-size.dtd                 |  30 ++--
 xava/dtds/editores.dtd                     | 176 ++++++++++-----------
 xava/dtds/editors.dtd                      | 174 ++++++++++----------
 xava/dtds/generadores-codigo.dtd           |  18 +--
 xava/dtds/longitud-defecto.dtd             |  26 +--
 xava/dtds/stereotype-type-default.dtd      |  18 +--
 xava/dtds/tabs-default-values.dtd          | 110 ++++++-------
 xava/dtds/tipo-estereotipo-defecto.dtd     |  18 +--
 xava/dtds/validadores.dtd                  |  66 ++++----
 xava/dtds/valores-defecto-tabs.dtd         | 110 ++++++-------
 23 files changed, 767 insertions(+), 794 deletions(-)
 create mode 100644 .settings/org.eclipse.core.resources.prefs

diff --git a/.settings/org.eclipse.core.resources.prefs b/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000..2678217
--- /dev/null
+++ b/.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
diff --git a/persistence/META-INF/persistence.xml b/persistence/META-INF/persistence.xml
index 19c385f..7a8d090 100644
--- a/persistence/META-INF/persistence.xml
+++ b/persistence/META-INF/persistence.xml
@@ -1,40 +1,46 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-
-<persistence xmlns="http://java.sun.com/xml/ns/persistence"
-             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-             xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_1_0.xsd"
-             version="1.0">
-             
-    <persistence-unit name="default">
-    	<provider>org.hibernate.jpa.HibernatePersistenceProvider</provider>
-    	<class>org.openxava.session.GalleryImage</class>
-    	<class>org.openxava.web.editors.DiscussionComment</class>
-        <properties>
-            <property name="javax.persistence.schema-generation.database.action" value="update"/>
-            <property name="hibernate.dialect" value="org.hibernate.dialect.MySQL8Dialect" />
-            <property name="javax.persistence.create-database-schemas" value="true"/> 
-            <property name="hibernate.default_catalog" value="admin_babydatenbank"/>
-            <property name="hibernate.jdbc.use_streams_for_binary" value="true"/>
-            <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"/>
-         
-        </properties>
-    </persistence-unit>
-    
-    <!-- JUnit Hypersonic -->
-    <persistence-unit name="junit">
-    	<provider>org.hibernate.jpa.HibernatePersistenceProvider</provider>
-    	<class>org.openxava.web.editors.DiscussionComment</class>
-        <properties>
-			<property name="hibernate.connection.driver_class" 	value="com.mysql.cj.jdbc.Driver"/>
-			<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"/>
-        </properties>
-    </persistence-unit>    
-    
-</persistence>
+<?xml version="1.0" encoding="UTF-8"?>
+
+
+<persistence xmlns="http://java.sun.com/xml/ns/persistence"
+             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+             xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_1_0.xsd"
+             version="1.0">
+             
+    <persistence-unit name="default">
+    	<provider>org.hibernate.jpa.HibernatePersistenceProvider</provider>
+    	<class>org.openxava.session.GalleryImage</class>
+    	<class>org.openxava.web.editors.DiscussionComment</class>
+        <properties>
+            <property name="javax.persistence.schema-generation.database.action" value="update"/>
+            <property name="hibernate.dialect" value="org.hibernate.dialect.MySQL8Dialect" />
+            <property name="javax.persistence.create-database-schemas" value="true"/> 
+            <property name="hibernate.default_catalog" value="admin_babydatenbank"/>
+            <property name="hibernate.jdbc.use_streams_for_binary" value="true"/>
+            <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&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>
+    
+    <!-- JUnit Hypersonic -->
+    <persistence-unit name="junit">
+    	<provider>org.hibernate.jpa.HibernatePersistenceProvider</provider>
+    	<class>org.openxava.web.editors.DiscussionComment</class>
+        <properties>
+			<property name="hibernate.connection.driver_class" 	value="com.mysql.cj.jdbc.Driver"/>
+			<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&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>    
+    
+</persistence>
diff --git a/web/META-INF/context.xml b/web/META-INF/context.xml
index c62562a..f1b4438 100644
--- a/web/META-INF/context.xml
+++ b/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"
diff --git a/web/index.jsp b/web/index.jsp
index ef64e7e..a06624e 100644
--- a/web/index.jsp
+++ b/web/index.jsp
@@ -6,10 +6,20 @@
 
 <%
 Users.setCurrent(request); 
-String module = Users.getCurrent() == null?"SignIn":modules.getCurrent(request);
-String url = Browsers.isMobile(request) && !"Index".equals(modules.getCurrent(request))?"phone":"m/" + module;
+if (Users.getCurrent() != null || Organizations.getCurrent(request) != null) {
+	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>
\ No newline at end of file
+</script>
+
+<%
+}
+else {
+%>
+<jsp:include page="naviox/welcome.jsp"/>
+<%
+}
+%>
diff --git a/web/naviox/welcome.jsp b/web/naviox/welcome.jsp
index 7a29162..fdbd9ae 100644
--- a/web/naviox/welcome.jsp
+++ b/web/naviox/welcome.jsp
@@ -1,53 +1 @@
-<%@include file="../xava/imports.jsp"%>
-
-<%@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>
-
+<jsp:forward page="/m/SignIn"/>
\ No newline at end of file
diff --git a/web/xava/module.jsp b/web/xava/module.jsp
index e338609..92fed9f 100644
--- a/web/xava/module.jsp
+++ b/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");
diff --git a/xava/dtds/aplicacion.dtd b/xava/dtds/aplicacion.dtd
index 14a6ab5..f001fce 100644
--- a/xava/dtds/aplicacion.dtd
+++ b/xava/dtds/aplicacion.dtd
@@ -1,75 +1,75 @@
-<!ELEMENT aplicacion (modulo-defecto?, modulo*)>
-<!ATTLIST aplicacion
- nombre ID #REQUIRED
- etiqueta CDATA #IMPLIED
->
-
-<!ELEMENT modulo-defecto (controlador*)>
-
-<!ELEMENT modulo (doc | (var-entorno*, modelo?, vista?, vista-swing?, vista-web?, tab?, controlador*, controlador-modo?) | listado)>
-<!ATTLIST modulo
- nombre ID #REQUIRED
- carpeta CDATA #IMPLIED
- etiqueta CDATA #IMPLIED
- descripcion CDATA #IMPLIED
->
-
-<!ELEMENT doc EMPTY>
-<!ATTLIST doc
- url CDATA #REQUIRED
- idiomas CDATA #IMPLIED
->
-
-<!ELEMENT var-entorno EMPTY>
-<!ATTLIST var-entorno
- nombre CDATA #REQUIRED
- valor CDATA #IMPLIED
->
-
-
-<!ELEMENT modelo EMPTY>
-<!ATTLIST modelo
- nombre CDATA #REQUIRED
->
-
-<!ELEMENT vista EMPTY>
-<!ATTLIST vista
- nombre CDATA #REQUIRED
->
-
-<!ELEMENT tab EMPTY>
-<!ATTLIST tab
- nombre CDATA #REQUIRED
->
-
-
-<!ELEMENT vista-swing EMPTY>
-<!ATTLIST vista-swing
- clase CDATA #REQUIRED
->
-
-<!ELEMENT vista-web EMPTY>
-<!ATTLIST vista-web
- url CDATA #REQUIRED
->
-
-
-
-<!ELEMENT controlador EMPTY>
-<!ATTLIST controlador
- nombre CDATA #REQUIRED
->
-
-<!ELEMENT controlador-modo EMPTY>
-<!ATTLIST controlador-modo
- nombre CDATA #REQUIRED
->
-
-
-
-<!ELEMENT listado EMPTY>
-<!ATTLIST listado
- modelo CDATA #REQUIRED
- tab CDATA #IMPLIED
->
-
+<!ELEMENT aplicacion (modulo-defecto?, modulo*)>
+<!ATTLIST aplicacion
+ nombre ID #REQUIRED
+ etiqueta CDATA #IMPLIED
+>
+
+<!ELEMENT modulo-defecto (controlador*)>
+
+<!ELEMENT modulo (doc | (var-entorno*, modelo?, vista?, vista-swing?, vista-web?, tab?, controlador*, controlador-modo?) | listado)>
+<!ATTLIST modulo
+ nombre ID #REQUIRED
+ carpeta CDATA #IMPLIED
+ etiqueta CDATA #IMPLIED
+ descripcion CDATA #IMPLIED
+>
+
+<!ELEMENT doc EMPTY>
+<!ATTLIST doc
+ url CDATA #REQUIRED
+ idiomas CDATA #IMPLIED
+>
+
+<!ELEMENT var-entorno EMPTY>
+<!ATTLIST var-entorno
+ nombre CDATA #REQUIRED
+ valor CDATA #IMPLIED
+>
+
+
+<!ELEMENT modelo EMPTY>
+<!ATTLIST modelo
+ nombre CDATA #REQUIRED
+>
+
+<!ELEMENT vista EMPTY>
+<!ATTLIST vista
+ nombre CDATA #REQUIRED
+>
+
+<!ELEMENT tab EMPTY>
+<!ATTLIST tab
+ nombre CDATA #REQUIRED
+>
+
+
+<!ELEMENT vista-swing EMPTY>
+<!ATTLIST vista-swing
+ clase CDATA #REQUIRED
+>
+
+<!ELEMENT vista-web EMPTY>
+<!ATTLIST vista-web
+ url CDATA #REQUIRED
+>
+
+
+
+<!ELEMENT controlador EMPTY>
+<!ATTLIST controlador
+ nombre CDATA #REQUIRED
+>
+
+<!ELEMENT controlador-modo EMPTY>
+<!ATTLIST controlador-modo
+ nombre CDATA #REQUIRED
+>
+
+
+
+<!ELEMENT listado EMPTY>
+<!ATTLIST listado
+ modelo CDATA #REQUIRED
+ tab CDATA #IMPLIED
+>
+
diff --git a/xava/dtds/application.dtd b/xava/dtds/application.dtd
index dfbb229..8f63624 100644
--- a/xava/dtds/application.dtd
+++ b/xava/dtds/application.dtd
@@ -1,62 +1,62 @@
-<!ELEMENT application (default-module?, module*)>
-<!ATTLIST application
- name ID #REQUIRED
- label CDATA #IMPLIED
->
-
-<!ELEMENT default-module (controller*)>
-
-<!ELEMENT module (doc | (env-var*, model?, view?, web-view?, tab?, controller*, mode-controller?))>
-<!ATTLIST module
- name ID #REQUIRED
- folder CDATA #IMPLIED
- label CDATA #IMPLIED
- description CDATA #IMPLIED
->
-
-<!ELEMENT doc EMPTY>
-<!ATTLIST doc
- url CDATA #REQUIRED
- languages CDATA #IMPLIED
->
-
-<!ELEMENT env-var EMPTY>
-<!ATTLIST env-var
- name CDATA #REQUIRED
- value CDATA #IMPLIED
->
-
-
-<!ELEMENT model EMPTY>
-<!ATTLIST model
- name CDATA #REQUIRED
->
-
-<!ELEMENT view EMPTY>
-<!ATTLIST view
- name CDATA #REQUIRED
->
-
-<!ELEMENT tab EMPTY>
-<!ATTLIST tab
- name CDATA #REQUIRED
->
-
-
-<!ELEMENT web-view EMPTY>
-<!ATTLIST web-view
- url CDATA #REQUIRED
->
-
-
-
-<!ELEMENT controller EMPTY>
-<!ATTLIST controller
- name CDATA #REQUIRED
->
-
-<!ELEMENT mode-controller EMPTY>
-<!ATTLIST mode-controller
- name CDATA #REQUIRED
->
-
+<!ELEMENT application (default-module?, module*)>
+<!ATTLIST application
+ name ID #REQUIRED
+ label CDATA #IMPLIED
+>
+
+<!ELEMENT default-module (controller*)>
+
+<!ELEMENT module (doc | (env-var*, model?, view?, web-view?, tab?, controller*, mode-controller?))>
+<!ATTLIST module
+ name ID #REQUIRED
+ folder CDATA #IMPLIED
+ label CDATA #IMPLIED
+ description CDATA #IMPLIED
+>
+
+<!ELEMENT doc EMPTY>
+<!ATTLIST doc
+ url CDATA #REQUIRED
+ languages CDATA #IMPLIED
+>
+
+<!ELEMENT env-var EMPTY>
+<!ATTLIST env-var
+ name CDATA #REQUIRED
+ value CDATA #IMPLIED
+>
+
+
+<!ELEMENT model EMPTY>
+<!ATTLIST model
+ name CDATA #REQUIRED
+>
+
+<!ELEMENT view EMPTY>
+<!ATTLIST view
+ name CDATA #REQUIRED
+>
+
+<!ELEMENT tab EMPTY>
+<!ATTLIST tab
+ name CDATA #REQUIRED
+>
+
+
+<!ELEMENT web-view EMPTY>
+<!ATTLIST web-view
+ url CDATA #REQUIRED
+>
+
+
+
+<!ELEMENT controller EMPTY>
+<!ATTLIST controller
+ name CDATA #REQUIRED
+>
+
+<!ELEMENT mode-controller EMPTY>
+<!ATTLIST mode-controller
+ name CDATA #REQUIRED
+>
+
diff --git a/xava/dtds/code-generators.dtd b/xava/dtds/code-generators.dtd
index 4fac970..5e05b13 100644
--- a/xava/dtds/code-generators.dtd
+++ b/xava/dtds/code-generators.dtd
@@ -1,9 +1,9 @@
-<!ELEMENT code-generators (for-stereotype)+>
-
-<!ELEMENT for-stereotype EMPTY>
-<!ATTLIST for-stereotype
- name CDATA #REQUIRED
- model-type (ejb|pojo|ALL) "ALL"
- class CDATA #REQUIRED
->
-
+<!ELEMENT code-generators (for-stereotype)+>
+
+<!ELEMENT for-stereotype EMPTY>
+<!ATTLIST for-stereotype
+ name CDATA #REQUIRED
+ model-type (ejb|pojo|ALL) "ALL"
+ class CDATA #REQUIRED
+>
+
diff --git a/xava/dtds/controladores.dtd b/xava/dtds/controladores.dtd
index 7f345c2..244e274 100644
--- a/xava/dtds/controladores.dtd
+++ b/xava/dtds/controladores.dtd
@@ -1,75 +1,75 @@
-<!ELEMENT subcontrolador EMPTY>
-<!ATTLIST subcontrolador
- controlador CDATA #REQUIRED
- imagen CDATA #IMPLIED
- icono CDATA #IMPLIED
- modo (detail|list|ALL|NONE) "ALL"
->
-
-<!ELEMENT var-entorno EMPTY>
-<!ATTLIST var-entorno
- nombre CDATA #REQUIRED
- valor CDATA #IMPLIED
->
-
-<!ELEMENT objeto EMPTY>
-<!ATTLIST objeto
- nombre CDATA #REQUIRED
- clase CDATA #REQUIRED
- valor CDATA #IMPLIED
- ambito (modulo|global) "modulo"
->
-
-<!ELEMENT accion (poner*, usa-objeto*)>
-<!ATTLIST accion
- nombre CDATA #REQUIRED
- etiqueta CDATA #IMPLIED
- descripcion CDATA #IMPLIED
- modo (detail|list|ALL|NONE) "ALL" 
- metodo CDATA #IMPLIED
- imagen CDATA #IMPLIED
- icono CDATA #IMPLIED
- atajo-de-teclado CDATA #IMPLIED
- clase CDATA #IMPLIED
- oculta (true|false) "false"
- al-iniciar (true|false) "false"
- en-cada-peticion (true|false) "false"
- antes-de-cada-peticion (true|false) "false"
- despues-de-cada-peticion (true|false) "false"
- por-defecto (nunca|casi-nunca|si-posible|casi-siempre|siempre) "casi-nunca"
- cuesta (true|false) "false" 
- confirmar (true|false) "false"
- en-cada-fila (true|false) "false"
- procesar-elementos-seleccionados (true|false) "false"
- disponible-en-nuevo (true|false) "true"
- pierde-datos-cambiados (true|false) "false"
->
-
-<!ELEMENT usa-objeto EMPTY>
-<!ATTLIST usa-objeto
- nombre CDATA #REQUIRED
- propiedad-accion CDATA #IMPLIED
->
-
-<!ELEMENT poner EMPTY>
-<!ATTLIST poner
- propiedad CDATA #REQUIRED
- valor CDATA #REQUIRED
->
-
-<!ELEMENT hereda-de EMPTY>
-<!ATTLIST hereda-de
- controlador CDATA #REQUIRED
- acciones-excluidas CDATA #IMPLIED
->
-
-<!ELEMENT controlador (hereda-de*, (accion|subcontrolador)*)>
-<!ATTLIST controlador
- nombre CDATA #REQUIRED
- etiqueta CDATA #IMPLIED
- imagen CDATA #IMPLIED
- icono CDATA #IMPLIED
- clase CDATA #IMPLIED
- contexto (comun|swing|web) "comun"
->
-<!ELEMENT controladores (var-entorno*, objeto*, controlador+)>
+<!ELEMENT subcontrolador EMPTY>
+<!ATTLIST subcontrolador
+ controlador CDATA #REQUIRED
+ imagen CDATA #IMPLIED
+ icono CDATA #IMPLIED
+ modo (detail|list|ALL|NONE) "ALL"
+>
+
+<!ELEMENT var-entorno EMPTY>
+<!ATTLIST var-entorno
+ nombre CDATA #REQUIRED
+ valor CDATA #IMPLIED
+>
+
+<!ELEMENT objeto EMPTY>
+<!ATTLIST objeto
+ nombre CDATA #REQUIRED
+ clase CDATA #REQUIRED
+ valor CDATA #IMPLIED
+ ambito (modulo|global) "modulo"
+>
+
+<!ELEMENT accion (poner*, usa-objeto*)>
+<!ATTLIST accion
+ nombre CDATA #REQUIRED
+ etiqueta CDATA #IMPLIED
+ descripcion CDATA #IMPLIED
+ modo (detail|list|ALL|NONE) "ALL" 
+ metodo CDATA #IMPLIED
+ imagen CDATA #IMPLIED
+ icono CDATA #IMPLIED
+ atajo-de-teclado CDATA #IMPLIED
+ clase CDATA #IMPLIED
+ oculta (true|false) "false"
+ al-iniciar (true|false) "false"
+ en-cada-peticion (true|false) "false"
+ antes-de-cada-peticion (true|false) "false"
+ despues-de-cada-peticion (true|false) "false"
+ por-defecto (nunca|casi-nunca|si-posible|casi-siempre|siempre) "casi-nunca"
+ cuesta (true|false) "false" 
+ confirmar (true|false) "false"
+ en-cada-fila (true|false) "false"
+ procesar-elementos-seleccionados (true|false) "false"
+ disponible-en-nuevo (true|false) "true"
+ pierde-datos-cambiados (true|false) "false"
+>
+
+<!ELEMENT usa-objeto EMPTY>
+<!ATTLIST usa-objeto
+ nombre CDATA #REQUIRED
+ propiedad-accion CDATA #IMPLIED
+>
+
+<!ELEMENT poner EMPTY>
+<!ATTLIST poner
+ propiedad CDATA #REQUIRED
+ valor CDATA #REQUIRED
+>
+
+<!ELEMENT hereda-de EMPTY>
+<!ATTLIST hereda-de
+ controlador CDATA #REQUIRED
+ acciones-excluidas CDATA #IMPLIED
+>
+
+<!ELEMENT controlador (hereda-de*, (accion|subcontrolador)*)>
+<!ATTLIST controlador
+ nombre CDATA #REQUIRED
+ etiqueta CDATA #IMPLIED
+ imagen CDATA #IMPLIED
+ icono CDATA #IMPLIED
+ clase CDATA #IMPLIED
+ contexto (comun|swing|web) "comun"
+>
+<!ELEMENT controladores (var-entorno*, objeto*, controlador+)>
diff --git a/xava/dtds/controllers.dtd b/xava/dtds/controllers.dtd
index 5e7a5ce..ed9db5e 100644
--- a/xava/dtds/controllers.dtd
+++ b/xava/dtds/controllers.dtd
@@ -1,72 +1,72 @@
-<!ELEMENT subcontroller EMPTY>
-<!ATTLIST subcontroller
- controller CDATA #REQUIRED
- image CDATA #IMPLIED
- icon CDATA #IMPLIED
- mode (detail|list|ALL|NONE) "ALL"
->
-
-<!ELEMENT env-var EMPTY>
-<!ATTLIST env-var
- name CDATA #REQUIRED
- value CDATA #IMPLIED
->
-
-<!ELEMENT object EMPTY>
-<!ATTLIST object
- name CDATA #REQUIRED
- class CDATA #REQUIRED
- value CDATA #IMPLIED
- scope (module|global) "module"
->
-
-<!ELEMENT action (set*, use-object*)>
-<!ATTLIST action
- name CDATA #REQUIRED
- label CDATA #IMPLIED
- description CDATA #IMPLIED
- mode (detail|list|ALL|NONE) "ALL"
- image CDATA #IMPLIED
- icon CDATA #IMPLIED
- keystroke CDATA #IMPLIED
- class CDATA #REQUIRED
- hidden (true|false) "false"
- on-init (true|false) "false"
- on-each-request (true|false) "false"
- before-each-request (true|false) "false"
- after-each-request (true|false) "false"
- by-default (never|almost-never|if-possible|almost-always|always) "almost-never"
- takes-long (true|false) "false"
- confirm (true|false) "false"
- in-each-row (true|false) "false"
- process-selected-items (true|false) "false"
- available-on-new (true|false) "true"
- loses-changed-data (true|false) "false"
->
-
-<!ELEMENT use-object EMPTY>
-<!ATTLIST use-object
- name CDATA #REQUIRED
- action-property CDATA #IMPLIED
->
-
-<!ELEMENT set EMPTY>
-<!ATTLIST set
- property CDATA #REQUIRED
- value CDATA #REQUIRED
->
-
-<!ELEMENT extends EMPTY>
-<!ATTLIST extends
- controller CDATA #REQUIRED
- excluded-actions CDATA #IMPLIED
->
-
-<!ELEMENT controller (extends*, (action|subcontroller)*)>
-<!ATTLIST controller
- name CDATA #REQUIRED
- label CDATA #IMPLIED
- image CDATA #IMPLIED
- icon CDATA #IMPLIED
->
-<!ELEMENT controllers (env-var*, object*, controller+)>
+<!ELEMENT subcontroller EMPTY>
+<!ATTLIST subcontroller
+ controller CDATA #REQUIRED
+ image CDATA #IMPLIED
+ icon CDATA #IMPLIED
+ mode (detail|list|ALL|NONE) "ALL"
+>
+
+<!ELEMENT env-var EMPTY>
+<!ATTLIST env-var
+ name CDATA #REQUIRED
+ value CDATA #IMPLIED
+>
+
+<!ELEMENT object EMPTY>
+<!ATTLIST object
+ name CDATA #REQUIRED
+ class CDATA #REQUIRED
+ value CDATA #IMPLIED
+ scope (module|global) "module"
+>
+
+<!ELEMENT action (set*, use-object*)>
+<!ATTLIST action
+ name CDATA #REQUIRED
+ label CDATA #IMPLIED
+ description CDATA #IMPLIED
+ mode (detail|list|ALL|NONE) "ALL"
+ image CDATA #IMPLIED
+ icon CDATA #IMPLIED
+ keystroke CDATA #IMPLIED
+ class CDATA #REQUIRED
+ hidden (true|false) "false"
+ on-init (true|false) "false"
+ on-each-request (true|false) "false"
+ before-each-request (true|false) "false"
+ after-each-request (true|false) "false"
+ by-default (never|almost-never|if-possible|almost-always|always) "almost-never"
+ takes-long (true|false) "false"
+ confirm (true|false) "false"
+ in-each-row (true|false) "false"
+ process-selected-items (true|false) "false"
+ available-on-new (true|false) "true"
+ loses-changed-data (true|false) "false"
+>
+
+<!ELEMENT use-object EMPTY>
+<!ATTLIST use-object
+ name CDATA #REQUIRED
+ action-property CDATA #IMPLIED
+>
+
+<!ELEMENT set EMPTY>
+<!ATTLIST set
+ property CDATA #REQUIRED
+ value CDATA #REQUIRED
+>
+
+<!ELEMENT extends EMPTY>
+<!ATTLIST extends
+ controller CDATA #REQUIRED
+ excluded-actions CDATA #IMPLIED
+>
+
+<!ELEMENT controller (extends*, (action|subcontroller)*)>
+<!ATTLIST controller
+ name CDATA #REQUIRED
+ label CDATA #IMPLIED
+ image CDATA #IMPLIED
+ icon CDATA #IMPLIED
+>
+<!ELEMENT controllers (env-var*, object*, controller+)>
diff --git a/xava/dtds/conversores.dtd b/xava/dtds/conversores.dtd
index 3881673..5c8bb71 100644
--- a/xava/dtds/conversores.dtd
+++ b/xava/dtds/conversores.dtd
@@ -1,15 +1,15 @@
-<!ELEMENT conversores (para-estereotipo|para-tipo)+>
-
-<!ELEMENT para-estereotipo EMPTY>
-<!ATTLIST para-estereotipo
- estereotipo CDATA #REQUIRED
- clase-conversor CDATA #REQUIRED
- tipo-cmp CDATA #REQUIRED
->
-
-<!ELEMENT para-tipo EMPTY>
-<!ATTLIST para-tipo
- tipo CDATA #REQUIRED
- clase-conversor CDATA #REQUIRED
- tipo-cmp CDATA #REQUIRED
->
+<!ELEMENT conversores (para-estereotipo|para-tipo)+>
+
+<!ELEMENT para-estereotipo EMPTY>
+<!ATTLIST para-estereotipo
+ estereotipo CDATA #REQUIRED
+ clase-conversor CDATA #REQUIRED
+ tipo-cmp CDATA #REQUIRED
+>
+
+<!ELEMENT para-tipo EMPTY>
+<!ATTLIST para-tipo
+ tipo CDATA #REQUIRED
+ clase-conversor CDATA #REQUIRED
+ tipo-cmp CDATA #REQUIRED
+>
diff --git a/xava/dtds/converters.dtd b/xava/dtds/converters.dtd
index 54ad27b..10326c1 100644
--- a/xava/dtds/converters.dtd
+++ b/xava/dtds/converters.dtd
@@ -1,15 +1,15 @@
-<!ELEMENT converters (for-stereotype|for-type)+>
-
-<!ELEMENT for-stereotype EMPTY>
-<!ATTLIST for-stereotype
- stereotype CDATA #REQUIRED
- converter-class CDATA #REQUIRED
- cmp-type CDATA #REQUIRED
->
-
-<!ELEMENT for-type EMPTY>
-<!ATTLIST for-type
- type CDATA #REQUIRED
- converter-class CDATA #REQUIRED
- cmp-type CDATA #REQUIRED
->
+<!ELEMENT converters (for-stereotype|for-type)+>
+
+<!ELEMENT for-stereotype EMPTY>
+<!ATTLIST for-stereotype
+ stereotype CDATA #REQUIRED
+ converter-class CDATA #REQUIRED
+ cmp-type CDATA #REQUIRED
+>
+
+<!ELEMENT for-type EMPTY>
+<!ATTLIST for-type
+ type CDATA #REQUIRED
+ converter-class CDATA #REQUIRED
+ cmp-type CDATA #REQUIRED
+>
diff --git a/xava/dtds/default-size.dtd b/xava/dtds/default-size.dtd
index e65b46f..4b6765b 100644
--- a/xava/dtds/default-size.dtd
+++ b/xava/dtds/default-size.dtd
@@ -1,15 +1,15 @@
-<!ELEMENT default-size (for-stereotype|for-type)+>
-
-<!ELEMENT for-stereotype EMPTY>
-<!ATTLIST for-stereotype
- name CDATA #REQUIRED
- size CDATA #REQUIRED
- scale CDATA #IMPLIED
->
-
-<!ELEMENT for-type EMPTY>
-<!ATTLIST for-type
- class CDATA #REQUIRED
- size CDATA #REQUIRED
- scale CDATA #IMPLIED
->
+<!ELEMENT default-size (for-stereotype|for-type)+>
+
+<!ELEMENT for-stereotype EMPTY>
+<!ATTLIST for-stereotype
+ name CDATA #REQUIRED
+ size CDATA #REQUIRED
+ scale CDATA #IMPLIED
+>
+
+<!ELEMENT for-type EMPTY>
+<!ATTLIST for-type
+ class CDATA #REQUIRED
+ size CDATA #REQUIRED
+ scale CDATA #IMPLIED
+>
diff --git a/xava/dtds/editores.dtd b/xava/dtds/editores.dtd
index 3798109..cdeabd2 100644
--- a/xava/dtds/editores.dtd
+++ b/xava/dtds/editores.dtd
@@ -1,88 +1,88 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-
-<!ELEMENT editores (editor*)>
-
-
-<!ELEMENT editor (propiedad*, formateador?, formateador-lista?, (para-tipo | para-estereotipo | para-propiedad-modelo | para-valores-posibles | para-referencias | para-referencia | para-colecciones | para-colecciones-elementos | para-coleccion | para-tabs | para-tab)*)>
-<!ATTLIST editor
- nombre CDATA #IMPLIED
- clase CDATA #IMPLIED
- url CDATA #IMPLIED
- formatear (true|false) "true" 
- depende-de-estereotipos CDATA #IMPLIED
- depende-de-propiedades CDATA #IMPLIED
- enmarcable (true|false) "false"
- recargar-siempre (true|false) "false"
- compuesto (true|false) "false" 
- icono CDATA #IMPLIED
- accion-iniciar CDATA #IMPLIED
- accion-liberar CDATA #IMPLIED 
- elementos-seleccionables (true|false) "true"
->
-
-<!ELEMENT propiedad EMPTY>
-<!ATTLIST propiedad
-  nombre CDATA #REQUIRED
-  valor CDATA #REQUIRED
->
-
-<!ELEMENT formateador (poner*)>
-<!ATTLIST formateador
-  clase CDATA #REQUIRED
-  del-tipo (true|false) "false"
->
-
-<!ELEMENT formateador-lista (poner*)>
-<!ATTLIST formateador-lista
-  clase CDATA #REQUIRED
-  del-tipo (true|false) "false"
->
-
-<!ELEMENT poner EMPTY>
-<!ATTLIST poner
- propiedad CDATA #REQUIRED
- valor CDATA #REQUIRED
->
-
-<!ELEMENT para-tipo EMPTY>
-<!ATTLIST para-tipo
- tipo CDATA #REQUIRED
->
-
-<!ELEMENT para-estereotipo EMPTY>
-<!ATTLIST para-estereotipo
- estereotipo CDATA #REQUIRED
->
-
-<!ELEMENT para-propiedad-modelo EMPTY>
-<!ATTLIST para-propiedad-modelo
- modelo CDATA #REQUIRED
- propiedad CDATA #REQUIRED 
->
-
-<!ELEMENT para-valores-posibles EMPTY>
-
-<!ELEMENT para-referencias EMPTY>
-
-<!ELEMENT para-referencia EMPTY>
-<!ATTLIST para-referencia
- modelo CDATA #REQUIRED 
->
-
-<!ELEMENT para-colecciones EMPTY>
-
-<!ELEMENT para-colecciones-elementos EMPTY>
-
-<!ELEMENT para-coleccion EMPTY>
-<!ATTLIST para-coleccion
- modelo CDATA #REQUIRED 
->
-
-<!ELEMENT para-tabs EMPTY>
-
-<!ELEMENT para-tab EMPTY>
-<!ATTLIST para-tab
- modelo CDATA #REQUIRED 
->
-
-
+<?xml version="1.0" encoding="ISO-8859-1"?>
+
+<!ELEMENT editores (editor*)>
+
+
+<!ELEMENT editor (propiedad*, formateador?, formateador-lista?, (para-tipo | para-estereotipo | para-propiedad-modelo | para-valores-posibles | para-referencias | para-referencia | para-colecciones | para-colecciones-elementos | para-coleccion | para-tabs | para-tab)*)>
+<!ATTLIST editor
+ nombre CDATA #IMPLIED
+ clase CDATA #IMPLIED
+ url CDATA #IMPLIED
+ formatear (true|false) "true" 
+ depende-de-estereotipos CDATA #IMPLIED
+ depende-de-propiedades CDATA #IMPLIED
+ enmarcable (true|false) "false"
+ recargar-siempre (true|false) "false"
+ compuesto (true|false) "false" 
+ icono CDATA #IMPLIED
+ accion-iniciar CDATA #IMPLIED
+ accion-liberar CDATA #IMPLIED 
+ elementos-seleccionables (true|false) "true"
+>
+
+<!ELEMENT propiedad EMPTY>
+<!ATTLIST propiedad
+  nombre CDATA #REQUIRED
+  valor CDATA #REQUIRED
+>
+
+<!ELEMENT formateador (poner*)>
+<!ATTLIST formateador
+  clase CDATA #REQUIRED
+  del-tipo (true|false) "false"
+>
+
+<!ELEMENT formateador-lista (poner*)>
+<!ATTLIST formateador-lista
+  clase CDATA #REQUIRED
+  del-tipo (true|false) "false"
+>
+
+<!ELEMENT poner EMPTY>
+<!ATTLIST poner
+ propiedad CDATA #REQUIRED
+ valor CDATA #REQUIRED
+>
+
+<!ELEMENT para-tipo EMPTY>
+<!ATTLIST para-tipo
+ tipo CDATA #REQUIRED
+>
+
+<!ELEMENT para-estereotipo EMPTY>
+<!ATTLIST para-estereotipo
+ estereotipo CDATA #REQUIRED
+>
+
+<!ELEMENT para-propiedad-modelo EMPTY>
+<!ATTLIST para-propiedad-modelo
+ modelo CDATA #REQUIRED
+ propiedad CDATA #REQUIRED 
+>
+
+<!ELEMENT para-valores-posibles EMPTY>
+
+<!ELEMENT para-referencias EMPTY>
+
+<!ELEMENT para-referencia EMPTY>
+<!ATTLIST para-referencia
+ modelo CDATA #REQUIRED 
+>
+
+<!ELEMENT para-colecciones EMPTY>
+
+<!ELEMENT para-colecciones-elementos EMPTY>
+
+<!ELEMENT para-coleccion EMPTY>
+<!ATTLIST para-coleccion
+ modelo CDATA #REQUIRED 
+>
+
+<!ELEMENT para-tabs EMPTY>
+
+<!ELEMENT para-tab EMPTY>
+<!ATTLIST para-tab
+ modelo CDATA #REQUIRED 
+>
+
+
diff --git a/xava/dtds/editors.dtd b/xava/dtds/editors.dtd
index 0086524..a483795 100644
--- a/xava/dtds/editors.dtd
+++ b/xava/dtds/editors.dtd
@@ -1,87 +1,87 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-
-<!ELEMENT editors (editor*)>
-
-
-<!ELEMENT editor (property*, formatter?, list-formatter?, (for-type | for-stereotype | for-model-property | for-valid-values | for-references | for-reference | for-collections | for-element-collections | for-collection | for-tabs | for-tab )*)>
-<!ATTLIST editor
- name CDATA #IMPLIED
- url CDATA #REQUIRED
- format (true|false) "true" 
- depends-stereotypes CDATA #IMPLIED
- depends-properties CDATA #IMPLIED
- frame (true|false) "false"
- always-reload (true|false) "false"
- composite (true|false) "false" 
- icon CDATA #IMPLIED
- init-action CDATA #IMPLIED
- release-action CDATA #IMPLIED
- selectable-items (true|false) "true"
->
-
-<!ELEMENT property EMPTY>
-<!ATTLIST property
-  name CDATA #REQUIRED
-  value CDATA #REQUIRED
->
-
-<!ELEMENT formatter (set*)>
-<!ATTLIST formatter
-  class CDATA #IMPLIED
-	from-type (true|false) "false"
->
-
-<!ELEMENT list-formatter (set*)>
-<!ATTLIST list-formatter
-  class CDATA #IMPLIED
-	from-type (true|false) "false"
->
-
-<!ELEMENT set EMPTY>
-<!ATTLIST set
- property CDATA #REQUIRED
- value CDATA #REQUIRED 
->
-
-<!ELEMENT for-type EMPTY>
-<!ATTLIST for-type
- type CDATA #REQUIRED
->
-
-<!ELEMENT for-stereotype EMPTY>
-<!ATTLIST for-stereotype
- stereotype CDATA #REQUIRED
->
-
-<!ELEMENT for-model-property EMPTY>
-<!ATTLIST for-model-property
- model CDATA #REQUIRED
- property CDATA #REQUIRED 
->
-
-<!ELEMENT for-valid-values EMPTY>
-
-<!ELEMENT for-references EMPTY>
-
-<!ELEMENT for-reference EMPTY>
-<!ATTLIST for-reference
- model CDATA #REQUIRED
->
-
-<!ELEMENT for-collections EMPTY>
-
-<!ELEMENT for-element-collections EMPTY>
-
-<!ELEMENT for-collection EMPTY>
-<!ATTLIST for-collection
- model CDATA #REQUIRED
->
-
-<!ELEMENT for-tabs EMPTY>
-
-<!ELEMENT for-tab EMPTY>
-<!ATTLIST for-tab
- model CDATA #REQUIRED
->
-
-
+<?xml version="1.0" encoding="ISO-8859-1"?>
+
+<!ELEMENT editors (editor*)>
+
+
+<!ELEMENT editor (property*, formatter?, list-formatter?, (for-type | for-stereotype | for-model-property | for-valid-values | for-references | for-reference | for-collections | for-element-collections | for-collection | for-tabs | for-tab )*)>
+<!ATTLIST editor
+ name CDATA #IMPLIED
+ url CDATA #REQUIRED
+ format (true|false) "true" 
+ depends-stereotypes CDATA #IMPLIED
+ depends-properties CDATA #IMPLIED
+ frame (true|false) "false"
+ always-reload (true|false) "false"
+ composite (true|false) "false" 
+ icon CDATA #IMPLIED
+ init-action CDATA #IMPLIED
+ release-action CDATA #IMPLIED
+ selectable-items (true|false) "true"
+>
+
+<!ELEMENT property EMPTY>
+<!ATTLIST property
+  name CDATA #REQUIRED
+  value CDATA #REQUIRED
+>
+
+<!ELEMENT formatter (set*)>
+<!ATTLIST formatter
+  class CDATA #IMPLIED
+	from-type (true|false) "false"
+>
+
+<!ELEMENT list-formatter (set*)>
+<!ATTLIST list-formatter
+  class CDATA #IMPLIED
+	from-type (true|false) "false"
+>
+
+<!ELEMENT set EMPTY>
+<!ATTLIST set
+ property CDATA #REQUIRED
+ value CDATA #REQUIRED 
+>
+
+<!ELEMENT for-type EMPTY>
+<!ATTLIST for-type
+ type CDATA #REQUIRED
+>
+
+<!ELEMENT for-stereotype EMPTY>
+<!ATTLIST for-stereotype
+ stereotype CDATA #REQUIRED
+>
+
+<!ELEMENT for-model-property EMPTY>
+<!ATTLIST for-model-property
+ model CDATA #REQUIRED
+ property CDATA #REQUIRED 
+>
+
+<!ELEMENT for-valid-values EMPTY>
+
+<!ELEMENT for-references EMPTY>
+
+<!ELEMENT for-reference EMPTY>
+<!ATTLIST for-reference
+ model CDATA #REQUIRED
+>
+
+<!ELEMENT for-collections EMPTY>
+
+<!ELEMENT for-element-collections EMPTY>
+
+<!ELEMENT for-collection EMPTY>
+<!ATTLIST for-collection
+ model CDATA #REQUIRED
+>
+
+<!ELEMENT for-tabs EMPTY>
+
+<!ELEMENT for-tab EMPTY>
+<!ATTLIST for-tab
+ model CDATA #REQUIRED
+>
+
+
diff --git a/xava/dtds/generadores-codigo.dtd b/xava/dtds/generadores-codigo.dtd
index 7fa86a7..5c48e05 100644
--- a/xava/dtds/generadores-codigo.dtd
+++ b/xava/dtds/generadores-codigo.dtd
@@ -1,9 +1,9 @@
-<!ELEMENT generadores-codigo (para-estereotipo)+>
-
-<!ELEMENT para-estereotipo EMPTY>
-<!ATTLIST para-estereotipo
- nombre CDATA #REQUIRED
- tipo-modelo (ejb|pojo|ALL) "ALL"
- clase CDATA #REQUIRED
->
-
+<!ELEMENT generadores-codigo (para-estereotipo)+>
+
+<!ELEMENT para-estereotipo EMPTY>
+<!ATTLIST para-estereotipo
+ nombre CDATA #REQUIRED
+ tipo-modelo (ejb|pojo|ALL) "ALL"
+ clase CDATA #REQUIRED
+>
+
diff --git a/xava/dtds/longitud-defecto.dtd b/xava/dtds/longitud-defecto.dtd
index 0c02897..74d47da 100644
--- a/xava/dtds/longitud-defecto.dtd
+++ b/xava/dtds/longitud-defecto.dtd
@@ -1,13 +1,13 @@
-<!ELEMENT longitud-defecto (para-estereotipo|para-tipo)+>
-
-<!ELEMENT para-estereotipo EMPTY>
-<!ATTLIST para-estereotipo
- nombre CDATA #REQUIRED
- longitud CDATA #REQUIRED
->
-
-<!ELEMENT para-tipo EMPTY>
-<!ATTLIST para-tipo
- clase CDATA #REQUIRED
- longitud CDATA #REQUIRED
->
+<!ELEMENT longitud-defecto (para-estereotipo|para-tipo)+>
+
+<!ELEMENT para-estereotipo EMPTY>
+<!ATTLIST para-estereotipo
+ nombre CDATA #REQUIRED
+ longitud CDATA #REQUIRED
+>
+
+<!ELEMENT para-tipo EMPTY>
+<!ATTLIST para-tipo
+ clase CDATA #REQUIRED
+ longitud CDATA #REQUIRED
+>
diff --git a/xava/dtds/stereotype-type-default.dtd b/xava/dtds/stereotype-type-default.dtd
index 985fb9d..206aace 100644
--- a/xava/dtds/stereotype-type-default.dtd
+++ b/xava/dtds/stereotype-type-default.dtd
@@ -1,9 +1,9 @@
-<!ELEMENT stereotype-type-default (for*)>
-
-<!ELEMENT for EMPTY>
-<!ATTLIST for
- stereotype CDATA #REQUIRED
- type CDATA #REQUIRED
->
-
-
+<!ELEMENT stereotype-type-default (for*)>
+
+<!ELEMENT for EMPTY>
+<!ATTLIST for
+ stereotype CDATA #REQUIRED
+ type CDATA #REQUIRED
+>
+
+
diff --git a/xava/dtds/tabs-default-values.dtd b/xava/dtds/tabs-default-values.dtd
index 42b6ef5..8bf044b 100644
--- a/xava/dtds/tabs-default-values.dtd
+++ b/xava/dtds/tabs-default-values.dtd
@@ -1,55 +1,55 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-
-<!ELEMENT tabs-default-values (tab*)>
-
-<!ELEMENT tab
-   (filter?, row-style*, properties?, base-condition?, default-order?, (for-model* | except-for-model* | for-all-models) )
->
-<!ATTLIST tab
- editors CDATA #IMPLIED
->
-
-<!ELEMENT base-condition
-   (#PCDATA)
->
-
-<!ELEMENT default-order
-   (#PCDATA)
->
-
-<!ELEMENT properties
-   (#PCDATA)
->
-
-<!ELEMENT set EMPTY>
-<!ATTLIST set
- property CDATA #REQUIRED
- from CDATA #IMPLIED
- value CDATA #IMPLIED 
->
-
-<!ELEMENT row-style EMPTY>
-<!ATTLIST row-style
- style CDATA #REQUIRED
- property CDATA #REQUIRED
- value CDATA #REQUIRED
->
-
-<!ELEMENT filter (set*)>
-<!ATTLIST filter
- class CDATA #REQUIRED
->
-
-<!ELEMENT for-model EMPTY>
-<!ATTLIST for-model
- model CDATA #REQUIRED
->
-
-<!ELEMENT except-for-model EMPTY>
-<!ATTLIST except-for-model
- model CDATA #REQUIRED
->
-
-<!ELEMENT for-all-models EMPTY>
-
-
+<?xml version="1.0" encoding="ISO-8859-1"?>
+
+<!ELEMENT tabs-default-values (tab*)>
+
+<!ELEMENT tab
+   (filter?, row-style*, properties?, base-condition?, default-order?, (for-model* | except-for-model* | for-all-models) )
+>
+<!ATTLIST tab
+ editors CDATA #IMPLIED
+>
+
+<!ELEMENT base-condition
+   (#PCDATA)
+>
+
+<!ELEMENT default-order
+   (#PCDATA)
+>
+
+<!ELEMENT properties
+   (#PCDATA)
+>
+
+<!ELEMENT set EMPTY>
+<!ATTLIST set
+ property CDATA #REQUIRED
+ from CDATA #IMPLIED
+ value CDATA #IMPLIED 
+>
+
+<!ELEMENT row-style EMPTY>
+<!ATTLIST row-style
+ style CDATA #REQUIRED
+ property CDATA #REQUIRED
+ value CDATA #REQUIRED
+>
+
+<!ELEMENT filter (set*)>
+<!ATTLIST filter
+ class CDATA #REQUIRED
+>
+
+<!ELEMENT for-model EMPTY>
+<!ATTLIST for-model
+ model CDATA #REQUIRED
+>
+
+<!ELEMENT except-for-model EMPTY>
+<!ATTLIST except-for-model
+ model CDATA #REQUIRED
+>
+
+<!ELEMENT for-all-models EMPTY>
+
+
diff --git a/xava/dtds/tipo-estereotipo-defecto.dtd b/xava/dtds/tipo-estereotipo-defecto.dtd
index c001871..7b04bc5 100644
--- a/xava/dtds/tipo-estereotipo-defecto.dtd
+++ b/xava/dtds/tipo-estereotipo-defecto.dtd
@@ -1,9 +1,9 @@
-<!ELEMENT tipo-estereotipo-defecto (para*)>
-
-<!ELEMENT para EMPTY>
-<!ATTLIST para
- estereotipo CDATA #REQUIRED
- tipo CDATA #REQUIRED
->
-
-
+<!ELEMENT tipo-estereotipo-defecto (para*)>
+
+<!ELEMENT para EMPTY>
+<!ATTLIST para
+ estereotipo CDATA #REQUIRED
+ tipo CDATA #REQUIRED
+>
+
+
diff --git a/xava/dtds/validadores.dtd b/xava/dtds/validadores.dtd
index b896234..f3801ca 100644
--- a/xava/dtds/validadores.dtd
+++ b/xava/dtds/validadores.dtd
@@ -1,33 +1,33 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-
-<!ELEMENT validadores (validador*, validador-requerido*, validador-defecto*)>
-
-<!ELEMENT validador EMPTY>
-<!ATTLIST validador
-  nombre ID #REQUIRED
-  clase CDATA #REQUIRED  
->
-
-<!ELEMENT validador-requerido ((nombre-validador | clase-validador), (para-tipo | para-estereotipo)+)>
-
-<!ELEMENT validador-defecto ((nombre-validador | clase-validador), (para-tipo | para-estereotipo)+)>
-
-<!ELEMENT nombre-validador EMPTY>
-<!ATTLIST nombre-validador
-  nombre CDATA #REQUIRED
->
-
-<!ELEMENT clase-validador EMPTY>
-<!ATTLIST clase-validador
-  clase CDATA #REQUIRED
->
-
-<!ELEMENT para-tipo EMPTY>
-<!ATTLIST para-tipo
-  tipo CDATA #REQUIRED
->
-
-<!ELEMENT para-estereotipo EMPTY>
-<!ATTLIST para-estereotipo
-  estereotipo CDATA #REQUIRED
->
+<?xml version="1.0" encoding="ISO-8859-1"?>
+
+<!ELEMENT validadores (validador*, validador-requerido*, validador-defecto*)>
+
+<!ELEMENT validador EMPTY>
+<!ATTLIST validador
+  nombre ID #REQUIRED
+  clase CDATA #REQUIRED  
+>
+
+<!ELEMENT validador-requerido ((nombre-validador | clase-validador), (para-tipo | para-estereotipo)+)>
+
+<!ELEMENT validador-defecto ((nombre-validador | clase-validador), (para-tipo | para-estereotipo)+)>
+
+<!ELEMENT nombre-validador EMPTY>
+<!ATTLIST nombre-validador
+  nombre CDATA #REQUIRED
+>
+
+<!ELEMENT clase-validador EMPTY>
+<!ATTLIST clase-validador
+  clase CDATA #REQUIRED
+>
+
+<!ELEMENT para-tipo EMPTY>
+<!ATTLIST para-tipo
+  tipo CDATA #REQUIRED
+>
+
+<!ELEMENT para-estereotipo EMPTY>
+<!ATTLIST para-estereotipo
+  estereotipo CDATA #REQUIRED
+>
diff --git a/xava/dtds/valores-defecto-tabs.dtd b/xava/dtds/valores-defecto-tabs.dtd
index 9fdd114..a09581b 100644
--- a/xava/dtds/valores-defecto-tabs.dtd
+++ b/xava/dtds/valores-defecto-tabs.dtd
@@ -1,55 +1,55 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-
-<!ELEMENT valores-defecto-tab (tab*)>
-
-<!ELEMENT tab
-   (filtro?, estilo-fila*, propiedades?, condicion-base?, orden-defecto?, (para-modelo* | excepto-para-modelo* | para-todos-los-modelos) )
->
-<!ATTLIST tab
- editores CDATA #IMPLIED
->
-
-<!ELEMENT condicion-base
-   (#PCDATA)
->
-
-<!ELEMENT orden-defecto
-   (#PCDATA)
->
-
-<!ELEMENT propiedades
-   (#PCDATA)
->
-
-<!ELEMENT poner EMPTY>
-<!ATTLIST poner
- propiedad CDATA #REQUIRED
- desde CDATA #IMPLIED
- valor CDATA #IMPLIED 
->
-
-<!ELEMENT estilo-fila EMPTY>
-<!ATTLIST estilo-fila
- estilo CDATA #REQUIRED
- propiedad CDATA #REQUIRED
- valor CDATA #REQUIRED
->
-
-<!ELEMENT filtro (poner*)>
-<!ATTLIST filtro
- clase CDATA #REQUIRED
->
-
-<!ELEMENT para-modelo EMPTY>
-<!ATTLIST para-modelo
- modelo CDATA #REQUIRED
->
-
-<!ELEMENT excepto-para-modelo EMPTY>
-<!ATTLIST excepto-para-modelo
- modelo CDATA #REQUIRED
->
-
-<!ELEMENT para-todos-los-modelos EMPTY>
-
-
+<?xml version="1.0" encoding="ISO-8859-1"?>
+
+<!ELEMENT valores-defecto-tab (tab*)>
+
+<!ELEMENT tab
+   (filtro?, estilo-fila*, propiedades?, condicion-base?, orden-defecto?, (para-modelo* | excepto-para-modelo* | para-todos-los-modelos) )
+>
+<!ATTLIST tab
+ editores CDATA #IMPLIED
+>
+
+<!ELEMENT condicion-base
+   (#PCDATA)
+>
+
+<!ELEMENT orden-defecto
+   (#PCDATA)
+>
+
+<!ELEMENT propiedades
+   (#PCDATA)
+>
+
+<!ELEMENT poner EMPTY>
+<!ATTLIST poner
+ propiedad CDATA #REQUIRED
+ desde CDATA #IMPLIED
+ valor CDATA #IMPLIED 
+>
+
+<!ELEMENT estilo-fila EMPTY>
+<!ATTLIST estilo-fila
+ estilo CDATA #REQUIRED
+ propiedad CDATA #REQUIRED
+ valor CDATA #REQUIRED
+>
+
+<!ELEMENT filtro (poner*)>
+<!ATTLIST filtro
+ clase CDATA #REQUIRED
+>
+
+<!ELEMENT para-modelo EMPTY>
+<!ATTLIST para-modelo
+ modelo CDATA #REQUIRED
+>
+
+<!ELEMENT excepto-para-modelo EMPTY>
+<!ATTLIST excepto-para-modelo
+ modelo CDATA #REQUIRED
+>
+
+<!ELEMENT para-todos-los-modelos EMPTY>
+
+