incubator-connectors-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From piergior...@apache.org
Subject svn commit: r1238731 - in /incubator/lcf/trunk: ./ connectors/alfresco/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/alfresco/ connectors/alfresco/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/alfresco/
Date Tue, 31 Jan 2012 18:23:18 GMT
Author: piergiorgio
Date: Tue Jan 31 18:23:17 2012
New Revision: 1238731

URL: http://svn.apache.org/viewvc?rev=1238731&view=rev
Log:
Now the Alfresco Connector UI is conformed with Apache Velocity (CONNECTORS-397)

Modified:
    incubator/lcf/trunk/CHANGES.txt
    incubator/lcf/trunk/connectors/alfresco/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/alfresco/AlfrescoRepositoryConnector.java
    incubator/lcf/trunk/connectors/alfresco/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/alfresco/Messages.java
    incubator/lcf/trunk/connectors/alfresco/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/alfresco/editConfiguration_en_US.html
    incubator/lcf/trunk/connectors/alfresco/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/alfresco/editSpecification_en_US.html
    incubator/lcf/trunk/connectors/alfresco/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/alfresco/hiddenConfiguration_en_US.html
    incubator/lcf/trunk/connectors/alfresco/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/alfresco/hiddenSpecification_en_US.html
    incubator/lcf/trunk/connectors/alfresco/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/alfresco/viewConfiguration_en_US.html
    incubator/lcf/trunk/connectors/alfresco/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/alfresco/viewSpecification_en_US.html

Modified: incubator/lcf/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/CHANGES.txt?rev=1238731&r1=1238730&r2=1238731&view=diff
==============================================================================
--- incubator/lcf/trunk/CHANGES.txt (original)
+++ incubator/lcf/trunk/CHANGES.txt Tue Jan 31 18:23:17 2012
@@ -3,6 +3,9 @@ $Id$
 
 ======================= 0.5-dev =====================
 
+CONNECTORS-397: Alfresco Connector UI must be conformed with Apache Velocity
+(Piergiorgio Lucidi)
+
 CONNECTORS-395: CMIS Connector UI must be completely conformed with Apache Velocity
 (Piergiorgio Lucidi)
 

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=1238731&r1=1238730&r2=1238731&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
Tue Jan 31 18:23:17 2012
@@ -426,7 +426,7 @@ public class AlfrescoRepositoryConnector
       String value = params.getParameter(key);
       paramMap.put(key,value);
     }
-    Messages.outputResource(out,locale,resName,paramMap,true);
+    Messages.outputResourceWithVelocity(out,locale,resName,paramMap,true);
   }
 
   /**

Modified: incubator/lcf/trunk/connectors/alfresco/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/alfresco/Messages.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/connectors/alfresco/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/alfresco/Messages.java?rev=1238731&r1=1238730&r2=1238731&view=diff
==============================================================================
--- incubator/lcf/trunk/connectors/alfresco/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/alfresco/Messages.java
(original)
+++ incubator/lcf/trunk/connectors/alfresco/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/alfresco/Messages.java
Tue Jan 31 18:23:17 2012
@@ -121,5 +121,14 @@ public class Messages extends org.apache
       substitutionParameters,mapToUpperCase);
   }
   
+  public static void outputResourceWithVelocity(IHTTPOutput output, Locale locale, String
resourceKey,
+      Map<String,String> substitutionParameters, boolean mapToUpperCase)
+      throws ManifoldCFException
+    {
+      outputResourceWithVelocity(output,createVelocityEngine(Messages.class),DEFAULT_PATH_NAME,locale,resourceKey,
+        substitutionParameters,mapToUpperCase);
+    }
+  
+  
 }
 

Modified: incubator/lcf/trunk/connectors/alfresco/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/alfresco/editConfiguration_en_US.html
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/connectors/alfresco/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/alfresco/editConfiguration_en_US.html?rev=1238731&r1=1238730&r2=1238731&view=diff
==============================================================================
--- incubator/lcf/trunk/connectors/alfresco/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/alfresco/editConfiguration_en_US.html
(original)
+++ incubator/lcf/trunk/connectors/alfresco/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/alfresco/editConfiguration_en_US.html
Tue Jan 31 18:23:17 2012
@@ -28,7 +28,7 @@
       </nobr>
     </td>
     <td class="value">
-        <input id="tenantDomain" name="tenantDomain" type="text" size="32" value="${TENANTDOMAIN:A}"
/>
+        <input id="tenantDomain" name="tenantDomain" type="text" size="32" value="$TENANTDOMAIN_A"
/>
     </td>
   </tr>
 	<tr>
@@ -38,7 +38,7 @@
 			</nobr>
 		</td>
 		<td class="value">
-			<input id="username" type="text" name="username" value="${USERNAME:A}" />
+			<input id="username" type="text" name="username" value="$USERNAME_A" />
 		</td>
 	</tr>
 	<tr>
@@ -48,7 +48,7 @@
 			</nobr>
 		</td>
 		<td class="value">
-			<input id="password" type="password" name="password" value="${PASSWORD:A}" />
+			<input id="password" type="password" name="password" value="$PASSWORD_A" />
 		</td>
 	</tr>
 	<tr>
@@ -59,8 +59,13 @@
 		</td>
 		<td class="value">
 			<select id="protocol" name="protocol">
-			  <option value="http">http</option>
-			  <option value="https">https</option>
+			#if($PROTOCOL_BJ == "https")
+        <option value="http">http</option>
+        <option value="https" selected="selected">https</option>
+      #else
+        <option value="http" selected="selected">http</option>
+        <option value="https">https</option>
+      #end
 			</select>
 		</td>
 	</tr>
@@ -71,7 +76,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>
@@ -81,7 +86,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>
@@ -91,19 +96,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>
-</table>
-
-<script type="text/javascript">
-<!--
-var protocol = "${PROTOCOL:BJ}";
-var protocolSelect = editconnection.protocol;
-if(protocol=="https"){
-  protocolSelect.options[1].selected = true;
-} else {
-  protocolSelect.options[0].selected = true;
-}
-//-->
-</script>
\ No newline at end of file
+</table>
\ No newline at end of file

Modified: incubator/lcf/trunk/connectors/alfresco/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/alfresco/editSpecification_en_US.html
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/connectors/alfresco/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/alfresco/editSpecification_en_US.html?rev=1238731&r1=1238730&r2=1238731&view=diff
==============================================================================
--- incubator/lcf/trunk/connectors/alfresco/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/alfresco/editSpecification_en_US.html
(original)
+++ incubator/lcf/trunk/connectors/alfresco/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/alfresco/editSpecification_en_US.html
Tue Jan 31 18:23:17 2012
@@ -29,7 +29,7 @@
 		</td>
 		<td class="value">
 			<nobr>
-				<input type="text" size="120" name="luceneQuery" value="${LUCENEQUERY:A}" />
+				<input type="text" size="120" name="luceneQuery" value="$LUCENEQUERY_A" />
 			</nobr>
 		</td>
 	</tr>

Modified: incubator/lcf/trunk/connectors/alfresco/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/alfresco/hiddenConfiguration_en_US.html
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/connectors/alfresco/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/alfresco/hiddenConfiguration_en_US.html?rev=1238731&r1=1238730&r2=1238731&view=diff
==============================================================================
--- incubator/lcf/trunk/connectors/alfresco/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/alfresco/hiddenConfiguration_en_US.html
(original)
+++ incubator/lcf/trunk/connectors/alfresco/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/alfresco/hiddenConfiguration_en_US.html
Tue Jan 31 18:23:17 2012
@@ -14,10 +14,10 @@
  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="tenantDomain" value="${TENANTDOMAIN: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="tenantDomain" value="$TENANTDOMAIN_A" />
\ No newline at end of file

Modified: incubator/lcf/trunk/connectors/alfresco/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/alfresco/hiddenSpecification_en_US.html
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/connectors/alfresco/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/alfresco/hiddenSpecification_en_US.html?rev=1238731&r1=1238730&r2=1238731&view=diff
==============================================================================
--- incubator/lcf/trunk/connectors/alfresco/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/alfresco/hiddenSpecification_en_US.html
(original)
+++ incubator/lcf/trunk/connectors/alfresco/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/alfresco/hiddenSpecification_en_US.html
Tue Jan 31 18:23:17 2012
@@ -14,4 +14,4 @@
  See the License for the specific language governing permissions and
  limitations under the License.
 -->
-<input type="hidden" name="luceneQuery" value="${LUCENEQUERY:A}" />
\ No newline at end of file
+<input type="hidden" name="luceneQuery" value="$LUCENEQUERY_A" />
\ No newline at end of file

Modified: incubator/lcf/trunk/connectors/alfresco/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/alfresco/viewConfiguration_en_US.html
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/connectors/alfresco/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/alfresco/viewConfiguration_en_US.html?rev=1238731&r1=1238730&r2=1238731&view=diff
==============================================================================
--- incubator/lcf/trunk/connectors/alfresco/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/alfresco/viewConfiguration_en_US.html
(original)
+++ incubator/lcf/trunk/connectors/alfresco/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/alfresco/viewConfiguration_en_US.html
Tue Jan 31 18:23:17 2012
@@ -24,11 +24,11 @@
 		</td>
 		<td class="value" colspan="3">
 		  <nobr>
-        tenantDomain=${TENANTDOMAIN:B}
+        tenantDomain=$TENANTDOMAIN_B
       </nobr>
       <br />
 			<nobr>
-				username=${USERNAME:B}
+				username=$USERNAME_B
 			</nobr>
 			<br />
       <nobr>
@@ -36,19 +36,19 @@
       </nobr>
 			<br />
 			<nobr>
-				protocol=${PROTOCOL:B}
+				protocol=$PROTOCOL_B
 			</nobr>
       <br />
       <nobr>
-        server=${SERVER:B}
+        server=$SERVER_B
       </nobr>
       <br />
       <nobr>
-        port=${PORT:B}
+        port=$PORT_B
       </nobr>
       <br />
       <nobr>
-        path=${PATH:B}
+        path=$PATH_B
       </nobr>
       <br />
 		</td>

Modified: incubator/lcf/trunk/connectors/alfresco/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/alfresco/viewSpecification_en_US.html
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/connectors/alfresco/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/alfresco/viewSpecification_en_US.html?rev=1238731&r1=1238730&r2=1238731&view=diff
==============================================================================
--- incubator/lcf/trunk/connectors/alfresco/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/alfresco/viewSpecification_en_US.html
(original)
+++ incubator/lcf/trunk/connectors/alfresco/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/alfresco/viewSpecification_en_US.html
Tue Jan 31 18:23:17 2012
@@ -21,7 +21,7 @@
 			Lucene Query:
 		</td>
 		<td class="value">
-			${LUCENEQUERY:B}
+			$LUCENEQUERY_B
 		</td>
 	</tr>
 </table>



Mime
View raw message