Tika, Lucene and Bouncycastle

diff --git a/META-INF/spring/apache.xml b/META-INF/spring/apache.xml
new file mode 100644 (file)
index 0000000..bdd644d
--- /dev/null
+++ b/META-INF/spring/apache.xml
@@ -0,0 +1,82 @@
+<?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">
+
+       <flow:flow name="apache/org.apache.lucene" spec="spec.version">
+               <flow:arg name="version" value="3.6.2" />
+               <bean id="org.apache.lucene" parent="template.apacheMaven"
+                       p:version="@{version}" p:sourceCoords="org.apache.lucene:lucene-core:@{version}" />
+       </flow:flow>
+
+       <flow:flow name="apache/org.apache.tika" spec="spec.version">
+               <flow:arg name="version" value="1.6" />
+               <bean id="org.apache.tika.core" parent="template.tikaMaven"
+                       p:sourceCoords="org.apache.tika:tika-core:@{version}" />
+               <bean id="org.apache.tika.parser" parent="template.tikaMaven"
+                       p:sourceCoords="org.apache.tika:tika-core:@{version}" />
+       </flow:flow>
+
+       <bean id="org.apache.log4j" p:groupId="org.argeo.tp.apache"
+               parent="template.bndWrapper">
+               <property name="bndProperties">
+                       <props merge="true">
+                               <prop key="Import-Package">
+                                       *,
+                                       com.ibm.uvm.tools;resolution:=optional,
+                                       com.sun.jdmk.comm;resolution:=optional,
+                                       javax.jmdns;resolution:=optional,
+                                       javax.jms;resolution:=optional,
+                                       javax.mail;resolution:=optional,
+                                       javax.mail.internet;resolution:=optional,
+                               </prop>
+                       </props>
+               </property>
+       </bean>
+
+       <!-- Log4j12 Factory -->
+       <flow:flow name="apache/org.apache.log4j" spec="spec.version">
+               <flow:arg name="version" value="1.2.17" />
+               <bean parent="template.archiveWrapper">
+                       <property name="uri"
+                               value="http://archive.apache.org/dist/logging/log4j/@{version}/log4j-@{version}.zip" />
+                       <property name="license">
+                               <util:constant static-field="org.argeo.slc.repo.FreeLicense.APACHE" />
+                       </property>
+                       <property name="wrappers">
+                               <map>
+                                       <entry key="apache-log4j-@{version}/log4j-@{version}.jar"
+                                               value-ref="org.apache.log4j" />
+                               </map>
+                       </property>
+                       <property name="sourcesProvider">
+                               <bean class="org.argeo.slc.repo.osgi.ArchiveSourcesProvider">
+                                       <property name="uri"
+                                               value="http://archive.apache.org/dist/logging/log4j/@{version}/log4j-@{version}.zip" />
+                                       <property name="base" value="apache-log4j-@{version}/src/main/java/" />
+                                       <property name="osgiFactory" ref="osgiFactory" />
+                               </bean>
+                       </property>
+               </bean>
+       </flow:flow>
+
+
+       <!-- Templates -->
+       <bean id="template.apacheMaven" parent="template.mavenWrapper"
+               abstract="true">
+               <property name="groupId" value="org.argeo.tp.apache" />
+               <property name="license">
+                       <util:constant static-field="org.argeo.slc.repo.FreeLicense.APACHE" />
+               </property>
+       </bean>
+
+       <bean id="template.tikaMaven" parent="template.apacheMaven"
+               abstract="true">
+               <property name="version" value="@{version}.0" />
+               <property name="doNotModify" value="true" />
+       </bean>
+</beans>
\ No newline at end of file

diff --git a/META-INF/spring/bouncycastle.xml b/META-INF/spring/bouncycastle.xml
new file mode 100644 (file)
index 0000000..b5b9f03
--- /dev/null
+++ b/META-INF/spring/bouncycastle.xml
@@ -0,0 +1,75 @@
+<?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">
+
+       <!-- TODO : Improve sources retrieval -->
+
+       <!-- REGISTER -->
+       <flow:flow name="misc/org.bouncycastle" spec="spec.version">
+               <flow:arg name="version" value="1.51" />
+               <bean id="bcprov"
+                       p:uri="https://www.bouncycastle.org/download/bcprov-jdk15on-151.jar"
+                       parent="template.bouncycastle">
+                       <property name="sourcesProvider">
+                               <bean class="org.argeo.slc.repo.osgi.ArchiveSourcesProvider">
+                                       <property name="uri"
+                                               value="http://repo1.maven.org/maven2/org/bouncycastle/bcprov-jdk15on/@{version}/bcprov-jdk15on-@{version}-sources.jar" />
+                                       <property name="osgiFactory" ref="osgiFactory" />
+                               </bean>
+                       </property>
+               </bean>
+               <bean id="bcpkix"
+                       p:uri="https://www.bouncycastle.org/download/bcpkix-jdk15on-151.jar"
+                       parent="template.bouncycastle">
+                       <property name="sourcesProvider">
+                               <bean class="org.argeo.slc.repo.osgi.ArchiveSourcesProvider">
+                                       <property name="uri"
+                                               value="http://repo1.maven.org/maven2/org/bouncycastle/bcpkix-jdk15on/@{version}/bcpkix-jdk15on-@{version}-sources.jar" />
+                                       <property name="osgiFactory" ref="osgiFactory" />
+                               </bean>
+                       </property>
+               </bean>
+               <bean id="bcmail"
+                       p:uri="https://www.bouncycastle.org/download/bcmail-jdk15on-151.jar"
+                       parent="template.bouncycastle">
+                       <property name="sourcesProvider">
+                               <bean class="org.argeo.slc.repo.osgi.ArchiveSourcesProvider">
+                                       <property name="uri"
+                                               value="http://repo1.maven.org/maven2/org/bouncycastle/bcmail-jdk15on/@{version}/bcmail-jdk15on-@{version}-sources.jar" />
+                                       <property name="osgiFactory" ref="osgiFactory" />
+                               </bean>
+                       </property>
+               </bean>
+               <bean id="bcpg"
+                       p:uri="https://www.bouncycastle.org/download/bcpg-jdk15on-151.jar"
+                       parent="template.bouncycastle">
+                       <property name="sourcesProvider">
+                               <bean class="org.argeo.slc.repo.osgi.ArchiveSourcesProvider">
+                                       <property name="uri"
+                                               value="http://repo1.maven.org/maven2/org/bouncycastle/bcpg-jdk15on/@{version}/bcpg-jdk15on-@{version}-sources.jar" />
+                                       <property name="osgiFactory" ref="osgiFactory" />
+                               </bean>
+                       </property>
+               </bean>
+       </flow:flow>
+
+       <!-- FACTORY -->
+       <bean id="template.bouncycastle" class="org.argeo.slc.repo.osgi.UriWrapper"
+               abstract="true">
+               <!-- <property name="baseUri" -->
+               <!-- value="https://www.bouncycastle.org/download/bcprov-jdk15on-151.jar" 
+                       /> -->
+               <property name="version" value="@{version}" />
+               <property name="groupId" value="org.argeo.tp.bouncycastle" />
+               <property name="doNotModify" value="true" />
+               <property name="license">
+                       <util:constant static-field="org.argeo.slc.repo.FreeLicense.MIT" />
+               </property>
+               <property name="osgiFactory" ref="osgiFactory" />
+       </bean>
+</beans>
\ No newline at end of file

diff --git a/META-INF/spring/distribution.xml b/META-INF/spring/distribution.xml
index 26e8395cbfec279c21068e3f0504adaa2421848a..36b59758c99b0d2350047e21e492c3ff2cd3264f 100644 (file)
--- a/META-INF/spring/distribution.xml
+++ b/META-INF/spring/distribution.xml
@@ -13,12 +13,13 @@
                <constructor-arg value="org.argeo.tp:argeo-tp:2.1.2" />
                <property name="modules">
                        <list>
-                               <ref bean="misc/org.apache.log4j" />
+                               <ref bean="apache/org.apache.log4j" />
                                <ref bean="misc/org.slf4j" />
                                <!-- <ref bean="apache.tomcat/org.apache.tomcat" /> -->
                                <ref bean="org.aopalliance" />
                                <ref bean="org.junit" />
                                <ref bean="misc/org.aspectj" />
+                               <ref bean="misc/org.bouncycastle" />
                                <ref bean="spring/org.springframework" />
                                <ref bean="spring/org.springframework.security" />
                                <ref bean="apache/org.apache.ant" />
@@ -45,6 +46,8 @@
                                <!-- <ref bean="org.eclipse.gemini.web.tomcat" /> -->
                                <!-- Jackrabbit -->
                                <ref bean="javax/javax.jcr" />
+                               <ref bean="apache/org.apache.tika" />
+                               <ref bean="apache/org.apache.lucene" />
                                <ref bean="apache/org.apache.jackrabbit" />
                        </list>
                </property>

diff --git a/META-INF/spring/misc.xml b/META-INF/spring/misc.xml
index 08207c8dd320f3335b630f29200fe8dd3705b985..70af27148a604737140fe24d8232b6574eeea6f8 100644 (file)
--- a/META-INF/spring/misc.xml
+++ b/META-INF/spring/misc.xml
@@ -18,22 +18,6 @@
                        </props>
                </property>
        </bean>
-       <bean id="org.apache.log4j" p:groupId="org.argeo.tp.apache"
-               parent="template.bndWrapper">
-               <property name="bndProperties">
-                       <props merge="true">
-                               <prop key="Import-Package">
-                                       *,
-                                       com.ibm.uvm.tools;resolution:=optional,
-                                       com.sun.jdmk.comm;resolution:=optional,
-                                       javax.jmdns;resolution:=optional,
-                                       javax.jms;resolution:=optional,
-                                       javax.mail;resolution:=optional,
-                                       javax.mail.internet;resolution:=optional,
-                               </prop>
-                       </props>
-               </property>
-       </bean>
        <bean id="org.slf4j.log4j12" parent="template.org.slf4j" />
        <bean id="org.slf4j.api" parent="template.org.slf4j" />
        <bean id="org.slf4j.commons.logging" parent="template.org.slf4j" />
@@ -52,32 +36,6 @@
                </property>
        </bean>
 
-       <!-- Log4j12 Factory -->
-       <flow:flow name="misc/org.apache.log4j" spec="spec.version">
-               <flow:arg name="version" value="1.2.17" />
-               <bean parent="template.archiveWrapper">
-                       <property name="uri"
-                               value="http://archive.apache.org/dist/logging/log4j/@{version}/log4j-@{version}.zip" />
-                       <property name="license">
-                               <util:constant static-field="org.argeo.slc.repo.FreeLicense.APACHE" />
-                       </property>
-                       <property name="wrappers">
-                               <map>
-                                       <entry key="apache-log4j-@{version}/log4j-@{version}.jar"
-                                               value-ref="org.apache.log4j" />
-                               </map>
-                       </property>
-                       <property name="sourcesProvider">
-                               <bean class="org.argeo.slc.repo.osgi.ArchiveSourcesProvider">
-                                       <property name="uri"
-                                               value="http://archive.apache.org/dist/logging/log4j/@{version}/log4j-@{version}.zip" />
-                                       <property name="base" value="apache-log4j-@{version}/src/main/java/" />
-                                       <property name="osgiFactory" ref="osgiFactory" />
-                               </bean>
-                       </property>
-               </bean>
-       </flow:flow>
-
        <!-- AspectJ Factory -->
        <flow:flow name="misc/org.aspectj" spec="spec.version">
                <flow:arg name="version" value="1.7.3" />