<!-- <packageName>fr.gouv.minefi.cp.helios.pesv2</packageName> -->
<schemaDirectory>src/main/xsd/PES_V2/Rev0</schemaDirectory>
<schemaFiles>PES_Aller.xsd</schemaFiles>
-
+ <extension>true</extension>
</configuration>
</plugin>
</plugins>
--- /dev/null
+/*
+ * To change this template, choose Tools | Templates
+ * and open the template in the editor.
+ */
+package com.axyus.generator.pespj.utils;
+
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
+import javax.xml.bind.annotation.adapters.XmlAdapter;
+
+public class DateAdapter extends XmlAdapter<String, Date> {
+
+ private SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
+
+ @Override
+ public String marshal(Date v) throws Exception {
+ return dateFormat.format(v);
+ }
+
+ @Override
+ public Date unmarshal(String v) throws Exception {
+ return dateFormat.parse(v);
+ }
+
+}
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss");
return sdf.format(date);
}
+
+ public static XMLGregorianCalendar getXmlDateGregorianCalendar(Date date) throws DatatypeConfigurationException {
+ return DatatypeFactory.newInstance().newXMLGregorianCalendar(new SimpleDateFormat("yyyy-MM-dd").format(date));
+ }
+
+ public static XMLGregorianCalendar getXmlDateTimeGregorianCalendar(Date date) throws DatatypeConfigurationException {
+ return DatatypeFactory.newInstance().newXMLGregorianCalendar(new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss").format(date));
+ }
}
import java.text.SimpleDateFormat;
import java.util.Arrays;
import java.util.Calendar;
+import java.util.Date;
import java.util.List;
import java.util.zip.GZIPOutputStream;
import javax.xml.datatype.XMLGregorianCalendar;
pj.setContenu(contenu);
}
- public static void setNomFicAndDatStr(PESAller pesAller, String pesPjFilename) {
+ public static void setNomFicAndDatStr(final PESAller pesAller, final String pesPjFilename) {
// Ajout du nom de fichier
- BaseTexte100 nomFichier = new BaseTexte100();
+ final BaseTexte100 nomFichier = new BaseTexte100();
nomFichier.setV(pesPjFilename);
pesAller.getEnveloppe().getParametres().setNomFic(nomFichier);
-
+
// Ajout de la date d'émission de la structure.
- Calendar calendar = Calendar.getInstance();
- XMLGregorianCalendar xmlDate = XMLGregorianCalendarImpl.createDateTime(calendar.get(Calendar.YEAR), calendar.get(Calendar.MONTH), calendar.get(Calendar.DAY_OF_MONTH), calendar.get(Calendar.HOUR_OF_DAY), calendar.get(Calendar.MINUTE), calendar.get(Calendar.SECOND));
- BaseDate date = new BaseDate();
- date.setV(xmlDate);
- pesAller.getEnTetePES().setDteStr(date);
+ try {
+ final BaseDate date = new BaseDate();
+ date.setV(new Date());
+ //date.setV(DateUtils.getXmlDateGregorianCalendar(new Date()));
+ pesAller.getEnTetePES().setDteStr(date);
+ } catch (Exception e) {
+ throw new UnExpectedException(e);
+ }
}
}
<?xml version="1.0" encoding="UTF-8"?>
<!-- edited with XMLSPY v5 rel. 2 U (http://www.xmlspy.com) by SERGE MURET (SEMA GROUP SA) -->
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" jaxb:version="2.0" xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" xmlns:xjc="http://java.sun.com/xml/ns/jaxb/xjc" jaxb:extensionBindingPrefixes="xjc">
<xs:complexType name="Base_Alphanum1">
<xs:attribute name="V" type="V_Alphanum1" use="required"/>
</xs:complexType>
<xs:restriction base="xs:boolean"/>
</xs:simpleType>
<xs:complexType name="Base_Date">
- <xs:attribute name="V" type="V_Date" use="required"/>
- </xs:complexType>
- <xs:simpleType name="V_Date">
+ <xs:attribute name="V" type="V_Date" use="required"/>
+ </xs:complexType>
+ <xs:simpleType name="V_Date">
+ <xs:annotation>
+ <xs:appinfo>
+ <xjc:javaType name="java.util.Date" adapter="com.axyus.generator.pespj.utils.DateAdapter" />
+ </xs:appinfo>
+ </xs:annotation>
<xs:restriction base="xs:date"/>
</xs:simpleType>
<xs:complexType name="Base_MontantPositifStrict">
import com.axyus.generator.pespj.utils.DateUtils;
import com.axyus.generator.pespj.utils.GeneratePesUtils;
import com.axyus.swing.components.wizard.WizardProcess;
-import com.sun.org.apache.xerces.internal.jaxp.datatype.XMLGregorianCalendarImpl;
-import fr.gouv.minefi.cp.helios.pes_v2.commun.BaseDate;
import fr.gouv.minefi.cp.helios.pes_v2.facture.r0.aller.TPESFactureOld;
import fr.gouv.minefi.cp.helios.pes_v2.rev0.aller.PESAller;
-import java.text.SimpleDateFormat;
-import java.util.Calendar;
import javax.swing.JOptionPane;
-import javax.xml.datatype.XMLGregorianCalendar;
import org.apache.commons.io.FilenameUtils;
/**
<name>${artifactId}</name>
<url>http://axyus.com</url>
<properties>
- <applicationVersion>2.3.0</applicationVersion>
+ <applicationVersion>2.4.0</applicationVersion>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
<prerequisites>
xsi:noNamespaceSchemaLocation="../../defs/technical-component-definition.xsd">
<name>generator-pes-pj</name>
<description>Générateur de PES PJ</description>
- <release>5.2.3.0</release>
+ <release>5.2.4.0</release>
<url>http://xemelios.org/updatesV5/generator-pes-pj</url>
<type>COMPOSANT</type>
<destination>
<file>${xemelios.tools.directory}/generator-pes-pj.jar</file>
</deletes>
<release-notes>
+ <release v="5.2.4.0">
+ <note visibility="public">Correction du format des dates (AAAA-MM-JJ)</note>
+ </release>
<release v="5.2.3.0">
<note visibility="public">Ajout du nom de fichier au sein du flux ainsi que de la date de génération</note>
</release>