Refactor

Additional indexers
Publish Argeo OSGi distribution as a service

diff --git a/META-INF/spring/distribution.xml b/META-INF/spring/distribution.xml
index 1c2b8cb753ca69fd89d011cdd1743a767afe3fd3..b5cd3191ed3d59f7796e889520caefec0354eb54 100644 (file)
--- a/META-INF/spring/distribution.xml
+++ b/META-INF/spring/distribution.xml
@@ -8,9 +8,9 @@
        http://www.argeo.org/schema/slc-flow http://www.argeo.org/schema/slc-flow-1.2.xsd">
 
        <!-- REGISTER -->
-       <bean id="org.argeo.tp" class="org.argeo.slc.repo.osgi.ArgeoOsgiDistribution"
+       <bean id="argeo-tp" class="org.argeo.slc.repo.osgi.ArgeoOsgiDistributionImpl"
                init-method="init" destroy-method="destroy">
-               <constructor-arg value="org.argeo.tp:org.argeo.tp:2.1.1" />
+               <constructor-arg value="org.argeo.tp:argeo-tp:2.1.1" />
                <property name="modules">
                        <list>
                                <ref bean="org.argeo.tp/org.apache.log4j" />
@@ -38,9 +38,8 @@
                        <list>
                                <bean class="org.argeo.slc.repo.ArtifactIndexer" />
                                <bean class="org.argeo.slc.repo.JarFileIndexer" />
-                               <!--  Added by BSinou - To be checked -->
-                               <!--  <bean class="org.argeo.slc.repo.ModularDistributionIndexer" />
-                               <bean class="org.argeo.slc.repo.PdeSourcesIndexer" />  -->
+                               <bean class="org.argeo.slc.repo.ModularDistributionIndexer" />
+                               <bean class="org.argeo.slc.repo.PdeSourcesIndexer" />
                        </list>
                </property>
                <property name="mirrors">
@@ -64,6 +63,14 @@
                <property name="distRepository" ref="distRepository" />
        </bean>
 
+       <flow:flow name="processDistribution">
+               <bean class="org.argeo.slc.repo.osgi.ProcessDistribution">
+                       <property name="osgiDistribution" ref="argeo-tp" />
+                       <property name="osgiFactory" ref="osgiFactory" />
+               </bean>
+       </flow:flow>
+
+       <!-- Security -->
        <bean
                class="org.argeo.security.core.AuthenticatedApplicationContextInitialization">
                <property name="authenticationManager" ref="authenticationManager" />
@@ -73,45 +80,4 @@
                        </list>
                </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" />
-       </flow:spec>
-
-       <bean id="template.archiveWrapper" class="org.argeo.slc.repo.osgi.ArchiveWrapper"
-               init-method="init" destroy-method="destroy" abstract="true">
-               <property name="version" value="@{version}" />
-               <property name="osgiFactory" ref="osgiFactory" />
-       </bean>
-
-       <!-- Must be a prototype since wrapper are stateful objects, properties 
-               such as version can be set by caller. -->
-       <bean id="template.bndWrapper" class="org.argeo.slc.repo.osgi.BndWrapper"
-               abstract="true" scope="prototype">
-               <property name="groupId" value="org.argeo.tp" />
-               <property name="bndProperties">
-                       <props>
-                               <prop key="Export-Package">*</prop>
-                       </props>
-               </property>
-       </bean>
-       <bean id="template.mavenWrapper" class="org.argeo.slc.repo.osgi.MavenWrapper"
-               abstract="true" scope="prototype">
-               <property name="groupId" value="org.argeo.tp" />
-               <property name="bndProperties">
-                       <props>
-                               <prop key="Export-Package">*</prop>
-                       </props>
-               </property>
-               <property name="osgiFactory" ref="osgiFactory" />
-       </bean>
-
-</beans>
+</beans>
\ No newline at end of file

diff --git a/META-INF/spring/org.argeo.tp.rap.xml b/META-INF/spring/org.argeo.tp.rap.xml
index 9b7349396e7b3e7ec725162496e1d7d918dd16ca..a88d161206a8b75fddf08b79e29a79ca6347f1f7 100644 (file)
--- a/META-INF/spring/org.argeo.tp.rap.xml
+++ b/META-INF/spring/org.argeo.tp.rap.xml
@@ -49,8 +49,8 @@
                                                <list>
                                                        <bean class="org.argeo.slc.repo.ArtifactIndexer" />
                                                        <bean class="org.argeo.slc.repo.JarFileIndexer" />
-                                                       <!-- Works with SLC 1.1.17+ <bean class="org.argeo.slc.repo.ModularDistributionIndexer" 
-                                                               /> <bean class="org.argeo.slc.repo.PdeSourcesIndexer" /> -->
+                                                       <bean class="org.argeo.slc.repo.ModularDistributionIndexer" />
+                                                       <bean class="org.argeo.slc.repo.PdeSourcesIndexer" />
                                                </list>
                                        </property>
                                        <property name="javaRepository" ref="javaRepository" />
@@ -118,8 +118,8 @@
                                                <list>
                                                        <bean class="org.argeo.slc.repo.ArtifactIndexer" />
                                                        <bean class="org.argeo.slc.repo.JarFileIndexer" />
-                                                       <!-- Works with SLC 1.1.17+ <bean class="org.argeo.slc.repo.ModularDistributionIndexer" 
-                                                               /> <bean class="org.argeo.slc.repo.PdeSourcesIndexer" /> -->
+                                                       <bean class="org.argeo.slc.repo.ModularDistributionIndexer" />
+                                                       <bean class="org.argeo.slc.repo.PdeSourcesIndexer" />
                                                </list>
                                        </property>
                                        <property name="javaRepository" ref="javaRepository" />

diff --git a/META-INF/spring/osgi.xml b/META-INF/spring/osgi.xml
index abd3838d8a2e8c530d82cf7516301dbe8fd3b202..618c464e617deee86d399fb7f7686a36c87d3fd4 100644 (file)
--- a/META-INF/spring/osgi.xml
+++ b/META-INF/spring/osgi.xml
@@ -10,7 +10,9 @@
        <beans:import resource="classpath:org/argeo/slc/osgi/execution.xml" />\r
 \r
        <!-- SERVICES -->\r
-       <service ref="osgiFactory" interface="org.argeo.slc.repo.OsgiFactory" />\r
+       <!-- <service ref="osgiFactory" interface="org.argeo.slc.repo.OsgiFactory" \r
+               /> -->\r
+       <service ref="argeo-tp" interface="org.argeo.slc.repo.ArgeoOsgiDistribution" />\r
 \r
        <!-- REFERENCES -->\r
        <reference id="authenticationManager"\r

diff --git a/META-INF/spring/templates.xml b/META-INF/spring/templates.xml
new file mode 100644 (file)
index 0000000..8752489
--- /dev/null
+++ b/META-INF/spring/templates.xml
@@ -0,0 +1,43 @@
+<?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">
+
+       <!-- Specs and templates -->
+       <flow:spec id="spec.version">
+               <flow:primitive name="version" isParameter="true" />
+       </flow:spec>
+
+       <bean id="template.archiveWrapper" class="org.argeo.slc.repo.osgi.ArchiveWrapper"
+               init-method="init" destroy-method="destroy" abstract="true">
+               <property name="version" value="@{version}" />
+               <property name="osgiFactory" ref="osgiFactory" />
+       </bean>
+
+       <!-- Must be a prototype since wrapper are stateful objects, properties 
+               such as version can be set by caller. -->
+       <bean id="template.bndWrapper" class="org.argeo.slc.repo.osgi.BndWrapper"
+               abstract="true" scope="prototype">
+               <property name="groupId" value="org.argeo.tp" />
+               <property name="bndProperties">
+                       <props>
+                               <prop key="Export-Package">*</prop>
+                       </props>
+               </property>
+       </bean>
+       <bean id="template.mavenWrapper" class="org.argeo.slc.repo.osgi.MavenWrapper"
+               abstract="true" scope="prototype">
+               <property name="groupId" value="org.argeo.tp" />
+               <property name="bndProperties">
+                       <props>
+                               <prop key="Export-Package">*</prop>
+                       </props>
+               </property>
+               <property name="osgiFactory" ref="osgiFactory" />
+       </bean>
+
+</beans>