Author: echatellier Date: 2012-02-23 17:09:21 +0100 (Thu, 23 Feb 2012) New Revision: 3346 Url: http://chorem.org/repositories/revision/lima/3346 Log: Update to openejb 4 (beta) Modified: trunk/lima-business/pom.xml trunk/lima-business/src/main/java/org/chorem/lima/service/LimaServiceFactory.java trunk/pom.xml Modified: trunk/lima-business/pom.xml =================================================================== --- trunk/lima-business/pom.xml 2012-02-22 16:49:09 UTC (rev 3345) +++ trunk/lima-business/pom.xml 2012-02-23 16:09:21 UTC (rev 3346) @@ -86,10 +86,6 @@ <groupId>org.apache.openejb</groupId> <artifactId>openejb-ejbd</artifactId> </dependency> - <dependency> - <groupId>org.apache.openejb</groupId> - <artifactId>ejb31-api-experimental</artifactId> - </dependency> </dependencies> <!-- ************************************************************* --> Modified: trunk/lima-business/src/main/java/org/chorem/lima/service/LimaServiceFactory.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/service/LimaServiceFactory.java 2012-02-22 16:49:09 UTC (rev 3345) +++ trunk/lima-business/src/main/java/org/chorem/lima/service/LimaServiceFactory.java 2012-02-23 16:09:21 UTC (rev 3346) @@ -144,12 +144,13 @@ */ public static void destroy() throws Exception { - // destroy code (only in embedded mode) + /* not available in openejb 4 + destroy code (only in embedded mode) Assembler assembler = SystemInstance.get().getComponent(Assembler.class); for (AppInfo appInfo : assembler.getDeployedApplications()) { assembler.destroyApplication(appInfo.jarPath); } - OpenEJB.destroy(); + OpenEJB.destroy();*/ } /** Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-02-22 16:49:09 UTC (rev 3345) +++ trunk/pom.xml 2012-02-23 16:09:21 UTC (rev 3346) @@ -123,18 +123,12 @@ <dependency> <groupId>org.apache.openejb</groupId> <artifactId>javaee-api</artifactId> - <version>5.0-3</version> + <version>6.0-3</version> <scope>runtime</scope> </dependency> <dependency> <groupId>org.apache.openejb</groupId> - <artifactId>ejb31-api-experimental</artifactId> - <version>${openEjbVersion}</version> - <scope>runtime</scope> - </dependency> - <dependency> - <groupId>org.apache.openejb</groupId> <artifactId>openejb-ejbd</artifactId> <version>${openEjbVersion}</version> <scope>runtime</scope> @@ -322,7 +316,7 @@ <topiaVersion>2.6.7</topiaVersion> <jaxxVersion>2.5-SNAPSHOT</jaxxVersion> <nuitonI18nVersion>2.4.1</nuitonI18nVersion> - <openEjbVersion>3.1.4</openEjbVersion> + <openEjbVersion>4.0.0-beta-2</openEjbVersion> <slf4jVersion>1.6.4</slf4jVersion> <!-- license to use --> @@ -350,7 +344,7 @@ <plugin> <groupId>org.nuiton.jaxx</groupId> - <artifactId>maven-jaxx-plugin</artifactId> + <artifactId>jaxx-maven-plugin</artifactId> <version>${jaxxVersion}</version> </plugin>