incubator-stonehenge-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bende...@apache.org
Subject svn commit: r820332 [7/7] - in /incubator/stonehenge/trunk/stocktrader/metro: ./ active_sts/ active_sts/etc/ active_sts/src/ active_sts/src/org/ active_sts/src/org/apache/ active_sts/src/org/apache/stonehenge/ active_sts/src/org/apache/stonehenge/stock...
Date Wed, 30 Sep 2009 16:21:14 GMT
Modified: incubator/stonehenge/trunk/stocktrader/metro/trader_client/web/account.xhtml
URL: http://svn.apache.org/viewvc/incubator/stonehenge/trunk/stocktrader/metro/trader_client/web/account.xhtml?rev=820332&r1=820331&r2=820332&view=diff
==============================================================================
--- incubator/stonehenge/trunk/stocktrader/metro/trader_client/web/account.xhtml (original)
+++ incubator/stonehenge/trunk/stocktrader/metro/trader_client/web/account.xhtml Wed Sep 30
16:21:08 2009
@@ -1,256 +1,258 @@
 <html xmlns="http://www.w3.org/1999/xhtml"
-	xmlns:ui="http://java.sun.com/jsf/facelets"
-	xmlns:h="http://java.sun.com/jsf/html"
-	xmlns:c="http://java.sun.com/jstl/core"
-	xmlns:f="http://java.sun.com/jsf/core"
-	xmlns:s="http://stonehenge.apache.com/jsf">
+      xmlns:ui="http://java.sun.com/jsf/facelets"
+      xmlns:h="http://java.sun.com/jsf/html"
+      xmlns:c="http://java.sun.com/jstl/core"
+      xmlns:f="http://java.sun.com/jsf/core"
+      xmlns:s="http://stonehenge.apache.com/jsf">
 <body>
 <ui:composition template="/template.xhtml">
-	<ui:define name="title">
-		Account Information
-    </ui:define>
-	<ui:define name="body">
-		<c:if test="#{!empty portfolioBean.closedOrdersReturn}">
-			<ui:include src="alertInfo.jsf" />
-		</c:if>
-		<div align="center">
-		<h:dataTable styleClass="table-outer"
-			cellspacing="0" value="#{accountBean.accountSummary}"
-			var="accountSummary">
-			<h:column>
-				<f:facet name="header">
-					<h:outputText value="Subtotal Buys" />
-				</f:facet>
-				<h:outputText class="currency">
-					<s:currency value="#{accountSummary.totalBuys}" />
-				</h:outputText>
-			</h:column>
-			<h:column>
-				<f:facet name="header">
-					<h:outputText value="Subtotal Sells" />
-				</f:facet>
-				<h:outputText class="currency">
-					<s:currency value="#{accountSummary.totalSells}" />
-				</h:outputText>
-			</h:column>
-			<h:column>
-				<f:facet name="header">
-					<h:outputText value="Subtotal Fees" />
-				</f:facet>
-				<h:outputText class="currency">
-					<s:currency value="#{accountSummary.totalTax}" />
-				</h:outputText>
-			</h:column>
-			<h:column>
-				<f:facet name="header">
-					<h:outputText value="Net Impact Cash Balance" />
-				</f:facet>
-				<h:outputText class="currency">
-					<s:price value="#{accountSummary.totalImpact}" />
-				</h:outputText>
-			</h:column>
-		</h:dataTable>
-		</div>
-		<div>
-		<p><b>Total Orders Shown</b></p>
-		</div>
-		
-		<h:dataTable styleClass="table-outer"
-			cellspacing="0"
-			value="#{accountBean.ordersReturn}"
-			columnClasses=",,,,currency,,,currency,currency,currency"
-			var="order">
-			<h:column>
-				<f:facet name="header">
-					<h:outputText value="Order ID" />
-				</f:facet>
-				<h:outputText>
-					<h:outputText value="#{order.orderID}" />
-				</h:outputText>
-			</h:column>
-			
-			<h:column>
-				<f:facet name="header">
-					<h:outputText value="Order Status" />
-				</f:facet>
-				<h:outputText>
-					<h:outputText value="#{order.orderStatus}" />
-				</h:outputText>
-			</h:column>
-			
-			<h:column>
-				<f:facet name="header">
-					<h:outputText value="Creation Date" />
-				</f:facet>
-				<h:outputText>
-					<h:outputText value="#{order.openDate.time}">
-						<f:convertDateTime pattern="#{accountBean.dateFormat}" />
-					</h:outputText>
-				</h:outputText>
-			</h:column>
-			
-			<h:column>
-				<f:facet name="header">
-					<h:outputText value="Completion Date" />
-				</f:facet>
-				<h:outputText>
-					<h:outputText value="#{order.completionDate.time}">
-						<f:convertDateTime pattern="#{accountBean.dateFormat}" />
-					</h:outputText>
-				</h:outputText>
-			</h:column>
-			
-			<h:column>
-				<f:facet name="header">
-					<h:outputText value="Txn Fee" />
-				</f:facet>
-				<h:outputText class="currency">
-					<s:currency value="#{order.orderFee}" />
-				</h:outputText>
-			</h:column>
-			
-			<h:column>
-				<f:facet name="header">
-					<h:outputText value="Type" />
-				</f:facet>
-				<h:outputText value="#{order.orderType}" />
-			</h:column>
-			
-			<h:column>
-				<f:facet name="header">
-					<h:outputText value="Symbol" />
-				</f:facet>
-				<form action="quotes.faces" method="post">
-					<input type="hidden" name="SYMBOLS" value="#{order.symbol}" />
-					<input type="submit" name="GETQUOTE" value="#{order.symbol}" />
-				</form>
-			</h:column>
-			
-			<h:column>
-				<f:facet name="header">
-					<h:outputText value="Quantity" />
-				</f:facet>
-				<h:outputText class="currency" value="#{order.quantity}" />
-			</h:column>
-			
-			<h:column>
-				<f:facet name="header">
-					<h:outputText value="Price" />
-				</f:facet>
-				<h:outputText class="currency">
-					<s:currency value="#{order.price}" />
-				</h:outputText>
-			</h:column>
-			
-			<h:column>
-				<f:facet name="header">
-					<h:outputText value="Total" />
-				</f:facet>
-				<h:outputText class="currency">
-					<s:currency value="#{order.quantity*order.price+order.orderFee}" />
-				</h:outputText>
-			</h:column>
-						
-		</h:dataTable>
-		
-		<form>
-		<table class="profile" cellspacing="0" width="100%">
-			<thead>
-				<tr>
-					<th><h:outputText
-						value="Update Account Profile: #{userBean.currentUserName}" /></th>
-				</tr>
-			</thead>
-			<tbody>
-			<h:messages style="color: red" align="center" />
-				<tr>
-					<td><h:form id="AccountProfile">
-						<table cellspacing="0" align="center">
-							<tr>
-								<td>Full Name:</td>
-								<td><h:inputText id="FULLNAME" 
-									value="#{registerBean.fullName}" required="true"
-									size="25" /></td>
-								<td>Email Address:</td>
-								<td><h:inputText id="EMAILADDRESS" 
-									value="#{registerBean.email}"  required="true"
-									size="25" /></td>
-							</tr>
-							<tr>
-								<td>Address:</td>
-								<td><h:inputText id="ADDRESS" 
-									value="#{registerBean.address}" required="true"
-									 size="25" /></td>
-								<td>Password:</td>
-								<td><h:inputSecret id="Password"
-									value="#{registerBean.password}" required="true"
-									 size="25" /></td>
-							</tr>
-							<tr>
-								<td>Credit Card:</td>
-								<td><h:inputText id="CREDITCARD" 
-									value="#{registerBean.creditCard}" required="true"
-									 size="25" /></td>
-								<td>Confirm Password:</td>
-								<td><h:inputSecret id="ConPASSWORD" validator="#{registerBean.passwordValidate}"
required="true"
-									value="#{registerBean.confPassword}"
-									 size="25" /></td>
-							</tr>
-							<tr>
-								<td colspan="4" class="button"><h:commandButton
-									action="#{registerBean.updateProfile}" id="UPDATEUSERPROFILE"
-									value="Update" class="button" /></td>
-							</tr>
-						</table>
-					</h:form>
-
-					<table align="center" class="profile-content" cellspacing="0">
-						<tbody>
-							<tr>
-								<td class="left">Account ID:</td>
-								<td><h:outputText
-									value="#{accountBean.userAccountDataReturn.accountID}" /></td>
-								<td class="left">Account Created</td>
-								<td><h:outputText
-									value="#{accountBean.userAccountDataReturn.creationDate.time}">
-									<f:convertDateTime pattern="#{accountBean.dateFormat}" />
-								</h:outputText></td>
-							</tr>
-							<tr>
-								<td class="left">User ID:</td>
-								<td><h:outputText
-									value="#{accountBean.userAccountDataReturn.profileID}" /></td>
-								<td class="left">Last Login:</td>
-								<td><h:outputText
-									value="#{accountBean.userAccountDataReturn.lastLogin.time}">
-									<f:convertDateTime pattern="#{accountBean.dateFormat}" />
-								</h:outputText></td>
-							</tr>
-							<tr>
-								<td class="left">Opening Balance:</td>
-								<td><h:outputText
-									value="#{accountBean.userAccountDataReturn.openBalance}" /></td>
-								<td class="left">Total Logins:</td>
-								<td><h:outputText
-									value="#{accountBean.userAccountDataReturn.loginCount}" /></td>
-							</tr>
-							<tr>
-								<td class="left">Cash Balance:</td>
-								<td><s:price
-									value="#{accountBean.userAccountDataReturn.balance}" /></td>
-								<td class="left">Total Logouts:</td>
-								<td><h:outputText
-									value="#{accountBean.userAccountDataReturn.logoutCount}" /></td>
-							</tr>
-						</tbody>
-					</table>
-					</td>
-				</tr>
-			</tbody>
-		</table>
-		</form>
-		<ui:include src="getQuote.jsf" />
-	</ui:define>
+<ui:define name="title">
+    Account Information
+</ui:define>
+<ui:define name="body">
+<c:if test="#{!empty portfolioBean.closedOrdersReturn}">
+    <ui:include src="alertInfo.jsf"/>
+</c:if>
+
+<div align="center">
+    <h:dataTable styleClass="table-outer"
+                 cellspacing="0" value="#{accountBean.accountSummary}"
+                 var="accountSummary">
+        <h:column>
+            <f:facet name="header">
+                <h:outputText value="Subtotal Buys"/>
+            </f:facet>
+            <h:outputText styleClass="currency">
+                <s:currency value="#{accountSummary.totalBuys}"/>
+            </h:outputText>
+        </h:column>
+        <h:column>
+            <f:facet name="header">
+                <h:outputText value="Subtotal Sells"/>
+            </f:facet>
+            <h:outputText styleClass="currency">
+                <s:currency value="#{accountSummary.totalSells}"/>
+            </h:outputText>
+        </h:column>
+        <h:column>
+            <f:facet name="header">
+                <h:outputText value="Subtotal Fees"/>
+            </f:facet>
+            <h:outputText styleClass="currency">
+                <s:currency value="#{accountSummary.totalTax}"/>
+            </h:outputText>
+        </h:column>
+        <h:column>
+            <f:facet name="header">
+                <h:outputText value="Net Impact Cash Balance"/>
+            </f:facet>
+            <h:outputText styleClass="currency">
+                <s:price value="#{accountSummary.totalImpact}"/>
+            </h:outputText>
+        </h:column>
+    </h:dataTable>
+</div>
+<div>
+    <p><b>Total Orders Shown</b></p>
+</div>
+
+<h:dataTable styleClass="table-outer"
+             cellspacing="0"
+             value="#{accountBean.ordersReturn}"
+             columnClasses=",,,,currency,,,currency,currency,currency"
+             var="order">
+    <h:column>
+        <f:facet name="header">
+            <h:outputText value="Order ID"/>
+        </f:facet>
+        <h:outputText>
+            <h:outputText value="#{order.orderID}"/>
+        </h:outputText>
+    </h:column>
+
+    <h:column>
+        <f:facet name="header">
+            <h:outputText value="Order Status"/>
+        </f:facet>
+        <h:outputText>
+            <h:outputText value="#{order.orderStatus}"/>
+        </h:outputText>
+    </h:column>
+
+    <h:column>
+        <f:facet name="header">
+            <h:outputText value="Creation Date"/>
+        </f:facet>
+        <h:outputText>
+            <h:outputText value="#{order.openDate.time}">
+                <f:convertDateTime pattern="#{accountBean.dateFormat}"/>
+            </h:outputText>
+        </h:outputText>
+    </h:column>
+
+    <h:column>
+        <f:facet name="header">
+            <h:outputText value="Completion Date"/>
+        </f:facet>
+        <h:outputText>
+            <h:outputText value="#{order.completionDate.time}">
+                <f:convertDateTime pattern="#{accountBean.dateFormat}"/>
+            </h:outputText>
+        </h:outputText>
+    </h:column>
+
+    <h:column>
+        <f:facet name="header">
+            <h:outputText value="Txn Fee"/>
+        </f:facet>
+        <h:outputText styleClass="currency">
+            <s:currency value="#{order.orderFee}"/>
+        </h:outputText>
+    </h:column>
+
+    <h:column>
+        <f:facet name="header">
+            <h:outputText value="Type"/>
+        </f:facet>
+        <h:outputText value="#{order.orderType}"/>
+    </h:column>
+
+    <h:column>
+        <f:facet name="header">
+            <h:outputText value="Symbol"/>
+        </f:facet>
+
+        <form action="quotes.faces" method="post">
+            <input type="hidden" name="SYMBOLS" value="#{order.symbol}"/>
+            <input type="submit" name="GETQUOTE" value="#{order.symbol}"/>
+        </form>
+    </h:column>
+
+    <h:column>
+        <f:facet name="header">
+            <h:outputText value="Quantity"/>
+        </f:facet>
+        <h:outputText styleClass="currency" value="#{order.quantity}"/>
+    </h:column>
+
+    <h:column>
+        <f:facet name="header">
+            <h:outputText value="Price"/>
+        </f:facet>
+        <h:outputText styleClass="currency">
+            <s:currency value="#{order.price}"/>
+        </h:outputText>
+    </h:column>
+
+    <h:column>
+        <f:facet name="header">
+            <h:outputText value="Total"/>
+        </f:facet>
+        <h:outputText styleClass="currency">
+            <s:currency value="#{order.quantity*order.price+order.orderFee}"/>
+        </h:outputText>
+    </h:column>
+
+</h:dataTable>
+
+    <table class="profile" cellspacing="0" width="100%">
+        <thead>
+        <tr>
+            <th><h:outputText
+                    value="Update Account Profile: #{userBean.currentUserName}"/></th>
+        </tr>
+        </thead>
+        <tbody>
+        <h:messages style="color: red" align="center"/>
+        <tr>
+            <td><h:form id="AccountProfile">
+                <table cellspacing="0" align="center">
+                    <tr>
+                        <td>Full Name:</td>
+                        <td><h:inputText id="FULLNAME"
+                                         value="#{registerBean.fullName}" required="true"
+                                         size="25"/></td>
+                        <td>Email Address:</td>
+                        <td><h:inputText id="EMAILADDRESS"
+                                         value="#{registerBean.email}" required="true"
+                                         size="25"/></td>
+                    </tr>
+                    <tr>
+                        <td>Address:</td>
+                        <td><h:inputText id="ADDRESS"
+                                         value="#{registerBean.address}" required="true"
+                                         size="25"/></td>
+                        <td>Password:</td>
+                        <td><h:inputSecret id="Password"
+                                           value="#{registerBean.password}" required="true"
+                                           size="25"/></td>
+                    </tr>
+                    <tr>
+                        <td>Credit Card:</td>
+                        <td><h:inputText id="CREDITCARD"
+                                         value="#{registerBean.creditCard}" required="true"
+                                         size="25"/></td>
+                        <td>Confirm Password:</td>
+                        <td><h:inputSecret id="ConPASSWORD" required="true" value="#{registerBean.confPassword}"
+                                           size="25">
+                            <f:validator validatorId="stonehenge.passwordValidator"/>
+                            <f:attribute name="password" value="AccountProfile:Password"/>
+                        </h:inputSecret></td>
+                    </tr>
+                    <tr>
+                        <td colspan="4" class="button"><h:commandButton
+                                action="#{registerBean.updateProfile}" id="UPDATEUSERPROFILE"
+                                value="Update" styleClass="button"/></td>
+                    </tr>
+                </table>
+            </h:form>
+
+                <table align="center" class="profile-content" cellspacing="0">
+                    <tbody>
+                    <tr>
+                        <td class="left">Account ID:</td>
+                        <td><h:outputText
+                                value="#{accountBean.userAccountDataReturn.accountID}"/></td>
+                        <td class="left">Account Created</td>
+                        <td><h:outputText
+                                value="#{accountBean.userAccountDataReturn.creationDate.time}">
+                            <f:convertDateTime pattern="#{accountBean.dateFormat}"/>
+                        </h:outputText></td>
+                    </tr>
+                    <tr>
+                        <td class="left">User ID:</td>
+                        <td><h:outputText
+                                value="#{accountBean.userAccountDataReturn.profileID}"/></td>
+                        <td class="left">Last Login:</td>
+                        <td><h:outputText
+                                value="#{accountBean.userAccountDataReturn.lastLogin.time}">
+                            <f:convertDateTime pattern="#{accountBean.dateFormat}"/>
+                        </h:outputText></td>
+                    </tr>
+                    <tr>
+                        <td class="left">Opening Balance:</td>
+                        <td><h:outputText
+                                value="#{accountBean.userAccountDataReturn.openBalance}"/></td>
+                        <td class="left">Total Logins:</td>
+                        <td><h:outputText
+                                value="#{accountBean.userAccountDataReturn.loginCount}"/></td>
+                    </tr>
+                    <tr>
+                        <td class="left">Cash Balance:</td>
+                        <td><s:price
+                                value="#{accountBean.userAccountDataReturn.balance}"/></td>
+                        <td class="left">Total Logouts:</td>
+                        <td><h:outputText
+                                value="#{accountBean.userAccountDataReturn.logoutCount}"/></td>
+                    </tr>
+                    </tbody>
+                </table>
+            </td>
+        </tr>
+        </tbody>
+    </table>
+<ui:include src="getQuote.jsf"/>
+</ui:define>
 </ui:composition>
 </body>
 </html>
\ No newline at end of file

Modified: incubator/stonehenge/trunk/stocktrader/metro/trader_client/web/configService.xhtml
URL: http://svn.apache.org/viewvc/incubator/stonehenge/trunk/stocktrader/metro/trader_client/web/configService.xhtml?rev=820332&r1=820331&r2=820332&view=diff
==============================================================================
--- incubator/stonehenge/trunk/stocktrader/metro/trader_client/web/configService.xhtml (original)
+++ incubator/stonehenge/trunk/stocktrader/metro/trader_client/web/configService.xhtml Wed
Sep 30 16:21:08 2009
@@ -2,6 +2,7 @@
       xmlns:ui="http://java.sun.com/jsf/facelets"
       xmlns:h="http://java.sun.com/jsf/html"
       xmlns:c="http://java.sun.com/jstl/core"
+      xmlns:a4j="http://richfaces.org/a4j"
       xmlns:f="http://java.sun.com/jsf/core"
       xmlns:s="http://stonehenge.apache.com/jsf">
 <body>
@@ -10,31 +11,46 @@
         Configuration
     </ui:define>
     <ui:define name="body">
-       <br/>
+        <br/>
+
         <div class="login" style="text-align:left">
-        <h:form>
-            <h:panelGrid columns="2" cellspacing="5" width="320px">
-               <h:outputLabel for="bses" >
-                    <h:outputText value="Business Service"/>
-                </h:outputLabel>
-
-                <h:selectOneMenu id="bses" value="#{configServiceBean.selectedBS}" >
-                    <f:selectItems id="bs" value="#{configServiceBean.bsNames}"/>
-                </h:selectOneMenu>
-                <h:outputLabel for="opses" >
-                    <h:outputText value="Order Processing Service"/>
-                </h:outputLabel>
-
-                <h:selectOneMenu id="opses" value="#{configServiceBean.selectedOPS}">
-                    <f:selectItems id="op" value="#{configServiceBean.opsNames}"/>
-                </h:selectOneMenu>
-
-                <h:panelGroup/>
-                <h:commandButton title="Set" value="Set" action="#{configServiceBean.setBSAndOPS}"/>
-            </h:panelGrid>
-        </h:form>
+            <h:form>
+                <h:panelGrid columns="2" cellspacing="5" width="320px" id="configService">
+                    <h:outputLabel for="bses">
+                        <h:outputText value="Business Service"/>
+                    </h:outputLabel>
+
+                    <h:selectOneMenu id="bses" value="#{configServiceBean.selectedBS.serviceName}">
+                        <f:selectItems id="bs" value="#{configServiceBean.bsNames}"/>
+                        <a4j:support event="onchange" action="#{configServiceBean.updateBS}"/>
+                    </h:selectOneMenu>
+
+                    <h:outputLabel for="opses">
+                        <h:outputText value="Order Processing Service"/>
+                    </h:outputLabel>
+
+                    <h:selectOneMenu id="opses" value="#{configServiceBean.selectedOPS.serviceName}">
+                        <f:selectItems id="op" value="#{configServiceBean.opsNames}"/>
+                        <a4j:support event="onchange" action="#{configServiceBean.updateOPS}"/>
+                    </h:selectOneMenu>
+
+                    <h:panelGroup/>
+                    <h:commandButton title="Set" value="Set" action="#{configServiceBean.setBasicBSAndOPS}"/>
+
+                    <a4j:commandButton title="Restore Defaults" value="Restore Defaults"
+                                       action="#{configServiceBean.restoreDefaults}" reRender="configService"/>
+                    <h:commandButton title="Advanced Configuration" value="Advanced Configuration"
+                                     action="#{configServiceBean.advancedConfig}"/>
+                    <h:panelGroup/>
+                    <h:commandButton title="Back to ConfigService Selection Page"
+                                     value="Back to ConfigService Selection Page"
+                                     action="#{configServiceBean.selectorPage}"/>
+                </h:panelGrid>
+            </h:form>
         </div>
-     </ui:define>
+        <div align="center" style="color:green">
+            <h:outputLabel value="#{configServiceBean.result}"></h:outputLabel></div>
+    </ui:define>
 </ui:composition>
 </body>
 </html>
\ No newline at end of file

Added: incubator/stonehenge/trunk/stocktrader/metro/trader_client/web/configServiceAdd.xhtml
URL: http://svn.apache.org/viewvc/incubator/stonehenge/trunk/stocktrader/metro/trader_client/web/configServiceAdd.xhtml?rev=820332&view=auto
==============================================================================
--- incubator/stonehenge/trunk/stocktrader/metro/trader_client/web/configServiceAdd.xhtml
(added)
+++ incubator/stonehenge/trunk/stocktrader/metro/trader_client/web/configServiceAdd.xhtml
Wed Sep 30 16:21:08 2009
@@ -0,0 +1,51 @@
+<html xmlns="http://www.w3.org/1999/xhtml"
+      xmlns:ui="http://java.sun.com/jsf/facelets"
+      xmlns:h="http://java.sun.com/jsf/html"
+      xmlns:f="http://java.sun.com/jsf/core"
+      xmlns:s="http://stonehenge.apache.com/jsf">
+<body>
+<ui:composition template="/template.xhtml">
+    <ui:define name="title">
+        Configuration
+    </ui:define>
+    <ui:define name="body">
+        <h:form id="newServiceForm">
+            <div class="login" style="text-align:left">
+                <h:panelGrid columns="2" cellspacing="5" width="420px">
+                    <h:outputLabel for="serType">
+                        <h:outputText value="Service Type"/>
+                    </h:outputLabel>
+                    <h:selectOneRadio id="serType" layout="pageDirection" required="true"
+                                      value="#{configServiceBean.serviceTypeValue}"
+                                      requiredMessage="Service Type is required">
+                        <f:selectItem id="item1" itemLabel="Bussiness Service" itemValue="BS"/>
+                        <f:selectItem id="item2" itemLabel="Order Processing Service"
itemValue="OPS"/>
+                    </h:selectOneRadio>
+                    <h:outputLabel for="name">
+                        <h:outputText value="Service Name"/>
+                    </h:outputLabel>
+                    <h:inputText id="name" value="#{configServiceBean.newService.serviceName}"
required="true"
+                                 validator="#{configServiceBean.validateServiceName}"/>
+                    <h:outputLabel for="url">
+                        <h:outputText value="Service URL"/>
+                    </h:outputLabel>
+                    <h:inputText id="url" value="#{configServiceBean.newService.serviceURL}"
required="true">
+                        <f:validator validatorId="urlValidator"/>
+                    </h:inputText>
+
+                    <h:panelGroup/>
+                    <h:panelGroup>
+                        <h:selectBooleanCheckbox id="sec" value="#{configServiceBean.newService.isSec}"/>
+                        <label>Uses secure messaging</label>
+                    </h:panelGroup>
+                    <h:commandButton id="add" title="Add" value="Add" action="#{configServiceBean.addService}"/>
+                    <h:commandButton id="cancel" title="Cancel" value="Cancel"
+                                     action="#{configServiceBean.cancelAddService}" immediate="true"/>
+                </h:panelGrid>
+            </div>
+        </h:form>
+        <h:messages style="color: red"/>
+    </ui:define>
+</ui:composition>
+</body>
+</html>
\ No newline at end of file

Added: incubator/stonehenge/trunk/stocktrader/metro/trader_client/web/configurationAdvanced.xhtml
URL: http://svn.apache.org/viewvc/incubator/stonehenge/trunk/stocktrader/metro/trader_client/web/configurationAdvanced.xhtml?rev=820332&view=auto
==============================================================================
--- incubator/stonehenge/trunk/stocktrader/metro/trader_client/web/configurationAdvanced.xhtml
(added)
+++ incubator/stonehenge/trunk/stocktrader/metro/trader_client/web/configurationAdvanced.xhtml
Wed Sep 30 16:21:08 2009
@@ -0,0 +1,90 @@
+<html xmlns="http://www.w3.org/1999/xhtml"
+      xmlns:ui="http://java.sun.com/jsf/facelets"
+      xmlns:h="http://java.sun.com/jsf/html"
+      xmlns:c="http://java.sun.com/jstl/core"
+      xmlns:f="http://java.sun.com/jsf/core"
+      xmlns:a4j="http://richfaces.org/a4j"
+      xmlns:rich="http://richfaces.org/rich"
+      xmlns:s="http://stonehenge.apache.com/jsf">
+<body>
+<ui:composition template="/template.xhtml">
+    <ui:define name="title">
+        Configuration: Advanced
+    </ui:define>
+    <ui:define name="body">
+        <br/>
+
+        <div class="login" style="text-align:left">
+            <h:form>
+                <h:panelGrid columns="2" cellspacing="5" width="480px" id="configSer">
+                    <h:outputLabel for="bses">
+                        <h:outputText value="Business Service"/>
+                    </h:outputLabel>
+                    <h:panelGroup>
+                        <h:selectOneMenu id="bses" value="#{configServiceBean.selectedBS.serviceName}">
+                            <f:selectItems id="bs" value="#{configServiceBean.bsNames}"/>
+                            <a4j:support event="onchange" reRender="bsesurl,isBSSec"
+                                         action="#{configServiceBean.updateBS}"/>
+                        </h:selectOneMenu>
+                        <h:commandLink value="Add New" action="#{configServiceBean.addNew}">
+                            <f:param name="serviceTypeId" value="BS"/>
+                        </h:commandLink>
+                    </h:panelGroup>
+
+                    <h:outputLabel for="bsesurl">
+                        <h:outputText value="Business Service URL"/>
+                    </h:outputLabel>
+                    <h:inputText id="bsesurl" value="#{configServiceBean.selectedBS.serviceURL}"
required="true">
+                        <f:validator validatorId="urlValidator"/>
+                    </h:inputText>
+                    <h:panelGroup/>
+                    <h:panelGroup>
+                        <h:selectBooleanCheckbox id="isBSSec" value="#{configServiceBean.selectedBS.isSec}"/>
+                        <label>Uses secure messaging</label>
+                    </h:panelGroup>
+
+                    <h:outputLabel for="opses">
+                        <h:outputText value="Order Processing Service"/>
+                    </h:outputLabel>
+                    <h:panelGroup>
+                        <h:selectOneMenu id="opses" value="#{configServiceBean.selectedOPS.serviceName}">
+                            <f:selectItems id="op" value="#{configServiceBean.opsNames}"/>
+                            <a4j:support event="onchange" reRender="opsesurl,isOPSSec"
+                                         action="#{configServiceBean.updateOPS}"/>
+                        </h:selectOneMenu>
+                        <h:commandLink value="Add New" action="#{configServiceBean.addNew}">
+                            <f:param name="serviceTypeId" value="OPS"/>
+                        </h:commandLink>
+                    </h:panelGroup>
+
+                    <h:outputLabel for="opsesurl">
+                        <h:outputText value="Order Processing Service URL"/>
+                    </h:outputLabel>
+                    <h:inputText id="opsesurl" value="#{configServiceBean.selectedOPS.serviceURL}"
required="true">
+                        <f:validator validatorId="urlValidator"/>
+                    </h:inputText>
+                    <h:panelGroup/>
+                    <h:panelGroup>
+                        <h:selectBooleanCheckbox id="isOPSSec" value="#{configServiceBean.selectedOPS.isSec}"/>
+                        <label>Uses secure messaging</label>
+                    </h:panelGroup>
+
+                    <h:panelGroup/>
+                    <h:commandButton title="Set" value="Set" action="#{configServiceBean.setAdvancedBSAndOPS}"/>
+
+                    <a4j:commandButton title="Restore Defaults" value="Restore Defaults"
+                                       action="#{configServiceBean.restoreDefaults}" reRender="configSer"/>
+                    <h:commandButton title="Basic Configuration" value="Basic Configuration"
+                                     action="#{configServiceBean.basicConfig}"/>
+                </h:panelGrid>
+            </h:form>
+        </div>
+        <h:messages style="color: red"/>
+
+        <div align="center" style="color:green">
+            <h:outputLabel value="#{configServiceBean.result}"></h:outputLabel>
+        </div>
+    </ui:define>
+</ui:composition>
+</body>
+</html>
\ No newline at end of file

Modified: incubator/stonehenge/trunk/stocktrader/metro/trader_client/web/register.xhtml
URL: http://svn.apache.org/viewvc/incubator/stonehenge/trunk/stocktrader/metro/trader_client/web/register.xhtml?rev=820332&r1=820331&r2=820332&view=diff
==============================================================================
--- incubator/stonehenge/trunk/stocktrader/metro/trader_client/web/register.xhtml (original)
+++ incubator/stonehenge/trunk/stocktrader/metro/trader_client/web/register.xhtml Wed Sep
30 16:21:08 2009
@@ -1,72 +1,76 @@
 <html xmlns="http://www.w3.org/1999/xhtml"
-	xmlns:c="http://java.sun.com/jsp/jstl/core"
-	xmlns:h="http://java.sun.com/jsf/html"
-	xmlns:f="http://java.sun.com/jsf/core"
-	xmlns:ui="http://java.sun.com/jsf/facelets">
+      xmlns:c="http://java.sun.com/jsp/jstl/core"
+      xmlns:h="http://java.sun.com/jsf/html"
+      xmlns:f="http://java.sun.com/jsf/core"
+      xmlns:ui="http://java.sun.com/jsf/facelets">
 <body>
 <ui:composition template="/template.xhtml">
-	<ui:define name="title">
-		Register
-</ui:define>
-	<ui:define name="body">
-		<h:messages style="color: red" align="center" />
-		<table class="profile" cellspacing="0" width="100%">
-			<thead>
-				<tr>
-					<th>Create Account Profile:</th>
-				</tr>
-			</thead>
-			<tbody>
-				<tr>
-					<td><h:form id="AccountProfile">
-						<table cellspacing="0" align="center">
-							<tr>
-							</tr>
-							<tr>
-								<td>Requested ID:</td>
-								<td><h:inputText id="UserID" size="25"
-									value="#{registerBean.userId}" required="true" /></td>
-								<td>Opening Balance:</td>
-								<td><h:inputText id="OpeningBalance"
-									value="#{registerBean.openBalance}" size="25" required="true" /></td>
-							</tr>
-							<tr>
-								<td>Full Name:</td>
-								<td><h:inputText id="FullName" size="25"
-									value="#{registerBean.fullName}" required="true" /></td>
-								<td>Email Address:</td>
-								<td><h:inputText id="Email" size="25"
-									value="#{registerBean.email}" required="true" /></td>
-							</tr>
-							<tr>
-								<td>Address:</td>
-								<td><h:inputText id="Address" size="25"
-									value="#{registerBean.address}" required="true" /></td>
-								<td>Password:</td>
-								<td><h:inputSecret id="Password" size="25"
-									value="#{registerBean.password}" required="true" /></td>
-							</tr>
+    <ui:define name="title">
+        Register
+    </ui:define>
+    <ui:define name="body">
+        <h:messages style="color: red" align="center"/>
+        <table class="profile" cellspacing="0" width="100%">
+            <thead>
+            <tr>
+                <th>Create Account Profile:</th>
+            </tr>
+            </thead>
+            <tbody>
+            <tr>
+                <td><h:form id="AccountProfile">
+                    <table cellspacing="0" align="center">
+                        <tr>
+                        </tr>
+                        <tr>
+                            <td>Requested ID:</td>
+                            <td><h:inputText id="UserID" size="25"
+                                             value="#{registerBean.userId}" required="true"/></td>
+                            <td>Opening Balance:</td>
+                            <td><h:inputText id="OpeningBalance"
+                                             value="#{registerBean.openBalance}" size="25"
required="true"/></td>
+                        </tr>
+                        <tr>
+                            <td>Full Name:</td>
+                            <td><h:inputText id="FullName" size="25"
+                                             value="#{registerBean.fullName}" required="true"/></td>
+                            <td>Email Address:</td>
+                            <td><h:inputText id="Email" size="25"
+                                             value="#{registerBean.email}" required="true"/></td>
+                        </tr>
+                        <tr>
+                            <td>Address:</td>
+                            <td><h:inputText id="Address" size="25"
+                                             value="#{registerBean.address}" required="true"/></td>
+                            <td>Password:</td>
+                            <td><h:inputSecret id="Password" size="25"
+                                               value="#{registerBean.password}" required="true"/></td>
+                        </tr>
 
-							<tr>
-								<td>Credit Card:</td>
-								<td><h:inputText size="25" id="CreditCard"
-									value="#{registerBean.creditCard}" required="true" /></td>
-								<td>Confirm Password:</td>
-								<td><h:inputSecret id="ConPASSWORD" validator="#{registerBean.passwordValidate}"
required="true"
-									value="#{registerBean.confPassword}"
-									 size="25" /></td>
-							</tr>
-							<tr>
-								<td colspan="4" class="button"><h:commandButton
-									class="button" title="submit" value="Register"
-									action="#{registerBean.register}" /></td>
-							</tr>
-						</table>
-					</h:form></td>
-				</tr>
-			</tbody>
-		</table>
-	</ui:define>
+                        <tr>
+                            <td>Credit Card:</td>
+                            <td><h:inputText size="25" id="CreditCard"
+                                             value="#{registerBean.creditCard}" required="true"/></td>
+                            <td>Confirm Password:</td>
+                            <td>
+                                <h:inputSecret id="ConPASSWORD" required="true" value="#{registerBean.confPassword}"
+                                               size="25">
+                                    <f:validator validatorId="stonehenge.passwordValidator"/>
+                                    <f:attribute name="password" value="AccountProfile:Password"/>
+                                </h:inputSecret>
+                            </td>
+                        </tr>
+                        <tr>
+                            <td colspan="4" class="button"><h:commandButton
+                                    class="button" title="submit" value="Register"
+                                    action="#{registerBean.register}"/></td>
+                        </tr>
+                    </table>
+                </h:form></td>
+            </tr>
+            </tbody>
+        </table>
+    </ui:define>
 </ui:composition>
 </body>
 </html>
\ No newline at end of file

Modified: incubator/stonehenge/trunk/stocktrader/metro/trader_client/web/template.xhtml
URL: http://svn.apache.org/viewvc/incubator/stonehenge/trunk/stocktrader/metro/trader_client/web/template.xhtml?rev=820332&r1=820331&r2=820332&view=diff
==============================================================================
--- incubator/stonehenge/trunk/stocktrader/metro/trader_client/web/template.xhtml (original)
+++ incubator/stonehenge/trunk/stocktrader/metro/trader_client/web/template.xhtml Wed Sep
30 16:21:08 2009
@@ -20,7 +20,7 @@
 		<td><a href="portfolio.faces">Portfolio</a></td>
         <td><a href="quotes.faces">Quotes/Trade</a></td>
         <td><a href="glossary.jsf">Glossary</a></td>
-        <td><a href="configService.jsf">Config</a></td>
+        <td><a href="ConfigServiceSelector.jsf">Config</a></td>
         <td><a href="login.jsf">Login/Logout</a></td>
     </tr>
 </table>



Mime
View raw message