manifoldcf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kwri...@apache.org
Subject svn commit: r1477881 - in /manifoldcf/branches/release-1.2-branch: ./ connectors/activedirectory/ connectors/alfresco/ connectors/cmis/ connectors/dropbox/ connectors/elasticsearch/ connectors/filesystem/ connectors/gts/ connectors/jcifs/ connectors/jd...
Date Tue, 30 Apr 2013 23:51:44 GMT
Author: kwright
Date: Tue Apr 30 23:51:43 2013
New Revision: 1477881

URL: http://svn.apache.org/r1477881
Log:
Pull up fix for CONNECTORS-586 from trunk.

Modified:
    manifoldcf/branches/release-1.2-branch/   (props changed)
    manifoldcf/branches/release-1.2-branch/CHANGES.txt
    manifoldcf/branches/release-1.2-branch/connectors/activedirectory/pom.xml
    manifoldcf/branches/release-1.2-branch/connectors/alfresco/pom.xml
    manifoldcf/branches/release-1.2-branch/connectors/cmis/pom.xml
    manifoldcf/branches/release-1.2-branch/connectors/dropbox/pom.xml
    manifoldcf/branches/release-1.2-branch/connectors/elasticsearch/pom.xml
    manifoldcf/branches/release-1.2-branch/connectors/filesystem/pom.xml
    manifoldcf/branches/release-1.2-branch/connectors/gts/pom.xml
    manifoldcf/branches/release-1.2-branch/connectors/jcifs/pom.xml
    manifoldcf/branches/release-1.2-branch/connectors/jdbc/pom.xml
    manifoldcf/branches/release-1.2-branch/connectors/ldap/pom.xml
    manifoldcf/branches/release-1.2-branch/connectors/nullauthority/pom.xml
    manifoldcf/branches/release-1.2-branch/connectors/nulloutput/pom.xml
    manifoldcf/branches/release-1.2-branch/connectors/opensearchserver/pom.xml
    manifoldcf/branches/release-1.2-branch/connectors/rss/   (props changed)
    manifoldcf/branches/release-1.2-branch/connectors/rss/pom.xml
    manifoldcf/branches/release-1.2-branch/connectors/sharepoint/   (props changed)
    manifoldcf/branches/release-1.2-branch/connectors/sharepoint/pom.xml
    manifoldcf/branches/release-1.2-branch/connectors/solr/pom.xml
    manifoldcf/branches/release-1.2-branch/connectors/webcrawler/pom.xml
    manifoldcf/branches/release-1.2-branch/connectors/wiki/   (props changed)
    manifoldcf/branches/release-1.2-branch/connectors/wiki/pom.xml
    manifoldcf/branches/release-1.2-branch/framework/combined-service/   (props changed)
    manifoldcf/branches/release-1.2-branch/framework/ui-core/pom.xml

Propchange: manifoldcf/branches/release-1.2-branch/
------------------------------------------------------------------------------
  Merged /manifoldcf/branches/CONNECTORS-586:r1477601-1477875
  Merged /manifoldcf/trunk:r1477880

Modified: manifoldcf/branches/release-1.2-branch/CHANGES.txt
URL: http://svn.apache.org/viewvc/manifoldcf/branches/release-1.2-branch/CHANGES.txt?rev=1477881&r1=1477880&r2=1477881&view=diff
==============================================================================
--- manifoldcf/branches/release-1.2-branch/CHANGES.txt (original)
+++ manifoldcf/branches/release-1.2-branch/CHANGES.txt Tue Apr 30 23:51:43 2013
@@ -3,6 +3,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/branches/release-1.2-branch/connectors/activedirectory/pom.xml
URL: http://svn.apache.org/viewvc/manifoldcf/branches/release-1.2-branch/connectors/activedirectory/pom.xml?rev=1477881&r1=1477880&r2=1477881&view=diff
==============================================================================
--- manifoldcf/branches/release-1.2-branch/connectors/activedirectory/pom.xml (original)
+++ manifoldcf/branches/release-1.2-branch/connectors/activedirectory/pom.xml Tue Apr 30 23:51:43
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/branches/release-1.2-branch/connectors/alfresco/pom.xml
URL: http://svn.apache.org/viewvc/manifoldcf/branches/release-1.2-branch/connectors/alfresco/pom.xml?rev=1477881&r1=1477880&r2=1477881&view=diff
==============================================================================
--- manifoldcf/branches/release-1.2-branch/connectors/alfresco/pom.xml (original)
+++ manifoldcf/branches/release-1.2-branch/connectors/alfresco/pom.xml Tue Apr 30 23:51:43
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/branches/release-1.2-branch/connectors/cmis/pom.xml
URL: http://svn.apache.org/viewvc/manifoldcf/branches/release-1.2-branch/connectors/cmis/pom.xml?rev=1477881&r1=1477880&r2=1477881&view=diff
==============================================================================
--- manifoldcf/branches/release-1.2-branch/connectors/cmis/pom.xml (original)
+++ manifoldcf/branches/release-1.2-branch/connectors/cmis/pom.xml Tue Apr 30 23:51:43 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/branches/release-1.2-branch/connectors/dropbox/pom.xml
URL: http://svn.apache.org/viewvc/manifoldcf/branches/release-1.2-branch/connectors/dropbox/pom.xml?rev=1477881&r1=1477880&r2=1477881&view=diff
==============================================================================
--- manifoldcf/branches/release-1.2-branch/connectors/dropbox/pom.xml (original)
+++ manifoldcf/branches/release-1.2-branch/connectors/dropbox/pom.xml Tue Apr 30 23:51:43
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/branches/release-1.2-branch/connectors/elasticsearch/pom.xml
URL: http://svn.apache.org/viewvc/manifoldcf/branches/release-1.2-branch/connectors/elasticsearch/pom.xml?rev=1477881&r1=1477880&r2=1477881&view=diff
==============================================================================
--- manifoldcf/branches/release-1.2-branch/connectors/elasticsearch/pom.xml (original)
+++ manifoldcf/branches/release-1.2-branch/connectors/elasticsearch/pom.xml Tue Apr 30 23:51:43
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/branches/release-1.2-branch/connectors/filesystem/pom.xml
URL: http://svn.apache.org/viewvc/manifoldcf/branches/release-1.2-branch/connectors/filesystem/pom.xml?rev=1477881&r1=1477880&r2=1477881&view=diff
==============================================================================
--- manifoldcf/branches/release-1.2-branch/connectors/filesystem/pom.xml (original)
+++ manifoldcf/branches/release-1.2-branch/connectors/filesystem/pom.xml Tue Apr 30 23:51:43
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/branches/release-1.2-branch/connectors/gts/pom.xml
URL: http://svn.apache.org/viewvc/manifoldcf/branches/release-1.2-branch/connectors/gts/pom.xml?rev=1477881&r1=1477880&r2=1477881&view=diff
==============================================================================
--- manifoldcf/branches/release-1.2-branch/connectors/gts/pom.xml (original)
+++ manifoldcf/branches/release-1.2-branch/connectors/gts/pom.xml Tue Apr 30 23:51:43 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/branches/release-1.2-branch/connectors/jcifs/pom.xml
URL: http://svn.apache.org/viewvc/manifoldcf/branches/release-1.2-branch/connectors/jcifs/pom.xml?rev=1477881&r1=1477880&r2=1477881&view=diff
==============================================================================
--- manifoldcf/branches/release-1.2-branch/connectors/jcifs/pom.xml (original)
+++ manifoldcf/branches/release-1.2-branch/connectors/jcifs/pom.xml Tue Apr 30 23:51:43 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/branches/release-1.2-branch/connectors/jdbc/pom.xml
URL: http://svn.apache.org/viewvc/manifoldcf/branches/release-1.2-branch/connectors/jdbc/pom.xml?rev=1477881&r1=1477880&r2=1477881&view=diff
==============================================================================
--- manifoldcf/branches/release-1.2-branch/connectors/jdbc/pom.xml (original)
+++ manifoldcf/branches/release-1.2-branch/connectors/jdbc/pom.xml Tue Apr 30 23:51:43 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/branches/release-1.2-branch/connectors/ldap/pom.xml
URL: http://svn.apache.org/viewvc/manifoldcf/branches/release-1.2-branch/connectors/ldap/pom.xml?rev=1477881&r1=1477880&r2=1477881&view=diff
==============================================================================
--- manifoldcf/branches/release-1.2-branch/connectors/ldap/pom.xml (original)
+++ manifoldcf/branches/release-1.2-branch/connectors/ldap/pom.xml Tue Apr 30 23:51:43 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/branches/release-1.2-branch/connectors/nullauthority/pom.xml
URL: http://svn.apache.org/viewvc/manifoldcf/branches/release-1.2-branch/connectors/nullauthority/pom.xml?rev=1477881&r1=1477880&r2=1477881&view=diff
==============================================================================
--- manifoldcf/branches/release-1.2-branch/connectors/nullauthority/pom.xml (original)
+++ manifoldcf/branches/release-1.2-branch/connectors/nullauthority/pom.xml Tue Apr 30 23:51:43
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/branches/release-1.2-branch/connectors/nulloutput/pom.xml
URL: http://svn.apache.org/viewvc/manifoldcf/branches/release-1.2-branch/connectors/nulloutput/pom.xml?rev=1477881&r1=1477880&r2=1477881&view=diff
==============================================================================
--- manifoldcf/branches/release-1.2-branch/connectors/nulloutput/pom.xml (original)
+++ manifoldcf/branches/release-1.2-branch/connectors/nulloutput/pom.xml Tue Apr 30 23:51:43
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/branches/release-1.2-branch/connectors/opensearchserver/pom.xml
URL: http://svn.apache.org/viewvc/manifoldcf/branches/release-1.2-branch/connectors/opensearchserver/pom.xml?rev=1477881&r1=1477880&r2=1477881&view=diff
==============================================================================
--- manifoldcf/branches/release-1.2-branch/connectors/opensearchserver/pom.xml (original)
+++ manifoldcf/branches/release-1.2-branch/connectors/opensearchserver/pom.xml Tue Apr 30
23:51:43 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/branches/release-1.2-branch/connectors/rss/
------------------------------------------------------------------------------
  Merged /manifoldcf/branches/CONNECTORS-586/connectors/rss:r1477601-1477875
  Merged /manifoldcf/trunk/connectors/rss:r1477880

Modified: manifoldcf/branches/release-1.2-branch/connectors/rss/pom.xml
URL: http://svn.apache.org/viewvc/manifoldcf/branches/release-1.2-branch/connectors/rss/pom.xml?rev=1477881&r1=1477880&r2=1477881&view=diff
==============================================================================
--- manifoldcf/branches/release-1.2-branch/connectors/rss/pom.xml (original)
+++ manifoldcf/branches/release-1.2-branch/connectors/rss/pom.xml Tue Apr 30 23:51:43 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/branches/release-1.2-branch/connectors/sharepoint/
------------------------------------------------------------------------------
  Merged /manifoldcf/trunk/connectors/sharepoint:r1477880
  Merged /manifoldcf/branches/CONNECTORS-586/connectors/sharepoint:r1477601-1477875

Modified: manifoldcf/branches/release-1.2-branch/connectors/sharepoint/pom.xml
URL: http://svn.apache.org/viewvc/manifoldcf/branches/release-1.2-branch/connectors/sharepoint/pom.xml?rev=1477881&r1=1477880&r2=1477881&view=diff
==============================================================================
--- manifoldcf/branches/release-1.2-branch/connectors/sharepoint/pom.xml (original)
+++ manifoldcf/branches/release-1.2-branch/connectors/sharepoint/pom.xml Tue Apr 30 23:51:43
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/branches/release-1.2-branch/connectors/solr/pom.xml
URL: http://svn.apache.org/viewvc/manifoldcf/branches/release-1.2-branch/connectors/solr/pom.xml?rev=1477881&r1=1477880&r2=1477881&view=diff
==============================================================================
--- manifoldcf/branches/release-1.2-branch/connectors/solr/pom.xml (original)
+++ manifoldcf/branches/release-1.2-branch/connectors/solr/pom.xml Tue Apr 30 23:51:43 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/branches/release-1.2-branch/connectors/webcrawler/pom.xml
URL: http://svn.apache.org/viewvc/manifoldcf/branches/release-1.2-branch/connectors/webcrawler/pom.xml?rev=1477881&r1=1477880&r2=1477881&view=diff
==============================================================================
--- manifoldcf/branches/release-1.2-branch/connectors/webcrawler/pom.xml (original)
+++ manifoldcf/branches/release-1.2-branch/connectors/webcrawler/pom.xml Tue Apr 30 23:51:43
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/branches/release-1.2-branch/connectors/wiki/
------------------------------------------------------------------------------
  Reverse-merged /incubator/lcf/branches/CONNECTORS-256/connectors/wiki:r1172896-1182809
  Merged /manifoldcf/branches/CONNECTORS-586/connectors/wiki:r1477601-1477875
  Merged /manifoldcf/trunk/connectors/wiki:r1477880

Modified: manifoldcf/branches/release-1.2-branch/connectors/wiki/pom.xml
URL: http://svn.apache.org/viewvc/manifoldcf/branches/release-1.2-branch/connectors/wiki/pom.xml?rev=1477881&r1=1477880&r2=1477881&view=diff
==============================================================================
--- manifoldcf/branches/release-1.2-branch/connectors/wiki/pom.xml (original)
+++ manifoldcf/branches/release-1.2-branch/connectors/wiki/pom.xml Tue Apr 30 23:51:43 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/branches/release-1.2-branch/framework/combined-service/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Tue Apr 30 23:51:43 2013
@@ -0,0 +1 @@
+target

Propchange: manifoldcf/branches/release-1.2-branch/framework/combined-service/
------------------------------------------------------------------------------
--- svn:ignores (added)
+++ svn:ignores Tue Apr 30 23:51:43 2013
@@ -0,0 +1 @@
+target

Modified: manifoldcf/branches/release-1.2-branch/framework/ui-core/pom.xml
URL: http://svn.apache.org/viewvc/manifoldcf/branches/release-1.2-branch/framework/ui-core/pom.xml?rev=1477881&r1=1477880&r2=1477881&view=diff
==============================================================================
--- manifoldcf/branches/release-1.2-branch/framework/ui-core/pom.xml (original)
+++ manifoldcf/branches/release-1.2-branch/framework/ui-core/pom.xml Tue Apr 30 23:51:43 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>



Mime
View raw message