- Wao-commits - mailman.cloud.codelutin.com

[Suiviobsmer-commits] r673 - trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/components
by bleny＠users.labs.libre-entreprise.org 14 Oct '10

14 Oct '10

Author: bleny Date: 2010-10-14 10:51:10 +0000 (Thu, 14 Oct 2010) New Revision: 673 Log: bugfix layout Modified: trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/components/ImportFieldSet.tml Modified: trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/components/ImportFieldSet.tml =================================================================== --- trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/components/ImportFieldSet.tml 2010-10-14 09:56:47 UTC (rev 672) +++ trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/components/ImportFieldSet.tml 2010-10-14 10:51:10 UTC (rev 673) @@ -26,7 +26,7 @@ <fieldset> <legend>Import ${label}</legend> <t:errors /> - <label for="file">Fichier ${format} ${label}</label> : + <label for="file">Fichier ${format} ${label}</label> :<br /> <input t:type="upload" t:id="file" t:validate="required" /> <input t:type="submit" class="ico import" value="OK" title="Import ${label} (format ${format} avec encodage UTF-8)" /> <t:body />

1 0

[Suiviobsmer-commits] r672 - trunk/wao-ui/src/main/webapp/css
by bleny＠users.labs.libre-entreprise.org 14 Oct '10

14 Oct '10

Author: bleny Date: 2010-10-14 09:56:47 +0000 (Thu, 14 Oct 2010) New Revision: 672 Log: int?\195?\169gration de la modif CSS d'Aur?\195?\169lie sur la carto Modified: trunk/wao-ui/src/main/webapp/css/cartography.css Modified: trunk/wao-ui/src/main/webapp/css/cartography.css =================================================================== --- trunk/wao-ui/src/main/webapp/css/cartography.css 2010-10-13 11:48:46 UTC (rev 671) +++ trunk/wao-ui/src/main/webapp/css/cartography.css 2010-10-14 09:56:47 UTC (rev 672) @@ -8,12 +8,12 @@ * it under the terms of the GNU Affero General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see <http://www.gnu.org/licenses/>. * #L% @@ -31,15 +31,21 @@ background-color: #080824; } + #so-cartography-border { - width: 250px; + width: 300px; + background-color:#f1f1f1; + padding:10px; + color:#007CC2; } #so-cartography-border h1 { font-size: 1.2em; text-align: center; - color: white; + color:#007CC2; margin-bottom: 20px; + font-family:Tahoma,Verdana,Arial,Helvetica,Courier New,Courier; + font-variant:small-caps; } #so-cartography-icons { @@ -50,7 +56,7 @@ } #so-cartography-filters { - color: white; + color:#007CC2; margin-left: 10px; font-size: 0.9em; } @@ -80,4 +86,4 @@ #so-footer a:hover { color: white !important; -} +} \ No newline at end of file

1 0

[Suiviobsmer-commits] r671 - in trunk/wao-business/src/test/java/fr/ifremer/wao: . entity service
by tchemit＠users.labs.libre-entreprise.org 13 Oct '10

13 Oct '10

Author: tchemit Date: 2010-10-13 11:48:46 +0000 (Wed, 13 Oct 2010) New Revision: 671 Log: rename field logger to log + add some fixme + close some stream Modified: trunk/wao-business/src/test/java/fr/ifremer/wao/ErrorDB1_0Test.java trunk/wao-business/src/test/java/fr/ifremer/wao/entity/WaoUserImplTest.java trunk/wao-business/src/test/java/fr/ifremer/wao/service/ActivityCalendarImportTest.java trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceBoatImplTest.java trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceCartographyImplTest.java trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceContactImplTest.java trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceContactInternalTest.java trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceSynthesisImplTest.java trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceUserImplTest.java Modified: trunk/wao-business/src/test/java/fr/ifremer/wao/ErrorDB1_0Test.java =================================================================== --- trunk/wao-business/src/test/java/fr/ifremer/wao/ErrorDB1_0Test.java 2010-10-13 11:48:18 UTC (rev 670) +++ trunk/wao-business/src/test/java/fr/ifremer/wao/ErrorDB1_0Test.java 2010-10-13 11:48:46 UTC (rev 671) @@ -69,6 +69,7 @@ private static TestManager manager; + //FIXME tchemit 2010-10-13 : on ne met pas ce genre d'objet en attibut, ou bien on s'assure qu'ils seront bien fermer dans une AfterClass private static Writer writerAll; private static Writer writerKos; Modified: trunk/wao-business/src/test/java/fr/ifremer/wao/entity/WaoUserImplTest.java =================================================================== --- trunk/wao-business/src/test/java/fr/ifremer/wao/entity/WaoUserImplTest.java 2010-10-13 11:48:18 UTC (rev 670) +++ trunk/wao-business/src/test/java/fr/ifremer/wao/entity/WaoUserImplTest.java 2010-10-13 11:48:46 UTC (rev 671) @@ -34,7 +34,8 @@ */ public class WaoUserImplTest { - private static final Logger logger = LoggerFactory.getLogger(WaoUserImplTest.class); + private static final Logger log = + LoggerFactory.getLogger(WaoUserImplTest.class); @Test Modified: trunk/wao-business/src/test/java/fr/ifremer/wao/service/ActivityCalendarImportTest.java =================================================================== --- trunk/wao-business/src/test/java/fr/ifremer/wao/service/ActivityCalendarImportTest.java 2010-10-13 11:48:18 UTC (rev 670) +++ trunk/wao-business/src/test/java/fr/ifremer/wao/service/ActivityCalendarImportTest.java 2010-10-13 11:48:46 UTC (rev 671) @@ -54,7 +54,8 @@ private static TestManager manager; - private static final Logger log = LoggerFactory.getLogger(ActivityCalendarImportTest.class); + private static final Logger log = + LoggerFactory.getLogger(ActivityCalendarImportTest.class); public ActivityCalendarImportTest() { } @@ -106,10 +107,13 @@ Assert.assertTrue(file.exists()); BufferedReader reader = new BufferedReader(new FileReader(file)); - String line = null; + try {String line; while ((line = reader.readLine()) != null) { log.info(line); } + } finally { + reader.close(); + } } } Modified: trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceBoatImplTest.java =================================================================== --- trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceBoatImplTest.java 2010-10-13 11:48:18 UTC (rev 670) +++ trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceBoatImplTest.java 2010-10-13 11:48:46 UTC (rev 671) @@ -259,7 +259,7 @@ row2.setCompany(company); serviceSampling.createUpdateSampleRow(row2, new ArrayList<Boat>(), new SampleRowLogImpl()); - return Arrays.asList(new SampleRow[] { row1, row2}); + return Arrays.asList(row1, row2); } @Test @@ -428,11 +428,15 @@ Assert.assertTrue(file.exists()); BufferedReader reader = new BufferedReader(new FileReader(file)); + try { String line = reader.readLine(); Assert.assertTrue(line.contains("Jean Michmuche")); Assert.assertTrue(line.contains("TARTANPION")); Assert.assertTrue(line.contains("TESTBOAT")); Assert.assertTrue(line.contains("174592")); + } finally { + reader.close(); + } } } Modified: trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceCartographyImplTest.java =================================================================== --- trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceCartographyImplTest.java 2010-10-13 11:48:18 UTC (rev 670) +++ trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceCartographyImplTest.java 2010-10-13 11:48:46 UTC (rev 671) @@ -51,14 +51,14 @@ */ public class ServiceCartographyImplTest extends AbstractServiceTest { - private static final Logger logger = + private static final Logger log = LoggerFactory.getLogger(ServiceCartographyImplTest.class); private ServiceCartography service; @Before public void initialize() { - logger.info("initialize ServiceCartographyImplTest"); + log.info("initialize ServiceCartographyImplTest"); service = manager.getServiceCartography(); } @@ -126,6 +126,7 @@ Company company2 = createCompany("BIS"); prepareContactsData(company, company2); + //FIXME tchemit 2010-10-13 : Ca sert a quoi, on teste rien ? InputStream input = getClass().getResourceAsStream("/import/boat_districts.kml"); ImportResults results = service.importBoatDistrictKml(input); Modified: trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceContactImplTest.java =================================================================== --- trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceContactImplTest.java 2010-10-13 11:48:18 UTC (rev 670) +++ trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceContactImplTest.java 2010-10-13 11:48:46 UTC (rev 671) @@ -48,20 +48,20 @@ */ public class ServiceContactImplTest extends AbstractServiceTest { - private static final Logger logger = + private static final Logger log = LoggerFactory.getLogger(ServiceContactImplTest.class); private ServiceContact service; @Before public void initialize() { - logger.info("initialize ServiceContactImplTest"); + log.info("initialize ServiceContactImplTest"); service = manager.getServiceContact(); } @Test public void testGetContactsFilteredByObserver() throws TopiaException { - logger.info("getContactsFilteredByObserver"); + log.info("getContactsFilteredByObserver"); /** PREPARE DATA **/ Contact contact = createDefaultContact(); @@ -70,14 +70,14 @@ ContactFilter filter = new ContactFilterImpl(); filter.setObserver(findDefaultObserver()); - logger.info("test 1 : Ok good filter, contact is correctly returned"); + log.info("test 1 : Ok good filter, contact is correctly returned"); Map<String, Contact> results = service.getContacts(filter); Assert.assertEquals(1, results.size()); Contact contactFind = results.get(contact.getTopiaId()); Assert.assertEquals(contact, contactFind); - logger.info("test 2 : Bad filter, no contact is returned"); + log.info("test 2 : Bad filter, no contact is returned"); WaoUser observer2 = createUser("marge", UserRole.OBSERVER, findDefaultCompany()); Modified: trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceContactInternalTest.java =================================================================== --- trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceContactInternalTest.java 2010-10-13 11:48:18 UTC (rev 670) +++ trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceContactInternalTest.java 2010-10-13 11:48:46 UTC (rev 671) @@ -88,7 +88,7 @@ private static TestManager manager; - private static final Logger logger = + private static final Logger log = LoggerFactory.getLogger(ServiceContactInternalTest.class); private ServiceContactImpl service; @@ -134,7 +134,7 @@ protected void prepareData(boolean needBoat, boolean needObserver) throws TopiaException { - logger.info("Prepare data :"); + log.info("Prepare data :"); TopiaContext transaction = manager.getContext().beginTransaction(); try { @@ -155,13 +155,13 @@ SampleRowDAO rowDAO = WaoDAOHelper.getSampleRowDAO(transaction); - logger.info("SampleRow : 2010_0001"); + log.info("SampleRow : 2010_0001"); sampleRow = rowDAO.create(SampleRow.CODE, "2010_0001", SampleRow.COMPANY, company); SampleMonthDAO monthDAO = WaoDAOHelper.getSampleMonthDAO(transaction); - logger.info("SampleMonth : 03/2010 _ row 2010_0001"); + log.info("SampleMonth : 03/2010 _ row 2010_0001"); Date monthDate = DateUtil.createDate(1, 3, 2010); sampleMonth = monthDAO.create(SampleMonth.SAMPLE_ROW, sampleRow, SampleMonth.PERIOD_DATE, monthDate); @@ -188,13 +188,13 @@ @Test public void testGetExistingSampleMonthForContact() throws TopiaException, NullSampleMonthException { - logger.info("testGetExistingSampleMonthForContact"); + log.info("testGetExistingSampleMonthForContact"); // /** PREPARE DATA **/ // prepareData(false, false); // // /** EXEC METHOD **/ -// logger.info("test 1 : SampleMonth exists for contact"); +// log.info("test 1 : SampleMonth exists for contact"); // TopiaContext transaction = manager.getContext().beginTransaction(); // try { // SampleMonthDAO monthDAO = @@ -212,7 +212,7 @@ // transaction.closeContext(); // } // -// logger.info("test 2 : contact tideBeginDate doesn't match with any" + +// log.info("test 2 : contact tideBeginDate doesn't match with any" + // " SampleMonth"); // transaction = manager.getContext().beginTransaction(); // try { @@ -225,7 +225,7 @@ // service.getExistingSampleMonthForContact(monthDAO, // contact.getSampleRow(), contact.getTideBeginDate()); // } catch (Exception eee) { -// logger.error("Error : " + eee.getMessage()); +// log.error("Error : " + eee.getMessage()); // assertEquals(NullSampleMonthException.class, eee.getClass()); // } finally { // transaction.closeContext(); @@ -235,7 +235,7 @@ @Test public void testUpdateSampleMonthTidesValue() throws TopiaException, NullSampleMonthException { - logger.info("testUpdateSampleMonthTidesValue"); + log.info("testUpdateSampleMonthTidesValue"); /** PREPARE DATA **/ prepareData(false, false); @@ -247,7 +247,7 @@ when(contact.getValidationProgram()).thenReturn(null); /** EXEC METHOD **/ - logger.info("test 1 : ContactState changed from null to BOARDING_DONE" + + log.info("test 1 : ContactState changed from null to BOARDING_DONE" + " -> increment estimated tides value"); TopiaContext transaction = manager.getContext().beginTransaction(); try { @@ -262,10 +262,10 @@ transaction.closeContext(); } - logger.info("test 1 : verification sampleMonth estimated tides = 1"); + log.info("test 1 : verification sampleMonth estimated tides = 1"); checkTidesValue(1, false); - logger.info("test 2 : ContactState changed from BOARDING_DONE to " + + log.info("test 2 : ContactState changed from BOARDING_DONE to " + "BOAT_REFUSED -> decrement estimated tides value"); transaction = manager.getContext().beginTransaction(); try { @@ -283,14 +283,14 @@ transaction.closeContext(); } - logger.info("test 2 : verification sampleMonth estimated tides = 0"); + log.info("test 2 : verification sampleMonth estimated tides = 0"); checkTidesValue(0, false); // Reset contactState to BOARDING_DONE for next test when(contact.getContactState()). thenReturn(ContactState.BOARDING_DONE); - logger.info("test 3 : CompanyValidation changed from null to " + + log.info("test 3 : CompanyValidation changed from null to " + "FALSE -> do nothing"); transaction = manager.getContext().beginTransaction(); try { @@ -306,10 +306,10 @@ transaction.closeContext(); } - logger.info("test 3 : verification sampleMonth real tides = 0"); + log.info("test 3 : verification sampleMonth real tides = 0"); checkTidesValue(0, true); - logger.info("test 4 : CompanyValidation changed from FALSE to " + + log.info("test 4 : CompanyValidation changed from FALSE to " + "TRUE -> increment real tides value"); transaction = manager.getContext().beginTransaction(); try { @@ -326,13 +326,13 @@ transaction.closeContext(); } - logger.info("test 4 : verification sampleMonth real tides = 1"); + log.info("test 4 : verification sampleMonth real tides = 1"); checkTidesValue(1, true); // ContactReference after saving contact will normally have this value : when(contactReference.getValidationCompany()).thenReturn(Boolean.TRUE); - logger.info("test 5 : CompanyValidation doesn't changed but " + + log.info("test 5 : CompanyValidation doesn't changed but " + "ProgramValidation is set to FALSE -> decrement real tides"); transaction = manager.getContext().beginTransaction(); try { @@ -346,10 +346,10 @@ transaction.closeContext(); } - logger.info("test 5 : verification sampleMonth real tides = 0"); + log.info("test 5 : verification sampleMonth real tides = 0"); checkTidesValue(0, true); - logger.info("test 6 : Prepare data for delete case"); + log.info("test 6 : Prepare data for delete case"); // PREPARE DATA : update estimated to 1 and real to 1 transaction = manager.getContext().beginTransaction(); try { @@ -375,7 +375,7 @@ when(contactReference.getValidationProgram()).thenReturn(Boolean.TRUE); when(contactReference.getValidationCompany()).thenReturn(Boolean.TRUE); - logger.info("test 6 : Delete contact (new contact is null) -> " + + log.info("test 6 : Delete contact (new contact is null) -> " + "decrement realTides and estimatedTides"); transaction = manager.getContext().beginTransaction(); try { @@ -389,12 +389,12 @@ transaction.closeContext(); } - logger.info("test 6 : verification sampleMonth real tides = 0" + + log.info("test 6 : verification sampleMonth real tides = 0" + "and estimated tides = 0"); checkTidesValue(0, true); checkTidesValue(0, false); - logger.info("test 7 : SampleMonth will change from 03/2010 to 04/2010" + + log.info("test 7 : SampleMonth will change from 03/2010 to 04/2010" + " -> decrement estimated tides from oldMonth"); transaction = manager.getContext().beginTransaction(); try { @@ -415,10 +415,10 @@ transaction.closeContext(); } - logger.info("test 7 : verification old sampleMonth estimated tides = 0"); + log.info("test 7 : verification old sampleMonth estimated tides = 0"); checkTidesValue(0, false); - logger.info("test 7 : verification new sampleMonth estimated " + + log.info("test 7 : verification new sampleMonth estimated " + "tides = 1 and real tides = 1"); transaction = manager.getContext().beginTransaction(); try { @@ -440,7 +440,7 @@ @Test public void testDecrementSampleMonthContactRefused() throws TopiaException, NullSampleMonthException { - logger.info("testDecrementSampleMonthContactRefused"); + log.info("testDecrementSampleMonthContactRefused"); /** PREPARE DATA **/ prepareData(false, false); @@ -477,7 +477,7 @@ checkTidesValue(1, true); /** EXEC METHOD **/ - logger.info("test 1 : validationProgram null -> FALSE, estimated -1" + + log.info("test 1 : validationProgram null -> FALSE, estimated -1" + " and real -1"); transaction = manager.getContext().beginTransaction(); try { @@ -497,7 +497,7 @@ checkTidesValue(0, false); checkTidesValue(0, true); - logger.info("test 2 : validationProgram FALSE -> null, estimated +1" + + log.info("test 2 : validationProgram FALSE -> null, estimated +1" + " and real +1"); transaction = manager.getContext().beginTransaction(); try { @@ -538,7 +538,7 @@ IOException, ImportRefusedException, ParseException { - logger.info("testLoadContactCsv"); + log.info("testLoadContactCsv"); /** PREPARE DATA **/ prepareData(true, true); @@ -581,7 +581,7 @@ /** EXEC METHOD **/ - logger.info("test 1 : load contact by Creator jmichmuche -> no error"); + log.info("test 1 : load contact by Creator jmichmuche -> no error"); ContactInput result = new ContactInput(); TopiaContext transaction = manager.getContext().beginTransaction(); try { @@ -610,34 +610,34 @@ transaction.closeContext(); } - logger.info("test 2 : Error on boat"); + log.info("test 2 : Error on boat"); when(reader.get(BOAT.NAVS_COD.name())).thenReturn("2222"); checkImportError(Contact.BOAT); // Reinit boat when(reader.get(BOAT.NAVS_COD.name())). thenReturn(String.valueOf(boat.getImmatriculation())); - logger.info("test 3 : Error on company"); + log.info("test 3 : Error on company"); when(creator.getCompany()).thenReturn(null); checkImportError(WaoUser.COMPANY); // Reinit creator company when(creator.getCompany()).thenReturn(company); - logger.info("test 4 : Error on observer"); + log.info("test 4 : Error on observer"); when(reader.get(CONTACT.OBSERV_ID.name())).thenReturn("FAKE"); checkImportError(Contact.OBSERVER); // Reinit observer when(reader.get(CONTACT.OBSERV_ID.name())). thenReturn(observer.getLogin()); - logger.info("test 5 : Error on sampleRow"); + log.info("test 5 : Error on sampleRow"); when(reader.get(SAMPLING.PLAN_CODE.name())).thenReturn("FAKE"); checkImportError(Contact.SAMPLE_ROW); // Reinit sampleRow when(reader.get(SAMPLING.PLAN_CODE.name())). thenReturn(sampleRow.getCode()); - logger.info("test 6 : Error on state"); + log.info("test 6 : Error on state"); when(reader.get(CONTACT.CONT_ETAT.name())).thenReturn("FAKE"); checkImportError(Contact.STATE); // Reinit state @@ -652,7 +652,7 @@ result.initialize(transaction, creator, 1); service.loadContactCsv(reader, result, false); } catch (Exception eee) { - logger.error("Error : " + eee.getMessage()); + log.error("Error : " + eee.getMessage()); assertEquals(ImportRefusedException.class, eee.getClass()); ImportRefusedException ex = (ImportRefusedException)eee; assertEquals(field, ex.getField()); @@ -664,7 +664,7 @@ @Test public void testCreateOrUpdateContact() throws TopiaException, NullSampleMonthException { - logger.info("testCreateOrUpdateContact"); + log.info("testCreateOrUpdateContact"); /** PREPARE DATA **/ prepareData(true, true); @@ -675,7 +675,7 @@ /** EXEC METHOD **/ - logger.info("test 1 : Create new contact with state CONTACT_START"); + log.info("test 1 : Create new contact with state CONTACT_START"); TopiaContext transaction = null; String newTopiaId = null; try { @@ -694,7 +694,7 @@ } } - logger.info("test 1 : Check contact existence"); + log.info("test 1 : Check contact existence"); try { transaction = manager.getContext().beginTransaction(); @@ -713,7 +713,7 @@ } } - logger.info("test 2 : Update the contact with state BOARDING_DONE, " + + log.info("test 2 : Update the contact with state BOARDING_DONE, " + "tideBeginDate, tideEndDate and NbObservants"); Date tideBeginDate = DateUtil.createDate(18,3,2010); Date tideEndDate = DateUtil.createDate(19,3,2010); @@ -736,7 +736,7 @@ } } - logger.info("test 2 : Check update contact"); + log.info("test 2 : Check update contact"); try { transaction = manager.getContext().beginTransaction(); @@ -767,7 +767,7 @@ @Test public void testImportContactCsv() throws TopiaException, WaoBusinessException, IOException { - logger.info("testImportContactCsv"); + log.info("testImportContactCsv"); /** PREPARE DATA **/ prepareData(true, true); @@ -777,7 +777,7 @@ when(creator.getLogin()).thenReturn(observer.getLogin()); /** EXEC METHOD **/ - logger.info("test 1 : Import new contact with observer creator"); + log.info("test 1 : Import new contact with observer creator"); InputStream input = getClass().getResourceAsStream("/import/contacts.csv"); try { @@ -789,7 +789,7 @@ input.close(); } - logger.info("test 1 : Check creation of the contact"); + log.info("test 1 : Check creation of the contact"); TopiaContext transaction = null; try { transaction = manager.getContext().beginTransaction(); @@ -807,7 +807,7 @@ } } - logger.info("test 2 : Import new contact with super admin creator"); + log.info("test 2 : Import new contact with super admin creator"); when(creator.getCompany()).thenReturn(company); when(creator.isAdmin()).thenReturn(true); when(creator.getLogin()).thenReturn("admin"); @@ -822,7 +822,7 @@ input.close(); } - logger.info("test 2 : Check update validations of the contact"); + log.info("test 2 : Check update validations of the contact"); try { transaction = manager.getContext().beginTransaction(); Modified: trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceSynthesisImplTest.java =================================================================== --- trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceSynthesisImplTest.java 2010-10-13 11:48:18 UTC (rev 670) +++ trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceSynthesisImplTest.java 2010-10-13 11:48:46 UTC (rev 671) @@ -63,14 +63,14 @@ */ public class ServiceSynthesisImplTest extends AbstractServiceTest { - private static final Logger logger = + private static final Logger log = LoggerFactory.getLogger(ServiceSynthesisImplTest.class); private ServiceSynthesis service; @Before public void initialize() { - logger.info("initialize ServiceSynthesisImplTest"); + log.info("initialize ServiceSynthesisImplTest"); service = manager.getServiceSynthesis(); } @@ -107,7 +107,7 @@ */ @Test public void testGetBoardingBoats() throws Exception { - logger.info("getBoardingBoats"); + log.info("getBoardingBoats"); /** PREPARE DATA **/ InputStream input = getClass().getResourceAsStream("/import/navires.csv"); ServiceBoat serviceBoat = manager.getServiceBoat(); @@ -195,7 +195,7 @@ */ @Test public void testGetNonComplianceBoardingIndicator() throws Exception { - logger.info("getNonComplianceBoardingIndicator"); + log.info("getNonComplianceBoardingIndicator"); /** PREPARE DATA **/ InputStream input = getClass().getResourceAsStream("/import/navires.csv"); ServiceBoat serviceBoat = manager.getServiceBoat(); @@ -302,7 +302,7 @@ */ @Test public void testGetContactStateStatistics() throws Exception { - logger.info("getContactStateStatistics"); + log.info("getContactStateStatistics"); /** PREPARE DATA **/ // InputStream input = getClass().getResourceAsStream("/import/navires.csv"); // ServiceBoat serviceBoat = manager.getServiceBoat(); @@ -465,7 +465,7 @@ */ @Test public void testGetContactDataInputDateReactivity() throws Exception { - logger.info("getContactDataInputDateReactivity"); + log.info("getContactDataInputDateReactivity"); /** PREPARE DATA **/ InputStream input = getClass().getResourceAsStream("/import/navires.csv"); ServiceBoat serviceBoat = manager.getServiceBoat(); Modified: trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceUserImplTest.java =================================================================== --- trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceUserImplTest.java 2010-10-13 11:48:18 UTC (rev 670) +++ trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceUserImplTest.java 2010-10-13 11:48:46 UTC (rev 671) @@ -49,7 +49,7 @@ private static TestManager manager; - private static final Logger logger = + private static final Logger log = LoggerFactory.getLogger(ServiceUserImplTest.class); private ServiceUser service; @@ -130,7 +130,7 @@ */ @Test public void testGetObservers() throws Exception { - logger.info("## START ## getObservers"); + log.info("## START ## getObservers"); Company company = new CompanyImpl(); company.setName("TARTANPION"); @@ -193,7 +193,7 @@ */ @Test public void testCreateDefaultAdmin() throws Exception { - logger.info("## START ## createDefaultAdmin"); + log.info("## START ## createDefaultAdmin"); service.createDefaultAdmin();

1 0

[Suiviobsmer-commits] r670 - trunk/wao-business/src/test/java/fr/ifremer/wao
by tchemit＠users.labs.libre-entreprise.org 13 Oct '10

13 Oct '10

Author: tchemit Date: 2010-10-13 11:48:18 +0000 (Wed, 13 Oct 2010) New Revision: 670 Log: fix tmpdir which is not created + renmae field logger to log Modified: trunk/wao-business/src/test/java/fr/ifremer/wao/AbstractServiceTest.java Modified: trunk/wao-business/src/test/java/fr/ifremer/wao/AbstractServiceTest.java =================================================================== --- trunk/wao-business/src/test/java/fr/ifremer/wao/AbstractServiceTest.java 2010-10-13 11:47:49 UTC (rev 669) +++ trunk/wao-business/src/test/java/fr/ifremer/wao/AbstractServiceTest.java 2010-10-13 11:48:18 UTC (rev 670) @@ -50,6 +50,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import java.io.File; import java.io.InputStream; import java.util.Date; import java.util.List; @@ -63,7 +64,7 @@ */ public abstract class AbstractServiceTest { - private static final Logger logger = + private static final Logger log = LoggerFactory.getLogger(AbstractServiceTest.class); protected static TestManager manager; @@ -80,13 +81,26 @@ @BeforeClass public static void setUpClass() throws Exception { + // Create tmpdir if not exist + String tmpdir = System.getProperty("java.io.tmpdir"); + File file = new File(tmpdir); + if (!file.exists()) { + boolean b = file.mkdirs(); + if (!b) { + if (log.isWarnEnabled()) + log.warn("Could not create tmp directory : " + file); + } + if (log.isInfoEnabled()) { + log.info("tmp dir : " + file + " was created"); + } + } manager = new TestManager(); } @Before public void setUp() throws Exception { - if (logger.isDebugEnabled()) { - logger.debug("Start manager"); + if (log.isDebugEnabled()) { + log.debug("Start manager"); } manager.start(); serviceSampling = (ServiceSamplingImpl)manager.getServiceSampling(); @@ -128,8 +142,8 @@ WaoUser.FIRST_NAME, OBSERVER_DEFAULT_FIRST_NAME, WaoUser.LAST_NAME, OBSERVER_DEFAULT_LAST_NAME, WaoUser.ROLE, UserRole.OBSERVER.ordinal()); - if (logger.isDebugEnabled()) { - logger.debug("Create default observer : " + observer); + if (log.isDebugEnabled()) { + log.debug("Create default observer : " + observer); } transaction.commitTransaction(); @@ -168,8 +182,8 @@ WaoUser.LAST_NAME, null, WaoUser.ROLE, role.ordinal()); - if (logger.isDebugEnabled()) { - logger.debug("Create observer : " + observer); + if (log.isDebugEnabled()) { + log.debug("Create observer : " + observer); } transaction.commitTransaction(); @@ -256,8 +270,8 @@ row = dao.create(); row.setCode(code); row.setCompany(company); - if (logger.isDebugEnabled()) { - logger.debug("Create sampleRow : " + row); + if (log.isDebugEnabled()) { + log.debug("Create sampleRow : " + row); } transaction.commitTransaction(); @@ -308,8 +322,8 @@ boat.setImmatriculation(immatriculation); boat.setName(name); boat.setActive(true); - if (logger.isDebugEnabled()) { - logger.debug("Create boat : " + boat); + if (log.isDebugEnabled()) { + log.debug("Create boat : " + boat); } transaction.commitTransaction(); @@ -387,8 +401,8 @@ contact.setContactState(ContactState.CONTACT_START); contact.setObserver(findDefaultObserver()); contact.setSampleRow(findDefaultSampleRow()); - if (logger.isDebugEnabled()) { - logger.debug("Create contact : " + contact); + if (log.isDebugEnabled()) { + log.debug("Create contact : " + contact); } transaction.commitTransaction();

1 0

[Suiviobsmer-commits] r669 - trunk/wao-ui/src/license
by tchemit＠users.labs.libre-entreprise.org 13 Oct '10

13 Oct '10

Author: tchemit Date: 2010-10-13 11:47:49 +0000 (Wed, 13 Oct 2010) New Revision: 669 Log: fix THIRD-PARTY file Modified: trunk/wao-ui/src/license/THIRD-PARTY.properties Modified: trunk/wao-ui/src/license/THIRD-PARTY.properties =================================================================== --- trunk/wao-ui/src/license/THIRD-PARTY.properties 2010-10-13 11:44:53 UTC (rev 668) +++ trunk/wao-ui/src/license/THIRD-PARTY.properties 2010-10-13 11:47:49 UTC (rev 669) @@ -1,8 +1,8 @@ # Generated by org.nuiton.license.plugin.AddThirdPartyMojo #------------------------------------------------------------------------------- # Already used licenses in project : +# - Affero General Public License (AGPL) # - Apache Software License 2.0 -# - BSD # - BSD License # - BSD license # - BSD style @@ -17,8 +17,6 @@ # - GNU Lesser General Public License version 2.1 # - GNU Library or Lesser General Public License # - GPL, LGPL, MPL -# - General Public License (GPL) v 3.0 -# - Lesser General Public License (LGPL) v 2.1 # - Lesser General Public License (LGPL) v 3.0 # - MIT License # - Public Domain @@ -32,7 +30,7 @@ # Please fill the missing licenses for dependencies : # # -#Sun Jul 11 22:47:24 CEST 2010 +#Mon Oct 11 17:34:56 CEST 2010 antlr--antlr--2.7.6=BSD com.formos.tapestry--tapestry-testify--1.0.2=The Apache Software License, Version 2.0 com.sun.xml.bind--jaxb-impl--2.2=COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 & GNU General Public License (GPL) Version 2 @@ -40,6 +38,7 @@ commons-beanutils--commons-beanutils-core--1.7.0=The Apache Software License, Version 2.0 commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 dom4j--dom4j--1.6.1=BSD +javassist--javassist--3.8.0.GA=Lesser General Public License (LGPL) v 2.1 javassist--javassist--3.9.0.GA=Lesser General Public License (LGPL) v 2.1 javax.transaction--jta--1.1=COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 javax.xml.bind--jaxb-api--2.2=COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 & GNU General Public License (GPL) Version 2

1 0

[Suiviobsmer-commits] r668 - trunk/wao-business/src/test/resources
by tchemit＠users.labs.libre-entreprise.org 13 Oct '10

13 Oct '10

Author: tchemit Date: 2010-10-13 11:44:53 +0000 (Wed, 13 Oct 2010) New Revision: 668 Log: pas de log en debug sur les tests Modified: trunk/wao-business/src/test/resources/log4j.properties Modified: trunk/wao-business/src/test/resources/log4j.properties =================================================================== --- trunk/wao-business/src/test/resources/log4j.properties 2010-10-13 10:22:10 UTC (rev 667) +++ trunk/wao-business/src/test/resources/log4j.properties 2010-10-13 11:44:53 UTC (rev 668) @@ -8,6 +8,6 @@ log4j.appender.A1.layout=org.apache.log4j.PatternLayout log4j.appender.A1.layout.ConversionPattern=%d [%p] %c{2} %m%n -log4j.logger.fr.ifremer.wao=DEBUG +log4j.logger.fr.ifremer.wao=INFO log4j.logger.org.nuiton.util=INFO log4j.logger.org.nuiton.util.beans.BinderProvider=ERROR

1 0

[Suiviobsmer-commits] r667 - in trunk: wao-business/src/main/java/fr/ifremer/wao wao-business/src/main/xmi wao-ui/src/main/java/fr/ifremer/wao/ui/data wao-ui/src/main/java/fr/ifremer/wao/ui/pages
by bleny＠users.labs.libre-entreprise.org 13 Oct '10

13 Oct '10

Author: bleny Date: 2010-10-13 10:22:10 +0000 (Wed, 13 Oct 2010) New Revision: 667 Log: added global synthesis in model + migration code ; moved synthesisId to business Added: trunk/wao-business/src/main/java/fr/ifremer/wao/SynthesisId.java Removed: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/data/SynthesisId.java Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/PostgresMigrationCallback.java trunk/wao-business/src/main/java/fr/ifremer/wao/WaoMigrationCallBack.java trunk/wao-business/src/main/xmi/wao.zargo trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Synthesis.java Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/PostgresMigrationCallback.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/PostgresMigrationCallback.java 2010-10-08 23:52:14 UTC (rev 666) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/PostgresMigrationCallback.java 2010-10-13 10:22:10 UTC (rev 667) @@ -38,6 +38,7 @@ import java.util.List; import java.util.Map; import java.util.Set; +import java.util.logging.Logger; /** * PgMigrationCallback @@ -47,7 +48,9 @@ * @author fdesbois <fdesbois at codelutin.com> */ public class PostgresMigrationCallback extends WaoMigrationCallBack { + private static final Logger logger = Logger.getLogger(PostgresMigrationCallback.class.getName()); + @Override protected void createUserRoleColumn_1_1a(List<String> queries) { // Evo #2063 @@ -267,4 +270,152 @@ queries.add("UPDATE Contact SET emailSent = FALSE WHERE dataInputDate IS NULL;"); queries.add("UPDATE Contact SET emailSent = TRUE WHERE dataInputDate IS NOT NULL;"); } + + @Override + protected void createTablesForIndicatorsAdministration_1_6(List<String> queries) { + // Evo #386 create Tables for Indicator IndicatorLevel and IndicatorLog + // entities + + queries.add("CREATE TABLE Indicator (" + + "topiaId CHARACTER VARYING(255) PRIMARY KEY," + + "topiaVersion BIGINT NOT NULL," + + "topiaCreateDate TIMESTAMP WITHOUT TIME ZONE NOT NULL," + + "indicatorId SMALLINT," + + "coefficient DOUBLE PRECISION);"); + + queries.add("CREATE TABLE IndicatorLevel (" + + "topiaId CHARACTER VARYING(255) PRIMARY KEY," + + "topiaVersion BIGINT NOT NULL," + + "topiaCreateDate TIMESTAMP WITHOUT TIME ZONE NOT NULL," + + "\"level\" SMALLINT," + + "upperBound DOUBLE PRECISION," + + "indicator CHARACTER VARYING(255)," + + "CONSTRAINT indicator_fkey FOREIGN KEY (indicator) " + + "REFERENCES Indicator (topiaid) MATCH SIMPLE " + + "ON UPDATE NO ACTION ON DELETE NO ACTION);"); + + // create table IndicatorLog with author FK + queries.add("CREATE TABLE IndicatorLog (" + + "topiaId CHARACTER VARYING(255) PRIMARY KEY," + + "topiaVersion BIGINT NOT NULL," + + "topiaCreateDate TIMESTAMP WITHOUT TIME ZONE NOT NULL," + + "logText TEXT," + + "\"comment\" TEXT," + + "indicator CHARACTER VARYING(255)," + + "author CHARACTER VARYING(255)," + + "CONSTRAINT author_fkey FOREIGN KEY (author) " + + "REFERENCES WaoUser (topiaid) MATCH SIMPLE " + + "ON UPDATE NO ACTION ON DELETE NO ACTION, " + + "CONSTRAINT indicator_fkey FOREIGN KEY (indicator) " + + "REFERENCES Indicator (topiaid) MATCH SIMPLE " + + "ON UPDATE NO ACTION ON DELETE NO ACTION);"); + + + + } + + @Override + protected void insertIndicatorLevelInitialValues_1_6(List<String> queries) { + + // first, fill Indicator relation + + int topiaVersion = 0; + String topiaCreateDateValue = "DATE '2010-10-12'"; + + String topiaIndicatorIdPrefix = "fr.ifremer.wao.entities.Indicator#1286887802000#1547308662"; + + String insertIntoIndicator = "INSERT INTO Indicator (topiaId, topiaVersion, topiaCreateDate, indicatorId, coefficient) " + + "VALUES ('%s', %s, %s, %s, %s);"; + + SynthesisId[] synthesisIds = { SynthesisId.GRAPH_SAMPLING, + SynthesisId.IND_COMPLIANCE_BOARDING, + SynthesisId.GRAPH_BOARDING, + SynthesisId.IND_ALLEGRO_REACTIVITY, + SynthesisId.IND_SAMPLE_RELIABILITY }; + + double coefficientValue = 1.0; + + Map <SynthesisId, String> indicatorsTopiaIds = new HashMap<SynthesisId, String>(); + + for (SynthesisId synthesisId : synthesisIds) { + String topiaId = topiaIndicatorIdPrefix + synthesisId.ordinal(); + indicatorsTopiaIds.put(synthesisId, topiaId); + queries.add(String.format(insertIntoIndicator, topiaId, + topiaVersion, + topiaCreateDateValue, + synthesisId.ordinal(), + coefficientValue)); + } + + + String topiaIndicatorLevelIdPrefix = "fr.ifremer.wao.entities.IndicatorLevel#1286890064000#1929220062_"; + int topiaIdSuffix = 0; + + // now filling IndicatorLevel + String indicatorTopiaId; + + indicatorTopiaId = indicatorsTopiaIds.get(SynthesisId.GRAPH_SAMPLING); + queries.add(getInsertIndicatorLevelQuery_1_6(topiaIndicatorLevelIdPrefix + topiaIdSuffix++, 1, 60.0, indicatorTopiaId)); + queries.add(getInsertIndicatorLevelQuery_1_6(topiaIndicatorLevelIdPrefix + topiaIdSuffix++, 2, 70.0, indicatorTopiaId)); + queries.add(getInsertIndicatorLevelQuery_1_6(topiaIndicatorLevelIdPrefix + topiaIdSuffix++, 3, 80.0, indicatorTopiaId)); + queries.add(getInsertIndicatorLevelQuery_1_6(topiaIndicatorLevelIdPrefix + topiaIdSuffix++, 4, 90.0, indicatorTopiaId)); + queries.add(getInsertIndicatorLevelQuery_1_6(topiaIndicatorLevelIdPrefix + topiaIdSuffix++, 5, 100.0, indicatorTopiaId)); + + indicatorTopiaId = indicatorsTopiaIds.get(SynthesisId.IND_COMPLIANCE_BOARDING); + queries.add(getInsertIndicatorLevelQuery_1_6(topiaIndicatorLevelIdPrefix + topiaIdSuffix++, 1, 60.0, indicatorTopiaId)); + queries.add(getInsertIndicatorLevelQuery_1_6(topiaIndicatorLevelIdPrefix + topiaIdSuffix++, 2, 70.0, indicatorTopiaId)); + queries.add(getInsertIndicatorLevelQuery_1_6(topiaIndicatorLevelIdPrefix + topiaIdSuffix++, 3, 80.0, indicatorTopiaId)); + queries.add(getInsertIndicatorLevelQuery_1_6(topiaIndicatorLevelIdPrefix + topiaIdSuffix++, 4, 90.0, indicatorTopiaId)); + queries.add(getInsertIndicatorLevelQuery_1_6(topiaIndicatorLevelIdPrefix + topiaIdSuffix++, 5, 100.0, indicatorTopiaId)); + + indicatorTopiaId = indicatorsTopiaIds.get(SynthesisId.GRAPH_BOARDING); + queries.add(getInsertIndicatorLevelQuery_1_6(topiaIndicatorLevelIdPrefix + topiaIdSuffix++, 1, 60.0, indicatorTopiaId)); + queries.add(getInsertIndicatorLevelQuery_1_6(topiaIndicatorLevelIdPrefix + topiaIdSuffix++, 2, 70.0, indicatorTopiaId)); + queries.add(getInsertIndicatorLevelQuery_1_6(topiaIndicatorLevelIdPrefix + topiaIdSuffix++, 3, 80.0, indicatorTopiaId)); + queries.add(getInsertIndicatorLevelQuery_1_6(topiaIndicatorLevelIdPrefix + topiaIdSuffix++, 4, 90.0, indicatorTopiaId)); + queries.add(getInsertIndicatorLevelQuery_1_6(topiaIndicatorLevelIdPrefix + topiaIdSuffix++, 5, 100.0, indicatorTopiaId)); + + indicatorTopiaId = indicatorsTopiaIds.get(SynthesisId.IND_ALLEGRO_REACTIVITY); + queries.add(getInsertIndicatorLevelQuery_1_6(topiaIndicatorLevelIdPrefix + topiaIdSuffix++, 1, 40.0, indicatorTopiaId)); // 40 days + queries.add(getInsertIndicatorLevelQuery_1_6(topiaIndicatorLevelIdPrefix + topiaIdSuffix++, 2, 30.0, indicatorTopiaId)); + queries.add(getInsertIndicatorLevelQuery_1_6(topiaIndicatorLevelIdPrefix + topiaIdSuffix++, 3, 20.0, indicatorTopiaId)); + queries.add(getInsertIndicatorLevelQuery_1_6(topiaIndicatorLevelIdPrefix + topiaIdSuffix++, 4, 10.0, indicatorTopiaId)); + queries.add(getInsertIndicatorLevelQuery_1_6(topiaIndicatorLevelIdPrefix + topiaIdSuffix++, 5, 5.0, indicatorTopiaId)); // 5 days + + indicatorTopiaId = indicatorsTopiaIds.get(SynthesisId.IND_SAMPLE_RELIABILITY); + queries.add(getInsertIndicatorLevelQuery_1_6(topiaIndicatorLevelIdPrefix + topiaIdSuffix++, 1, 80.0, indicatorTopiaId)); + queries.add(getInsertIndicatorLevelQuery_1_6(topiaIndicatorLevelIdPrefix + topiaIdSuffix++, 2, 85.0, indicatorTopiaId)); + queries.add(getInsertIndicatorLevelQuery_1_6(topiaIndicatorLevelIdPrefix + topiaIdSuffix++, 3, 90.0, indicatorTopiaId)); + queries.add(getInsertIndicatorLevelQuery_1_6(topiaIndicatorLevelIdPrefix + topiaIdSuffix++, 4, 95.0, indicatorTopiaId)); + queries.add(getInsertIndicatorLevelQuery_1_6(topiaIndicatorLevelIdPrefix + topiaIdSuffix++, 5, 100.0, indicatorTopiaId)); + + } + + /** + * help method to create insertion for initial data in table levels + * @param indicatorTopiaId the topiaId of the concerned indicator (foreign key) + * @param level value in the tuple + * @param upperBound value in the tuble + * @return an SQL "insert" request for table IndicatorLevel + */ + protected String getInsertIndicatorLevelQuery_1_6(String topiaId, + int level, double upperBound, + String indicatorTopiaId) { + + int topiaVersion = 0; + String topiaCreateDateValue = "DATE '2010-10-12'"; + + String insertIntoIndicatorLevel = + "INSERT INTO IndicatorLevel (topiaId, topiaVersion, topiaCreateDate, level, upperBound, indicator) " + + "VALUES ('%s', %s, %s, %s, %s, '%s');"; + + String request = String.format(insertIntoIndicatorLevel, + topiaId, + topiaVersion, + topiaCreateDateValue, + level, + upperBound, + indicatorTopiaId); + return request; + } } Copied: trunk/wao-business/src/main/java/fr/ifremer/wao/SynthesisId.java (from rev 666, trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/data/SynthesisId.java) =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/SynthesisId.java (rev 0) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/SynthesisId.java 2010-10-13 10:22:10 UTC (rev 667) @@ -0,0 +1,74 @@ +/* + * #%L + * Wao :: Web Interface + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2010 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ +package fr.ifremer.wao; + +/** + * SynthesisID + * + * Created: 9 févr. 2010 + * + * @author fdesbois <fdesbois at codelutin.com> + */ +public enum SynthesisId { + + /** */ + GRAPH_SAMPLING("graph1"), + + /** */ + GRAPH_BOARDING("graph2"), + + /** */ + IND_NON_COMPLIANCE_BOARDING("ind1"), + + /** */ + IND_CONTACT_STATE("ind2"), + + /** */ + IND_ALLEGRO_REACTIVITY("ind3"), + + /** */ + IND_COMPLIANCE_BOARDING("ind4"), + + /** */ + IND_SAMPLE_RELIABILITY("ind5"); + + private String blockId; + + SynthesisId(String blockId) { + this.blockId = blockId; + } + + public String getBlockId() { + return blockId; + } + + public static SynthesisId getSynthesisId(String blockId) { + for (SynthesisId synthesisId : SynthesisId.values()) { + if (synthesisId.getBlockId().equals(blockId)) { + return synthesisId; + } + } + return null; + } +} Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/WaoMigrationCallBack.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/WaoMigrationCallBack.java 2010-10-08 23:52:14 UTC (rev 666) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/WaoMigrationCallBack.java 2010-10-13 10:22:10 UTC (rev 667) @@ -78,13 +78,18 @@ protected abstract void createContactEmailSentColumn_1_5e(List<String> queries); + protected abstract void createTablesForIndicatorsAdministration_1_6(List<String> queries); + + protected abstract void insertIndicatorLevelInitialValues_1_6(List<String> queries); + protected static final Version[] VERSIONS = new Version[] { VersionUtil.valueOf("1.0"), VersionUtil.valueOf("1.1"), VersionUtil.valueOf("1.2"), VersionUtil.valueOf("1.3"), VersionUtil.valueOf("1.4"), - VersionUtil.valueOf("1.5") + VersionUtil.valueOf("1.5"), + VersionUtil.valueOf("1.6") }; @Override @@ -217,4 +222,28 @@ executeSQL(tx, showSql, showProgression, strings); } + /** creates Indicator, IndicatorLevel, IndicatorLog tables and inserts + * initial values. + */ + public void migrateTo_1_6(TopiaContextImplementor tx, + boolean showSql, + boolean showProgression) throws TopiaException { + if (log.isInfoEnabled()) { + log.info("migrating to version 1.6"); + } + + List<String> queries = new ArrayList<String>(); + + createTablesForIndicatorsAdministration_1_6(queries); + + insertIndicatorLevelInitialValues_1_6(queries); + + if (log.isDebugEnabled()) { + log.debug("queries for migration to version 1.6 are \n" + queries); + } + + String[] strings = queries.toArray(new String[queries.size()]); + executeSQL(tx, true, true, strings); + } + } Modified: trunk/wao-business/src/main/xmi/wao.zargo =================================================================== (Binary files differ) Deleted: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/data/SynthesisId.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/data/SynthesisId.java 2010-10-08 23:52:14 UTC (rev 666) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/data/SynthesisId.java 2010-10-13 10:22:10 UTC (rev 667) @@ -1,64 +0,0 @@ -/* - * #%L - * Wao :: Web Interface - * - * $Id$ - * $HeadURL$ - * %% - * Copyright (C) 2009 - 2010 Ifremer - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - * #L% - */ -package fr.ifremer.wao.ui.data; - -/** - * SynthesisID - * - * Created: 9 févr. 2010 - * - * @author fdesbois <fdesbois at codelutin.com> - */ -public enum SynthesisId { - - GRAPH_SAMPLING("graph1"), - GRAPH_BOARDING("graph2"), - IND_NON_COMPLIANCE_BOARDING("ind1"), - IND_CONTACT_STATE("ind2"), - IND_ALLEGRO_REACTIVITY("ind3"); - private String blockId; - - SynthesisId(String blockId) { - this.blockId = blockId; - } - - public String getBlockId() { - return blockId; - } - - public static SynthesisId getSynthesisID(String blockId) { - if (blockId.equals(GRAPH_SAMPLING.getBlockId())) { - return GRAPH_SAMPLING; - } else if (blockId.equals(GRAPH_BOARDING.getBlockId())) { - return GRAPH_BOARDING; - } else if (blockId.equals(IND_CONTACT_STATE.getBlockId())) { - return IND_CONTACT_STATE; - } else if (blockId.equals(IND_NON_COMPLIANCE_BOARDING.getBlockId())) { - return IND_NON_COMPLIANCE_BOARDING; - } else if (blockId.equals(IND_ALLEGRO_REACTIVITY.getBlockId())) { - return IND_ALLEGRO_REACTIVITY; - } - return null; - } -} Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Synthesis.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Synthesis.java 2010-10-08 23:52:14 UTC (rev 666) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Synthesis.java 2010-10-13 10:22:10 UTC (rev 667) @@ -24,6 +24,7 @@ package fr.ifremer.wao.ui.pages; +import fr.ifremer.wao.SynthesisId; import fr.ifremer.wao.WaoException; import fr.ifremer.wao.bean.BoardingResult; import fr.ifremer.wao.bean.ConnectedUser; @@ -39,7 +40,7 @@ import fr.ifremer.wao.ui.data.ChartUtils; import fr.ifremer.wao.ui.data.ChartUtils.ChartType; import fr.ifremer.wao.ui.data.RequiresAuthentication; -import fr.ifremer.wao.ui.data.SynthesisId; +import fr.ifremer.wao.SynthesisId; import fr.ifremer.wao.ui.services.WaoManager; import org.apache.commons.collections.CollectionUtils; import org.apache.tapestry5.Block; @@ -56,7 +57,6 @@ import org.nuiton.util.DateUtil; import org.nuiton.util.PeriodDates; import org.slf4j.Logger; - import java.text.DateFormat; import java.text.NumberFormat; import java.text.SimpleDateFormat;

1 0

[Suiviobsmer-commits] r666 - trunk
by tchemit＠users.labs.libre-entreprise.org 08 Oct '10

08 Oct '10

Author: tchemit Date: 2010-10-08 23:52:14 +0000 (Fri, 08 Oct 2010) New Revision: 666 Log: Update mavenpom4labs to 2.3.1. Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-10-07 00:16:37 UTC (rev 665) +++ trunk/pom.xml 2010-10-08 23:52:14 UTC (rev 666) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4labs</artifactId> - <version>2.3</version> + <version>2.3.1</version> </parent> <groupId>fr.ifremer</groupId>

1 0

[Suiviobsmer-commits] r665 - in tags/wao-1.5.3: . src/announcement
by tchemit＠users.labs.libre-entreprise.org 07 Oct '10

07 Oct '10

Author: tchemit Date: 2010-10-07 00:16:37 +0000 (Thu, 07 Oct 2010) New Revision: 665 Log: fix mavenpom4labs version in release notes Modified: tags/wao-1.5.3/changelog.txt tags/wao-1.5.3/src/announcement/release-email-1.5.3.txt Modified: tags/wao-1.5.3/changelog.txt =================================================================== --- tags/wao-1.5.3/changelog.txt 2010-10-07 00:12:09 UTC (rev 664) +++ tags/wao-1.5.3/changelog.txt 2010-10-07 00:16:37 UTC (rev 665) @@ -26,7 +26,7 @@ - **Nuiton-utils** 1.3.1 -> 1.4.2 [http://maven-site.nuiton.org/nuiton-utils] - **ToPIA** 2.4.2 -> 2.4.3 [http://maven-site.nuiton.org/topia/topia-persistence] - **EUGene** 2.1.1 -> 2.2 [http://maven-site.nuiton.org/eugene] -- **mavenpom4labs** 2.2.3 -> 2.2.6 [http://maven-site.nuiton.org/mavenpom/mavenpom4labs] +- **mavenpom4labs** 2.2.3 -> 2.3 [http://maven-site.nuiton.org/mavenpom/mavenpom4labs] 1.5.2 ----- Modified: tags/wao-1.5.3/src/announcement/release-email-1.5.3.txt =================================================================== --- tags/wao-1.5.3/src/announcement/release-email-1.5.3.txt 2010-10-07 00:12:09 UTC (rev 664) +++ tags/wao-1.5.3/src/announcement/release-email-1.5.3.txt 2010-10-07 00:16:37 UTC (rev 665) @@ -18,7 +18,7 @@ - Nuiton-utils 1.3.1 -> 1.4.2 [http://maven-site.nuiton.org/nuiton-utils] - ToPIA 2.4.2 -> 2.4.3 [http://maven-site.nuiton.org/topia/topia-persistence] - EUGene 2.1.1 -> 2.2 [http://maven-site.nuiton.org/eugene] -- mavenpom4labs 2.2.3 -> 2.2.6 [http://maven-site.nuiton.org/mavenpom/mavenpom4labs] +- mavenpom4labs 2.2.3 -> 2.3 [http://maven-site.nuiton.org/mavenpom/mavenpom4labs] Documentation :

1 0

[Suiviobsmer-commits] r664 - in trunk: . src/announcement
by tchemit＠users.labs.libre-entreprise.org 07 Oct '10

07 Oct '10

Author: tchemit Date: 2010-10-07 00:12:09 +0000 (Thu, 07 Oct 2010) New Revision: 664 Log: fix mavenpom4labs version in release notes Modified: trunk/changelog.txt trunk/src/announcement/release-email-1.5.3.txt Modified: trunk/changelog.txt =================================================================== --- trunk/changelog.txt 2010-10-06 23:57:41 UTC (rev 663) +++ trunk/changelog.txt 2010-10-07 00:12:09 UTC (rev 664) @@ -26,7 +26,7 @@ - **Nuiton-utils** 1.3.1 -> 1.4.2 [http://maven-site.nuiton.org/nuiton-utils] - **ToPIA** 2.4.2 -> 2.4.3 [http://maven-site.nuiton.org/topia/topia-persistence] - **EUGene** 2.1.1 -> 2.2 [http://maven-site.nuiton.org/eugene] -- **mavenpom4labs** 2.2.3 -> 2.2.6 [http://maven-site.nuiton.org/mavenpom/mavenpom4labs] +- **mavenpom4labs** 2.2.3 -> 2.3 [http://maven-site.nuiton.org/mavenpom/mavenpom4labs] 1.5.2 ----- Modified: trunk/src/announcement/release-email-1.5.3.txt =================================================================== --- trunk/src/announcement/release-email-1.5.3.txt 2010-10-06 23:57:41 UTC (rev 663) +++ trunk/src/announcement/release-email-1.5.3.txt 2010-10-07 00:12:09 UTC (rev 664) @@ -18,7 +18,7 @@ - Nuiton-utils 1.3.1 -> 1.4.2 [http://maven-site.nuiton.org/nuiton-utils] - ToPIA 2.4.2 -> 2.4.3 [http://maven-site.nuiton.org/topia/topia-persistence] - EUGene 2.1.1 -> 2.2 [http://maven-site.nuiton.org/eugene] -- mavenpom4labs 2.2.3 -> 2.2.6 [http://maven-site.nuiton.org/mavenpom/mavenpom4labs] +- mavenpom4labs 2.2.3 -> 2.3 [http://maven-site.nuiton.org/mavenpom/mavenpom4labs] Documentation :

1 0