incubator-connectors-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kwri...@apache.org
Subject svn commit: r1225063 [1/10] - in /incubator/lcf/trunk: ./ connectors/activedirectory/ connectors/activedirectory/connector/src/main/java/org/apache/manifoldcf/authorities/authorities/activedirectory/ connectors/activedirectory/connector/src/main/native...
Date Wed, 28 Dec 2011 00:42:25 GMT
Author: kwright
Date: Wed Dec 28 00:42:19 2011
New Revision: 1225063

URL: http://svn.apache.org/viewvc?rev=1225063&view=rev
Log:
Add internationalization support, and English and Japanese localization.  (CONNECTORS-335).  Commit includes major contributions from Hitoshi Ozawa.

Added:
    incubator/lcf/trunk/connectors/activedirectory/connector/src/main/java/org/apache/manifoldcf/authorities/authorities/activedirectory/Messages.java
      - copied unchanged from r1225060, incubator/lcf/branches/CONNECTORS-335/connectors/activedirectory/connector/src/main/java/org/apache/manifoldcf/authorities/authorities/activedirectory/Messages.java
    incubator/lcf/trunk/connectors/activedirectory/connector/src/main/native2ascii/
      - copied from r1225060, incubator/lcf/branches/CONNECTORS-335/connectors/activedirectory/connector/src/main/native2ascii/
    incubator/lcf/trunk/connectors/activedirectory/connector/src/main/resource/
      - copied from r1225060, incubator/lcf/branches/CONNECTORS-335/connectors/activedirectory/connector/src/main/resource/
    incubator/lcf/trunk/connectors/alfresco/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/alfresco/Messages.java
      - copied unchanged from r1225060, incubator/lcf/branches/CONNECTORS-335/connectors/alfresco/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/alfresco/Messages.java
    incubator/lcf/trunk/connectors/alfresco/connector/src/main/native2ascii/
      - copied from r1225060, incubator/lcf/branches/CONNECTORS-335/connectors/alfresco/connector/src/main/native2ascii/
    incubator/lcf/trunk/connectors/alfresco/connector/src/main/resource/org/apache/manifoldcf/crawler/connectors/alfresco/common_en_US.properties.utf8
      - copied unchanged from r1225060, incubator/lcf/branches/CONNECTORS-335/connectors/alfresco/connector/src/main/resource/org/apache/manifoldcf/crawler/connectors/alfresco/common_en_US.properties.utf8
    incubator/lcf/trunk/connectors/alfresco/connector/src/main/resource/org/apache/manifoldcf/crawler/connectors/alfresco/common_ja_JP.properties.utf8
      - copied unchanged from r1225060, incubator/lcf/branches/CONNECTORS-335/connectors/alfresco/connector/src/main/resource/org/apache/manifoldcf/crawler/connectors/alfresco/common_ja_JP.properties.utf8
    incubator/lcf/trunk/connectors/alfresco/connector/src/main/resource/org/apache/manifoldcf/crawler/connectors/alfresco/editConfiguration_en_US.html
      - copied unchanged from r1225060, incubator/lcf/branches/CONNECTORS-335/connectors/alfresco/connector/src/main/resource/org/apache/manifoldcf/crawler/connectors/alfresco/editConfiguration_en_US.html
    incubator/lcf/trunk/connectors/alfresco/connector/src/main/resource/org/apache/manifoldcf/crawler/connectors/alfresco/editConfiguration_en_US.js
      - copied unchanged from r1225060, incubator/lcf/branches/CONNECTORS-335/connectors/alfresco/connector/src/main/resource/org/apache/manifoldcf/crawler/connectors/alfresco/editConfiguration_en_US.js
    incubator/lcf/trunk/connectors/alfresco/connector/src/main/resource/org/apache/manifoldcf/crawler/connectors/alfresco/editSpecification_en_US.html
      - copied unchanged from r1225060, incubator/lcf/branches/CONNECTORS-335/connectors/alfresco/connector/src/main/resource/org/apache/manifoldcf/crawler/connectors/alfresco/editSpecification_en_US.html
    incubator/lcf/trunk/connectors/alfresco/connector/src/main/resource/org/apache/manifoldcf/crawler/connectors/alfresco/editSpecification_en_US.js
      - copied unchanged from r1225060, incubator/lcf/branches/CONNECTORS-335/connectors/alfresco/connector/src/main/resource/org/apache/manifoldcf/crawler/connectors/alfresco/editSpecification_en_US.js
    incubator/lcf/trunk/connectors/alfresco/connector/src/main/resource/org/apache/manifoldcf/crawler/connectors/alfresco/hiddenConfiguration_en_US.html
      - copied unchanged from r1225060, incubator/lcf/branches/CONNECTORS-335/connectors/alfresco/connector/src/main/resource/org/apache/manifoldcf/crawler/connectors/alfresco/hiddenConfiguration_en_US.html
    incubator/lcf/trunk/connectors/alfresco/connector/src/main/resource/org/apache/manifoldcf/crawler/connectors/alfresco/hiddenSpecification_en_US.html
      - copied unchanged from r1225060, incubator/lcf/branches/CONNECTORS-335/connectors/alfresco/connector/src/main/resource/org/apache/manifoldcf/crawler/connectors/alfresco/hiddenSpecification_en_US.html
    incubator/lcf/trunk/connectors/alfresco/connector/src/main/resource/org/apache/manifoldcf/crawler/connectors/alfresco/viewConfiguration_en_US.html
      - copied unchanged from r1225060, incubator/lcf/branches/CONNECTORS-335/connectors/alfresco/connector/src/main/resource/org/apache/manifoldcf/crawler/connectors/alfresco/viewConfiguration_en_US.html
    incubator/lcf/trunk/connectors/alfresco/connector/src/main/resource/org/apache/manifoldcf/crawler/connectors/alfresco/viewSpecification_en_US.html
      - copied unchanged from r1225060, incubator/lcf/branches/CONNECTORS-335/connectors/alfresco/connector/src/main/resource/org/apache/manifoldcf/crawler/connectors/alfresco/viewSpecification_en_US.html
    incubator/lcf/trunk/connectors/cmis/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/cmis/Messages.java
      - copied unchanged from r1225060, incubator/lcf/branches/CONNECTORS-335/connectors/cmis/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/cmis/Messages.java
    incubator/lcf/trunk/connectors/cmis/connector/src/main/native2ascii/
      - copied from r1225060, incubator/lcf/branches/CONNECTORS-335/connectors/cmis/connector/src/main/native2ascii/
    incubator/lcf/trunk/connectors/cmis/connector/src/main/resource/org/apache/manifoldcf/crawler/connectors/cmis/editConfiguration_en_US.html
      - copied unchanged from r1225060, incubator/lcf/branches/CONNECTORS-335/connectors/cmis/connector/src/main/resource/org/apache/manifoldcf/crawler/connectors/cmis/editConfiguration_en_US.html
    incubator/lcf/trunk/connectors/cmis/connector/src/main/resource/org/apache/manifoldcf/crawler/connectors/cmis/editConfiguration_en_US.js
      - copied unchanged from r1225060, incubator/lcf/branches/CONNECTORS-335/connectors/cmis/connector/src/main/resource/org/apache/manifoldcf/crawler/connectors/cmis/editConfiguration_en_US.js
    incubator/lcf/trunk/connectors/cmis/connector/src/main/resource/org/apache/manifoldcf/crawler/connectors/cmis/editConfiguration_ja_JP.html
      - copied unchanged from r1225060, incubator/lcf/branches/CONNECTORS-335/connectors/cmis/connector/src/main/resource/org/apache/manifoldcf/crawler/connectors/cmis/editConfiguration_ja_JP.html
    incubator/lcf/trunk/connectors/cmis/connector/src/main/resource/org/apache/manifoldcf/crawler/connectors/cmis/editConfiguration_ja_JP.js
      - copied unchanged from r1225060, incubator/lcf/branches/CONNECTORS-335/connectors/cmis/connector/src/main/resource/org/apache/manifoldcf/crawler/connectors/cmis/editConfiguration_ja_JP.js
    incubator/lcf/trunk/connectors/cmis/connector/src/main/resource/org/apache/manifoldcf/crawler/connectors/cmis/editSpecification_en_US.html
      - copied unchanged from r1225060, incubator/lcf/branches/CONNECTORS-335/connectors/cmis/connector/src/main/resource/org/apache/manifoldcf/crawler/connectors/cmis/editSpecification_en_US.html
    incubator/lcf/trunk/connectors/cmis/connector/src/main/resource/org/apache/manifoldcf/crawler/connectors/cmis/editSpecification_en_US.js
      - copied unchanged from r1225060, incubator/lcf/branches/CONNECTORS-335/connectors/cmis/connector/src/main/resource/org/apache/manifoldcf/crawler/connectors/cmis/editSpecification_en_US.js
    incubator/lcf/trunk/connectors/cmis/connector/src/main/resource/org/apache/manifoldcf/crawler/connectors/cmis/editSpecification_ja_JP.html
      - copied unchanged from r1225060, incubator/lcf/branches/CONNECTORS-335/connectors/cmis/connector/src/main/resource/org/apache/manifoldcf/crawler/connectors/cmis/editSpecification_ja_JP.html
    incubator/lcf/trunk/connectors/cmis/connector/src/main/resource/org/apache/manifoldcf/crawler/connectors/cmis/editSpecification_ja_JP.js
      - copied unchanged from r1225060, incubator/lcf/branches/CONNECTORS-335/connectors/cmis/connector/src/main/resource/org/apache/manifoldcf/crawler/connectors/cmis/editSpecification_ja_JP.js
    incubator/lcf/trunk/connectors/cmis/connector/src/main/resource/org/apache/manifoldcf/crawler/connectors/cmis/hiddenConfiguration_en_US.html
      - copied unchanged from r1225060, incubator/lcf/branches/CONNECTORS-335/connectors/cmis/connector/src/main/resource/org/apache/manifoldcf/crawler/connectors/cmis/hiddenConfiguration_en_US.html
    incubator/lcf/trunk/connectors/cmis/connector/src/main/resource/org/apache/manifoldcf/crawler/connectors/cmis/hiddenConfiguration_ja_JP.html
      - copied unchanged from r1225060, incubator/lcf/branches/CONNECTORS-335/connectors/cmis/connector/src/main/resource/org/apache/manifoldcf/crawler/connectors/cmis/hiddenConfiguration_ja_JP.html
    incubator/lcf/trunk/connectors/cmis/connector/src/main/resource/org/apache/manifoldcf/crawler/connectors/cmis/hiddenSpecification_en_US.html
      - copied unchanged from r1225060, incubator/lcf/branches/CONNECTORS-335/connectors/cmis/connector/src/main/resource/org/apache/manifoldcf/crawler/connectors/cmis/hiddenSpecification_en_US.html
    incubator/lcf/trunk/connectors/cmis/connector/src/main/resource/org/apache/manifoldcf/crawler/connectors/cmis/hiddenSpecification_ja_JP.html
      - copied unchanged from r1225060, incubator/lcf/branches/CONNECTORS-335/connectors/cmis/connector/src/main/resource/org/apache/manifoldcf/crawler/connectors/cmis/hiddenSpecification_ja_JP.html
    incubator/lcf/trunk/connectors/cmis/connector/src/main/resource/org/apache/manifoldcf/crawler/connectors/cmis/viewConfiguration_en_US.html
      - copied unchanged from r1225060, incubator/lcf/branches/CONNECTORS-335/connectors/cmis/connector/src/main/resource/org/apache/manifoldcf/crawler/connectors/cmis/viewConfiguration_en_US.html
    incubator/lcf/trunk/connectors/cmis/connector/src/main/resource/org/apache/manifoldcf/crawler/connectors/cmis/viewConfiguration_ja_JP.html
      - copied unchanged from r1225060, incubator/lcf/branches/CONNECTORS-335/connectors/cmis/connector/src/main/resource/org/apache/manifoldcf/crawler/connectors/cmis/viewConfiguration_ja_JP.html
    incubator/lcf/trunk/connectors/cmis/connector/src/main/resource/org/apache/manifoldcf/crawler/connectors/cmis/viewSpecification_en_US.html
      - copied unchanged from r1225060, incubator/lcf/branches/CONNECTORS-335/connectors/cmis/connector/src/main/resource/org/apache/manifoldcf/crawler/connectors/cmis/viewSpecification_en_US.html
    incubator/lcf/trunk/connectors/cmis/connector/src/main/resource/org/apache/manifoldcf/crawler/connectors/cmis/viewSpecification_ja_JP.html
      - copied unchanged from r1225060, incubator/lcf/branches/CONNECTORS-335/connectors/cmis/connector/src/main/resource/org/apache/manifoldcf/crawler/connectors/cmis/viewSpecification_ja_JP.html
    incubator/lcf/trunk/connectors/documentum/connector/src/main/java/org/apache/manifoldcf/crawler/authorities/DCTM/Messages.java
      - copied unchanged from r1225060, incubator/lcf/branches/CONNECTORS-335/connectors/documentum/connector/src/main/java/org/apache/manifoldcf/crawler/authorities/DCTM/Messages.java
    incubator/lcf/trunk/connectors/documentum/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/DCTM/Messages.java
      - copied unchanged from r1225060, incubator/lcf/branches/CONNECTORS-335/connectors/documentum/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/DCTM/Messages.java
    incubator/lcf/trunk/connectors/documentum/connector/src/main/native2ascii/
      - copied from r1225060, incubator/lcf/branches/CONNECTORS-335/connectors/documentum/connector/src/main/native2ascii/
    incubator/lcf/trunk/connectors/documentum/connector/src/main/resource/
      - copied from r1225060, incubator/lcf/branches/CONNECTORS-335/connectors/documentum/connector/src/main/resource/
    incubator/lcf/trunk/connectors/filenet/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/filenet/Messages.java
      - copied unchanged from r1225060, incubator/lcf/branches/CONNECTORS-335/connectors/filenet/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/filenet/Messages.java
    incubator/lcf/trunk/connectors/filenet/connector/src/main/native2ascii/
      - copied from r1225060, incubator/lcf/branches/CONNECTORS-335/connectors/filenet/connector/src/main/native2ascii/
    incubator/lcf/trunk/connectors/filenet/connector/src/main/resource/
      - copied from r1225060, incubator/lcf/branches/CONNECTORS-335/connectors/filenet/connector/src/main/resource/
    incubator/lcf/trunk/connectors/filesystem/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/filesystem/Messages.java
      - copied unchanged from r1225060, incubator/lcf/branches/CONNECTORS-335/connectors/filesystem/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/filesystem/Messages.java
    incubator/lcf/trunk/connectors/filesystem/connector/src/main/native2ascii/
      - copied from r1225060, incubator/lcf/branches/CONNECTORS-335/connectors/filesystem/connector/src/main/native2ascii/
    incubator/lcf/trunk/connectors/gts/connector/src/main/java/org/apache/manifoldcf/agents/output/gts/Messages.java
      - copied unchanged from r1225060, incubator/lcf/branches/CONNECTORS-335/connectors/gts/connector/src/main/java/org/apache/manifoldcf/agents/output/gts/Messages.java
    incubator/lcf/trunk/connectors/gts/connector/src/main/native2ascii/
      - copied from r1225060, incubator/lcf/branches/CONNECTORS-335/connectors/gts/connector/src/main/native2ascii/
    incubator/lcf/trunk/connectors/gts/connector/src/main/resource/
      - copied from r1225060, incubator/lcf/branches/CONNECTORS-335/connectors/gts/connector/src/main/resource/
    incubator/lcf/trunk/connectors/jcifs/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/sharedrive/Messages.java
      - copied unchanged from r1225060, incubator/lcf/branches/CONNECTORS-335/connectors/jcifs/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/sharedrive/Messages.java
    incubator/lcf/trunk/connectors/jcifs/connector/src/main/native2ascii/
      - copied from r1225060, incubator/lcf/branches/CONNECTORS-335/connectors/jcifs/connector/src/main/native2ascii/
    incubator/lcf/trunk/connectors/jcifs/connector/src/main/resource/
      - copied from r1225060, incubator/lcf/branches/CONNECTORS-335/connectors/jcifs/connector/src/main/resource/
    incubator/lcf/trunk/connectors/jdbc/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/jdbc/Messages.java
      - copied unchanged from r1225060, incubator/lcf/branches/CONNECTORS-335/connectors/jdbc/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/jdbc/Messages.java
    incubator/lcf/trunk/connectors/jdbc/connector/src/main/native2ascii/
      - copied from r1225060, incubator/lcf/branches/CONNECTORS-335/connectors/jdbc/connector/src/main/native2ascii/
    incubator/lcf/trunk/connectors/jdbc/connector/src/main/resource/
      - copied from r1225060, incubator/lcf/branches/CONNECTORS-335/connectors/jdbc/connector/src/main/resource/
    incubator/lcf/trunk/connectors/livelink/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/livelink/Messages.java
      - copied unchanged from r1225060, incubator/lcf/branches/CONNECTORS-335/connectors/livelink/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/livelink/Messages.java
    incubator/lcf/trunk/connectors/livelink/connector/src/main/native2ascii/
      - copied from r1225060, incubator/lcf/branches/CONNECTORS-335/connectors/livelink/connector/src/main/native2ascii/
    incubator/lcf/trunk/connectors/livelink/connector/src/main/resource/
      - copied from r1225060, incubator/lcf/branches/CONNECTORS-335/connectors/livelink/connector/src/main/resource/
    incubator/lcf/trunk/connectors/meridio/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/meridio/Messages.java
      - copied unchanged from r1225060, incubator/lcf/branches/CONNECTORS-335/connectors/meridio/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/meridio/Messages.java
    incubator/lcf/trunk/connectors/meridio/connector/src/main/native2ascii/
      - copied from r1225060, incubator/lcf/branches/CONNECTORS-335/connectors/meridio/connector/src/main/native2ascii/
    incubator/lcf/trunk/connectors/meridio/connector/src/main/resouce/
      - copied from r1225060, incubator/lcf/branches/CONNECTORS-335/connectors/meridio/connector/src/main/resouce/
    incubator/lcf/trunk/connectors/meridio/connector/src/main/resource/
      - copied from r1225060, incubator/lcf/branches/CONNECTORS-335/connectors/meridio/connector/src/main/resource/
    incubator/lcf/trunk/connectors/nullauthority/connector/src/main/java/org/apache/manifoldcf/authorities/authorities/nullauthority/Messages.java
      - copied unchanged from r1225060, incubator/lcf/branches/CONNECTORS-335/connectors/nullauthority/connector/src/main/java/org/apache/manifoldcf/authorities/authorities/nullauthority/Messages.java
    incubator/lcf/trunk/connectors/nullauthority/connector/src/main/native2ascii/
      - copied from r1225060, incubator/lcf/branches/CONNECTORS-335/connectors/nullauthority/connector/src/main/native2ascii/
    incubator/lcf/trunk/connectors/nullauthority/connector/src/main/resource/
      - copied from r1225060, incubator/lcf/branches/CONNECTORS-335/connectors/nullauthority/connector/src/main/resource/
    incubator/lcf/trunk/connectors/nulloutput/connector/src/main/java/org/apache/manifoldcf/agents/output/nullconnector/Messages.java
      - copied unchanged from r1225060, incubator/lcf/branches/CONNECTORS-335/connectors/nulloutput/connector/src/main/java/org/apache/manifoldcf/agents/output/nullconnector/Messages.java
    incubator/lcf/trunk/connectors/nulloutput/connector/src/main/native2ascii/
      - copied from r1225060, incubator/lcf/branches/CONNECTORS-335/connectors/nulloutput/connector/src/main/native2ascii/
    incubator/lcf/trunk/connectors/nulloutput/connector/src/main/resource/
      - copied from r1225060, incubator/lcf/branches/CONNECTORS-335/connectors/nulloutput/connector/src/main/resource/
    incubator/lcf/trunk/connectors/opensearchserver/connector/src/main/java/org/apache/manifoldcf/agents/output/opensearchserver/Messages.java
      - copied unchanged from r1225060, incubator/lcf/branches/CONNECTORS-335/connectors/opensearchserver/connector/src/main/java/org/apache/manifoldcf/agents/output/opensearchserver/Messages.java
    incubator/lcf/trunk/connectors/opensearchserver/connector/src/main/native2ascii/
      - copied from r1225060, incubator/lcf/branches/CONNECTORS-335/connectors/opensearchserver/connector/src/main/native2ascii/
    incubator/lcf/trunk/connectors/opensearchserver/connector/src/main/resource/org/apache/manifoldcf/agents/output/opensearchserver/configuration_en_US.html
      - copied unchanged from r1225060, incubator/lcf/branches/CONNECTORS-335/connectors/opensearchserver/connector/src/main/resource/org/apache/manifoldcf/agents/output/opensearchserver/configuration_en_US.html
    incubator/lcf/trunk/connectors/opensearchserver/connector/src/main/resource/org/apache/manifoldcf/agents/output/opensearchserver/configuration_en_US.js
      - copied unchanged from r1225060, incubator/lcf/branches/CONNECTORS-335/connectors/opensearchserver/connector/src/main/resource/org/apache/manifoldcf/agents/output/opensearchserver/configuration_en_US.js
    incubator/lcf/trunk/connectors/opensearchserver/connector/src/main/resource/org/apache/manifoldcf/agents/output/opensearchserver/configuration_ja_JP.html
      - copied unchanged from r1225060, incubator/lcf/branches/CONNECTORS-335/connectors/opensearchserver/connector/src/main/resource/org/apache/manifoldcf/agents/output/opensearchserver/configuration_ja_JP.html
    incubator/lcf/trunk/connectors/opensearchserver/connector/src/main/resource/org/apache/manifoldcf/agents/output/opensearchserver/configuration_ja_JP.js
      - copied unchanged from r1225060, incubator/lcf/branches/CONNECTORS-335/connectors/opensearchserver/connector/src/main/resource/org/apache/manifoldcf/agents/output/opensearchserver/configuration_ja_JP.js
    incubator/lcf/trunk/connectors/opensearchserver/connector/src/main/resource/org/apache/manifoldcf/agents/output/opensearchserver/specifications_en_US.html
      - copied unchanged from r1225060, incubator/lcf/branches/CONNECTORS-335/connectors/opensearchserver/connector/src/main/resource/org/apache/manifoldcf/agents/output/opensearchserver/specifications_en_US.html
    incubator/lcf/trunk/connectors/opensearchserver/connector/src/main/resource/org/apache/manifoldcf/agents/output/opensearchserver/specifications_en_US.js
      - copied unchanged from r1225060, incubator/lcf/branches/CONNECTORS-335/connectors/opensearchserver/connector/src/main/resource/org/apache/manifoldcf/agents/output/opensearchserver/specifications_en_US.js
    incubator/lcf/trunk/connectors/opensearchserver/connector/src/main/resource/org/apache/manifoldcf/agents/output/opensearchserver/specifications_ja_JP.html
      - copied unchanged from r1225060, incubator/lcf/branches/CONNECTORS-335/connectors/opensearchserver/connector/src/main/resource/org/apache/manifoldcf/agents/output/opensearchserver/specifications_ja_JP.html
    incubator/lcf/trunk/connectors/opensearchserver/connector/src/main/resource/org/apache/manifoldcf/agents/output/opensearchserver/specifications_ja_JP.js
      - copied unchanged from r1225060, incubator/lcf/branches/CONNECTORS-335/connectors/opensearchserver/connector/src/main/resource/org/apache/manifoldcf/agents/output/opensearchserver/specifications_ja_JP.js
    incubator/lcf/trunk/connectors/opensearchserver/connector/src/main/resource/org/apache/manifoldcf/agents/output/opensearchserver/viewSpec_en_US.html
      - copied unchanged from r1225060, incubator/lcf/branches/CONNECTORS-335/connectors/opensearchserver/connector/src/main/resource/org/apache/manifoldcf/agents/output/opensearchserver/viewSpec_en_US.html
    incubator/lcf/trunk/connectors/opensearchserver/connector/src/main/resource/org/apache/manifoldcf/agents/output/opensearchserver/viewSpec_ja_JP.html
      - copied unchanged from r1225060, incubator/lcf/branches/CONNECTORS-335/connectors/opensearchserver/connector/src/main/resource/org/apache/manifoldcf/agents/output/opensearchserver/viewSpec_ja_JP.html
    incubator/lcf/trunk/connectors/opensearchserver/connector/src/main/resource/org/apache/manifoldcf/agents/output/opensearchserver/view_en_US.html
      - copied unchanged from r1225060, incubator/lcf/branches/CONNECTORS-335/connectors/opensearchserver/connector/src/main/resource/org/apache/manifoldcf/agents/output/opensearchserver/view_en_US.html
    incubator/lcf/trunk/connectors/opensearchserver/connector/src/main/resource/org/apache/manifoldcf/agents/output/opensearchserver/view_ja_JP.html
      - copied unchanged from r1225060, incubator/lcf/branches/CONNECTORS-335/connectors/opensearchserver/connector/src/main/resource/org/apache/manifoldcf/agents/output/opensearchserver/view_ja_JP.html
    incubator/lcf/trunk/connectors/rss/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/rss/Messages.java
      - copied unchanged from r1225060, incubator/lcf/branches/CONNECTORS-335/connectors/rss/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/rss/Messages.java
    incubator/lcf/trunk/connectors/rss/connector/src/main/native2ascii/
      - copied from r1225060, incubator/lcf/branches/CONNECTORS-335/connectors/rss/connector/src/main/native2ascii/
    incubator/lcf/trunk/connectors/rss/connector/src/main/resource/
      - copied from r1225060, incubator/lcf/branches/CONNECTORS-335/connectors/rss/connector/src/main/resource/
    incubator/lcf/trunk/connectors/sharepoint/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/sharepoint/Messages.java
      - copied unchanged from r1225060, incubator/lcf/branches/CONNECTORS-335/connectors/sharepoint/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/sharepoint/Messages.java
    incubator/lcf/trunk/connectors/sharepoint/connector/src/main/native2ascii/
      - copied from r1225060, incubator/lcf/branches/CONNECTORS-335/connectors/sharepoint/connector/src/main/native2ascii/
    incubator/lcf/trunk/connectors/sharepoint/connector/src/main/resource/
      - copied from r1225060, incubator/lcf/branches/CONNECTORS-335/connectors/sharepoint/connector/src/main/resource/
    incubator/lcf/trunk/connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/Messages.java
      - copied unchanged from r1225060, incubator/lcf/branches/CONNECTORS-335/connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/Messages.java
    incubator/lcf/trunk/connectors/solr/connector/src/main/native2ascii/
      - copied from r1225060, incubator/lcf/branches/CONNECTORS-335/connectors/solr/connector/src/main/native2ascii/
    incubator/lcf/trunk/connectors/webcrawler/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/webcrawler/Messages.java
      - copied unchanged from r1225060, incubator/lcf/branches/CONNECTORS-335/connectors/webcrawler/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/webcrawler/Messages.java
    incubator/lcf/trunk/connectors/webcrawler/connector/src/main/native2ascii/
      - copied from r1225060, incubator/lcf/branches/CONNECTORS-335/connectors/webcrawler/connector/src/main/native2ascii/
    incubator/lcf/trunk/connectors/webcrawler/connector/src/main/resource/
      - copied from r1225060, incubator/lcf/branches/CONNECTORS-335/connectors/webcrawler/connector/src/main/resource/
    incubator/lcf/trunk/connectors/wiki/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/wiki/Messages.java
      - copied unchanged from r1225060, incubator/lcf/branches/CONNECTORS-335/connectors/wiki/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/wiki/Messages.java
    incubator/lcf/trunk/connectors/wiki/connector/src/main/native2ascii/
      - copied from r1225060, incubator/lcf/branches/CONNECTORS-335/connectors/wiki/connector/src/main/native2ascii/
    incubator/lcf/trunk/connectors/wiki/connector/src/main/resource/
      - copied from r1225060, incubator/lcf/branches/CONNECTORS-335/connectors/wiki/connector/src/main/resource/
    incubator/lcf/trunk/framework/core/src/main/java/org/apache/manifoldcf/core/i18n/
      - copied from r1225060, incubator/lcf/branches/CONNECTORS-335/framework/core/src/main/java/org/apache/manifoldcf/core/i18n/
    incubator/lcf/trunk/framework/core/src/main/native2ascii/
      - copied from r1225060, incubator/lcf/branches/CONNECTORS-335/framework/core/src/main/native2ascii/
    incubator/lcf/trunk/framework/core/src/main/resource/
      - copied from r1225060, incubator/lcf/branches/CONNECTORS-335/framework/core/src/main/resource/
    incubator/lcf/trunk/framework/core/src/test/java/org/apache/manifoldcf/core/tests/HTMLTester.java
      - copied unchanged from r1225060, incubator/lcf/branches/CONNECTORS-335/framework/core/src/test/java/org/apache/manifoldcf/core/tests/HTMLTester.java
    incubator/lcf/trunk/framework/core/src/test/resource/
      - copied from r1225060, incubator/lcf/branches/CONNECTORS-335/framework/core/src/test/resource/
    incubator/lcf/trunk/framework/crawler-ui/src/main/webapp/WEB-INF/lib/jstl-api-1.2.jar
      - copied unchanged from r1225060, incubator/lcf/branches/CONNECTORS-335/framework/crawler-ui/src/main/webapp/WEB-INF/lib/jstl-api-1.2.jar
    incubator/lcf/trunk/framework/crawler-ui/src/main/webapp/WEB-INF/lib/jstl-impl-1.2.jar
      - copied unchanged from r1225060, incubator/lcf/branches/CONNECTORS-335/framework/crawler-ui/src/main/webapp/WEB-INF/lib/jstl-impl-1.2.jar
    incubator/lcf/trunk/framework/crawler-ui/src/main/webapp/WEB-INF/lib/jstl.jar
      - copied unchanged from r1225060, incubator/lcf/branches/CONNECTORS-335/framework/crawler-ui/src/main/webapp/WEB-INF/lib/jstl.jar
    incubator/lcf/trunk/framework/crawler-ui/src/main/webapp/WEB-INF/lib/standard.jar
      - copied unchanged from r1225060, incubator/lcf/branches/CONNECTORS-335/framework/crawler-ui/src/main/webapp/WEB-INF/lib/standard.jar
    incubator/lcf/trunk/framework/ui-core/src/main/java/org/apache/manifoldcf/ui/i18n/
      - copied from r1225060, incubator/lcf/branches/CONNECTORS-335/framework/ui-core/src/main/java/org/apache/manifoldcf/ui/i18n/
Removed:
    incubator/lcf/trunk/connectors/alfresco/connector/src/main/resource/org/apache/manifoldcf/crawler/connectors/alfresco/editConfiguration.html
    incubator/lcf/trunk/connectors/alfresco/connector/src/main/resource/org/apache/manifoldcf/crawler/connectors/alfresco/editConfiguration.js
    incubator/lcf/trunk/connectors/alfresco/connector/src/main/resource/org/apache/manifoldcf/crawler/connectors/alfresco/editSpecification.html
    incubator/lcf/trunk/connectors/alfresco/connector/src/main/resource/org/apache/manifoldcf/crawler/connectors/alfresco/editSpecification.js
    incubator/lcf/trunk/connectors/alfresco/connector/src/main/resource/org/apache/manifoldcf/crawler/connectors/alfresco/hiddenConfiguration.html
    incubator/lcf/trunk/connectors/alfresco/connector/src/main/resource/org/apache/manifoldcf/crawler/connectors/alfresco/hiddenSpecification.html
    incubator/lcf/trunk/connectors/alfresco/connector/src/main/resource/org/apache/manifoldcf/crawler/connectors/alfresco/viewConfiguration.html
    incubator/lcf/trunk/connectors/alfresco/connector/src/main/resource/org/apache/manifoldcf/crawler/connectors/alfresco/viewSpecification.html
    incubator/lcf/trunk/connectors/cmis/connector/src/main/resource/org/apache/manifoldcf/crawler/connectors/cmis/editConfiguration.html
    incubator/lcf/trunk/connectors/cmis/connector/src/main/resource/org/apache/manifoldcf/crawler/connectors/cmis/editConfiguration.js
    incubator/lcf/trunk/connectors/cmis/connector/src/main/resource/org/apache/manifoldcf/crawler/connectors/cmis/editSpecification.html
    incubator/lcf/trunk/connectors/cmis/connector/src/main/resource/org/apache/manifoldcf/crawler/connectors/cmis/editSpecification.js
    incubator/lcf/trunk/connectors/cmis/connector/src/main/resource/org/apache/manifoldcf/crawler/connectors/cmis/hiddenConfiguration.html
    incubator/lcf/trunk/connectors/cmis/connector/src/main/resource/org/apache/manifoldcf/crawler/connectors/cmis/hiddenSpecification.html
    incubator/lcf/trunk/connectors/cmis/connector/src/main/resource/org/apache/manifoldcf/crawler/connectors/cmis/viewConfiguration.html
    incubator/lcf/trunk/connectors/cmis/connector/src/main/resource/org/apache/manifoldcf/crawler/connectors/cmis/viewSpecification.html
    incubator/lcf/trunk/connectors/opensearchserver/connector/src/main/resource/org/apache/manifoldcf/agents/output/opensearchserver/configuration.html
    incubator/lcf/trunk/connectors/opensearchserver/connector/src/main/resource/org/apache/manifoldcf/agents/output/opensearchserver/configuration.js
    incubator/lcf/trunk/connectors/opensearchserver/connector/src/main/resource/org/apache/manifoldcf/agents/output/opensearchserver/specifications.html
    incubator/lcf/trunk/connectors/opensearchserver/connector/src/main/resource/org/apache/manifoldcf/agents/output/opensearchserver/view.html
    incubator/lcf/trunk/connectors/opensearchserver/connector/src/main/resource/org/apache/manifoldcf/agents/output/opensearchserver/viewSpec.html
Modified:
    incubator/lcf/trunk/   (props changed)
    incubator/lcf/trunk/CHANGES.txt
    incubator/lcf/trunk/LICENSE.txt
    incubator/lcf/trunk/build.xml
    incubator/lcf/trunk/connectors/activedirectory/build.xml
    incubator/lcf/trunk/connectors/activedirectory/connector/src/main/java/org/apache/manifoldcf/authorities/authorities/activedirectory/ActiveDirectoryAuthority.java
    incubator/lcf/trunk/connectors/activedirectory/pom.xml
    incubator/lcf/trunk/connectors/alfresco/build.xml
    incubator/lcf/trunk/connectors/alfresco/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/alfresco/AlfrescoRepositoryConnector.java
    incubator/lcf/trunk/connectors/alfresco/pom.xml
    incubator/lcf/trunk/connectors/cmis/build.xml
    incubator/lcf/trunk/connectors/cmis/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/cmis/CmisAuthorityConnector.java
    incubator/lcf/trunk/connectors/cmis/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/cmis/CmisRepositoryConnector.java
    incubator/lcf/trunk/connectors/cmis/pom.xml
    incubator/lcf/trunk/connectors/documentum/build.xml
    incubator/lcf/trunk/connectors/documentum/connector/src/main/java/org/apache/manifoldcf/crawler/authorities/DCTM/AuthorityConnector.java
    incubator/lcf/trunk/connectors/documentum/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/DCTM/DCTM.java
    incubator/lcf/trunk/connectors/filenet/build.xml
    incubator/lcf/trunk/connectors/filenet/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/filenet/FilenetConnector.java
    incubator/lcf/trunk/connectors/filesystem/build.xml
    incubator/lcf/trunk/connectors/filesystem/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/filesystem/FileConnector.java
    incubator/lcf/trunk/connectors/filesystem/pom.xml
    incubator/lcf/trunk/connectors/gts/build.xml
    incubator/lcf/trunk/connectors/gts/connector/src/main/java/org/apache/manifoldcf/agents/output/gts/GTSConnector.java
    incubator/lcf/trunk/connectors/gts/pom.xml
    incubator/lcf/trunk/connectors/jcifs/build.xml
    incubator/lcf/trunk/connectors/jcifs/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/sharedrive/SharedDriveConnector.java
    incubator/lcf/trunk/connectors/jcifs/pom.xml
    incubator/lcf/trunk/connectors/jdbc/build.xml
    incubator/lcf/trunk/connectors/jdbc/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/jdbc/JDBCConnector.java
    incubator/lcf/trunk/connectors/jdbc/pom.xml
    incubator/lcf/trunk/connectors/livelink/build.xml
    incubator/lcf/trunk/connectors/livelink/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/livelink/LivelinkAuthority.java
    incubator/lcf/trunk/connectors/livelink/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/livelink/LivelinkConnector.java
    incubator/lcf/trunk/connectors/meridio/build.xml
    incubator/lcf/trunk/connectors/meridio/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/meridio/MeridioAuthority.java
    incubator/lcf/trunk/connectors/meridio/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/meridio/MeridioConnector.java
    incubator/lcf/trunk/connectors/nullauthority/build.xml
    incubator/lcf/trunk/connectors/nullauthority/connector/src/main/java/org/apache/manifoldcf/authorities/authorities/nullauthority/NullAuthority.java
    incubator/lcf/trunk/connectors/nullauthority/pom.xml
    incubator/lcf/trunk/connectors/nulloutput/build.xml
    incubator/lcf/trunk/connectors/nulloutput/pom.xml
    incubator/lcf/trunk/connectors/opensearchserver/build.xml
    incubator/lcf/trunk/connectors/opensearchserver/connector/src/main/java/org/apache/manifoldcf/agents/output/opensearchserver/OpenSearchServerConnector.java
    incubator/lcf/trunk/connectors/opensearchserver/connector/src/main/java/org/apache/manifoldcf/agents/output/opensearchserver/OpenSearchServerParam.java
    incubator/lcf/trunk/connectors/opensearchserver/pom.xml
    incubator/lcf/trunk/connectors/rss/build.xml
    incubator/lcf/trunk/connectors/rss/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/rss/RSSConnector.java
    incubator/lcf/trunk/connectors/rss/pom.xml
    incubator/lcf/trunk/connectors/sharepoint/build.xml
    incubator/lcf/trunk/connectors/sharepoint/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/sharepoint/SharePointRepository.java
    incubator/lcf/trunk/connectors/solr/build.xml
    incubator/lcf/trunk/connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/SolrConnector.java
    incubator/lcf/trunk/connectors/solr/pom.xml
    incubator/lcf/trunk/connectors/webcrawler/build.xml
    incubator/lcf/trunk/connectors/webcrawler/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/webcrawler/WebcrawlerConnector.java
    incubator/lcf/trunk/connectors/webcrawler/pom.xml
    incubator/lcf/trunk/connectors/wiki/build.xml
    incubator/lcf/trunk/connectors/wiki/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/wiki/WikiConnector.java
    incubator/lcf/trunk/connectors/wiki/pom.xml
    incubator/lcf/trunk/framework/agents/pom.xml
    incubator/lcf/trunk/framework/agents/src/main/java/org/apache/manifoldcf/agents/interfaces/IOutputConnector.java
    incubator/lcf/trunk/framework/agents/src/main/java/org/apache/manifoldcf/agents/interfaces/OutputConnectorFactory.java
    incubator/lcf/trunk/framework/agents/src/main/java/org/apache/manifoldcf/agents/output/BaseOutputConnector.java
    incubator/lcf/trunk/framework/build.xml
    incubator/lcf/trunk/framework/core/pom.xml
    incubator/lcf/trunk/framework/core/src/main/java/org/apache/manifoldcf/core/connector/BaseConnector.java
    incubator/lcf/trunk/framework/core/src/main/java/org/apache/manifoldcf/core/interfaces/IConnector.java
    incubator/lcf/trunk/framework/core/src/main/java/org/apache/manifoldcf/core/system/ManifoldCFResourceLoader.java
    incubator/lcf/trunk/framework/core/src/main/native2ascii/org/apache/manifoldcf/core/i18n/   (props changed)
    incubator/lcf/trunk/framework/core/src/test/resource/org/apache/manifoldcf/core/tests/Javascript.py   (props changed)
    incubator/lcf/trunk/framework/core/src/test/resource/org/apache/manifoldcf/core/tests/VirtualBrowser.py   (props changed)
    incubator/lcf/trunk/framework/crawler-ui/src/main/webapp/WEB-INF/web.xml
    incubator/lcf/trunk/framework/crawler-ui/src/main/webapp/adminDefaults.jsp
    incubator/lcf/trunk/framework/crawler-ui/src/main/webapp/adminHeaders.jsp
    incubator/lcf/trunk/framework/crawler-ui/src/main/webapp/banner.jsp
    incubator/lcf/trunk/framework/crawler-ui/src/main/webapp/documentstatus.jsp
    incubator/lcf/trunk/framework/crawler-ui/src/main/webapp/editauthority.jsp
    incubator/lcf/trunk/framework/crawler-ui/src/main/webapp/editconnection.jsp
    incubator/lcf/trunk/framework/crawler-ui/src/main/webapp/editjob.jsp
    incubator/lcf/trunk/framework/crawler-ui/src/main/webapp/editoutput.jsp
    incubator/lcf/trunk/framework/crawler-ui/src/main/webapp/error.jsp
    incubator/lcf/trunk/framework/crawler-ui/src/main/webapp/execute.jsp
    incubator/lcf/trunk/framework/crawler-ui/src/main/webapp/index.jsp
    incubator/lcf/trunk/framework/crawler-ui/src/main/webapp/listauthorities.jsp
    incubator/lcf/trunk/framework/crawler-ui/src/main/webapp/listconnections.jsp
    incubator/lcf/trunk/framework/crawler-ui/src/main/webapp/listjobs.jsp
    incubator/lcf/trunk/framework/crawler-ui/src/main/webapp/listoutputs.jsp
    incubator/lcf/trunk/framework/crawler-ui/src/main/webapp/maxactivityreport.jsp
    incubator/lcf/trunk/framework/crawler-ui/src/main/webapp/maxbandwidthreport.jsp
    incubator/lcf/trunk/framework/crawler-ui/src/main/webapp/navigation.jsp
    incubator/lcf/trunk/framework/crawler-ui/src/main/webapp/queuestatus.jsp
    incubator/lcf/trunk/framework/crawler-ui/src/main/webapp/resultreport.jsp
    incubator/lcf/trunk/framework/crawler-ui/src/main/webapp/showjobstatus.jsp
    incubator/lcf/trunk/framework/crawler-ui/src/main/webapp/simplereport.jsp
    incubator/lcf/trunk/framework/crawler-ui/src/main/webapp/viewauthority.jsp
    incubator/lcf/trunk/framework/crawler-ui/src/main/webapp/viewconnection.jsp
    incubator/lcf/trunk/framework/crawler-ui/src/main/webapp/viewjob.jsp
    incubator/lcf/trunk/framework/crawler-ui/src/main/webapp/viewoutput.jsp
    incubator/lcf/trunk/framework/jetty-runner/pom.xml
    incubator/lcf/trunk/framework/pull-agent/pom.xml
    incubator/lcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/authorities/interfaces/AuthorityConnectorFactory.java
    incubator/lcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/connectors/BaseRepositoryConnector.java
    incubator/lcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/interfaces/IRepositoryConnector.java
    incubator/lcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/interfaces/RepositoryConnectorFactory.java
    incubator/lcf/trunk/framework/ui-core/pom.xml
    incubator/lcf/trunk/framework/ui-core/src/main/java/org/apache/manifoldcf/ui/util/Encoder.java
    incubator/lcf/trunk/tests/alfresco/pom.xml
    incubator/lcf/trunk/tests/cmis/pom.xml
    incubator/lcf/trunk/tests/filesystem/pom.xml
    incubator/lcf/trunk/tests/wiki/pom.xml

Propchange: incubator/lcf/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Dec 28 00:42:19 2011
@@ -13,4 +13,6 @@
 /incubator/lcf/branches/CONNECTORS-287:1200390-1210394
 /incubator/lcf/branches/CONNECTORS-290:1204836-1205502
 /incubator/lcf/branches/CONNECTORS-313:1213173-1214848
+/incubator/lcf/branches/CONNECTORS-314:1221058
 /incubator/lcf/branches/CONNECTORS-32:1092556-1094216
+/incubator/lcf/branches/CONNECTORS-335:1222285-1225060

Modified: incubator/lcf/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/CHANGES.txt?rev=1225063&r1=1225062&r2=1225063&view=diff
==============================================================================
--- incubator/lcf/trunk/CHANGES.txt (original)
+++ incubator/lcf/trunk/CHANGES.txt Wed Dec 28 00:42:19 2011
@@ -3,6 +3,11 @@ $Id$
 
 ======================= 0.5-dev =====================
 
+CONNECTORS-335: Add i18n infrastructure.  This commit also addresses
+some problems found in the CMIS, Alfresco, and OpenSearchServer
+connectors having to do with improper escaping of data values.
+(Hitoshi Ozawa, Karl Wright)
+
 CONNECTORS-334: Add MySQL database support.
 (Hitoshi Ozawa, Karl Wright)
 

Modified: incubator/lcf/trunk/LICENSE.txt
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/LICENSE.txt?rev=1225063&r1=1225062&r2=1225063&view=diff
==============================================================================
--- incubator/lcf/trunk/LICENSE.txt (original)
+++ incubator/lcf/trunk/LICENSE.txt Wed Dec 28 00:42:19 2011
@@ -278,6 +278,12 @@ License: Apache 2  (http://www.apache.or
 This product includes a wsdl4j.jar.
 License: CPL 1.0 (http://www.opensource.org/licenses/cpl1.0)
 
+This product includes a jstl-api-1.2.jar.
+License: Common Development and Distribution License (CDDL) v1.0 (https://glassfish.dev.java.net/public/CDDLv1.0.html)
+
+This product includes a jstl-impl-1.2.jar.
+License: Common Development and Distribution License (CDDL) v1.0 (https://glassfish.dev.java.net/public/CDDLv1.0.html)
+
 ==========================================================================
 The following license applies to json.jar, which is generated from the json
 sources from http://www.json.org/java/index.html

Modified: incubator/lcf/trunk/build.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/build.xml?rev=1225063&r1=1225062&r2=1225063&view=diff
==============================================================================
--- incubator/lcf/trunk/build.xml (original)
+++ incubator/lcf/trunk/build.xml Wed Dec 28 00:42:19 2011
@@ -153,6 +153,7 @@
                 <include name="commons-fileupload*.jar"/>
                 <include name="commons-httpclient-mcf.jar"/>
                 <include name="commons-io*.jar"/>
+                <include name="commons-lang*.jar"/>
                 <include name="commons-logging*.jar"/>
                 <include name="eclipse*.jar"/>
                 <include name="jasper*.jar"/>
@@ -1298,7 +1299,7 @@
         <mkdir dir="build/example"/>
         <manifest file="build/example/manifest">
             <attribute name="Main-Class" value="org.apache.manifoldcf.jettyrunner.ManifoldCFJettyRunner"/>
-            <attribute name="Class-Path" value="lib/commons-codec.jar lib/commons-collections.jar lib/commons-el.jar lib/commons-fileupload.jar lib/commons-httpclient-mcf.jar lib/commons-io.jar lib/commons-logging.jar lib/hsqldb.jar lib/derbyclient.jar lib/derby.jar lib/derbyLocale_cs.jar lib/derbyLocale_de_DE.jar lib/derbyLocale_es.jar lib/derbyLocale_fr.jar lib/derbyLocale_hu.jar lib/derbyLocale_it.jar lib/derbyLocale_ja_JP.jar lib/derbyLocale_ko_KR.jar lib/derbyLocale_pl.jar lib/derbyLocale_pt_BR.jar lib/derbyLocale_ru.jar lib/derbyLocale_zh_CN.jar lib/derbyLocale_zh_TW.jar lib/derbynet.jar lib/derbyrun.jar lib/derbytools.jar lib/eclipse-ecj.jar lib/jasper-6.0.24.jar lib/jasper-el-6.0.24.jar lib/jdbcpool-0.99.jar lib/jetty-6.1.26-patched-JETTY-1340.jar lib/jetty-util-6.1.26-patched-JETTY-1340.jar lib/jsp-api-2.1-glassfish-2.1.v20091210.jar lib/json.jar lib/mcf-agents.jar lib/mcf-core.jar lib/mcf-jetty-runner.jar lib/mcf-pull-agent.jar lib/mcf-ui-core.jar lib/log4j-1.2.jar
  lib/postgresql.jar lib/mysql-connector-java-5.1.18.jar lib/serializer.jar lib/servlet-api-2.5-20081211.jar lib/tomcat-juli-6.0.24.jar lib/xalan2.jar lib/xercesImpl-mcf.jar lib/xml-apis.jar"/>
+            <attribute name="Class-Path" value="lib/commons-lang.jar lib/commons-codec.jar lib/commons-collections.jar lib/commons-el.jar lib/commons-fileupload.jar lib/commons-httpclient-mcf.jar lib/commons-io.jar lib/commons-logging.jar lib/hsqldb.jar lib/derbyclient.jar lib/derby.jar lib/derbyLocale_cs.jar lib/derbyLocale_de_DE.jar lib/derbyLocale_es.jar lib/derbyLocale_fr.jar lib/derbyLocale_hu.jar lib/derbyLocale_it.jar lib/derbyLocale_ja_JP.jar lib/derbyLocale_ko_KR.jar lib/derbyLocale_pl.jar lib/derbyLocale_pt_BR.jar lib/derbyLocale_ru.jar lib/derbyLocale_zh_CN.jar lib/derbyLocale_zh_TW.jar lib/derbynet.jar lib/derbyrun.jar lib/derbytools.jar lib/eclipse-ecj.jar lib/jasper-6.0.24.jar lib/jasper-el-6.0.24.jar lib/jdbcpool-0.99.jar lib/jetty-6.1.26-patched-JETTY-1340.jar lib/jetty-util-6.1.26-patched-JETTY-1340.jar lib/jsp-api-2.1-glassfish-2.1.v20091210.jar lib/json.jar lib/mcf-agents.jar lib/mcf-core.jar lib/mcf-jetty-runner.jar lib/mcf-pull-agent.jar lib/mcf-ui-core.
 jar lib/log4j-1.2.jar lib/postgresql.jar lib/mysql-connector-java-5.1.18.jar lib/serializer.jar lib/servlet-api-2.5-20081211.jar lib/tomcat-juli-6.0.24.jar lib/xalan2.jar lib/xercesImpl-mcf.jar lib/xml-apis.jar"/>
         </manifest>
         <jar destfile="dist/example/start.jar" manifest="build/example/manifest"/>
     </target>

Modified: incubator/lcf/trunk/connectors/activedirectory/build.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/connectors/activedirectory/build.xml?rev=1225063&r1=1225062&r2=1225063&view=diff
==============================================================================
--- incubator/lcf/trunk/connectors/activedirectory/build.xml (original)
+++ incubator/lcf/trunk/connectors/activedirectory/build.xml Wed Dec 28 00:42:19 2011
@@ -39,11 +39,15 @@
                 <fileset dir="lib" includes="*.jar"/>
             </classpath>
         </javac>
+        <native2ascii encoding="UTF-8" src="connector/src/main/native2ascii" dest="build/connector/classes" includes="**/*.properties" />
     </target>
 
     <target name="jar-connector" depends="compile-connector">
         <mkdir dir="build/jar"/>
-        <jar destfile="build/jar/mcf-activedirectory-connector.jar" basedir="build/connector/classes"/>
+        <jar destfile="build/jar/mcf-activedirectory-connector.jar">
+        	<fileset dir="build/connector/classes"/>
+          <!-- fileset dir="connector/src/main/resource"/ -->
+        </jar>
     </target>
 
     <target name="lib" depends="jar-connector">

Modified: incubator/lcf/trunk/connectors/activedirectory/connector/src/main/java/org/apache/manifoldcf/authorities/authorities/activedirectory/ActiveDirectoryAuthority.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/connectors/activedirectory/connector/src/main/java/org/apache/manifoldcf/authorities/authorities/activedirectory/ActiveDirectoryAuthority.java?rev=1225063&r1=1225062&r2=1225063&view=diff
==============================================================================
--- incubator/lcf/trunk/connectors/activedirectory/connector/src/main/java/org/apache/manifoldcf/authorities/authorities/activedirectory/ActiveDirectoryAuthority.java (original)
+++ incubator/lcf/trunk/connectors/activedirectory/connector/src/main/java/org/apache/manifoldcf/authorities/authorities/activedirectory/ActiveDirectoryAuthority.java Wed Dec 28 00:42:19 2011
@@ -339,11 +339,11 @@ public class ActiveDirectoryAuthority ex
   *@param tabsArray is an array of tab names.  Add to this array any tab names that are specific to the connector.
   */
   @Override
-  public void outputConfigurationHeader(IThreadContext threadContext, IHTTPOutput out, ConfigParams parameters, List<String> tabsArray)
+  public void outputConfigurationHeader(IThreadContext threadContext, IHTTPOutput out, Locale locale, ConfigParams parameters, List<String> tabsArray)
     throws ManifoldCFException, IOException
   {
-    tabsArray.add("Domain Controller");
-    tabsArray.add("Cache");
+    tabsArray.add(Messages.getString(locale,"ActiveDirectoryAuthority.DomainController"));
+    tabsArray.add(Messages.getString(locale,"ActiveDirectoryAuthority.Cache"));
     
     out.print(
 "<script type=\"text/javascript\">\n"+
@@ -422,7 +422,7 @@ public class ActiveDirectoryAuthority ex
   *@param tabName is the current tab name.
   */
   @Override
-  public void outputConfigurationBody(IThreadContext threadContext, IHTTPOutput out, ConfigParams parameters, String tabName)
+  public void outputConfigurationBody(IThreadContext threadContext, IHTTPOutput out, Locale locale, ConfigParams parameters, String tabName)
     throws ManifoldCFException, IOException
   {
     String domainControllerName = parameters.getParameter(org.apache.manifoldcf.authorities.authorities.activedirectory.ActiveDirectoryConfig.PARAM_DOMAINCONTROLLER);
@@ -448,29 +448,29 @@ public class ActiveDirectoryAuthority ex
       cacheLRUsize = "1000";    
     
     // The "Domain Controller" tab
-    if (tabName.equals("Domain Controller"))
+    if (tabName.equals(Messages.getString(locale,"ActiveDirectoryAuthority.DomainController")))
     {
       out.print(
 "<table class=\"displaytable\">\n"+
 "  <tr><td class=\"separator\" colspan=\"2\"><hr/></td></tr>\n"+
 "  <tr>\n"+
-"    <td class=\"description\"><nobr>Domain controller name:</nobr></td>\n"+
+"    <td class=\"description\"><nobr>" + Messages.getBodyString(locale,"ActiveDirectoryAuthority.DomainControllerName") + "</nobr></td>\n"+
 "    <td class=\"value\"><input type=\"text\" size=\"64\" name=\"domaincontrollername\" value=\""+org.apache.manifoldcf.ui.util.Encoder.attributeEscape(domainControllerName)+"\"/></td>\n"+
 "  </tr>\n"+
 "  <tr>\n"+
-"    <td class=\"description\"><nobr>Administrative user name:</nobr></td>\n"+
+"    <td class=\"description\"><nobr>" + Messages.getBodyString(locale,"ActiveDirectoryAuthority.AdministrativeUserName") + "</nobr></td>\n"+
 "    <td class=\"value\"><input type=\"text\" size=\"32\" name=\"username\" value=\""+org.apache.manifoldcf.ui.util.Encoder.attributeEscape(userName)+"\"/></td>\n"+
 "  </tr>\n"+
 "  <tr>\n"+
-"    <td class=\"description\"><nobr>Administrative password:</nobr></td>\n"+
+"    <td class=\"description\"><nobr>" + Messages.getBodyString(locale,"ActiveDirectoryAuthority.AdministrativePassword") + "</nobr></td>\n"+
 "    <td class=\"value\"><input type=\"password\" size=\"32\" name=\"password\" value=\""+org.apache.manifoldcf.ui.util.Encoder.attributeEscape(password)+"\"/></td>\n"+
 "  </tr>\n"+
 "  <tr>\n"+
-"    <td class=\"description\"><nobr>Authentication:</nobr></td>\n"+
+"    <td class=\"description\"><nobr>" + Messages.getBodyString(locale,"ActiveDirectoryAuthority.Authentication") + "</nobr></td>\n"+
 "    <td class=\"value\"><input type=\"text\" size=\"32\" name=\"authentication\" value=\""+org.apache.manifoldcf.ui.util.Encoder.attributeEscape(authentication)+"\"/></td>\n"+
 "  </tr>\n"+
 "  <tr>\n"+
-"    <td class=\"description\"><nobr>Login name AD attribute:</nobr></td>\n"+
+"    <td class=\"description\"><nobr>" + Messages.getBodyString(locale,"ActiveDirectoryAuthority.LoginNameADAttribute") + "</nobr></td>\n"+
 "    <td class=\"value\">\n"+
 "      <select name=\"userACLsUsername\">\n"+
 "        <option value=\"sAMAccountName\""+(userACLsUsername.equals("sAMAccountName")?" selected=\"true\"":"")+">sAMAccountName</option>\n"+
@@ -492,17 +492,17 @@ public class ActiveDirectoryAuthority ex
       );
     }
     // The "Cache" tab
-    if (tabName.equals("Cache"))
+    if (tabName.equals(Messages.getString(locale,"ActiveDirectoryAuthority.Cache")))
     {
       out.print(
 "<table class=\"displaytable\">\n"+
 "  <tr><td class=\"separator\" colspan=\"2\"><hr/></td></tr>\n"+
 "  <tr>\n"+
-"    <td class=\"description\"><nobr>Cache lifetime:</nobr></td>\n"+
-"    <td class=\"value\"><input type=\"text\" size=\"5\" name=\"cachelifetime\" value=\""+org.apache.manifoldcf.ui.util.Encoder.attributeEscape(cacheLifetime)+"\"/> minutes</td>\n"+
+"    <td class=\"description\"><nobr>" + Messages.getBodyString(locale,"ActiveDirectoryAuthority.CacheLifetime") + "</nobr></td>\n"+
+"    <td class=\"value\"><input type=\"text\" size=\"5\" name=\"cachelifetime\" value=\""+org.apache.manifoldcf.ui.util.Encoder.attributeEscape(cacheLifetime)+"\"/> " + Messages.getBodyString(locale,"ActiveDirectoryAuthority.minutes") + "</td>\n"+
 "  </tr>\n"+
 "  <tr>\n"+
-"    <td class=\"description\"><nobr>Cache LRU size:</nobr></td>\n"+
+"    <td class=\"description\"><nobr>" + Messages.getBodyString(locale,"ActiveDirectoryAuthority.CacheLRUSize") + "</nobr></td>\n"+
 "    <td class=\"value\"><input type=\"text\" size=\"5\" name=\"cachelrusize\" value=\""+org.apache.manifoldcf.ui.util.Encoder.attributeEscape(cacheLRUsize)+"\"/></td>\n"+
 "  </tr>\n"+
 "</table>\n"
@@ -528,7 +528,7 @@ public class ActiveDirectoryAuthority ex
   *@return null if all is well, or a string error message if there is an error that should prevent saving of the connection (and cause a redirection to an error page).
   */
   @Override
-  public String processConfigurationPost(IThreadContext threadContext, IPostParameters variableContext, ConfigParams parameters)
+  public String processConfigurationPost(IThreadContext threadContext, IPostParameters variableContext, Locale locale, ConfigParams parameters)
     throws ManifoldCFException
   {
     String domainControllerName = variableContext.getParameter("domaincontrollername");
@@ -564,13 +564,13 @@ public class ActiveDirectoryAuthority ex
   *@param parameters are the configuration parameters, as they currently exist, for this connection being configured.
   */
   @Override
-  public void viewConfiguration(IThreadContext threadContext, IHTTPOutput out, ConfigParams parameters)
+  public void viewConfiguration(IThreadContext threadContext, IHTTPOutput out, Locale locale, ConfigParams parameters)
     throws ManifoldCFException, IOException
   {
     out.print(
 "<table class=\"displaytable\">\n"+
 "  <tr>\n"+
-"    <td class=\"description\" colspan=\"1\"><nobr>Parameters:</nobr></td>\n"+
+"    <td class=\"description\" colspan=\"1\"><nobr>" + Messages.getBodyString(locale,"ActiveDirectoryAuthority.Parameters") + "</nobr></td>\n"+
 "    <td class=\"value\" colspan=\"3\">\n"
     );
     Iterator iter = parameters.listParameters();

Modified: incubator/lcf/trunk/connectors/activedirectory/pom.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/connectors/activedirectory/pom.xml?rev=1225063&r1=1225062&r2=1225063&view=diff
==============================================================================
--- incubator/lcf/trunk/connectors/activedirectory/pom.xml (original)
+++ incubator/lcf/trunk/connectors/activedirectory/pom.xml Wed Dec 28 00:42:19 2011
@@ -31,6 +31,30 @@
   <build>
     <sourceDirectory>${basedir}/connector/src/main/java</sourceDirectory>
     <testSourceDirectory>${basedir}/connector/src/test/java</testSourceDirectory>
+    <plugins>
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>native2ascii-maven-plugin</artifactId>
+        <version>1.0-alpha-1</version>
+        <configuration>
+            <dest>target/classes</dest>
+            <src>connector/src/main/native2ascii</src>
+        </configuration>
+        <executions>
+            <execution>
+                <id>native2ascii-utf8</id>
+                <goals>
+                    <goal>native2ascii</goal>
+                </goals>
+                <configuration>
+                    <encoding>UTF8</encoding>
+                    <includes>**/*.properties</includes>
+                </configuration>
+            </execution>
+        </executions>
+      </plugin>
+    </plugins>
+
   </build>
 
   <dependencies>

Modified: incubator/lcf/trunk/connectors/alfresco/build.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/connectors/alfresco/build.xml?rev=1225063&r1=1225062&r2=1225063&view=diff
==============================================================================
--- incubator/lcf/trunk/connectors/alfresco/build.xml (original)
+++ incubator/lcf/trunk/connectors/alfresco/build.xml Wed Dec 28 00:42:19 2011
@@ -62,13 +62,14 @@
             	  <fileset dir="alfresco-ws-client" includes="*.jar"/>
             </classpath>
         </javac>
+        <!-- native2ascii encoding="UTF-8" src="connector/src/main/native2ascii" dest="build/connector/classes" includes="**/*.properties" / -->
     </target>
 
     <target name="jar-connector" depends="compile-connector,precompile-check" if="canBuild">
         <mkdir dir="build/jar"/>
         <jar destfile="build/jar/mcf-alfresco-connector.jar">
         	<fileset dir="build/connector/classes"/>
-          <fileset dir="connector/src/main/resource" />
+          <fileset dir="connector/src/main/resource"/>
         </jar>
     </target>
 
@@ -84,8 +85,6 @@
             <fileset dir="lib">
                 <include name="axis*.jar"/>	
                 <include name="commons-discovery*.jar"/>
-                <include name="commons-logging*.jar"/>
-                <include name="commons-lang*.jar"/>
                 <include name="jaxrpc*.jar"/>
                 <include name="mail*.jar"/>
                 <include name="opensaml*.jar"/>

Modified: incubator/lcf/trunk/connectors/alfresco/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/alfresco/AlfrescoRepositoryConnector.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/connectors/alfresco/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/alfresco/AlfrescoRepositoryConnector.java?rev=1225063&r1=1225062&r2=1225063&view=diff
==============================================================================
--- incubator/lcf/trunk/connectors/alfresco/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/alfresco/AlfrescoRepositoryConnector.java (original)
+++ incubator/lcf/trunk/connectors/alfresco/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/alfresco/AlfrescoRepositoryConnector.java Wed Dec 28 00:42:19 2011
@@ -27,6 +27,9 @@ import java.io.InterruptedIOException;
 import java.io.UnsupportedEncodingException;
 import java.util.Iterator;
 import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+import java.util.HashMap;
 
 import org.alfresco.webservice.authentication.AuthenticationFault;
 import org.alfresco.webservice.content.Content;
@@ -409,52 +412,16 @@ public class AlfrescoRepositoryConnector
    * @param out
    * @throws ManifoldCFException
    */
-  private void outputResource(String resName, IHTTPOutput out,
-      ConfigParams params) throws ManifoldCFException {
-    InputStream is = getClass().getResourceAsStream(resName);
-    BufferedReader br = null;
-    try {
-      br = new BufferedReader(new InputStreamReader(is, "UTF-8"));
-      String line;
-      while ((line = br.readLine()) != null) {
-        if (params != null) {
-          @SuppressWarnings("unchecked")
-          Iterator<String> i = params.listParameters();
-          boolean parsedLine = false;
-          while (i.hasNext()) {
-            String key = (String) i.next();
-            String value = Encoder.attributeEscape(params.getParameter(key));
-            String replacer = "${" + key.toUpperCase() + "}";
-            if (StringUtils.contains(line, replacer)) {
-              if (StringUtils.isEmpty(value)) {
-                out.println(StringUtils.replace(line, replacer,
-                    StringUtils.EMPTY));
-                parsedLine = true;
-              } else {
-                out.println(StringUtils.replace(line, replacer, value));
-                parsedLine = true;
-              }
-            } else if (StringUtils.contains(line, "${")) {
-              parsedLine = true;
-            } else if (!parsedLine) {
-              out.println(line);
-              parsedLine = true;
-            }
-          }
-        } else {
-          break;
-        }
-      }
-    } catch (UnsupportedEncodingException e) {
-      throw new ManifoldCFException(e);
-    } catch (IOException e) {
-      throw new ManifoldCFException(e);
-    } finally {
-      if (br != null)
-        IOUtils.closeQuietly(br);
-      if (is != null)
-        IOUtils.closeQuietly(is);
+  private static void outputResource(String resName, IHTTPOutput out,
+      Locale locale, ConfigParams params) throws ManifoldCFException {
+    Map<String,String> paramMap = new HashMap<String,String>();
+    Iterator<String> i = params.listParameters();
+    while(i.hasNext()){
+      String key = i.next();
+      String value = params.getParameter(key);
+      paramMap.put(key,value);
     }
+    Messages.outputResource(out,locale,resName,paramMap,true);
   }
 
   /**
@@ -474,7 +441,7 @@ public class AlfrescoRepositoryConnector
    */
   @Override
   public void viewConfiguration(IThreadContext threadContext, IHTTPOutput out,
-      ConfigParams parameters) throws ManifoldCFException, IOException {
+      Locale locale, ConfigParams parameters) throws ManifoldCFException, IOException {
     
     String username = parameters.getParameter(AlfrescoConfig.USERNAME_PARAM);
     if (StringUtils.isEmpty(username)) {
@@ -506,7 +473,7 @@ public class AlfrescoRepositoryConnector
       parameters.setParameter(AlfrescoConfig.PATH_PARAM, AlfrescoConfig.PATH_DEFAULT_VALUE);
     }
     
-    outputResource(VIEW_CONFIG_FORWARD, out, parameters);
+    outputResource(VIEW_CONFIG_FORWARD, out, locale, parameters);
   }
 
   /**
@@ -528,10 +495,10 @@ public class AlfrescoRepositoryConnector
    */
   @Override
   public void outputConfigurationHeader(IThreadContext threadContext,
-      IHTTPOutput out, ConfigParams parameters, List<String> tabsArray)
+      IHTTPOutput out, Locale locale, ConfigParams parameters, List<String> tabsArray)
       throws ManifoldCFException, IOException {
     tabsArray.add(ALFRESCO_SERVER_TAB_NAME);
-    outputResource(EDIT_CONFIG_HEADER_FORWARD, out, parameters);
+    outputResource(EDIT_CONFIG_HEADER_FORWARD, out, locale, parameters);
   }
 
   /** Output the configuration body section.
@@ -545,40 +512,41 @@ public class AlfrescoRepositoryConnector
    */
   @Override
   public void outputConfigurationBody(IThreadContext threadContext,
-      IHTTPOutput out, ConfigParams parameters, String tabName)
+      IHTTPOutput out, Locale locale, ConfigParams parameters, String tabName)
       throws ManifoldCFException, IOException {
     
-    if(ALFRESCO_SERVER_TAB_NAME.equals(tabName)){
-      String username = parameters.getParameter(AlfrescoConfig.USERNAME_PARAM);
-      String password = parameters.getParameter(AlfrescoConfig.PASSWORD_PARAM);
-      String protocol = parameters.getParameter(AlfrescoConfig.PROTOCOL_PARAM);
-      String server = parameters.getParameter(AlfrescoConfig.SERVER_PARAM);
-      String port = parameters.getParameter(AlfrescoConfig.PORT_PARAM);
-      String path = parameters.getParameter(AlfrescoConfig.PATH_PARAM);
-      
-      if (StringUtils.isEmpty(username))
-        username = StringUtils.EMPTY;
-      if (StringUtils.isEmpty(password))
-        password = StringUtils.EMPTY;
-      if (StringUtils.isEmpty(protocol))
-        protocol = StringUtils.EMPTY;
-      if (StringUtils.isEmpty(server))
-        server = StringUtils.EMPTY;
-      if (StringUtils.isEmpty(port))
-        port = StringUtils.EMPTY;
-      if (StringUtils.isEmpty(path))
-        path = StringUtils.EMPTY;
-  
-      parameters.setParameter(AlfrescoConfig.USERNAME_PARAM, username);
-      parameters.setParameter(AlfrescoConfig.PASSWORD_PARAM, password);
-      parameters.setParameter(AlfrescoConfig.PROTOCOL_PARAM, protocol);
-      parameters.setParameter(AlfrescoConfig.SERVER_PARAM, server);
-      parameters.setParameter(AlfrescoConfig.PORT_PARAM, port);
-      parameters.setParameter(AlfrescoConfig.PATH_PARAM, path);
+    String username = parameters.getParameter(AlfrescoConfig.USERNAME_PARAM);
+    String password = parameters.getParameter(AlfrescoConfig.PASSWORD_PARAM);
+    String protocol = parameters.getParameter(AlfrescoConfig.PROTOCOL_PARAM);
+    String server = parameters.getParameter(AlfrescoConfig.SERVER_PARAM);
+    String port = parameters.getParameter(AlfrescoConfig.PORT_PARAM);
+    String path = parameters.getParameter(AlfrescoConfig.PATH_PARAM);
       
-      outputResource(EDIT_CONFIG_FORWARD, out, parameters);  
+    if (username == null)
+      username = "admin";
+    if (password == null)
+      password = "admin";
+    if (protocol == null)
+      protocol = "http";
+    if (server == null)
+      server = "localhost";
+    if (port == null)
+      port = "8080";
+    if (path == null)
+      path = "/alfresco/api";
+  
+    ConfigParams newMap = new ConfigParams();
+    newMap.setParameter(AlfrescoConfig.USERNAME_PARAM, username);
+    newMap.setParameter(AlfrescoConfig.PASSWORD_PARAM, password);
+    newMap.setParameter(AlfrescoConfig.PROTOCOL_PARAM, protocol);
+    newMap.setParameter(AlfrescoConfig.SERVER_PARAM, server);
+    newMap.setParameter(AlfrescoConfig.PORT_PARAM, port);
+    newMap.setParameter(AlfrescoConfig.PATH_PARAM, path);
+    
+    if(ALFRESCO_SERVER_TAB_NAME.equals(tabName)){
+      outputResource(EDIT_CONFIG_FORWARD, out, locale, newMap);  
     } else {
-      outputResource(HIDDEN_CONFIG_FORWARD, out, parameters);
+      outputResource(HIDDEN_CONFIG_FORWARD, out, locale, newMap);
     }
   }
 
@@ -603,7 +571,7 @@ public class AlfrescoRepositoryConnector
    */
   @Override
   public String processConfigurationPost(IThreadContext threadContext,
-      IPostParameters variableContext, ConfigParams parameters)
+      IPostParameters variableContext, Locale locale, ConfigParams parameters)
       throws ManifoldCFException {
 
     String username = variableContext.getParameter(AlfrescoConfig.USERNAME_PARAM);
@@ -655,7 +623,7 @@ public class AlfrescoRepositoryConnector
    *          is the current document specification for this job.
    */
   @Override
-  public void viewSpecification(IHTTPOutput out, DocumentSpecification ds)
+  public void viewSpecification(IHTTPOutput out, Locale locale, DocumentSpecification ds)
       throws ManifoldCFException, IOException {
     int i = 0;
     boolean seenAny = false;
@@ -672,7 +640,7 @@ public class AlfrescoRepositoryConnector
       }
       i++;
     }
-    outputResource(VIEW_SPEC_FORWARD, out, specificationParams);
+    outputResource(VIEW_SPEC_FORWARD, out, locale, specificationParams);
   }
 
   /**
@@ -692,7 +660,7 @@ public class AlfrescoRepositoryConnector
    */
   @Override
   public String processSpecificationPost(IPostParameters variableContext,
-      DocumentSpecification ds) throws ManifoldCFException {
+      Locale locale, DocumentSpecification ds) throws ManifoldCFException {
     String luceneQuery = variableContext
         .getParameter(AlfrescoConfig.LUCENE_QUERY_PARAM);
     if (StringUtils.isNotEmpty(luceneQuery)) {
@@ -740,7 +708,7 @@ public class AlfrescoRepositoryConnector
    *          is the current tab name.
    */
   @Override
-  public void outputSpecificationBody(IHTTPOutput out,
+  public void outputSpecificationBody(IHTTPOutput out, Locale locale,
       DocumentSpecification ds, String tabName) throws ManifoldCFException,
       IOException {
     String luceneQuery = StringUtils.EMPTY;
@@ -757,9 +725,9 @@ public class AlfrescoRepositoryConnector
     ConfigParams params = new ConfigParams();
     params.setParameter(AlfrescoConfig.LUCENE_QUERY_PARAM, luceneQuery);
     if (tabName.equals(TAB_LABEL_LUCENE_QUERY)) {
-      outputResource(EDIT_SPEC_FORWARD, out, params);
+      outputResource(EDIT_SPEC_FORWARD, out, locale, params);
     } else {
-      outputResource(HIDDEN_SPEC_FORWARD, out, params);
+      outputResource(HIDDEN_SPEC_FORWARD, out, locale, params);
     }
   }
 
@@ -779,10 +747,10 @@ public class AlfrescoRepositoryConnector
    */
   @Override
   public void outputSpecificationHeader(IHTTPOutput out,
-      DocumentSpecification ds, List<String> tabsArray)
+      Locale locale, DocumentSpecification ds, List<String> tabsArray)
       throws ManifoldCFException, IOException {
     tabsArray.add(TAB_LABEL_LUCENE_QUERY);
-    outputResource(EDIT_SPEC_HEADER_FORWARD, out, params);
+    outputResource(EDIT_SPEC_HEADER_FORWARD, out, locale, params);
   }
 
   /** Process a set of documents.

Modified: incubator/lcf/trunk/connectors/alfresco/pom.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/connectors/alfresco/pom.xml?rev=1225063&r1=1225062&r2=1225063&view=diff
==============================================================================
--- incubator/lcf/trunk/connectors/alfresco/pom.xml (original)
+++ incubator/lcf/trunk/connectors/alfresco/pom.xml Wed Dec 28 00:42:19 2011
@@ -72,11 +72,33 @@
     </resources>
     <plugins>
       <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>native2ascii-maven-plugin</artifactId>
+        <version>1.0-alpha-1</version>
+        <configuration>
+            <dest>target/classes</dest>
+            <src>connector/src/main/native2ascii</src>
+        </configuration>
+        <executions>
+            <execution>
+                <id>native2ascii-utf8</id>
+                <goals>
+                    <goal>native2ascii</goal>
+                </goals>
+                <configuration>
+                    <encoding>UTF8</encoding>
+                    <includes>**/*.properties</includes>
+                </configuration>
+            </execution>
+        </executions>
+      </plugin>
+      <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-surefire-plugin</artifactId>
         <configuration>
           <excludes>
             <exclude>**/*Postgresql*.java</exclude>
+            <exclude>**/*MySQL*.java</exclude>
           </excludes>
           <forkMode>always</forkMode>
           <workingDirectory>target/test-output</workingDirectory>

Modified: incubator/lcf/trunk/connectors/cmis/build.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/connectors/cmis/build.xml?rev=1225063&r1=1225062&r2=1225063&view=diff
==============================================================================
--- incubator/lcf/trunk/connectors/cmis/build.xml (original)
+++ incubator/lcf/trunk/connectors/cmis/build.xml Wed Dec 28 00:42:19 2011
@@ -39,13 +39,14 @@
                 <fileset dir="lib" includes="*.jar"/>
             </classpath>
         </javac>
+        <native2ascii encoding="UTF-8" src="connector/src/main/native2ascii" dest="build/connector/classes" includes="**/*.properties" />
     </target>
 
     <target name="jar-connector" depends="compile-connector">
         <mkdir dir="build/jar"/>
         <jar destfile="build/jar/mcf-cmis-connector.jar">
         	<fileset dir="build/connector/classes"/>
-          <fileset dir="connector/src/main/resource" />
+          <fileset dir="connector/src/main/resource"/>
         </jar>
     </target>
 
@@ -69,7 +70,6 @@
                 <include name="jsr181-api*.jar"/>
                 <include name="jsr250-api*.jar"/>
                 <include name="activation*.jar"/>
-                <include name="commons-lang*.jar"/>
             </fileset>
         </copy>
     </target>

Modified: incubator/lcf/trunk/connectors/cmis/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/cmis/CmisAuthorityConnector.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/connectors/cmis/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/cmis/CmisAuthorityConnector.java?rev=1225063&r1=1225062&r2=1225063&view=diff
==============================================================================
--- incubator/lcf/trunk/connectors/cmis/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/cmis/CmisAuthorityConnector.java (original)
+++ incubator/lcf/trunk/connectors/cmis/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/cmis/CmisAuthorityConnector.java Wed Dec 28 00:42:19 2011
@@ -21,6 +21,7 @@ import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
+import java.util.Locale;
 
 import org.apache.commons.lang.StringUtils;
 import org.apache.manifoldcf.authorities.authorities.BaseAuthorityConnector;
@@ -63,9 +64,6 @@ public class CmisAuthorityConnector exte
   protected static final String CONFIG_PARAM_USERNAME_REGEXP = "usernameregexp";
   protected static final String CONFIG_PARAM_USER_TRANSLATION = "usertranslation";
   
-  private static final String TAB_NAME_REPOSITORY = "Repository";
-  private static final String TAB_NAME_USER_MAPPING = "User Mapping";
-  
   private static final String DEFAULT_VALUE_ENDPOINT = "http://localhost:8080/cmis/";
   private static final String DEFAULT_VALUE_REPOSITORY_ID = "uuid";
 
@@ -136,7 +134,7 @@ public class CmisAuthorityConnector exte
    */
   @Override
   public void outputConfigurationBody(IThreadContext threadContext,
-      IHTTPOutput out, ConfigParams parameters, String tabName)
+      IHTTPOutput out, Locale locale, ConfigParams parameters, String tabName)
       throws ManifoldCFException, IOException {
 
     String endpoint = parameters.getParameter(CONFIG_PARAM_ENDPOINT);
@@ -158,14 +156,14 @@ public class CmisAuthorityConnector exte
     String usernameRegexp = localMap.getMatchString(0);
     String userTranslation = localMap.getReplaceString(0);
     
-    if (tabName.equals(TAB_NAME_REPOSITORY))
+    if (tabName.equals(Messages.getString(locale,"CmisAuthorityConnector.Repository")))
     {
     out.print("<table class=\"displaytable\">\n"
         + "  <tr><td class=\"separator\" colspan=\"2\"><hr/></td></tr>\n");
-    out.print("<tr><td class=\"description\"><nobr>Endpoint:</nobr></td>" +
+    out.print("<tr><td class=\"description\"><nobr>" + Messages.getString(locale,"CmisAuthorityConnector.Endpoint") + "</nobr></td>" +
         "<td class=\"value\"><input type=\"text\" name=\""
         + CONFIG_PARAM_ENDPOINT + "\" value=\""+Encoder.attributeEscape(endpoint)+"\" size=\"50\"/></td></tr>\n");
-    out.print("<tr><td class=\"description\"><nobr>Repository ID:</nobr></td>" +
+    out.print("<tr><td class=\"description\"><nobr>" + Messages.getString(locale,"CmisAuthorityConnector.RepositoryID") + "</nobr></td>" +
         "<td class=\"value\"><input type=\"text\" name=\""
         + CONFIG_PARAM_REPOSITORY_ID + "\" value=\""+Encoder.attributeEscape(repositoryId)+"\"/></td></tr>\n");
     out.print("</table>\n");
@@ -176,13 +174,13 @@ public class CmisAuthorityConnector exte
       out.print("<input type=\"hidden\" name=\""+CONFIG_PARAM_REPOSITORY_ID+"\" value=\""+Encoder.attributeEscape(repositoryId)+"\"/>\n");
     }
     
-    if (tabName.equals(TAB_NAME_USER_MAPPING))
+    if (tabName.equals(Messages.getString(locale,"CmisAuthorityConnector.UserMapping")))
     {
       out.print(
 "<table class=\"displaytable\">\n"+
 "  <tr><td class=\"separator\" colspan=\"2\"><hr/></td></tr>\n"+
 "  <tr>\n"+
-"    <td class=\"description\"><nobr>User mapping:</nobr></td>\n"+
+"    <td class=\"description\"><nobr>" + Messages.getString(locale,"CmisAuthorityConnector.UserMapping") + "</nobr></td>\n"+
 "    <td class=\"value\">\n"+
 "      <input type=\"text\" size=\"32\" name=\""+CONFIG_PARAM_USERNAME_REGEXP+"\" value=\""+
   Encoder.attributeEscape(usernameRegexp)+"\"/> ==&gt; \n"+
@@ -224,24 +222,24 @@ public class CmisAuthorityConnector exte
    */
   @Override
   public void outputConfigurationHeader(IThreadContext threadContext,
-      IHTTPOutput out, ConfigParams parameters, List<String> tabsArray)
+      IHTTPOutput out, Locale locale, ConfigParams parameters, List<String> tabsArray)
       throws ManifoldCFException, IOException {
     
-    tabsArray.add(TAB_NAME_REPOSITORY);
-    tabsArray.add(TAB_NAME_USER_MAPPING);
+    tabsArray.add(Messages.getString(locale,"CmisAuthorityConnector.Repository"));
+    tabsArray.add(Messages.getString(locale,"CmisAuthorityConnector.UserMapping"));
     
     out.print("<script type=\"text/javascript\">\n" + "<!--\n"
         + "function checkConfig()\n" + "{\n"
         + "  if (editconnection.endpoint.value == \"\")\n" + "  {\n"
-        + "    alert(\"The endpoint must be not null\");\n"
+        + "    alert(\"" + Messages.getString(locale,"CmisAuthorityConnector.TheEndpointMustBeNotNull") + "\");\n"
         + "    editconnection.endpoint.focus();\n" + "    return false;\n"
         + "  }\n" + "\n" + "  return true;\n" + "}\n" + " \n"
         + "function checkConfigForSave()\n" + "{\n"
         + "  if (editconnection.endpoint.value == \"\")\n" + "  {\n"
-        + "    alert(\"The endpoint must be not null\");\n"
+        + "    alert(\"" + Messages.getString(locale,"CmisAuthorityConnector.TheEndpointMustBeNotNull") + "\");\n"
         + "    editconnection.endpoint.focus();\n" + "    return false;\n"
         + "  }\n" + "  if (editconnection.repositoryId.value == \"\")\n" + "  {\n"
-        + "    alert(\"The repository id must be not null\");\n"
+        + "    alert(\"" + Messages.getString(locale,"CmisAuthorityConnector.TheEndpointMustBeNotNull") + "\");\n"
         + "    editconnection.repositoryId.focus();\n" + "    return false;\n"
         + "  }\n" + "  return true;\n" + "}\n" + "\n" + "//-->\n"
         + "</script>\n");
@@ -268,7 +266,7 @@ public class CmisAuthorityConnector exte
    */
   @Override
   public String processConfigurationPost(IThreadContext threadContext,
-      IPostParameters variableContext, ConfigParams parameters)
+      IPostParameters variableContext, Locale locale, ConfigParams parameters)
       throws ManifoldCFException {
 
     //Repository
@@ -312,10 +310,10 @@ public class CmisAuthorityConnector exte
    */
   @Override
   public void viewConfiguration(IThreadContext threadContext, IHTTPOutput out,
-      ConfigParams parameters) throws ManifoldCFException, IOException {
+      Locale locale, ConfigParams parameters) throws ManifoldCFException, IOException {
     out.print("<table class=\"displaytable\">\n"
         + "  <tr>\n"
-        + "    <td class=\"description\" colspan=\"1\"><nobr>Parameters:</nobr></td>\n"
+        + "    <td class=\"description\" colspan=\"1\"><nobr>" + Messages.getString(locale,"CmisAuthorityConnector.Parameters") + "</nobr></td>\n"
         + "    <td class=\"value\" colspan=\"3\">\n");
     Iterator iter = parameters.listParameters();
     while (iter.hasNext()) {
@@ -473,4 +471,4 @@ public class CmisAuthorityConnector exte
       
     }
     
-}
\ No newline at end of file
+}



Mime
View raw message