Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Kinsamanka/feature/#2135 tango controls support 2 7 2 #2401

Open
wants to merge 4 commits into
base: release/2.7.4
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 3 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions WebContent/WEB-INF/jsp/dataSourceEdit.jsp
Original file line number Diff line number Diff line change
Expand Up @@ -502,5 +502,9 @@
test="${dataSource.type.id == applicationScope['constants.DataSourceVO.Types.RADIUINO']}">
<jsp:include page="dataSourceEdit/editRadiuino.jsp" />
</c:when>
<c:when
test="${dataSource.type.id == applicationScope['constants.DataSourceVO.Types.TANGO']}">
<jsp:include page="dataSourceEdit/editTango.jsp" />
</c:when>
</c:choose>
</tag:page>
17 changes: 17 additions & 0 deletions WebContent/WEB-INF/jsp/dataSourceEdit/dsFootTango.jspf
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
<%@ include file="/WEB-INF/jsp/include/tech.jsp" %>
<tr>
<td class="formLabelRequired"><fmt:message key="dsEdit.tango.deviceID"/></td>
<td class="formField"><input id="deviceID" type="text" value="${dataSource.deviceID}"/></td>
</tr>
<tr>
<td class="formLabelRequired"><fmt:message key="dsEdit.tango.hostName"/></td>
<td class="formField"><input id="hostName" type="text" value="${dataSource.hostName}"/></td>
</tr>
<tr>
<td class="formLabelRequired"><fmt:message key="dsEdit.tango.port"/></td>
<td class="formField"><input id="port" type="text" value="${dataSource.port}"/></td>
</tr>
</table>
<tag:dsEvents/>
</div>
</td>
58 changes: 58 additions & 0 deletions WebContent/WEB-INF/jsp/dataSourceEdit/editTango.jsp
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
<%--
@author GP Orcullo
--%>
<%@ include file="/WEB-INF/jsp/include/tech.jsp" %>

<script type="text/javascript">
function initImpl() {
}
function saveDataSourceImpl() {
DataSourceEditDwr.saveTangoDataSource($get("dataSourceName"), $get("dataSourceXid"),
$get("deviceID"), $get("hostName"),
$get("port"), saveDataSourceCB);
}
function appendPointListColumnFunctions(pointListColumnHeaders, pointListColumnFunctions) {
pointListColumnHeaders.push('<fmt:message key="dsEdit.tango.attribute"/>');
pointListColumnHeaders.push('<fmt:message key="dsEdit.tango.type"/>');
pointListColumnFunctions.push(function(p) { return p.pointLocator.attribute; });
pointListColumnFunctions.push(
function(p) { return p.pointLocator.settable ? '<fmt:message key="dsEdit.tango.writable"/>' :
'<fmt:message key="dsEdit.tango.readonly"/>'; });
}
function editPointCBImpl(locator) {
$set("attribute", locator.attribute);
$set("settable", locator.settable);
$set("dataTypeId", locator.dataTypeId);
}
function savePointImpl(locator) {
delete locator.settable;
locator.attribute = $get("attribute");
locator.settable = $get("settable");
locator.dataTypeId = $get("dataTypeId");
DataSourceEditDwr.saveTangoPointLocator(currentPoint.id, $get("xid"), $get("name"), locator, savePointCB);
}
</script>

<c:set var="dsDesc"><fmt:message key="dsEdit.tango.desc"/></c:set>
<c:set var="dsHelpId" value="tangoDS"/>
<%@ include file="/WEB-INF/jsp/dataSourceEdit/dsHead.jspf" %>
<%@ include file="/WEB-INF/jsp/dataSourceEdit/dsFootTango.jspf" %>

<tag:pointList pointHelpId="tangoPP">
<tr>
<td class="formLabelRequired"><fmt:message key="dsEdit.pointDataType"/></td>
<td class="formField">
<select name="dataTypeId">
<tag:dataTypeOptions excludeImage="true"/>
</select>
</td>
</tr>
<tr>
<td class="formLabelRequired"><fmt:message key="dsEdit.tango.attribute"/></td>
<td class="formField"><input type="text" id="attribute"/></td>
</tr>
<tr>
<td class="formLabel"><fmt:message key="dsEdit.tango.writable"/></td>
<td class="formField"><input type="checkbox" id="settable"/></td>
</tr>
</tag:pointList>
Binary file added WebContent/WEB-INF/lib/JTangoCommons-9.6.8.jar
Binary file not shown.
Binary file added WebContent/WEB-INF/lib/JavaTangoIDL-9.5.9.jar
Binary file not shown.
Binary file added WebContent/WEB-INF/lib/TangORB-9.6.8.jar
Binary file not shown.
Binary file added WebContent/WEB-INF/lib/jacorb-3.9.jar
Binary file not shown.
Binary file added WebContent/WEB-INF/lib/jacorb-omgapi-3.9.jar
Binary file not shown.
Binary file added WebContent/WEB-INF/lib/jacorb-services-3.9.jar
Binary file not shown.
Binary file not shown.
Binary file added WebContent/WEB-INF/lib/jeromq-0.5.1.jar
Binary file not shown.
14 changes: 11 additions & 3 deletions build.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
<property name="app-version" value="1.7"/>
<property environment="env"/>
<property name="debuglevel" value="source,lines,vars"/>
<property name="target" value="1.8"/>
<property name="source" value="1.8"/>
<property name="target" value="11"/>
<property name="source" value="11"/>

<property name="build-project.dir" value="build/"/>
<property name="build-project.src.dir" value="${build-project.dir}classes/"/>
Expand Down Expand Up @@ -853,12 +853,20 @@
<pathelement location="WebContent/WEB-INF/lib/spring-security-messaging-4.2.5.RELEASE.jar"/>
<pathelement location="WebContent/WEB-INF/lib/spring-security-web-4.2.5.RELEASE.jar"/>
<pathelement location="WebContent/WEB-INF/lib/spring-session-1.3.5.RELEASE.jar"/>
<pathelement location="WebContent/WEB-INF/lib/JTangoCommons-9.6.8.jar"/>
<pathelement location="WebContent/WEB-INF/lib/JavaTangoIDL-9.5.9.jar"/>
<pathelement location="WebContent/WEB-INF/lib/jacorb-3.9.jar"/>
<pathelement location="WebContent/WEB-INF/lib/jacorb-omgapi-3.9.jar"/>
<pathelement location="WebContent/WEB-INF/lib/jacorb-services-3.9.jar"/>
<pathelement location="WebContent/WEB-INF/lib/jboss-rmi-api_1.0_spec-1.0.6.Final.jar"/>
<pathelement location="WebContent/WEB-INF/lib/jeromq-0.5.1.jar"/>
<pathelement location="WebContent/WEB-INF/lib/TangORB-9.6.8.jar"/>
<pathelement location="WebContent/WEB-INF/lib/jSerialComm-2.9.2.jar"/>
<pathelement location="WebContent/WEB-INF/lib/amqp-client-5.15.0.jar"/>
<pathelement location="WebContent/WEB-INF/lib/org.eclipse.paho.client.mqttv3-1.2.5.jar"/>
<pathelement location="WebContent/WEB-INF/lib/org.eclipse.paho.mqttv5.client-1.2.5.jar"/>
<pathelement location="WebContent/WEB-INF/classes"/>
</path>
</path>
<path id="EAR Libraries.libraryclasspath"/>
<path id="Apache Tomcat v7.0 [Apache Tomcat v7.0].libraryclasspath">
<pathelement location="${env.CATALINA_HOME}/lib/annotations-api.jar"/>
Expand Down
2 changes: 2 additions & 0 deletions src/com/serotonin/mango/MangoContextListener.java
Original file line number Diff line number Diff line change
Expand Up @@ -307,6 +307,8 @@ private void constantsInitialize(ServletContext ctx) {
DataSourceVO.Type.INTERNAL.getId());
ctx.setAttribute("constants.DataSourceVO.Types.JMX",
DataSourceVO.Type.JMX.getId());
ctx.setAttribute("constants.DataSourceVO.Types.TANGO",
DataSourceVO.Type.TANGO.getId());
ctx.setAttribute("constants.DataSourceVO.Types.MQTT",
DataSourceVO.Type.MQTT.getId());
ctx.setAttribute("constants.Permissions.DataPointAccessTypes.NONE",
Expand Down
Loading