Author: vgritsenko
Date: Wed Mar 9 06:20:01 2005
New Revision: 156647
URL: http://svn.apache.org/viewcvs?view=rev&rev=156647
Log:
sync with branch
Modified:
cocoon/trunk/src/blocks/ojb/conf/repository.xml
cocoon/trunk/src/blocks/ojb/conf/repository_database.xml (contents, props
changed)
cocoon/trunk/src/blocks/ojb/conf/repository_internal.xml (contents, props
changed)
cocoon/trunk/src/blocks/ojb/conf/repository_user.xml (contents, props
changed)
Modified: cocoon/trunk/src/blocks/ojb/conf/repository.xml
URL:
http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/ojb/conf/repository.xml?view=diff&r1=156646&r2=156647
==============================================================================
--- cocoon/trunk/src/blocks/ojb/conf/repository.xml (original)
+++ cocoon/trunk/src/blocks/ojb/conf/repository.xml Wed Mar 9 06:20:01 2005
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Copyright 1999-2004 The Apache Software Foundation
+ Copyright 1999-2005 The Apache Software Foundation
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -13,14 +13,16 @@
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.
+
+ $Id$
-->
<!DOCTYPE descriptor-repository PUBLIC
- "-//Apache Software Foundation//DTD OJB Repository//EN"
- "repository.dtd"
+ "-//Apache Software Foundation//DTD OJB Repository//EN"
+ "repository.dtd"
[
- <!ENTITY database SYSTEM "repository_database.xml">
- <!ENTITY internal SYSTEM "repository_internal.xml">
- <!ENTITY user SYSTEM "repository_user.xml">
+ <!ENTITY database SYSTEM "repository_database.xml">
+ <!ENTITY internal SYSTEM "repository_internal.xml">
+ <!ENTITY user SYSTEM "repository_user.xml">
]>
<descriptor-repository version="1.0" isolation-level="read-uncommitted">
@@ -32,5 +34,4 @@
<!-- include user defined mappings here -->
&user;
-
</descriptor-repository>
Modified: cocoon/trunk/src/blocks/ojb/conf/repository_database.xml
URL:
http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/ojb/conf/repository_database.xml?view=diff&r1=156646&r2=156647
==============================================================================
--- cocoon/trunk/src/blocks/ojb/conf/repository_database.xml (original)
+++ cocoon/trunk/src/blocks/ojb/conf/repository_database.xml Wed Mar 9
06:20:01 2005
@@ -1,34 +1,34 @@
<!-- OJB DATABASE MAPPINGS START HERE -->
<!--
-#/* Copyright 2002-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
--->
+ Copyright 1999-2005 The Apache Software Foundation
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ $Id$
+-->
<!--
-Define here all used connections.
-One defined connection should be defined as the default one,
-by set default-connection="true" - this could be done at runtime too.
-
-It is possible to set user/password at
-runtime or let login different users at runtime using the same
-database. Use different PBKey with same jcdAlias name but
-different user/password.
+ Define here all used connections.
+ One defined connection should be defined as the default one,
+ by set default-connection="true" - this could be done at runtime too.
+
+ It is possible to set user/password at
+ runtime or let login different users at runtime using the same
+ database. Use different PBKey with same jcdAlias name but
+ different user/password.
-Ditto it is possible to add jdbc-connection-descriptor at runtime
-using the MetadataManager.
+ Ditto it is possible to add jdbc-connection-descriptor at runtime
+ using the MetadataManager.
-->
<jdbc-connection-descriptor
jcd-alias="default"
@@ -61,5 +61,4 @@
</sequence-manager>
</jdbc-connection-descriptor>
-
- <!-- END OF OJB DATABASE MAPPINGS-->
+<!-- END OF OJB DATABASE MAPPINGS-->
Propchange: cocoon/trunk/src/blocks/ojb/conf/repository_database.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cocoon/trunk/src/blocks/ojb/conf/repository_database.xml
------------------------------------------------------------------------------
svn:keywords = Id
Modified: cocoon/trunk/src/blocks/ojb/conf/repository_internal.xml
URL:
http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/ojb/conf/repository_internal.xml?view=diff&r1=156646&r2=156647
==============================================================================
--- cocoon/trunk/src/blocks/ojb/conf/repository_internal.xml (original)
+++ cocoon/trunk/src/blocks/ojb/conf/repository_internal.xml Wed Mar 9
06:20:01 2005
@@ -1,20 +1,22 @@
<!-- OJB INTERNAL MAPPINGS START HERE, DO NOT EDIT -->
<!--
-#/* Copyright 2002-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+ Copyright 1999-2005 The Apache Software Foundation
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ $Id$
-->
+
<!-- The OJB HIGH/LOW SequenceManagerTable -->
<class-descriptor
class="org.apache.ojb.broker.util.sequence.HighLowSequence"
@@ -54,7 +56,6 @@
/>
</class-descriptor>
-
<!-- The OJB Lock Table -->
<class-descriptor
class="org.apache.ojb.odmg.locking.LockEntry"
@@ -89,7 +90,6 @@
/>
</class-descriptor>
-
<!-- THIS IS THE OJB NAMED ROOTS TABLE, DO NOT EDIT-->
<class-descriptor
class="org.apache.ojb.odmg.NamedRootsEntry"
@@ -163,8 +163,8 @@
/>
</class-descriptor>
- <!-- THIS IS THE OJB DLIST IMPLEMENTATION, DO NOT EDIT-->
- <!-- alternative implementation of DList -->
+<!-- THIS IS THE OJB DLIST IMPLEMENTATION, DO NOT EDIT-->
+<!-- alternative implementation of DList -->
<class-descriptor
class="org.apache.ojb.odmg.collections.DListImpl_2"
table="OJB_DLIST"
@@ -220,7 +220,7 @@
/>
</class-descriptor>
- <!-- THIS IS THE OJB DBAG IMPLEMENTATION, DO NOT EDIT-->
+<!-- THIS IS THE OJB DBAG IMPLEMENTATION, DO NOT EDIT-->
<class-descriptor
class="org.apache.ojb.odmg.collections.DBagImpl"
table="OJB_DLIST"
@@ -357,6 +357,4 @@
/>
</class-descriptor>
-
-
- <!-- END OF OJB INTERNAL MAPPINGS-->
+<!-- END OF OJB INTERNAL MAPPINGS-->
Propchange: cocoon/trunk/src/blocks/ojb/conf/repository_internal.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cocoon/trunk/src/blocks/ojb/conf/repository_internal.xml
------------------------------------------------------------------------------
svn:keywords = Id
Modified: cocoon/trunk/src/blocks/ojb/conf/repository_user.xml
URL:
http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/ojb/conf/repository_user.xml?view=diff&r1=156646&r2=156647
==============================================================================
--- cocoon/trunk/src/blocks/ojb/conf/repository_user.xml (original)
+++ cocoon/trunk/src/blocks/ojb/conf/repository_user.xml Wed Mar 9 06:20:01
2005
@@ -1,23 +1,23 @@
<!-- OJB USER MAPPINGS START HERE -->
<!--
-#/* Copyright 2002-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
--->
+ Copyright 1999-2005 The Apache Software Foundation
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
- <!-- Add your own mappings here -->
+ 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.
+ $Id$
+-->
+
+ <!-- Add your own mappings here -->
<class-descriptor class="org.apache.cocoon.ojb.samples.bean.Department"
table="DEPARTMENT">
<field-descriptor name="id" column="ID" jdbc-type="INTEGER"
primarykey="true"/>
@@ -30,7 +30,7 @@
<field-descriptor name="name" column="NAME"
jdbc-type="VARCHAR"/>
</class-descriptor>
- <!-- mappings for the QueryBean Block -->
+ <!-- mappings for the QueryBean Block -->
<class-descriptor
class="org.apache.cocoon.bean.query.SimpleLuceneCriterionBean"
table="CRITERION">
<field-descriptor name="id" column="ID" jdbc-type="BIGINT"
primarykey="true" autoincrement="true"/>
<field-descriptor name="qid" column="Q_ID" jdbc-type="BIGINT"
access="anonymous"/>
@@ -47,15 +47,14 @@
<field-descriptor name="name" column="Q_NAME" jdbc-type="VARCHAR"/>
<field-descriptor name="type" column="Q_TYPE" jdbc-type="VARCHAR"/>
<field-descriptor name="size" column="Q_SIZE" jdbc-type="BIGINT"/>
- <collection-descriptor
- name="criteria"
-
element-class-ref="org.apache.cocoon.bean.query.SimpleLuceneCriterionBean"
- auto-retrieve="true"
- auto-update="true"
- auto-delete="true">
- <inverse-foreignkey field-ref="qid"/>
- </collection-descriptor>
+ <collection-descriptor
+ name="criteria"
+
element-class-ref="org.apache.cocoon.bean.query.SimpleLuceneCriterionBean"
+ auto-retrieve="true"
+ auto-update="true"
+ auto-delete="true">
+ <inverse-foreignkey field-ref="qid"/>
+ </collection-descriptor>
</class-descriptor>
-
- <!-- END OF OJB USER MAPPINGS-->
+<!-- END OF OJB USER MAPPINGS-->
Propchange: cocoon/trunk/src/blocks/ojb/conf/repository_user.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cocoon/trunk/src/blocks/ojb/conf/repository_user.xml
------------------------------------------------------------------------------
svn:keywords = Id
