Author: aadamchik
Date: Wed Aug 16 06:42:36 2006
New Revision: 431897
URL: http://svn.apache.org/viewvc?rev=431897&view=rev
Log:
CAY-629 sans derby
Added:
incubator/cayenne/soc/trunk/cayenne-rop/rop-browser-server/web/WEB-INF/lib/ashwood-1.1.jar
(with props)
incubator/cayenne/soc/trunk/cayenne-rop/rop-browser-server/web/WEB-INF/lib/cayenne-jdk1.4-core-3.0-incubating-SNAPSHOT.jar
(with props)
incubator/cayenne/soc/trunk/cayenne-rop/rop-browser-server/web/WEB-INF/lib/commons-collections-3.1.jar
(with props)
incubator/cayenne/soc/trunk/cayenne-rop/rop-browser-server/web/WEB-INF/lib/commons-lang-2.1.jar
(with props)
incubator/cayenne/soc/trunk/cayenne-rop/rop-browser-server/web/WEB-INF/lib/commons-logging.jar
(with props)
incubator/cayenne/soc/trunk/cayenne-rop/rop-browser-server/web/WEB-INF/lib/log4j-1.2.13.jar
(with props)
Removed:
incubator/cayenne/soc/trunk/cayenne-rop/rop-browser-server/web/WEB-INF/lib/cayenne-1.2.jar
Modified:
incubator/cayenne/soc/trunk/cayenne-rop/rop-browser-server/.classpath
incubator/cayenne/soc/trunk/cayenne-rop/rop-browser-server/cayenne/ropbrowserMap.map.xml
incubator/cayenne/soc/trunk/cayenne-rop/rop-browser-server/src/org/apache/cayenne/ropbrowser/server/auto/_Artist.java
incubator/cayenne/soc/trunk/cayenne-rop/rop-browser-server/src/org/apache/cayenne/ropbrowser/server/auto/_Gallery.java
incubator/cayenne/soc/trunk/cayenne-rop/rop-browser-server/src/org/apache/cayenne/ropbrowser/server/auto/_Painting.java
incubator/cayenne/soc/trunk/cayenne-rop/rop-browser-server/web/WEB-INF/web.xml
Modified: incubator/cayenne/soc/trunk/cayenne-rop/rop-browser-server/.classpath
URL:
http://svn.apache.org/viewvc/incubator/cayenne/soc/trunk/cayenne-rop/rop-browser-server/.classpath?rev=431897&r1=431896&r2=431897&view=diff
==============================================================================
--- incubator/cayenne/soc/trunk/cayenne-rop/rop-browser-server/.classpath
(original)
+++ incubator/cayenne/soc/trunk/cayenne-rop/rop-browser-server/.classpath Wed
Aug 16 06:42:36 2006
@@ -1,13 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="src"/>
- <classpathentry kind="src" path="cayenne"/>
- <classpathentry kind="lib" path="web/WEB-INF/lib/cayenne-1.2.jar"/>
- <classpathentry kind="lib" path="web/WEB-INF/lib/hessian-3.0.13.jar"/>
- <classpathentry kind="lib"
path="web/WEB-INF/lib/postgresql-8.1-405.jdbc2ee.jar"/>
- <classpathentry kind="lib" path="web/WEB-INF/lib/smack-2.2.1.jar"/>
- <classpathentry kind="lib" path="web/WEB-INF/lib/smackx-2.2.1.jar"/>
- <classpathentry kind="con"
path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry combineaccessrules="false" kind="src"
path="/rop-browser"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="src" path="src"/>
+ <classpathentry kind="src" path="cayenne"/>
+ <classpathentry sourcepath="G:/soc/smack-dev-2.2.1/source" kind="lib"
path="web/WEB-INF/lib/smack-2.2.1.jar"/>
+ <classpathentry kind="lib" path="web/WEB-INF/lib/smackx-2.2.1.jar"/>
+ <classpathentry kind="lib" path="web/WEB-INF/lib/hessian-3.0.13.jar"/>
+ <classpathentry kind="lib"
path="web/WEB-INF/lib/cayenne-jdk1.4-core-3.0-incubating-SNAPSHOT.jar"/>
+ <classpathentry kind="lib"
path="web/WEB-INF/lib/commons-collections-3.1.jar"/>
+ <classpathentry kind="lib" path="web/WEB-INF/lib/commons-lang-2.1.jar"/>
+ <classpathentry kind="lib" path="web/WEB-INF/lib/commons-logging.jar"/>
+ <classpathentry kind="lib" path="web/WEB-INF/lib/log4j-1.2.13.jar"/>
+ <classpathentry kind="lib" path="web/WEB-INF/lib/ashwood-1.1.jar"/>
+ <classpathentry kind="con"
path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry combineaccessrules="false" kind="src"
path="/rop-browser"/>
+ <classpathentry kind="lib"
path="web/WEB-INF/lib/postgresql-8.1-405.jdbc2ee.jar"/>
+ <classpathentry kind="output" path="bin"/>
+</classpath>
Modified:
incubator/cayenne/soc/trunk/cayenne-rop/rop-browser-server/cayenne/ropbrowserMap.map.xml
URL:
http://svn.apache.org/viewvc/incubator/cayenne/soc/trunk/cayenne-rop/rop-browser-server/cayenne/ropbrowserMap.map.xml?rev=431897&r1=431896&r2=431897&view=diff
==============================================================================
---
incubator/cayenne/soc/trunk/cayenne-rop/rop-browser-server/cayenne/ropbrowserMap.map.xml
(original)
+++
incubator/cayenne/soc/trunk/cayenne-rop/rop-browser-server/cayenne/ropbrowserMap.map.xml
Wed Aug 16 06:42:36 2006
@@ -1,20 +1,19 @@
<?xml version="1.0" encoding="utf-8"?>
<data-map project-version="1.1">
<property name="defaultPackage"
value="org.apache.cayenne.ropbrowser.server"/>
- <property name="defaultSchema" value="public"/>
<property name="clientSupported" value="true"/>
<property name="defaultClientPackage"
value="org.apache.cayenne.ropbrowser.model"/>
- <db-entity name="Artist" schema="public">
+ <db-entity name="Artist">
<db-attribute name="ALIVE" type="BOOLEAN" isMandatory="true"/>
<db-attribute name="ARTIST_ID" type="INTEGER"
isPrimaryKey="true" isMandatory="true"/>
<db-attribute name="ARTIST_NAME" type="VARCHAR"
isMandatory="true" length="64"/>
<db-attribute name="DATE_OF_BIRTH" type="DATE"/>
</db-entity>
- <db-entity name="Gallery" schema="public">
+ <db-entity name="Gallery">
<db-attribute name="GALLERY_ID" type="INTEGER"
isPrimaryKey="true" isMandatory="true"/>
<db-attribute name="GALLERY_NAME" type="VARCHAR"
isMandatory="true" length="64"/>
</db-entity>
- <db-entity name="Painting" schema="public">
+ <db-entity name="Painting">
<db-attribute name="ARTIST_ID" type="INTEGER"
isMandatory="true"/>
<db-attribute name="ESTIMATED_PRICE" type="DOUBLE"
precision="2"/>
<db-attribute name="GALLERY_ID" type="INTEGER"
isMandatory="true"/>
Modified:
incubator/cayenne/soc/trunk/cayenne-rop/rop-browser-server/src/org/apache/cayenne/ropbrowser/server/auto/_Artist.java
URL:
http://svn.apache.org/viewvc/incubator/cayenne/soc/trunk/cayenne-rop/rop-browser-server/src/org/apache/cayenne/ropbrowser/server/auto/_Artist.java?rev=431897&r1=431896&r2=431897&view=diff
==============================================================================
---
incubator/cayenne/soc/trunk/cayenne-rop/rop-browser-server/src/org/apache/cayenne/ropbrowser/server/auto/_Artist.java
(original)
+++
incubator/cayenne/soc/trunk/cayenne-rop/rop-browser-server/src/org/apache/cayenne/ropbrowser/server/auto/_Artist.java
Wed Aug 16 06:42:36 2006
@@ -7,7 +7,7 @@
* since it may be overwritten next time code is regenerated.
* If you need to make any customizations, please use subclass.
*/
-public class _Artist extends org.objectstyle.cayenne.CayenneDataObject {
+public class _Artist extends org.apache.cayenne.CayenneDataObject {
public static final String ALIVE_PROPERTY = "alive";
public static final String ARTIST_NAME_PROPERTY = "artistName";
Modified:
incubator/cayenne/soc/trunk/cayenne-rop/rop-browser-server/src/org/apache/cayenne/ropbrowser/server/auto/_Gallery.java
URL:
http://svn.apache.org/viewvc/incubator/cayenne/soc/trunk/cayenne-rop/rop-browser-server/src/org/apache/cayenne/ropbrowser/server/auto/_Gallery.java?rev=431897&r1=431896&r2=431897&view=diff
==============================================================================
---
incubator/cayenne/soc/trunk/cayenne-rop/rop-browser-server/src/org/apache/cayenne/ropbrowser/server/auto/_Gallery.java
(original)
+++
incubator/cayenne/soc/trunk/cayenne-rop/rop-browser-server/src/org/apache/cayenne/ropbrowser/server/auto/_Gallery.java
Wed Aug 16 06:42:36 2006
@@ -7,7 +7,7 @@
* since it may be overwritten next time code is regenerated.
* If you need to make any customizations, please use subclass.
*/
-public class _Gallery extends org.objectstyle.cayenne.CayenneDataObject {
+public class _Gallery extends org.apache.cayenne.CayenneDataObject {
public static final String GALLERY_NAME_PROPERTY = "galleryName";
public static final String GALLERY_PAINTING_PROPERTY = "galleryPainting";
Modified:
incubator/cayenne/soc/trunk/cayenne-rop/rop-browser-server/src/org/apache/cayenne/ropbrowser/server/auto/_Painting.java
URL:
http://svn.apache.org/viewvc/incubator/cayenne/soc/trunk/cayenne-rop/rop-browser-server/src/org/apache/cayenne/ropbrowser/server/auto/_Painting.java?rev=431897&r1=431896&r2=431897&view=diff
==============================================================================
---
incubator/cayenne/soc/trunk/cayenne-rop/rop-browser-server/src/org/apache/cayenne/ropbrowser/server/auto/_Painting.java
(original)
+++
incubator/cayenne/soc/trunk/cayenne-rop/rop-browser-server/src/org/apache/cayenne/ropbrowser/server/auto/_Painting.java
Wed Aug 16 06:42:36 2006
@@ -5,7 +5,7 @@
* since it may be overwritten next time code is regenerated.
* If you need to make any customizations, please use subclass.
*/
-public class _Painting extends org.objectstyle.cayenne.CayenneDataObject {
+public class _Painting extends org.apache.cayenne.CayenneDataObject {
public static final String ESTIMATED_PRICE_PROPERTY = "estimatedPrice";
public static final String PAINTING_NAME_PROPERTY = "paintingName";
Added:
incubator/cayenne/soc/trunk/cayenne-rop/rop-browser-server/web/WEB-INF/lib/ashwood-1.1.jar
URL:
http://svn.apache.org/viewvc/incubator/cayenne/soc/trunk/cayenne-rop/rop-browser-server/web/WEB-INF/lib/ashwood-1.1.jar?rev=431897&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
incubator/cayenne/soc/trunk/cayenne-rop/rop-browser-server/web/WEB-INF/lib/ashwood-1.1.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added:
incubator/cayenne/soc/trunk/cayenne-rop/rop-browser-server/web/WEB-INF/lib/cayenne-jdk1.4-core-3.0-incubating-SNAPSHOT.jar
URL:
http://svn.apache.org/viewvc/incubator/cayenne/soc/trunk/cayenne-rop/rop-browser-server/web/WEB-INF/lib/cayenne-jdk1.4-core-3.0-incubating-SNAPSHOT.jar?rev=431897&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
incubator/cayenne/soc/trunk/cayenne-rop/rop-browser-server/web/WEB-INF/lib/cayenne-jdk1.4-core-3.0-incubating-SNAPSHOT.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added:
incubator/cayenne/soc/trunk/cayenne-rop/rop-browser-server/web/WEB-INF/lib/commons-collections-3.1.jar
URL:
http://svn.apache.org/viewvc/incubator/cayenne/soc/trunk/cayenne-rop/rop-browser-server/web/WEB-INF/lib/commons-collections-3.1.jar?rev=431897&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
incubator/cayenne/soc/trunk/cayenne-rop/rop-browser-server/web/WEB-INF/lib/commons-collections-3.1.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added:
incubator/cayenne/soc/trunk/cayenne-rop/rop-browser-server/web/WEB-INF/lib/commons-lang-2.1.jar
URL:
http://svn.apache.org/viewvc/incubator/cayenne/soc/trunk/cayenne-rop/rop-browser-server/web/WEB-INF/lib/commons-lang-2.1.jar?rev=431897&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
incubator/cayenne/soc/trunk/cayenne-rop/rop-browser-server/web/WEB-INF/lib/commons-lang-2.1.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added:
incubator/cayenne/soc/trunk/cayenne-rop/rop-browser-server/web/WEB-INF/lib/commons-logging.jar
URL:
http://svn.apache.org/viewvc/incubator/cayenne/soc/trunk/cayenne-rop/rop-browser-server/web/WEB-INF/lib/commons-logging.jar?rev=431897&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
incubator/cayenne/soc/trunk/cayenne-rop/rop-browser-server/web/WEB-INF/lib/commons-logging.jar
------------------------------------------------------------------------------
svn:executable = *
Propchange:
incubator/cayenne/soc/trunk/cayenne-rop/rop-browser-server/web/WEB-INF/lib/commons-logging.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added:
incubator/cayenne/soc/trunk/cayenne-rop/rop-browser-server/web/WEB-INF/lib/log4j-1.2.13.jar
URL:
http://svn.apache.org/viewvc/incubator/cayenne/soc/trunk/cayenne-rop/rop-browser-server/web/WEB-INF/lib/log4j-1.2.13.jar?rev=431897&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
incubator/cayenne/soc/trunk/cayenne-rop/rop-browser-server/web/WEB-INF/lib/log4j-1.2.13.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Modified:
incubator/cayenne/soc/trunk/cayenne-rop/rop-browser-server/web/WEB-INF/web.xml
URL:
http://svn.apache.org/viewvc/incubator/cayenne/soc/trunk/cayenne-rop/rop-browser-server/web/WEB-INF/web.xml?rev=431897&r1=431896&r2=431897&view=diff
==============================================================================
---
incubator/cayenne/soc/trunk/cayenne-rop/rop-browser-server/web/WEB-INF/web.xml
(original)
+++
incubator/cayenne/soc/trunk/cayenne-rop/rop-browser-server/web/WEB-INF/web.xml
Wed Aug 16 06:42:36 2006
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE web-app
PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
"http://java.sun.com/dtd/web-app_2_3.dtd";>
@@ -13,12 +13,11 @@
<!-- Deploying Cayenne distributed service using Hessian OPP transport
-->
<servlet>
<servlet-name>rop-browser</servlet-name>
-
<servlet-class>org.objectstyle.cayenne.remote.hessian.service.HessianServlet</servlet-class>
-
+
<servlet-class>org.apache.cayenne.remote.hessian.service.HessianServlet</servlet-class>
<!--
<init-param>
<param-name>cayenne.RemoteService.EventBridge.factory</param-name>
-
<param-value>org.objectstyle.cayenne.event.XMPPBridgeFactory</param-value>
+
<param-value>org.apache.cayenne.event.XMPPBridgeFactory</param-value>
</init-param>
<init-param>
<param-name>cayenne.XMPPBridge.xmppHost</param-name>
