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

[Suiviobsmer-commits] r1043 - trunk/wao-business/src/main/java/fr/ifremer/wao/service
by bleny＠users.labs.libre-entreprise.org 23 Feb '11

23 Feb '11

Author: bleny Date: 2011-02-23 15:54:22 +0000 (Wed, 23 Feb 2011) New Revision: 1043 Log: bugfix in terrestrial import ; region useless Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceReferentialImpl.java Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceReferentialImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceReferentialImpl.java 2011-02-23 12:21:19 UTC (rev 1042) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceReferentialImpl.java 2011-02-23 15:54:22 UTC (rev 1043) @@ -278,7 +278,6 @@ @Override protected void executeImportTerrestrialLocations(TopiaContext transaction, InputStream input) throws Exception { - TerrestrialLocationDAO dao = WaoDAOHelper.getTerrestrialLocationDAO(transaction); // first, we will read the CSV file, line by line @@ -302,9 +301,9 @@ TerrestrialLocation location = locationIterator.next(); // look if already exists and update existing or add new - TerrestrialLocation existingLocation = dao.findByProperties(TerrestrialLocation.PROPERTY_CODE, location.getCode(), - TerrestrialLocation.PROPERTY_NAME, location.getName(), - TerrestrialLocation.PROPERTY_LOCATION_TYPE_ORDINAL, location.getLocationTypeOrdinal()); + TerrestrialLocation existingLocation = dao.findByProperties( + TerrestrialLocation.PROPERTY_CODE, location.getCode(), + TerrestrialLocation.PROPERTY_LOCATION_TYPE_ORDINAL, location.getLocationTypeOrdinal()); if (existingLocation == null) { dao.create(location); locationAdded += 1; @@ -338,7 +337,7 @@ BinderFactory.newBinder(TerrestrialLocation.class); // counts for logging int districtAdded = 0, districtUpdated = 0; - int regionAdded = 0, regionUpdated = 0; +// int regionAdded = 0, regionUpdated = 0; for (String districtCode : districtCodes) { // for each district code found @@ -385,39 +384,39 @@ districtUpdated += 1; } - // creating a region object for this district - TerrestrialLocation region = dao.newInstance(); - locationBinder.copyExcluding(district, region, TerrestrialLocation.TOPIA_ID, - TerrestrialLocation.TOPIA_CREATE_DATE, TerrestrialLocation.TOPIA_VERSION, - TerrestrialLocation.PROPERTY_DEPARTMENT_CODE, TerrestrialLocation.PROPERTY_DEPARTMENT_NAME, - TerrestrialLocation.PROPERTY_SUB_REGION_IFREMER_CODE, TerrestrialLocation.PROPERTY_SUB_REGION_IFREMER_NAME); - - // prevent to deal with case "Hors France" - if (region.getRegionIfremerCode() != null) { - - // try to find it if it's already in DB - TerrestrialLocation existingRegion = dao.findByProperties( - TerrestrialLocation.PROPERTY_REGION_IFREMER_CODE, region.getRegionIfremerCode(), - TerrestrialLocation.PROPERTY_DISTRICT_CODE, null, - TerrestrialLocation.PROPERTY_LOCATION_TYPE_ORDINAL, null); - - // create or update - if (existingRegion == null) { - dao.create(region); - regionAdded += 1; - } else { - locationBinder.copyExcluding(region, existingRegion, TerrestrialLocation.TOPIA_ID, - TerrestrialLocation.TOPIA_CREATE_DATE, TerrestrialLocation.TOPIA_VERSION); - dao.update(existingRegion); - regionUpdated += 1; - } - } +// // creating a region object for this district +// TerrestrialLocation region = dao.newInstance(); +// locationBinder.copyExcluding(district, region, TerrestrialLocation.TOPIA_ID, +// TerrestrialLocation.TOPIA_CREATE_DATE, TerrestrialLocation.TOPIA_VERSION, +// TerrestrialLocation.PROPERTY_DEPARTMENT_CODE, TerrestrialLocation.PROPERTY_DEPARTMENT_NAME, +// TerrestrialLocation.PROPERTY_SUB_REGION_IFREMER_CODE, TerrestrialLocation.PROPERTY_SUB_REGION_IFREMER_NAME); +// +// // prevent to deal with case "Hors France" +// if (region.getRegionIfremerCode() != null) { +// +// // try to find it if it's already in DB +// TerrestrialLocation existingRegion = dao.findByProperties( +// TerrestrialLocation.PROPERTY_REGION_IFREMER_CODE, region.getRegionIfremerCode(), +// TerrestrialLocation.PROPERTY_DISTRICT_CODE, null, +// TerrestrialLocation.PROPERTY_LOCATION_TYPE_ORDINAL, null); +// +// // create or update +// if (existingRegion == null) { +// dao.create(region); +// regionAdded += 1; +// } else { +// locationBinder.copyExcluding(region, existingRegion, TerrestrialLocation.TOPIA_ID, +// TerrestrialLocation.TOPIA_CREATE_DATE, TerrestrialLocation.TOPIA_VERSION); +// dao.update(existingRegion); +// regionUpdated += 1; +// } +// } } if (log.isInfoEnabled()) { log.info(locationAdded + " terrestrial locations added, " + locationUpdated + " updated"); log.info(districtAdded + " terrestrial district added, " + districtUpdated + " updated"); - log.info(regionAdded + " terrestrial region added, " + regionUpdated + " updated"); +// log.info(regionAdded + " terrestrial region added, " + regionUpdated + " updated"); } transaction.commitTransaction();

1 0

[Suiviobsmer-commits] r1042 - in trunk/wao-business/src/main: java/fr/ifremer/wao/entity java/fr/ifremer/wao/service xmi
by bleny＠users.labs.libre-entreprise.org 23 Feb '11

23 Feb '11

Author: bleny Date: 2011-02-23 12:21:19 +0000 (Wed, 23 Feb 2011) New Revision: 1042 Log: switch model version to 3.0, add region import in terrestrial location management Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/entity/TerrestrialLocationImpl.java trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceReferentialImpl.java trunk/wao-business/src/main/xmi/wao.zargo Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/entity/TerrestrialLocationImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/entity/TerrestrialLocationImpl.java 2011-02-21 14:16:19 UTC (rev 1041) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/entity/TerrestrialLocationImpl.java 2011-02-23 12:21:19 UTC (rev 1042) @@ -50,11 +50,20 @@ return districtName; } + @Override public boolean isDistrict() { - boolean isDistrict = getLocationType() == null; + boolean isDistrict = getLocationType() == null + && getDistrictCode() != null; return isDistrict; } + @Override + public boolean isRegion() { + boolean isRegion = getLocationType() == null + && getDistrictCode() == null; + return isRegion; + } + /** Get a description of the location like « Maracaibo (Port, Venezuela) » * */ Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceReferentialImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceReferentialImpl.java 2011-02-21 14:16:19 UTC (rev 1041) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceReferentialImpl.java 2011-02-23 12:21:19 UTC (rev 1042) @@ -316,10 +316,6 @@ } } - if (log.isInfoEnabled()) { - log.info(locationAdded + " terrestrial locations added, " + locationUpdated + " updated"); - } - // now, all the CSV file has been read and dumped into database, // Now, we need to update database by adding any missing district // Each location has a district (identified by a district code) @@ -342,6 +338,7 @@ BinderFactory.newBinder(TerrestrialLocation.class); // counts for logging int districtAdded = 0, districtUpdated = 0; + int regionAdded = 0, regionUpdated = 0; for (String districtCode : districtCodes) { // for each district code found @@ -379,7 +376,7 @@ TerrestrialLocation existingDistrict = dao.findByProperties(TerrestrialLocation.PROPERTY_DISTRICT_CODE, district.getDistrictCode(), TerrestrialLocation.PROPERTY_LOCATION_TYPE_ORDINAL, null); if (existingDistrict == null) { - dao.create(district); + existingDistrict = dao.create(district); districtAdded += 1; } else { locationBinder.copyExcluding(district, existingDistrict, TerrestrialLocation.TOPIA_ID, @@ -387,14 +384,43 @@ dao.update(existingDistrict); districtUpdated += 1; } + + // creating a region object for this district + TerrestrialLocation region = dao.newInstance(); + locationBinder.copyExcluding(district, region, TerrestrialLocation.TOPIA_ID, + TerrestrialLocation.TOPIA_CREATE_DATE, TerrestrialLocation.TOPIA_VERSION, + TerrestrialLocation.PROPERTY_DEPARTMENT_CODE, TerrestrialLocation.PROPERTY_DEPARTMENT_NAME, + TerrestrialLocation.PROPERTY_SUB_REGION_IFREMER_CODE, TerrestrialLocation.PROPERTY_SUB_REGION_IFREMER_NAME); + + // prevent to deal with case "Hors France" + if (region.getRegionIfremerCode() != null) { + + // try to find it if it's already in DB + TerrestrialLocation existingRegion = dao.findByProperties( + TerrestrialLocation.PROPERTY_REGION_IFREMER_CODE, region.getRegionIfremerCode(), + TerrestrialLocation.PROPERTY_DISTRICT_CODE, null, + TerrestrialLocation.PROPERTY_LOCATION_TYPE_ORDINAL, null); + + // create or update + if (existingRegion == null) { + dao.create(region); + regionAdded += 1; + } else { + locationBinder.copyExcluding(region, existingRegion, TerrestrialLocation.TOPIA_ID, + TerrestrialLocation.TOPIA_CREATE_DATE, TerrestrialLocation.TOPIA_VERSION); + dao.update(existingRegion); + regionUpdated += 1; + } + } } if (log.isInfoEnabled()) { + log.info(locationAdded + " terrestrial locations added, " + locationUpdated + " updated"); log.info(districtAdded + " terrestrial district added, " + districtUpdated + " updated"); + log.info(regionAdded + " terrestrial region added, " + regionUpdated + " updated"); } transaction.commitTransaction(); - } @Override Modified: trunk/wao-business/src/main/xmi/wao.zargo =================================================================== (Binary files differ)

1 0

[Suiviobsmer-commits] r1041 - in trunk/wao-ui/src/main: java/fr/ifremer/wao/ui/services resources/fr/ifremer/wao/ui/pages
by bleny＠users.labs.libre-entreprise.org 21 Feb '11

21 Feb '11

Author: bleny Date: 2011-02-21 14:16:19 +0000 (Mon, 21 Feb 2011) New Revision: 1041 Log: missing headers :-( Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/services/KmlLoaderStrategyContactsStatesMotifs.java trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/pages/Boats_en.properties trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/pages/Contacts_en.properties Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/services/KmlLoaderStrategyContactsStatesMotifs.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/services/KmlLoaderStrategyContactsStatesMotifs.java 2011-02-21 13:43:34 UTC (rev 1040) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/services/KmlLoaderStrategyContactsStatesMotifs.java 2011-02-21 14:16:19 UTC (rev 1041) @@ -1,3 +1,26 @@ +/* + * #%L + * Wao :: Web Interface + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2011 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.services; import fr.ifremer.wao.bean.ContactFilter; Modified: trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/pages/Boats_en.properties =================================================================== --- trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/pages/Boats_en.properties 2011-02-21 13:43:34 UTC (rev 1040) +++ trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/pages/Boats_en.properties 2011-02-21 14:16:19 UTC (rev 1041) @@ -1,3 +1,26 @@ +### +# #%L +# Wao :: Web Interface +# +# $Id$ +# $HeadURL$ +# %% +# Copyright (C) 2009 - 2011 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% +### name-label: Name immatriculation-label: # districtCode-label: District Modified: trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/pages/Contacts_en.properties =================================================================== --- trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/pages/Contacts_en.properties 2011-02-21 13:43:34 UTC (rev 1040) +++ trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/pages/Contacts_en.properties 2011-02-21 14:16:19 UTC (rev 1041) @@ -1 +1,24 @@ +### +# #%L +# Wao :: Web Interface +# +# $Id$ +# $HeadURL$ +# %% +# Copyright (C) 2009 - 2011 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% +### topiaCreateDate-label: Creation \ No newline at end of file

1 0

[Suiviobsmer-commits] r1040 - in trunk: . wao-business wao-ui
by bleny＠users.labs.libre-entreprise.org 21 Feb '11

21 Feb '11

Author: bleny Date: 2011-02-21 13:43:34 +0000 (Mon, 21 Feb 2011) New Revision: 1040 Log: [maven-release-plugin] prepare for next development iteration Modified: trunk/pom.xml trunk/wao-business/pom.xml trunk/wao-ui/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-02-21 13:43:31 UTC (rev 1039) +++ trunk/pom.xml 2011-02-21 13:43:34 UTC (rev 1040) @@ -15,7 +15,7 @@ <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>2.1</version> + <version>3.0-SNAPSHOT</version> <modules> <module>wao-ui</module> @@ -329,12 +329,12 @@ <scm> <connection> - scm:svn:svn://anonymous at labs.libre-entreprise.org/svnroot/suiviobsmer/tags/wao-2.1 + scm:svn:svn://anonymous at labs.libre-entreprise.org/svnroot/suiviobsmer/trunk </connection> <developerConnection> - scm:svn:svn+ssh://${user.name}@labs.libre-entreprise.org/svnroot/suiviobsmer/tags/wao-2.1 + scm:svn:svn+ssh://bleny at labs.libre-entreprise.org/svnroot/suiviobsmer/trunk </developerConnection> - <url>http://labs.libre-entreprise.org/scm/viewvc.php/tags/wao-2.1?root=suiviobsm… + <url>http://labs.libre-entreprise.org/scm/viewvc.php/trunk/?root=suiviobsmer </url> </scm> Modified: trunk/wao-business/pom.xml =================================================================== --- trunk/wao-business/pom.xml 2011-02-21 13:43:31 UTC (rev 1039) +++ trunk/wao-business/pom.xml 2011-02-21 13:43:34 UTC (rev 1040) @@ -10,7 +10,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>2.1</version> + <version>3.0-SNAPSHOT</version> </parent> <groupId>fr.ifremer.wao</groupId> @@ -230,13 +230,13 @@ <scm> <url> - http://labs.libre-entreprise.org/scm/viewvc.php/tags/wao-2.1/?root=suiviobs… + http://labs.libre-entreprise.org/scm/viewvc.php/trunk/wao-business/?root=su… </url> <connection> - scm:svn:svn://anonymous at labs.libre-entreprise.org/svnroot/suiviobsmer/tags/wao-2.1/wao-business + scm:svn:svn://anonymous at labs.libre-entreprise.org/svnroot/suiviobsmer/trunk/wao-business </connection> <developerConnection> - scm:svn:svn+ssh://${user.name}@labs.libre-entreprise.org/svnroot/suiviobsmer/tags/wao-2.1/wao-business + scm:svn:svn+ssh://bleny at labs.libre-entreprise.org/svnroot/suiviobsmer/trunk/wao-business </developerConnection> </scm> </project> Modified: trunk/wao-ui/pom.xml =================================================================== --- trunk/wao-ui/pom.xml 2011-02-21 13:43:31 UTC (rev 1039) +++ trunk/wao-ui/pom.xml 2011-02-21 13:43:34 UTC (rev 1040) @@ -10,7 +10,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>2.1</version> + <version>3.0-SNAPSHOT</version> </parent> <groupId>fr.ifremer.wao</groupId> @@ -310,13 +310,13 @@ <scm> <url> - http://labs.libre-entreprise.org/scm/viewvc.php/tags/wao-2.1/?root=suiviobs… + http://labs.libre-entreprise.org/scm/viewvc.php/trunk/wao-ui/?root=suiviobs… </url> <connection> - scm:svn:svn://anonymous at labs.libre-entreprise.org/svnroot/suiviobsmer/tags/wao-2.1/wao-ui + scm:svn:svn://anonymous at labs.libre-entreprise.org/svnroot/suiviobsmer/trunk/wao-ui </connection> <developerConnection> - scm:svn:svn+ssh://${user.name}@labs.libre-entreprise.org/svnroot/suiviobsmer/tags/wao-2.1/wao-ui + scm:svn:svn+ssh://bleny at labs.libre-entreprise.org/svnroot/suiviobsmer/trunk/wao-ui </developerConnection> </scm>

1 0

[Suiviobsmer-commits] r1039 - in tags: . wao-2.1
by bleny＠users.labs.libre-entreprise.org 21 Feb '11

21 Feb '11

Author: bleny Date: 2011-02-21 13:43:31 +0000 (Mon, 21 Feb 2011) New Revision: 1039 Log: [maven-release-plugin] copy for tag wao-2.1 Added: tags/wao-2.1/ Property changes on: tags/wao-2.1 ___________________________________________________________________ Added: svn:ignore + *.ipr *.iws *.iml *.idea target nbactions.xml Added: svn:mergeinfo + /branches/wao-1.5.x:679-733

1 0

[Suiviobsmer-commits] r1038 - in trunk: . wao-business wao-ui
by bleny＠users.labs.libre-entreprise.org 21 Feb '11

21 Feb '11

Author: bleny Date: 2011-02-21 13:43:28 +0000 (Mon, 21 Feb 2011) New Revision: 1038 Log: [maven-release-plugin] prepare release wao-2.1 Modified: trunk/pom.xml trunk/wao-business/pom.xml trunk/wao-ui/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-02-21 13:36:22 UTC (rev 1037) +++ trunk/pom.xml 2011-02-21 13:43:28 UTC (rev 1038) @@ -15,7 +15,7 @@ <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>2.1-SNAPSHOT</version> + <version>2.1</version> <modules> <module>wao-ui</module> @@ -329,12 +329,12 @@ <scm> <connection> - scm:svn:svn://anonymous at labs.libre-entreprise.org/svnroot/suiviobsmer/trunk + scm:svn:svn://anonymous at labs.libre-entreprise.org/svnroot/suiviobsmer/tags/wao-2.1 </connection> <developerConnection> - scm:svn:svn+ssh://${user.name}@labs.libre-entreprise.org/svnroot/suiviobsmer/trunk + scm:svn:svn+ssh://${user.name}@labs.libre-entreprise.org/svnroot/suiviobsmer/tags/wao-2.1 </developerConnection> - <url>http://labs.libre-entreprise.org/scm/viewvc.php/trunk/?root=suiviobsmer + <url>http://labs.libre-entreprise.org/scm/viewvc.php/tags/wao-2.1?root=suiviobsm… </url> </scm> Modified: trunk/wao-business/pom.xml =================================================================== --- trunk/wao-business/pom.xml 2011-02-21 13:36:22 UTC (rev 1037) +++ trunk/wao-business/pom.xml 2011-02-21 13:43:28 UTC (rev 1038) @@ -10,7 +10,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>2.1-SNAPSHOT</version> + <version>2.1</version> </parent> <groupId>fr.ifremer.wao</groupId> @@ -230,13 +230,13 @@ <scm> <url> - http://labs.libre-entreprise.org/scm/viewvc.php/trunk/wao-business/?root=su… + http://labs.libre-entreprise.org/scm/viewvc.php/tags/wao-2.1/?root=suiviobs… </url> <connection> - scm:svn:svn://anonymous at labs.libre-entreprise.org/svnroot/suiviobsmer/trunk/wao-business + scm:svn:svn://anonymous at labs.libre-entreprise.org/svnroot/suiviobsmer/tags/wao-2.1/wao-business </connection> <developerConnection> - scm:svn:svn+ssh://${user.name}@labs.libre-entreprise.org/svnroot/suiviobsmer/trunk/wao-business + scm:svn:svn+ssh://${user.name}@labs.libre-entreprise.org/svnroot/suiviobsmer/tags/wao-2.1/wao-business </developerConnection> </scm> </project> Modified: trunk/wao-ui/pom.xml =================================================================== --- trunk/wao-ui/pom.xml 2011-02-21 13:36:22 UTC (rev 1037) +++ trunk/wao-ui/pom.xml 2011-02-21 13:43:28 UTC (rev 1038) @@ -10,7 +10,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>2.1-SNAPSHOT</version> + <version>2.1</version> </parent> <groupId>fr.ifremer.wao</groupId> @@ -310,13 +310,13 @@ <scm> <url> - http://labs.libre-entreprise.org/scm/viewvc.php/trunk/wao-ui/?root=suiviobs… + http://labs.libre-entreprise.org/scm/viewvc.php/tags/wao-2.1/?root=suiviobs… </url> <connection> - scm:svn:svn://anonymous at labs.libre-entreprise.org/svnroot/suiviobsmer/trunk/wao-ui + scm:svn:svn://anonymous at labs.libre-entreprise.org/svnroot/suiviobsmer/tags/wao-2.1/wao-ui </connection> <developerConnection> - scm:svn:svn+ssh://${user.name}@labs.libre-entreprise.org/svnroot/suiviobsmer/trunk/wao-ui + scm:svn:svn+ssh://${user.name}@labs.libre-entreprise.org/svnroot/suiviobsmer/tags/wao-2.1/wao-ui </developerConnection> </scm>

1 0

[Suiviobsmer-commits] r1037 - in trunk: wao-business/src/license wao-business/src/main/java/fr/ifremer/wao/entity wao-business/src/main/java/fr/ifremer/wao/service wao-ui/src/license
by bleny＠users.labs.libre-entreprise.org 21 Feb '11

21 Feb '11

Author: bleny Date: 2011-02-21 13:36:22 +0000 (Mon, 21 Feb 2011) New Revision: 1037 Log: third party licences + headers Modified: trunk/wao-business/src/license/THIRD-PARTY.properties trunk/wao-business/src/main/java/fr/ifremer/wao/entity/ContactStateMotifImpl.java trunk/wao-business/src/main/java/fr/ifremer/wao/service/EntitiesTranslator.java trunk/wao-ui/src/license/THIRD-PARTY.properties Modified: trunk/wao-business/src/license/THIRD-PARTY.properties =================================================================== --- trunk/wao-business/src/license/THIRD-PARTY.properties 2011-02-21 11:07:36 UTC (rev 1036) +++ trunk/wao-business/src/license/THIRD-PARTY.properties 2011-02-21 13:36:22 UTC (rev 1037) @@ -1,36 +1,17 @@ -### -# #%L -# Wao :: Business -# %% -# Copyright (C) 2009 - 2011 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% -### # Generated by org.nuiton.license.plugin.AddThirdPartyMojo #------------------------------------------------------------------------------- # Already used licenses in project : # - BSD License # - BSD license # - BSD style +# - CDDL 1.1 # - COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 -# - COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 & GNU General Public License (GPL) Version 2 # - Common Development and Distribution License (CDDL) v1.0 # - Common Public License Version 1.0 # - GNU General Public Library # - GNU Lesser General Public License # - GNU Library or Lesser General Public License +# - GPL2 w/ CPE # - Lesser General Public License (LGPL) v 2.1 # - Lesser General Public License (LGPL) v 3.0 # - MIT License @@ -41,12 +22,9 @@ # Please fill the missing licenses for dependencies : # # -#Fri Nov 26 17:04:07 CET 2010 +#Mon Feb 21 12:11:54 CET 2011 antlr--antlr--2.7.6--jar=BSD -com.sun.xml.bind--jaxb-impl--2.2--jar=COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 & GNU General Public License (GPL) Version 2 -com.sun.xml.bind--jaxb-xjc--2.2--jar=COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 & GNU General Public License (GPL) Version 2 commons-primitives--commons-primitives--1.0--jar=The Apache Software License, Version 2.0 dom4j--dom4j--1.6.1--jar=BSD javassist--javassist--3.8.0.GA--jar=Lesser General Public License (LGPL) v 2.1 javax.transaction--jta--1.1--jar=COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 -javax.xml.bind--jaxb-api--2.2--jar=COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 & GNU General Public License (GPL) Version 2 Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/entity/ContactStateMotifImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/entity/ContactStateMotifImpl.java 2011-02-21 11:07:36 UTC (rev 1036) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/entity/ContactStateMotifImpl.java 2011-02-21 13:36:22 UTC (rev 1037) @@ -1,3 +1,26 @@ +/* + * #%L + * Wao :: Business + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2011 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.entity; import fr.ifremer.wao.WaoUtils; Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/service/EntitiesTranslator.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/service/EntitiesTranslator.java 2011-02-21 11:07:36 UTC (rev 1036) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/service/EntitiesTranslator.java 2011-02-21 13:36:22 UTC (rev 1037) @@ -1,3 +1,26 @@ +/* + * #%L + * Wao :: Business + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2011 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.service; import fr.ifremer.wao.WaoDAOHelper; Modified: trunk/wao-ui/src/license/THIRD-PARTY.properties =================================================================== --- trunk/wao-ui/src/license/THIRD-PARTY.properties 2011-02-21 11:07:36 UTC (rev 1036) +++ trunk/wao-ui/src/license/THIRD-PARTY.properties 2011-02-21 13:36:22 UTC (rev 1037) @@ -2,14 +2,16 @@ #------------------------------------------------------------------------------- # Already used licenses in project : # - Affero General Public License (AGPL) +# - Apache Software License - Version 2.0 # - Apache Software License 2.0 # - BSD License # - BSD license # - BSD style +# - CDDL 1.1 # - COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 -# - COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 & GNU General Public License (GPL) Version 2 # - Common Development and Distribution License (CDDL) v1.0 # - Common Public License Version 1.0 +# - Eclipse Public License - Version 1.0 # - GNU General Public Library # - GNU LESSER GENERAL PUBLIC LICENSE Version 2.1 # - GNU Lesser General Public Licence @@ -17,6 +19,7 @@ # - GNU Lesser General Public License version 2.1 # - GNU Library or Lesser General Public License # - GPL, LGPL, MPL +# - GPL2 w/ CPE # - LGPL 2.1 # - Lesser General Public License (LGPL) v 2.1 # - Lesser General Public License (LGPL) v 3.0 @@ -32,15 +35,14 @@ # Please fill the missing licenses for dependencies : # # -#Mon Feb 07 10:25:43 CET 2011 +#Mon Feb 21 12:16:55 CET 2011 antlr--antlr--2.7.6--jar=BSD -com.formos.tapestry--tapestry-testify--1.0.2--jar=The Apache Software License, Version 2.0 -com.sun.xml.bind--jaxb-impl--2.2--jar=COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 & GNU General Public License (GPL) Version 2 -com.sun.xml.bind--jaxb-xjc--2.2--jar=COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 & GNU General Public License (GPL) Version 2 +com.formos.tapestry--tapestry-testify--1.0.3--jar=no licence (see http://tapestry.formos.com/nightly/tapestry-testify/license.html) commons-primitives--commons-primitives--1.0--jar=The Apache Software License, Version 2.0 dom4j--dom4j--1.6.1--jar=BSD javassist--javassist--3.8.0.GA--jar=Lesser General Public License (LGPL) v 2.1 +javax.servlet--servlet-api--2.5--jar=COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 javax.transaction--jta--1.1--jar=COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 -javax.xml.bind--jaxb-api--2.2--jar=COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 & GNU General Public License (GPL) Version 2 +jetty--org.mortbay.jetty--5.1.12--jar=ASL 2.0 ognl--ognl--2.7.3--jar=The OpenSymphony Software License, Version 1.1 org.antlr--antlr-runtime--3.1.1--jar=BSD

1 0

[Suiviobsmer-commits] r1036 - in trunk: . wao-business/src/main/java/fr/ifremer/wao wao-business/src/main/java/fr/ifremer/wao/service
by bleny＠users.labs.libre-entreprise.org 21 Feb '11

21 Feb '11

Author: bleny Date: 2011-02-21 11:07:36 +0000 (Mon, 21 Feb 2011) New Revision: 1036 Log: replacing call to nuiton-utils snapshot Modified: trunk/pom.xml trunk/wao-business/src/main/java/fr/ifremer/wao/WaoUtils.java trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceContactImpl.java trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceUserImpl.java Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-02-21 10:51:03 UTC (rev 1035) +++ trunk/pom.xml 2011-02-21 11:07:36 UTC (rev 1036) @@ -312,7 +312,7 @@  <nuitonI18nVersion>2.3.1</nuitonI18nVersion> - <nuitonUtilsVersion>2.1-SNAPSHOT</nuitonUtilsVersion> + <nuitonUtilsVersion>2.0</nuitonUtilsVersion> <nuitonWebVersion>1.0</nuitonWebVersion> <topiaVersion>2.5.2</topiaVersion> <eugeneVersion>2.3</eugeneVersion> Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/WaoUtils.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/WaoUtils.java 2011-02-21 10:51:03 UTC (rev 1035) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/WaoUtils.java 2011-02-21 11:07:36 UTC (rev 1036) @@ -152,4 +152,13 @@ DateFormat dateFormat = new SimpleDateFormat(pattern, context.getLocale()); return dateFormat.format(date); } + + /** + * + * @deprecated should be replaced by StringUtil.isEmail + */ + @Deprecated + public static boolean isEmail(String str) { + return str.matches("^[a-z0-9!#$%&'*+/=?^_`{|}~-]+((\\.[a-z0-9!#$%&'*+/=?^_`{|}~-]+)?)+@(?:[a-z0-9](?:[a-z0-9-]*[a-z0-9])?\\.)+[a-z0-9](?:[a-z0-9\\-]*[a-z0-9])?$"); + } } Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceContactImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceContactImpl.java 2011-02-21 10:51:03 UTC (rev 1035) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceContactImpl.java 2011-02-21 11:07:36 UTC (rev 1036) @@ -439,7 +439,7 @@ // sending the same e-mail to all of them for (WaoUser waoUser : waoUsers) { String userLogin = waoUser.getLogin(); - if (StringUtil.isEmail(userLogin)) { + if (WaoUtils.isEmail(userLogin)) { try { WaoUtils.sendEmail(userLogin, object, body); } catch (EmailException e) { Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceUserImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceUserImpl.java 2011-02-21 10:51:03 UTC (rev 1035) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceUserImpl.java 2011-02-21 11:07:36 UTC (rev 1036) @@ -31,6 +31,7 @@ import fr.ifremer.wao.WaoException; import fr.ifremer.wao.WaoProperty; import fr.ifremer.wao.WaoQueryHelper; +import fr.ifremer.wao.WaoUtils; import fr.ifremer.wao.bean.ConnectedUser; import fr.ifremer.wao.bean.ConnectedUserImpl; import fr.ifremer.wao.bean.ObsProgram; @@ -253,7 +254,7 @@ transaction.commitTransaction(); try { - if (StringUtil.isEmail(user.getLogin()) && user.isPasswordChanged()) { + if (WaoUtils.isEmail(user.getLogin()) && user.isPasswordChanged()) { String subject = "[WAO] "; String msg = "Bonjour,\n\n"; if (isNewUser) {

1 0

[Suiviobsmer-commits] r1035 - in trunk: . wao-business wao-ui
by bleny＠users.labs.libre-entreprise.org 21 Feb '11

21 Feb '11

Author: bleny Date: 2011-02-21 10:51:03 +0000 (Mon, 21 Feb 2011) New Revision: 1035 Log: update pom for release Modified: trunk/pom.xml trunk/wao-business/pom.xml trunk/wao-ui/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-02-21 10:16:27 UTC (rev 1034) +++ trunk/pom.xml 2011-02-21 10:51:03 UTC (rev 1035) @@ -181,36 +181,21 @@ <artifactId>xercesImpl</artifactId> <version>2.9.1</version> </dependency> - <dependency> <groupId>xml-apis</groupId> <artifactId>xml-apis</artifactId> <version>1.3.03</version> </dependency> - -  -  -  -  -  -  -  -  -  -  -  <dependency> <groupId>net.sourceforge.javacsv</groupId> <artifactId>javacsv</artifactId> <version>2.0</version> </dependency> - <dependency> <groupId>org.hibernate</groupId> <artifactId>hibernate-core</artifactId> <version>${hibernateVersion}</version> </dependency> -  <dependency> <groupId>com.h2database</groupId> @@ -228,12 +213,6 @@ <version>0.9.10-hudson-24</version> <scope>provided</scope> </dependency> -  <dependency> <groupId>com.formos.tapestry</groupId> <artifactId>tapestry-testify</artifactId> @@ -353,20 +332,13 @@ scm:svn:svn://anonymous at labs.libre-entreprise.org/svnroot/suiviobsmer/trunk </connection> <developerConnection> - scm:svn:svn+ssh://bleny at labs.libre-entreprise.org/svnroot/suiviobsmer/trunk + scm:svn:svn+ssh://${user.name}@labs.libre-entreprise.org/svnroot/suiviobsmer/trunk </developerConnection> <url>http://labs.libre-entreprise.org/scm/viewvc.php/trunk/?root=suiviobsmer </url> </scm> <build> -  - <pluginManagement> <plugins> @@ -433,74 +405,4 @@ </mailingList> </mailingLists> - -  - -  - -  -  -  -  -  -  -  -  -  -  -  -  - -  - -  -  -  -  -  -  -  -  -  -  -  -  - -  - -  - -  - -  - -  -  -  -  -  -  -  -  -  -  -  - -  - -  -  -  -  -  -  -  -  -  -  -  -  - -  - </project> Modified: trunk/wao-business/pom.xml =================================================================== --- trunk/wao-business/pom.xml 2011-02-21 10:16:27 UTC (rev 1034) +++ trunk/wao-business/pom.xml 2011-02-21 10:51:03 UTC (rev 1035) @@ -88,16 +88,7 @@ <dependency> <groupId>xml-apis</groupId> <artifactId>xml-apis</artifactId> - </dependency> -  -  -  -  -  -  -  -  -  + </dependency> <dependency> <groupId>org.nuiton.topia</groupId> <artifactId>topia-persistence</artifactId> @@ -116,11 +107,6 @@ <artifactId>h2</artifactId> <scope>test</scope> </dependency> -  -  -  -  -  <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> @@ -250,21 +236,8 @@ scm:svn:svn://anonymous at labs.libre-entreprise.org/svnroot/suiviobsmer/trunk/wao-business </connection> <developerConnection> - scm:svn:svn+ssh://bleny at labs.libre-entreprise.org/svnroot/suiviobsmer/trunk/wao-business + scm:svn:svn+ssh://${user.name}@labs.libre-entreprise.org/svnroot/suiviobsmer/trunk/wao-business </developerConnection> </scm> - -  -  -  -  -  -  -  -  -  -  -  - </project> Modified: trunk/wao-ui/pom.xml =================================================================== --- trunk/wao-ui/pom.xml 2011-02-21 10:16:27 UTC (rev 1034) +++ trunk/wao-ui/pom.xml 2011-02-21 10:51:03 UTC (rev 1035) @@ -316,7 +316,7 @@ scm:svn:svn://anonymous at labs.libre-entreprise.org/svnroot/suiviobsmer/trunk/wao-ui </connection> <developerConnection> - scm:svn:svn+ssh://bleny at labs.libre-entreprise.org/svnroot/suiviobsmer/trunk/wao-ui + scm:svn:svn+ssh://${user.name}@labs.libre-entreprise.org/svnroot/suiviobsmer/trunk/wao-ui </developerConnection> </scm>

1 0

[Suiviobsmer-commits] r1034 - in trunk: wao-business/src/main/java/fr/ifremer/wao wao-ui/src/main/java/fr/ifremer/wao/ui/services
by bleny＠users.labs.libre-entreprise.org 21 Feb '11

21 Feb '11

Author: bleny Date: 2011-02-21 10:16:27 +0000 (Mon, 21 Feb 2011) New Revision: 1034 Log: add trace to show where i18n bug is from Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/WaoContextImpl.java trunk/wao-business/src/main/java/fr/ifremer/wao/WaoUtils.java trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/services/WaoManager.java Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/WaoContextImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/WaoContextImpl.java 2011-02-18 17:14:56 UTC (rev 1033) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/WaoContextImpl.java 2011-02-21 10:16:27 UTC (rev 1034) @@ -495,6 +495,23 @@ protected Locale initialValue() { return Locale.FRENCH; } + + @Override + public Locale get() { + Locale locale = super.get(); + if (log.isTraceEnabled()) { + log.trace("thread " + Thread.currentThread().getName() + " get locale " + locale); + } + return locale; + } + + @Override + public void set(Locale locale) { + if (log.isTraceEnabled()) { + log.trace("thread " + Thread.currentThread().getName() + " set locale to " + locale); + } + super.set(locale); + } }; @Override Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/WaoUtils.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/WaoUtils.java 2011-02-18 17:14:56 UTC (rev 1033) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/WaoUtils.java 2011-02-21 10:16:27 UTC (rev 1034) @@ -132,7 +132,7 @@ public static final String dateTimePattern = "dd/MM/yyyy HH:mm"; public static final String timePattern = "HH:mm"; - public static String formatMonthTime(Date date) { + public static String formatMonth(Date date) { return formatDate(date, monthPattern); } Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/services/WaoManager.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/services/WaoManager.java 2011-02-18 17:14:56 UTC (rev 1033) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/services/WaoManager.java 2011-02-21 10:16:27 UTC (rev 1034) @@ -291,10 +291,10 @@ public void changeLocale() { Locale currentLocale = getCurrentLocale(); Locale newLocale; - if (Locale.ENGLISH.equals(currentLocale)) { + if (Locale.FRENCH.equals(currentLocale)) { + newLocale = Locale.ENGLISH; + } else { newLocale = Locale.FRENCH; - } else { - newLocale = Locale.ENGLISH; } localeService.set(newLocale); context.setLocale(newLocale);

1 0