October 2009 - Callao-commits - mailman.cloud.codelutin.com

r2670 - in trunk: . callao-service
by fdesbois＠users.chorem.org 14 Oct '09

14 Oct '09

Author: fdesbois Date: 2009-10-14 14:54:29 +0200 (Wed, 14 Oct 2009) New Revision: 2670 Modified: trunk/callao-service/pom.xml trunk/pom.xml Log: - Cleaning non used dependency for topia-soa - Remove jnlp and jlfgr Modified: trunk/callao-service/pom.xml =================================================================== --- trunk/callao-service/pom.xml 2009-10-13 16:50:55 UTC (rev 2669) +++ trunk/callao-service/pom.xml 2009-10-14 12:54:29 UTC (rev 2670) @@ -20,13 +20,16 @@ <artifactId>callao-entity</artifactId> <version>${project.version}</version> </dependency> - <dependency> + <groupId>org.jdom</groupId> + <artifactId>jdom</artifactId> + </dependency> + + - <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> @@ -54,15 +57,15 @@ </resource> </resources> <plugins> - +  - <plugin> +  + Configuration of model generator <configuration> <addCompileDirectory>true</addCompileDirectory> <srcDirZuml>../callao-entity/src/main/xmi/</srcDirZuml> @@ -78,10 +81,10 @@ <input>../callao-entity/src/main/xmi/</input> <output>target/generated-sources/xmi</output> </zargoResources> - + </configuration> - - + + <goals> <goal>zargo2xmi</goal> <goal>xmi2objectmodel</goal> @@ -89,7 +92,7 @@ </goals> </execution> </executions> -  + </dependencies - </plugin> + </plugin>--> </plugins> </build> </project> + Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2009-10-13 16:50:55 UTC (rev 2669) +++ trunk/pom.xml 2009-10-14 12:54:29 UTC (rev 2670) @@ -37,12 +37,18 @@ <groupId>org.nuiton.topia</groupId> <artifactId>topia-persistence</artifactId> <version>${topia.version}</version> - </dependency> - <dependency> + </dependency> + <dependency> + <groupId>org.jdom</groupId> + <artifactId>jdom</artifactId> + <version>1.1</version> + </dependency> + + <dependency> <groupId>org.nuiton</groupId>

1 0

r2669 - in trunk/callao-service/src/test: . java/org/chorem/callao/service resources
by fdesbois＠users.chorem.org 13 Oct '09

13 Oct '09

Author: fdesbois Date: 2009-10-13 18:50:55 +0200 (Tue, 13 Oct 2009) New Revision: 2669 Added: trunk/callao-service/src/test/resources/ trunk/callao-service/src/test/resources/Callao_bdd.properties Modified: trunk/callao-service/src/test/java/org/chorem/callao/service/TransactionServiceImplTest.java Log: - Correction Ano #56 : Test was completely change to have distinct methods without dependencies between them - Add properties to change database location for Tests Modified: trunk/callao-service/src/test/java/org/chorem/callao/service/TransactionServiceImplTest.java =================================================================== --- trunk/callao-service/src/test/java/org/chorem/callao/service/TransactionServiceImplTest.java 2009-10-11 12:14:48 UTC (rev 2668) +++ trunk/callao-service/src/test/java/org/chorem/callao/service/TransactionServiceImplTest.java 2009-10-13 16:50:55 UTC (rev 2669) @@ -39,58 +39,24 @@ /** log. */ private static final org.apache.commons.logging.Log log = LogFactory.getLog(TransactionServiceImplTest.class); - private static TransactionServiceImpl instanceTransaction; - private static PeriodServiceImpl instancePeriod; - private static TimeSpanServiceImpl instanceTimespan; - private static JournalServiceImpl instanceJournal; - private static EntryServiceImpl instanceEntry; - private static AccountServiceImpl instanceAccount; - private static LogServiceImpl instanceLog; - private static String topiaIDTransaction; - private static String topiaIDTransaction2; - @BeforeClass public static void setUpClass() throws Exception { ContextCallao.getInstance().init(); } - @Before - public void setUp() { - instanceTransaction = new TransactionServiceImpl(); - instancePeriod = new PeriodServiceImpl(); - instanceTimespan = new TimeSpanServiceImpl(); - instanceJournal = new JournalServiceImpl(); - instanceEntry = new EntryServiceImpl(); - instanceAccount = new AccountServiceImpl(); - instanceLog = new LogServiceImpl(); - } - /** * On nettoie la base de données * @throws java.lang.Exception */ @AfterClass public static void tearDownClass() throws Exception { - // Supprime Account - instanceAccount.removeAccount("8"); - // Supprime Journal - List<JournalDTO> listJournal = instanceJournal.getAllJournal(); - for (JournalDTO journalDTO : listJournal) - { - instanceJournal.removeJournal(journalDTO); - } + LogServiceImpl serviceLog = new LogServiceImpl(); // Supprime Log - List<LogDTO> listLog = instanceLog.listeAllLogDTO(); + List<LogDTO> listLog = serviceLog.listeAllLogDTO(); for (LogDTO logDTO : listLog) { - instanceLog.removeLog(logDTO); - } - // Supprime Period & TimeSpan - Date d = new Date(110,0,1); - PeriodDTO periodDTO = instancePeriod.searchPeriodDTOWithDate(d); - instancePeriod.removePeriod(periodDTO); - // Supprime Transaction - //List<Transaction> listTransaction = instanceTransaction.s + serviceLog.removeLog(logDTO); + } ContextCallao.getInstance().disconnect(); } @@ -103,51 +69,60 @@ @Test public void createTransactionTest () { - String result; - // debut 1 janvier 2010 - Date beginTimeSpan = new Date(110,0,1); - // fin 31 décembre 2010 - Date endTimeSpan = new Date(110,11,31); - // Création période avec son découpage sur 12 mois - result = instancePeriod.createPeriod(beginTimeSpan, endTimeSpan, false); - Assert.assertEquals(ServiceHelper.RESPOND_SUCCESS,result); - // Recherche du timespan 1 janv au 31 janv 2010 - Date dateSearch = new Date(110,0,1); - TimeSpan timespan = instanceTimespan.searchTimeSpanByDate(dateSearch); - // Création Journal - result = instanceJournal.createJournal("Journal transaction", "jt","description"); - Assert.assertEquals(ServiceHelper.RESPOND_SUCCESS,result); - // Recherche du journal pour l'ajouter dans la transaction - Journal journal = instanceJournal.searchJournalWithLabel("Journal transaction"); - /** - * Création d'une transaction - */ - result = instanceTransaction.createTransaction(dateSearch, "Facture 6", "description transaction", timespan, journal); - /** - * Si il renvoie succes et non l'identifiant (à commenter dans la classe correspondante) - */ - //Assert.assertEquals(ServiceHelper.RESPOND_SUCCESS,result); + log.info("BEGIN createTransactionTest()"); + + PeriodServiceImpl servicePeriod = new PeriodServiceImpl(); + TransactionServiceImpl serviceTransaction = new TransactionServiceImpl(); + JournalServiceImpl serviceJournal = new JournalServiceImpl(); + + // Creation Period & TimeSpan (default period 01/01/2010 -> 31/12/2010) + TimeSpan timespan = createPeriod(servicePeriod); + + // Creation Journal + Journal journal = createJournal(serviceJournal,"Journal transaction", "jt","description"); + + // Test creationTransaction avec Journal et TimeSpan + String transactionId = createTransaction(serviceTransaction, "Facture 6", "description transaction", timespan, journal); + + /* NETTOYAGE TEST */ + removeTransaction(serviceTransaction, transactionId); + removeJournals(serviceJournal); + removePeriod(servicePeriod); + /* FIN NETTOYAGE TEST */ } + /** * Recherche des transactions. */ @Test public void searchTransactionTest () { - // Une seule transaction est dans la base de données. - Date dateSearch = new Date(110,0,1); - // Recherche d'un timeSpan - TimeSpan timespan = instanceTimespan.searchTimeSpanByDate(dateSearch); + log.info("BEGIN searchTransactionTest()"); + PeriodServiceImpl servicePeriod = new PeriodServiceImpl(); + TransactionServiceImpl serviceTransaction = new TransactionServiceImpl(); + JournalServiceImpl serviceJournal = new JournalServiceImpl(); + + /* PREPARATION TEST */ + // Default period 01/01/2010 -> 31/12/2010 + TimeSpan timespan = createPeriod(servicePeriod); + Journal journal = createJournal(serviceJournal,"Journal transaction", "jt","description"); + String transactionId = createTransaction(serviceTransaction, "Facture 6", "description transaction", timespan, journal); + /* FIN PREPARATION TEST */ + // Recherche de la transaction suivant ce timeSpan. - List<Transaction> listTransaction = instanceTransaction.searchListTransactionWithTimeSpan(timespan); + List<Transaction> listTransaction = serviceTransaction.searchListTransactionWithTimeSpan(timespan); Assert.assertEquals(1,listTransaction.size()); // On prend le premier élément de la liste de transactions Transaction transaction = listTransaction.get(0); // Si c'est la bonne transaction Assert.assertEquals("Facture 6",transaction.getVoucherRef()); - // On inscrit le topiaId pour la suite des tests - topiaIDTransaction = transaction.getTopiaId(); + + /* NETTOYAGE TEST */ + removeTransaction(serviceTransaction, transactionId); + removeJournals(serviceJournal); + removePeriod(servicePeriod); + /* FIN NETTOYAGE TEST */ } @@ -160,10 +135,28 @@ @Test public void searchWithTopiaIdTest () { + log.info("BEGIN searchWithTopiaIdTest()"); + PeriodServiceImpl servicePeriod = new PeriodServiceImpl(); + TransactionServiceImpl serviceTransaction = new TransactionServiceImpl(); + JournalServiceImpl serviceJournal = new JournalServiceImpl(); + + /* PREPARATION TEST */ + // Default period 01/01/2010 -> 31/12/2010 + TimeSpan timespan = createPeriod(servicePeriod); + Journal journal = createJournal(serviceJournal,"Journal transaction", "jt","description"); + String transactionId = createTransaction(serviceTransaction, "Facture 6", "description transaction", timespan, journal); + /* FIN PREPARATION TEST */ + // Recherche de la transaction avec son identifiant. - Transaction transaction = instanceTransaction.searchTransactionWithTopiaId(topiaIDTransaction); + Transaction transaction = serviceTransaction.searchTransactionWithTopiaId(transactionId); // Si c'est la bonne transaction Assert.assertEquals("Facture 6",transaction.getVoucherRef()); + + /* NETTOYAGE TEST */ + removeTransaction(serviceTransaction, transactionId); + removeJournals(serviceJournal); + removePeriod(servicePeriod); + /* FIN NETTOYAGE TEST */ } /** @@ -172,8 +165,20 @@ @Test public void searchTransactionDTOTest () { + log.info("BEGIN searchTransactionDTOTest()"); + PeriodServiceImpl servicePeriod = new PeriodServiceImpl(); + TransactionServiceImpl serviceTransaction = new TransactionServiceImpl(); + JournalServiceImpl serviceJournal = new JournalServiceImpl(); + + /* PREPARATION TEST */ + // Default period 01/01/2010 -> 31/12/2010 + TimeSpan timespan = createPeriod(servicePeriod); + Journal journal = createJournal(serviceJournal,"Journal transaction", "jt","description"); + String transactionId = createTransaction(serviceTransaction, "Facture 6", "description transaction", timespan, journal); + /* FIN PREPARATION TEST */ + // Recherche de la transaction à l'aide de son identifiant. - TransactionDTO transactionDTO = instanceTransaction.searchTransactionDTO(topiaIDTransaction); + TransactionDTO transactionDTO = serviceTransaction.searchTransactionDTO(transactionId); // Vérifie si la transaction DTO est correcte. Assert.assertEquals("Facture 6",transactionDTO.getVoucherRef()); // Charge le journalDTO à partir de la transactionDTO @@ -184,6 +189,12 @@ // debut 1 janvier 2010 - vérifie si c'est la même période Date beginTimeSpan = new Date(110,0,1); Assert.assertEquals(beginTimeSpan,timeSpanDTO.getBeginTimeSpan()); + + /* NETTOYAGE TEST */ + removeTransaction(serviceTransaction, transactionId); + removeJournals(serviceJournal); + removePeriod(servicePeriod); + /* FIN NETTOYAGE TEST */ } /** @@ -192,14 +203,32 @@ @Test public void modifyTransactionTest () { - TransactionDTO transactionDTO = instanceTransaction.searchTransactionDTO(topiaIDTransaction); + log.info("BEGIN modifyTransactionTest()"); + PeriodServiceImpl servicePeriod = new PeriodServiceImpl(); + TransactionServiceImpl serviceTransaction = new TransactionServiceImpl(); + JournalServiceImpl serviceJournal = new JournalServiceImpl(); + + /* PREPARATION TEST */ + // Default period 01/01/2010 -> 31/12/2010 + TimeSpan timespan = createPeriod(servicePeriod); + Journal journal = createJournal(serviceJournal,"Journal transaction", "jt","description"); + String transactionId = createTransaction(serviceTransaction, "Facture 6", "description transaction", timespan, journal); + TransactionDTO transactionDTO = serviceTransaction.searchTransactionDTO(transactionId); + /* FIN PREPARATION TEST */ + // On modifie la référence du fichier. transactionDTO.setVoucherRef("Nouvelle facture"); - String result = instanceTransaction.modifyTransaction(transactionDTO); + String result = serviceTransaction.modifyTransaction(transactionDTO); Assert.assertEquals(ServiceHelper.RESPOND_SUCCESS,result); // On recherche la transaction dans la base de données. - Transaction transaction = instanceTransaction.searchTransactionWithTopiaId(topiaIDTransaction); + Transaction transaction = serviceTransaction.searchTransactionWithTopiaId(transactionId); Assert.assertEquals("Nouvelle facture",transaction.getVoucherRef()); + + /* NETTOYAGE TEST */ + removeTransaction(serviceTransaction, transactionId); + removeJournals(serviceJournal); + removePeriod(servicePeriod); + /* FIN NETTOYAGE TEST */ } /** @@ -208,6 +237,19 @@ @Test public void createTransactionDTOTest () { + log.info("BEGIN createTransactionDTOTest()"); + PeriodServiceImpl servicePeriod = new PeriodServiceImpl(); + TimeSpanServiceImpl serviceTimespan = new TimeSpanServiceImpl(); + TransactionServiceImpl serviceTransaction = new TransactionServiceImpl(); + JournalServiceImpl serviceJournal = new JournalServiceImpl(); + + /* PREPARATION TEST */ + // Default period 01/01/2010 -> 31/12/2010 + TimeSpan timespan = createPeriod(servicePeriod); + Journal journal = createJournal(serviceJournal,"Journal transaction", "jt","description"); + String transactionId = createTransaction(serviceTransaction, "Facture 6", "description transaction", timespan, journal); + /* FIN PREPARATION TEST */ + TransactionDTO transactionDTO = new TransactionDTO(); Date dateTransaction = new Date(); transactionDTO.setEntryDate(dateTransaction); @@ -215,46 +257,54 @@ transactionDTO.setDescription("No comment"); // Il n'y a pas de timeSpan et journal attachés à la transaction // ce qui créé une erreur lors de la création - String result = instanceTransaction.createTransaction(transactionDTO); + String result = serviceTransaction.createTransaction(transactionDTO); Assert.assertEquals(ServiceHelper.TRANSACTION_NOT_JOURNAL,result); // On fournit à transactionDTO un timeSpan valide // debut 1 janvier 2010 - Date dateSearch = new Date(110,0,1); - TimeSpanDTO timeSpanDTO = instanceTimespan.searchTimeSpanDTOByDate(dateSearch); + Date dateSearch = timespan.getBeginTimeSpan(); + TimeSpanDTO timeSpanDTO = serviceTimespan.searchTimeSpanDTOByDate(dateSearch); transactionDTO.setTimeSpanDTO(timeSpanDTO); // On fournit à transactionDTO un journal NON valide (non présent dans la BDD) JournalDTO journalDTO = new JournalDTO(); journalDTO.setLabel("existe pas"); transactionDTO.setJournalDTO(journalDTO); // Ajout de la transaction avec erreur avec le journalDTO - result = instanceTransaction.createTransaction(transactionDTO); + result = serviceTransaction.createTransaction(transactionDTO); Assert.assertEquals(ServiceHelper.TRANSACTION_NOT_JOURNAL,result); /** * Ajout d'un journalDTO valide */ - journalDTO = instanceJournal.searchJournalDTOWithLabel("Journal transaction"); + journalDTO = serviceJournal.searchJournalDTOWithLabel("Journal transaction"); transactionDTO.setJournalDTO(journalDTO); - result = instanceTransaction.createTransaction(transactionDTO); + result = serviceTransaction.createTransaction(transactionDTO); /** * Si il renvoie succes et non l'identifiant (à commenter dans la classe correspondante) */ //Assert.assertEquals(ServiceHelper.RESPOND_SUCCESS,result); // Vérifie le nombre de transactions (égal à deux) - TimeSpan timeSpan = instanceTimespan.searchTimeSpanByDate(dateSearch); - List<TransactionDTO> listTransactionDTO = instanceTransaction.searchListTransactionDTOWithTimeSpan(timeSpan); + TimeSpan timeSpan = serviceTimespan.searchTimeSpanByDate(dateSearch); + List<TransactionDTO> listTransactionDTO = serviceTransaction.searchListTransactionDTOWithTimeSpan(timeSpan); Assert.assertEquals(2,listTransactionDTO.size()); /** * pour effacer par la suite les transactions à la fin des tests */ - // Vérifie si la 1ière transaction est celle deja inscrite (createTransactionTest) + // Vérifie si la 1ière transaction est celle deja inscrite transactionDTO = listTransactionDTO.get(0); - if ( transactionDTO.getId().equals(topiaIDTransaction) ) + String transactionId2; + if ( transactionDTO.getId().equals(transactionId) ) { - topiaIDTransaction2 = listTransactionDTO.get(1).getId(); - } else + transactionId2 = listTransactionDTO.get(1).getId(); + } else // ?????? { - topiaIDTransaction2 = transactionDTO.getId(); + transactionId2 = transactionDTO.getId(); } + + /* NETTOYAGE TEST */ + removeTransaction(serviceTransaction, transactionId); + removeTransaction(serviceTransaction, transactionId2); + removeJournals(serviceJournal); + removePeriod(servicePeriod); + /* FIN NETTOYAGE TEST */ } /** @@ -263,25 +313,45 @@ @Test public void addEntryTest () { + log.info("BEGIN addEntryTest()"); + PeriodServiceImpl servicePeriod = new PeriodServiceImpl(); + TransactionServiceImpl serviceTransaction = new TransactionServiceImpl(); + JournalServiceImpl serviceJournal = new JournalServiceImpl(); + AccountServiceImpl serviceAccount = new AccountServiceImpl(); + + /* PREPARATION TEST */ + // Default period 01/01/2010 -> 31/12/2010 + TimeSpan timespan = createPeriod(servicePeriod); + Journal journal = createJournal(serviceJournal,"Journal transaction", "jt","description"); + String transactionId = createTransaction(serviceTransaction, "Facture 6", "description transaction", timespan, journal); + /* FIN PREPARATION TEST */ + // On recherche la transaction dans la base de données. - Transaction transaction = instanceTransaction.searchTransactionWithTopiaId(topiaIDTransaction); + Transaction transaction = serviceTransaction.searchTransactionWithTopiaId(transactionId); // On créé le compte 8 et recherche cet account dans la base de données - instanceAccount.createAccount("8", "Compte essai", "0","actif"); - instanceAccount.createAccount("81", "Compte essai 81", "8","actif"); - Account account = instanceAccount.searchAccount("8"); - Assert.assertEquals("8",account.getAccountNumber()); + Account account = createAccount(serviceAccount,"8", "Compte essai", "0","actif"); + createAccount(serviceAccount,"81", "Compte essai 81", "8","actif"); // Ajout entrée : 300 euros en crédit - String result = instanceTransaction.addEntry("entree1", "300", false, "lettering", "detail", transaction,account); + String result = serviceTransaction.addEntry("entree1", "300", false, "lettering", "detail", transaction,account); /** * Si il renvoie succes et non l'identifiant (à commenter dans la classe correspondante) */ //Assert.assertEquals(ServiceHelper.RESPOND_SUCCESS,result); // Ajout entrée : 300 euros en débit - result = instanceTransaction.addEntry("entree2", "300", true, "lettering", "detail", transaction,account); + result = serviceTransaction.addEntry("entree2", "300", true, "lettering", "detail", transaction,account); /** * Si il renvoie succes et non l'identifiant (à commenter dans la classe correspondante) */ //Assert.assertEquals(ServiceHelper.RESPOND_SUCCESS,result); + + /* NETTOYAGE TEST */ + // Les entrees sont supprimees avec la transaction (composition) + removeTransaction(serviceTransaction, transactionId); + serviceAccount.removeAccount("8"); + serviceAccount.removeAccount("81"); + removeJournals(serviceJournal); + removePeriod(servicePeriod); + /* FIN NETTOYAGE TEST */ } /** @@ -290,9 +360,26 @@ @Test public void searchEntryTest () { - // On recherche la transaction dans la base de données. - Transaction transaction = instanceTransaction.searchTransactionWithTopiaId(topiaIDTransaction); - List<EntryDTO> listEntryDTO = instanceEntry.searchEntryDTOWithTransaction(transaction); + log.info("BEGIN searchEntryTest()"); + PeriodServiceImpl servicePeriod = new PeriodServiceImpl(); + TransactionServiceImpl serviceTransaction = new TransactionServiceImpl(); + JournalServiceImpl serviceJournal = new JournalServiceImpl(); + AccountServiceImpl serviceAccount = new AccountServiceImpl(); + EntryServiceImpl serviceEntry = new EntryServiceImpl(); + + /* PREPARATION TEST */ + // Default period 01/01/2010 -> 31/12/2010 + TimeSpan timespan = createPeriod(servicePeriod); + Journal journal = createJournal(serviceJournal,"Journal transaction", "jt","description"); + String transactionId = createTransaction(serviceTransaction, "Facture 6", "description transaction", timespan, journal); + Transaction transaction = serviceTransaction.searchTransactionWithTopiaId(transactionId); + Account account = createAccount(serviceAccount,"8", "Compte essai", "0","actif"); + createAccount(serviceAccount,"81", "Compte essai 81", "8","actif"); + serviceTransaction.addEntry("entree1", "300", false, "lettering", "detail", transaction,account); + serviceTransaction.addEntry("entree2", "300", true, "lettering", "detail", transaction,account); + /* FIN PREPARATION TEST */ + + List<EntryDTO> listEntryDTO = serviceEntry.searchEntryDTOWithTransaction(transaction); // On doit trouver deux entrées. Assert.assertEquals(2,listEntryDTO.size()); /** @@ -305,6 +392,14 @@ // Trouve le compte 81 accountDTO = accountDTO.getAccountChildDTO().get(0); Assert.assertEquals("81",accountDTO.getAccountNumber()); + + /* NETTOYAGE TEST */ + removeTransaction(serviceTransaction, transactionId); + serviceAccount.removeAccount("8"); + serviceAccount.removeAccount("81"); + removeJournals(serviceJournal); + removePeriod(servicePeriod); + /* FIN NETTOYAGE TEST */ } /** @@ -313,26 +408,50 @@ @Test public void modifyEntry () { - // On recherche la transaction dans la base de données. - Transaction transaction = instanceTransaction.searchTransactionWithTopiaId(topiaIDTransaction); + log.info("BEGIN modifyEntry()"); + PeriodServiceImpl servicePeriod = new PeriodServiceImpl(); + TransactionServiceImpl serviceTransaction = new TransactionServiceImpl(); + JournalServiceImpl serviceJournal = new JournalServiceImpl(); + AccountServiceImpl serviceAccount = new AccountServiceImpl(); + EntryServiceImpl serviceEntry = new EntryServiceImpl(); + + /* PREPARATION TEST */ + // Default period 01/01/2010 -> 31/12/2010 + TimeSpan timespan = createPeriod(servicePeriod); + Journal journal = createJournal(serviceJournal,"Journal transaction", "jt","description"); + String transactionId = createTransaction(serviceTransaction, "Facture 6", "description transaction", timespan, journal); + Transaction transaction = serviceTransaction.searchTransactionWithTopiaId(transactionId); + Account account = createAccount(serviceAccount,"8", "Compte essai", "0","actif"); + serviceTransaction.addEntry("entree1", "300", false, "lettering", "detail", transaction,account); + serviceTransaction.addEntry("entree2", "300", true, "lettering", "detail", transaction,account); + /* FIN PREPARATION TEST */ + // Recherche les deux entry en format DTO - List<EntryDTO> listEntryDTO = instanceEntry.searchEntryDTOWithTransaction(transaction); + List<EntryDTO> listEntryDTO = serviceEntry.searchEntryDTOWithTransaction(transaction); + Assert.assertEquals(2,listEntryDTO.size()); // Premier DTO EntryDTO entryDTO = listEntryDTO.get(0); entryDTO.setAmount("800"); - String result = instanceTransaction.modifyEntry(entryDTO); + String result = serviceTransaction.modifyEntry(entryDTO); Assert.assertEquals(ServiceHelper.RESPOND_SUCCESS,result); // Second DTO entryDTO = listEntryDTO.get(1); entryDTO.setAmount("800"); - + // Modification de l'entrée dans la bdd. - result = instanceTransaction.modifyEntry(entryDTO); + result = serviceTransaction.modifyEntry(entryDTO); Assert.assertEquals(ServiceHelper.RESPOND_SUCCESS,result); // Vérifie que les deux DTO ont bien été modifiés. - listEntryDTO = instanceEntry.searchEntryDTOWithTransaction(transaction); + listEntryDTO = serviceEntry.searchEntryDTOWithTransaction(transaction); entryDTO = listEntryDTO.get(0); Assert.assertEquals("800,00",entryDTO.getAmount()); + + /* NETTOYAGE TEST */ + removeTransaction(serviceTransaction, transactionId); + serviceAccount.removeAccount("8"); + removeJournals(serviceJournal); + removePeriod(servicePeriod); + /* FIN NETTOYAGE TEST */ } /** @@ -341,35 +460,147 @@ @Test public void removeEntryTest () { - Transaction transaction = instanceTransaction.searchTransactionWithTopiaId(topiaIDTransaction); - List<EntryDTO> listEntryDTO = instanceEntry.searchEntryDTOWithTransaction(transaction); + log.info("BEGIN removeEntryTest()"); + PeriodServiceImpl servicePeriod = new PeriodServiceImpl(); + TransactionServiceImpl serviceTransaction = new TransactionServiceImpl(); + JournalServiceImpl serviceJournal = new JournalServiceImpl(); + AccountServiceImpl serviceAccount = new AccountServiceImpl(); + EntryServiceImpl serviceEntry = new EntryServiceImpl(); + + /* PREPARATION TEST */ + // Default period 01/01/2010 -> 31/12/2010 + TimeSpan timespan = createPeriod(servicePeriod); + Journal journal = createJournal(serviceJournal,"Journal transaction", "jt","description"); + String transactionId = createTransaction(serviceTransaction, "Facture 6", "description transaction", timespan, journal); + Transaction transaction = serviceTransaction.searchTransactionWithTopiaId(transactionId); + Account account = createAccount(serviceAccount,"8", "Compte essai", "0","actif"); + serviceTransaction.addEntry("entree1", "300", false, "lettering", "detail", transaction,account); + serviceTransaction.addEntry("entree2", "300", true, "lettering", "detail", transaction,account); + /* FIN PREPARATION TEST */ + + List<EntryDTO> listEntryDTO = serviceEntry.searchEntryDTOWithTransaction(transaction); // Prend le premier DTO EntryDTO entryDTO = listEntryDTO.get(0); // Supprime cette entrée - String result = instanceTransaction.removeEntry(entryDTO.getId()); + String result = serviceTransaction.removeEntry(entryDTO.getId()); Assert.assertEquals(ServiceHelper.RESPOND_SUCCESS,result); // Recherche dans la base de données les entrys - listEntryDTO = instanceEntry.searchEntryDTOWithTransaction(transaction); + listEntryDTO = serviceEntry.searchEntryDTOWithTransaction(transaction); // Trouve un seul entry DTO Assert.assertEquals(1,listEntryDTO.size()); + + /* NETTOYAGE TEST */ + removeTransaction(serviceTransaction, transactionId); + serviceAccount.removeAccount("8"); + removeJournals(serviceJournal); + removePeriod(servicePeriod); + /* FIN NETTOYAGE TEST */ } - + /** * Test la suppression d'une transaction et ses entrées. */ @Test public void removeTransactionTest () { + log.info("BEGIN removeEntryTest()"); + PeriodServiceImpl servicePeriod = new PeriodServiceImpl(); + TransactionServiceImpl serviceTransaction = new TransactionServiceImpl(); + JournalServiceImpl serviceJournal = new JournalServiceImpl(); + AccountServiceImpl serviceAccount = new AccountServiceImpl(); + EntryServiceImpl serviceEntry = new EntryServiceImpl(); + + /* PREPARATION TEST */ + // Default period 01/01/2010 -> 31/12/2010 + TimeSpan timespan = createPeriod(servicePeriod); + Journal journal = createJournal(serviceJournal,"Journal transaction", "jt","description"); + String transactionId = createTransaction(serviceTransaction, "Facture 6", "description transaction", timespan, journal); + Transaction transaction = serviceTransaction.searchTransactionWithTopiaId(transactionId); + Account account = createAccount(serviceAccount,"8", "Compte essai", "0","actif"); + serviceTransaction.addEntry("entree1", "300", false, "lettering", "detail", transaction,account); + /* FIN PREPARATION TEST */ + // Supprime cette transaction - String result = instanceTransaction.removeTransaction(topiaIDTransaction); + String result = serviceTransaction.removeTransaction(transactionId); Assert.assertEquals(ServiceHelper.RESPOND_SUCCESS,result); // Recherche dans la base de données les entrys - Transaction transaction = instanceTransaction.searchTransactionWithTopiaId(topiaIDTransaction); - List<EntryDTO> listEntryDTO = instanceEntry.searchEntryDTOWithTransaction(transaction); + transaction = serviceTransaction.searchTransactionWithTopiaId(transactionId); + List<EntryDTO> listEntryDTO = serviceEntry.searchEntryDTOWithTransaction(transaction); Assert.assertEquals(0,listEntryDTO.size()); - // Efface seconde transaction - result = instanceTransaction.removeTransaction(topiaIDTransaction2); + + /* NETTOYAGE TEST */ + serviceAccount.removeAccount("8"); + removeJournals(serviceJournal); + removePeriod(servicePeriod); + /* FIN NETTOYAGE TEST */ + } + + private TimeSpan createPeriod(PeriodServiceImpl servicePeriod) { + TimeSpanServiceImpl serviceTimespan = new TimeSpanServiceImpl(); + // debut 1 janvier 2010 + Date beginTimeSpan = new Date(110,0,1); + // fin 31 décembre 2010 + Date endTimeSpan = new Date(110,11,31); + // Création période avec son découpage sur 12 mois + String result = servicePeriod.createPeriod(beginTimeSpan, endTimeSpan, false); Assert.assertEquals(ServiceHelper.RESPOND_SUCCESS,result); + // Recherche du timespan 1 janv au 31 janv 2010 + //Date dateSearch = new Date(110,0,1); + TimeSpan timespan = serviceTimespan.searchTimeSpanByDate(beginTimeSpan); + return timespan; } - + + private void removePeriod(PeriodServiceImpl servicePeriod) { + // Supprime Period & TimeSpan + Date d = new Date(110,0,1); + PeriodDTO periodDTO = servicePeriod.searchPeriodDTOWithDate(d); + servicePeriod.removePeriod(periodDTO); + } + + private Journal createJournal(JournalServiceImpl serviceJournal, + String label, String prefix, String description) { + // Création Journal + String result = serviceJournal.createJournal(label, prefix, description); + Assert.assertEquals(ServiceHelper.RESPOND_SUCCESS,result); + // Recherche du journal pour l'ajouter dans la transaction + Journal journal = serviceJournal.searchJournalWithLabel(label); + Assert.assertNotNull(journal); + return journal; + } + + private void removeJournals(JournalServiceImpl serviceJournal) { + // Supprime Journal + List<JournalDTO> listJournal = serviceJournal.getAllJournal(); + for (JournalDTO journalDTO : listJournal) + { + serviceJournal.removeJournal(journalDTO); + } + } + + private String createTransaction(TransactionServiceImpl serviceTransaction, + String voucherRef, String description, TimeSpan timespan, Journal journal) { + // Création d'une transaction + String transactionId = serviceTransaction.createTransaction( + timespan.getBeginTimeSpan(), voucherRef, description, timespan, journal); + /** + * Si il renvoie succes et non l'identifiant (à commenter dans la classe correspondante) + */ + //Assert.assertEquals(ServiceHelper.RESPOND_SUCCESS,result); + Assert.assertFalse(transactionId.equals(ServiceHelper.RESPOND_ERROR)); + log.debug("RESULT createTransaction : " + transactionId); + return transactionId; + } + + private void removeTransaction(TransactionServiceImpl serviceTransaction, String transactionId) { + String result = serviceTransaction.removeTransaction(transactionId); + Assert.assertEquals(ServiceHelper.RESPOND_SUCCESS,result); + } + + private Account createAccount(AccountServiceImpl serviceAccount, + String accountNumber, String label, String masterAccountNumber, String type) { + serviceAccount.createAccount(accountNumber, label, masterAccountNumber, type); + Account account = serviceAccount.searchAccount(accountNumber); + Assert.assertEquals(accountNumber,account.getAccountNumber()); + return account; + } } Added: trunk/callao-service/src/test/resources/Callao_bdd.properties =================================================================== --- trunk/callao-service/src/test/resources/Callao_bdd.properties (rev 0) +++ trunk/callao-service/src/test/resources/Callao_bdd.properties 2009-10-13 16:50:55 UTC (rev 2669) @@ -0,0 +1,24 @@ +# Propri\u00E9t\u00E9s par d\u00E9faut pour une base de donn\u00E9es de type H2 +hibernate.hbm2ddl.auto=update +hibernate.show_sql=false + + +hibernate.dialect=org.hibernate.dialect.H2Dialect +hibernate.connection.username=sa +hibernate.connection.password= +hibernate.connection.driver_class=org.h2.Driver +hibernate.connection.url=jdbc:h2:file:target/h2data/callao +#hibernate.connection.url=jdbc:h2:file:~/.callao/callao + + +#topia.service.history=org.nuiton.topia.history.TopiaHistoryServiceImpl + +# Permet de pr\u00C3\u00A9ciser les classes \u00C3\u00A0 persister +topia.persistence.classes=org.chorem.callao.entity.AccountImpl, \ +org.chorem.callao.entity.ClientImpl, \ +org.chorem.callao.entity.EntryImpl, org.chorem.callao.entity.PeriodImpl, \ +org.chorem.callao.entity.JournalImpl, org.chorem.callao.entity.ProjectImpl, \ +org.chorem.callao.entity.TimeSpanImpl, org.chorem.callao.entity.TransactionImpl, \ +org.chorem.callao.entity.UsersImpl, org.chorem.callao.entity.LogImpl + +#topia.service.security=org.nuiton.topia.security.TopiaSecurityServiceImpl

1 0

r2668 - trunk
by tchemit＠users.chorem.org 11 Oct '09

11 Oct '09

Author: tchemit Date: 2009-10-11 14:14:48 +0200 (Sun, 11 Oct 2009) New Revision: 2668 Modified: trunk/LICENSE.txt trunk/pom.xml Log: update mavenpom, junit, i18n and processor versions expect for JTimer which is NOT a mavenpom project (what a shame... must be changed) Modified: trunk/LICENSE.txt =================================================================== --- trunk/LICENSE.txt 2009-09-25 08:17:49 UTC (rev 2667) +++ trunk/LICENSE.txt 2009-10-11 12:14:48 UTC (rev 2668) @@ -1,166 +1,674 @@ - GNU LESSER GENERAL PUBLIC LICENSE + GNU GENERAL PUBLIC LICENSE Version 3, 29 June 2007 Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/> Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. + Preamble - This version of the GNU Lesser General Public License incorporates -the terms and conditions of version 3 of the GNU General Public -License, supplemented by the additional permissions listed below. + The GNU General Public License is a free, copyleft license for +software and other kinds of works. - 0. Additional Definitions. + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +the GNU General Public License is intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. We, the Free Software Foundation, use the +GNU General Public License for most of our software; it applies also to +any other work released this way by its authors. You can apply it to +your programs, too. - As used herein, "this License" refers to version 3 of the GNU Lesser -General Public License, and the "GNU GPL" refers to version 3 of the GNU -General Public License. + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things. - "The Library" refers to a covered work governed by this License, -other than an Application or a Combined Work as defined below. + To protect your rights, we need to prevent others from denying you +these rights or asking you to surrender the rights. Therefore, you have +certain responsibilities if you distribute copies of the software, or if +you modify it: responsibilities to respect the freedom of others. - An "Application" is any work that makes use of an interface provided -by the Library, but which is not otherwise based on the Library. -Defining a subclass of a class defined by the Library is deemed a mode -of using an interface provided by the Library. + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must pass on to the recipients the same +freedoms that you received. You must make sure that they, too, receive +or can get the source code. And you must show them these terms so they +know their rights. - A "Combined Work" is a work produced by combining or linking an -Application with the Library. The particular version of the Library -with which the Combined Work was made is also called the "Linked -Version". + Developers that use the GNU GPL protect your rights with two steps: +(1) assert copyright on the software, and (2) offer you this License +giving you legal permission to copy, distribute and/or modify it. - The "Minimal Corresponding Source" for a Combined Work means the -Corresponding Source for the Combined Work, excluding any source code -for portions of the Combined Work that, considered in isolation, are -based on the Application, and not on the Linked Version. + For the developers' and authors' protection, the GPL clearly explains +that there is no warranty for this free software. For both users' and +authors' sake, the GPL requires that modified versions be marked as +changed, so that their problems will not be attributed erroneously to +authors of previous versions. - The "Corresponding Application Code" for a Combined Work means the -object code and/or source code for the Application, including any data -and utility programs needed for reproducing the Combined Work from the -Application, but excluding the System Libraries of the Combined Work. + Some devices are designed to deny users access to install or run +modified versions of the software inside them, although the manufacturer +can do so. This is fundamentally incompatible with the aim of +protecting users' freedom to change the software. The systematic +pattern of such abuse occurs in the area of products for individuals to +use, which is precisely where it is most unacceptable. Therefore, we +have designed this version of the GPL to prohibit the practice for those +products. If such problems arise substantially in other domains, we +stand ready to extend this provision to those domains in future versions +of the GPL, as needed to protect the freedom of users. - 1. Exception to Section 3 of the GNU GPL. + Finally, every program is threatened constantly by software patents. +States should not allow patents to restrict development and use of +software on general-purpose computers, but in those that do, we wish to +avoid the special danger that patents applied to a free program could +make it effectively proprietary. To prevent this, the GPL assures that +patents cannot be used to render the program non-free. - You may convey a covered work under sections 3 and 4 of this License -without being bound by section 3 of the GNU GPL. + The precise terms and conditions for copying, distribution and +modification follow. - 2. Conveying Modified Versions. + TERMS AND CONDITIONS - If you modify a copy of the Library, and, in your modifications, a -facility refers to a function or data to be supplied by an Application -that uses the facility (other than as an argument passed when the -facility is invoked), then you may convey a copy of the modified -version: + 0. Definitions. - a) under this License, provided that you make a good faith effort to - ensure that, in the event an Application does not supply the - function or data, the facility still operates, and performs - whatever part of its purpose remains meaningful, or + "This License" refers to version 3 of the GNU General Public License. - b) under the GNU GPL, with none of the additional permissions of - this License applicable to that copy. + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. - 3. Object Code Incorporating Material from Library Header Files. + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. - The object code form of an Application may incorporate material from -a header file that is part of the Library. You may convey such object -code under terms of your choice, provided that, if the incorporated -material is not limited to numerical parameters, data structure -layouts and accessors, or small macros, inline functions and templates -(ten or fewer lines in length), you do both of the following: + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work. - a) Give prominent notice with each copy of the object code that the - Library is used in it and that the Library and its use are - covered by this License. + A "covered work" means either the unmodified Program or a work based +on the Program. - b) Accompany the object code with a copy of the GNU GPL and this license - document. + To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. - 4. Combined Works. + To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. - You may convey a Combined Work under terms of your choice that, -taken together, effectively do not restrict modification of the -portions of the Library contained in the Combined Work and reverse -engineering for debugging such modifications, if you also do each of -the following: + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. - a) Give prominent notice with each copy of the Combined Work that - the Library is used in it and that the Library and its use are - covered by this License. + 1. Source Code. - b) Accompany the Combined Work with a copy of the GNU GPL and this license - document. + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any non-source +form of a work. - c) For a Combined Work that displays copyright notices during - execution, include the copyright notice for the Library among - these notices, as well as a reference directing the user to the - copies of the GNU GPL and this license document. + A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. - d) Do one of the following: + The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. - 0) Convey the Minimal Corresponding Source under the terms of this - License, and the Corresponding Application Code in a form - suitable for, and under terms that permit, the user to - recombine or relink the Application with a modified version of - the Linked Version to produce a modified Combined Work, in the - manner specified by section 6 of the GNU GPL for conveying - Corresponding Source. + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. - 1) Use a suitable shared library mechanism for linking with the - Library. A suitable mechanism is one that (a) uses at run time - a copy of the Library already present on the user's computer - system, and (b) will operate properly with a modified version - of the Library that is interface-compatible with the Linked - Version. + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. - e) Provide Installation Information, but only if you would otherwise - be required to provide such information under section 6 of the - GNU GPL, and only to the extent that such information is - necessary to install and execute a modified version of the - Combined Work produced by recombining or relinking the - Application with a modified version of the Linked Version. (If - you use option 4d0, the Installation Information must accompany - the Minimal Corresponding Source and Corresponding Application - Code. If you use option 4d1, you must provide the Installation - Information in the manner specified by section 6 of the GNU GPL - for conveying Corresponding Source.) + The Corresponding Source for a work in source code form is that +same work. - 5. Combined Libraries. + 2. Basic Permissions. - You may place library facilities that are a work based on the -Library side by side in a single library together with other library -facilities that are not Applications and are not covered by this -License, and convey such a combined library under terms of your -choice, if you do both of the following: + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. - a) Accompany the combined library with a copy of the same work based - on the Library, uncombined with any other library facilities, - conveyed under the terms of this License. + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. - b) Give prominent notice with the combined library that part of it - is a work based on the Library, and explaining where to find the - accompanying uncombined form of the same work. + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. - 6. Revised Versions of the GNU Lesser General Public License. + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. - The Free Software Foundation may publish revised and/or new versions -of the GNU Lesser General Public License from time to time. Such new -versions will be similar in spirit to the present version, but may -differ in detail to address new problems or concerns. + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. - Each version is given a distinguishing version number. If the -Library as you received it specifies that a certain numbered version -of the GNU Lesser General Public License "or any later version" -applies to it, you have the option of following the terms and -conditions either of that published version or of any later version -published by the Free Software Foundation. If the Library as you -received it does not specify a version number of the GNU Lesser -General Public License, you may choose any version of the GNU Lesser -General Public License ever published by the Free Software Foundation. + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures. - If the Library as you received it specifies that a proxy can decide -whether future versions of the GNU Lesser General Public License shall -apply, that proxy's public statement of acceptance of any version is -permanent authorization for you to choose that version for the -Library. + 4. Conveying Verbatim Copies. + You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + + However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + + Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + + A contributor's "essential patent claims" are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of +this License. + + Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + + If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + + A patent license is "discriminatory" if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the non-exercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying the Program. + + 13. Use with the GNU Affero General Public License. + + Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU Affero General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the special requirements of the GNU Affero General Public License, +section 13, concerning interaction through a network will apply to the +combination as such. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + + Each version is given a distinguishing version number. If the +Program specifies that a certain numbered version of the GNU General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU General Public License, you may choose any version ever published +by the Free Software Foundation. + + If the Program specifies that a proxy can decide which future +versions of the GNU General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program. + + Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. + + 15. Disclaimer of Warranty. + + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY +OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM +IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE +USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF +DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD +PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +state the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + <one line to give the program's name and a brief idea of what it does.> + Copyright (C) <year> <name of author> + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU 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 General Public License + along with this program. If not, see <http://www.gnu.org/licenses/>. + +Also add information on how to contact you by electronic and paper mail. + + If the program does terminal interaction, make it output a short +notice like this when it starts in an interactive mode: + + <program> Copyright (C) <year> <name of author> + This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, your program's commands +might be different; for a GUI interface, you would use an "about box". + + You should also get your employer (if you work as a programmer) or school, +if any, to sign a "copyright disclaimer" for the program, if necessary. +For more information on this, and how to apply and follow the GNU GPL, see +<http://www.gnu.org/licenses/>. + + The GNU General Public License does not permit incorporating your program +into proprietary programs. If your program is a subroutine library, you +may consider it more useful to permit linking proprietary applications with +the library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. But first, please read +<http://www.gnu.org/philosophy/why-not-lgpl.html>. Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2009-09-25 08:17:49 UTC (rev 2667) +++ trunk/pom.xml 2009-10-11 12:14:48 UTC (rev 2668) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom</artifactId> - <version>1.0.2</version> + <version>1.1.0-SNAPSHOT</version> </parent> <groupId>org.chorem</groupId> @@ -77,7 +77,7 @@ <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> - <version>4.6</version> + <version>4.7</version> <scope>test</scope> </dependency>

1 0