Eclipse Gemini Blueprint and Web

[gpl/argeo-tp.git] / META-INF / spring / distribution.xml

diff --git a/META-INF/spring/distribution.xml b/META-INF/spring/distribution.xml
index 3c1eef0d6a571c05186864954e5512ab4a177a6c..bcb1745e4d2f0091cfc75a2d518438d98079acc9 100644 (file)
--- a/META-INF/spring/distribution.xml
+++ b/META-INF/spring/distribution.xml
@@ -8,16 +8,30 @@
        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" />
                                <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.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" />
+                               <!-- Gemini -->
+                               <ref bean="org.argeo.tp.gemini/org.gemini.blueprint" />
+                               <!-- <ref bean="org.argeo.tp.gemini/org.gemini.web" /> -->
+                               <ref bean="org.eclipse.gemini.web.core" />
+                               <ref bean="org.eclipse.gemini.web.extender" />
+                               <ref bean="org.eclipse.gemini.web.tomcat" />
                        </list>
                </property>
        </bean>
@@ -25,11 +39,13 @@
        <!-- Factory -->
        <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="workspace" value="argeo-tp-2.1" />
                <property name="nodeIndexers">
                        <list>
-                               <bean class="org.argeo.slc.repo.ArtifactIndexer" />
+                               <bean class="org.argeo.slc.repo.ModularDistributionIndexer" />
+                               <bean class="org.argeo.slc.repo.PdeSourcesIndexer" />
                                <bean class="org.argeo.slc.repo.JarFileIndexer" />
+                               <bean class="org.argeo.slc.repo.ArtifactIndexer" />
                        </list>
                </property>
                <property name="mirrors">
@@ -49,10 +65,24 @@
                                </entry>
                        </map>
                </property>
+               <property name="mavenRepositories">
+                       <list>
+                               <value>http://repo1.maven.org/maven2/</value>
+                               <value>http://download.eclipse.org/gemini/mvn/</value>
+                       </list>
+               </property>
                <property name="javaRepository" ref="javaRepository" />
                <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" />
@@ -62,38 +92,4 @@
                        </list>
                </property>
        </bean>
-
-       <!-- 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>
\ No newline at end of file