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 2011/08/09 03:39:22 UTC
svn commit: r1155186 - in /incubator/lcf/trunk:
framework/jetty-runner/pom.xml
site/src/documentation/content/xdocs/how-to-build-and-deploy.xml
tests/cmis/pom.xml tests/filesystem/pom.xml tests/sharepoint/pom.xml
Author: kwright
Date: Tue Aug 9 01:39:22 2011
New Revision: 1155186
URL: http://svn.apache.org/viewvc?rev=1155186&view=rev
Log:
Fix a bunch of broken maven dependencies and also make the cmis war deployment automatic during tests.
Modified:
incubator/lcf/trunk/framework/jetty-runner/pom.xml
incubator/lcf/trunk/site/src/documentation/content/xdocs/how-to-build-and-deploy.xml
incubator/lcf/trunk/tests/cmis/pom.xml
incubator/lcf/trunk/tests/filesystem/pom.xml
incubator/lcf/trunk/tests/sharepoint/pom.xml
Modified: incubator/lcf/trunk/framework/jetty-runner/pom.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/framework/jetty-runner/pom.xml?rev=1155186&r1=1155185&r2=1155186&view=diff
==============================================================================
--- incubator/lcf/trunk/framework/jetty-runner/pom.xml (original)
+++ incubator/lcf/trunk/framework/jetty-runner/pom.xml Tue Aug 9 01:39:22 2011
@@ -97,23 +97,45 @@
</plugins>
</build>
- <dependencies>
- <!-- Internal dependencies -->
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>mcf-core</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>mcf-agents</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>mcf-pull-agent</artifactId>
- <version>${project.version}</version>
- </dependency>
+ <dependencies>
+ <!-- Internal dependencies -->
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>mcf-api-service</artifactId>
+ <version>${project.version}</version>
+ <type>war</type>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>mcf-authority-service</artifactId>
+ <version>${project.version}</version>
+ <type>war</type>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>mcf-crawler-ui</artifactId>
+ <version>${project.version}</version>
+ <type>war</type>
+ <scope>runtime</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>mcf-core</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>mcf-agents</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>mcf-pull-agent</artifactId>
+ <version>${project.version}</version>
+ </dependency>
<!-- output connectors -->
<dependency>
@@ -148,6 +170,12 @@
<version>${project.version}</version>
<scope>runtime</scope>
</dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>mcf-cmis-connector</artifactId>
+ <version>${project.version}</version>
+ <scope>runtime</scope>
+ </dependency>
<!-- repository connectors -->
<dependency>
@@ -204,7 +232,7 @@
</dependency>
<!-- database -->
- <dependency>
+ <dependency>
<groupId>org.apache.derby</groupId>
<artifactId>derby</artifactId>
<version>${derby.version}</version>
Modified: incubator/lcf/trunk/site/src/documentation/content/xdocs/how-to-build-and-deploy.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/site/src/documentation/content/xdocs/how-to-build-and-deploy.xml?rev=1155186&r1=1155185&r2=1155186&view=diff
==============================================================================
--- incubator/lcf/trunk/site/src/documentation/content/xdocs/how-to-build-and-deploy.xml (original)
+++ incubator/lcf/trunk/site/src/documentation/content/xdocs/how-to-build-and-deploy.xml Tue Aug 9 01:39:22 2011
@@ -237,6 +237,7 @@ cd webservice/Package
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/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/chemistry-opencmis-server-inmemory-war-0.5.0-SNAPSHOT.war -DgroupId=org.apache.chemistry.opencmis -DartifactId=chemistry-opencmis-server-inmemory-war -Dversion=0.5.0-SNAPSHOT -Dpackaging=war
mvn install:install-file -Dfile=connectors/jcifs/jcifs/jcifs.jar -DgroupId=org.samba.jcifs -DartifactId=jcifs -Dversion=1.3.16 -Dpackaging=jar
</source>
</section>
Modified: incubator/lcf/trunk/tests/cmis/pom.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/tests/cmis/pom.xml?rev=1155186&r1=1155185&r2=1155186&view=diff
==============================================================================
--- incubator/lcf/trunk/tests/cmis/pom.xml (original)
+++ incubator/lcf/trunk/tests/cmis/pom.xml Tue Aug 9 01:39:22 2011
@@ -37,11 +37,7 @@
<artifactId>mcf-cmis-test</artifactId>
<name>ManifoldCF - Test - CMIS</name>
-
- <properties>
- <opencmis.server.war.path>/Users/piergiorgiolucidi/Documents/workspaces/manifold/CONNECTORS-236/lib</opencmis.server.war.path>
- </properties>
-
+
<build>
<defaultGoal>test</defaultGoal>
<plugins>
@@ -58,6 +54,13 @@
<outputDirectory>target/dependency</outputDirectory>
<artifactItems>
<artifactItem>
+ <groupId>org.apache.chemistry.opencmis</groupId>
+ <artifactId>chemistry-opencmis-server-inmemory-war</artifactId>
+ <version>0.5.0-SNAPSHOT</version>
+ <type>war</type>
+ <overWrite>false</overWrite>
+ </artifactItem>
+ <artifactItem>
<groupId>${project.groupId}</groupId>
<artifactId>mcf-api-service</artifactId>
<version>${project.version}</version>
@@ -91,15 +94,43 @@
<crawlerWarPath>target/dependency/mcf-crawler-ui-${project.version}.war</crawlerWarPath>
<authorityserviceWarPath>target/dependency/mcf-authority-service-${project.version}.war</authorityserviceWarPath>
<apiWarPath>target/dependency/mcf-api-service-${project.version}.war</apiWarPath>
- <openCmisServerWarPath>${opencmis.server.war.path}/chemistry-opencmis-server-inmemory-war-0.5.0-SNAPSHOT.war</openCmisServerWarPath>
+ <openCmisServerWarPath>target/dependency/chemistry-opencmis-server-inmemory-war-0.5.0-SNAPSHOT.war</openCmisServerWarPath>
</systemPropertyVariables>
</configuration>
</plugin>
- </plugins>
+ </plugins>
</build>
<dependencies>
<!-- Internal dependencies -->
<dependency>
+ <groupId>org.apache.chemistry.opencmis</groupId>
+ <artifactId>chemistry-opencmis-server-inmemory-war</artifactId>
+ <version>0.5.0-SNAPSHOT</version>
+ <type>war</type>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>mcf-api-service</artifactId>
+ <version>${project.version}</version>
+ <type>war</type>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>mcf-authority-service</artifactId>
+ <version>${project.version}</version>
+ <type>war</type>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>mcf-crawler-ui</artifactId>
+ <version>${project.version}</version>
+ <type>war</type>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
<groupId>${project.groupId}</groupId>
<artifactId>mcf-jettyrunner</artifactId>
<version>${project.version}</version>
@@ -209,7 +240,7 @@
<dependency>
<groupId>org.apache.chemistry.opencmis</groupId>
<artifactId>chemistry-opencmis-client-impl</artifactId>
- <version>0.5.0-SNAPSHOT</version>
+ <version>0.4.0</version>
</dependency>
<dependency>
<groupId>commons-lang</groupId>
Modified: incubator/lcf/trunk/tests/filesystem/pom.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/tests/filesystem/pom.xml?rev=1155186&r1=1155185&r2=1155186&view=diff
==============================================================================
--- incubator/lcf/trunk/tests/filesystem/pom.xml (original)
+++ incubator/lcf/trunk/tests/filesystem/pom.xml Tue Aug 9 01:39:22 2011
@@ -89,6 +89,28 @@
<!-- Internal dependencies -->
<dependency>
<groupId>${project.groupId}</groupId>
+ <artifactId>mcf-api-service</artifactId>
+ <version>${project.version}</version>
+ <type>war</type>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>mcf-authority-service</artifactId>
+ <version>${project.version}</version>
+ <type>war</type>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>mcf-crawler-ui</artifactId>
+ <version>${project.version}</version>
+ <type>war</type>
+ <scope>runtime</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>${project.groupId}</groupId>
<artifactId>mcf-core</artifactId>
<version>${project.version}</version>
</dependency>
Modified: incubator/lcf/trunk/tests/sharepoint/pom.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/tests/sharepoint/pom.xml?rev=1155186&r1=1155185&r2=1155186&view=diff
==============================================================================
--- incubator/lcf/trunk/tests/sharepoint/pom.xml (original)
+++ incubator/lcf/trunk/tests/sharepoint/pom.xml Tue Aug 9 01:39:22 2011
@@ -33,6 +33,28 @@
<!-- Internal dependencies -->
<dependency>
<groupId>${project.groupId}</groupId>
+ <artifactId>mcf-api-service</artifactId>
+ <version>${project.version}</version>
+ <type>war</type>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>mcf-authority-service</artifactId>
+ <version>${project.version}</version>
+ <type>war</type>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>mcf-crawler-ui</artifactId>
+ <version>${project.version}</version>
+ <type>war</type>
+ <scope>runtime</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>${project.groupId}</groupId>
<artifactId>mcf-core</artifactId>
<version>${project.version}</version>
</dependency>