You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cayenne.apache.org by sk...@apache.org on 2016/03/31 12:04:26 UTC
cayenne git commit: update project and schema versions for tutorials;
fixed maven scope for derby in tutorial; fixed some typos;
Repository: cayenne
Updated Branches:
refs/heads/master 139dfe7a8 -> 4bdff812c
update project and schema versions for tutorials;
fixed maven scope for derby in tutorial;
fixed some typos;
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/4bdff812
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/4bdff812
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/4bdff812
Branch: refs/heads/master
Commit: 4bdff812c3e77a8822b8892b63d3cc91e13a080f
Parents: 139dfe7
Author: Savva Kolbachev <s....@gmail.com>
Authored: Thu Mar 31 12:07:11 2016 +0300
Committer: Savva Kolbachev <s....@gmail.com>
Committed: Thu Mar 31 12:07:22 2016 +0300
----------------------------------------------------------------------
docs/docbook/getting-started-rop/src/docbkx/authentication.xml | 4 ++--
docs/docbook/getting-started-rop/src/docbkx/client-code.xml | 2 +-
docs/docbook/getting-started-rop/src/docbkx/web-service.xml | 2 +-
.../tutorial-rop-server/src/main/resources/cayenne-project.xml | 2 +-
.../tutorial-rop-server/src/main/resources/datamap.map.xml | 6 +++---
tutorials/tutorial/pom.xml | 1 +
tutorials/tutorial/src/main/resources/cayenne-project.xml | 2 +-
tutorials/tutorial/src/main/resources/datamap.map.xml | 6 +++---
8 files changed, 13 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cayenne/blob/4bdff812/docs/docbook/getting-started-rop/src/docbkx/authentication.xml
----------------------------------------------------------------------
diff --git a/docs/docbook/getting-started-rop/src/docbkx/authentication.xml b/docs/docbook/getting-started-rop/src/docbkx/authentication.xml
index 0872044..ebf4241 100644
--- a/docs/docbook/getting-started-rop/src/docbkx/authentication.xml
+++ b/docs/docbook/getting-started-rop/src/docbkx/authentication.xml
@@ -115,14 +115,14 @@ java.rmi.RemoteException: Server returned HTTP response code: 401 for URL: http:
<para>Which is exactly what you'd expect, as the client is not authenticating itself. So
change the line in Main.java where we obtained an ROP connection to this:</para>
<programlisting language="java">Map<String,String> properties = new HashMap<>();
-properties.put(Constants.ROP_SERVICE_URL_PROPERTY, "http://localhost:8080/tutorial-rop-server/cayenne-service");
+properties.put(Constants.ROP_SERVICE_URL_PROPERTY, "http://localhost:8080/tutorial/cayenne-service");
properties.put(Constants.ROP_SERVICE_USERNAME_PROPERTY, "cayenne-user");
properties.put(Constants.ROP_SERVICE_PASSWORD_PROPERTY, "secret");
ClientRuntime runtime = new ClientRuntime(properties);</programlisting>
<para>Try running again, and everything should work as before. Obviously in production
environment, in addition to authentication you'll need to use HTTPS to access the server
- to prevent third-party evesdropping on your password and data.</para>
+ to prevent third-party eavesdropping on your password and data.</para>
<para>Congratulations, you are done with the ROP tutorial!</para>
</section>
</chapter>
http://git-wip-us.apache.org/repos/asf/cayenne/blob/4bdff812/docs/docbook/getting-started-rop/src/docbkx/client-code.xml
----------------------------------------------------------------------
diff --git a/docs/docbook/getting-started-rop/src/docbkx/client-code.xml b/docs/docbook/getting-started-rop/src/docbkx/client-code.xml
index 6dc3902..76dd9fd 100644
--- a/docs/docbook/getting-started-rop/src/docbkx/client-code.xml
+++ b/docs/docbook/getting-started-rop/src/docbkx/client-code.xml
@@ -37,7 +37,7 @@ public class Main {
<para>Now the part that is actually different from regular Cayenne - establishing the server
connection and obtaining the ObjectContext:</para>
<programlisting language="java">Map<String, String> properties = new HashMap<>();
-properties.put(Constants.ROP_SERVICE_URL_PROPERTY, "http://localhost:8080/tutorial-rop-server/cayenne-service");
+properties.put(Constants.ROP_SERVICE_URL_PROPERTY, "http://localhost:8080/tutorial/cayenne-service");
properties.put(Constants.ROP_SERVICE_USERNAME_PROPERTY, "cayenne-user");
properties.put(Constants.ROP_SERVICE_PASSWORD_PROPERTY, "secret");
http://git-wip-us.apache.org/repos/asf/cayenne/blob/4bdff812/docs/docbook/getting-started-rop/src/docbkx/web-service.xml
----------------------------------------------------------------------
diff --git a/docs/docbook/getting-started-rop/src/docbkx/web-service.xml b/docs/docbook/getting-started-rop/src/docbkx/web-service.xml
index ad60d44..62ad70f 100644
--- a/docs/docbook/getting-started-rop/src/docbkx/web-service.xml
+++ b/docs/docbook/getting-started-rop/src/docbkx/web-service.xml
@@ -73,7 +73,7 @@
<section xml:id="configuring-web-xml">
<title>Configuring web.xml</title>
<para>Cayenne web service is declared in the web.xml. It is implemented as a servlet
- "org.apache.cayenne.configuration.rop.server.ROPHessianServlet". Open
+ "org.apache.cayenne.rop.ROPServlet". Open
tutorial/src/main/webapp/WEB-INF/web.xml in Eclipse and add a service declaration: </para>
<programlisting><?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE web-app
http://git-wip-us.apache.org/repos/asf/cayenne/blob/4bdff812/tutorials/tutorial-rop-server/src/main/resources/cayenne-project.xml
----------------------------------------------------------------------
diff --git a/tutorials/tutorial-rop-server/src/main/resources/cayenne-project.xml b/tutorials/tutorial-rop-server/src/main/resources/cayenne-project.xml
index 9c4a8a5..5957e5c 100644
--- a/tutorials/tutorial-rop-server/src/main/resources/cayenne-project.xml
+++ b/tutorials/tutorial-rop-server/src/main/resources/cayenne-project.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<domain project-version="6">
+<domain project-version="7">
<map name="datamap"/>
<node name="datanode"
http://git-wip-us.apache.org/repos/asf/cayenne/blob/4bdff812/tutorials/tutorial-rop-server/src/main/resources/datamap.map.xml
----------------------------------------------------------------------
diff --git a/tutorials/tutorial-rop-server/src/main/resources/datamap.map.xml b/tutorials/tutorial-rop-server/src/main/resources/datamap.map.xml
index 4b05708..466cd06 100644
--- a/tutorials/tutorial-rop-server/src/main/resources/datamap.map.xml
+++ b/tutorials/tutorial-rop-server/src/main/resources/datamap.map.xml
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
-<data-map xmlns="http://cayenne.apache.org/schema/3.0/modelMap"
+<data-map xmlns="http://cayenne.apache.org/schema/7/modelMap"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://cayenne.apache.org/schema/3.0/modelMap http://cayenne.apache.org/schema/3.0/modelMap.xsd"
- project-version="6">
+ xsi:schemaLocation="http://cayenne.apache.org/schema/7/modelMap http://cayenne.apache.org/schema/7/modelMap.xsd"
+ project-version="7">
<property name="defaultPackage" value="org.apache.cayenne.tutorial.persistent"/>
<property name="clientSupported" value="true"/>
<property name="defaultClientPackage" value="org.apache.cayenne.tutorial.persistent.client"/>
http://git-wip-us.apache.org/repos/asf/cayenne/blob/4bdff812/tutorials/tutorial/pom.xml
----------------------------------------------------------------------
diff --git a/tutorials/tutorial/pom.xml b/tutorials/tutorial/pom.xml
index 6c2daf6..a258df5 100644
--- a/tutorials/tutorial/pom.xml
+++ b/tutorials/tutorial/pom.xml
@@ -33,6 +33,7 @@
<dependency>
<groupId>org.apache.derby</groupId>
<artifactId>derby</artifactId>
+ <scope>compile</scope>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/cayenne/blob/4bdff812/tutorials/tutorial/src/main/resources/cayenne-project.xml
----------------------------------------------------------------------
diff --git a/tutorials/tutorial/src/main/resources/cayenne-project.xml b/tutorials/tutorial/src/main/resources/cayenne-project.xml
index 9c4a8a5..5957e5c 100644
--- a/tutorials/tutorial/src/main/resources/cayenne-project.xml
+++ b/tutorials/tutorial/src/main/resources/cayenne-project.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<domain project-version="6">
+<domain project-version="7">
<map name="datamap"/>
<node name="datanode"
http://git-wip-us.apache.org/repos/asf/cayenne/blob/4bdff812/tutorials/tutorial/src/main/resources/datamap.map.xml
----------------------------------------------------------------------
diff --git a/tutorials/tutorial/src/main/resources/datamap.map.xml b/tutorials/tutorial/src/main/resources/datamap.map.xml
index 614fba1..4875f89 100644
--- a/tutorials/tutorial/src/main/resources/datamap.map.xml
+++ b/tutorials/tutorial/src/main/resources/datamap.map.xml
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
-<data-map xmlns="http://cayenne.apache.org/schema/3.0/modelMap"
+<data-map xmlns="http://cayenne.apache.org/schema/7/modelMap"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://cayenne.apache.org/schema/3.0/modelMap http://cayenne.apache.org/schema/3.0/modelMap.xsd"
- project-version="6">
+ xsi:schemaLocation="http://cayenne.apache.org/schema/7/modelMap http://cayenne.apache.org/schema/7/modelMap.xsd"
+ project-version="7">
<property name="defaultPackage" value="org.apache.cayenne.tutorial.persistent"/>
<db-entity name="ARTIST">
<db-attribute name="DATE_OF_BIRTH" type="DATE"/>