ssh://bsinou@git.argeo.org:322/var/lib/git/git.argeo.org/org.argeo.tp.slc.factory.git/
Conflicts:
META-INF/MANIFEST.MF
pom.xml
/cache
/target
+/*.target
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>org.argeo.tp</name>
+ <name>org.argeo.tp.slc.factory</name>
<comment></comment>
<projects>
</projects>
Manifest-Version: 1.0\r
-Bnd-LastModified: 1396362883620\r
+Bnd-LastModified: 1401865871630\r
Build-Jdk: 1.6.0_30\r
-Built-By: bsinou\r
+Built-By: mbaudier\r
Bundle-Description: SLC execution modules for generic tasks, to be used \r
as parent pom\r
Bundle-DocURL: http://www.argeo.org\r
Bundle-RequiredExecutionEnvironment: JavaSE-1.6\r
Bundle-SymbolicName: org.argeo.tp.slc.factory\r
Bundle-Vendor: Argeo\r
-Bundle-Version: 1.1.16.r140401_1634\r
+Bundle-Version: 1.1.19.SNAPSHOT-r140604_0911\r
Created-By: Apache Maven Bundle Plugin\r
-Import-Package: com.jcraft.jsch;resolution:=optional,\r
- javax.jcr;version="[2.0,3)",\r
- javax.security.auth,\r
- javax.security.auth.callback,\r
- net.sf.cglib.core;version="[2.1,3)",\r
- net.sf.cglib.proxy;version="[2.1,3)",\r
- net.sf.cglib.reflect;version="[2.1,3)",\r
- org.aopalliance.aop;version="[1.0,2)",\r
- org.apache.commons.exec;version="[1.0,2)";resolution:=optional,\r
- org.argeo.security.core;version="[1.2,2)",\r
- org.argeo.slc.core.execution;version="[1.1,2)",\r
- org.argeo.slc.core.execution.tasks;version="[1.1,2)",\r
- org.argeo.slc.execution;version="[1.1,2)",\r
- org.argeo.slc.osgi;version="[1.1,2)",\r
- org.argeo.slc.repo,\r
- org.argeo.slc.repo.osgi,\r
- org.argeo.slc.test;version="[1.1,2)",\r
- org.springframework.aop;version="[2.5,3)",\r
- org.springframework.aop.framework;version="[2.5,3)",\r
- org.springframework.aop.scope;version="[2.5,3)",\r
- org.springframework.beans.factory.config;version="[2.5,3)",\r
- org.springframework.core.io;version="[2.5,3)",\r
- org.springframework.security;version="[2.0,3)"\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
+ ="[2.1,3)",net.sf.cglib.reflect;version="[2.1,3)",org.aopalliance.aop;v\r
+ ersion="[1.0,2)",org.apache.commons.exec;resolution:=optional;version="\r
+ [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;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
<ref bean="org.argeo.tp/org.slf4j" />
<ref bean="org.argeo.tp.apache.tomcat/org.apache.tomcat" />
<ref bean="org.argeo.tp/org.aopalliance" />
+ <ref bean="org.argeo.tp/org.aspectj" />
<ref bean="org.argeo.tp.spring/org.springframework" />
+ <ref bean="org.argeo.tp.apache.ant/org.apache.ant" />
+ <!-- Felix -->
+ <ref bean="org.apache.felix.framework" />
+ <ref bean="org.apache.felix.bundlerepository" />
+ <ref bean="org.apache.felix.gogo.command" />
+ <ref bean="org.apache.felix.gogo.runtime" />
+ <ref bean="org.apache.felix.gogo.shell" />
</list>
</property>
</bean>
</property>
</bean>
+ <flow:flow name="processDistribution">
+ <bean class="org.argeo.slc.repo.osgi.ProcessDistribution">
+ <property name="osgiDistribution" ref="org.argeo.tp" />
+ <property name="osgiFactory" ref="osgiFactory" />
+ </bean>
+ </flow:flow>
+
<!-- Specs and templates -->
<flow:spec id="spec.version">
<flow:primitive name="version" isParameter="true" />
<property name="osgiFactory" ref="osgiFactory" />
</bean>
-</beans>
\ No newline at end of file
+</beans>
+++ /dev/null
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:p="http://www.springframework.org/schema/p"
- xmlns:util="http://www.springframework.org/schema/util" xmlns:flow="http://www.argeo.org/schema/slc-flow"
- xsi:schemaLocation="
- http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
- http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-2.5.xsd
- http://www.argeo.org/schema/slc-flow http://www.argeo.org/schema/slc-flow-1.2.xsd">
-
- <!-- REGISTER -->
- <bean id="org.apache.ant" parent="template.org.apache.ant" />
- <bean id="org.apache.ant.launch" parent="template.org.apache.ant" />
-
- <!-- Ant Factory -->
- <bean id="template.org.apache.ant" parent="template.bndWrapper"
- abstract="true">
- <property name="groupId" value="org.argeo.tp.ant" />
- </bean>
-
- <flow:flow name="org.argeo.tp.ant/org.apache.ant" spec="spec.version">
- <flow:arg name="version" value="1.9.2" />
- <bean parent="template.archiveWrapper">
- <property name="uri"
- value="http://archive.apache.org/dist/ant/binaries/apache-ant-@{version}-bin.zip" />
- <property name="wrappers">
- <map>
- <entry key="apache-ant-@{version}/lib/ant.jar" value-ref="org.apache.ant" />
- <entry key="apache-ant-@{version}/lib/ant-launcher.jar"
- value-ref="org.apache.ant.launch" />
- </map>
- </property>
- </bean>
- </flow:flow>
-</beans>
\ No newline at end of file
--- /dev/null
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:p="http://www.springframework.org/schema/p"
+ xmlns:util="http://www.springframework.org/schema/util" xmlns:flow="http://www.argeo.org/schema/slc-flow"
+ xsi:schemaLocation="
+ http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+ http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-2.5.xsd
+ http://www.argeo.org/schema/slc-flow http://www.argeo.org/schema/slc-flow-1.2.xsd">
+
+ <!-- REGISTER -->
+ <bean id="org.apache.ant" parent="template.org.apache.ant" />
+ <bean id="org.apache.ant.launch" parent="template.org.apache.ant" />
+
+ <!-- Ant Factory -->
+ <bean id="template.org.apache.ant" parent="template.bndWrapper"
+ abstract="true">
+ <property name="groupId" value="org.argeo.tp.apache.ant" />
+ </bean>
+
+ <flow:flow name="org.argeo.tp.apache.ant/org.apache.ant" spec="spec.version">
+ <flow:arg name="version" value="1.9.2" />
+ <bean parent="template.archiveWrapper">
+ <property name="uri"
+ value="http://archive.apache.org/dist/ant/binaries/apache-ant-@{version}-bin.zip" />
+ <property name="wrappers">
+ <map>
+ <entry key="apache-ant-@{version}/lib/ant.jar" value-ref="org.apache.ant" />
+ <entry key="apache-ant-@{version}/lib/ant-launcher.jar"
+ value-ref="org.apache.ant.launch" />
+ </map>
+ </property>
+ </bean>
+ </flow:flow>
+</beans>
\ No newline at end of file
--- /dev/null
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:p="http://www.springframework.org/schema/p"
+ xmlns:util="http://www.springframework.org/schema/util" xmlns:flow="http://www.argeo.org/schema/slc-flow"
+ xsi:schemaLocation="
+ http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+ http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-2.5.xsd
+ http://www.argeo.org/schema/slc-flow http://www.argeo.org/schema/slc-flow-1.2.xsd">
+
+ <!-- REGISTER -->
+ <bean id="org.apache.felix.framework" p:version="4.2.1"
+ parent="template.org.apache.felix">
+ </bean>
+ <bean id="org.apache.felix.bundlerepository" p:version="1.6.6"
+ parent="template.org.apache.felix">
+ </bean>
+ <bean id="org.apache.felix.gogo.command" p:version="0.12.0"
+ parent="template.org.apache.felix">
+ </bean>
+ <bean id="org.apache.felix.gogo.runtime" p:version="0.10.0"
+ parent="template.org.apache.felix">
+ </bean>
+ <bean id="org.apache.felix.gogo.shell" p:version="0.10.0"
+ parent="template.org.apache.felix">
+ </bean>
+
+ <!-- FACTORY -->
+ <bean id="template.org.apache.felix" class="org.argeo.slc.repo.osgi.UriWrapper"
+ abstract="true">
+ <property name="baseUri" value="http://archive.apache.org/dist/felix" />
+ <property name="groupId" value="org.argeo.tp.apache.felix" />
+ <property name="doNotModify" value="true" />
+ <property name="osgiFactory" ref="osgiFactory" />
+ </bean>
+</beans>
\ No newline at end of file
--- /dev/null
+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
--- /dev/null
+#log4j.rootLogger=WARN, console
+log4j.rootLogger=WARN, development
+
+## Levels
+log4j.logger.org.argeo=DEBUG
+log4j.logger.org.argeo.slc.repo=DEBUG
+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
<parent>
<groupId>org.argeo.slc</groupId>
<artifactId>lib</artifactId>
- <version>1.1.16</version>
+ <version>1.1.19-SNAPSHOT</version>
</parent>
<groupId>org.argeo.tp.slc</groupId>
<artifactId>org.argeo.tp.slc.factory</artifactId>
</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>
projects / gpl / argeo-tp.git / commitdiff