manifoldcf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kwri...@apache.org
Subject svn commit: r1234447 - in /incubator/lcf/branches/CONNECTORS-388: connectors/cmis/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/cmis/ framework/ui-core/src/main/java/org/apache/manifoldcf/ui/i18n/
Date Sun, 22 Jan 2012 02:33:05 GMT
Author: kwright
Date: Sun Jan 22 02:33:04 2012
New Revision: 1234447

URL: http://svn.apache.org/viewvc?rev=1234447&view=rev
Log:
Change Velocity variable conventions to use _ rather than : since Velocity did not like the
latter.

Modified:
    incubator/lcf/branches/CONNECTORS-388/connectors/cmis/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/cmis/editConfiguration_en_US.html
    incubator/lcf/branches/CONNECTORS-388/connectors/cmis/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/cmis/editConfiguration_ja_JP.html
    incubator/lcf/branches/CONNECTORS-388/connectors/cmis/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/cmis/editSpecification_en_US.html
    incubator/lcf/branches/CONNECTORS-388/connectors/cmis/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/cmis/editSpecification_ja_JP.html
    incubator/lcf/branches/CONNECTORS-388/connectors/cmis/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/cmis/hiddenConfiguration_en_US.html
    incubator/lcf/branches/CONNECTORS-388/connectors/cmis/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/cmis/hiddenConfiguration_ja_JP.html
    incubator/lcf/branches/CONNECTORS-388/connectors/cmis/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/cmis/hiddenSpecification_en_US.html
    incubator/lcf/branches/CONNECTORS-388/connectors/cmis/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/cmis/hiddenSpecification_ja_JP.html
    incubator/lcf/branches/CONNECTORS-388/framework/ui-core/src/main/java/org/apache/manifoldcf/ui/i18n/Messages.java

Modified: incubator/lcf/branches/CONNECTORS-388/connectors/cmis/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/cmis/editConfiguration_en_US.html
URL: http://svn.apache.org/viewvc/incubator/lcf/branches/CONNECTORS-388/connectors/cmis/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/cmis/editConfiguration_en_US.html?rev=1234447&r1=1234446&r2=1234447&view=diff
==============================================================================
--- incubator/lcf/branches/CONNECTORS-388/connectors/cmis/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/cmis/editConfiguration_en_US.html
(original)
+++ incubator/lcf/branches/CONNECTORS-388/connectors/cmis/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/cmis/editConfiguration_en_US.html
Sun Jan 22 02:33:04 2012
@@ -45,7 +45,7 @@
       </nobr>
     </td>
     <td class="value">
-      <input type="text" id="username" name="username" value="$USERNAME:A" />
+      <input type="text" id="username" name="username" value="$USERNAME_A" />
     </td>
   </tr>
   <tr>
@@ -55,7 +55,7 @@
       </nobr>
     </td>
     <td class="value">
-      <input type="password" id="password" name="password" value="$PASSWORD:A" />
+      <input type="password" id="password" name="password" value="$PASSWORD_A" />
     </td>
   </tr>
   <tr>
@@ -78,7 +78,7 @@
       </nobr>
     </td>
     <td class="value">
-        <input id="server" name="server" type="text" size="32" value="$SERVER:A"/>
+        <input id="server" name="server" type="text" size="32" value="$SERVER_A"/>
     </td>
   </tr>
   <tr>
@@ -88,7 +88,7 @@
       </nobr>
     </td>
     <td class="value">
-        <input id="port" name="port" type="text" size="5" value="$PORT:A" />
+        <input id="port" name="port" type="text" size="5" value="$PORT_A" />
     </td>
   </tr>
   <tr>
@@ -98,7 +98,7 @@
       </nobr>
     </td>
     <td class="value">
-        <input id="path" name="path" type="text" size="32" value="$PATH:A" />
+        <input id="path" name="path" type="text" size="32" value="$PATH_A" />
     </td>
   </tr>
   <tr>
@@ -108,7 +108,7 @@
       </nobr>
     </td>
     <td class="value">
-      <input type="text" id="repositoryId" name="repositoryId" value="$REPOSITORYID:A"
/>
+      <input type="text" id="repositoryId" name="repositoryId" value="$REPOSITORYID_A"
/>
       <nobr>
         (optional)
       </nobr>
@@ -118,7 +118,7 @@
 
 <script type="text/javascript">
 <!--
-var binding = "$BINDING:BJ";
+var binding = "$BINDING_BJ";
 var bindingSelect = editconnection.binding;
 if(binding==bindingSelect.options[1].value){
   bindingSelect.options[1].selected = true;
@@ -126,7 +126,7 @@ if(binding==bindingSelect.options[1].val
   bindingSelect.options[0].selected = true;
 }
 
-var protocol = "$PROTOCOL:BJ";
+var protocol = "$PROTOCOL_BJ";
 var protocolSelect = editconnection.protocol;
 if(protocol==protocolSelect.options[1].value){
   protocolSelect.options[1].selected = true;

Modified: incubator/lcf/branches/CONNECTORS-388/connectors/cmis/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/cmis/editConfiguration_ja_JP.html
URL: http://svn.apache.org/viewvc/incubator/lcf/branches/CONNECTORS-388/connectors/cmis/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/cmis/editConfiguration_ja_JP.html?rev=1234447&r1=1234446&r2=1234447&view=diff
==============================================================================
--- incubator/lcf/branches/CONNECTORS-388/connectors/cmis/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/cmis/editConfiguration_ja_JP.html
(original)
+++ incubator/lcf/branches/CONNECTORS-388/connectors/cmis/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/cmis/editConfiguration_ja_JP.html
Sun Jan 22 02:33:04 2012
@@ -45,7 +45,7 @@
 			</nobr>
 		</td>
 		<td class="value">
-			<input type="text" name="username" value="${USERNAME:A}" />
+			<input type="text" name="username" value="$USERNAME_A" />
 		</td>
 	</tr>
 	<tr>
@@ -55,7 +55,7 @@
 			</nobr>
 		</td>
 		<td class="value">
-			<input type="password" name="password" value="${PASSWORD:A}" />
+			<input type="password" name="password" value="$PASSWORD_A" />
 		</td>
 	</tr>
 	<tr>
@@ -65,7 +65,7 @@
 			</nobr>
 		</td>
 		<td class="value">
-			<input type="text" name="endpoint" value="${ENDPOINT:A}" size="50" />
+			<input type="text" name="endpoint" value="$ENDPOINT_A" size="50" />
 		</td>
 	</tr>
 	<tr>
@@ -75,7 +75,7 @@
 			</nobr>
 		</td>
 		<td class="value">
-			<input type="text" id="repositoryId" name="repositoryId" value="{REPOSITORYID:A}" />
+			<input type="text" id="repositoryId" name="repositoryId" value="REPOSITORYID_A" />
 			<nobr>
 				(任意)
 			</nobr>
@@ -85,7 +85,7 @@
 
 <script type="text/javascript">
 <!--
-var binding = "${BINDING:BJ}";
+var binding = "$BINDING_BJ";
 var bindingSelect = editconnection.binding;
 if(binding==bindingSelect.options[1].value){
   bindingSelect.options[1].selected = true;
@@ -93,7 +93,7 @@ if(binding==bindingSelect.options[1].val
   bindingSelect.options[0].selected = true;
 }
 
-var protocol = "${PROTOCOL:BJ}";
+var protocol = "$PROTOCOL_BJ";
 var protocolSelect = editconnection.protocol;
 if(protocol==protocolSelect.options[1].value){
   protocolSelect.options[1].selected = true;

Modified: incubator/lcf/branches/CONNECTORS-388/connectors/cmis/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/cmis/editSpecification_en_US.html
URL: http://svn.apache.org/viewvc/incubator/lcf/branches/CONNECTORS-388/connectors/cmis/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/cmis/editSpecification_en_US.html?rev=1234447&r1=1234446&r2=1234447&view=diff
==============================================================================
--- incubator/lcf/branches/CONNECTORS-388/connectors/cmis/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/cmis/editSpecification_en_US.html
(original)
+++ incubator/lcf/branches/CONNECTORS-388/connectors/cmis/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/cmis/editSpecification_en_US.html
Sun Jan 22 02:33:04 2012
@@ -29,7 +29,7 @@
     </td>
     <td class="value">
       <nobr>
-        <input type="text" size="120" name="cmisQuery" value="$CMISQUERY:A" />
+        <input type="text" size="120" name="cmisQuery" value="$CMISQUERY_A" />
       </nobr>
     </td>
   </tr>

Modified: incubator/lcf/branches/CONNECTORS-388/connectors/cmis/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/cmis/editSpecification_ja_JP.html
URL: http://svn.apache.org/viewvc/incubator/lcf/branches/CONNECTORS-388/connectors/cmis/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/cmis/editSpecification_ja_JP.html?rev=1234447&r1=1234446&r2=1234447&view=diff
==============================================================================
--- incubator/lcf/branches/CONNECTORS-388/connectors/cmis/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/cmis/editSpecification_ja_JP.html
(original)
+++ incubator/lcf/branches/CONNECTORS-388/connectors/cmis/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/cmis/editSpecification_ja_JP.html
Sun Jan 22 02:33:04 2012
@@ -29,7 +29,7 @@
 		</td>
 		<td class="value">
 			<nobr>
-				<input type="text" size="120" name="cmisQuery" value="${CMISQUERY:A}" />
+				<input type="text" size="120" name="cmisQuery" value="$CMISQUERY_A" />
 			</nobr>
 		</td>
 	</tr>

Modified: incubator/lcf/branches/CONNECTORS-388/connectors/cmis/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/cmis/hiddenConfiguration_en_US.html
URL: http://svn.apache.org/viewvc/incubator/lcf/branches/CONNECTORS-388/connectors/cmis/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/cmis/hiddenConfiguration_en_US.html?rev=1234447&r1=1234446&r2=1234447&view=diff
==============================================================================
--- incubator/lcf/branches/CONNECTORS-388/connectors/cmis/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/cmis/hiddenConfiguration_en_US.html
(original)
+++ incubator/lcf/branches/CONNECTORS-388/connectors/cmis/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/cmis/hiddenConfiguration_en_US.html
Sun Jan 22 02:33:04 2012
@@ -14,11 +14,11 @@
  See the License for the specific language governing permissions and
  limitations under the License.
 -->
-<input type="hidden" name="username" value="$USERNAME:A" />
-<input type="hidden" name="password" value="$PASSWORD:A" />
-<input type="hidden" name="protocol" value="$PROTOCOL:A" />
-<input type="hidden" name="server" value="$SERVER:A" />
-<input type="hidden" name="port" value="$PORT:A" />
-<input type="hidden" name="path" value="$PATH:A" />
-<input type="hidden" name="binding" value="$BINDING:A" />
-<input type="hidden" name="repositoryId" value="$REPOSITORYID:A" />
\ No newline at end of file
+<input type="hidden" name="username" value="$USERNAME_A" />
+<input type="hidden" name="password" value="$PASSWORD_A" />
+<input type="hidden" name="protocol" value="$PROTOCOL_A" />
+<input type="hidden" name="server" value="$SERVER_A" />
+<input type="hidden" name="port" value="$PORT_A" />
+<input type="hidden" name="path" value="$PATH_A" />
+<input type="hidden" name="binding" value="$BINDING_A" />
+<input type="hidden" name="repositoryId" value="$REPOSITORYID_A" />
\ No newline at end of file

Modified: incubator/lcf/branches/CONNECTORS-388/connectors/cmis/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/cmis/hiddenConfiguration_ja_JP.html
URL: http://svn.apache.org/viewvc/incubator/lcf/branches/CONNECTORS-388/connectors/cmis/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/cmis/hiddenConfiguration_ja_JP.html?rev=1234447&r1=1234446&r2=1234447&view=diff
==============================================================================
--- incubator/lcf/branches/CONNECTORS-388/connectors/cmis/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/cmis/hiddenConfiguration_ja_JP.html
(original)
+++ incubator/lcf/branches/CONNECTORS-388/connectors/cmis/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/cmis/hiddenConfiguration_ja_JP.html
Sun Jan 22 02:33:04 2012
@@ -14,11 +14,11 @@
  See the License for the specific language governing permissions and
  limitations under the License.
 -->
-<input type="hidden" name="username" value="${USERNAME:A}" />
-<input type="hidden" name="password" value="${PASSWORD:A}" />
-<input type="hidden" name="protocol" value="${PROTOCOL:A}" />
-<input type="hidden" name="server" value="${SERVER:A}" />
-<input type="hidden" name="port" value="${PORT:A}" />
-<input type="hidden" name="path" value="${PATH:A}" />
-<input type="hidden" name="binding" value="${BINDING:A}" />
-<input type="hidden" name="repositoryId" value="${REPOSITORYID:A}" />
\ No newline at end of file
+<input type="hidden" name="username" value="$USERNAME_A" />
+<input type="hidden" name="password" value="$PASSWORD_A" />
+<input type="hidden" name="protocol" value="$PROTOCOL_A" />
+<input type="hidden" name="server" value="$SERVER_A" />
+<input type="hidden" name="port" value="$PORT_A" />
+<input type="hidden" name="path" value="$PATH_A" />
+<input type="hidden" name="binding" value="$BINDING_A" />
+<input type="hidden" name="repositoryId" value="$REPOSITORYID_A" />
\ No newline at end of file

Modified: incubator/lcf/branches/CONNECTORS-388/connectors/cmis/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/cmis/hiddenSpecification_en_US.html
URL: http://svn.apache.org/viewvc/incubator/lcf/branches/CONNECTORS-388/connectors/cmis/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/cmis/hiddenSpecification_en_US.html?rev=1234447&r1=1234446&r2=1234447&view=diff
==============================================================================
--- incubator/lcf/branches/CONNECTORS-388/connectors/cmis/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/cmis/hiddenSpecification_en_US.html
(original)
+++ incubator/lcf/branches/CONNECTORS-388/connectors/cmis/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/cmis/hiddenSpecification_en_US.html
Sun Jan 22 02:33:04 2012
@@ -14,4 +14,4 @@
  See the License for the specific language governing permissions and
  limitations under the License.
 -->
-<input type="hidden" name="cmisQuery" value="$CMISQUERY:A" />
\ No newline at end of file
+<input type="hidden" name="cmisQuery" value="$CMISQUERY_A" />
\ No newline at end of file

Modified: incubator/lcf/branches/CONNECTORS-388/connectors/cmis/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/cmis/hiddenSpecification_ja_JP.html
URL: http://svn.apache.org/viewvc/incubator/lcf/branches/CONNECTORS-388/connectors/cmis/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/cmis/hiddenSpecification_ja_JP.html?rev=1234447&r1=1234446&r2=1234447&view=diff
==============================================================================
--- incubator/lcf/branches/CONNECTORS-388/connectors/cmis/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/cmis/hiddenSpecification_ja_JP.html
(original)
+++ incubator/lcf/branches/CONNECTORS-388/connectors/cmis/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/cmis/hiddenSpecification_ja_JP.html
Sun Jan 22 02:33:04 2012
@@ -14,4 +14,4 @@
  See the License for the specific language governing permissions and
  limitations under the License.
 -->
-<input type="hidden" name="cmisQuery" value="${CMISQUERY:A}" />
\ No newline at end of file
+<input type="hidden" name="cmisQuery" value="$CMISQUERY_A" />
\ No newline at end of file

Modified: incubator/lcf/branches/CONNECTORS-388/framework/ui-core/src/main/java/org/apache/manifoldcf/ui/i18n/Messages.java
URL: http://svn.apache.org/viewvc/incubator/lcf/branches/CONNECTORS-388/framework/ui-core/src/main/java/org/apache/manifoldcf/ui/i18n/Messages.java?rev=1234447&r1=1234446&r2=1234447&view=diff
==============================================================================
--- incubator/lcf/branches/CONNECTORS-388/framework/ui-core/src/main/java/org/apache/manifoldcf/ui/i18n/Messages.java
(original)
+++ incubator/lcf/branches/CONNECTORS-388/framework/ui-core/src/main/java/org/apache/manifoldcf/ui/i18n/Messages.java
Sun Jan 22 02:33:04 2012
@@ -148,10 +148,10 @@ public class Messages extends org.apache
             value = "";
              
           context.put(key,value);
-          context.put(key+":A",Encoder.attributeEscape(value));
-          context.put(key+":B",Encoder.bodyEscape(value));
-          context.put(key+":AJ",Encoder.attributeJavascriptEscape(value));
-          context.put(key+":BJ",Encoder.bodyJavascriptEscape(value));
+          context.put(key+"_A",Encoder.attributeEscape(value));
+          context.put(key+"_B",Encoder.bodyEscape(value));
+          context.put(key+"_AJ",Encoder.attributeJavascriptEscape(value));
+          context.put(key+"_BJ",Encoder.bodyJavascriptEscape(value));
         }
       }
       



Mime
View raw message