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:20 UTC
cvs commit: jakarta-commons-sandbox/jelly/src/test/org/apache/commons/jelly/core Product.java Order.java Customer.java testNewTag.jelly TestInvokeTag.java testInvokeTag.jelly TestNewTag.java
dion 2003/01/15 04:23:20
Modified: jelly/src/test/org/apache/commons/jelly/core
testNewTag.jelly TestInvokeTag.java
testInvokeTag.jelly TestNewTag.java
Added: jelly/src/test/org/apache/commons/jelly/core Product.java
Order.java Customer.java
Log:
Finish removing bean taglib from core
Revision Changes Path
1.2 +14 -14 jakarta-commons-sandbox/jelly/src/test/org/apache/commons/jelly/core/testNewTag.jelly
Index: testNewTag.jelly
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/jelly/src/test/org/apache/commons/jelly/core/testNewTag.jelly,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- testNewTag.jelly 28 Nov 2002 00:22:23 -0000 1.1
+++ testNewTag.jelly 15 Jan 2003 12:23:19 -0000 1.2
@@ -1,58 +1,58 @@
<j:jelly xmlns:j="jelly:core">
<j:if test="${test.simpleNew}">
- <j:new var="foo" className="org.apache.commons.jelly.bean.Customer"/>
+ <j:new var="foo" className="org.apache.commons.jelly.core.Customer"/>
</j:if>
<j:if test="${test.newThenOverwrite}">
- <j:new var="foo" className="org.apache.commons.jelly.bean.Customer"/>
+ <j:new var="foo" className="org.apache.commons.jelly.core.Customer"/>
<j:new var="foo" className="java.util.Date"/>
</j:if>
<j:if test="${test.newWithLiteralArg}">
- <j:new var="foo" className="org.apache.commons.jelly.bean.Customer">
+ <j:new var="foo" className="org.apache.commons.jelly.core.Customer">
<j:arg value="Jane Doe"/>
</j:new>
</j:if>
<j:if test="${test.newWithTwoArgs}">
- <j:new var="foo" className="org.apache.commons.jelly.bean.Customer">
+ <j:new var="foo" className="org.apache.commons.jelly.core.Customer">
<j:arg value="Jane Doe"/>
<j:arg value="Chicago"/>
</j:new>
</j:if>
<j:if test="${test.newWithExpressionArg}">
<j:set var="namearg" value="Jane Doe"/>
- <j:new var="foo" className="org.apache.commons.jelly.bean.Customer">
+ <j:new var="foo" className="org.apache.commons.jelly.core.Customer">
<j:arg value="${namearg}"/>
</j:new>
</j:if>
<j:if test="${test.newWithNullArg}">
- <j:new var="foo" className="org.apache.commons.jelly.bean.Customer">
+ <j:new var="foo" className="org.apache.commons.jelly.core.Customer">
<j:arg type="java.lang.String"/>
</j:new>
</j:if>
<j:if test="${test.newWithNewArg}">
- <j:new var="foo" className="org.apache.commons.jelly.bean.Customer">
+ <j:new var="foo" className="org.apache.commons.jelly.core.Customer">
<j:arg type="java.lang.String">
<j:new className="java.lang.String"/>
</j:arg>
</j:new>
- <j:new var="bar" className="org.apache.commons.jelly.bean.Customer">
+ <j:new var="bar" className="org.apache.commons.jelly.core.Customer">
<j:arg value="Jane Doe"/>
<j:arg value="Chicago"/>
- <j:arg><j:new className="org.apache.commons.jelly.bean.Order"/></j:arg>
+ <j:arg><j:new className="org.apache.commons.jelly.core.Order"/></j:arg>
</j:new>
- <j:new var="qux" className="org.apache.commons.jelly.bean.Customer">
+ <j:new var="qux" className="org.apache.commons.jelly.core.Customer">
<j:arg>
- <j:new className="org.apache.commons.jelly.bean.Customer">
+ <j:new className="org.apache.commons.jelly.core.Customer">
<j:arg value="Jane Doe"/>
<j:arg value="Chicago"/>
- <j:arg><j:new className="org.apache.commons.jelly.bean.Order"/></j:arg>
+ <j:arg><j:new className="org.apache.commons.jelly.core.Order"/></j:arg>
</j:new>
</j:arg>
</j:new>
</j:if>
<j:if test="${test.newWithUseBeanArg}">
- <j:new var="foo" className="org.apache.commons.jelly.bean.Customer">
+ <j:new var="foo" className="org.apache.commons.jelly.core.Customer">
<j:arg>
- <j:useBean class="org.apache.commons.jelly.bean.Customer" name="Jane Doe" city="Chicago" location="Location"/>
+ <j:useBean class="org.apache.commons.jelly.core.Customer" name="Jane Doe" city="Chicago" location="Location"/>
</j:arg>
</j:new>
</j:if>
1.2 +5 -5 jakarta-commons-sandbox/jelly/src/test/org/apache/commons/jelly/core/TestInvokeTag.java
Index: TestInvokeTag.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/jelly/src/test/org/apache/commons/jelly/core/TestInvokeTag.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- TestInvokeTag.java 29 Nov 2002 15:53:10 -0000 1.1
+++ TestInvokeTag.java 15 Jan 2003 12:23:19 -0000 1.2
@@ -64,7 +64,7 @@
import junit.framework.TestSuite;
import org.apache.commons.jelly.Script;
-import org.apache.commons.jelly.bean.Customer;
+import org.apache.commons.jelly.core.Customer;
/**
* @author Rodney Waldhoff
1.2 +4 -4 jakarta-commons-sandbox/jelly/src/test/org/apache/commons/jelly/core/testInvokeTag.jelly
Index: testInvokeTag.jelly
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/jelly/src/test/org/apache/commons/jelly/core/testInvokeTag.jelly,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- testInvokeTag.jelly 29 Nov 2002 15:53:10 -0000 1.1
+++ testInvokeTag.jelly 15 Jan 2003 12:23:20 -0000 1.2
@@ -2,7 +2,7 @@
<j:if test="${test.simpleInvoke}">
<j:set var="namearg" value="Jane Doe"/>
- <j:new var="foo" className="org.apache.commons.jelly.bean.Customer"/>
+ <j:new var="foo" className="org.apache.commons.jelly.core.Customer"/>
<j:invoke method="setName" on="${foo}">
<j:arg value="${namearg}"/>
</j:invoke>
@@ -10,7 +10,7 @@
<j:arg value="Chicago"/>
</j:invoke>
<j:invoke method="addOrder" on="${foo}">
- <j:arg><j:new className="org.apache.commons.jelly.bean.Order"/></j:arg>
+ <j:arg><j:new className="org.apache.commons.jelly.core.Order"/></j:arg>
</j:invoke>
</j:if>
@@ -27,7 +27,7 @@
<j:invoke on="${list}" method="add"><j:arg value="Jane Doe"/></j:invoke>
<j:invoke on="${list}" method="add"><j:arg value="Chicago"/></j:invoke>
- <j:new var="customer" className="org.apache.commons.jelly.bean.Customer">
+ <j:new var="customer" className="org.apache.commons.jelly.core.Customer">
<j:arg><j:invoke on="${list}" method="get"><j:arg type="int" value="0"/></j:invoke></j:arg>
<j:arg><j:invoke on="${list}" method="get"><j:arg type="int" value="1"/></j:invoke></j:arg>
</j:new>
@@ -38,7 +38,7 @@
<j:invoke on="${list}" method="add"><j:arg value="Jane Doe"/></j:invoke>
<j:invoke on="${list}" method="add"><j:arg value="Chicago"/></j:invoke>
- <j:new var="customer" className="org.apache.commons.jelly.bean.Customer">
+ <j:new var="customer" className="org.apache.commons.jelly.core.Customer">
<j:arg><j:invoke on="${list}" method="get"><j:arg type="int" value="0"/></j:invoke></j:arg>
<j:arg><j:invoke on="${list}" method="get" var="argtwo"><j:arg type="int" value="1"/></j:invoke></j:arg>
</j:new>
1.3 +6 -6 jakarta-commons-sandbox/jelly/src/test/org/apache/commons/jelly/core/TestNewTag.java
Index: TestNewTag.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/jelly/src/test/org/apache/commons/jelly/core/TestNewTag.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- TestNewTag.java 30 Nov 2002 07:41:21 -0000 1.2
+++ TestNewTag.java 15 Jan 2003 12:23:20 -0000 1.3
@@ -66,7 +66,7 @@
import junit.framework.TestSuite;
import org.apache.commons.jelly.Script;
-import org.apache.commons.jelly.bean.Customer;
+import org.apache.commons.jelly.core.Customer;
/**
* @author Rodney Waldhoff
1.1 jakarta-commons-sandbox/jelly/src/test/org/apache/commons/jelly/core/Product.java
Index: Product.java
===================================================================
/*
* $Header: /home/cvs/jakarta-commons-sandbox/jelly/src/test/org/apache/commons/jelly/core/Product.java,v 1.1 2003/01/15 12:23:19 dion Exp $
* $Revision: 1.1 $
* $Date: 2003/01/15 12:23:19 $
*
* ====================================================================
*
* The Apache Software License, Version 1.1
*
* Copyright (c) 2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
*
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
*
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
*
* 3. The end-user documentation included with the redistribution, if
* any, must include the following acknowlegement:
* "This product includes software developed by the
* Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowlegement may appear in the software itself,
* if and wherever such third-party acknowlegements normally appear.
*
* 4. The names "The Jakarta Project", "Commons", and "Apache Software
* Foundation" must not be used to endorse or promote products derived
* from this software without prior written permission. For written
* permission, please contact apache@apache.org.
*
* 5. Products derived from this software may not be called "Apache"
* nor may "Apache" appear in their names without prior written
* permission of the Apache Group.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
* ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
* USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
* ====================================================================
*
* This software consists of voluntary contributions made by many
* individuals on behalf of the Apache Software Foundation. For more
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*
* $Id: Product.java,v 1.1 2003/01/15 12:23:19 dion Exp $
*/
package org.apache.commons.jelly.core;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
/**
* A sample bean that we can construct via Jelly tags
*
* @author <a href="mailto:jstrachan@apache.org">James Strachan</a>
* @version $Revision: 1.1 $
*/
public class Product {
/** The Log to which logging calls will be made. */
private static final Log log = LogFactory.getLog(Product.class);
private String id;
private String name;
public Product() {
}
public String toString() {
return "Product[id=" + id + ";name=" + name + "]";
}
// Properties
//-------------------------------------------------------------------------
/**
* Returns the id.
* @return String
*/
public String getId() {
return id;
}
/**
* Returns the name.
* @return String
*/
public String getName() {
return name;
}
/**
* Sets the id.
* @param id The id to set
*/
public void setId(String id) {
this.id = id;
}
/**
* Sets the name.
* @param name The name to set
*/
public void setName(String name) {
this.name = name;
}
}
1.1 jakarta-commons-sandbox/jelly/src/test/org/apache/commons/jelly/core/Order.java
Index: Order.java
===================================================================
/*
* $Header: /home/cvs/jakarta-commons-sandbox/jelly/src/test/org/apache/commons/jelly/core/Order.java,v 1.1 2003/01/15 12:23:19 dion Exp $
* $Revision: 1.1 $
* $Date: 2003/01/15 12:23:19 $
*
* ====================================================================
*
* The Apache Software License, Version 1.1
*
* Copyright (c) 2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
*
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
*
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
*
* 3. The end-user documentation included with the redistribution, if
* any, must include the following acknowlegement:
* "This product includes software developed by the
* Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowlegement may appear in the software itself,
* if and wherever such third-party acknowlegements normally appear.
*
* 4. The names "The Jakarta Project", "Commons", and "Apache Software
* Foundation" must not be used to endorse or promote products derived
* from this software without prior written permission. For written
* permission, please contact apache@apache.org.
*
* 5. Products derived from this software may not be called "Apache"
* nor may "Apache" appear in their names without prior written
* permission of the Apache Group.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
* ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
* USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
* ====================================================================
*
* This software consists of voluntary contributions made by many
* individuals on behalf of the Apache Software Foundation. For more
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*
* $Id: Order.java,v 1.1 2003/01/15 12:23:19 dion Exp $
*/
package org.apache.commons.jelly.core;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
/**
* A sample bean that we can construct via Jelly tags
*
* @author <a href="mailto:jstrachan@apache.org">James Strachan</a>
* @version $Revision: 1.1 $
*/
public class Order {
/** The Log to which logging calls will be made. */
private static final Log log = LogFactory.getLog(Order.class);
private Product product;
private int amount;
private double price;
public Order() {
}
public String toString() {
return "Order[amount=" + amount + ";price=" + price + ";product=" + product + "]";
}
/**
* Factory method to create a new Product
*/
public Product createProduct() {
return new Product();
}
/**
* Returns the amount.
* @return int
*/
public int getAmount() {
return amount;
}
/**
* Returns the price.
* @return double
*/
public double getPrice() {
return price;
}
/**
* Sets the amount.
* @param amount The amount to set
*/
public void setAmount(int amount) {
this.amount = amount;
}
/**
* Sets the price.
* @param price The price to set
*/
public void setPrice(double price) {
this.price = price;
}
/**
* Returns the product.
* @return Product
*/
public Product getProduct() {
return product;
}
/**
* Sets the product.
* @param product The product to set
*/
public void setProduct(Product product) {
this.product = product;
}
}
1.1 jakarta-commons-sandbox/jelly/src/test/org/apache/commons/jelly/core/Customer.java
Index: Customer.java
===================================================================
/*
* $Header: /home/cvs/jakarta-commons-sandbox/jelly/src/test/org/apache/commons/jelly/core/Customer.java,v 1.1 2003/01/15 12:23:20 dion Exp $
* $Revision: 1.1 $
* $Date: 2003/01/15 12:23:20 $
*
* ====================================================================
*
* The Apache Software License, Version 1.1
*
* Copyright (c) 2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
*
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
*
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
*
* 3. The end-user documentation included with the redistribution, if
* any, must include the following acknowlegement:
* "This product includes software developed by the
* Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowlegement may appear in the software itself,
* if and wherever such third-party acknowlegements normally appear.
*
* 4. The names "The Jakarta Project", "Commons", and "Apache Software
* Foundation" must not be used to endorse or promote products derived
* from this software without prior written permission. For written
* permission, please contact apache@apache.org.
*
* 5. Products derived from this software may not be called "Apache"
* nor may "Apache" appear in their names without prior written
* permission of the Apache Group.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
* ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
* USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
* ====================================================================
*
* This software consists of voluntary contributions made by many
* individuals on behalf of the Apache Software Foundation. For more
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*
* $Id: Customer.java,v 1.1 2003/01/15 12:23:20 dion Exp $
*/
package org.apache.commons.jelly.core;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
/**
* A sample bean that we can construct via Jelly tags
*
* @author <a href="mailto:jstrachan@apache.org">James Strachan</a>
* @version $Revision: 1.1 $
*/
public class Customer {
/** The Log to which logging calls will be made. */
private static final Log log = LogFactory.getLog(Customer.class);
private String name;
private String city;
private String location;
private List orders = new ArrayList();
public Customer() {
}
public Customer(String name) {
setName(name);
}
public Customer(String name, String city) {
setName(name);
setCity(city);
}
public Customer(String name, String city, Order anOrder) {
setName(name);
setCity(city);
addOrder(anOrder);
}
public Customer(Customer cust) {
setName(cust.getName());
setCity(cust.getCity());
setLocation(cust.getLocation());
List list = cust.getOrders();
if(null != list) {
for(Iterator iter = list.iterator();iter.hasNext();) {
addOrder((Order)iter.next());
}
}
}
public String toString() {
return super.toString() + "[name=" + name + ";city=" + city + "]";
}
/**
* Creates a new Order object
*/
public Order createOrder() {
return new Order();
}
public List getOrders() {
return orders;
}
public void addOrder(Order order) {
orders.add(order);
}
public void removeOrder(Order order) {
orders.remove(order);
}
/**
* Returns the city.
* @return String
*/
public String getCity() {
return city;
}
/**
* Returns the location.
* @return String
*/
public String getLocation() {
return location;
}
/**
* Returns the name.
* @return String
*/
public String getName() {
return name;
}
/**
* Sets the city.
* @param city The city to set
*/
public void setCity(String city) {
this.city = city;
}
/**
* Sets the location.
* @param location The location to set
*/
public void setLocation(String location) {
this.location = location;
}
/**
* Sets the name.
* @param name The name to set
*/
public void setName(String name) {
this.name = name;
}
}
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>