Author: echatellier Date: 2011-03-24 12:47:35 +0100 (Thu, 24 Mar 2011) New Revision: 3081 Url: http://chorem.org/repositories/revision/lima/3081 Log: Update to openejb 3.1.4 Added: trunk/lima-business/src/main/assembly/ trunk/lima-business/src/main/assembly/bin.xml trunk/lima-business/src/main/assembly/lima-server Modified: trunk/lima-business/pom.xml trunk/lima-business/src/license/THIRD-PARTY.properties trunk/lima-swing/pom.xml trunk/pom.xml Modified: trunk/lima-business/pom.xml =================================================================== --- trunk/lima-business/pom.xml 2011-03-12 14:22:58 UTC (rev 3080) +++ trunk/lima-business/pom.xml 2011-03-24 11:47:35 UTC (rev 3081) @@ -19,10 +19,6 @@ <artifactId>lima-callao</artifactId> <version>${project.version}</version> </dependency> - <!--dependency> - <groupId>org.jdom</groupId> - <artifactId>jdom</artifactId> - </dependency--> <dependency> <groupId>net.sf.opencsv</groupId> <artifactId>opencsv</artifactId> @@ -74,15 +70,17 @@ <artifactId>commons-io</artifactId> </dependency> <dependency> - <groupId>org.apache.geronimo.ext.openejb</groupId> + <groupId>org.apache.openejb</groupId> <artifactId>openejb-core</artifactId> - <scope>provided</scope> </dependency> <dependency> - <groupId>org.apache.geronimo.ext.openejb</groupId> - <artifactId>javaee-api</artifactId> - <scope>provided</scope> + <groupId>org.apache.openejb</groupId> + <artifactId>openejb-ejbd</artifactId> </dependency> + <dependency> + <groupId>org.apache.openejb</groupId> + <artifactId>ejb31-api-experimental</artifactId> + </dependency> </dependencies> <!-- ************************************************************* --> @@ -91,25 +89,16 @@ <name>Lima :: business</name> <description>Business module for lima</description> + <properties> + <!--Main class in JAR --> + <maven.jar.main.class>org.chorem.lima.LimaServer</maven.jar.main.class> + </properties> + <!-- ************************************************************* --> <!-- *** Build Settings ****************************************** --> <!-- ************************************************************* --> <build> - <plugins> - <plugin> - <groupId>org.nuiton.i18n</groupId> - <artifactId>maven-i18n-plugin</artifactId> - <executions> - <execution> - <goals> - <goal>parserJava</goal> - <goal>gen</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> <pluginManagement> <plugins> <plugin> @@ -126,27 +115,80 @@ </excludes> </configuration> </plugin> - - <!-- - TODO EC-20100408 pour l'intant c'est une archive - jar-with-dependencies qui sert a deploiement dans - le conteneur d'EJB (openejb) mais un ear correct serait - préférable (mais en packaging ear, il manque le projet courant) - --> <plugin> - <artifactId>maven-assembly-plugin</artifactId> + <artifactId>maven-jar-plugin</artifactId> <configuration> - <descriptorRefs> - <descriptorRef>jar-with-dependencies</descriptorRef> - </descriptorRefs> - <attach>false</attach> + <archive> + <manifest> + <addClasspath>true</addClasspath> + <classpathPrefix>./lib/</classpathPrefix> + </manifest> + </archive> </configuration> </plugin> - - </plugins> </pluginManagement> + <plugins> + <plugin> + <groupId>org.nuiton.i18n</groupId> + <artifactId>maven-i18n-plugin</artifactId> + <executions> + <execution> + <goals> + <goal>parserJava</goal> + <goal>gen</goal> + </goals> + </execution> + </executions> + </plugin> + <plugin> + <artifactId>maven-dependency-plugin</artifactId> + <executions> + <execution> + <id>copy-dependencies</id> + <goals> + <goal>copy-dependencies</goal> + </goals> + <configuration> + <outputDirectory>${project.build.directory}/lib</outputDirectory> + </configuration> + </execution> + </executions> + </plugin> + </plugins> </build> + + <profiles> + <profile> + <id>assembly-profile</id> + <activation> + <property> + <name>performRelease</name> + <value>true</value> + </property> + </activation> + <build> + <plugins> + <plugin> + <artifactId>maven-assembly-plugin</artifactId> + <configuration> + <finalName>lima-server-${project.version}</finalName> + <descriptors> + <descriptor>src/main/assembly/bin.xml</descriptor> + </descriptors> + <attach>false</attach> + </configuration> + <executions> + <execution> + <phase>verify</phase> + <goals> + <goal>single</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + </build> + </profile> + </profiles> </project> - - Modified: trunk/lima-business/src/license/THIRD-PARTY.properties =================================================================== --- trunk/lima-business/src/license/THIRD-PARTY.properties 2011-03-12 14:22:58 UTC (rev 3080) +++ trunk/lima-business/src/license/THIRD-PARTY.properties 2011-03-24 11:47:35 UTC (rev 3081) @@ -1,4 +1,4 @@ -# Generated by org.nuiton.license.plugin.AddThirdPartyMojo +# Generated by org.codehaus.mojo.license.AddThirdPartyMojo #------------------------------------------------------------------------------- # Already used licenses in project : # - ANTLR 2 License @@ -6,7 +6,6 @@ # - Apache License Version 1.1 # - Apache Software License - Version 2.0 # - Apache Software License 2.0 -# - Apache Software License, Version 2.0 # - BSD License # - Bouncy Castle Licence # - Bouncy Castle License @@ -21,7 +20,6 @@ # - License Agreement for Java Transaction API Classes # - MIT License # - Mozilla Public License -# - Public Domain # - The Apache Software License, Version 2.0 # - The H2 License, Version 1.0 # - http://asm.ow2.org/license.html @@ -31,7 +29,7 @@ # Please fill the missing licenses for dependencies : # # -#Mon Nov 22 08:53:03 CET 2010 +#Thu Mar 24 12:12:43 CET 2011 antlr--antlr--2.7.6--jar=ANTLR 2 License com.sun.xml.bind--jaxb-impl--2.1.9--jar=Common Development and Distribution License (CDDL) v1.0 / GPLv2 + classpath exception dual license commons-net--commons-net--2.0--jar=The Apache Software License, Version 2.0 @@ -39,6 +37,6 @@ dom4j--dom4j--1.6.1--jar=jdomlicence javassist--javassist--3.8.0.GA--jar=GNU Lesser General Public License javax.transaction--jta--1.1--jar=License Agreement for Java Transaction API Classes +org.apache.geronimo.specs--geronimo-j2ee-management_1.0_spec--1.0--jar=The Apache Software License, Version 2.0 org.codehaus.swizzle--swizzle-stream--1.0.1--jar=The Apache Software License, Version 2.0 -org.osgi--org.osgi.core--4.1.0--jar=The Apache Software License, Version 2.0 quartz--quartz--1.5.2--jar=The Apache Software License, Version 2.0 Added: trunk/lima-business/src/main/assembly/bin.xml =================================================================== --- trunk/lima-business/src/main/assembly/bin.xml (rev 0) +++ trunk/lima-business/src/main/assembly/bin.xml 2011-03-24 11:47:35 UTC (rev 3081) @@ -0,0 +1,61 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + Lima Swing + + $Id: bin.xml 3067 2010-12-17 15:00:16Z echatellier $ + $HeadURL: http://svn.chorem.org/svn/lima/trunk/lima-swing/src/main/assembly/bin.xml $ + %% + Copyright (C) 2008 - 2010 CodeLutin + %% + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as + published by the Free Software Foundation, either version 3 of the + License, or (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public + License along with this program. If not, see + <http://www.gnu.org/licenses/gpl-3.0.html>. + #L% + --> + +<assembly xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/assembly-1.1.1.xsd"> + <id>bin</id> + <formats> + <format>zip</format> + </formats> + + <files> + <file> + <source>target/${project.build.finalName}.${project.packaging}</source> + <destName>lima-server.${project.packaging}</destName> + </file> + <file> + <source>src/main/assembly/lima-server</source> + <fileMode>0755</fileMode> + </file> + </files> + <fileSets> + <fileSet> + <directory>target/lib</directory> + <outputDirectory>lib</outputDirectory> + <includes> + <include>*.jar</include> + </includes> + <excludes> + <exclude>junit-*.jar</exclude> + </excludes> + </fileSet> + <fileSet> + <includes> + <include>README*</include> + <include>LICENSE*</include> + </includes> + </fileSet> + </fileSets> +</assembly> \ No newline at end of file Added: trunk/lima-business/src/main/assembly/lima-server =================================================================== --- trunk/lima-business/src/main/assembly/lima-server (rev 0) +++ trunk/lima-business/src/main/assembly/lima-server 2011-03-24 11:47:35 UTC (rev 3081) @@ -0,0 +1,9 @@ +#!/bin/sh +MX=512M +cd `dirname $0` +if [ -n "$JAVA_HOME" ]; then + $JAVA_HOME/bin/java -Xmx$MX -Xms$MX -jar ./lima-server.jar $* +else + java -Xmx$MX -Xms$MX -jar ./lima-server.jar $* +fi +cd "$OLDPWD" Property changes on: trunk/lima-business/src/main/assembly/lima-server ___________________________________________________________________ Added: svn:executable + * Modified: trunk/lima-swing/pom.xml =================================================================== --- trunk/lima-swing/pom.xml 2011-03-12 14:22:58 UTC (rev 3080) +++ trunk/lima-swing/pom.xml 2011-03-24 11:47:35 UTC (rev 3081) @@ -93,19 +93,19 @@ </dependency> <dependency> - <groupId>org.apache.geronimo.ext.openejb</groupId> + <groupId>org.apache.openejb</groupId> <artifactId>openejb-core</artifactId> </dependency> <!-- for remote mode only --> <dependency> - <groupId>org.apache.geronimo.ext.openejb</groupId> + <groupId>org.apache.openejb</groupId> <artifactId>openejb-client</artifactId> <scope>runtime</scope> </dependency> <dependency> - <groupId>org.apache.geronimo.ext.openejb</groupId> + <groupId>org.apache.openejb</groupId> <artifactId>openejb-loader</artifactId> </dependency> </dependencies> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-03-12 14:22:58 UTC (rev 3080) +++ trunk/pom.xml 2011-03-24 11:47:35 UTC (rev 3081) @@ -107,26 +107,31 @@ <!-- Services --> <dependency> - <groupId>org.apache.geronimo.ext.openejb</groupId> + <groupId>org.apache.openejb</groupId> <artifactId>openejb-core</artifactId> <version>${openEjbVersion}</version> <scope>compile</scope> </dependency> <dependency> - <groupId>org.apache.geronimo.ext.openejb</groupId> - <artifactId>javaee-api</artifactId> - <version>5.0.3</version> + <groupId>org.apache.openejb</groupId> + <artifactId>ejb31-api-experimental</artifactId> + <version>${openEjbVersion}</version> </dependency> + <dependency> + <groupId>org.apache.openejb</groupId> + <artifactId>openejb-ejbd</artifactId> + <version>${openEjbVersion}</version> + </dependency> <!-- Mandatory for remote mode (embedded need only core) --> <dependency> - <groupId>org.apache.geronimo.ext.openejb</groupId> + <groupId>org.apache.openejb</groupId> <artifactId>openejb-client</artifactId> <version>${openEjbVersion}</version> <scope>compile</scope> </dependency> <dependency> - <groupId>org.apache.geronimo.ext.openejb</groupId> + <groupId>org.apache.openejb</groupId> <artifactId>openejb-loader</artifactId> <version>${openEjbVersion}</version> </dependency> @@ -275,8 +280,8 @@ <topiaVersion>2.4.2</topiaVersion> <jaxxVersion>2.1</jaxxVersion> <nuitonI18nVersion>1.2.2</nuitonI18nVersion> - <openEjbVersion>3.1.3.0</openEjbVersion> - <slf4jVersion>1.6.0</slf4jVersion> + <openEjbVersion>3.1.4</openEjbVersion> + <slf4jVersion>1.6.1</slf4jVersion> <!--axis.version>1.4.1</axis.version--> <!-- 1.4 and 1.4.1 breaks jnlp with corrupt jar <axis.version>1.3</axis.version>-->