Author: andrey
Date: Wed Dec 9 10:20:49 2009
New Revision: 888758
URL: http://svn.apache.org/viewvc?rev=888758&view=rev
Log:
should not create empty graph file
Modified:
cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ModelerProject.java
Modified: cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ModelerProject.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ModelerProject.java?rev=888758&r1=888757&r2=888758&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ModelerProject.java
(original)
+++ cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ModelerProject.java
Wed Dec 9 10:20:49 2009
@@ -24,6 +24,7 @@
import org.apache.cayenne.conf.Configuration;
import org.apache.cayenne.modeler.action.ModelerProjectConfiguration;
import org.apache.cayenne.modeler.graph.GraphFile;
+import org.apache.cayenne.modeler.graph.GraphMap;
import org.apache.cayenne.project.ApplicationProject;
import org.apache.cayenne.project.ProjectFile;
@@ -45,9 +46,12 @@
@Override
public ProjectFile projectFileForObject(Object obj) {
if (requiresDomainFile(obj)) {
- return new GraphFile(this,
- ((ModelerProjectConfiguration) getConfiguration()).
- getGraphRegistry().getGraphMap((DataDomain) obj));
+ GraphMap map = ((ModelerProjectConfiguration) getConfiguration()).
+ getGraphRegistry().getGraphMap((DataDomain) obj);
+
+ if (map.size() > 0) {
+ return new GraphFile(this, map);
+ }
}
return super.projectFileForObject(obj);
}
[ https://issues.apache.org/jira/browse/CAY-1331?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=12787901#action_12787901
]
Marcin Skladaniec commented on CAY-1331:
----------------------------------------
forgot to mention, server side there are no exceptions, from server point of view everything
is ok.
this is client side only.
> hessian upgrade stops rop
> -------------------------
>
> Key: CAY-1331
> URL: https://issues.apache.org/jira/browse/CAY-1331
> Project: Cayenne
> Issue Type: Bug
> Components: Cayenne Core Library
> Affects Versions: 3.0 beta 1
> Reporter: Marcin Skladaniec
>
> I tried to upgrade to most recent hessian library (4.0.2). The Cayenne Hessian transport
stopped working. On client connection is created ok, but once the client-server data channel
is created following exception is thrown:
> [java] 13:45:27,866 [AWT-EventQueue-0] INFO org.apache.cayenne.remote.hessian.HessianConnection
:189 - Connecting to [admin:*******@http://delish.ish.com.au:8181/angel-server-cayenne] -
dedicated session.
> [java] 13:45:28,428 [AWT-EventQueue-0] INFO org.apache.cayenne.remote.hessian.HessianConnection
:228 - Error establishing remote session. URL - http://delish.ish.com.au:8181/angel-server-cayenne;
CAUSE - expected integer at 0x53 java.lang.String
> [java] 13:45:28,430 [AWT-EventQueue-0] INFO ish.oncourse.controller.LoginController
:429 - Authentication failed.
> [java] org.apache.cayenne.CayenneRuntimeException: [v.3.0B1 Nov 03 2009 19:16:06]
Error establishing remote session. URL - http://delish.ish.com.au:8181/angel-server-cayenne;
CAUSE - expected integer at 0x53 java.lang.String (org.apache.cayenne.remote.RemoteSession)
> [java] at org.apache.cayenne.remote.hessian.HessianConnection.connect(HessianConnection.java:229)
> [java] at org.apache.cayenne.remote.hessian.HessianConnection.getServerEventBridge(HessianConnection.java:114)
> [java] at org.apache.cayenne.remote.ClientChannel.setupRemoteChannelListener(ClientChannel.java:256)
> [java] at org.apache.cayenne.remote.ClientChannel.<init>(ClientChannel.java:94)
> [java] at org.apache.cayenne.remote.ClientChannel.<init>(ClientChannel.java:76)
> [java] at org.apache.cayenne.remote.ClientChannel.<init>(ClientChannel.java:71)
> [java] at ish.oncourse.ContextManager.getDataChannel(ContextManager.java:81)
> [java] at ish.oncourse.ContextManager.getChannel(ContextManager.java:70)
> [java] at ish.oncourse.ContextManager.getNewDedicatedContext(ContextManager.java:107)
> ....
> [java] Caused by: com.caucho.hessian.io.HessianProtocolException: expected integer
at 0x53 java.lang.String (org.apache.cayenne.remote.RemoteSession)
> [java] at com.caucho.hessian.io.Hessian2Input.error(Hessian2Input.java:2765)
> [java] at com.caucho.hessian.io.Hessian2Input.expect(Hessian2Input.java:2736)
> [java] at com.caucho.hessian.io.Hessian2Input.readInt(Hessian2Input.java:796)
> [java] at com.caucho.hessian.io.Hessian2Input.readObject(Hessian2Input.java:1621)
> [java] at com.caucho.hessian.client.HessianProxy.invoke(HessianProxy.java:253)
> [java] at $Proxy2.establishSession(Unknown Source)
> [java] at org.apache.cayenne.remote.hessian.HessianConnection.connect(HessianConnection.java:210)
> [java] ... 48 more
> as additional info: in our setup we are using basic authentication username and password
--
This message is automatically generated by JIRA.
-
You can reply to this email to add a comment to the issue online.
hessian upgrade stops rop
-------------------------
Key: CAY-1331
URL: https://issues.apache.org/jira/browse/CAY-1331
Project: Cayenne
Issue Type: Bug
Components: Cayenne Core Library
Affects Versions: 3.0 beta 1
Reporter: Marcin Skladaniec
I tried to upgrade to most recent hessian library (4.0.2). The Cayenne Hessian transport stopped
working. On client connection is created ok, but once the client-server data channel is created
following exception is thrown:
[java] 13:45:27,866 [AWT-EventQueue-0] INFO org.apache.cayenne.remote.hessian.HessianConnection
:189 - Connecting to [admin:*******@http://delish.ish.com.au:8181/angel-server-cayenne] -
dedicated session.
[java] 13:45:28,428 [AWT-EventQueue-0] INFO org.apache.cayenne.remote.hessian.HessianConnection
:228 - Error establishing remote session. URL - http://delish.ish.com.au:8181/angel-server-cayenne;
CAUSE - expected integer at 0x53 java.lang.String
[java] 13:45:28,430 [AWT-EventQueue-0] INFO ish.oncourse.controller.LoginController
:429 - Authentication failed.
[java] org.apache.cayenne.CayenneRuntimeException: [v.3.0B1 Nov 03 2009 19:16:06] Error
establishing remote session. URL - http://delish.ish.com.au:8181/angel-server-cayenne; CAUSE
- expected integer at 0x53 java.lang.String (org.apache.cayenne.remote.RemoteSession)
[java] at org.apache.cayenne.remote.hessian.HessianConnection.connect(HessianConnection.java:229)
[java] at org.apache.cayenne.remote.hessian.HessianConnection.getServerEventBridge(HessianConnection.java:114)
[java] at org.apache.cayenne.remote.ClientChannel.setupRemoteChannelListener(ClientChannel.java:256)
[java] at org.apache.cayenne.remote.ClientChannel.<init>(ClientChannel.java:94)
[java] at org.apache.cayenne.remote.ClientChannel.<init>(ClientChannel.java:76)
[java] at org.apache.cayenne.remote.ClientChannel.<init>(ClientChannel.java:71)
[java] at ish.oncourse.ContextManager.getDataChannel(ContextManager.java:81)
[java] at ish.oncourse.ContextManager.getChannel(ContextManager.java:70)
[java] at ish.oncourse.ContextManager.getNewDedicatedContext(ContextManager.java:107)
....
[java] Caused by: com.caucho.hessian.io.HessianProtocolException: expected integer at
0x53 java.lang.String (org.apache.cayenne.remote.RemoteSession)
[java] at com.caucho.hessian.io.Hessian2Input.error(Hessian2Input.java:2765)
[java] at com.caucho.hessian.io.Hessian2Input.expect(Hessian2Input.java:2736)
[java] at com.caucho.hessian.io.Hessian2Input.readInt(Hessian2Input.java:796)
[java] at com.caucho.hessian.io.Hessian2Input.readObject(Hessian2Input.java:1621)
[java] at com.caucho.hessian.client.HessianProxy.invoke(HessianProxy.java:253)
[java] at $Proxy2.establishSession(Unknown Source)
[java] at org.apache.cayenne.remote.hessian.HessianConnection.connect(HessianConnection.java:210)
[java] ... 48 more
as additional info: in our setup we are using basic authentication username and password
--
This message is automatically generated by JIRA.
-
You can reply to this email to add a comment to the issue online.
[ https://issues.apache.org/jira/browse/CAY-1330?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
]
Andrus Adamchik closed CAY-1330.
--------------------------------
Resolution: Fixed
Ah good point. I just added a note about KEYS file:
http://cwiki.apache.org/confluence/display/CAYSITE/Download
(it will be automatically synced to the site in a due time)
> Download page does not have link to KEYS file
> ---------------------------------------------
>
> Key: CAY-1330
> URL: https://issues.apache.org/jira/browse/CAY-1330
> Project: Cayenne
> Issue Type: Bug
> Environment: http://cayenne.apache.org/download.html
> Reporter: Sebb
> Priority: Critical
>
> http://cayenne.apache.org/download.html needs a link to the KEYS file, i.e. http://www.apache.org/dist/cayenne/KEYS.
> This is essential to allow users to check the signature (.asc) files.
--
This message is automatically generated by JIRA.
-
You can reply to this email to add a comment to the issue online.
<html>
<head>
<base href="http://cwiki.apache.org/confluence">
<link rel="stylesheet" href="/confluence/s/1519/1/1/_/styles/combined.css?spaceKey=CAYSITE&forWysiwyg=true"
type="text/css">
</head>
<body style="background-color: white" bgcolor="white">
<div id="pageContent">
<div id="notificationFormat">
<div class="wiki-content">
<div class="email">
<h2><a href="http://cwiki.apache.org/confluence/display/CAYSITE/Download">Download</a></h2>
<h4>Page <b>edited</b> by <a href="http://cwiki.apache.org/confluence/display/~andrus">Andrus
Adamchik</a>
</h4>
<br/>
<div class="notificationGreySide">
<h2><a name="Download-Download"></a>Download</h2>
<p><em>KEYS file to verify the file signatures can be <a href="http://www.apache.org/dist/cayenne/KEYS"
rel="nofollow">found here</a>.</em></p>
<h3><a name="Download-3.0BetaRelease"></a>3.0 Beta Release</h3>
<ul>
<li><a href="http://www.apache.org/dyn/closer.cgi/cayenne/cayenne-3.0B1.tar.gz"
rel="nofollow">Cayenne 3.0B1</a> with cross-platform Java CayenneModeler. (<a
href="http://www.apache.org/dist/cayenne/cayenne-3.0B1.tar.gz.asc" rel="nofollow">pgp</a>,
<a href="http://www.apache.org/dist/cayenne/cayenne-3.0B1.tar.gz.md5" rel="nofollow">md5</a>)</li>
<li><a href="http://www.apache.org/dyn/closer.cgi/cayenne/cayenne-3.0B1-macosx.dmg"
rel="nofollow">Cayenne 3.0B1</a> with Mac OS X CayenneModeler. (<a href="http://www.apache.org/dist/cayenne/cayenne-3.0B1-macosx.dmg.asc"
rel="nofollow">pgp</a>, <a href="http://www.apache.org/dist/cayenne/cayenne-3.0B1-macosx.dmg.md5"
rel="nofollow">md5</a>)</li>
<li><a href="http://www.apache.org/dyn/closer.cgi/cayenne/cayenne-3.0B1-win.zip"
rel="nofollow">Cayenne 3.0B1</a> with Windows CayenneModeler. (<a href="http://www.apache.org/dist/cayenne/cayenne-3.0B1-win.zip.asc"
rel="nofollow">pgp</a>, <a href="http://www.apache.org/dist/cayenne/cayenne-3.0B1-win.zip.md5"
rel="nofollow">md5</a>)</li>
<li><a href="http://svn.apache.org/repos/asf/cayenne/main/tags/3.0B1/docs/doc/src/main/resources/RELEASE-NOTES.txt"
rel="nofollow">Release Notes</a> for Cayenne 3.0B1.</li>
</ul>
<h3><a name="Download-LatestStableReleases"></a>Latest Stable Releases</h3>
<ul>
<li><a href="http://www.apache.org/dyn/closer.cgi/cayenne/cayenne-2.0.4.tar.gz"
rel="nofollow">Cayenne 2.0.4</a> with cross-platform Java CayenneModeler. (<a
href="http://www.apache.org/dist/cayenne/cayenne-2.0.4.tar.gz.asc" rel="nofollow">pgp</a>,
<a href="http://www.apache.org/dist/cayenne/cayenne-2.0.4.tar.gz.md5" rel="nofollow">md5</a>)</li>
<li><a href="http://www.apache.org/dyn/closer.cgi/cayenne/cayenne-2.0.4-macosx.dmg"
rel="nofollow">Cayenne 2.0.4</a> with Mac OS X CayenneModeler. (<a href="http://www.apache.org/dist/cayenne/cayenne-2.0.4-macosx.dmg.asc"
rel="nofollow">pgp</a>, <a href="http://www.apache.org/dist/cayenne/cayenne-2.0.4-macosx.dmg.md5"
rel="nofollow">md5</a>)</li>
<li><a href="http://www.apache.org/dyn/closer.cgi/cayenne/cayenne-2.0.4-win.zip"
rel="nofollow">Cayenne 2.0.4</a> with Windows CayenneModeler. (<a href="http://www.apache.org/dist/cayenne/cayenne-2.0.4-win.zip.asc"
rel="nofollow">pgp</a>, <a href="http://www.apache.org/dist/cayenne/cayenne-2.0.4-win.zip.md5"
rel="nofollow">md5</a>)</li>
</ul>
<ul>
<li><a href="http://prdownloads.sourceforge.net/cayenne/cayenne-1.2.4.tar.gz" rel="nofollow">Cayenne
1.2.4</a> with cross-platform Java CayenneModeler.</li>
<li><a href="http://prdownloads.sourceforge.net/cayenne/cayenne-1.2.4-macosx.dmg"
rel="nofollow">Cayenne 1.2.4</a> with Mac OS X CayenneModeler.</li>
<li><a href="http://prdownloads.sourceforge.net/cayenne/cayenne-1.2.4-win.zip" rel="nofollow">Cayenne
1.2.4</a> with Windows CayenneModeler.</li>
</ul>
<h3><a name="Download-Nightlybuilds"></a>Nightly builds</h3>
<ul>
<li><a href="http://hudson.zones.apache.org/hudson/job/Cayenne-trunk/lastBuild/"
rel="nofollow">Individual Cayenne modules</a> are built from the SVN trunk by our
continuous integration server.</li>
<li><a href="http://svn.apache.org/repos/asf/cayenne/main/trunk/docs/doc/src/main/resources/RELEASE-NOTES.txt"
rel="nofollow">Release Notes</a> for the development trunk.</li>
</ul>
<h3><a name="Download-Legacy"></a>Legacy</h3>
<ul>
<li><a href="http://archive.apache.org/dist/cayenne/" rel="nofollow">All previous
Apache Cayenne releases</a>.</li>
<li><a href="http://prdownloads.sourceforge.net/cayenne/cayenne-1.1.4.tar.gz" rel="nofollow">Cayenne
1.1.4</a>.</li>
<li><a href="http://sourceforge.net/project/showfiles.php?group_id=48132" rel="nofollow">Other
pre-Apache Legacy Releases</a>.</li>
</ul>
<h3><a name="Download-Maven2"></a>Maven 2</h3>
<p>Maven2 bundles for Cayenne are available from the default repository at <a href="http://repo1.maven.org/maven2/"
rel="nofollow">http://repo1.maven.org/maven2/</a>.</p>
<p><em>Cayenne 3.0:</em></p>
<ul>
<li>groupId: org.apache.cayenne</li>
<li>artifactId: cayenne-server, cayenne-client, cayenne-agent, cayenne-modeler</li>
</ul>
<ul>
<li>groupId: org.apache.cayenne.plugins</li>
<li>artifactId: maven-cayenne-plugin</li>
</ul>
<p><em>Cayenne 2.0:</em></p>
<ul>
<li>groupId: org.apache.cayenne</li>
<li>artifactId: cayenne-nodeps, cayenne-client-nodeps, cayenne-modeler</li>
</ul>
<p><em>Cayenne 1.2:</em></p>
<ul>
<li>groupId: org.objectstyle.cayenne</li>
<li>artifactId: cayenne, cayenne-nodeps and cayenne-client-nodeps</li>
</ul>
<p><em>Cayenne 3.0 Snapshots:</em></p>
<p>3.0 trunk snapshots are <b>occasionally</b> posted to the Apache snapshot
repository at <a href="http://people.apache.org/repo/m2-snapshot-repository/" rel="nofollow">http://people.apache.org/repo/m2-snapshot-repository/</a>.
Browse the list of available snapshot modules <a href="http://people.apache.org/repo/m2-snapshot-repository/org/apache/cayenne/"
rel="nofollow">here</a>. Please check the dates on the snapshots - they may turn
out to be pretty old. Also, please be aware that these snapshots may be purged at any time,
so keep local copies of anything you need to refer to in the future.</p>
<p><em>Continuous testing snaphots</em></p>
<p><a href="http://hudson.zones.apache.org/hudson/view/Cayenne/" rel="nofollow">Our
continuous testing server</a> builds Cayenne and runs a suite of tests after every change
to the source. You can access the latest copies of built artifact from that server and see
the results of the test suite at any time. For example, the latest client jar can be found
<a href="http://hudson.zones.apache.org/hudson/view/Cayenne/job/Cayenne-trunk/lastBuild/org.apache.cayenne$cayenne-client/artifact/org.apache.cayenne/cayenne-client/3.0-SNAPSHOT/cayenne-client-3.0-SNAPSHOT.jar/*fingerprint*/"
rel="nofollow">here</a></p>
</div>
<div id="commentsSection" class="wiki-content pageSection">
<div style="float: right;">
<a href="http://cwiki.apache.org/confluence/users/viewnotifications.action"
class="grey">Change Notification Preferences</a>
</div>
<a href="http://cwiki.apache.org/confluence/display/CAYSITE/Download">View Online</a>
|
<a href="http://cwiki.apache.org/confluence/pages/diffpagesbyversion.action?pageId=34976&revisedVersion=28&originalVersion=27">View
Change</a>
</div>
</div>
</div>
</div>
</div>
</body>
</html>
Download page does not have link to KEYS file
---------------------------------------------
Key: CAY-1330
URL: https://issues.apache.org/jira/browse/CAY-1330
Project: Cayenne
Issue Type: Bug
Environment: http://cayenne.apache.org/download.html
Reporter: Sebb
Priority: Critical
http://cayenne.apache.org/download.html needs a link to the KEYS file, i.e. http://www.apache.org/dist/cayenne/KEYS.
This is essential to allow users to check the signature (.asc) files.
--
This message is automatically generated by JIRA.
-
You can reply to this email to add a comment to the issue online.
[ https://issues.apache.org/jira/browse/CAY-1329?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
]
Andrus Adamchik updated CAY-1329:
---------------------------------
Description: Create a new module (cayenne-project-unpublished) for managing filesystem-based
Cayenne projects. I.e. this will mirror o.a.c.project and o.a.c.configuration (project saving
parts) , only will be based on the new DI stack. The module will have an attached DI configuration
that can be used in the Modeler. (was: Create a new module (cayenne-project-unpublished)
for managing filesystem-based Cayenne projects. I.e. this will mirror o.a.c.project and o.a.c.configuration
(porject saving parts) , only will be based on the new DI stack. The module will have an attached
DI configuration that can be used in the Modeler.)
> DI-based cayenne-project module
> -------------------------------
>
> Key: CAY-1329
> URL: https://issues.apache.org/jira/browse/CAY-1329
> Project: Cayenne
> Issue Type: Task
> Components: Cayenne Core Library
> Affects Versions: 3.0M1
> Reporter: Andrus Adamchik
> Assignee: Andrus Adamchik
>
> Create a new module (cayenne-project-unpublished) for managing filesystem-based Cayenne
projects. I.e. this will mirror o.a.c.project and o.a.c.configuration (project saving parts)
, only will be based on the new DI stack. The module will have an attached DI configuration
that can be used in the Modeler.
--
This message is automatically generated by JIRA.
-
You can reply to this email to add a comment to the issue online.
DI-based cayenne-project module
-------------------------------
Key: CAY-1329
URL: https://issues.apache.org/jira/browse/CAY-1329
Project: Cayenne
Issue Type: Task
Components: Cayenne Core Library
Affects Versions: 3.0M1
Reporter: Andrus Adamchik
Assignee: Andrus Adamchik
Create a new module (cayenne-project-unpublished) for managing filesystem-based Cayenne projects.
I.e. this will mirror o.a.c.project and o.a.c.configuration (porject saving parts) , only
will be based on the new DI stack. The module will have an attached DI configuration that
can be used in the Modeler.
--
This message is automatically generated by JIRA.
-
You can reply to this email to add a comment to the issue online.
[ https://issues.apache.org/jira/browse/CAY-1231?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
]
Andrus Adamchik closed CAY-1231.
--------------------------------
Resolution: Not A Problem
> Problem with CLOB field under Oracle
> ------------------------------------
>
> Key: CAY-1231
> URL: https://issues.apache.org/jira/browse/CAY-1231
> Project: Cayenne
> Issue Type: Bug
> Components: Cayenne Core Library
> Affects Versions: 2.0 branch
> Environment: Oracle 10g, Cayenne 2.0.4, Java 1.5
> Reporter: Eugene Matyushkin
> Assignee: Andrus Adamchik
> Priority: Critical
> Attachments: CAY-1231_check.patch
>
>
> 1. Creating table:
> CREATE TABLE CRM_PDOCTYPECAT (
> PDOCTYPECATID NUMERIC(19,0) NOT NULL,
> CATNAME VARCHAR(255) NOT NULL,
> CATDESCRIPTION CLOB NULL
> );
> 2. Creating named query
> INSERT INTO CRM_PDOCTYPECAT(
> PDOCTYPECATID,
> CATNAME,
> CATDESCRIPTION
> ) VALUES (
> #bind($PDOCTYPECATID 'NUMERIC'),
> #bind($CATNAME 'VARCHAR'),
> #bind($CATDESCRIPTION 'CLOB')
> )
> 3. Binding very long (more then 32766 chars) string to CATDESCRIPTION.
> 4. Executing query
> Result:
> 2009-05-28 13:32:03,053 [main] INFO org.apache.cayenne.access.QueryLogger - *** error.
> java.sql.SQLException: setString can process only strings less then 32766 symbols in
length
> at oracle.jdbc.driver.DatabaseError.throwSqlException(DatabaseError.java:125)
> at oracle.jdbc.driver.DatabaseError.throwSqlException(DatabaseError.java:162)
> at oracle.jdbc.driver.DatabaseError.throwSqlException(DatabaseError.java:227)
> at oracle.jdbc.driver.OraclePreparedStatement.setStringInternal(OraclePreparedStatement.java:4588)
> at oracle.jdbc.driver.OraclePreparedStatement.setString(OraclePreparedStatement.java:4559)
> I guess, setClob should be used instead of setString when working with CLOBs.
--
This message is automatically generated by JIRA.
-
You can reply to this email to add a comment to the issue online.
[ https://issues.apache.org/jira/browse/CAY-1231?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
]
Andrus Adamchik updated CAY-1231:
---------------------------------
Fix Version/s: (was: 2.0.5)
so changing some jira fields here... I understand that nothing has to be changed in Cayenne,
and the fix is to upgrade Oracle driver.
> Problem with CLOB field under Oracle
> ------------------------------------
>
> Key: CAY-1231
> URL: https://issues.apache.org/jira/browse/CAY-1231
> Project: Cayenne
> Issue Type: Bug
> Components: Cayenne Core Library
> Affects Versions: 2.0 branch
> Environment: Oracle 10g, Cayenne 2.0.4, Java 1.5
> Reporter: Eugene Matyushkin
> Assignee: Andrus Adamchik
> Priority: Critical
> Attachments: CAY-1231_check.patch
>
>
> 1. Creating table:
> CREATE TABLE CRM_PDOCTYPECAT (
> PDOCTYPECATID NUMERIC(19,0) NOT NULL,
> CATNAME VARCHAR(255) NOT NULL,
> CATDESCRIPTION CLOB NULL
> );
> 2. Creating named query
> INSERT INTO CRM_PDOCTYPECAT(
> PDOCTYPECATID,
> CATNAME,
> CATDESCRIPTION
> ) VALUES (
> #bind($PDOCTYPECATID 'NUMERIC'),
> #bind($CATNAME 'VARCHAR'),
> #bind($CATDESCRIPTION 'CLOB')
> )
> 3. Binding very long (more then 32766 chars) string to CATDESCRIPTION.
> 4. Executing query
> Result:
> 2009-05-28 13:32:03,053 [main] INFO org.apache.cayenne.access.QueryLogger - *** error.
> java.sql.SQLException: setString can process only strings less then 32766 symbols in
length
> at oracle.jdbc.driver.DatabaseError.throwSqlException(DatabaseError.java:125)
> at oracle.jdbc.driver.DatabaseError.throwSqlException(DatabaseError.java:162)
> at oracle.jdbc.driver.DatabaseError.throwSqlException(DatabaseError.java:227)
> at oracle.jdbc.driver.OraclePreparedStatement.setStringInternal(OraclePreparedStatement.java:4588)
> at oracle.jdbc.driver.OraclePreparedStatement.setString(OraclePreparedStatement.java:4559)
> I guess, setClob should be used instead of setString when working with CLOBs.
--
This message is automatically generated by JIRA.
-
You can reply to this email to add a comment to the issue online.
[ https://issues.apache.org/jira/browse/CAY-1231?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
]
Andrus Adamchik reopened CAY-1231:
----------------------------------
> Problem with CLOB field under Oracle
> ------------------------------------
>
> Key: CAY-1231
> URL: https://issues.apache.org/jira/browse/CAY-1231
> Project: Cayenne
> Issue Type: Bug
> Components: Cayenne Core Library
> Affects Versions: 2.0 branch
> Environment: Oracle 10g, Cayenne 2.0.4, Java 1.5
> Reporter: Eugene Matyushkin
> Assignee: Andrus Adamchik
> Priority: Critical
> Attachments: CAY-1231_check.patch
>
>
> 1. Creating table:
> CREATE TABLE CRM_PDOCTYPECAT (
> PDOCTYPECATID NUMERIC(19,0) NOT NULL,
> CATNAME VARCHAR(255) NOT NULL,
> CATDESCRIPTION CLOB NULL
> );
> 2. Creating named query
> INSERT INTO CRM_PDOCTYPECAT(
> PDOCTYPECATID,
> CATNAME,
> CATDESCRIPTION
> ) VALUES (
> #bind($PDOCTYPECATID 'NUMERIC'),
> #bind($CATNAME 'VARCHAR'),
> #bind($CATDESCRIPTION 'CLOB')
> )
> 3. Binding very long (more then 32766 chars) string to CATDESCRIPTION.
> 4. Executing query
> Result:
> 2009-05-28 13:32:03,053 [main] INFO org.apache.cayenne.access.QueryLogger - *** error.
> java.sql.SQLException: setString can process only strings less then 32766 symbols in
length
> at oracle.jdbc.driver.DatabaseError.throwSqlException(DatabaseError.java:125)
> at oracle.jdbc.driver.DatabaseError.throwSqlException(DatabaseError.java:162)
> at oracle.jdbc.driver.DatabaseError.throwSqlException(DatabaseError.java:227)
> at oracle.jdbc.driver.OraclePreparedStatement.setStringInternal(OraclePreparedStatement.java:4588)
> at oracle.jdbc.driver.OraclePreparedStatement.setString(OraclePreparedStatement.java:4559)
> I guess, setClob should be used instead of setString when working with CLOBs.
--
This message is automatically generated by JIRA.
-
You can reply to this email to add a comment to the issue online.
<html>
<head>
<base href="http://cwiki.apache.org/confluence">
<link rel="stylesheet" href="/confluence/s/1519/1/25/_/styles/combined.css?spaceKey=CAY&forWysiwyg=true"
type="text/css">
</head>
<body style="background-color: white" bgcolor="white">
<div id="pageContent">
<div id="notificationFormat">
<div class="wiki-content">
<div class="email">
<h2><a href="http://cwiki.apache.org/confluence/display/CAY/Board+Report+December+2009">Board
Report December 2009</a></h2>
<h4>Page <b>added</b> by <a href="http://cwiki.apache.org/confluence/display/~blacknext">Michael
Gentry</a>
</h4>
<br/>
<div class="notificationGreySide">
<div class='panelMacro'><table class='warningMacro'><colgroup><col
width='24'><col></colgroup><tr><td valign='top'><img src="/confluence/images/icons/emoticons/forbidden.gif"
width="16" height="16" align="absmiddle" alt="" border="0"></td><td><b>Warning</b><br
/><p>This board report has not yet been finalized. This message will be removed
once finished.</p></td></tr></table></div>
<p>Development</p>
<ul>
<li>Released Cayenne 3.0 Beta 1. Barring errors discovered during the beta phase,
the 3.0 API is frozen. A few more features in Cayenne Modeler are still planned which are
external to the API.</li>
</ul>
<p>Community</p>
<ul>
<li>Added Olga Tkachova as a committer.</li>
<li>Added Evgeny Ryabitskiy as a committer.</li>
<li>Activity on the user and development lists has been normal.</li>
</ul>
</div>
<div id="commentsSection" class="wiki-content pageSection">
<div style="float: right;">
<a href="http://cwiki.apache.org/confluence/users/viewnotifications.action"
class="grey">Change Notification Preferences</a>
</div>
<a href="http://cwiki.apache.org/confluence/display/CAY/Board+Report+December+2009">View
Online</a>
|
<a href="http://cwiki.apache.org/confluence/display/CAY/Board+Report+December+2009?showComments=true&showCommentArea=true#addcomment">Add
Comment</a>
</div>
</div>
</div>
</div>
</div>
</body>
</html>
<html>
<head>
<base href="http://cwiki.apache.org/confluence">
<link rel="stylesheet" href="/confluence/s/1519/1/25/_/styles/combined.css?spaceKey=CAY&forWysiwyg=true"
type="text/css">
</head>
<body style="background-color: white" bgcolor="white">
<div id="pageContent">
<div id="notificationFormat">
<div class="wiki-content">
<div class="email">
<h2><a href="http://cwiki.apache.org/confluence/display/CAY/Board+Reports">Board
Reports</a></h2>
<h4>Page <b>edited</b> by <a href="http://cwiki.apache.org/confluence/display/~blacknext">Michael
Gentry</a>
</h4>
Added December.
<div id="versionComment" class="noteMacro" style="display:none; padding: 5px;">
Added December.<br />
</div>
<br/>
<div class="notificationGreySide">
<h2><a name="BoardReports-CayenneASFboardreports"></a>Cayenne ASF
board reports</h2>
<p><em>note that the board reports text is intentionally kept formatting-free
so that it can be pasted into a text email</em></p>
<p><a href="/confluence/display/CAY/Board+Report+January+2007" title="Board Report
January 2007">January 2007</a><br/>
<a href="/confluence/display/CAY/Board+Report+February+2007" title="Board Report February
2007">February 2007</a><br/>
<a href="/confluence/display/CAY/Board+Report+March+2007" title="Board Report March 2007">March
2007</a><br/>
<a href="/confluence/display/CAY/Board+Report+June+2007" title="Board Report June 2007">June
2007</a><br/>
<a href="/confluence/display/CAY/Board+Report+September+2007" title="Board Report September
2007">September 2007</a><br/>
<a href="/confluence/display/CAY/Board+Report+December+2007" title="Board Report December
2007">December 2007</a><br/>
<a href="/confluence/display/CAY/Board+Report+March+2008" title="Board Report March 2008">March
2008</a><br/>
<a href="/confluence/display/CAY/Board+Report+June+2008" title="Board Report June 2008">June
2008</a><br/>
<a href="/confluence/display/CAY/Board+Report+September+2008" title="Board Report September
2008">September 2008</a><br/>
<a href="/confluence/display/CAY/Board+Report+December+2008" title="Board Report December
2008">December 2008</a><br/>
<a href="/confluence/display/CAY/Board+Report+March+2009" title="Board Report March 2009">March
2009</a><br/>
<a href="/confluence/display/CAY/Board+Report+June+2009" title="Board Report June 2009">June
2009</a><br/>
<a href="/confluence/display/CAY/Board+Report+September+2009" title="Board Report September
2009">September 2009</a><br/>
<a href="/confluence/pages/createpage.action?spaceKey=CAY&title=Board+Report+December+2009&linkCreation=true&fromPageId=46140"
class="createlink">December 2009</a></p>
</div>
<div id="commentsSection" class="wiki-content pageSection">
<div style="float: right;">
<a href="http://cwiki.apache.org/confluence/users/viewnotifications.action"
class="grey">Change Notification Preferences</a>
</div>
<a href="http://cwiki.apache.org/confluence/display/CAY/Board+Reports">View Online</a>
|
<a href="http://cwiki.apache.org/confluence/pages/diffpagesbyversion.action?pageId=46140&revisedVersion=16&originalVersion=15">View
Change</a>
|
<a href="http://cwiki.apache.org/confluence/display/CAY/Board+Reports?showComments=true&showCommentArea=true#addcomment">Add
Comment</a>
</div>
</div>
</div>
</div>
</div>
</body>
</html>
Author: aadamchik
Date: Mon Dec 7 15:19:01 2009
New Revision: 887949
URL: http://svn.apache.org/viewvc?rev=887949&view=rev
Log:
CAY-1319 Switch Cayenne configuration loading to cayenne-di container
* Adding a converter of the legacy DataSourceFactory names
* Upgrade instrcutions for custom factories
Modified:
cayenne/main/trunk/docs/doc/src/main/resources/UPGRADE.txt
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/configuration/XMLDataChannelDescriptorLoaderAction.java
Modified: cayenne/main/trunk/docs/doc/src/main/resources/UPGRADE.txt
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/docs/doc/src/main/resources/UPGRADE.txt?rev=887949&r1=887948&r2=887949&view=diff
==============================================================================
--- cayenne/main/trunk/docs/doc/src/main/resources/UPGRADE.txt (original)
+++ cayenne/main/trunk/docs/doc/src/main/resources/UPGRADE.txt Mon Dec 7 15:19:01 2009
@@ -8,6 +8,23 @@
using removed EntityUtil methods (those were replaced by variables placed directly into
Velocity context)
+* Custom DataSourceFactory: The interface used by Cayenne to load custom DataSource factories
has changed
+ from org.apache.cayenne.conf.DataSourceFactory to org.apache.cayenne.configuration.DataSourceFactory.
+ This new interface must be implemented by the custom factories. Note that now custom
+ implementations can rely on Cayenne to inject dependencies into them using @Inject annotation.
+
+* Custom DbAdapter / DbAdapterFactory: The interface used by Cayenne to allow custom DbAdapters
to be auto-detected
+ with AutoAdapter has changed from org.apache.cayenne.dba.DbAdapterFactory to org.apache.cayenne.configuration.DbAdapterDetector.
+ Note that now custom implementations can rely on Cayenne to inject dependencies into them
using @Inject annotation.
+ To register a custom implementation with Cayenne DI container, one might do this in the
custom DI module:
+
+ ...
+ public void configure(Binder binder) {
+ ...
+ binder.bindList(DbAdapterFactory.class).add(new MyDbAdapterDetector());
+ }
+
+
UPGRADING FROM 3.0M6
* Per CAY-1281 pre-persist callback was renamed to post-add (while pre-persist now has a
different meaning).
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/configuration/XMLDataChannelDescriptorLoaderAction.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/configuration/XMLDataChannelDescriptorLoaderAction.java?rev=887949&r1=887948&r2=887949&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/configuration/XMLDataChannelDescriptorLoaderAction.java
(original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/configuration/XMLDataChannelDescriptorLoaderAction.java
Mon Dec 7 15:19:01 2009
@@ -21,6 +21,8 @@
import java.io.IOException;
import java.io.InputStream;
import java.net.URL;
+import java.util.HashMap;
+import java.util.Map;
import org.apache.cayenne.CayenneRuntimeException;
import org.apache.cayenne.map.DataMap;
@@ -46,6 +48,21 @@
static final String PROPERTY_TAG = "property";
static final String MAP_REF_TAG = "map-ref";
+ private static final Map<String, String> dataSourceFactoryNameMapping;
+
+ static {
+ dataSourceFactoryNameMapping = new HashMap<String, String>();
+ dataSourceFactoryNameMapping.put(
+ "org.apache.cayenne.conf.DriverDataSourceFactory",
+ XMLPoolingDataSourceFactory.class.getName());
+ dataSourceFactoryNameMapping.put(
+ "org.apache.cayenne.conf.JNDIDataSourceFactory",
+ JNDIDataSourceFactory.class.getName());
+ dataSourceFactoryNameMapping.put(
+ "org.apache.cayenne.conf.DBCPDataSourceFactory",
+ DBCPDataSourceFactory.class.getName());
+ }
+
private DataMapLoader mapLoader;
private Log logger;
@@ -96,6 +113,20 @@
return descriptor;
}
+ /**
+ * Converts the names of standard Cayenne-supplied DataSourceFactories from the legacy
+ * names to the current names.
+ */
+ private String convertDataSourceFactory(String dataSourceFactory) {
+
+ if (dataSourceFactory == null) {
+ return null;
+ }
+
+ String converted = dataSourceFactoryNameMapping.get(dataSourceFactory);
+ return converted != null ? converted : dataSourceFactory;
+ }
+
final class DataChannelHandler extends SAXNestedTagHandler {
private DataChannelDescriptor descriptor;
@@ -167,12 +198,12 @@
nodeDescriptor.setName(nodeName);
nodeDescriptor.setAdapterType(attributes.getValue("", "adapter"));
- // TODO: andrus, 11.29.2009 : should we rename that to "location"??
String location = attributes.getValue("", "datasource");
nodeDescriptor.setLocation(location);
- nodeDescriptor.setDataSourceFactoryType(attributes
- .getValue("", "factory"));
+ String dataSourceFactory = attributes.getValue("", "factory");
+ nodeDescriptor
+ .setDataSourceFactoryType(convertDataSourceFactory(dataSourceFactory));
nodeDescriptor.setSchemaUpdateStrategyType(attributes.getValue(
"",
"schema-update-strategy"));
[ https://issues.apache.org/jira/browse/CAY-1231?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
]
Evgeny Ryabitskiy resolved CAY-1231.
------------------------------------
Resolution: Fixed
Closing. Working properly with new driver.
> Problem with CLOB field under Oracle
> ------------------------------------
>
> Key: CAY-1231
> URL: https://issues.apache.org/jira/browse/CAY-1231
> Project: Cayenne
> Issue Type: Bug
> Components: Cayenne Core Library
> Affects Versions: 2.0 branch
> Environment: Oracle 10g, Cayenne 2.0.4, Java 1.5
> Reporter: Eugene Matyushkin
> Assignee: Andrus Adamchik
> Priority: Critical
> Fix For: 2.0.5
>
> Attachments: CAY-1231_check.patch
>
>
> 1. Creating table:
> CREATE TABLE CRM_PDOCTYPECAT (
> PDOCTYPECATID NUMERIC(19,0) NOT NULL,
> CATNAME VARCHAR(255) NOT NULL,
> CATDESCRIPTION CLOB NULL
> );
> 2. Creating named query
> INSERT INTO CRM_PDOCTYPECAT(
> PDOCTYPECATID,
> CATNAME,
> CATDESCRIPTION
> ) VALUES (
> #bind($PDOCTYPECATID 'NUMERIC'),
> #bind($CATNAME 'VARCHAR'),
> #bind($CATDESCRIPTION 'CLOB')
> )
> 3. Binding very long (more then 32766 chars) string to CATDESCRIPTION.
> 4. Executing query
> Result:
> 2009-05-28 13:32:03,053 [main] INFO org.apache.cayenne.access.QueryLogger - *** error.
> java.sql.SQLException: setString can process only strings less then 32766 symbols in
length
> at oracle.jdbc.driver.DatabaseError.throwSqlException(DatabaseError.java:125)
> at oracle.jdbc.driver.DatabaseError.throwSqlException(DatabaseError.java:162)
> at oracle.jdbc.driver.DatabaseError.throwSqlException(DatabaseError.java:227)
> at oracle.jdbc.driver.OraclePreparedStatement.setStringInternal(OraclePreparedStatement.java:4588)
> at oracle.jdbc.driver.OraclePreparedStatement.setString(OraclePreparedStatement.java:4559)
> I guess, setClob should be used instead of setString when working with CLOBs.
--
This message is automatically generated by JIRA.
-
You can reply to this email to add a comment to the issue online.
[ https://issues.apache.org/jira/browse/CAY-1231?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
]
Evgeny Ryabitskiy updated CAY-1231:
-----------------------------------
Attachment: CAY-1231_check.patch
Was tested with latest Oracle Driver: version: 11.2.0.1.0 (ojdbc5_g-11.2.0.1.0.jar)
Working properly.
Even for 64 000 000 chars string.
> Problem with CLOB field under Oracle
> ------------------------------------
>
> Key: CAY-1231
> URL: https://issues.apache.org/jira/browse/CAY-1231
> Project: Cayenne
> Issue Type: Bug
> Components: Cayenne Core Library
> Affects Versions: 2.0 branch
> Environment: Oracle 10g, Cayenne 2.0.4, Java 1.5
> Reporter: Eugene Matyushkin
> Assignee: Andrus Adamchik
> Priority: Critical
> Fix For: 2.0.5
>
> Attachments: CAY-1231_check.patch
>
>
> 1. Creating table:
> CREATE TABLE CRM_PDOCTYPECAT (
> PDOCTYPECATID NUMERIC(19,0) NOT NULL,
> CATNAME VARCHAR(255) NOT NULL,
> CATDESCRIPTION CLOB NULL
> );
> 2. Creating named query
> INSERT INTO CRM_PDOCTYPECAT(
> PDOCTYPECATID,
> CATNAME,
> CATDESCRIPTION
> ) VALUES (
> #bind($PDOCTYPECATID 'NUMERIC'),
> #bind($CATNAME 'VARCHAR'),
> #bind($CATDESCRIPTION 'CLOB')
> )
> 3. Binding very long (more then 32766 chars) string to CATDESCRIPTION.
> 4. Executing query
> Result:
> 2009-05-28 13:32:03,053 [main] INFO org.apache.cayenne.access.QueryLogger - *** error.
> java.sql.SQLException: setString can process only strings less then 32766 symbols in
length
> at oracle.jdbc.driver.DatabaseError.throwSqlException(DatabaseError.java:125)
> at oracle.jdbc.driver.DatabaseError.throwSqlException(DatabaseError.java:162)
> at oracle.jdbc.driver.DatabaseError.throwSqlException(DatabaseError.java:227)
> at oracle.jdbc.driver.OraclePreparedStatement.setStringInternal(OraclePreparedStatement.java:4588)
> at oracle.jdbc.driver.OraclePreparedStatement.setString(OraclePreparedStatement.java:4559)
> I guess, setClob should be used instead of setString when working with CLOBs.
--
This message is automatically generated by JIRA.
-
You can reply to this email to add a comment to the issue online.
[ https://issues.apache.org/jira/browse/CAY-1323?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
]
Evgeny Ryabitskiy updated CAY-1323:
-----------------------------------
Attachment: CAY-1323_3.1.patch
Updated. + Some test coverage.
I think it's ready to commit
> oracle.sql.TIMESTAMP in Result of query
> ---------------------------------------
>
> Key: CAY-1323
> URL: https://issues.apache.org/jira/browse/CAY-1323
> Project: Cayenne
> Issue Type: Bug
> Components: Cayenne Core Library
> Affects Versions: 2.0.5, 3.0 beta 1
> Reporter: Evgeny Ryabitskiy
> Assignee: Evgeny Ryabitskiy
> Attachments: CAY-1323_3.1.patch, CAY-1323_3.1.patch, CAY-1323_3.1_OracleTest.patch,
cayenne.xml, OracleTimestampTest.java, OracleTimestampTestMap.map.xml
>
>
> Result of query from column of timestamp type was mapped to oracle.sql.TIMESTAMP.
> I think it should be mapped to standard JDBS TIMESTAMP
> I am using latest official Oracle JDBC driver.
--
This message is automatically generated by JIRA.
-
You can reply to this email to add a comment to the issue online.
[ https://issues.apache.org/jira/browse/CAY-1328?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
]
Evgeny Ryabitskiy updated CAY-1328:
-----------------------------------
Attachment: CAY-1328.patch
JUnit to show it
> SQLTemplate for DataMap is not working
> --------------------------------------
>
> Key: CAY-1328
> URL: https://issues.apache.org/jira/browse/CAY-1328
> Project: Cayenne
> Issue Type: Bug
> Environment: Cayenne 3.1 trunk
> Reporter: Evgeny Ryabitskiy
> Attachments: CAY-1328.patch
>
>
> got:
> java.lang.NullPointerException
> at org.apache.cayenne.access.ObjectResolver.<init>(ObjectResolver.java:60)
> at org.apache.cayenne.access.DataDomainQueryAction$ObjectConversionStrategy.toObjects(DataDomainQueryAction.java:568)
> at org.apache.cayenne.access.DataDomainQueryAction$SingleObjectConversionStrategy.convert(DataDomainQueryAction.java:603)
> at org.apache.cayenne.access.DataDomainQueryAction.interceptObjectConversion(DataDomainQueryAction.java:451)
> at org.apache.cayenne.access.DataDomainQueryAction.execute(DataDomainQueryAction.java:125)
> at org.apache.cayenne.access.UnitTestDomainQueryAction.execute(UnitTestDomainQueryAction.java:48)
> at org.apache.cayenne.access.UnitTestDomain.onQuery(UnitTestDomain.java:63)
> at org.apache.cayenne.util.ObjectContextQueryAction.runQuery(ObjectContextQueryAction.java:335)
> at org.apache.cayenne.util.ObjectContextQueryAction.execute(ObjectContextQueryAction.java:96)
> at org.apache.cayenne.access.DataContext.onQuery(DataContext.java:1049)
> at org.apache.cayenne.access.DataContext.performQuery(DataContext.java:1038)
> at org.apache.cayenne.query.SQLTemplateTest.testSQLTemplateForDataMapWithInsert(SQLTemplateTest.java:64)
> at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
> at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:39)
> at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:25)
> at java.lang.reflect.Method.invoke(Method.java:585)
> at junit.framework.TestCase.runTest(TestCase.java:154)
> at junit.framework.TestCase.runBare(TestCase.java:127)
> at junit.framework.TestResult$1.protect(TestResult.java:106)
> at junit.framework.TestResult.runProtected(TestResult.java:124)
> at junit.framework.TestResult.run(TestResult.java:109)
> at junit.framework.TestCase.run(TestCase.java:118)
> at org.eclipse.jdt.internal.junit.runner.junit3.JUnit3TestReference.run(JUnit3TestReference.java:130)
> at org.eclipse.jdt.internal.junit.runner.TestExecution.run(TestExecution.java:38)
> at org.eclipse.jdt.internal.junit.runner.RemoteTestRunner.runTests(RemoteTestRunner.java:467)
> at org.eclipse.jdt.internal.junit.runner.RemoteTestRunner.runTests(RemoteTestRunner.java:683)
> at org.eclipse.jdt.internal.junit.runner.RemoteTestRunner.run(RemoteTestRunner.java:390)
> at org.eclipse.jdt.internal.junit.runner.RemoteTestRunner.main(RemoteTestRunner.java:197)
--
This message is automatically generated by JIRA.
-
You can reply to this email to add a comment to the issue online.
SQLTemplate for DataMap is not working
--------------------------------------
Key: CAY-1328
URL: https://issues.apache.org/jira/browse/CAY-1328
Project: Cayenne
Issue Type: Bug
Environment: Cayenne 3.1 trunk
Reporter: Evgeny Ryabitskiy
got:
java.lang.NullPointerException
at org.apache.cayenne.access.ObjectResolver.<init>(ObjectResolver.java:60)
at org.apache.cayenne.access.DataDomainQueryAction$ObjectConversionStrategy.toObjects(DataDomainQueryAction.java:568)
at org.apache.cayenne.access.DataDomainQueryAction$SingleObjectConversionStrategy.convert(DataDomainQueryAction.java:603)
at org.apache.cayenne.access.DataDomainQueryAction.interceptObjectConversion(DataDomainQueryAction.java:451)
at org.apache.cayenne.access.DataDomainQueryAction.execute(DataDomainQueryAction.java:125)
at org.apache.cayenne.access.UnitTestDomainQueryAction.execute(UnitTestDomainQueryAction.java:48)
at org.apache.cayenne.access.UnitTestDomain.onQuery(UnitTestDomain.java:63)
at org.apache.cayenne.util.ObjectContextQueryAction.runQuery(ObjectContextQueryAction.java:335)
at org.apache.cayenne.util.ObjectContextQueryAction.execute(ObjectContextQueryAction.java:96)
at org.apache.cayenne.access.DataContext.onQuery(DataContext.java:1049)
at org.apache.cayenne.access.DataContext.performQuery(DataContext.java:1038)
at org.apache.cayenne.query.SQLTemplateTest.testSQLTemplateForDataMapWithInsert(SQLTemplateTest.java:64)
at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:39)
at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:25)
at java.lang.reflect.Method.invoke(Method.java:585)
at junit.framework.TestCase.runTest(TestCase.java:154)
at junit.framework.TestCase.runBare(TestCase.java:127)
at junit.framework.TestResult$1.protect(TestResult.java:106)
at junit.framework.TestResult.runProtected(TestResult.java:124)
at junit.framework.TestResult.run(TestResult.java:109)
at junit.framework.TestCase.run(TestCase.java:118)
at org.eclipse.jdt.internal.junit.runner.junit3.JUnit3TestReference.run(JUnit3TestReference.java:130)
at org.eclipse.jdt.internal.junit.runner.TestExecution.run(TestExecution.java:38)
at org.eclipse.jdt.internal.junit.runner.RemoteTestRunner.runTests(RemoteTestRunner.java:467)
at org.eclipse.jdt.internal.junit.runner.RemoteTestRunner.runTests(RemoteTestRunner.java:683)
at org.eclipse.jdt.internal.junit.runner.RemoteTestRunner.run(RemoteTestRunner.java:390)
at org.eclipse.jdt.internal.junit.runner.RemoteTestRunner.main(RemoteTestRunner.java:197)
--
This message is automatically generated by JIRA.
-
You can reply to this email to add a comment to the issue online.
[ https://issues.apache.org/jira/browse/CAY-1319?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
]
Andrus Adamchik closed CAY-1319.
--------------------------------
Resolution: Fixed
> Minimal DI container-based configuration to run Cayenne
> --------------------------------------------------------
>
> Key: CAY-1319
> URL: https://issues.apache.org/jira/browse/CAY-1319
> Project: Cayenne
> Issue Type: Task
> Components: Cayenne Core Library
> Affects Versions: 3.1M1
> Reporter: Andrus Adamchik
> Assignee: Andrus Adamchik
> Fix For: 3.1M1
>
>
> Need to implement loading of Cayenne runtime configuration via a DI mechanism. This will
include moving cayenne-di module from sandbox to Cayenne proper and using it to provide access
to DataDomain to the applications.
> (this is very closely related to CAY-1318, as per CAY-1318 it is likely that in the future
Configuration class will be removed from Cayenne and a replacement needs to be provided)
--
This message is automatically generated by JIRA.
-
You can reply to this email to add a comment to the issue online.
Author: aadamchik
Date: Sun Dec 6 22:48:29 2009
New Revision: 887792
URL: http://svn.apache.org/viewvc?rev=887792&view=rev
Log:
CAY-1319 Switch Cayenne configuration loading to cayenne-di container
* release notes
Modified:
cayenne/main/trunk/docs/doc/src/main/resources/RELEASE-NOTES.txt
Modified: cayenne/main/trunk/docs/doc/src/main/resources/RELEASE-NOTES.txt
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/docs/doc/src/main/resources/RELEASE-NOTES.txt?rev=887792&r1=887791&r2=887792&view=diff
==============================================================================
--- cayenne/main/trunk/docs/doc/src/main/resources/RELEASE-NOTES.txt (original)
+++ cayenne/main/trunk/docs/doc/src/main/resources/RELEASE-NOTES.txt Sun Dec 6 22:48:29 2009
@@ -18,6 +18,7 @@
CAY-1314 Migrate Modeler Preferences to Java Preferences API: migrate org.apache.cayenne.modeler.ModelerPreferences
CAY-1315 Formattable exceptions
CAY-1316 Deprecate DataObjectUtils and move its methods to new utility class org.apache.cayenne.Cayenne
+CAY-1319 Minimal DI container-based configuration to run Cayenne
Bug Fixes Since 3.0:
Author: aadamchik
Date: Sun Dec 6 22:33:33 2009
New Revision: 887787
URL: http://svn.apache.org/viewvc?rev=887787&view=rev
Log:
CAY-1319 Switch Cayenne configuration loading to cayenne-di container
* DBCPDataSourceFactory
Added:
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/configuration/DBCPDataSourceFactory.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/configuration/DBCPDataSourceFactoryTest.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/resources/org/apache/cayenne/configuration/testDBCP.properties
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/resources/org/apache/cayenne/configuration/testDBCP_legacy.properties
Modified:
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/conf/DBCPDataSourceFactory.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/configuration/JNDIDataSourceFactory.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/configuration/XMLDataChannelDescriptorLoaderAction.java
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/conf/DBCPDataSourceFactory.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/conf/DBCPDataSourceFactory.java?rev=887787&r1=887786&r2=887787&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/conf/DBCPDataSourceFactory.java
(original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/conf/DBCPDataSourceFactory.java
Sun Dec 6 22:33:33 2009
@@ -36,6 +36,7 @@
* list of supported properties.
*
* @since 1.2
+ * @deprecated since 3.1 replaced with {@link org.apache.cayenne.configuration.DBCPDataSourceFactory}
*/
public class DBCPDataSourceFactory implements DataSourceFactory {
Added: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/configuration/DBCPDataSourceFactory.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/configuration/DBCPDataSourceFactory.java?rev=887787&view=auto
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/configuration/DBCPDataSourceFactory.java
(added)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/configuration/DBCPDataSourceFactory.java
Sun Dec 6 22:33:33 2009
@@ -0,0 +1,108 @@
+/*****************************************************************
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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.
+ ****************************************************************/
+package org.apache.cayenne.configuration;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.Properties;
+import java.util.Map.Entry;
+
+import javax.sql.DataSource;
+
+import org.apache.cayenne.CayenneRuntimeException;
+import org.apache.cayenne.di.Inject;
+import org.apache.cayenne.resource.Resource;
+import org.apache.cayenne.resource.ResourceLocator;
+import org.apache.commons.dbcp.BasicDataSourceFactory;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+/**
+ * A {@link DataSourceFactory} based on DBCP connection pool library.
+ *
+ * @since 3.1
+ */
+public class DBCPDataSourceFactory implements DataSourceFactory {
+
+ private static final Log logger = LogFactory.getLog(DBCPDataSourceFactory.class);
+
+ @Inject
+ protected ResourceLocator resourceLocator;
+
+ public DataSource getDataSource(DataNodeDescriptor nodeDescriptor) throws Exception {
+
+ Resource dbcpConfiguration = nodeDescriptor.getConfigurationResource();
+ if (dbcpConfiguration == null) {
+ throw new CayenneRuntimeException(
+ "Null 'configurationResource' for nodeDescriptor '%s'",
+ nodeDescriptor.getName());
+ }
+
+ Properties properties = getProperties(dbcpConfiguration);
+ if (logger.isDebugEnabled()) {
+ logger.debug("DBCP Properties: " + properties);
+ }
+
+ properties = filteredDeprecatedProperties(properties);
+ return BasicDataSourceFactory.createDataSource(properties);
+ }
+
+ /**
+ * Converts old-style cayene.dbcp.xyz properties to just cayenne.dbcp.
+ */
+ private Properties filteredDeprecatedProperties(Properties unfiltered) {
+ Properties properties = new Properties();
+
+ final String deprecatedPrefix = "cayenne.dbcp.";
+
+ for (Entry<Object, Object> entry : unfiltered.entrySet()) {
+ Object key = entry.getKey();
+ if (key instanceof String && key.toString().startsWith(deprecatedPrefix))
{
+
+ String oldKey = key.toString();
+ key = oldKey.substring(deprecatedPrefix.length());
+ logger.info("Deprecated use of 'cayenne.dbcp.' prefix in '"
+ + oldKey
+ + "', converting to "
+ + key);
+ }
+
+ properties.put(key, entry.getValue());
+ }
+
+ return properties;
+ }
+
+ private Properties getProperties(Resource dbcpConfiguration) throws IOException {
+ Properties properties = new Properties();
+ InputStream in = dbcpConfiguration.getURL().openStream();
+ try {
+ properties.load(in);
+ }
+ finally {
+ try {
+ in.close();
+ }
+ catch (IOException e) {
+ }
+ }
+
+ return properties;
+ }
+}
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/configuration/JNDIDataSourceFactory.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/configuration/JNDIDataSourceFactory.java?rev=887787&r1=887786&r2=887787&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/configuration/JNDIDataSourceFactory.java
(original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/configuration/JNDIDataSourceFactory.java
Sun Dec 6 22:33:33 2009
@@ -47,7 +47,7 @@
}
try {
- return loadViaJNDI(location);
+ return lookupViaJNDI(location);
}
catch (Exception ex) {
logger.info("failed JNDI lookup of DataSource location '" + location + "'");
@@ -56,7 +56,7 @@
}
}
- DataSource loadViaJNDI(String location) throws NamingException {
+ DataSource lookupViaJNDI(String location) throws NamingException {
QueryLogger.logConnect(location);
Context context = new InitialContext();
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/configuration/XMLDataChannelDescriptorLoaderAction.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/configuration/XMLDataChannelDescriptorLoaderAction.java?rev=887787&r1=887786&r2=887787&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/configuration/XMLDataChannelDescriptorLoaderAction.java
(original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/configuration/XMLDataChannelDescriptorLoaderAction.java
Sun Dec 6 22:33:33 2009
@@ -177,7 +177,7 @@
"",
"schema-update-strategy"));
- // this may be bogus for nodes other than driver nodes, but here we can't
+ // this may be bogus for some nodes, such as JNDI, but here we can't
// tell for sure
if (location != null) {
nodeDescriptor.setConfigurationResource(descriptor
Added: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/configuration/DBCPDataSourceFactoryTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/configuration/DBCPDataSourceFactoryTest.java?rev=887787&view=auto
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/configuration/DBCPDataSourceFactoryTest.java
(added)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/configuration/DBCPDataSourceFactoryTest.java
Sun Dec 6 22:33:33 2009
@@ -0,0 +1,110 @@
+/*****************************************************************
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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.
+ ****************************************************************/
+package org.apache.cayenne.configuration;
+
+import java.io.IOException;
+import java.net.URL;
+
+import javax.sql.DataSource;
+
+import junit.framework.TestCase;
+
+import org.apache.cayenne.resource.URLResource;
+import org.apache.commons.dbcp.BasicDataSource;
+
+public class DBCPDataSourceFactoryTest extends TestCase {
+
+ public void testGetDataSource() throws Exception {
+
+ String baseUrl = getClass().getPackage().getName().replace('.', '/');
+ URL url = getClass().getClassLoader().getResource(
+ baseUrl + "/testDBCP.properties");
+ assertNotNull(url);
+
+ DataNodeDescriptor nodeDescriptor = new DataNodeDescriptor();
+ nodeDescriptor.setConfigurationResource(new URLResource(url));
+
+ DBCPDataSourceFactory factory = new DBCPDataSourceFactory();
+ DataSource dataSource = factory.getDataSource(nodeDescriptor);
+ assertNotNull(dataSource);
+
+ assertTrue(dataSource instanceof BasicDataSource);
+ BasicDataSource basicDataSource = (BasicDataSource) dataSource;
+ assertEquals("com.example.jdbc.Driver", basicDataSource.getDriverClassName());
+ assertEquals("jdbc:somedb://localhost/cayenne", basicDataSource.getUrl());
+ assertEquals("john", basicDataSource.getUsername());
+ assertEquals("secret", basicDataSource.getPassword());
+ assertEquals(20, basicDataSource.getMaxActive());
+ assertEquals(5, basicDataSource.getMinIdle());
+ assertEquals(8, basicDataSource.getMaxIdle());
+ assertEquals(10000, basicDataSource.getMaxWait());
+ assertEquals("select 1 from xyz;", basicDataSource.getValidationQuery());
+ }
+
+ public void testGetDataSource_LegacyConfig() throws Exception {
+
+ String baseUrl = getClass().getPackage().getName().replace('.', '/');
+ URL url = getClass().getClassLoader().getResource(
+ baseUrl + "/testDBCP_legacy.properties");
+ assertNotNull(url);
+
+ DataNodeDescriptor nodeDescriptor = new DataNodeDescriptor();
+ nodeDescriptor.setConfigurationResource(new URLResource(url));
+
+ DBCPDataSourceFactory factory = new DBCPDataSourceFactory();
+ DataSource dataSource = factory.getDataSource(nodeDescriptor);
+ assertNotNull(dataSource);
+
+ assertTrue(dataSource instanceof BasicDataSource);
+ BasicDataSource basicDataSource = (BasicDataSource) dataSource;
+ assertEquals("com.example.jdbc.Driver", basicDataSource.getDriverClassName());
+ assertEquals("jdbc:somedb://localhost/cayenne", basicDataSource.getUrl());
+ assertEquals("john", basicDataSource.getUsername());
+ assertEquals("secret", basicDataSource.getPassword());
+ assertEquals(20, basicDataSource.getMaxActive());
+ assertEquals(5, basicDataSource.getMinIdle());
+ assertEquals(8, basicDataSource.getMaxIdle());
+ assertEquals(10000, basicDataSource.getMaxWait());
+ assertEquals("select 1 from xyz;", basicDataSource.getValidationQuery());
+ }
+
+ public void testGetDataSource_InvalidLocation() throws Exception {
+
+ String baseUrl = getClass().getPackage().getName().replace('.', '/');
+ URL url = getClass().getClassLoader().getResource(
+ baseUrl + "/testDBCP.properties");
+ assertNotNull(url);
+ url = new URL(url, ".nosuchfile");
+
+ DataNodeDescriptor nodeDescriptor = new DataNodeDescriptor();
+ nodeDescriptor.setConfigurationResource(new URLResource(url));
+
+ DBCPDataSourceFactory factory = new DBCPDataSourceFactory();
+
+ try {
+ factory.getDataSource(nodeDescriptor);
+ fail("didn't throw on abscent config file");
+ }
+ catch (IOException ex) {
+ // expected
+ }
+
+ }
+
+}
Added: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/resources/org/apache/cayenne/configuration/testDBCP.properties
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/resources/org/apache/cayenne/configuration/testDBCP.properties?rev=887787&view=auto
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/resources/org/apache/cayenne/configuration/testDBCP.properties
(added)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/resources/org/apache/cayenne/configuration/testDBCP.properties
Sun Dec 6 22:33:33 2009
@@ -0,0 +1,9 @@
+driverClassName=com.example.jdbc.Driver
+url=jdbc:somedb://localhost/cayenne
+username=john
+password=secret
+maxActive=20
+minIdle=5
+maxIdle=8
+maxWait=10000
+validationQuery=select 1 from xyz;
\ No newline at end of file
Added: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/resources/org/apache/cayenne/configuration/testDBCP_legacy.properties
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/resources/org/apache/cayenne/configuration/testDBCP_legacy.properties?rev=887787&view=auto
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/resources/org/apache/cayenne/configuration/testDBCP_legacy.properties
(added)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/resources/org/apache/cayenne/configuration/testDBCP_legacy.properties
Sun Dec 6 22:33:33 2009
@@ -0,0 +1,10 @@
+# DBCPDataSourceFactory properties for Cayenne < 3.1
+cayenne.dbcp.driverClassName=com.example.jdbc.Driver
+cayenne.dbcp.url=jdbc:somedb://localhost/cayenne
+cayenne.dbcp.username=john
+cayenne.dbcp.password=secret
+cayenne.dbcp.maxActive=20
+cayenne.dbcp.minIdle=5
+cayenne.dbcp.maxIdle=8
+cayenne.dbcp.maxWait=10000
+cayenne.dbcp.validationQuery=select 1 from xyz;
\ No newline at end of file
Author: aadamchik
Date: Sun Dec 6 14:14:42 2009
New Revision: 887685
URL: http://svn.apache.org/viewvc?rev=887685&view=rev
Log:
CAY-1319 Switch Cayenne configuration loading to cayenne-di container
* JNDIDataSourceProvider
Added:
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/configuration/JNDIDataSourceFactory.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/configuration/JNDIDataSourceFactoryTest.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/JNDISetup.java
Modified:
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/pom.xml
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/conf/JNDIDataSourceFactory.java
cayenne/main/trunk/pom.xml
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/pom.xml
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/pom.xml?rev=887685&r1=887684&r2=887685&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/pom.xml (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/pom.xml Sun Dec 6 14:14:42 2009
@@ -57,6 +57,10 @@
<artifactId>spring-beans</artifactId>
</dependency>
<dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-mock</artifactId>
+ </dependency>
+ <dependency>
<groupId>com.caucho</groupId>
<artifactId>resin-hessian</artifactId>
</dependency>
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/conf/JNDIDataSourceFactory.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/conf/JNDIDataSourceFactory.java?rev=887685&r1=887684&r2=887685&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/conf/JNDIDataSourceFactory.java
(original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/conf/JNDIDataSourceFactory.java
Sun Dec 6 14:14:42 2009
@@ -32,6 +32,8 @@
/**
* Looks up DataSource objects via JNDI.
*
+ * @deprecated since 3.1, replaced by
+ * {@link org.apache.cayenne.configuration.JNDIDataSourceFactory}.
*/
public class JNDIDataSourceFactory implements DataSourceFactory {
@@ -97,9 +99,10 @@
// reflection ...
ClassLoader loader = Thread.currentThread().getContextClassLoader();
- DataSourceFactory prefsFactory = (DataSourceFactory) Class
- .forName("org.apache.cayenne.modeler.pref.PreferencesDataSourceFactory",
true, loader)
- .newInstance();
+ DataSourceFactory prefsFactory = (DataSourceFactory) Class.forName(
+ "org.apache.cayenne.modeler.pref.PreferencesDataSourceFactory",
+ true,
+ loader).newInstance();
prefsFactory.initializeWithParentConfiguration(parentConfig);
return prefsFactory.getDataSource(location);
Added: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/configuration/JNDIDataSourceFactory.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/configuration/JNDIDataSourceFactory.java?rev=887685&view=auto
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/configuration/JNDIDataSourceFactory.java
(added)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/configuration/JNDIDataSourceFactory.java
Sun Dec 6 14:14:42 2009
@@ -0,0 +1,77 @@
+/*****************************************************************
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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.
+ ****************************************************************/
+package org.apache.cayenne.configuration;
+
+import javax.naming.Context;
+import javax.naming.InitialContext;
+import javax.naming.NamingException;
+import javax.sql.DataSource;
+
+import org.apache.cayenne.CayenneRuntimeException;
+import org.apache.cayenne.access.QueryLogger;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+/**
+ * Locates DataSource mapped via JNDI.
+ *
+ * @since 3.1
+ */
+public class JNDIDataSourceFactory implements DataSourceFactory {
+
+ private static final Log logger = LogFactory.getLog(JNDIDataSourceFactory.class);
+
+ public DataSource getDataSource(DataNodeDescriptor nodeDescriptor) throws Exception {
+
+ String location = nodeDescriptor.getLocation();
+ if (location == null) {
+ throw new CayenneRuntimeException(
+ "Null 'location' for nodeDescriptor '%s'",
+ nodeDescriptor.getName());
+ }
+
+ try {
+ return loadViaJNDI(location);
+ }
+ catch (Exception ex) {
+ logger.info("failed JNDI lookup of DataSource location '" + location + "'");
+ QueryLogger.logConnectFailure(ex);
+ throw ex;
+ }
+ }
+
+ DataSource loadViaJNDI(String location) throws NamingException {
+ QueryLogger.logConnect(location);
+
+ Context context = new InitialContext();
+ DataSource dataSource;
+ try {
+ Context envContext = (Context) context.lookup("java:comp/env");
+ dataSource = (DataSource) envContext.lookup(location);
+ }
+ catch (NamingException namingEx) {
+ // try looking up the location directly...
+ dataSource = (DataSource) context.lookup(location);
+ }
+
+ QueryLogger.logConnectSuccess();
+ return dataSource;
+ }
+
+}
Added: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/configuration/JNDIDataSourceFactoryTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/configuration/JNDIDataSourceFactoryTest.java?rev=887685&view=auto
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/configuration/JNDIDataSourceFactoryTest.java
(added)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/configuration/JNDIDataSourceFactoryTest.java
Sun Dec 6 14:14:42 2009
@@ -0,0 +1,93 @@
+/*****************************************************************
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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.
+ ****************************************************************/
+package org.apache.cayenne.configuration;
+
+import javax.naming.InitialContext;
+import javax.naming.NameNotFoundException;
+
+import junit.framework.TestCase;
+
+import org.apache.cayenne.unit.JNDISetup;
+
+import com.mockrunner.mock.jdbc.MockDataSource;
+
+public class JNDIDataSourceFactoryTest extends TestCase {
+
+ public void testGetDataSource_NameBound() throws Exception {
+
+ DataNodeDescriptor descriptor = new DataNodeDescriptor();
+ descriptor.setLocation("jdbc/TestDS");
+
+ JNDISetup.doSetup();
+
+ MockDataSource dataSource = new MockDataSource();
+ InitialContext context = new InitialContext();
+ context.bind(descriptor.getLocation(), dataSource);
+
+ try {
+
+ JNDIDataSourceFactory factory = new JNDIDataSourceFactory();
+ assertSame(dataSource, factory.getDataSource(descriptor));
+ }
+ finally {
+ // since the context is shared, must clear it after the test
+ context.unbind(descriptor.getLocation());
+ }
+ }
+
+ public void testGetDataSource_NameBoundWithPrefix() throws Exception {
+
+ DataNodeDescriptor descriptor = new DataNodeDescriptor();
+ descriptor.setLocation("jdbc/TestDS");
+
+ JNDISetup.doSetup();
+
+ MockDataSource dataSource = new MockDataSource();
+ InitialContext context = new InitialContext();
+ context.bind("java:comp/env/" + descriptor.getLocation(), dataSource);
+
+ try {
+
+ JNDIDataSourceFactory factory = new JNDIDataSourceFactory();
+ assertSame(dataSource, factory.getDataSource(descriptor));
+ }
+ finally {
+ // since the context is shared, must clear it after the test
+ context.unbind("java:comp/env/" + descriptor.getLocation());
+ }
+ }
+
+ public void testGetDataSource_NameNotBound() throws Exception {
+
+ DataNodeDescriptor descriptor = new DataNodeDescriptor();
+ descriptor.setLocation("jdbc/TestDS");
+
+ JNDISetup.doSetup();
+
+ JNDIDataSourceFactory factory = new JNDIDataSourceFactory();
+
+ try {
+ factory.getDataSource(descriptor);
+ fail("Didn't throw on unbound name");
+ }
+ catch (NameNotFoundException e) {
+ // expected
+ }
+ }
+}
Added: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/JNDISetup.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/JNDISetup.java?rev=887685&view=auto
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/JNDISetup.java
(added)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/JNDISetup.java
Sun Dec 6 14:14:42 2009
@@ -0,0 +1,57 @@
+/*****************************************************************
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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.
+ ****************************************************************/
+package org.apache.cayenne.unit;
+
+import javax.naming.NamingException;
+import javax.naming.spi.NamingManager;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.springframework.mock.jndi.SimpleNamingContextBuilder;
+
+/**
+ * A helper class to setup a shared test JNDI environment.
+ */
+public class JNDISetup {
+
+ private static Log logger = LogFactory.getLog(JNDISetup.class);
+
+ private static volatile boolean setup;
+
+ public static void doSetup() {
+ if (!setup) {
+
+ synchronized (JNDISetup.class) {
+
+ if (!setup) {
+ try {
+ NamingManager
+ .setInitialContextFactoryBuilder(new SimpleNamingContextBuilder());
+ }
+ catch (NamingException e) {
+ logger.error("Can't perform JNDI setup, ignoring...", e);
+ }
+
+ setup = true;
+ }
+ }
+ }
+ }
+
+}
Modified: cayenne/main/trunk/pom.xml
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/pom.xml?rev=887685&r1=887684&r2=887685&view=diff
==============================================================================
--- cayenne/main/trunk/pom.xml (original)
+++ cayenne/main/trunk/pom.xml Sun Dec 6 14:14:42 2009
@@ -497,6 +497,13 @@
<version>1.2.6</version>
<scope>test</scope>
</dependency>
+
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-mock</artifactId>
+ <version>2.0.8</version>
+ <scope>test</scope>
+ </dependency>
<dependency>
<groupId>velocity</groupId>
[ https://issues.apache.org/jira/browse/CAY-1318?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
]
Andrus Adamchik updated CAY-1318:
---------------------------------
Attachment: 0001-CAY-1318-Cayenne-configuration-to-support-a-single-D.patch
attaching patch for archival purposes... this task is waiting for CAY-1319 to be finished
> Cayenne configuration to support a single DataDomain
> ----------------------------------------------------
>
> Key: CAY-1318
> URL: https://issues.apache.org/jira/browse/CAY-1318
> Project: Cayenne
> Issue Type: Task
> Components: Cayenne Core Library, CayenneModeler GUI
> Affects Versions: 3.1M1
> Reporter: Andrus Adamchik
> Assignee: Andrus Adamchik
> Fix For: 3.1M1
>
> Attachments: 0001-CAY-1318-Cayenne-configuration-to-support-a-single-D.patch
>
>
> Multi-datadomain runtime configurations offer no advantage over multiple configurations
with a single domain each. So going to change the project structure to only support a single
DataDomain. A Modeler will have project upgrader that will split multi-domain projects into
multiple single domain projects (e.g. cayenne1.xml, cayenne2.xml, etc).
--
This message is automatically generated by JIRA.
-
You can reply to this email to add a comment to the issue online.
[ https://issues.apache.org/jira/browse/CAY-1319?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
]
Andrus Adamchik updated CAY-1319:
---------------------------------
Description:
Need to implement loading of Cayenne runtime configuration via a DI mechanism. This will include
moving cayenne-di module from sandbox to Cayenne proper and using it to provide access to
DataDomain to the applications.
(this is very closely related to CAY-1318, as per CAY-1318 it is likely that in the future
Configuration class will be removed from Cayenne and a replacement needs to be provided)
was:
Need to implement loading of Cayenne runtime (and Modeler?) configuration via a DI mechanism.
This will include moving cayenne-di module from sandbox to Cayenne proper and using it to
provide access to DataDomain to the applications.
(this is very closely related to CAY-1318, as per CAY-1318 it is likely that Configuration
class will be removed from Cayenne and a replacement needs to be provided)
Summary: Minimal DI container-based configuration to run Cayenne (was: Switch Cayenne
configuration loading to cayenne-di container)
(renaming the issue, as it is about implementing a DI-based stack... Making it a default in
Cayenne is a separate task.
> Minimal DI container-based configuration to run Cayenne
> --------------------------------------------------------
>
> Key: CAY-1319
> URL: https://issues.apache.org/jira/browse/CAY-1319
> Project: Cayenne
> Issue Type: Task
> Components: Cayenne Core Library
> Affects Versions: 3.1M1
> Reporter: Andrus Adamchik
> Assignee: Andrus Adamchik
> Fix For: 3.1M1
>
>
> Need to implement loading of Cayenne runtime configuration via a DI mechanism. This will
include moving cayenne-di module from sandbox to Cayenne proper and using it to provide access
to DataDomain to the applications.
> (this is very closely related to CAY-1318, as per CAY-1318 it is likely that in the future
Configuration class will be removed from Cayenne and a replacement needs to be provided)
--
This message is automatically generated by JIRA.
-
You can reply to this email to add a comment to the issue online.
[ https://issues.apache.org/jira/browse/CAY-1319?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
]
Andrus Adamchik updated CAY-1319:
---------------------------------
Attachment: (was: 0001-CAY-1318-Cayenne-configuration-to-support-a-single-D.patch)
> Switch Cayenne configuration loading to cayenne-di container
> ------------------------------------------------------------
>
> Key: CAY-1319
> URL: https://issues.apache.org/jira/browse/CAY-1319
> Project: Cayenne
> Issue Type: Task
> Components: Cayenne Core Library
> Affects Versions: 3.1M1
> Reporter: Andrus Adamchik
> Assignee: Andrus Adamchik
> Fix For: 3.1M1
>
>
> Need to implement loading of Cayenne runtime (and Modeler?) configuration via a DI mechanism.
This will include moving cayenne-di module from sandbox to Cayenne proper and using it to
provide access to DataDomain to the applications.
> (this is very closely related to CAY-1318, as per CAY-1318 it is likely that Configuration
class will be removed from Cayenne and a replacement needs to be provided)
--
This message is automatically generated by JIRA.
-
You can reply to this email to add a comment to the issue online.
Author: aadamchik
Date: Sun Dec 6 11:23:18 2009
New Revision: 887668
URL: http://svn.apache.org/viewvc?rev=887668&view=rev
Log:
CAY-1319 Switch Cayenne configuration loading to cayenne-di container
* DataContextProvider
* CayenneRuntime -> CayenneServerRuntime
* CayenneServerRuntime itests
Added:
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/configuration/CayenneServerModule.java
- copied, changed from r887667, cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/configuration/CayenneModule.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/configuration/DomainDataChannelProvider.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/runtime/CayenneServerRuntime.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/runtime/DataContextProvider.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/runtime/CayenneServerRuntimeTest.java
- copied, changed from r887667, cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/runtime/CayenneRuntimeTest.java
cayenne/main/trunk/itests/cayenne-di-stack/
cayenne/main/trunk/itests/cayenne-di-stack/.classpath
cayenne/main/trunk/itests/cayenne-di-stack/.project
cayenne/main/trunk/itests/cayenne-di-stack/.settings/
cayenne/main/trunk/itests/cayenne-di-stack/.settings/org.eclipse.jdt.core.prefs
cayenne/main/trunk/itests/cayenne-di-stack/.settings/org.maven.ide.eclipse.prefs
cayenne/main/trunk/itests/cayenne-di-stack/pom.xml
- copied, changed from r887667, cayenne/main/trunk/itests/pom.xml
cayenne/main/trunk/itests/cayenne-di-stack/src/
cayenne/main/trunk/itests/cayenne-di-stack/src/main/
cayenne/main/trunk/itests/cayenne-di-stack/src/main/java/
cayenne/main/trunk/itests/cayenne-di-stack/src/main/java/org/
cayenne/main/trunk/itests/cayenne-di-stack/src/main/java/org/apache/
cayenne/main/trunk/itests/cayenne-di-stack/src/main/java/org/apache/cayenne/
cayenne/main/trunk/itests/cayenne-di-stack/src/main/java/org/apache/cayenne/itest/
cayenne/main/trunk/itests/cayenne-di-stack/src/main/java/org/apache/cayenne/itest/di_stack/
cayenne/main/trunk/itests/cayenne-di-stack/src/main/java/org/apache/cayenne/itest/di_stack/DefaultMap.java
cayenne/main/trunk/itests/cayenne-di-stack/src/main/java/org/apache/cayenne/itest/di_stack/Table1.java
cayenne/main/trunk/itests/cayenne-di-stack/src/main/java/org/apache/cayenne/itest/di_stack/auto/
cayenne/main/trunk/itests/cayenne-di-stack/src/main/java/org/apache/cayenne/itest/di_stack/auto/_DefaultMap.java
cayenne/main/trunk/itests/cayenne-di-stack/src/main/java/org/apache/cayenne/itest/di_stack/auto/_Table1.java
cayenne/main/trunk/itests/cayenne-di-stack/src/main/java/org/apache/cayenne/runtime/
cayenne/main/trunk/itests/cayenne-di-stack/src/main/java/org/apache/cayenne/runtime/CayenneServerRuntimeCase.java
cayenne/main/trunk/itests/cayenne-di-stack/src/main/java/org/apache/cayenne/runtime/RuntimeName.java
cayenne/main/trunk/itests/cayenne-di-stack/src/main/resources/
cayenne/main/trunk/itests/cayenne-di-stack/src/main/resources/DefaultMap.map.xml
cayenne/main/trunk/itests/cayenne-di-stack/src/main/resources/PoolingDSNode.driver.xml
cayenne/main/trunk/itests/cayenne-di-stack/src/main/resources/cayenne-DEFAULT.xml
cayenne/main/trunk/itests/cayenne-di-stack/src/main/resources/log4j.properties
cayenne/main/trunk/itests/cayenne-di-stack/src/test/
cayenne/main/trunk/itests/cayenne-di-stack/src/test/java/
cayenne/main/trunk/itests/cayenne-di-stack/src/test/java/org/
cayenne/main/trunk/itests/cayenne-di-stack/src/test/java/org/apache/
cayenne/main/trunk/itests/cayenne-di-stack/src/test/java/org/apache/cayenne/
cayenne/main/trunk/itests/cayenne-di-stack/src/test/java/org/apache/cayenne/runtime/
cayenne/main/trunk/itests/cayenne-di-stack/src/test/java/org/apache/cayenne/runtime/CayenneServerRuntimeIntegrationTest.java
Removed:
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/configuration/CayenneModule.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/runtime/CayenneRuntimeTest.java
cayenne/main/trunk/framework/cayenne-server/pom.properties
Modified:
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/dbsync/CreateIfNoSchemaStrategy.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/configuration/SAXNestedTagHandler.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/configuration/XMLDataChannelDescriptorLoader.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/configuration/XMLDataChannelDescriptorLoaderAction.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/runtime/CayenneRuntime.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/runtime/DataDomainProvider.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/runtime/DataDomainProviderTest.java
cayenne/main/trunk/itests/pom.xml
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/dbsync/CreateIfNoSchemaStrategy.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/dbsync/CreateIfNoSchemaStrategy.java?rev=887668&r1=887667&r2=887668&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/dbsync/CreateIfNoSchemaStrategy.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/dbsync/CreateIfNoSchemaStrategy.java Sun Dec 6 11:23:18 2009
@@ -42,7 +42,7 @@
final static Log logger = LogFactory.getLog(CreateIfNoSchemaStrategy.class);
@Override
- public void processSchemaUpdate(DataNode dataNode) throws SQLException {
+ protected void processSchemaUpdate(DataNode dataNode) throws SQLException {
Map<String, Boolean> nameTables = getNameTablesInDB(dataNode);
Collection<DbEntity> entities = dataNode.getEntityResolver().getDbEntities();
Copied: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/configuration/CayenneServerModule.java (from r887667, cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/configuration/CayenneModule.java)
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/configuration/CayenneServerModule.java?p2=cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/configuration/CayenneServerModule.java&p1=cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/configuration/CayenneModule.java&r1=887667&r2=887668&rev=887668&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/configuration/CayenneModule.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/configuration/CayenneServerModule.java Sun Dec 6 11:23:18 2009
@@ -19,9 +19,10 @@
package org.apache.cayenne.configuration;
import org.apache.cayenne.DataChannel;
+import org.apache.cayenne.ObjectContext;
+import org.apache.cayenne.access.DataDomain;
import org.apache.cayenne.access.dbsync.SchemaUpdateStrategy;
import org.apache.cayenne.access.dbsync.SkipSchemaUpdateStrategy;
-import org.apache.cayenne.dba.DbAdapter;
import org.apache.cayenne.dba.db2.DB2Sniffer;
import org.apache.cayenne.dba.derby.DerbySniffer;
import org.apache.cayenne.dba.frontbase.FrontBaseSniffer;
@@ -41,20 +42,21 @@
import org.apache.cayenne.resource.ClassLoaderResourceLocator;
import org.apache.cayenne.resource.ResourceLocator;
import org.apache.cayenne.runtime.CayenneRuntime;
+import org.apache.cayenne.runtime.DataContextProvider;
import org.apache.cayenne.runtime.DataDomainProvider;
/**
- * A DI module containing all Cayenne runtime configurations. To customize Cayenne runtime
- * configuration, either extend this module, or supply an extra custom module when
+ * A DI module containing all Cayenne server runtime configurations. To customize Cayenne
+ * runtime configuration, either extend this module, or supply an extra custom module when
* creating {@link CayenneRuntime}.
*
* @since 3.1
*/
-public class CayenneModule implements Module {
+public class CayenneServerModule implements Module {
protected String runtimeName;
- public CayenneModule(String runtimeName) {
+ public CayenneServerModule(String runtimeName) {
this.runtimeName = runtimeName;
}
@@ -68,7 +70,7 @@
// configure known DbAdapter detectors in reverse order of popularity. Users can
// add their own for their own to install custom adapters automatically
binder
- .bindList(DbAdapter.class)
+ .bindList(DbAdapterFactory.class)
.add(new OpenBaseSniffer())
.add(new FrontBaseSniffer())
.add(new IngresSniffer())
@@ -86,8 +88,13 @@
binder.bind(AdhocObjectFactory.class).to(DefaultAdhocObjectFactory.class).in(
Scopes.SINGLETON);
- // a service to provide the main stack DataChannel
- binder.bind(DataChannel.class).toProvider(DataDomainProvider.class);
+ // a service to provide the main stack DataDomain
+ binder.bind(DataDomain.class).toProvider(DataDomainProvider.class).in(Scopes.SINGLETON);
+
+ // will return DataDomain for request for a DataChannel
+ binder.bind(DataChannel.class).toProvider(DomainDataChannelProvider.class).in(Scopes.SINGLETON);
+
+ binder.bind(ObjectContext.class).toProvider(DataContextProvider.class);
// a service to load project XML descriptors
binder.bind(DataChannelDescriptorLoader.class).to(
Added: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/configuration/DomainDataChannelProvider.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/configuration/DomainDataChannelProvider.java?rev=887668&view=auto
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/configuration/DomainDataChannelProvider.java (added)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/configuration/DomainDataChannelProvider.java Sun Dec 6 11:23:18 2009
@@ -0,0 +1,41 @@
+/*****************************************************************
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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.
+ ****************************************************************/
+package org.apache.cayenne.configuration;
+
+import org.apache.cayenne.DataChannel;
+import org.apache.cayenne.access.DataDomain;
+import org.apache.cayenne.di.DIException;
+import org.apache.cayenne.di.Inject;
+import org.apache.cayenne.di.Provider;
+
+/**
+ * This is a default implementation of a DataChannel provider that simply returns a
+ * DataDomain for a given runtime.
+ *
+ * @since 3.1
+ */
+public class DomainDataChannelProvider implements Provider<DataChannel> {
+
+ @Inject
+ protected DataDomain dataDomain;
+
+ public DataChannel get() throws DIException {
+ return dataDomain;
+ }
+}
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/configuration/SAXNestedTagHandler.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/configuration/SAXNestedTagHandler.java?rev=887668&r1=887667&r2=887668&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/configuration/SAXNestedTagHandler.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/configuration/SAXNestedTagHandler.java Sun Dec 6 11:23:18 2009
@@ -18,6 +18,10 @@
****************************************************************/
package org.apache.cayenne.configuration;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+
import org.xml.sax.Attributes;
import org.xml.sax.ContentHandler;
import org.xml.sax.Locator;
@@ -68,6 +72,21 @@
}
}
+ protected String unexpectedTagMessage(String tagFound, String... tagsExpected) {
+
+ List<String> expected = tagsExpected != null
+ ? Arrays.asList(tagsExpected)
+ : Collections.<String> emptyList();
+
+ return String
+ .format(
+ "tag <%s> is unexpected at [%d,%d]. The following tags are allowed here: %s",
+ tagFound,
+ locator.getColumnNumber(),
+ locator.getLineNumber(),
+ expected);
+ }
+
protected ContentHandler createChildTagHandler(
String namespaceURI,
String localName,
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/configuration/XMLDataChannelDescriptorLoader.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/configuration/XMLDataChannelDescriptorLoader.java?rev=887668&r1=887667&r2=887668&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/configuration/XMLDataChannelDescriptorLoader.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/configuration/XMLDataChannelDescriptorLoader.java Sun Dec 6 11:23:18 2009
@@ -50,7 +50,10 @@
public DataChannelDescriptor load(String runtimeName) throws CayenneRuntimeException {
- logger.debug("starting configuration loading: " + runtimeName);
+ long t0 = System.currentTimeMillis();
+ if (logger.isDebugEnabled()) {
+ logger.debug("starting configuration loading: " + runtimeName);
+ }
String resourceName = getResourceName(runtimeName);
Collection<Resource> configurations = resourceLocator.findResources(resourceName);
@@ -73,11 +76,20 @@
}
DataChannelDescriptor descriptor = new XMLDataChannelDescriptorLoaderAction(
- dataMapLoader).load(configurationResource);
+ dataMapLoader,
+ logger).load(configurationResource);
descriptor.setName(runtimeName);
- logger.debug("finished configuration loading: " + runtimeName);
+ long t1 = System.currentTimeMillis();
+
+ if (logger.isDebugEnabled()) {
+ logger.debug("finished configuration loading: "
+ + runtimeName
+ + " in "
+ + (t1 - t0)
+ + " ms.");
+ }
return descriptor;
}
}
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/configuration/XMLDataChannelDescriptorLoaderAction.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/configuration/XMLDataChannelDescriptorLoaderAction.java?rev=887668&r1=887667&r2=887668&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/configuration/XMLDataChannelDescriptorLoaderAction.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/configuration/XMLDataChannelDescriptorLoaderAction.java Sun Dec 6 11:23:18 2009
@@ -27,7 +27,6 @@
import org.apache.cayenne.resource.Resource;
import org.apache.cayenne.util.Util;
import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.xml.sax.Attributes;
import org.xml.sax.ContentHandler;
import org.xml.sax.InputSource;
@@ -41,9 +40,6 @@
*/
class XMLDataChannelDescriptorLoaderAction {
- private static Log logger = LogFactory
- .getLog(XMLDataChannelDescriptorLoaderAction.class);
-
static final String DOMAIN_TAG = "domain";
static final String MAP_TAG = "map";
static final String NODE_TAG = "node";
@@ -51,9 +47,11 @@
static final String MAP_REF_TAG = "map-ref";
private DataMapLoader mapLoader;
+ private Log logger;
- XMLDataChannelDescriptorLoaderAction(DataMapLoader mapLoader) {
+ XMLDataChannelDescriptorLoaderAction(DataMapLoader mapLoader, Log logger) {
this.mapLoader = mapLoader;
+ this.logger = logger;
}
DataChannelDescriptor load(Resource resource) {
@@ -118,6 +116,7 @@
return new DataChannelChildrenHandler(parser, this);
}
+ logger.info(unexpectedTagMessage(localName, DOMAIN_TAG));
return super.createChildTagHandler(namespaceURI, localName, name, atts);
}
}
@@ -172,9 +171,8 @@
String location = attributes.getValue("", "datasource");
nodeDescriptor.setLocation(location);
- nodeDescriptor.setDataSourceFactoryType(attributes.getValue(
- "",
- "factory"));
+ nodeDescriptor.setDataSourceFactoryType(attributes
+ .getValue("", "factory"));
nodeDescriptor.setSchemaUpdateStrategyType(attributes.getValue(
"",
"schema-update-strategy"));
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/runtime/CayenneRuntime.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/runtime/CayenneRuntime.java?rev=887668&r1=887667&r2=887668&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/runtime/CayenneRuntime.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/runtime/CayenneRuntime.java Sun Dec 6 11:23:18 2009
@@ -20,37 +20,24 @@
import org.apache.cayenne.DataChannel;
import org.apache.cayenne.ObjectContext;
-import org.apache.cayenne.configuration.CayenneModule;
import org.apache.cayenne.di.DIBootstrap;
import org.apache.cayenne.di.Injector;
import org.apache.cayenne.di.Module;
/**
- * Represents the main access point to a given Cayenne stack. Provides a default Cayenne
- * configuration as well as a way to customize this configuration via a built in
- * dependency injection container.
+ * A superclass of possible Cayenne runtime objects. A CayenneRuntime is the main access
+ * point to a given Cayenne stack. It provides a default Cayenne configuration as well as
+ * a way to customize this configuration via a built in dependency injection container.
*
* @since 3.1
*/
-public class CayenneRuntime {
+public abstract class CayenneRuntime {
protected String name;
protected Injector injector;
protected Module[] modules;
/**
- * Initializes Cayenne runtime instance with a default configuration provided by
- * {@link CayenneModule}.
- *
- * @param name Runtime name. By default a configuration file name contains a runtime
- * name in it, to allow multiple runtimes in a single JVM. E.g. a typical
- * config file name has the form of "cayenne-<name>.xml".
- */
- public CayenneRuntime(String name) {
- this(name, new CayenneModule(name));
- }
-
- /**
* Initializes Cayenne runtime with an array of DI modules.
*/
public CayenneRuntime(String name, Module... modules) {
@@ -94,7 +81,7 @@
/**
* Creates and returns an ObjectContext based on the runtime DataChannel.
*/
- public ObjectContext newObjectContext() {
+ public ObjectContext newContext() {
return injector.getInstance(ObjectContext.class);
}
}
Added: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/runtime/CayenneServerRuntime.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/runtime/CayenneServerRuntime.java?rev=887668&view=auto
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/runtime/CayenneServerRuntime.java (added)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/runtime/CayenneServerRuntime.java Sun Dec 6 11:23:18 2009
@@ -0,0 +1,52 @@
+/*****************************************************************
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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.
+ ****************************************************************/
+package org.apache.cayenne.runtime;
+
+import org.apache.cayenne.access.DataDomain;
+import org.apache.cayenne.configuration.CayenneServerModule;
+import org.apache.cayenne.di.Module;
+
+/**
+ * A runtime representing Cayenne server-stack that connects directly to the database via
+ * JDBC. The term "server" is used as opposed to ROP "client". Any application, desktop,
+ * server, etc. that has a direct JDBC connection should be using this runtime.
+ *
+ * @since 3.1
+ */
+public class CayenneServerRuntime extends CayenneRuntime {
+
+ public CayenneServerRuntime(String name) {
+ super(name, new CayenneServerModule(name));
+ }
+
+ public CayenneServerRuntime(String name, Module... modules) {
+ super(name, modules);
+ }
+
+ /**
+ * Returns the main runtime DataDomain. Note that by default the returned DataDomain
+ * is the same as the main DataChannel returned by {@link #getDataChannel()}. Although
+ * users may redefine DataChannel provider in the DI registry, for instance to
+ * decorate this DataDomain with a custom wrapper.
+ */
+ public DataDomain getDataDomain() {
+ return injector.getInstance(DataDomain.class);
+ }
+
+}
Added: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/runtime/DataContextProvider.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/runtime/DataContextProvider.java?rev=887668&view=auto
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/runtime/DataContextProvider.java (added)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/runtime/DataContextProvider.java Sun Dec 6 11:23:18 2009
@@ -0,0 +1,40 @@
+/*****************************************************************
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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.
+ ****************************************************************/
+package org.apache.cayenne.runtime;
+
+import org.apache.cayenne.access.DataContext;
+import org.apache.cayenne.access.DataDomain;
+import org.apache.cayenne.di.DIException;
+import org.apache.cayenne.di.Inject;
+import org.apache.cayenne.di.Provider;
+
+/**
+ * @since 3.1
+ */
+public class DataContextProvider implements Provider<DataContext> {
+
+ @Inject
+ protected DataDomain dataDomain;
+
+ public DataContext get() throws DIException {
+ // TODO: andrus 12.5.2009 - deprecate 'createDataContext' in DataDomain and move
+ // it to this provider instead
+ return dataDomain.createDataContext();
+ }
+}
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/runtime/DataDomainProvider.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/runtime/DataDomainProvider.java?rev=887668&r1=887667&r2=887668&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/runtime/DataDomainProvider.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/runtime/DataDomainProvider.java Sun Dec 6 11:23:18 2009
@@ -43,7 +43,7 @@
*
* @since 3.1
*/
-public class DataDomainProvider implements Provider<DataChannel> {
+public class DataDomainProvider implements Provider<DataDomain> {
@Inject
protected DataChannelDescriptorLoader loader;
@@ -63,13 +63,13 @@
@Inject
protected AdhocObjectFactory objectFactory;
- protected volatile DataChannel dataChannel;
+ protected volatile DataDomain dataDomain;
- public DataChannel get() throws DIException {
+ public DataDomain get() throws DIException {
- if (dataChannel == null) {
+ if (dataDomain == null) {
synchronized (this) {
- if (dataChannel == null) {
+ if (dataDomain == null) {
try {
createDataChannel();
@@ -85,7 +85,7 @@
}
}
- return dataChannel;
+ return dataDomain;
}
protected void createDataChannel() throws Exception {
@@ -93,12 +93,12 @@
.get(RuntimeProperties.CAYENNE_RUNTIME_NAME);
DataChannelDescriptor descriptor = loader.load(runtimeName);
- DataDomain dataChannel = new DataDomain(descriptor.getName());
+ DataDomain dataDomain = new DataDomain(descriptor.getName());
- dataChannel.initWithProperties(descriptor.getProperties());
+ dataDomain.initWithProperties(descriptor.getProperties());
for (DataMap dataMap : descriptor.getDataMaps()) {
- dataChannel.addMap(dataMap);
+ dataDomain.addMap(dataMap);
}
for (DataNodeDescriptor nodeDescriptor : descriptor.getDataNodeDescriptors()) {
@@ -138,13 +138,13 @@
// DataMaps
for (String dataMapName : nodeDescriptor.getDataMapNames()) {
- dataNode.addDataMap(dataChannel.getMap(dataMapName));
+ dataNode.addDataMap(dataDomain.getMap(dataMapName));
}
- dataChannel.addNode(dataNode);
+ dataDomain.addNode(dataNode);
}
- this.dataChannel = dataChannel;
+ this.dataDomain = dataDomain;
}
}
Copied: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/runtime/CayenneServerRuntimeTest.java (from r887667, cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/runtime/CayenneRuntimeTest.java)
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/runtime/CayenneServerRuntimeTest.java?p2=cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/runtime/CayenneServerRuntimeTest.java&p1=cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/runtime/CayenneRuntimeTest.java&r1=887667&r2=887668&rev=887668&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/runtime/CayenneRuntimeTest.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/runtime/CayenneServerRuntimeTest.java Sun Dec 6 11:23:18 2009
@@ -24,24 +24,23 @@
import org.apache.cayenne.ObjectContext;
import org.apache.cayenne.QueryResponse;
import org.apache.cayenne.access.DataContext;
-import org.apache.cayenne.configuration.CayenneModule;
+import org.apache.cayenne.configuration.CayenneServerModule;
import org.apache.cayenne.di.Binder;
import org.apache.cayenne.di.Module;
import org.apache.cayenne.event.EventManager;
import org.apache.cayenne.graph.GraphDiff;
import org.apache.cayenne.map.EntityResolver;
import org.apache.cayenne.query.Query;
-import org.apache.cayenne.runtime.CayenneRuntime;
-public class CayenneRuntimeTest extends TestCase {
+public class CayenneServerRuntimeTest extends TestCase {
public void testDefaultConstructor() {
- CayenneRuntime runtime = new CayenneRuntime("xxxx");
+ CayenneServerRuntime runtime = new CayenneServerRuntime("xxxx");
assertEquals("xxxx", runtime.getName());
assertEquals(1, runtime.getModules().length);
- assertTrue(runtime.getModules()[0] instanceof CayenneModule);
+ assertTrue(runtime.getModules()[0] instanceof CayenneServerModule);
}
public void testConstructor_Modules() {
@@ -62,7 +61,7 @@
}
};
- CayenneRuntime runtime = new CayenneRuntime("yyyy", m1, m2);
+ CayenneServerRuntime runtime = new CayenneServerRuntime("yyyy", m1, m2);
assertEquals("yyyy", runtime.getName());
assertEquals(2, runtime.getModules().length);
@@ -102,7 +101,7 @@
}
};
- CayenneRuntime runtime = new CayenneRuntime("name", module);
+ CayenneServerRuntime runtime = new CayenneServerRuntime("name", module);
assertSame(channel, runtime.getDataChannel());
}
@@ -116,8 +115,8 @@
}
};
- CayenneRuntime runtime = new CayenneRuntime("name", module);
- assertSame(context, runtime.newObjectContext());
- assertSame(context, runtime.newObjectContext());
+ CayenneServerRuntime runtime = new CayenneServerRuntime("name", module);
+ assertSame(context, runtime.newContext());
+ assertSame(context, runtime.newContext());
}
}
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/runtime/DataDomainProviderTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/runtime/DataDomainProviderTest.java?rev=887668&r1=887667&r2=887668&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/runtime/DataDomainProviderTest.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/runtime/DataDomainProviderTest.java Sun Dec 6 11:23:18 2009
@@ -18,8 +18,6 @@
****************************************************************/
package org.apache.cayenne.runtime;
-import java.sql.DatabaseMetaData;
-import java.sql.SQLException;
import java.util.Collections;
import javax.sql.DataSource;
@@ -38,14 +36,14 @@
import org.apache.cayenne.configuration.DataChannelDescriptorLoader;
import org.apache.cayenne.configuration.DataNodeDescriptor;
import org.apache.cayenne.configuration.DataSourceFactoryLoader;
+import org.apache.cayenne.configuration.DbAdapterFactory;
import org.apache.cayenne.configuration.DefaultAdhocObjectFactory;
import org.apache.cayenne.configuration.DefaultRuntimeProperties;
import org.apache.cayenne.configuration.RuntimeProperties;
import org.apache.cayenne.configuration.mock.MockDataSourceFactory;
import org.apache.cayenne.configuration.mock.MockDataSourceFactoryLoader;
-import org.apache.cayenne.dba.AutoAdapter;
import org.apache.cayenne.dba.DbAdapter;
-import org.apache.cayenne.dba.DbAdapterFactory;
+import org.apache.cayenne.dba.MockDbAdapter;
import org.apache.cayenne.dba.oracle.OracleAdapter;
import org.apache.cayenne.di.Binder;
import org.apache.cayenne.di.DIBootstrap;
@@ -53,8 +51,6 @@
import org.apache.cayenne.di.Module;
import org.apache.cayenne.map.DataMap;
-import com.mockrunner.mock.jdbc.MockDataSource;
-
public class DataDomainProviderTest extends TestCase {
public void testGet() {
@@ -109,14 +105,19 @@
new SkipSchemaUpdateStrategy());
binder.bind(DbAdapterFactory.class).toInstance(new DbAdapterFactory() {
- public DbAdapter createAdapter(DatabaseMetaData md)
- throws SQLException {
- throw new UnsupportedOperationException("TODO");
+ public DbAdapter createAdapter(
+ DataNodeDescriptor nodeDescriptor,
+ DataSource dataSource) throws Exception {
+
+ if (nodeDescriptor.getAdapterType() != null) {
+ return (DbAdapter) Class.forName(
+ nodeDescriptor.getAdapterType()).newInstance();
+ }
+
+ return new MockDbAdapter();
}
});
- binder.bind(DataSource.class).toInstance(new MockDataSource());
- binder.bind(DbAdapter.class).to(AutoAdapter.class);
binder.bind(DataSourceFactoryLoader.class).toInstance(
new MockDataSourceFactoryLoader());
binder.bind(AdhocObjectFactory.class).to(DefaultAdhocObjectFactory.class);
@@ -183,6 +184,6 @@
.getName());
assertNotNull(node2.getAdapter());
- assertEquals(AutoAdapter.class, node2.getAdapter().getClass());
+ assertEquals(MockDbAdapter.class, node2.getAdapter().getClass());
}
}
Added: cayenne/main/trunk/itests/cayenne-di-stack/.classpath
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/itests/cayenne-di-stack/.classpath?rev=887668&view=auto
==============================================================================
--- cayenne/main/trunk/itests/cayenne-di-stack/.classpath (added)
+++ cayenne/main/trunk/itests/cayenne-di-stack/.classpath Sun Dec 6 11:23:18 2009
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="src" output="target/classes" path="src/main/java"/>
+ <classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources"/>
+ <classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+ <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
+ <classpathentry kind="output" path="target/classes"/>
+</classpath>
Added: cayenne/main/trunk/itests/cayenne-di-stack/.project
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/itests/cayenne-di-stack/.project?rev=887668&view=auto
==============================================================================
--- cayenne/main/trunk/itests/cayenne-di-stack/.project (added)
+++ cayenne/main/trunk/itests/cayenne-di-stack/.project Sun Dec 6 11:23:18 2009
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>cayenne-di-stack</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <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: cayenne/main/trunk/itests/cayenne-di-stack/.settings/org.eclipse.jdt.core.prefs
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/itests/cayenne-di-stack/.settings/org.eclipse.jdt.core.prefs?rev=887668&view=auto
==============================================================================
--- cayenne/main/trunk/itests/cayenne-di-stack/.settings/org.eclipse.jdt.core.prefs (added)
+++ cayenne/main/trunk/itests/cayenne-di-stack/.settings/org.eclipse.jdt.core.prefs Sun Dec 6 11:23:18 2009
@@ -0,0 +1,5 @@
+#Sat Dec 05 19:10:26 EET 2009
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.source=1.5
Added: cayenne/main/trunk/itests/cayenne-di-stack/.settings/org.maven.ide.eclipse.prefs
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/itests/cayenne-di-stack/.settings/org.maven.ide.eclipse.prefs?rev=887668&view=auto
==============================================================================
--- cayenne/main/trunk/itests/cayenne-di-stack/.settings/org.maven.ide.eclipse.prefs (added)
+++ cayenne/main/trunk/itests/cayenne-di-stack/.settings/org.maven.ide.eclipse.prefs Sun Dec 6 11:23:18 2009
@@ -0,0 +1,9 @@
+#Sat Dec 05 19:10:25 EET 2009
+activeProfiles=
+eclipse.preferences.version=1
+fullBuildGoals=process-test-resources
+includeModules=false
+resolveWorkspaceProjects=true
+resourceFilterGoals=process-resources resources\:testResources
+skipCompilerPlugin=true
+version=1
Copied: cayenne/main/trunk/itests/cayenne-di-stack/pom.xml (from r887667, cayenne/main/trunk/itests/pom.xml)
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/itests/cayenne-di-stack/pom.xml?p2=cayenne/main/trunk/itests/cayenne-di-stack/pom.xml&p1=cayenne/main/trunk/itests/pom.xml&r1=887667&r2=887668&rev=887668&view=diff
==============================================================================
--- cayenne/main/trunk/itests/pom.xml (original)
+++ cayenne/main/trunk/itests/cayenne-di-stack/pom.xml Sun Dec 6 11:23:18 2009
@@ -17,42 +17,56 @@
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.itests</groupId>
+ <artifactId>cayenne-itests-parent</artifactId>
+ <version>3.1-SNAPSHOT</version>
+ </parent>
+
+ <description>Integration Tests - Cayenne DI Stack</description>
+ <artifactId>cayenne-di-stack</artifactId>
+ <name>Integration Tests - Cayenne DI Stack</name>
+ <packaging>jar</packaging>
+
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>compile</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.cayenne.itests</groupId>
+ <artifactId>itest-common</artifactId>
+ <version>${version}</version>
+ </dependency>
+
+ </dependencies>
-<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.1-SNAPSHOT</version>
- </parent>
-
- <groupId>org.apache.cayenne.itests</groupId>
- <artifactId>cayenne-itests-parent</artifactId>
- <name>Cayenne Integration Tests Parent</name>
- <packaging>pom</packaging>
-
- <modules>
- <module>itest-common</module>
- <module>jpa-chapter2</module>
- <module>jpa-chapter3</module>
- <module>jpa-chapter5</module>
- <module>jpa-chapter6</module>
- <module>jpa-chapter9</module>
- </modules>
<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-deploy-plugin</artifactId>
<configuration>
<skip>true</skip>
</configuration>
</plugin>
+
</plugins>
</build>
</project>
Added: cayenne/main/trunk/itests/cayenne-di-stack/src/main/java/org/apache/cayenne/itest/di_stack/DefaultMap.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/itests/cayenne-di-stack/src/main/java/org/apache/cayenne/itest/di_stack/DefaultMap.java?rev=887668&view=auto
==============================================================================
--- cayenne/main/trunk/itests/cayenne-di-stack/src/main/java/org/apache/cayenne/itest/di_stack/DefaultMap.java (added)
+++ cayenne/main/trunk/itests/cayenne-di-stack/src/main/java/org/apache/cayenne/itest/di_stack/DefaultMap.java Sun Dec 6 11:23:18 2009
@@ -0,0 +1,18 @@
+package org.apache.cayenne.itest.di_stack;
+
+import org.apache.cayenne.itest.di_stack.auto._DefaultMap;
+
+public class DefaultMap extends _DefaultMap {
+
+ private static DefaultMap instance;
+
+ private DefaultMap() {}
+
+ public static DefaultMap getInstance() {
+ if(instance == null) {
+ instance = new DefaultMap();
+ }
+
+ return instance;
+ }
+}
Added: cayenne/main/trunk/itests/cayenne-di-stack/src/main/java/org/apache/cayenne/itest/di_stack/Table1.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/itests/cayenne-di-stack/src/main/java/org/apache/cayenne/itest/di_stack/Table1.java?rev=887668&view=auto
==============================================================================
--- cayenne/main/trunk/itests/cayenne-di-stack/src/main/java/org/apache/cayenne/itest/di_stack/Table1.java (added)
+++ cayenne/main/trunk/itests/cayenne-di-stack/src/main/java/org/apache/cayenne/itest/di_stack/Table1.java Sun Dec 6 11:23:18 2009
@@ -0,0 +1,7 @@
+package org.apache.cayenne.itest.di_stack;
+
+import org.apache.cayenne.itest.di_stack.auto._Table1;
+
+public class Table1 extends _Table1 {
+
+}
Added: cayenne/main/trunk/itests/cayenne-di-stack/src/main/java/org/apache/cayenne/itest/di_stack/auto/_DefaultMap.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/itests/cayenne-di-stack/src/main/java/org/apache/cayenne/itest/di_stack/auto/_DefaultMap.java?rev=887668&view=auto
==============================================================================
--- cayenne/main/trunk/itests/cayenne-di-stack/src/main/java/org/apache/cayenne/itest/di_stack/auto/_DefaultMap.java (added)
+++ cayenne/main/trunk/itests/cayenne-di-stack/src/main/java/org/apache/cayenne/itest/di_stack/auto/_DefaultMap.java Sun Dec 6 11:23:18 2009
@@ -0,0 +1,12 @@
+package org.apache.cayenne.itest.di_stack.auto;
+
+
+
+/**
+ * This class 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 _DefaultMap {
+}
\ No newline at end of file
Added: cayenne/main/trunk/itests/cayenne-di-stack/src/main/java/org/apache/cayenne/itest/di_stack/auto/_Table1.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/itests/cayenne-di-stack/src/main/java/org/apache/cayenne/itest/di_stack/auto/_Table1.java?rev=887668&view=auto
==============================================================================
--- cayenne/main/trunk/itests/cayenne-di-stack/src/main/java/org/apache/cayenne/itest/di_stack/auto/_Table1.java (added)
+++ cayenne/main/trunk/itests/cayenne-di-stack/src/main/java/org/apache/cayenne/itest/di_stack/auto/_Table1.java Sun Dec 6 11:23:18 2009
@@ -0,0 +1,24 @@
+package org.apache.cayenne.itest.di_stack.auto;
+
+import org.apache.cayenne.CayenneDataObject;
+
+/**
+ * Class _Table1 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 abstract class _Table1 extends CayenneDataObject {
+
+ public static final String NAME_PROPERTY = "name";
+
+ public static final String ID_PK_COLUMN = "ID";
+
+ public void setName(String name) {
+ writeProperty("name", name);
+ }
+ public String getName() {
+ return (String)readProperty("name");
+ }
+
+}
Added: cayenne/main/trunk/itests/cayenne-di-stack/src/main/java/org/apache/cayenne/runtime/CayenneServerRuntimeCase.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/itests/cayenne-di-stack/src/main/java/org/apache/cayenne/runtime/CayenneServerRuntimeCase.java?rev=887668&view=auto
==============================================================================
--- cayenne/main/trunk/itests/cayenne-di-stack/src/main/java/org/apache/cayenne/runtime/CayenneServerRuntimeCase.java (added)
+++ cayenne/main/trunk/itests/cayenne-di-stack/src/main/java/org/apache/cayenne/runtime/CayenneServerRuntimeCase.java Sun Dec 6 11:23:18 2009
@@ -0,0 +1,69 @@
+package org.apache.cayenne.runtime;
+
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Map;
+
+import junit.framework.TestCase;
+
+import org.apache.cayenne.access.DataNode;
+import org.apache.cayenne.access.dbsync.CreateIfNoSchemaStrategy;
+import org.apache.cayenne.access.dbsync.SchemaUpdateStrategy;
+import org.apache.cayenne.itest.ItestDBUtils;
+import org.apache.cayenne.itest.ItestTableUtils;
+
+public abstract class CayenneServerRuntimeCase extends TestCase {
+
+ static final Map<RuntimeName, CayenneServerRuntime> runtimeCache;
+
+ static {
+ runtimeCache = new HashMap<RuntimeName, CayenneServerRuntime>();
+ }
+
+ protected CayenneServerRuntime runtime;
+
+ @Override
+ protected void setUp() throws Exception {
+
+ RuntimeName name = getRuntimeName();
+ assertNotNull(name);
+
+ runtime = runtimeCache.get(name);
+ if (runtime == null) {
+ runtime = new CayenneServerRuntime(name.name());
+ runtimeCache.put(name, runtime);
+
+ // setup schema
+
+ // TODO: should that be drop/create?
+ SchemaUpdateStrategy dbCreator = new CreateIfNoSchemaStrategy();
+ dbCreator.updateSchema(getDataNode());
+ }
+ }
+
+ @Override
+ protected void tearDown() throws Exception {
+ runtime = null;
+ }
+
+ protected abstract RuntimeName getRuntimeName();
+
+ protected ItestDBUtils getDbUtils() {
+
+ return new ItestDBUtils(getDataNode().getDataSource());
+ }
+
+ protected ItestTableUtils getTableHelper(String tableName) {
+ return new ItestTableUtils(getDbUtils(), tableName);
+ }
+
+ private DataNode getDataNode() {
+ Collection<DataNode> nodes = runtime.getDataDomain().getDataNodes();
+ assertFalse("Can't find DataSource - no nodes configured", nodes
+ .isEmpty());
+ assertEquals("Can't find DataSource - multiple nodes found", 1, nodes
+ .size());
+
+ return nodes.iterator().next();
+ }
+}
Added: cayenne/main/trunk/itests/cayenne-di-stack/src/main/java/org/apache/cayenne/runtime/RuntimeName.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/itests/cayenne-di-stack/src/main/java/org/apache/cayenne/runtime/RuntimeName.java?rev=887668&view=auto
==============================================================================
--- cayenne/main/trunk/itests/cayenne-di-stack/src/main/java/org/apache/cayenne/runtime/RuntimeName.java (added)
+++ cayenne/main/trunk/itests/cayenne-di-stack/src/main/java/org/apache/cayenne/runtime/RuntimeName.java Sun Dec 6 11:23:18 2009
@@ -0,0 +1,6 @@
+package org.apache.cayenne.runtime;
+
+public enum RuntimeName {
+
+ DEFAULT
+}
Added: cayenne/main/trunk/itests/cayenne-di-stack/src/main/resources/DefaultMap.map.xml
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/itests/cayenne-di-stack/src/main/resources/DefaultMap.map.xml?rev=887668&view=auto
==============================================================================
--- cayenne/main/trunk/itests/cayenne-di-stack/src/main/resources/DefaultMap.map.xml (added)
+++ cayenne/main/trunk/itests/cayenne-di-stack/src/main/resources/DefaultMap.map.xml Sun Dec 6 11:23:18 2009
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<data-map xmlns="http://cayenne.apache.org/schema/3.0/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="3.0.0.1">
+ <property name="defaultPackage" value="org.apache.cayenne.itest.di_stack"/>
+ <db-entity name="TABLE1">
+ <db-attribute name="ID" type="BIGINT" isPrimaryKey="true" isMandatory="true"/>
+ <db-attribute name="NAME" type="VARCHAR" length="255"/>
+ </db-entity>
+ <obj-entity name="Table1" className="org.apache.cayenne.itest.di_stack.Table1" dbEntityName="TABLE1">
+ <obj-attribute name="name" type="java.lang.String" db-attribute-path="NAME"/>
+ </obj-entity>
+</data-map>
Added: cayenne/main/trunk/itests/cayenne-di-stack/src/main/resources/PoolingDSNode.driver.xml
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/itests/cayenne-di-stack/src/main/resources/PoolingDSNode.driver.xml?rev=887668&view=auto
==============================================================================
--- cayenne/main/trunk/itests/cayenne-di-stack/src/main/resources/PoolingDSNode.driver.xml (added)
+++ cayenne/main/trunk/itests/cayenne-di-stack/src/main/resources/PoolingDSNode.driver.xml Sun Dec 6 11:23:18 2009
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<driver project-version="3.0.0.1" class="org.hsqldb.jdbcDriver">
+ <url value="jdbc:hsqldb:mem:DEFAULT"/>
+ <connectionPool min="1" max="1"/>
+ <login/>
+</driver>
Added: cayenne/main/trunk/itests/cayenne-di-stack/src/main/resources/cayenne-DEFAULT.xml
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/itests/cayenne-di-stack/src/main/resources/cayenne-DEFAULT.xml?rev=887668&view=auto
==============================================================================
--- cayenne/main/trunk/itests/cayenne-di-stack/src/main/resources/cayenne-DEFAULT.xml (added)
+++ cayenne/main/trunk/itests/cayenne-di-stack/src/main/resources/cayenne-DEFAULT.xml Sun Dec 6 11:23:18 2009
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<domain name="DefaultDomain" project-version="3.0.0.1">
+ <map name="DefaultMap" location="DefaultMap.map.xml"/>
+
+ <node name="PoolingDSNode"
+ datasource="PoolingDSNode.driver.xml"
+ factory="org.apache.cayenne.configuration.XMLPoolingDataSourceFactory">
+ <map-ref name="DefaultMap"/>
+ </node>
+</domain>
Added: cayenne/main/trunk/itests/cayenne-di-stack/src/main/resources/log4j.properties
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/itests/cayenne-di-stack/src/main/resources/log4j.properties?rev=887668&view=auto
==============================================================================
--- cayenne/main/trunk/itests/cayenne-di-stack/src/main/resources/log4j.properties (added)
+++ cayenne/main/trunk/itests/cayenne-di-stack/src/main/resources/log4j.properties Sun Dec 6 11:23:18 2009
@@ -0,0 +1,6 @@
+log4j.rootLogger=WARN, A1
+log4j.appender.A1=org.apache.log4j.ConsoleAppender
+log4j.appender.A1.layout=org.apache.log4j.PatternLayout
+log4j.appender.A1.layout.ConversionPattern=[%d{dd/MMM/yyyy:HH:mm:ss}] %t %x %-5p %c{1}: %m%n
+
+log4j.logger.org.apache.cayenne=DEBUG
\ No newline at end of file
Added: cayenne/main/trunk/itests/cayenne-di-stack/src/test/java/org/apache/cayenne/runtime/CayenneServerRuntimeIntegrationTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/itests/cayenne-di-stack/src/test/java/org/apache/cayenne/runtime/CayenneServerRuntimeIntegrationTest.java?rev=887668&view=auto
==============================================================================
--- cayenne/main/trunk/itests/cayenne-di-stack/src/test/java/org/apache/cayenne/runtime/CayenneServerRuntimeIntegrationTest.java (added)
+++ cayenne/main/trunk/itests/cayenne-di-stack/src/test/java/org/apache/cayenne/runtime/CayenneServerRuntimeIntegrationTest.java Sun Dec 6 11:23:18 2009
@@ -0,0 +1,61 @@
+package org.apache.cayenne.runtime;
+
+import org.apache.cayenne.Cayenne;
+import org.apache.cayenne.ObjectContext;
+import org.apache.cayenne.access.DataDomain;
+import org.apache.cayenne.itest.ItestDBUtils;
+import org.apache.cayenne.itest.di_stack.Table1;
+import org.apache.cayenne.query.SelectQuery;
+
+public class CayenneServerRuntimeIntegrationTest extends
+ CayenneServerRuntimeCase {
+
+ @Override
+ protected RuntimeName getRuntimeName() {
+ return RuntimeName.DEFAULT;
+ }
+
+ public void testGetDomain_singleton() {
+
+ DataDomain domain1 = runtime.getDataDomain();
+ assertNotNull(domain1);
+
+ DataDomain domain2 = runtime.getDataDomain();
+ assertNotNull(domain2);
+
+ assertSame(domain1, domain2);
+ }
+
+ public void testNewContext_notSingleton() {
+
+ ObjectContext context1 = runtime.newContext();
+ assertNotNull(context1);
+
+ ObjectContext context2 = runtime.newContext();
+ assertNotNull(context2);
+
+ assertNotSame(context1, context2);
+ }
+
+ public void testNewContext_separateObjects() throws Exception {
+ ItestDBUtils dbUtils = getDbUtils();
+ dbUtils.deleteAll("TABLE1");
+ dbUtils.insert("TABLE1", new String[] { "ID", "NAME" }, new Object[] {
+ 1, "Abc" });
+
+ SelectQuery query = new SelectQuery(Table1.class);
+
+ ObjectContext context1 = runtime.newContext();
+ ObjectContext context2 = runtime.newContext();
+
+ Table1 o1 = (Table1) Cayenne.objectForQuery(context1, query);
+ Table1 o2 = (Table1) Cayenne.objectForQuery(context2, query);
+
+ assertNotNull(o1);
+ assertNotNull(o2);
+ assertEquals("Abc", o1.getName());
+ assertNotSame(o1, o2);
+ assertEquals(o1.getObjectId(), o2.getObjectId());
+
+ }
+}
Modified: cayenne/main/trunk/itests/pom.xml
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/itests/pom.xml?rev=887668&r1=887667&r2=887668&view=diff
==============================================================================
--- cayenne/main/trunk/itests/pom.xml (original)
+++ cayenne/main/trunk/itests/pom.xml Sun Dec 6 11:23:18 2009
@@ -38,6 +38,7 @@
<modules>
<module>itest-common</module>
+ <module>cayenne-di-stack</module>
<module>jpa-chapter2</module>
<module>jpa-chapter3</module>
<module>jpa-chapter5</module>
Added: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/configuration/DefaultDataSourceFactoryLoaderTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/configuration/DefaultDataSourceFactoryLoaderTest.java?rev=887667&view=auto
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/configuration/DefaultDataSourceFactoryLoaderTest.java
(added)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/configuration/DefaultDataSourceFactoryLoaderTest.java
Sun Dec 6 11:22:19 2009
@@ -0,0 +1,96 @@
+/*****************************************************************
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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.
+ ****************************************************************/
+package org.apache.cayenne.configuration;
+
+import java.net.URL;
+
+import junit.framework.TestCase;
+
+import org.apache.cayenne.configuration.mock.MockDataSourceFactory1;
+import org.apache.cayenne.di.Binder;
+import org.apache.cayenne.di.DIBootstrap;
+import org.apache.cayenne.di.Injector;
+import org.apache.cayenne.di.Module;
+import org.apache.cayenne.resource.ResourceLocator;
+import org.apache.cayenne.resource.URLResource;
+import org.apache.cayenne.resource.mock.MockResourceLocator;
+
+public class DefaultDataSourceFactoryLoaderTest extends TestCase {
+
+ public void testGetDataSourceFactory_Implicit() throws Exception {
+ String baseUrl = getClass().getPackage().getName().replace('.', '/');
+ URL url = getClass().getClassLoader().getResource(
+ baseUrl + "/testNode1.driver.xml");
+ assertNotNull(url);
+
+ DataNodeDescriptor nodeDescriptor = new DataNodeDescriptor();
+ nodeDescriptor.setName("node1");
+ nodeDescriptor.setConfigurationResource(new URLResource(url));
+
+ Module testModule = new Module() {
+
+ public void configure(Binder binder) {
+ binder.bind(AdhocObjectFactory.class).to(DefaultAdhocObjectFactory.class);
+ binder.bind(ResourceLocator.class).to(MockResourceLocator.class);
+ }
+ };
+
+ Injector injector = DIBootstrap.createInjector(testModule);
+
+ DefaultDataSourceFactoryLoader factoryLoader = new DefaultDataSourceFactoryLoader();
+ injector.injectMembers(factoryLoader);
+
+ DataSourceFactory factory = factoryLoader.getDataSourceFactory(nodeDescriptor);
+ assertNotNull(factory);
+ assertTrue(factory instanceof XMLPoolingDataSourceFactory);
+ }
+
+ public void testGetDataSourceFactory_Explicit() throws Exception {
+ String baseUrl = getClass().getPackage().getName().replace('.', '/');
+ URL url = getClass().getClassLoader().getResource(
+ baseUrl + "/testNode1.driver.xml");
+ assertNotNull(url);
+
+ DataNodeDescriptor nodeDescriptor = new DataNodeDescriptor();
+ nodeDescriptor.setName("node1");
+ nodeDescriptor.setConfigurationResource(new URLResource(url));
+ nodeDescriptor.setDataSourceFactoryType(MockDataSourceFactory1.class.getName());
+
+ Module testModule = new Module() {
+
+ public void configure(Binder binder) {
+ binder.bind(AdhocObjectFactory.class).to(DefaultAdhocObjectFactory.class);
+ binder.bind(ResourceLocator.class).to(MockResourceLocator.class);
+ }
+ };
+
+ Injector injector = DIBootstrap.createInjector(testModule);
+
+ DefaultDataSourceFactoryLoader factoryLoader = new DefaultDataSourceFactoryLoader();
+ injector.injectMembers(factoryLoader);
+
+ DataSourceFactory factory = factoryLoader.getDataSourceFactory(nodeDescriptor);
+ assertNotNull(factory);
+ assertTrue(factory instanceof MockDataSourceFactory1);
+ assertSame(
+ "Injection on the factory hasn't been performed",
+ injector,
+ ((MockDataSourceFactory1) factory).getInjector());
+ }
+}
Added: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/configuration/DefaultDbAdapterFactoryTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/configuration/DefaultDbAdapterFactoryTest.java?rev=887667&view=auto
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/configuration/DefaultDbAdapterFactoryTest.java
(added)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/configuration/DefaultDbAdapterFactoryTest.java
Sun Dec 6 11:22:19 2009
@@ -0,0 +1,138 @@
+/*****************************************************************
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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.
+ ****************************************************************/
+package org.apache.cayenne.configuration;
+
+import java.sql.DatabaseMetaData;
+import java.sql.SQLException;
+import java.util.ArrayList;
+import java.util.List;
+
+import junit.framework.TestCase;
+
+import org.apache.cayenne.dba.AutoAdapter;
+import org.apache.cayenne.dba.DbAdapter;
+import org.apache.cayenne.dba.MockDbAdapter;
+import org.apache.cayenne.di.Binder;
+import org.apache.cayenne.di.DIBootstrap;
+import org.apache.cayenne.di.Injector;
+import org.apache.cayenne.di.Module;
+import org.apache.cayenne.map.DbEntity;
+
+import com.mockrunner.mock.jdbc.MockConnection;
+import com.mockrunner.mock.jdbc.MockDataSource;
+
+public class DefaultDbAdapterFactoryTest extends TestCase {
+
+ public void testCreatedAdapter_Auto() throws Exception {
+
+ final DbAdapter adapter = new MockDbAdapter() {
+
+ @Override
+ public String createTable(DbEntity ent) {
+ return "XXXXX";
+ }
+ };
+
+ List<DbAdapterDetector> detectors = new ArrayList<DbAdapterDetector>();
+ detectors.add(new DbAdapterDetector() {
+
+ public DbAdapter createAdapter(DatabaseMetaData md) throws SQLException {
+ return adapter;
+ }
+ });
+
+ MockConnection connection = new MockConnection();
+
+ MockDataSource dataSource = new MockDataSource();
+ dataSource.setupConnection(connection);
+
+ Module testModule = new Module() {
+
+ public void configure(Binder binder) {
+ binder.bind(AdhocObjectFactory.class).to(DefaultAdhocObjectFactory.class);
+ }
+ };
+
+ Injector injector = DIBootstrap.createInjector(testModule);
+
+ DefaultDbAdapterFactory factory = new DefaultDbAdapterFactory(detectors);
+ injector.injectMembers(factory);
+
+ DbAdapter createdAdapter = factory.createAdapter(
+ new DataNodeDescriptor(),
+ dataSource);
+ assertTrue(createdAdapter instanceof AutoAdapter);
+ assertEquals("XXXXX", createdAdapter.createTable(new DbEntity("Test")));
+ }
+
+ public void testCreatedAdapter_Generic() throws Exception {
+
+ List<DbAdapterDetector> detectors = new ArrayList<DbAdapterDetector>();
+
+ Module testModule = new Module() {
+
+ public void configure(Binder binder) {
+ binder.bind(AdhocObjectFactory.class).to(DefaultAdhocObjectFactory.class);
+ }
+ };
+
+ Injector injector = DIBootstrap.createInjector(testModule);
+
+ DefaultDbAdapterFactory factory = new DefaultDbAdapterFactory(detectors);
+ injector.injectMembers(factory);
+
+ DbAdapter createdAdapter = factory.createAdapter(
+ new DataNodeDescriptor(),
+ new MockDataSource());
+ assertNotNull(createdAdapter);
+ assertTrue(
+ "Unexpected class: " + createdAdapter.getClass().getName(),
+ createdAdapter instanceof AutoAdapter);
+ assertEquals("CREATE TABLE Test ()", createdAdapter.createTable(new DbEntity(
+ "Test")));
+ }
+
+ public void testCreatedAdapter_Custom() throws Exception {
+
+ DataNodeDescriptor nodeDescriptor = new DataNodeDescriptor();
+ nodeDescriptor.setAdapterType(MockDbAdapter.class.getName());
+
+ List<DbAdapterDetector> detectors = new ArrayList<DbAdapterDetector>();
+
+ Module testModule = new Module() {
+
+ public void configure(Binder binder) {
+ binder.bind(AdhocObjectFactory.class).to(DefaultAdhocObjectFactory.class);
+ }
+ };
+
+ Injector injector = DIBootstrap.createInjector(testModule);
+
+ DefaultDbAdapterFactory factory = new DefaultDbAdapterFactory(detectors);
+ injector.injectMembers(factory);
+
+ DbAdapter createdAdapter = factory.createAdapter(
+ nodeDescriptor,
+ new MockDataSource());
+ assertNotNull(createdAdapter);
+ assertTrue(
+ "Unexpected class: " + createdAdapter.getClass().getName(),
+ createdAdapter instanceof MockDbAdapter);
+ }
+}
Added: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/configuration/XMLPoolingDataSourceFactoryTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/configuration/XMLPoolingDataSourceFactoryTest.java?rev=887667&view=auto
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/configuration/XMLPoolingDataSourceFactoryTest.java
(added)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/configuration/XMLPoolingDataSourceFactoryTest.java
Sun Dec 6 11:22:19 2009
@@ -0,0 +1,66 @@
+/*****************************************************************
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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.
+ ****************************************************************/
+package org.apache.cayenne.configuration;
+
+import java.net.URL;
+
+import javax.sql.DataSource;
+
+import junit.framework.TestCase;
+
+import org.apache.cayenne.conn.DataSourceInfo;
+import org.apache.cayenne.resource.URLResource;
+
+import com.mockrunner.mock.jdbc.MockDataSource;
+
+public class XMLPoolingDataSourceFactoryTest extends TestCase {
+
+ public void testGetDataSource() throws Exception {
+
+ String baseUrl = getClass().getPackage().getName().replace('.', '/');
+ URL url = getClass().getClassLoader().getResource(
+ baseUrl + "/testNode1.driver.xml");
+ assertNotNull(url);
+
+ DataNodeDescriptor nodeDescriptor = new DataNodeDescriptor();
+ nodeDescriptor.setConfigurationResource(new URLResource(url));
+
+ final DataSource dataSource = new MockDataSource();
+
+ XMLPoolingDataSourceFactory factory = new XMLPoolingDataSourceFactory() {
+
+ // override super to make test assertions and to prevent DB connection
+ @Override
+ protected DataSource createDataSource(DataSourceInfo dataSourceDescriptor)
+ throws Exception {
+
+ assertEquals("jdbcDriver", dataSourceDescriptor.getJdbcDriver());
+ assertEquals("jdbcUrl", dataSourceDescriptor.getDataSourceUrl());
+ assertEquals(2, dataSourceDescriptor.getMinConnections());
+ assertEquals(3, dataSourceDescriptor.getMaxConnections());
+ assertEquals("jdbcUserName", dataSourceDescriptor.getUserName());
+ assertEquals("jdbcPassword", dataSourceDescriptor.getPassword());
+ return dataSource;
+ }
+ };
+
+ DataSource newDataSource = factory.getDataSource(nodeDescriptor);
+ assertSame(dataSource, newDataSource);
+ }
+}
Copied: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/configuration/mock/MockDataSourceFactory.java
(from r887666, cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/runtime/MockDataSourceFactory1.java)
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/configuration/mock/MockDataSourceFactory.java?p2=cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/configuration/mock/MockDataSourceFactory.java&p1=cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/runtime/MockDataSourceFactory1.java&r1=887666&r2=887667&rev=887667&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/runtime/MockDataSourceFactory1.java
(original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/configuration/mock/MockDataSourceFactory.java
Sun Dec 6 11:22:19 2009
@@ -16,15 +16,16 @@
* specific language governing permissions and limitations
* under the License.
****************************************************************/
-package org.apache.cayenne.runtime;
+package org.apache.cayenne.configuration.mock;
import javax.sql.DataSource;
import org.apache.cayenne.configuration.DataNodeDescriptor;
+import org.apache.cayenne.configuration.DataSourceFactory;
import com.mockrunner.mock.jdbc.MockDataSource;
-public class MockDataSourceFactory1 implements DataSourceFactory {
+public class MockDataSourceFactory implements DataSourceFactory {
public DataSource getDataSource(DataNodeDescriptor nodeDescriptor) {
return new MockDataSource();
Copied: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/configuration/mock/MockDataSourceFactory1.java
(from r887666, cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/runtime/MockDataSourceFactory2.java)
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/configuration/mock/MockDataSourceFactory1.java?p2=cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/configuration/mock/MockDataSourceFactory1.java&p1=cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/runtime/MockDataSourceFactory2.java&r1=887666&r2=887667&rev=887667&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/runtime/MockDataSourceFactory2.java
(original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/configuration/mock/MockDataSourceFactory1.java
Sun Dec 6 11:22:19 2009
@@ -16,18 +16,25 @@
* specific language governing permissions and limitations
* under the License.
****************************************************************/
-package org.apache.cayenne.runtime;
+package org.apache.cayenne.configuration.mock;
import javax.sql.DataSource;
import org.apache.cayenne.configuration.DataNodeDescriptor;
+import org.apache.cayenne.configuration.DataSourceFactory;
+import org.apache.cayenne.di.Inject;
+import org.apache.cayenne.di.Injector;
-import com.mockrunner.mock.jdbc.MockDataSource;
+public class MockDataSourceFactory1 implements DataSourceFactory {
-public class MockDataSourceFactory2 implements DataSourceFactory {
+ @Inject
+ protected Injector injector;
- public DataSource getDataSource(DataNodeDescriptor nodeDescriptor) {
- return new MockDataSource();
+ public DataSource getDataSource(DataNodeDescriptor nodeDescriptor) throws Exception {
+ return null;
}
+ public Injector getInjector() {
+ return injector;
+ }
}
Copied: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/configuration/mock/MockDataSourceFactoryLoader.java
(from r887666, cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/runtime/MockDataSourceFactory2.java)
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/configuration/mock/MockDataSourceFactoryLoader.java?p2=cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/configuration/mock/MockDataSourceFactoryLoader.java&p1=cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/runtime/MockDataSourceFactory2.java&r1=887666&r2=887667&rev=887667&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/runtime/MockDataSourceFactory2.java
(original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/configuration/mock/MockDataSourceFactoryLoader.java
Sun Dec 6 11:22:19 2009
@@ -16,18 +16,16 @@
* specific language governing permissions and limitations
* under the License.
****************************************************************/
-package org.apache.cayenne.runtime;
-
-import javax.sql.DataSource;
+package org.apache.cayenne.configuration.mock;
import org.apache.cayenne.configuration.DataNodeDescriptor;
+import org.apache.cayenne.configuration.DataSourceFactory;
+import org.apache.cayenne.configuration.DataSourceFactoryLoader;
-import com.mockrunner.mock.jdbc.MockDataSource;
-
-public class MockDataSourceFactory2 implements DataSourceFactory {
+public class MockDataSourceFactoryLoader implements DataSourceFactoryLoader {
- public DataSource getDataSource(DataNodeDescriptor nodeDescriptor) {
- return new MockDataSource();
+ public DataSourceFactory getDataSourceFactory(DataNodeDescriptor nodeDescriptor) {
+ return new MockDataSourceFactory();
}
}
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/dba/MockDbAdapter.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/dba/MockDbAdapter.java?rev=887667&r1=887666&r2=887667&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/dba/MockDbAdapter.java
(original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/dba/MockDbAdapter.java
Sun Dec 6 11:22:19 2009
@@ -19,13 +19,11 @@
package org.apache.cayenne.dba;
-import java.sql.Connection;
import java.sql.PreparedStatement;
import java.sql.SQLException;
import java.util.Collection;
import org.apache.cayenne.access.DataNode;
-import org.apache.cayenne.access.OperationObserver;
import org.apache.cayenne.access.trans.QualifierTranslator;
import org.apache.cayenne.access.trans.QueryAssembler;
import org.apache.cayenne.access.types.ExtendedTypeMap;
@@ -33,7 +31,6 @@
import org.apache.cayenne.map.DbEntity;
import org.apache.cayenne.map.DbRelationship;
import org.apache.cayenne.merge.MergerFactory;
-import org.apache.cayenne.query.BatchQuery;
import org.apache.cayenne.query.Query;
import org.apache.cayenne.query.SQLAction;
@@ -69,10 +66,6 @@
return false;
}
- public String dropTable(DbEntity ent) {
- return null;
- }
-
public Collection<String> dropTableStatements(DbEntity table) {
return null;
}
@@ -127,28 +120,13 @@
return null;
}
- public boolean shouldRunBatchQuery(
- DataNode node,
- Connection con,
- BatchQuery query,
- OperationObserver delegate) throws SQLException, Exception {
- return false;
- }
-
public MergerFactory mergerFactory() {
return null;
}
public void createTableAppendColumn(StringBuffer sqlBuffer, DbAttribute column) {
}
-
- public String getIdentifiersStartQuote(){
- return "\"";
- }
- public String getIdentifiersEndQuote(){
- return "\"";
- }
-
+
public QuotingStrategy getQuotingStrategy(boolean isQuoteStrategy) {
return null;
}
Copied: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/resource/mock/MockResourceLocator.java
(from r887666, cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/runtime/DriverDataSourceFactory.java)
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/resource/mock/MockResourceLocator.java?p2=cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/resource/mock/MockResourceLocator.java&p1=cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/runtime/DriverDataSourceFactory.java&r1=887666&r2=887667&rev=887667&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/runtime/DriverDataSourceFactory.java
(original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/resource/mock/MockResourceLocator.java
Sun Dec 6 11:22:19 2009
@@ -16,19 +16,17 @@
* specific language governing permissions and limitations
* under the License.
****************************************************************/
-package org.apache.cayenne.runtime;
+package org.apache.cayenne.resource.mock;
-import javax.sql.DataSource;
+import java.util.Collection;
-import org.apache.cayenne.configuration.DataNodeDescriptor;
+import org.apache.cayenne.resource.Resource;
+import org.apache.cayenne.resource.ResourceLocator;
-/**
- * @since 3.1
- */
-public class DriverDataSourceFactory implements DataSourceFactory {
+public class MockResourceLocator implements ResourceLocator {
- public DataSource getDataSource(DataNodeDescriptor nodeDescriptor) {
- throw new UnsupportedOperationException("TODO");
+ public Collection<Resource> findResources(String name) {
+ return null;
}
}
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/runtime/DataDomainProviderTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/runtime/DataDomainProviderTest.java?rev=887667&r1=887666&r2=887667&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/runtime/DataDomainProviderTest.java
(original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/runtime/DataDomainProviderTest.java
Sun Dec 6 11:22:19 2009
@@ -33,11 +33,16 @@
import org.apache.cayenne.access.dbsync.SchemaUpdateStrategy;
import org.apache.cayenne.access.dbsync.SkipSchemaUpdateStrategy;
import org.apache.cayenne.access.dbsync.ThrowOnPartialOrCreateSchemaStrategy;
+import org.apache.cayenne.configuration.AdhocObjectFactory;
import org.apache.cayenne.configuration.DataChannelDescriptor;
import org.apache.cayenne.configuration.DataChannelDescriptorLoader;
import org.apache.cayenne.configuration.DataNodeDescriptor;
+import org.apache.cayenne.configuration.DataSourceFactoryLoader;
+import org.apache.cayenne.configuration.DefaultAdhocObjectFactory;
import org.apache.cayenne.configuration.DefaultRuntimeProperties;
import org.apache.cayenne.configuration.RuntimeProperties;
+import org.apache.cayenne.configuration.mock.MockDataSourceFactory;
+import org.apache.cayenne.configuration.mock.MockDataSourceFactoryLoader;
import org.apache.cayenne.dba.AutoAdapter;
import org.apache.cayenne.dba.DbAdapter;
import org.apache.cayenne.dba.DbAdapterFactory;
@@ -68,7 +73,7 @@
nodeDescriptor1.setName("node1");
nodeDescriptor1.getDataMapNames().add("map1");
nodeDescriptor1.setAdapterType(OracleAdapter.class.getName());
- nodeDescriptor1.setDataSourceFactoryType(MockDataSourceFactory1.class.getName());
+ nodeDescriptor1.setDataSourceFactoryType(MockDataSourceFactory.class.getName());
nodeDescriptor1.setLocation("jdbc/testDataNode1");
nodeDescriptor1
.setSchemaUpdateStrategyType(ThrowOnPartialOrCreateSchemaStrategy.class
@@ -112,8 +117,9 @@
binder.bind(DataSource.class).toInstance(new MockDataSource());
binder.bind(DbAdapter.class).to(AutoAdapter.class);
- binder.bind(DataSourceFactory.class).toInstance(
- new MockDataSourceFactory2());
+ binder.bind(DataSourceFactoryLoader.class).toInstance(
+ new MockDataSourceFactoryLoader());
+ binder.bind(AdhocObjectFactory.class).to(DefaultAdhocObjectFactory.class);
}
};
@@ -165,8 +171,7 @@
assertEquals(1, node2.getDataMaps().size());
assertSame(map2, node2.getDataMaps().iterator().next());
assertSame(node2, domain.lookupDataNode(map2));
- assertEquals(MockDataSourceFactory2.class.getName(), node2
- .getDataSourceFactory());
+ assertNull(node2.getDataSourceFactory());
assertNotNull(node2.getDataSource());
assertEquals(nodeDescriptor2.getLocation(), node2.getDataSourceLocation());
assertEquals(SkipSchemaUpdateStrategy.class.getName(), node2
Added: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/resources/org/apache/cayenne/configuration/testNode1.driver.xml
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/resources/org/apache/cayenne/configuration/testNode1.driver.xml?rev=887667&view=auto
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/resources/org/apache/cayenne/configuration/testNode1.driver.xml
(added)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/resources/org/apache/cayenne/configuration/testNode1.driver.xml
Sun Dec 6 11:22:19 2009
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<driver project-version="6" class="jdbcDriver">
+ <url value="jdbcUrl"/>
+ <connectionPool min="2" max="3"/>
+ <login userName="jdbcUserName" password="jdbcPassword"/>
+</driver>
Added: cayenne/main/trunk/framework/cayenne-server/pom.properties
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-server/pom.properties?rev=887667&view=auto
==============================================================================
--- cayenne/main/trunk/framework/cayenne-server/pom.properties (added)
+++ cayenne/main/trunk/framework/cayenne-server/pom.properties Sun Dec 6 11:22:19 2009
@@ -0,0 +1,5 @@
+#Generated by Maven
+#Sat Dec 05 14:56:16 CET 2009
+version=3.1-SNAPSHOT
+groupId=org.apache.cayenne
+artifactId=cayenne-server
Author: aadamchik
Date: Sun Dec 6 11:22:19 2009
New Revision: 887667
URL: http://svn.apache.org/viewvc?rev=887667&view=rev
Log:
CAY-1319 Switch Cayenne configuration loading to cayenne-di container
* configuration.DataSourceFactoryLoader
* configuration.DataSourceFactory
* configuration.XMLPoolingDataSourceFactory
* configuration.DbAdapterFactory
* configuration.AdhocObjectFactory
Added:
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/configuration/AdhocObjectFactory.java
- copied, changed from r887666, cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/runtime/DataSourceFactory.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/configuration/DataSourceFactory.java
- copied, changed from r887666, cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/runtime/DataSourceFactory.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/configuration/DataSourceFactoryLoader.java
- copied, changed from r887666, cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/runtime/DataSourceFactory.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/configuration/DbAdapterDetector.java
- copied, changed from r887666, cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/DbAdapterFactory.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/configuration/DbAdapterFactory.java
- copied, changed from r887666, cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/runtime/DataSourceFactory.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/configuration/DefaultAdhocObjectFactory.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/configuration/DefaultDataSourceFactoryLoader.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/configuration/DefaultDbAdapterFactory.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/configuration/XMLPoolingDataSourceFactory.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/configuration/DefaultDataSourceFactoryLoaderTest.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/configuration/DefaultDbAdapterFactoryTest.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/configuration/XMLPoolingDataSourceFactoryTest.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/configuration/mock/
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/configuration/mock/MockDataSourceFactory.java
- copied, changed from r887666, cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/runtime/MockDataSourceFactory1.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/configuration/mock/MockDataSourceFactory1.java
- copied, changed from r887666, cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/runtime/MockDataSourceFactory2.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/configuration/mock/MockDataSourceFactoryLoader.java
- copied, changed from r887666, cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/runtime/MockDataSourceFactory2.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/resource/mock/
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/resource/mock/MockResourceLocator.java
- copied, changed from r887666, cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/runtime/DriverDataSourceFactory.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/resources/org/apache/cayenne/configuration/testNode1.driver.xml
cayenne/main/trunk/framework/cayenne-server/pom.properties
Removed:
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/runtime/DataSourceFactory.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/runtime/DriverDataSourceFactory.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/runtime/JNDIDataSourceFactory.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/runtime/MockDataSourceFactory1.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/runtime/MockDataSourceFactory2.java
Modified:
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/conf/DataSourceFactory.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/conf/DriverDataSourceFactory.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/configuration/CayenneModule.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/AutoAdapter.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/DbAdapterFactory.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/DbAdapterFactoryChain.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/db2/DB2Sniffer.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/derby/DerbySniffer.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/frontbase/FrontBaseSniffer.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/h2/H2Sniffer.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/hsqldb/HSQLDBSniffer.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/ingres/IngresSniffer.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/mysql/MySQLSniffer.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/openbase/OpenBaseSniffer.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/oracle/OracleSniffer.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/postgres/PostgresSniffer.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/sqlite/SQLiteSniffer.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/sqlserver/SQLServerSniffer.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/sybase/SybaseSniffer.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/runtime/DataDomainProvider.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/dba/MockDbAdapter.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/runtime/DataDomainProviderTest.java
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/conf/DataSourceFactory.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/conf/DataSourceFactory.java?rev=887667&r1=887666&r2=887667&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/conf/DataSourceFactory.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/conf/DataSourceFactory.java Sun Dec 6 11:22:19 2009
@@ -22,19 +22,22 @@
import javax.sql.DataSource;
/**
- * A pluggable factory for javax.sql.DataSource instances used by Cayenne runtime.
+ * A pluggable factory for {@link DataSource} instances used by Cayenne runtime.
+ *
+ * @deprecated since 3.1, replaced by
+ * {@link org.apache.cayenne.configuration.DataSourceFactory}
*/
public interface DataSourceFactory {
/**
* Initializes factory with the parent configuration object.
*/
- public void initializeWithParentConfiguration(Configuration conf);
+ void initializeWithParentConfiguration(Configuration conf);
/**
* Returns DataSource object corresponding to <code>location</code>. Concrete
* implementations may treat location differently - as a file path, JNDI location,
* etc.
*/
- public DataSource getDataSource(String location) throws Exception;
+ DataSource getDataSource(String location) throws Exception;
}
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/conf/DriverDataSourceFactory.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/conf/DriverDataSourceFactory.java?rev=887667&r1=887666&r2=887667&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/conf/DriverDataSourceFactory.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/conf/DriverDataSourceFactory.java Sun Dec 6 11:22:19 2009
@@ -33,6 +33,7 @@
import org.apache.cayenne.access.QueryLogger;
import org.apache.cayenne.conn.DataSourceInfo;
import org.apache.cayenne.conn.PoolManager;
+import org.apache.cayenne.resource.ResourceLocator;
import org.apache.cayenne.util.Util;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -47,17 +48,19 @@
* Creates DataSource objects from XML configuration files that describe a JDBC driver.
* Wraps JDBC driver in a generic DataSource implementation.
*
+ * @deprecated since 3.1 {@link org.apache.cayenne.configuration.XMLPoolingDataSourceFactory}
+ * replaces this class.
*/
-// TODO: factory shouldn't contain any state specific to location ("driverInfo" ivar
-// should go, and probably "parser" too)... Otherwise the API doesn't make sense -
-// sequential invocations of getDataSource() will have side effects....
public class DriverDataSourceFactory implements DataSourceFactory {
private static final Log logger = LogFactory.getLog(DriverDataSourceFactory.class);
+ protected Configuration parentConfiguration;
+
+ // TODO: andrus 12.5.2009: non-thread-safe local ivars... SInce this class is
+ // deprecated, I guess we don't have to fix it here...
protected XMLReader parser;
protected DataSourceInfo driverInfo;
- protected Configuration parentConfiguration;
/**
* Creates new DriverDataSourceFactory.
@@ -74,7 +77,7 @@
}
public DataSource getDataSource(String location) throws Exception {
- this.load(location);
+ load(location);
ConnectionLogger logger = new ConnectionLogger();
@@ -114,12 +117,11 @@
}
/**
- * Loads driver information from the file at <code>location</code>. Called
- * internally from "getDataSource"
+ * Loads driver information from the file at <code>location</code>. Called internally
+ * from "getDataSource"
+ *
+ * @deprecated since 3.1
*/
- // TODO: andrus 2008/04/22, while this never caused any troubles, storing loaded
- // DataSourceInfo in an ivar clearly violates the scope logic, as "location" is a
- // local variable.
protected void load(String location) throws Exception {
logger.info("loading driver information from '" + location + "'.");
@@ -236,6 +238,7 @@
}
private class LoginHandler extends AbstractHandler {
+
/**
* Constructor which just delegates to the superconstructor.
*
@@ -312,10 +315,10 @@
String password = atts.getValue("password");
String passwordLocation = atts.getValue("passwordLocation");
String passwordSource = atts.getValue("passwordSource");
- if(passwordSource == null) {
+ if (passwordSource == null) {
passwordSource = DataSourceInfo.PASSWORD_LOCATION_MODEL;
}
-
+
String username = atts.getValue("userName");
driverInfo.setPasswordEncoderClass(encoderClass);
Copied: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/configuration/AdhocObjectFactory.java (from r887666, cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/runtime/DataSourceFactory.java)
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/configuration/AdhocObjectFactory.java?p2=cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/configuration/AdhocObjectFactory.java&p1=cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/runtime/DataSourceFactory.java&r1=887666&r2=887667&rev=887667&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/runtime/DataSourceFactory.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/configuration/AdhocObjectFactory.java Sun Dec 6 11:22:19 2009
@@ -16,21 +16,18 @@
* specific language governing permissions and limitations
* under the License.
****************************************************************/
-package org.apache.cayenne.runtime;
-
-import javax.sql.DataSource;
-
-import org.apache.cayenne.configuration.DataNodeDescriptor;
+package org.apache.cayenne.configuration;
/**
- * Provides instances of {@link DataSource} for DataNodes.
+ * Creates objects for user-provided String class names, injecting dependencies into them.
*
* @since 3.1
*/
-public interface DataSourceFactory {
+public interface AdhocObjectFactory {
/**
- * Returns a DataSource for a given {@link DataNodeDescriptor} configuration object.
+ * Returns an instance of "className" that implements "superType", injecting
+ * dependencies from the registry into it.
*/
- DataSource getDataSource(DataNodeDescriptor nodeDescriptor);
+ <T> T newInstance(Class<? super T> superType, String className);
}
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/configuration/CayenneModule.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/configuration/CayenneModule.java?rev=887667&r1=887666&r2=887667&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/configuration/CayenneModule.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/configuration/CayenneModule.java Sun Dec 6 11:22:19 2009
@@ -21,8 +21,20 @@
import org.apache.cayenne.DataChannel;
import org.apache.cayenne.access.dbsync.SchemaUpdateStrategy;
import org.apache.cayenne.access.dbsync.SkipSchemaUpdateStrategy;
-import org.apache.cayenne.dba.AutoAdapter;
import org.apache.cayenne.dba.DbAdapter;
+import org.apache.cayenne.dba.db2.DB2Sniffer;
+import org.apache.cayenne.dba.derby.DerbySniffer;
+import org.apache.cayenne.dba.frontbase.FrontBaseSniffer;
+import org.apache.cayenne.dba.h2.H2Sniffer;
+import org.apache.cayenne.dba.hsqldb.HSQLDBSniffer;
+import org.apache.cayenne.dba.ingres.IngresSniffer;
+import org.apache.cayenne.dba.mysql.MySQLSniffer;
+import org.apache.cayenne.dba.openbase.OpenBaseSniffer;
+import org.apache.cayenne.dba.oracle.OracleSniffer;
+import org.apache.cayenne.dba.postgres.PostgresSniffer;
+import org.apache.cayenne.dba.sqlite.SQLiteSniffer;
+import org.apache.cayenne.dba.sqlserver.SQLServerSniffer;
+import org.apache.cayenne.dba.sybase.SybaseSniffer;
import org.apache.cayenne.di.Binder;
import org.apache.cayenne.di.Module;
import org.apache.cayenne.di.Scopes;
@@ -30,8 +42,6 @@
import org.apache.cayenne.resource.ResourceLocator;
import org.apache.cayenne.runtime.CayenneRuntime;
import org.apache.cayenne.runtime.DataDomainProvider;
-import org.apache.cayenne.runtime.DataSourceFactory;
-import org.apache.cayenne.runtime.DriverDataSourceFactory;
/**
* A DI module containing all Cayenne runtime configurations. To customize Cayenne runtime
@@ -55,6 +65,27 @@
RuntimeProperties.CAYENNE_RUNTIME_NAME,
runtimeName);
+ // configure known DbAdapter detectors in reverse order of popularity. Users can
+ // add their own for their own to install custom adapters automatically
+ binder
+ .bindList(DbAdapter.class)
+ .add(new OpenBaseSniffer())
+ .add(new FrontBaseSniffer())
+ .add(new IngresSniffer())
+ .add(new SQLiteSniffer())
+ .add(new DB2Sniffer())
+ .add(new H2Sniffer())
+ .add(new HSQLDBSniffer())
+ .add(new SybaseSniffer())
+ .add(new DerbySniffer())
+ .add(new SQLServerSniffer())
+ .add(new OracleSniffer())
+ .add(new PostgresSniffer())
+ .add(new MySQLSniffer());
+
+ binder.bind(AdhocObjectFactory.class).to(DefaultAdhocObjectFactory.class).in(
+ Scopes.SINGLETON);
+
// a service to provide the main stack DataChannel
binder.bind(DataChannel.class).toProvider(DataDomainProvider.class);
@@ -73,16 +104,16 @@
binder.bind(RuntimeProperties.class).to(DefaultRuntimeProperties.class).in(
Scopes.SINGLETON);
+ // a service to load DataSourceFactories
+ binder.bind(DataSourceFactoryLoader.class).to(
+ DefaultDataSourceFactoryLoader.class).in(Scopes.SINGLETON);
+
// a default SchemaUpdateStrategy (used when no explicit strategy is specified in
// XML)
- binder.bind(SchemaUpdateStrategy.class).to(SkipSchemaUpdateStrategy.class);
-
- // a default DBAdapter (used when no explicit adapter is set in XML)
-
- // TODO: andrus 11.30.2009: missing dependencies: DataSource, DbAdapterFactory
- binder.bind(DbAdapter.class).to(AutoAdapter.class);
+ binder.bind(SchemaUpdateStrategy.class).to(SkipSchemaUpdateStrategy.class).in(
+ Scopes.SINGLETON);
- // a service to find or create DataSources
- binder.bind(DataSourceFactory.class).to(DriverDataSourceFactory.class);
+ // a default DBAdapterFactory used to load custom and automatic DbAdapters
+ binder.bind(DbAdapterFactory.class).to(DefaultDbAdapterFactory.class);
}
}
Copied: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/configuration/DataSourceFactory.java (from r887666, cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/runtime/DataSourceFactory.java)
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/configuration/DataSourceFactory.java?p2=cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/configuration/DataSourceFactory.java&p1=cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/runtime/DataSourceFactory.java&r1=887666&r2=887667&rev=887667&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/runtime/DataSourceFactory.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/configuration/DataSourceFactory.java Sun Dec 6 11:22:19 2009
@@ -16,21 +16,18 @@
* specific language governing permissions and limitations
* under the License.
****************************************************************/
-package org.apache.cayenne.runtime;
+package org.apache.cayenne.configuration;
import javax.sql.DataSource;
-import org.apache.cayenne.configuration.DataNodeDescriptor;
-
/**
- * Provides instances of {@link DataSource} for DataNodes.
- *
* @since 3.1
*/
public interface DataSourceFactory {
/**
- * Returns a DataSource for a given {@link DataNodeDescriptor} configuration object.
+ * Returns DataSource object based on the configuration provided in the
+ * "nodeDescriptor".
*/
- DataSource getDataSource(DataNodeDescriptor nodeDescriptor);
+ DataSource getDataSource(DataNodeDescriptor nodeDescriptor) throws Exception;
}
Copied: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/configuration/DataSourceFactoryLoader.java (from r887666, cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/runtime/DataSourceFactory.java)
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/configuration/DataSourceFactoryLoader.java?p2=cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/configuration/DataSourceFactoryLoader.java&p1=cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/runtime/DataSourceFactory.java&r1=887666&r2=887667&rev=887667&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/runtime/DataSourceFactory.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/configuration/DataSourceFactoryLoader.java Sun Dec 6 11:22:19 2009
@@ -16,21 +16,19 @@
* specific language governing permissions and limitations
* under the License.
****************************************************************/
-package org.apache.cayenne.runtime;
-
-import javax.sql.DataSource;
-
-import org.apache.cayenne.configuration.DataNodeDescriptor;
+package org.apache.cayenne.configuration;
/**
- * Provides instances of {@link DataSource} for DataNodes.
+ * Provides instances of {@link DataSourceFactory} for DataNodes.
*
* @since 3.1
*/
-public interface DataSourceFactory {
+public interface DataSourceFactoryLoader {
/**
- * Returns a DataSource for a given {@link DataNodeDescriptor} configuration object.
+ * Returns a DataSourceFactory for a given {@link DataNodeDescriptor} configuration
+ * object. The factory should be specified in the node descriptor explicitly by the
+ * user. Cayenne will inject dependencies in all user-provided factories.
*/
- DataSource getDataSource(DataNodeDescriptor nodeDescriptor);
+ DataSourceFactory getDataSourceFactory(DataNodeDescriptor nodeDescriptor);
}
Copied: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/configuration/DbAdapterDetector.java (from r887666, cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/DbAdapterFactory.java)
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/configuration/DbAdapterDetector.java?p2=cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/configuration/DbAdapterDetector.java&p1=cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/DbAdapterFactory.java&r1=887666&r2=887667&rev=887667&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/DbAdapterFactory.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/configuration/DbAdapterDetector.java Sun Dec 6 11:22:19 2009
@@ -16,25 +16,26 @@
* specific language governing permissions and limitations
* under the License.
****************************************************************/
-
-package org.apache.cayenne.dba;
+package org.apache.cayenne.configuration;
import java.sql.DatabaseMetaData;
import java.sql.SQLException;
+import org.apache.cayenne.dba.DbAdapter;
+
/**
- * Defines a conditional factory for a specific DbAdapter. Note that the factory can
- * potentially return different (or differently configured) DbAdapters for the same
- * database based on version information and other metadata.
+ * A factory interface providing DbAdapter based on JDBC metadata. It allows custom
+ * DbAdapters to contribute database detection algorithms to
+ * {@link DefaultDbAdapterFactory}.
*
- * @since 1.2
+ * @since 3.1
*/
-public interface DbAdapterFactory {
+public interface DbAdapterDetector {
/**
* Returns an instance of DbAdapter if the factory detects that it knows how to handle
- * the database. Returns null if the database is not known to the factory, thus
- * allowing multiple factories to be chained.
+ * the database or null if the database is not known to the factory, thus allowing
+ * multiple factories to be chained.
*/
DbAdapter createAdapter(DatabaseMetaData md) throws SQLException;
}
Copied: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/configuration/DbAdapterFactory.java (from r887666, cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/runtime/DataSourceFactory.java)
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/configuration/DbAdapterFactory.java?p2=cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/configuration/DbAdapterFactory.java&p1=cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/runtime/DataSourceFactory.java&r1=887666&r2=887667&rev=887667&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/runtime/DataSourceFactory.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/configuration/DbAdapterFactory.java Sun Dec 6 11:22:19 2009
@@ -16,21 +16,21 @@
* specific language governing permissions and limitations
* under the License.
****************************************************************/
-package org.apache.cayenne.runtime;
+package org.apache.cayenne.configuration;
import javax.sql.DataSource;
-import org.apache.cayenne.configuration.DataNodeDescriptor;
+import org.apache.cayenne.dba.DbAdapter;
/**
- * Provides instances of {@link DataSource} for DataNodes.
- *
* @since 3.1
*/
-public interface DataSourceFactory {
+public interface DbAdapterFactory {
/**
- * Returns a DataSource for a given {@link DataNodeDescriptor} configuration object.
+ * Returns an instance of DbAdapter if the factory detects that it knows how to handle
+ * the database.
*/
- DataSource getDataSource(DataNodeDescriptor nodeDescriptor);
+ DbAdapter createAdapter(DataNodeDescriptor nodeDescriptor, DataSource dataSource)
+ throws Exception;
}
Added: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/configuration/DefaultAdhocObjectFactory.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/configuration/DefaultAdhocObjectFactory.java?rev=887667&view=auto
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/configuration/DefaultAdhocObjectFactory.java (added)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/configuration/DefaultAdhocObjectFactory.java Sun Dec 6 11:22:19 2009
@@ -0,0 +1,83 @@
+/*****************************************************************
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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.
+ ****************************************************************/
+package org.apache.cayenne.configuration;
+
+import org.apache.cayenne.CayenneRuntimeException;
+import org.apache.cayenne.di.Inject;
+import org.apache.cayenne.di.Injector;
+import org.apache.cayenne.util.Util;
+
+/**
+ * A default implementation of {@link AdhocObjectFactory} that creates objects using
+ * default no-arg constructor and injects dependencies into annotated fields. Note that
+ * constructor injection is not supported by this factory.
+ *
+ * @since 3.1
+ */
+public class DefaultAdhocObjectFactory implements AdhocObjectFactory {
+
+ @Inject
+ protected Injector injector;
+
+ public <T> T newInstance(Class<? super T> superType, String className) {
+
+ if (superType == null) {
+ throw new NullPointerException("Null superType");
+ }
+
+ if (className == null) {
+ throw new NullPointerException("Null className");
+ }
+
+ Class<T> type;
+ try {
+ type = (Class<T>) Util.getJavaClass(className);
+ }
+ catch (ClassNotFoundException e) {
+ throw new CayenneRuntimeException(
+ "Invalid class %s of type %s",
+ e,
+ className,
+ superType.getName());
+ }
+
+ if (!superType.isAssignableFrom(type)) {
+ throw new CayenneRuntimeException(
+ "Class %s is not assignable to %s",
+ className,
+ superType.getName());
+ }
+
+ T instance;
+ try {
+ instance = type.newInstance();
+ }
+ catch (Exception e) {
+ throw new CayenneRuntimeException(
+ "Error creating instance of class %s of type %s",
+ e,
+ className,
+ superType.getName());
+ }
+
+ injector.injectMembers(instance);
+ return instance;
+ }
+
+}
Added: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/configuration/DefaultDataSourceFactoryLoader.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/configuration/DefaultDataSourceFactoryLoader.java?rev=887667&view=auto
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/configuration/DefaultDataSourceFactoryLoader.java (added)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/configuration/DefaultDataSourceFactoryLoader.java Sun Dec 6 11:22:19 2009
@@ -0,0 +1,55 @@
+/*****************************************************************
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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.
+ ****************************************************************/
+package org.apache.cayenne.configuration;
+
+import org.apache.cayenne.CayenneRuntimeException;
+import org.apache.cayenne.di.Inject;
+
+/**
+ * A {@link DataSourceFactoryLoader} that loads factories explicitly configured in the
+ * {@link DataNodeDescriptor}. If the factory class is not explicitly configured, and the
+ * descriptor has a configuration resource attached to it, {@link XMLPoolingDataSourceFactory}
+ * is returned.
+ *
+ * @since 3.1
+ */
+public class DefaultDataSourceFactoryLoader implements DataSourceFactoryLoader {
+
+ @Inject
+ protected AdhocObjectFactory objectFactory;
+
+ public DataSourceFactory getDataSourceFactory(DataNodeDescriptor nodeDescriptor) {
+ String typeName = nodeDescriptor.getDataSourceFactoryType();
+
+ if (typeName == null) {
+ if (nodeDescriptor.getConfigurationResource() != null) {
+ return objectFactory.newInstance(
+ DataSourceFactory.class,
+ XMLPoolingDataSourceFactory.class.getName());
+ }
+ else {
+ throw new CayenneRuntimeException(
+ "DataNodeDescriptor '%s' has no explicit DataSourceFactoryType set and has no configuration resource",
+ nodeDescriptor.getName());
+ }
+ }
+
+ return objectFactory.newInstance(DataSourceFactory.class, typeName);
+ }
+}
Added: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/configuration/DefaultDbAdapterFactory.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/configuration/DefaultDbAdapterFactory.java?rev=887667&view=auto
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/configuration/DefaultDbAdapterFactory.java (added)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/configuration/DefaultDbAdapterFactory.java Sun Dec 6 11:22:19 2009
@@ -0,0 +1,125 @@
+/*****************************************************************
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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.
+ ****************************************************************/
+package org.apache.cayenne.configuration;
+
+import java.sql.Connection;
+import java.sql.DatabaseMetaData;
+import java.sql.SQLException;
+import java.util.List;
+
+import javax.sql.DataSource;
+
+import org.apache.cayenne.CayenneRuntimeException;
+import org.apache.cayenne.access.QueryLogger;
+import org.apache.cayenne.dba.AutoAdapter;
+import org.apache.cayenne.dba.DbAdapter;
+import org.apache.cayenne.dba.JdbcAdapter;
+import org.apache.cayenne.di.DIException;
+import org.apache.cayenne.di.Inject;
+import org.apache.cayenne.di.Provider;
+
+/**
+ * A factory of DbAdapters that either loads user-provided adapter or guesses the adapter
+ * type from the database metadata.
+ *
+ * @since 3.1
+ */
+public class DefaultDbAdapterFactory implements DbAdapterFactory {
+
+ @Inject
+ protected AdhocObjectFactory objectFactory;
+ protected List<DbAdapterDetector> detectors;
+
+ public DefaultDbAdapterFactory(@Inject List<DbAdapterDetector> detectors) {
+ if (detectors == null) {
+ throw new NullPointerException("Null detectors list");
+ }
+
+ this.detectors = detectors;
+ }
+
+ public DbAdapter createAdapter(
+ final DataNodeDescriptor nodeDescriptor,
+ final DataSource dataSource) throws Exception {
+
+ String adapterType = nodeDescriptor.getAdapterType();
+ if (adapterType != null) {
+ return objectFactory.newInstance(DbAdapter.class, adapterType);
+ }
+ else {
+ return new AutoAdapter(new Provider<DbAdapter>() {
+
+ public DbAdapter get() throws DIException {
+ return detectAdapter(nodeDescriptor, dataSource);
+ }
+ });
+ }
+ }
+
+ protected DbAdapter detectAdapter(
+ DataNodeDescriptor nodeDescriptor,
+ DataSource dataSource) {
+
+ if (detectors.isEmpty()) {
+ return defaultAdapter();
+ }
+
+ try {
+ Connection c = dataSource.getConnection();
+
+ try {
+ return detectAdapter(c.getMetaData());
+ }
+ finally {
+ try {
+ c.close();
+ }
+ catch (SQLException e) {
+ // ignore...
+ }
+ }
+ }
+ catch (SQLException e) {
+ throw new CayenneRuntimeException("Error detecting database type: "
+ + e.getLocalizedMessage(), e);
+ }
+ }
+
+ protected DbAdapter detectAdapter(DatabaseMetaData metaData) throws SQLException {
+ // iterate in reverse order to allow custom factories to take precedence over the
+ // default ones configured in constructor
+ for (int i = detectors.size() - 1; i >= 0; i--) {
+ DbAdapterDetector detector = detectors.get(i);
+ DbAdapter adapter = detector.createAdapter(metaData);
+
+ if (adapter != null) {
+ QueryLogger.log("Detected and installed adapter: "
+ + adapter.getClass().getName());
+ return adapter;
+ }
+ }
+
+ return defaultAdapter();
+ }
+
+ protected DbAdapter defaultAdapter() {
+ QueryLogger.log("Failed to detect database type, using generic adapter");
+ return new JdbcAdapter();
+ }
+}
Added: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/configuration/XMLPoolingDataSourceFactory.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/configuration/XMLPoolingDataSourceFactory.java?rev=887667&view=auto
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/configuration/XMLPoolingDataSourceFactory.java (added)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/configuration/XMLPoolingDataSourceFactory.java Sun Dec 6 11:22:19 2009
@@ -0,0 +1,324 @@
+/*****************************************************************
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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.
+ ****************************************************************/
+package org.apache.cayenne.configuration;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.util.Collection;
+
+import javax.sql.DataSource;
+
+import org.apache.cayenne.ConfigurationException;
+import org.apache.cayenne.access.ConnectionLogger;
+import org.apache.cayenne.access.QueryLogger;
+import org.apache.cayenne.conf.PasswordEncoding;
+import org.apache.cayenne.conn.DataSourceInfo;
+import org.apache.cayenne.conn.PoolManager;
+import org.apache.cayenne.di.Inject;
+import org.apache.cayenne.resource.Resource;
+import org.apache.cayenne.resource.ResourceLocator;
+import org.apache.cayenne.util.Util;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.xml.sax.Attributes;
+import org.xml.sax.ContentHandler;
+import org.xml.sax.InputSource;
+import org.xml.sax.XMLReader;
+
+/**
+ * A {@link DataSourceFactory} that loads JDBC connection information from an XML resource
+ * associated with the DataNodeDescriptor, returning a DataSource with simple connection
+ * pooling.
+ *
+ * @since 3.1
+ */
+public class XMLPoolingDataSourceFactory implements DataSourceFactory {
+
+ private static final Log logger = LogFactory
+ .getLog(XMLPoolingDataSourceFactory.class);
+
+ @Inject
+ protected ResourceLocator resourceLocator;
+
+ public DataSource getDataSource(DataNodeDescriptor nodeDescriptor) throws Exception {
+
+ logger.info("loading driver information from '"
+ + nodeDescriptor.getLocation()
+ + "'.");
+
+ Resource resource = nodeDescriptor.getConfigurationResource();
+
+ if (resource == null) {
+ logger.info("Null configuration resource for node descriptor with location '"
+ + nodeDescriptor.getLocation()
+ + "'");
+ throw new ConfigurationException(
+ "Null configuration resource for node descriptor with location '%s'",
+ nodeDescriptor.getLocation());
+ }
+
+ DataSourceInfo dataSourceDescriptor = new DataSourceInfo();
+
+ XMLReader parser = Util.createXmlReader();
+
+ DriverHandler handler = new DriverHandler(dataSourceDescriptor, parser);
+ parser.setContentHandler(handler);
+ parser.setErrorHandler(handler);
+ parser.parse(new InputSource(resource.getURL().openStream()));
+
+ return createDataSource(dataSourceDescriptor);
+ }
+
+ /**
+ * Returns an instance of {@link PoolManager}.
+ */
+ protected DataSource createDataSource(DataSourceInfo dataSourceDescriptor)
+ throws Exception {
+
+ ConnectionLogger logger = new ConnectionLogger();
+ try {
+ return new PoolManager(
+ dataSourceDescriptor.getJdbcDriver(),
+ dataSourceDescriptor.getDataSourceUrl(),
+ dataSourceDescriptor.getMinConnections(),
+ dataSourceDescriptor.getMaxConnections(),
+ dataSourceDescriptor.getUserName(),
+ dataSourceDescriptor.getPassword(),
+ logger);
+ }
+ catch (Exception e) {
+ QueryLogger.logConnectFailure(e);
+ throw e;
+ }
+ }
+
+ private static String passwordFromURL(URL url) {
+ InputStream inputStream = null;
+ String password = null;
+
+ try {
+ inputStream = url.openStream();
+ password = passwordFromInputStream(inputStream);
+ }
+ catch (IOException exception) {
+ // Log the error while trying to open the stream. A null
+ // password will be returned as a result.
+ logger.warn(exception);
+ }
+
+ return password;
+ }
+
+ private static String passwordFromInputStream(InputStream inputStream) {
+ BufferedReader bufferedReader = null;
+ String password = null;
+
+ try {
+ bufferedReader = new BufferedReader(new InputStreamReader(inputStream));
+ password = bufferedReader.readLine();
+ }
+ catch (IOException exception) {
+ logger.warn(exception);
+ }
+ finally {
+ try {
+ if (bufferedReader != null) {
+ bufferedReader.close();
+ }
+ }
+ catch (Exception exception) {
+ }
+
+ try {
+ inputStream.close();
+ }
+ catch (IOException exception) {
+ }
+ }
+
+ return password;
+ }
+
+ private class DriverHandler extends SAXNestedTagHandler {
+
+ private DataSourceInfo dataSourceDescriptor;
+
+ DriverHandler(DataSourceInfo dataSourceDescriptor, XMLReader parser) {
+ super(parser, null);
+ this.dataSourceDescriptor = dataSourceDescriptor;
+ }
+
+ @Override
+ protected ContentHandler createChildTagHandler(
+ String namespaceURI,
+ String localName,
+ String name,
+ Attributes attributes) {
+
+ if (localName.equals("driver")) {
+ String className = attributes.getValue("", "class");
+ logger.info("loading driver " + className);
+ dataSourceDescriptor.setJdbcDriver(className);
+ return new DriverChildrenHandler(parser, this);
+ }
+
+ return super.createChildTagHandler(namespaceURI, localName, name, attributes);
+ }
+ }
+
+ private class DriverChildrenHandler extends SAXNestedTagHandler {
+
+ private DataSourceInfo dataSourceDescriptor;
+
+ DriverChildrenHandler(XMLReader parser, DriverHandler parentHandler) {
+ super(parser, parentHandler);
+ this.dataSourceDescriptor = parentHandler.dataSourceDescriptor;
+ }
+
+ @Override
+ protected ContentHandler createChildTagHandler(
+ String namespaceURI,
+ String localName,
+ String name,
+ Attributes attributes) {
+
+ if (localName.equals("login")) {
+
+ logger.info("loading user name and password.");
+
+ String encoderClass = attributes.getValue("encoderClass");
+
+ String encoderKey = attributes.getValue("encoderKey");
+ if (encoderKey == null) {
+ encoderKey = attributes.getValue("encoderSalt");
+ }
+
+ String password = attributes.getValue("password");
+ String passwordLocation = attributes.getValue("passwordLocation");
+ String passwordSource = attributes.getValue("passwordSource");
+ if (passwordSource == null) {
+ passwordSource = DataSourceInfo.PASSWORD_LOCATION_MODEL;
+ }
+
+ String username = attributes.getValue("userName");
+
+ dataSourceDescriptor.setPasswordEncoderClass(encoderClass);
+ dataSourceDescriptor.setPasswordEncoderKey(encoderKey);
+ dataSourceDescriptor.setPasswordLocation(passwordLocation);
+ dataSourceDescriptor.setPasswordSource(passwordSource);
+ dataSourceDescriptor.setUserName(username);
+
+ // Replace {} in passwordSource with encoderSalt -- useful for EXECUTABLE
+ // & URL options
+ if (encoderKey != null) {
+ passwordSource = passwordSource.replaceAll("\\{\\}", encoderKey);
+ }
+
+ PasswordEncoding passwordEncoder = dataSourceDescriptor
+ .getPasswordEncoder();
+
+ if (passwordLocation != null) {
+ if (passwordLocation
+ .equals(DataSourceInfo.PASSWORD_LOCATION_CLASSPATH)) {
+ Collection<Resource> urls = resourceLocator
+ .findResources(passwordLocation);
+ if (urls.size() > 0) {
+ password = passwordFromURL(urls.iterator().next().getURL());
+ }
+ else {
+ logger.error("Could not find resource in CLASSPATH: "
+ + passwordSource);
+ }
+ }
+ else if (passwordLocation
+ .equals(DataSourceInfo.PASSWORD_LOCATION_URL)) {
+ try {
+ password = passwordFromURL(new URL(passwordSource));
+ }
+ catch (MalformedURLException exception) {
+ logger.warn(exception);
+ }
+ }
+ else if (passwordLocation
+ .equals(DataSourceInfo.PASSWORD_LOCATION_EXECUTABLE)) {
+ if (passwordSource != null) {
+ try {
+ Process process = Runtime.getRuntime().exec(
+ passwordSource);
+ password = passwordFromInputStream(process
+ .getInputStream());
+ process.waitFor();
+ }
+ catch (IOException exception) {
+ logger.warn(exception);
+ }
+ catch (InterruptedException exception) {
+ logger.warn(exception);
+ }
+ }
+ }
+ }
+
+ if (password != null && passwordEncoder != null) {
+ dataSourceDescriptor.setPassword(passwordEncoder.decodePassword(
+ password,
+ encoderKey));
+ }
+ }
+ else if (localName.equals("url")) {
+ dataSourceDescriptor.setDataSourceUrl(attributes.getValue("value"));
+ }
+ else if (localName.equals("connectionPool")) {
+ String min = attributes.getValue("min");
+ if (min != null) {
+ try {
+ dataSourceDescriptor.setMinConnections(Integer.parseInt(min));
+ }
+ catch (NumberFormatException nfex) {
+ logger.info("Non-numeric 'min' attribute", nfex);
+ throw new ConfigurationException(
+ "Non-numeric 'min' attribute '%s'",
+ nfex,
+ min);
+ }
+ }
+
+ String max = attributes.getValue("max");
+ if (max != null) {
+ try {
+ dataSourceDescriptor.setMaxConnections(Integer.parseInt(max));
+ }
+ catch (NumberFormatException nfex) {
+ logger.info("Non-numeric 'max' attribute", nfex);
+ throw new ConfigurationException(
+ "Non-numeric 'max' attribute '%s'",
+ nfex,
+ max);
+ }
+ }
+ }
+
+ return super.createChildTagHandler(namespaceURI, localName, name, attributes);
+ }
+ }
+}
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/AutoAdapter.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/AutoAdapter.java?rev=887667&r1=887666&r2=887667&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/AutoAdapter.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/AutoAdapter.java Sun Dec 6 11:22:19 2009
@@ -48,7 +48,8 @@
import org.apache.cayenne.dba.sqlite.SQLiteSniffer;
import org.apache.cayenne.dba.sqlserver.SQLServerSniffer;
import org.apache.cayenne.dba.sybase.SybaseSniffer;
-import org.apache.cayenne.di.Inject;
+import org.apache.cayenne.di.DIException;
+import org.apache.cayenne.di.Provider;
import org.apache.cayenne.map.DbAttribute;
import org.apache.cayenne.map.DbEntity;
import org.apache.cayenne.map.DbRelationship;
@@ -68,8 +69,15 @@
final static String DEFAULT_QUOTE_SQL_IDENTIFIERS_CHAR_START = "\"";
final static String DEFAULT_QUOTE_SQL_IDENTIFIERS_CHAR_END = "\"";
+ /**
+ * @deprecated since 3.1 in favor of
+ * {@link org.apache.cayenne.configuration.DbAdapterFactory} configured
+ * via dependency injection.
+ */
static final List<DbAdapterFactory> defaultFactories;
+
static {
+
defaultFactories = new ArrayList<DbAdapterFactory>();
// hardcoded factories for adapters that we know how to auto-detect
@@ -93,6 +101,9 @@
* Allows application code to add a sniffer to detect a custom adapter.
*
* @since 3.0
+ * @deprecated since 3.1 in favor of
+ * {@link org.apache.cayenne.configuration.DbAdapterFactory} configured
+ * via dependency injection.
*/
public static void addFactory(DbAdapterFactory factory) {
defaultFactories.add(factory);
@@ -101,47 +112,114 @@
/**
* Returns a DbAdapterFactory configured to detect all databases officially supported
* by Cayenne.
+ *
+ * @deprecated since 3.1 in favor of
+ * {@link org.apache.cayenne.configuration.DbAdapterFactory} configured
+ * via dependency injection.
*/
public static DbAdapterFactory getDefaultFactory() {
return new DbAdapterFactoryChain(defaultFactories);
}
- protected DbAdapterFactory adapterFactory;
- protected DataSource dataSource;
+ protected Provider<DbAdapter> adapterProvider;
protected PkGenerator pkGenerator;
/**
- * The actual adapter that is delegated method execution.
+ * The actual adapter that is delegated methods execution.
*/
- DbAdapter adapter;
+ volatile DbAdapter adapter;
/**
* Creates an AutoAdapter that can detect adapters known to Cayenne.
+ *
+ * @deprecated since 3.1 as {@link org.apache.cayenne.configuration.DbAdapterFactory}
+ * parameter is required.
*/
public AutoAdapter(DataSource dataSource) {
- this(null, dataSource);
+ this((DbAdapterFactory) null, dataSource);
}
/**
* Creates an AutoAdapter with specified adapter factory and DataSource. If
* adapterFactory is null, default factory is used.
+ *
+ * @deprecated since 3.1 in favor of
+ * {@link org.apache.cayenne.configuration.DbAdapterFactory} configured
+ * via dependency injection.
*/
- public AutoAdapter(@Inject DbAdapterFactory adapterFactory,
- @Inject DataSource dataSource) {
+ public AutoAdapter(DbAdapterFactory adapterFactory, final DataSource dataSource) {
// sanity check
if (dataSource == null) {
throw new CayenneRuntimeException("Null dataSource");
}
- this.adapterFactory = adapterFactory != null
+ final DbAdapterFactory deprecatedFactory = adapterFactory != null
? adapterFactory
: createDefaultFactory();
- this.dataSource = dataSource;
+
+ this.adapterProvider = new Provider<DbAdapter>() {
+
+ public DbAdapter get() throws DIException {
+ DbAdapter adapter;
+
+ try {
+ Connection c = dataSource.getConnection();
+
+ try {
+ adapter = deprecatedFactory.createAdapter(c.getMetaData());
+ }
+ finally {
+ try {
+ c.close();
+ }
+ catch (SQLException e) {
+ // ignore...
+ }
+ }
+ }
+ catch (SQLException e) {
+ throw new CayenneRuntimeException("Error detecting database type: "
+ + e.getLocalizedMessage(), e);
+ }
+
+ if (adapter == null) {
+ QueryLogger
+ .log("Failed to detect database type, using default adapter");
+ adapter = new JdbcAdapter();
+ }
+ else {
+ QueryLogger.log("Detected and installed adapter: "
+ + adapter.getClass().getName());
+ }
+
+ return adapter;
+ }
+ };
+
+ }
+
+ /**
+ * Creates an {@link AutoAdapter} based on a delegate adapter obtained via
+ * "adapterProvider".
+ *
+ * @since 3.1
+ */
+ public AutoAdapter(Provider<DbAdapter> adapterProvider) {
+
+ if (adapterProvider == null) {
+ throw new CayenneRuntimeException("Null adapterProvider");
+ }
+
+ this.adapterProvider = adapterProvider;
}
/**
* Called from constructor to initialize factory in case no factory was specified by
* the object creator.
+ *
+ * @deprecated since 3.1 in favor of
+ * {@link org.apache.cayenne.configuration.DbAdapterFactory} configured
+ * via dependency injection.
*/
protected DbAdapterFactory createDefaultFactory() {
return getDefaultFactory();
@@ -163,41 +241,10 @@
}
/**
- * Opens a connection, retrieves JDBC metadata and attempts to guess adapter form it.
+ * Loads underlying DbAdapter delegate.
*/
protected DbAdapter loadAdapter() {
- DbAdapter adapter = null;
-
- try {
- Connection c = dataSource.getConnection();
-
- try {
- adapter = adapterFactory.createAdapter(c.getMetaData());
- }
- finally {
- try {
- c.close();
- }
- catch (SQLException e) {
- // ignore...
- }
- }
- }
- catch (SQLException e) {
- throw new CayenneRuntimeException("Error detecting database type: "
- + e.getLocalizedMessage(), e);
- }
-
- if (adapter == null) {
- QueryLogger.log("Failed to detect database type, using default adapter");
- adapter = new JdbcAdapter();
- }
- else {
- QueryLogger.log("Detected and installed adapter: "
- + adapter.getClass().getName());
- }
-
- return adapter;
+ return adapterProvider.get();
}
// ---- DbAdapter methods ----
@@ -307,9 +354,6 @@
getAdapter().createTableAppendColumn(sqlBuffer, column);
}
- public void setDefaultQuoteSqlIdentifiersChars(boolean isQuoteSqlIdentifiers) {
- }
-
public String getIdentifiersStartQuote() {
return DEFAULT_QUOTE_SQL_IDENTIFIERS_CHAR_START;
}
@@ -321,5 +365,4 @@
public QuotingStrategy getQuotingStrategy(boolean isQuoteStrategy) {
return getAdapter().getQuotingStrategy(isQuoteStrategy);
}
-
}
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/DbAdapterFactory.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/DbAdapterFactory.java?rev=887667&r1=887666&r2=887667&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/DbAdapterFactory.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/DbAdapterFactory.java Sun Dec 6 11:22:19 2009
@@ -28,6 +28,9 @@
* database based on version information and other metadata.
*
* @since 1.2
+ * @deprecated since 3.1 in favor of
+ * {@link org.apache.cayenne.configuration.DbAdapterFactory} configured via
+ * dependency injection.
*/
public interface DbAdapterFactory {
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/DbAdapterFactoryChain.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/DbAdapterFactoryChain.java?rev=887667&r1=887666&r2=887667&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/DbAdapterFactoryChain.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/DbAdapterFactoryChain.java Sun Dec 6 11:22:19 2009
@@ -30,10 +30,10 @@
* adapters known to Cayenne or can work with custom factories.
*
* @since 1.2
+ * @deprecated since 3.1 in favor of
+ * {@link org.apache.cayenne.configuration.DbAdapterFactory} configured via
+ * dependency injection.
*/
-// TODO, Andrus 11/01/2005, how can custom adapters be auto-detected? I.e. is there a way
-// to plug a custom factory into configuration loading process? Of course users can simply
-// specify the adapter class in the modeler, so this may be a non-issue.
class DbAdapterFactoryChain implements DbAdapterFactory {
List<DbAdapterFactory> factories;
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/db2/DB2Sniffer.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/db2/DB2Sniffer.java?rev=887667&r1=887666&r2=887667&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/db2/DB2Sniffer.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/db2/DB2Sniffer.java Sun Dec 6 11:22:19 2009
@@ -22,13 +22,14 @@
import java.sql.DatabaseMetaData;
import java.sql.SQLException;
+import org.apache.cayenne.configuration.DbAdapterDetector;
import org.apache.cayenne.dba.DbAdapter;
import org.apache.cayenne.dba.DbAdapterFactory;
/**
* @since 1.2
*/
-public class DB2Sniffer implements DbAdapterFactory {
+public class DB2Sniffer implements DbAdapterFactory, DbAdapterDetector {
public DbAdapter createAdapter(DatabaseMetaData md) throws SQLException {
String dbName = md.getDatabaseProductName();
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/derby/DerbySniffer.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/derby/DerbySniffer.java?rev=887667&r1=887666&r2=887667&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/derby/DerbySniffer.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/derby/DerbySniffer.java Sun Dec 6 11:22:19 2009
@@ -22,6 +22,7 @@
import java.sql.DatabaseMetaData;
import java.sql.SQLException;
+import org.apache.cayenne.configuration.DbAdapterDetector;
import org.apache.cayenne.dba.DbAdapter;
import org.apache.cayenne.dba.DbAdapterFactory;
@@ -30,7 +31,7 @@
*
* @since 1.2
*/
-public class DerbySniffer implements DbAdapterFactory {
+public class DerbySniffer implements DbAdapterFactory, DbAdapterDetector {
public DbAdapter createAdapter(DatabaseMetaData md) throws SQLException {
String dbName = md.getDatabaseProductName();
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/frontbase/FrontBaseSniffer.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/frontbase/FrontBaseSniffer.java?rev=887667&r1=887666&r2=887667&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/frontbase/FrontBaseSniffer.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/frontbase/FrontBaseSniffer.java Sun Dec 6 11:22:19 2009
@@ -22,13 +22,14 @@
import java.sql.DatabaseMetaData;
import java.sql.SQLException;
+import org.apache.cayenne.configuration.DbAdapterDetector;
import org.apache.cayenne.dba.DbAdapter;
import org.apache.cayenne.dba.DbAdapterFactory;
/**
* @since 1.2
*/
-public class FrontBaseSniffer implements DbAdapterFactory {
+public class FrontBaseSniffer implements DbAdapterFactory, DbAdapterDetector {
public DbAdapter createAdapter(DatabaseMetaData md) throws SQLException {
String dbName = md.getDatabaseProductName();
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/h2/H2Sniffer.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/h2/H2Sniffer.java?rev=887667&r1=887666&r2=887667&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/h2/H2Sniffer.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/h2/H2Sniffer.java Sun Dec 6 11:22:19 2009
@@ -21,13 +21,15 @@
import java.sql.DatabaseMetaData;
import java.sql.SQLException;
+
+import org.apache.cayenne.configuration.DbAdapterDetector;
import org.apache.cayenne.dba.DbAdapter;
import org.apache.cayenne.dba.DbAdapterFactory;
/**
* @since 3.0
*/
-public class H2Sniffer implements DbAdapterFactory {
+public class H2Sniffer implements DbAdapterFactory, DbAdapterDetector {
public DbAdapter createAdapter(DatabaseMetaData md) throws SQLException {
String dbName = md.getDatabaseProductName();
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/hsqldb/HSQLDBSniffer.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/hsqldb/HSQLDBSniffer.java?rev=887667&r1=887666&r2=887667&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/hsqldb/HSQLDBSniffer.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/hsqldb/HSQLDBSniffer.java Sun Dec 6 11:22:19 2009
@@ -22,6 +22,7 @@
import java.sql.DatabaseMetaData;
import java.sql.SQLException;
+import org.apache.cayenne.configuration.DbAdapterDetector;
import org.apache.cayenne.dba.DbAdapter;
import org.apache.cayenne.dba.DbAdapterFactory;
@@ -30,7 +31,7 @@
*
* @since 1.2
*/
-public class HSQLDBSniffer implements DbAdapterFactory {
+public class HSQLDBSniffer implements DbAdapterFactory, DbAdapterDetector {
public DbAdapter createAdapter(DatabaseMetaData md) throws SQLException {
String dbName = md.getDatabaseProductName();
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/ingres/IngresSniffer.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/ingres/IngresSniffer.java?rev=887667&r1=887666&r2=887667&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/ingres/IngresSniffer.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/ingres/IngresSniffer.java Sun Dec 6 11:22:19 2009
@@ -22,6 +22,7 @@
import java.sql.DatabaseMetaData;
import java.sql.SQLException;
+import org.apache.cayenne.configuration.DbAdapterDetector;
import org.apache.cayenne.dba.DbAdapter;
import org.apache.cayenne.dba.DbAdapterFactory;
@@ -30,7 +31,7 @@
*
* @since 1.2
*/
-public class IngresSniffer implements DbAdapterFactory {
+public class IngresSniffer implements DbAdapterFactory, DbAdapterDetector {
public DbAdapter createAdapter(DatabaseMetaData md) throws SQLException {
String dbName = md.getDatabaseProductName();
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/mysql/MySQLSniffer.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/mysql/MySQLSniffer.java?rev=887667&r1=887666&r2=887667&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/mysql/MySQLSniffer.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/mysql/MySQLSniffer.java Sun Dec 6 11:22:19 2009
@@ -24,6 +24,7 @@
import java.sql.SQLException;
import java.sql.Statement;
+import org.apache.cayenne.configuration.DbAdapterDetector;
import org.apache.cayenne.dba.DbAdapter;
import org.apache.cayenne.dba.DbAdapterFactory;
@@ -32,7 +33,7 @@
*
* @since 1.2
*/
-public class MySQLSniffer implements DbAdapterFactory {
+public class MySQLSniffer implements DbAdapterFactory, DbAdapterDetector {
public DbAdapter createAdapter(DatabaseMetaData md) throws SQLException {
String dbName = md.getDatabaseProductName();
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/openbase/OpenBaseSniffer.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/openbase/OpenBaseSniffer.java?rev=887667&r1=887666&r2=887667&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/openbase/OpenBaseSniffer.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/openbase/OpenBaseSniffer.java Sun Dec 6 11:22:19 2009
@@ -22,6 +22,7 @@
import java.sql.DatabaseMetaData;
import java.sql.SQLException;
+import org.apache.cayenne.configuration.DbAdapterDetector;
import org.apache.cayenne.dba.DbAdapter;
import org.apache.cayenne.dba.DbAdapterFactory;
@@ -30,7 +31,7 @@
*
* @since 1.2
*/
-public class OpenBaseSniffer implements DbAdapterFactory {
+public class OpenBaseSniffer implements DbAdapterFactory, DbAdapterDetector {
public DbAdapter createAdapter(DatabaseMetaData md) throws SQLException {
String dbName = md.getDatabaseProductName();
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/oracle/OracleSniffer.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/oracle/OracleSniffer.java?rev=887667&r1=887666&r2=887667&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/oracle/OracleSniffer.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/oracle/OracleSniffer.java Sun Dec 6 11:22:19 2009
@@ -22,13 +22,14 @@
import java.sql.DatabaseMetaData;
import java.sql.SQLException;
+import org.apache.cayenne.configuration.DbAdapterDetector;
import org.apache.cayenne.dba.DbAdapter;
import org.apache.cayenne.dba.DbAdapterFactory;
/**
* @since 1.2
*/
-public class OracleSniffer implements DbAdapterFactory {
+public class OracleSniffer implements DbAdapterFactory, DbAdapterDetector {
public DbAdapter createAdapter(DatabaseMetaData md) throws SQLException {
String dbName = md.getDatabaseProductName();
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/postgres/PostgresSniffer.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/postgres/PostgresSniffer.java?rev=887667&r1=887666&r2=887667&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/postgres/PostgresSniffer.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/postgres/PostgresSniffer.java Sun Dec 6 11:22:19 2009
@@ -22,13 +22,14 @@
import java.sql.DatabaseMetaData;
import java.sql.SQLException;
+import org.apache.cayenne.configuration.DbAdapterDetector;
import org.apache.cayenne.dba.DbAdapter;
import org.apache.cayenne.dba.DbAdapterFactory;
/**
* @since 1.2
*/
-public class PostgresSniffer implements DbAdapterFactory {
+public class PostgresSniffer implements DbAdapterFactory, DbAdapterDetector {
public DbAdapter createAdapter(DatabaseMetaData md) throws SQLException {
String dbName = md.getDatabaseProductName();
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/sqlite/SQLiteSniffer.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/sqlite/SQLiteSniffer.java?rev=887667&r1=887666&r2=887667&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/sqlite/SQLiteSniffer.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/sqlite/SQLiteSniffer.java Sun Dec 6 11:22:19 2009
@@ -21,6 +21,7 @@
import java.sql.DatabaseMetaData;
import java.sql.SQLException;
+import org.apache.cayenne.configuration.DbAdapterDetector;
import org.apache.cayenne.dba.DbAdapter;
import org.apache.cayenne.dba.DbAdapterFactory;
@@ -29,7 +30,7 @@
*
* @since 3.0
*/
-public class SQLiteSniffer implements DbAdapterFactory {
+public class SQLiteSniffer implements DbAdapterFactory, DbAdapterDetector {
public DbAdapter createAdapter(DatabaseMetaData md) throws SQLException {
String dbName = md.getDatabaseProductName();
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/sqlserver/SQLServerSniffer.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/sqlserver/SQLServerSniffer.java?rev=887667&r1=887666&r2=887667&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/sqlserver/SQLServerSniffer.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/sqlserver/SQLServerSniffer.java Sun Dec 6 11:22:19 2009
@@ -22,6 +22,7 @@
import java.sql.DatabaseMetaData;
import java.sql.SQLException;
+import org.apache.cayenne.configuration.DbAdapterDetector;
import org.apache.cayenne.dba.DbAdapter;
import org.apache.cayenne.dba.DbAdapterFactory;
@@ -30,7 +31,7 @@
*
* @since 1.2
*/
-public class SQLServerSniffer implements DbAdapterFactory {
+public class SQLServerSniffer implements DbAdapterFactory, DbAdapterDetector {
public DbAdapter createAdapter(DatabaseMetaData md) throws SQLException {
String dbName = md.getDatabaseProductName();
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/sybase/SybaseSniffer.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/sybase/SybaseSniffer.java?rev=887667&r1=887666&r2=887667&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/sybase/SybaseSniffer.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/sybase/SybaseSniffer.java Sun Dec 6 11:22:19 2009
@@ -22,6 +22,7 @@
import java.sql.DatabaseMetaData;
import java.sql.SQLException;
+import org.apache.cayenne.configuration.DbAdapterDetector;
import org.apache.cayenne.dba.DbAdapter;
import org.apache.cayenne.dba.DbAdapterFactory;
@@ -30,7 +31,7 @@
*
* @since 1.2
*/
-public class SybaseSniffer implements DbAdapterFactory {
+public class SybaseSniffer implements DbAdapterFactory, DbAdapterDetector {
public DbAdapter createAdapter(DatabaseMetaData md) throws SQLException {
// JTDS driver returns "sql server" for Sybase, so need to handle it differently
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/runtime/DataDomainProvider.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/runtime/DataDomainProvider.java?rev=887667&r1=887666&r2=887667&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/runtime/DataDomainProvider.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/runtime/DataDomainProvider.java Sun Dec 6 11:22:19 2009
@@ -18,22 +18,24 @@
****************************************************************/
package org.apache.cayenne.runtime;
-import org.apache.cayenne.CayenneRuntimeException;
+import javax.sql.DataSource;
+
import org.apache.cayenne.DataChannel;
import org.apache.cayenne.access.DataDomain;
import org.apache.cayenne.access.DataNode;
import org.apache.cayenne.access.dbsync.SchemaUpdateStrategy;
+import org.apache.cayenne.configuration.AdhocObjectFactory;
import org.apache.cayenne.configuration.DataChannelDescriptor;
import org.apache.cayenne.configuration.DataChannelDescriptorLoader;
import org.apache.cayenne.configuration.DataNodeDescriptor;
+import org.apache.cayenne.configuration.DataSourceFactory;
+import org.apache.cayenne.configuration.DataSourceFactoryLoader;
+import org.apache.cayenne.configuration.DbAdapterFactory;
import org.apache.cayenne.configuration.RuntimeProperties;
-import org.apache.cayenne.dba.DbAdapter;
import org.apache.cayenne.di.DIException;
import org.apache.cayenne.di.Inject;
-import org.apache.cayenne.di.Injector;
import org.apache.cayenne.di.Provider;
import org.apache.cayenne.map.DataMap;
-import org.apache.cayenne.util.Util;
/**
* A {@link DataChannel} provider that provides a single instance of DataDomain configured
@@ -53,13 +55,13 @@
protected SchemaUpdateStrategy defaultSchemaUpdateStrategy;
@Inject
- protected DbAdapter defaultAdapter;
+ protected DbAdapterFactory adapterFactory;
@Inject
- protected DataSourceFactory defaultDataSourceFactory;
+ protected DataSourceFactoryLoader dataSourceFactoryLoader;
@Inject
- protected Injector injector;
+ protected AdhocObjectFactory objectFactory;
protected volatile DataChannel dataChannel;
@@ -68,7 +70,17 @@
if (dataChannel == null) {
synchronized (this) {
if (dataChannel == null) {
- createDataChannel();
+
+ try {
+ createDataChannel();
+ }
+ catch (DIException e) {
+ throw e;
+ }
+ catch (Exception e) {
+ throw new DIException("Error loading DataChannel: '%s'", e, e
+ .getMessage());
+ }
}
}
}
@@ -76,7 +88,7 @@
return dataChannel;
}
- protected void createDataChannel() {
+ protected void createDataChannel() throws Exception {
String runtimeName = configurationProperties
.get(RuntimeProperties.CAYENNE_RUNTIME_NAME);
DataChannelDescriptor descriptor = loader.load(runtimeName);
@@ -94,21 +106,13 @@
dataNode.setDataSourceLocation(nodeDescriptor.getLocation());
- String dataSourceFactoryType = nodeDescriptor.getDataSourceFactoryType();
- if (dataSourceFactoryType == null) {
- dataNode.setDataSourceFactory(defaultDataSourceFactory
- .getClass()
- .getName());
- dataNode.setDataSource(defaultDataSourceFactory
- .getDataSource(nodeDescriptor));
- }
- else {
- dataNode.setDataSourceFactory(dataSourceFactoryType);
- DataSourceFactory factory = newInstance(
- DataSourceFactory.class,
- dataSourceFactoryType);
- dataNode.setDataSource(factory.getDataSource(nodeDescriptor));
- }
+ DataSourceFactory dataSourceFactory = dataSourceFactoryLoader
+ .getDataSourceFactory(nodeDescriptor);
+
+ DataSource dataSource = dataSourceFactory.getDataSource(nodeDescriptor);
+
+ dataNode.setDataSourceFactory(nodeDescriptor.getDataSourceFactoryType());
+ dataNode.setDataSource(dataSource);
// schema update strategy
String schemaUpdateStrategyType = nodeDescriptor
@@ -121,20 +125,16 @@
.getName());
}
else {
- dataNode.setSchemaUpdateStrategyName(schemaUpdateStrategyType);
- dataNode.setSchemaUpdateStrategy(newInstance(
+
+ SchemaUpdateStrategy strategy = objectFactory.newInstance(
SchemaUpdateStrategy.class,
- schemaUpdateStrategyType));
+ schemaUpdateStrategyType);
+ dataNode.setSchemaUpdateStrategyName(schemaUpdateStrategyType);
+ dataNode.setSchemaUpdateStrategy(strategy);
}
// DbAdapter
- String adapterType = nodeDescriptor.getAdapterType();
- if (adapterType == null) {
- dataNode.setAdapter(defaultAdapter);
- }
- else {
- dataNode.setAdapter(newInstance(DbAdapter.class, adapterType));
- }
+ dataNode.setAdapter(adapterFactory.createAdapter(nodeDescriptor, dataSource));
// DataMaps
for (String dataMapName : nodeDescriptor.getDataMapNames()) {
@@ -147,32 +147,4 @@
this.dataChannel = dataChannel;
}
- private <T> T newInstance(Class<? extends T> interfaceType, String className) {
-
- Class<? extends T> type;
- try {
- type = (Class<? extends T>) Util.getJavaClass(className);
- }
- catch (ClassNotFoundException e) {
- throw new CayenneRuntimeException(
- "Invalid class %s of type %s",
- e,
- className,
- interfaceType.getName());
- }
- T instance;
- try {
- instance = type.newInstance();
- }
- catch (Exception e) {
- throw new CayenneRuntimeException(
- "Error creating instance of class %s of type %s",
- e,
- className,
- interfaceType.getName());
- }
-
- injector.injectMembers(instance);
- return instance;
- }
}
Author: aadamchik
Date: Sun Dec 6 11:21:11 2009
New Revision: 887666
URL: http://svn.apache.org/viewvc?rev=887666&view=rev
Log:
removing test case for the class that is itself located in the unit tests
Removed:
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/conf/ConnectionPropertiesTest.java
[ https://issues.apache.org/jira/browse/CAY-1323?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=12786069#action_12786069
]
Evgeny Ryabitskiy commented on CAY-1323:
----------------------------------------
[Andrus] This is a new use pattern of ExtendedTypes (till now 'materializeObject' would always
return the same class or a subclass of 'getClassName'... I guess it's fine to trick Oracle.
Also Oracle has a few more odd types:
http://download-east.oracle.com/otn_hosted_doc/jdeveloper/904preview/jdbc-javadoc/oracle/sql/package-summary.html
that we may want to handle in a similar fashion (at least the date/time ones)
Re:
Love to do something new :)
Yeah! It's a large field of Oracle tunning.
Next step I am going to work with Oracle CLOBs. (Some fellas from my work have troubles with
it). I have some logs.... but not even looked inside... yet..
> oracle.sql.TIMESTAMP in Result of query
> ---------------------------------------
>
> Key: CAY-1323
> URL: https://issues.apache.org/jira/browse/CAY-1323
> Project: Cayenne
> Issue Type: Bug
> Components: Cayenne Core Library
> Affects Versions: 2.0.5, 3.0 beta 1
> Reporter: Evgeny Ryabitskiy
> Assignee: Evgeny Ryabitskiy
> Attachments: CAY-1323_3.1.patch, CAY-1323_3.1_OracleTest.patch, cayenne.xml,
OracleTimestampTest.java, OracleTimestampTestMap.map.xml
>
>
> Result of query from column of timestamp type was mapped to oracle.sql.TIMESTAMP.
> I think it should be mapped to standard JDBS TIMESTAMP
> I am using latest official Oracle JDBC driver.
--
This message is automatically generated by JIRA.
-
You can reply to this email to add a comment to the issue online.
[ https://issues.apache.org/jira/browse/CAY-1323?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=12786065#action_12786065
]
Evgeny Ryabitskiy commented on CAY-1323:
----------------------------------------
[Andrus] Not a bad idea, however 'getDate' would lose all time data, so what if that weird
object returned by the driver is a custom timestamp... Should we call 'getTimestamp()' instead?
Something to figure out.
Re;
It's UtilDateType.java class and it's expecting to return java.util.Date.
'getDate' returns 'java.sql.Date'
There are no deferents between 'java.sql.Date' and ' java.util.Date'
if we use 'getTimestamp()' we got 'java.sql.Timestamp'
Only deferents between Timestamp and Date is nanoseconds.
We don't need nanoseconds, because we converting to ' java.util.Date' and nanoseconds will
be dropped.
So I think it is right method in right place. No lose of time data.
> oracle.sql.TIMESTAMP in Result of query
> ---------------------------------------
>
> Key: CAY-1323
> URL: https://issues.apache.org/jira/browse/CAY-1323
> Project: Cayenne
> Issue Type: Bug
> Components: Cayenne Core Library
> Affects Versions: 2.0.5, 3.0 beta 1
> Reporter: Evgeny Ryabitskiy
> Assignee: Evgeny Ryabitskiy
> Attachments: CAY-1323_3.1.patch, CAY-1323_3.1_OracleTest.patch, cayenne.xml,
OracleTimestampTest.java, OracleTimestampTestMap.map.xml
>
>
> Result of query from column of timestamp type was mapped to oracle.sql.TIMESTAMP.
> I think it should be mapped to standard JDBS TIMESTAMP
> I am using latest official Oracle JDBC driver.
--
This message is automatically generated by JIRA.
-
You can reply to this email to add a comment to the issue online.
[ https://issues.apache.org/jira/browse/CAY-1323?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
]
Andrus Adamchik reassigned CAY-1323:
------------------------------------
Assignee: Evgeny Ryabitskiy (was: Andrus Adamchik)
Cool. Assigning this to Evgeny.
Good stuff. See my comments inline below...
Index: src/main/java/org/apache/cayenne/access/types/UtilDateType.java
===================================================================
- public Object materializeObject(ResultSet rs, int index, int type) throws Exception {
+ public Date materializeObject(ResultSet rs, int index, int type) throws Exception {
Date val = null;
switch (type) {
@@ -70,28 +69,18 @@
val = rs.getTime(index);
break;
default:
- // here the driver can "surprise" us
- // check the type of returned value...
- Object object = rs.getObject(index);
-
- if (object != null && !(object instanceof Date)) {
- throw new CayenneRuntimeException(
- "Expected an instance of java.util.Date, instead got "
- + object.getClass().getName()
- + ", column index: "
- + index);
- }
-
- val = (Date) object;
+ val = rs.getDate(index);
break;
}
[Andrus] Not a bad idea, however 'getDate' would lose all time data, so what if that weird
object returned by the driver is a custom timestamp... Should we call 'getTimestamp()' instead?
Something to figure out.
Index: src/main/java/org/apache/cayenne/dba/oracle/OracleTimestampType.java
===================================================================
+
+/**
+ * This is handler for Oracle specific type "oracle.sql.TIMESTAMP"
+ * Oracle official JDBC Driver is mapping SQL TIMESTAMP to this type
+ * Created to solve CAY-1323.
+ */
+public class OracleTimestampType extends TimestampType {
+
+ @Override
+ public String getClassName() {
+ return "oracle.sql.TIMESTAMP";
+ }
+}
[Andrus] This is a new use pattern of ExtendedTypes (till now 'materializeObject' would always
return the same class or a subclass of 'getClassName'... I guess it's fine to trick Oracle.
Also Oracle has a few more odd types:
http://download-east.oracle.com/otn_hosted_doc/jdeveloper/904preview/jdbc-javadoc/oracle/sql/package-summary.html
that we may want to handle in a similar fashion (at least the date/time ones)
> oracle.sql.TIMESTAMP in Result of query
> ---------------------------------------
>
> Key: CAY-1323
> URL: https://issues.apache.org/jira/browse/CAY-1323
> Project: Cayenne
> Issue Type: Bug
> Components: Cayenne Core Library
> Affects Versions: 2.0.5, 3.0 beta 1
> Reporter: Evgeny Ryabitskiy
> Assignee: Evgeny Ryabitskiy
> Attachments: CAY-1323_3.1.patch, CAY-1323_3.1_OracleTest.patch, cayenne.xml,
OracleTimestampTest.java, OracleTimestampTestMap.map.xml
>
>
> Result of query from column of timestamp type was mapped to oracle.sql.TIMESTAMP.
> I think it should be mapped to standard JDBS TIMESTAMP
> I am using latest official Oracle JDBC driver.
--
This message is automatically generated by JIRA.
-
You can reply to this email to add a comment to the issue online.
[ https://issues.apache.org/jira/browse/CAY-1323?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=12785966#action_12785966
]
Evgeny Ryabitskiy edited comment on CAY-1323 at 12/4/09 3:48 PM:
-----------------------------------------------------------------
Fixed!
Improved Timestamp/Date mapping for most of cases
Patch is only for 3.1 trunk.
Still need to think what to do with other branches
was (Author: apparition):
Fixed!
Improved Timestamp/Date mapping for most of cases
> oracle.sql.TIMESTAMP in Result of query
> ---------------------------------------
>
> Key: CAY-1323
> URL: https://issues.apache.org/jira/browse/CAY-1323
> Project: Cayenne
> Issue Type: Bug
> Components: Cayenne Core Library
> Affects Versions: 2.0.5, 3.0 beta 1
> Reporter: Evgeny Ryabitskiy
> Assignee: Andrus Adamchik
> Attachments: CAY-1323_3.1.patch, CAY-1323_3.1_OracleTest.patch, cayenne.xml,
OracleTimestampTest.java, OracleTimestampTestMap.map.xml
>
>
> Result of query from column of timestamp type was mapped to oracle.sql.TIMESTAMP.
> I think it should be mapped to standard JDBS TIMESTAMP
> I am using latest official Oracle JDBC driver.
--
This message is automatically generated by JIRA.
-
You can reply to this email to add a comment to the issue online.
[ https://issues.apache.org/jira/browse/CAY-1323?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=12785968#action_12785968
]
Evgeny Ryabitskiy commented on CAY-1323:
----------------------------------------
Maybe assign this issue to me.. cause I am resolving it? :)
> oracle.sql.TIMESTAMP in Result of query
> ---------------------------------------
>
> Key: CAY-1323
> URL: https://issues.apache.org/jira/browse/CAY-1323
> Project: Cayenne
> Issue Type: Bug
> Components: Cayenne Core Library
> Affects Versions: 2.0.5, 3.0 beta 1
> Reporter: Evgeny Ryabitskiy
> Assignee: Andrus Adamchik
> Attachments: CAY-1323_3.1.patch, CAY-1323_3.1_OracleTest.patch, cayenne.xml,
OracleTimestampTest.java, OracleTimestampTestMap.map.xml
>
>
> Result of query from column of timestamp type was mapped to oracle.sql.TIMESTAMP.
> I think it should be mapped to standard JDBS TIMESTAMP
> I am using latest official Oracle JDBC driver.
--
This message is automatically generated by JIRA.
-
You can reply to this email to add a comment to the issue online.
[ https://issues.apache.org/jira/browse/CAY-1323?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
]
Evgeny Ryabitskiy updated CAY-1323:
-----------------------------------
Attachment: CAY-1323_3.1_OracleTest.patch
JUnits to check Oracle Date/Timestamp Mapping
> oracle.sql.TIMESTAMP in Result of query
> ---------------------------------------
>
> Key: CAY-1323
> URL: https://issues.apache.org/jira/browse/CAY-1323
> Project: Cayenne
> Issue Type: Bug
> Components: Cayenne Core Library
> Affects Versions: 2.0.5, 3.0 beta 1
> Reporter: Evgeny Ryabitskiy
> Assignee: Andrus Adamchik
> Attachments: CAY-1323_3.1.patch, CAY-1323_3.1_OracleTest.patch, cayenne.xml,
OracleTimestampTest.java, OracleTimestampTestMap.map.xml
>
>
> Result of query from column of timestamp type was mapped to oracle.sql.TIMESTAMP.
> I think it should be mapped to standard JDBS TIMESTAMP
> I am using latest official Oracle JDBC driver.
--
This message is automatically generated by JIRA.
-
You can reply to this email to add a comment to the issue online.
[ https://issues.apache.org/jira/browse/CAY-1323?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
]
Evgeny Ryabitskiy updated CAY-1323:
-----------------------------------
Attachment: CAY-1323_3.1.patch
Fixed!
Improved Timestamp/Date mapping for most of cases
> oracle.sql.TIMESTAMP in Result of query
> ---------------------------------------
>
> Key: CAY-1323
> URL: https://issues.apache.org/jira/browse/CAY-1323
> Project: Cayenne
> Issue Type: Bug
> Components: Cayenne Core Library
> Affects Versions: 2.0.5, 3.0 beta 1
> Reporter: Evgeny Ryabitskiy
> Assignee: Andrus Adamchik
> Attachments: CAY-1323_3.1.patch, cayenne.xml, OracleTimestampTest.java, OracleTimestampTestMap.map.xml
>
>
> Result of query from column of timestamp type was mapped to oracle.sql.TIMESTAMP.
> I think it should be mapped to standard JDBS TIMESTAMP
> I am using latest official Oracle JDBC driver.
--
This message is automatically generated by JIRA.
-
You can reply to this email to add a comment to the issue online.
<html>
<head>
<base href="http://cwiki.apache.org/confluence">
<link rel="stylesheet" href="/confluence/s/1519/1/1/_/styles/combined.css?spaceKey=CAYDOC&forWysiwyg=true"
type="text/css">
</head>
<body style="background-color: white" bgcolor="white">
<div id="pageContent">
<div id="notificationFormat">
<div class="wiki-content">
<div class="email">
<h2><a href="http://cwiki.apache.org/confluence/display/CAYDOC/Tutorial+Setup">Tutorial
Setup</a></h2>
<h4>Page <b>edited</b> by <a href="http://cwiki.apache.org/confluence/display/~andrus">Andrus
Adamchik</a>
</h4>
<br/>
<div class="notificationGreySide">
<h3><a name="TutorialSetup-InstallJava"></a>Install Java</h3>
<p>Make sure you have Java installed. Cayenne 3.0 requires JDK 1.5 or newer.</p>
<h3><a name="TutorialSetup-DownloadCayenne"></a>Download Cayenne</h3>
<p>Get <a href="http://cayenne.apache.org/download.html" rel="nofollow">the latest
Cayenne</a> distribution. If you are on Linux, select a cross-platform version (<tt>cayenne-XXX.tar.gz</tt>).
For Mac OS X select <tt>cayenne-XXX-macosx.dmg</tt> and for Windows - <tt>cayenne-XXX-win.zip</tt>.
Unpack the distribution somewhere in the file system. </p>
<h3><a name="TutorialSetup-DownloadDerbyDatabase"></a>Download Derby Database</h3>
<p>Get Derby database <a href="http://db.apache.org/derby/derby_downloads.html" rel="nofollow">from
here</a> and unpack it somewhere in the filesystem.</p>
<h3><a name="TutorialSetup-DownloadEclipse"></a>Download Eclipse </h3>
<p>Download Eclipse <a href="http://www.eclipse.org" rel="nofollow">from here</a>
and unpack it somewhere in the filesystem.</p>
<h3><a name="TutorialSetup-CreateaNewEclipseProject"></a>Create a New Eclipse
Project</h3>
<p>Start Eclipse and go to <tt>"File > New > Project"</tt>.
Select a "Java Project" for the project type and click "Next":</p>
<p><img src="/confluence/download/attachments/10642/eclipse-new-project.jpg" align="absmiddle"
border="0" /></p>
<p>Enter "cayenne-tutorial" for the project name, select "Create separate source and
output folders" radio button and click "Next":</p>
<p><img src="/confluence/download/attachments/10642/eclipse-project-settings.jpg"
align="absmiddle" border="0" /></p>
<p>On the next screen ("Java Settings") go to the "Libraries" tab and click "Add External
Jar" button on the right to add two Jar files:</p>
<ul>
<li><tt>derby.jar</tt> located in the "lib" directory of the Derby installation)</li>
<li><tt>cayenne.jar</tt> located in the "lib" directory of Cayenne installation.</li>
</ul>
<p><img src="/confluence/download/attachments/10642/eclipse-java-settings.jpg" align="absmiddle"
border="0" /></p>
<p>When done click "Finish" and the new project should appear in Eclipse.</p>
<hr />
<p><b>Next Step: <a href="/confluence/display/CAYDOC/Tutorial+Starting+Mapping+Project"
title="Tutorial Starting Mapping Project">Tutorial Starting Mapping Project</a></b></p>
<hr />
</div>
<div id="commentsSection" class="wiki-content pageSection">
<div style="float: right;">
<a href="http://cwiki.apache.org/confluence/users/viewnotifications.action"
class="grey">Change Notification Preferences</a>
</div>
<a href="http://cwiki.apache.org/confluence/display/CAYDOC/Tutorial+Setup">View
Online</a>
|
<a href="http://cwiki.apache.org/confluence/pages/diffpagesbyversion.action?pageId=10642&revisedVersion=11&originalVersion=10">View
Change</a>
|
<a href="http://cwiki.apache.org/confluence/display/CAYDOC/Tutorial+Setup?showComments=true&showCommentArea=true#addcomment">Add
Comment</a>
</div>
</div>
</div>
</div>
</div>
</body>
</html>
<html>
<head>
<base href="http://cwiki.apache.org/confluence">
<link rel="stylesheet" href="/confluence/s/1519/1/1/_/styles/combined.css?spaceKey=CAYDOC&forWysiwyg=true"
type="text/css">
</head>
<body style="background-color: white" bgcolor="white">
<div id="pageContent">
<div id="notificationFormat">
<div class="wiki-content">
<div class="email">
<h2><a href="http://cwiki.apache.org/confluence/display/CAYDOC/Tutorial+Setup">Tutorial
Setup</a></h2>
<h4>Page <b>edited</b> by <a href="http://cwiki.apache.org/confluence/display/~andrus">Andrus
Adamchik</a>
</h4>
<br/>
<div class="notificationGreySide">
<h3><a name="TutorialSetup-InstallJava"></a>Install Java</h3>
<p>Make sure you have Java installed. Cayenne 3.0 requires JDK 1.5.</p>
<h3><a name="TutorialSetup-DownloadCayenne"></a>Download Cayenne</h3>
<p>Get <a href="http://cayenne.apache.org/download.html" rel="nofollow">the latest
Cayenne</a> distribution. If you are on Linux, select a cross-platform version (<tt>cayenne-XXX.tar.gz</tt>).
For Mac OS X select <tt>cayenne-XXX-macosx.dmg</tt> and for Windows - <tt>cayenne-XXX-win.zip</tt>.
Unpack the distribution somewhere in the file system. </p>
<h3><a name="TutorialSetup-DownloadDerbyDatabase"></a>Download Derby Database</h3>
<p>Get Derby database <a href="http://db.apache.org/derby/derby_downloads.html" rel="nofollow">from
here</a> and unpack it somewhere in the filesystem.</p>
<h3><a name="TutorialSetup-DownloadEclipse"></a>Download Eclipse </h3>
<p>Download Eclipse <a href="http://www.eclipse.org" rel="nofollow">from here</a>
and unpack it somewhere in the filesystem.</p>
<h3><a name="TutorialSetup-CreateaNewEclipseProject"></a>Create a New Eclipse
Project</h3>
<p>Start Eclipse and go to <tt>"File > New > Project"</tt>.
Select a "Java Project" for the project type and click "Next":</p>
<p><img src="/confluence/download/attachments/10642/eclipse-new-project.jpg" align="absmiddle"
border="0" /></p>
<p>Enter "cayenne-tutorial" for the project name, select "Create separate source and
output folders" radio button and click "Next":</p>
<p><img src="/confluence/download/attachments/10642/eclipse-project-settings.jpg"
align="absmiddle" border="0" /></p>
<p>On the next screen ("Java Settings") go to the "Libraries" tab and click "Add External
Jar" button on the right to add two Jar files:</p>
<ul>
<li><tt>derby.jar</tt> located in the "lib" directory of the Derby installation)</li>
<li><tt>cayenne.jar</tt> located in the "lib" directory of Cayenne installation.</li>
</ul>
<p><img src="/confluence/download/attachments/10642/eclipse-java-settings.jpg" align="absmiddle"
border="0" /></p>
<p>When done click "Finish" and the new project should appear in Eclipse.</p>
<hr />
<p><b>Next Step: <a href="/confluence/display/CAYDOC/Tutorial+Starting+Mapping+Project"
title="Tutorial Starting Mapping Project">Tutorial Starting Mapping Project</a></b></p>
<hr />
</div>
<div id="commentsSection" class="wiki-content pageSection">
<div style="float: right;">
<a href="http://cwiki.apache.org/confluence/users/viewnotifications.action"
class="grey">Change Notification Preferences</a>
</div>
<a href="http://cwiki.apache.org/confluence/display/CAYDOC/Tutorial+Setup">View
Online</a>
|
<a href="http://cwiki.apache.org/confluence/pages/diffpagesbyversion.action?pageId=10642&revisedVersion=10&originalVersion=9">View
Change</a>
|
<a href="http://cwiki.apache.org/confluence/display/CAYDOC/Tutorial+Setup?showComments=true&showCommentArea=true#addcomment">Add
Comment</a>
</div>
</div>
</div>
</div>
</div>
</body>
</html>
<html>
<head>
<base href="http://cwiki.apache.org/confluence">
<link rel="stylesheet" href="/confluence/s/1519/1/1/_/styles/combined.css?spaceKey=CAYDOC&forWysiwyg=true"
type="text/css">
</head>
<body style="background-color: white" bgcolor="white">
<div id="pageContent">
<div id="notificationFormat">
<div class="wiki-content">
<div class="email">
<h2><a href="http://cwiki.apache.org/confluence/display/CAYDOC/JAR+Files+and+Dependencies">JAR
Files and Dependencies</a></h2>
<h4>Page <b>edited</b> by <a href="http://cwiki.apache.org/confluence/display/~andrus">Andrus
Adamchik</a>
</h4>
<br/>
<div class="notificationGreySide">
<p>This sections explains where all the relevant jar files are located. It
also lists Cayenne dependencies.</p>
<h3><a name="JARFilesandDependencies-CayenneRuntimeFramework"></a>Cayenne
Runtime Framework</h3>
<p>The following runtime jars are included in Cayenne distribution <tt>"lib"</tt>
directory:</p>
<ul>
<li><b><tt>cayenne-server-x.x.jar</tt></b> - contains full
Cayenne runtime WITHOUT dependencies. Most applications will use only this file.</li>
</ul>
<ul>
<li><tt>cayenne-client-x.x.jar</tt> - a subset of cayenne-server.jar trimmed
for use on the client in an <a href="/confluence/display/CAYDOC/Remote+Object+Persistence+Guide"
title="Remote Object Persistence Guide">ROP application</a>.</li>
<li><tt>cayenne-tools-x.x.jar</tt> - Ant tasks</li>
<li><tt>cayenne-modeler-x.x.jar</tt> - CayenneModeler runtime library.
Most applications won't ever use it. It is only needed for the <a href="/confluence/display/CAYDOC/Using+JNDI"
title="Using JNDI">local JNDI hack</a>.</li>
</ul>
<p>When using <tt>cayenne-server-x.x.jar</tt> you'll need a few third party
jars (all included in <tt>"lib/third-party"</tt> directory of the distribution):</p>
<ul>
<li><a href="http://objectstyle.org/ashwood/" rel="nofollow">ObjectStyle Ashwood
Graph Library</a>, version 2.0</li>
<li><a href="http://jakarta.apache.org/velocity/" rel="nofollow">Apache Velocity
Template Engine</a>, version 1.3 (and all its dependencies bundled with velocity-dep)</li>
<li><a href="http://jakarta.apache.org/commons/collections" rel="nofollow">Apache
Commons Collections</a>, version 3.1</li>
<li><a href="http://jakarta.apache.org/commons/logging/" rel="nofollow">Apache
Commons Logging</a>, version 1.1</li>
</ul>
<p>ROP client dependencies are explained <a href="/confluence/display/CAYDOC/Remote+Object+Persistence+Installation"
title="Remote Object Persistence Installation">here</a>.</p>
<h3><a name="JARFilesandDependencies-OptionalRuntimeDependencies"></a>Optional
Runtime Dependencies</h3>
<p>One or more of the following libraries may be needed depending on how you use Cayenne:</p>
<ul>
<li><a href="http://ant.apache.org/" rel="nofollow">Apache Ant</a>, version
1.6 or newer. Needed for <a href="/confluence/display/CAYDOC/Ant+Tasks" title="Ant Tasks">Cayenne
Ant Tasks</a>.</li>
<li><a href="http://jakarta.apache.org/commons/pool/" rel="nofollow">Apache Commons
Pool</a>, version 1.2 and <a href="http://jakarta.apache.org/commons/dbcp/" rel="nofollow">Apache
Commons DBCP</a>, version 1.2.1. Needed if you use DBCPDataSourceFactory for one of
the DataNodes.</li>
<li><a href="http://www.jgroups.org/" rel="nofollow">JGroups</a>, version
2.2.7 or newer. Needed if you plan to use remote notifications via JGroups transport.</li>
<li><a href="http://java.sun.com/products/jms/" rel="nofollow">Java Messaging
Service (JMS)</a>. Needed if you plan to use remote notifications via JMS transport.</li>
<li><a href="http://vpp.sourceforge.net/" rel="nofollow">Foundry Logic VPP Library</a>,
version 2.2.1 (included in <tt>"lib/third-party"</tt> directory of the distribution).
Needed for <a href="/confluence/display/CAYDOC/cgen" title="cgen">class generation options</a>
with Ant.</li>
<li><a href="http://www.opensymphony.com/oscache/" rel="nofollow">OSCache</a>
version 2.3.2 or newer. Needed if you plan to use OSCache as your <a href="/confluence/display/CAYDOC/Query+Result+Caching"
title="Query Result Caching">query results cache provider</a>.</li>
</ul>
</div>
<div id="commentsSection" class="wiki-content pageSection">
<div style="float: right;">
<a href="http://cwiki.apache.org/confluence/users/viewnotifications.action"
class="grey">Change Notification Preferences</a>
</div>
<a href="http://cwiki.apache.org/confluence/display/CAYDOC/JAR+Files+and+Dependencies">View
Online</a>
|
<a href="http://cwiki.apache.org/confluence/pages/diffpagesbyversion.action?pageId=10589&revisedVersion=20&originalVersion=19">View
Change</a>
|
<a href="http://cwiki.apache.org/confluence/display/CAYDOC/JAR+Files+and+Dependencies?showComments=true&showCommentArea=true#addcomment">Add
Comment</a>
</div>
</div>
</div>
</div>
</div>
</body>
</html>