Author: echatellier Date: 2012-06-04 16:33:59 +0200 (Mon, 04 Jun 2012) New Revision: 3437 Url: http://chorem.org/repositories/revision/lima/3437 Log: Fix ejb module name to not being generated with application version. Fix startup from command line. Modified: 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 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-06-01 14:01:39 UTC (rev 3436) +++ trunk/lima-business/src/main/java/org/chorem/lima/service/LimaServiceFactory.java 2012-06-04 14:33:59 UTC (rev 3437) @@ -58,7 +58,7 @@ protected static EJBContainer container; /** EJB service namespace. */ - protected static final String NAMESPACE = "java:global/lima-business/"; + protected static final String NAMESPACE = "java:global/lima/"; /** * Init openejb container. @@ -89,6 +89,7 @@ // see http://openejb.apache.org/embedded-configuration.html // http://openejb.apache.org/properties-listing.html // for embedded configuration + //props.setProperty("openejb.jndiname.format", "ejb/{interfaceClass.simpleName}"); container = EJBContainer.createEJBContainer(props); } Modified: trunk/lima-business/src/main/resources/META-INF/ejb-jar.xml =================================================================== --- trunk/lima-business/src/main/resources/META-INF/ejb-jar.xml 2012-06-01 14:01:39 UTC (rev 3436) +++ trunk/lima-business/src/main/resources/META-INF/ejb-jar.xml 2012-06-04 14:33:59 UTC (rev 3437) @@ -1,3 +1,4 @@ +<?xml version="1.0" encoding="UTF-8"?> <!-- #%L Lima business @@ -28,7 +29,12 @@ Interceptor based on : http://openejb.apache.org/examples-trunk/alternate-descriptors/ --> -<ejb-jar> +<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"> + <!-- Le nom est a fixer sinon, il est généré et contient la version --> + <module-name>lima</module-name> <assembly-descriptor> <interceptor-binding> <ejb-name>*</ejb-name> Modified: trunk/lima-business/src/test/resources/META-INF/ejb-jar.xml =================================================================== --- trunk/lima-business/src/test/resources/META-INF/ejb-jar.xml 2012-06-01 14:01:39 UTC (rev 3436) +++ trunk/lima-business/src/test/resources/META-INF/ejb-jar.xml 2012-06-04 14:33:59 UTC (rev 3437) @@ -1,3 +1,4 @@ +<?xml version="1.0" encoding="UTF-8"?> <!-- #%L Lima business @@ -28,7 +29,12 @@ Interceptor based on : http://openejb.apache.org/examples-trunk/alternate-descriptors/ --> -<ejb-jar> +<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"> + <!-- Le nom est a fixer sinon, il est généré et contient la version --> + <module-name>lima</module-name> <assembly-descriptor> <interceptor-binding> <ejb-name>*</ejb-name>