You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@commons.apache.org by di...@apache.org on 2003/01/15 13:23:45 UTC

cvs commit: jakarta-commons-sandbox/jelly/src/test/org/apache/commons/jelly/define beanSample.jelly

dion        2003/01/15 04:23:45

  Modified:    jelly/src/test/org/apache/commons/jelly suite.jelly
               jelly/src/test/org/apache/commons/jelly/define
                        beanSample.jelly
  Log:
  Finish removing bean taglib from core
  
  Revision  Changes    Path
  1.13      +6 -6      jakarta-commons-sandbox/jelly/src/test/org/apache/commons/jelly/suite.jelly
  
  Index: suite.jelly
  ===================================================================
  RCS file: /home/cvs/jakarta-commons-sandbox/jelly/src/test/org/apache/commons/jelly/suite.jelly,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- suite.jelly	27 Nov 2002 15:39:42 -0000	1.12
  +++ suite.jelly	15 Jan 2003 12:23:45 -0000	1.13
  @@ -98,7 +98,7 @@
     </test:case>
   
   	<test:case name="testNewAndSetProperties">
  -		<j:new className="org.apache.commons.jelly.bean.Customer" var="customer"/>
  +		<j:new className="org.apache.commons.jelly.core.Customer" var="customer"/>
   		<j:setProperties object="${customer}" name="James" city="London" />
   
   		<log:info>Created a new bean: ${customer}</log:info>
  @@ -114,12 +114,12 @@
   			actual="${customer.city}"/>
   			
   		<test:assertEquals 
  -			expected="org.apache.commons.jelly.bean.Customer" 
  +			expected="org.apache.commons.jelly.core.Customer" 
   			actual="${customer.class.name}"/>
     </test:case>
   
   	<test:case name="testUseBean">
  -		<j:useBean var="customer" class="org.apache.commons.jelly.bean.Customer" name="James" city="London" />
  +		<j:useBean var="customer" class="org.apache.commons.jelly.core.Customer" name="James" city="London" />
   
   		<log:info>Created a new bean: ${customer}</log:info>
   			
  @@ -134,12 +134,12 @@
   			actual="${customer.city}"/>
   			
   		<test:assertEquals 
  -			expected="org.apache.commons.jelly.bean.Customer" 
  +			expected="org.apache.commons.jelly.core.Customer" 
   			actual="${customer.class.name}"/>
     </test:case>
   
   	<test:case name="testUseBeanWithSetProperties">
  -		<j:useBean var="customer" class="org.apache.commons.jelly.bean.Customer" name="James">
  +		<j:useBean var="customer" class="org.apache.commons.jelly.core.Customer" name="James">
   
   			<!-- typically the following tag might be nested inside some conditional logic -->
   			<j:setProperties name="Bob" city="Atlanta"/>
  @@ -158,7 +158,7 @@
   			actual="${customer.city}"/>
   			
   		<test:assertEquals 
  -			expected="org.apache.commons.jelly.bean.Customer" 
  +			expected="org.apache.commons.jelly.core.Customer" 
   			actual="${customer.class.name}"/>
     </test:case>
   
  
  
  
  1.3       +1 -1      jakarta-commons-sandbox/jelly/src/test/org/apache/commons/jelly/define/beanSample.jelly
  
  Index: beanSample.jelly
  ===================================================================
  RCS file: /home/cvs/jakarta-commons-sandbox/jelly/src/test/org/apache/commons/jelly/define/beanSample.jelly,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- beanSample.jelly	16 Oct 2002 18:17:58 -0000	1.2
  +++ beanSample.jelly	15 Jan 2003 12:23:45 -0000	1.3
  @@ -18,7 +18,7 @@
     	  || we'll specify some required attributes and some default values
     	  -->
     	  
  -    <define:bean name="customer" className="org.apache.commons.jelly.bean.Customer">
  +    <define:bean name="customer" className="org.apache.commons.jelly.core.Customer">
   	  <define:attribute name="name" required="true"/>
   	  <define:attribute name="location" defaultValue="UK"/>
   	</define:bean>    	
  
  
  

--
To unsubscribe, e-mail:   <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>