Author: kwright
Date: Tue Jun 10 23:40:49 2014
New Revision: 1601792
URL: http://svn.apache.org/r1601792
Log:
Add Velocity templates
Added:
manifoldcf/branches/CONNECTORS-961/connectors/forcedmetadata/connector/src/main/resources/org/apache/manifoldcf/agents/transformation/forcedmetadata/editSpecification.js
(with props)
manifoldcf/branches/CONNECTORS-961/connectors/forcedmetadata/connector/src/main/resources/org/apache/manifoldcf/agents/transformation/forcedmetadata/editSpecification_ForcedMetadata.html
(with props)
manifoldcf/branches/CONNECTORS-961/connectors/forcedmetadata/connector/src/main/resources/org/apache/manifoldcf/agents/transformation/forcedmetadata/viewSpecification.html
(with props)
Modified:
manifoldcf/branches/CONNECTORS-961/connectors/forcedmetadata/connector/src/main/java/org/apache/manifoldcf/agents/transformation/forcedmetadata/ForcedMetadataConnector.java
manifoldcf/branches/CONNECTORS-961/connectors/forcedmetadata/connector/src/main/native2ascii/org/apache/manifoldcf/agents/transformation/forcedmetadata/common_en_US.properties
Modified:
manifoldcf/branches/CONNECTORS-961/connectors/forcedmetadata/connector/src/main/java/org/apache/manifoldcf/agents/transformation/forcedmetadata/ForcedMetadataConnector.java
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-961/connectors/forcedmetadata/connector/src/main/java/org/apache/manifoldcf/agents/transformation/forcedmetadata/ForcedMetadataConnector.java?rev=1601792&r1=1601791&r2=1601792&view=diff
==============================================================================
---
manifoldcf/branches/CONNECTORS-961/connectors/forcedmetadata/connector/src/main/java/org/apache/manifoldcf/agents/transformation/forcedmetadata/ForcedMetadataConnector.java
(original)
+++
manifoldcf/branches/CONNECTORS-961/connectors/forcedmetadata/connector/src/main/java/org/apache/manifoldcf/agents/transformation/forcedmetadata/ForcedMetadataConnector.java
Tue Jun 10 23:40:49 2014
@@ -267,9 +267,8 @@ public class ForcedMetadataConnector ext
protected void fillInForcedMetadataTab(Map<String,Object> paramMap,
Specification os)
{
- // We construct a list of maps from the parameters
- List<Map<String,String>> pObject = new ArrayList<Map<String,String>>();
-
+ // First, sort everything
+ Map<String,Set<String>> params = new HashMap<String,Set<String>>();
for (int i = 0; i < os.getChildCount(); i++)
{
SpecificationNode sn = os.getChild(i);
@@ -277,12 +276,48 @@ public class ForcedMetadataConnector ext
{
String parameter = sn.getAttributeValue(ATTR_PARAMETER);
String value = sn.getAttributeValue(ATTR_VALUE);
+ Set<String> values = params.get(parameter);
+ if (values == null)
+ {
+ values = new HashSet<String>();
+ params.put(parameter,values);
+ }
+ values.add(value);
+ }
+ }
+
+ // We construct a list of maps from the parameters
+ List<Map<String,String>> pObject = new ArrayList<Map<String,String>>();
+
+ String[] keys = new String[params.size()];
+ int j = 0;
+ while (String key : params.keySet())
+ {
+ keys[j++] = key;
+ }
+ java.util.Arrays.sort(keys);
+
+ // Now, build map
+ for (String key : keys)
+ {
+ Set<String> values = params.get(key);
+ String[] valueArray = new String[values.size()];
+ j = 0;
+ for (String value : values)
+ {
+ valueArray[j++] = value;
+ }
+ java.util.Arrays.sort(valueArray);
+
+ for (String value : valueArray)
+ {
Map<String,String> record = new HashMap<String,String>();
- record.put("parameter",parameter);
+ record.put("parameter",key);
record.put("value",value);
pObject.add(record);
}
}
+
paramMap.put("Parameters",pObject);
}
Modified:
manifoldcf/branches/CONNECTORS-961/connectors/forcedmetadata/connector/src/main/native2ascii/org/apache/manifoldcf/agents/transformation/forcedmetadata/common_en_US.properties
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-961/connectors/forcedmetadata/connector/src/main/native2ascii/org/apache/manifoldcf/agents/transformation/forcedmetadata/common_en_US.properties?rev=1601792&r1=1601791&r2=1601792&view=diff
==============================================================================
---
manifoldcf/branches/CONNECTORS-961/connectors/forcedmetadata/connector/src/main/native2ascii/org/apache/manifoldcf/agents/transformation/forcedmetadata/common_en_US.properties
(original)
+++
manifoldcf/branches/CONNECTORS-961/connectors/forcedmetadata/connector/src/main/native2ascii/org/apache/manifoldcf/agents/transformation/forcedmetadata/common_en_US.properties
Tue Jun 10 23:40:49 2014
@@ -14,3 +14,11 @@
# limitations under the License.
ForcedMetadata.ForcedMetadata=Forced metadata
+ForcedMetadata.ForcedMetadataNameMustNotBeNull=Forced metadata name must not
be null
+ForcedMetadata.ForcedMetadataColon=Forced metadata:
+ForcedMetadata.ParameterName=Parameter name
+ForcedMetadata.ParameterValue=Parameter value
+ForcedMetadata.Delete=Delete
+ForcedMetadata.Deleteforcedmetadatanumber=Delete forced metadata #
+ForcedMetadata.Add=Add
+ForcedMetadata.Addforcedmetadata=Add forced metadata item
\ No newline at end of file
Added:
manifoldcf/branches/CONNECTORS-961/connectors/forcedmetadata/connector/src/main/resources/org/apache/manifoldcf/agents/transformation/forcedmetadata/editSpecification.js
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-961/connectors/forcedmetadata/connector/src/main/resources/org/apache/manifoldcf/agents/transformation/forcedmetadata/editSpecification.js?rev=1601792&view=auto
==============================================================================
---
manifoldcf/branches/CONNECTORS-961/connectors/forcedmetadata/connector/src/main/resources/org/apache/manifoldcf/agents/transformation/forcedmetadata/editSpecification.js
(added)
+++
manifoldcf/branches/CONNECTORS-961/connectors/forcedmetadata/connector/src/main/resources/org/apache/manifoldcf/agents/transformation/forcedmetadata/editSpecification.js
Tue Jun 10 23:40:49 2014
@@ -0,0 +1,53 @@
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<script type="text/javascript">
+<!--
+
+function AddForcedMetadata_$SeqNum()
+{
+ if (editjob.forcedmetadata_$SeqNum_name.value == "")
+ {
+
alert("$Encoder.bodyJavascriptEscape($ResourceBundle.getString('ForcedMetadata.ForcedMetadataNameMustNotBeNull'))");
+ editjob.forcedmetadata_$SeqNum_name.focus();
+ return;
+ }
+ document.editjob.forcedmetadata_$SeqNum_op.value="Add";
+ postFormSetAnchor("forcedmetadata_$SeqNum_tag");
+}
+
+function DeleteForcedMetadata_$SeqNum(n)
+{
+ eval("document.editjob.forcedmetadata_$SeqNum_"+n+"_op.value = 'Delete'");
+ if (n == 0)
+ postFormSetAnchor("forcedmetadata_$SeqNum_tag");
+ else
+ postFormSetAnchor("forcedmetadata_$SeqNum_"+(n-1)+"_tag");
+}
+
+function checkSpecificationForSave_$SeqNum()
+{
+ return true;
+}
+
+function checkSpecification_$SeqNum()
+{
+ return true;
+}
+
+//-->
+</script>
Propchange:
manifoldcf/branches/CONNECTORS-961/connectors/forcedmetadata/connector/src/main/resources/org/apache/manifoldcf/agents/transformation/forcedmetadata/editSpecification.js
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
manifoldcf/branches/CONNECTORS-961/connectors/forcedmetadata/connector/src/main/resources/org/apache/manifoldcf/agents/transformation/forcedmetadata/editSpecification.js
------------------------------------------------------------------------------
svn:keywords = Id
Added:
manifoldcf/branches/CONNECTORS-961/connectors/forcedmetadata/connector/src/main/resources/org/apache/manifoldcf/agents/transformation/forcedmetadata/editSpecification_ForcedMetadata.html
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-961/connectors/forcedmetadata/connector/src/main/resources/org/apache/manifoldcf/agents/transformation/forcedmetadata/editSpecification_ForcedMetadata.html?rev=1601792&view=auto
==============================================================================
---
manifoldcf/branches/CONNECTORS-961/connectors/forcedmetadata/connector/src/main/resources/org/apache/manifoldcf/agents/transformation/forcedmetadata/editSpecification_ForcedMetadata.html
(added)
+++
manifoldcf/branches/CONNECTORS-961/connectors/forcedmetadata/connector/src/main/resources/org/apache/manifoldcf/agents/transformation/forcedmetadata/editSpecification_ForcedMetadata.html
Tue Jun 10 23:40:49 2014
@@ -0,0 +1,88 @@
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+#if($TabName == $ResourceBundle.getString('ForcedMetadata.ForcedMetadata' &&
$SeqNum == $SelectedNum))
+
+<table class="displaytable">
+ <tr>
+ <td class="separator" colspan="4"><hr/></td>
+ </tr>
+ <tr>
+ <td class="description"
colspan="1"><nobr>$Encoder.bodyEscape($ResourceBundle.getString('ForcedMetadata.ForcedMetadataColon'))</nobr></td>
+ <td class="boxcell" colspan="3">
+ <table class="formtable">
+ <tr class="formheaderrow">
+ <td class="formcolumnheader"></td>
+ <td
class="formcolumnheader"><nobr>$Encoder.bodyEscape($ResourceBundle.getString('ForcedMetadata.ParameterName'))</nobr></td>
+ <td
class="formcolumnheader"><nobr>$Encoder.bodyEscape($ResourceBundle.getString('ForcedMetadata.ParameterValue'))</nobr></td>
+ </tr>
+ #set($paramcounter = 0)
+ #foreach($paramrecord in $Parameters)
+ #if(($paramcounter % 2) == 0)
+ <tr class="evenformrow">
+ #else
+ <tr class="oddformrow">
+ #end
+ <td class="formcolumncell">
+ <a name="forcedmetadata_$SeqNum_$paramcounter_tag"/>
+ <input type="button"
value="$Encoder.attributeEscape($ResourceBundle.getString('ForcedMetadata.Delete'))"
alt="$Encoder.attributeEscape($ResourceBundle.getString('ForcedMetadata.Deleteforcedmetadatanumber'))$paramcounter"
onclick='javascript:DeleteForcedMetadata_$SeqNum("$paramcounter");'/>
+ <input type="hidden"
name="forcedmetadata_$SeqNum_$paramcounter_op" value="Continue"/>
+ <input type="hidden"
name="forcedmetadata_$SeqNum_$paramcounter_name"
value="$Encoder.attributeEscape($paramrecord.get('parameter')"/>
+ <input type="hidden"
name="forcedmetadata_$SeqNum_$paramcounter_value"
value="$Encoder.attributeEscape($paramrecord.get('value')"/>
+ </td>
+ <td class="formcolumncell">
+ <nobr>$Encoder.bodyEscape($paramrecord.get('parameter'))</nobr>
+ </td>
+ <td class="formcolumncell">
+ <nobr>$Encoder.bodyEscape($paramrecord.get('value'))</nobr>
+ </td>
+ </tr>
+ #set($paramcounter = $paramcounter + 1)
+ #end
+ #if($paramcounter == 0)
+ <tr class="formrow"><td colspan="3"
class="formcolumnmessage"><nobr>$Encoder.bodyEscape($ResourceBundle.getString('ForcedMetadata.NoForcedMetadataSpecified'))</nobr></td></tr>
+ #end
+ <tr class="formrow"><td colspan="3"
class="formseparator"><hr/></td></tr>
+ <tr class="formrow">
+ <td class="formcolumncell">
+ <a name="forcedmetadata_$SeqNum_tag"/>
+ <input type="hidden" name="forcedmetadata_$SeqNum_op"
value="Continue"/>
+ <input type="button"
value="$Encoder.attributeEscape($ResourceBundle.getString('ForcedMetadata.Add'))"
alt="$Encoder.attributeEscape($ResourceBundle.getString('ForcedMetadata.Addforcedmetadata'))"
onclick="javascript:AddForcedMetadata();"/>
+ <input type="hidden" name="forcedmetadata_$SeqNum_count"
value="$paramcounter"/>
+ </td>
+ <td class="formcolumncell">
+ <input type="text" name="forcedmetadata_$SeqNum_name" size="30"
value=""/>
+ </td>
+ <td class="formcolumncell">
+ <input type="text" name="forcedmetadata_$SeqNum_value" size="30"
value=""/>
+ </td>
+ </tr>
+ </table>
+ </td>
+ </tr>
+</table>
+
+#else
+
+ #set($paramcounter = 0)
+ #foreach($paramrecord in $Parameters)
+<input type="hidden" name="forcedmetadata_$SeqNum_$paramcounter_name"
value="$Encoder.attributeEscape($paramrecord.get('parameter'))" />
+<input type="hidden" name="forcedmetadata_$SeqNum_$paramcounter_value"
value="$Encoder.attributeEscape($paramrecord.get('value'))" />
+ #end
+<input type="hidden" name="forcedmetadata_$SeqNum_count"
value="$paramcounter"/>
+
+#end
Propchange:
manifoldcf/branches/CONNECTORS-961/connectors/forcedmetadata/connector/src/main/resources/org/apache/manifoldcf/agents/transformation/forcedmetadata/editSpecification_ForcedMetadata.html
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
manifoldcf/branches/CONNECTORS-961/connectors/forcedmetadata/connector/src/main/resources/org/apache/manifoldcf/agents/transformation/forcedmetadata/editSpecification_ForcedMetadata.html
------------------------------------------------------------------------------
svn:keywords = Id
Added:
manifoldcf/branches/CONNECTORS-961/connectors/forcedmetadata/connector/src/main/resources/org/apache/manifoldcf/agents/transformation/forcedmetadata/viewSpecification.html
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-961/connectors/forcedmetadata/connector/src/main/resources/org/apache/manifoldcf/agents/transformation/forcedmetadata/viewSpecification.html?rev=1601792&view=auto
==============================================================================
---
manifoldcf/branches/CONNECTORS-961/connectors/forcedmetadata/connector/src/main/resources/org/apache/manifoldcf/agents/transformation/forcedmetadata/viewSpecification.html
(added)
+++
manifoldcf/branches/CONNECTORS-961/connectors/forcedmetadata/connector/src/main/resources/org/apache/manifoldcf/agents/transformation/forcedmetadata/viewSpecification.html
Tue Jun 10 23:40:49 2014
@@ -0,0 +1,52 @@
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<table class="displaytable">
+ <tr>
+ <td class="separator" colspan="4"><hr/></td>
+ </tr>
+ <tr>
+ <td class="description"
colspan="1"><nobr>$Encoder.bodyEscape($ResourceBundle.getString('ForcedMetadata.ForcedMetadataColon'))</nobr></td>
+ <td class="boxcell" colspan="3">
+ <table class="formtable">
+ <tr class="formheaderrow">
+ <td
class="formcolumnheader"><nobr>$Encoder.bodyEscape($ResourceBundle.getString('ForcedMetadata.ParameterName'))</nobr></td>
+ <td
class="formcolumnheader"><nobr>$Encoder.bodyEscape($ResourceBundle.getString('ForcedMetadata.ParameterValue'))</nobr></td>
+ </tr>
+ #set($paramcounter = 0)
+ #foreach($paramrecord in $Parameters)
+ #if(($paramcounter % 2) == 0)
+ <tr class="evenformrow">
+ #else
+ <tr class="oddformrow">
+ #end
+ <td class="formcolumncell">
+ <nobr>$Encoder.bodyEscape($paramrecord.get('parameter'))</nobr>
+ </td>
+ <td class="formcolumncell">
+ <nobr>$Encoder.bodyEscape($paramrecord.get('value'))</nobr>
+ </td>
+ </tr>
+ #set($paramcounter = $paramcounter + 1)
+ #end
+ #if($paramcounter == 0)
+ <tr class="formrow"><td colspan="2"
class="formcolumnmessage"><nobr>$Encoder.bodyEscape($ResourceBundle.getString('ForcedMetadata.NoForcedMetadataSpecified'))</nobr></td></tr>
+ #end
+ </table>
+ </td>
+ </tr>
+</table>
Propchange:
manifoldcf/branches/CONNECTORS-961/connectors/forcedmetadata/connector/src/main/resources/org/apache/manifoldcf/agents/transformation/forcedmetadata/viewSpecification.html
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
manifoldcf/branches/CONNECTORS-961/connectors/forcedmetadata/connector/src/main/resources/org/apache/manifoldcf/agents/transformation/forcedmetadata/viewSpecification.html
------------------------------------------------------------------------------
svn:keywords = Id
