From 4a69ac4b9089b1b9de6d9f25393d295074bf4b93 Mon Sep 17 00:00:00 2001 From: Mathieu Baudier Date: Fri, 6 Mar 2009 13:52:08 +0000 Subject: [PATCH] Optimize server start and deployment git-svn-id: https://svn.argeo.org/slc/trunk@2236 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc --- org.argeo.slc.webapp/pom.xml | 142 +++++------ org.argeo.slc/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../WEB-INF/classes/log4j.properties | 5 +- server/org.argeo.slc.siteserver/pom.xml | 240 ++++-------------- 5 files changed, 114 insertions(+), 277 deletions(-) diff --git a/org.argeo.slc.webapp/pom.xml b/org.argeo.slc.webapp/pom.xml index b21f3775d..d75107bd8 100644 --- a/org.argeo.slc.webapp/pom.xml +++ b/org.argeo.slc.webapp/pom.xml @@ -7,22 +7,40 @@ 0.11.3-SNAPSHOT ../org.argeo.slc - org.argeo.slc.webapp - pom - Argeo SLC Web Application + org.argeo.slc.server + org.argeo.slc.ria + jar + Argeo SLC Web UI - ${artifactId} + + + src/main/webapp + + index.jsp + argeo-ria/** + + + + org.apache.maven.plugins maven-compiler-plugin - maven-war-plugin + maven-jar-plugin - qooxdoo-0.8-sdk/**,source/** + + false + src/main/webapp/META-INF/MANIFEST.MF + + org.argeo.slc.maven maven-argeo-qooxdoo-plugin @@ -104,81 +122,43 @@ - - - org.argeo.slc.runtime - org.argeo.slc.server - + - - org.springframework.osgi - org.springframework.osgi.web.extender - - - org.eclipse.osgi - org.eclipse.osgi - - - org.apache.catalina - com.springsource.org.apache.catalina - - - org.springframework.osgi - org.springframework.osgi.web - - - javax.annotation - com.springsource.javax.annotation - - - javax.persistence - com.springsource.javax.persistence - - - javax.xml.ws - com.springsource.javax.xml.ws - - - javax.xml.bind - com.springsource.javax.xml.bind - - - org.springframework.osgi - org.springframework.osgi.extender - - - org.argeo.slc.dep.osgi - org.argeo.dep.osgi.catalina.start - - - javax.servlet - com.springsource.javax.servlet.jsp - - - javax.el - com.springsource.javax.el - - - javax.servlet - com.springsource.javax.servlet.jsp.jstl - - - org.apache.taglibs - com.springsource.org.apache.taglibs.standard - - - org.hsqldb - com.springsource.org.hsqldb - + org.springframework.osgi + org.springframework.osgi.web.extender + org.eclipse.osgi + org.eclipse.osgi + org.apache.catalina + com.springsource.org.apache.catalina + org.springframework.osgi + org.springframework.osgi.web + javax.annotation + com.springsource.javax.annotation + javax.persistence + com.springsource.javax.persistence + javax.xml.ws + com.springsource.javax.xml.ws + javax.xml.bind + com.springsource.javax.xml.bind + org.springframework.osgi + org.springframework.osgi.extender + org.argeo.slc.dep.osgi + org.argeo.dep.osgi.catalina.start + javax.servlet + com.springsource.javax.servlet.jsp + javax.el + com.springsource.javax.el + javax.servlet + com.springsource.javax.servlet.jsp.jstl + org.apache.taglibs + com.springsource.org.apache.taglibs.standard + org.hsqldb + com.springsource.org.hsqldb - - - com.sun.xml - - com.springsource.com.sun.xml.messaging.saaj - - - - + com.sun.xml + com.springsource.com.sun.xml.messaging.saaj + + --> \ No newline at end of file diff --git a/org.argeo.slc/pom.xml b/org.argeo.slc/pom.xml index 6df9fd04f..203eb669f 100644 --- a/org.argeo.slc/pom.xml +++ b/org.argeo.slc/pom.xml @@ -512,7 +512,7 @@ limitations under the License. org.argeo.slc.dep.osgi org.argeo.dep.osgi.catalina.start - 1.0.0 + 1.0.0.argeo.2 diff --git a/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.server.tomcat/META-INF/MANIFEST.MF b/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.server.tomcat/META-INF/MANIFEST.MF index 2e843b1fe..db811a3e2 100644 --- a/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.server.tomcat/META-INF/MANIFEST.MF +++ b/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.server.tomcat/META-INF/MANIFEST.MF @@ -1,3 +1,3 @@ Bundle-SymbolicName: org.argeo.slc.server.tomcat Bundle-Version: 0.1.0 -Fragment-Host: org.springframework.osgi.catalina.start.osgi \ No newline at end of file +Fragment-Host: org.argeo.dep.osgi.catalina.start \ No newline at end of file diff --git a/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.webapp.war/WEB-INF/classes/log4j.properties b/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.webapp.war/WEB-INF/classes/log4j.properties index 34f682a8a..d51df5f45 100644 --- a/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.webapp.war/WEB-INF/classes/log4j.properties +++ b/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.webapp.war/WEB-INF/classes/log4j.properties @@ -6,14 +6,15 @@ log4j.rootLogger=WARN, console log4j.logger.org.argeo.slc=DEBUG # Spring -log4j.logger.org.springframework=INFO +log4j.logger.org.springframework=WARN log4j.logger.org.springframework.transaction=WARN log4j.logger.org.springframework.orm.hibernate3=WARN log4j.logger.org.springframework.orm.hibernate3.HibernateTransactionManager=WARN +log4j.logger.org.springframework.osgi.web=INFO # Hibernate log4j.logger.org.hibernate=WARN -log4j.logger.org.hibernate.stat=INFO +log4j.logger.org.hibernate.stat=WARN log4j.logger.org.hibernate.SQL=WARN log4j.logger.org.hibernate.transaction=WARN #log4j.logger.org.hibernate.tool.hbm2ddl=TRACE diff --git a/server/org.argeo.slc.siteserver/pom.xml b/server/org.argeo.slc.siteserver/pom.xml index 034f4a727..9c63fe7eb 100644 --- a/server/org.argeo.slc.siteserver/pom.xml +++ b/server/org.argeo.slc.siteserver/pom.xml @@ -16,37 +16,6 @@ - - - org.mortbay.jetty - maven-jetty-plugin - - ${project.build.directory}/dependency/org.argeo.slc.webapp.war - 0 - ../../org.argeo.slc.webapp/src/main/config/jetty/webdefault.xml - src/test/config/jetty/jetty.xml - - - - appserver.base - target - - - - appserver.home - target - - - - - maven-dependency-plugin @@ -101,50 +70,33 @@ - - - - - - - - - - - + + - - + + - - - + + + + + - + value="org.argeo.dep.osgi.catalina.start,org.springframework.osgi.extender,org.springframework.osgi.web.extender,org.springframework.osgi.samples.simplewebapp,org.argeo.slc.server.activemq,org.argeo.slc.server.hibernate,org.argeo.slc.webapp,org.argeo.slc.demo.basic,org.argeo.slc.demo.manager" /> @@ -153,41 +105,40 @@ - - maven-dependency-plugin - - - manager - initialize - - list - - - target/server.maven - - - - - + + - - - - org.argeo.slc.runtime org.argeo.slc.server + + org.argeo.slc.server + org.argeo.slc.ria + ${project.version} + + org.hsqldb @@ -223,22 +174,6 @@ 1.0.0 - - - @@ -254,10 +189,16 @@ org.springframework.osgi.web + org.apache.catalina com.springsource.org.apache.catalina + + org.argeo.slc.dep.osgi + org.argeo.dep.osgi.catalina.start + + org.apache.jasper com.springsource.org.apache.jasper @@ -287,7 +228,6 @@ - org.apache.commons com.springsource.org.apache.commons.logging @@ -299,85 +239,6 @@ - - org.springframework.osgi - catalina.start.osgi - 1.0.0 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - com.sun.xml @@ -399,12 +260,6 @@ 1.2.2 - - org.argeo.slc.runtime @@ -425,7 +280,7 @@ - + \ No newline at end of file -- 2.39.2