incubator-connectors-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kwri...@apache.org
Subject svn commit: r1327771 - in /incubator/lcf/branches/CONNECTORS-459: ./ connectors/ framework/ framework/jetty-runner/ tests/ tests/alfresco/ tests/cmis/ tests/elasticsearch/ tests/filesystem/ tests/rss/ tests/wiki/
Date Thu, 19 Apr 2012 01:37:06 GMT
Author: kwright
Date: Thu Apr 19 01:37:05 2012
New Revision: 1327771

URL: http://svn.apache.org/viewvc?rev=1327771&view=rev
Log:
Include slf4j everywhere jetty is included

Modified:
    incubator/lcf/branches/CONNECTORS-459/build.xml
    incubator/lcf/branches/CONNECTORS-459/connectors/connector-build.xml
    incubator/lcf/branches/CONNECTORS-459/framework/build.xml
    incubator/lcf/branches/CONNECTORS-459/framework/jetty-runner/pom.xml
    incubator/lcf/branches/CONNECTORS-459/pom.xml
    incubator/lcf/branches/CONNECTORS-459/tests/alfresco/pom.xml
    incubator/lcf/branches/CONNECTORS-459/tests/cmis/pom.xml
    incubator/lcf/branches/CONNECTORS-459/tests/elasticsearch/pom.xml
    incubator/lcf/branches/CONNECTORS-459/tests/filesystem/pom.xml
    incubator/lcf/branches/CONNECTORS-459/tests/rss/pom.xml
    incubator/lcf/branches/CONNECTORS-459/tests/test-build.xml
    incubator/lcf/branches/CONNECTORS-459/tests/wiki/pom.xml

Modified: incubator/lcf/branches/CONNECTORS-459/build.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/branches/CONNECTORS-459/build.xml?rev=1327771&r1=1327770&r2=1327771&view=diff
==============================================================================
--- incubator/lcf/branches/CONNECTORS-459/build.xml (original)
+++ incubator/lcf/branches/CONNECTORS-459/build.xml Thu Apr 19 01:37:05 2012
@@ -2901,6 +2901,20 @@ Use Apache Forrest version forrest-0.9-d
         <ant dir="build/download/commons-httpclient" target="dist"/>
         <copy todir="lib" file="build/download/commons-httpclient/dist/commons-httpclient.jar"/>
     </target>
+  
+    <target name="download-slf4j">
+        <mkdir dir="lib"/>
+        <property name="slf4j-version" value="1.6.4"/>
+        <property name="slf4j-package" value="org/slf4j"/>
+        <antcall target="download-via-maven"><param name="project-path" value="${slf4j-package}"/><param
name="artifact-version" value="${slf4j-version}"/><param name="target" value="lib"/>
+            <param name="artifact-name" value="slf4j-api"/>
+            <param name="artifact-type" value="jar"/>
+        </antcall>
+        <antcall target="download-via-maven"><param name="project-path" value="${slf4j-package}"/><param
name="artifact-version" value="${slf4j-version}"/><param name="target" value="lib"/>
+            <param name="artifact-name" value="slf4j-simple"/>
+            <param name="artifact-type" value="jar"/>
+        </antcall>
+    </target>
     
     <target name="download-jetty">
         <mkdir dir="lib"/>
@@ -3380,7 +3394,7 @@ Use Apache Forrest version forrest-0.9-d
         </copy>
     </target>
 
-    <target name="make-core-deps" depends="download-json,download-hsqldb,download-xerces,download-commons,download-solr-plugins,download-sharepoint-plugin,download-jstl,download-xmlgraphics-commons,download-wstx-asl,download-xmlsec,download-xml-apis,download-wss4j,download-velocity,download-streambuffer,download-stax,download-servlet-api,download-xml-resolver,download-osgi,download-opensaml,download-mimepull,download-mail,download-log4j,download-junit,download-jsr181-api,download-jsr250-api,download-jaxws,download-jdbcpool,download-glassfish,download-jaxb,download-tomcat,download-h2,download-h2-support,download-geronimo-specs,download-fop,download-derby,download-postgresql,download-axis,download-saaj,download-wsdl4j,download-castor,download-jetty,download-xalan,download-activation,download-avalon-framework,download-poi,download-chemistry,download-ecj">
+    <target name="make-core-deps" depends="download-json,download-hsqldb,download-xerces,download-commons,download-solr-plugins,download-sharepoint-plugin,download-jstl,download-xmlgraphics-commons,download-wstx-asl,download-xmlsec,download-xml-apis,download-wss4j,download-velocity,download-streambuffer,download-stax,download-servlet-api,download-xml-resolver,download-osgi,download-opensaml,download-mimepull,download-mail,download-log4j,download-junit,download-jsr181-api,download-jsr250-api,download-jaxws,download-jdbcpool,download-glassfish,download-jaxb,download-tomcat,download-h2,download-h2-support,download-geronimo-specs,download-fop,download-derby,download-postgresql,download-axis,download-saaj,download-wsdl4j,download-castor,download-jetty,download-slf4j,download-xalan,download-activation,download-avalon-framework,download-poi,download-chemistry,download-ecj">
         <copy todir="lib">
             <fileset dir="lib-license" includes="*.txt"/>
         </copy>

Modified: incubator/lcf/branches/CONNECTORS-459/connectors/connector-build.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/branches/CONNECTORS-459/connectors/connector-build.xml?rev=1327771&r1=1327770&r2=1327771&view=diff
==============================================================================
--- incubator/lcf/branches/CONNECTORS-459/connectors/connector-build.xml (original)
+++ incubator/lcf/branches/CONNECTORS-459/connectors/connector-build.xml Thu Apr 19 01:37:05
2012
@@ -43,6 +43,7 @@
             <include name="eclipse*.jar"/>
             <include name="jasper*.jar"/>
             <include name="jetty*.jar"/>
+            <include name="slf4j*.jar"/>
             <include name="jdbcpool*.jar"/>
             <include name="jsp-2.1*.jar"/>
             <include name="jsp-api*.jar"/>

Modified: incubator/lcf/branches/CONNECTORS-459/framework/build.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/branches/CONNECTORS-459/framework/build.xml?rev=1327771&r1=1327770&r2=1327771&view=diff
==============================================================================
--- incubator/lcf/branches/CONNECTORS-459/framework/build.xml (original)
+++ incubator/lcf/branches/CONNECTORS-459/framework/build.xml Thu Apr 19 01:37:05 2012
@@ -44,6 +44,7 @@
             <include name="ecj*.jar"/>
             <include name="jasper*.jar"/>
             <include name="jetty*.jar"/>
+            <include name="slf4j*.jar"/>
             <include name="jdbcpool*.jar"/>
             <include name="jsp-2.1*.jar"/>
             <include name="jsp-api*.jar"/>
@@ -656,6 +657,7 @@
             </fileset>
             <fileset dir="../lib">
                 <include name="jetty*.jar"/>
+                <include name="slf4j*.jar"/>
                 <include name="servlet-api*.jar"/>
                 <include name="ecj*.jar"/>
                 <include name="jasper*.jar"/>
@@ -695,6 +697,7 @@
             </fileset>
             <fileset dir="../lib">
                 <include name="jetty*.jar"/>
+                <include name="slf4j*.jar"/>
                 <include name="servlet-api*.jar"/>
                 <include name="ecj*.jar"/>
                 <include name="jasper*.jar"/>
@@ -749,6 +752,7 @@
                 <include name="jasper*.jar"/>
                 <include name="jdbcpool*.jar"/>
                 <include name="jetty*.jar"/>
+                <include name="slf4j*.jar"/>
                 <include name="jsp-api*.jar"/>
                 <include name="jsp-2.5*.jar"/>
                 <include name="log4j*.jar"/>
@@ -845,7 +849,9 @@
         <property name="manifest-cp-55" value="${manifest-cp-54} lib/jetty-security.jar"/>
         <property name="manifest-cp-56" value="${manifest-cp-55} lib/jetty-continuation.jar"/>
         <property name="manifest-cp-57" value="${manifest-cp-56} lib/jetty-xml.jar"/>
-        <property name="manifest-cp" value="${manifest-cp-57}"/>
+        <property name="manifest-cp-58" value="${manifest-cp-57} lib/slf4j-api.jar"/>
+        <property name="manifest-cp-59" value="${manifest-cp-58} lib/slf4j-simple.jar"/>
+        <property name="manifest-cp" value="${manifest-cp-59}"/>
         <mkdir dir="build/example"/>
         <manifest file="build/example/manifest">
             <attribute name="Main-Class" value="org.apache.manifoldcf.jettyrunner.ManifoldCFJettyRunner"/>
@@ -873,6 +879,7 @@
                 <include name="jasper*.jar"/>
                 <include name="jdbcpool*.jar"/>
                 <include name="jetty*.jar"/>
+                <include name="slf4j*.jar"/>
                 <include name="jsp-api*.jar"/>
                 <include name="jsp-2.5*.jar"/>
                 <include name="log4j*.jar"/>
@@ -977,7 +984,9 @@
         <property name="manifest-cp-proprietary-57" value="${manifest-cp-proprietary-56}
lib/jetty-security.jar"/>
         <property name="manifest-cp-proprietary-58" value="${manifest-cp-proprietary-57}
lib/jetty-continuation.jar"/>
         <property name="manifest-cp-proprietary-59" value="${manifest-cp-proprietary-58}
lib/jetty-xml.jar"/>
-        <property name="manifest-cp-proprietary" value="${manifest-cp-proprietary-59}"/>
+        <property name="manifest-cp-proprietary-60" value="${manifest-cp-proprietary-59}
lib/slf4j-api.jar"/>
+        <property name="manifest-cp-proprietary-61" value="${manifest-cp-proprietary-60}
lib/slf4j-simple.jar"/>
+        <property name="manifest-cp-proprietary" value="${manifest-cp-proprietary-61}"/>
         <mkdir dir="build/example-proprietary"/>
         <manifest file="build/example-proprietary/manifest">
             <attribute name="Main-Class" value="org.apache.manifoldcf.jettyrunner.ManifoldCFJettyRunner"/>

Modified: incubator/lcf/branches/CONNECTORS-459/framework/jetty-runner/pom.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/branches/CONNECTORS-459/framework/jetty-runner/pom.xml?rev=1327771&r1=1327770&r2=1327771&view=diff
==============================================================================
--- incubator/lcf/branches/CONNECTORS-459/framework/jetty-runner/pom.xml (original)
+++ incubator/lcf/branches/CONNECTORS-459/framework/jetty-runner/pom.xml Thu Apr 19 01:37:05
2012
@@ -256,6 +256,17 @@
     </dependency>
 
     <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-api</artifactId>
+      <version>${slf4j.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-simple</artifactId>
+      <version>${slf4j.version}</version>
+    </dependency>
+
+    <dependency>
       <groupId>org.mortbay.jetty</groupId>
       <artifactId>jsp-api-2.1-glassfish</artifactId>
       <version>${glassfish.version}</version>

Modified: incubator/lcf/branches/CONNECTORS-459/pom.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/branches/CONNECTORS-459/pom.xml?rev=1327771&r1=1327770&r2=1327771&view=diff
==============================================================================
--- incubator/lcf/branches/CONNECTORS-459/pom.xml (original)
+++ incubator/lcf/branches/CONNECTORS-459/pom.xml Thu Apr 19 01:37:05 2012
@@ -61,6 +61,7 @@
     <jdbcpool.version>0.99</jdbcpool.version>
     <json.version>20090211</json.version>
     <velocity.version>1.7</velocity.version>
+    <slf4j.version>1.6.4</slf4j.version>
   </properties>
 
   <modules>

Modified: incubator/lcf/branches/CONNECTORS-459/tests/alfresco/pom.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/branches/CONNECTORS-459/tests/alfresco/pom.xml?rev=1327771&r1=1327770&r2=1327771&view=diff
==============================================================================
--- incubator/lcf/branches/CONNECTORS-459/tests/alfresco/pom.xml (original)
+++ incubator/lcf/branches/CONNECTORS-459/tests/alfresco/pom.xml Thu Apr 19 01:37:05 2012
@@ -242,6 +242,17 @@
     </dependency>
 
     <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-api</artifactId>
+      <version>${slf4j.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-simple</artifactId>
+      <version>${slf4j.version}</version>
+    </dependency>
+
+    <dependency>
       <groupId>org.mortbay.jetty</groupId>
       <artifactId>jsp-api-2.1-glassfish</artifactId>
       <version>${glassfish.version}</version>

Modified: incubator/lcf/branches/CONNECTORS-459/tests/cmis/pom.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/branches/CONNECTORS-459/tests/cmis/pom.xml?rev=1327771&r1=1327770&r2=1327771&view=diff
==============================================================================
--- incubator/lcf/branches/CONNECTORS-459/tests/cmis/pom.xml (original)
+++ incubator/lcf/branches/CONNECTORS-459/tests/cmis/pom.xml Thu Apr 19 01:37:05 2012
@@ -236,6 +236,17 @@
     </dependency>
 
     <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-api</artifactId>
+      <version>${slf4j.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-simple</artifactId>
+      <version>${slf4j.version}</version>
+    </dependency>
+
+    <dependency>
       <groupId>org.mortbay.jetty</groupId>
       <artifactId>jsp-api-2.1-glassfish</artifactId>
       <version>${glassfish.version}</version>

Modified: incubator/lcf/branches/CONNECTORS-459/tests/elasticsearch/pom.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/branches/CONNECTORS-459/tests/elasticsearch/pom.xml?rev=1327771&r1=1327770&r2=1327771&view=diff
==============================================================================
--- incubator/lcf/branches/CONNECTORS-459/tests/elasticsearch/pom.xml (original)
+++ incubator/lcf/branches/CONNECTORS-459/tests/elasticsearch/pom.xml Thu Apr 19 01:37:05
2012
@@ -262,6 +262,17 @@
     </dependency>
     
     <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-api</artifactId>
+      <version>${slf4j.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-simple</artifactId>
+      <version>${slf4j.version}</version>
+    </dependency>
+    
+    <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>mcf-core</artifactId>
       <version>${project.version}</version>

Modified: incubator/lcf/branches/CONNECTORS-459/tests/filesystem/pom.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/branches/CONNECTORS-459/tests/filesystem/pom.xml?rev=1327771&r1=1327770&r2=1327771&view=diff
==============================================================================
--- incubator/lcf/branches/CONNECTORS-459/tests/filesystem/pom.xml (original)
+++ incubator/lcf/branches/CONNECTORS-459/tests/filesystem/pom.xml Thu Apr 19 01:37:05 2012
@@ -207,6 +207,17 @@
     </dependency>
 
     <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-api</artifactId>
+      <version>${slf4j.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-simple</artifactId>
+      <version>${slf4j.version}</version>
+    </dependency>
+
+    <dependency>
       <groupId>org.mortbay.jetty</groupId>
       <artifactId>jsp-api-2.1-glassfish</artifactId>
       <version>${glassfish.version}</version>

Modified: incubator/lcf/branches/CONNECTORS-459/tests/rss/pom.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/branches/CONNECTORS-459/tests/rss/pom.xml?rev=1327771&r1=1327770&r2=1327771&view=diff
==============================================================================
--- incubator/lcf/branches/CONNECTORS-459/tests/rss/pom.xml (original)
+++ incubator/lcf/branches/CONNECTORS-459/tests/rss/pom.xml Thu Apr 19 01:37:05 2012
@@ -201,6 +201,17 @@
     </dependency>
 
     <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-api</artifactId>
+      <version>${slf4j.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-simple</artifactId>
+      <version>${slf4j.version}</version>
+    </dependency>
+
+    <dependency>
       <groupId>org.mortbay.jetty</groupId>
       <artifactId>jsp-api-2.1-glassfish</artifactId>
       <version>${glassfish.version}</version>

Modified: incubator/lcf/branches/CONNECTORS-459/tests/test-build.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/branches/CONNECTORS-459/tests/test-build.xml?rev=1327771&r1=1327770&r2=1327771&view=diff
==============================================================================
--- incubator/lcf/branches/CONNECTORS-459/tests/test-build.xml (original)
+++ incubator/lcf/branches/CONNECTORS-459/tests/test-build.xml Thu Apr 19 01:37:05 2012
@@ -42,6 +42,7 @@
             <include name="ecj*.jar"/>
             <include name="jasper*.jar"/>
             <include name="jetty*.jar"/>
+            <include name="slf4j*.jar"/>
             <include name="jdbcpool*.jar"/>
             <include name="jsp-2.1*.jar"/>
             <include name="jsp-api*.jar"/>

Modified: incubator/lcf/branches/CONNECTORS-459/tests/wiki/pom.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/branches/CONNECTORS-459/tests/wiki/pom.xml?rev=1327771&r1=1327770&r2=1327771&view=diff
==============================================================================
--- incubator/lcf/branches/CONNECTORS-459/tests/wiki/pom.xml (original)
+++ incubator/lcf/branches/CONNECTORS-459/tests/wiki/pom.xml Thu Apr 19 01:37:05 2012
@@ -202,6 +202,17 @@
     </dependency>
 
     <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-api</artifactId>
+      <version>${slf4j.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-simple</artifactId>
+      <version>${slf4j.version}</version>
+    </dependency>
+
+    <dependency>
       <groupId>org.mortbay.jetty</groupId>
       <artifactId>jsp-api-2.1-glassfish</artifactId>
       <version>${glassfish.version}</version>



Mime
View raw message