Merge TP extras

diff --git a/META-INF/MANIFEST.MF b/META-INF/MANIFEST.MF
index 7a06b416f9039ffea9ea1370ba3c75725ca2c147..0fb70e075141888a54cfecc4398ac8cb3b164eec 100644 (file)
--- a/META-INF/MANIFEST.MF
+++ b/META-INF/MANIFEST.MF
@@ -6,7 +6,7 @@ Bundle-ManifestVersion: 2
 Bundle-Name: Third Party Factory\r
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8\r
 Bundle-SymbolicName: org.argeo.tp.factory.core\r
-Bundle-Version: 2.1.13.r201605220946\r
+Bundle-Version: 2.1.14.SNAPSHOT-r201605220948\r
 Import-Package: javax.jcr;version="[2.0,3)",\r
  javax.security.auth.callback;resolution:=optional,\r
  org.aopalliance.aop;version="[1.0,2)",\r

diff --git a/META-INF/spring/apache.xml b/META-INF/spring/apache.xml
index e24f28c6730a64174d9c49bb7c632fd83e301f91..5a0d84d6c09c6906758027e88002af2de21965eb 100644 (file)
--- a/META-INF/spring/apache.xml
+++ b/META-INF/spring/apache.xml
@@ -64,6 +64,15 @@
                </bean>
        </flow:flow>
 
+       <flow:flow name="apache/org.apache.pdfbox" spec="spec.version">
+               <flow:arg name="version" value="1.8.8" />
+               <bean id="org.apache.pdfbox" parent="template.apacheMaven"
+                       p:version="@{version}" p:sourceCoords="org.apache.pdfbox:pdfbox:@{version}" />
+               <bean id="org.apache.pdfbox.fontbox" parent="template.apacheMaven"
+                       p:version="@{version}" p:sourceCoords="org.apache.pdfbox:fontbox:@{version}" />
+               <bean id="org.apache.pdfbox.jempbox" parent="template.apacheMaven"
+                       p:version="@{version}" p:sourceCoords="org.apache.pdfbox:jempbox:@{version}" />
+       </flow:flow>
 
        <!-- Templates -->
        <bean id="template.apacheMaven" parent="template.mavenWrapper"

diff --git a/META-INF/spring/bouncycastle.xml b/META-INF/spring/bouncycastle.xml
index 379cc4fcdfde58df78de6ece3ed4d39524ca136f..749b8643b450f0d4b24c866ef67c4c610aeeab26 100644 (file)
--- a/META-INF/spring/bouncycastle.xml
+++ b/META-INF/spring/bouncycastle.xml
@@ -11,9 +11,9 @@
 
        <!-- REGISTER -->
        <flow:flow name="misc/org.bouncycastle" spec="spec.version">
-               <flow:arg name="version" value="1.52" />
+               <flow:arg name="version" value="1.54" />
                <bean id="bcprov"
-                       p:uri="http://www.bouncycastle.org/download/bcprov-jdk15on-152.jar"
+                       p:uri="http://downloads.bouncycastle.org/java/bcprov-jdk15on-154.jar"
                        parent="template.bouncycastle">
                        <property name="sourcesProvider">
                                <bean class="org.argeo.slc.repo.osgi.ArchiveSourcesProvider">
@@ -24,7 +24,7 @@
                        </property>
                </bean>
                <bean id="bcpkix"
-                       p:uri="http://www.bouncycastle.org/download/bcpkix-jdk15on-152.jar"
+                       p:uri="http://downloads.bouncycastle.org/java/bcpkix-jdk15on-154.jar"
                        parent="template.bouncycastle">
                        <property name="sourcesProvider">
                                <bean class="org.argeo.slc.repo.osgi.ArchiveSourcesProvider">
@@ -35,7 +35,7 @@
                        </property>
                </bean>
                <bean id="bcmail"
-                       p:uri="http://www.bouncycastle.org/download/bcmail-jdk15on-152.jar"
+                       p:uri="http://downloads.bouncycastle.org/java/bcmail-jdk15on-154.jar"
                        parent="template.bouncycastle">
                        <property name="sourcesProvider">
                                <bean class="org.argeo.slc.repo.osgi.ArchiveSourcesProvider">
@@ -46,7 +46,7 @@
                        </property>
                </bean>
                <bean id="bcpg"
-                       p:uri="http://www.bouncycastle.org/download/bcpg-jdk15on-152.jar"
+                       p:uri="http://downloads.bouncycastle.org/java/bcpg-jdk15on-154.jar"
                        parent="template.bouncycastle">
                        <property name="sourcesProvider">
                                <bean class="org.argeo.slc.repo.osgi.ArchiveSourcesProvider">

diff --git a/META-INF/spring/distribution.xml b/META-INF/spring/distribution.xml
index afbf0c5fe2a9045d96111ccee953d40aed2f9f6a..c1cb5b83598860b3c35a4b2d2a86cadfd2c6bae8 100644 (file)
--- a/META-INF/spring/distribution.xml
+++ b/META-INF/spring/distribution.xml
@@ -10,7 +10,7 @@
        <!-- 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.13" />
+               <constructor-arg value="org.argeo.tp:argeo-tp:2.1.14" />
                <property name="modules">
                        <list>
                                <!-- Javax -->
@@ -76,6 +76,19 @@
                                
                                <!-- Spring -->
                                <ref bean="spring/org.springframework" />
+
+                               <!-- Document generation and management -->
+                               <ref bean="net.sf.jxl" />
+                               <ref bean="apache/org.apache.pdfbox" />
+                               <!-- Databases -->
+                               <ref bean="org.postgresql.postgresql" />
+                               <ref bean="org.dbunit" />
+                               <!-- ALM -->
+                               <ref bean="eclipse/org.eclipse.aether" />
+                               <ref bean="org.redline-rpm" />
+                               <!-- Needs https://code.google.com/p/javaewah/ -->
+                               <!-- <ref bean="org.eclipse.jgit" /> -->
+                               <ref bean="misc/org.tmatesoft.svnkit" />
                        </list>
                </property>
        </bean>
@@ -83,7 +96,7 @@
        <!-- Factory -->
        <bean id="osgiFactory" class="org.argeo.slc.repo.osgi.OsgiFactoryImpl"
                init-method="init" destroy-method="destroy">
-               <property name="workspace" value="argeo-tp-2.1" />
+               <property name="workspace" value="argeo-2.1" />
                <property name="nodeIndexers">
                        <list>
                                <bean class="org.argeo.slc.repo.ModularDistributionIndexer" />
@@ -129,10 +142,11 @@
        <!-- Security -->
        <bean
                class="org.argeo.security.core.AuthenticatedApplicationContextInitialization">
-               <property name="beanNames">
-                       <list>
-                               <value>osgiFactory</value>
-                       </list>
-               </property>
+<!--           <property name="beanNames"> -->
+<!--                   <list> -->
+<!--                           <value>osgiFactory</value> -->
+<!--                           <value>argeo-tp</value> -->
+<!--                   </list> -->
+<!--           </property> -->
        </bean>
 </beans>
\ No newline at end of file

diff --git a/META-INF/spring/eclipse.equinox.xml b/META-INF/spring/eclipse.equinox.xml
index 192df222751130817c4ca7f2bd1ae300490a8e13..7ff099b3e5b59bb3870b9a9af63cf86fff2299d2 100644 (file)
--- a/META-INF/spring/eclipse.equinox.xml
+++ b/META-INF/spring/eclipse.equinox.xml
@@ -8,8 +8,8 @@
        http://www.argeo.org/schema/slc-flow http://www.argeo.org/schema/slc-flow-0.12.xsd">
 
        <flow:flow name="eclipse/org.argeo.tp.equinox" parent="template.importEquinox">
-               <flow:arg name="equinoxRelease" value="LunaSR1" />
-               <flow:arg name="equinoxTimestamp" value="201409250400" />
+               <flow:arg name="equinoxRelease" value="LunaSR2" />
+               <flow:arg name="equinoxTimestamp" value="201502041700" />
        </flow:flow>
 
        <!-- Equinox specs and templates -->

diff --git a/META-INF/spring/misc.xml b/META-INF/spring/misc.xml
index 313da4085e4d1f5da84ed66ae355ca9389ccb6d2..2888c3e55ec02056cc0824bf1f4df613bae47daa 100644 (file)
--- a/META-INF/spring/misc.xml
+++ b/META-INF/spring/misc.xml
@@ -14,22 +14,6 @@
                </property>
        </bean>
 
-       <bean id="org.junit" p:version="4.11.0" p:sourceCoords="junit:junit:4.11"
-               parent="template.mavenWrapper">
-               <property name="license">
-                       <util:constant static-field="org.argeo.slc.repo.FreeLicense.EPL" />
-               </property>
-               <property name="bndProperties">
-                       <props merge="true">
-                               <prop key="Import-Package">
-                                       org.hamcrest;resolution:=optional,
-                                       org.hamcrest.core;resolution:=optional,
-                                       *
-                               </prop>
-                       </props>
-               </property>
-       </bean>
-
        <bean id="EDU.oswego.cs.dl.util.concurrent" p:sourceCoords="concurrent:concurrent:1.3.4"
                parent="template.mavenWrapper">
                <property name="license">
@@ -136,23 +120,6 @@
                </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>
-
        <bean id="bitronix.tm" p:sourceCoords="org.codehaus.btm:btm:2.1.4"
                parent="template.mavenWrapper">
                <property name="license">
@@ -243,4 +210,19 @@
                </bean>
        </flow:flow>
 
+       <bean id="net.sf.jxl" p:sourceCoords="net.sourceforge.jexcelapi:jxl:2.6.12"
+               parent="template.mavenWrapper">
+               <!-- <property name="doNotModify" value="true" /> -->
+               <property name="license">
+                       <util:constant static-field="org.argeo.slc.repo.FreeLicense.LGPL_v2" />
+               </property>
+       </bean>
+
+       <bean id="org.postgresql.postgresql" p:sourceCoords="org.postgresql:postgresql:9.3-1102-jdbc41"
+               p:version="9.3.1102.jdbc41" parent="template.mavenWrapper">
+               <property name="license">
+                       <util:constant static-field="org.argeo.slc.repo.FreeLicense.BSD" />
+               </property>
+       </bean>
+
 </beans>
\ No newline at end of file

diff --git a/pom.xml b/pom.xml
index e98964270e04ca46421607f3fcb2a57db21e038c..0178833710d1de3eee7e6c87d157bb576505ef4d 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -8,7 +8,7 @@
        </parent>
        <groupId>org.argeo.tp.factory</groupId>
        <artifactId>org.argeo.tp.factory.core</artifactId>
-       <version>2.1.13</version>
+       <version>2.1.14-SNAPSHOT</version>
        <name>Third Party Factory</name>
        <properties>
                <additionalImports.slc-lib>