You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cayenne.apache.org by mg...@apache.org on 2006/07/17 17:37:19 UTC
svn commit: r422742 - in
/incubator/cayenne/main/trunk/cayenne/cayenne-java/src:
cayenne/java/org/apache/cayenne/exp/parser/
cayenne/java/org/apache/cayenne/project/
cayenne/java/org/apache/cayenne/tools/
cayenne/java/org/apache/cayenne/wocompat/parser...
Author: mgentry
Date: Mon Jul 17 08:37:16 2006
New Revision: 422742
URL: http://svn.apache.org/viewvc?rev=422742&view=rev
Log:
Changed namespace from objectstyle to apache.
Modified:
incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/exp/parser/ExpressionParser.jjt
incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/exp/parser/ExpressionParserTreeConstants.java
incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/project/package.html
incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/tools/antlib.xml
incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/wocompat/parser/Parser.jj
incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/resources/.cayenne/cayenne-log.properties
incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/resources/dotemplates/v1_2/client-subclass.vm
incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/resources/dotemplates/v1_2/client-superclass.vm
incubator/cayenne/main/trunk/cayenne/cayenne-java/src/dvmodeler/bin/dvmodeler.bat
incubator/cayenne/main/trunk/cayenne/cayenne-java/src/dvmodeler/bin/dvmodeler.sh
incubator/cayenne/main/trunk/cayenne/cayenne-java/src/modeler/bin/modeler.bat
incubator/cayenne/main/trunk/cayenne/cayenne-java/src/modeler/bin/modeler.sh
incubator/cayenne/main/trunk/cayenne/cayenne-java/src/modeler/java/org/apache/cayenne/modeler/cayennemodeler-strings.properties
incubator/cayenne/main/trunk/cayenne/cayenne-java/src/regression/doc/overview.txt
incubator/cayenne/main/trunk/cayenne/cayenne-java/src/regression/samples/cayenne.xml
incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/java/org/apache/cayenne/tools/CayenneGeneratorTst.java
incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/java/org/apache/cayenne/tools/CayenneGeneratorv1_2Tst.java
incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/art-with-errors.eomodeld/Artist.plist
incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/art-with-errors.eomodeld/ArtistExhibit.plist
incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/art-with-errors.eomodeld/Exhibit.plist
incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/art-with-errors.eomodeld/Gallery.plist
incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/art-with-errors.eomodeld/Painting.plist
incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/art-with-errors.eomodeld/PaintingInfo.plist
incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/art-with-errors.eomodeld/index.eomodeld
incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/cdeploy/alt-cayenne.xml
incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/ddl/hsqldb/create-sp-aliases.sql
incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/wotests/art.eomodeld/Artist.plist
incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/wotests/art.eomodeld/ArtistExhibit.plist
incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/wotests/art.eomodeld/Exhibit.plist
incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/wotests/art.eomodeld/ExhibitType.plist
incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/wotests/art.eomodeld/Gallery.plist
incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/wotests/art.eomodeld/Painting.plist
incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/wotests/art.eomodeld/PaintingInfo.plist
incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/wotests/art.eomodeld/index.eomodeld
incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/xmlcoding/attribute-mapping.xml
incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/xmlcoding/collection-mapping.xml
incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/xmlcoding/collection-no-entity-mapping.xml
incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/xmlcoding/data-objects-encoded.xml
incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/xmlcoding/encoded-complex-collection-alt1.xml
incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/xmlcoding/encoded-complex-collection.xml
incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/xmlcoding/encoded-object-primitives.xml
incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/xmlcoding/encoded-object.xml
incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/xmlcoding/encoded-simple-collection.xml
incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/xmlcoding/simple-mapping.xml
Modified: incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/exp/parser/ExpressionParser.jjt
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/exp/parser/ExpressionParser.jjt?rev=422742&r1=422741&r2=422742&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/exp/parser/ExpressionParser.jjt (original)
+++ incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/exp/parser/ExpressionParser.jjt Mon Jul 17 08:37:16 2006
@@ -70,12 +70,12 @@
* Some parts of the parser are based on OGNL parser,
* copyright (c) 2002, Drew Davidson and Luke Blanshard
*/
-package org.objectstyle.cayenne.exp.parser;
+package org.apache.cayenne.exp.parser;
import java.io.*;
import java.util.*;
import java.math.*;
-import org.objectstyle.cayenne.exp.*;
+import org.apache.cayenne.exp.*;
/**
* Parser of Cayenne Expressions.
@@ -448,4 +448,4 @@
| < #DEC_DIGITS: (["0"-"9"])+ >
| < #EXPONENT: ["e","E"] (["+","-"])? (["0"-"9"])+ >
| < #FLT_SUFF: ["d","D","f","F","b","B"] >
-}
\ No newline at end of file
+}
Modified: incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/exp/parser/ExpressionParserTreeConstants.java
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/exp/parser/ExpressionParserTreeConstants.java?rev=422742&r1=422741&r2=422742&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/exp/parser/ExpressionParserTreeConstants.java (original)
+++ incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/exp/parser/ExpressionParserTreeConstants.java Mon Jul 17 08:37:16 2006
@@ -1,4 +1,4 @@
-/* Generated By:JJTree: Do not edit this line. ../cayenne-java/src/cayenne/java/org.apache.cayenne/exp/parser/ExpressionParserTreeConstants.java */
+/* Generated By:JJTree: Do not edit this line. ../cayenne-java/src/cayenne/java/org/apache/cayenne/exp/parser/ExpressionParserTreeConstants.java */
package org.apache.cayenne.exp.parser;
Modified: incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/project/package.html
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/project/package.html?rev=422742&r1=422741&r2=422742&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/project/package.html (original)
+++ incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/project/package.html Mon Jul 17 08:37:16 2006
@@ -4,12 +4,12 @@
MVC type of application to work with Cayenne project files. Like
any good model in MVC, it is independent from a specific GUI layer.
-<p><code>org.objectstyle.cayenne.project</code> package views the objects that
+<p><code>org.apache.cayenne.project</code> package views the objects that
comprise project tree from the point of <strong>semantics</strong>
rather than logical relationships. It is normally not used in deployment.</p>
-<p><code>org.objectstyle.cayenne.project</code> package provides safe implementations of
+<p><code>org.apache.cayenne.project</code> package provides safe implementations of
read/write operations on Cayenne project and handles validation, using validators
-from <code>org.objectstyle.cayenne.project.validator</code> package.
+from <code>org.apache.cayenne.project.validator</code> package.
</body>
</html>
Modified: incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/tools/antlib.xml
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/tools/antlib.xml?rev=422742&r1=422741&r2=422742&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/tools/antlib.xml (original)
+++ incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/tools/antlib.xml Mon Jul 17 08:37:16 2006
@@ -3,4 +3,4 @@
<taskdef name="cdbgen" classname="org.apache.cayenne.tools.DbGeneratorTask"/>
<taskdef name="cdeploy" classname="org.apache.cayenne.tools.DeploymentConfigurator"/>
<taskdef name="cdataport" classname="org.apache.cayenne.tools.DataPortTask"/>
-</antlib>
\ No newline at end of file
+</antlib>
Modified: incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/wocompat/parser/Parser.jj
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/wocompat/parser/Parser.jj?rev=422742&r1=422741&r2=422742&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/wocompat/parser/Parser.jj (original)
+++ incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/wocompat/parser/Parser.jj Mon Jul 17 08:37:16 2006
@@ -64,7 +64,7 @@
* information on the ObjectStyle Group, please see
* <http://objectstyle.org/>.
*/
-package org.objectstyle.cayenne.wocompat.parser;
+package org.apache.cayenne.wocompat.parser;
import org.apache.log4j.Logger;
import java.io.*;
@@ -271,4 +271,4 @@
("," o=object() { v.add(o); } )*
)?
")" {return v;}
-}
\ No newline at end of file
+}
Modified: incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/resources/.cayenne/cayenne-log.properties
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/resources/.cayenne/cayenne-log.properties?rev=422742&r1=422741&r2=422742&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/resources/.cayenne/cayenne-log.properties (original)
+++ incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/resources/.cayenne/cayenne-log.properties Mon Jul 17 08:37:16 2006
@@ -4,8 +4,8 @@
log4j.appender.A1.layout.ConversionPattern=%-5p %c{1}: %m%n
# General Cayenne logging
-log4j.logger.org.objectstyle.cayenne = WARN
-log4j.logger.org.objectstyle.cayenne.access.QueryLogger = INFO
+log4j.logger.org.apache.cayenne = WARN
+log4j.logger.org.apache.cayenne.access.QueryLogger = INFO
# GUI-related logging
@@ -13,5 +13,5 @@
log4j.logger.org.scopemvc = INFO
# set modeler to INFO
-log4j.logger.org.objectstyle.cayenne.modeler = INFO
+log4j.logger.org.apache.cayenne.modeler = INFO
Modified: incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/resources/dotemplates/v1_2/client-subclass.vm
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/resources/dotemplates/v1_2/client-subclass.vm?rev=422742&r1=422741&r2=422742&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/resources/dotemplates/v1_2/client-subclass.vm (original)
+++ incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/resources/dotemplates/v1_2/client-subclass.vm Mon Jul 17 08:37:16 2006
@@ -21,4 +21,4 @@
*/
public class ${entityUtils.subClassName} extends ${entityUtils.superClassName} {
-}
\ No newline at end of file
+}
Modified: incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/resources/dotemplates/v1_2/client-superclass.vm
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/resources/dotemplates/v1_2/client-superclass.vm?rev=422742&r1=422741&r2=422742&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/resources/dotemplates/v1_2/client-superclass.vm (original)
+++ incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/resources/dotemplates/v1_2/client-superclass.vm Mon Jul 17 08:37:16 2006
@@ -129,4 +129,4 @@
#end
#end
-}
\ No newline at end of file
+}
Modified: incubator/cayenne/main/trunk/cayenne/cayenne-java/src/dvmodeler/bin/dvmodeler.bat
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne/cayenne-java/src/dvmodeler/bin/dvmodeler.bat?rev=422742&r1=422741&r2=422742&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/cayenne/cayenne-java/src/dvmodeler/bin/dvmodeler.bat (original)
+++ incubator/cayenne/main/trunk/cayenne/cayenne-java/src/dvmodeler/bin/dvmodeler.bat Mon Jul 17 08:37:16 2006
@@ -11,7 +11,7 @@
rem Variables:
rem -------------------------------------------------------------------
-set MAIN_CLASS=org.objectstyle.cayenne.dataview.dvmodeler.Main
+set MAIN_CLASS=org.apache.cayenne.dataview.dvmodeler.Main
if not "%JAVA_HOME%" == "" goto check_cayenne_home
Modified: incubator/cayenne/main/trunk/cayenne/cayenne-java/src/dvmodeler/bin/dvmodeler.sh
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne/cayenne-java/src/dvmodeler/bin/dvmodeler.sh?rev=422742&r1=422741&r2=422742&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/cayenne/cayenne-java/src/dvmodeler/bin/dvmodeler.sh (original)
+++ incubator/cayenne/main/trunk/cayenne/cayenne-java/src/dvmodeler/bin/dvmodeler.sh Mon Jul 17 08:37:16 2006
@@ -5,7 +5,7 @@
# Certain parts are modeled after Tomcat startup scrips,
# Copyright Apache Software Foundation
-MAIN_CLASS=org.objectstyle.cayenne.dataview.dvmodeler.Main
+MAIN_CLASS=org.apache.cayenne.dataview.dvmodeler.Main
# OS specific support.
Modified: incubator/cayenne/main/trunk/cayenne/cayenne-java/src/modeler/bin/modeler.bat
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne/cayenne-java/src/modeler/bin/modeler.bat?rev=422742&r1=422741&r2=422742&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/cayenne/cayenne-java/src/modeler/bin/modeler.bat (original)
+++ incubator/cayenne/main/trunk/cayenne/cayenne-java/src/modeler/bin/modeler.bat Mon Jul 17 08:37:16 2006
@@ -20,7 +20,7 @@
rem or raise your default environment space from 256 characters to 4096 characters.
rem -------------------------------------------------------------------
-set MAIN_CLASS=org.objectstyle.cayenne.modeler.Main
+set MAIN_CLASS=org.apache.cayenne.modeler.Main
set CLASSPATH=
Modified: incubator/cayenne/main/trunk/cayenne/cayenne-java/src/modeler/bin/modeler.sh
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne/cayenne-java/src/modeler/bin/modeler.sh?rev=422742&r1=422741&r2=422742&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/cayenne/cayenne-java/src/modeler/bin/modeler.sh (original)
+++ incubator/cayenne/main/trunk/cayenne/cayenne-java/src/modeler/bin/modeler.sh Mon Jul 17 08:37:16 2006
@@ -5,7 +5,7 @@
# Certain parts are modeled after Tomcat startup scrips,
# Copyright Apache Software Foundation
-MAIN_CLASS=org.objectstyle.cayenne.modeler.Main
+MAIN_CLASS=org.apache.cayenne.modeler.Main
CLASSPATH=
Modified: incubator/cayenne/main/trunk/cayenne/cayenne-java/src/modeler/java/org/apache/cayenne/modeler/cayennemodeler-strings.properties
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne/cayenne-java/src/modeler/java/org/apache/cayenne/modeler/cayennemodeler-strings.properties?rev=422742&r1=422741&r2=422742&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/cayenne/cayenne-java/src/modeler/java/org/apache/cayenne/modeler/cayennemodeler-strings.properties (original)
+++ incubator/cayenne/main/trunk/cayenne/cayenne-java/src/modeler/java/org/apache/cayenne/modeler/cayennemodeler-strings.properties Mon Jul 17 08:37:16 2006
@@ -1,7 +1,7 @@
cayenne.version = @CAYENNE_VERSION@
cayenne.build.date = @CAYENNE_BUILD_DATE@
-cayenne.bugreport.url = http://objectstyle.org/cayenne/bugs-features.html
+cayenne.bugreport.url = http://issues.apache.org/cayenne/
cayenne.modeler.about.info = (c) 2002-2006 Andrei (Andrus) Adamchik and individual authors.<br><br>\
<a href='http://objectstyle.org/cayenne/'>http://objectstyle.org/cayenne/</a></font><br>
Modified: incubator/cayenne/main/trunk/cayenne/cayenne-java/src/regression/doc/overview.txt
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne/cayenne-java/src/regression/doc/overview.txt?rev=422742&r1=422741&r2=422742&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/cayenne/cayenne-java/src/regression/doc/overview.txt (original)
+++ incubator/cayenne/main/trunk/cayenne/cayenne-java/src/regression/doc/overview.txt Mon Jul 17 08:37:16 2006
@@ -31,7 +31,7 @@
3) Principles of Work
Created the functional Oracle-oriented prototype of the Cayenne testing app
-dwelling in the package org.objectstyle.cayenne.test. Its purpose is to
+dwelling in the package org.apache.cayenne.test. Its purpose is to
automatically generate a set of random database schemas and quality of the
Cayenne's commit against them. A short description of the steps follows:
@@ -66,7 +66,7 @@
databases.
To start the app one must execute a command line like:
-java org.objectstyle.cayenne.test.Main path_to_config_file
+java org.apache.cayenne.test.Main path_to_config_file
The config file contains parameters to tune the app. For the details
see doc/test/schema-test.config. If the command line argument is
omitted the app tries to find "./schema-test.config".
Modified: incubator/cayenne/main/trunk/cayenne/cayenne-java/src/regression/samples/cayenne.xml
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne/cayenne-java/src/regression/samples/cayenne.xml?rev=422742&r1=422741&r2=422742&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/cayenne/cayenne-java/src/regression/samples/cayenne.xml (original)
+++ incubator/cayenne/main/trunk/cayenne/cayenne-java/src/regression/samples/cayenne.xml Mon Jul 17 08:37:16 2006
@@ -3,8 +3,8 @@
<domain name="TestDomain">
<node name="test-connection"
datasource="test-connection.xml"
- adapter="org.objectstyle.cayenne.dba.oracle.OracleAdapter"
- factory="org.objectstyle.cayenne.conf.DriverDataSourceFactory">
+ adapter="org.apache.cayenne.dba.oracle.OracleAdapter"
+ factory="org.apache.cayenne.conf.DriverDataSourceFactory">
</node>
</domain>
</domains>
Modified: incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/java/org/apache/cayenne/tools/CayenneGeneratorTst.java
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/java/org/apache/cayenne/tools/CayenneGeneratorTst.java?rev=422742&r1=422741&r2=422742&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/java/org/apache/cayenne/tools/CayenneGeneratorTst.java (original)
+++ incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/java/org/apache/cayenne/tools/CayenneGeneratorTst.java Mon Jul 17 08:37:16 2006
@@ -99,11 +99,11 @@
task.execute();
// check results
- File a = new File(mapDir, convertPath("org/objectstyle/art/Artist.java"));
+ File a = new File(mapDir, convertPath("org/apache/art/Artist.java"));
assertTrue(a.isFile());
assertContents(a, "Artist", "org.apache.art", "CayenneDataObject");
- File _a = new File(mapDir, convertPath("org/objectstyle/art/_Artist.java"));
+ File _a = new File(mapDir, convertPath("org/apache/art/_Artist.java"));
assertFalse(_a.exists());
}
@@ -123,11 +123,11 @@
task.execute();
// check results
- File a = new File(mapDir, convertPath("org/objectstyle/art/Artist.java"));
+ File a = new File(mapDir, convertPath("org/apache/art/Artist.java"));
assertTrue(a.isFile());
assertContents(a, "Artist", "org.apache.art", "CayenneDataObject");
- File _a = new File(mapDir, convertPath("org/objectstyle/art/_Artist.java"));
+ File _a = new File(mapDir, convertPath("org/apache/art/_Artist.java"));
assertFalse(_a.exists());
}
@@ -154,7 +154,7 @@
File _a = new File(mapDir, convertPath("_Artist.java"));
assertFalse(_a.exists());
- File pkga = new File(mapDir, convertPath("org/objectstyle/art/Artist.java"));
+ File pkga = new File(mapDir, convertPath("org/apache/art/Artist.java"));
assertFalse(pkga.exists());
}
@@ -174,11 +174,11 @@
task.execute();
// check results
- File a = new File(mapDir, convertPath("org/objectstyle/art/Artist.java"));
+ File a = new File(mapDir, convertPath("org/apache/art/Artist.java"));
assertTrue(a.isFile());
assertContents(a, "Artist", "org.apache.art", "_Artist");
- File _a = new File(mapDir, convertPath("org/objectstyle/art/_Artist.java"));
+ File _a = new File(mapDir, convertPath("org/apache/art/_Artist.java"));
assertTrue(_a.exists());
assertContents(_a, "_Artist", "org.apache.art", "CayenneDataObject");
}
@@ -207,7 +207,7 @@
assertTrue(_a.exists());
assertContents(_a, "_Artist", "org.apache.art", "CayenneDataObject");
- File pkga = new File(mapDir, convertPath("org/objectstyle/art/Artist.java"));
+ File pkga = new File(mapDir, convertPath("org/apache/art/Artist.java"));
assertFalse(pkga.exists());
}
@@ -225,19 +225,19 @@
task.setMap(map);
task.setMakepairs(true);
task.setUsepkgpath(true);
- task.setSuperpkg("org.objectstyle.superart");
+ task.setSuperpkg("org.apache.superart");
// run task
task.execute();
// check results
- File a = new File(mapDir, convertPath("org/objectstyle/art/Artist.java"));
+ File a = new File(mapDir, convertPath("org/apache/art/Artist.java"));
assertTrue(a.isFile());
assertContents(a, "Artist", "org.apache.art", "_Artist");
- File _a = new File(mapDir, convertPath("org/objectstyle/superart/_Artist.java"));
+ File _a = new File(mapDir, convertPath("org/apache/superart/_Artist.java"));
assertTrue(_a.exists());
- assertContents(_a, "_Artist", "org.objectstyle.superart", "CayenneDataObject");
+ assertContents(_a, "_Artist", "org.apache.superart", "CayenneDataObject");
}
private String convertPath(String unixPath) {
Modified: incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/java/org/apache/cayenne/tools/CayenneGeneratorv1_2Tst.java
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/java/org/apache/cayenne/tools/CayenneGeneratorv1_2Tst.java?rev=422742&r1=422741&r2=422742&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/java/org/apache/cayenne/tools/CayenneGeneratorv1_2Tst.java (original)
+++ incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/java/org/apache/cayenne/tools/CayenneGeneratorv1_2Tst.java Mon Jul 17 08:37:16 2006
@@ -124,13 +124,13 @@
task.execute();
// check results
- File a = new File(destDir, convertPath("org/objectstyle/art2/MyArtGroup.java"));
+ File a = new File(destDir, convertPath("org/apache/art2/MyArtGroup.java"));
assertTrue(a.isFile());
assertContents(a, "MyArtGroup", "org.apache.art2", "_MyArtGroup");
File _a = new File(
destDir,
- convertPath("org/objectstyle/art2/auto/_MyArtGroup.java"));
+ convertPath("org/apache/art2/auto/_MyArtGroup.java"));
assertTrue(_a.exists());
assertContents(
_a,
@@ -181,13 +181,13 @@
task.execute();
// check results
- File a = new File(destDir, convertPath("org/objectstyle/art2/MyArtGroup.java"));
+ File a = new File(destDir, convertPath("org/apache/art2/MyArtGroup.java"));
assertTrue(a.isFile());
assertContents(a, "MyArtGroup", "org.apache.art2", "_MyArtGroup");
File _a = new File(
destDir,
- convertPath("org/objectstyle/art2/auto/_MyArtGroup.java"));
+ convertPath("org/apache/art2/auto/_MyArtGroup.java"));
assertTrue(_a.exists());
assertContents(
_a,
Modified: incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/art-with-errors.eomodeld/Artist.plist
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/art-with-errors.eomodeld/Artist.plist?rev=422742&r1=422741&r2=422742&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/art-with-errors.eomodeld/Artist.plist (original)
+++ incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/art-with-errors.eomodeld/Artist.plist Mon Jul 17 08:37:16 2006
@@ -17,7 +17,7 @@
}
);
attributesUsedForLocking = (artistId);
- className = org.objectstyle.art.Artist;
+ className = org.apache.art.Artist;
classProperties = (artistName, dateOfBirth, artistExhibitArray, paintingArray, exhibitArray);
externalName = ARTIST;
fetchSpecificationDictionary = {};
Modified: incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/art-with-errors.eomodeld/ArtistExhibit.plist
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/art-with-errors.eomodeld/ArtistExhibit.plist?rev=422742&r1=422741&r2=422742&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/art-with-errors.eomodeld/ArtistExhibit.plist (original)
+++ incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/art-with-errors.eomodeld/ArtistExhibit.plist Mon Jul 17 08:37:16 2006
@@ -16,7 +16,7 @@
}
);
attributesUsedForLocking = (artistId, exhibitId);
- className = org.objectstyle.art.ArtistExhibit;
+ className = org.apache.art.ArtistExhibit;
classProperties = (toExhibit, toArtist);
externalName = ARTIST_EXHIBIT;
fetchSpecificationDictionary = {};
Modified: incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/art-with-errors.eomodeld/Exhibit.plist
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/art-with-errors.eomodeld/Exhibit.plist?rev=422742&r1=422741&r2=422742&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/art-with-errors.eomodeld/Exhibit.plist (original)
+++ incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/art-with-errors.eomodeld/Exhibit.plist Mon Jul 17 08:37:16 2006
@@ -28,7 +28,7 @@
}
);
attributesUsedForLocking = (exhibitId, galleryId);
- className = org.objectstyle.art.Exhibit;
+ className = org.apache.art.Exhibit;
classProperties = (closingDate, openingDate, toGallery, artistExhibitArray);
externalName = EXHIBIT;
fetchSpecificationDictionary = {};
Modified: incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/art-with-errors.eomodeld/Gallery.plist
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/art-with-errors.eomodeld/Gallery.plist?rev=422742&r1=422741&r2=422742&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/art-with-errors.eomodeld/Gallery.plist (original)
+++ incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/art-with-errors.eomodeld/Gallery.plist Mon Jul 17 08:37:16 2006
@@ -16,7 +16,7 @@
}
);
attributesUsedForLocking = (galleryId);
- className = org.objectstyle.art.Gallery;
+ className = org.apache.art.Gallery;
classProperties = (galleryName, paintingArray, exhibitArray);
externalName = GALLERY;
fetchSpecificationDictionary = {};
Modified: incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/art-with-errors.eomodeld/Painting.plist
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/art-with-errors.eomodeld/Painting.plist?rev=422742&r1=422741&r2=422742&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/art-with-errors.eomodeld/Painting.plist (original)
+++ incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/art-with-errors.eomodeld/Painting.plist Mon Jul 17 08:37:16 2006
@@ -40,7 +40,7 @@
}
);
attributesUsedForLocking = (artistId, galleryId, paintingId);
- className = org.objectstyle.art.Painting;
+ className = org.apache.art.Painting;
classProperties = (estimatedPrice, toGallery, toArtist, toPaintingInfo, paintingTitle);
externalName = PAINTING;
fetchSpecificationDictionary = {};
Modified: incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/art-with-errors.eomodeld/PaintingInfo.plist
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/art-with-errors.eomodeld/PaintingInfo.plist?rev=422742&r1=422741&r2=422742&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/art-with-errors.eomodeld/PaintingInfo.plist (original)
+++ incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/art-with-errors.eomodeld/PaintingInfo.plist Mon Jul 17 08:37:16 2006
@@ -23,7 +23,7 @@
}
);
attributesUsedForLocking = (paintingId);
- className = org.objectstyle.art.PaintingInfo;
+ className = org.apache.art.PaintingInfo;
classProperties = (imageBlob, textReview, painting);
externalName = PAINTING_INFO;
fetchSpecificationDictionary = {};
Modified: incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/art-with-errors.eomodeld/index.eomodeld
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/art-with-errors.eomodeld/index.eomodeld?rev=422742&r1=422741&r2=422742&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/art-with-errors.eomodeld/index.eomodeld (original)
+++ incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/art-with-errors.eomodeld/index.eomodeld Mon Jul 17 08:37:16 2006
@@ -3,11 +3,11 @@
adaptorName = None;
connectionDictionary = {};
entities = (
- {className = org.objectstyle.art.Artist; name = Artist; },
- {className = org.objectstyle.art.ArtistExhibit; name = ArtistExhibit; },
- {className = org.objectstyle.art.Exhibit; name = Exhibit; },
- {className = org.objectstyle.art.Gallery; name = Gallery; },
- {className = org.objectstyle.art.Painting; name = Painting; },
- {className = org.objectstyle.art.PaintingInfo; name = PaintingInfo; }
+ {className = org.apache.art.Artist; name = Artist; },
+ {className = org.apache.art.ArtistExhibit; name = ArtistExhibit; },
+ {className = org.apache.art.Exhibit; name = Exhibit; },
+ {className = org.apache.art.Gallery; name = Gallery; },
+ {className = org.apache.art.Painting; name = Painting; },
+ {className = org.apache.art.PaintingInfo; name = PaintingInfo; }
);
}
Modified: incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/cdeploy/alt-cayenne.xml
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/cdeploy/alt-cayenne.xml?rev=422742&r1=422741&r2=422742&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/cdeploy/alt-cayenne.xml (original)
+++ incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/cdeploy/alt-cayenne.xml Mon Jul 17 08:37:16 2006
@@ -4,8 +4,8 @@
<map name="map1" location="map1.map.xml"/>
<node name="node3"
datasource="abc/xyz"
- adapter="org.objectstyle.cayenne.dba.mysql.MySQLAdapter"
- factory="org.objectstyle.cayenne.conf.JNDIDataSourceFactory">
+ adapter="org.apache.cayenne.dba.mysql.MySQLAdapter"
+ factory="org.apache.cayenne.conf.JNDIDataSourceFactory">
<map-ref name="map1"/>
</node>
</domain>
Modified: incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/ddl/hsqldb/create-sp-aliases.sql
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/ddl/hsqldb/create-sp-aliases.sql?rev=422742&r1=422741&r2=422742&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/ddl/hsqldb/create-sp-aliases.sql (original)
+++ incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/ddl/hsqldb/create-sp-aliases.sql Mon Jul 17 08:37:16 2006
@@ -1,2 +1,2 @@
-CREATE ALIAS cayenne_tst_upd_proc FOR "org.objectstyle.cayenne.unit.HSQLProcedures.cayenne_tst_upd_proc";
-CREATE ALIAS cayenne_tst_select_proc FOR "org.objectstyle.cayenne.unit.HSQLProcedures.cayenne_tst_select_proc";
\ No newline at end of file
+CREATE ALIAS cayenne_tst_upd_proc FOR "org.apache.cayenne.unit.HSQLProcedures.cayenne_tst_upd_proc";
+CREATE ALIAS cayenne_tst_select_proc FOR "org.apache.cayenne.unit.HSQLProcedures.cayenne_tst_select_proc";
Modified: incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/wotests/art.eomodeld/Artist.plist
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/wotests/art.eomodeld/Artist.plist?rev=422742&r1=422741&r2=422742&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/wotests/art.eomodeld/Artist.plist (original)
+++ incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/wotests/art.eomodeld/Artist.plist Mon Jul 17 08:37:16 2006
@@ -24,7 +24,7 @@
}
);
attributesUsedForLocking = (artistId);
- className = "org.objectstyle.art.Artist";
+ className = "org.apache.art.Artist";
classProperties = (artistName, dateOfBirth, artistExhibitArray, paintingArray, exhibitArray);
externalName = ARTIST;
fetchSpecificationDictionary = {};
Modified: incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/wotests/art.eomodeld/ArtistExhibit.plist
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/wotests/art.eomodeld/ArtistExhibit.plist?rev=422742&r1=422741&r2=422742&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/wotests/art.eomodeld/ArtistExhibit.plist (original)
+++ incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/wotests/art.eomodeld/ArtistExhibit.plist Mon Jul 17 08:37:16 2006
@@ -16,7 +16,7 @@
}
);
attributesUsedForLocking = (artistId, exhibitId);
- className = "org.objectstyle.art.ArtistExhibit";
+ className = "org.apache.art.ArtistExhibit";
classProperties = (toExhibit, toArtist);
externalName = "ARTIST_EXHIBIT";
fetchSpecificationDictionary = {};
Modified: incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/wotests/art.eomodeld/Exhibit.plist
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/wotests/art.eomodeld/Exhibit.plist?rev=422742&r1=422741&r2=422742&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/wotests/art.eomodeld/Exhibit.plist (original)
+++ incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/wotests/art.eomodeld/Exhibit.plist Mon Jul 17 08:37:16 2006
@@ -36,7 +36,7 @@
}
);
attributesUsedForLocking = (exhibitId, galleryId, exhibitTypeId);
- className = "org.objectstyle.art.Exhibit";
+ className = "org.apache.art.Exhibit";
classProperties = (
closingDate,
openingDate,
Modified: incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/wotests/art.eomodeld/ExhibitType.plist
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/wotests/art.eomodeld/ExhibitType.plist?rev=422742&r1=422741&r2=422742&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/wotests/art.eomodeld/ExhibitType.plist (original)
+++ incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/wotests/art.eomodeld/ExhibitType.plist Mon Jul 17 08:37:16 2006
@@ -16,7 +16,7 @@
}
);
attributesUsedForLocking = (exhibitTypeId);
- className = "org.objectstyle.cayenne.art.ExhibitType";
+ className = "org.apache.cayenne.art.ExhibitType";
classProperties = (name);
externalName = "EXHIBIT_TYPE";
name = ExhibitType;
Modified: incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/wotests/art.eomodeld/Gallery.plist
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/wotests/art.eomodeld/Gallery.plist?rev=422742&r1=422741&r2=422742&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/wotests/art.eomodeld/Gallery.plist (original)
+++ incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/wotests/art.eomodeld/Gallery.plist Mon Jul 17 08:37:16 2006
@@ -16,7 +16,7 @@
}
);
attributesUsedForLocking = (galleryId);
- className = "org.objectstyle.art.Gallery";
+ className = "org.apache.art.Gallery";
classProperties = (galleryName, paintingArray, exhibitArray);
externalName = GALLERY;
fetchSpecificationDictionary = {};
Modified: incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/wotests/art.eomodeld/Painting.plist
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/wotests/art.eomodeld/Painting.plist?rev=422742&r1=422741&r2=422742&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/wotests/art.eomodeld/Painting.plist (original)
+++ incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/wotests/art.eomodeld/Painting.plist Mon Jul 17 08:37:16 2006
@@ -40,7 +40,7 @@
}
);
attributesUsedForLocking = (artistId, galleryId, paintingId);
- className = "org.objectstyle.art.Painting";
+ className = "org.apache.art.Painting";
classProperties = (estimatedPrice, toGallery, toArtist, toPaintingInfo, paintingTitle);
externalName = PAINTING;
fetchSpecificationDictionary = {};
Modified: incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/wotests/art.eomodeld/PaintingInfo.plist
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/wotests/art.eomodeld/PaintingInfo.plist?rev=422742&r1=422741&r2=422742&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/wotests/art.eomodeld/PaintingInfo.plist (original)
+++ incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/wotests/art.eomodeld/PaintingInfo.plist Mon Jul 17 08:37:16 2006
@@ -23,7 +23,7 @@
}
);
attributesUsedForLocking = (paintingId);
- className = "org.objectstyle.art.PaintingInfo";
+ className = "org.apache.art.PaintingInfo";
classProperties = (imageBlob, textReview, painting);
externalName = "PAINTING_INFO";
fetchSpecificationDictionary = {};
Modified: incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/wotests/art.eomodeld/index.eomodeld
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/wotests/art.eomodeld/index.eomodeld?rev=422742&r1=422741&r2=422742&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/wotests/art.eomodeld/index.eomodeld (original)
+++ incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/wotests/art.eomodeld/index.eomodeld Mon Jul 17 08:37:16 2006
@@ -3,14 +3,14 @@
adaptorName = None;
connectionDictionary = {};
entities = (
- {className = "org.objectstyle.art.Artist"; name = Artist; },
- {className = "org.objectstyle.art.ArtistExhibit"; name = ArtistExhibit; },
+ {className = "org.apache.art.Artist"; name = Artist; },
+ {className = "org.apache.art.ArtistExhibit"; name = ArtistExhibit; },
{className = CustomTypes; name = CustomTypes; },
- {className = "org.objectstyle.art.Exhibit"; name = Exhibit; },
- {className = "org.objectstyle.cayenne.art.ExhibitType"; name = ExhibitType; },
- {className = "org.objectstyle.art.Gallery"; name = Gallery; },
- {className = "org.objectstyle.art.Painting"; name = Painting; },
- {className = "org.objectstyle.art.PaintingInfo"; name = PaintingInfo; }
+ {className = "org.apache.art.Exhibit"; name = Exhibit; },
+ {className = "org.apache.cayenne.art.ExhibitType"; name = ExhibitType; },
+ {className = "org.apache.art.Gallery"; name = Gallery; },
+ {className = "org.apache.art.Painting"; name = Painting; },
+ {className = "org.apache.art.PaintingInfo"; name = PaintingInfo; }
);
entitiesWithSharedObjects = (ExhibitType);
}
Modified: incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/xmlcoding/attribute-mapping.xml
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/xmlcoding/attribute-mapping.xml?rev=422742&r1=422741&r2=422742&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/xmlcoding/attribute-mapping.xml (original)
+++ incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/xmlcoding/attribute-mapping.xml Mon Jul 17 08:37:16 2006
@@ -1,5 +1,5 @@
<model>
- <entity name="org.objectstyle.cayenne.xml.TestObject" xmlTag="Test">
+ <entity name="org.apache.cayenne.xml.TestObject" xmlTag="Test">
<property name="name" xmlTag="Name" attribute="YES"/>
<property name="age" xmlTag="Age" attribute="YES"/>
<property name="open" xmlTag="IsOpen"/>
Modified: incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/xmlcoding/collection-mapping.xml
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/xmlcoding/collection-mapping.xml?rev=422742&r1=422741&r2=422742&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/xmlcoding/collection-mapping.xml (original)
+++ incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/xmlcoding/collection-mapping.xml Mon Jul 17 08:37:16 2006
@@ -1,15 +1,15 @@
<model>
- <entity name="org.objectstyle.cayenne.xml.TestObject" xmlTag="Family">
+ <entity name="org.apache.cayenne.xml.TestObject" xmlTag="Family">
<property name="name" xmlTag="Name"/>
<property name="children" xmlTag="Child"/>
</entity>
- <entity name="org.objectstyle.cayenne.xml.TestObject" xmlTag="Child">
+ <entity name="org.apache.cayenne.xml.TestObject" xmlTag="Child">
<property name="name" xmlTag="Name"/>
<property name="children" xmlTag="Grandchild"/>
</entity>
- <entity name="org.objectstyle.cayenne.xml.TestObject" xmlTag="Grandchild">
+ <entity name="org.apache.cayenne.xml.TestObject" xmlTag="Grandchild">
<property name="name" xmlTag="Name"/>
<property name="age" xmlTag="Age"/>
</entity>
Modified: incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/xmlcoding/collection-no-entity-mapping.xml
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/xmlcoding/collection-no-entity-mapping.xml?rev=422742&r1=422741&r2=422742&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/xmlcoding/collection-no-entity-mapping.xml (original)
+++ incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/xmlcoding/collection-no-entity-mapping.xml Mon Jul 17 08:37:16 2006
@@ -1,5 +1,5 @@
<model>
- <entity name="org.objectstyle.cayenne.xml.TestObject" xmlTag="Family">
+ <entity name="org.apache.cayenne.xml.TestObject" xmlTag="Family">
<property name="name" xmlTag="Name"/>
<!-- children should decode as strings as there is no mapping for the tag 'Child' -->
Modified: incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/xmlcoding/data-objects-encoded.xml
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/xmlcoding/data-objects-encoded.xml?rev=422742&r1=422741&r2=422742&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/xmlcoding/data-objects-encoded.xml (original)
+++ incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/xmlcoding/data-objects-encoded.xml Mon Jul 17 08:37:16 2006
@@ -1,15 +1,15 @@
<EncodedTestList type="java.util.ArrayList">
-<Test type="org.objectstyle.cayenne.xml.TestObject">
+<Test type="org.apache.cayenne.xml.TestObject">
<name type="java.lang.String">George</name>
<age type="java.lang.Integer">5</age>
<open type="java.lang.Boolean">true</open>
</Test>
-<Test type="org.objectstyle.cayenne.xml.TestObject">
+<Test type="org.apache.cayenne.xml.TestObject">
<name type="java.lang.String">Mary</name>
<age type="java.lang.Integer">28</age>
<open type="java.lang.Boolean">false</open>
</Test>
-<Test type="org.objectstyle.cayenne.xml.TestObject">
+<Test type="org.apache.cayenne.xml.TestObject">
<name type="java.lang.String">Joe</name>
<age type="java.lang.Integer">31</age>
<open type="java.lang.Boolean">true</open>
Modified: incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/xmlcoding/encoded-complex-collection-alt1.xml
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/xmlcoding/encoded-complex-collection-alt1.xml?rev=422742&r1=422741&r2=422742&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/xmlcoding/encoded-complex-collection-alt1.xml (original)
+++ incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/xmlcoding/encoded-complex-collection-alt1.xml Mon Jul 17 08:37:16 2006
@@ -1,22 +1,22 @@
-<Test type="org.objectstyle.cayenne.xml.TestObject">
+<Test type="org.apache.cayenne.xml.TestObject">
<name type="java.lang.String">George</name>
<age type="java.lang.Integer">0</age>
<open type="java.lang.Boolean">false</open>
-<children type="org.objectstyle.cayenne.xml.TestObject">
+<children type="org.apache.cayenne.xml.TestObject">
<name type="java.lang.String">Bill</name>
<age type="java.lang.Integer">62</age>
<open type="java.lang.Boolean">true</open>
</children>
-<children type="org.objectstyle.cayenne.xml.TestObject">
+<children type="org.apache.cayenne.xml.TestObject">
<name type="java.lang.String">Sue</name>
<age type="java.lang.Integer">8</age>
<open type="java.lang.Boolean">true</open>
</children>
-<children type="org.objectstyle.cayenne.xml.TestObject">
+<children type="org.apache.cayenne.xml.TestObject">
<name type="java.lang.String">Joe</name>
<age type="java.lang.Integer">31</age>
<open type="java.lang.Boolean">false</open>
-<children forceList="YES" type="org.objectstyle.cayenne.xml.TestObject">
+<children forceList="YES" type="org.apache.cayenne.xml.TestObject">
<name type="java.lang.String">Harry</name>
<age type="java.lang.Integer">23</age>
<open type="java.lang.Boolean">false</open>
Modified: incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/xmlcoding/encoded-complex-collection.xml
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/xmlcoding/encoded-complex-collection.xml?rev=422742&r1=422741&r2=422742&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/xmlcoding/encoded-complex-collection.xml (original)
+++ incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/xmlcoding/encoded-complex-collection.xml Mon Jul 17 08:37:16 2006
@@ -1,22 +1,22 @@
-<Test type="org.objectstyle.cayenne.xml.TestObject">
+<Test type="org.apache.cayenne.xml.TestObject">
<name type="java.lang.String">George</name>
<age type="java.lang.Integer">0</age>
<open type="java.lang.Boolean">false</open>
-<children type="org.objectstyle.cayenne.xml.TestObject">
+<children type="org.apache.cayenne.xml.TestObject">
<name type="java.lang.String">Bill</name>
<age type="java.lang.Integer">62</age>
<open type="java.lang.Boolean">true</open>
</children>
-<children type="org.objectstyle.cayenne.xml.TestObject">
+<children type="org.apache.cayenne.xml.TestObject">
<name type="java.lang.String">Sue</name>
<age type="java.lang.Integer">8</age>
<open type="java.lang.Boolean">true</open>
</children>
-<children type="org.objectstyle.cayenne.xml.TestObject">
+<children type="org.apache.cayenne.xml.TestObject">
<name type="java.lang.String">Joe</name>
<age type="java.lang.Integer">31</age>
<open type="java.lang.Boolean">false</open>
-<children type="org.objectstyle.cayenne.xml.TestObject" forceList="YES">
+<children type="org.apache.cayenne.xml.TestObject" forceList="YES">
<name type="java.lang.String">Harry</name>
<age type="java.lang.Integer">23</age>
<open type="java.lang.Boolean">false</open>
Modified: incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/xmlcoding/encoded-object-primitives.xml
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/xmlcoding/encoded-object-primitives.xml?rev=422742&r1=422741&r2=422742&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/xmlcoding/encoded-object-primitives.xml (original)
+++ incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/xmlcoding/encoded-object-primitives.xml Mon Jul 17 08:37:16 2006
@@ -1,5 +1,5 @@
-<object type="org.objectstyle.cayenne.xml.TestObject">
+<object type="org.apache.cayenne.xml.TestObject">
<name type="java.lang.String">n1</name>
<age type="int">5</age>
<open type="boolean">true</open>
-</object>
\ No newline at end of file
+</object>
Modified: incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/xmlcoding/encoded-object.xml
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/xmlcoding/encoded-object.xml?rev=422742&r1=422741&r2=422742&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/xmlcoding/encoded-object.xml (original)
+++ incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/xmlcoding/encoded-object.xml Mon Jul 17 08:37:16 2006
@@ -1,5 +1,5 @@
-<object type="org.objectstyle.cayenne.xml.TestObject">
+<object type="org.apache.cayenne.xml.TestObject">
<name type="java.lang.String">n1</name>
<age type="java.lang.Integer">5</age>
<open type="java.lang.Boolean">true</open>
-</object>
\ No newline at end of file
+</object>
Modified: incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/xmlcoding/encoded-simple-collection.xml
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/xmlcoding/encoded-simple-collection.xml?rev=422742&r1=422741&r2=422742&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/xmlcoding/encoded-simple-collection.xml (original)
+++ incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/xmlcoding/encoded-simple-collection.xml Mon Jul 17 08:37:16 2006
@@ -1,10 +1,10 @@
-<Test type="org.objectstyle.cayenne.xml.TestObject">
-<children type="org.objectstyle.cayenne.xml.TestObject">
+<Test type="org.apache.cayenne.xml.TestObject">
+<children type="org.apache.cayenne.xml.TestObject">
<name type="java.lang.String">Bill</name>
<age type="java.lang.Integer">98</age>
<open type="java.lang.Boolean">true</open>
</children>
-<children type="org.objectstyle.cayenne.xml.TestObject">
+<children type="org.apache.cayenne.xml.TestObject">
<name type="java.lang.String">Sue</name>
<age type="java.lang.Integer">45</age>
<open type="java.lang.Boolean">false</open>
Modified: incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/xmlcoding/simple-mapping.xml
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/xmlcoding/simple-mapping.xml?rev=422742&r1=422741&r2=422742&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/xmlcoding/simple-mapping.xml (original)
+++ incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/xmlcoding/simple-mapping.xml Mon Jul 17 08:37:16 2006
@@ -1,5 +1,5 @@
<model>
- <entity name="org.objectstyle.cayenne.xml.TestObject" xmlTag="Test">
+ <entity name="org.apache.cayenne.xml.TestObject" xmlTag="Test">
<property name="name" xmlTag="Name"/>
<property name="age" xmlTag="Age"/>
<property name="open" xmlTag="IsOpen"/>