<bean p:version="3.3.0" parent="template.commonsArchiveWrapper" />
</flow:flow>
+ <flow:flow name="apache/org.apache.commons.compress" spec="spec.commons">
+ <flow:arg name="project" value="compress" />
+ <flow:arg name="version" value="1.9" />
+ <bean p:version="1.9.0" parent="template.commonsArchiveWrapper">
+ <property name="wrappers">
+ <map>
+ <entry
+ key="commons-@{project}-@{version}/commons-@{project}-@{version}.jar">
+ <bean p:name="org.apache.commons.@{project}" parent="template.org.apache.commons">
+ <property name="bndProperties">
+ <props merge="true">
+ <prop key="Import-Package">
+ org.tukaani.*;resolution:=optional,
+ *
+ </prop>
+ </props>
+ </property>
+ </bean>
+ </entry>
+ </map>
+ </property>
+ <property name="sourcesProvider">
+ <bean class="org.argeo.slc.repo.osgi.ArchiveSourcesProvider">
+ <property name="uri"
+ value="http://archive.apache.org/dist/commons/@{project}/source/commons-@{project}-@{version}-src.zip" />
+ <property name="base"
+ value="commons-@{project}-@{version}-src/src/main/java/" />
+ <property name="osgiFactory" ref="osgiFactory" />
+ </bean>
+ </property>
+ </bean>
+ </flow:flow>
+
<flow:flow name="apache/org.apache.commons.vfs" spec="spec.commons">
<flow:arg name="project" value="vfs" />
<flow:arg name="version" value="2.0" />
</bean>
</flow:flow>
+ <flow:flow name="apache/org.apache.commons.jci" spec="spec.commons">
+ <flow:arg name="project" value="jci" />
+ <flow:arg name="version" value="1.1" />
+ <bean parent="template.commonsArchiveWrapper">
+ <property name="uri"
+ value="http://archive.apache.org/dist/commons/@{project}/binaries/commons-@{project}-@{version}-bin.zip" />
+ <!-- JCI provides OSGi metadata, but they are broken (org.apache.commons.jci.monitor
+ package) -->
+ <property name="wrappers">
+ <map>
+ <entry
+ key="commons-@{project}-@{version}/lib/commons-@{project}-core-@{version}.jar">
+ <bean p:name="org.apache.commons.@{project}-core" parent="template.org.apache.commons">
+ <property name="bndProperties">
+ <props merge="true">
+ <prop key="Import-Package">
+ org.apache.commons.jci.monitor;resolution:=optional,
+ *
+ </prop>
+ </props>
+ </property>
+ </bean>
+ </entry>
+ <entry
+ key="commons-@{project}-@{version}/lib/commons-@{project}-eclipse-@{version}.jar">
+ <bean p:name="org.apache.commons.@{project}-eclipse" parent="template.org.apache.commons" />
+ </entry>
+ <!-- <entry -->
+ <!-- key="commons-@{project}-@{version}/lib/commons-@{project}-rhino-@{version}.jar"> -->
+ <!-- <bean p:name="org.apache.commons.@{project}-rhino" parent="template.org.apache.commons"
+ /> -->
+ <!-- </entry> -->
+ </map>
+ </property>
+ <!-- TODO : include other sources than core -->
+ <property name="sourcesProvider">
+ <bean class="org.argeo.slc.repo.osgi.ArchiveSourcesProvider">
+ <property name="uri"
+ value="http://archive.apache.org/dist/commons/@{project}/source/commons-@{project}-@{version}-src.zip" />
+ <property name="base"
+ value="commons-@{project}-@{version}-src/core/src/main/java/" />
+ <property name="osgiFactory" ref="osgiFactory" />
+ </bean>
+ </property>
+ </bean>
+ </flow:flow>
+
<flow:flow name="apache/org.apache.commons.httpclient" spec="spec.version">
<flow:arg name="version" value="3.1" />
<bean parent="template.commonsArchiveWrapper">
</bean>
</flow:flow>
+ <flow:flow name="apache/org.apache.httpcomponents.httpclient"
+ spec="spec.version">
+ <flow:arg name="version" value="4.4" />
+ <bean parent="template.archiveWrapper">
+ <property name="version" value="@{version}.0" />
+ <property name="license">
+ <util:constant static-field="org.argeo.slc.repo.FreeLicense.APACHE" />
+ </property>
+ <property name="uri"
+ value="http://archive.apache.org/dist/httpcomponents/httpclient/binary/httpcomponents-client-@{version}-osgi-bin.zip" />
+ <property name="includes">
+ <map>
+ <entry
+ key="httpcomponents-client-@{version}/org.apache.httpcomponents.httpclient_@{version}.jar"
+ value="org.argeo.tp.apache" />
+ </map>
+ </property>
+ <property name="sourcesProvider">
+ <bean class="org.argeo.slc.repo.osgi.ArchiveSourcesProvider">
+ <property name="uri"
+ value="http://archive.apache.org/dist/httpcomponents/httpclient/source/httpcomponents-client-@{version}-src.zip" />
+ <property name="base"
+ value="httpcomponents-client-@{version}/httpclient/src/main/java/" />
+ <property name="osgiFactory" ref="osgiFactory" />
+ </bean>
+ </property>
+ </bean>
+ </flow:flow>
+
<!-- Specs and templates -->
<flow:spec id="spec.commons">
<flow:primitive name="version" isParameter="true" />
<!-- REGISTER -->
<bean id="argeo-tp" class="org.argeo.slc.repo.osgi.ArgeoOsgiDistributionImpl"
init-method="init" destroy-method="destroy">
- <constructor-arg value="org.argeo.tp:argeo-tp:2.1.6" />
+ <constructor-arg value="org.argeo.tp:argeo-tp:2.1.7" />
<property name="modules">
<list>
<!-- Javax -->
<ref bean="javax.inject" />
<ref bean="javax.jcr" />
<ref bean="javax.mail" />
+
+ <!-- Builder -->
+ <ref bean="biz.aQute.bnd" />
+ <ref bean="eclipse/org.eclipse.jdt.core.compiler.batch" />
<!-- Standalone projects -->
<ref bean="apache/org.apache.log4j" />
<ref bean="org.aspectj.weaver" />
<ref bean="misc/org.bouncycastle" />
<ref bean="apache/org.apache.ant" />
+ <ref bean="org.quartz-scheduler.quartz" />
+ <ref bean="org.quartz-scheduler.quartz.jobs" />
<!-- Apache Commons -->
<ref bean="apache/org.apache.commons.io" />
<ref bean="apache/org.apache.commons.vfs" />
<ref bean="apache/org.apache.commons.net" />
<ref bean="apache/org.apache.commons.exec" />
+ <ref bean="apache/org.apache.commons.jci" />
+ <ref bean="apache/org.apache.commons.compress" />
<!-- Eclipse -->
<ref bean="eclipse/org.argeo.tp.jetty" />
<property name="osgiFactory" ref="osgiFactory" />
</bean>
</flow:flow>
+
+ <flow:flow name="eclipse/org.eclipse.jdt.core.compiler.batch"
+ spec="equinoxVersion.spec">
+ <flow:arg name="equinoxRelease" value="4.4.1" />
+ <flow:arg name="equinoxTimestamp" value="201409250400" />
+ <bean id="org.eclipse.jdt.core.compiler.batch" class="org.argeo.slc.repo.osgi.UriWrapper">
+ <!-- TODO URI wrapper should be able to read OSGi metadata -->
+ <property name="version" value="3.10.0.v20140902-0626" />
+ <property name="uri"
+ value="http://www.eclipse.org/downloads/eclipse/downloads/drops4/R-@{equinoxRelease}-@{equinoxTimestamp}/ecj-@{equinoxRelease}.jar" />
+ <property name="groupId" value="org.argeo.tp.equinox" />
+ <property name="doNotModify" value="true" />
+ <property name="license">
+ <util:constant static-field="org.argeo.slc.repo.FreeLicense.EPL" />
+ </property>
+ <property name="osgiFactory" ref="osgiFactory" />
+ <property name="sourcesProvider">
+ <bean class="org.argeo.slc.repo.osgi.ArchiveSourcesProvider">
+ <property name="uri"
+ value="http://www.eclipse.org/downloads/eclipse/downloads/drops4/R-@{equinoxRelease}-@{equinoxTimestamp}/ecjsrc-@{equinoxRelease}.jar" />
+ <property name="osgiFactory" ref="osgiFactory" />
+ </bean>
+ </property>
+ </bean>
+ </flow:flow>
+
</beans>
\ No newline at end of file
<!-- TODO: Rather use the binary provided here: https://github.com/JodaOrg/joda-time/releases
once the archiveMapper can manage tar.gz archives -->
- <bean id="org.joda.time" p:sourceCoords="joda-time:joda-time:2.6"
+ <bean id="org.joda.time" p:version="2.6.0" p:sourceCoords="joda-time:joda-time:2.6"
parent="template.mavenWrapper">
- <!-- <property name="doNotModify" value="true" /> -->
<property name="license">
<util:constant static-field="org.argeo.slc.repo.FreeLicense.APACHE" />
</property>
</property>
</bean>
+ <bean id="org.quartz-scheduler.quartz" p:sourceCoords="org.quartz-scheduler:quartz:jar:2.2.1"
+ parent="template.mavenWrapper">
+ <property name="license">
+ <util:constant static-field="org.argeo.slc.repo.FreeLicense.APACHE" />
+ </property>
+ <property name="bndProperties">
+ <props merge="true">
+ <prop key="Import-Package">
+ *;resolution:=optional,
+ </prop>
+ </props>
+ </property>
+ </bean>
+
+ <bean id="org.quartz-scheduler.quartz.jobs" p:sourceCoords="org.quartz-scheduler:quartz-jobs:jar:2.2.1"
+ parent="template.mavenWrapper">
+ <property name="license">
+ <util:constant static-field="org.argeo.slc.repo.FreeLicense.APACHE" />
+ </property>
+ <property name="bndProperties">
+ <props merge="true">
+ <prop key="Import-Package">
+ *;resolution:=optional,
+ </prop>
+ </props>
+ </property>
+ </bean>
+
+ <bean id="biz.aQute.bnd" p:sourceCoords="biz.aQute:bnd:1.50.0"
+ parent="template.mavenWrapper">
+ <property name="license">
+ <util:constant static-field="org.argeo.slc.repo.FreeLicense.APACHE" />
+ </property>
+ <property name="bndProperties">
+ <props merge="true">
+ <prop key="Import-Package">
+ org.eclipse.*;resolution:=optional,
+ org.apache.tools.ant.*;resolution:=optional,
+ junit.*;resolution:=optional,
+ *
+ </prop>
+ </props>
+ </property>
+ </bean>
+
<flow:flow name="misc/org.slf4j" spec="spec.version">
<flow:arg name="version" value="1.7.5" />
<bean parent="template.archiveWrapper">