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 2011/12/23 00:25:26 UTC
svn commit: r1222509 - in /incubator/lcf/branches/CONNECTORS-335/framework: ./ core/src/main/java/org/apache/manifoldcf/core/i18n/ core/src/main/resource/ core/src/main/resource/org/ core/src/main/resource/org/apache/ core/src/main/resource/org/apache/...

Author: kwright
Date: Thu Dec 22 23:25:25 2011
New Revision: 1222509

URL: http://svn.apache.org/viewvc?rev=1222509&view=rev
Log:
Move everything but the .utf8 files into their proper locations as far as maven is concerned

Added:
    incubator/lcf/branches/CONNECTORS-335/framework/core/src/main/resource/
    incubator/lcf/branches/CONNECTORS-335/framework/core/src/main/resource/org/
    incubator/lcf/branches/CONNECTORS-335/framework/core/src/main/resource/org/apache/
    incubator/lcf/branches/CONNECTORS-335/framework/core/src/main/resource/org/apache/manifoldcf/
    incubator/lcf/branches/CONNECTORS-335/framework/core/src/main/resource/org/apache/manifoldcf/core/
    incubator/lcf/branches/CONNECTORS-335/framework/core/src/main/resource/org/apache/manifoldcf/core/i18n/
    incubator/lcf/branches/CONNECTORS-335/framework/core/src/main/resource/org/apache/manifoldcf/core/i18n/common.properties
      - copied unchanged from r1222386, incubator/lcf/branches/CONNECTORS-335/framework/core/src/main/java/org/apache/manifoldcf/core/i18n/common.properties
    incubator/lcf/branches/CONNECTORS-335/framework/core/src/main/resource/org/apache/manifoldcf/core/i18n/common_en_US.properties
      - copied unchanged from r1222386, incubator/lcf/branches/CONNECTORS-335/framework/core/src/main/java/org/apache/manifoldcf/core/i18n/common_en_US.properties
    incubator/lcf/branches/CONNECTORS-335/framework/core/src/main/resource/org/apache/manifoldcf/core/i18n/common_ja_JP.properties
      - copied unchanged from r1222386, incubator/lcf/branches/CONNECTORS-335/framework/core/src/main/java/org/apache/manifoldcf/core/i18n/common_ja_JP.properties
    incubator/lcf/branches/CONNECTORS-335/framework/crawler-ui/src/main/resources/
    incubator/lcf/branches/CONNECTORS-335/framework/crawler-ui/src/main/resources/messages.properties
      - copied unchanged from r1222386, incubator/lcf/branches/CONNECTORS-335/framework/crawler-ui/src/main/webapp/WEB-INF/classes/messages.properties
    incubator/lcf/branches/CONNECTORS-335/framework/crawler-ui/src/main/resources/messages_en.properties
      - copied unchanged from r1222386, incubator/lcf/branches/CONNECTORS-335/framework/crawler-ui/src/main/webapp/WEB-INF/classes/messages_en.properties
    incubator/lcf/branches/CONNECTORS-335/framework/crawler-ui/src/main/resources/messages_ja.properties
      - copied unchanged from r1222386, incubator/lcf/branches/CONNECTORS-335/framework/crawler-ui/src/main/webapp/WEB-INF/classes/messages_ja.properties
Removed:
    incubator/lcf/branches/CONNECTORS-335/framework/core/src/main/java/org/apache/manifoldcf/core/i18n/common.properties
    incubator/lcf/branches/CONNECTORS-335/framework/core/src/main/java/org/apache/manifoldcf/core/i18n/common_en_US.properties
    incubator/lcf/branches/CONNECTORS-335/framework/core/src/main/java/org/apache/manifoldcf/core/i18n/common_ja_JP.properties
    incubator/lcf/branches/CONNECTORS-335/framework/crawler-ui/src/main/webapp/WEB-INF/classes/messages.properties
    incubator/lcf/branches/CONNECTORS-335/framework/crawler-ui/src/main/webapp/WEB-INF/classes/messages_en.properties
    incubator/lcf/branches/CONNECTORS-335/framework/crawler-ui/src/main/webapp/WEB-INF/classes/messages_ja.properties
Modified:
    incubator/lcf/branches/CONNECTORS-335/framework/build.xml

Modified: incubator/lcf/branches/CONNECTORS-335/framework/build.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/branches/CONNECTORS-335/framework/build.xml?rev=1222509&r1=1222508&r2=1222509&view=diff
==============================================================================
--- incubator/lcf/branches/CONNECTORS-335/framework/build.xml (original)
+++ incubator/lcf/branches/CONNECTORS-335/framework/build.xml Thu Dec 22 23:25:25 2011
@@ -55,9 +55,6 @@
             </classpath>
         </javac>
         <native2ascii encoding="UTF-8" src="core/src/main/java" dest="core/src/main/java" ext="" includes="**/*.utf8" />
-        <copy todir="build/core/classes">
-             <fileset dir="core/src/main/java" includes="**/*.properties"/>
-        </copy>
     </target>
 
     <target name="compile-ui-core" depends="compile-core">
@@ -170,8 +167,6 @@
                 <pathelement location="${java.home}/../lib/tools.jar"/>
                 <fileset dir="lib"> 
                     <include name="*.jar"/> 
-
-
                 </fileset>
                 <pathelement location="build/core/classes"/>
                 <pathelement location="build/ui-core/classes"/>
@@ -205,7 +200,10 @@
 
     <target name="jar-core" depends="compile-core">
         <mkdir dir="build/jar"/>
-        <jar destfile="build/jar/mcf-core.jar" basedir="build/core/classes"/>
+        <jar destfile="build/jar/mcf-core.jar">
+          <fileset dir="build/core/classes"/>
+          <fileset dir="core/src/main/resource"/>
+        </jar>
     </target>
 
     <target name="jar-ui-core" depends="compile-ui-core">
@@ -358,9 +356,7 @@
         </copy>
         <mkdir dir="build/webapp/crawler-ui/WEB-INF/classes"/>
         <copy todir="build/webapp/crawler-ui/WEB-INF/classes">
-            <fileset dir="crawler-ui/src/main/webapp/WEB-INF/classes">
-                <include name="*.properties"/>
-            </fileset>
+            <fileset dir="crawler-ui/src/main/resources"/>
         </copy>
         <copy todir="build/webapp/crawler-ui">
             <fileset dir="crawler-ui/src/main/webapp" includes="**/*.jsp,**/*.css,**/*.png,**/*.html"/>