From 1ec55746401235e40466bcb1ae63ea888d22a384 Mon Sep 17 00:00:00 2001 From: mbaudier Date: Wed, 4 Jun 2014 09:51:06 +0200 Subject: [PATCH] Update SLC. Standalone launch. --- .gitignore | 1 + .project | 2 +- META-INF/MANIFEST.MF | 18 +++++++-------- bin/.gitignore | 1 + bin/argeo-tp-factory.properties | 23 +++++++++++++++++++ bin/log4j.properties | 39 +++++++++++++++++++++++++++++++++ pom.xml | 30 ++++++++++++++++++++++++- 7 files changed, 103 insertions(+), 11 deletions(-) create mode 100644 bin/.gitignore create mode 100644 bin/argeo-tp-factory.properties create mode 100644 bin/log4j.properties diff --git a/.gitignore b/.gitignore index d0040d9..28c2ca2 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ /cache /target +/*.target diff --git a/.project b/.project index 125b006..3dd4b4a 100644 --- a/.project +++ b/.project @@ -1,6 +1,6 @@ - org.argeo.tp + org.argeo.tp.slc.factory diff --git a/META-INF/MANIFEST.MF b/META-INF/MANIFEST.MF index 73ec92e..efd1687 100644 --- a/META-INF/MANIFEST.MF +++ b/META-INF/MANIFEST.MF @@ -1,6 +1,6 @@ Manifest-Version: 1.0 -Bnd-LastModified: 1376991293617 -Build-Jdk: 1.7.0_25 +Bnd-LastModified: 1401865871630 +Build-Jdk: 1.6.0_30 Built-By: mbaudier Bundle-Description: SLC execution modules for generic tasks, to be used as parent pom @@ -11,7 +11,7 @@ Bundle-Name: Argeo Distribution Factory Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Bundle-SymbolicName: org.argeo.tp.slc.factory Bundle-Vendor: Argeo -Bundle-Version: 1.1.14.SNAPSHOT-r130820_1134 +Bundle-Version: 1.1.19.SNAPSHOT-r140604_0911 Created-By: Apache Maven Bundle Plugin Import-Package: com.jcraft.jsch;resolution:=optional,javax.jcr;version=" [2.0,3)",net.sf.cglib.core;version="[2.1,3)",net.sf.cglib.proxy;version @@ -20,12 +20,12 @@ Import-Package: com.jcraft.jsch;resolution:=optional,javax.jcr;version=" [1.0,2)",org.argeo.security.core;version="[1.2,2)",org.argeo.slc.core.e xecution;version="[1.1,2)",org.argeo.slc.core.execution.tasks;version=" [1.1,2)",org.argeo.slc.execution;version="[1.1,2)",org.argeo.slc.osgi;v - ersion="[1.1,2)",org.argeo.slc.repo,org.argeo.slc.repo.osgi,org.argeo.s - lc.test;version="[1.1,2)",org.springframework.aop;version="[2.5,3)",org - .springframework.aop.framework;version="[2.5,3)",org.springframework.ao - p.scope;version="[2.5,3)",org.springframework.beans.factory.config;vers - ion="[2.5,3)",org.springframework.core.io;version="[2.5,3)",org.springf - ramework.security;version="[2.0,3)" + ersion="[1.1,2)",org.argeo.slc.repo;version="[1.1,2)",org.argeo.slc.rep + o.osgi;version="[1.1,2)",org.argeo.slc.test;version="[1.1,2)",org.sprin + gframework.aop;version="[2.5,3)",org.springframework.aop.framework;vers + ion="[2.5,3)",org.springframework.aop.scope;version="[2.5,3)",org.sprin + gframework.beans.factory.config;version="[2.5,3)",org.springframework.c + ore.io;version="[2.5,3)",org.springframework.security;version="[2.0,3)" SLC-ExecutionModule: default SLC-GroupId: org.argeo.tp.slc Tool: Bnd-1.50.0 diff --git a/bin/.gitignore b/bin/.gitignore new file mode 100644 index 0000000..2db33e9 --- /dev/null +++ b/bin/.gitignore @@ -0,0 +1 @@ +/exec diff --git a/bin/argeo-tp-factory.properties b/bin/argeo-tp-factory.properties new file mode 100644 index 0000000..ca35d5c --- /dev/null +++ b/bin/argeo-tp-factory.properties @@ -0,0 +1,23 @@ +argeo.osgi.start=\ +org.springframework.osgi.extender,\ +org.argeo.node.repo.jackrabbit,\ +org.argeo.security.dao.os,\ +org.argeo.slc.node.jackrabbit,\ +org.argeo.slc.agent,\ +org.argeo.slc.agent.jcr,\ +org.argeo.slc.support.maven,\ +org.argeo.slc.server.repo,\ + +argeo.osgi.start.5=org.argeo.server.catalina.start,\ +org.springframework.osgi.web.extender,\ +org.argeo.jackrabbit.webapp,\ +org.argeo.slc.server.repo.webapp,\ + +slc.executionModules=org.argeo.tp.slc.factory,\ + +eclipse.application=org.argeo.slc.client.rcp.application +org.argeo.security.ui.initialPerspective=org.argeo.slc.client.ui.slcExecutionPerspective + +log4j.configuration=file:../../log4j.properties + +#argeo.server.tomcat.config=conf/default-server-ssl.xml diff --git a/bin/log4j.properties b/bin/log4j.properties new file mode 100644 index 0000000..fd767c3 --- /dev/null +++ b/bin/log4j.properties @@ -0,0 +1,39 @@ +#log4j.rootLogger=WARN, console +log4j.rootLogger=WARN, development + +## Levels +log4j.logger.org.argeo=DEBUG +log4j.logger.org.argeo.slc.repo=TRACE +log4j.logger.org.argeo.jackrabbit.remote.ExtendedDispatcherServlet=ERROR +log4j.logger.org.springframework.web.servlet.PageNotFound=ERROR +log4j.logger.org.argeo.server.webextender.TomcatDeployer=WARN + +#log4j.logger.org.apache=DEBUG +#log4j.logger.org.springframework.security=DEBUG +#log4j.logger.org.apache.jackrabbit=DEBUG +#log4j.logger.org.apache.jackrabbit.spi2dav=DEBUG +#log4j.logger.org.apache.jackrabbit.core.query.QueryImpl=DEBUG + +log4j.logger.org.apache.coyote=INFO +log4j.logger.org.apache.catalina.core.ContainerBase=INFO +log4j.logger.org.apache.directory.server=ERROR +log4j.logger.org.apache.jackrabbit.core.query.lucene=ERROR +log4j.logger.org.apache.jackrabbit.core.config.ConfigurationErrorHandler=ERROR +log4j.logger.org.apache.jackrabbit.core.util.db.DbUtility=FATAL + +## Appenders +# default appender +log4j.appender.console=org.apache.log4j.ConsoleAppender +log4j.appender.console.layout=org.apache.log4j.PatternLayout +log4j.appender.console.layout.ConversionPattern=%d{yyyyMMdd HH:mm:ss} %-5p %m [%t] %c%n + +# messages only appender +log4j.appender.messages=org.apache.log4j.ConsoleAppender +log4j.appender.messages.layout=org.apache.log4j.PatternLayout +log4j.appender.messages.layout.ConversionPattern=%m%n + +# development appender +log4j.appender.development=org.apache.log4j.ConsoleAppender +log4j.appender.development.layout=org.apache.log4j.PatternLayout +log4j.appender.development.layout.ConversionPattern=%d{HH:mm:ss,SSS} [%16.16t] %5p %m (%F:%L) %c%n +#log4j.appender.development.layout.ConversionPattern=%d{HH:mm:ss,SSS} %5p %m [%16.16t] %c%n diff --git a/pom.xml b/pom.xml index b15940d..dc207ec 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ org.argeo.slc lib - 1.1.14-SNAPSHOT + 1.1.19-SNAPSHOT org.argeo.tp.slc org.argeo.tp.slc.factory @@ -18,7 +18,35 @@ + + + org.argeo.maven.plugins + maven-argeo-osgi-plugin + + + generate-descriptors + + descriptors + + generate-resources + + + + + + + org.argeo.slc + org.argeo.slc.repo + ${version.slc} + + + org.argeo.slc + org.argeo.slc.dep.rcp + ${version.slc} + test + + argeo-slc -- 2.30.2