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/05/01 01:49:51 UTC
svn commit: r1477880 - in /manifoldcf/trunk: ./ connectors/activedirectory/
connectors/alfresco/ connectors/cmis/ connectors/dropbox/
connectors/elasticsearch/ connectors/filesystem/ connectors/gts/
connectors/jcifs/ connectors/jdbc/ connectors/ldap/ c...
Author: kwright
Date: Tue Apr 30 23:49:50 2013
New Revision: 1477880
URL: http://svn.apache.org/r1477880
Log:
Fix for CONNECTORS-586.
Modified:
manifoldcf/trunk/ (props changed)
manifoldcf/trunk/CHANGES.txt
manifoldcf/trunk/connectors/activedirectory/pom.xml
manifoldcf/trunk/connectors/alfresco/pom.xml
manifoldcf/trunk/connectors/cmis/pom.xml
manifoldcf/trunk/connectors/dropbox/pom.xml
manifoldcf/trunk/connectors/elasticsearch/pom.xml
manifoldcf/trunk/connectors/filesystem/pom.xml
manifoldcf/trunk/connectors/gts/pom.xml
manifoldcf/trunk/connectors/jcifs/pom.xml
manifoldcf/trunk/connectors/jdbc/pom.xml
manifoldcf/trunk/connectors/ldap/pom.xml
manifoldcf/trunk/connectors/nullauthority/pom.xml
manifoldcf/trunk/connectors/nulloutput/pom.xml
manifoldcf/trunk/connectors/opensearchserver/pom.xml
manifoldcf/trunk/connectors/rss/ (props changed)
manifoldcf/trunk/connectors/rss/pom.xml
manifoldcf/trunk/connectors/sharepoint/ (props changed)
manifoldcf/trunk/connectors/sharepoint/pom.xml
manifoldcf/trunk/connectors/solr/pom.xml
manifoldcf/trunk/connectors/webcrawler/pom.xml
manifoldcf/trunk/connectors/wiki/ (props changed)
manifoldcf/trunk/connectors/wiki/pom.xml
manifoldcf/trunk/framework/combined-service/ (props changed)
manifoldcf/trunk/framework/ui-core/pom.xml
Propchange: manifoldcf/trunk/
------------------------------------------------------------------------------
Merged /manifoldcf/branches/CONNECTORS-586:r1477601-1477875
Modified: manifoldcf/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/CHANGES.txt?rev=1477880&r1=1477879&r2=1477880&view=diff
==============================================================================
--- manifoldcf/trunk/CHANGES.txt (original)
+++ manifoldcf/trunk/CHANGES.txt Tue Apr 30 23:49:50 2013
@@ -5,6 +5,9 @@ $Id$
======================= Release 1.2 =====================
+CONNECTORS-586: Fix native2ascii incompatibility with Java 7.
+(Christian Ziech, Karl Wright)
+
CONNECTORS-685: Handle the case when connector model is
ADD_CHANGE_DELETE and you change configuration data.
(Maciej Li¿ewski, Karl Wright)
Modified: manifoldcf/trunk/connectors/activedirectory/pom.xml
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/activedirectory/pom.xml?rev=1477880&r1=1477879&r2=1477880&view=diff
==============================================================================
--- manifoldcf/trunk/connectors/activedirectory/pom.xml (original)
+++ manifoldcf/trunk/connectors/activedirectory/pom.xml Tue Apr 30 23:49:50 2013
@@ -30,14 +30,29 @@
<build>
<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>
+
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>native2ascii-maven-plugin</artifactId>
- <version>1.0-alpha-1</version>
+ <version>1.0-beta-1</version>
<configuration>
- <dest>target/classes</dest>
- <src>connector/src/main/native2ascii</src>
+ <workDir>target/classes</workDir>
</configuration>
<executions>
<execution>
@@ -47,7 +62,9 @@
</goals>
<configuration>
<encoding>UTF8</encoding>
- <includes>**/*.properties</includes>
+ <includes>
+ <include>**/*.properties</include>
+ </includes>
</configuration>
</execution>
</executions>
Modified: manifoldcf/trunk/connectors/alfresco/pom.xml
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/alfresco/pom.xml?rev=1477880&r1=1477879&r2=1477880&view=diff
==============================================================================
--- manifoldcf/trunk/connectors/alfresco/pom.xml (original)
+++ manifoldcf/trunk/connectors/alfresco/pom.xml Tue Apr 30 23:49:50 2013
@@ -78,15 +78,21 @@
<include>**/*.js</include>
</includes>
</resource>
- </resources>
+ <resource>
+ <directory>${basedir}/connector/src/main/native2ascii</directory>
+ <includes>
+ <include>**/*.properties</include>
+ </includes>
+ </resource>
+ </resources>
+
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>native2ascii-maven-plugin</artifactId>
- <version>1.0-alpha-1</version>
+ <version>1.0-beta-1</version>
<configuration>
- <dest>target/classes</dest>
- <src>connector/src/main/native2ascii</src>
+ <workDir>target/classes</workDir>
</configuration>
<executions>
<execution>
@@ -96,7 +102,9 @@
</goals>
<configuration>
<encoding>UTF8</encoding>
- <includes>**/*.properties</includes>
+ <includes>
+ <include>**/*.properties</include>
+ </includes>
</configuration>
</execution>
</executions>
Modified: manifoldcf/trunk/connectors/cmis/pom.xml
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/cmis/pom.xml?rev=1477880&r1=1477879&r2=1477880&view=diff
==============================================================================
--- manifoldcf/trunk/connectors/cmis/pom.xml (original)
+++ manifoldcf/trunk/connectors/cmis/pom.xml Tue Apr 30 23:49:50 2013
@@ -47,15 +47,21 @@
<include>**/*.js</include>
</includes>
</resource>
- </resources>
+ <resource>
+ <directory>${basedir}/connector/src/main/native2ascii</directory>
+ <includes>
+ <include>**/*.properties</include>
+ </includes>
+ </resource>
+ </resources>
+
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>native2ascii-maven-plugin</artifactId>
- <version>1.0-alpha-1</version>
+ <version>1.0-beta-1</version>
<configuration>
- <dest>target/classes</dest>
- <src>connector/src/main/native2ascii</src>
+ <workDir>target/classes</workDir>
</configuration>
<executions>
<execution>
@@ -65,7 +71,9 @@
</goals>
<configuration>
<encoding>UTF8</encoding>
- <includes>**/*.properties</includes>
+ <includes>
+ <include>**/*.properties</include>
+ </includes>
</configuration>
</execution>
</executions>
Modified: manifoldcf/trunk/connectors/dropbox/pom.xml
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/dropbox/pom.xml?rev=1477880&r1=1477879&r2=1477880&view=diff
==============================================================================
--- manifoldcf/trunk/connectors/dropbox/pom.xml (original)
+++ manifoldcf/trunk/connectors/dropbox/pom.xml Tue Apr 30 23:49:50 2013
@@ -56,15 +56,20 @@
<include>**/*.js</include>
</includes>
</resource>
+ <resource>
+ <directory>${basedir}/connector/src/main/native2ascii</directory>
+ <includes>
+ <include>**/*.properties</include>
+ </includes>
+ </resource>
</resources>
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>native2ascii-maven-plugin</artifactId>
- <version>1.0-alpha-1</version>
+ <version>1.0-beta-1</version>
<configuration>
- <dest>target/classes</dest>
- <src>connector/src/main/native2ascii</src>
+ <workDir>target/classes</workDir>
</configuration>
<executions>
<execution>
@@ -74,7 +79,9 @@
</goals>
<configuration>
<encoding>UTF8</encoding>
- <includes>**/*.properties</includes>
+ <includes>
+ <include>**/*.properties</include>
+ </includes>
</configuration>
</execution>
</executions>
Modified: manifoldcf/trunk/connectors/elasticsearch/pom.xml
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/elasticsearch/pom.xml?rev=1477880&r1=1477879&r2=1477880&view=diff
==============================================================================
--- manifoldcf/trunk/connectors/elasticsearch/pom.xml (original)
+++ manifoldcf/trunk/connectors/elasticsearch/pom.xml Tue Apr 30 23:49:50 2013
@@ -42,16 +42,26 @@
<resources>
<resource>
<directory>${basedir}/connector/src/main/resources</directory>
+ <includes>
+ <include>**/*.html</include>
+ <include>**/*.js</include>
+ </includes>
</resource>
- </resources>
+ <resource>
+ <directory>${basedir}/connector/src/main/native2ascii</directory>
+ <includes>
+ <include>**/*.properties</include>
+ </includes>
+ </resource>
+ </resources>
+
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>native2ascii-maven-plugin</artifactId>
- <version>1.0-alpha-1</version>
+ <version>1.0-beta-1</version>
<configuration>
- <dest>target/classes</dest>
- <src>connector/src/main/native2ascii</src>
+ <workDir>target/classes</workDir>
</configuration>
<executions>
<execution>
@@ -61,7 +71,9 @@
</goals>
<configuration>
<encoding>UTF8</encoding>
- <includes>**/*.properties</includes>
+ <includes>
+ <include>**/*.properties</include>
+ </includes>
</configuration>
</execution>
</executions>
Modified: manifoldcf/trunk/connectors/filesystem/pom.xml
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/filesystem/pom.xml?rev=1477880&r1=1477879&r2=1477880&view=diff
==============================================================================
--- manifoldcf/trunk/connectors/filesystem/pom.xml (original)
+++ manifoldcf/trunk/connectors/filesystem/pom.xml Tue Apr 30 23:49:50 2013
@@ -30,14 +30,22 @@
<build>
<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>
+
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>native2ascii-maven-plugin</artifactId>
- <version>1.0-alpha-1</version>
+ <version>1.0-beta-1</version>
<configuration>
- <dest>target/classes</dest>
- <src>connector/src/main/native2ascii</src>
+ <workDir>target/classes</workDir>
</configuration>
<executions>
<execution>
@@ -47,7 +55,9 @@
</goals>
<configuration>
<encoding>UTF8</encoding>
- <includes>**/*.properties</includes>
+ <includes>
+ <include>**/*.properties</include>
+ </includes>
</configuration>
</execution>
</executions>
Modified: manifoldcf/trunk/connectors/gts/pom.xml
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/gts/pom.xml?rev=1477880&r1=1477879&r2=1477880&view=diff
==============================================================================
--- manifoldcf/trunk/connectors/gts/pom.xml (original)
+++ manifoldcf/trunk/connectors/gts/pom.xml Tue Apr 30 23:49:50 2013
@@ -30,14 +30,22 @@
<build>
<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>
+
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>native2ascii-maven-plugin</artifactId>
- <version>1.0-alpha-1</version>
+ <version>1.0-beta-1</version>
<configuration>
- <dest>target/classes</dest>
- <src>connector/src/main/native2ascii</src>
+ <workDir>target/classes</workDir>
</configuration>
<executions>
<execution>
@@ -47,7 +55,9 @@
</goals>
<configuration>
<encoding>UTF8</encoding>
- <includes>**/*.properties</includes>
+ <includes>
+ <include>**/*.properties</include>
+ </includes>
</configuration>
</execution>
</executions>
Modified: manifoldcf/trunk/connectors/jcifs/pom.xml
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/jcifs/pom.xml?rev=1477880&r1=1477879&r2=1477880&view=diff
==============================================================================
--- manifoldcf/trunk/connectors/jcifs/pom.xml (original)
+++ manifoldcf/trunk/connectors/jcifs/pom.xml Tue Apr 30 23:49:50 2013
@@ -30,14 +30,22 @@
<build>
<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>
+
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>native2ascii-maven-plugin</artifactId>
- <version>1.0-alpha-1</version>
+ <version>1.0-beta-1</version>
<configuration>
- <dest>target/classes</dest>
- <src>connector/src/main/native2ascii</src>
+ <workDir>target/classes</workDir>
</configuration>
<executions>
<execution>
@@ -47,7 +55,9 @@
</goals>
<configuration>
<encoding>UTF8</encoding>
- <includes>**/*.properties</includes>
+ <includes>
+ <include>**/*.properties</include>
+ </includes>
</configuration>
</execution>
</executions>
Modified: manifoldcf/trunk/connectors/jdbc/pom.xml
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/jdbc/pom.xml?rev=1477880&r1=1477879&r2=1477880&view=diff
==============================================================================
--- manifoldcf/trunk/connectors/jdbc/pom.xml (original)
+++ manifoldcf/trunk/connectors/jdbc/pom.xml Tue Apr 30 23:49:50 2013
@@ -30,14 +30,22 @@
<build>
<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>
+
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>native2ascii-maven-plugin</artifactId>
- <version>1.0-alpha-1</version>
+ <version>1.0-beta-1</version>
<configuration>
- <dest>target/classes</dest>
- <src>connector/src/main/native2ascii</src>
+ <workDir>target/classes</workDir>
</configuration>
<executions>
<execution>
@@ -47,7 +55,9 @@
</goals>
<configuration>
<encoding>UTF8</encoding>
- <includes>**/*.properties</includes>
+ <includes>
+ <include>**/*.properties</include>
+ </includes>
</configuration>
</execution>
</executions>
Modified: manifoldcf/trunk/connectors/ldap/pom.xml
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/ldap/pom.xml?rev=1477880&r1=1477879&r2=1477880&view=diff
==============================================================================
--- manifoldcf/trunk/connectors/ldap/pom.xml (original)
+++ manifoldcf/trunk/connectors/ldap/pom.xml Tue Apr 30 23:49:50 2013
@@ -30,14 +30,22 @@
<build>
<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>
+
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>native2ascii-maven-plugin</artifactId>
- <version>1.0-alpha-1</version>
+ <version>1.0-beta-1</version>
<configuration>
- <dest>target/classes</dest>
- <src>connector/src/main/native2ascii</src>
+ <workDir>target/classes</workDir>
</configuration>
<executions>
<execution>
@@ -47,7 +55,9 @@
</goals>
<configuration>
<encoding>UTF8</encoding>
- <includes>**/*.properties</includes>
+ <includes>
+ <include>**/*.properties</include>
+ </includes>
</configuration>
</execution>
</executions>
Modified: manifoldcf/trunk/connectors/nullauthority/pom.xml
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/nullauthority/pom.xml?rev=1477880&r1=1477879&r2=1477880&view=diff
==============================================================================
--- manifoldcf/trunk/connectors/nullauthority/pom.xml (original)
+++ manifoldcf/trunk/connectors/nullauthority/pom.xml Tue Apr 30 23:49:50 2013
@@ -30,14 +30,22 @@
<build>
<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>
+
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>native2ascii-maven-plugin</artifactId>
- <version>1.0-alpha-1</version>
+ <version>1.0-beta-1</version>
<configuration>
- <dest>target/classes</dest>
- <src>connector/src/main/native2ascii</src>
+ <workDir>target/classes</workDir>
</configuration>
<executions>
<execution>
@@ -47,7 +55,9 @@
</goals>
<configuration>
<encoding>UTF8</encoding>
- <includes>**/*.properties</includes>
+ <includes>
+ <include>**/*.properties</include>
+ </includes>
</configuration>
</execution>
</executions>
Modified: manifoldcf/trunk/connectors/nulloutput/pom.xml
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/nulloutput/pom.xml?rev=1477880&r1=1477879&r2=1477880&view=diff
==============================================================================
--- manifoldcf/trunk/connectors/nulloutput/pom.xml (original)
+++ manifoldcf/trunk/connectors/nulloutput/pom.xml Tue Apr 30 23:49:50 2013
@@ -30,14 +30,22 @@
<build>
<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>
+
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>native2ascii-maven-plugin</artifactId>
- <version>1.0-alpha-1</version>
+ <version>1.0-beta-1</version>
<configuration>
- <dest>target/classes</dest>
- <src>connector/src/main/native2ascii</src>
+ <workDir>target/classes</workDir>
</configuration>
<executions>
<execution>
@@ -47,7 +55,9 @@
</goals>
<configuration>
<encoding>UTF8</encoding>
- <includes>**/*.properties</includes>
+ <includes>
+ <include>**/*.properties</include>
+ </includes>
</configuration>
</execution>
</executions>
Modified: manifoldcf/trunk/connectors/opensearchserver/pom.xml
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/opensearchserver/pom.xml?rev=1477880&r1=1477879&r2=1477880&view=diff
==============================================================================
--- manifoldcf/trunk/connectors/opensearchserver/pom.xml (original)
+++ manifoldcf/trunk/connectors/opensearchserver/pom.xml Tue Apr 30 23:49:50 2013
@@ -42,16 +42,26 @@
<resources>
<resource>
<directory>${basedir}/connector/src/main/resources</directory>
+ <includes>
+ <include>**/*.html</include>
+ <include>**/*.js</include>
+ </includes>
</resource>
- </resources>
+ <resource>
+ <directory>${basedir}/connector/src/main/native2ascii</directory>
+ <includes>
+ <include>**/*.properties</include>
+ </includes>
+ </resource>
+ </resources>
+
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>native2ascii-maven-plugin</artifactId>
- <version>1.0-alpha-1</version>
+ <version>1.0-beta-1</version>
<configuration>
- <dest>target/classes</dest>
- <src>connector/src/main/native2ascii</src>
+ <workDir>target/classes</workDir>
</configuration>
<executions>
<execution>
@@ -61,7 +71,9 @@
</goals>
<configuration>
<encoding>UTF8</encoding>
- <includes>**/*.properties</includes>
+ <includes>
+ <include>**/*.properties</include>
+ </includes>
</configuration>
</execution>
</executions>
Propchange: manifoldcf/trunk/connectors/rss/
------------------------------------------------------------------------------
Merged /manifoldcf/branches/CONNECTORS-586/connectors/rss:r1477601-1477875
Modified: manifoldcf/trunk/connectors/rss/pom.xml
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/rss/pom.xml?rev=1477880&r1=1477879&r2=1477880&view=diff
==============================================================================
--- manifoldcf/trunk/connectors/rss/pom.xml (original)
+++ manifoldcf/trunk/connectors/rss/pom.xml Tue Apr 30 23:49:50 2013
@@ -30,14 +30,22 @@
<build>
<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>
+
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>native2ascii-maven-plugin</artifactId>
- <version>1.0-alpha-1</version>
+ <version>1.0-beta-1</version>
<configuration>
- <dest>target/classes</dest>
- <src>connector/src/main/native2ascii</src>
+ <workDir>target/classes</workDir>
</configuration>
<executions>
<execution>
@@ -47,7 +55,9 @@
</goals>
<configuration>
<encoding>UTF8</encoding>
- <includes>**/*.properties</includes>
+ <includes>
+ <include>**/*.properties</include>
+ </includes>
</configuration>
</execution>
</executions>
Propchange: manifoldcf/trunk/connectors/sharepoint/
------------------------------------------------------------------------------
Merged /manifoldcf/branches/CONNECTORS-586/connectors/sharepoint:r1477601-1477875
Modified: manifoldcf/trunk/connectors/sharepoint/pom.xml
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/sharepoint/pom.xml?rev=1477880&r1=1477879&r2=1477880&view=diff
==============================================================================
--- manifoldcf/trunk/connectors/sharepoint/pom.xml (original)
+++ manifoldcf/trunk/connectors/sharepoint/pom.xml Tue Apr 30 23:49:50 2013
@@ -28,21 +28,31 @@
<name>ManifoldCF - Connectors - SharePoint</name>
<build>
- <sourceDirectory>connector/src/main/java</sourceDirectory>
- <testSourceDirectory>connector/src/test/java</testSourceDirectory>
+ <sourceDirectory>${basedir}/src/main/java</sourceDirectory>
+ <testSourceDirectory>${basedir}/src/test/java</testSourceDirectory>
<resources>
<resource>
- <directory>connectors/src/main/resources</directory>
+ <directory>${basedir}/connector/src/main/resources</directory>
+ <includes>
+ <include>**/*.html</include>
+ <include>**/*.js</include>
+ </includes>
</resource>
- </resources>
+ <resource>
+ <directory>${basedir}/connector/src/main/native2ascii</directory>
+ <includes>
+ <include>**/*.properties</include>
+ </includes>
+ </resource>
+ </resources>
+
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>native2ascii-maven-plugin</artifactId>
- <version>1.0-alpha-1</version>
+ <version>1.0-beta-1</version>
<configuration>
- <dest>target/classes</dest>
- <src>connector/src/main/native2ascii</src>
+ <workDir>target/classes</workDir>
</configuration>
<executions>
<execution>
@@ -52,7 +62,9 @@
</goals>
<configuration>
<encoding>UTF8</encoding>
- <includes>**/*.properties</includes>
+ <includes>
+ <include>**/*.properties</include>
+ </includes>
</configuration>
</execution>
</executions>
Modified: manifoldcf/trunk/connectors/solr/pom.xml
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/solr/pom.xml?rev=1477880&r1=1477879&r2=1477880&view=diff
==============================================================================
--- manifoldcf/trunk/connectors/solr/pom.xml (original)
+++ manifoldcf/trunk/connectors/solr/pom.xml Tue Apr 30 23:49:50 2013
@@ -30,14 +30,22 @@
<build>
<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>
+
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>native2ascii-maven-plugin</artifactId>
- <version>1.0-alpha-1</version>
+ <version>1.0-beta-1</version>
<configuration>
- <dest>target/classes</dest>
- <src>connector/src/main/native2ascii</src>
+ <workDir>target/classes</workDir>
</configuration>
<executions>
<execution>
@@ -47,7 +55,9 @@
</goals>
<configuration>
<encoding>UTF8</encoding>
- <includes>**/*.properties</includes>
+ <includes>
+ <include>**/*.properties</include>
+ </includes>
</configuration>
</execution>
</executions>
Modified: manifoldcf/trunk/connectors/webcrawler/pom.xml
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/webcrawler/pom.xml?rev=1477880&r1=1477879&r2=1477880&view=diff
==============================================================================
--- manifoldcf/trunk/connectors/webcrawler/pom.xml (original)
+++ manifoldcf/trunk/connectors/webcrawler/pom.xml Tue Apr 30 23:49:50 2013
@@ -30,14 +30,22 @@
<build>
<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>
+
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>native2ascii-maven-plugin</artifactId>
- <version>1.0-alpha-1</version>
+ <version>1.0-beta-1</version>
<configuration>
- <dest>target/classes</dest>
- <src>connector/src/main/native2ascii</src>
+ <workDir>target/classes</workDir>
</configuration>
<executions>
<execution>
@@ -47,7 +55,9 @@
</goals>
<configuration>
<encoding>UTF8</encoding>
- <includes>**/*.properties</includes>
+ <includes>
+ <include>**/*.properties</include>
+ </includes>
</configuration>
</execution>
</executions>
Propchange: manifoldcf/trunk/connectors/wiki/
------------------------------------------------------------------------------
Merged /manifoldcf/branches/CONNECTORS-586/connectors/wiki:r1477601-1477875
Modified: manifoldcf/trunk/connectors/wiki/pom.xml
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/wiki/pom.xml?rev=1477880&r1=1477879&r2=1477880&view=diff
==============================================================================
--- manifoldcf/trunk/connectors/wiki/pom.xml (original)
+++ manifoldcf/trunk/connectors/wiki/pom.xml Tue Apr 30 23:49:50 2013
@@ -30,14 +30,22 @@
<build>
<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>
+
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>native2ascii-maven-plugin</artifactId>
- <version>1.0-alpha-1</version>
+ <version>1.0-beta-1</version>
<configuration>
- <dest>target/classes</dest>
- <src>connector/src/main/native2ascii</src>
+ <workDir>target/classes</workDir>
</configuration>
<executions>
<execution>
@@ -47,7 +55,9 @@
</goals>
<configuration>
<encoding>UTF8</encoding>
- <includes>**/*.properties</includes>
+ <includes>
+ <include>**/*.properties</include>
+ </includes>
</configuration>
</execution>
</executions>
Propchange: manifoldcf/trunk/framework/combined-service/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Tue Apr 30 23:49:50 2013
@@ -0,0 +1 @@
+target
Propchange: manifoldcf/trunk/framework/combined-service/
------------------------------------------------------------------------------
--- svn:ignores (added)
+++ svn:ignores Tue Apr 30 23:49:50 2013
@@ -0,0 +1 @@
+target
Modified: manifoldcf/trunk/framework/ui-core/pom.xml
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/framework/ui-core/pom.xml?rev=1477880&r1=1477879&r2=1477880&view=diff
==============================================================================
--- manifoldcf/trunk/framework/ui-core/pom.xml (original)
+++ manifoldcf/trunk/framework/ui-core/pom.xml Tue Apr 30 23:49:50 2013
@@ -28,14 +28,19 @@
<name>ManifoldCF - Framework - UI Core</name>
<build>
+ <resources>
+ <resource>
+ <directory>src/main/native2ascii</directory>
+ </resource>
+ </resources>
+
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>native2ascii-maven-plugin</artifactId>
- <version>1.0-alpha-1</version>
+ <version>1.0-beta-1</version>
<configuration>
- <dest>target/classes</dest>
- <src>src/main/native2ascii</src>
+ <workDir>target/classes</workDir>
</configuration>
<executions>
<execution>
@@ -45,7 +50,9 @@
</goals>
<configuration>
<encoding>UTF8</encoding>
- <includes>**/*.properties</includes>
+ <includes>
+ <include>**/*.properties</include>
+ </includes>
</configuration>
</execution>
</executions>