Author: bdudney
Date: Tue Oct 24 08:38:10 2006
New Revision: 467358
URL: http://svn.apache.org/viewvc?view=rev&rev=467358
Log:
more updates to the tutorial, made some small changes to make the tutorial
easier to use
Added:
incubator/cayenne/main/trunk/tutorials/quick-start/cayenne-tutorial/src/main/resources/ArtWorkDomainMap.map.xml
- copied, changed from r467318,
incubator/cayenne/main/trunk/tutorials/quick-start/cayenne-tutorial/src/main/resources/UntitledDomainMap.map.xml
incubator/cayenne/main/trunk/tutorials/quick-start/cayenne-tutorial/src/main/resources/ArtWorkDomainNode.driver.xml
- copied, changed from r467318,
incubator/cayenne/main/trunk/tutorials/quick-start/cayenne-tutorial/src/main/resources/UntitledDomainNode.driver.xml
Removed:
incubator/cayenne/main/trunk/tutorials/quick-start/cayenne-tutorial/src/main/resources/UntitledDomainMap.map.xml
incubator/cayenne/main/trunk/tutorials/quick-start/cayenne-tutorial/src/main/resources/UntitledDomainNode.driver.xml
Modified:
incubator/cayenne/main/trunk/tutorials/quick-start-rop/cayenne-rop-server-tutorial/.classpath
incubator/cayenne/main/trunk/tutorials/quick-start-rop/cayenne-rop-server-tutorial/src/main/resources/ROPServerTutorialDomainNode.driver.xml
incubator/cayenne/main/trunk/tutorials/quick-start/cayenne-tutorial/
(props changed)
incubator/cayenne/main/trunk/tutorials/quick-start/cayenne-tutorial/src/main/resources/cayenne.xml
Modified:
incubator/cayenne/main/trunk/tutorials/quick-start-rop/cayenne-rop-server-tutorial/.classpath
URL:
http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/tutorials/quick-start-rop/cayenne-rop-server-tutorial/.classpath?view=diff&rev=467358&r1=467357&r2=467358
==============================================================================
---
incubator/cayenne/main/trunk/tutorials/quick-start-rop/cayenne-rop-server-tutorial/.classpath
(original)
+++
incubator/cayenne/main/trunk/tutorials/quick-start-rop/cayenne-rop-server-tutorial/.classpath
Tue Oct 24 08:38:10 2006
@@ -1,17 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="src" path="src/main/java"/>
- <classpathentry kind="src" path="src/main/resources"/>
- <classpathentry kind="output" path="target/classes"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="var"
path="M2_REPO/org/objectstyle/ashwood/ashwood/1.1/ashwood-1.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/asm/asm/2.2.3/asm-2.2.3.jar"/>
- <classpathentry kind="var"
path="M2_REPO/org/apache/cayenne/core/cayenne-jdk1.5/3.0-incubating-SNAPSHOT/cayenne-jdk1.5-3.0-incubating-SNAPSHOT.jar"
sourcepath="M2_REPO/org/apache/cayenne/core/cayenne-jdk1.5/3.0-incubating-SNAPSHOT/cayenne-jdk1.5-3.0-incubating-SNAPSHOT-sources.jar"/>
- <classpathentry kind="src" path="/cayenne-rop-client-tutorial"/>
- <classpathentry kind="var"
path="M2_REPO/com/caucho/hessian/3.0.13/hessian-3.0.13.jar"/>
- <classpathentry kind="var"
path="M2_REPO/org/apache/cayenne/core/cayenne-jdk1.4/3.0-incubating-SNAPSHOT/cayenne-jdk1.4-3.0-incubating-SNAPSHOT.jar"
sourcepath="M2_REPO/org/apache/cayenne/core/cayenne-jdk1.4/3.0-incubating-SNAPSHOT/cayenne-jdk1.4-3.0-incubating-SNAPSHOT-sources.jar"/>
- <classpathentry kind="var"
path="M2_REPO/velocity/velocity/1.3/velocity-1.3.jar"/>
- <classpathentry kind="var"
path="M2_REPO/commons-collections/commons-collections/3.1/commons-collections-3.1.jar"/>
- <classpathentry kind="var"
path="M2_REPO/commons-lang/commons-lang/2.1/commons-lang-2.1.jar"/>
- <classpathentry kind="var"
path="M2_REPO/org/apache/derby/derby/10.1.3.1/derby-10.1.3.1.jar"/>
- <classpathentry kind="var"
path="M2_REPO/commons-logging/commons-logging/1.1/commons-logging-1.1.jar"/>
-</classpath>
\ No newline at end of file
+ <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="var"
path="M2_REPO/org/objectstyle/ashwood/ashwood/1.1/ashwood-1.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/asm/asm/2.2.3/asm-2.2.3.jar"/>
+ <classpathentry kind="var"
path="M2_REPO/org/apache/cayenne/core/cayenne-jdk1.5/3.0-incubating-SNAPSHOT/cayenne-jdk1.5-3.0-incubating-SNAPSHOT.jar"
sourcepath="M2_REPO/org/apache/cayenne/core/cayenne-jdk1.5/3.0-incubating-SNAPSHOT/cayenne-jdk1.5-3.0-incubating-SNAPSHOT-sources.jar"/>
+ <classpathentry kind="src" path="/cayenne-rop-client-tutorial"/>
+ <classpathentry kind="var"
path="M2_REPO/com/caucho/hessian/3.0.13/hessian-3.0.13.jar"/>
+ <classpathentry kind="var"
path="M2_REPO/org/apache/cayenne/core/cayenne-jdk1.4/3.0-incubating-SNAPSHOT/cayenne-jdk1.4-3.0-incubating-SNAPSHOT.jar"
sourcepath="M2_REPO/org/apache/cayenne/core/cayenne-jdk1.4/3.0-incubating-SNAPSHOT/cayenne-jdk1.4-3.0-incubating-SNAPSHOT-sources.jar"/>
+ <classpathentry kind="var"
path="M2_REPO/velocity/velocity/1.3/velocity-1.3.jar"/>
+ <classpathentry kind="var"
path="M2_REPO/commons-collections/commons-collections/3.1/commons-collections-3.1.jar"/>
+ <classpathentry kind="var"
path="M2_REPO/commons-lang/commons-lang/2.1/commons-lang-2.1.jar"/>
+ <classpathentry kind="var"
path="M2_REPO/org/apache/derby/derby/10.1.3.1/derby-10.1.3.1.jar"/>
+ <classpathentry kind="var"
path="M2_REPO/commons-logging/commons-logging/1.1/commons-logging-1.1.jar"/>
+ <classpathentry kind="output" path="target/classes"/>
+</classpath>
Modified:
incubator/cayenne/main/trunk/tutorials/quick-start-rop/cayenne-rop-server-tutorial/src/main/resources/ROPServerTutorialDomainNode.driver.xml
URL:
http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/tutorials/quick-start-rop/cayenne-rop-server-tutorial/src/main/resources/ROPServerTutorialDomainNode.driver.xml?view=diff&rev=467358&r1=467357&r2=467358
==============================================================================
---
incubator/cayenne/main/trunk/tutorials/quick-start-rop/cayenne-rop-server-tutorial/src/main/resources/ROPServerTutorialDomainNode.driver.xml
(original)
+++
incubator/cayenne/main/trunk/tutorials/quick-start-rop/cayenne-rop-server-tutorial/src/main/resources/ROPServerTutorialDomainNode.driver.xml
Tue Oct 24 08:38:10 2006
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<driver project-version="2.0" class="org.apache.derby.jdbc.EmbeddedDriver">
- <url value="jdbc:derby:/tmp/testdb"/>
+ <url value="jdbc:derby:/tmp/testdb;create=true"/>
<connectionPool min="1" max="1" />
</driver>
Propchange: incubator/cayenne/main/trunk/tutorials/quick-start/cayenne-tutorial/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Tue Oct 24 08:38:10 2006
@@ -1,2 +1,2 @@
-
+derby.log
bin
Copied:
incubator/cayenne/main/trunk/tutorials/quick-start/cayenne-tutorial/src/main/resources/ArtWorkDomainMap.map.xml
(from r467318,
incubator/cayenne/main/trunk/tutorials/quick-start/cayenne-tutorial/src/main/resources/UntitledDomainMap.map.xml)
URL:
http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/tutorials/quick-start/cayenne-tutorial/src/main/resources/ArtWorkDomainMap.map.xml?view=diff&rev=467358&p1=incubator/cayenne/main/trunk/tutorials/quick-start/cayenne-tutorial/src/main/resources/UntitledDomainMap.map.xml&r1=467318&p2=incubator/cayenne/main/trunk/tutorials/quick-start/cayenne-tutorial/src/main/resources/ArtWorkDomainMap.map.xml&r2=467358
==============================================================================
---
incubator/cayenne/main/trunk/tutorials/quick-start/cayenne-tutorial/src/main/resources/UntitledDomainMap.map.xml
(original)
+++
incubator/cayenne/main/trunk/tutorials/quick-start/cayenne-tutorial/src/main/resources/ArtWorkDomainMap.map.xml
Tue Oct 24 08:38:10 2006
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<data-map project-version="1.1">
+<data-map project-version="2.0">
<property name="defaultPackage" value="cayenne.tutorial"/>
<db-entity name="ARTIST">
<db-attribute name="DATE_OF_BIRTH" type="DATE"/>
@@ -42,7 +42,7 @@
<obj-relationship name="paintings" source="Gallery" target="Painting"
deleteRule="Cascade" db-relationship-path="paintings"/>
<obj-relationship name="artist" source="Painting" target="Artist"
deleteRule="Nullify" db-relationship-path="artist"/>
<obj-relationship name="gallery" source="Painting" target="Gallery"
deleteRule="Nullify" db-relationship-path="gallery"/>
- <query name="DeleteAll"
factory="org.apache.cayenne.map.SQLTemplateBuilder" root="data-map"
root-name="UntitledDomainMap">
+ <query name="DeleteAll"
factory="org.apache.cayenne.map.SQLTemplateBuilder" root="data-map"
root-name="ArtWorkDomainMap">
<property name="cayenne.GenericSelectQuery.fetchingDataRows"
value="true"/>
<sql><![CDATA[delete from $table]]></sql>
</query>
Copied:
incubator/cayenne/main/trunk/tutorials/quick-start/cayenne-tutorial/src/main/resources/ArtWorkDomainNode.driver.xml
(from r467318,
incubator/cayenne/main/trunk/tutorials/quick-start/cayenne-tutorial/src/main/resources/UntitledDomainNode.driver.xml)
URL:
http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/tutorials/quick-start/cayenne-tutorial/src/main/resources/ArtWorkDomainNode.driver.xml?view=diff&rev=467358&p1=incubator/cayenne/main/trunk/tutorials/quick-start/cayenne-tutorial/src/main/resources/UntitledDomainNode.driver.xml&r1=467318&p2=incubator/cayenne/main/trunk/tutorials/quick-start/cayenne-tutorial/src/main/resources/ArtWorkDomainNode.driver.xml&r2=467358
==============================================================================
---
incubator/cayenne/main/trunk/tutorials/quick-start/cayenne-tutorial/src/main/resources/UntitledDomainNode.driver.xml
(original)
+++
incubator/cayenne/main/trunk/tutorials/quick-start/cayenne-tutorial/src/main/resources/ArtWorkDomainNode.driver.xml
Tue Oct 24 08:38:10 2006
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<driver project-version="1.1" class="org.apache.derby.jdbc.EmbeddedDriver">
- <url value="jdbc:derby:/Users/andrus/Desktop/testdb;create=true"/>
+<driver project-version="2.0" class="org.apache.derby.jdbc.EmbeddedDriver">
+ <url value="jdbc:derby:/tmp/testdb;create=true"/>
<connectionPool min="1" max="1" />
</driver>
Modified:
incubator/cayenne/main/trunk/tutorials/quick-start/cayenne-tutorial/src/main/resources/cayenne.xml
URL:
http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/tutorials/quick-start/cayenne-tutorial/src/main/resources/cayenne.xml?view=diff&rev=467358&r1=467357&r2=467358
==============================================================================
---
incubator/cayenne/main/trunk/tutorials/quick-start/cayenne-tutorial/src/main/resources/cayenne.xml
(original)
+++
incubator/cayenne/main/trunk/tutorials/quick-start/cayenne-tutorial/src/main/resources/cayenne.xml
Tue Oct 24 08:38:10 2006
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="utf-8"?>
-<domains project-version="1.1">
-<domain name="UntitledDomain">
- <map name="UntitledDomainMap" location="UntitledDomainMap.map.xml"/>
+<domains project-version="2.0">
+<domain name="ArtWorkDomain">
+ <map name="ArtWorkDomainMap" location="ArtWorkDomainMap.map.xml"/>
- <node name="UntitledDomainNode"
- datasource="UntitledDomainNode.driver.xml"
+ <node name="ArtWorkDomainNode"
+ datasource="ArtWorkDomainNode.driver.xml"
factory="org.apache.cayenne.conf.DriverDataSourceFactory">
- <map-ref name="UntitledDomainMap"/>
+ <map-ref name="ArtWorkDomainMap"/>
</node>
</domain>
</domains>
