Author: tchemit Date: 2013-07-01 08:12:00 +0200 (Mon, 01 Jul 2013) New Revision: 3843 Url: http://chorem.org/projects/pollen/repository/revisions/3843 Log: fix build + ignore target directory Modified: trunk/pollen-rest-api/pom.xml trunk/pollen-services/src/test/java/org/chorem/pollen/service/AbstractPollenServiceTest.java trunk/pollen-ui-js/ Modified: trunk/pollen-rest-api/pom.xml =================================================================== --- trunk/pollen-rest-api/pom.xml 2013-07-01 05:40:45 UTC (rev 3842) +++ trunk/pollen-rest-api/pom.xml 2013-07-01 06:12:00 UTC (rev 3843) @@ -142,6 +142,10 @@ </dependencies> <properties> + + <i18n.silent>true</i18n.silent> + <i18n.bundleOutputName>${pollenI18nBundle}</i18n.bundleOutputName> + <defaultWebContextPath>pollen</defaultWebContextPath> <defaultLogDir>${basedir}/target</defaultLogDir> <defaultDbDir>${basedir}/target</defaultDbDir> @@ -196,6 +200,20 @@ </plugin> </plugins> </pluginManagement> + + <plugins> + <plugin> + <groupId>org.nuiton.i18n</groupId> + <artifactId>i18n-maven-plugin</artifactId> + <executions> + <execution> + <goals> + <goal>bundle</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> </build> <profiles> Modified: trunk/pollen-services/src/test/java/org/chorem/pollen/service/AbstractPollenServiceTest.java =================================================================== --- trunk/pollen-services/src/test/java/org/chorem/pollen/service/AbstractPollenServiceTest.java 2013-07-01 05:40:45 UTC (rev 3842) +++ trunk/pollen-services/src/test/java/org/chorem/pollen/service/AbstractPollenServiceTest.java 2013-07-01 06:12:00 UTC (rev 3843) @@ -69,10 +69,8 @@ serviceContext.setPollenServiceConfig(getPollenServiceConfig()); - EntityManager entityManager = getJpaEntityManagerRule().getEntityManager(); + EntityManager entityManager = getJpaEntityManagerRule().newEntityManager(); -// JpaEntityIdFactoryIfNotEmpty idGenerator = new JpaEntityIdFactoryIfNotEmpty(); -// JpaPollenPersistenceContext persistenceContext = new JpaPollenPersistenceContext(idGenerator, entityManager); JpaPollenPersistenceContext persistenceContext = new JpaPollenPersistenceContext(entityManager); serviceContext.setPersistenceContext(persistenceContext); Property changes on: trunk/pollen-ui-js ___________________________________________________________________ Modified: svn:ignore - *.iml + *.iml target *.ipr *.iws .idea