You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cayenne.apache.org by bd...@apache.org on 2006/07/25 07:18:11 UTC
svn commit: r425284 [2/2] - in /incubator/cayenne/examples/trunk: ./
3t-example-client/ 3t-example-client/src/cayenne3t/
3t-example-client/src/main/ 3t-example-client/src/main/java/
3t-example-client/src/main/java/cayenne3t/ 3t-example-client/src/main/...
Modified: incubator/cayenne/examples/trunk/cayenne-petstore/src/main/java/org/apache/petstore/domain/auto/_LineItem.java
URL: http://svn.apache.org/viewvc/incubator/cayenne/examples/trunk/cayenne-petstore/src/main/java/org/apache/petstore/domain/auto/_LineItem.java?rev=425284&r1=425031&r2=425284&view=diff
==============================================================================
--- incubator/cayenne/examples/trunk/cayenne-petstore/src/main/java/org/apache/petstore/domain/auto/_LineItem.java (original)
+++ incubator/cayenne/examples/trunk/cayenne-petstore/src/main/java/org/apache/petstore/domain/auto/_LineItem.java Mon Jul 24 22:18:04 2006
@@ -1,11 +1,11 @@
-package org.objectstyle.petstore.domain.auto;
+package org.apache.petstore.domain.auto;
/** Class _LineItem was generated by Cayenne.
* It is probably a good idea to avoid changing this class manually,
* since it may be overwritten next time code is regenerated.
* If you need to make any customizations, please use subclass.
*/
-public class _LineItem extends org.objectstyle.cayenne.CayenneDataObject {
+public class _LineItem extends org.apache.cayenne.CayenneDataObject {
public static final String QUANTITY_PROPERTY = "quantity";
public static final String UNIT_PRICE_PROPERTY = "unitPrice";
@@ -32,30 +32,30 @@
}
- public void setItem(org.objectstyle.petstore.domain.Item item) {
+ public void setItem(org.apache.petstore.domain.Item item) {
setToOneTarget("item", item, true);
}
- public org.objectstyle.petstore.domain.Item getItem() {
- return (org.objectstyle.petstore.domain.Item)readProperty("item");
+ public org.apache.petstore.domain.Item getItem() {
+ return (org.apache.petstore.domain.Item)readProperty("item");
}
- public void setOrder(org.objectstyle.petstore.domain.Order order) {
+ public void setOrder(org.apache.petstore.domain.Order order) {
setToOneTarget("order", order, true);
}
- public org.objectstyle.petstore.domain.Order getOrder() {
- return (org.objectstyle.petstore.domain.Order)readProperty("order");
+ public org.apache.petstore.domain.Order getOrder() {
+ return (org.apache.petstore.domain.Order)readProperty("order");
}
- public void setStatus(org.objectstyle.petstore.domain.OrderStatus status) {
+ public void setStatus(org.apache.petstore.domain.OrderStatus status) {
setToOneTarget("status", status, true);
}
- public org.objectstyle.petstore.domain.OrderStatus getStatus() {
- return (org.objectstyle.petstore.domain.OrderStatus)readProperty("status");
+ public org.apache.petstore.domain.OrderStatus getStatus() {
+ return (org.apache.petstore.domain.OrderStatus)readProperty("status");
}
Modified: incubator/cayenne/examples/trunk/cayenne-petstore/src/main/java/org/apache/petstore/domain/auto/_Order.java
URL: http://svn.apache.org/viewvc/incubator/cayenne/examples/trunk/cayenne-petstore/src/main/java/org/apache/petstore/domain/auto/_Order.java?rev=425284&r1=425031&r2=425284&view=diff
==============================================================================
--- incubator/cayenne/examples/trunk/cayenne-petstore/src/main/java/org/apache/petstore/domain/auto/_Order.java (original)
+++ incubator/cayenne/examples/trunk/cayenne-petstore/src/main/java/org/apache/petstore/domain/auto/_Order.java Mon Jul 24 22:18:04 2006
@@ -1,4 +1,4 @@
-package org.objectstyle.petstore.domain.auto;
+package org.apache.petstore.domain.auto;
import java.util.List;
@@ -7,7 +7,7 @@
* since it may be overwritten next time code is regenerated.
* If you need to make any customizations, please use subclass.
*/
-public class _Order extends org.objectstyle.cayenne.CayenneDataObject {
+public class _Order extends org.apache.cayenne.CayenneDataObject {
public static final String BILL_ADDRESS1_PROPERTY = "billAddress1";
public static final String BILL_ADDRESS2_PROPERTY = "billAddress2";
@@ -221,19 +221,19 @@
}
- public void setAccount(org.objectstyle.petstore.domain.Account account) {
+ public void setAccount(org.apache.petstore.domain.Account account) {
setToOneTarget("account", account, true);
}
- public org.objectstyle.petstore.domain.Account getAccount() {
- return (org.objectstyle.petstore.domain.Account)readProperty("account");
+ public org.apache.petstore.domain.Account getAccount() {
+ return (org.apache.petstore.domain.Account)readProperty("account");
}
- public void addToLineItems(org.objectstyle.petstore.domain.LineItem obj) {
+ public void addToLineItems(org.apache.petstore.domain.LineItem obj) {
addToManyTarget("lineItems", obj, true);
}
- public void removeFromLineItems(org.objectstyle.petstore.domain.LineItem obj) {
+ public void removeFromLineItems(org.apache.petstore.domain.LineItem obj) {
removeToManyTarget("lineItems", obj, true);
}
public List getLineItems() {
Modified: incubator/cayenne/examples/trunk/cayenne-petstore/src/main/java/org/apache/petstore/domain/auto/_OrderStatus.java
URL: http://svn.apache.org/viewvc/incubator/cayenne/examples/trunk/cayenne-petstore/src/main/java/org/apache/petstore/domain/auto/_OrderStatus.java?rev=425284&r1=425031&r2=425284&view=diff
==============================================================================
--- incubator/cayenne/examples/trunk/cayenne-petstore/src/main/java/org/apache/petstore/domain/auto/_OrderStatus.java (original)
+++ incubator/cayenne/examples/trunk/cayenne-petstore/src/main/java/org/apache/petstore/domain/auto/_OrderStatus.java Mon Jul 24 22:18:04 2006
@@ -1,11 +1,11 @@
-package org.objectstyle.petstore.domain.auto;
+package org.apache.petstore.domain.auto;
/** Class _OrderStatus was generated by Cayenne.
* It is probably a good idea to avoid changing this class manually,
* since it may be overwritten next time code is regenerated.
* If you need to make any customizations, please use subclass.
*/
-public class _OrderStatus extends org.objectstyle.cayenne.CayenneDataObject {
+public class _OrderStatus extends org.apache.cayenne.CayenneDataObject {
public static final String STATUS_PROPERTY = "status";
public static final String TIMESTAMP_PROPERTY = "timestamp";
@@ -30,12 +30,12 @@
}
- public void setLineItem(org.objectstyle.petstore.domain.LineItem lineItem) {
+ public void setLineItem(org.apache.petstore.domain.LineItem lineItem) {
setToOneTarget("lineItem", lineItem, true);
}
- public org.objectstyle.petstore.domain.LineItem getLineItem() {
- return (org.objectstyle.petstore.domain.LineItem)readProperty("lineItem");
+ public org.apache.petstore.domain.LineItem getLineItem() {
+ return (org.apache.petstore.domain.LineItem)readProperty("lineItem");
}
Modified: incubator/cayenne/examples/trunk/cayenne-petstore/src/main/java/org/apache/petstore/domain/auto/_Product.java
URL: http://svn.apache.org/viewvc/incubator/cayenne/examples/trunk/cayenne-petstore/src/main/java/org/apache/petstore/domain/auto/_Product.java?rev=425284&r1=425031&r2=425284&view=diff
==============================================================================
--- incubator/cayenne/examples/trunk/cayenne-petstore/src/main/java/org/apache/petstore/domain/auto/_Product.java (original)
+++ incubator/cayenne/examples/trunk/cayenne-petstore/src/main/java/org/apache/petstore/domain/auto/_Product.java Mon Jul 24 22:18:04 2006
@@ -1,4 +1,4 @@
-package org.objectstyle.petstore.domain.auto;
+package org.apache.petstore.domain.auto;
import java.util.List;
@@ -7,7 +7,7 @@
* since it may be overwritten next time code is regenerated.
* If you need to make any customizations, please use subclass.
*/
-public class _Product extends org.objectstyle.cayenne.CayenneDataObject {
+public class _Product extends org.apache.cayenne.CayenneDataObject {
public static final String CATEGORY_NAME_PROPERTY = "categoryName";
public static final String DESCRIPTION_PROPERTY = "description";
@@ -41,19 +41,19 @@
}
- public void setCategory(org.objectstyle.petstore.domain.Category category) {
+ public void setCategory(org.apache.petstore.domain.Category category) {
setToOneTarget("category", category, true);
}
- public org.objectstyle.petstore.domain.Category getCategory() {
- return (org.objectstyle.petstore.domain.Category)readProperty("category");
+ public org.apache.petstore.domain.Category getCategory() {
+ return (org.apache.petstore.domain.Category)readProperty("category");
}
- public void addToItems(org.objectstyle.petstore.domain.Item obj) {
+ public void addToItems(org.apache.petstore.domain.Item obj) {
addToManyTarget("items", obj, true);
}
- public void removeFromItems(org.objectstyle.petstore.domain.Item obj) {
+ public void removeFromItems(org.apache.petstore.domain.Item obj) {
removeToManyTarget("items", obj, true);
}
public List getItems() {
Modified: incubator/cayenne/examples/trunk/cayenne-petstore/src/main/java/org/apache/petstore/domain/auto/_Profile.java
URL: http://svn.apache.org/viewvc/incubator/cayenne/examples/trunk/cayenne-petstore/src/main/java/org/apache/petstore/domain/auto/_Profile.java?rev=425284&r1=425031&r2=425284&view=diff
==============================================================================
--- incubator/cayenne/examples/trunk/cayenne-petstore/src/main/java/org/apache/petstore/domain/auto/_Profile.java (original)
+++ incubator/cayenne/examples/trunk/cayenne-petstore/src/main/java/org/apache/petstore/domain/auto/_Profile.java Mon Jul 24 22:18:04 2006
@@ -1,11 +1,11 @@
-package org.objectstyle.petstore.domain.auto;
+package org.apache.petstore.domain.auto;
/** Class _Profile was generated by Cayenne.
* It is probably a good idea to avoid changing this class manually,
* since it may be overwritten next time code is regenerated.
* If you need to make any customizations, please use subclass.
*/
-public class _Profile extends org.objectstyle.cayenne.CayenneDataObject {
+public class _Profile extends org.apache.cayenne.CayenneDataObject {
public static final String BANNER_OPTION_PROPERTY = "bannerOption";
public static final String LANGUAGE_PREFERENCE_PROPERTY = "languagePreference";
@@ -39,21 +39,21 @@
}
- public void setAccount(org.objectstyle.petstore.domain.Account account) {
+ public void setAccount(org.apache.petstore.domain.Account account) {
setToOneTarget("account", account, true);
}
- public org.objectstyle.petstore.domain.Account getAccount() {
- return (org.objectstyle.petstore.domain.Account)readProperty("account");
+ public org.apache.petstore.domain.Account getAccount() {
+ return (org.apache.petstore.domain.Account)readProperty("account");
}
- public void setCategory(org.objectstyle.petstore.domain.Category category) {
+ public void setCategory(org.apache.petstore.domain.Category category) {
setToOneTarget("category", category, true);
}
- public org.objectstyle.petstore.domain.Category getCategory() {
- return (org.objectstyle.petstore.domain.Category)readProperty("category");
+ public org.apache.petstore.domain.Category getCategory() {
+ return (org.apache.petstore.domain.Category)readProperty("category");
}
Modified: incubator/cayenne/examples/trunk/cayenne-petstore/src/main/java/org/apache/petstore/domain/auto/_Supplier.java
URL: http://svn.apache.org/viewvc/incubator/cayenne/examples/trunk/cayenne-petstore/src/main/java/org/apache/petstore/domain/auto/_Supplier.java?rev=425284&r1=425031&r2=425284&view=diff
==============================================================================
--- incubator/cayenne/examples/trunk/cayenne-petstore/src/main/java/org/apache/petstore/domain/auto/_Supplier.java (original)
+++ incubator/cayenne/examples/trunk/cayenne-petstore/src/main/java/org/apache/petstore/domain/auto/_Supplier.java Mon Jul 24 22:18:04 2006
@@ -1,4 +1,4 @@
-package org.objectstyle.petstore.domain.auto;
+package org.apache.petstore.domain.auto;
import java.util.List;
@@ -7,7 +7,7 @@
* since it may be overwritten next time code is regenerated.
* If you need to make any customizations, please use subclass.
*/
-public class _Supplier extends org.objectstyle.cayenne.CayenneDataObject {
+public class _Supplier extends org.apache.cayenne.CayenneDataObject {
public static final String ADDRESS1_PROPERTY = "address1";
public static final String ADDRESS2_PROPERTY = "address2";
@@ -85,10 +85,10 @@
}
- public void addToItems(org.objectstyle.petstore.domain.Item obj) {
+ public void addToItems(org.apache.petstore.domain.Item obj) {
addToManyTarget("items", obj, true);
}
- public void removeFromItems(org.objectstyle.petstore.domain.Item obj) {
+ public void removeFromItems(org.apache.petstore.domain.Item obj) {
removeToManyTarget("items", obj, true);
}
public List getItems() {
Modified: incubator/cayenne/examples/trunk/cayenne-petstore/src/main/java/org/apache/petstore/domain/auto/_User.java
URL: http://svn.apache.org/viewvc/incubator/cayenne/examples/trunk/cayenne-petstore/src/main/java/org/apache/petstore/domain/auto/_User.java?rev=425284&r1=425031&r2=425284&view=diff
==============================================================================
--- incubator/cayenne/examples/trunk/cayenne-petstore/src/main/java/org/apache/petstore/domain/auto/_User.java (original)
+++ incubator/cayenne/examples/trunk/cayenne-petstore/src/main/java/org/apache/petstore/domain/auto/_User.java Mon Jul 24 22:18:04 2006
@@ -1,11 +1,11 @@
-package org.objectstyle.petstore.domain.auto;
+package org.apache.petstore.domain.auto;
/** Class _User was generated by Cayenne.
* It is probably a good idea to avoid changing this class manually,
* since it may be overwritten next time code is regenerated.
* If you need to make any customizations, please use subclass.
*/
-public class _User extends org.objectstyle.cayenne.CayenneDataObject {
+public class _User extends org.apache.cayenne.CayenneDataObject {
public static final String PASSWORD_PROPERTY = "password";
public static final String ACCOUNT_PROPERTY = "account";
@@ -20,12 +20,12 @@
}
- public void setAccount(org.objectstyle.petstore.domain.Account account) {
+ public void setAccount(org.apache.petstore.domain.Account account) {
setToOneTarget("account", account, true);
}
- public org.objectstyle.petstore.domain.Account getAccount() {
- return (org.objectstyle.petstore.domain.Account)readProperty("account");
+ public org.apache.petstore.domain.Account getAccount() {
+ return (org.apache.petstore.domain.Account)readProperty("account");
}
Modified: incubator/cayenne/examples/trunk/cayenne-petstore/src/main/java/org/apache/petstore/presentation/AbstractBean.java
URL: http://svn.apache.org/viewvc/incubator/cayenne/examples/trunk/cayenne-petstore/src/main/java/org/apache/petstore/presentation/AbstractBean.java?rev=425284&r1=425031&r2=425284&view=diff
==============================================================================
--- incubator/cayenne/examples/trunk/cayenne-petstore/src/main/java/org/apache/petstore/presentation/AbstractBean.java (original)
+++ incubator/cayenne/examples/trunk/cayenne-petstore/src/main/java/org/apache/petstore/presentation/AbstractBean.java Mon Jul 24 22:18:04 2006
@@ -1,4 +1,4 @@
-package org.objectstyle.petstore.presentation;
+package org.apache.petstore.presentation;
import org.apache.struts.beanaction.ActionContext;
import org.apache.struts.beanaction.BaseBean;
Modified: incubator/cayenne/examples/trunk/cayenne-petstore/src/main/java/org/apache/petstore/presentation/AccountBean.java
URL: http://svn.apache.org/viewvc/incubator/cayenne/examples/trunk/cayenne-petstore/src/main/java/org/apache/petstore/presentation/AccountBean.java?rev=425284&r1=425031&r2=425284&view=diff
==============================================================================
--- incubator/cayenne/examples/trunk/cayenne-petstore/src/main/java/org/apache/petstore/presentation/AccountBean.java (original)
+++ incubator/cayenne/examples/trunk/cayenne-petstore/src/main/java/org/apache/petstore/presentation/AccountBean.java Mon Jul 24 22:18:04 2006
@@ -1,15 +1,13 @@
-package org.objectstyle.petstore.presentation;
+package org.apache.petstore.presentation;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
-
+import org.apache.petstore.domain.Account;
+import org.apache.petstore.domain.Category;
+import org.apache.petstore.service.AccountService;
+import org.apache.petstore.service.CatalogService;
import org.apache.struts.beanaction.BeanActionException;
-import org.objectstyle.petstore.domain.Account;
-import org.objectstyle.petstore.domain.Category;
-import org.objectstyle.petstore.service.AccountService;
-import org.objectstyle.petstore.service.CatalogService;
-
import com.ibatis.common.util.PaginatedList;
public class AccountBean extends AbstractBean {
Modified: incubator/cayenne/examples/trunk/cayenne-petstore/src/main/java/org/apache/petstore/presentation/CartBean.java
URL: http://svn.apache.org/viewvc/incubator/cayenne/examples/trunk/cayenne-petstore/src/main/java/org/apache/petstore/presentation/CartBean.java?rev=425284&r1=425031&r2=425284&view=diff
==============================================================================
--- incubator/cayenne/examples/trunk/cayenne-petstore/src/main/java/org/apache/petstore/presentation/CartBean.java (original)
+++ incubator/cayenne/examples/trunk/cayenne-petstore/src/main/java/org/apache/petstore/presentation/CartBean.java Mon Jul 24 22:18:04 2006
@@ -1,13 +1,12 @@
-package org.objectstyle.petstore.presentation;
+package org.apache.petstore.presentation;
import java.util.Iterator;
import java.util.Map;
-
+import org.apache.petstore.domain.Cart;
+import org.apache.petstore.domain.CartItem;
+import org.apache.petstore.domain.Item;
+import org.apache.petstore.service.CatalogService;
import org.apache.struts.beanaction.ActionContext;
-import org.objectstyle.petstore.domain.Cart;
-import org.objectstyle.petstore.domain.CartItem;
-import org.objectstyle.petstore.domain.Item;
-import org.objectstyle.petstore.service.CatalogService;
public class CartBean extends AbstractBean {
Modified: incubator/cayenne/examples/trunk/cayenne-petstore/src/main/java/org/apache/petstore/presentation/CatalogBean.java
URL: http://svn.apache.org/viewvc/incubator/cayenne/examples/trunk/cayenne-petstore/src/main/java/org/apache/petstore/presentation/CatalogBean.java?rev=425284&r1=425031&r2=425284&view=diff
==============================================================================
--- incubator/cayenne/examples/trunk/cayenne-petstore/src/main/java/org/apache/petstore/presentation/CatalogBean.java (original)
+++ incubator/cayenne/examples/trunk/cayenne-petstore/src/main/java/org/apache/petstore/presentation/CatalogBean.java Mon Jul 24 22:18:04 2006
@@ -1,9 +1,9 @@
-package org.objectstyle.petstore.presentation;
+package org.apache.petstore.presentation;
-import org.objectstyle.petstore.domain.Category;
-import org.objectstyle.petstore.domain.Item;
-import org.objectstyle.petstore.domain.Product;
-import org.objectstyle.petstore.service.CatalogService;
+import org.apache.petstore.domain.Category;
+import org.apache.petstore.domain.Item;
+import org.apache.petstore.domain.Product;
+import org.apache.petstore.service.CatalogService;
import com.ibatis.common.util.PaginatedList;
Modified: incubator/cayenne/examples/trunk/cayenne-petstore/src/main/java/org/apache/petstore/presentation/OrderBean.java
URL: http://svn.apache.org/viewvc/incubator/cayenne/examples/trunk/cayenne-petstore/src/main/java/org/apache/petstore/presentation/OrderBean.java?rev=425284&r1=425031&r2=425284&view=diff
==============================================================================
--- incubator/cayenne/examples/trunk/cayenne-petstore/src/main/java/org/apache/petstore/presentation/OrderBean.java (original)
+++ incubator/cayenne/examples/trunk/cayenne-petstore/src/main/java/org/apache/petstore/presentation/OrderBean.java Mon Jul 24 22:18:04 2006
@@ -1,14 +1,12 @@
-package org.objectstyle.petstore.presentation;
+package org.apache.petstore.presentation;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import java.util.Map;
-
+import org.apache.petstore.domain.Order;
+import org.apache.petstore.service.OrderService;
import org.apache.struts.beanaction.ActionContext;
-import org.objectstyle.petstore.domain.Order;
-import org.objectstyle.petstore.service.OrderService;
-
import com.ibatis.common.util.PaginatedList;
public class OrderBean extends AbstractBean {
Modified: incubator/cayenne/examples/trunk/cayenne-petstore/src/main/java/org/apache/petstore/service/AccountService.java
URL: http://svn.apache.org/viewvc/incubator/cayenne/examples/trunk/cayenne-petstore/src/main/java/org/apache/petstore/service/AccountService.java?rev=425284&r1=425031&r2=425284&view=diff
==============================================================================
--- incubator/cayenne/examples/trunk/cayenne-petstore/src/main/java/org/apache/petstore/service/AccountService.java (original)
+++ incubator/cayenne/examples/trunk/cayenne-petstore/src/main/java/org/apache/petstore/service/AccountService.java Mon Jul 24 22:18:04 2006
@@ -1,9 +1,9 @@
-package org.objectstyle.petstore.service;
+package org.apache.petstore.service;
-import org.objectstyle.petstore.dao.AccountDao;
-import org.objectstyle.petstore.dao.DaoManager;
-import org.objectstyle.petstore.dao.PersistenceManager;
-import org.objectstyle.petstore.domain.Account;
+import org.apache.petstore.dao.AccountDao;
+import org.apache.petstore.dao.DaoManager;
+import org.apache.petstore.dao.PersistenceManager;
+import org.apache.petstore.domain.Account;
public class AccountService {
Modified: incubator/cayenne/examples/trunk/cayenne-petstore/src/main/java/org/apache/petstore/service/CatalogService.java
URL: http://svn.apache.org/viewvc/incubator/cayenne/examples/trunk/cayenne-petstore/src/main/java/org/apache/petstore/service/CatalogService.java?rev=425284&r1=425031&r2=425284&view=diff
==============================================================================
--- incubator/cayenne/examples/trunk/cayenne-petstore/src/main/java/org/apache/petstore/service/CatalogService.java (original)
+++ incubator/cayenne/examples/trunk/cayenne-petstore/src/main/java/org/apache/petstore/service/CatalogService.java Mon Jul 24 22:18:04 2006
@@ -1,14 +1,14 @@
-package org.objectstyle.petstore.service;
+package org.apache.petstore.service;
import java.util.List;
-import org.objectstyle.petstore.dao.DaoManager;
-import org.objectstyle.petstore.dao.ItemDao;
-import org.objectstyle.petstore.dao.PersistenceManager;
-import org.objectstyle.petstore.dao.ProductDao;
-import org.objectstyle.petstore.domain.Category;
-import org.objectstyle.petstore.domain.Item;
-import org.objectstyle.petstore.domain.Product;
+import org.apache.petstore.dao.DaoManager;
+import org.apache.petstore.dao.ItemDao;
+import org.apache.petstore.dao.PersistenceManager;
+import org.apache.petstore.dao.ProductDao;
+import org.apache.petstore.domain.Category;
+import org.apache.petstore.domain.Item;
+import org.apache.petstore.domain.Product;
import com.ibatis.common.util.PaginatedList;
Modified: incubator/cayenne/examples/trunk/cayenne-petstore/src/main/java/org/apache/petstore/service/OrderService.java
URL: http://svn.apache.org/viewvc/incubator/cayenne/examples/trunk/cayenne-petstore/src/main/java/org/apache/petstore/service/OrderService.java?rev=425284&r1=425031&r2=425284&view=diff
==============================================================================
--- incubator/cayenne/examples/trunk/cayenne-petstore/src/main/java/org/apache/petstore/service/OrderService.java (original)
+++ incubator/cayenne/examples/trunk/cayenne-petstore/src/main/java/org/apache/petstore/service/OrderService.java Mon Jul 24 22:18:04 2006
@@ -1,14 +1,14 @@
-package org.objectstyle.petstore.service;
+package org.apache.petstore.service;
import java.util.Iterator;
-import org.objectstyle.petstore.dao.DaoManager;
-import org.objectstyle.petstore.dao.OrderDao;
-import org.objectstyle.petstore.dao.PersistenceManager;
-import org.objectstyle.petstore.domain.Account;
-import org.objectstyle.petstore.domain.Cart;
-import org.objectstyle.petstore.domain.CartItem;
-import org.objectstyle.petstore.domain.Order;
+import org.apache.petstore.dao.DaoManager;
+import org.apache.petstore.dao.OrderDao;
+import org.apache.petstore.dao.PersistenceManager;
+import org.apache.petstore.domain.Account;
+import org.apache.petstore.domain.Cart;
+import org.apache.petstore.domain.CartItem;
+import org.apache.petstore.domain.Order;
import com.ibatis.common.util.PaginatedList;
Modified: incubator/cayenne/examples/trunk/cayenne-petstore/src/main/webapp/WEB-INF/cayenne.xml
URL: http://svn.apache.org/viewvc/incubator/cayenne/examples/trunk/cayenne-petstore/src/main/webapp/WEB-INF/cayenne.xml?rev=425284&r1=425031&r2=425284&view=diff
==============================================================================
--- incubator/cayenne/examples/trunk/cayenne-petstore/src/main/webapp/WEB-INF/cayenne.xml (original)
+++ incubator/cayenne/examples/trunk/cayenne-petstore/src/main/webapp/WEB-INF/cayenne.xml Mon Jul 24 22:18:04 2006
@@ -5,7 +5,7 @@
<node name="petstore"
datasource="petstore.driver.xml"
- factory="org.objectstyle.cayenne.conf.DriverDataSourceFactory">
+ factory="org.apache.cayenne.conf.DriverDataSourceFactory">
<map-ref name="petstore"/>
</node>
</domain>
Modified: incubator/cayenne/examples/trunk/cayenne-petstore/src/main/webapp/WEB-INF/petstore.map.xml
URL: http://svn.apache.org/viewvc/incubator/cayenne/examples/trunk/cayenne-petstore/src/main/webapp/WEB-INF/petstore.map.xml?rev=425284&r1=425031&r2=425284&view=diff
==============================================================================
--- incubator/cayenne/examples/trunk/cayenne-petstore/src/main/webapp/WEB-INF/petstore.map.xml (original)
+++ incubator/cayenne/examples/trunk/cayenne-petstore/src/main/webapp/WEB-INF/petstore.map.xml Mon Jul 24 22:18:04 2006
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<data-map project-version="1.1">
- <property name="defaultPackage" value="org.objectstyle.petstore.domain"/>
+ <property name="defaultPackage" value="org.apache.petstore.domain"/>
<db-entity name="account">
<db-attribute name="addr1" type="VARCHAR" isMandatory="true" length="80"/>
<db-attribute name="addr2" type="VARCHAR" length="40"/>
@@ -109,7 +109,7 @@
<db-attribute name="suppid" type="INTEGER" isPrimaryKey="true" isMandatory="true" length="4"/>
<db-attribute name="zip" type="VARCHAR" length="5"/>
</db-entity>
- <obj-entity name="Account" className="org.objectstyle.petstore.domain.Account" dbEntityName="account">
+ <obj-entity name="Account" className="org.apache.petstore.domain.Account" dbEntityName="account">
<obj-attribute name="address1" type="java.lang.String" db-attribute-path="addr1"/>
<obj-attribute name="address2" type="java.lang.String" db-attribute-path="addr2"/>
<obj-attribute name="city" type="java.lang.String" db-attribute-path="city"/>
@@ -123,17 +123,17 @@
<obj-attribute name="userName" type="java.lang.String" db-attribute-path="userid"/>
<obj-attribute name="zip" type="java.lang.String" db-attribute-path="zip"/>
</obj-entity>
- <obj-entity name="BannerData" className="org.objectstyle.petstore.domain.BannerData" dbEntityName="bannerdata">
+ <obj-entity name="BannerData" className="org.apache.petstore.domain.BannerData" dbEntityName="bannerdata">
<obj-attribute name="bannerName" type="java.lang.String" db-attribute-path="bannername"/>
</obj-entity>
- <obj-entity name="Category" className="org.objectstyle.petstore.domain.Category" dbEntityName="category">
+ <obj-entity name="Category" className="org.apache.petstore.domain.Category" dbEntityName="category">
<obj-attribute name="description" type="java.lang.String" db-attribute-path="descn"/>
<obj-attribute name="name" type="java.lang.String" db-attribute-path="name"/>
</obj-entity>
- <obj-entity name="Inventory" className="org.objectstyle.petstore.domain.Inventory" dbEntityName="inventory">
+ <obj-entity name="Inventory" className="org.apache.petstore.domain.Inventory" dbEntityName="inventory">
<obj-attribute name="quantity" type="java.lang.Integer" db-attribute-path="qty"/>
</obj-entity>
- <obj-entity name="Item" className="org.objectstyle.petstore.domain.Item" dbEntityName="item">
+ <obj-entity name="Item" className="org.apache.petstore.domain.Item" dbEntityName="item">
<obj-attribute name="attribute1" type="java.lang.String" db-attribute-path="attr1"/>
<obj-attribute name="attribute2" type="java.lang.String" db-attribute-path="attr2"/>
<obj-attribute name="attribute3" type="java.lang.String" db-attribute-path="attr3"/>
@@ -143,11 +143,11 @@
<obj-attribute name="status" type="java.lang.String" db-attribute-path="status"/>
<obj-attribute name="unitCost" type="java.math.BigDecimal" db-attribute-path="unitcost"/>
</obj-entity>
- <obj-entity name="LineItem" className="org.objectstyle.petstore.domain.LineItem" dbEntityName="lineitem">
+ <obj-entity name="LineItem" className="org.apache.petstore.domain.LineItem" dbEntityName="lineitem">
<obj-attribute name="quantity" type="java.lang.Integer" db-attribute-path="quantity"/>
<obj-attribute name="unitPrice" type="java.math.BigDecimal" db-attribute-path="unitprice"/>
</obj-entity>
- <obj-entity name="Order" className="org.objectstyle.petstore.domain.Order" dbEntityName="orders">
+ <obj-entity name="Order" className="org.apache.petstore.domain.Order" dbEntityName="orders">
<obj-attribute name="billAddress1" type="java.lang.String" db-attribute-path="billaddr1"/>
<obj-attribute name="billAddress2" type="java.lang.String" db-attribute-path="billaddr2"/>
<obj-attribute name="billCity" type="java.lang.String" db-attribute-path="billcity"/>
@@ -172,21 +172,21 @@
<obj-attribute name="shipZip" type="java.lang.String" db-attribute-path="shipzip"/>
<obj-attribute name="totalPrice" type="java.math.BigDecimal" db-attribute-path="totalprice"/>
</obj-entity>
- <obj-entity name="OrderStatus" className="org.objectstyle.petstore.domain.OrderStatus" dbEntityName="orderstatus">
+ <obj-entity name="OrderStatus" className="org.apache.petstore.domain.OrderStatus" dbEntityName="orderstatus">
<obj-attribute name="status" type="java.lang.String" db-attribute-path="status"/>
<obj-attribute name="timestamp" type="java.util.Date" db-attribute-path="timestamp"/>
</obj-entity>
- <obj-entity name="Product" className="org.objectstyle.petstore.domain.Product" dbEntityName="product">
+ <obj-entity name="Product" className="org.apache.petstore.domain.Product" dbEntityName="product">
<obj-attribute name="categoryName" type="java.lang.String" db-attribute-path="category"/>
<obj-attribute name="description" type="java.lang.String" db-attribute-path="descn"/>
<obj-attribute name="name" type="java.lang.String" db-attribute-path="name"/>
</obj-entity>
- <obj-entity name="Profile" className="org.objectstyle.petstore.domain.Profile" dbEntityName="profile">
+ <obj-entity name="Profile" className="org.apache.petstore.domain.Profile" dbEntityName="profile">
<obj-attribute name="bannerOption" type="java.lang.Boolean" db-attribute-path="banneropt"/>
<obj-attribute name="languagePreference" type="java.lang.String" db-attribute-path="langpref"/>
<obj-attribute name="listOption" type="java.lang.Boolean" db-attribute-path="mylistopt"/>
</obj-entity>
- <obj-entity name="Supplier" className="org.objectstyle.petstore.domain.Supplier" dbEntityName="supplier">
+ <obj-entity name="Supplier" className="org.apache.petstore.domain.Supplier" dbEntityName="supplier">
<obj-attribute name="address1" type="java.lang.String" db-attribute-path="addr1"/>
<obj-attribute name="address2" type="java.lang.String" db-attribute-path="addr2"/>
<obj-attribute name="city" type="java.lang.String" db-attribute-path="city"/>
@@ -196,7 +196,7 @@
<obj-attribute name="status" type="java.lang.String" db-attribute-path="status"/>
<obj-attribute name="zip" type="java.lang.String" db-attribute-path="zip"/>
</obj-entity>
- <obj-entity name="User" className="org.objectstyle.petstore.domain.User" dbEntityName="signon">
+ <obj-entity name="User" className="org.apache.petstore.domain.User" dbEntityName="signon">
<obj-attribute name="password" type="java.lang.String" db-attribute-path="password"/>
</obj-entity>
<db-relationship name="orders" source="account" target="orders" toMany="true">
@@ -297,21 +297,21 @@
<obj-relationship name="category" source="Profile" target="Category" db-relationship-path="category"/>
<obj-relationship name="items" source="Supplier" target="Item" db-relationship-path="items"/>
<obj-relationship name="account" source="User" target="Account" db-relationship-path="account"/>
- <query name="getAccount" factory="org.objectstyle.cayenne.map.SelectQueryBuilder" root="obj-entity" root-name="Account">
+ <query name="getAccount" factory="org.apache.cayenne.map.SelectQueryBuilder" root="obj-entity" root-name="Account">
<qualifier><![CDATA[(userName = $userName) and (user.password = $password)]]></qualifier>
</query>
- <query name="getCategories" factory="org.objectstyle.cayenne.map.SelectQueryBuilder" root="obj-entity" root-name="Category">
+ <query name="getCategories" factory="org.apache.cayenne.map.SelectQueryBuilder" root="obj-entity" root-name="Category">
<property name="cayenne.GenericSelectQuery.refreshingObjects" value="false"/>
<property name="cayenne.GenericSelectQuery.cachePolicy" value="sharedcache"/>
<ordering><![CDATA[name]]></ordering>
</query>
- <query name="getInventoryQuantity" factory="org.objectstyle.cayenne.map.SQLTemplateBuilder" root="data-map" root-name="petstore">
+ <query name="getInventoryQuantity" factory="org.apache.cayenne.map.SQLTemplateBuilder" root="data-map" root-name="petstore">
<property name="cayenne.GenericSelectQuery.refreshingObjects" value="false"/>
<property name="cayenne.GenericSelectQuery.fetchingDataRows" value="true"/>
<property name="cayenne.GenericSelectQuery.fetchLimit" value="1"/>
<sql><![CDATA[select qty as quantity from inventory where itemid = #bind($itemId)]]></sql>
</query>
- <query name="schemaCheck" factory="org.objectstyle.cayenne.map.SQLTemplateBuilder" root="data-map" root-name="petstore">
+ <query name="schemaCheck" factory="org.apache.cayenne.map.SQLTemplateBuilder" root="data-map" root-name="petstore">
<property name="cayenne.GenericSelectQuery.refreshingObjects" value="false"/>
<property name="cayenne.GenericSelectQuery.fetchingDataRows" value="true"/>
<property name="cayenne.GenericSelectQuery.fetchLimit" value="1"/>
Modified: incubator/cayenne/examples/trunk/cayenne-petstore/src/main/webapp/WEB-INF/struts-config.xml
URL: http://svn.apache.org/viewvc/incubator/cayenne/examples/trunk/cayenne-petstore/src/main/webapp/WEB-INF/struts-config.xml?rev=425284&r1=425031&r2=425284&view=diff
==============================================================================
--- incubator/cayenne/examples/trunk/cayenne-petstore/src/main/webapp/WEB-INF/struts-config.xml (original)
+++ incubator/cayenne/examples/trunk/cayenne-petstore/src/main/webapp/WEB-INF/struts-config.xml Mon Jul 24 22:18:04 2006
@@ -7,10 +7,10 @@
<struts-config>
<form-beans>
- <form-bean name="accountBean" type="org.objectstyle.petstore.presentation.AccountBean"/>
- <form-bean name="catalogBean" type="org.objectstyle.petstore.presentation.CatalogBean"/>
- <form-bean name="cartBean" type="org.objectstyle.petstore.presentation.CartBean"/>
- <form-bean name="orderBean" type="org.objectstyle.petstore.presentation.OrderBean"/>
+ <form-bean name="accountBean" type="org.apache.petstore.presentation.AccountBean"/>
+ <form-bean name="catalogBean" type="org.apache.petstore.presentation.CatalogBean"/>
+ <form-bean name="cartBean" type="org.apache.petstore.presentation.CartBean"/>
+ <form-bean name="orderBean" type="org.apache.petstore.presentation.OrderBean"/>
</form-beans>
<global-exceptions>
Modified: incubator/cayenne/examples/trunk/cayenne-petstore/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/incubator/cayenne/examples/trunk/cayenne-petstore/src/main/webapp/WEB-INF/web.xml?rev=425284&r1=425031&r2=425284&view=diff
==============================================================================
--- incubator/cayenne/examples/trunk/cayenne-petstore/src/main/webapp/WEB-INF/web.xml (original)
+++ incubator/cayenne/examples/trunk/cayenne-petstore/src/main/webapp/WEB-INF/web.xml Mon Jul 24 22:18:04 2006
@@ -34,7 +34,7 @@
<filter>
<filter-name>ConfigFilter</filter-name>
- <filter-class>org.objectstyle.petstore.ConfigFilter</filter-class>
+ <filter-class>org.apache.petstore.ConfigFilter</filter-class>
</filter>
<filter-mapping>
Propchange: incubator/cayenne/examples/trunk/cross-db-example/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Jul 24 22:18:04 2006
@@ -1,2 +1,2 @@
-
+target
bin
Modified: incubator/cayenne/examples/trunk/cross-db-example/.classpath
URL: http://svn.apache.org/viewvc/incubator/cayenne/examples/trunk/cross-db-example/.classpath?rev=425284&r1=425283&r2=425284&view=diff
==============================================================================
--- incubator/cayenne/examples/trunk/cross-db-example/.classpath (original)
+++ incubator/cayenne/examples/trunk/cross-db-example/.classpath Mon Jul 24 22:18:04 2006
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="src" path="src"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="lib" path="lib/hsqldb-1.8.0.2.jar"/>
- <classpathentry kind="lib" path="lib/cayenne-1.2RC2.jar"/>
+ <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
+ <classpathentry kind="src" path="src/main/java"/>
+ <classpathentry kind="src" path="src/main/resources"/>
<classpathentry kind="output" path="bin"/>
</classpath>
Modified: incubator/cayenne/examples/trunk/cross-db-example/.project
URL: http://svn.apache.org/viewvc/incubator/cayenne/examples/trunk/cross-db-example/.project?rev=425284&r1=425283&r2=425284&view=diff
==============================================================================
--- incubator/cayenne/examples/trunk/cross-db-example/.project (original)
+++ incubator/cayenne/examples/trunk/cross-db-example/.project Mon Jul 24 22:18:04 2006
@@ -10,8 +10,14 @@
<arguments>
</arguments>
</buildCommand>
+ <buildCommand>
+ <name>org.maven.ide.eclipse.maven2Builder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.jdt.core.javanature</nature>
+ <nature>org.maven.ide.eclipse.maven2Nature</nature>
</natures>
</projectDescription>
Added: incubator/cayenne/examples/trunk/cross-db-example/pom.xml
URL: http://svn.apache.org/viewvc/incubator/cayenne/examples/trunk/cross-db-example/pom.xml?rev=425284&view=auto
==============================================================================
--- incubator/cayenne/examples/trunk/cross-db-example/pom.xml (added)
+++ incubator/cayenne/examples/trunk/cross-db-example/pom.xml Mon Jul 24 22:18:04 2006
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?><project>
+ <parent>
+ <artifactId>examples-parent</artifactId>
+ <groupId>org.apache.cayenne.examples</groupId>
+ <version>3.0-SNAPSHOT</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>cross-db</artifactId>
+ <name>Cayenne Cross Database Relationship Example</name>
+ <description>An example of the cross db stuff</description>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-jar-plugin</artifactId>
+ <configuration>
+ <archive>
+ <manifest>
+ <mainClass>test.Main</mainClass>
+ </manifest>
+ </archive>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ <dependencies>
+ <dependency>
+ <groupId>hsqldb</groupId>
+ <artifactId>hsqldb</artifactId>
+ <version>1.8.0.1</version>
+ </dependency>
+ </dependencies>
+</project>
\ No newline at end of file
Modified: incubator/cayenne/examples/trunk/cross-db-example/src/main/java/test/Main.java
URL: http://svn.apache.org/viewvc/incubator/cayenne/examples/trunk/cross-db-example/src/main/java/test/Main.java?rev=425284&r1=425031&r2=425284&view=diff
==============================================================================
--- incubator/cayenne/examples/trunk/cross-db-example/src/main/java/test/Main.java (original)
+++ incubator/cayenne/examples/trunk/cross-db-example/src/main/java/test/Main.java Mon Jul 24 22:18:04 2006
@@ -2,13 +2,13 @@
import java.util.Iterator;
-import org.objectstyle.cayenne.access.DataContext;
-import org.objectstyle.cayenne.access.DataNode;
-import org.objectstyle.cayenne.access.DbGenerator;
-import org.objectstyle.cayenne.exp.Expression;
-import org.objectstyle.cayenne.exp.ExpressionFactory;
-import org.objectstyle.cayenne.map.DataMap;
-import org.objectstyle.cayenne.query.SelectQuery;
+import org.apache.cayenne.access.DataContext;
+import org.apache.cayenne.access.DataNode;
+import org.apache.cayenne.access.DbGenerator;
+import org.apache.cayenne.exp.Expression;
+import org.apache.cayenne.exp.ExpressionFactory;
+import org.apache.cayenne.map.DataMap;
+import org.apache.cayenne.query.SelectQuery;
import test.db1.Department;
import test.db2.Person;
Modified: incubator/cayenne/examples/trunk/cross-db-example/src/main/java/test/db1/auto/_Department.java
URL: http://svn.apache.org/viewvc/incubator/cayenne/examples/trunk/cross-db-example/src/main/java/test/db1/auto/_Department.java?rev=425284&r1=425031&r2=425284&view=diff
==============================================================================
--- incubator/cayenne/examples/trunk/cross-db-example/src/main/java/test/db1/auto/_Department.java (original)
+++ incubator/cayenne/examples/trunk/cross-db-example/src/main/java/test/db1/auto/_Department.java Mon Jul 24 22:18:04 2006
@@ -7,7 +7,7 @@
* since it may be overwritten next time code is regenerated.
* If you need to make any customizations, please use subclass.
*/
-public class _Department extends org.objectstyle.cayenne.CayenneDataObject {
+public class _Department extends org.apache.cayenne.CayenneDataObject {
public static final String NAME_PROPERTY = "name";
public static final String PEOPLE_PROPERTY = "people";
Modified: incubator/cayenne/examples/trunk/cross-db-example/src/main/java/test/db2/auto/_Person.java
URL: http://svn.apache.org/viewvc/incubator/cayenne/examples/trunk/cross-db-example/src/main/java/test/db2/auto/_Person.java?rev=425284&r1=425031&r2=425284&view=diff
==============================================================================
--- incubator/cayenne/examples/trunk/cross-db-example/src/main/java/test/db2/auto/_Person.java (original)
+++ incubator/cayenne/examples/trunk/cross-db-example/src/main/java/test/db2/auto/_Person.java Mon Jul 24 22:18:04 2006
@@ -5,7 +5,7 @@
* since it may be overwritten next time code is regenerated.
* If you need to make any customizations, please use subclass.
*/
-public class _Person extends org.objectstyle.cayenne.CayenneDataObject {
+public class _Person extends org.apache.cayenne.CayenneDataObject {
public static final String FULL_NAME_PROPERTY = "fullName";
public static final String DEPARTMENT_PROPERTY = "department";
Copied: incubator/cayenne/examples/trunk/cross-db-example/src/main/resources/cayenne.xml (from r425031, incubator/cayenne/examples/trunk/cross-db-example/src/cayenne.xml)
URL: http://svn.apache.org/viewvc/incubator/cayenne/examples/trunk/cross-db-example/src/main/resources/cayenne.xml?p2=incubator/cayenne/examples/trunk/cross-db-example/src/main/resources/cayenne.xml&p1=incubator/cayenne/examples/trunk/cross-db-example/src/cayenne.xml&r1=425031&r2=425284&rev=425284&view=diff
==============================================================================
--- incubator/cayenne/examples/trunk/cross-db-example/src/cayenne.xml (original)
+++ incubator/cayenne/examples/trunk/cross-db-example/src/main/resources/cayenne.xml Mon Jul 24 22:18:04 2006
@@ -6,12 +6,12 @@
<node name="db1"
datasource="db1.driver.xml"
- factory="org.objectstyle.cayenne.conf.DriverDataSourceFactory">
+ factory="org.apache.cayenne.conf.DriverDataSourceFactory">
<map-ref name="map1"/>
</node>
<node name="db2"
datasource="db2.driver.xml"
- factory="org.objectstyle.cayenne.conf.DriverDataSourceFactory">
+ factory="org.apache.cayenne.conf.DriverDataSourceFactory">
<map-ref name="map2"/>
</node>
</domain>
Propchange: incubator/cayenne/examples/trunk/generic-mapping-example/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Jul 24 22:18:04 2006
@@ -1,2 +1,2 @@
-
+target
build
Modified: incubator/cayenne/examples/trunk/generic-mapping-example/.classpath
URL: http://svn.apache.org/viewvc/incubator/cayenne/examples/trunk/generic-mapping-example/.classpath?rev=425284&r1=425283&r2=425284&view=diff
==============================================================================
--- incubator/cayenne/examples/trunk/generic-mapping-example/.classpath (original)
+++ incubator/cayenne/examples/trunk/generic-mapping-example/.classpath Mon Jul 24 22:18:04 2006
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="src" path="src"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="lib" path="lib/hsqldb-1.8.0.2.jar"/>
- <classpathentry kind="lib" path="lib/cayenne-1.2RC2.jar"/>
+ <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
+ <classpathentry kind="src" path="src/main/java"/>
+ <classpathentry kind="src" path="src/main/resources"/>
<classpathentry kind="output" path="build"/>
</classpath>
Modified: incubator/cayenne/examples/trunk/generic-mapping-example/.project
URL: http://svn.apache.org/viewvc/incubator/cayenne/examples/trunk/generic-mapping-example/.project?rev=425284&r1=425283&r2=425284&view=diff
==============================================================================
--- incubator/cayenne/examples/trunk/generic-mapping-example/.project (original)
+++ incubator/cayenne/examples/trunk/generic-mapping-example/.project Mon Jul 24 22:18:04 2006
@@ -10,8 +10,14 @@
<arguments>
</arguments>
</buildCommand>
+ <buildCommand>
+ <name>org.maven.ide.eclipse.maven2Builder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.jdt.core.javanature</nature>
+ <nature>org.maven.ide.eclipse.maven2Nature</nature>
</natures>
</projectDescription>
Added: incubator/cayenne/examples/trunk/generic-mapping-example/pom.xml
URL: http://svn.apache.org/viewvc/incubator/cayenne/examples/trunk/generic-mapping-example/pom.xml?rev=425284&view=auto
==============================================================================
--- incubator/cayenne/examples/trunk/generic-mapping-example/pom.xml (added)
+++ incubator/cayenne/examples/trunk/generic-mapping-example/pom.xml Mon Jul 24 22:18:04 2006
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?><project>
+ <parent>
+ <artifactId>examples-parent</artifactId>
+ <groupId>org.apache.cayenne.examples</groupId>
+ <version>3.0-SNAPSHOT</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>generic-mapping</artifactId>
+ <name>Cayenne Generic Mapping Example</name>
+ <description>An example of the generic mapping stuff</description>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-jar-plugin</artifactId>
+ <configuration>
+ <archive>
+ <manifest>
+ <mainClass>cayenne.example.generic.Main</mainClass>
+ </manifest>
+ </archive>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ <dependencies>
+ <dependency>
+ <groupId>hsqldb</groupId>
+ <artifactId>hsqldb</artifactId>
+ <version>1.8.0.1</version>
+ </dependency>
+ </dependencies>
+</project>
Modified: incubator/cayenne/examples/trunk/generic-mapping-example/src/main/java/cayenne/example/generic/Main.java
URL: http://svn.apache.org/viewvc/incubator/cayenne/examples/trunk/generic-mapping-example/src/main/java/cayenne/example/generic/Main.java?rev=425284&r1=425031&r2=425284&view=diff
==============================================================================
--- incubator/cayenne/examples/trunk/generic-mapping-example/src/main/java/cayenne/example/generic/Main.java (original)
+++ incubator/cayenne/examples/trunk/generic-mapping-example/src/main/java/cayenne/example/generic/Main.java Mon Jul 24 22:18:04 2006
@@ -4,19 +4,19 @@
import java.util.Iterator;
import java.util.List;
-import org.objectstyle.cayenne.CayenneRuntimeException;
-import org.objectstyle.cayenne.DataObject;
-import org.objectstyle.cayenne.access.DataContext;
-import org.objectstyle.cayenne.access.DataNode;
-import org.objectstyle.cayenne.access.DbGenerator;
-import org.objectstyle.cayenne.exp.Expression;
-import org.objectstyle.cayenne.exp.ExpressionFactory;
-import org.objectstyle.cayenne.map.DataMap;
-import org.objectstyle.cayenne.map.DbAttribute;
-import org.objectstyle.cayenne.map.DbEntity;
-import org.objectstyle.cayenne.map.ObjAttribute;
-import org.objectstyle.cayenne.map.ObjEntity;
-import org.objectstyle.cayenne.query.SelectQuery;
+import org.apache.cayenne.CayenneRuntimeException;
+import org.apache.cayenne.DataObject;
+import org.apache.cayenne.access.DataContext;
+import org.apache.cayenne.access.DataNode;
+import org.apache.cayenne.access.DbGenerator;
+import org.apache.cayenne.exp.Expression;
+import org.apache.cayenne.exp.ExpressionFactory;
+import org.apache.cayenne.map.DataMap;
+import org.apache.cayenne.map.DbAttribute;
+import org.apache.cayenne.map.DbEntity;
+import org.apache.cayenne.map.ObjAttribute;
+import org.apache.cayenne.map.ObjEntity;
+import org.apache.cayenne.query.SelectQuery;
/**
* An example launcher. Uses in-memory HSQLDB for all database operations.
Copied: incubator/cayenne/examples/trunk/generic-mapping-example/src/main/resources/cayenne.xml (from r425031, incubator/cayenne/examples/trunk/generic-mapping-example/src/cayenne.xml)
URL: http://svn.apache.org/viewvc/incubator/cayenne/examples/trunk/generic-mapping-example/src/main/resources/cayenne.xml?p2=incubator/cayenne/examples/trunk/generic-mapping-example/src/main/resources/cayenne.xml&p1=incubator/cayenne/examples/trunk/generic-mapping-example/src/cayenne.xml&r1=425031&r2=425284&rev=425284&view=diff
==============================================================================
--- incubator/cayenne/examples/trunk/generic-mapping-example/src/cayenne.xml (original)
+++ incubator/cayenne/examples/trunk/generic-mapping-example/src/main/resources/cayenne.xml Mon Jul 24 22:18:04 2006
@@ -5,7 +5,7 @@
<node name="in-memory-node"
datasource="in-memory-node.driver.xml"
- factory="org.objectstyle.cayenne.conf.DriverDataSourceFactory">
+ factory="org.apache.cayenne.conf.DriverDataSourceFactory">
<map-ref name="generic-example-map"/>
</node>
</domain>
Added: incubator/cayenne/examples/trunk/pom.xml
URL: http://svn.apache.org/viewvc/incubator/cayenne/examples/trunk/pom.xml?rev=425284&view=auto
==============================================================================
--- incubator/cayenne/examples/trunk/pom.xml (added)
+++ incubator/cayenne/examples/trunk/pom.xml Mon Jul 24 22:18:04 2006
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright 2006 The Apache Software Foundation
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<!-- $Rev$ $Date$ -->
+
+<project
+ xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.cayenne</groupId>
+ <artifactId>cayenne-parent</artifactId>
+ <version>3.0-SNAPSHOT</version>
+ </parent>
+
+ <groupId>org.apache.cayenne.examples</groupId>
+ <artifactId>examples-parent</artifactId>
+ <name>Cayenne Examples</name>
+ <packaging>pom</packaging>
+
+ <modules>
+ <module>3t-example</module>
+ <module>3t-example-client</module>
+ <module>cayenne-jpa-annotations-example</module>
+ <module>cayenne-petstore</module>
+ <module>cross-db-example</module>
+ <module>generic-mapping-example</module>
+ </modules>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.cayenne</groupId>
+ <artifactId>cayenne</artifactId>
+ <version>3.0-incubating-SNAPSHOT</version>
+ </dependency>
+ </dependencies>
+
+</project>