Update SLC. Standalone launch.

diff --git a/.gitignore b/.gitignore
index d0040d950ba937556b09df73b06d234f6e393f99..28c2ca2f70343277911ab685d10f8b1482c17a82 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@
 /cache
 
 /target
+/*.target

diff --git a/.project b/.project
index 125b006b12d954b937d3a137512f14908d81e49c..3dd4b4a19cbb09b87104d5ab1df766faf9a9e55f 100644 (file)
--- a/.project
+++ b/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-       <name>org.argeo.tp</name>
+       <name>org.argeo.tp.slc.factory</name>
        <comment></comment>
        <projects>
        </projects>

diff --git a/META-INF/MANIFEST.MF b/META-INF/MANIFEST.MF
index 73ec92e6593d237498edf208a71453aa7654b576..efd16878889ea06caceb93f99b797b3ec44c3aa3 100644 (file)
--- a/META-INF/MANIFEST.MF
+++ b/META-INF/MANIFEST.MF
@@ -1,6 +1,6 @@
 Manifest-Version: 1.0\r
-Bnd-LastModified: 1376991293617\r
-Build-Jdk: 1.7.0_25\r
+Bnd-LastModified: 1401865871630\r
+Build-Jdk: 1.6.0_30\r
 Built-By: mbaudier\r
 Bundle-Description: SLC execution modules for generic tasks, to be used \r
  as parent pom\r
@@ -11,7 +11,7 @@ Bundle-Name: Argeo Distribution Factory
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6\r
 Bundle-SymbolicName: org.argeo.tp.slc.factory\r
 Bundle-Vendor: Argeo\r
-Bundle-Version: 1.1.14.SNAPSHOT-r130820_1134\r
+Bundle-Version: 1.1.19.SNAPSHOT-r140604_0911\r
 Created-By: Apache Maven Bundle Plugin\r
 Import-Package: com.jcraft.jsch;resolution:=optional,javax.jcr;version="\r
  [2.0,3)",net.sf.cglib.core;version="[2.1,3)",net.sf.cglib.proxy;version\r
@@ -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\r
  xecution;version="[1.1,2)",org.argeo.slc.core.execution.tasks;version="\r
  [1.1,2)",org.argeo.slc.execution;version="[1.1,2)",org.argeo.slc.osgi;v\r
- ersion="[1.1,2)",org.argeo.slc.repo,org.argeo.slc.repo.osgi,org.argeo.s\r
- lc.test;version="[1.1,2)",org.springframework.aop;version="[2.5,3)",org\r
- .springframework.aop.framework;version="[2.5,3)",org.springframework.ao\r
- p.scope;version="[2.5,3)",org.springframework.beans.factory.config;vers\r
- ion="[2.5,3)",org.springframework.core.io;version="[2.5,3)",org.springf\r
- ramework.security;version="[2.0,3)"\r
+ ersion="[1.1,2)",org.argeo.slc.repo;version="[1.1,2)",org.argeo.slc.rep\r
+ o.osgi;version="[1.1,2)",org.argeo.slc.test;version="[1.1,2)",org.sprin\r
+ gframework.aop;version="[2.5,3)",org.springframework.aop.framework;vers\r
+ ion="[2.5,3)",org.springframework.aop.scope;version="[2.5,3)",org.sprin\r
+ gframework.beans.factory.config;version="[2.5,3)",org.springframework.c\r
+ ore.io;version="[2.5,3)",org.springframework.security;version="[2.0,3)"\r
 SLC-ExecutionModule: default\r
 SLC-GroupId: org.argeo.tp.slc\r
 Tool: Bnd-1.50.0\r

diff --git a/bin/.gitignore b/bin/.gitignore
new file mode 100644 (file)
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 (file)
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 (file)
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 b15940d696452f2758149f53af72bfadfda66510..dc207ecd120c08f494ec80c5380c4e6200d8b60e 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
        <parent>
                <groupId>org.argeo.slc</groupId>
                <artifactId>lib</artifactId>
-               <version>1.1.14-SNAPSHOT</version>
+               <version>1.1.19-SNAPSHOT</version>
        </parent>
        <groupId>org.argeo.tp.slc</groupId>
        <artifactId>org.argeo.tp.slc.factory</artifactId>
@@ -18,7 +18,35 @@
                                </includes>
                        </resource>
                </resources>
+               <plugins>
+                       <plugin>
+                               <groupId>org.argeo.maven.plugins</groupId>
+                               <artifactId>maven-argeo-osgi-plugin</artifactId>
+                               <executions>
+                                       <execution>
+                                               <id>generate-descriptors</id>
+                                               <goals>
+                                                       <goal>descriptors</goal>
+                                               </goals>
+                                               <phase>generate-resources</phase>
+                                       </execution>
+                               </executions>
+                       </plugin>
+               </plugins>
        </build>
+       <dependencies>
+               <dependency>
+                       <groupId>org.argeo.slc</groupId>
+                       <artifactId>org.argeo.slc.repo</artifactId>
+                       <version>${version.slc}</version>
+               </dependency>
+               <dependency>
+                       <groupId>org.argeo.slc</groupId>
+                       <artifactId>org.argeo.slc.dep.rcp</artifactId>
+                       <version>${version.slc}</version>
+                       <scope>test</scope>
+               </dependency>
+       </dependencies>
        <repositories>
                <repository>
                        <id>argeo-slc</id>