You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@manifoldcf.apache.org by kw...@apache.org on 2013/02/08 15:38:04 UTC
svn commit: r1444028 - in /manifoldcf/branches/release-1.1-branch: ./
connectors/jcifs/ framework/ framework/combined-service/ tests/filesystem/
tests/rss/ tests/webcrawler/
Author: kwright
Date: Fri Feb 8 14:37:48 2013
New Revision: 1444028
URL: http://svn.apache.org/r1444028
Log:
Pull up fixes for CONNECTORS-632 and CONNECTORS-636 from trunk.
Added:
manifoldcf/branches/release-1.1-branch/framework/combined-service/pom.xml
- copied, changed from r1441022, manifoldcf/trunk/framework/combined-service/pom.xml
Modified:
manifoldcf/branches/release-1.1-branch/ (props changed)
manifoldcf/branches/release-1.1-branch/CHANGES.txt
manifoldcf/branches/release-1.1-branch/connectors/jcifs/build.xml
manifoldcf/branches/release-1.1-branch/connectors/jcifs/pom.xml
manifoldcf/branches/release-1.1-branch/framework/pom.xml
manifoldcf/branches/release-1.1-branch/mvn-bootstrap.bat
manifoldcf/branches/release-1.1-branch/mvn-bootstrap.sh
manifoldcf/branches/release-1.1-branch/tests/filesystem/pom.xml
manifoldcf/branches/release-1.1-branch/tests/rss/pom.xml
manifoldcf/branches/release-1.1-branch/tests/webcrawler/pom.xml
Propchange: manifoldcf/branches/release-1.1-branch/
------------------------------------------------------------------------------
Merged /manifoldcf/trunk:r1440900,1441022,1441028,1441288-1441289,1441362,1441389,1441404
Modified: manifoldcf/branches/release-1.1-branch/CHANGES.txt
URL: http://svn.apache.org/viewvc/manifoldcf/branches/release-1.1-branch/CHANGES.txt?rev=1444028&r1=1444027&r2=1444028&view=diff
==============================================================================
--- manifoldcf/branches/release-1.1-branch/CHANGES.txt (original)
+++ manifoldcf/branches/release-1.1-branch/CHANGES.txt Fri Feb 8 14:37:48 2013
@@ -7,6 +7,10 @@ CONNECTORS-638: Fix issue with database
connection expiration.
(Erlend Garåsen, Maciej Li¿ewski, Karl Wright)
+CONNECTORS-632: Get mvn-bootstrap scripts working again as
+intended.
+(Maciej Li¿ewski, Karl Wright)
+
======================= Release 1.1 =====================
CONNECTORS-630: Work around SolrJ paramname encoding bug.
Modified: manifoldcf/branches/release-1.1-branch/connectors/jcifs/build.xml
URL: http://svn.apache.org/viewvc/manifoldcf/branches/release-1.1-branch/connectors/jcifs/build.xml?rev=1444028&r1=1444027&r2=1444028&view=diff
==============================================================================
--- manifoldcf/branches/release-1.1-branch/connectors/jcifs/build.xml (original)
+++ manifoldcf/branches/release-1.1-branch/connectors/jcifs/build.xml Fri Feb 8 14:37:48 2013
@@ -44,7 +44,13 @@
<target name="download-jcifs">
<property name="jcifs-version" value="1.3.17"/>
- <get src="http://jcifs.samba.org/src/jcifs-${jcifs-version}.jar" dest="lib-proprietary/jcifs.jar"/>
+ <antcall target="download-via-maven">
+ <param name="project-path" value="jcifs"/>
+ <param name="artifact-version" value="${jcifs-version}"/>
+ <param name="target" value="lib-proprietary"/>
+ <param name="artifact-name" value="jcifs"/>
+ <param name="artifact-type" value="jar"/>
+ </antcall>
</target>
<target name="download-dependencies" depends="download-jcifs"/>
Modified: manifoldcf/branches/release-1.1-branch/connectors/jcifs/pom.xml
URL: http://svn.apache.org/viewvc/manifoldcf/branches/release-1.1-branch/connectors/jcifs/pom.xml?rev=1444028&r1=1444027&r2=1444028&view=diff
==============================================================================
--- manifoldcf/branches/release-1.1-branch/connectors/jcifs/pom.xml (original)
+++ manifoldcf/branches/release-1.1-branch/connectors/jcifs/pom.xml Fri Feb 8 14:37:48 2013
@@ -79,7 +79,7 @@
<!-- try installing manually from http://jcifs.samba.org if not available
in your repository -->
<dependency>
- <groupId>org.samba.jcifs</groupId>
+ <groupId>jcifs</groupId>
<artifactId>jcifs</artifactId>
<version>1.3.17</version>
</dependency>
Copied: manifoldcf/branches/release-1.1-branch/framework/combined-service/pom.xml (from r1441022, manifoldcf/trunk/framework/combined-service/pom.xml)
URL: http://svn.apache.org/viewvc/manifoldcf/branches/release-1.1-branch/framework/combined-service/pom.xml?p2=manifoldcf/branches/release-1.1-branch/framework/combined-service/pom.xml&p1=manifoldcf/trunk/framework/combined-service/pom.xml&r1=1441022&r2=1444028&rev=1444028&view=diff
==============================================================================
--- manifoldcf/trunk/framework/combined-service/pom.xml (original)
+++ manifoldcf/branches/release-1.1-branch/framework/combined-service/pom.xml Fri Feb 8 14:37:48 2013
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.manifoldcf</groupId>
<artifactId>mcf-framework</artifactId>
- <version>1.1-SNAPSHOT</version>
+ <version>1.2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -61,6 +61,13 @@
<version>${project.version}</version>
</dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>mcf-crawler-ui</artifactId>
+ <version>${project.version}</version>
+ <type>war</type>
+ </dependency>
+
<!-- web dependencies -->
<dependency>
<groupId>javax.servlet</groupId>
@@ -101,9 +108,9 @@
</exclusions>
</dependency>
<dependency>
- <groupId>commons-httpclient</groupId>
- <artifactId>commons-httpclient</artifactId>
- <version>${commons-httpclient.version}</version>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpclient</artifactId>
+ <version>${httpcomponent.version}</version>
<scope>runtime</scope>
</dependency>
<dependency>
@@ -173,4 +180,34 @@
</dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-war-plugin</artifactId>
+ <configuration>
+ <overlays>
+ <overlay>
+ <groupId>org.apache.manifoldcf</groupId>
+ <artifactId>mcf-crawler-ui</artifactId>
+ <type>war</type>
+ <includes>
+ <include>*.jsp</include>
+ </includes>
+ <targetPath>/</targetPath>
+ </overlay>
+ <overlay>
+ <groupId>org.apache.manifoldcf</groupId>
+ <artifactId>mcf-crawler-ui</artifactId>
+ <type>war</type>
+ <includes>
+ <include>WEB-INF/jsp/*</include>
+ </includes>
+ <targetPath>/</targetPath>
+ </overlay>
+ </overlays>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
</project>
\ No newline at end of file
Modified: manifoldcf/branches/release-1.1-branch/framework/pom.xml
URL: http://svn.apache.org/viewvc/manifoldcf/branches/release-1.1-branch/framework/pom.xml?rev=1444028&r1=1444027&r2=1444028&view=diff
==============================================================================
--- manifoldcf/branches/release-1.1-branch/framework/pom.xml (original)
+++ manifoldcf/branches/release-1.1-branch/framework/pom.xml Fri Feb 8 14:37:48 2013
@@ -42,6 +42,7 @@
<module>api-service</module>
<module>crawler-ui</module>
<module>script-engine</module>
+ <module>combined-service</module>
</modules>
</project>
\ No newline at end of file
Modified: manifoldcf/branches/release-1.1-branch/mvn-bootstrap.bat
URL: http://svn.apache.org/viewvc/manifoldcf/branches/release-1.1-branch/mvn-bootstrap.bat?rev=1444028&r1=1444027&r2=1444028&view=diff
==============================================================================
--- manifoldcf/branches/release-1.1-branch/mvn-bootstrap.bat (original)
+++ manifoldcf/branches/release-1.1-branch/mvn-bootstrap.bat Fri Feb 8 14:37:48 2013
@@ -14,16 +14,9 @@ rem WITHOUT WARRANTIES OR CONDITIONS OF
rem See the License for the specific language governing permissions and
rem limitations under the License.
-cmd /c ant make-deps
-
-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/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/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
-cmd /c mvn install:install-file -Dfile=lib/hsqldb.jar -DgroupId=org.hsqldb -DartifactId=hsqldb -Dversion=2.2.9 -Dpackaging=jar
-
echo Dependencies installed
Modified: manifoldcf/branches/release-1.1-branch/mvn-bootstrap.sh
URL: http://svn.apache.org/viewvc/manifoldcf/branches/release-1.1-branch/mvn-bootstrap.sh?rev=1444028&r1=1444027&r2=1444028&view=diff
==============================================================================
--- manifoldcf/branches/release-1.1-branch/mvn-bootstrap.sh (original)
+++ manifoldcf/branches/release-1.1-branch/mvn-bootstrap.sh Fri Feb 8 14:37:48 2013
@@ -21,16 +21,9 @@
# Created: Wednesday, September 21 2011 by Alex Ott
#
-ant make-deps
-
-mvn install:install-file -Dfile=lib/jdbcpool.jar -DgroupId=com.bitmechanic -DartifactId=jdbcpool -Dversion=0.99 -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/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
-mvn install:install-file -Dfile=lib/hsqldb.jar -DgroupId=org.hsqldb -DartifactId=hsqldb -Dversion=2.2.9 -Dpackaging=jar
-
echo "Dependencies installed"
Modified: manifoldcf/branches/release-1.1-branch/tests/filesystem/pom.xml
URL: http://svn.apache.org/viewvc/manifoldcf/branches/release-1.1-branch/tests/filesystem/pom.xml?rev=1444028&r1=1444027&r2=1444028&view=diff
==============================================================================
--- manifoldcf/branches/release-1.1-branch/tests/filesystem/pom.xml (original)
+++ manifoldcf/branches/release-1.1-branch/tests/filesystem/pom.xml Fri Feb 8 14:37:48 2013
@@ -59,6 +59,13 @@
</artifactItem>
<artifactItem>
<groupId>${project.groupId}</groupId>
+ <artifactId>mcf-combined-service</artifactId>
+ <version>${project.version}</version>
+ <type>war</type>
+ <overWrite>false</overWrite>
+ </artifactItem>
+ <artifactItem>
+ <groupId>${project.groupId}</groupId>
<artifactId>mcf-crawler-ui</artifactId>
<version>${project.version}</version>
<type>war</type>
@@ -79,6 +86,7 @@
<crawlerWarPath>../dependency/mcf-crawler-ui-${project.version}.war</crawlerWarPath>
<authorityserviceWarPath>../dependency/mcf-authority-service-${project.version}.war</authorityserviceWarPath>
<apiWarPath>../dependency/mcf-api-service-${project.version}.war</apiWarPath>
+ <combinedWarPath>../dependency/mcf-combined-service-${project.version}.war</apiWarPath>
</systemPropertyVariables>
<excludes>
<exclude>**/*Postgresql*.java</exclude>
@@ -121,6 +129,12 @@
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
+ <artifactId>mcf-combined-service</artifactId>
+ <version>${project.version}</version>
+ <type>war</type>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
<artifactId>mcf-crawler-ui</artifactId>
<version>${project.version}</version>
<type>war</type>
Modified: manifoldcf/branches/release-1.1-branch/tests/rss/pom.xml
URL: http://svn.apache.org/viewvc/manifoldcf/branches/release-1.1-branch/tests/rss/pom.xml?rev=1444028&r1=1444027&r2=1444028&view=diff
==============================================================================
--- manifoldcf/branches/release-1.1-branch/tests/rss/pom.xml (original)
+++ manifoldcf/branches/release-1.1-branch/tests/rss/pom.xml Fri Feb 8 14:37:48 2013
@@ -59,6 +59,13 @@
</artifactItem>
<artifactItem>
<groupId>${project.groupId}</groupId>
+ <artifactId>mcf-combined-service</artifactId>
+ <version>${project.version}</version>
+ <type>war</type>
+ <overWrite>false</overWrite>
+ </artifactItem>
+ <artifactItem>
+ <groupId>${project.groupId}</groupId>
<artifactId>mcf-crawler-ui</artifactId>
<version>${project.version}</version>
<type>war</type>
@@ -79,6 +86,7 @@
<crawlerWarPath>../dependency/mcf-crawler-ui-${project.version}.war</crawlerWarPath>
<authorityserviceWarPath>../dependency/mcf-authority-service-${project.version}.war</authorityserviceWarPath>
<apiWarPath>../dependency/mcf-api-service-${project.version}.war</apiWarPath>
+ <combinedWarPath>../dependency/mcf-combined-service-${project.version}.war</apiWarPath>
</systemPropertyVariables>
<excludes>
<exclude>**/*Postgresql*.java</exclude>
@@ -121,6 +129,12 @@
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
+ <artifactId>mcf-combined-service</artifactId>
+ <version>${project.version}</version>
+ <type>war</type>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
<artifactId>mcf-crawler-ui</artifactId>
<version>${project.version}</version>
<type>war</type>
Modified: manifoldcf/branches/release-1.1-branch/tests/webcrawler/pom.xml
URL: http://svn.apache.org/viewvc/manifoldcf/branches/release-1.1-branch/tests/webcrawler/pom.xml?rev=1444028&r1=1444027&r2=1444028&view=diff
==============================================================================
--- manifoldcf/branches/release-1.1-branch/tests/webcrawler/pom.xml (original)
+++ manifoldcf/branches/release-1.1-branch/tests/webcrawler/pom.xml Fri Feb 8 14:37:48 2013
@@ -143,7 +143,7 @@
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>mcf-rss-connector</artifactId>
+ <artifactId>mcf-web-connector</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>