Author: bdudney
Date: Sat Oct 21 07:24:55 2006
New Revision: 466404
URL: http://svn.apache.org/viewvc?view=rev&rev=466404
Log:
works with maven
Added:
incubator/cayenne/main/trunk/tutorials/quick-start-rop/cayenne-rop-client-tutorial/pom.xml
incubator/cayenne/main/trunk/tutorials/quick-start-rop/cayenne-rop-server-tutorial/pom.xml
incubator/cayenne/main/trunk/tutorials/quick-start-rop/cayenne-rop-server-tutorial/src/main/resources/ROPServerTutorialDomainMap.map.xml
- copied, changed from r466380,
incubator/cayenne/main/trunk/tutorials/quick-start-rop/cayenne-rop-server-tutorial/src/main/resources/UntitledDomainMap.map.xml
incubator/cayenne/main/trunk/tutorials/quick-start-rop/cayenne-rop-server-tutorial/src/main/resources/ROPServerTutorialDomainNode.driver.xml
- copied, changed from r466380,
incubator/cayenne/main/trunk/tutorials/quick-start-rop/cayenne-rop-server-tutorial/src/main/resources/UntitledDomainNode.driver.xml
incubator/cayenne/main/trunk/tutorials/quick-start-rop/pom.xml
Removed:
incubator/cayenne/main/trunk/tutorials/quick-start-rop/cayenne-rop-server-tutorial/src/main/resources/UntitledDomainMap.map.xml
incubator/cayenne/main/trunk/tutorials/quick-start-rop/cayenne-rop-server-tutorial/src/main/resources/UntitledDomainNode.driver.xml
Modified:
incubator/cayenne/main/trunk/tutorials/quick-start-rop/cayenne-rop-client-tutorial/.classpath
incubator/cayenne/main/trunk/tutorials/quick-start-rop/cayenne-rop-client-tutorial/.project
incubator/cayenne/main/trunk/tutorials/quick-start-rop/cayenne-rop-client-tutorial/src/main/java/cayenne/tutorial/client/Main.java
incubator/cayenne/main/trunk/tutorials/quick-start-rop/cayenne-rop-server-tutorial/
(props changed)
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/.project
incubator/cayenne/main/trunk/tutorials/quick-start-rop/cayenne-rop-server-tutorial/jetty-run-config.xml
incubator/cayenne/main/trunk/tutorials/quick-start-rop/cayenne-rop-server-tutorial/src/main/resources/cayenne.xml
Modified:
incubator/cayenne/main/trunk/tutorials/quick-start-rop/cayenne-rop-client-tutorial/.classpath
URL:
http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/tutorials/quick-start-rop/cayenne-rop-client-tutorial/.classpath?view=diff&rev=466404&r1=466403&r2=466404
==============================================================================
---
incubator/cayenne/main/trunk/tutorials/quick-start-rop/cayenne-rop-client-tutorial/.classpath
(original)
+++
incubator/cayenne/main/trunk/tutorials/quick-start-rop/cayenne-rop-client-tutorial/.classpath
Sat Oct 21 07:24:55 2006
@@ -1,11 +1,14 @@
-<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="src" path="src"/>
- <classpathentry kind="con"
path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="lib"
path="/Users/andrus/Desktop/cayenne-1.2RC2/lib/cayenne-client-nodeps.jar"/>
- <classpathentry kind="lib"
path="/Users/andrus/opt/commons-logging-1.0.4/commons-logging.jar"/>
- <classpathentry kind="lib"
path="/Users/andrus/opt/commons-collections-3.1/commons-collections-3.1.jar"/>
- <classpathentry kind="lib"
path="/Users/andrus/opt/commons-lang-2.1/commons-lang-2.1.jar"/>
- <classpathentry kind="lib"
path="/Users/andrus/opt/hessian-3.0.13/hessian-3.0.13.jar"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
+ <classpathentry kind="src" path="src/main/java"/>
+ <classpathentry kind="output" path="target/classes"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry kind="var"
path="M2_REPO/com/caucho/hessian/3.0.13/hessian-3.0.13.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/objectstyle/ashwood/ashwood/1.1/ashwood-1.1.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="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/commons-logging/commons-logging/1.1/commons-logging-1.1.jar"/>
+ <classpathentry kind="var"
path="M2_REPO/commons-collections/commons-collections/3.1/commons-collections-3.1.jar"/>
+ <classpathentry kind="var"
path="M2_REPO/velocity/velocity/1.3/velocity-1.3.jar"/>
+ <classpathentry kind="var" path="M2_REPO/asm/asm/2.2.3/asm-2.2.3.jar"/>
+</classpath>
\ No newline at end of file
Modified:
incubator/cayenne/main/trunk/tutorials/quick-start-rop/cayenne-rop-client-tutorial/.project
URL:
http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/tutorials/quick-start-rop/cayenne-rop-client-tutorial/.project?view=diff&rev=466404&r1=466403&r2=466404
==============================================================================
---
incubator/cayenne/main/trunk/tutorials/quick-start-rop/cayenne-rop-client-tutorial/.project
(original)
+++
incubator/cayenne/main/trunk/tutorials/quick-start-rop/cayenne-rop-client-tutorial/.project
Sat Oct 21 07:24:55 2006
@@ -1,17 +1,15 @@
-<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>cayenne-rop-client-tutorial</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
-</projectDescription>
+ <name>cayenne-rop-client-tutorial</name>
+ <comment>Apache Cayenne is a powerful, full-featured Java Object
+ Relational Mapping framework currently in incubation.</comment>
+ <projects/>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments/>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ </natures>
+</projectDescription>
\ No newline at end of file
Added:
incubator/cayenne/main/trunk/tutorials/quick-start-rop/cayenne-rop-client-tutorial/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/tutorials/quick-start-rop/cayenne-rop-client-tutorial/pom.xml?view=auto&rev=466404
==============================================================================
---
incubator/cayenne/main/trunk/tutorials/quick-start-rop/cayenne-rop-client-tutorial/pom.xml
(added)
+++
incubator/cayenne/main/trunk/tutorials/quick-start-rop/cayenne-rop-client-tutorial/pom.xml
Sat Oct 21 07:24:55 2006
@@ -0,0 +1,105 @@
+<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.rop.tutorials</groupId>
+ <artifactId>cayenne-rop-tutorial-parent</artifactId>
+ <version>3.0-incubating-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>cayenne-rop-client-tutorial</artifactId>
+ <packaging>jar</packaging>
+ <name>Cayenne ROP Client Tutorial</name>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.cayenne.core</groupId>
+ <artifactId>cayenne-jdk1.4</artifactId>
+ <version>3.0-incubating-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cayenne.core</groupId>
+ <artifactId>cayenne-jdk1.5</artifactId>
+ <version>3.0-incubating-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>com.caucho</groupId>
+ <artifactId>hessian</artifactId>
+ <version>3.0.13</version>
+ <!-- not sure why this is required but it does not make
+ it to the war file if its not set to compile -->
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ <version>1.0.4</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-collections</groupId>
+ <artifactId>commons-collections</artifactId>
+ <version>3.1</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
+ <version>2.1</version>
+ </dependency>
+ </dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <configuration>
+ <archive>
+ <manifest>
+ <mainClass>cayenne.tutorial.client.Main</mainClass>
+ <addClasspath>true</addClasspath>
+ </manifest>
+ </archive>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <version>2.0-ALPHA-1-SNAPSHOT</version>
+ <executions>
+ <execution>
+ <id>copy-dependencies</id>
+ <phase>package</phase>
+ <goals>
+ <goal>copy-dependencies</goal>
+ </goals>
+ <configuration>
+ <outputDirectory>${project.build.directory}</outputDirectory>
+ <overWriteReleases>false</overWriteReleases>
+ <overWriteSnapshots>true</overWriteSnapshots>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ <pluginRepositories>
+ <pluginRepository>
+ <snapshots>
+ <enabled>true</enabled>
+ <updatePolicy>daily</updatePolicy>
+ </snapshots>
+ <id>apache-snapshot-repo</id>
+ <name>apache-snapshot-repo</name>
+ <url>http://people.apache.org/repo/m2-snapshot-repository</url>
+ </pluginRepository>
+ </pluginRepositories>
+ <repositories>
+ <repository>
+ <snapshots>
+ <enabled>true</enabled>
+ <updatePolicy>daily</updatePolicy>
+ </snapshots>
+ <id>apache-snapshot-repo</id>
+ <name>apache-snapshot-repo</name>
+ <url>http://people.apache.org/repo/m2-snapshot-repository</url>
+ </repository>
+ </repositories>
+</project>
Modified:
incubator/cayenne/main/trunk/tutorials/quick-start-rop/cayenne-rop-client-tutorial/src/main/java/cayenne/tutorial/client/Main.java
URL:
http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/tutorials/quick-start-rop/cayenne-rop-client-tutorial/src/main/java/cayenne/tutorial/client/Main.java?view=diff&rev=466404&r1=466403&r2=466404
==============================================================================
---
incubator/cayenne/main/trunk/tutorials/quick-start-rop/cayenne-rop-client-tutorial/src/main/java/cayenne/tutorial/client/Main.java
(original)
+++
incubator/cayenne/main/trunk/tutorials/quick-start-rop/cayenne-rop-client-tutorial/src/main/java/cayenne/tutorial/client/Main.java
Sat Oct 21 07:24:55 2006
@@ -43,7 +43,7 @@
public static void main(String[] args) {
ClientConnection connection = new HessianConnection(
- "http://localhost:8080/cayenne-service";,
"cayenne-user",
+
"http://localhost:8080/cayenne-rop-server-tutorial/cayenne-service";,
"cayenne-user",
"secret", null);
DataChannel channel = new ClientChannel(connection);
Propchange:
incubator/cayenne/main/trunk/tutorials/quick-start-rop/cayenne-rop-server-tutorial/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Sat Oct 21 07:24:55 2006
@@ -1,2 +1,2 @@
-
+derby.log
bin
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=466404&r1=466403&r2=466404
==============================================================================
---
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
Sat Oct 21 07:24:55 2006
@@ -1,8 +1,17 @@
-<?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-tutorial-client"/>
- <classpathentry kind="output" path="bin"/>
-</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
Modified:
incubator/cayenne/main/trunk/tutorials/quick-start-rop/cayenne-rop-server-tutorial/.project
URL:
http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/tutorials/quick-start-rop/cayenne-rop-server-tutorial/.project?view=diff&rev=466404&r1=466403&r2=466404
==============================================================================
---
incubator/cayenne/main/trunk/tutorials/quick-start-rop/cayenne-rop-server-tutorial/.project
(original)
+++
incubator/cayenne/main/trunk/tutorials/quick-start-rop/cayenne-rop-server-tutorial/.project
Sat Oct 21 07:24:55 2006
@@ -1,17 +1,17 @@
-<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>cayenne-rop-server-tutorial</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
-</projectDescription>
+ <name>cayenne-rop-server-tutorial</name>
+ <comment>Apache Cayenne is a powerful, full-featured Java Object
+ Relational Mapping framework currently in incubation.</comment>
+ <projects>
+ <project>cayenne-rop-client-tutorial</project>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments/>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ </natures>
+</projectDescription>
\ No newline at end of file
Modified:
incubator/cayenne/main/trunk/tutorials/quick-start-rop/cayenne-rop-server-tutorial/jetty-run-config.xml
URL:
http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/tutorials/quick-start-rop/cayenne-rop-server-tutorial/jetty-run-config.xml?view=diff&rev=466404&r1=466403&r2=466404
==============================================================================
---
incubator/cayenne/main/trunk/tutorials/quick-start-rop/cayenne-rop-server-tutorial/jetty-run-config.xml
(original)
+++
incubator/cayenne/main/trunk/tutorials/quick-start-rop/cayenne-rop-server-tutorial/jetty-run-config.xml
Sat Oct 21 07:24:55 2006
@@ -22,39 +22,45 @@
<Configure class="org.mortbay.jetty.Server">
- <Call name="addListener">
- <Arg>
- <New class="org.mortbay.http.SocketListener">
- <Set name="Port"><SystemProperty name="jetty.port"
default="8080"/>
- </Set>
- <Set name="MinThreads">2</Set>
- <Set name="MaxThreads">100</Set>
- <Set name="MaxIdleTimeMs">30000</Set>
- <Set name="LowResourcePersistTimeMs">5000</Set>
- <Set name="PoolName">Listener</Set>
- <Set name="ConfidentialPort">8443</Set>
- <Set name="IntegralPort">8443</Set>
- </New>
- </Arg>
- </Call>
-
- <Set name="WebApplicationConfigurationClassNames">
- <Array type="java.lang.String">
- <Item>org.mortbay.jetty.servlet.XMLConfiguration</Item>
- </Array>
+ <!-- =========================================================== -->
+ <!-- Server Thread Pool -->
+ <!-- =========================================================== -->
+ <Set name="ThreadPool">
+ <New class="org.mortbay.thread.BoundedThreadPool">
+ <Set name="minThreads">10</Set>
+ <Set name="lowThreads">50</Set>
+ <Set name="maxThreads">250</Set>
+ </New>
</Set>
-
- <Call name="addRealm">
- <Arg>
- <New class="org.mortbay.http.HashUserRealm">
- <Arg>Cayenne Realm</Arg>
- <Arg><SystemProperty name="user.dir"
default="."/>/jetty-realm.properties</Arg>
- </New>
- </Arg>
+
+ <!-- =========================================================== -->
+ <!-- Set connectors -->
+ <!-- =========================================================== -->
+ <!-- One of each type! -->
+ <!-- =========================================================== -->
+
+ <!-- Use this connector for many frequently idle connections
+ and for threadless continuations.
+ -->
+ <Call name="addConnector">
+ <Arg>
+ <New class="org.mortbay.jetty.nio.SelectChannelConnector">
+ <Set name="port"><SystemProperty name="jetty.port"
default="8080"/></Set>
+ <Set name="maxIdleTime">30000</Set>
+ <Set name="Acceptors">2</Set>
+ <Set name="confidentialPort">8443</Set>
+ </New>
+ </Arg>
</Call>
+
- <Call name="addWebApplication">
- <Arg>/</Arg>
- <Arg>webapp</Arg>
+ <Call name="addUserRealm">
+ <Arg>
+ <New class="org.mortbay.jetty.security.HashUserRealm">
+ <Set name="name">Cayenne Realm</Set>
+ <Set name="config">jetty-realm.properties</Set>
+ </New>
+ </Arg>
</Call>
+
</Configure>
Added:
incubator/cayenne/main/trunk/tutorials/quick-start-rop/cayenne-rop-server-tutorial/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/tutorials/quick-start-rop/cayenne-rop-server-tutorial/pom.xml?view=auto&rev=466404
==============================================================================
---
incubator/cayenne/main/trunk/tutorials/quick-start-rop/cayenne-rop-server-tutorial/pom.xml
(added)
+++
incubator/cayenne/main/trunk/tutorials/quick-start-rop/cayenne-rop-server-tutorial/pom.xml
Sat Oct 21 07:24:55 2006
@@ -0,0 +1,80 @@
+<?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.
+-->
+
+<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.rop.tutorials</groupId>
+ <artifactId>cayenne-rop-tutorial-parent</artifactId>
+ <version>3.0-incubating-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>cayenne-rop-server-tutorial</artifactId>
+ <packaging>war</packaging>
+ <name>Cayenne ROP Server Tutorial</name>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.cayenne.core</groupId>
+ <artifactId>cayenne-jdk1.4</artifactId>
+ <version>3.0-incubating-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cayenne.core</groupId>
+ <artifactId>cayenne-jdk1.5</artifactId>
+ <version>3.0-incubating-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.derby</groupId>
+ <artifactId>derby</artifactId>
+ <version>10.1.3.1</version>
+ </dependency>
+ <dependency>
+ <groupId>com.caucho</groupId>
+ <artifactId>hessian</artifactId>
+ <version>3.0.13</version>
+ <!-- not sure why this is required but it does not make
+ it to the war file if its not set to compile -->
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cayenne.rop.tutorials</groupId>
+ <artifactId>cayenne-rop-client-tutorial</artifactId>
+ <version>3.0-incubating-SNAPSHOT</version>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <finalName>cayenne-rop-server-tutorial</finalName>
+ <plugins>
+ <plugin>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>maven-jetty-plugin</artifactId>
+ <configuration>
+ <jettyConfig>jetty-run-config.xml</jettyConfig>
+ <userRealms>
+ <userRealm
implementation="org.mortbay.jetty.security.HashUserRealm">
+ <name>Cayenne Realm</name>
+ <config>jetty-realm.properties</config>
+ </userRealm>
+ </userRealms>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
Copied:
incubator/cayenne/main/trunk/tutorials/quick-start-rop/cayenne-rop-server-tutorial/src/main/resources/ROPServerTutorialDomainMap.map.xml
(from r466380,
incubator/cayenne/main/trunk/tutorials/quick-start-rop/cayenne-rop-server-tutorial/src/main/resources/UntitledDomainMap.map.xml)
URL:
http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/tutorials/quick-start-rop/cayenne-rop-server-tutorial/src/main/resources/ROPServerTutorialDomainMap.map.xml?view=diff&rev=466404&p1=incubator/cayenne/main/trunk/tutorials/quick-start-rop/cayenne-rop-server-tutorial/src/main/resources/UntitledDomainMap.map.xml&r1=466380&p2=incubator/cayenne/main/trunk/tutorials/quick-start-rop/cayenne-rop-server-tutorial/src/main/resources/ROPServerTutorialDomainMap.map.xml&r2=466404
==============================================================================
---
incubator/cayenne/main/trunk/tutorials/quick-start-rop/cayenne-rop-server-tutorial/src/main/resources/UntitledDomainMap.map.xml
(original)
+++
incubator/cayenne/main/trunk/tutorials/quick-start-rop/cayenne-rop-server-tutorial/src/main/resources/ROPServerTutorialDomainMap.map.xml
Sat Oct 21 07:24:55 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"/>
<property name="clientSupported" value="true"/>
<property name="defaultClientPackage" value="cayenne.tutorial.client"/>
@@ -44,7 +44,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="ROPServerTutorialDomainMap">
<property name="cayenne.GenericSelectQuery.fetchingDataRows"
value="true"/>
<sql><![CDATA[delete from $table]]></sql>
</query>
Copied:
incubator/cayenne/main/trunk/tutorials/quick-start-rop/cayenne-rop-server-tutorial/src/main/resources/ROPServerTutorialDomainNode.driver.xml
(from r466380,
incubator/cayenne/main/trunk/tutorials/quick-start-rop/cayenne-rop-server-tutorial/src/main/resources/UntitledDomainNode.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=466404&p1=incubator/cayenne/main/trunk/tutorials/quick-start-rop/cayenne-rop-server-tutorial/src/main/resources/UntitledDomainNode.driver.xml&r1=466380&p2=incubator/cayenne/main/trunk/tutorials/quick-start-rop/cayenne-rop-server-tutorial/src/main/resources/ROPServerTutorialDomainNode.driver.xml&r2=466404
==============================================================================
---
incubator/cayenne/main/trunk/tutorials/quick-start-rop/cayenne-rop-server-tutorial/src/main/resources/UntitledDomainNode.driver.xml
(original)
+++
incubator/cayenne/main/trunk/tutorials/quick-start-rop/cayenne-rop-server-tutorial/src/main/resources/ROPServerTutorialDomainNode.driver.xml
Sat Oct 21 07:24:55 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"/>
<connectionPool min="1" max="1" />
</driver>
Modified:
incubator/cayenne/main/trunk/tutorials/quick-start-rop/cayenne-rop-server-tutorial/src/main/resources/cayenne.xml
URL:
http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/tutorials/quick-start-rop/cayenne-rop-server-tutorial/src/main/resources/cayenne.xml?view=diff&rev=466404&r1=466403&r2=466404
==============================================================================
---
incubator/cayenne/main/trunk/tutorials/quick-start-rop/cayenne-rop-server-tutorial/src/main/resources/cayenne.xml
(original)
+++
incubator/cayenne/main/trunk/tutorials/quick-start-rop/cayenne-rop-server-tutorial/src/main/resources/cayenne.xml
Sat Oct 21 07:24:55 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="ROPServerTutorial">
+ <map name="ROPServerTutorialDomainMap"
location="ROPServerTutorialDomainMap.map.xml"/>
- <node name="UntitledDomainNode"
- datasource="UntitledDomainNode.driver.xml"
+ <node name="ROPServerTutorialDomainNode"
+ datasource="ROPServerTutorialDomainNode.driver.xml"
factory="org.apache.cayenne.conf.DriverDataSourceFactory">
- <map-ref name="UntitledDomainMap"/>
+ <map-ref name="ROPServerTutorialDomainMap"/>
</node>
</domain>
</domains>
Added: incubator/cayenne/main/trunk/tutorials/quick-start-rop/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/tutorials/quick-start-rop/pom.xml?view=auto&rev=466404
==============================================================================
--- incubator/cayenne/main/trunk/tutorials/quick-start-rop/pom.xml (added)
+++ incubator/cayenne/main/trunk/tutorials/quick-start-rop/pom.xml Sat Oct 21
07:24:55 2006
@@ -0,0 +1,40 @@
+<?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.
+-->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0";
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
+
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.cayenne</groupId>
+ <artifactId>cayenne-parent</artifactId>
+ <version>3.0-incubating-SNAPSHOT</version>
+ </parent>
+
+ <groupId>org.apache.cayenne.rop.tutorials</groupId>
+ <artifactId>cayenne-rop-tutorial-parent</artifactId>
+ <name>Cayenne ROP Tutorial Parent</name>
+ <packaging>pom</packaging>
+
+ <modules>
+ <module>cayenne-rop-client-tutorial</module>
+ <module>cayenne-rop-server-tutorial</module>
+ </modules>
+
+</project>
