incubator-connectors-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kwri...@apache.org
Subject svn commit: r910992 - in /incubator/lcf/trunk/modules: build.xml connectors/meridio/build.xml connectors/meridio/sun/ lib/geronimo-activation_1.1_spec.jar lib/geronimo-javamail_1.4_spec.jar
Date Wed, 17 Feb 2010 14:32:12 GMT
Author: kwright
Date: Wed Feb 17 14:32:11 2010
New Revision: 910992

URL: http://svn.apache.org/viewvc?rev=910992&view=rev
Log:
Use geronimo jars instead of sun jars for activation and mailapi.

Added:
    incubator/lcf/trunk/modules/lib/geronimo-activation_1.1_spec.jar   (with props)
    incubator/lcf/trunk/modules/lib/geronimo-javamail_1.4_spec.jar   (with props)
Removed:
    incubator/lcf/trunk/modules/connectors/meridio/sun/
Modified:
    incubator/lcf/trunk/modules/build.xml
    incubator/lcf/trunk/modules/connectors/meridio/build.xml

Modified: incubator/lcf/trunk/modules/build.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/build.xml?rev=910992&r1=910991&r2=910992&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/build.xml (original)
+++ incubator/lcf/trunk/modules/build.xml Wed Feb 17 14:32:11 2010
@@ -221,6 +221,8 @@
         <copy todir="connectors/meridio/lib" file="lib/castor-1.0.5.jar"/>
         <copy todir="connectors/meridio/lib" file="lib/castor-1.0.5-xml.jar"/>
         <copy todir="connectors/meridio/lib" file="lib/commons-discovery.jar"/>
+        <copy todir="connectors/meridio/lib" file="lib/geronimo-activation_1.1_spec.jar"/>
+        <copy todir="connectors/meridio/lib" file="lib/geronimo-javamail_1.4_spec.jar"/>
         <copy todir="connectors/meridio/lib">
             <fileset dir="framework/lib"/>
         </copy>

Modified: incubator/lcf/trunk/modules/connectors/meridio/build.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/connectors/meridio/build.xml?rev=910992&r1=910991&r2=910992&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/connectors/meridio/build.xml (original)
+++ incubator/lcf/trunk/modules/connectors/meridio/build.xml Wed Feb 17 14:32:11 2010
@@ -10,8 +10,6 @@
         <available file="wsdls/DMDataSet.xsd" property="DMDataSetStatus"/>
         <available file="wsdls/RMDataSet.xsd" property="RMDataSetStatus"/>
         <available file="wsdls/RMClassificationDataSet.xsd" property="RMClassificationDataSetStatus"/>
-        <available file="sun/activation.jar" property="activationStatus"/>
-        <available file="sun/mailapi.jar" property="mailapiStatus"/>
         <condition property="canBuild">
             <and>
                 <isset property="meridioDMWS_axisStatus"/>
@@ -19,8 +17,6 @@
                 <isset property="DMDataSetStatus"/>
                 <isset property="RMDataSetStatus"/>
                 <isset property="RMClassificationDataSetStatus"/>
-                <isset property="activationStatus"/>
-                <isset property="mailapiStatus"/>
             </and>
         </condition>
     </target>
@@ -94,12 +90,12 @@
 
     <target name="compile-xsds" depends="classcreate-xsds,precompile-check" if="canBuild">
         <mkdir dir="build/xsdclasses"/>
-        <javac srcdir="build/xsdjava" destdir="build/xsdclasses" classpath="lib/log4j-1.2.jar:lib/commons-logging.jar:lib/lcf-core.jar:lib/lcf-agents.jar:lib/lcf-pull-agent.jar:lib/mailapi.jar:lib/castor-1.0.5-commons.jar:lib/castor-1.0.5.jar:lib/castor-1.0.5-xml.jar:sun/activation.jar"
target="1.5" source="1.4"/>
+        <javac srcdir="build/xsdjava" destdir="build/xsdclasses" classpath="lib/log4j-1.2.jar:lib/commons-logging.jar:lib/lcf-core.jar:lib/lcf-agents.jar:lib/lcf-pull-agent.jar:lib/mailapi.jar:lib/castor-1.0.5-commons.jar:lib/castor-1.0.5.jar:lib/castor-1.0.5-xml.jar:lib/geronimo-activation_1.1_spec.jar"
target="1.5" source="1.4"/>
     </target>
 
     <target name="compile-connector" depends="compile-wsdls,compile-xsds,precompile-check"
if="canBuild">
         <mkdir dir="build/connector/classes"/>
-        <javac srcdir="connector" destdir="build/connector/classes" classpath="lib/log4j-1.2.jar:lib/commons-logging.jar:lib/commons-httpclient.jar:lib/commons-collections.jar:lib/commons-codec.jar:lib/lcf-core.jar:lib/lcf-agents.jar:lib/lcf-pull-agent.jar:lib/mailapi.jar:lib/castor-1.0.5-commons.jar:lib/castor-1.0.5.jar:lib/castor-1.0.5-xml.jar:sun/activation.jar:lib/axis.jar:build/wsdlclasses:build/xsdclasses:lib/activation.jar:lib/jaxrpc.jar:lib/saaj.jar"
target="1.5" source="1.4"/>
+        <javac srcdir="connector" destdir="build/connector/classes" classpath="lib/log4j-1.2.jar:lib/commons-logging.jar:lib/commons-httpclient.jar:lib/commons-collections.jar:lib/commons-codec.jar:lib/lcf-core.jar:lib/lcf-agents.jar:lib/lcf-pull-agent.jar:lib/mailapi.jar:lib/castor-1.0.5-commons.jar:lib/castor-1.0.5.jar:lib/castor-1.0.5-xml.jar:lib/geronimo-activation_1.1_spec.jar:lib/axis.jar:build/wsdlclasses:build/xsdclasses:lib/activation.jar:lib/jaxrpc.jar:lib/saaj.jar"
target="1.5" source="1.4"/>
     </target>
 
     <target name="compile-crawler-ui" depends="compile-connector,compile-wsdls,compile-xsds,precompile-check"
if="canBuild">
@@ -140,9 +136,6 @@
                 <fileset dir="lib"> 
                     <include name="*.jar"/> 
                 </fileset> 
-                <fileset dir="sun"> 
-                    <include name="*.jar"/> 
-                </fileset>
                 <pathelement location="build/crawler-war/WEB-INF/lib/jstl.jar"/>
                 <pathelement location="build/crawler-war/WEB-INF/lib/standard.jar"/>
                 <pathelement location="build/connector/classes"/>
@@ -159,9 +152,6 @@
                 <fileset dir="lib"> 
                     <include name="*.jar"/> 
                 </fileset>
-                <fileset dir="sun"> 
-                    <include name="*.jar"/> 
-                </fileset>
                 <pathelement location="build/crawler-war/WEB-INF/lib/jstl.jar"/>
                 <pathelement location="build/crawler-war/WEB-INF/lib/standard.jar"/>
                 <pathelement location="build/connector/classes"/>
@@ -199,9 +189,8 @@
         <copy todir="build/webapp/crawler-ui/WEB-INF/lib" file="lib/castor-1.0.5-commons.jar"/>
         <copy todir="build/webapp/crawler-ui/WEB-INF/lib" file="lib/castor-1.0.5.jar"/>
         <copy todir="build/webapp/crawler-ui/WEB-INF/lib" file="lib/castor-1.0.5-xml.jar"/>
-        <copy todir="build/webapp/crawler-ui/WEB-INF/lib">
-            <fileset dir="sun" includes="*.jar"/>
-        </copy>
+        <copy todir="build/webapp/crawler-ui/WEB-INF/lib" file="lib/geronimo-activation_1.1_spec.jar"/>
+        <copy todir="build/webapp/crawler-ui/WEB-INF/lib" file="lib/geronimo-javamail_1.4_spec.jar"/>
         <mkdir dir="build/webapp/crawler-ui"/>
         <copy todir="build/webapp/crawler-ui">
             <fileset dir="crawler-ui" includes="**/*.jsp,**/*.css,**/*.png,**/*.html"/>

Added: incubator/lcf/trunk/modules/lib/geronimo-activation_1.1_spec.jar
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/lib/geronimo-activation_1.1_spec.jar?rev=910992&view=auto
==============================================================================
Binary file - no diff available.

Propchange: incubator/lcf/trunk/modules/lib/geronimo-activation_1.1_spec.jar
------------------------------------------------------------------------------
    svn:executable = *

Propchange: incubator/lcf/trunk/modules/lib/geronimo-activation_1.1_spec.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: incubator/lcf/trunk/modules/lib/geronimo-javamail_1.4_spec.jar
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/lib/geronimo-javamail_1.4_spec.jar?rev=910992&view=auto
==============================================================================
Binary file - no diff available.

Propchange: incubator/lcf/trunk/modules/lib/geronimo-javamail_1.4_spec.jar
------------------------------------------------------------------------------
    svn:executable = *

Propchange: incubator/lcf/trunk/modules/lib/geronimo-javamail_1.4_spec.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream



Mime
View raw message