Author: echatellier Date: 2014-05-14 13:51:21 +0200 (Wed, 14 May 2014) New Revision: 3797 Url: http://forge.chorem.org/projects/lima/repository/revisions/3797 Log: fixes #1026: Update to openejb 4.6.0.2 Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/LimaInterceptor.java trunk/lima-business/src/main/java/org/chorem/lima/service/LimaServiceFactory.java trunk/lima-business/src/main/resources/META-INF/ejb-jar.xml trunk/lima-business/src/test/resources/META-INF/ejb-jar.xml trunk/lima-swing/src/license/THIRD-PARTY.properties trunk/pom.xml Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/LimaInterceptor.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/business/LimaInterceptor.java 2014-05-13 14:52:18 UTC (rev 3796) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/LimaInterceptor.java 2014-05-14 11:51:21 UTC (rev 3797) @@ -81,6 +81,7 @@ } LimaConfig config = LimaConfig.getInstance(); + log.info("Properties = " + config.getFlatOptions()); TopiaContext rootContext = TopiaContextFactory.getContext(config.getFlatOptions()); TopiaContext tx = rootContext.beginTransaction(); 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 2014-05-13 14:52:18 UTC (rev 3796) +++ trunk/lima-business/src/main/java/org/chorem/lima/service/LimaServiceFactory.java 2014-05-14 11:51:21 UTC (rev 3797) @@ -68,7 +68,12 @@ public static void initFactory(ApplicationConfig config) { // make a copy of options - Properties props = config.getFlatOptions(); + Properties props = new Properties(); + + // warning, make a clean properties, openejb put all those properties in jvm wide scope + // introducing strange behaviour in AppConfig loading + // only copy necessary options + props.putAll(config.getOptionStartsWith("java.naming")); // transmission des options de logging a openejb // sinon, il utilise son propre pattern interne @@ -86,6 +91,10 @@ IOUtils.closeQuietly(log4jFile); } + // as of openejb 4.6, bean-finder-shaded 3.15 doesn't scan full classpath anymore by default + // see http://list.chorem.org/pipermail/lima-devel/2014-May/000154.html for more details + System.setProperty("xbean.finder.use.get-resources", "true"); + // see http://openejb.apache.org/embedded-configuration.html // http://openejb.apache.org/properties-listing.html // for embedded configuration Modified: trunk/lima-business/src/main/resources/META-INF/ejb-jar.xml =================================================================== --- trunk/lima-business/src/main/resources/META-INF/ejb-jar.xml 2014-05-13 14:52:18 UTC (rev 3796) +++ trunk/lima-business/src/main/resources/META-INF/ejb-jar.xml 2014-05-14 11:51:21 UTC (rev 3797) @@ -29,10 +29,10 @@ Interceptor based on : http://openejb.apache.org/examples-trunk/alternate-descriptors/ --> -<ejb-jar xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xmlns="http://java.sun.com/xml/ns/javaee" xmlns:ejb="http://java.sun.com/xml/ns/javaee/ejb-jar_3_1.xsd" - xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/ejb-jar_3_1.xsd" - version="3.1"> +<ejb-jar xmlns="http://java.sun.com/xml/ns/javaee" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/ejb-jar_3_1.xsd" + version="3.1"> <!-- Le nom est a fixer sinon, il est généré et contient la version --> <module-name>lima</module-name> <assembly-descriptor> Modified: trunk/lima-business/src/test/resources/META-INF/ejb-jar.xml =================================================================== --- trunk/lima-business/src/test/resources/META-INF/ejb-jar.xml 2014-05-13 14:52:18 UTC (rev 3796) +++ trunk/lima-business/src/test/resources/META-INF/ejb-jar.xml 2014-05-14 11:51:21 UTC (rev 3797) @@ -29,10 +29,10 @@ Interceptor based on : http://openejb.apache.org/examples-trunk/alternate-descriptors/ --> -<ejb-jar xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xmlns="http://java.sun.com/xml/ns/javaee" xmlns:ejb="http://java.sun.com/xml/ns/javaee/ejb-jar_3_0.xsd" - xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/ejb-jar_3_1.xsd" - version="3.1"> +<ejb-jar xmlns="http://java.sun.com/xml/ns/javaee" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/ejb-jar_3_1.xsd" + version="3.1"> <!-- Le nom est a fixer sinon, il est généré et contient la version --> <module-name>lima</module-name> <assembly-descriptor> Modified: trunk/lima-swing/src/license/THIRD-PARTY.properties =================================================================== --- trunk/lima-swing/src/license/THIRD-PARTY.properties 2014-05-13 14:52:18 UTC (rev 3796) +++ trunk/lima-swing/src/license/THIRD-PARTY.properties 2014-05-14 11:51:21 UTC (rev 3797) @@ -3,16 +3,15 @@ # Already used licenses in project : # - AL 2.0 # - Apache 2 -# - Apache 2.0 # - Apache License 2.0 # - Apache License, version 2.0 # - Apache Software License - Version 2.0 +# - Apache Software License 2.0 # - BSD # - BSD License # - CDDL # - CDDL 1.1 # - COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 -# - CPL # - Common Development and Distribution License # - Common Public License Version 1.0 # - Eclipse Distribution License (EDL), Version 1.0 @@ -41,7 +40,9 @@ # Please fill the missing licenses for dependencies : # # -#Mon May 12 15:24:40 CEST 2014 +#Tue May 13 17:26:41 CEST 2014 commons-jxpath--commons-jxpath--1.3=The Apache Software License, Version 2.0 commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 dom4j--dom4j--1.6.1=jdomlicence +org.metatype.sxc--sxc-jaxb-core--0.8=CDDL 1.1 +org.metatype.sxc--sxc-runtime--0.8=CDDL 1.1 Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2014-05-13 14:52:18 UTC (rev 3796) +++ trunk/pom.xml 2014-05-14 11:51:21 UTC (rev 3797) @@ -182,10 +182,8 @@ <nuitonWidgetsVersion>1.1.1</nuitonWidgetsVersion> <launch4jPluginVersion>1.5.0.0</launch4jPluginVersion> - <!-- Version cannot be upgraded because of incompatibility with OpenEJB - -chatellier ???--> <jaxxVersion>2.8.4</jaxxVersion> - <openEjbVersion>4.5.2</openEjbVersion> + <openEjbVersion>4.6.0.2</openEjbVersion> <slf4jVersion>1.7.7</slf4jVersion> <swingxVersion>1.6.5-1</swingxVersion> <pdfboxVersion>1.8.4</pdfboxVersion>