Author: fdesbois Date: 2010-03-24 00:38:20 +0100 (Wed, 24 Mar 2010) New Revision: 2957 Log: rename PollenServiceTransformer in BusinessTransformer and put it in Topia Removed: trunk/pollen-topia-template/ Modified: trunk/pollen-business/pom.xml trunk/pollen-business/src/main/java/org/chorem/pollen/PollenContextImpl.java trunk/pollen-business/src/main/java/org/chorem/pollen/service/ServicePollImpl.java trunk/pollen-business/src/main/java/org/chorem/pollen/service/ServiceUserImpl.java trunk/pollen-business/src/main/resources/i18n/pollen-business-en_GB.properties trunk/pollen-business/src/main/resources/i18n/pollen-business-fr_FR.properties trunk/pollen-business/src/main/xmi/pollen.zargo trunk/pollen-business/src/test/java/org/chorem/pollen/business/TestManager.java trunk/pom.xml Modified: trunk/pollen-business/pom.xml =================================================================== --- trunk/pollen-business/pom.xml 2010-03-23 15:39:36 UTC (rev 2956) +++ trunk/pollen-business/pom.xml 2010-03-23 23:38:20 UTC (rev 2957) @@ -19,11 +19,6 @@ <dependencies> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>pollen-template</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>${project.groupId}</groupId> <artifactId>pollen-votecounting</artifactId> <version>${project.version}</version> </dependency> @@ -118,7 +113,7 @@ <defaultPackage>org.chorem.pollen</defaultPackage> <templates> org.nuiton.topia.generator.TopiaMetaTransformer, - org.chorem.pollen.template.PollenServiceTransformer + org.nuiton.topia.generator.BusinessTransformer </templates> </configuration> <goals> @@ -147,6 +142,13 @@ <artifactId>maven-i18n-plugin</artifactId> <executions> <execution> + <configuration> + <entries> + <entry> + <basedir>${maven.gen.dir}/java</basedir> + </entry> + </entries> + </configuration> <goals> <goal>parserJava</goal> <goal>gen</goal> @@ -154,12 +156,12 @@ </execution> <execution> <id>make-bundle</id> + <configuration> + <bundleOutputName>pollen-business</bundleOutputName> + </configuration> <goals> <goal>bundle</goal> </goals> - <configuration> - <bundleOutputName>pollen-business</bundleOutputName> - </configuration> </execution> </executions> </plugin> Modified: trunk/pollen-business/src/main/java/org/chorem/pollen/PollenContextImpl.java =================================================================== --- trunk/pollen-business/src/main/java/org/chorem/pollen/PollenContextImpl.java 2010-03-23 15:39:36 UTC (rev 2956) +++ trunk/pollen-business/src/main/java/org/chorem/pollen/PollenContextImpl.java 2010-03-23 23:38:20 UTC (rev 2957) @@ -14,12 +14,12 @@ import org.nuiton.topia.TopiaContext; import org.nuiton.topia.TopiaContextFactory; import org.nuiton.topia.TopiaException; -import org.nuiton.topia.TopiaNotFoundException; import org.nuiton.util.ApplicationConfig; import org.nuiton.util.ArgumentsParserException; import static org.nuiton.i18n.I18n._; import static org.nuiton.i18n.I18n.n_; import org.nuiton.i18n.init.DefaultI18nInitializer; +import org.nuiton.topia.TopiaNotFoundException; /** * PollenContext @@ -221,7 +221,6 @@ * * @return the main TopiaContext needed to begin new transaction */ - @Override public TopiaContext getTopiaRootContext() { try { return TopiaContextFactory.getContext(getProperties()); @@ -231,6 +230,11 @@ return null; } + @Override + public TopiaContext beginTransaction() throws TopiaException { + return getTopiaRootContext().beginTransaction(); + } + // @Override // public PollenConverter getConverter() { // if (converter == null) { @@ -247,7 +251,7 @@ * @param eee the exception to manage * @param message the message to add to the new PollenException * @param args for message - * @throws PollenException which contains the exception as the cause + * @throws PollenException which contains the exception as the cause */ @Override public void doCatch(Exception eee, String message, Object... args) Modified: trunk/pollen-business/src/main/java/org/chorem/pollen/service/ServicePollImpl.java =================================================================== --- trunk/pollen-business/src/main/java/org/chorem/pollen/service/ServicePollImpl.java 2010-03-23 15:39:36 UTC (rev 2956) +++ trunk/pollen-business/src/main/java/org/chorem/pollen/service/ServicePollImpl.java 2010-03-23 23:38:20 UTC (rev 2957) @@ -12,6 +12,7 @@ import org.chorem.pollen.entity.PollAccount; import org.chorem.pollen.entity.PollImpl; import org.chorem.pollen.entity.UserAccount; +import org.nuiton.i18n.I18n; import org.nuiton.topia.TopiaContext; import org.nuiton.topia.TopiaException; @@ -33,86 +34,100 @@ } @Override - protected Poll executeGetNewPoll(TopiaContext transaction) - throws TopiaException { - - PollDAO dao = PollenDAOHelper.getPollDAO(transaction); - + protected Poll executeGetNewPoll() { return new PollImpl(); } @Override - protected Poll executeGetNewPoll(TopiaContext transaction, Poll poll) - throws TopiaException { + protected Poll executeGetNewPoll(Poll poll) { throw new UnsupportedOperationException("Not supported yet."); } @Override - protected void executeCreatePoll(TopiaContext transaction, Poll poll) - throws TopiaException { + protected void executeCreatePoll(TopiaContext transaction, + List<Object> errorArgs, Poll poll) throws TopiaException { - PollDAO dao = PollenDAOHelper.getPollDAO(transaction); + errorArgs.add(poll.getTitle()); + errorArgs.add(poll.getUId()); - + PollenDAOHelper.getPollDAO(transaction).create(poll); + + transaction.commitTransaction(); } @Override - protected void executeUpdatePoll(TopiaContext transaction, Poll poll) throws TopiaException { + protected void executeUpdatePoll(TopiaContext transaction, + List<Object> errorArgs, Poll poll) throws TopiaException { throw new UnsupportedOperationException("Not supported yet."); } @Override - protected void executeSavePoll(TopiaContext transaction, Poll poll) throws TopiaException { + protected void executeSavePoll(TopiaContext transaction, + List<Object> errorArgs, Poll poll) throws TopiaException { throw new UnsupportedOperationException("Not supported yet."); } @Override - protected void executeDeletePoll(TopiaContext transaction, Poll poll) throws TopiaException { + protected void executeDeletePoll(TopiaContext transaction, + List<Object> errorArgs, Poll poll) throws TopiaException { throw new UnsupportedOperationException("Not supported yet."); } @Override - protected void executeDeleteChoice(TopiaContext transaction, Choice choice) throws TopiaException { + protected void executeDeleteChoice(TopiaContext transaction, + List<Object> errorArgs, Choice choice) throws TopiaException { throw new UnsupportedOperationException("Not supported yet."); } @Override - protected void executeCreateUpdateVote(TopiaContext transaction, PollAccount person) throws TopiaException { + protected void executeCreateUpdateVote(TopiaContext transaction, + List<Object> errorArgs, PollAccount person) throws TopiaException { throw new UnsupportedOperationException("Not supported yet."); } @Override - protected void executeDeleteVote(TopiaContext transaction, Poll poll, PollAccount person) throws TopiaException { + protected void executeDeleteVote(TopiaContext transaction, + List<Object> errorArgs, Poll poll, PollAccount person) + throws TopiaException { throw new UnsupportedOperationException("Not supported yet."); } @Override - protected Poll executeGetPollForUpdate(TopiaContext transaction, String pollUId) throws PollenBusinessException, TopiaException { + protected Poll executeGetPollForUpdate(TopiaContext transaction, + List<Object> errorArgs, String pollUId) + throws PollenBusinessException, TopiaException { throw new UnsupportedOperationException("Not supported yet."); } @Override - protected List<Poll> executeGetAllPolls(TopiaContext transaction) throws TopiaException { + protected List<Poll> executeGetAllPolls(TopiaContext transaction, + List<Object> errorArgs) throws TopiaException { throw new UnsupportedOperationException("Not supported yet."); } @Override - protected List<Poll> executeGetRunningPolls(TopiaContext transaction) throws TopiaException { + protected List<Poll> executeGetRunningPolls(TopiaContext transaction, + List<Object> errorArgs) throws TopiaException { throw new UnsupportedOperationException("Not supported yet."); } @Override - protected List<Poll> executeGetPollsByUser(TopiaContext transaction, UserAccount user) throws TopiaException { + protected List<Poll> executeGetPollsByUser(TopiaContext transaction, + List<Object> errorArgs, UserAccount user) throws TopiaException { throw new UnsupportedOperationException("Not supported yet."); } @Override - protected List<Comment> executeGetComments(TopiaContext transaction, Poll poll, int startIndex, int endIndex) throws TopiaException { + protected List<Comment> executeGetComments(TopiaContext transaction, + List<Object> errorArgs, Poll poll, int startIndex, int endIndex) + throws TopiaException { throw new UnsupportedOperationException("Not supported yet."); } @Override - protected List<PollAccount> executeGetVotes(TopiaContext transaction, Poll poll, int startIndex, int endIndex) throws TopiaException { + protected List<PollAccount> executeGetVotes(TopiaContext transaction, + List<Object> errorArgs, Poll poll, int startIndex, int endIndex) + throws TopiaException { throw new UnsupportedOperationException("Not supported yet."); } Modified: trunk/pollen-business/src/main/java/org/chorem/pollen/service/ServiceUserImpl.java =================================================================== --- trunk/pollen-business/src/main/java/org/chorem/pollen/service/ServiceUserImpl.java 2010-03-23 15:39:36 UTC (rev 2956) +++ trunk/pollen-business/src/main/java/org/chorem/pollen/service/ServiceUserImpl.java 2010-03-23 23:38:20 UTC (rev 2957) @@ -27,52 +27,65 @@ } @Override - protected UserAccount executeConnect(TopiaContext transaction, String login, String password) throws PollenBusinessException, TopiaException { + protected UserAccount executeConnect(TopiaContext transaction, + List<Object> errorArgs, String login, String password) + throws PollenBusinessException, TopiaException { throw new UnsupportedOperationException("Not supported yet."); } @Override - protected void executeCreateUpdateUser(TopiaContext transaction, UserAccount user) throws TopiaException { + protected void executeCreateUpdateUser(TopiaContext transaction, + List<Object> errorArgs, UserAccount user) throws TopiaException { throw new UnsupportedOperationException("Not supported yet."); } @Override - protected void executeDeleteUser(TopiaContext transaction, UserAccount user) throws TopiaException { + protected void executeDeleteUser(TopiaContext transaction, + List<Object> errorArgs, UserAccount user) throws TopiaException { throw new UnsupportedOperationException("Not supported yet."); } @Override - protected List<UserAccount> executeGetUsers(TopiaContext transaction) throws TopiaException { + protected List<UserAccount> executeGetUsers(TopiaContext transaction, + List<Object> errorArgs) throws TopiaException { throw new UnsupportedOperationException("Not supported yet."); } @Override - protected PollAccount executeGetNewList(TopiaContext transaction) throws TopiaException { + protected PollAccount executeGetNewList(TopiaContext transaction, + List<Object> errorArgs) throws TopiaException { throw new UnsupportedOperationException("Not supported yet."); } @Override - protected void executeCreateUpdateList(TopiaContext transaction, PollAccount list) throws TopiaException { + protected void executeCreateUpdateList(TopiaContext transaction, + List<Object> errorArgs, PollAccount list) throws TopiaException { throw new UnsupportedOperationException("Not supported yet."); } @Override - protected void executeDeleteList(TopiaContext transaction, PollAccount list) throws TopiaException { + protected void executeDeleteList(TopiaContext transaction, + List<Object> errorArgs, PollAccount list) throws TopiaException { throw new UnsupportedOperationException("Not supported yet."); } @Override - protected List<PollAccount> executeGetFavoriteLists(TopiaContext transaction) throws TopiaException { + protected List<PollAccount> executeGetFavoriteLists( + TopiaContext transaction, List<Object> errorArgs) + throws TopiaException { throw new UnsupportedOperationException("Not supported yet."); } @Override - protected PollAccount executeGetNewPerson(TopiaContext transaction, UserAccount user) throws TopiaException { + protected PollAccount executeGetNewPerson(TopiaContext transaction, + List<Object> errorArgs, UserAccount user) throws TopiaException { throw new UnsupportedOperationException("Not supported yet."); } @Override - protected PollAccount executeGetPerson(TopiaContext transaction, String accountUId) throws PollenBusinessException, TopiaException { + protected PollAccount executeGetPerson(TopiaContext transaction, + List<Object> errorArgs, String accountUId) + throws PollenBusinessException, TopiaException { throw new UnsupportedOperationException("Not supported yet."); } Modified: trunk/pollen-business/src/main/resources/i18n/pollen-business-en_GB.properties =================================================================== --- trunk/pollen-business/src/main/resources/i18n/pollen-business-en_GB.properties 2010-03-23 15:39:36 UTC (rev 2956) +++ trunk/pollen-business/src/main/resources/i18n/pollen-business-en_GB.properties 2010-03-23 23:38:20 UTC (rev 2957) @@ -9,17 +9,35 @@ pollen.error.servicePoll.addComment= pollen.error.servicePoll.createChoice= pollen.error.servicePoll.createPoll= +pollen.error.servicePoll.createUpdateVote= pollen.error.servicePoll.delete= pollen.error.servicePoll.deleteChoice= pollen.error.servicePoll.deleteComment= pollen.error.servicePoll.deletePoll= +pollen.error.servicePoll.deleteVote= pollen.error.servicePoll.getAllPolls= pollen.error.servicePoll.getComments= +pollen.error.servicePoll.getNewPoll= pollen.error.servicePoll.getPoll= +pollen.error.servicePoll.getPollForUpdate= +pollen.error.servicePoll.getPollsByUser= pollen.error.servicePoll.getRestrictedAccount=Unable to retrieve restricted account with accountUId \= %1$s and poll with uid \= %2$s +pollen.error.servicePoll.getRunningPolls= +pollen.error.servicePoll.getVotes= +pollen.error.servicePoll.savePoll= pollen.error.servicePoll.updatePoll= pollen.error.serviceResults.importPoll= +pollen.error.serviceUser.connect= pollen.error.serviceUser.createDefaultAdmin= +pollen.error.serviceUser.createUpdateList= +pollen.error.serviceUser.createUpdateUser= +pollen.error.serviceUser.deleteList= +pollen.error.serviceUser.deleteUser= +pollen.error.serviceUser.getFavoriteLists= +pollen.error.serviceUser.getNewList= +pollen.error.serviceUser.getNewPerson= +pollen.error.serviceUser.getPerson= +pollen.error.serviceUser.getUsers= pollen.error.serviceVote.getVote= pollen.error.serviceVote.getVotesByPoll=Unable to load votes from poll with uid \= %1$s pollen.error.serviceVote.hasAlreadyVoted=Unable test vote existing for account with votingId \= %1$s and poll with uid \= %2$s Modified: trunk/pollen-business/src/main/resources/i18n/pollen-business-fr_FR.properties =================================================================== --- trunk/pollen-business/src/main/resources/i18n/pollen-business-fr_FR.properties 2010-03-23 15:39:36 UTC (rev 2956) +++ trunk/pollen-business/src/main/resources/i18n/pollen-business-fr_FR.properties 2010-03-23 23:38:20 UTC (rev 2957) @@ -9,16 +9,34 @@ pollen.error.servicePoll.addComment=Impossible d'ajouter un nouveau commentaire cr\u00E9\u00E9 par %1$s pour le sondage %2$s (%3$s) pollen.error.servicePoll.createChoice= pollen.error.servicePoll.createPoll=Impossible d'enregistrer le sondage %1$s cr\u00E9\u00E9 par %2$s +pollen.error.servicePoll.createUpdateVote= pollen.error.servicePoll.deleteChoice= pollen.error.servicePoll.deleteComment=Impossible de supprimer le commentaire ayant pour identifiant "%1$s", appartenenant au sondage %2$s (%3$s) pollen.error.servicePoll.deletePoll=Impossible de supprimer le sondage ayant pou identifiant "%1$s" +pollen.error.servicePoll.deleteVote= pollen.error.servicePoll.getAllPolls= pollen.error.servicePoll.getComments= +pollen.error.servicePoll.getNewPoll= pollen.error.servicePoll.getPoll= +pollen.error.servicePoll.getPollForUpdate= +pollen.error.servicePoll.getPollsByUser= pollen.error.servicePoll.getRestrictedAccount=Unable to retrieve restricted account with accountUId \= %1$s and poll with uid \= %2$s +pollen.error.servicePoll.getRunningPolls= +pollen.error.servicePoll.getVotes= +pollen.error.servicePoll.savePoll= pollen.error.servicePoll.updatePoll=Impossible de mettre \u00E0 jour le sondage %1$s (%2$s) pollen.error.serviceResults.importPoll= +pollen.error.serviceUser.connect= pollen.error.serviceUser.createDefaultAdmin=Impossible de cr\u00E9er l'administrateur par d\u00E9faut \: %1$s (%2$s) +pollen.error.serviceUser.createUpdateList= +pollen.error.serviceUser.createUpdateUser= +pollen.error.serviceUser.deleteList= +pollen.error.serviceUser.deleteUser= +pollen.error.serviceUser.getFavoriteLists= +pollen.error.serviceUser.getNewList= +pollen.error.serviceUser.getNewPerson= +pollen.error.serviceUser.getPerson= +pollen.error.serviceUser.getUsers= pollen.error.serviceVote.getVote= pollen.error.serviceVote.getVotesByPoll= pollen.error.serviceVote.hasAlreadyVoted= Modified: trunk/pollen-business/src/main/xmi/pollen.zargo =================================================================== --- trunk/pollen-business/src/main/xmi/pollen.zargo 2010-03-23 15:39:36 UTC (rev 2956) +++ trunk/pollen-business/src/main/xmi/pollen.zargo 2010-03-23 23:38:20 UTC (rev 2957) @@ -1,11 +1,10 @@ -PKۄw<pollen.argo�TKn�0��� �AQt!kcwѢA��]��$=�~�'�=z��"mRv�E61�g��ޣ8���D6�T(�u�1�ﲬ��1M�Eb1bt/�@8�U�,R8Av����B}_<|*VUyZ{��j$��Z�y��`,p�Z�@k:��9F�ΐ�ߏ߲U�*��A����iT���*���Aƀ}.��H� -�����&�^Qqׄ -��P�F4J�aG�ͅx�G9����0�|�G�(�R��D4J�q\��בW$�&^)���4��d -\����QK,�zB��T���ݡ+��{��G��1����B�v������3��'(��<�W��Ճ��Ų��)L��>v�$B�l'P$�$��XGx�6nx�I -�"�~$��z �:������ͯ���S������L�B~�����~��!���ƴ��7�EqRz�K�g��= -Ǿ�o�8{��������W�p" -��[�Bv�{�g���P�Uhv�~�F ��¾�k�5/��&B����� -�w��T�m��.�m���ShA�+�n�C�$�qPZȣ��a�,�i��w�PKZ�949PKۄw<pollen_Modèle.pgml�]�n�F�ߧ���"�3�k�p�dQ�i��E��IZ� +PK��w<pollen.argo�TKn�0��� �AQt!kcwѢA��]��,=�~�'�=z��"eRv�E6�ś��aEd+��Bѯ�y}�e���k�-���;!{¡��$HY�ٙ���C���x�T��r�=KA5�X-�<Q^0�l�R�5�� +�z�9F��ߏ߲U�*��@u���iT} LAU.A/4 +Z���,\�1#QJ48��9�4!�W��p��)m$A���q`�\�x�c� 3��x�R 5.w$A�T���x>��� Ax4ɕ؞�aD&S�"� +�|���#T�HuW���B��C +{�(�q�AlZi+�j��x;�ד�vE[�g � +�@�z��,[=�p��c�K"��v2E�J�� Gl@Y�-��'�+�E�l���.�$�����_?o~��_��4�ޚ2T�Q��s{�d�k���i)a�~��bV���y�9��Q8��uC��+�������i���:�-�sg8+��B�g��){�6 +��}46n��k^L�����|����\�m͇�(L]��k-x�7�Ђ�W��D�� �렴�'w�ÊIf�f���PK����4:PK��w<pollen_Modèle.pgml�]�n�F�ߧ���"�3�k�p�dQ�i��E��IZ� �r��>оǾ�)���CrFQEٮ$R�|���7��������1X,�x~q�ε�I0�b?��.�>�=��&?^~��o/�~���W�������z39K����F��������������]���(���l�ޟ/7 �.���KV��|�x��u�.�/���gj�өmO�1�" O-l�x�t�"��qoo��S[Ӵ�Z��B3Ͼ�d��{\������7 ξ��/?�-������L�^�����}�?2𓉮�O&� �?���M�>���& @@ -46,24 +45,20 @@ -�r.zb��</^͓�����xc�0���"�ݳ�����o��a��Y|����D8[�i�=ː�{�{��[%�+��mЇ��|t�UZH�ǫfN^[-%E�\L��p�]-e�vYj�͂�+�V��r��9#�Co�}����6z��$��Hf�i�ʼ~�&�_��6#F*�2뺝RJѺib����ܱ��Vg2�z�.�m[N������j���t���oG!?�Y-p�T�z�G!?�Y�f@���Q����:���#v.�z;2tG�o�r%��B��3�FLcc�T��7n���q̬q������7�Y��$6�92e]�-�=����͆�f�AM���X���J5B���-����1�n6��7[�f�?����Y��ղ��͗���a�I3��֪�sk3��n����] �[o�[�{��n����Z����aѡ�� �T%Ea%��\��P��U��aXUw,�8\ӓ��T��=�� ��5�Y\h�3U�@y�����JB� ��w=�TU����z�����61!fM;*���\Dz��Ê���@�cX��P��q�Ō� Ob-�{����(Vd��� -�Q�2�+g�=��mճ�q����_���?3j�|9q�&:G_��G���PK����PKۄw<pollen_Services.pgml�\�o�8�����ԤB ]�i��Ӥ}��!M��D�!���������K�d�.tJZcx��_���/|e -��`�=�����. -�q���ku�7���/�L��}=W��������'�� -=���"���� ђĽ���١�W�����B{ы�M��WDCV!�P���ǩoG���Ϳ�A�۵�.0�]�j]S3o}`�g�9�g3�k��z�ީ�Α���;�0\#F�� �y!^-�K�S7���洗���v��Z�Dac��?����M�7(B�>�l?��#�b�7ލ��x C�=7�4��Ú��}�!�Q�4��v��8V����l`�3��T���!ߧ}���q8����F -�?`�iR�6��m��4�/��!Z����R1��C���a��^F�����7��b��d>�Px75s��9�m�YuVm�R�U��45��;�������e���˲����B����'ZB���zh&i�2��)�uă�� -��E���^��,�7X`o���/PK�'e#@��l�!0B��VF�M�P���+3з�Ӱ����GθOay�-�]�����B�^E͐c'#d -ٜ��<y���63�+�V���u']���W[�=JB���i<饅*�ٓ���aɄ����i�B����;I_��墈��(�%[L�bi�dA����,@t�����W,��Ĵ�� -����<��ebي�Ӟ��.ug�V,�įl�cg��V65 -����h�א�* e2r� -> -�������ؠWcC���'u�{ԝ;�� -�dz�|�wl�:�M9S�s�l]��_�`�8�K��������Gg��V@��F�k��G�7��6-``��3�WKw�R�u��������nJa7D�����Bn������[�s�sL7b�N������?��o�~��-�1�I���g�L�1݅D8H�����U@��;0�K��?@"�q�P�O@'��dth@0.�v\�t�?C���؈I���R�/I����H���&�����v��}�ror?����Pv�BCE=Fz0 �<�X�GҔ�VX��#C��Æ�?VA@��^���5�-}�Q�� ��y�p��xE�(5��B��!S�͵f -2��e*ej���7*���!���֠����-�v܌B�6��4�P�̂8H -�Zm���y�L�0��1�}�Z,��}�\Q��(�5Ŗ{�nD>��u���E7Y� -�/P�s�BU>���H�(��o�E&�F�,���e>`g2����H�s�un�g�|��)�_'�(����N�3(�-fXъN���T�N�SE����M�JR��Pɬ}Z��i}�n�>q<��x/%��,���>Հ"�JI���>����)�Pf�F���X�-R���>�3� -\��+=�i`���(Ȏ�O�v��|0]8�y$fWEAUF�|�Pt���g�3�Gs5��q4�����c��ٶrD�=y� � a�7��i���j�8b~dC��<Lb>�;�H&mL9� ,��H�^1�>�zF -p�"�K�6�Ӑ��m J �TAXhU� t����8D OH?%<��R�!b�VN��ӵ�����Sb���V���%�[��"��N���D<�����9�� -�N��O09�PKF;�!��@PKۄw<pollen_Diagrammedeclasses.pgml�Zko�H��_�VU*��c0� PuIZEj���T�V�ʘ���a��G��w��/HC[Ԅ����9w�̽a��n�K7���.G2ꨲ�����7����(�,��8�0��tq&��tyu�^��Mg�g2�f8t x4e^�f]A'q͈�1{� �͉�o����+�;+ҹ~�n��ax���M���4�+ +�Q�2�+g�=��mճ�q����_���?3j�|9q�&:G_��G���PK����PK��w<pollen_Services.pgml�\ko�6��_�C��#J�é��M��@_X��P�D�\eѐh'��GJ�^�%���V +;E=�9������]�F1��jO���=������S^L�ƿ��t����7�ҧ\~�����c�x=�#9��؍В$wÑ?p"�h'���G�b� ��D+��"8X��Շ��ǯ�>���a�o�}`��@���f]���g�5rf3��o��z��^�f�HI~Bg'�K����є�����٩䫛Ώsz�w!���q�_��Dac��?F���C�_Q��8�9A�Ǵ/��n �"x3Q��%���xӑ�64��;����Y}��?����h��G�A]Pϵ�3��c8��n�����5m�:_�����&��������a�A�8������IOn��7�#�I�»i�C�� �S4��j�jc�Zm�ۤ(��!u�p����].s�߲[V�F�n��y�%T��n�f�u�RΑ���D<(���_�_���6��f��6������[R5T�0�F#T�`le���Ea//>3�!}����8r'�$���8�Fv���-��*&h�\'!�����鳀<g����|�@?�Sv; ���ځ~?�q�"E��O�����ϟT�F��%{o�i�B����;�&�qT岈��,�)����҉Ȃ>=I%�������%*�\��s�e��%����"��ibՊ���o<��t�Xr��ٌ&��lj� �y���!�u�d�f���tu +[cn�빡� #��'���sGx��=���C�������?�3�Ä`�2�G��Fv +�%���n��P�;P^n�f@�A�UD��1��ސ/X�t��Zz�oJ��otq=>v֏�ݒ�n����=�݃���m)�&���;����.Ď��==n +�H +����fu�'� �*��_1��t�0�����W!i��.��H0�QG������"�lG�ѡ��лq��Ag���c#!��G��$ +�֓ ]�j�hLX��σ �e0��d��ń톲 +�*"�0Z`8�!A�n���ؒ��H��ڐ:��$��U�!�b�ke��G�P��nȊ_�]�0:^�/J +���7vȔtq�Y���)b�0��9^��߸��c�D�]��[ڂBrC�t؊����(�.�+S� +�CA��AR��j��4ϓW��������3���� + +�����Kl��F�c�e��(�Ŋl�z�*��'���E��FE�~3-�x7VՍ�.�;��T�fG:���k�?K�8�O��&�F����pB����@`E':IO>R�8�Ou��Pߛ�T�>ը]PI�>�[ɴ>`�Z�$���Y>�SI(?K�8�O=�dB��ThR��_M�Sa��F���� +��K�z��}8g��zyUz��;.C:���#Q�oC�,�8��Quc���sOή����O�4S4>��R�L��vo�p!��6]Ӻ�}BCZ:ۖCN�h������0�[�J�XTԵD1?2�!�b&1� +c$��M�uK��]�NP/����~=��8aG�-HjW�OhH�¶��h� -�G�}.�5�P��J�I@��Ԁ`�آ��a2�t�ƨa����껮5*��k���xpR�Eb#�A�(��rξ���S��L��PK�N�ŷ�@PK��w<pollen_Diagrammedeclasses.pgml�Zko�H��_�VU*��c0� PuIZEj���T�V�ʘ���a��G��w��/HC[Ԅ����9w�̽a��n�K7���.G2ꨲ�����7����(�,��8�0��tq&��tyu�^��Mg�g2�f8t x4e^�f]A'q͈�1{� �͉�o����+�;+ҹ~�n��ax���M���4�+ R5�Ќ�������5,�úb��:P�Ծ| E����#yB��q�`���*�[�OM�~���,�����G�I��jꑄt�s`��G���G���$�����$�v���3[<7L:�������a��EU�)�5u5��ɜ�ڷp
i(��%�s��S6�o�g���ﺶĝ���|M�y0rcs�n�6�n/=��d܍d=e�>sKf|>���2�ěsx5�HL%���J�R����*i�.�u�q�L9~:$[��:d.�(ߊ)K�c|�M���d��]Gx� �e�+���7��2�KP �� ȅ���*7;\�o��i,�'BX�N��F� ��2k���N�qB�� I/_��d�dPb�z��p�'�H�d,3O�?���!�*�2����8�z�L��ͤy���'�"�������XL��I��2��� @@ -76,79 +71,75 @@ �dE�0 �2�����[8�>��5Ѻk�0�9�{�G�m�����| fx���WGM��[`y�V>������*�w���P���ai�,�*Z��b4s�1v<�v�C�1 -^� �?j���ݺU�V{y���WoS�l�H:���?>�PK9ܜ='PKۄw<pollen.todo�����Q(K-*���S�UP2�3PRH�K�O��K ����Z()��q�(��;�D�*���+G���*(�8z)%)J -@% ���,.2���E���9e�)�E�%��� Y,B3PK4�[-m�PKۄw<pollen_profile.profile�����Q(K-*���S�UP2�3PRH�K�O��K ����Z()��qq��e��q��ÙPK7Rp:BPKۄw< -pollen.xmi�]�㶕��M���H�S�ؙ�Z�k��wo�� R3�H-I���V��HQMJ��(AI��x?�?���Α��؞+�EzP��]ӳlw����q5�<H}��O����eg3������?�����Co��.��`L8D?>H����n��}<@�W�K�&)���䵡K��GI����7��_7|����I:�my�a�������������[���!�Cx�5n a��۷Q��x�`��U�7鑿����Cu2T�� ����%�g�iB��-��1PTI����+��������?K��_�ר�ҟ��[�D/�"4�i=:R��|�F�mzb��2Կ}�&~ґ� GM� -�s��D]_�zz�m����`2(�`���`��צ6�n��l6�׃�,˯���Q=ه���s�>Hv�aM{c��x�O��������@�y���D;����f��i�N�X:3m��Z���F�f_~!y:ţ���z�n��LFk@&X]�����R� ߤ�1�@bBա�ӫ���~�g�4Y����=�p}�a�|�|x����,)����U�I�F��"�gZ��g��0����**H�e7���&h�n��T77���cz:�5��|�|���<Do�ï4�:�J��peW�����A@Xو�`���%+�H���ԲL�$����!��v̟<�Dd#�����֎m2��2[�fh?C2�NL�,�,�.%���éAVD^�`�6��� -��Ԉ�Ȇ�����O��"B�� <�y���зׇ���#Lt}-��>�d0&�=��OGz�����7^����Gϰ]���Ŵ���-/O�p�cB�oax��K��f�?��g�Yż�Nh����nɢI5���S"}�W -}<ؼ��q�k ��&"�8�g�$�G?H��>����}"�͠.[���d����:�Q��A�H5EJ��S��)I R�ɜ̨��ӫ�|7-��E�o����=�oTl���7 -^��#��"�Ǔ��Z�AR�e���)~����\�ZGJu��dṟ0gӜ� -�"�����q��?���V��+cZl4?��aύ�����Yx� -R��k���5��U�R�i4���B3�6�o�t�F�$� -�ܿ���z?�-��7�Z�ׁ�և��CMo��;,�K -w�\��2��]FV9�ed���L�f�us]�S��I�y��Ԣ���<R��cA\!W�d��:Z��{�@1�(j��-Rл�[ĉ�6�J�EK -%�,/�t�rf��� -��RE��̳��Ȩ�j��a���`�Ρ|^���ֺ_�+Gیr��(�7��B/�"��?"����E7���=�G����C�m�����"+O�4(Yi$Hw�!$`p1�s�rH`�3��O��G'|{���r�p��a�������/{A6����M!qC8%7�w�=+Z�ʰ�Uy]�v��z�Q�kg�}~%Cǜ�ނ��J>���?�M��������!>�$�����7(jO��}4|����0����u�TL�=�S ��w���.P��烎���Ө�����/�o2��>s�pʟ�/2g8ϜyY�eM�`db���d�o,2����i���gD��n����m7��ѭb�T"�{ĚϞljs,,}��)R�G@��Qh-nl?߉�9Z��o2R(L�L�{���y���<�D�!2�3n4��MÌ��Z�t˜�$��Ia�X$�P3t�~蘒@:�t�߸��� � 0�k�k�Z]b���P��L?,]v#�����p����PX!��ΰ�Ҁ���3z*�Css^̊Ac!����Z�g����%}���d@������0��\����5�o�?\�8�ae�a*�u��#|϶���=�SR�z����rNr�&��CDSa��?l�J�,D���rj\��<���J��Z�09D}9=9q�U�+���:�L=�-�F܄J��.'�k3���0��[&�7>#�zpD�}n�h��}���#|u�"�&S� �S���U�7��U�����,f"�1�L��*�5֡Љ�',�n�h9k�_�B'��G��x0%�Ej -�t+&ԦЌ��B�C_OT5�0Y �p��w�i���Uw�Ae"Ѣx��P�~�q�ֲ���v�hh�ڦϝ�F�w�tP@�F�t9�?���{������4.�Z��p�X0O-̵���z -��WPbRF;>y�H��j�w�0� 4Hw����ܫ�:0�+D���K"��0�t�0������hS�C�6��şhE$��!K��]��;��%�D�A\�~-[u�a��=����@#�7�j�D$y�F��f����ß -�pk��M�L�� ��������f!Pf"E1�L��̚�TX�-B������6k���(�e:4�k�A�X���6˾��(J�e:�0ޕ�_bK���~�����_�JG��25ӡ��/3�҃TX��t���S�Y8�Uѧ���/�7X��z�Ya���3˚9x]�#����x�QAuEA��� �� -�UF��`DZi(�9�� Nw��������m�0)�2n�� �Y�(xSg�+���G@@o! �'h㑮ET+����P��W��@,��a�X�@���6���D�7�Ȑ4�b���>Z#�Z60=7��RX��fL&�=�$��'!ڮ�����C,��}W`}��kR{?�AZ{V�ҋp�� �%��*����#�u����fM>�]X�����7� 11�ͺ^L��^�7�=1�dž2�om��z�q9��l x�B8Ǘ%��V�_;� -�t�� -��P�Z���F O��B��@�S��p�P�N�P��j7�hS(r�3z��ܞ�(�.Q�┉&���[s.��_Г[s%���-ݚ��9�����9�Rz���+���&Cܛ��FMP�@GP8� �� x�2!�U��larr��<�6��a�uܹ�/~��F�b�v�.7�E@bI�&'�Xm>���»f��h�0��؞���M�}�қf ��]�1��6�Lhj�G��Md�0���վy�����`��|��|���&:��L�.Cr��ea�I�0���D��y�Ž��D�ܓL��-��t��k��L -bRQ����;�}g��r������(��g:�dN�x2�ֆ6�r6Ӎ9�Mr�ra28�O��0���n2Ѫ�'�2���aG�3�s��5y��$�Ac0����34=ׅf�K2�x�Z���(R��;�lo1�E��@�[з�-�&�wh���[nOOt=�=17W��l�/�O�t�1֑Sk���e�*�*��~�4*�U�� -N�*��u� �RN%i���Q�=pC6leqY�_� �ԣ=� ƪ�ĊD�J�������{���wdZ���el�(Ӎj����D�^�Y�Ȟ�X�:�.�l:.��$-+�jL�y.���Z�Љ�c��^5*j���£$�'w���ZOcA�G���\�(1Zq��jek�9�p��:�M���a0�PKz��Q�(\�jd=��� l�Q'([��j���B�U�&D�H��؍��o����� $��I>D��~����j�K[ܯ:�hB8{���%�ՒE����m(�B!k�l�w��P�\}��@��(1����{��J -$G��]�k�0�cЭ�w�s�Lфvv�Ihg��0�!���B�.���'�4�Ѣ1-��H9�:�/�'� -[Kq���Q��T��ܚ]��s� -P��b��#t�>�2����֭��g�ղnP���-�'O�SF�e-x�:�r������v�P;C眣��[������� -���[A-�ia���!7,�W�0�挨YҲ��ɭ"�EV��n�E�{� -��ɻ �D�R�"M��/�qʵ�K~�I5���;��"����&c�:}"a�&���%=����D -{4y"��k�n����Xk2��?��a/�T,��`,�D'V��G��C3�M��XDk���B8�n��B�T|��ʤ ��ܫ@ޮ�� -DT�f��=�9Q�L�~E5�*�� w�&b9���K�$8a���H��؍�] ���e��*��e��� -� �1ˢ&�F���C��aw��Ty�y�3���خ}o�����z�n�ZU&�� -"���jI��3��rP -�Y�1,��"���YYi"�e� -����D�_�L��٢;b@~-���LI����*�e����s����U=���*.���H͇BE����N��sE4��H�����l{��/0��}f�@�w���;bȔ�ޜ0��-d�I�M�TS9_Z^��'��ɹE����$�'yc���ic0�V�������G���'χ���s�c�e����&v�~� -����f7_����k�x�ԉ�Ce~ -�/b� ��|<�X}�<$�S��8���Ac���Vcr�F���M���T�@��E݀�i�ˎ�ό�;+�|-9UH��l8���C� W=�Q �~��|k:�.�<ۭ1��di/����\~�{)ϭ:D�� -!��8w�r^-�� ���e]0 -I�Y'^��B��Ό4� -{8�G�P��s���\�Yj��٥I���gۤ_f8,�w�X�#���J^䦏�G��;��7�0Nè�pQU� ������c'�#����6���;�t�rsp���s{���>p]���-ؑ.rM!��-[����� -��������d,5�>"�Q�p�2�~Xశ����X8ϽS`�M`!���)�)�L&��=q�=`'���e��{�I`� -`�"�5��@���ʹ�j��larJ]� {���0�قZa�Za���KZ��-̽H@`�-`��hY���'/��4lC�(8��9-[�b�1=9�QV��Ún4�}6xG�E���N��π�����Ȑtbo�ea+s����V��O���ݥ=�+�@D�aN�����J��#��E�4�(��^�M�R�봅!v�<?�م�� -*<g< XT�J�Oo��q��n��Ũ�Lᝌg���1:{+��|#c�qy�GB�"Fw���?���n��Oh$LsR��+�Բ��W��{4 �ǯ�"��vď�ߞ�_�3C�=���C$&}�F�)#�z~�hG���WD�~z�ubNhzf����( -�#��÷���2'�_�������k��豦Px�p�_� -I����]M���{���$O�QzrD� �濔&�5�e5��^�S�ó3�]yޤ�"�_VC��8�>.{+��V��V<�����[����Ԏ��;�N�6���(���#}�|��S��* -�Ow��p{r�sp���3�+�eDT� -�P�2���L����-��Xx�X�VB��������� -JM�29�qE��#���e������RU!z����{9�'N�&jga���_�I�_�iRD�~m��i�D��7[@ �q~��b��PI�7����KS���Q�R�� -<{��8��R`�T��2�x��]�D_�����BVBi�CRZ�/���W#�D��QQ�"5 -[4�Ԟ�j� +^� �?j���ݺU�V{y���WoS�l�H:���?>�PK9ܜ='PK��w<pollen.todo�����Q(K-*���S�UP2�3PRH�K�O��K ����Z()��q�(��;�D�*���+G���*(�8z)%)J +@% ���,.2���E���9e�)�E�%��� Y,B3PK4�[-m�PK��w<pollen_profile.profile�����Q(K-*���S�UP2�3PRH�K�O��K ����Z()��qq��e��q��ÙPK7Rp:BPK��w< +pollen.xmi�]뗣6��������Jv�\���N�g]~��9IO��:;���]L0xWw���W�[<$��<3��-�Օ�O������e�H/�lϕ�"�)�N���Y���_|zZ�O��槿��N��������q�7�~�������pCla�&���F�`����P���:D�}��o4U�/�$UV价�H~���o%����-tC"p��/����C�v�o<L����= +�@����o�&������C�7鑿����u2P�� ����%�g�iB��-��e�^Q%y�&���2�V��#�,��_�f?H��oM^�<��0Ј�-D�,�H ���-����˷�@���m�������������8��3s?���'�{E��Wd�~�� +s8o���)X�'o�'�,��ӟGytw`�?�7�q�{'���4��mF��?��@���3_�������`f��T��dG�t f� � +�~�&�͞^!y:ţ��k덢*��aBȄ�yxw|��?ȷ�F�D,��Pu ����s�C¯�L��&��];�'���#���wJ�Βr��q��LZ4��G�>��:4?��߀�ؤ�TQ�@��(�p�ʆ5A�w�S�\CH�"k���L�04����v�������Ҭ��*ɮ�]�džsae#>���C٘X�bD�<N-��I�����2�~e��ٳMD6@۰���no8��Ȓ�l�_���ɜ:2!����;��c��Yy]@�SC��*�+h$OLsHE��x��|�^����5��ϣ|��m�C��`�i�hᏴ�%�1����t:�3���~��:�?��.z�����5Ϧ�g�n x}x����s�8���D<�*��`�wB{��E�'uKM�٥���#�j����5't���_J��4���>#% ?�N��vɿ���#�4�:oM�����Yd�?vH�&q���Mh"�)A��O����$%H�'s2���L�nZ���߂���;,���:����������hOƊjY:I�S��Zf��=!:o(�:l( � +�;,����c +`�*�9�`E� +��pH���Y�\f2�Z5f4��i����{�7���� �L��%��g�k�<b��h��υf�m��x�Z5�~I���^� +���~�[�?8��n��H���7LJ��v�vX���@� �e^���r���J?vʙ$���!���L�e���>_�E;
-��� -��wpCQ�W�2�ޡ�{����u<��.��ئ��<�n�Uɚz���D��$,|u6����:���x�vh>y>� -��>X�d+3�U&�����u�s%.B� ~�F�xl�� �x�M��yEh�I$�!덺Gc]�<�����C�����m�,RM�y�s�X���p��6����~\?�X!�n��;py�����u���n�l[w����6�x ��ɕ�'(���Ih�g[z?�ߥ��ǽ�ۆ?&_ -��eIx>B�����:>�c������\��B4�0����F_:��mL� �� -��yu�&����ʒ -�j��۵Sw���.t�s��]�L��X�8 -K�sc�FuӅ��{�F�A�'���a"���Շ��<���H�@j���Nˀh�W��t���-z%����ҩ9�Q�MFomښ���*�Qe��q�u�r����:U�xB%os�v���z�g�q�5��=�D��ۡ&p�����\��6`�����c�H��� �'̘2ҿ��� ��i_��dW��=�I��,-�ӓN�d��������';���-Yґ�����c�/�le+����?w�J[���Gy��W��vS��>�o��y\�um�����C�f���5��;�����3��[���jB9:x��5�����Յ]W�qJ�&݄&�?3�{e��w��E�ҭ�os�W�����rk�;^��#'�俠�P(q7�ĉ����ķtb����� -�o�sO�։�?C�K���J��]���oߵ�3��6�����������HG�e"a�r,jߵ����1��~����4�{��ԍq6�oB�+��Z���a�դٙu�7jVgDaM�'��U�"�lt�V�G��Î-��m�� ��$ۍ�"3� ��&͋�+�w�X��<�n�"��e"vf����}��G}�ʹU�f�(�Ѡ��GnU.����ʾ0=�ܨ��(�L�_- �m�־�;�q��DJ�z�b|Ƕ�$!�= -:e -�0�m�)-���\ɽ�j�S�P��(�RF�I�z�▗VC"E D�JH+JHn�v�J��h/���x�%\;α��[�(J/��1�"���ԭQ�H�� -QԞC�9����<��Ҕ�bw -����Z�[���:<�ra�bo'�y���!�k���ꆏ3��ݞ�,�U�4�އ�Ȼ?���N�i�GV�kI���wp�:�x_v�]Q NJ<����y? \1V��֊&�>?��S�ԓ�P�/�Y\������rt����އ��>=�+��~z��(����ʷ|�sU>w��S�*�������� t�����ۋ -�WT`��� -�����E&r:���k�\�ˈ�k���oN܋yAlsƯ�6g,+*�Z]�u�p�W�`��;<���g�״���s��0O7����g�co^/x� -�}� �%�3�����.)�Nh�9A�',�_S?_9�ٞM�a�w�g���������u��HDO���~�;!W��~��r�U�B˳�F��� -��T]XY���X�8Wx �$�-#�D+���`X��R��s:H��_�1*����&��������4VT�2b�b~Z��L#�� ��Ix��m����4|ĴS����h�i�%��V��zb��:�c�M-�$�-/�u.6V��-�Y��݄ޕ/�vx�ˢ��f*@S#�!T� -��ըN�e���)�M�*0𮇯���H���Dk -�]u�\�^bF��Љ�Sy��j�9�V���&K{ �b>k�h����-��kBK���c����Z- -v*xQ�诐���E?���������yO��9��7���1�/�`��o���2��%�N8�o��)��*������r��i=�;�c.�7��r�w丗�g�J�}���ͫ&�}�T��ʾ&��T�]V=`V۪�Vۊ�yE��z�j�[OO�������w����x����S��B�b�)�]~����~���m���p[(<(/��N��*s��U_�ǃ�t���g�P�KL�����4vʹ�<��\^��C��B-�|9�΅u?������B/�?N�7�}����΅�@/w�� -~\�z_�.:nӅ^�6�}[��ӈ�bą�<��e�����v��/_Lz/_L��I_�xL�p�M˽V�����Ǵ�F���4�e1�Bxg}�i��y�MLU�d.�Yy�.�����2�i��p�#9Ş�{���x��1��[?~���;���ł�P����K�s��,�;oط�}�g�ߣ� {Lt�x,4ך��D@W�Zg@��T'� �*QMX�4pbSЖ�kGK'nx�_M�s�4p��ђ�A!�'�h��uϺ��S�qP�/��k�- -��ZВ�D�- -��YP��Hr7- -�ĺZM F�iM��&B<�4p�JI��Dh��N۴d7��BK��2���`�0��Ml#N� �r��V�g��5�zs�4Tpⷣ'��\*���!���]4T�����S�\H��W�mDg������&��R�i���#EM����g4Tp�OCxsyd4Tp�GFCxs�<4Tt|��%>�Y�t -F&"y�M&}c��Y�s�eyǻ-�uj�,��X?f!���;V0��ԉh,��8+���fĪ������$�ujm,���%�K��?ɬ�/����i���X��?-�V��������\�׃��]� d���s,�/�3��Qg��;�~` yԱn�DM����:^e�����l�q��dL���*�zL�h3���^��Z��&%]_�: 4���n��kEm��f�k�A=E��&K&:.��Ds3�IA7N��4�z�"�؛ -XSD��<��ղ2��z⍉�>2�!L�N?�� -J�L����@&����>�ڲ/����( -��Ϯ�<e�Y��9�P~�3w;��PȎ��,��Dk̈́�)�&�^��Z/�`"���]u����O��&EAs��������Jb�SҜv?�Az�{m;x*������A��{h������� -p�y�y�����/l2�f� �f�4C��|�*5��?L� -��>�h}��.p2��7�Ә��>�d����DW��(@�@���Rӂ�������sk$���ܓ,���I��&����F���o�?�|��PK���"��PKۄw<Z�949pollen.argoPKۄw<����mpollen_Modèle.pgmlPKۄw<F;�!��@�pollen_Services.pgmlPKۄw<9ܜ='�pollen_Diagrammedeclasses.pgmlPKۄw<4�[-m�h#pollen.todoPKۄw<7Rp:B$pollen_profile.profilePKۄw<���"�� -�$pollen.xmiPK��G \ No newline at end of file +y�-Ƃ�B.�ɞ�Eu�p=� +�b�;P��@q�HA��o'���*!g-)�Tj�|<�w��ʙiz{7�FK��F�#�j��[�;d��#��ya���;�v��m3��J�td:\��� +����6��8'+;��7*�G�@$!�=~F�h[$��vnXyڦA�J�X A��!��A��C���yf0��8:�۫���kF��d�l_����tX~��0�q.�gn +����)�Q���h�+�BT�at�}��-FE���}��]�sz��+���:�6q,���*�/��$�@��2���=�����Y���O�z��P1��OU$xf:ܴ��@;�:~�O� +�g�C�����n�̙3�1"��Ȝ�<s�u�-kj����N&mm��&N����>#:~v�'�N�u��E��n5����!�|��N�ca�#�@L�J>zt'��Bkqm�A�^���2�}���@a2f:�:��#���)�%�t�9��p�0�k���h9��Y�D#ѬM +��"y�����Cǔ��q�C��ƕ��N��^�xh���ӋB�O2�P�tٍ�W�O���U���WCa��?8���nJV�OT�t��� +��i1+���^�k^<\Z���£s�=�������sͽ�C� +���qyn����֑�����^j�v�GLI�#@��[���9�=ܚ̋M�����]+ղ��d�ʱqm��|R�*U�:i�������ĉV���l*�,3���4q*�����<�èjn���|��������͢9��5�4G��EM��N��(���W��nW�ffj�G���ǰ2z�L�X�B#f��� +D���5 +��$����� +�)<8Э�p8�ft�Z�1Qռ�d�����p�3_W����D�V�A�C��A�uX���Ad� 0�ej�>wV��=�A@����.|�o9�������i\� ��j��~<� 0 +�-C�`J�+(:1)#�-�=a$�s�ͻS�� +4Hw����ܫ�:0�+D���K"��0�t�0������hS�C�6��şhE$��!K��M��;��%�D�A\�~)[5�a��=����@#��C�H�µ6;չه? pc��M�L�� ��������f!Pf"E1�L�+�̚�TX�-B�ۮ���6k���(�e:4� +k�A�X���6˾��(J�e:\0ޕ�_bK�q�X�����L��O\���P_ї@�A*��b:^p�)�,���SuEL�+,�T�ج0s�����e��.��j��L��(��:�"� ��j��ĆQ�*��M��ش�5��S̅�ǻ�~�Bx����6s����W�L�с,n���3ޕ����# ������6��Vtհ�P��W��@,�`�X�@���6���D�W�H���b���62��E-����)�pp5&sۏPx�უ�l��EFξ +�_v>���>��5���|'���"ܨ>�e� +�'��h�f +�ǚ1^�3ۅ���k]�_y5�c۬��D�(��p����XWF�� +���c8�9�6�/�s|Y��nP�#�N���L�+ˠ�\���;�q0kP�+�)9ՙ�����q��j�vs�6�"�:ӡ�P��9�R�.N�hR�/�5�x�=�5GQr�k^ӭ9y���M�ޚ�(�W!���ɩo2Ľ9in��j�t�3|�0[ +2��,�[UP�aI�&'�����j��=[������8h$.VlG�r�Y$��larr�j���{H,�k��� �@����M�4�W@,�iV�5�5�Q�N���j�G��Md�0���վy������M�M�TU�ut:C��#M��o��ܓ~a��k�61�{%���'�W[����YME}=ՉqHE->���������n��N�8ß�p�9����2��4�IXO��D6�ʅ�h`>{���C��D�N�HD�t�:P�9ϴO�r���َ�����8���\�.�T�k�2~�H��������Yd��oA�v7���ߡEz�l|�9>����,��\�ʲ����!����nDN���Z�N�D�(r�eҨ�W�^7�9"��B��N��r*Iӿ~�:��a+�˪��"y��a1Vu!V$ZW +,�nu�@���o�8�#�Zx_���2]��1%W&��"��D���"?�Aw�e��q�&W%9kYYUc*�s�<��Ҙ�N�M��QQ�%�=�C]���zZ<��0��E�ъs�U+[#�9�[E��ujdt���Z�c��r�D��V#��VN`[�:A���U��T�ؕ�bt0� �EjWŮ%(|���N �LL�!�l���ՖV{[���vձE���su��^( ��,*���l@� +Yfۼ�\����SJTF����H�G܊6VR 9�W�^C���nu�9�Δ���N: �,�9$^!\y��jw� -��hLK;=Rβδ��ʼn��V�R%�|��;%U#F�D�fW��k\�=�X ���O�L#8A<n,<�uk�:�Y�z��[��t�y������@Y�0��\��%|��8�N��9����p�~r��w��c��VPkZ�����@� +�$̭9#�E��larr+��j����j��Fò�Yl�f²:Q��HS��ˀy�r���{RE�c��.(�H�m%��بN�H�8�D� &��qI�:B��Yh?Q�>�M���Z���(:1̸֚��g���C������ ���J>�(��sh氩�"���hm�^��� +�V(P����X�ҟ{(�ەѵ���j�,��G5G"���Я��E����#�v��,���@ym�'�?@z�v�є�+���^��O=���2���,�g2m��+=d�HL�G��9a��,��v�xK�8�f��T]㵪LF� u"���jI����rP -�Y�1,��"���YYi"�e� +����D�_�L��ɢ;`@~-���LI����*�e����s����U=���*.��H͇BE����N��sE4��H�����l{��/0��}f�@�����bȔ�ޜ0�� +d�I�M�TS9_[���G��ɹE�����$�Gyc���ic0�V�������G���gχ���s�b�e����&v�~� ����f7_����K�x�Ԉ�Ce~ +�/b� ��|<�X}�<$�S��8���Ac���Vcr�dy7�X[9���$���-&�6�G�WwV�Zr��F#�p�+��*�z�<�A��F���t�]�[y�[b~���^�5K9��P�R�[u�&^yB^�q�z�ZFkA6+)˺`��c$^��B�gF��=�#i(�����h�݉,5u����$Bf��mR�/3��r����5jx!/r��?ƣ�ޝnr�O�a�tA������z��sⱓd����~f�ᾞ~��V��Bh���� +Ԣ��Vdx:5��z͆���h +)+d���N6����:� +�>��!mR�˹YS�?�C�ם +���S˓�{TLn����% s��w^C����4F�z_'��j����K����������9����\�;W��\g�؝�[�0?��ձvU����r�Е��0I��������J�+��pX�����X8ϽK[`�U`!Q�=�CG5M�'n�G���larrN,�,T�HxH�^a9�ʝ@�-LNi|A a��P�����VئV�{3���-xs� Xx +X�*<�c��ً����|� +�@Ü�-L1!=9�AV��Ú�B�}6xG�E���N.� ������ȐH|do�ea+s����V7!�k +����=�+�zL�aN�����;&N'GX�-�Ji�Q�M�ޛ�0�iC��]y~��}�Tx�x��(��[��Y]�"C�Q�Q���ۜ,�#c t�V$n��]΅�vhJ# +ًA��R��aﺶ�a�?��0�Ii���?R�^�_a���$��Z�W'~RpJ7��s&p�$��!^d���}$9}s��>F��'����6hG��M�~:�5b�hzf�3���(�@p��\~ieN�W�� )u#B���cM��J+�)ਿPZ�6�mZ� 黚�o��%�s�<�F�a�&��S��.Ԅ�Մ��j�,�'������#(e���\���2'��W�9�q +}�E����9����ޚ�Ԧv���y�"��95�Fi�����L���8�Ua�8}��*�Ŝ�R<�o������kFDE�P�� ;�t��(�b!�������(b ��<�<F�)Q&�f��57$x��\�{���.D��y+'����D�,,����0����0M�(���- �:��HR�fD<�oa6\�*I{��s>��caiJ���c��" +_�<[�Ϸc@��[ +̔ +_F�¼���;��P�J�#mxHJ�%|���j$C��f@T��H�@��3�g��[CC�t�����P��չ��������4��e���K�f�6��$���"EU��^<�h5Qa" N�r�Qg�4���gχ�>����qef��~�7.p.d�Y(6a�o������ X~1����39���DBb���8����h ++�bv�s�������H5��!b���� �B<Zۛ}���q�dN`�`�������m/���k��&E���ٶ�am�@~A�+��P���<�L϶�&~�K�9�;~� L���f�%��mH�v3������kϗ��� +�qin;�d��#�����u|���71�A|l0M�Á�x�#�*K*�3���m�NIܙ۫����_w6�2��xq�,����"���ƕ��ON��DX + +:�=v�}s�|��1�L���|㝖ш�(^��.-![�J +t#�/�ڥSsܣ:���ڴ5����ͣ�����R�Ts��u���J��T�HO�z�g�q$J��V��}�mQ8�W�^K.��g ����ӱ�?��}�fL�_i�^��^2�+m����$�q����I��K2O����W�����hmK��t�b-��f���%[�� +2�}��-����m�Q�d�Õ����c��#fb]/�-��@��em�F�n���5;57�������P���p�hi$�auaׅ�E�R�I7�I�ό�^�.<� i�t+��\�U����;�Z����ȉ*���8J�U*q���-�<9�-��#��ï�[��ܓ�ub��)���0�����窻�����a˙�]���B�O�F�KDpd�#�2�0a9���r�cra͘PZ�aw�z�ͽE �F�8�7!��w-�Kw��j��̺�K6�3����3�UѪU�[6�N�� !��cK�h[ -��h-�vc�Ȍ�G¼�J�� +�+�1O��[�}Do�����B�(jߵ�Q�}3m��/Jo4��[���q��/L�47�2= ++F�W�Hm�����j�' ���Es�Ʊ�$I�s�����B"r�vJ˵2;�Br������$T�$J��q�^5���ՐH���Ҋ���]��!�b=$�a W��s,���5�ҋ��L��=�?uk #�B��P�`N��o%ϋ�4�z��]C'$f���V�`���\�gx���K��x_�Yʐ�5z~�Hu�Ǚ���D@7�/t՟3�.�!.��g ���C��#+�$���;�v�P��;Ԯ('%S}�������+}zg���B��m�9r�Iv(}���,�b�g ��zR9:���p����X�����X?��U�����T�[>ӹ*�;^��_�w�gi� +���H�~�}Q�k��E�*�~DO�^xi +��"9��K�Z��uD0���#�b^ۜ��� ˊ +�V�p��/\���ۡ�����Y�5-��~��,�Ӎe��4C��؛�i�`�-k������e�l�s�۽�xN� ������bF�g�o����}�p��!:`�3R��;i����Nȕ;l�%���:_dU����d�m{v�>.UV����l;V'��9Ij�� ъ�x2�G��T ��R��F�I@��� +z�ft�/�щ�<� +3u.6��آ�L3�a��8[j����-�r�+e���6�C`MGk݈89VT��ubv�b~�������d���*�),���)��i��|�L;9��>��[Ed��Ē#��g:�Z�I"[^.�\l�4��[2��݄ޕ/�vx�7��'CSC5�B��(_��Xv*����d����.h���H��!��N�k�K�B�^b�w*�[�:��J���di/�[�g�� +�R��}Mh)�Tt�3^�E�N/j�<�o�����?6�sPS1���1G���f��;����t�-x�\�]��� �b�-�=e�R�}K�+' +���t�X��`ߤ����ޑ�^�}+�����7��p��S1�+���n�SAvY��}\Xm��Zm+.���j�˪o==d���-d��EN�����rO�.����v�)C.���s�](<n����B�AyY(=u�-T�����>|���>Ӆ�\b +]'��S��桖���?� +j���)�4.tg����}h<��Z9�qʾ)�#����<4.�Z�۔W�������w�xp�.�r�)��ӹ�z��F,#.4�Q_�.#.�o�W�˄�x�b��x�b �N�z�cʅ�oZ��}\<�}5z�\ﴧ�.��;���xH3]��;o�`��'��p��ʳt9e.�YO3��\���)��c�#V�c_��9��y_��s.v�yOx,\����^�'��eA�y{��%���X>K��N�c"�c�c��ּ&z���:jL��8 �V�jª������$^�<Z8q����jB����m��l +i�8�D[խ{֭䞲���|9��xg]#g\hi�$Ղ��&-hi�$͂��F��ii�'��jJ0��Okb5l"�CK'9��d�M��ii�$�MKv9)�4��-s�:� ��ۄ��61�d��.�_keyv*8qP�5�@C'~;z�����\��ECYx�:;EA�΅��}��Ftz*8�Z�o�i.�� +N<RԄ��;zFCW �4�7�GFCWyd4�7��CCEǧ�_��C˚`d"����d��-�@�"�u�,��x�e!�N-�����,$��`y�� +��:���g%���L�X��s�V�d�N����]W�d��c�T�'����X��?-�V_����e��cyמ7���z����2�,4�y����zw<��̀`y��$�:��r��iєycYǫl��U�1��:.�����ק�e���i�G#mb��yX��II@�W��N��z��p�FQGk}=�5�tPO�k�ɒ���˻0�܌xR��S�:͵�D7���XSD��hOƊjY:Sj=��D@���U'������V&`�q~ �]�gAmٌ��r�sF�]�g�W�2Ь� +�� (�䙻�@i(dGAG�Te��̈́�)�&�^��Z/�`"���]u����OE�&EAs��������Bb�cҜ�?�Nz�۰<����@o��������6Ah{.�i +��_>x^����v��L���>0��fh��ׯRC�����~ ��;��G{�'3�C<�)�9��u��iN4X/��5�w�UjZ��]�\mx���H�Wz�HF�W�$�B��t~z����ѯn����Ϸ��?PK���#��PK��w<����4:pollen.argoPK��w<����mpollen_Modèle.pgmlPK��w<�N�ŷ�@�pollen_Services.pgmlPK��w<9ܜ='�pollen_Diagrammedeclasses.pgmlPK��w<4�[-m�i#pollen.todoPK��w<7Rp:B$pollen_profile.profilePK��w<���#�� +�$pollen.xmiPK�aH \ No newline at end of file Modified: trunk/pollen-business/src/test/java/org/chorem/pollen/business/TestManager.java =================================================================== --- trunk/pollen-business/src/test/java/org/chorem/pollen/business/TestManager.java 2010-03-23 15:39:36 UTC (rev 2956) +++ trunk/pollen-business/src/test/java/org/chorem/pollen/business/TestManager.java 2010-03-23 23:38:20 UTC (rev 2957) @@ -69,7 +69,7 @@ } public static TopiaContext beginTransaction() throws TopiaException { - return getContext().getTopiaRootContext().beginTransaction(); + return getContext().beginTransaction(); } } Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-03-23 15:39:36 UTC (rev 2956) +++ trunk/pom.xml 2010-03-23 23:38:20 UTC (rev 2957) @@ -19,7 +19,6 @@ <modules> <!-- <module>pollen-ui</module>--> - <module>pollen-template</module> <module>pollen-business</module> <module>pollen-votecounting</module> </modules>