You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@beehive.apache.org by ek...@apache.org on 2005/09/16 00:07:11 UTC
svn commit: r289324 - in /beehive/trunk/netui/test/webapps/drt:
coreWeb/WEB-INF/schemas/ coreWeb/WEB-INF/src/xml/
coreWeb/databinding/xmlBeans/serialize/ testRecorder/tests/
Author: ekoneil
Date: Thu Sep 15 15:07:03 2005
New Revision: 289324
URL: http://svn.apache.org/viewcvs?rev=289324&view=rev
Log:
More XMLBean decoupling. Remove a set of XMLBeans from the NetUI DRTs. Convert the SerializeXMLTag test over from CustomerProfile to portfolio and remove unused sample data / schemas.
BB: self
Test: NetUI BVT pass
Removed:
beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/schemas/CustomerProfile.xsd
beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/schemas/CustomerProfileConfig.xsdconfig
beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/schemas/catalog.xsd
beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/src/xml/CustomerProfile.xml
beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/src/xml/CustomerProfile_SerializeXML.xml
beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/src/xml/bikeCatalog.xml
Modified:
beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/xmlBeans/serialize/Controller.jpf
beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/xmlBeans/serialize/index.jsp
beehive/trunk/netui/test/webapps/drt/testRecorder/tests/SerializeXMLTag.xml
Modified: beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/xmlBeans/serialize/Controller.jpf
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/xmlBeans/serialize/Controller.jpf?rev=289324&r1=289323&r2=289324&view=diff
==============================================================================
--- beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/xmlBeans/serialize/Controller.jpf (original)
+++ beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/xmlBeans/serialize/Controller.jpf Thu Sep 15 15:07:03 2005
@@ -17,24 +17,26 @@
*/
package databinding.xmlBeans.serialize;
-// java imports
-import org.apache.beehive.netui.pageflow.annotations.Jpf;
import java.io.InputStream;
-// internal imports
+import org.apache.beehive.controls.api.bean.Control;
import org.apache.beehive.netui.pageflow.Forward;
import org.apache.beehive.netui.pageflow.PageFlowController;
+import org.apache.beehive.netui.pageflow.annotations.Jpf;
+import org.apache.xmlbeans.XmlObject;
-// external imports
-import org.openuri.customerprofile.schemas.CustomerProfile;
+import databinding.datagrid.controls.PortfolioControl;
/**
*
*/
@Jpf.Controller
public class Controller
- extends PageFlowController
-{
+ extends PageFlowController {
+
+ @Control()
+ private PortfolioControl _portfolioControl;
+
@Jpf.Action(
forwards = {
@Jpf.Forward(
@@ -42,14 +44,8 @@
path = "index.jsp")
})
protected Forward begin()
- throws Exception
- {
- // get data from somewhere
- InputStream is = getClass().getClassLoader().getResourceAsStream("/xml/CustomerProfile_SerializeXML.xml");
-
- // load the XMLBean
- CustomerProfile cp = CustomerProfile.Factory.parse(is);
+ throws Exception {
- return new Forward("index", "customerProfile", cp);
+ return new Forward("index", "xmlbean", _portfolioControl.getPortfolio());
}
}
Modified: beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/xmlBeans/serialize/index.jsp
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/xmlBeans/serialize/index.jsp?rev=289324&r1=289323&r2=289324&view=diff
==============================================================================
--- beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/xmlBeans/serialize/index.jsp (original)
+++ beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/xmlBeans/serialize/index.jsp Thu Sep 15 15:07:03 2005
@@ -12,7 +12,7 @@
<b>SerializeXML Tag Test</b>
<br/>
<br/>
- <netui-data:serializeXML source="${pageInput.customerProfile}" divName="customerProfile"/>
+ <netui-data:serializeXML source="${pageInput.xmlbean}" divName="xmlbean"/>
<br/>
</p>
</body>
Modified: beehive/trunk/netui/test/webapps/drt/testRecorder/tests/SerializeXMLTag.xml
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/SerializeXMLTag.xml?rev=289324&r1=289323&r2=289324&view=diff
==============================================================================
--- beehive/trunk/netui/test/webapps/drt/testRecorder/tests/SerializeXMLTag.xml (original)
+++ beehive/trunk/netui/test/webapps/drt/testRecorder/tests/SerializeXMLTag.xml Thu Sep 15 15:07:03 2005
@@ -2,7 +2,7 @@
<ses:recorderSession xmlns:ses="http://beehive.apache.org/netui/tools/testrecorder/2004/session">
<ses:sessionName>SerializeXMLTag</ses:sessionName>
<ses:tester>ekoneil</ses:tester>
- <ses:startDate>18 Jan 2005, 06:54:16.031 PM MST</ses:startDate>
+ <ses:startDate>15 Sep 2005, 03:59:11.106 PM MDT</ses:startDate>
<ses:description>ekoneil</ses:description>
<ses:tests>
<ses:test>
@@ -18,7 +18,7 @@
<ses:cookies>
<ses:cookie>
<ses:name>JSESSIONID</ses:name>
- <ses:value>401BA83031A94CBDA416B26EB0A88FB5</ses:value>
+ <ses:value>42B62A088A6B51EDCFFFD21A45D890DF</ses:value>
</ses:cookie>
</ses:cookies>
<ses:headers>
@@ -40,7 +40,7 @@
</ses:header>
<ses:header>
<ses:name>cookie</ses:name>
- <ses:value>$Version=0; JSESSIONID=401BA83031A94CBDA416B26EB0A88FB5; $Path=/coreWeb</ses:value>
+ <ses:value>$Version=0; JSESSIONID=42B62A088A6B51EDCFFFD21A45D890DF; $Path=/coreWeb</ses:value>
</ses:header>
<ses:header>
<ses:name>cookie2</ses:name>
@@ -56,7 +56,7 @@
</ses:header>
<ses:header>
<ses:name>testrecorder.playback.testid</ses:name>
- <ses:value>-54834ffa:101889e165b:-78fb</ses:value>
+ <ses:value>6c5b7991:1065bb40f8d:-7651</ses:value>
</ses:header>
<ses:header>
<ses:name>testrecorder.playback.testnumber</ses:name>
@@ -88,64 +88,47 @@
<b>SerializeXML Tag Test</b>
<br/>
<br/>
- <div id="customerProfile">
+ <div id="xmlbean">
<!--
-<CUSTOMERPROFILE xmlns="http://openuri.org/customerProfileLocal">
- <CUSTOMER>
- <NAME>John Kay</NAME>
- <ADDRESS>Center Street</ADDRESS>
- <CITY>Plano</CITY>
- <STATE>TX</STATE>
- <ZIP>75023</ZIP>
- <PHONE>4081231234</PHONE>
- <ORDER>
- <ORDER_DATE>2002-03-06T08:00:00-05:00</ORDER_DATE>
- <TOTAL_ORDER_AMT>1000</TOTAL_ORDER_AMT>
- <ORDERID>ORDER_ID_1_0</ORDERID>
- </ORDER>
- <ORDER>
- <ORDER_DATE>2002-03-07T08:00:00-05:00</ORDER_DATE>
- <TOTAL_ORDER_AMT>1500</TOTAL_ORDER_AMT>
- <ORDERID>ORDER_ID_1_1</ORDERID>
- </ORDER>
- <PROMOTION>
- <PROMOTION_NAME>Wireless Upsell</PROMOTION_NAME>
- <PROMOTION_DESC>Family Holiday Connect</PROMOTION_DESC>
- <STATE>TX</STATE>
- <FROM_DATE>2001-11-22T09:00:00-05:00</FROM_DATE>
- <TO_DATE>2002-12-31T10:00:00-05:00</TO_DATE>
- <PRICE>49.99</PRICE>
- </PROMOTION>
- <CUSTID>CUSTOMER_1</CUSTID>
- </CUSTOMER>
- <CUSTOMER>
- <NAME>Jack Black</NAME>
- <ADDRESS>North First Street</ADDRESS>
- <CITY>San Jose</CITY>
- <STATE>CA</STATE>
- <ZIP>93151</ZIP>
- <PHONE>4081231234</PHONE>
- <ORDER>
- <ORDER_DATE>2002-03-06T10:00:00-05:00</ORDER_DATE>
- <TOTAL_ORDER_AMT>1000</TOTAL_ORDER_AMT>
- <ORDERID>ORDER_ID_1_0</ORDERID>
- </ORDER>
- <ORDER>
- <ORDER_DATE>2002-03-06T11:00:00-05:00</ORDER_DATE>
- <TOTAL_ORDER_AMT>1500</TOTAL_ORDER_AMT>
- <ORDERID>ORDER_ID_1_1</ORDERID>
- </ORDER>
- <PROMOTION>
- <PROMOTION_NAME>Wireless Upsell</PROMOTION_NAME>
- <PROMOTION_DESC>Family Holiday Connect</PROMOTION_DESC>
- <STATE>TX</STATE>
- <FROM_DATE>2001-11-22T12:00:00-05:00</FROM_DATE>
- <TO_DATE>2002-12-31T13:00:00-05:00</TO_DATE>
- <PRICE>49.99</PRICE>
- </PROMOTION>
- <CUSTID>CUSTOMER_2</CUSTID>
- </CUSTOMER>
-</CUSTOMERPROFILE>
+<xml-fragment>
+ <cus:stocks xmlns:cus="http://www.openuri.org/customerPortfolio">
+ <cus:stock exchange="nasdaq">
+ <cus:symbol>BEAS</cus:symbol>
+ <cus:name>BEA Systems</cus:name>
+ <cus:price>14.35</cus:price>
+ <cus:web>http://www.bea.com</cus:web>
+ <cus:shares>500</cus:shares>
+ </cus:stock>
+ <cus:stock exchange="nasdaq">
+ <cus:symbol>CSCO</cus:symbol>
+ <cus:name>Cisco Systems</cus:name>
+ <cus:price>19.42</cus:price>
+ <cus:web>http://www.cisco.com</cus:web>
+ <cus:shares>400</cus:shares>
+ </cus:stock>
+ <cus:stock exchange="nyse">
+ <cus:symbol exchange="nyse">GE</cus:symbol>
+ <cus:name>General Electric</cus:name>
+ <cus:price>59.42</cus:price>
+ <cus:web>http://www.ge.com</cus:web>
+ <cus:shares>300</cus:shares>
+ </cus:stock>
+ <cus:stock exchange="nasdaq">
+ <cus:symbol>RHAT</cus:symbol>
+ <cus:name>RedHat Systems</cus:name>
+ <cus:price>18.20</cus:price>
+ <cus:web>http://www.redhat.com</cus:web>
+ <cus:shares>200</cus:shares>
+ </cus:stock>
+ <cus:stock exchange="nyse">
+ <cus:symbol exchange="nyse">YHOO</cus:symbol>
+ <cus:name>Yahoo Inc</cus:name>
+ <cus:price>48.16</cus:price>
+ <cus:web>http://www.yahoo.com</cus:web>
+ <cus:shares>100</cus:shares>
+ </cus:stock>
+ </cus:stocks>
+</xml-fragment>
-->
</div>
<br/>
@@ -171,7 +154,7 @@
<ses:cookies>
<ses:cookie>
<ses:name>JSESSIONID</ses:name>
- <ses:value>401BA83031A94CBDA416B26EB0A88FB5</ses:value>
+ <ses:value>42B62A088A6B51EDCFFFD21A45D890DF</ses:value>
</ses:cookie>
</ses:cookies>
<ses:headers>
@@ -193,7 +176,7 @@
</ses:header>
<ses:header>
<ses:name>cookie</ses:name>
- <ses:value>$Version=0; JSESSIONID=401BA83031A94CBDA416B26EB0A88FB5; $Path=/coreWeb</ses:value>
+ <ses:value>$Version=0; JSESSIONID=42B62A088A6B51EDCFFFD21A45D890DF; $Path=/coreWeb</ses:value>
</ses:header>
<ses:header>
<ses:name>cookie2</ses:name>
@@ -209,7 +192,7 @@
</ses:header>
<ses:header>
<ses:name>testrecorder.playback.testid</ses:name>
- <ses:value>-54834ffa:101889e165b:-78fb</ses:value>
+ <ses:value>6c5b7991:1065bb40f8d:-7651</ses:value>
</ses:header>
<ses:header>
<ses:name>testrecorder.playback.testnumber</ses:name>
@@ -240,7 +223,7 @@
</ses:testResults>
</ses:test>
</ses:tests>
- <ses:endDate>18 Jan 2005, 06:54:17.781 PM MST</ses:endDate>
+ <ses:endDate>15 Sep 2005, 03:59:12.247 PM MDT</ses:endDate>
<ses:sessionStatus>fail</ses:sessionStatus>
<ses:testCount>2</ses:testCount>
<ses:passedCount>1</ses:passedCount>