Author: vgritsenko
Date: Wed Mar 9 06:11:40 2005
New Revision: 156645
URL: http://svn.apache.org/viewcvs?view=rev&rev=156645
Log:
split repository.xml into 3 files
Added:
cocoon/branches/BRANCH_2_1_X/src/blocks/ojb/conf/repository_database.xml
- copied, changed from r156580,
cocoon/trunk/src/blocks/ojb/conf/repository_database.xml
cocoon/branches/BRANCH_2_1_X/src/blocks/ojb/conf/repository_internal.xml
- copied, changed from r156580,
cocoon/trunk/src/blocks/ojb/conf/repository_internal.xml
cocoon/branches/BRANCH_2_1_X/src/blocks/ojb/conf/repository_user.xml
- copied, changed from r156580,
cocoon/trunk/src/blocks/ojb/conf/repository_user.xml
Removed:
cocoon/branches/BRANCH_2_1_X/src/blocks/ojb/conf/repository.xml
Copied:
cocoon/branches/BRANCH_2_1_X/src/blocks/ojb/conf/repository_database.xml (from
r156580, cocoon/trunk/src/blocks/ojb/conf/repository_database.xml)
URL:
http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/ojb/conf/repository_database.xml?view=diff&rev=156645&p1=cocoon/trunk/src/blocks/ojb/conf/repository_database.xml&r1=156580&p2=cocoon/branches/BRANCH_2_1_X/src/blocks/ojb/conf/repository_database.xml&r2=156645
==============================================================================
--- cocoon/trunk/src/blocks/ojb/conf/repository_database.xml (original)
+++ cocoon/branches/BRANCH_2_1_X/src/blocks/ojb/conf/repository_database.xml
Wed Mar 9 06:11:40 2005
@@ -1,34 +1,32 @@
<!-- 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.
+-->
<!--
-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 +59,4 @@
</sequence-manager>
</jdbc-connection-descriptor>
-
- <!-- END OF OJB DATABASE MAPPINGS-->
+<!-- END OF OJB DATABASE MAPPINGS-->
Copied:
cocoon/branches/BRANCH_2_1_X/src/blocks/ojb/conf/repository_internal.xml (from
r156580, cocoon/trunk/src/blocks/ojb/conf/repository_internal.xml)
URL:
http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/ojb/conf/repository_internal.xml?view=diff&rev=156645&p1=cocoon/trunk/src/blocks/ojb/conf/repository_internal.xml&r1=156580&p2=cocoon/branches/BRANCH_2_1_X/src/blocks/ojb/conf/repository_internal.xml&r2=156645
==============================================================================
--- cocoon/trunk/src/blocks/ojb/conf/repository_internal.xml (original)
+++ cocoon/branches/BRANCH_2_1_X/src/blocks/ojb/conf/repository_internal.xml
Wed Mar 9 06:11:40 2005
@@ -1,20 +1,20 @@
<!-- 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.
-->
+
<!-- The OJB HIGH/LOW SequenceManagerTable -->
<class-descriptor
class="org.apache.ojb.broker.util.sequence.HighLowSequence"
@@ -54,7 +54,6 @@
/>
</class-descriptor>
-
<!-- The OJB Lock Table -->
<class-descriptor
class="org.apache.ojb.odmg.locking.LockEntry"
@@ -89,7 +88,6 @@
/>
</class-descriptor>
-
<!-- THIS IS THE OJB NAMED ROOTS TABLE, DO NOT EDIT-->
<class-descriptor
class="org.apache.ojb.odmg.NamedRootsEntry"
@@ -163,8 +161,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 +218,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 +355,4 @@
/>
</class-descriptor>
-
-
- <!-- END OF OJB INTERNAL MAPPINGS-->
+<!-- END OF OJB INTERNAL MAPPINGS-->
Copied: cocoon/branches/BRANCH_2_1_X/src/blocks/ojb/conf/repository_user.xml
(from r156580, cocoon/trunk/src/blocks/ojb/conf/repository_user.xml)
URL:
http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/ojb/conf/repository_user.xml?view=diff&rev=156645&p1=cocoon/trunk/src/blocks/ojb/conf/repository_user.xml&r1=156580&p2=cocoon/branches/BRANCH_2_1_X/src/blocks/ojb/conf/repository_user.xml&r2=156645
==============================================================================
--- cocoon/trunk/src/blocks/ojb/conf/repository_user.xml (original)
+++ cocoon/branches/BRANCH_2_1_X/src/blocks/ojb/conf/repository_user.xml Wed
Mar 9 06:11:40 2005
@@ -1,23 +1,21 @@
<!-- 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
- <!-- Add your own mappings here -->
+ 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.
+-->
+ <!-- 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,32 +28,4 @@
<field-descriptor name="name" column="NAME"
jdbc-type="VARCHAR"/>
</class-descriptor>
- <!-- 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"/>
- <field-descriptor name="field" column="C_FIELD" jdbc-type="VARCHAR"/>
- <field-descriptor name="match" column="C_MATCH" jdbc-type="VARCHAR"/>
- <field-descriptor name="term" column="C_TERM" jdbc-type="VARCHAR"/>
- </class-descriptor>
-
- <class-descriptor
class="org.apache.cocoon.bean.query.SimpleLuceneQueryBean" table="QUERY">
- <field-descriptor name="id" column="ID" jdbc-type="BIGINT"
primarykey="true" autoincrement="true"/>
- <field-descriptor name="user" column="USER_ID" jdbc-type="VARCHAR"/>
- <field-descriptor name="date" column="Q_DATE" jdbc-type="TIMESTAMP"
conversion="org.apache.ojb.broker.accesslayer.conversions.JavaDate2SqlTimestampFieldConversion"/>
- <field-descriptor name="bool" column="Q_BOOL" jdbc-type="VARCHAR"/>
- <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>
- </class-descriptor>
-
-
- <!-- END OF OJB USER MAPPINGS-->
+<!-- END OF OJB USER MAPPINGS-->
