This is an automated email from the git hooks/post-receive script. New commit to branch feature/1190-encodage-path in repository lima. See http://git.chorem.org/lima.git commit 0dd23ace0d79bc3b70e709f9e93e4fbaf15509d5 Author: dcosse <cosse@codelutin.com> Date: Fri Mar 6 18:31:06 2015 +0100 refs #1190 Refactoring déplacement de LimaServer sur la partie business, correction sur les POMs, ajout de paramètres à openEjb. La partie serveur démarre et la partie client essaie de s'y connecter mais elle ne semble pas y parvenir, elle démarre toujours sur une base locale. --- lima-business/README.txt | 7 ++- lima-business/pom.xml | 36 +++++++++++++- .../src/main/assembly/bin.xml | 42 ---------------- .../src/main/assembly/lima-server | 0 .../src/main/java/org/chorem/lima/LimaServer.java | 4 +- .../ejb/FinancialTransactionServiceImpl.java | 4 +- .../chorem/lima/service/LimaServiceFactory.java | 4 +- .../src/{test => main}/resources/log4j.properties | 4 +- lima-business/src/test/resources/log4j.properties | 4 +- lima-swing/pom.xml | 6 +++ .../main/java/org/chorem/lima/LimaSwingConfig.java | 3 +- lima-swing/src/main/resources/META-INF/ejb-jar.xml | 41 +++++++++++++++ .../src/main/resources/lima-config.properties | 4 +- lima-swing/src/main/resources/log4j.properties | 58 +++++++++++----------- lima-web/pom.xml | 32 +++--------- lima-web/src/main/assembly/bin.xml | 52 ++++--------------- .../src/main}/resources/log4j.properties | 0 pom.xml | 2 +- 18 files changed, 147 insertions(+), 156 deletions(-) diff --git a/lima-business/README.txt b/lima-business/README.txt index 30404ce..5971651 100644 --- a/lima-business/README.txt +++ b/lima-business/README.txt @@ -1 +1,6 @@ -TODO \ No newline at end of file +Configurer le client pour se connecter au serveur via le fichier de configuration : +UNIX LIKE:$HOME/.config/lima.properties +7 et +: C:\Users\USER_NAME\AppData\Roaming\lima.properties + +java.naming.factory.initial=org.apache.openejb.client.RemoteInitialContextFactory +java.naming.provider.url=ejbd://192.168.99.9:4201 \ No newline at end of file diff --git a/lima-business/pom.xml b/lima-business/pom.xml index 36844a0..d84e624 100644 --- a/lima-business/pom.xml +++ b/lima-business/pom.xml @@ -82,12 +82,12 @@ <dependency> <groupId>org.apache.openejb</groupId> <artifactId>javaee-api</artifactId> - <scope>provided</scope> + <scope>compile</scope> </dependency> <dependency> <groupId>org.apache.openejb</groupId> <artifactId>openejb-core</artifactId> - <scope>runtime</scope> + <scope>compile</scope> </dependency> <dependency> <groupId>org.apache.openejb</groupId> @@ -132,6 +132,7 @@ <manifest> <addClasspath>true</addClasspath> <classpathPrefix>./lib/</classpathPrefix> + <mainClass>org.chorem.lima.LimaServer</mainClass> </manifest> </archive> </configuration> @@ -169,6 +170,37 @@ </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>package</phase> + <goals> + <goal>single</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + </build> + </profile> <profile> <id>reporting</id> diff --git a/lima-web/src/main/assembly/bin.xml b/lima-business/src/main/assembly/bin.xml similarity index 59% copy from lima-web/src/main/assembly/bin.xml copy to lima-business/src/main/assembly/bin.xml index 9baff9f..671d1d1 100644 --- a/lima-web/src/main/assembly/bin.xml +++ b/lima-business/src/main/assembly/bin.xml @@ -56,47 +56,5 @@ <include>LICENSE*</include> </includes> </fileSet> - <fileSet> - <directory>src/main/resources/reports</directory> - <outputDirectory>reports</outputDirectory> - <includes> - <include>*.pdf</include> - </includes> - </fileSet> - <fileSet> - <directory>src/main/jasperreports/accounts</directory> - <outputDirectory>jasperreports</outputDirectory> - <includes> - <include>*.jrxml</include> - </includes> - </fileSet> - <fileSet> - <directory>src/main/jasperreports/balance</directory> - <outputDirectory>jasperreports</outputDirectory> - <includes> - <include>*.jrxml</include> - </includes> - </fileSet> - <fileSet> - <directory>src/main/jasperreports/entryBook</directory> - <outputDirectory>jasperreports</outputDirectory> - <includes> - <include>*.jrxml</include> - </includes> - </fileSet> - <fileSet> - <directory>src/main/jasperreports/generalEntryBook</directory> - <outputDirectory>jasperreports</outputDirectory> - <includes> - <include>*.jrxml</include> - </includes> - </fileSet> - <fileSet> - <directory>src/main/jasperreports/ledger</directory> - <outputDirectory>jasperreports</outputDirectory> - <includes> - <include>*.jrxml</include> - </includes> - </fileSet> </fileSets> </assembly> diff --git a/lima-web/src/main/assembly/lima-server b/lima-business/src/main/assembly/lima-server similarity index 100% rename from lima-web/src/main/assembly/lima-server rename to lima-business/src/main/assembly/lima-server diff --git a/lima-web/src/main/java/org/chorem/lima/LimaServer.java b/lima-business/src/main/java/org/chorem/lima/LimaServer.java similarity index 95% rename from lima-web/src/main/java/org/chorem/lima/LimaServer.java rename to lima-business/src/main/java/org/chorem/lima/LimaServer.java index 77c24b9..bf1d6dd 100644 --- a/lima-web/src/main/java/org/chorem/lima/LimaServer.java +++ b/lima-business/src/main/java/org/chorem/lima/LimaServer.java @@ -46,12 +46,14 @@ public class LimaServer { * Lima server. * * @param args - * @throws javax.naming.NamingException + * @throws NamingException */ public static void main(String... args) throws NamingException { + Properties properties = new Properties(); properties.setProperty(Context.INITIAL_CONTEXT_FACTORY, LocalInitialContextFactory.class.getName()); properties.setProperty("openejb.embedded.remotable", "true"); + properties.setProperty("openejb.deployments.classpath.ear", "false"); // Uncomment these properties to change the defaults //properties.setProperty("ejbd.port", "4202"); properties.setProperty("ejbd.bind", "0.0.0.0"); diff --git a/lima-business/src/main/java/org/chorem/lima/business/ejb/FinancialTransactionServiceImpl.java b/lima-business/src/main/java/org/chorem/lima/business/ejb/FinancialTransactionServiceImpl.java index 970212f..9e82fb4 100644 --- a/lima-business/src/main/java/org/chorem/lima/business/ejb/FinancialTransactionServiceImpl.java +++ b/lima-business/src/main/java/org/chorem/lima/business/ejb/FinancialTransactionServiceImpl.java @@ -466,8 +466,8 @@ public class FinancialTransactionServiceImpl extends AbstractLimaService impleme EntryTopiaDao entryTopiaDao = getDaoHelper().getEntryDao(); List<Entry> entries = entryTopiaDao.findAllEntryByFilter(filter); - if (log.isInfoEnabled()) { - log.info("Entries size : " + entries.size()); + if (log.isDebugEnabled()) { + log.debug("Entries size : " + entries.size()); } return entries; diff --git a/lima-business/src/main/java/org/chorem/lima/service/LimaServiceFactory.java b/lima-business/src/main/java/org/chorem/lima/service/LimaServiceFactory.java index c16e2c5..9fa26eb 100644 --- a/lima-business/src/main/java/org/chorem/lima/service/LimaServiceFactory.java +++ b/lima-business/src/main/java/org/chorem/lima/service/LimaServiceFactory.java @@ -91,11 +91,11 @@ public class LimaServiceFactory { // 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"); + //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 + // for embedded configuration. container = EJBContainer.createEJBContainer(props); } diff --git a/lima-business/src/test/resources/log4j.properties b/lima-business/src/main/resources/log4j.properties similarity index 90% copy from lima-business/src/test/resources/log4j.properties copy to lima-business/src/main/resources/log4j.properties index e4875ad..2a75c2e 100644 --- a/lima-business/src/test/resources/log4j.properties +++ b/lima-business/src/main/resources/log4j.properties @@ -28,6 +28,4 @@ log4j.appender.stdout.layout=org.apache.log4j.PatternLayout log4j.appender.stdout.layout.ConversionPattern=%5p [%t] (%F:%L) %M - %m%n # package level -log4j.logger.org.chorem.lima=DEBUG - -log4j.logger.org.chorem.lima.business.ejb.FinancialTransactionServiceImpl=DEBUG +log4j.logger.org.chorem.lima=DEBUG \ No newline at end of file diff --git a/lima-business/src/test/resources/log4j.properties b/lima-business/src/test/resources/log4j.properties index e4875ad..2a75c2e 100644 --- a/lima-business/src/test/resources/log4j.properties +++ b/lima-business/src/test/resources/log4j.properties @@ -28,6 +28,4 @@ log4j.appender.stdout.layout=org.apache.log4j.PatternLayout log4j.appender.stdout.layout.ConversionPattern=%5p [%t] (%F:%L) %M - %m%n # package level -log4j.logger.org.chorem.lima=DEBUG - -log4j.logger.org.chorem.lima.business.ejb.FinancialTransactionServiceImpl=DEBUG +log4j.logger.org.chorem.lima=DEBUG \ No newline at end of file diff --git a/lima-swing/pom.xml b/lima-swing/pom.xml index 0c50419..d3e2180 100644 --- a/lima-swing/pom.xml +++ b/lima-swing/pom.xml @@ -162,6 +162,12 @@ </dependency> <dependency> + <groupId>org.apache.openejb</groupId> + <artifactId>javaee-api</artifactId> + <scope>runtime</scope> + </dependency> + + <dependency> <groupId>org.nuiton</groupId> <artifactId>nuiton-widgets</artifactId> </dependency> diff --git a/lima-swing/src/main/java/org/chorem/lima/LimaSwingConfig.java b/lima-swing/src/main/java/org/chorem/lima/LimaSwingConfig.java index befba4e..02e64da 100644 --- a/lima-swing/src/main/java/org/chorem/lima/LimaSwingConfig.java +++ b/lima-swing/src/main/java/org/chorem/lima/LimaSwingConfig.java @@ -518,7 +518,8 @@ public class LimaSwingConfig extends ApplicationConfig { OPENEJB_EXCLUDE_INCLUDE("openejb.exclude-include.order", "open_EJB_include-exclude_order","open_EJB_include-exclude_order", "include-exclude", String.class, false, false), OPENEJB_INCLUDE("openejb.deployments.classpath.include", "open_EJB_include","open_EJB_include", "", String.class, false, false), OPENEJB_EXCLUDE("openejb.deployments.classpath.exclude", "open_EJB_exclude","open_EJB_exclude", ".*", String.class, false, false), - OPENEJB_LOCAL_INITIAL_CONTEXT_FACTORY("java.naming.factory.initial", "java.naming.factory.initial", "java.naming.factory.initial", "org.apache.openejb.core.LocalInitialContextFactory", String.class, false, false), + OPENEJB_DEPLOYMENTS_CLASSPATH_EAR("openejb.deployments.classpath.ear", "openejb.deployments.classpath.ear", "openejb.deployments.classpath.ear", "false", String.class, false, false), + INITIAL_CONTEXT_FACTORY("java.naming.factory.initial", "java.naming.factory.initial", "java.naming.factory.initial", "org.apache.openejb.core.LocalInitialContextFactory", String.class, false, false), LIMA_HOST_ADDRESS("lima.host.address", t("lima.config.host.address.label"), diff --git a/lima-swing/src/main/resources/META-INF/ejb-jar.xml b/lima-swing/src/main/resources/META-INF/ejb-jar.xml new file mode 100644 index 0000000..38b4710 --- /dev/null +++ b/lima-swing/src/main/resources/META-INF/ejb-jar.xml @@ -0,0 +1,41 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + Lima :: business + %% + Copyright (C) 2008 - 2012 CodeLutin, Chatellier Eric + %% + 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% + --> +<!-- + Empty configuration file based on + http://openejb.apache.org/application-discovery-via-the-classpath.html + + Interceptor based on : http://openejb.apache.org/examples-trunk/alternate-descriptors/ +--> +<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> + <interceptor-binding> + <ejb-name>*</ejb-name> + <interceptor-class>org.chorem.lima.business.LimaInterceptor</interceptor-class> + </interceptor-binding> + </assembly-descriptor> +</ejb-jar> diff --git a/lima-swing/src/main/resources/lima-config.properties b/lima-swing/src/main/resources/lima-config.properties index a317c16..6c6155f 100644 --- a/lima-swing/src/main/resources/lima-config.properties +++ b/lima-swing/src/main/resources/lima-config.properties @@ -45,8 +45,8 @@ application.organisation.url=${project.organization.url} #lima.openejb.remotemode=false java.naming.factory.initial=org.apache.openejb.core.LocalInitialContextFactory openejb.exclude-include.order=include-exclude -openejb.deployments.classpath.include="" -openejb.deployments.classpath.exclude=".*" +openejb.deployments.classpath.include= +openejb.deployments.classpath.exclude=.* #Lima Accounting Host #lima.host.address=localhost diff --git a/lima-swing/src/main/resources/log4j.properties b/lima-swing/src/main/resources/log4j.properties index 804ff5b..0037d9a 100644 --- a/lima-swing/src/main/resources/log4j.properties +++ b/lima-swing/src/main/resources/log4j.properties @@ -37,45 +37,45 @@ log4j.appender.file.layout.ConversionPattern=%5p [%t] (%F:%L) %M - %m%n openejb.logger.external=true log4j.category.OpenEJB.options=warn log4j.category.OpenEJB=warn -log4j.category.OpenEJB.server=warn +log4j.category.OpenEJB.server=info log4j.category.OpenEJB.startup=warn log4j.category.OpenEJB.startup.service=warn log4j.category.OpenEJB.startup.config=warn -log4j.category.OpenEJB.hsql=error +log4j.category.OpenEJB.hsql=info log4j.category.CORBA-Adapter=info log4j.category.Transaction=warn log4j.category.org.apache.activemq=error log4j.category.org.apache.geronimo=error -log4j.category.openjpa=error +log4j.category.openjpa=info log4j.appender.C=org.apache.log4j.ConsoleAppender log4j.appender.C.layout=org.apache.log4j.SimpleLayout # package level log4j.logger.org.chorem.lima=INFO -log4j.logger.org.chorem.lima.ui.financialtransaction.FinancialTransactionTable=DEBUG -log4j.logger.org.chorem.lima.ui.lettering.LetteringViewHandler=DEBUG -log4j.logger.org.chorem.lima.ui.lettering.LettringSelectionModel=DEBUG -log4j.logger.org.chorem.lima.ui.lettering.LetteringEditModel=DEBUG -log4j.logger.org.chorem.lima.ui.common.FinancialTransactionTableModel=DEBUG -log4j.logger.org.chorem.lima.ui.celleditor.BigDecimalTableCellEditor=DEBUG -log4j.logger.org.chorem.lima.business.accountingrules.DefaultAccountingRules=DEBUG -log4j.logger.org.chorem.lima.business.ejb.FinancialTransactionServiceImpl=DEBUG -log4j.logger.org.chorem.lima.business.ui.celleditor.BigDecimalTableCellEditor=DEBUG -log4j.logger.org.chorem.lima.business.ui.financialtransaction.FinancialTransactionTableModel=DEBUG -log4j.logger.org.chorem.lima.entity.EntryDAOImpl=DEBUG -log4j.logger.org.chorem.lima.ui.financialtransaction.FinancialTransactionViewHandler=DEBUG -log4j.logger.org.chorem.lima.entity.AbstractFinancialTransactionTopiaDao=DEBUG -log4j.logger.org.chorem.lima.ui.combobox.FiscalPeriodComboBoxModel=DEBUG -log4j.logger.org.chorem.lima.ui.financialtransactionsearch.FinancialTransactionPeriodSearchPanel=DEBUG -log4j.logger.org.chorem.lima.ui.financialtransactionsearch.FinancialTransactionSearchViewHandler=DEBUG -log4j.logger.org.chorem.lima.ui.fiscalperiod.FiscalPeriodViewHandler=DEBUG -log4j.logger.org.chorem.lima.ui.fiscalperiod.FiscalPeriodTableModel=DEBUG -log4j.logger.org.chorem.lima.business.ejb.DocumentServiceImpl=DEBUG -log4j.logger.org.chorem.lima.business.ejb.HttpServerServiceImpl=DEBUG -log4j.logger.org.chorem.lima.ui.accountsreports.AccountsReportsViewHandler=DEBUG -log4j.logger.org.chorem.lima.business.ejb.ReportServiceImpl=DEBUG -log4j.logger.org.chorem.lima.ui.MainViewHandler=DEBUG -log4j.logger.org.chorem.lima.business.ejb.FinancialStatementServiceImpl=DEBUG -log4j.logger.org.chorem.lima.ui.importexport.ImportExport=DEBUG -log4j.logger.org.chorem.lima.ui.celleditor.DateTableCellEditor=DEBUG +log4j.logger.org.chorem.lima.ui.financialtransaction.FinancialTransactionTable=INFO +log4j.logger.org.chorem.lima.ui.lettering.LetteringViewHandler=INFO +log4j.logger.org.chorem.lima.ui.lettering.LettringSelectionModel=INFO +log4j.logger.org.chorem.lima.ui.lettering.LetteringEditModel=INFO +log4j.logger.org.chorem.lima.ui.common.FinancialTransactionTableModel=INFO +log4j.logger.org.chorem.lima.ui.celleditor.BigDecimalTableCellEditor=INFO +log4j.logger.org.chorem.lima.business.accountingrules.DefaultAccountingRules=INFO +log4j.logger.org.chorem.lima.business.ejb.FinancialTransactionServiceImpl=INFO +log4j.logger.org.chorem.lima.business.ui.celleditor.BigDecimalTableCellEditor=INFO +log4j.logger.org.chorem.lima.business.ui.financialtransaction.FinancialTransactionTableModel=INFO +log4j.logger.org.chorem.lima.entity.EntryDAOImpl=INFO +log4j.logger.org.chorem.lima.ui.financialtransaction.FinancialTransactionViewHandler=INFO +log4j.logger.org.chorem.lima.entity.AbstractFinancialTransactionTopiaDao=INFO +log4j.logger.org.chorem.lima.ui.combobox.FiscalPeriodComboBoxModel=INFO +log4j.logger.org.chorem.lima.ui.financialtransactionsearch.FinancialTransactionPeriodSearchPanel=INFO +log4j.logger.org.chorem.lima.ui.financialtransactionsearch.FinancialTransactionSearchViewHandler=INFO +log4j.logger.org.chorem.lima.ui.fiscalperiod.FiscalPeriodViewHandler=INFO +log4j.logger.org.chorem.lima.ui.fiscalperiod.FiscalPeriodTableModel=INFO +log4j.logger.org.chorem.lima.business.ejb.DocumentServiceImpl=INFO +log4j.logger.org.chorem.lima.business.ejb.HttpServerServiceImpl=INFO +log4j.logger.org.chorem.lima.ui.accountsreports.AccountsReportsViewHandler=INFO +log4j.logger.org.chorem.lima.business.ejb.ReportServiceImpl=INFO +log4j.logger.org.chorem.lima.ui.MainViewHandler=INFO +log4j.logger.org.chorem.lima.business.ejb.FinancialStatementServiceImpl=INFO +log4j.logger.org.chorem.lima.ui.importexport.ImportExport=INFO +log4j.logger.org.chorem.lima.ui.celleditor.DateTableCellEditor=INFO diff --git a/lima-web/pom.xml b/lima-web/pom.xml index 62e5957..847663a 100644 --- a/lima-web/pom.xml +++ b/lima-web/pom.xml @@ -14,16 +14,6 @@ <name>Lima :: web</name> <description>Lima Web Module</description> - <properties> - <!--Main class in JAR --> - <maven.jar.main.class>org.chorem.lima.LimaServer</maven.jar.main.class> - - <redmine.releaseFiles> - target/lima-server-${project.version}-bin.zip - </redmine.releaseFiles> - - </properties> - <dependencies> <dependency> <groupId>${project.groupId}</groupId> @@ -97,16 +87,6 @@ <scope>compile</scope> </dependency> <dependency> - <groupId>org.apache.openejb</groupId> - <artifactId>openejb-core</artifactId> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>org.apache.openejb</groupId> - <artifactId>javaee-api</artifactId> - <scope>runtime</scope> - </dependency> - <dependency> <groupId>org.hibernate</groupId> <artifactId>hibernate-core</artifactId> <scope>compile</scope> @@ -116,7 +96,11 @@ <artifactId>javax.servlet-api</artifactId> <scope>provided</scope> </dependency> - + <dependency> + <groupId>org.apache.openejb</groupId> + <artifactId>javaee-api</artifactId> + <scope>runtime</scope> + </dependency> </dependencies> <build> @@ -160,7 +144,6 @@ <manifest> <addClasspath>true</addClasspath> <classpathPrefix>./lib/</classpathPrefix> - <mainClass>org.chorem.lima.LimaServer</mainClass> </manifest> </archive> </configuration> @@ -211,9 +194,9 @@ <plugin> <artifactId>maven-assembly-plugin</artifactId> <configuration> - <finalName>lima-server-${project.version}</finalName> + <finalName>lima-web-${project.version}</finalName> <descriptors> - <descriptor>src/main/assembly/bin.xml</descriptor> + <descriptor>../lima-web/src/main/assembly/bin.xml</descriptor> </descriptors> <attach>false</attach> </configuration> @@ -267,5 +250,4 @@ </profile> </profiles> - </project> diff --git a/lima-web/src/main/assembly/bin.xml b/lima-web/src/main/assembly/bin.xml index 9baff9f..4091fad 100644 --- a/lima-web/src/main/assembly/bin.xml +++ b/lima-web/src/main/assembly/bin.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- #%L - Lima :: business + Lima :: Swing %% Copyright (C) 2008 - 2010 CodeLutin %% @@ -22,8 +22,8 @@ --> <assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd"> + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd"> <id>bin</id> <formats> <format>zip</format> @@ -32,11 +32,7 @@ <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> + <destName>lima.${project.packaging}</destName> </file> </files> <fileSets> @@ -57,45 +53,17 @@ </includes> </fileSet> <fileSet> - <directory>src/main/resources/reports</directory> - <outputDirectory>reports</outputDirectory> + <directory>src/main/resources/i18n</directory> + <outputDirectory>i18n</outputDirectory> <includes> - <include>*.pdf</include> + <include>*.properties</include> </includes> </fileSet> <fileSet> - <directory>src/main/jasperreports/accounts</directory> - <outputDirectory>jasperreports</outputDirectory> - <includes> - <include>*.jrxml</include> - </includes> - </fileSet> - <fileSet> - <directory>src/main/jasperreports/balance</directory> - <outputDirectory>jasperreports</outputDirectory> - <includes> - <include>*.jrxml</include> - </includes> - </fileSet> - <fileSet> - <directory>src/main/jasperreports/entryBook</directory> - <outputDirectory>jasperreports</outputDirectory> - <includes> - <include>*.jrxml</include> - </includes> - </fileSet> - <fileSet> - <directory>src/main/jasperreports/generalEntryBook</directory> - <outputDirectory>jasperreports</outputDirectory> - <includes> - <include>*.jrxml</include> - </includes> - </fileSet> - <fileSet> - <directory>src/main/jasperreports/ledger</directory> - <outputDirectory>jasperreports</outputDirectory> + <directory>target</directory> + <outputDirectory>i18n</outputDirectory> <includes> - <include>*.jrxml</include> + <include>lima-i18n.csv</include> </includes> </fileSet> </fileSets> diff --git a/lima-business/src/test/resources/log4j.properties b/lima-web/src/main/resources/log4j.properties similarity index 100% copy from lima-business/src/test/resources/log4j.properties copy to lima-web/src/main/resources/log4j.properties diff --git a/pom.xml b/pom.xml index 1b8ffd5..9ad8490 100644 --- a/pom.xml +++ b/pom.xml @@ -392,7 +392,7 @@ <groupId>org.apache.openejb</groupId> <artifactId>javaee-api</artifactId> <version>${openejbJavaeeApiVersion}</version> - <scope>runtime</scope> + <scope>provided</scope> </dependency> <dependency> -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.