From: <sta...@us...> - 2007-03-23 05:00:14
|
Revision: 1631 http://archive-access.svn.sourceforge.net/archive-access/?rev=1631&view=rev Author: stack-sf Date: 2007-03-22 22:00:15 -0700 (Thu, 22 Mar 2007) Log Message: ----------- * src/images/nutchwax.jpg * src/images/nwa.jpg * src/images/iipc.gif Deleted. Were moved under src/site/resources. * src/plugin/build-plugin.xml * nutchwax-webapp/src/main/assembly/assemble-war.xml * nutchwax-job/src/main/assembly/assemble-job.xml * nutchwax-webapp/pom.xml Build nutchwax plugins into nutchwax-plugins target. Then we can add this dir to nutchwax classpath in eclipse and our plugins can be found (Other wise they were in a blind spot -- in the eclipse target dir). * .classpath Add in nutchwax conf and plugins target dirs. Modified Paths: -------------- trunk/archive-access/projects/nutchwax/.classpath trunk/archive-access/projects/nutchwax/nutchwax-job/src/main/assembly/assemble-job.xml trunk/archive-access/projects/nutchwax/nutchwax-webapp/pom.xml trunk/archive-access/projects/nutchwax/nutchwax-webapp/src/main/assembly/assemble-war.xml trunk/archive-access/projects/nutchwax/src/plugin/build-plugin.xml Removed Paths: ------------- trunk/archive-access/projects/nutchwax/src/images/ Modified: trunk/archive-access/projects/nutchwax/.classpath =================================================================== --- trunk/archive-access/projects/nutchwax/.classpath 2007-03-23 00:30:25 UTC (rev 1630) +++ trunk/archive-access/projects/nutchwax/.classpath 2007-03-23 05:00:15 UTC (rev 1631) @@ -184,7 +184,7 @@ <classpathentry kind="lib" path="nutchwax-thirdparty/nutch/lib/commons-lang-2.1.jar"/> <classpathentry kind="lib" path="nutchwax-thirdparty/nutch/lib/commons-logging-1.0.4.jar"/> <classpathentry kind="lib" path="nutchwax-thirdparty/nutch/lib/commons-logging-api-1.0.4.jar"/> - <classpathentry kind="lib" path="nutchwax-thirdparty/nutch/lib/hadoop-0.10.1-core.jar"/> + <classpathentry kind="lib" path="nutchwax-thirdparty/nutch/lib/hadoop-0.10.1-core.jar" /> <classpathentry kind="lib" path="nutchwax-thirdparty/nutch/lib/jakarta-oro-2.0.7.jar"/> <classpathentry kind="lib" path="nutchwax-thirdparty/nutch/lib/jets3t.jar"/> <classpathentry kind="lib" path="nutchwax-thirdparty/nutch/lib/jetty-5.1.4.jar"/> @@ -236,7 +236,9 @@ <classpathentry kind="lib" path="nutchwax-thirdparty/nutch/src/plugin/urlfilter-automaton/lib/automaton.jar"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/> + <classpathentry kind="lib" path="conf"/> <classpathentry kind="lib" path="nutchwax-thirdparty/nutch/build"/> <classpathentry kind="lib" path="nutchwax-thirdparty/nutch/conf"/> + <classpathentry kind="lib" path="nutchwax-plugins/target"/> <classpathentry kind="output" path="target"/> </classpath> Modified: trunk/archive-access/projects/nutchwax/nutchwax-job/src/main/assembly/assemble-job.xml =================================================================== --- trunk/archive-access/projects/nutchwax/nutchwax-job/src/main/assembly/assemble-job.xml 2007-03-23 00:30:25 UTC (rev 1630) +++ trunk/archive-access/projects/nutchwax/nutchwax-job/src/main/assembly/assemble-job.xml 2007-03-23 05:00:15 UTC (rev 1631) @@ -6,7 +6,7 @@ <includeBaseDirectory>false</includeBaseDirectory> <fileSets> <fileSet> - <directory>../target/wax-plugins</directory> + <directory>../nutchwax-plugins/target/wax-plugins</directory> <outputDirectory>/wax-plugins</outputDirectory> </fileSet> <fileSet> Modified: trunk/archive-access/projects/nutchwax/nutchwax-webapp/pom.xml =================================================================== --- trunk/archive-access/projects/nutchwax/nutchwax-webapp/pom.xml 2007-03-23 00:30:25 UTC (rev 1630) +++ trunk/archive-access/projects/nutchwax/nutchwax-webapp/pom.xml 2007-03-23 05:00:15 UTC (rev 1631) @@ -84,7 +84,7 @@ </copy> <copy todir="target/${artifactId}-${project.version}/WEB-INF/classes/wax-plugins" overwrite="true"> - <fileset dir="../target/wax-plugins" /> + <fileset dir="../nutchwax-plugins/target/wax-plugins" /> </copy> <copy todir="target/${artifactId}-${project.version}/WEB-INF/classes" overwrite="true"> Modified: trunk/archive-access/projects/nutchwax/nutchwax-webapp/src/main/assembly/assemble-war.xml =================================================================== --- trunk/archive-access/projects/nutchwax/nutchwax-webapp/src/main/assembly/assemble-war.xml 2007-03-23 00:30:25 UTC (rev 1630) +++ trunk/archive-access/projects/nutchwax/nutchwax-webapp/src/main/assembly/assemble-war.xml 2007-03-23 05:00:15 UTC (rev 1631) @@ -25,7 +25,7 @@ </fileSet> <fileSet> - <directory>../target/wax-plugins</directory> + <directory>../nutchwax-plugins/target/wax-plugins</directory> <outputDirectory>/wax-plugins</outputDirectory> </fileSet> <fileSet> Modified: trunk/archive-access/projects/nutchwax/src/plugin/build-plugin.xml =================================================================== --- trunk/archive-access/projects/nutchwax/src/plugin/build-plugin.xml 2007-03-23 00:30:25 UTC (rev 1630) +++ trunk/archive-access/projects/nutchwax/src/plugin/build-plugin.xml 2007-03-23 05:00:15 UTC (rev 1631) @@ -37,7 +37,7 @@ <property name="build.classes" location="${build.dir}/classes"/> <property name="build.test" location="${build.dir}/test"/> - <property name="deploy.dir" location="${nutch.root}/target//wax-plugins/${name}"/> + <property name="deploy.dir" location="${nutch.root}/nutchwax-plugins/target/wax-plugins/${name}"/> <property name="javac.deprecation" value="off"/> <property name="javac.debug" value="on"/> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |