Start core Distribution 2

diff --git a/.project b/.project
index 03d0b421ec8b5cd8c65ac5cd09f245d26acfab06..125b006b12d954b937d3a137512f14908d81e49c 100644 (file)
--- a/.project
+++ b/.project
@@ -15,8 +15,14 @@
                        <arguments>
                        </arguments>
                </buildCommand>
+               <buildCommand>
+                       <name>org.eclipse.linuxtools.rpm.rpmlint.rpmlintBuilder</name>
+                       <arguments>
+                       </arguments>
+               </buildCommand>
        </buildSpec>
        <natures>
                <nature>org.eclipse.pde.PluginNature</nature>
+               <nature>org.eclipse.linuxtools.rpm.rpmlint.rpmlintNature</nature>
        </natures>
 </projectDescription>

diff --git a/META-INF/spring/distribution.xml b/META-INF/spring/distribution.xml
index dcec9d1c71f90a9114bb92e0f559f5dcc7fb1aa9..4329111804571269cce068c98137708076c2c0ca 100644 (file)
--- a/META-INF/spring/distribution.xml
+++ b/META-INF/spring/distribution.xml
@@ -58,9 +58,9 @@
        <bean id="template.bndWrapper" class="org.argeo.slc.repo.osgi.BndWrapper"
                abstract="true">
                <property name="bndProperties">
-                       <value>
-                               Export-Package=*
-                       </value>
+                       <props>
+                               <prop key="Export-Package">*</prop>
+                       </props>
                </property>
        </bean>
 

diff --git a/META-INF/spring/org.argeo.tp.apache.tomcat.xml b/META-INF/spring/org.argeo.tp.apache.tomcat.xml
index 23c2ebd0b9bdc8c656ed678730555e443c2234af..712437fb3353619234c4872c17d5260235b80f5c 100644 (file)
--- a/META-INF/spring/org.argeo.tp.apache.tomcat.xml
+++ b/META-INF/spring/org.argeo.tp.apache.tomcat.xml
@@ -15,7 +15,7 @@
        <bean id="org.apache.tomcat.api" parent="template.org.apache.tomcat" />
        <bean id="org.apache.tomcat.util" parent="template.org.apache.tomcat" />
 
-       <!-- SLF4J Factory -->
+       <!-- FACTORY -->
        <bean id="template.org.apache.tomcat" parent="template.bndWrapper"
                abstract="true">
                <property name="groupId" value="org.argeo.tp.apache.tomcat" />

diff --git a/META-INF/spring/org.argeo.tp.javax.xml b/META-INF/spring/org.argeo.tp.javax.xml
index 0e1ab2aa68dc0eaeb418f68328df325b31a31bd2..6a678aa163c0bd0adcd59964a493f26dc8cffd69 100644 (file)
--- a/META-INF/spring/org.argeo.tp.javax.xml
+++ b/META-INF/spring/org.argeo.tp.javax.xml
@@ -13,7 +13,7 @@
        <bean id="javax.servlet" p:version="3.0.0" parent="template.javax" />
        <bean id="javax.servlet.jsp" p:version="2.2.0" parent="template.javax" />
 
-       <!-- Javax Factory -->
+       <!-- FACTORY -->
        <bean id="template.javax" parent="template.bndWrapper" abstract="true">
                <property name="groupId" value="org.argeo.tp.javax" />
        </bean>

diff --git a/META-INF/spring/org.argeo.tp.spring.xml b/META-INF/spring/org.argeo.tp.spring.xml
new file mode 100644 (file)
index 0000000..e0f8dd4
--- /dev/null
+++ b/META-INF/spring/org.argeo.tp.spring.xml
@@ -0,0 +1,99 @@
+<?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.springframework.aop" parent="template.org.springframework" />
+       <bean id="org.springframework.aspects" parent="template.org.springframework" />
+       <bean id="org.springframework.beans" parent="template.org.springframework" />
+       <bean id="org.springframework.context" parent="template.org.springframework" />
+       <bean id="org.springframework.context.support" parent="template.org.springframework" />
+       <bean id="org.springframework.core" parent="template.org.springframework" />
+       <bean id="org.springframework.expression" parent="template.org.springframework" />
+       <bean id="org.springframework.instrument" parent="template.org.springframework" />
+       <bean id="org.springframework.instrument.tomcat" parent="template.org.springframework" />
+       <bean id="org.springframework.jdbc" parent="template.org.springframework" />
+       <bean id="org.springframework.jms" parent="template.org.springframework" />
+       <bean id="org.springframework.orm" parent="template.org.springframework" />
+       <bean id="org.springframework.oxm" parent="template.org.springframework" />
+       <bean id="org.springframework.test" parent="template.org.springframework" />
+       <bean id="org.springframework.tx" parent="template.org.springframework" />
+       <bean id="org.springframework.web" parent="template.org.springframework" />
+       <bean id="org.springframework.web.servlet" parent="template.org.springframework" />
+
+       <!-- FACTORY -->
+       <bean id="template.org.springframework" parent="template.bndWrapper"
+               abstract="true">
+               <property name="groupId" value="org.argeo.tp.spring" />
+       </bean>
+
+       <flow:flow name="org.argeo.tp.spring/org.springframework"
+               spec="spec.version">
+               <flow:arg name="version" value="3.2.4" />
+               <bean parent="template.archiveWrapper">
+                       <property name="uri"
+                               value="http://repo.springsource.org/libs-release-local/org/springframework/spring/@{version}.RELEASE/spring-framework-@{version}.RELEASE-dist.zip" />
+                       <property name="wrappers">
+                               <map>
+                                       <entry
+                                               key="spring-framework-@{version}.RELEASE/libs/spring-aop-@{version}.RELEASE.jar"
+                                               value-ref="org.springframework.aop" />
+                                       <entry
+                                               key="spring-framework-@{version}.RELEASE/libs/spring-aspects-@{version}.RELEASE.jar"
+                                               value-ref="org.springframework.aspects" />
+                                       <entry
+                                               key="spring-framework-@{version}.RELEASE/libs/spring-beans-@{version}.RELEASE.jar"
+                                               value-ref="org.springframework.beans" />
+                                       <entry
+                                               key="spring-framework-@{version}.RELEASE/libs/spring-context-@{version}.RELEASE.jar"
+                                               value-ref="org.springframework.context" />
+                                       <entry
+                                               key="spring-framework-@{version}.RELEASE/libs/spring-context-support-@{version}.RELEASE.jar"
+                                               value-ref="org.springframework.context.support" />
+                                       <entry
+                                               key="spring-framework-@{version}.RELEASE/libs/spring-core-@{version}.RELEASE.jar"
+                                               value-ref="org.springframework.core" />
+                                       <entry
+                                               key="spring-framework-@{version}.RELEASE/libs/spring-expression-@{version}.RELEASE.jar"
+                                               value-ref="org.springframework.expression" />
+                                       <entry
+                                               key="spring-framework-@{version}.RELEASE/libs/spring-instrument-@{version}.RELEASE.jar"
+                                               value-ref="org.springframework.instrument" />
+                                       <entry
+                                               key="spring-framework-@{version}.RELEASE/libs/spring-instrument-tomcat-@{version}.RELEASE.jar"
+                                               value-ref="org.springframework.instrument.tomcat" />
+                                       <entry
+                                               key="spring-framework-@{version}.RELEASE/libs/spring-jdbc-@{version}.RELEASE.jar"
+                                               value-ref="org.springframework.jdbc" />
+                                       <entry
+                                               key="spring-framework-@{version}.RELEASE/libs/spring-jms-@{version}.RELEASE.jar"
+                                               value-ref="org.springframework.jms" />
+                                       <entry
+                                               key="spring-framework-@{version}.RELEASE/libs/spring-orm-@{version}.RELEASE.jar"
+                                               value-ref="org.springframework.orm" />
+                                       <entry
+                                               key="spring-framework-@{version}.RELEASE/libs/spring-oxm-@{version}.RELEASE.jar"
+                                               value-ref="org.springframework.oxm" />
+                                       <entry
+                                               key="spring-framework-@{version}.RELEASE/libs/spring-test-@{version}.RELEASE.jar"
+                                               value-ref="org.springframework.test" />
+                                       <entry
+                                               key="spring-framework-@{version}.RELEASE/libs/spring-tx-@{version}.RELEASE.jar"
+                                               value-ref="org.springframework.tx" />
+                                       <entry
+                                               key="spring-framework-@{version}.RELEASE/libs/spring-web-@{version}.RELEASE.jar"
+                                               value-ref="org.springframework.web" />
+                                       <entry
+                                               key="spring-framework-@{version}.RELEASE/libs/spring-webmvc-@{version}.RELEASE.jar"
+                                               value-ref="org.springframework.web.servlet" />
+                               </map>
+                       </property>
+               </bean>
+       </flow:flow>
+
+</beans>
\ No newline at end of file