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 [1/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/...

Author: bdudney
Date: Mon Jul 24 22:18:04 2006
New Revision: 425284

URL: http://svn.apache.org/viewvc?rev=425284&view=rev
Log:
mavenized examples

Added:
    incubator/cayenne/examples/trunk/3t-example-client/pom.xml
    incubator/cayenne/examples/trunk/3t-example-client/src/main/
    incubator/cayenne/examples/trunk/3t-example-client/src/main/java/
    incubator/cayenne/examples/trunk/3t-example-client/src/main/java/cayenne3t/
      - copied from r425031, incubator/cayenne/examples/trunk/3t-example-client/src/cayenne3t/
    incubator/cayenne/examples/trunk/3t-example/pom.xml
    incubator/cayenne/examples/trunk/3t-example/src/
    incubator/cayenne/examples/trunk/3t-example/src/main/
    incubator/cayenne/examples/trunk/3t-example/src/main/java/
    incubator/cayenne/examples/trunk/3t-example/src/main/java/cayenne3t/
      - copied from r425019, incubator/cayenne/examples/trunk/3t-example/webroot/WEB-INF/src/cayenne3t/
    incubator/cayenne/examples/trunk/3t-example/src/main/java/cayenne3t/example/
      - copied from r425031, incubator/cayenne/examples/trunk/3t-example/webroot/WEB-INF/src/cayenne3t/example/
    incubator/cayenne/examples/trunk/3t-example/src/main/resources/
    incubator/cayenne/examples/trunk/3t-example/src/main/resources/cayenne.xml
      - copied unchanged from r425019, incubator/cayenne/examples/trunk/3t-example/webroot/WEB-INF/src/cayenne.xml
    incubator/cayenne/examples/trunk/3t-example/src/main/resources/hr-db.driver.xml
      - copied unchanged from r425019, incubator/cayenne/examples/trunk/3t-example/webroot/WEB-INF/src/hr-db.driver.xml
    incubator/cayenne/examples/trunk/3t-example/src/main/resources/hr.map.xml
      - copied unchanged from r425019, incubator/cayenne/examples/trunk/3t-example/webroot/WEB-INF/src/hr.map.xml
    incubator/cayenne/examples/trunk/3t-example/src/main/webapp/
    incubator/cayenne/examples/trunk/3t-example/src/main/webapp/WEB-INF/
    incubator/cayenne/examples/trunk/3t-example/src/main/webapp/WEB-INF/lib/
      - copied from r425019, incubator/cayenne/examples/trunk/3t-example/webroot/WEB-INF/lib/
    incubator/cayenne/examples/trunk/3t-example/src/main/webapp/WEB-INF/lib/postgresql-8.0-310.jdbc3.jar
      - copied unchanged from r425031, incubator/cayenne/examples/trunk/3t-example/webroot/WEB-INF/lib/postgresql-8.0-310.jdbc3.jar
    incubator/cayenne/examples/trunk/3t-example/src/main/webapp/WEB-INF/log4j.properties
      - copied unchanged from r425019, incubator/cayenne/examples/trunk/3t-example/webroot/WEB-INF/log4j.properties
    incubator/cayenne/examples/trunk/3t-example/src/main/webapp/WEB-INF/web.xml
      - copied unchanged from r425019, incubator/cayenne/examples/trunk/3t-example/webroot/WEB-INF/web.xml
    incubator/cayenne/examples/trunk/3t-example/src/main/webapp/index.html
      - copied unchanged from r425019, incubator/cayenne/examples/trunk/3t-example/webroot/index.html
    incubator/cayenne/examples/trunk/cayenne-petstore/pom.xml
    incubator/cayenne/examples/trunk/cayenne-petstore/src/main/
    incubator/cayenne/examples/trunk/cayenne-petstore/src/main/java/
    incubator/cayenne/examples/trunk/cayenne-petstore/src/main/java/org/
    incubator/cayenne/examples/trunk/cayenne-petstore/src/main/java/org/apache/
      - copied from r425031, incubator/cayenne/examples/trunk/cayenne-petstore/src/org/objectstyle/
    incubator/cayenne/examples/trunk/cayenne-petstore/src/main/resources/
    incubator/cayenne/examples/trunk/cayenne-petstore/src/main/resources/derby.properties
      - copied unchanged from r425031, incubator/cayenne/examples/trunk/cayenne-petstore/src/properties/derby.properties
    incubator/cayenne/examples/trunk/cayenne-petstore/src/main/resources/messages.properties
      - copied unchanged from r425031, incubator/cayenne/examples/trunk/cayenne-petstore/src/properties/messages.properties
    incubator/cayenne/examples/trunk/cayenne-petstore/src/main/webapp/
    incubator/cayenne/examples/trunk/cayenne-petstore/src/main/webapp/WEB-INF/
      - copied from r425031, incubator/cayenne/examples/trunk/cayenne-petstore/web/WEB-INF/
    incubator/cayenne/examples/trunk/cayenne-petstore/src/main/webapp/account/
      - copied from r425031, incubator/cayenne/examples/trunk/cayenne-petstore/web/account/
    incubator/cayenne/examples/trunk/cayenne-petstore/src/main/webapp/cart/
      - copied from r425031, incubator/cayenne/examples/trunk/cayenne-petstore/web/cart/
    incubator/cayenne/examples/trunk/cayenne-petstore/src/main/webapp/catalog/
      - copied from r425031, incubator/cayenne/examples/trunk/cayenne-petstore/web/catalog/
    incubator/cayenne/examples/trunk/cayenne-petstore/src/main/webapp/common/
      - copied from r425031, incubator/cayenne/examples/trunk/cayenne-petstore/web/common/
    incubator/cayenne/examples/trunk/cayenne-petstore/src/main/webapp/css/
      - copied from r425031, incubator/cayenne/examples/trunk/cayenne-petstore/web/css/
    incubator/cayenne/examples/trunk/cayenne-petstore/src/main/webapp/help.html
      - copied unchanged from r425031, incubator/cayenne/examples/trunk/cayenne-petstore/web/help.html
    incubator/cayenne/examples/trunk/cayenne-petstore/src/main/webapp/images/
      - copied from r425031, incubator/cayenne/examples/trunk/cayenne-petstore/web/images/
    incubator/cayenne/examples/trunk/cayenne-petstore/src/main/webapp/index.html
      - copied unchanged from r425031, incubator/cayenne/examples/trunk/cayenne-petstore/web/index.html
    incubator/cayenne/examples/trunk/cayenne-petstore/src/main/webapp/order/
      - copied from r425031, incubator/cayenne/examples/trunk/cayenne-petstore/web/order/
    incubator/cayenne/examples/trunk/cross-db-example/pom.xml
    incubator/cayenne/examples/trunk/cross-db-example/src/main/
    incubator/cayenne/examples/trunk/cross-db-example/src/main/java/
    incubator/cayenne/examples/trunk/cross-db-example/src/main/java/test/
      - copied from r425031, incubator/cayenne/examples/trunk/cross-db-example/src/test/
    incubator/cayenne/examples/trunk/cross-db-example/src/main/resources/
    incubator/cayenne/examples/trunk/cross-db-example/src/main/resources/cayenne.xml
      - copied, changed from r425031, incubator/cayenne/examples/trunk/cross-db-example/src/cayenne.xml
    incubator/cayenne/examples/trunk/cross-db-example/src/main/resources/db1.driver.xml
      - copied unchanged from r425031, incubator/cayenne/examples/trunk/cross-db-example/src/db1.driver.xml
    incubator/cayenne/examples/trunk/cross-db-example/src/main/resources/db2.driver.xml
      - copied unchanged from r425031, incubator/cayenne/examples/trunk/cross-db-example/src/db2.driver.xml
    incubator/cayenne/examples/trunk/cross-db-example/src/main/resources/map1.map.xml
      - copied unchanged from r425031, incubator/cayenne/examples/trunk/cross-db-example/src/map1.map.xml
    incubator/cayenne/examples/trunk/cross-db-example/src/main/resources/map2.map.xml
      - copied unchanged from r425031, incubator/cayenne/examples/trunk/cross-db-example/src/map2.map.xml
    incubator/cayenne/examples/trunk/generic-mapping-example/pom.xml
    incubator/cayenne/examples/trunk/generic-mapping-example/src/main/
    incubator/cayenne/examples/trunk/generic-mapping-example/src/main/java/
    incubator/cayenne/examples/trunk/generic-mapping-example/src/main/java/cayenne/
      - copied from r425031, incubator/cayenne/examples/trunk/generic-mapping-example/src/cayenne/
    incubator/cayenne/examples/trunk/generic-mapping-example/src/main/resources/
    incubator/cayenne/examples/trunk/generic-mapping-example/src/main/resources/cayenne.xml
      - copied, changed from r425031, incubator/cayenne/examples/trunk/generic-mapping-example/src/cayenne.xml
    incubator/cayenne/examples/trunk/generic-mapping-example/src/main/resources/generic-example-map.map.xml
      - copied unchanged from r425031, incubator/cayenne/examples/trunk/generic-mapping-example/src/generic-example-map.map.xml
    incubator/cayenne/examples/trunk/generic-mapping-example/src/main/resources/in-memory-node.driver.xml
      - copied unchanged from r425031, incubator/cayenne/examples/trunk/generic-mapping-example/src/in-memory-node.driver.xml
    incubator/cayenne/examples/trunk/pom.xml
Removed:
    incubator/cayenne/examples/trunk/3t-example-client/src/cayenne3t/
    incubator/cayenne/examples/trunk/3t-example/build.xml
    incubator/cayenne/examples/trunk/3t-example/webroot/WEB-INF/lib/
    incubator/cayenne/examples/trunk/3t-example/webroot/WEB-INF/log4j.properties
    incubator/cayenne/examples/trunk/3t-example/webroot/WEB-INF/src/cayenne.xml
    incubator/cayenne/examples/trunk/3t-example/webroot/WEB-INF/src/cayenne3t/
    incubator/cayenne/examples/trunk/3t-example/webroot/WEB-INF/src/hr-db.driver.xml
    incubator/cayenne/examples/trunk/3t-example/webroot/WEB-INF/src/hr.map.xml
    incubator/cayenne/examples/trunk/3t-example/webroot/WEB-INF/web.xml
    incubator/cayenne/examples/trunk/3t-example/webroot/index.html
    incubator/cayenne/examples/trunk/cayenne-petstore/build.xml
    incubator/cayenne/examples/trunk/cayenne-petstore/devlib/
    incubator/cayenne/examples/trunk/cayenne-petstore/lib/
    incubator/cayenne/examples/trunk/cayenne-petstore/src/org/objectstyle/
    incubator/cayenne/examples/trunk/cayenne-petstore/src/properties/derby.properties
    incubator/cayenne/examples/trunk/cayenne-petstore/src/properties/messages.properties
    incubator/cayenne/examples/trunk/cayenne-petstore/web/WEB-INF/
    incubator/cayenne/examples/trunk/cayenne-petstore/web/account/
    incubator/cayenne/examples/trunk/cayenne-petstore/web/cart/
    incubator/cayenne/examples/trunk/cayenne-petstore/web/catalog/
    incubator/cayenne/examples/trunk/cayenne-petstore/web/common/
    incubator/cayenne/examples/trunk/cayenne-petstore/web/css/
    incubator/cayenne/examples/trunk/cayenne-petstore/web/help.html
    incubator/cayenne/examples/trunk/cayenne-petstore/web/images/
    incubator/cayenne/examples/trunk/cayenne-petstore/web/index.html
    incubator/cayenne/examples/trunk/cayenne-petstore/web/order/
    incubator/cayenne/examples/trunk/cross-db-example/src/cayenne.xml
    incubator/cayenne/examples/trunk/cross-db-example/src/db1.driver.xml
    incubator/cayenne/examples/trunk/cross-db-example/src/db2.driver.xml
    incubator/cayenne/examples/trunk/cross-db-example/src/map1.map.xml
    incubator/cayenne/examples/trunk/cross-db-example/src/map2.map.xml
    incubator/cayenne/examples/trunk/cross-db-example/src/test/
    incubator/cayenne/examples/trunk/generic-mapping-example/lib/
    incubator/cayenne/examples/trunk/generic-mapping-example/src/cayenne/
    incubator/cayenne/examples/trunk/generic-mapping-example/src/cayenne.xml
    incubator/cayenne/examples/trunk/generic-mapping-example/src/generic-example-map.map.xml
    incubator/cayenne/examples/trunk/generic-mapping-example/src/in-memory-node.driver.xml
Modified:
    incubator/cayenne/examples/trunk/3t-example/   (props changed)
    incubator/cayenne/examples/trunk/3t-example-client/   (props changed)
    incubator/cayenne/examples/trunk/3t-example-client/.classpath
    incubator/cayenne/examples/trunk/3t-example-client/src/main/java/cayenne3t/example/client/EventTrace.java
    incubator/cayenne/examples/trunk/3t-example-client/src/main/java/cayenne3t/example/client/GraphChangeTrace.java
    incubator/cayenne/examples/trunk/3t-example-client/src/main/java/cayenne3t/example/client/Main.java
    incubator/cayenne/examples/trunk/3t-example-client/src/main/java/cayenne3t/example/hr/CustomClientObject.java
    incubator/cayenne/examples/trunk/3t-example-client/src/main/java/cayenne3t/example/hr/auto/_CDepartment.java
    incubator/cayenne/examples/trunk/3t-example-client/src/main/java/cayenne3t/example/hr/auto/_CPerson.java
    incubator/cayenne/examples/trunk/3t-example-client/src/main/java/cayenne3t/example/hr/auto/_CProject.java
    incubator/cayenne/examples/trunk/3t-example/.classpath
    incubator/cayenne/examples/trunk/3t-example/.project
    incubator/cayenne/examples/trunk/3t-example/src/main/java/cayenne3t/example/hr/auto/_Department.java
    incubator/cayenne/examples/trunk/3t-example/src/main/java/cayenne3t/example/hr/auto/_Person.java
    incubator/cayenne/examples/trunk/3t-example/src/main/java/cayenne3t/example/hr/auto/_Project.java
    incubator/cayenne/examples/trunk/cayenne-jpa-annotations-example/pom.xml
    incubator/cayenne/examples/trunk/cayenne-petstore/   (props changed)
    incubator/cayenne/examples/trunk/cayenne-petstore/.classpath
    incubator/cayenne/examples/trunk/cayenne-petstore/.project
    incubator/cayenne/examples/trunk/cayenne-petstore/src/main/java/org/apache/petstore/ConfigFilter.java
    incubator/cayenne/examples/trunk/cayenne-petstore/src/main/java/org/apache/petstore/DBSetupHelper.java
    incubator/cayenne/examples/trunk/cayenne-petstore/src/main/java/org/apache/petstore/dao/AccountDao.java
    incubator/cayenne/examples/trunk/cayenne-petstore/src/main/java/org/apache/petstore/dao/DaoManager.java
    incubator/cayenne/examples/trunk/cayenne-petstore/src/main/java/org/apache/petstore/dao/ItemDao.java
    incubator/cayenne/examples/trunk/cayenne-petstore/src/main/java/org/apache/petstore/dao/OrderDao.java
    incubator/cayenne/examples/trunk/cayenne-petstore/src/main/java/org/apache/petstore/dao/PersistenceManager.java
    incubator/cayenne/examples/trunk/cayenne-petstore/src/main/java/org/apache/petstore/dao/ProductDao.java
    incubator/cayenne/examples/trunk/cayenne-petstore/src/main/java/org/apache/petstore/dao/impl/AccountCayenneDao.java
    incubator/cayenne/examples/trunk/cayenne-petstore/src/main/java/org/apache/petstore/dao/impl/CayenneDao.java
    incubator/cayenne/examples/trunk/cayenne-petstore/src/main/java/org/apache/petstore/dao/impl/CayennePersistenceManager.java
    incubator/cayenne/examples/trunk/cayenne-petstore/src/main/java/org/apache/petstore/dao/impl/ItemCayenneDao.java
    incubator/cayenne/examples/trunk/cayenne-petstore/src/main/java/org/apache/petstore/dao/impl/OrderCayenneDao.java
    incubator/cayenne/examples/trunk/cayenne-petstore/src/main/java/org/apache/petstore/dao/impl/ProductCayenneDao.java
    incubator/cayenne/examples/trunk/cayenne-petstore/src/main/java/org/apache/petstore/domain/Account.java
    incubator/cayenne/examples/trunk/cayenne-petstore/src/main/java/org/apache/petstore/domain/BannerData.java
    incubator/cayenne/examples/trunk/cayenne-petstore/src/main/java/org/apache/petstore/domain/Cart.java
    incubator/cayenne/examples/trunk/cayenne-petstore/src/main/java/org/apache/petstore/domain/CartItem.java
    incubator/cayenne/examples/trunk/cayenne-petstore/src/main/java/org/apache/petstore/domain/Category.java
    incubator/cayenne/examples/trunk/cayenne-petstore/src/main/java/org/apache/petstore/domain/Inventory.java
    incubator/cayenne/examples/trunk/cayenne-petstore/src/main/java/org/apache/petstore/domain/Item.java
    incubator/cayenne/examples/trunk/cayenne-petstore/src/main/java/org/apache/petstore/domain/LineItem.java
    incubator/cayenne/examples/trunk/cayenne-petstore/src/main/java/org/apache/petstore/domain/Order.java
    incubator/cayenne/examples/trunk/cayenne-petstore/src/main/java/org/apache/petstore/domain/OrderStatus.java
    incubator/cayenne/examples/trunk/cayenne-petstore/src/main/java/org/apache/petstore/domain/Product.java
    incubator/cayenne/examples/trunk/cayenne-petstore/src/main/java/org/apache/petstore/domain/Profile.java
    incubator/cayenne/examples/trunk/cayenne-petstore/src/main/java/org/apache/petstore/domain/Supplier.java
    incubator/cayenne/examples/trunk/cayenne-petstore/src/main/java/org/apache/petstore/domain/User.java
    incubator/cayenne/examples/trunk/cayenne-petstore/src/main/java/org/apache/petstore/domain/auto/_Account.java
    incubator/cayenne/examples/trunk/cayenne-petstore/src/main/java/org/apache/petstore/domain/auto/_BannerData.java
    incubator/cayenne/examples/trunk/cayenne-petstore/src/main/java/org/apache/petstore/domain/auto/_Category.java
    incubator/cayenne/examples/trunk/cayenne-petstore/src/main/java/org/apache/petstore/domain/auto/_Inventory.java
    incubator/cayenne/examples/trunk/cayenne-petstore/src/main/java/org/apache/petstore/domain/auto/_Item.java
    incubator/cayenne/examples/trunk/cayenne-petstore/src/main/java/org/apache/petstore/domain/auto/_LineItem.java
    incubator/cayenne/examples/trunk/cayenne-petstore/src/main/java/org/apache/petstore/domain/auto/_Order.java
    incubator/cayenne/examples/trunk/cayenne-petstore/src/main/java/org/apache/petstore/domain/auto/_OrderStatus.java
    incubator/cayenne/examples/trunk/cayenne-petstore/src/main/java/org/apache/petstore/domain/auto/_Product.java
    incubator/cayenne/examples/trunk/cayenne-petstore/src/main/java/org/apache/petstore/domain/auto/_Profile.java
    incubator/cayenne/examples/trunk/cayenne-petstore/src/main/java/org/apache/petstore/domain/auto/_Supplier.java
    incubator/cayenne/examples/trunk/cayenne-petstore/src/main/java/org/apache/petstore/domain/auto/_User.java
    incubator/cayenne/examples/trunk/cayenne-petstore/src/main/java/org/apache/petstore/presentation/AbstractBean.java
    incubator/cayenne/examples/trunk/cayenne-petstore/src/main/java/org/apache/petstore/presentation/AccountBean.java
    incubator/cayenne/examples/trunk/cayenne-petstore/src/main/java/org/apache/petstore/presentation/CartBean.java
    incubator/cayenne/examples/trunk/cayenne-petstore/src/main/java/org/apache/petstore/presentation/CatalogBean.java
    incubator/cayenne/examples/trunk/cayenne-petstore/src/main/java/org/apache/petstore/presentation/OrderBean.java
    incubator/cayenne/examples/trunk/cayenne-petstore/src/main/java/org/apache/petstore/service/AccountService.java
    incubator/cayenne/examples/trunk/cayenne-petstore/src/main/java/org/apache/petstore/service/CatalogService.java
    incubator/cayenne/examples/trunk/cayenne-petstore/src/main/java/org/apache/petstore/service/OrderService.java
    incubator/cayenne/examples/trunk/cayenne-petstore/src/main/webapp/WEB-INF/cayenne.xml
    incubator/cayenne/examples/trunk/cayenne-petstore/src/main/webapp/WEB-INF/petstore.map.xml
    incubator/cayenne/examples/trunk/cayenne-petstore/src/main/webapp/WEB-INF/struts-config.xml
    incubator/cayenne/examples/trunk/cayenne-petstore/src/main/webapp/WEB-INF/web.xml
    incubator/cayenne/examples/trunk/cross-db-example/   (props changed)
    incubator/cayenne/examples/trunk/cross-db-example/.classpath
    incubator/cayenne/examples/trunk/cross-db-example/.project
    incubator/cayenne/examples/trunk/cross-db-example/src/main/java/test/Main.java
    incubator/cayenne/examples/trunk/cross-db-example/src/main/java/test/db1/auto/_Department.java
    incubator/cayenne/examples/trunk/cross-db-example/src/main/java/test/db2/auto/_Person.java
    incubator/cayenne/examples/trunk/generic-mapping-example/   (props changed)
    incubator/cayenne/examples/trunk/generic-mapping-example/.classpath
    incubator/cayenne/examples/trunk/generic-mapping-example/.project
    incubator/cayenne/examples/trunk/generic-mapping-example/src/main/java/cayenne/example/generic/Main.java

Propchange: incubator/cayenne/examples/trunk/3t-example/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Mon Jul 24 22:18:04 2006
@@ -0,0 +1 @@
+target

Propchange: incubator/cayenne/examples/trunk/3t-example-client/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Jul 24 22:18:04 2006
@@ -1 +1,2 @@
+target
 classes

Modified: incubator/cayenne/examples/trunk/3t-example-client/.classpath
URL: http://svn.apache.org/viewvc/incubator/cayenne/examples/trunk/3t-example-client/.classpath?rev=425284&r1=425283&r2=425284&view=diff
==============================================================================
--- incubator/cayenne/examples/trunk/3t-example-client/.classpath (original)
+++ incubator/cayenne/examples/trunk/3t-example-client/.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 combineaccessrules="false" kind="src" path="/cayenne-java"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/cayenne-java-1.5"/>
+	<classpathentry kind="src" path="src/main/java"/>
 	<classpathentry kind="output" path="classes"/>
 </classpath>

Added: incubator/cayenne/examples/trunk/3t-example-client/pom.xml
URL: http://svn.apache.org/viewvc/incubator/cayenne/examples/trunk/3t-example-client/pom.xml?rev=425284&view=auto
==============================================================================
--- incubator/cayenne/examples/trunk/3t-example-client/pom.xml (added)
+++ incubator/cayenne/examples/trunk/3t-example-client/pom.xml Mon Jul 24 22:18:04 2006
@@ -0,0 +1,54 @@
+<?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.examples</groupId>
+      <artifactId>examples-parent</artifactId>
+      <version>3.0-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>3t-example-client</artifactId>
+    <name>Cayenne Three Tier Client Example</name>
+    <description>An example of the 3 tier stuff</description>
+    <packaging>jar</packaging>
+
+    <build>
+      <plugins>
+	<plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-jar-plugin</artifactId>
+          <configuration>
+            <archive>
+              <manifest>
+		<mainClass>cayenne3t.example.client.Main</mainClass>
+              </manifest>
+            </archive>
+          </configuration>
+	</plugin>
+      </plugins>
+    </build>
+
+</project>

Modified: incubator/cayenne/examples/trunk/3t-example-client/src/main/java/cayenne3t/example/client/EventTrace.java
URL: http://svn.apache.org/viewvc/incubator/cayenne/examples/trunk/3t-example-client/src/main/java/cayenne3t/example/client/EventTrace.java?rev=425284&r1=425031&r2=425284&view=diff
==============================================================================
--- incubator/cayenne/examples/trunk/3t-example-client/src/main/java/cayenne3t/example/client/EventTrace.java (original)
+++ incubator/cayenne/examples/trunk/3t-example-client/src/main/java/cayenne3t/example/client/EventTrace.java Mon Jul 24 22:18:04 2006
@@ -1,9 +1,9 @@
 package cayenne3t.example.client;
 
+import org.apache.cayenne.DataChannelListener;
+import org.apache.cayenne.graph.GraphEvent;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.objectstyle.cayenne.DataChannelListener;
-import org.objectstyle.cayenne.graph.GraphEvent;
 
 public class EventTrace implements DataChannelListener {
 

Modified: incubator/cayenne/examples/trunk/3t-example-client/src/main/java/cayenne3t/example/client/GraphChangeTrace.java
URL: http://svn.apache.org/viewvc/incubator/cayenne/examples/trunk/3t-example-client/src/main/java/cayenne3t/example/client/GraphChangeTrace.java?rev=425284&r1=425031&r2=425284&view=diff
==============================================================================
--- incubator/cayenne/examples/trunk/3t-example-client/src/main/java/cayenne3t/example/client/GraphChangeTrace.java (original)
+++ incubator/cayenne/examples/trunk/3t-example-client/src/main/java/cayenne3t/example/client/GraphChangeTrace.java Mon Jul 24 22:18:04 2006
@@ -1,8 +1,8 @@
 package cayenne3t.example.client;
 
+import org.apache.cayenne.graph.GraphChangeHandler;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.objectstyle.cayenne.graph.GraphChangeHandler;
 
 /**
  * This is an example of a GraphEventListener that logs received events.

Modified: incubator/cayenne/examples/trunk/3t-example-client/src/main/java/cayenne3t/example/client/Main.java
URL: http://svn.apache.org/viewvc/incubator/cayenne/examples/trunk/3t-example-client/src/main/java/cayenne3t/example/client/Main.java?rev=425284&r1=425031&r2=425284&view=diff
==============================================================================
--- incubator/cayenne/examples/trunk/3t-example-client/src/main/java/cayenne3t/example/client/Main.java (original)
+++ incubator/cayenne/examples/trunk/3t-example-client/src/main/java/cayenne3t/example/client/Main.java Mon Jul 24 22:18:04 2006
@@ -3,24 +3,22 @@
 import java.util.Date;
 import java.util.Iterator;
 import java.util.List;
-
+import org.apache.cayenne.CayenneContext;
+import org.apache.cayenne.DataChannel;
+import org.apache.cayenne.ObjectContext;
+import org.apache.cayenne.QueryResponse;
+import org.apache.cayenne.exp.Expression;
+import org.apache.cayenne.query.NamedQuery;
+import org.apache.cayenne.query.Query;
+import org.apache.cayenne.query.QueryChain;
+import org.apache.cayenne.query.SelectQuery;
+import org.apache.cayenne.remote.ClientChannel;
+import org.apache.cayenne.remote.ClientConnection;
+import org.apache.cayenne.remote.hessian.HessianConnection;
+import org.apache.cayenne.util.EventUtil;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.log4j.BasicConfigurator;
-import org.objectstyle.cayenne.CayenneContext;
-import org.objectstyle.cayenne.DataChannel;
-import org.objectstyle.cayenne.ObjectContext;
-import org.objectstyle.cayenne.QueryResponse;
-import org.objectstyle.cayenne.exp.Expression;
-import org.objectstyle.cayenne.query.NamedQuery;
-import org.objectstyle.cayenne.query.Query;
-import org.objectstyle.cayenne.query.QueryChain;
-import org.objectstyle.cayenne.query.SelectQuery;
-import org.objectstyle.cayenne.remote.ClientChannel;
-import org.objectstyle.cayenne.remote.ClientConnection;
-import org.objectstyle.cayenne.remote.hessian.HessianConnection;
-import org.objectstyle.cayenne.util.EventUtil;
-
 import cayenne3t.example.hr.CDepartment;
 import cayenne3t.example.hr.CPerson;
 

Modified: incubator/cayenne/examples/trunk/3t-example-client/src/main/java/cayenne3t/example/hr/CustomClientObject.java
URL: http://svn.apache.org/viewvc/incubator/cayenne/examples/trunk/3t-example-client/src/main/java/cayenne3t/example/hr/CustomClientObject.java?rev=425284&r1=425031&r2=425284&view=diff
==============================================================================
--- incubator/cayenne/examples/trunk/3t-example-client/src/main/java/cayenne3t/example/hr/CustomClientObject.java (original)
+++ incubator/cayenne/examples/trunk/3t-example-client/src/main/java/cayenne3t/example/hr/CustomClientObject.java Mon Jul 24 22:18:04 2006
@@ -1,6 +1,6 @@
 package cayenne3t.example.hr;
 
-import org.objectstyle.cayenne.PersistentObject;
+import org.apache.cayenne.PersistentObject;
 
 /**
  * This is a test "wedge" client-side superclass.

Modified: incubator/cayenne/examples/trunk/3t-example-client/src/main/java/cayenne3t/example/hr/auto/_CDepartment.java
URL: http://svn.apache.org/viewvc/incubator/cayenne/examples/trunk/3t-example-client/src/main/java/cayenne3t/example/hr/auto/_CDepartment.java?rev=425284&r1=425031&r2=425284&view=diff
==============================================================================
--- incubator/cayenne/examples/trunk/3t-example-client/src/main/java/cayenne3t/example/hr/auto/_CDepartment.java (original)
+++ incubator/cayenne/examples/trunk/3t-example-client/src/main/java/cayenne3t/example/hr/auto/_CDepartment.java Mon Jul 24 22:18:04 2006
@@ -2,7 +2,7 @@
 
 import java.util.List;
 
-import org.objectstyle.cayenne.PersistentObject;
+import org.apache.cayenne.PersistentObject;
 
 import cayenne3t.example.hr.CPerson;
 import cayenne3t.example.hr.CProject;

Modified: incubator/cayenne/examples/trunk/3t-example-client/src/main/java/cayenne3t/example/hr/auto/_CPerson.java
URL: http://svn.apache.org/viewvc/incubator/cayenne/examples/trunk/3t-example-client/src/main/java/cayenne3t/example/hr/auto/_CPerson.java?rev=425284&r1=425031&r2=425284&view=diff
==============================================================================
--- incubator/cayenne/examples/trunk/3t-example-client/src/main/java/cayenne3t/example/hr/auto/_CPerson.java (original)
+++ incubator/cayenne/examples/trunk/3t-example-client/src/main/java/cayenne3t/example/hr/auto/_CPerson.java Mon Jul 24 22:18:04 2006
@@ -2,9 +2,7 @@
 
 import java.util.Date;
 import java.util.List;
-
-import org.objectstyle.cayenne.ValueHolder;
-
+import org.apache.cayenne.ValueHolder;
 import cayenne3t.example.hr.CDepartment;
 import cayenne3t.example.hr.CProject;
 import cayenne3t.example.hr.CustomClientObject;

Modified: incubator/cayenne/examples/trunk/3t-example-client/src/main/java/cayenne3t/example/hr/auto/_CProject.java
URL: http://svn.apache.org/viewvc/incubator/cayenne/examples/trunk/3t-example-client/src/main/java/cayenne3t/example/hr/auto/_CProject.java?rev=425284&r1=425031&r2=425284&view=diff
==============================================================================
--- incubator/cayenne/examples/trunk/3t-example-client/src/main/java/cayenne3t/example/hr/auto/_CProject.java (original)
+++ incubator/cayenne/examples/trunk/3t-example-client/src/main/java/cayenne3t/example/hr/auto/_CProject.java Mon Jul 24 22:18:04 2006
@@ -2,8 +2,8 @@
 
 import java.util.List;
 
-import org.objectstyle.cayenne.PersistentObject;
-import org.objectstyle.cayenne.ValueHolder;
+import org.apache.cayenne.PersistentObject;
+import org.apache.cayenne.ValueHolder;
 
 import cayenne3t.example.hr.CDepartment;
 import cayenne3t.example.hr.CPerson;

Modified: incubator/cayenne/examples/trunk/3t-example/.classpath
URL: http://svn.apache.org/viewvc/incubator/cayenne/examples/trunk/3t-example/.classpath?rev=425284&r1=425283&r2=425284&view=diff
==============================================================================
--- incubator/cayenne/examples/trunk/3t-example/.classpath (original)
+++ incubator/cayenne/examples/trunk/3t-example/.classpath Mon Jul 24 22:18:04 2006
@@ -1,10 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="src" path="webroot/WEB-INF/src"/>
-	<classpathentry kind="lib" path="webroot/WEB-INF/lib/postgresql-8.0-310.jdbc3.jar"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/3t-example-client"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/cayenne-java"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/cayenne-java-1.5"/>
+	<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
+	<classpathentry kind="lib" path="src/main/webapp/WEB-INF/lib/postgresql-8.0-310.jdbc3.jar"/>
+	<classpathentry kind="src" path="src/main/java"/>
+	<classpathentry kind="src" path="src/main/webapp"/>
+	<classpathentry kind="src" path="src/main/resources"/>
 	<classpathentry kind="output" path="webroot/WEB-INF/classes"/>
 </classpath>

Modified: incubator/cayenne/examples/trunk/3t-example/.project
URL: http://svn.apache.org/viewvc/incubator/cayenne/examples/trunk/3t-example/.project?rev=425284&r1=425283&r2=425284&view=diff
==============================================================================
--- incubator/cayenne/examples/trunk/3t-example/.project (original)
+++ incubator/cayenne/examples/trunk/3t-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/3t-example/pom.xml
URL: http://svn.apache.org/viewvc/incubator/cayenne/examples/trunk/3t-example/pom.xml?rev=425284&view=auto
==============================================================================
--- incubator/cayenne/examples/trunk/3t-example/pom.xml (added)
+++ incubator/cayenne/examples/trunk/3t-example/pom.xml Mon Jul 24 22:18:04 2006
@@ -0,0 +1,47 @@
+<?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.examples</groupId>
+      <artifactId>examples-parent</artifactId>
+      <version>3.0-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>3t-example</artifactId>
+    <name>Cayenne Three Tier Example</name>
+    <description>Cayenne 3 tier example</description>
+    <packaging>war</packaging>
+
+    <dependencies>
+      <dependency>
+        <groupId>org.apache.geronimo.specs</groupId>
+        <artifactId>geronimo-servlet_2.4_spec</artifactId>
+        <version>1.0.1</version>
+        <scope>provided</scope>
+      </dependency>
+    </dependencies>
+
+</project>

Modified: incubator/cayenne/examples/trunk/3t-example/src/main/java/cayenne3t/example/hr/auto/_Department.java
URL: http://svn.apache.org/viewvc/incubator/cayenne/examples/trunk/3t-example/src/main/java/cayenne3t/example/hr/auto/_Department.java?rev=425284&r1=425031&r2=425284&view=diff
==============================================================================
--- incubator/cayenne/examples/trunk/3t-example/src/main/java/cayenne3t/example/hr/auto/_Department.java (original)
+++ incubator/cayenne/examples/trunk/3t-example/src/main/java/cayenne3t/example/hr/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 DESCRIPTION_PROPERTY = "description";
     public static final String NAME_PROPERTY = "name";

Modified: incubator/cayenne/examples/trunk/3t-example/src/main/java/cayenne3t/example/hr/auto/_Person.java
URL: http://svn.apache.org/viewvc/incubator/cayenne/examples/trunk/3t-example/src/main/java/cayenne3t/example/hr/auto/_Person.java?rev=425284&r1=425031&r2=425284&view=diff
==============================================================================
--- incubator/cayenne/examples/trunk/3t-example/src/main/java/cayenne3t/example/hr/auto/_Person.java (original)
+++ incubator/cayenne/examples/trunk/3t-example/src/main/java/cayenne3t/example/hr/auto/_Person.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 _Person extends org.objectstyle.cayenne.CayenneDataObject {
+public class _Person extends org.apache.cayenne.CayenneDataObject {
 
     public static final String BASE_SALARY_PROPERTY = "baseSalary";
     public static final String DATE_HIRED_PROPERTY = "dateHired";

Modified: incubator/cayenne/examples/trunk/3t-example/src/main/java/cayenne3t/example/hr/auto/_Project.java
URL: http://svn.apache.org/viewvc/incubator/cayenne/examples/trunk/3t-example/src/main/java/cayenne3t/example/hr/auto/_Project.java?rev=425284&r1=425031&r2=425284&view=diff
==============================================================================
--- incubator/cayenne/examples/trunk/3t-example/src/main/java/cayenne3t/example/hr/auto/_Project.java (original)
+++ incubator/cayenne/examples/trunk/3t-example/src/main/java/cayenne3t/example/hr/auto/_Project.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 _Project extends org.objectstyle.cayenne.CayenneDataObject {
+public class _Project extends org.apache.cayenne.CayenneDataObject {
 
     public static final String NAME_PROPERTY = "name";
     public static final String DEPARTMENT_PROPERTY = "department";

Modified: incubator/cayenne/examples/trunk/cayenne-jpa-annotations-example/pom.xml
URL: http://svn.apache.org/viewvc/incubator/cayenne/examples/trunk/cayenne-jpa-annotations-example/pom.xml?rev=425284&r1=425283&r2=425284&view=diff
==============================================================================
--- incubator/cayenne/examples/trunk/cayenne-jpa-annotations-example/pom.xml (original)
+++ incubator/cayenne/examples/trunk/cayenne-jpa-annotations-example/pom.xml Mon Jul 24 22:18:04 2006
@@ -1,50 +1,69 @@
-<?xml version="1.0"?><project>
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>org.apache.cayenne</groupId>
-  <artifactId>cayenne-jpa-annotations-example</artifactId>
-  <name>An example application using JPA annotations.</name>
-  <version>3.0-incubating-SNAPSHOT</version>
-  <url>http://incubator.apache.org/cayenne</url>
-  <build>
-    <plugins>
-      <plugin>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <configuration>
-          <source>1.5</source>
-          <target>1.5</target>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-  <dependencies>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>3.8.1</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.geronimo.specs</groupId>
-      <artifactId>geronimo-jpa_3.0_spec</artifactId>
-      <version>1.0-SNAPSHOT</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.cayenne</groupId>
-      <artifactId>cayenne-jpa</artifactId>
-      <version>3.0-incubating-SNAPSHOT</version>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>cglib</groupId>
-      <artifactId>cglib-nodep</artifactId>
-      <version>2.1_3</version>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.derby</groupId>
-      <artifactId>derby</artifactId>
-      <version>10.1.2.1</version>
-		<scope>runtime</scope>
-    </dependency>
-  </dependencies>
-</project>
\ No newline at end of file
+<?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.examples</groupId>
+      <artifactId>examples-parent</artifactId>
+      <version>3.0-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>jpa-example</artifactId>
+    <name>Cayenne JPA Example</name>
+    <description>An example of the jpa stuff</description>
+    <packaging>jar</packaging>
+
+    <dependencies>
+      <dependency>
+        <groupId>org.apache.cayenne</groupId>
+        <artifactId>cayenne-jpa</artifactId>
+        <version>3.0-incubating-SNAPSHOT</version>
+      </dependency>
+    </dependencies>
+
+    <build>
+      <plugins>
+	<plugin>
+          <artifactId>maven-compiler-plugin</artifactId>
+          <configuration>
+            <source>1.5</source>
+            <target>1.5</target>
+          </configuration>
+	</plugin>
+	<plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-jar-plugin</artifactId>
+          <configuration>
+            <archive>
+              <manifest>
+		<mainClass>org.apache.cayenne.jpa.example.Main</mainClass>
+              </manifest>
+            </archive>
+          </configuration>
+	</plugin>
+      </plugins>
+    </build>
+
+</project>

Propchange: incubator/cayenne/examples/trunk/cayenne-petstore/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Jul 24 22:18:04 2006
@@ -1,3 +1,4 @@
+target
 petstoredb
 dist
 bin

Modified: incubator/cayenne/examples/trunk/cayenne-petstore/.classpath
URL: http://svn.apache.org/viewvc/incubator/cayenne/examples/trunk/cayenne-petstore/.classpath?rev=425284&r1=425283&r2=425284&view=diff
==============================================================================
--- incubator/cayenne/examples/trunk/cayenne-petstore/.classpath (original)
+++ incubator/cayenne/examples/trunk/cayenne-petstore/.classpath Mon Jul 24 22:18:04 2006
@@ -1,19 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="src" path="src/main/java"/>
+	<classpathentry kind="src" path="src/main/resources"/>
+	<classpathentry kind="src" path="src/main/webapp"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="lib" path="lib/struts.jar"/>
-	<classpathentry kind="lib" path="lib/jakarta-oro.jar"/>
-	<classpathentry kind="lib" path="lib/commons-validator.jar"/>
-	<classpathentry kind="lib" path="lib/commons-logging.jar"/>
-	<classpathentry kind="lib" path="lib/commons-fileupload.jar"/>
-	<classpathentry kind="lib" path="lib/commons-digester.jar"/>
-	<classpathentry kind="lib" path="lib/commons-beanutils.jar"/>
-	<classpathentry kind="lib" path="lib/beanaction.jar"/>
-	<classpathentry kind="lib" path="lib/antlr.jar"/>
-	<classpathentry kind="lib" path="devlib/servlet.jar"/>
-	<classpathentry kind="lib" path="lib/ibatis-common-2.jar"/>
-	<classpathentry kind="lib" path="lib/derby-10.2.1.0.jar"/>
-	<classpathentry kind="lib" path="lib/cayenne-1.2RC2.jar"/>
+	<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
 	<classpathentry kind="output" path="bin/eclipse"/>
 </classpath>

Modified: incubator/cayenne/examples/trunk/cayenne-petstore/.project
URL: http://svn.apache.org/viewvc/incubator/cayenne/examples/trunk/cayenne-petstore/.project?rev=425284&r1=425283&r2=425284&view=diff
==============================================================================
--- incubator/cayenne/examples/trunk/cayenne-petstore/.project (original)
+++ incubator/cayenne/examples/trunk/cayenne-petstore/.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/cayenne-petstore/pom.xml
URL: http://svn.apache.org/viewvc/incubator/cayenne/examples/trunk/cayenne-petstore/pom.xml?rev=425284&view=auto
==============================================================================
--- incubator/cayenne/examples/trunk/cayenne-petstore/pom.xml (added)
+++ incubator/cayenne/examples/trunk/cayenne-petstore/pom.xml Mon Jul 24 22:18:04 2006
@@ -0,0 +1,45 @@
+<?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>cayenne-petstore</artifactId>
+  <packaging>war</packaging>
+  <name>Cayenne Petstore Example</name>
+  <description>Petstore redone with Cayenne</description>
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.geronimo.specs</groupId>
+      <artifactId>geronimo-servlet_2.4_spec</artifactId>
+      <version>1.0.1</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>struts</groupId>
+      <artifactId>struts</artifactId>
+      <version>1.2.9</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.derby</groupId>
+      <artifactId>derby</artifactId>
+      <version>10.1.2.1</version>
+    </dependency>
+    <dependency>
+      <groupId>antlr</groupId>
+      <artifactId>antlrall</artifactId>
+      <version>2.7.4</version>
+    </dependency>
+    <dependency>
+      <groupId>beanaction</groupId>
+      <artifactId>beanaction</artifactId>
+      <version>1.0</version>
+    </dependency>
+    <dependency>
+      <groupId>com.ibatis</groupId>
+      <artifactId>ibatis-common</artifactId>
+      <version>2.1.0.565</version>
+    </dependency>
+  </dependencies>
+</project>
\ No newline at end of file

Modified: incubator/cayenne/examples/trunk/cayenne-petstore/src/main/java/org/apache/petstore/ConfigFilter.java
URL: http://svn.apache.org/viewvc/incubator/cayenne/examples/trunk/cayenne-petstore/src/main/java/org/apache/petstore/ConfigFilter.java?rev=425284&r1=425031&r2=425284&view=diff
==============================================================================
--- incubator/cayenne/examples/trunk/cayenne-petstore/src/main/java/org/apache/petstore/ConfigFilter.java (original)
+++ incubator/cayenne/examples/trunk/cayenne-petstore/src/main/java/org/apache/petstore/ConfigFilter.java Mon Jul 24 22:18:04 2006
@@ -1,27 +1,25 @@
-package org.objectstyle.petstore;
+package org.apache.petstore;
 
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Properties;
-
 import javax.servlet.FilterConfig;
 import javax.servlet.ServletException;
-
-import org.objectstyle.cayenne.conf.Configuration;
-import org.objectstyle.cayenne.conf.WebApplicationContextFilter;
-import org.objectstyle.petstore.dao.AccountDao;
-import org.objectstyle.petstore.dao.DaoManager;
-import org.objectstyle.petstore.dao.ItemDao;
-import org.objectstyle.petstore.dao.OrderDao;
-import org.objectstyle.petstore.dao.PersistenceManager;
-import org.objectstyle.petstore.dao.ProductDao;
-import org.objectstyle.petstore.dao.impl.AccountCayenneDao;
-import org.objectstyle.petstore.dao.impl.CayennePersistenceManager;
-import org.objectstyle.petstore.dao.impl.ItemCayenneDao;
-import org.objectstyle.petstore.dao.impl.OrderCayenneDao;
-import org.objectstyle.petstore.dao.impl.ProductCayenneDao;
+import org.apache.cayenne.conf.Configuration;
+import org.apache.cayenne.conf.WebApplicationContextFilter;
+import org.apache.petstore.dao.AccountDao;
+import org.apache.petstore.dao.DaoManager;
+import org.apache.petstore.dao.ItemDao;
+import org.apache.petstore.dao.OrderDao;
+import org.apache.petstore.dao.PersistenceManager;
+import org.apache.petstore.dao.ProductDao;
+import org.apache.petstore.dao.impl.AccountCayenneDao;
+import org.apache.petstore.dao.impl.CayennePersistenceManager;
+import org.apache.petstore.dao.impl.ItemCayenneDao;
+import org.apache.petstore.dao.impl.OrderCayenneDao;
+import org.apache.petstore.dao.impl.ProductCayenneDao;
 
 /**
  * A servlet filter that performs initial configuraion later makes sure a DataContext is

Modified: incubator/cayenne/examples/trunk/cayenne-petstore/src/main/java/org/apache/petstore/DBSetupHelper.java
URL: http://svn.apache.org/viewvc/incubator/cayenne/examples/trunk/cayenne-petstore/src/main/java/org/apache/petstore/DBSetupHelper.java?rev=425284&r1=425031&r2=425284&view=diff
==============================================================================
--- incubator/cayenne/examples/trunk/cayenne-petstore/src/main/java/org/apache/petstore/DBSetupHelper.java (original)
+++ incubator/cayenne/examples/trunk/cayenne-petstore/src/main/java/org/apache/petstore/DBSetupHelper.java Mon Jul 24 22:18:04 2006
@@ -1,4 +1,4 @@
-package org.objectstyle.petstore;
+package org.apache.petstore;
 
 import java.io.BufferedReader;
 import java.io.IOException;
@@ -8,14 +8,14 @@
 import javax.servlet.ServletContext;
 import javax.servlet.ServletException;
 
-import org.objectstyle.cayenne.access.DataContext;
-import org.objectstyle.cayenne.access.DataDomain;
-import org.objectstyle.cayenne.access.DataNode;
-import org.objectstyle.cayenne.access.DbGenerator;
-import org.objectstyle.cayenne.map.DataMap;
-import org.objectstyle.cayenne.query.QueryChain;
-import org.objectstyle.cayenne.query.SQLTemplate;
-import org.objectstyle.petstore.domain.Account;
+import org.apache.cayenne.access.DataContext;
+import org.apache.cayenne.access.DataDomain;
+import org.apache.cayenne.access.DataNode;
+import org.apache.cayenne.access.DbGenerator;
+import org.apache.cayenne.map.DataMap;
+import org.apache.cayenne.query.QueryChain;
+import org.apache.cayenne.query.SQLTemplate;
+import org.apache.petstore.domain.Account;
 
 /**
  * Helper class to init test DB.

Modified: incubator/cayenne/examples/trunk/cayenne-petstore/src/main/java/org/apache/petstore/dao/AccountDao.java
URL: http://svn.apache.org/viewvc/incubator/cayenne/examples/trunk/cayenne-petstore/src/main/java/org/apache/petstore/dao/AccountDao.java?rev=425284&r1=425031&r2=425284&view=diff
==============================================================================
--- incubator/cayenne/examples/trunk/cayenne-petstore/src/main/java/org/apache/petstore/dao/AccountDao.java (original)
+++ incubator/cayenne/examples/trunk/cayenne-petstore/src/main/java/org/apache/petstore/dao/AccountDao.java Mon Jul 24 22:18:04 2006
@@ -1,6 +1,6 @@
-package org.objectstyle.petstore.dao;
+package org.apache.petstore.dao;
 
-import org.objectstyle.petstore.domain.Account;
+import org.apache.petstore.domain.Account;
 
 public interface AccountDao {
 

Modified: incubator/cayenne/examples/trunk/cayenne-petstore/src/main/java/org/apache/petstore/dao/DaoManager.java
URL: http://svn.apache.org/viewvc/incubator/cayenne/examples/trunk/cayenne-petstore/src/main/java/org/apache/petstore/dao/DaoManager.java?rev=425284&r1=425031&r2=425284&view=diff
==============================================================================
--- incubator/cayenne/examples/trunk/cayenne-petstore/src/main/java/org/apache/petstore/dao/DaoManager.java (original)
+++ incubator/cayenne/examples/trunk/cayenne-petstore/src/main/java/org/apache/petstore/dao/DaoManager.java Mon Jul 24 22:18:04 2006
@@ -1,4 +1,4 @@
-package org.objectstyle.petstore.dao;
+package org.apache.petstore.dao;
 
 import java.util.Map;
 

Modified: incubator/cayenne/examples/trunk/cayenne-petstore/src/main/java/org/apache/petstore/dao/ItemDao.java
URL: http://svn.apache.org/viewvc/incubator/cayenne/examples/trunk/cayenne-petstore/src/main/java/org/apache/petstore/dao/ItemDao.java?rev=425284&r1=425031&r2=425284&view=diff
==============================================================================
--- incubator/cayenne/examples/trunk/cayenne-petstore/src/main/java/org/apache/petstore/dao/ItemDao.java (original)
+++ incubator/cayenne/examples/trunk/cayenne-petstore/src/main/java/org/apache/petstore/dao/ItemDao.java Mon Jul 24 22:18:04 2006
@@ -1,6 +1,6 @@
-package org.objectstyle.petstore.dao;
+package org.apache.petstore.dao;
 
-import org.objectstyle.petstore.domain.Product;
+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/dao/OrderDao.java
URL: http://svn.apache.org/viewvc/incubator/cayenne/examples/trunk/cayenne-petstore/src/main/java/org/apache/petstore/dao/OrderDao.java?rev=425284&r1=425031&r2=425284&view=diff
==============================================================================
--- incubator/cayenne/examples/trunk/cayenne-petstore/src/main/java/org/apache/petstore/dao/OrderDao.java (original)
+++ incubator/cayenne/examples/trunk/cayenne-petstore/src/main/java/org/apache/petstore/dao/OrderDao.java Mon Jul 24 22:18:04 2006
@@ -1,6 +1,6 @@
-package org.objectstyle.petstore.dao;
+package org.apache.petstore.dao;
 
-import org.objectstyle.petstore.domain.Account;
+import org.apache.petstore.domain.Account;
 
 import com.ibatis.common.util.PaginatedList;
 

Modified: incubator/cayenne/examples/trunk/cayenne-petstore/src/main/java/org/apache/petstore/dao/PersistenceManager.java
URL: http://svn.apache.org/viewvc/incubator/cayenne/examples/trunk/cayenne-petstore/src/main/java/org/apache/petstore/dao/PersistenceManager.java?rev=425284&r1=425031&r2=425284&view=diff
==============================================================================
--- incubator/cayenne/examples/trunk/cayenne-petstore/src/main/java/org/apache/petstore/dao/PersistenceManager.java (original)
+++ incubator/cayenne/examples/trunk/cayenne-petstore/src/main/java/org/apache/petstore/dao/PersistenceManager.java Mon Jul 24 22:18:04 2006
@@ -1,4 +1,4 @@
-package org.objectstyle.petstore.dao;
+package org.apache.petstore.dao;
 
 import java.util.List;
 

Modified: incubator/cayenne/examples/trunk/cayenne-petstore/src/main/java/org/apache/petstore/dao/ProductDao.java
URL: http://svn.apache.org/viewvc/incubator/cayenne/examples/trunk/cayenne-petstore/src/main/java/org/apache/petstore/dao/ProductDao.java?rev=425284&r1=425031&r2=425284&view=diff
==============================================================================
--- incubator/cayenne/examples/trunk/cayenne-petstore/src/main/java/org/apache/petstore/dao/ProductDao.java (original)
+++ incubator/cayenne/examples/trunk/cayenne-petstore/src/main/java/org/apache/petstore/dao/ProductDao.java Mon Jul 24 22:18:04 2006
@@ -1,6 +1,6 @@
-package org.objectstyle.petstore.dao;
+package org.apache.petstore.dao;
 
-import org.objectstyle.petstore.domain.Category;
+import org.apache.petstore.domain.Category;
 
 import com.ibatis.common.util.PaginatedList;
 

Modified: incubator/cayenne/examples/trunk/cayenne-petstore/src/main/java/org/apache/petstore/dao/impl/AccountCayenneDao.java
URL: http://svn.apache.org/viewvc/incubator/cayenne/examples/trunk/cayenne-petstore/src/main/java/org/apache/petstore/dao/impl/AccountCayenneDao.java?rev=425284&r1=425031&r2=425284&view=diff
==============================================================================
--- incubator/cayenne/examples/trunk/cayenne-petstore/src/main/java/org/apache/petstore/dao/impl/AccountCayenneDao.java (original)
+++ incubator/cayenne/examples/trunk/cayenne-petstore/src/main/java/org/apache/petstore/dao/impl/AccountCayenneDao.java Mon Jul 24 22:18:04 2006
@@ -1,10 +1,10 @@
-package org.objectstyle.petstore.dao.impl;
+package org.apache.petstore.dao.impl;
 
 import java.util.HashMap;
 import java.util.Map;
 
-import org.objectstyle.petstore.dao.AccountDao;
-import org.objectstyle.petstore.domain.Account;
+import org.apache.petstore.dao.AccountDao;
+import org.apache.petstore.domain.Account;
 
 public class AccountCayenneDao extends CayenneDao implements AccountDao {
 

Modified: incubator/cayenne/examples/trunk/cayenne-petstore/src/main/java/org/apache/petstore/dao/impl/CayenneDao.java
URL: http://svn.apache.org/viewvc/incubator/cayenne/examples/trunk/cayenne-petstore/src/main/java/org/apache/petstore/dao/impl/CayenneDao.java?rev=425284&r1=425031&r2=425284&view=diff
==============================================================================
--- incubator/cayenne/examples/trunk/cayenne-petstore/src/main/java/org/apache/petstore/dao/impl/CayenneDao.java (original)
+++ incubator/cayenne/examples/trunk/cayenne-petstore/src/main/java/org/apache/petstore/dao/impl/CayenneDao.java Mon Jul 24 22:18:04 2006
@@ -1,11 +1,10 @@
-package org.objectstyle.petstore.dao.impl;
+package org.apache.petstore.dao.impl;
 
 import java.util.List;
 import java.util.Map;
-
-import org.objectstyle.cayenne.DataObjectUtils;
-import org.objectstyle.cayenne.access.DataContext;
-import org.objectstyle.cayenne.query.ParameterizedQuery;
+import org.apache.cayenne.DataObjectUtils;
+import org.apache.cayenne.access.DataContext;
+import org.apache.cayenne.query.ParameterizedQuery;
 
 /**
  * @author Andrus Adamchik

Modified: incubator/cayenne/examples/trunk/cayenne-petstore/src/main/java/org/apache/petstore/dao/impl/CayennePersistenceManager.java
URL: http://svn.apache.org/viewvc/incubator/cayenne/examples/trunk/cayenne-petstore/src/main/java/org/apache/petstore/dao/impl/CayennePersistenceManager.java?rev=425284&r1=425031&r2=425284&view=diff
==============================================================================
--- incubator/cayenne/examples/trunk/cayenne-petstore/src/main/java/org/apache/petstore/dao/impl/CayennePersistenceManager.java (original)
+++ incubator/cayenne/examples/trunk/cayenne-petstore/src/main/java/org/apache/petstore/dao/impl/CayennePersistenceManager.java Mon Jul 24 22:18:04 2006
@@ -1,11 +1,10 @@
-package org.objectstyle.petstore.dao.impl;
+package org.apache.petstore.dao.impl;
 
 import java.util.List;
-
-import org.objectstyle.cayenne.DataObject;
-import org.objectstyle.cayenne.DataObjectUtils;
-import org.objectstyle.cayenne.query.SelectQuery;
-import org.objectstyle.petstore.dao.PersistenceManager;
+import org.apache.cayenne.DataObject;
+import org.apache.cayenne.DataObjectUtils;
+import org.apache.cayenne.query.SelectQuery;
+import org.apache.petstore.dao.PersistenceManager;
 
 public class CayennePersistenceManager extends CayenneDao implements PersistenceManager {
 

Modified: incubator/cayenne/examples/trunk/cayenne-petstore/src/main/java/org/apache/petstore/dao/impl/ItemCayenneDao.java
URL: http://svn.apache.org/viewvc/incubator/cayenne/examples/trunk/cayenne-petstore/src/main/java/org/apache/petstore/dao/impl/ItemCayenneDao.java?rev=425284&r1=425031&r2=425284&view=diff
==============================================================================
--- incubator/cayenne/examples/trunk/cayenne-petstore/src/main/java/org/apache/petstore/dao/impl/ItemCayenneDao.java (original)
+++ incubator/cayenne/examples/trunk/cayenne-petstore/src/main/java/org/apache/petstore/dao/impl/ItemCayenneDao.java Mon Jul 24 22:18:04 2006
@@ -1,12 +1,10 @@
-package org.objectstyle.petstore.dao.impl;
+package org.apache.petstore.dao.impl;
 
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
-
-import org.objectstyle.petstore.dao.ItemDao;
-import org.objectstyle.petstore.domain.Product;
-
+import org.apache.petstore.dao.ItemDao;
+import org.apache.petstore.domain.Product;
 import com.ibatis.common.util.PaginatedArrayList;
 import com.ibatis.common.util.PaginatedList;
 

Modified: incubator/cayenne/examples/trunk/cayenne-petstore/src/main/java/org/apache/petstore/dao/impl/OrderCayenneDao.java
URL: http://svn.apache.org/viewvc/incubator/cayenne/examples/trunk/cayenne-petstore/src/main/java/org/apache/petstore/dao/impl/OrderCayenneDao.java?rev=425284&r1=425031&r2=425284&view=diff
==============================================================================
--- incubator/cayenne/examples/trunk/cayenne-petstore/src/main/java/org/apache/petstore/dao/impl/OrderCayenneDao.java (original)
+++ incubator/cayenne/examples/trunk/cayenne-petstore/src/main/java/org/apache/petstore/dao/impl/OrderCayenneDao.java Mon Jul 24 22:18:04 2006
@@ -1,8 +1,7 @@
-package org.objectstyle.petstore.dao.impl;
-
-import org.objectstyle.petstore.dao.OrderDao;
-import org.objectstyle.petstore.domain.Account;
+package org.apache.petstore.dao.impl;
 
+import org.apache.petstore.dao.OrderDao;
+import org.apache.petstore.domain.Account;
 import com.ibatis.common.util.PaginatedArrayList;
 import com.ibatis.common.util.PaginatedList;
 

Modified: incubator/cayenne/examples/trunk/cayenne-petstore/src/main/java/org/apache/petstore/dao/impl/ProductCayenneDao.java
URL: http://svn.apache.org/viewvc/incubator/cayenne/examples/trunk/cayenne-petstore/src/main/java/org/apache/petstore/dao/impl/ProductCayenneDao.java?rev=425284&r1=425031&r2=425284&view=diff
==============================================================================
--- incubator/cayenne/examples/trunk/cayenne-petstore/src/main/java/org/apache/petstore/dao/impl/ProductCayenneDao.java (original)
+++ incubator/cayenne/examples/trunk/cayenne-petstore/src/main/java/org/apache/petstore/dao/impl/ProductCayenneDao.java Mon Jul 24 22:18:04 2006
@@ -1,15 +1,15 @@
-package org.objectstyle.petstore.dao.impl;
+package org.apache.petstore.dao.impl;
 
 import java.util.List;
 import java.util.StringTokenizer;
 
-import org.objectstyle.cayenne.exp.Expression;
-import org.objectstyle.cayenne.exp.ExpressionFactory;
-import org.objectstyle.cayenne.query.SelectQuery;
-import org.objectstyle.cayenne.util.Util;
-import org.objectstyle.petstore.dao.ProductDao;
-import org.objectstyle.petstore.domain.Category;
-import org.objectstyle.petstore.domain.Product;
+import org.apache.cayenne.exp.Expression;
+import org.apache.cayenne.exp.ExpressionFactory;
+import org.apache.cayenne.query.SelectQuery;
+import org.apache.cayenne.util.Util;
+import org.apache.petstore.dao.ProductDao;
+import org.apache.petstore.domain.Category;
+import org.apache.petstore.domain.Product;
 
 import com.ibatis.common.util.PaginatedArrayList;
 import com.ibatis.common.util.PaginatedList;

Modified: incubator/cayenne/examples/trunk/cayenne-petstore/src/main/java/org/apache/petstore/domain/Account.java
URL: http://svn.apache.org/viewvc/incubator/cayenne/examples/trunk/cayenne-petstore/src/main/java/org/apache/petstore/domain/Account.java?rev=425284&r1=425031&r2=425284&view=diff
==============================================================================
--- incubator/cayenne/examples/trunk/cayenne-petstore/src/main/java/org/apache/petstore/domain/Account.java (original)
+++ incubator/cayenne/examples/trunk/cayenne-petstore/src/main/java/org/apache/petstore/domain/Account.java Mon Jul 24 22:18:04 2006
@@ -1,7 +1,7 @@
-package org.objectstyle.petstore.domain;
+package org.apache.petstore.domain;
 
-import org.objectstyle.cayenne.PersistenceState;
-import org.objectstyle.petstore.domain.auto._Account;
+import org.apache.cayenne.PersistenceState;
+import org.apache.petstore.domain.auto._Account;
 
 public class Account extends _Account {
 

Modified: incubator/cayenne/examples/trunk/cayenne-petstore/src/main/java/org/apache/petstore/domain/BannerData.java
URL: http://svn.apache.org/viewvc/incubator/cayenne/examples/trunk/cayenne-petstore/src/main/java/org/apache/petstore/domain/BannerData.java?rev=425284&r1=425031&r2=425284&view=diff
==============================================================================
--- incubator/cayenne/examples/trunk/cayenne-petstore/src/main/java/org/apache/petstore/domain/BannerData.java (original)
+++ incubator/cayenne/examples/trunk/cayenne-petstore/src/main/java/org/apache/petstore/domain/BannerData.java Mon Jul 24 22:18:04 2006
@@ -1,6 +1,6 @@
-package org.objectstyle.petstore.domain;
+package org.apache.petstore.domain;
 
-import org.objectstyle.petstore.domain.auto._BannerData;
+import org.apache.petstore.domain.auto._BannerData;
 
 public class BannerData extends _BannerData {
 

Modified: incubator/cayenne/examples/trunk/cayenne-petstore/src/main/java/org/apache/petstore/domain/Cart.java
URL: http://svn.apache.org/viewvc/incubator/cayenne/examples/trunk/cayenne-petstore/src/main/java/org/apache/petstore/domain/Cart.java?rev=425284&r1=425031&r2=425284&view=diff
==============================================================================
--- incubator/cayenne/examples/trunk/cayenne-petstore/src/main/java/org/apache/petstore/domain/Cart.java (original)
+++ incubator/cayenne/examples/trunk/cayenne-petstore/src/main/java/org/apache/petstore/domain/Cart.java Mon Jul 24 22:18:04 2006
@@ -1,4 +1,4 @@
-package org.objectstyle.petstore.domain;
+package org.apache.petstore.domain;
 
 import java.io.Serializable;
 import java.math.BigDecimal;
@@ -8,7 +8,6 @@
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
-
 import com.ibatis.common.util.PaginatedArrayList;
 import com.ibatis.common.util.PaginatedList;
 

Modified: incubator/cayenne/examples/trunk/cayenne-petstore/src/main/java/org/apache/petstore/domain/CartItem.java
URL: http://svn.apache.org/viewvc/incubator/cayenne/examples/trunk/cayenne-petstore/src/main/java/org/apache/petstore/domain/CartItem.java?rev=425284&r1=425031&r2=425284&view=diff
==============================================================================
--- incubator/cayenne/examples/trunk/cayenne-petstore/src/main/java/org/apache/petstore/domain/CartItem.java (original)
+++ incubator/cayenne/examples/trunk/cayenne-petstore/src/main/java/org/apache/petstore/domain/CartItem.java Mon Jul 24 22:18:04 2006
@@ -1,4 +1,4 @@
-package org.objectstyle.petstore.domain;
+package org.apache.petstore.domain;
 
 import java.io.Serializable;
 import java.math.BigDecimal;

Modified: incubator/cayenne/examples/trunk/cayenne-petstore/src/main/java/org/apache/petstore/domain/Category.java
URL: http://svn.apache.org/viewvc/incubator/cayenne/examples/trunk/cayenne-petstore/src/main/java/org/apache/petstore/domain/Category.java?rev=425284&r1=425031&r2=425284&view=diff
==============================================================================
--- incubator/cayenne/examples/trunk/cayenne-petstore/src/main/java/org/apache/petstore/domain/Category.java (original)
+++ incubator/cayenne/examples/trunk/cayenne-petstore/src/main/java/org/apache/petstore/domain/Category.java Mon Jul 24 22:18:04 2006
@@ -1,7 +1,7 @@
-package org.objectstyle.petstore.domain;
+package org.apache.petstore.domain;
 
-import org.objectstyle.cayenne.DataObjectUtils;
-import org.objectstyle.petstore.domain.auto._Category;
+import org.apache.cayenne.DataObjectUtils;
+import org.apache.petstore.domain.auto._Category;
 
 public class Category extends _Category {
 

Modified: incubator/cayenne/examples/trunk/cayenne-petstore/src/main/java/org/apache/petstore/domain/Inventory.java
URL: http://svn.apache.org/viewvc/incubator/cayenne/examples/trunk/cayenne-petstore/src/main/java/org/apache/petstore/domain/Inventory.java?rev=425284&r1=425031&r2=425284&view=diff
==============================================================================
--- incubator/cayenne/examples/trunk/cayenne-petstore/src/main/java/org/apache/petstore/domain/Inventory.java (original)
+++ incubator/cayenne/examples/trunk/cayenne-petstore/src/main/java/org/apache/petstore/domain/Inventory.java Mon Jul 24 22:18:04 2006
@@ -1,6 +1,6 @@
-package org.objectstyle.petstore.domain;
+package org.apache.petstore.domain;
 
-import org.objectstyle.petstore.domain.auto._Inventory;
+import org.apache.petstore.domain.auto._Inventory;
 
 public class Inventory extends _Inventory {
 

Modified: incubator/cayenne/examples/trunk/cayenne-petstore/src/main/java/org/apache/petstore/domain/Item.java
URL: http://svn.apache.org/viewvc/incubator/cayenne/examples/trunk/cayenne-petstore/src/main/java/org/apache/petstore/domain/Item.java?rev=425284&r1=425031&r2=425284&view=diff
==============================================================================
--- incubator/cayenne/examples/trunk/cayenne-petstore/src/main/java/org/apache/petstore/domain/Item.java (original)
+++ incubator/cayenne/examples/trunk/cayenne-petstore/src/main/java/org/apache/petstore/domain/Item.java Mon Jul 24 22:18:04 2006
@@ -1,7 +1,7 @@
-package org.objectstyle.petstore.domain;
+package org.apache.petstore.domain;
 
-import org.objectstyle.cayenne.DataObjectUtils;
-import org.objectstyle.petstore.domain.auto._Item;
+import org.apache.cayenne.DataObjectUtils;
+import org.apache.petstore.domain.auto._Item;
 
 public class Item extends _Item {
 

Modified: incubator/cayenne/examples/trunk/cayenne-petstore/src/main/java/org/apache/petstore/domain/LineItem.java
URL: http://svn.apache.org/viewvc/incubator/cayenne/examples/trunk/cayenne-petstore/src/main/java/org/apache/petstore/domain/LineItem.java?rev=425284&r1=425031&r2=425284&view=diff
==============================================================================
--- incubator/cayenne/examples/trunk/cayenne-petstore/src/main/java/org/apache/petstore/domain/LineItem.java (original)
+++ incubator/cayenne/examples/trunk/cayenne-petstore/src/main/java/org/apache/petstore/domain/LineItem.java Mon Jul 24 22:18:04 2006
@@ -1,9 +1,8 @@
-package org.objectstyle.petstore.domain;
+package org.apache.petstore.domain;
 
 import java.math.BigDecimal;
-
-import org.objectstyle.cayenne.DataObjectUtils;
-import org.objectstyle.petstore.domain.auto._LineItem;
+import org.apache.cayenne.DataObjectUtils;
+import org.apache.petstore.domain.auto._LineItem;
 
 public class LineItem extends _LineItem {
 

Modified: incubator/cayenne/examples/trunk/cayenne-petstore/src/main/java/org/apache/petstore/domain/Order.java
URL: http://svn.apache.org/viewvc/incubator/cayenne/examples/trunk/cayenne-petstore/src/main/java/org/apache/petstore/domain/Order.java?rev=425284&r1=425031&r2=425284&view=diff
==============================================================================
--- incubator/cayenne/examples/trunk/cayenne-petstore/src/main/java/org/apache/petstore/domain/Order.java (original)
+++ incubator/cayenne/examples/trunk/cayenne-petstore/src/main/java/org/apache/petstore/domain/Order.java Mon Jul 24 22:18:04 2006
@@ -1,10 +1,9 @@
-package org.objectstyle.petstore.domain;
+package org.apache.petstore.domain;
 
 import java.util.Date;
 import java.util.Iterator;
-
-import org.objectstyle.cayenne.DataObjectUtils;
-import org.objectstyle.petstore.domain.auto._Order;
+import org.apache.cayenne.DataObjectUtils;
+import org.apache.petstore.domain.auto._Order;
 
 public class Order extends _Order {
 

Modified: incubator/cayenne/examples/trunk/cayenne-petstore/src/main/java/org/apache/petstore/domain/OrderStatus.java
URL: http://svn.apache.org/viewvc/incubator/cayenne/examples/trunk/cayenne-petstore/src/main/java/org/apache/petstore/domain/OrderStatus.java?rev=425284&r1=425031&r2=425284&view=diff
==============================================================================
--- incubator/cayenne/examples/trunk/cayenne-petstore/src/main/java/org/apache/petstore/domain/OrderStatus.java (original)
+++ incubator/cayenne/examples/trunk/cayenne-petstore/src/main/java/org/apache/petstore/domain/OrderStatus.java Mon Jul 24 22:18:04 2006
@@ -1,6 +1,6 @@
-package org.objectstyle.petstore.domain;
+package org.apache.petstore.domain;
 
-import org.objectstyle.petstore.domain.auto._OrderStatus;
+import org.apache.petstore.domain.auto._OrderStatus;
 
 public class OrderStatus extends _OrderStatus {
 

Modified: incubator/cayenne/examples/trunk/cayenne-petstore/src/main/java/org/apache/petstore/domain/Product.java
URL: http://svn.apache.org/viewvc/incubator/cayenne/examples/trunk/cayenne-petstore/src/main/java/org/apache/petstore/domain/Product.java?rev=425284&r1=425031&r2=425284&view=diff
==============================================================================
--- incubator/cayenne/examples/trunk/cayenne-petstore/src/main/java/org/apache/petstore/domain/Product.java (original)
+++ incubator/cayenne/examples/trunk/cayenne-petstore/src/main/java/org/apache/petstore/domain/Product.java Mon Jul 24 22:18:04 2006
@@ -1,7 +1,7 @@
-package org.objectstyle.petstore.domain;
+package org.apache.petstore.domain;
 
-import org.objectstyle.cayenne.DataObjectUtils;
-import org.objectstyle.petstore.domain.auto._Product;
+import org.apache.cayenne.DataObjectUtils;
+import org.apache.petstore.domain.auto._Product;
 
 public class Product extends _Product {
 

Modified: incubator/cayenne/examples/trunk/cayenne-petstore/src/main/java/org/apache/petstore/domain/Profile.java
URL: http://svn.apache.org/viewvc/incubator/cayenne/examples/trunk/cayenne-petstore/src/main/java/org/apache/petstore/domain/Profile.java?rev=425284&r1=425031&r2=425284&view=diff
==============================================================================
--- incubator/cayenne/examples/trunk/cayenne-petstore/src/main/java/org/apache/petstore/domain/Profile.java (original)
+++ incubator/cayenne/examples/trunk/cayenne-petstore/src/main/java/org/apache/petstore/domain/Profile.java Mon Jul 24 22:18:04 2006
@@ -1,6 +1,6 @@
-package org.objectstyle.petstore.domain;
+package org.apache.petstore.domain;
 
-import org.objectstyle.petstore.domain.auto._Profile;
+import org.apache.petstore.domain.auto._Profile;
 
 public class Profile extends _Profile {
 

Modified: incubator/cayenne/examples/trunk/cayenne-petstore/src/main/java/org/apache/petstore/domain/Supplier.java
URL: http://svn.apache.org/viewvc/incubator/cayenne/examples/trunk/cayenne-petstore/src/main/java/org/apache/petstore/domain/Supplier.java?rev=425284&r1=425031&r2=425284&view=diff
==============================================================================
--- incubator/cayenne/examples/trunk/cayenne-petstore/src/main/java/org/apache/petstore/domain/Supplier.java (original)
+++ incubator/cayenne/examples/trunk/cayenne-petstore/src/main/java/org/apache/petstore/domain/Supplier.java Mon Jul 24 22:18:04 2006
@@ -1,6 +1,6 @@
-package org.objectstyle.petstore.domain;
+package org.apache.petstore.domain;
 
-import org.objectstyle.petstore.domain.auto._Supplier;
+import org.apache.petstore.domain.auto._Supplier;
 
 public class Supplier extends _Supplier {
 

Modified: incubator/cayenne/examples/trunk/cayenne-petstore/src/main/java/org/apache/petstore/domain/User.java
URL: http://svn.apache.org/viewvc/incubator/cayenne/examples/trunk/cayenne-petstore/src/main/java/org/apache/petstore/domain/User.java?rev=425284&r1=425031&r2=425284&view=diff
==============================================================================
--- incubator/cayenne/examples/trunk/cayenne-petstore/src/main/java/org/apache/petstore/domain/User.java (original)
+++ incubator/cayenne/examples/trunk/cayenne-petstore/src/main/java/org/apache/petstore/domain/User.java Mon Jul 24 22:18:04 2006
@@ -1,6 +1,6 @@
-package org.objectstyle.petstore.domain;
+package org.apache.petstore.domain;
 
-import org.objectstyle.petstore.domain.auto._User;
+import org.apache.petstore.domain.auto._User;
 
 public class User extends _User {
 

Modified: incubator/cayenne/examples/trunk/cayenne-petstore/src/main/java/org/apache/petstore/domain/auto/_Account.java
URL: http://svn.apache.org/viewvc/incubator/cayenne/examples/trunk/cayenne-petstore/src/main/java/org/apache/petstore/domain/auto/_Account.java?rev=425284&r1=425031&r2=425284&view=diff
==============================================================================
--- incubator/cayenne/examples/trunk/cayenne-petstore/src/main/java/org/apache/petstore/domain/auto/_Account.java (original)
+++ incubator/cayenne/examples/trunk/cayenne-petstore/src/main/java/org/apache/petstore/domain/auto/_Account.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 _Account extends org.objectstyle.cayenne.CayenneDataObject {
+public class _Account extends org.apache.cayenne.CayenneDataObject {
 
     public static final String ADDRESS1_PROPERTY = "address1";
     public static final String ADDRESS2_PROPERTY = "address2";
@@ -123,10 +123,10 @@
     }
     
     
-    public void addToOrders(org.objectstyle.petstore.domain.Order obj) {
+    public void addToOrders(org.apache.petstore.domain.Order obj) {
         addToManyTarget("orders", obj, true);
     }
-    public void removeFromOrders(org.objectstyle.petstore.domain.Order obj) {
+    public void removeFromOrders(org.apache.petstore.domain.Order obj) {
         removeToManyTarget("orders", obj, true);
     }
     public List getOrders() {
@@ -134,21 +134,21 @@
     }
     
     
-    public void setProfile(org.objectstyle.petstore.domain.Profile profile) {
+    public void setProfile(org.apache.petstore.domain.Profile profile) {
         setToOneTarget("profile", profile, true);
     }
 
-    public org.objectstyle.petstore.domain.Profile getProfile() {
-        return (org.objectstyle.petstore.domain.Profile)readProperty("profile");
+    public org.apache.petstore.domain.Profile getProfile() {
+        return (org.apache.petstore.domain.Profile)readProperty("profile");
     } 
     
     
-    public void setUser(org.objectstyle.petstore.domain.User user) {
+    public void setUser(org.apache.petstore.domain.User user) {
         setToOneTarget("user", user, true);
     }
 
-    public org.objectstyle.petstore.domain.User getUser() {
-        return (org.objectstyle.petstore.domain.User)readProperty("user");
+    public org.apache.petstore.domain.User getUser() {
+        return (org.apache.petstore.domain.User)readProperty("user");
     } 
     
     

Modified: incubator/cayenne/examples/trunk/cayenne-petstore/src/main/java/org/apache/petstore/domain/auto/_BannerData.java
URL: http://svn.apache.org/viewvc/incubator/cayenne/examples/trunk/cayenne-petstore/src/main/java/org/apache/petstore/domain/auto/_BannerData.java?rev=425284&r1=425031&r2=425284&view=diff
==============================================================================
--- incubator/cayenne/examples/trunk/cayenne-petstore/src/main/java/org/apache/petstore/domain/auto/_BannerData.java (original)
+++ incubator/cayenne/examples/trunk/cayenne-petstore/src/main/java/org/apache/petstore/domain/auto/_BannerData.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 _BannerData 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 _BannerData extends org.objectstyle.cayenne.CayenneDataObject {
+public class _BannerData extends org.apache.cayenne.CayenneDataObject {
 
     public static final String BANNER_NAME_PROPERTY = "bannerName";
     public static final String CATEGORY_PROPERTY = "category";
@@ -20,12 +20,12 @@
     }
     
     
-    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/_Category.java
URL: http://svn.apache.org/viewvc/incubator/cayenne/examples/trunk/cayenne-petstore/src/main/java/org/apache/petstore/domain/auto/_Category.java?rev=425284&r1=425031&r2=425284&view=diff
==============================================================================
--- incubator/cayenne/examples/trunk/cayenne-petstore/src/main/java/org/apache/petstore/domain/auto/_Category.java (original)
+++ incubator/cayenne/examples/trunk/cayenne-petstore/src/main/java/org/apache/petstore/domain/auto/_Category.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 _Category extends org.objectstyle.cayenne.CayenneDataObject {
+public class _Category extends org.apache.cayenne.CayenneDataObject {
 
     public static final String DESCRIPTION_PROPERTY = "description";
     public static final String NAME_PROPERTY = "name";
@@ -33,19 +33,19 @@
     }
     
     
-    public void setBanner(org.objectstyle.petstore.domain.BannerData banner) {
+    public void setBanner(org.apache.petstore.domain.BannerData banner) {
         setToOneTarget("banner", banner, true);
     }
 
-    public org.objectstyle.petstore.domain.BannerData getBanner() {
-        return (org.objectstyle.petstore.domain.BannerData)readProperty("banner");
+    public org.apache.petstore.domain.BannerData getBanner() {
+        return (org.apache.petstore.domain.BannerData)readProperty("banner");
     } 
     
     
-    public void addToProducts(org.objectstyle.petstore.domain.Product obj) {
+    public void addToProducts(org.apache.petstore.domain.Product obj) {
         addToManyTarget("products", obj, true);
     }
-    public void removeFromProducts(org.objectstyle.petstore.domain.Product obj) {
+    public void removeFromProducts(org.apache.petstore.domain.Product obj) {
         removeToManyTarget("products", obj, true);
     }
     public List getProducts() {
@@ -53,10 +53,10 @@
     }
     
     
-    public void addToProfiles(org.objectstyle.petstore.domain.Profile obj) {
+    public void addToProfiles(org.apache.petstore.domain.Profile obj) {
         addToManyTarget("profiles", obj, true);
     }
-    public void removeFromProfiles(org.objectstyle.petstore.domain.Profile obj) {
+    public void removeFromProfiles(org.apache.petstore.domain.Profile obj) {
         removeToManyTarget("profiles", obj, true);
     }
     public List getProfiles() {

Modified: incubator/cayenne/examples/trunk/cayenne-petstore/src/main/java/org/apache/petstore/domain/auto/_Inventory.java
URL: http://svn.apache.org/viewvc/incubator/cayenne/examples/trunk/cayenne-petstore/src/main/java/org/apache/petstore/domain/auto/_Inventory.java?rev=425284&r1=425031&r2=425284&view=diff
==============================================================================
--- incubator/cayenne/examples/trunk/cayenne-petstore/src/main/java/org/apache/petstore/domain/auto/_Inventory.java (original)
+++ incubator/cayenne/examples/trunk/cayenne-petstore/src/main/java/org/apache/petstore/domain/auto/_Inventory.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 _Inventory 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 _Inventory extends org.objectstyle.cayenne.CayenneDataObject {
+public class _Inventory extends org.apache.cayenne.CayenneDataObject {
 
     public static final String QUANTITY_PROPERTY = "quantity";
     public static final String ITEM_PROPERTY = "item";
@@ -20,12 +20,12 @@
     }
     
     
-    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");
     } 
     
     

Modified: incubator/cayenne/examples/trunk/cayenne-petstore/src/main/java/org/apache/petstore/domain/auto/_Item.java
URL: http://svn.apache.org/viewvc/incubator/cayenne/examples/trunk/cayenne-petstore/src/main/java/org/apache/petstore/domain/auto/_Item.java?rev=425284&r1=425031&r2=425284&view=diff
==============================================================================
--- incubator/cayenne/examples/trunk/cayenne-petstore/src/main/java/org/apache/petstore/domain/auto/_Item.java (original)
+++ incubator/cayenne/examples/trunk/cayenne-petstore/src/main/java/org/apache/petstore/domain/auto/_Item.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 _Item extends org.objectstyle.cayenne.CayenneDataObject {
+public class _Item extends org.apache.cayenne.CayenneDataObject {
 
     public static final String ATTRIBUTE1_PROPERTY = "attribute1";
     public static final String ATTRIBUTE2_PROPERTY = "attribute2";
@@ -88,19 +88,19 @@
     }
     
     
-    public void setInventory(org.objectstyle.petstore.domain.Inventory inventory) {
+    public void setInventory(org.apache.petstore.domain.Inventory inventory) {
         setToOneTarget("inventory", inventory, true);
     }
 
-    public org.objectstyle.petstore.domain.Inventory getInventory() {
-        return (org.objectstyle.petstore.domain.Inventory)readProperty("inventory");
+    public org.apache.petstore.domain.Inventory getInventory() {
+        return (org.apache.petstore.domain.Inventory)readProperty("inventory");
     } 
     
     
-    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() {
@@ -108,21 +108,21 @@
     }
     
     
-    public void setProduct(org.objectstyle.petstore.domain.Product product) {
+    public void setProduct(org.apache.petstore.domain.Product product) {
         setToOneTarget("product", product, true);
     }
 
-    public org.objectstyle.petstore.domain.Product getProduct() {
-        return (org.objectstyle.petstore.domain.Product)readProperty("product");
+    public org.apache.petstore.domain.Product getProduct() {
+        return (org.apache.petstore.domain.Product)readProperty("product");
     } 
     
     
-    public void setSupplier(org.objectstyle.petstore.domain.Supplier supplier) {
+    public void setSupplier(org.apache.petstore.domain.Supplier supplier) {
         setToOneTarget("supplier", supplier, true);
     }
 
-    public org.objectstyle.petstore.domain.Supplier getSupplier() {
-        return (org.objectstyle.petstore.domain.Supplier)readProperty("supplier");
+    public org.apache.petstore.domain.Supplier getSupplier() {
+        return (org.apache.petstore.domain.Supplier)readProperty("supplier");
     }