Date: 2004-10-05T01:46:05
Editor: CarstenZiegeler <[EMAIL PROTECTED]>
Wiki: Cocoon Wiki
Page: MergingBranches
URL: http://wiki.apache.org/cocoon/MergingBranches
no comment
Change Log:
------------------------------------------------------------------------------
@@ -146,18 +146,6 @@
src/blocks/javaflow/java/org/apache/cocoon/forms/flow/java/FormInstance.java
src/blocks/javaflow/samples/forms/form1.xml
}}}
- * Ojb
- {{{
- src/blocks/ojb/java/org/apache/cocoon/ojb/broker/components/PBFactory.java
-
src/blocks/ojb/java/org/apache/cocoon/ojb/broker/components/PBFactoryImpl.java
- src/blocks/ojb/java/org/apache/cocoon/ojb/components/AbstractOjbImpl.java
-
src/blocks/ojb/java/org/apache/cocoon/ojb/components/ConnectionFactoryAvalonDataSource.java
-
src/blocks/ojb/java/org/apache/cocoon/ojb/odmg/components/OdmgImplementation.java
-
src/blocks/ojb/java/org/apache/cocoon/ojb/odmg/components/OdmgImplementationImpl.java
- src/blocks/ojb/java/org/apache/cocoon/ojb/jdo/components/JdoPMF.java
- src/blocks/ojb/java/org/apache/cocoon/ojb/jdo/components/JdoPMFImpl.java
- src/blocks/ojb/samples/sitemap.xmap
- }}}
* scratchpad
{{{
src/blocks/scratchpad/test/org/apache/cocoon/components/source/impl/CachingSourceTestCase.xtest
@@ -287,6 +275,7 @@
* Mail
* midi
* Naming
+ * ojb
* Paranoid
* Petstore
* Php
