Menu
▾
▴
[Archive-access-cvs] SF.net SVN: archive-access: [1592] trunk/archive-access/projects/nutchwax
|
From: <sta...@us...> - 2007-03-20 00:29:12
|
Revision: 1592
http://archive-access.svn.sourceforge.net/archive-access/?rev=1592&view=rev
Author: stack-sf
Date: 2007-03-19 17:29:13 -0700 (Mon, 19 Mar 2007)
Log Message:
-----------
D src/web
Moved under nutchwax-war.
D nutchwax-war/src/main/assembly/placeholder.xml
A nutchwax-war/src/main/assembly/assemble-war.xml
A nutchwax-war/src/main/webapp
A nutchwax-war/src/main/webapp/WEB-INF
Added from src/web
M nutchwax-war/pom.xml
Change target packaging to be war.
Modified Paths:
--------------
trunk/archive-access/projects/nutchwax/nutchwax-war/pom.xml
Added Paths:
-----------
trunk/archive-access/projects/nutchwax/nutchwax-war/src/main/assembly/assemble-war.xml
trunk/archive-access/projects/nutchwax/nutchwax-war/src/main/webapp/
trunk/archive-access/projects/nutchwax/nutchwax-war/src/main/webapp/WEB-INF/
Removed Paths:
-------------
trunk/archive-access/projects/nutchwax/nutchwax-war/src/main/assembly/placeholder.xml
trunk/archive-access/projects/nutchwax/src/web/
Modified: trunk/archive-access/projects/nutchwax/nutchwax-war/pom.xml
===================================================================
--- trunk/archive-access/projects/nutchwax/nutchwax-war/pom.xml 2007-03-19 19:11:31 UTC (rev 1591)
+++ trunk/archive-access/projects/nutchwax/nutchwax-war/pom.xml 2007-03-20 00:29:13 UTC (rev 1592)
@@ -29,72 +29,20 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.archive.nutchwax</groupId>
<artifactId>nutchwax-war</artifactId>
- <packaging>pom</packaging>
+ <packaging>war</packaging>
<name>NutchWAX Webapp</name>
- <build>
- <plugins>
- <plugin>
- <!-- NOTE: We don't need a groupId specification because the group is
- org.apache.maven.plugins ...which is assumed by default.
- -->
- <artifactId>maven-assembly-plugin</artifactId>
- <configuration>
- <descriptors>
- <descriptor>
- src/main/assembly/placeholder.xml
- </descriptor>
- </descriptors>
- <appendAssemblyId>
- false
- </appendAssemblyId>
- </configuration>
- <executions>
- <execution>
- <phase>package</phase>
- <goals>
- <goal>attached</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <artifactId>maven-antrun-plugin</artifactId>
- <executions>
- <execution>
- <id>antrun.package</id>
- <phase>package</phase>
- <configuration>
- <tasks>
- <echo>Assembling Job JAR</echo>
- <ant dir=".." target="war"/>
- <copy file="../target/nutchwax-webapp-${project.version}.war" overwrite="true"
- verbose="true" tofile="target/${project.artifactId}-${project.version}.war" />
- </tasks>
- </configuration>
- <goals>
- <goal>run</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
<dependencies>
<dependency>
<groupId>org.archive.nutchwax</groupId>
<artifactId>nutchwax-core</artifactId>
</dependency>
</dependencies>
- <!--If I uncomment the below, we fail trying to download our
- dependency from remote repository. It should be getting it from
- the local repository. It must be some artifact of our hack.
- Leaving it off for now.
-
- <dependencies>
- <dependency>
- <groupId>org.archive.nutchwax</groupId>
- <artifactId>nutchwax-job</artifactId>
- </dependency>
- </dependencies>
- -->
+ <distributionManagement>
+ <site>
+ <id>website</id>
+ <name>Website</name>
+ <!--Pass as command-line system property to maven-->
+ <url>${website.url}/projects/${project.parent.artifactId}/${project.artifactId}</url>
+ </site>
+ </distributionManagement>
</project>
Copied: trunk/archive-access/projects/nutchwax/nutchwax-war/src/main/assembly/assemble-war.xml (from rev 1589, trunk/archive-access/projects/nutchwax/nutchwax-war/src/main/assembly/placeholder.xml)
===================================================================
--- trunk/archive-access/projects/nutchwax/nutchwax-war/src/main/assembly/assemble-war.xml (rev 0)
+++ trunk/archive-access/projects/nutchwax/nutchwax-war/src/main/assembly/assemble-war.xml 2007-03-20 00:29:13 UTC (rev 1592)
@@ -0,0 +1,116 @@
+<assembly>
+ <id>war</id>
+ <formats>
+ <format>war</format>
+ </formats>
+ <includeBaseDirectory>false</includeBaseDirectory>
+ <fileSets>
+ <fileSet>
+ <directory>../third-party/nutch/src/web/jsp</directory>
+ <outputDirectory>/</outputDirectory>
+ <excludes>
+ <exclude>**/search.jsp</exclude>
+ <exclude>**/web.xml</exclude>
+ <exclude>**/refine*.xml</exclude>
+ <exclude>**/cluster.jsp</exclude>
+ <exclude>**/refine-query*</exclude>
+ </excludes>
+ </fileSet>
+ <fileSet>
+ <directory>../third-party/nutch/src/web/jsp</directory>
+ <outputDirectory>/</outputDirectory>
+ <excludes>
+ <exclude>**/web.xml</exclude>
+ <excludes>
+ </fileSet>
+
+ <fileSet>
+ <directory>../target/wax-plugins</directory>
+ <outputDirectory>/wax-plugins</outputDirectory>
+ </fileSet>
+ <fileSet>
+ <directory>../src/plugin/parse-waxext/bin</directory>
+ <outputDirectory>/bin</outputDirectory>
+ </fileSet>
+ <fileSet>
+ <directory>..</directory>
+ <outputDirectory>/</outputDirectory>
+ <includes>
+ <include>
+ README*
+ </include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>../conf</directory>
+ <outputDirectory>/</outputDirectory>
+ <includes>
+ <include>log4j.properties</include>
+ <include>wax-parse-plugins.xml</include>
+ <include>wax-default.xml</include>
+ <include>regex-normalize.xml</include>
+ <include>regex-urlfilter.txt</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>../third-party/nutch/build/plugins</directory>
+ <outputDirectory>/plugins</outputDirectory>
+ <includes>
+ <include>analysis-*/**</include>
+ <include>index-*/**</include>
+ <include>language-*/**</include>
+ <include>lib-*/**</include>
+ <include>nutch-*/**</include>
+ <include>scoring-*/**</include>
+ <include>query-*/**</include>
+ <include>summary-*/**</include>
+ <include>urlfilter-*/**</include>
+ <include>urlnormalizer-*/**</include>
+ <include>parse-*/**</include>
+ </includes>
+ <excludes>
+ <exclude>parse-js/**</exclude>
+ </excludes>
+ </fileSet>
+ <fileSet>
+ <directory>../third-party/nutch/conf</directory>
+ <outputDirectory>/</outputDirectory>
+ <includes>
+ <include>mime-types.xml</include>
+ <include>nutch-default.xml</include>
+ <include>nutch-site.xml</include>
+ <include>common-terms.utf8</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>../third-party/nutch/lib</directory>
+ <outputDirectory>/lib</outputDirectory>
+ <includes>
+ <include>commons-lang*</include>
+ <include>lucene*</include>
+ <include>jakarta-oro*</include>
+ <include>xerces*</include>
+ <include>concurrent*</include>
+ </includes>
+ </fileSet>
+ </fileSets>
+ <dependencySets>
+ <dependencySet>
+ <outputDirectory>/lib</outputDirectory>
+ <!--<scope>runtime</scope>
+ -->
+ <excludes>
+ <exclude>commons-cli:commons-cli</exclude>
+ <exclude>commons-collections:commons-collections</exclude>
+ <exclude>commons-pool:commons-pool</exclude>
+ <exclude>commons-logging:commons-logging</exclude>
+ <exclude>org.apache:hadoop</exclude>
+ <exclude>org.apache:nutch</exclude>
+ <exclude>org.apache:nutch</exclude>
+ <exclude>com.sleepycat:je</exclude>
+ <exclude>junit:junit</exclude>
+ <exclude>javax.servlet:servlet-api</exclude>
+ </excludes>
+ </dependencySet>
+ </dependencySets>
+</assembly>
Deleted: trunk/archive-access/projects/nutchwax/nutchwax-war/src/main/assembly/placeholder.xml
===================================================================
--- trunk/archive-access/projects/nutchwax/nutchwax-war/src/main/assembly/placeholder.xml 2007-03-19 19:11:31 UTC (rev 1591)
+++ trunk/archive-access/projects/nutchwax/nutchwax-war/src/main/assembly/placeholder.xml 2007-03-20 00:29:13 UTC (rev 1592)
@@ -1,6 +0,0 @@
-<assembly>
- <id>placeholder</id>
- <formats>
- <format>war</format>
- </formats>
-</assembly>
Copied: trunk/archive-access/projects/nutchwax/nutchwax-war/src/main/webapp (from rev 1589, trunk/archive-access/projects/nutchwax/src/web)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
