manifoldcf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kwri...@apache.org
Subject svn commit: r1222533 - in /incubator/lcf/branches/CONNECTORS-335/framework: ./ core/src/main/java/org/apache/manifoldcf/core/i18n/ core/src/main/resource/org/apache/manifoldcf/core/i18n/ crawler-ui/src/main/resource/ crawler-ui/src/main/resources/ craw...
Date Fri, 23 Dec 2011 02:44:42 GMT
Author: kwright
Date: Fri Dec 23 02:44:41 2011
New Revision: 1222533

URL: http://svn.apache.org/viewvc?rev=1222533&view=rev
Log:
Standardize on .utf8 files as being the 'true source', and autogenerate the .properties files
during build.

Added:
    incubator/lcf/branches/CONNECTORS-335/framework/core/src/main/resource/org/apache/manifoldcf/core/i18n/common.properties.utf8
      - copied unchanged from r1222517, incubator/lcf/branches/CONNECTORS-335/framework/core/src/main/resource/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.utf8
      - copied unchanged from r1222517, incubator/lcf/branches/CONNECTORS-335/framework/core/src/main/resource/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.utf8
      - copied unchanged from r1222517, incubator/lcf/branches/CONNECTORS-335/framework/core/src/main/java/org/apache/manifoldcf/core/i18n/common_ja_JP.properties.utf8
    incubator/lcf/branches/CONNECTORS-335/framework/crawler-ui/src/main/resource/   (props
changed)
      - copied from r1222517, incubator/lcf/branches/CONNECTORS-335/framework/crawler-ui/src/main/resources/
    incubator/lcf/branches/CONNECTORS-335/framework/crawler-ui/src/main/resource/messages.properties.utf8
      - copied unchanged from r1222517, incubator/lcf/branches/CONNECTORS-335/framework/crawler-ui/src/main/resources/messages.properties
    incubator/lcf/branches/CONNECTORS-335/framework/crawler-ui/src/main/resource/messages_en.properties.utf8
      - copied unchanged from r1222517, incubator/lcf/branches/CONNECTORS-335/framework/crawler-ui/src/main/resources/messages_en.properties
    incubator/lcf/branches/CONNECTORS-335/framework/crawler-ui/src/main/resource/messages_ja.properties.utf8
      - copied unchanged from r1222517, incubator/lcf/branches/CONNECTORS-335/framework/crawler-ui/src/main/webapp/WEB-INF/classes/messages_ja.properties.utf8
Removed:
    incubator/lcf/branches/CONNECTORS-335/framework/core/src/main/java/org/apache/manifoldcf/core/i18n/common_ja_JP.properties.utf8
    incubator/lcf/branches/CONNECTORS-335/framework/core/src/main/resource/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
    incubator/lcf/branches/CONNECTORS-335/framework/core/src/main/resource/org/apache/manifoldcf/core/i18n/common_ja_JP.properties
    incubator/lcf/branches/CONNECTORS-335/framework/crawler-ui/src/main/resource/messages.properties
    incubator/lcf/branches/CONNECTORS-335/framework/crawler-ui/src/main/resource/messages_en.properties
    incubator/lcf/branches/CONNECTORS-335/framework/crawler-ui/src/main/resource/messages_ja.properties
    incubator/lcf/branches/CONNECTORS-335/framework/crawler-ui/src/main/resources/
    incubator/lcf/branches/CONNECTORS-335/framework/crawler-ui/src/main/webapp/WEB-INF/classes/
Modified:
    incubator/lcf/branches/CONNECTORS-335/framework/build.xml
    incubator/lcf/branches/CONNECTORS-335/framework/core/src/main/resource/org/apache/manifoldcf/core/i18n/
  (props changed)

Modified: incubator/lcf/branches/CONNECTORS-335/framework/build.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/branches/CONNECTORS-335/framework/build.xml?rev=1222533&r1=1222532&r2=1222533&view=diff
==============================================================================
--- incubator/lcf/branches/CONNECTORS-335/framework/build.xml (original)
+++ incubator/lcf/branches/CONNECTORS-335/framework/build.xml Fri Dec 23 02:44:41 2011
@@ -18,13 +18,17 @@
 <project default="all">
 
     <target name="clean">
-        <delete dir="build"/>
-        <delete dir="dist"/>
-        <delete dir="test-output"/>
-        <delete dir="test-output-postgresql"/>
-        <delete dir="test-output-mysql"/>
-        <delete dir="test-output-HSQLDB"/>
-        <delete dir="test-output-HSQLDBext"/>
+      <delete dir="build"/>
+      <delete dir="dist"/>
+      <delete dir="test-output"/>
+      <delete dir="test-output-postgresql"/>
+      <delete dir="test-output-mysql"/>
+      <delete dir="test-output-HSQLDB"/>
+      <delete dir="test-output-HSQLDBext"/>
+      <delete>
+	<fileset dir="core/src/main/resource" includes="**/*.properties"/>
+	<fileset dir="crawler-ui/src/main/resource" includes="**/*.properties"/>
+      </delete>
     </target>
     
     <target name="doc">
@@ -54,7 +58,7 @@
                 </fileset>
             </classpath>
         </javac>
-        <native2ascii encoding="UTF-8" src="core/src/main/java" dest="core/src/main/java"
ext="" includes="**/*.utf8" />
+        <native2ascii encoding="UTF-8" src="core/src/main/resource" dest="core/src/main/resource"
ext="" includes="**/*.utf8" />
     </target>
 
     <target name="compile-ui-core" depends="compile-core">
@@ -195,14 +199,16 @@
             </classpath>
 
         </javac>
-        <native2ascii encoding="UTF-8" src="crawler-ui/src/main/webapp/WEB-INF/classes"
dest="crawler-ui/src/main/webapp/WEB-INF/classes" ext="" includes="**/*.utf8"/>
+        <native2ascii encoding="UTF-8" src="crawler-ui/src/main/resource" dest="crawler-ui/src/main/resource"
ext="" includes="**/*.utf8"/>
     </target>
 
     <target name="jar-core" depends="compile-core">
         <mkdir dir="build/jar"/>
         <jar destfile="build/jar/mcf-core.jar">
           <fileset dir="build/core/classes"/>
-          <fileset dir="core/src/main/resource"/>
+          <fileset dir="core/src/main/resource">
+	  <include name="**/*.properties"/>
+	</fileset>
         </jar>
     </target>
 
@@ -356,7 +362,9 @@
         </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/resources"/>
+            <fileset dir="crawler-ui/src/main/resource">
+	      <include name="**/*.properties"/>
+	  </fileset>
         </copy>
         <copy todir="build/webapp/crawler-ui">
             <fileset dir="crawler-ui/src/main/webapp" includes="**/*.jsp,**/*.css,**/*.png,**/*.html"/>

Propchange: incubator/lcf/branches/CONNECTORS-335/framework/core/src/main/resource/org/apache/manifoldcf/core/i18n/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri Dec 23 02:44:41 2011
@@ -0,0 +1 @@
+*.properties

Propchange: incubator/lcf/branches/CONNECTORS-335/framework/crawler-ui/src/main/resource/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri Dec 23 02:44:41 2011
@@ -0,0 +1 @@
+*.properties



Mime
View raw message