Author: kwright
Date: Thu Mar 27 23:48:41 2014
New Revision: 1582548
URL: http://svn.apache.org/r1582548
Log:
Regularize handling of test resources
Modified:
manifoldcf/branches/CONNECTORS-912/connectors/activedirectory/pom.xml
manifoldcf/branches/CONNECTORS-912/connectors/cmis/pom.xml
manifoldcf/branches/CONNECTORS-912/connectors/dropbox/pom.xml
manifoldcf/branches/CONNECTORS-912/connectors/elasticsearch/pom.xml
manifoldcf/branches/CONNECTORS-912/connectors/email/pom.xml
manifoldcf/branches/CONNECTORS-912/connectors/filesystem/pom.xml
manifoldcf/branches/CONNECTORS-912/connectors/generic/pom.xml
manifoldcf/branches/CONNECTORS-912/connectors/googledrive/pom.xml
manifoldcf/branches/CONNECTORS-912/connectors/gts/pom.xml
manifoldcf/branches/CONNECTORS-912/connectors/hdfs/pom.xml
manifoldcf/branches/CONNECTORS-912/connectors/jcifs/pom.xml
manifoldcf/branches/CONNECTORS-912/connectors/jdbc/pom.xml
manifoldcf/branches/CONNECTORS-912/connectors/jira/pom.xml
manifoldcf/branches/CONNECTORS-912/connectors/ldap/pom.xml
manifoldcf/branches/CONNECTORS-912/connectors/nullauthority/pom.xml
manifoldcf/branches/CONNECTORS-912/connectors/nulloutput/pom.xml
manifoldcf/branches/CONNECTORS-912/connectors/opensearchserver/pom.xml
manifoldcf/branches/CONNECTORS-912/connectors/regexpmapper/pom.xml
manifoldcf/branches/CONNECTORS-912/connectors/rss/pom.xml
manifoldcf/branches/CONNECTORS-912/connectors/sharepoint/pom.xml
manifoldcf/branches/CONNECTORS-912/connectors/solr/pom.xml
manifoldcf/branches/CONNECTORS-912/connectors/webcrawler/pom.xml
manifoldcf/branches/CONNECTORS-912/connectors/wiki/pom.xml
Modified: manifoldcf/branches/CONNECTORS-912/connectors/activedirectory/pom.xml
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-912/connectors/activedirectory/pom.xml?rev=1582548&r1=1582547&r2=1582548&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-912/connectors/activedirectory/pom.xml
(original)
+++ manifoldcf/branches/CONNECTORS-912/connectors/activedirectory/pom.xml Thu
Mar 27 23:48:41 2014
@@ -38,19 +38,24 @@
<testSourceDirectory>${basedir}/connector/src/test/java</testSourceDirectory>
<resources>
<resource>
- <directory>${basedir}/connector/src/main/resources</directory>
+ <directory>${basedir}/connector/src/main/native2ascii</directory>
<includes>
- <include>**/*.html</include>
- <include>**/*.js</include>
+ <include>**/*.properties</include>
</includes>
</resource>
<resource>
- <directory>${basedir}/connector/src/main/native2ascii</directory>
+ <directory>${basedir}/connector/src/main/resources</directory>
<includes>
- <include>**/*.properties</include>
+ <include>**/*.html</include>
+ <include>**/*.js</include>
</includes>
</resource>
</resources>
+ <testResources>
+ <testResource>
+ <directory>${basedir}/connector/src/test/resources</directory>
+ </testResource>
+ </testResources>
<plugins>
Modified: manifoldcf/branches/CONNECTORS-912/connectors/cmis/pom.xml
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-912/connectors/cmis/pom.xml?rev=1582548&r1=1582547&r2=1582548&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-912/connectors/cmis/pom.xml (original)
+++ manifoldcf/branches/CONNECTORS-912/connectors/cmis/pom.xml Thu Mar 27
23:48:41 2014
@@ -47,19 +47,24 @@
<testSourceDirectory>${basedir}/connector/src/test/java</testSourceDirectory>
<resources>
<resource>
- <directory>${basedir}/connector/src/main/resources</directory>
+ <directory>${basedir}/connector/src/main/native2ascii</directory>
<includes>
- <include>**/*.html</include>
- <include>**/*.js</include>
+ <include>**/*.properties</include>
</includes>
</resource>
<resource>
- <directory>${basedir}/connector/src/main/native2ascii</directory>
+ <directory>${basedir}/connector/src/main/resources</directory>
<includes>
- <include>**/*.properties</include>
+ <include>**/*.html</include>
+ <include>**/*.js</include>
</includes>
</resource>
</resources>
+ <testResources>
+ <testResource>
+ <directory>${basedir}/connector/src/test/resources</directory>
+ </testResource>
+ </testResources>
<plugins>
Modified: manifoldcf/branches/CONNECTORS-912/connectors/dropbox/pom.xml
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-912/connectors/dropbox/pom.xml?rev=1582548&r1=1582547&r2=1582548&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-912/connectors/dropbox/pom.xml (original)
+++ manifoldcf/branches/CONNECTORS-912/connectors/dropbox/pom.xml Thu Mar 27
23:48:41 2014
@@ -50,20 +50,26 @@
<sourceDirectory>${basedir}/connector/src/main/java</sourceDirectory>
<testSourceDirectory>${basedir}/connector/src/test/java</testSourceDirectory>
<resources>
- <resource>
- <directory>${basedir}/connector/src/main/resources</directory>
- <includes>
- <include>**/*.html</include>
- <include>**/*.js</include>
- </includes>
- </resource>
- <resource>
-
<directory>${basedir}/connector/src/main/native2ascii</directory>
- <includes>
- <include>**/*.properties</include>
- </includes>
- </resource>
- </resources>
+ <resource>
+ <directory>${basedir}/connector/src/main/native2ascii</directory>
+ <includes>
+ <include>**/*.properties</include>
+ </includes>
+ </resource>
+ <resource>
+ <directory>${basedir}/connector/src/main/resources</directory>
+ <includes>
+ <include>**/*.html</include>
+ <include>**/*.js</include>
+ </includes>
+ </resource>
+ </resources>
+ <testResources>
+ <testResource>
+ <directory>${basedir}/connector/src/test/resources</directory>
+ </testResource>
+ </testResources>
+
<plugins>
<plugin>
Modified: manifoldcf/branches/CONNECTORS-912/connectors/elasticsearch/pom.xml
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-912/connectors/elasticsearch/pom.xml?rev=1582548&r1=1582547&r2=1582548&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-912/connectors/elasticsearch/pom.xml
(original)
+++ manifoldcf/branches/CONNECTORS-912/connectors/elasticsearch/pom.xml Thu Mar
27 23:48:41 2014
@@ -60,19 +60,24 @@
<testSourceDirectory>${basedir}/connector/src/test/java</testSourceDirectory>
<resources>
<resource>
- <directory>${basedir}/connector/src/main/resources</directory>
+ <directory>${basedir}/connector/src/main/native2ascii</directory>
<includes>
- <include>**/*.html</include>
- <include>**/*.js</include>
+ <include>**/*.properties</include>
</includes>
</resource>
<resource>
- <directory>${basedir}/connector/src/main/native2ascii</directory>
+ <directory>${basedir}/connector/src/main/resources</directory>
<includes>
- <include>**/*.properties</include>
+ <include>**/*.html</include>
+ <include>**/*.js</include>
</includes>
</resource>
</resources>
+ <testResources>
+ <testResource>
+ <directory>${basedir}/connector/src/test/resources</directory>
+ </testResource>
+ </testResources>
<plugins>
Modified: manifoldcf/branches/CONNECTORS-912/connectors/email/pom.xml
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-912/connectors/email/pom.xml?rev=1582548&r1=1582547&r2=1582548&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-912/connectors/email/pom.xml (original)
+++ manifoldcf/branches/CONNECTORS-912/connectors/email/pom.xml Thu Mar 27
23:48:41 2014
@@ -38,19 +38,24 @@
<testSourceDirectory>${basedir}/connector/src/test/java</testSourceDirectory>
<resources>
<resource>
- <directory>${basedir}/connector/src/main/resources</directory>
+ <directory>${basedir}/connector/src/main/native2ascii</directory>
<includes>
- <include>**/*.html</include>
- <include>**/*.js</include>
+ <include>**/*.properties</include>
</includes>
</resource>
<resource>
- <directory>${basedir}/connector/src/main/native2ascii</directory>
+ <directory>${basedir}/connector/src/main/resources</directory>
<includes>
- <include>**/*.properties</include>
+ <include>**/*.html</include>
+ <include>**/*.js</include>
</includes>
</resource>
</resources>
+ <testResources>
+ <testResource>
+ <directory>${basedir}/connector/src/test/resources</directory>
+ </testResource>
+ </testResources>
<plugins>
Modified: manifoldcf/branches/CONNECTORS-912/connectors/filesystem/pom.xml
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-912/connectors/filesystem/pom.xml?rev=1582548&r1=1582547&r2=1582548&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-912/connectors/filesystem/pom.xml (original)
+++ manifoldcf/branches/CONNECTORS-912/connectors/filesystem/pom.xml Thu Mar 27
23:48:41 2014
@@ -38,19 +38,24 @@
<testSourceDirectory>${basedir}/connector/src/test/java</testSourceDirectory>
<resources>
<resource>
- <directory>${basedir}/connector/src/main/resources</directory>
+ <directory>${basedir}/connector/src/main/native2ascii</directory>
<includes>
- <include>**/*.html</include>
- <include>**/*.js</include>
+ <include>**/*.properties</include>
</includes>
</resource>
<resource>
- <directory>${basedir}/connector/src/main/native2ascii</directory>
+ <directory>${basedir}/connector/src/main/resources</directory>
<includes>
- <include>**/*.properties</include>
+ <include>**/*.html</include>
+ <include>**/*.js</include>
</includes>
</resource>
</resources>
+ <testResources>
+ <testResource>
+ <directory>${basedir}/connector/src/test/resources</directory>
+ </testResource>
+ </testResources>
<plugins>
Modified: manifoldcf/branches/CONNECTORS-912/connectors/generic/pom.xml
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-912/connectors/generic/pom.xml?rev=1582548&r1=1582547&r2=1582548&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-912/connectors/generic/pom.xml (original)
+++ manifoldcf/branches/CONNECTORS-912/connectors/generic/pom.xml Thu Mar 27
23:48:41 2014
@@ -37,13 +37,25 @@
<sourceDirectory>${basedir}/connector/src/main/java</sourceDirectory>
<testSourceDirectory>${basedir}/connector/src/test/java</testSourceDirectory>
<resources>
- <resource>
-
<directory>${basedir}/connector/src/main/native2ascii</directory>
- <includes>
- <include>**/*.properties</include>
- </includes>
- </resource>
- </resources>
+ <resource>
+ <directory>${basedir}/connector/src/main/native2ascii</directory>
+ <includes>
+ <include>**/*.properties</include>
+ </includes>
+ </resource>
+ <resource>
+ <directory>${basedir}/connector/src/main/resources</directory>
+ <includes>
+ <include>**/*.html</include>
+ <include>**/*.js</include>
+ </includes>
+ </resource>
+ </resources>
+ <testResources>
+ <testResource>
+ <directory>${basedir}/connector/src/test/resources</directory>
+ </testResource>
+ </testResources>
<plugins>
Modified: manifoldcf/branches/CONNECTORS-912/connectors/googledrive/pom.xml
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-912/connectors/googledrive/pom.xml?rev=1582548&r1=1582547&r2=1582548&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-912/connectors/googledrive/pom.xml (original)
+++ manifoldcf/branches/CONNECTORS-912/connectors/googledrive/pom.xml Thu Mar
27 23:48:41 2014
@@ -52,20 +52,25 @@
<sourceDirectory>${basedir}/connector/src/main/java</sourceDirectory>
<testSourceDirectory>${basedir}/connector/src/test/java</testSourceDirectory>
<resources>
- <resource>
- <directory>${basedir}/connector/src/main/resources</directory>
- <includes>
- <include>**/*.html</include>
- <include>**/*.js</include>
- </includes>
- </resource>
- <resource>
-
<directory>${basedir}/connector/src/main/native2ascii</directory>
- <includes>
- <include>**/*.properties</include>
- </includes>
- </resource>
- </resources>
+ <resource>
+ <directory>${basedir}/connector/src/main/native2ascii</directory>
+ <includes>
+ <include>**/*.properties</include>
+ </includes>
+ </resource>
+ <resource>
+ <directory>${basedir}/connector/src/main/resources</directory>
+ <includes>
+ <include>**/*.html</include>
+ <include>**/*.js</include>
+ </includes>
+ </resource>
+ </resources>
+ <testResources>
+ <testResource>
+ <directory>${basedir}/connector/src/test/resources</directory>
+ </testResource>
+ </testResources>
<plugins>
Modified: manifoldcf/branches/CONNECTORS-912/connectors/gts/pom.xml
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-912/connectors/gts/pom.xml?rev=1582548&r1=1582547&r2=1582548&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-912/connectors/gts/pom.xml (original)
+++ manifoldcf/branches/CONNECTORS-912/connectors/gts/pom.xml Thu Mar 27
23:48:41 2014
@@ -43,7 +43,19 @@
<include>**/*.properties</include>
</includes>
</resource>
+ <resource>
+ <directory>${basedir}/connector/src/main/resources</directory>
+ <includes>
+ <include>**/*.html</include>
+ <include>**/*.js</include>
+ </includes>
+ </resource>
</resources>
+ <testResources>
+ <testResource>
+ <directory>${basedir}/connector/src/test/resources</directory>
+ </testResource>
+ </testResources>
<plugins>
Modified: manifoldcf/branches/CONNECTORS-912/connectors/hdfs/pom.xml
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-912/connectors/hdfs/pom.xml?rev=1582548&r1=1582547&r2=1582548&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-912/connectors/hdfs/pom.xml (original)
+++ manifoldcf/branches/CONNECTORS-912/connectors/hdfs/pom.xml Thu Mar 27
23:48:41 2014
@@ -38,19 +38,24 @@
<testSourceDirectory>${basedir}/connector/src/test/java</testSourceDirectory>
<resources>
<resource>
- <directory>${basedir}/connector/src/main/resources</directory>
+ <directory>${basedir}/connector/src/main/native2ascii</directory>
<includes>
- <include>**/*.html</include>
- <include>**/*.js</include>
+ <include>**/*.properties</include>
</includes>
</resource>
<resource>
- <directory>${basedir}/connector/src/main/native2ascii</directory>
+ <directory>${basedir}/connector/src/main/resources</directory>
<includes>
- <include>**/*.properties</include>
+ <include>**/*.html</include>
+ <include>**/*.js</include>
</includes>
</resource>
</resources>
+ <testResources>
+ <testResource>
+ <directory>${basedir}/connector/src/test/resources</directory>
+ </testResource>
+ </testResources>
<plugins>
Modified: manifoldcf/branches/CONNECTORS-912/connectors/jcifs/pom.xml
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-912/connectors/jcifs/pom.xml?rev=1582548&r1=1582547&r2=1582548&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-912/connectors/jcifs/pom.xml (original)
+++ manifoldcf/branches/CONNECTORS-912/connectors/jcifs/pom.xml Thu Mar 27
23:48:41 2014
@@ -43,7 +43,19 @@
<include>**/*.properties</include>
</includes>
</resource>
+ <resource>
+ <directory>${basedir}/connector/src/main/resources</directory>
+ <includes>
+ <include>**/*.html</include>
+ <include>**/*.js</include>
+ </includes>
+ </resource>
</resources>
+ <testResources>
+ <testResource>
+ <directory>${basedir}/connector/src/test/resources</directory>
+ </testResource>
+ </testResources>
<plugins>
Modified: manifoldcf/branches/CONNECTORS-912/connectors/jdbc/pom.xml
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-912/connectors/jdbc/pom.xml?rev=1582548&r1=1582547&r2=1582548&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-912/connectors/jdbc/pom.xml (original)
+++ manifoldcf/branches/CONNECTORS-912/connectors/jdbc/pom.xml Thu Mar 27
23:48:41 2014
@@ -43,7 +43,19 @@
<include>**/*.properties</include>
</includes>
</resource>
+ <resource>
+ <directory>${basedir}/connector/src/main/resources</directory>
+ <includes>
+ <include>**/*.html</include>
+ <include>**/*.js</include>
+ </includes>
+ </resource>
</resources>
+ <testResources>
+ <testResource>
+ <directory>${basedir}/connector/src/test/resources</directory>
+ </testResource>
+ </testResources>
<plugins>
Modified: manifoldcf/branches/CONNECTORS-912/connectors/jira/pom.xml
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-912/connectors/jira/pom.xml?rev=1582548&r1=1582547&r2=1582548&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-912/connectors/jira/pom.xml (original)
+++ manifoldcf/branches/CONNECTORS-912/connectors/jira/pom.xml Thu Mar 27
23:48:41 2014
@@ -52,20 +52,25 @@
<sourceDirectory>${basedir}/connector/src/main/java</sourceDirectory>
<testSourceDirectory>${basedir}/connector/src/test/java</testSourceDirectory>
<resources>
- <resource>
- <directory>${basedir}/connector/src/main/resources</directory>
- <includes>
- <include>**/*.html</include>
- <include>**/*.js</include>
- </includes>
- </resource>
- <resource>
-
<directory>${basedir}/connector/src/main/native2ascii</directory>
- <includes>
- <include>**/*.properties</include>
- </includes>
- </resource>
- </resources>
+ <resource>
+ <directory>${basedir}/connector/src/main/native2ascii</directory>
+ <includes>
+ <include>**/*.properties</include>
+ </includes>
+ </resource>
+ <resource>
+ <directory>${basedir}/connector/src/main/resources</directory>
+ <includes>
+ <include>**/*.html</include>
+ <include>**/*.js</include>
+ </includes>
+ </resource>
+ </resources>
+ <testResources>
+ <testResource>
+ <directory>${basedir}/connector/src/test/resources</directory>
+ </testResource>
+ </testResources>
<plugins>
Modified: manifoldcf/branches/CONNECTORS-912/connectors/ldap/pom.xml
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-912/connectors/ldap/pom.xml?rev=1582548&r1=1582547&r2=1582548&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-912/connectors/ldap/pom.xml (original)
+++ manifoldcf/branches/CONNECTORS-912/connectors/ldap/pom.xml Thu Mar 27
23:48:41 2014
@@ -43,7 +43,19 @@
<include>**/*.properties</include>
</includes>
</resource>
+ <resource>
+ <directory>${basedir}/connector/src/main/resources</directory>
+ <includes>
+ <include>**/*.html</include>
+ <include>**/*.js</include>
+ </includes>
+ </resource>
</resources>
+ <testResources>
+ <testResource>
+ <directory>${basedir}/connector/src/test/resources</directory>
+ </testResource>
+ </testResources>
<plugins>
Modified: manifoldcf/branches/CONNECTORS-912/connectors/nullauthority/pom.xml
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-912/connectors/nullauthority/pom.xml?rev=1582548&r1=1582547&r2=1582548&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-912/connectors/nullauthority/pom.xml
(original)
+++ manifoldcf/branches/CONNECTORS-912/connectors/nullauthority/pom.xml Thu Mar
27 23:48:41 2014
@@ -43,7 +43,19 @@
<include>**/*.properties</include>
</includes>
</resource>
+ <resource>
+ <directory>${basedir}/connector/src/main/resources</directory>
+ <includes>
+ <include>**/*.html</include>
+ <include>**/*.js</include>
+ </includes>
+ </resource>
</resources>
+ <testResources>
+ <testResource>
+ <directory>${basedir}/connector/src/test/resources</directory>
+ </testResource>
+ </testResources>
<plugins>
Modified: manifoldcf/branches/CONNECTORS-912/connectors/nulloutput/pom.xml
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-912/connectors/nulloutput/pom.xml?rev=1582548&r1=1582547&r2=1582548&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-912/connectors/nulloutput/pom.xml (original)
+++ manifoldcf/branches/CONNECTORS-912/connectors/nulloutput/pom.xml Thu Mar 27
23:48:41 2014
@@ -43,7 +43,19 @@
<include>**/*.properties</include>
</includes>
</resource>
+ <resource>
+ <directory>${basedir}/connector/src/main/resources</directory>
+ <includes>
+ <include>**/*.html</include>
+ <include>**/*.js</include>
+ </includes>
+ </resource>
</resources>
+ <testResources>
+ <testResource>
+ <directory>${basedir}/connector/src/test/resources</directory>
+ </testResource>
+ </testResources>
<plugins>
Modified: manifoldcf/branches/CONNECTORS-912/connectors/opensearchserver/pom.xml
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-912/connectors/opensearchserver/pom.xml?rev=1582548&r1=1582547&r2=1582548&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-912/connectors/opensearchserver/pom.xml
(original)
+++ manifoldcf/branches/CONNECTORS-912/connectors/opensearchserver/pom.xml Thu
Mar 27 23:48:41 2014
@@ -47,19 +47,24 @@
<testSourceDirectory>${basedir}/connector/src/test/java</testSourceDirectory>
<resources>
<resource>
- <directory>${basedir}/connector/src/main/resources</directory>
+ <directory>${basedir}/connector/src/main/native2ascii</directory>
<includes>
- <include>**/*.html</include>
- <include>**/*.js</include>
+ <include>**/*.properties</include>
</includes>
</resource>
<resource>
- <directory>${basedir}/connector/src/main/native2ascii</directory>
+ <directory>${basedir}/connector/src/main/resources</directory>
<includes>
- <include>**/*.properties</include>
+ <include>**/*.html</include>
+ <include>**/*.js</include>
</includes>
</resource>
</resources>
+ <testResources>
+ <testResource>
+ <directory>${basedir}/connector/src/test/resources</directory>
+ </testResource>
+ </testResources>
<plugins>
Modified: manifoldcf/branches/CONNECTORS-912/connectors/regexpmapper/pom.xml
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-912/connectors/regexpmapper/pom.xml?rev=1582548&r1=1582547&r2=1582548&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-912/connectors/regexpmapper/pom.xml
(original)
+++ manifoldcf/branches/CONNECTORS-912/connectors/regexpmapper/pom.xml Thu Mar
27 23:48:41 2014
@@ -38,19 +38,24 @@
<testSourceDirectory>${basedir}/connector/src/test/java</testSourceDirectory>
<resources>
<resource>
- <directory>${basedir}/connector/src/main/resources</directory>
+ <directory>${basedir}/connector/src/main/native2ascii</directory>
<includes>
- <include>**/*.html</include>
- <include>**/*.js</include>
+ <include>**/*.properties</include>
</includes>
</resource>
<resource>
- <directory>${basedir}/connector/src/main/native2ascii</directory>
+ <directory>${basedir}/connector/src/main/resources</directory>
<includes>
- <include>**/*.properties</include>
+ <include>**/*.html</include>
+ <include>**/*.js</include>
</includes>
</resource>
</resources>
+ <testResources>
+ <testResource>
+ <directory>${basedir}/connector/src/test/resources</directory>
+ </testResource>
+ </testResources>
<plugins>
Modified: manifoldcf/branches/CONNECTORS-912/connectors/rss/pom.xml
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-912/connectors/rss/pom.xml?rev=1582548&r1=1582547&r2=1582548&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-912/connectors/rss/pom.xml (original)
+++ manifoldcf/branches/CONNECTORS-912/connectors/rss/pom.xml Thu Mar 27
23:48:41 2014
@@ -43,7 +43,19 @@
<include>**/*.properties</include>
</includes>
</resource>
+ <resource>
+ <directory>${basedir}/connector/src/main/resources</directory>
+ <includes>
+ <include>**/*.html</include>
+ <include>**/*.js</include>
+ </includes>
+ </resource>
</resources>
+ <testResources>
+ <testResource>
+ <directory>${basedir}/connector/src/test/resources</directory>
+ </testResource>
+ </testResources>
<plugins>
Modified: manifoldcf/branches/CONNECTORS-912/connectors/sharepoint/pom.xml
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-912/connectors/sharepoint/pom.xml?rev=1582548&r1=1582547&r2=1582548&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-912/connectors/sharepoint/pom.xml (original)
+++ manifoldcf/branches/CONNECTORS-912/connectors/sharepoint/pom.xml Thu Mar 27
23:48:41 2014
@@ -38,19 +38,24 @@
<testSourceDirectory>${basedir}/src/test/java</testSourceDirectory>
<resources>
<resource>
- <directory>${basedir}/connector/src/main/resources</directory>
+ <directory>${basedir}/connector/src/main/native2ascii</directory>
<includes>
- <include>**/*.html</include>
- <include>**/*.js</include>
+ <include>**/*.properties</include>
</includes>
</resource>
<resource>
- <directory>${basedir}/connector/src/main/native2ascii</directory>
+ <directory>${basedir}/connector/src/main/resources</directory>
<includes>
- <include>**/*.properties</include>
+ <include>**/*.html</include>
+ <include>**/*.js</include>
</includes>
</resource>
</resources>
+ <testResources>
+ <testResource>
+ <directory>${basedir}/connector/src/test/resources</directory>
+ </testResource>
+ </testResources>
<plugins>
Modified: manifoldcf/branches/CONNECTORS-912/connectors/solr/pom.xml
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-912/connectors/solr/pom.xml?rev=1582548&r1=1582547&r2=1582548&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-912/connectors/solr/pom.xml (original)
+++ manifoldcf/branches/CONNECTORS-912/connectors/solr/pom.xml Thu Mar 27
23:48:41 2014
@@ -43,7 +43,19 @@
<include>**/*.properties</include>
</includes>
</resource>
+ <resource>
+ <directory>${basedir}/connector/src/main/resources</directory>
+ <includes>
+ <include>**/*.html</include>
+ <include>**/*.js</include>
+ </includes>
+ </resource>
</resources>
+ <testResources>
+ <testResource>
+ <directory>${basedir}/connector/src/test/resources</directory>
+ </testResource>
+ </testResources>
<plugins>
Modified: manifoldcf/branches/CONNECTORS-912/connectors/webcrawler/pom.xml
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-912/connectors/webcrawler/pom.xml?rev=1582548&r1=1582547&r2=1582548&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-912/connectors/webcrawler/pom.xml (original)
+++ manifoldcf/branches/CONNECTORS-912/connectors/webcrawler/pom.xml Thu Mar 27
23:48:41 2014
@@ -43,7 +43,19 @@
<include>**/*.properties</include>
</includes>
</resource>
+ <resource>
+ <directory>${basedir}/connector/src/main/resources</directory>
+ <includes>
+ <include>**/*.html</include>
+ <include>**/*.js</include>
+ </includes>
+ </resource>
</resources>
+ <testResources>
+ <testResource>
+ <directory>${basedir}/connector/src/test/resources</directory>
+ </testResource>
+ </testResources>
<plugins>
Modified: manifoldcf/branches/CONNECTORS-912/connectors/wiki/pom.xml
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-912/connectors/wiki/pom.xml?rev=1582548&r1=1582547&r2=1582548&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-912/connectors/wiki/pom.xml (original)
+++ manifoldcf/branches/CONNECTORS-912/connectors/wiki/pom.xml Thu Mar 27
23:48:41 2014
@@ -43,8 +43,20 @@
<include>**/*.properties</include>
</includes>
</resource>
+ <resource>
+ <directory>${basedir}/connector/src/main/resources</directory>
+ <includes>
+ <include>**/*.html</include>
+ <include>**/*.js</include>
+ </includes>
+ </resource>
</resources>
-
+ <testResources>
+ <testResource>
+ <directory>${basedir}/connector/src/test/resources</directory>
+ </testResource>
+ </testResources>
+
<plugins>
<plugin>
