Author: tchemit Date: 2013-01-12 19:02:10 +0100 (Sat, 12 Jan 2013) New Revision: 183 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/183 Log: - fix jar classpath (bug with snapshot unique version) - fix adagio persistence driver usage - reformat license header Modified: trunk/tutti-persistence-dev/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceDevImpl.java trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/PersistenceService.java trunk/tutti-ui-swing/pom.xml trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUI.jaxx Modified: trunk/tutti-persistence-dev/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceDevImpl.java =================================================================== --- trunk/tutti-persistence-dev/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceDevImpl.java 2013-01-12 18:00:27 UTC (rev 182) +++ trunk/tutti-persistence-dev/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceDevImpl.java 2013-01-12 18:02:10 UTC (rev 183) @@ -71,7 +71,6 @@ import java.io.ObjectOutputStream; import java.util.List; import java.util.Map; -import java.util.Properties; import java.util.ServiceLoader; import java.util.Set; import java.util.UUID; @@ -157,7 +156,6 @@ return "Persistence Dev implementation"; } - @Override public void open() throws IOException { Preconditions.checkNotNull(config, " No config property setted"); @@ -178,7 +176,6 @@ } } - @Override public void close() throws IOException { if (log.isInfoEnabled()) { @@ -191,10 +188,6 @@ } } - @Override - public void setEnumerations(Properties dbEnumerations) { - } - //------------------------------------------------------------------------// //-- Referential methods --// //------------------------------------------------------------------------// Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/PersistenceService.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/PersistenceService.java 2013-01-12 18:00:27 UTC (rev 182) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/PersistenceService.java 2013-01-12 18:02:10 UTC (rev 183) @@ -46,15 +46,14 @@ import fr.ifremer.tutti.persistence.entities.referential.Species; import fr.ifremer.tutti.persistence.entities.referential.Vessel; import fr.ifremer.tutti.persistence.entities.referential.Zone; +import fr.ifremer.tutti.persistence.service.TuttiPersistenceServiceLocator; +import org.apache.commons.io.IOUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.util.ApplicationConfig; -import org.springframework.context.ApplicationContext; -import org.springframework.context.support.ClassPathXmlApplicationContext; import java.io.IOException; import java.util.List; -import java.util.Properties; /** * Persistence service. @@ -130,22 +129,11 @@ // can now instanciate Spring context - ApplicationContext springContext = new ClassPathXmlApplicationContext( - "applicationContext-conf.xml", - "applicationContext-dataSource-local.xml", - "applicationContext-entities.xml", - "applicationContext-service-tutti.xml" - ); + driver = TuttiPersistenceServiceLocator.getPersistenceService(); - driver = (TuttiPersistence) springContext.getBean("adagioPersistenceService"); - if (log.isInfoEnabled()) { log.info("Will open persistence driver " + driver.getImplementationName()); } - - Properties enumerations = driverConfig.getDbEnumerations(); - driver.setEnumerations(enumerations); - driver.open(); } @@ -157,23 +145,15 @@ if (log.isInfoEnabled()) { log.info("Will close persistence Service " + getImplementationName()); } - try { - driver.close(); - } finally { - devDriver.close(); - } + IOUtils.closeQuietly(devDriver); + IOUtils.closeQuietly(driver); } - @Override - public void setEnumerations(Properties dbEnumerations) { - } - //------------------------------------------------------------------------// //-- Referential methods --// //------------------------------------------------------------------------// - @Override public List<Vessel> getAllScientificVessel() { return devDriver.getAllScientificVessel(); Modified: trunk/tutti-ui-swing/pom.xml =================================================================== --- trunk/tutti-ui-swing/pom.xml 2013-01-12 18:00:27 UTC (rev 182) +++ trunk/tutti-ui-swing/pom.xml 2013-01-12 18:02:10 UTC (rev 183) @@ -185,7 +185,7 @@ <configuration> <archive> <manifest> - <useUniqueVersions>true</useUniqueVersions> + <useUniqueVersions>false</useUniqueVersions> <addClasspath>true</addClasspath> <classpathPrefix>./lib/</classpathPrefix> </manifest> @@ -232,10 +232,10 @@ <version>3.5.0</version> </dependency--> - <dependency> + <!--dependency> <groupId>fr.ird</groupId> <artifactId>msaccess-importer</artifactId> - </dependency> + </dependency--> <dependency> <groupId>org.nuiton</groupId> Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUI.jaxx =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUI.jaxx 2013-01-12 18:00:27 UTC (rev 182) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUI.jaxx 2013-01-12 18:02:10 UTC (rev 183) @@ -16,10 +16,10 @@ 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 General Public -License along with this program. If not, see -<http://www.gnu.org/licenses/gpl-3.0.html>. -#L% + You should have received a copy of the GNU General Public + License along with this program. If not, see + <http://www.gnu.org/licenses/gpl-3.0.html>. + #L% --> <JPanel id='homePanel' layout='{new BorderLayout()}' implements='fr.ifremer.tutti.ui.swing.TuttiUI<EditProtocolUIModel, EditProtocolUIHandler>'> @@ -157,4 +157,4 @@ <JButton id='saveButton' onActionPerformed='handler.save()'/> </JPanel> -</JPanel> \ No newline at end of file +</JPanel>