[Carbon-dev] svn commit r31971 - in branches/carbon/1.5.1/trunk/carbon-components/data-services/org.wso2.carbon.dataservices.ui/src/main/resources: org/wso2/carbon/dataservices/ui/i18n web/ds
sumedha at wso2.com
sumedha at wso2.com
Mon Mar 9 02:03:08 PDT 2009
Author: sumedha
Date: Mon Mar 9 02:03:08 2009
New Revision: 31971
URL: http://wso2.org/svn/browse/wso2?view=rev&revision=31971
Log:
copying changes from trunk
Modified:
branches/carbon/1.5.1/trunk/carbon-components/data-services/org.wso2.carbon.dataservices.ui/src/main/resources/org/wso2/carbon/dataservices/ui/i18n/Resources.properties
branches/carbon/1.5.1/trunk/carbon-components/data-services/org.wso2.carbon.dataservices.ui/src/main/resources/web/ds/addDataSource.jsp
branches/carbon/1.5.1/trunk/carbon-components/data-services/org.wso2.carbon.dataservices.ui/src/main/resources/web/ds/addOutputMapping.jsp
branches/carbon/1.5.1/trunk/carbon-components/data-services/org.wso2.carbon.dataservices.ui/src/main/resources/web/ds/addQuery.jsp
Modified: branches/carbon/1.5.1/trunk/carbon-components/data-services/org.wso2.carbon.dataservices.ui/src/main/resources/org/wso2/carbon/dataservices/ui/i18n/Resources.properties
URL: http://wso2.org/svn/browse/wso2/branches/carbon/1.5.1/trunk/carbon-components/data-services/org.wso2.carbon.dataservices.ui/src/main/resources/org/wso2/carbon/dataservices/ui/i18n/Resources.properties?rev=31971&r1=31970&r2=31971&view=diff
==============================================================================
--- branches/carbon/1.5.1/trunk/carbon-components/data-services/org.wso2.carbon.dataservices.ui/src/main/resources/org/wso2/carbon/dataservices/ui/i18n/Resources.properties (original)
+++ branches/carbon/1.5.1/trunk/carbon-components/data-services/org.wso2.carbon.dataservices.ui/src/main/resources/org/wso2/carbon/dataservices/ui/i18n/Resources.properties Mon Mar 9 02:03:08 2009
@@ -165,6 +165,7 @@
edit.query.header=Edit Query
dataservice.output.field.name=Output field name
dataservice.sql.column.name=SQL column Name
+dataservice.datasource.column.name=Data source column Name
dataservice.query.parameter.name=Query Parameter Name
dataservice.query.parameter.mapping=Query Parameter Mapping
dataservices.select.query=Select Query
Modified: branches/carbon/1.5.1/trunk/carbon-components/data-services/org.wso2.carbon.dataservices.ui/src/main/resources/web/ds/addDataSource.jsp
URL: http://wso2.org/svn/browse/wso2/branches/carbon/1.5.1/trunk/carbon-components/data-services/org.wso2.carbon.dataservices.ui/src/main/resources/web/ds/addDataSource.jsp?rev=31971&r1=31970&r2=31971&view=diff
==============================================================================
--- branches/carbon/1.5.1/trunk/carbon-components/data-services/org.wso2.carbon.dataservices.ui/src/main/resources/web/ds/addDataSource.jsp (original)
+++ branches/carbon/1.5.1/trunk/carbon-components/data-services/org.wso2.carbon.dataservices.ui/src/main/resources/web/ds/addDataSource.jsp Mon Mar 9 02:03:08 2009
@@ -345,7 +345,7 @@
<input class="button" type="button" value="<fmt:message key="datasource.test.connection"/>" onclick="testConnection();return false;"/>
<script type="text/javascript">
function displayMsg(msg){
- CARBON.showErrorDialog(msg);
+ CARBON.showInfoDialog(msg);
}
function testConnection() {
Modified: branches/carbon/1.5.1/trunk/carbon-components/data-services/org.wso2.carbon.dataservices.ui/src/main/resources/web/ds/addOutputMapping.jsp
URL: http://wso2.org/svn/browse/wso2/branches/carbon/1.5.1/trunk/carbon-components/data-services/org.wso2.carbon.dataservices.ui/src/main/resources/web/ds/addOutputMapping.jsp?rev=31971&r1=31970&r2=31971&view=diff
==============================================================================
--- branches/carbon/1.5.1/trunk/carbon-components/data-services/org.wso2.carbon.dataservices.ui/src/main/resources/web/ds/addOutputMapping.jsp (original)
+++ branches/carbon/1.5.1/trunk/carbon-components/data-services/org.wso2.carbon.dataservices.ui/src/main/resources/web/ds/addOutputMapping.jsp Mon Mar 9 02:03:08 2009
@@ -3,13 +3,13 @@
<%@ page import="org.wso2.carbon.dataservices.ui.beans.*" %>
<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %>
<%@ taglib uri="http://wso2.org/projects/carbon/taglibs/carbontags.jar" prefix="carbon" %>
-<fmt:bundle basename="org.wso2.carbon.dataservices.ui.i18n.Resources">
+<fmt:bundle basename="org.wso2.carbon.dataservices.ui.i18n.Resources">
<!--
<carbon:breadcrumb
label="Add/Edit Output Mapping"
resourceBundle="org.wso2.carbon.dataservices.ui.i18n.Resources"
topPage="false"
- request="<%=request%>" />
+ request="<%=request%>" />
-->
<jsp:useBean id="dataService" class="org.wso2.carbon.dataservices.ui.beans.Data" scope="session">
</jsp:useBean>
@@ -22,7 +22,7 @@
String editFlag = request.getParameter("edit");
edit = (edit == null) ? "" : edit;
%>
- <form method="post" action="OutputMappingProcessor.jsp?flag=outputMapping&edit=<%=edit%>" id="outputMapping" name="outputMapping"
+ <form method="post" action="OutputMappingProcessor.jsp?flag=outputMapping&edit=<%=edit%>" id="outputMapping" name="outputMapping"
onsubmit="return validateOutputMappingMandatoryFields();">
<table class="styledLeft" id="outputmappingTable">
<%
@@ -173,7 +173,7 @@
<td><input value="<%=name%>" id="txtDataServiceOMElementName" name="txtDataServiceOMElementName" size="30" type="text"></td>
</tr>
<tr>
- <td><label><fmt:message key="dataservice.sql.column.name"/></label></td>
+ <td><label><fmt:message key="dataservice.datasource.column.name"/></label></td>
<td><input value="<%=column%>" id="txtDataServiceOMColumnName" name="txtDataServiceOMColumnName" size="30" type="text"></td>
</tr>
</table>
@@ -190,6 +190,9 @@
ArrayList<Attribute> attributes = result.getAttributes();
ArrayList<CallQuery> callQueries = result.getCallQueries();
if(elements.size() != 0 || attributes != null || callQueries != null){
+ if (elements != null) {
+ Iterator itrElements = elements.iterator();
+ if(itrElements.hasNext()){
%>
<tr>
<td><b><fmt:message key="dataservices.element.name"/></b></td>
@@ -198,9 +201,7 @@
<td><b><fmt:message key="actions1"/></b></td>
</tr>
<%
-
- if (elements != null) {
- Iterator itrElements = elements.iterator();
+ }
while (itrElements.hasNext()) {
Element element = (Element) itrElements.next();
%>
@@ -242,17 +243,19 @@
<%
}
}
- if (callQueries != null) {
- %>
- <tr>
- <td colspan="4"></td>
- </tr>
- <tr>
- <td colspan="3"><b><fmt:message key="query.id"/></b></td>
- <td><b><fmt:message key="actions1"/></b></td>
- </tr>
- <%
+ if (callQueries != null) {
Iterator itrCallQueries = callQueries.iterator();
+ if(itrCallQueries.hasNext()){
+ %>
+ <tr>
+ <td colspan="4"></td>
+ </tr>
+ <tr>
+ <td colspan="3"><b><fmt:message key="query.id"/></b></td>
+ <td><b><fmt:message key="actions1"/></b></td>
+ </tr>
+ <%
+ }
while (itrCallQueries.hasNext()) {
CallQuery callQuery = (CallQuery) itrCallQueries.next();
%>
@@ -282,11 +285,11 @@
</table>
</td>
</tr>
- <tr>
- <td class="buttonRow" colspan="2">
- <input class="button" type="button" value="<fmt:message key="mainConfiguration"/>"
- onclick="document.outputMapping.action='addQuery.jsp?queryId=<%=queryId%>';document.outputMapping.submit();return false;"/>
- <input class="button" type="submit" value="<fmt:message key="add"/>"
+ <tr>
+ <td class="buttonRow" colspan="2">
+ <input class="button" type="button" value="<fmt:message key="mainConfiguration"/>"
+ onclick="document.outputMapping.action='addQuery.jsp?queryId=<%=queryId%>';document.outputMapping.submit();return false;"/>
+ <input class="button" type="submit" value="<fmt:message key="add"/>"
onclick="document.outputMapping.action = 'OutputMappingProcessor.jsp?flag=add&edit=<%=editFlag%>'"/>
</td>
</tr>
@@ -294,8 +297,8 @@
</table>
</form>
</div>
- </div>
- <script type="text/javascript">
- alternateTableRows('existingMappingsTable', 'tableEvenRow', 'tableOddRow');
+ </div>
+ <script type="text/javascript">
+ alternateTableRows('existingMappingsTable', 'tableEvenRow', 'tableOddRow');
</script>
</fmt:bundle>
\ No newline at end of file
Modified: branches/carbon/1.5.1/trunk/carbon-components/data-services/org.wso2.carbon.dataservices.ui/src/main/resources/web/ds/addQuery.jsp
URL: http://wso2.org/svn/browse/wso2/branches/carbon/1.5.1/trunk/carbon-components/data-services/org.wso2.carbon.dataservices.ui/src/main/resources/web/ds/addQuery.jsp?rev=31971&r1=31970&r2=31971&view=diff
==============================================================================
--- branches/carbon/1.5.1/trunk/carbon-components/data-services/org.wso2.carbon.dataservices.ui/src/main/resources/web/ds/addQuery.jsp (original)
+++ branches/carbon/1.5.1/trunk/carbon-components/data-services/org.wso2.carbon.dataservices.ui/src/main/resources/web/ds/addQuery.jsp Mon Mar 9 02:03:08 2009
@@ -282,7 +282,11 @@
<table class="styledInner" cellspacing="0" id="existingOutputMappingsTable">
<% if (query != null) {
Result result = query.getResult();
- if (result != null) { %>
+ if (result != null) {
+ ArrayList<Element> elements = result.getElements();
+ Iterator itrElements = elements.iterator();
+ if(itrElements.hasNext()){
+ %>
<tr>
<td><b><fmt:message key="dataservices.element.name"/></b></td>
<td><b><fmt:message key="dataservices.sql.column.name"/></b></td>
@@ -291,11 +295,10 @@
</tr>
<%
- ArrayList<Element> elements = result.getElements();
+ }
ArrayList<Attribute> attributes = result.getAttributes();
ArrayList<CallQuery> callQueries = result.getCallQueries();
if (elements != null) {
- Iterator itrElements = elements.iterator();
while (itrElements.hasNext()) {
Element element = (Element) itrElements.next();
%>
@@ -338,6 +341,8 @@
}
}
if (callQueries != null) {
+ Iterator itrCallQueries = callQueries.iterator();
+ if(itrCallQueries.hasNext()){
%>
<tr>
<td colspan="4"></td>
@@ -346,8 +351,8 @@
<td colspan="3"><b><fmt:message key="query.id"/></b></td>
<td><b><fmt:message key="actions1"/></b></td>
</tr>
- <%
- Iterator itrCallQueries = callQueries.iterator();
+ <%
+ }
while (itrCallQueries.hasNext()) {
CallQuery callQuery = (CallQuery) itrCallQueries.next();
%>
More information about the Carbon-dev
mailing list