Add log4j and Tomcat

diff --git a/META-INF/MANIFEST.MF b/META-INF/MANIFEST.MF
index 11892b2b52d11f7ec782238e2a89740378eb90a4..73ec92e6593d237498edf208a71453aa7654b576 100644 (file)
--- a/META-INF/MANIFEST.MF
+++ b/META-INF/MANIFEST.MF
@@ -1,5 +1,5 @@
 Manifest-Version: 1.0\r
-Bnd-LastModified: 1376923329338\r
+Bnd-LastModified: 1376991293617\r
 Build-Jdk: 1.7.0_25\r
 Built-By: mbaudier\r
 Bundle-Description: SLC execution modules for generic tasks, to be used \r
@@ -11,7 +11,7 @@ Bundle-Name: Argeo Distribution Factory
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6\r
 Bundle-SymbolicName: org.argeo.tp.slc.factory\r
 Bundle-Vendor: Argeo\r
-Bundle-Version: 1.1.14.SNAPSHOT-r130819_1642\r
+Bundle-Version: 1.1.14.SNAPSHOT-r130820_1134\r
 Created-By: Apache Maven Bundle Plugin\r
 Import-Package: com.jcraft.jsch;resolution:=optional,javax.jcr;version="\r
  [2.0,3)",net.sf.cglib.core;version="[2.1,3)",net.sf.cglib.proxy;version\r

diff --git a/META-INF/spring/distribution.xml b/META-INF/spring/distribution.xml
index 64d3f44b83b05221931268eaa6b36783ccda49b8..dcec9d1c71f90a9114bb92e0f559f5dcc7fb1aa9 100644 (file)
--- a/META-INF/spring/distribution.xml
+++ b/META-INF/spring/distribution.xml
@@ -5,8 +5,22 @@
        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-0.12.xsd">
+       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"
+               init-method="init" destroy-method="destroy">
+               <constructor-arg value="org.argeo.tp:org.argeo.tp:2.1.1" />
+               <property name="modules">
+                       <set>
+                               <!-- <ref bean="org.slf4j.log4j12" /> -->
+                               <!-- <ref bean="org.slf4j.api" /> -->
+                               <!-- <ref bean="org.slf4j.commons.logging" /> -->
+                       </set>
+               </property>
+       </bean>
+
+       <!-- 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" />
@@ -20,39 +34,6 @@
                <property name="distRepository" ref="distRepository" />
        </bean>
 
-       <bean name="org.argeo.tp/org.slf4j" parent="template.wrapDistribution">
-               <constructor-arg>
-                       <map>
-                               <entry key="version" value="1.7.5" />
-                       </map>
-               </constructor-arg>
-       </bean>
-
-       <!-- Specs and templates -->
-       <flow:spec id="wrapDistribution.spec">
-               <flow:primitive name="version" isParameter="true" />
-       </flow:spec>
-
-       <flow:flow id="template.wrapDistribution" spec="wrapDistribution.spec"
-               abstract="true">
-               <bean class="org.argeo.slc.repo.osgi.DistributionWrapper">
-                       <property name="groupId" value="org.argeo.tp" />
-                       <property name="uri"
-                               value="http://www.slf4j.org/dist/slf4j-@{version}.zip" />
-                       <property name="wrappers">
-                               <map>
-                                       <entry key="slf4j-@{version}/slf4j-api-@{version}.jar">
-                                               <bean class="org.argeo.slc.repo.osgi.BndWrapper">
-                                                       <property name="bsn" value="org.slf4j.api" />
-                                                       <property name="version" value="@{version}" />
-                                               </bean>
-                                       </entry>
-                               </map>
-                       </property>
-                       <property name="osgiFactory" ref="osgiFactory" />
-               </bean>
-       </flow:flow>
-
        <bean
                class="org.argeo.security.core.AuthenticatedApplicationContextInitialization">
                <property name="authenticationManager" ref="authenticationManager" />
@@ -63,4 +44,24 @@
                </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>
+
+       <bean id="template.bndWrapper" class="org.argeo.slc.repo.osgi.BndWrapper"
+               abstract="true">
+               <property name="bndProperties">
+                       <value>
+                               Export-Package=*
+                       </value>
+               </property>
+       </bean>
+
 </beans>
\ No newline at end of file

diff --git a/META-INF/spring/org.argeo.tp.apache.tomcat.xml b/META-INF/spring/org.argeo.tp.apache.tomcat.xml
new file mode 100644 (file)
index 0000000..23c2ebd
--- /dev/null
+++ b/META-INF/spring/org.argeo.tp.apache.tomcat.xml
@@ -0,0 +1,59 @@
+<?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.apache.catalina" parent="template.org.apache.tomcat" />
+       <bean id="org.apache.jasper" parent="template.org.apache.tomcat" />
+       <bean id="org.apache.el" parent="template.org.apache.tomcat" />
+       <bean id="org.apache.coyote" parent="template.org.apache.tomcat" />
+       <bean id="org.apache.tomcat.api" parent="template.org.apache.tomcat" />
+       <bean id="org.apache.tomcat.util" parent="template.org.apache.tomcat" />
+
+       <!-- SLF4J Factory -->
+       <bean id="template.org.apache.tomcat" parent="template.bndWrapper"
+               abstract="true">
+               <property name="groupId" value="org.argeo.tp.apache.tomcat" />
+       </bean>
+
+       <flow:flow name="org.argeo.tp.apache.tomcat/org.apache.tomcat"
+               spec="spec.version">
+               <flow:arg name="version" value="7.0.42" />
+               <bean parent="template.archiveWrapper">
+                       <property name="uri"
+                               value="http://archive.apache.org/dist/tomcat/tomcat-7/v@{version}/bin/apache-tomcat-@{version}.zip" />
+                       <property name="wrappers">
+                               <map>
+                                       <!-- Tomcat -->
+                                       <entry key="apache-tomcat-@{version}/lib/catalina.jar"
+                                               value-ref="org.apache.catalina" />
+                                       <entry key="apache-tomcat-@{version}/lib/jasper.jar"
+                                               value-ref="org.apache.jasper" />
+                                       <entry key="apache-tomcat-@{version}/lib/jasper-el.jar"
+                                               value-ref="org.apache.el" />
+                                       <entry key="apache-tomcat-@{version}/lib/tomcat-coyote.jar"
+                                               value-ref="org.apache.coyote" />
+                                       <entry key="apache-tomcat-@{version}/lib/tomcat-api.jar"
+                                               value-ref="org.apache.tomcat.api" />
+                                       <entry key="apache-tomcat-@{version}/lib/tomcat-util.jar"
+                                               value-ref="org.apache.tomcat.util" />
+                                       <!-- Javax -->
+                                       <entry key="apache-tomcat-@{version}/lib/annotations-api.jar"
+                                               value-ref="javax.annotation" />
+                                       <entry key="apache-tomcat-@{version}/lib/el-api.jar"
+                                               value-ref="javax.el" />
+                                       <entry key="apache-tomcat-@{version}/lib/jsp-api.jar"
+                                               value-ref="javax.servlet.jsp" />
+                                       <entry key="apache-tomcat-@{version}/lib/servlet-api.jar"
+                                               value-ref="javax.servlet" />
+                               </map>
+                       </property>
+               </bean>
+       </flow:flow>
+
+</beans>
\ No newline at end of file

diff --git a/META-INF/spring/org.argeo.tp.javax.xml b/META-INF/spring/org.argeo.tp.javax.xml
new file mode 100644 (file)
index 0000000..0e1ab2a
--- /dev/null
+++ b/META-INF/spring/org.argeo.tp.javax.xml
@@ -0,0 +1,20 @@
+<?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="javax.annotation" p:version="3.0.0" parent="template.javax" />
+       <bean id="javax.el" p:version="2.2.0" parent="template.javax" />
+       <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 -->
+       <bean id="template.javax" parent="template.bndWrapper" abstract="true">
+               <property name="groupId" value="org.argeo.tp.javax" />
+       </bean>
+</beans>
\ No newline at end of file

diff --git a/META-INF/spring/org.argeo.tp.xml b/META-INF/spring/org.argeo.tp.xml
new file mode 100644 (file)
index 0000000..3b107e4
--- /dev/null
+++ b/META-INF/spring/org.argeo.tp.xml
@@ -0,0 +1,56 @@
+<?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.apache.log4j" p:groupId="org.argeo.tp.apache"
+               parent="template.bndWrapper" />
+       <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" />
+
+       <!-- Log4j12 Factory -->
+       <flow:flow name="org.argeo.tp/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="wrappers">
+                               <map>
+                                       <entry key="apache-log4j-@{version}/log4j-@{version}.jar"
+                                               value-ref="org.apache.log4j" />
+                               </map>
+                       </property>
+               </bean>
+       </flow:flow>
+
+       <!-- SLF4J Factory -->
+       <bean id="template.org.slf4j" parent="template.bndWrapper"
+               abstract="true">
+               <property name="groupId" value="org.argeo.tp" />
+       </bean>
+
+       <flow:flow name="org.argeo.tp/org.slf4j" spec="spec.version">
+               <flow:arg name="version" value="1.7.5" />
+               <bean parent="template.archiveWrapper">
+                       <property name="uri"
+                               value="http://www.slf4j.org/dist/slf4j-@{version}.zip" />
+                       <property name="wrappers">
+                               <map>
+                                       <entry key="slf4j-@{version}/slf4j-log4j12-@{version}.jar"
+                                               value-ref="org.slf4j.log4j12" />
+                                       <entry key="slf4j-@{version}/slf4j-api-@{version}.jar"
+                                               value-ref="org.slf4j.api" />
+                                       <entry key="slf4j-@{version}/jcl-over-slf4j-@{version}.jar"
+                                               value-ref="org.slf4j.commons.logging" />
+                               </map>
+                       </property>
+               </bean>
+       </flow:flow>
+
+</beans>
\ No newline at end of file