Adapt to changes in SLC

diff --git a/META-INF/MANIFEST.MF b/META-INF/MANIFEST.MF
index 0be0eec80fc0a3482d7e3ab57f1efc01fbefe51b..11892b2b52d11f7ec782238e2a89740378eb90a4 100644 (file)
--- a/META-INF/MANIFEST.MF
+++ b/META-INF/MANIFEST.MF
@@ -1,6 +1,6 @@
 Manifest-Version: 1.0\r
-Bnd-LastModified: 1366639430467\r
-Build-Jdk: 1.6.0_24\r
+Bnd-LastModified: 1376923329338\r
+Build-Jdk: 1.7.0_25\r
 Built-By: mbaudier\r
 Bundle-Description: SLC execution modules for generic tasks, to be used \r
  as parent pom\r
@@ -11,26 +11,21 @@ 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.12.r130422_1603\r
+Bundle-Version: 1.1.14.SNAPSHOT-r130819_1642\r
 Created-By: Apache Maven Bundle Plugin\r
-Import-Package: com.jcraft.jsch;resolution:=optional,\r
- javax.jcr;version="[2.0,3)",\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.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.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
+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,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
 SLC-ExecutionModule: default\r
 SLC-GroupId: org.argeo.tp.slc\r
 Tool: Bnd-1.50.0\r

diff --git a/META-INF/spring/distribution.xml b/META-INF/spring/distribution.xml
new file mode 100644 (file)
index 0000000..64d3f44
--- /dev/null
+++ b/META-INF/spring/distribution.xml
@@ -0,0 +1,66 @@
+<?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-0.12.xsd">
+
+       <bean id="osgiFactory" class="org.argeo.slc.repo.osgi.OsgiFactoryImpl"
+               init-method="init" destroy-method="destroy">
+               <property name="workspace" value="org.argeo.tp-2.1.x" />
+               <property name="nodeIndexers">
+                       <list>
+                               <bean class="org.argeo.slc.repo.ArtifactIndexer" />
+                               <bean class="org.argeo.slc.repo.JarFileIndexer" />
+                       </list>
+               </property>
+               <property name="javaRepository" ref="javaRepository" />
+               <property name="distRepository" ref="distRepository" />
+       </bean>
+
+       <bean name="org.argeo.tp/org.slf4j" parent="template.wrapDistribution">
+               <constructor-arg>
+                       <map>
+                               <entry key="version" value="1.7.5" />
+                       </map>
+               </constructor-arg>
+       </bean>
+
+       <!-- Specs and templates -->
+       <flow:spec id="wrapDistribution.spec">
+               <flow:primitive name="version" isParameter="true" />
+       </flow:spec>
+
+       <flow:flow id="template.wrapDistribution" spec="wrapDistribution.spec"
+               abstract="true">
+               <bean class="org.argeo.slc.repo.osgi.DistributionWrapper">
+                       <property name="groupId" value="org.argeo.tp" />
+                       <property name="uri"
+                               value="http://www.slf4j.org/dist/slf4j-@{version}.zip" />
+                       <property name="wrappers">
+                               <map>
+                                       <entry key="slf4j-@{version}/slf4j-api-@{version}.jar">
+                                               <bean class="org.argeo.slc.repo.osgi.BndWrapper">
+                                                       <property name="bsn" value="org.slf4j.api" />
+                                                       <property name="version" value="@{version}" />
+                                               </bean>
+                                       </entry>
+                               </map>
+                       </property>
+                       <property name="osgiFactory" ref="osgiFactory" />
+               </bean>
+       </flow:flow>
+
+       <bean
+               class="org.argeo.security.core.AuthenticatedApplicationContextInitialization">
+               <property name="authenticationManager" ref="authenticationManager" />
+               <property name="beanNames">
+                       <list>
+                               <value>osgiFactory</value>
+                       </list>
+               </property>
+       </bean>
+
+</beans>
\ No newline at end of file

diff --git a/META-INF/spring/osgi.xml b/META-INF/spring/osgi.xml
index a15fe030da6a1b0370905f1a5bd6bba309efe428..abd3838d8a2e8c530d82cf7516301dbe8fd3b202 100644 (file)
--- a/META-INF/spring/osgi.xml
+++ b/META-INF/spring/osgi.xml
@@ -9,7 +9,14 @@
        <beans:import resource="classpath:org/argeo/slc/core/execution/spring.xml" />\r
        <beans:import resource="classpath:org/argeo/slc/osgi/execution.xml" />\r
 \r
+       <!-- SERVICES -->\r
+       <service ref="osgiFactory" interface="org.argeo.slc.repo.OsgiFactory" />\r
+\r
        <!-- REFERENCES -->\r
+       <reference id="authenticationManager"\r
+               interface="org.springframework.security.AuthenticationManager" />\r
        <reference id="javaRepository" interface="javax.jcr.Repository"\r
                filter="(argeo.jcr.repository.alias=java)" />\r
+       <reference id="distRepository" interface="javax.jcr.Repository"\r
+               filter="(argeo.jcr.repository.alias=dist)" />\r
 </beans:beans>
\ No newline at end of file

diff --git a/pom.xml b/pom.xml
index 6534551164069a8fcaf8d94af26c2a87a0565161..b15940d696452f2758149f53af72bfadfda66510 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
        <parent>
                <groupId>org.argeo.slc</groupId>
                <artifactId>lib</artifactId>
-               <version>1.1.12</version>
+               <version>1.1.14-SNAPSHOT</version>
        </parent>
        <groupId>org.argeo.tp.slc</groupId>
        <artifactId>org.argeo.tp.slc.factory</artifactId>