incubator-connectors-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kwri...@apache.org
Subject svn commit: r1308136 [3/3] - in /incubator/lcf/trunk: ./ connectors/ connectors/alfresco/ connectors/cmis/ connectors/elasticsearch/ connectors/jcifs/ connectors/rss/ connectors/sharepoint/ connectors/sharepoint/integration/ connectors/solr/ connectors...
Date Sun, 01 Apr 2012 15:30:31 GMT
Modified: incubator/lcf/trunk/common-build.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/common-build.xml?rev=1308136&r1=1308135&r2=1308136&view=diff
==============================================================================
--- incubator/lcf/trunk/common-build.xml (original)
+++ incubator/lcf/trunk/common-build.xml Sun Apr  1 15:30:29 2012
@@ -17,5 +17,24 @@
 
 <project name="mcf-common-build">
 
+    <target name="setup-maven-url">
+        <property name="maven-base-url" value="http://repo1.maven.org/maven2"/>
+    </target>
+    
+    <target name="download-via-maven" depends="setup-maven-url">
+        <get src="${maven-base-url}/${project-path}/${artifact-name}/${artifact-version}/${artifact-name}-${artifact-version}.${artifact-type}" dest="${target}/${artifact-name}.${artifact-type}"/>
+    </target>
+    
+    <target name="setup-svn-url">
+        <property name="svn-base-url" value="http://svn.apache.org/repos/asf/incubator/lcf"/>
+    </target>
+
+    <target name="download-via-svn" depends="setup-svn-url">
+        <get src="${svn-base-url}/bin-dist/${project-desc}-${artifact-version}/${artifact-name}.${artifact-type}" dest="${target}/${artifact-name}.${artifact-type}"/>
+    </target>
+
+    <target name="download-via-escaped-svn" depends="setup-svn-url">
+        <get src="${svn-base-url}/bin-dist/${project-desc}-${artifact-version}/${escaped-artifact-name}.${artifact-type}" dest="${target}/${artifact-name}.${artifact-type}"/>
+    </target>
 
 </project>

Modified: incubator/lcf/trunk/connectors/alfresco/build.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/connectors/alfresco/build.xml?rev=1308136&r1=1308135&r2=1308136&view=diff
==============================================================================
--- incubator/lcf/trunk/connectors/alfresco/build.xml (original)
+++ incubator/lcf/trunk/connectors/alfresco/build.xml Sun Apr  1 15:30:29 2012
@@ -105,4 +105,10 @@
 	
     <target name="download-dependencies" depends="download-alfresco-ws-client"/>
 
+    <target name="download-cleanup">
+        <delete>
+            <fileset dir="lib-proprietary" excludes="README*.txt"/>
+        </delete>
+    </target>
+
 </project>

Modified: incubator/lcf/trunk/connectors/alfresco/pom.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/connectors/alfresco/pom.xml?rev=1308136&r1=1308135&r2=1308136&view=diff
==============================================================================
--- incubator/lcf/trunk/connectors/alfresco/pom.xml (original)
+++ incubator/lcf/trunk/connectors/alfresco/pom.xml Sun Apr  1 15:30:29 2012
@@ -207,6 +207,8 @@
         <artifactId>commons-lang</artifactId>
         <version>2.6</version>
     </dependency>
+    
+    <!-- Test scope -->
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>

Modified: incubator/lcf/trunk/connectors/cmis/pom.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/connectors/cmis/pom.xml?rev=1308136&r1=1308135&r2=1308136&view=diff
==============================================================================
--- incubator/lcf/trunk/connectors/cmis/pom.xml (original)
+++ incubator/lcf/trunk/connectors/cmis/pom.xml Sun Apr  1 15:30:29 2012
@@ -116,6 +116,8 @@
         <artifactId>commons-lang</artifactId>
         <version>2.6</version>
     </dependency>
+    
+    <!-- Test scope -->
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>

Modified: incubator/lcf/trunk/connectors/connector-build.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/connectors/connector-build.xml?rev=1308136&r1=1308135&r2=1308136&view=diff
==============================================================================
--- incubator/lcf/trunk/connectors/connector-build.xml (original)
+++ incubator/lcf/trunk/connectors/connector-build.xml Sun Apr  1 15:30:29 2012
@@ -38,14 +38,14 @@
             <include name="commons-collections*.jar"/>
             <include name="commons-el*.jar"/>
             <include name="commons-fileupload*.jar"/>
-            <include name="commons-httpclient-mcf.jar"/>
+            <include name="commons-httpclient*.jar"/>
             <include name="commons-io*.jar"/>
             <include name="commons-lang*.jar"/>
             <include name="commons-logging*.jar"/>
             <include name="eclipse*.jar"/>
             <include name="jasper*.jar"/>
             <include name="jetty*.jar"/>
-            <include name="jdbcpool-0.99.jar"/>
+            <include name="jdbcpool*.jar"/>
             <include name="jsp-2.1*.jar"/>
             <include name="jsp-api*.jar"/>
             <include name="junit*.jar"/>
@@ -54,7 +54,7 @@
             <include name="servlet-api*.jar"/>
             <include name="tomcat-juli*.jar"/>
             <include name="xalan*.jar"/>
-            <include name="xercesImpl-mcf.jar"/>
+            <include name="xercesImpl*.jar"/>
             <include name="xml-apis*.jar"/>
             <include name="velocity*.jar"/>
         </fileset>
@@ -595,6 +595,8 @@
 
     <target name="download-dependencies"/>
 
+    <target name="download-cleanup"/>
+    
     <target name="all" depends="build,doc,build-tests,run-tests,run-tests-derby,run-tests-HSQLDB"/>
 
 </project>

Modified: incubator/lcf/trunk/connectors/elasticsearch/build.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/connectors/elasticsearch/build.xml?rev=1308136&r1=1308135&r2=1308136&view=diff
==============================================================================
--- incubator/lcf/trunk/connectors/elasticsearch/build.xml (original)
+++ incubator/lcf/trunk/connectors/elasticsearch/build.xml Sun Apr  1 15:30:29 2012
@@ -23,7 +23,7 @@
         
         <mkdir dir="build/download"/>
         <get src="http://cloud.github.com/downloads/elasticsearch/elasticsearch/elasticsearch-0.19.0.tar.gz" 
-          dest="build/download/elasticsearch.tar.gz"/>
+            dest="build/download/elasticsearch.tar.gz"/>
         <gunzip src="build/download/elasticsearch.tar.gz"/>
         <untar src="build/download/elasticsearch.tar" dest="test-materials-proprietary"/>
         
@@ -31,12 +31,12 @@
         <mkdir dir="test-materials-proprietary/elasticsearch-0.19.0/plugins"/>
         
         <get src="http://cloud.github.com/downloads/elasticsearch/elasticsearch-mapper-attachments/elasticsearch-mapper-attachments-1.2.0.zip" 
-          dest="test-materials-proprietary/elasticsearch-0.19.0/plugins/mapper-attachments.zip"/>
+            dest="test-materials-proprietary/elasticsearch-0.19.0/plugins/mapper-attachments.zip"/>
         
         <unzip src="test-materials-proprietary/elasticsearch-0.19.0/plugins/mapper-attachments.zip" dest="test-materials-proprietary/elasticsearch-0.19.0/plugins/mapper-attachments"/>
         
         <chmod dir="test-materials-proprietary/elasticsearch-0.19.0" perm="ugo+rxw">
-         <fileset dir="**/*"/>
+            <fileset dir="**/*"/>
         </chmod>
         <chmod file="test-materials-proprietary/elasticsearch-0.19.0/bin/plugin" perm="ugo+rx"/>
         <chmod file="test-materials-proprietary/elasticsearch-0.19.0/bin/elasticsearch" perm="ugo+rx"/>
@@ -44,4 +44,10 @@
       
     </target>
 
+    <target name="download-cleanup">
+        <delete>
+            <fileset dir="test-materials-proprietary" excludes="README*.txt"/>
+        </delete>
+    </target>
+
 </project>

Modified: incubator/lcf/trunk/connectors/jcifs/build.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/connectors/jcifs/build.xml?rev=1308136&r1=1308135&r2=1308136&view=diff
==============================================================================
--- incubator/lcf/trunk/connectors/jcifs/build.xml (original)
+++ incubator/lcf/trunk/connectors/jcifs/build.xml Sun Apr  1 15:30:29 2012
@@ -49,4 +49,13 @@
 
     <target name="download-dependencies" depends="download-jcifs"/>
 
+    <target name="download-cleanup">
+        <delete>
+            <fileset dir="lib-proprietary">
+                <exclude name="README.txt"/>
+                <exclude name="*.diffs"/>
+            </fileset>
+        </delete>
+    </target>
+    
 </project>

Modified: incubator/lcf/trunk/connectors/rss/pom.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/connectors/rss/pom.xml?rev=1308136&r1=1308135&r2=1308136&view=diff
==============================================================================
--- incubator/lcf/trunk/connectors/rss/pom.xml (original)
+++ incubator/lcf/trunk/connectors/rss/pom.xml Sun Apr  1 15:30:29 2012
@@ -90,23 +90,23 @@
     </dependency>
     <dependency>
       <groupId>commons-httpclient</groupId>
-      <artifactId>commons-httpclient-mcf</artifactId>
-      <version>3.1</version>
+      <artifactId>commons-httpclient</artifactId>
+      <version>${commons-httpclient.version}</version>
     </dependency>
     <dependency>
       <groupId>commons-logging</groupId>
       <artifactId>commons-logging</artifactId>
-      <version>1.1.1</version>
+      <version>${commons-logging.version}</version>
     </dependency>
     <dependency>
       <groupId>commons-codec</groupId>
       <artifactId>commons-codec</artifactId>
-      <version>1.5</version>
+      <version>${commons-codec.version}</version>
     </dependency>
     <dependency>
       <groupId>xerces</groupId>
-      <artifactId>xercesImpl-mcf</artifactId>
-      <version>2.9.1</version>
+      <artifactId>xercesImpl</artifactId>
+      <version>${xerces.version}</version>
     </dependency>
     <dependency>
       <groupId>junit</groupId>

Modified: incubator/lcf/trunk/connectors/sharepoint/build.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/connectors/sharepoint/build.xml?rev=1308136&r1=1308135&r2=1308136&view=diff
==============================================================================
--- incubator/lcf/trunk/connectors/sharepoint/build.xml (original)
+++ incubator/lcf/trunk/connectors/sharepoint/build.xml Sun Apr  1 15:30:29 2012
@@ -72,7 +72,7 @@
           <fileset dir="integration">
               <include name="*.bat"/>
               <include name="*.wsp"/>
-              <include name="*.txt"/>
+              <include name="Installation Readme.txt"/>
           </fileset>
         </copy>
     </target>
@@ -85,6 +85,37 @@
         <get src="http://www.wssdemo.com/_vti_bin/versions.asmx?wsdl=true" dest="lib-proprietary/versions.wsdl"/>
         <get src="http://www.wssdemo.com/_vti_bin/webs.asmx?wsdl=true" dest="lib-proprietary/webs.wsdl"/>
 
+        <property name="sharepoint-plugin-version" value="0.1-incubating"/>
+        <property name="sharepoint-plugin-description" value="mcf-sharepoint-3.0-plugin"/>
+        
+        <antcall target="download-via-svn"><param name="target" value="integration"/><param name="project-desc" value="${sharepoint-plugin-description}"/><param name="artifact-version" value="${sharepoint-plugin-version}"/>
+            <param name="artifact-name" value="MetaCarta.SharePoint.MCPermissionsService"/>
+            <param name="artifact-type" value="wsp"/>
+        </antcall>
+        <antcall target="download-via-escaped-svn"><param name="target" value="integration"/><param name="project-desc" value="${sharepoint-plugin-description}"/><param name="artifact-version" value="${sharepoint-plugin-version}"/>
+            <param name="escaped-artifact-name" value="Installation%20Readme"/>
+            <param name="artifact-name" value="Installation Readme"/>
+            <param name="artifact-type" value="txt"/>
+        </antcall>
+        <antcall target="download-via-svn"><param name="target" value="integration"/><param name="project-desc" value="${sharepoint-plugin-description}"/><param name="artifact-version" value="${sharepoint-plugin-version}"/>
+            <param name="artifact-name" value="setup"/>
+            <param name="artifact-type" value="bat"/>
+        </antcall>
+        <antcall target="download-via-svn"><param name="target" value="integration"/><param name="project-desc" value="${sharepoint-plugin-description}"/><param name="artifact-version" value="${sharepoint-plugin-version}"/>
+            <param name="artifact-name" value="remove"/>
+            <param name="artifact-type" value="bat"/>
+        </antcall>
+        <antcall target="download-via-svn"><param name="target" value="integration"/><param name="project-desc" value="${sharepoint-plugin-description}"/><param name="artifact-version" value="${sharepoint-plugin-version}"/>
+            <param name="artifact-name" value="upgrade"/>
+            <param name="artifact-type" value="bat"/>
+        </antcall>
+    </target>
+
+    <target name="download-cleanup">
+        <delete>
+            <fileset dir="lib-proprietary" excludes="README.txt"/>
+            <fileset dir="integration" excludes="README.txt"/>
+        </delete>
     </target>
 
 </project>

Propchange: incubator/lcf/trunk/connectors/sharepoint/integration/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sun Apr  1 15:30:29 2012
@@ -0,0 +1,4 @@
+*.wsp
+*.bat
+Installation Readme.txt
+

Modified: incubator/lcf/trunk/connectors/solr/build.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/connectors/solr/build.xml?rev=1308136&r1=1308135&r2=1308136&view=diff
==============================================================================
--- incubator/lcf/trunk/connectors/solr/build.xml (original)
+++ incubator/lcf/trunk/connectors/solr/build.xml Sun Apr  1 15:30:29 2012
@@ -19,12 +19,34 @@
 
     <import file="../connector-build.xml"/>
 
+    <target name="download-dependencies">
+        <antcall target="download-via-svn"><param name="target" value="integration"/>
+            <param name="project-desc" value="mcf-solr-3.x-plugin"/>
+            <param name="artifact-version" value="0.1-incubating"/>
+            <param name="artifact-name" value="mcf-solr-3.x-plugin"/>
+            <param name="artifact-type" value="jar"/>
+        </antcall>
+        <antcall target="download-via-svn"><param name="target" value="integration"/>
+            <param name="project-desc" value="mcf-solr-4.x-plugin"/>
+            <param name="artifact-version" value="0.1-incubating"/>
+            <param name="artifact-name" value="mcf-solr-4.x-plugin"/>
+            <param name="artifact-type" value="jar"/>
+        </antcall>
+    </target>
+
+    <target name="download-cleanup">
+        <delete>
+            <fileset dir="integration" excludes="README*.txt"/>
+        </delete>
+    </target>
+
     <target name="integration">
         <mkdir dir="dist/integration"/>
         <copy todir="dist/integration">
           <fileset dir="integration">
               <include name="*.jar"/>
-              <include name="*.txt"/>
+              <include name="README-3.x.txt"/>
+              <include name="README-4.x.txt"/>
           </fileset>
         </copy>
     </target>

Propchange: incubator/lcf/trunk/connectors/solr/integration/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sun Apr  1 15:30:29 2012
@@ -0,0 +1 @@
+*.jar

Modified: incubator/lcf/trunk/connectors/webcrawler/pom.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/connectors/webcrawler/pom.xml?rev=1308136&r1=1308135&r2=1308136&view=diff
==============================================================================
--- incubator/lcf/trunk/connectors/webcrawler/pom.xml (original)
+++ incubator/lcf/trunk/connectors/webcrawler/pom.xml Sun Apr  1 15:30:29 2012
@@ -90,23 +90,23 @@
     </dependency>
     <dependency>
       <groupId>commons-httpclient</groupId>
-      <artifactId>commons-httpclient-mcf</artifactId>
-      <version>3.1</version>
+      <artifactId>commons-httpclient</artifactId>
+      <version>${commons-httpclient.version}</version>
     </dependency>
     <dependency>
       <groupId>commons-logging</groupId>
       <artifactId>commons-logging</artifactId>
-      <version>1.1.1</version>
+      <version>${commons-logging.version}</version>
     </dependency>
     <dependency>
       <groupId>commons-codec</groupId>
       <artifactId>commons-codec</artifactId>
-      <version>1.5</version>
+      <version>${commons-codec.version}</version>
     </dependency>
     <dependency>
       <groupId>xerces</groupId>
-      <artifactId>xercesImpl-mcf</artifactId>
-      <version>2.9.1</version>
+      <artifactId>xercesImpl</artifactId>
+      <version>${xerces.version}</version>
     </dependency>
     <dependency>
       <groupId>junit</groupId>

Modified: incubator/lcf/trunk/connectors/wiki/pom.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/connectors/wiki/pom.xml?rev=1308136&r1=1308135&r2=1308136&view=diff
==============================================================================
--- incubator/lcf/trunk/connectors/wiki/pom.xml (original)
+++ incubator/lcf/trunk/connectors/wiki/pom.xml Sun Apr  1 15:30:29 2012
@@ -90,23 +90,23 @@
     </dependency>
     <dependency>
       <groupId>commons-httpclient</groupId>
-      <artifactId>commons-httpclient-mcf</artifactId>
-      <version>3.1</version>
+      <artifactId>commons-httpclient</artifactId>
+      <version>${commons-httpclient.version}</version>
     </dependency>
     <dependency>
       <groupId>commons-logging</groupId>
       <artifactId>commons-logging</artifactId>
-      <version>1.1.1</version>
+      <version>${commons-logging.version}</version>
     </dependency>
     <dependency>
       <groupId>commons-codec</groupId>
       <artifactId>commons-codec</artifactId>
-      <version>1.5</version>
+      <version>${commons-codec.version}</version>
     </dependency>
     <dependency>
       <groupId>xerces</groupId>
-      <artifactId>xercesImpl-mcf</artifactId>
-      <version>2.9.1</version>
+      <artifactId>xercesImpl</artifactId>
+      <version>${xerces.version}</version>
     </dependency>
     <dependency>
       <groupId>junit</groupId>

Modified: incubator/lcf/trunk/framework/api-service/pom.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/framework/api-service/pom.xml?rev=1308136&r1=1308135&r2=1308136&view=diff
==============================================================================
--- incubator/lcf/trunk/framework/api-service/pom.xml (original)
+++ incubator/lcf/trunk/framework/api-service/pom.xml Sun Apr  1 15:30:29 2012
@@ -55,7 +55,7 @@
     <dependency>
       <groupId>javax.servlet</groupId>
       <artifactId>servlet-api</artifactId>
-      <version>2.5</version>
+      <version>${servlet-api.version}</version>
       <scope>provided</scope>
     </dependency>
 
@@ -63,19 +63,19 @@
     <dependency>
       <groupId>commons-io</groupId>
       <artifactId>commons-io</artifactId>
-      <version>2.0.1</version>
+      <version>${commons-io.version}</version>
       <scope>runtime</scope>
     </dependency>
     <dependency>
       <groupId>commons-codec</groupId>
       <artifactId>commons-codec</artifactId>
-      <version>1.5</version>
+      <version>${commons-codec.version}</version>
       <scope>runtime</scope>
     </dependency>
     <dependency>
       <groupId>commons-el</groupId>
       <artifactId>commons-el</artifactId>
-      <version>1.0</version>
+      <version>${commons-el.version}</version>
       <scope>runtime</scope>
       <exclusions>
         <exclusion>
@@ -87,37 +87,37 @@
     <dependency>
       <groupId>commons-httpclient</groupId>
       <artifactId>commons-httpclient</artifactId>
-      <version>3.1</version>
+      <version>${commons-httpclient.version}</version>
       <scope>runtime</scope>
     </dependency>
     <dependency>
       <groupId>commons-collections</groupId>
       <artifactId>commons-collections</artifactId>
-      <version>3.2.1</version>
+      <version>${commons-collections.version}</version>
       <scope>runtime</scope>
     </dependency>
     <dependency>
       <groupId>commons-fileupload</groupId>
       <artifactId>commons-fileupload</artifactId>
-      <version>1.2.2</version>
+      <version>${commons-fileupload.version}</version>
       <scope>runtime</scope>
     </dependency>
     <dependency>
       <groupId>xalan</groupId>
       <artifactId>serializer</artifactId>
-      <version>2.7.1</version>
+      <version>${xalan.version}</version>
       <scope>runtime</scope>
     </dependency>
     <dependency>
       <groupId>xerces</groupId>
-      <artifactId>xercesImpl-mcf</artifactId>
-      <version>2.9.1</version>
+      <artifactId>xercesImpl</artifactId>
+      <version>${xerces.version}</version>
       <scope>runtime</scope>
     </dependency>
     <dependency>
       <groupId>commons-logging</groupId>
       <artifactId>commons-logging</artifactId>
-      <version>1.1.1</version>
+      <version>${commons-logging.version}</version>
       <scope>runtime</scope>
     </dependency>
 
@@ -151,7 +151,7 @@
     <dependency>
       <groupId>net.sourceforge.jtds</groupId>
       <artifactId>jtds</artifactId>
-      <version>1.2.4</version>
+      <version>${jtds.version}</version>
       <scope>runtime</scope>
     </dependency>
 

Modified: incubator/lcf/trunk/framework/authority-service/pom.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/framework/authority-service/pom.xml?rev=1308136&r1=1308135&r2=1308136&view=diff
==============================================================================
--- incubator/lcf/trunk/framework/authority-service/pom.xml (original)
+++ incubator/lcf/trunk/framework/authority-service/pom.xml Sun Apr  1 15:30:29 2012
@@ -55,7 +55,7 @@
     <dependency>
       <groupId>javax.servlet</groupId>
       <artifactId>servlet-api</artifactId>
-      <version>2.5</version>
+      <version>${servlet-api.version}</version>
       <scope>provided</scope>
     </dependency>
 
@@ -63,19 +63,19 @@
     <dependency>
       <groupId>commons-io</groupId>
       <artifactId>commons-io</artifactId>
-      <version>2.0.1</version>
+      <version>${commons-io.version}</version>
       <scope>runtime</scope>
     </dependency>
     <dependency>
       <groupId>commons-codec</groupId>
       <artifactId>commons-codec</artifactId>
-      <version>1.5</version>
+      <version>${commons-codec.version}</version>
       <scope>runtime</scope>
     </dependency>
     <dependency>
       <groupId>commons-el</groupId>
       <artifactId>commons-el</artifactId>
-      <version>1.0</version>
+      <version>${commons-el.version}</version>
       <scope>runtime</scope>
       <exclusions>
         <exclusion>
@@ -86,38 +86,38 @@
     </dependency>
     <dependency>
       <groupId>commons-httpclient</groupId>
-      <artifactId>commons-httpclient-mcf</artifactId>
-      <version>3.1</version>
+      <artifactId>commons-httpclient</artifactId>
+      <version>${commons-httpclient.version}</version>
       <scope>runtime</scope>
     </dependency>
     <dependency>
       <groupId>commons-collections</groupId>
       <artifactId>commons-collections</artifactId>
-      <version>3.2.1</version>
+      <version>${commons-collections.version}</version>
       <scope>runtime</scope>
     </dependency>
     <dependency>
       <groupId>commons-fileupload</groupId>
       <artifactId>commons-fileupload</artifactId>
-      <version>1.2.2</version>
+      <version>${commons-fileupload.version}</version>
       <scope>runtime</scope>
     </dependency>
     <dependency>
       <groupId>xalan</groupId>
       <artifactId>serializer</artifactId>
-      <version>2.7.1</version>
+      <version>${xalan.version}</version>
       <scope>runtime</scope>
     </dependency>
     <dependency>
       <groupId>xerces</groupId>
-      <artifactId>xercesImpl-mcf</artifactId>
-      <version>2.9.1</version>
+      <artifactId>xercesImpl</artifactId>
+      <version>${xerces.version}</version>
       <scope>runtime</scope>
     </dependency>
     <dependency>
       <groupId>commons-logging</groupId>
       <artifactId>commons-logging</artifactId>
-      <version>1.1.1</version>
+      <version>${commons-logging.version}</version>
       <scope>runtime</scope>
     </dependency>
 
@@ -151,7 +151,7 @@
     <dependency>
       <groupId>net.sourceforge.jtds</groupId>
       <artifactId>jtds</artifactId>
-      <version>1.2.4</version>
+      <version>${jtds.version}</version>
       <scope>runtime</scope>
     </dependency>
 

Modified: incubator/lcf/trunk/framework/authority-servlet/pom.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/framework/authority-servlet/pom.xml?rev=1308136&r1=1308135&r2=1308136&view=diff
==============================================================================
--- incubator/lcf/trunk/framework/authority-servlet/pom.xml (original)
+++ incubator/lcf/trunk/framework/authority-servlet/pom.xml Sun Apr  1 15:30:29 2012
@@ -50,7 +50,7 @@
     <dependency>
       <groupId>javax.servlet</groupId>
       <artifactId>servlet-api</artifactId>
-      <version>2.5</version>
+      <version>${servlet-api.version}</version>
       <scope>provided</scope>
     </dependency>
   </dependencies>

Modified: incubator/lcf/trunk/framework/build.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/framework/build.xml?rev=1308136&r1=1308135&r2=1308136&view=diff
==============================================================================
--- incubator/lcf/trunk/framework/build.xml (original)
+++ incubator/lcf/trunk/framework/build.xml Sun Apr  1 15:30:29 2012
@@ -39,14 +39,14 @@
             <include name="commons-collections*.jar"/>
             <include name="commons-el*.jar"/>
             <include name="commons-fileupload*.jar"/>
-            <include name="commons-httpclient-mcf.jar"/>
+            <include name="commons-httpclient*.jar"/>
             <include name="commons-io*.jar"/>
             <include name="commons-lang*.jar"/>
             <include name="commons-logging*.jar"/>
-            <include name="eclipse*.jar"/>
+            <include name="ecj*.jar"/>
             <include name="jasper*.jar"/>
             <include name="jetty*.jar"/>
-            <include name="jdbcpool-0.99.jar"/>
+            <include name="jdbcpool*.jar"/>
             <include name="jsp-2.1*.jar"/>
             <include name="jsp-api*.jar"/>
             <include name="junit*.jar"/>
@@ -55,7 +55,7 @@
             <include name="servlet-api*.jar"/>
             <include name="tomcat-juli*.jar"/>
             <include name="xalan*.jar"/>
-            <include name="xercesImpl-mcf.jar"/>
+            <include name="xercesImpl*.jar"/>
             <include name="xml-apis*.jar"/>
             <include name="velocity*.jar"/>
         </fileset>
@@ -189,7 +189,7 @@
         </taskdef > 
         <!-- Compile jsp's to java -->
         <mkdir dir="build/crawler-ui/java"/>
-        <jasper2 validateXml="false" uriroot="crawler-ui/src/main/webapp" webXmlFragment="crawler-ui/src/main/webapp/WEB-INF/web-generated.xml" outputDir="build/crawler-ui/java" /> 
+        <jasper2 validateXml="false" uriroot="crawler-ui/src/main/webapp" webXmlFragment="build/crawler-ui/web-generated.xml" outputDir="build/crawler-ui/java" /> 
         <!-- Compile java classes -->
         <mkdir dir="build/crawler-ui/classes"/>
         <javac srcdir="build/crawler-ui/java" destdir="build/crawler-ui/classes" target="1.5" source="1.5" debug="true" debuglevel="lines,vars,source">
@@ -200,8 +200,8 @@
                 <pathelement location="build/ui-core/classes"/>
                 <pathelement location="build/agents/classes"/>
                 <pathelement location="build/pull-agent/classes"/>
-                <fileset dir="crawler-ui/src/main/webapp/WEB-INF/lib">
-                    <include name="*.jar"/> 
+                <fileset dir="../lib">
+                    <include name="jstl*.jar"/>
                 </fileset>
             </classpath>
 
@@ -253,15 +253,15 @@
                 <include name="commons-collections*.jar"/>
                 <include name="commons-el*.jar"/>
                 <include name="commons-fileupload*.jar"/>
-                <include name="commons-httpclient-mcf.jar"/>
+                <include name="commons-httpclient*.jar"/>
                 <include name="commons-io*.jar"/>
                 <include name="commons-lang*.jar"/>
                 <include name="commons-logging*.jar"/>
-                <include name="jdbcpool-0.99.jar"/>
+                <include name="jdbcpool*.jar"/>
                 <include name="log4j*.jar"/>
                 <include name="serializer*.jar"/>
                 <include name="xalan*.jar"/>
-                <include name="xercesImpl-mcf.jar"/>
+                <include name="xercesImpl*.jar"/>
                 <include name="xml-apis*.jar"/>
             </fileset>
             <fileset dir="../lib">
@@ -291,15 +291,15 @@
                 <include name="commons-collections*.jar"/>
                 <include name="commons-el*.jar"/>
                 <include name="commons-fileupload*.jar"/>
-                <include name="commons-httpclient-mcf.jar"/>
+                <include name="commons-httpclient*.jar"/>
                 <include name="commons-io*.jar"/>
                 <include name="commons-lang*.jar"/>
                 <include name="commons-logging*.jar"/>
-                <include name="jdbcpool-0.99.jar"/>
+                <include name="jdbcpool*.jar"/>
                 <include name="log4j*.jar"/>
                 <include name="serializer*.jar"/>
                 <include name="xalan*.jar"/>
-                <include name="xercesImpl-mcf.jar"/>
+                <include name="xercesImpl*.jar"/>
                 <include name="xml-apis*.jar"/>
             </fileset>
             <fileset dir="../lib">
@@ -334,15 +334,15 @@
                 <include name="commons-collections*.jar"/>
                 <include name="commons-el*.jar"/>
                 <include name="commons-fileupload*.jar"/>
-                <include name="commons-httpclient-mcf.jar"/>
+                <include name="commons-httpclient*.jar"/>
                 <include name="commons-io*.jar"/>
                 <include name="commons-lang*.jar"/>
                 <include name="commons-logging*.jar"/>
-                <include name="jdbcpool-0.99.jar"/>
+                <include name="jdbcpool*.jar"/>
                 <include name="log4j*.jar"/>
                 <include name="serializer*.jar"/>
                 <include name="xalan*.jar"/>
-                <include name="xercesImpl-mcf.jar"/>
+                <include name="xercesImpl*.jar"/>
                 <include name="xml-apis*.jar"/>
             </fileset>
             <fileset dir="../lib">
@@ -373,15 +373,15 @@
                 <include name="commons-collections*.jar"/>
                 <include name="commons-el*.jar"/>
                 <include name="commons-fileupload*.jar"/>
-                <include name="commons-httpclient-mcf.jar"/>
+                <include name="commons-httpclient*.jar"/>
                 <include name="commons-io*.jar"/>
                 <include name="commons-lang*.jar"/>
                 <include name="commons-logging*.jar"/>
-                <include name="jdbcpool-0.99.jar"/>
+                <include name="jdbcpool*.jar"/>
                 <include name="log4j*.jar"/>
                 <include name="serializer*.jar"/>
                 <include name="xalan*.jar"/>
-                <include name="xercesImpl-mcf.jar"/>
+                <include name="xercesImpl*.jar"/>
                 <include name="xml-apis*.jar"/>
             </fileset>
             <fileset dir="../lib">
@@ -409,8 +409,8 @@
     <target name="webapp-crawler-ui" depends="compile-crawler-ui,jar-core,jar-ui-core,jar-agents,jar-pull-agent">
         <mkdir dir="build/webapp/crawler-ui/WEB-INF/lib"/>
         <copy todir="build/webapp/crawler-ui/WEB-INF/lib">
-            <fileset dir="crawler-ui/src/main/webapp/WEB-INF/lib">
-                <include name="*.jar"/>
+            <fileset dir="../lib">
+                <include name="jstl*.jar"/>
             </fileset>
             <fileset dir="../build/jar">
                 <include name="json.jar"/>
@@ -420,15 +420,15 @@
                 <include name="commons-collections*.jar"/>
                 <include name="commons-el*.jar"/>
                 <include name="commons-fileupload*.jar"/>
-                <include name="commons-httpclient-mcf.jar"/>
+                <include name="commons-httpclient*.jar"/>
                 <include name="commons-io*.jar"/>
                 <include name="commons-lang*.jar"/>
                 <include name="commons-logging*.jar"/>
-                <include name="jdbcpool-0.99.jar"/>
+                <include name="jdbcpool*.jar"/>
                 <include name="log4j*.jar"/>
                 <include name="serializer*.jar"/>
                 <include name="xalan*.jar"/>
-                <include name="xercesImpl-mcf.jar"/>
+                <include name="xercesImpl*.jar"/>
                 <include name="xml-apis*.jar"/>
                 <include name="velocity*.jar"/>
             </fileset>
@@ -437,8 +437,6 @@
                 <include name="derby*.jar"/>
                 <include name="hsqldb*.jar"/>
             </fileset>
-        </copy>
-        <copy todir="build/webapp/crawler-ui/WEB-INF/lib">
             <fileset dir="build/jar">
                 <include name="mcf-core.jar"/>
                 <include name="mcf-agents.jar"/>
@@ -460,8 +458,8 @@
       <target name="webapp-crawler-ui-proprietary" depends="compile-crawler-ui,jar-core,jar-ui-core,jar-agents,jar-pull-agent">
         <mkdir dir="build/webapp/crawler-ui-proprietary/WEB-INF/lib"/>
         <copy todir="build/webapp/crawler-ui-proprietary/WEB-INF/lib">
-            <fileset dir="crawler-ui/src/main/webapp/WEB-INF/lib">
-                <include name="*.jar"/>
+            <fileset dir="../lib">
+                <include name="jstl*.jar"/>
             </fileset>
             <fileset dir="../build/jar">
                 <include name="json.jar"/>
@@ -471,15 +469,15 @@
                 <include name="commons-collections*.jar"/>
                 <include name="commons-el*.jar"/>
                 <include name="commons-fileupload*.jar"/>
-                <include name="commons-httpclient-mcf.jar"/>
+                <include name="commons-httpclient*.jar"/>
                 <include name="commons-io*.jar"/>
                 <include name="commons-lang*.jar"/>
                 <include name="commons-logging*.jar"/>
-                <include name="jdbcpool-0.99.jar"/>
+                <include name="jdbcpool*.jar"/>
                 <include name="log4j*.jar"/>
                 <include name="serializer*.jar"/>
                 <include name="xalan*.jar"/>
-                <include name="xercesImpl-mcf.jar"/>
+                <include name="xercesImpl*.jar"/>
                 <include name="xml-apis*.jar"/>
                 <include name="velocity*.jar"/>
             </fileset>
@@ -576,16 +574,16 @@
                 <include name="commons-collections*.jar"/>
                 <include name="commons-el*.jar"/>
                 <include name="commons-fileupload*.jar"/>
-                <include name="commons-httpclient-mcf.jar"/>
+                <include name="commons-httpclient*.jar"/>
                 <include name="commons-io*.jar"/>
                 <include name="commons-lang*.jar"/>
                 <include name="commons-logging*.jar"/>
-                <include name="jdbcpool-0.99.jar"/>
+                <include name="jdbcpool*.jar"/>
                 <include name="log4j*.jar"/>
                 <include name="serializer*.jar"/>
                 <include name="servlet-api*.jar"/>
                 <include name="xalan*.jar"/>
-                <include name="xercesImpl-mcf.jar"/>
+                <include name="xercesImpl*.jar"/>
                 <include name="xml-apis*.jar"/>
                 <include name="velocity*.jar"/>
             </fileset>
@@ -617,16 +615,16 @@
                 <include name="commons-collections*.jar"/>
                 <include name="commons-el*.jar"/>
                 <include name="commons-fileupload*.jar"/>
-                <include name="commons-httpclient-mcf.jar"/>
+                <include name="commons-httpclient*.jar"/>
                 <include name="commons-io*.jar"/>
                 <include name="commons-lang*.jar"/>
                 <include name="commons-logging*.jar"/>
-                <include name="jdbcpool-0.99.jar"/>
+                <include name="jdbcpool*.jar"/>
                 <include name="log4j*.jar"/>
                 <include name="serializer*.jar"/>
                 <include name="servlet-api*.jar"/>
                 <include name="xalan*.jar"/>
-                <include name="xercesImpl-mcf.jar"/>
+                <include name="xercesImpl*.jar"/>
                 <include name="xml-apis*.jar"/>
                 <include name="velocity*.jar"/>
             </fileset>
@@ -683,7 +681,7 @@
             <fileset dir="../lib">
                 <include name="jetty*.jar"/>
                 <include name="servlet-api*.jar"/>
-                <include name="eclipse*.jar"/>
+                <include name="ecj*.jar"/>
                 <include name="jasper*.jar"/>
                 <include name="tomcat-juli*.jar"/>
                 <include name="jsp-api*.jar"/>
@@ -724,7 +722,7 @@
             <fileset dir="../lib">
                 <include name="jetty*.jar"/>
                 <include name="servlet-api*.jar"/>
-                <include name="eclipse*.jar"/>
+                <include name="ecj*.jar"/>
                 <include name="jasper*.jar"/>
                 <include name="tomcat-juli*.jar"/>
                 <include name="jsp-api*.jar"/>
@@ -743,7 +741,7 @@
             <fileset dir="../lib">
                 <include name="commons-codec*.jar"/>
                 <include name="commons-collections*.jar"/>
-                <include name="commons-httpclient-mcf.jar"/>
+                <include name="commons-httpclient*.jar"/>
                 <include name="commons-io*.jar"/>
                 <include name="commons-lang*.jar"/>
                 <include name="commons-logging*.jar"/>
@@ -773,13 +771,13 @@
                 <include name="commons-collections*.jar"/>
                 <include name="commons-el*.jar"/>
                 <include name="commons-fileupload*.jar"/>
-                <include name="commons-httpclient-mcf.jar"/>
+                <include name="commons-httpclient*.jar"/>
                 <include name="commons-io*.jar"/>
                 <include name="commons-lang*.jar"/>
                 <include name="commons-logging*.jar"/>
-                <include name="eclipse*.jar"/>
+                <include name="ecj*.jar"/>
                 <include name="jasper*.jar"/>
-                <include name="jdbcpool-0.99.jar"/>
+                <include name="jdbcpool*.jar"/>
                 <include name="jetty*.jar"/>
                 <include name="jsp-api*.jar"/>
                 <include name="jsp-2.5*.jar"/>
@@ -788,7 +786,7 @@
                 <include name="servlet-api*.jar"/>
                 <include name="tomcat-juli*.jar"/>
                 <include name="xalan*.jar"/>
-                <include name="xercesImpl-mcf.jar"/>
+                <include name="xercesImpl*.jar"/>
                 <include name="xml-apis*.jar"/>
                 <include name="velocity*.jar"/>
             </fileset>
@@ -826,7 +824,7 @@
         <property name="manifest-cp-3" value="${manifest-cp-2} lib/commons-collections.jar"/>
         <property name="manifest-cp-4" value="${manifest-cp-3} lib/commons-el.jar"/>
         <property name="manifest-cp-5" value="${manifest-cp-4} lib/commons-fileupload.jar"/>
-        <property name="manifest-cp-6" value="${manifest-cp-5} lib/commons-httpclient-mcf.jar"/>
+        <property name="manifest-cp-6" value="${manifest-cp-5} lib/commons-httpclient.jar"/>
         <property name="manifest-cp-7" value="${manifest-cp-6} lib/commons-io.jar"/>
         <property name="manifest-cp-8" value="${manifest-cp-7} lib/commons-logging.jar"/>
         <property name="manifest-cp-9" value="${manifest-cp-8} lib/hsqldb.jar"/>
@@ -847,29 +845,29 @@
         <property name="manifest-cp-24" value="${manifest-cp-23} lib/derbyLocale_zh_TW.jar"/>
         <property name="manifest-cp-25" value="${manifest-cp-24} lib/derbyrun.jar"/>
         <property name="manifest-cp-26" value="${manifest-cp-25} lib/derbytools.jar"/>
-        <property name="manifest-cp-27" value="${manifest-cp-26} lib/jasper-6.0.24.jar"/>
-        <property name="manifest-cp-28" value="${manifest-cp-27} lib/jasper-el-6.0.24.jar"/>
-        <property name="manifest-cp-29" value="${manifest-cp-28} lib/jdbcpool-0.99.jar"/>
-        <property name="manifest-cp-30" value="${manifest-cp-29} lib/jetty-6.1.26-patched-JETTY-1340.jar"/>
-        <property name="manifest-cp-31" value="${manifest-cp-30} lib/jetty-util-6.1.26-patched-JETTY-1340.jar"/>
-        <property name="manifest-cp-32" value="${manifest-cp-31} lib/jsp-api-2.1-glassfish-2.1.v20091210.jar"/>
+        <property name="manifest-cp-27" value="${manifest-cp-26} lib/jasper.jar"/>
+        <property name="manifest-cp-28" value="${manifest-cp-27} lib/jasper-el.jar"/>
+        <property name="manifest-cp-29" value="${manifest-cp-28} lib/jdbcpool.jar"/>
+        <property name="manifest-cp-30" value="${manifest-cp-29} lib/jetty.jar"/>
+        <property name="manifest-cp-31" value="${manifest-cp-30} lib/jetty-util.jar"/>
+        <property name="manifest-cp-32" value="${manifest-cp-31} lib/jsp-api-2.1-glassfish.jar"/>
         <property name="manifest-cp-33" value="${manifest-cp-32} lib/json.jar"/>
         <property name="manifest-cp-34" value="${manifest-cp-33} lib/mcf-core.jar"/>
         <property name="manifest-cp-35" value="${manifest-cp-34} lib/mcf-agents.jar"/>
         <property name="manifest-cp-36" value="${manifest-cp-35} lib/mcf-jetty-runner.jar"/>
         <property name="manifest-cp-37" value="${manifest-cp-36} lib/mcf-pull-agent.jar"/>
         <property name="manifest-cp-38" value="${manifest-cp-37} lib/mcf-ui-core.jar"/>
-        <property name="manifest-cp-39" value="${manifest-cp-38} lib/log4j-1.2.jar"/>
+        <property name="manifest-cp-39" value="${manifest-cp-38} lib/log4j.jar"/>
         <property name="manifest-cp-40" value="${manifest-cp-39} lib/postgresql.jar"/>
         <property name="manifest-cp-42" value="${manifest-cp-39} lib/serializer.jar"/>
-        <property name="manifest-cp-43" value="${manifest-cp-42} lib/servlet-api-2.5-20081211.jar"/>
-        <property name="manifest-cp-44" value="${manifest-cp-43} lib/tomcat-juli-6.0.24.jar"/>
-        <property name="manifest-cp-45" value="${manifest-cp-44} lib/xalan2.jar"/>
-        <property name="manifest-cp-46" value="${manifest-cp-45} lib/xercesImpl-mcf.jar"/>
+        <property name="manifest-cp-43" value="${manifest-cp-42} lib/servlet-api.jar"/>
+        <property name="manifest-cp-44" value="${manifest-cp-43} lib/tomcat-juli.jar"/>
+        <property name="manifest-cp-45" value="${manifest-cp-44} lib/xalan.jar"/>
+        <property name="manifest-cp-46" value="${manifest-cp-45} lib/xercesImpl.jar"/>
         <property name="manifest-cp-47" value="${manifest-cp-46} lib/xml-apis.jar"/>
         <property name="manifest-cp-48" value="${manifest-cp-47} lib/derbynet.jar"/>
-        <property name="manifest-cp-49" value="${manifest-cp-48} lib/eclipse-ecj.jar"/>
-        <property name="manifest-cp-52" value="${manifest-cp-49} lib/velocity-1.7.jar"/>
+        <property name="manifest-cp-49" value="${manifest-cp-48} lib/ecj.jar"/>
+        <property name="manifest-cp-52" value="${manifest-cp-49} lib/velocity.jar"/>
         <property name="manifest-cp" value="${manifest-cp-52}"/>
         <mkdir dir="build/example"/>
         <manifest file="build/example/manifest">
@@ -892,13 +890,13 @@
                 <include name="commons-collections*.jar"/>
                 <include name="commons-el*.jar"/>
                 <include name="commons-fileupload*.jar"/>
-                <include name="commons-httpclient-mcf.jar"/>
+                <include name="commons-httpclient*.jar"/>
                 <include name="commons-io*.jar"/>
                 <include name="commons-lang*.jar"/>
                 <include name="commons-logging*.jar"/>
-                <include name="eclipse*.jar"/>
+                <include name="ecj*.jar"/>
                 <include name="jasper*.jar"/>
-                <include name="jdbcpool-0.99.jar"/>
+                <include name="jdbcpool*.jar"/>
                 <include name="jetty*.jar"/>
                 <include name="jsp-api*.jar"/>
                 <include name="jsp-2.5*.jar"/>
@@ -907,7 +905,7 @@
                 <include name="servlet-api*.jar"/>
                 <include name="tomcat-juli*.jar"/>
                 <include name="xalan*.jar"/>
-                <include name="xercesImpl-mcf.jar"/>
+                <include name="xercesImpl*.jar"/>
                 <include name="xml-apis*.jar"/>
                 <include name="velocity*.jar"/>
             </fileset>
@@ -950,7 +948,7 @@
         <property name="manifest-cp-proprietary-3" value="${manifest-cp-proprietary-2} lib/commons-collections.jar"/>
         <property name="manifest-cp-proprietary-4" value="${manifest-cp-proprietary-3} lib/commons-el.jar"/>
         <property name="manifest-cp-proprietary-5" value="${manifest-cp-proprietary-4} lib/commons-fileupload.jar"/>
-        <property name="manifest-cp-proprietary-6" value="${manifest-cp-proprietary-5} lib/commons-httpclient-mcf.jar"/>
+        <property name="manifest-cp-proprietary-6" value="${manifest-cp-proprietary-5} lib/commons-httpclient.jar"/>
         <property name="manifest-cp-proprietary-7" value="${manifest-cp-proprietary-6} lib/commons-io.jar"/>
         <property name="manifest-cp-proprietary-8" value="${manifest-cp-proprietary-7} lib/commons-logging.jar"/>
         <property name="manifest-cp-proprietary-9" value="${manifest-cp-proprietary-8} lib/hsqldb.jar"/>
@@ -971,32 +969,32 @@
         <property name="manifest-cp-proprietary-24" value="${manifest-cp-proprietary-23} lib/derbyLocale_zh_TW.jar"/>
         <property name="manifest-cp-proprietary-25" value="${manifest-cp-proprietary-24} lib/derbyrun.jar"/>
         <property name="manifest-cp-proprietary-26" value="${manifest-cp-proprietary-25} lib/derbytools.jar"/>
-        <property name="manifest-cp-proprietary-27" value="${manifest-cp-proprietary-26} lib/jasper-6.0.24.jar"/>
-        <property name="manifest-cp-proprietary-28" value="${manifest-cp-proprietary-27} lib/jasper-el-6.0.24.jar"/>
-        <property name="manifest-cp-proprietary-29" value="${manifest-cp-proprietary-28} lib/jdbcpool-0.99.jar"/>
-        <property name="manifest-cp-proprietary-30" value="${manifest-cp-proprietary-29} lib/jetty-6.1.26-patched-JETTY-1340.jar"/>
-        <property name="manifest-cp-proprietary-31" value="${manifest-cp-proprietary-30} lib/jetty-util-6.1.26-patched-JETTY-1340.jar"/>
-        <property name="manifest-cp-proprietary-32" value="${manifest-cp-proprietary-31} lib/jsp-api-2.1-glassfish-2.1.v20091210.jar"/>
+        <property name="manifest-cp-proprietary-27" value="${manifest-cp-proprietary-26} lib/jasper.jar"/>
+        <property name="manifest-cp-proprietary-28" value="${manifest-cp-proprietary-27} lib/jasper-el.jar"/>
+        <property name="manifest-cp-proprietary-29" value="${manifest-cp-proprietary-28} lib/jdbcpool.jar"/>
+        <property name="manifest-cp-proprietary-30" value="${manifest-cp-proprietary-29} lib/jetty.jar"/>
+        <property name="manifest-cp-proprietary-31" value="${manifest-cp-proprietary-30} lib/jetty-util.jar"/>
+        <property name="manifest-cp-proprietary-32" value="${manifest-cp-proprietary-31} lib/jsp-api-2.1-glassfish.jar"/>
         <property name="manifest-cp-proprietary-33" value="${manifest-cp-proprietary-32} lib/json.jar"/>
         <property name="manifest-cp-proprietary-34" value="${manifest-cp-proprietary-33} lib/mcf-core.jar"/>
         <property name="manifest-cp-proprietary-35" value="${manifest-cp-proprietary-34} lib/mcf-agents.jar"/>
         <property name="manifest-cp-proprietary-36" value="${manifest-cp-proprietary-35} lib/mcf-jetty-runner.jar"/>
         <property name="manifest-cp-proprietary-37" value="${manifest-cp-proprietary-36} lib/mcf-pull-agent.jar"/>
         <property name="manifest-cp-proprietary-38" value="${manifest-cp-proprietary-37} lib/mcf-ui-core.jar"/>
-        <property name="manifest-cp-proprietary-39" value="${manifest-cp-proprietary-38} lib/log4j-1.2.jar"/>
+        <property name="manifest-cp-proprietary-39" value="${manifest-cp-proprietary-38} lib/log4j.jar"/>
         <property name="manifest-cp-proprietary-40" value="${manifest-cp-proprietary-39} lib/postgresql.jar"/>
         <property name="manifest-cp-proprietary-41" value="${manifest-cp-proprietary-40} lib/mysql-connector-java.jar"/>
         <property name="manifest-cp-proprietary-42" value="${manifest-cp-proprietary-41} lib/serializer.jar"/>
-        <property name="manifest-cp-proprietary-43" value="${manifest-cp-proprietary-42} lib/servlet-api-2.5-20081211.jar"/>
-        <property name="manifest-cp-proprietary-44" value="${manifest-cp-proprietary-43} lib/tomcat-juli-6.0.24.jar"/>
-        <property name="manifest-cp-proprietary-45" value="${manifest-cp-proprietary-44} lib/xalan2.jar"/>
-        <property name="manifest-cp-proprietary-46" value="${manifest-cp-proprietary-45} lib/xercesImpl-mcf.jar"/>
+        <property name="manifest-cp-proprietary-43" value="${manifest-cp-proprietary-42} lib/servlet-api.jar"/>
+        <property name="manifest-cp-proprietary-44" value="${manifest-cp-proprietary-43} lib/tomcat-juli.jar"/>
+        <property name="manifest-cp-proprietary-45" value="${manifest-cp-proprietary-44} lib/xalan.jar"/>
+        <property name="manifest-cp-proprietary-46" value="${manifest-cp-proprietary-45} lib/xercesImpl.jar"/>
         <property name="manifest-cp-proprietary-47" value="${manifest-cp-proprietary-46} lib/xml-apis.jar"/>
         <property name="manifest-cp-proprietary-48" value="${manifest-cp-proprietary-47} lib/derbynet.jar"/>
-        <property name="manifest-cp-proprietary-49" value="${manifest-cp-proprietary-48} lib/eclipse-ecj.jar"/>
+        <property name="manifest-cp-proprietary-49" value="${manifest-cp-proprietary-48} lib/ecj.jar"/>
         <property name="manifest-cp-proprietary-50" value="${manifest-cp-proprietary-49} lib/ojdbc.jar"/>
         <property name="manifest-cp-proprietary-51" value="${manifest-cp-proprietary-50} lib/jtds.jar"/>
-        <property name="manifest-cp-proprietary-52" value="${manifest-cp-proprietary-51} lib/velocity-1.7.jar"/>
+        <property name="manifest-cp-proprietary-52" value="${manifest-cp-proprietary-51} lib/velocity.jar"/>
         <property name="manifest-cp-proprietary" value="${manifest-cp-proprietary-52}"/>
         <mkdir dir="build/example-proprietary"/>
         <manifest file="build/example-proprietary/manifest">

Modified: incubator/lcf/trunk/framework/core/pom.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/framework/core/pom.xml?rev=1308136&r1=1308135&r2=1308136&view=diff
==============================================================================
--- incubator/lcf/trunk/framework/core/pom.xml (original)
+++ incubator/lcf/trunk/framework/core/pom.xml Sun Apr  1 15:30:29 2012
@@ -58,17 +58,17 @@
     <dependency>
       <groupId>log4j</groupId>
       <artifactId>log4j</artifactId>
-      <version>1.2.16</version>
+      <version>${log4j.version}</version>
     </dependency>
     <dependency>
       <groupId>com.bitmechanic</groupId>
       <artifactId>jdbcpool</artifactId>
-      <version>0.99</version>
+      <version>${jdbcpool.version}</version>
     </dependency>
     <dependency>
       <groupId>org.json</groupId>
       <artifactId>json</artifactId>
-      <version>20090211</version>
+      <version>${json.version}</version>
     </dependency>
     <dependency>
       <groupId>junit</groupId>
@@ -79,7 +79,7 @@
     <dependency>
       <groupId>org.apache.velocity</groupId>
       <artifactId>velocity</artifactId>
-      <version>1.7</version>
+      <version>${velocity.version}</version>
     </dependency>
   </dependencies>
 </project>

Modified: incubator/lcf/trunk/framework/crawler-ui/pom.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/framework/crawler-ui/pom.xml?rev=1308136&r1=1308135&r2=1308136&view=diff
==============================================================================
--- incubator/lcf/trunk/framework/crawler-ui/pom.xml (original)
+++ incubator/lcf/trunk/framework/crawler-ui/pom.xml Sun Apr  1 15:30:29 2012
@@ -55,27 +55,33 @@
     <dependency>
       <groupId>javax.servlet</groupId>
       <artifactId>servlet-api</artifactId>
-      <version>2.5</version>
+      <version>${servlet-api.version}</version>
       <scope>provided</scope>
     </dependency>
 
     <!-- runtime dependencies -->
     <dependency>
+      <groupId>jstl</groupId>
+      <artifactId>jstl</artifactId>
+      <version>${jstl.version}</version>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
       <groupId>commons-io</groupId>
       <artifactId>commons-io</artifactId>
-      <version>2.0.1</version>
+      <version>${commons-io.version}</version>
       <scope>runtime</scope>
     </dependency>
     <dependency>
       <groupId>commons-codec</groupId>
       <artifactId>commons-codec</artifactId>
-      <version>1.5</version>
+      <version>${commons-codec.version}</version>
       <scope>runtime</scope>
     </dependency>
     <dependency>
       <groupId>commons-el</groupId>
       <artifactId>commons-el</artifactId>
-      <version>1.0</version>
+      <version>${commons-el.version}</version>
       <scope>runtime</scope>
       <exclusions>
         <exclusion>
@@ -86,58 +92,58 @@
     </dependency>
     <dependency>
       <groupId>commons-httpclient</groupId>
-      <artifactId>commons-httpclient-mcf</artifactId>
-      <version>3.1</version>
+      <artifactId>commons-httpclient</artifactId>
+      <version>${commons-httpclient.version}</version>
       <scope>runtime</scope>
     </dependency>
     <dependency>
       <groupId>commons-collections</groupId>
       <artifactId>commons-collections</artifactId>
-      <version>3.2.1</version>
+      <version>${commons-collections.version}</version>
       <scope>runtime</scope>
     </dependency>
     <dependency>
       <groupId>commons-fileupload</groupId>
       <artifactId>commons-fileupload</artifactId>
-      <version>1.2.2</version>
+      <version>${commons-fileupload.version}</version>
       <scope>runtime</scope>
     </dependency>
     <dependency>
       <groupId>xalan</groupId>
       <artifactId>serializer</artifactId>
-      <version>2.7.1</version>
+      <version>${xalan.version}</version>
       <scope>runtime</scope>
     </dependency>
     <dependency>
       <groupId>xerces</groupId>
-      <artifactId>xercesImpl-mcf</artifactId>
-      <version>2.9.1</version>
+      <artifactId>xercesImpl</artifactId>
+      <version>${xerces.version}</version>
       <scope>runtime</scope>
     </dependency>
     <dependency>
       <groupId>commons-logging</groupId>
       <artifactId>commons-logging</artifactId>
-      <version>1.1.1</version>
+      <version>${commons-logging.version}</version>
       <scope>runtime</scope>
     </dependency>
-
+    
     <!-- database dependencies -->
     <dependency>
       <groupId>org.apache.derby</groupId>
       <artifactId>derby</artifactId>
-      <version>10.7.1.1</version>
+      <version>${derby.version}</version>
       <scope>runtime</scope>
     </dependency>
     <dependency>
       <groupId>org.hsqldb</groupId>
       <artifactId>hsqldb</artifactId>
-      <version>2.2.4</version>
+      <version>${hsqldb.version}</version>
       <scope>runtime</scope>
     </dependency>
     <dependency>
       <groupId>postgresql</groupId>
       <artifactId>postgresql</artifactId>
-      <version>8.4-702.jdbc4</version>
+      <version>${postgresql.version}</version>
       <scope>runtime</scope>
     </dependency>
     <dependency>
@@ -151,7 +157,7 @@
     <dependency>
       <groupId>net.sourceforge.jtds</groupId>
       <artifactId>jtds</artifactId>
-      <version>1.2.4</version>
+      <version>${jtds.version}</version>
       <scope>runtime</scope>
     </dependency>
 

Modified: incubator/lcf/trunk/framework/jetty-runner/pom.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/framework/jetty-runner/pom.xml?rev=1308136&r1=1308135&r2=1308136&view=diff
==============================================================================
--- incubator/lcf/trunk/framework/jetty-runner/pom.xml (original)
+++ incubator/lcf/trunk/framework/jetty-runner/pom.xml Sun Apr  1 15:30:29 2012
@@ -206,7 +206,7 @@
     <dependency>
       <groupId>javax.servlet</groupId>
       <artifactId>servlet-api</artifactId>
-      <version>2.5</version>
+      <version>${servlet-api.version}</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
@@ -217,17 +217,17 @@
     <dependency>
       <groupId>org.mortbay.jetty</groupId>
       <artifactId>jsp-api-2.1</artifactId>
-      <version>6.1.14</version>
+      <version>${jsp-api-2.1.version}</version>
     </dependency>    
     <dependency>
       <groupId>javax.servlet.jsp</groupId>
       <artifactId>jsp-api</artifactId>
-      <version>2.1</version>
+      <version>${jsp-api.version}</version>
     </dependency>
     <dependency>
       <groupId>org.mortbay.jetty</groupId>
       <artifactId>jsp-2.1-glassfish</artifactId>
-      <version>2.1.v20091210</version>
+      <version>${jsp-2.1-glassfish.version}</version>
     </dependency>
 
     <!-- databases -->
@@ -242,7 +242,7 @@
     <dependency>
       <groupId>net.sourceforge.jtds</groupId>
       <artifactId>jtds</artifactId>
-      <version>1.2.4</version>
+      <version>${jtds.version}</version>
       <scope>runtime</scope>
     </dependency>
     <dependency>
@@ -262,25 +262,25 @@
     <dependency>
       <groupId>commons-lang</groupId>
       <artifactId>commons-lang</artifactId>
-      <version>2.6</version>
+      <version>${commons-lang.version}</version>
       <scope>runtime</scope>
     </dependency>
     <dependency>
       <groupId>commons-io</groupId>
       <artifactId>commons-io</artifactId>
-      <version>2.0.1</version>
+      <version>${commons-io.version}</version>
       <scope>runtime</scope>
     </dependency>
     <dependency>
       <groupId>commons-codec</groupId>
       <artifactId>commons-codec</artifactId>
-      <version>1.5</version>
+      <version>${commons-codec.version}</version>
       <scope>runtime</scope>
     </dependency>
     <dependency>
       <groupId>commons-el</groupId>
       <artifactId>commons-el</artifactId>
-      <version>1.0</version>
+      <version>${commons-el.version}</version>
       <scope>runtime</scope>
       <exclusions>
         <exclusion>
@@ -291,38 +291,38 @@
     </dependency>
     <dependency>
       <groupId>commons-httpclient</groupId>
-      <artifactId>commons-httpclient-mcf</artifactId>
-      <version>3.1</version>
+      <artifactId>commons-httpclient</artifactId>
+      <version>${commons-httpclient.version}</version>
       <scope>runtime</scope>
     </dependency>
     <dependency>
       <groupId>commons-collections</groupId>
       <artifactId>commons-collections</artifactId>
-      <version>3.2.1</version>
+      <version>${commons-collections.version}</version>
       <scope>runtime</scope>
     </dependency>
     <dependency>
       <groupId>commons-fileupload</groupId>
       <artifactId>commons-fileupload</artifactId>
-      <version>1.2.2</version>
+      <version>${commons-fileupload.version}</version>
       <scope>runtime</scope>
     </dependency>
     <dependency>
       <groupId>xalan</groupId>
       <artifactId>serializer</artifactId>
-      <version>2.7.1</version>
+      <version>${xalan.version}</version>
       <scope>runtime</scope>
     </dependency>
     <dependency>
       <groupId>xerces</groupId>
-      <artifactId>xercesImpl-mcf</artifactId>
-      <version>2.9.1</version>
+      <artifactId>xercesImpl</artifactId>
+      <version>${xerces.version}</version>
       <scope>runtime</scope>
     </dependency>
     <dependency>
       <groupId>commons-logging</groupId>
       <artifactId>commons-logging</artifactId>
-      <version>1.1.1</version>
+      <version>${commons-logging.version}</version>
       <scope>runtime</scope>
     </dependency>
     

Modified: incubator/lcf/trunk/framework/pull-agent/pom.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/framework/pull-agent/pom.xml?rev=1308136&r1=1308135&r2=1308136&view=diff
==============================================================================
--- incubator/lcf/trunk/framework/pull-agent/pom.xml (original)
+++ incubator/lcf/trunk/framework/pull-agent/pom.xml Sun Apr  1 15:30:29 2012
@@ -84,38 +84,38 @@
     <dependency>
       <groupId>org.mortbay.jetty</groupId>
       <artifactId>jsp-api-2.1</artifactId>
-      <version>6.1.14</version>
+      <version>${jsp-api-2.1.version}</version>
       <scope>test</scope>
     </dependency>    
     <dependency>
       <groupId>javax.servlet.jsp</groupId>
       <artifactId>jsp-api</artifactId>
-      <version>2.1</version>
+      <version>${jsp-api.version}</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.mortbay.jetty</groupId>
       <artifactId>jsp-2.1-glassfish</artifactId>
-      <version>2.1.v20091210</version>
+      <version>${jsp-2.1-glassfish.version}</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>commons-httpclient</groupId>
-      <artifactId>commons-httpclient-mcf</artifactId>
-      <version>3.1</version>
+      <artifactId>commons-httpclient</artifactId>
+      <version>${commons-httpclient.version}</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>commons-logging</groupId>
       <artifactId>commons-logging</artifactId>
-      <version>1.1.1</version>
+      <version>${commons-logging.version}</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>commons-codec</groupId>
       <artifactId>commons-codec</artifactId>
-      <version>1.5</version>
+      <version>${commons-codec.version}</version>
       <scope>test</scope>
     </dependency>
 

Modified: incubator/lcf/trunk/framework/ui-core/pom.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/framework/ui-core/pom.xml?rev=1308136&r1=1308135&r2=1308136&view=diff
==============================================================================
--- incubator/lcf/trunk/framework/ui-core/pom.xml (original)
+++ incubator/lcf/trunk/framework/ui-core/pom.xml Sun Apr  1 15:30:29 2012
@@ -65,13 +65,13 @@
     <dependency>
       <groupId>javax.servlet</groupId>
       <artifactId>servlet-api</artifactId>
-      <version>2.5</version>
+      <version>${servlet-api.version}</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>javax.servlet.jsp</groupId>
       <artifactId>jsp-api</artifactId>
-      <version>2.1</version>
+      <version>${jsp-api.version}</version>
       <scope>provided</scope>
     </dependency>
 
@@ -79,22 +79,22 @@
      <dependency>
         <groupId>commons-lang</groupId>
         <artifactId>commons-lang</artifactId>
-        <version>2.6</version>
+        <version>${commons-lang.version}</version>
     </dependency>
     <dependency>
       <groupId>commons-fileupload</groupId>
       <artifactId>commons-fileupload</artifactId>
-      <version>1.2.2</version>
+      <version>${commons-fileupload.version}</version>
     </dependency>
     <dependency>
-      <groupId>org.apache.commons</groupId>
+      <groupId>commons-io</groupId>
       <artifactId>commons-io</artifactId>
-      <version>1.3.2</version>
+      <version>${commons-io.version}</version>
     </dependency>
     <dependency>
       <groupId>org.apache.velocity</groupId>
       <artifactId>velocity</artifactId>
-      <version>1.7</version>
+      <version>${velocity.version}</version>
     </dependency>
   </dependencies>
 </project>
\ No newline at end of file

Modified: incubator/lcf/trunk/mvn-bootstrap.bat
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/mvn-bootstrap.bat?rev=1308136&r1=1308135&r2=1308136&view=diff
==============================================================================
--- incubator/lcf/trunk/mvn-bootstrap.bat (original)
+++ incubator/lcf/trunk/mvn-bootstrap.bat Sun Apr  1 15:30:29 2012
@@ -16,16 +16,13 @@ rem limitations under the License.
 
 cmd /c ant download-dependencies
 
-cmd /c mvn install:install-file -Dfile=lib/jdbcpool-0.99.jar -DgroupId=com.bitmechanic -DartifactId=jdbcpool -Dversion=0.99 -Dpackaging=jar
-cmd /c mvn install:install-file -Dfile=lib/hsqldb.jar -DgroupId=org.hsqldb -DartifactId=hsqldb -Dversion=2.2.6.12-04-2011 -Dpackaging=jar
+cmd /c mvn install:install-file -Dfile=lib/jdbcpool.jar -DgroupId=com.bitmechanic -DartifactId=jdbcpool -Dversion=0.99 -Dpackaging=jar
 
-cmd /c mvn install:install-file -Dfile=lib/commons-httpclient-mcf.jar -DgroupId=commons-httpclient -DartifactId=commons-httpclient-mcf -Dversion=3.1  -Dpackaging=jar
-cmd /c mvn install:install-file -Dfile=lib/xercesImpl-mcf.jar -DgroupId=xerces -DartifactId=xercesImpl-mcf -Dversion=2.9.1  -Dpackaging=jar
+cmd /c mvn install:install-file -Dfile=lib/commons-httpclient.jar -DgroupId=commons-httpclient -DartifactId=commons-httpclient -Dversion=3.1-mcf-1  -Dpackaging=jar
+cmd /c mvn install:install-file -Dfile=lib/xercesImpl.jar -DgroupId=xerces -DartifactId=xercesImpl -Dversion=2.9.1-mcf-1  -Dpackaging=jar
 cmd /c mvn install:install-file -Dfile=connectors/jcifs/lib-proprietary/jcifs.jar -DgroupId=org.samba.jcifs -DartifactId=jcifs -Dversion=1.3.17  -Dpackaging=jar
 
-cmd /c mvn install:install-file -Dfile=lib/chemistry-opencmis-server-inmemory.war -DgroupId=org.apache.chemistry.opencmis -DartifactId=chemistry-opencmis-server-inmemory -Dversion=0.6.0 -Dpackaging=war
-
-cmd /c mvn install:install-file -Dfile=lib/opensaml-1.0.1.jar -DgroupId=org.opensaml -DartifactId=opensaml -Dversion=1.0.1 -Dpackaging=jar
-cmd /c mvn install:install-file -Dfile=lib/xmlsec-1.4.1.jar -DgroupId=xml-security -DartifactId=xmlsec -Dversion=1.4.1 -Dpackaging=jar
+cmd /c mvn install:install-file -Dfile=lib/opensaml.jar -DgroupId=org.opensaml -DartifactId=opensaml -Dversion=1.0.1 -Dpackaging=jar
+cmd /c mvn install:install-file -Dfile=lib/xmlsec.jar -DgroupId=xml-security -DartifactId=xmlsec -Dversion=1.4.1 -Dpackaging=jar
 
 echo Dependencies installed

Modified: incubator/lcf/trunk/mvn-bootstrap.sh
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/mvn-bootstrap.sh?rev=1308136&r1=1308135&r2=1308136&view=diff
==============================================================================
--- incubator/lcf/trunk/mvn-bootstrap.sh (original)
+++ incubator/lcf/trunk/mvn-bootstrap.sh Sun Apr  1 15:30:29 2012
@@ -23,16 +23,13 @@
 
 ant download-dependencies
 
-mvn install:install-file -Dfile=lib/jdbcpool-0.99.jar -DgroupId=com.bitmechanic -DartifactId=jdbcpool -Dversion=0.99 -Dpackaging=jar
-mvn install:install-file -Dfile=lib/hsqldb.jar -DgroupId=org.hsqldb -DartifactId=hsqldb -Dversion=2.2.6.12-04-2011 -Dpackaging=jar
+mvn install:install-file -Dfile=lib/jdbcpool.jar -DgroupId=com.bitmechanic -DartifactId=jdbcpool -Dversion=0.99 -Dpackaging=jar
 
-mvn install:install-file -Dfile=lib/commons-httpclient-mcf.jar -DgroupId=commons-httpclient -DartifactId=commons-httpclient-mcf -Dversion=3.1  -Dpackaging=jar
-mvn install:install-file -Dfile=lib/xercesImpl-mcf.jar -DgroupId=xerces -DartifactId=xercesImpl-mcf -Dversion=2.9.1  -Dpackaging=jar
+mvn install:install-file -Dfile=lib/commons-httpclient.jar -DgroupId=commons-httpclient -DartifactId=commons-httpclient -Dversion=3.1-mcf-1  -Dpackaging=jar
+mvn install:install-file -Dfile=lib/xercesImpl.jar -DgroupId=xerces -DartifactId=xercesImpl -Dversion=2.9.1-mcf-1  -Dpackaging=jar
 mvn install:install-file -Dfile=connectors/jcifs/lib-proprietary/jcifs.jar -DgroupId=org.samba.jcifs -DartifactId=jcifs -Dversion=1.3.17  -Dpackaging=jar
 
-mvn install:install-file -Dfile=lib/chemistry-opencmis-server-inmemory.war -DgroupId=org.apache.chemistry.opencmis -DartifactId=chemistry-opencmis-server-inmemory -Dversion=0.6.0 -Dpackaging=war
-
-mvn install:install-file -Dfile=lib/opensaml-1.0.1.jar -DgroupId=org.opensaml -DartifactId=opensaml -Dversion=1.0.1 -Dpackaging=jar
-mvn install:install-file -Dfile=lib/xmlsec-1.4.1.jar -DgroupId=xml-security -DartifactId=xmlsec -Dversion=1.4.1 -Dpackaging=jar
+mvn install:install-file -Dfile=lib/opensaml.jar -DgroupId=org.opensaml -DartifactId=opensaml -Dversion=1.0.1 -Dpackaging=jar
+mvn install:install-file -Dfile=lib/xmlsec.jar -DgroupId=xml-security -DartifactId=xmlsec -Dversion=1.4.1 -Dpackaging=jar
 
 echo "Dependencies installed"

Modified: incubator/lcf/trunk/pom.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/pom.xml?rev=1308136&r1=1308135&r2=1308136&view=diff
==============================================================================
--- incubator/lcf/trunk/pom.xml (original)
+++ incubator/lcf/trunk/pom.xml Sun Apr  1 15:30:29 2012
@@ -38,11 +38,31 @@
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <!-- dependency versions -->
     <junit.version>4.8.2</junit.version>
-    <postgresql.version>8.4-702.jdbc4</postgresql.version>
+    <postgresql.version>9.1-901.jdbc4</postgresql.version>
     <mysql.version>5.1.18</mysql.version>
-    <hsqldb.version>2.2.6.12-04-2011</hsqldb.version>
-    <derby.version>10.7.1.1</derby.version>
+    <hsqldb.version>2.2.8</hsqldb.version>
+    <derby.version>10.8.2.2</derby.version>
     <jetty.version>6.1.26</jetty.version>
+    <commons-codec.version>1.5</commons-codec.version>
+    <commons-io.version>2.0.1</commons-io.version>
+    <commons-logging.version>1.1.1</commons-logging.version>
+    <commons-collections.version>3.2.1</commons-collections.version>
+    <commons-fileupload.version>1.2.2</commons-fileupload.version>
+    <commons-httpclient.version>3.1-mcf-1</commons-httpclient.version>
+    <commons-el.version>1.0</commons-el.version>
+    <commons-lang.version>2.6</commons-lang.version>
+    <xalan.version>2.7.1</xalan.version>
+    <xerces.version>2.9.1-mcf-1</xerces.version>
+    <jtds.version>1.2.4</jtds.version>
+    <servlet-api.version>2.5</servlet-api.version>
+    <jstl.version>1.2</jstl.version>
+    <jsp-api-2.1.version>6.1.14</jsp-api-2.1.version>
+    <jsp-api.version>2.1</jsp-api.version>
+    <jsp-2.1-glassfish.version>2.1.v20091210</jsp-2.1-glassfish.version>
+    <log4j.version>1.2.16</log4j.version>
+    <jdbcpool.version>0.99</jdbcpool.version>
+    <json.version>20090211</json.version>
+    <velocity.version>1.7</velocity.version>
   </properties>
 
   <modules>
@@ -71,6 +91,9 @@
         <configuration>
           <source>1.5</source>
           <target>1.5</target>
+          <fork>true</fork>
+          <meminitial>128m</meminitial>
+          <maxmem>512m</maxmem>
         </configuration>
       </plugin>
       <plugin>

Modified: incubator/lcf/trunk/site/build.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/site/build.xml?rev=1308136&r1=1308135&r2=1308136&view=diff
==============================================================================
--- incubator/lcf/trunk/site/build.xml (original)
+++ incubator/lcf/trunk/site/build.xml Sun Apr  1 15:30:29 2012
@@ -265,7 +265,11 @@
     
     <target name="download-dependencies" depends="download-dejavu-fonts,download-ipa-fonts">
     </target>
-    
+
+    <target name="download-cleanup">
+        <delete dir="fonts"/>
+    </target>
+
     <target name="all" depends="dist"/>
     
 </project>

Modified: incubator/lcf/trunk/tests/alfresco/pom.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/tests/alfresco/pom.xml?rev=1308136&r1=1308135&r2=1308136&view=diff
==============================================================================
--- incubator/lcf/trunk/tests/alfresco/pom.xml (original)
+++ incubator/lcf/trunk/tests/alfresco/pom.xml Sun Apr  1 15:30:29 2012
@@ -212,17 +212,17 @@
     <dependency>
       <groupId>org.mortbay.jetty</groupId>
       <artifactId>jsp-api-2.1</artifactId>
-      <version>6.1.14</version>
+      <version>${jsp-api-2.1.version}</version>
     </dependency>    
     <dependency>
       <groupId>javax.servlet.jsp</groupId>
       <artifactId>jsp-api</artifactId>
-      <version>2.1</version>
+      <version>${jsp-api.version}</version>
     </dependency>
     <dependency>
       <groupId>org.mortbay.jetty</groupId>
       <artifactId>jsp-2.1-glassfish</artifactId>
-      <version>2.1.v20091210</version>
+      <version>${jsp-2.1-glassfish.version}</version>
     </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
@@ -277,30 +277,19 @@
     </dependency>
     <dependency>
       <groupId>commons-httpclient</groupId>
-      <artifactId>commons-httpclient-mcf</artifactId>
-      <version>3.1</version>
+      <artifactId>commons-httpclient</artifactId>
+      <version>${commons-httpclient.version}</version>
     </dependency>
     <dependency>
       <groupId>commons-logging</groupId>
       <artifactId>commons-logging</artifactId>
-      <version>1.1.1</version>
+      <version>${commons-logging.version}</version>
     </dependency>
     <dependency>
       <groupId>commons-codec</groupId>
       <artifactId>commons-codec</artifactId>
-      <version>1.5</version>
+      <version>${commons-codec.version}</version>
     </dependency>
 
-    <!-- Apache Chemistry dependencies -->
-    <dependency>
-      <groupId>org.apache.chemistry.opencmis</groupId>
-      <artifactId>chemistry-opencmis-client-impl</artifactId>
-      <version>0.5.0</version>
-  </dependency>
-  <dependency>
-      <groupId>commons-lang</groupId>
-      <artifactId>commons-lang</artifactId>
-      <version>2.6</version>
-  </dependency>
   </dependencies>
 </project>
\ No newline at end of file

Modified: incubator/lcf/trunk/tests/cmis/pom.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/tests/cmis/pom.xml?rev=1308136&r1=1308135&r2=1308136&view=diff
==============================================================================
--- incubator/lcf/trunk/tests/cmis/pom.xml (original)
+++ incubator/lcf/trunk/tests/cmis/pom.xml Sun Apr  1 15:30:29 2012
@@ -196,17 +196,17 @@
     <dependency>
       <groupId>org.mortbay.jetty</groupId>
       <artifactId>jsp-api-2.1</artifactId>
-      <version>6.1.14</version>
+      <version>${jsp-api-2.1.version}</version>
     </dependency>    
     <dependency>
       <groupId>javax.servlet.jsp</groupId>
       <artifactId>jsp-api</artifactId>
-      <version>2.1</version>
+      <version>${jsp-api.version}</version>
     </dependency>
     <dependency>
       <groupId>org.mortbay.jetty</groupId>
       <artifactId>jsp-2.1-glassfish</artifactId>
-      <version>2.1.v20091210</version>
+      <version>${jsp-2.1-glassfish.version}</version>
     </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
@@ -261,18 +261,18 @@
     </dependency>
     <dependency>
       <groupId>commons-httpclient</groupId>
-      <artifactId>commons-httpclient-mcf</artifactId>
-      <version>3.1</version>
+      <artifactId>commons-httpclient</artifactId>
+      <version>${commons-httpclient.version}</version>
     </dependency>
     <dependency>
       <groupId>commons-logging</groupId>
       <artifactId>commons-logging</artifactId>
-      <version>1.1.1</version>
+      <version>${commons-logging.version}</version>
     </dependency>
     <dependency>
       <groupId>commons-codec</groupId>
       <artifactId>commons-codec</artifactId>
-      <version>1.5</version>
+      <version>${commons-codec.version}</version>
     </dependency>
 
     <!-- Apache Chemistry dependencies -->

Modified: incubator/lcf/trunk/tests/elasticsearch/pom.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/tests/elasticsearch/pom.xml?rev=1308136&r1=1308135&r2=1308136&view=diff
==============================================================================
--- incubator/lcf/trunk/tests/elasticsearch/pom.xml (original)
+++ incubator/lcf/trunk/tests/elasticsearch/pom.xml Sun Apr  1 15:30:29 2012
@@ -211,17 +211,17 @@
     <dependency>
       <groupId>org.mortbay.jetty</groupId>
       <artifactId>jsp-api-2.1</artifactId>
-      <version>6.1.14</version>
+      <version>${jsp-api-2.1.version}</version>
     </dependency>    
     <dependency>
       <groupId>javax.servlet.jsp</groupId>
       <artifactId>jsp-api</artifactId>
-      <version>2.1</version>
+      <version>${jsp-api.version}</version>
     </dependency>
     <dependency>
       <groupId>org.mortbay.jetty</groupId>
       <artifactId>jsp-2.1-glassfish</artifactId>
-      <version>2.1.v20091210</version>
+      <version>${jsp-2.1-glassfish.version}</version>
     </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
@@ -276,18 +276,18 @@
     </dependency>
     <dependency>
       <groupId>commons-httpclient</groupId>
-      <artifactId>commons-httpclient-mcf</artifactId>
-      <version>3.1</version>
+      <artifactId>commons-httpclient</artifactId>
+      <version>${commons-httpclient.version}</version>
     </dependency>
     <dependency>
       <groupId>commons-logging</groupId>
       <artifactId>commons-logging</artifactId>
-      <version>1.1.1</version>
+      <version>${commons-logging.version}</version>
     </dependency>
     <dependency>
       <groupId>commons-codec</groupId>
       <artifactId>commons-codec</artifactId>
-      <version>1.5</version>
+      <version>${commons-codec.version}</version>
     </dependency>
 
     <!-- Apache Chemistry dependencies -->
@@ -304,9 +304,9 @@
     
     <!-- Elastic Search dependencies -->
     <dependency>
-	    <groupId>org.elasticsearch</groupId>
-	    <artifactId>elasticsearch</artifactId>
-	    <version>0.19.0</version>
+      <groupId>org.elasticsearch</groupId>
+      <artifactId>elasticsearch</artifactId>
+      <version>0.19.0</version>
     </dependency>
     <dependency>
       <groupId>org.apache.lucene</groupId>
@@ -346,4 +346,4 @@
       <version>1.2.0</version>
     </dependency>
   </dependencies>
-</project>
\ No newline at end of file
+</project>

Modified: incubator/lcf/trunk/tests/filesystem/pom.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/tests/filesystem/pom.xml?rev=1308136&r1=1308135&r2=1308136&view=diff
==============================================================================
--- incubator/lcf/trunk/tests/filesystem/pom.xml (original)
+++ incubator/lcf/trunk/tests/filesystem/pom.xml Sun Apr  1 15:30:29 2012
@@ -167,17 +167,17 @@
     <dependency>
       <groupId>org.mortbay.jetty</groupId>
       <artifactId>jsp-api-2.1</artifactId>
-      <version>6.1.14</version>
+      <version>${jsp-api-2.1.version}</version>
     </dependency>    
     <dependency>
       <groupId>javax.servlet.jsp</groupId>
       <artifactId>jsp-api</artifactId>
-      <version>2.1</version>
+      <version>${jsp-api.version}</version>
     </dependency>
     <dependency>
       <groupId>org.mortbay.jetty</groupId>
       <artifactId>jsp-2.1-glassfish</artifactId>
-      <version>2.1.v20091210</version>
+      <version>${jsp-2.1-glassfish.version}</version>
     </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
@@ -232,18 +232,18 @@
     </dependency>
     <dependency>
       <groupId>commons-httpclient</groupId>
-      <artifactId>commons-httpclient-mcf</artifactId>
-      <version>3.1</version>
+      <artifactId>commons-httpclient</artifactId>
+      <version>${commons-httpclient.version}</version>
     </dependency>
     <dependency>
       <groupId>commons-logging</groupId>
       <artifactId>commons-logging</artifactId>
-      <version>1.1.1</version>
+      <version>${commons-logging.version}</version>
     </dependency>
     <dependency>
       <groupId>commons-codec</groupId>
       <artifactId>commons-codec</artifactId>
-      <version>1.5</version>
+      <version>${commons-codec.version}</version>
     </dependency>
   </dependencies>
 </project>
\ No newline at end of file

Modified: incubator/lcf/trunk/tests/rss/pom.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/tests/rss/pom.xml?rev=1308136&r1=1308135&r2=1308136&view=diff
==============================================================================
--- incubator/lcf/trunk/tests/rss/pom.xml (original)
+++ incubator/lcf/trunk/tests/rss/pom.xml Sun Apr  1 15:30:29 2012
@@ -161,17 +161,17 @@
     <dependency>
       <groupId>org.mortbay.jetty</groupId>
       <artifactId>jsp-api-2.1</artifactId>
-      <version>6.1.14</version>
+      <version>${jsp-api-2.1.version}</version>
     </dependency>    
     <dependency>
       <groupId>javax.servlet.jsp</groupId>
       <artifactId>jsp-api</artifactId>
-      <version>2.1</version>
+      <version>${jsp-api.version}</version>
     </dependency>
     <dependency>
       <groupId>org.mortbay.jetty</groupId>
       <artifactId>jsp-2.1-glassfish</artifactId>
-      <version>2.1.v20091210</version>
+      <version>${jsp-2.1-glassfish.version}</version>
     </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
@@ -226,18 +226,18 @@
     </dependency>
     <dependency>
       <groupId>commons-httpclient</groupId>
-      <artifactId>commons-httpclient-mcf</artifactId>
-      <version>3.1</version>
+      <artifactId>commons-httpclient</artifactId>
+      <version>${commons-httpclient.version}</version>
     </dependency>
     <dependency>
       <groupId>commons-logging</groupId>
       <artifactId>commons-logging</artifactId>
-      <version>1.1.1</version>
+      <version>${commons-logging.version}</version>
     </dependency>
     <dependency>
       <groupId>commons-codec</groupId>
       <artifactId>commons-codec</artifactId>
-      <version>1.5</version>
+      <version>${commons-codec.version}</version>
     </dependency>
   </dependencies>
 </project>
\ No newline at end of file

Modified: incubator/lcf/trunk/tests/sharepoint/pom.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/tests/sharepoint/pom.xml?rev=1308136&r1=1308135&r2=1308136&view=diff
==============================================================================
--- incubator/lcf/trunk/tests/sharepoint/pom.xml (original)
+++ incubator/lcf/trunk/tests/sharepoint/pom.xml Sun Apr  1 15:30:29 2012
@@ -93,18 +93,18 @@
     </dependency>
     <dependency>
       <groupId>commons-httpclient</groupId>
-      <artifactId>commons-httpclient-mcf</artifactId>
-      <version>3.1</version>
+      <artifactId>commons-httpclient</artifactId>
+      <version>${commons-httpclient.version}</version>
     </dependency>
     <dependency>
       <groupId>commons-logging</groupId>
       <artifactId>commons-logging</artifactId>
-      <version>1.1.1</version>
+      <version>${commons-logging.version}</version>
     </dependency>
     <dependency>
       <groupId>commons-codec</groupId>
       <artifactId>commons-codec</artifactId>
-      <version>1.5</version>
+      <version>${commons-codec.version}</version>
     </dependency>
   </dependencies>
 </project>
\ No newline at end of file

Modified: incubator/lcf/trunk/tests/test-build.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/tests/test-build.xml?rev=1308136&r1=1308135&r2=1308136&view=diff
==============================================================================
--- incubator/lcf/trunk/tests/test-build.xml (original)
+++ incubator/lcf/trunk/tests/test-build.xml Sun Apr  1 15:30:29 2012
@@ -37,14 +37,14 @@
             <include name="commons-collections*.jar"/>
             <include name="commons-el*.jar"/>
             <include name="commons-fileupload*.jar"/>
-            <include name="commons-httpclient-mcf.jar"/>
+            <include name="commons-httpclient*.jar"/>
             <include name="commons-io*.jar"/>
             <include name="commons-lang*.jar"/>
             <include name="commons-logging*.jar"/>
-            <include name="eclipse*.jar"/>
+            <include name="ecj*.jar"/>
             <include name="jasper*.jar"/>
             <include name="jetty*.jar"/>
-            <include name="jdbcpool-0.99.jar"/>
+            <include name="jdbcpool*.jar"/>
             <include name="jsp-2.1*.jar"/>
             <include name="jsp-api*.jar"/>
             <include name="junit*.jar"/>
@@ -53,7 +53,7 @@
             <include name="servlet-api*.jar"/>
             <include name="tomcat-juli*.jar"/>
             <include name="xalan*.jar"/>
-            <include name="xercesImpl-mcf.jar"/>
+            <include name="xercesImpl*.jar"/>
             <include name="xml-apis*.jar"/>
             <include name="velocity*.jar"/>
         </fileset>

Modified: incubator/lcf/trunk/tests/wiki/pom.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/tests/wiki/pom.xml?rev=1308136&r1=1308135&r2=1308136&view=diff
==============================================================================
--- incubator/lcf/trunk/tests/wiki/pom.xml (original)
+++ incubator/lcf/trunk/tests/wiki/pom.xml Sun Apr  1 15:30:29 2012
@@ -162,22 +162,22 @@
     <dependency>
       <groupId>org.mortbay.jetty</groupId>
       <artifactId>jsp-api-2.1</artifactId>
-      <version>6.1.14</version>
+      <version>${jsp-api-2.1.version}</version>
     </dependency>    
     <dependency>
       <groupId>javax.servlet.jsp</groupId>
       <artifactId>jsp-api</artifactId>
-      <version>2.1</version>
+      <version>${jsp-api.version}</version>
     </dependency>
     <dependency>
       <groupId>org.mortbay.jetty</groupId>
       <artifactId>jsp-2.1-glassfish</artifactId>
-      <version>2.1.v20091210</version>
+      <version>${jsp-2.1-glassfish.version}</version>
     </dependency>
     <dependency>
       <groupId>xerces</groupId>
-      <artifactId>xercesImpl-mcf</artifactId>
-      <version>2.9.1</version>
+      <artifactId>xercesImpl</artifactId>
+      <version>${xerces.version}</version>
     </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
@@ -232,18 +232,18 @@
     </dependency>
     <dependency>
       <groupId>commons-httpclient</groupId>
-      <artifactId>commons-httpclient-mcf</artifactId>
-      <version>3.1</version>
+      <artifactId>commons-httpclient</artifactId>
+      <version>${commons-httpclient.version}</version>
     </dependency>
     <dependency>
       <groupId>commons-logging</groupId>
       <artifactId>commons-logging</artifactId>
-      <version>1.1.1</version>
+      <version>${commons-logging.version}</version>
     </dependency>
     <dependency>
       <groupId>commons-codec</groupId>
       <artifactId>commons-codec</artifactId>
-      <version>1.5</version>
+      <version>${commons-codec.version}</version>
     </dependency>
   </dependencies>
 </project>
\ No newline at end of file



Mime
View raw message