You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jackrabbit.apache.org by cl...@apache.org on 2007/05/10 23:25:22 UTC
svn commit: r536999 [6/7] - in
/jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src: dtd/
main/java/org/apache/jackrabbit/ main/java/org/apache/jackrabbit/ocm/
main/java/org/apache/jackrabbit/ocm/exception/
main/java/org/apache/jackrabbit/o...
Copied: jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/testmodel/Resource.java (from r535963, jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/portals/graffito/jcr/testmodel/Resource.java)
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/testmodel/Resource.java?view=diff&rev=536999&p1=jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/portals/graffito/jcr/testmodel/Resource.java&r1=535963&p2=jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/testmodel/Resource.java&r2=536999
==============================================================================
--- jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/portals/graffito/jcr/testmodel/Resource.java (original)
+++ jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/testmodel/Resource.java Thu May 10 14:25:11 2007
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.portals.graffito.jcr.testmodel;
+package org.apache.jackrabbit.ocm.testmodel;
import java.io.InputStream;
import java.util.Calendar;
Modified: jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/testmodel/crossreference/A.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/testmodel/crossreference/A.java?view=diff&rev=536999&r1=535963&r2=536999
==============================================================================
--- jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/testmodel/crossreference/A.java (original)
+++ jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/testmodel/crossreference/A.java Thu May 10 14:25:11 2007
@@ -14,12 +14,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.portals.graffito.jcr.testmodel.crossreference;
+package org.apache.jackrabbit.ocm.testmodel.crossreference;
import java.util.ArrayList;
import java.util.Collection;
-import org.apache.portals.graffito.jcr.testmodel.C;
+import org.apache.jackrabbit.ocm.testmodel.C;
/**
*
Modified: jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/testmodel/crossreference/B.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/testmodel/crossreference/B.java?view=diff&rev=536999&r1=535963&r2=536999
==============================================================================
--- jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/testmodel/crossreference/B.java (original)
+++ jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/testmodel/crossreference/B.java Thu May 10 14:25:11 2007
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.portals.graffito.jcr.testmodel.crossreference;
+package org.apache.jackrabbit.ocm.testmodel.crossreference;
/**
*
Modified: jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/testmodel/hashmap/Element.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/testmodel/hashmap/Element.java?view=diff&rev=536999&r1=535963&r2=536999
==============================================================================
--- jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/testmodel/hashmap/Element.java (original)
+++ jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/testmodel/hashmap/Element.java Thu May 10 14:25:11 2007
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.portals.graffito.jcr.testmodel.hashmap;
+package org.apache.jackrabbit.ocm.testmodel.hashmap;
/**
Modified: jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/testmodel/hashmap/HashMapElement.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/testmodel/hashmap/HashMapElement.java?view=diff&rev=536999&r1=535963&r2=536999
==============================================================================
--- jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/testmodel/hashmap/HashMapElement.java (original)
+++ jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/testmodel/hashmap/HashMapElement.java Thu May 10 14:25:11 2007
@@ -14,12 +14,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.portals.graffito.jcr.testmodel.hashmap;
+package org.apache.jackrabbit.ocm.testmodel.hashmap;
import java.util.HashMap;
import java.util.Iterator;
-import org.apache.portals.graffito.jcr.persistence.collectionconverter.ManageableCollection;
+import org.apache.jackrabbit.ocm.persistence.collectionconverter.ManageableCollection;
/**
*
@@ -30,7 +30,7 @@
{
/**
- * @see org.apache.portals.graffito.jcr.persistence.collectionconverter.ManageableCollection#addObject(java.lang.Object)
+ * @see org.apache.jackrabbit.ocm.persistence.collectionconverter.ManageableCollection#addObject(java.lang.Object)
*/
public void addObject(Object object)
{
@@ -41,7 +41,7 @@
}
/**
- * @see org.apache.portals.graffito.jcr.persistence.collectionconverter.ManageableCollection#getIterator()
+ * @see org.apache.jackrabbit.ocm.persistence.collectionconverter.ManageableCollection#getIterator()
*/
public Iterator getIterator()
{
Modified: jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/testmodel/hashmap/Main.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/testmodel/hashmap/Main.java?view=diff&rev=536999&r1=535963&r2=536999
==============================================================================
--- jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/testmodel/hashmap/Main.java (original)
+++ jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/testmodel/hashmap/Main.java Thu May 10 14:25:11 2007
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.portals.graffito.jcr.testmodel.hashmap;
+package org.apache.jackrabbit.ocm.testmodel.hashmap;
import java.util.HashMap;
Copied: jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/testmodel/inheritance/Ancestor.java (from r535963, jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/portals/graffito/jcr/testmodel/inheritance/Ancestor.java)
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/testmodel/inheritance/Ancestor.java?view=diff&rev=536999&p1=jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/portals/graffito/jcr/testmodel/inheritance/Ancestor.java&r1=535963&p2=jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/testmodel/inheritance/Ancestor.java&r2=536999
==============================================================================
--- jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/portals/graffito/jcr/testmodel/inheritance/Ancestor.java (original)
+++ jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/testmodel/inheritance/Ancestor.java Thu May 10 14:25:11 2007
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.portals.graffito.jcr.testmodel.inheritance;
+package org.apache.jackrabbit.ocm.testmodel.inheritance;
public class Ancestor
{
Propchange: jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/testmodel/inheritance/Ancestor.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied: jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/testmodel/inheritance/AnotherDescendant.java (from r535963, jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/portals/graffito/jcr/testmodel/inheritance/AnotherDescendant.java)
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/testmodel/inheritance/AnotherDescendant.java?view=diff&rev=536999&p1=jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/portals/graffito/jcr/testmodel/inheritance/AnotherDescendant.java&r1=535963&p2=jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/testmodel/inheritance/AnotherDescendant.java&r2=536999
==============================================================================
--- jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/portals/graffito/jcr/testmodel/inheritance/AnotherDescendant.java (original)
+++ jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/testmodel/inheritance/AnotherDescendant.java Thu May 10 14:25:11 2007
@@ -14,9 +14,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.portals.graffito.jcr.testmodel.inheritance;
+package org.apache.jackrabbit.ocm.testmodel.inheritance;
-import org.apache.portals.graffito.jcr.testmodel.interfaces.Interface;
+import org.apache.jackrabbit.ocm.testmodel.interfaces.Interface;
public class AnotherDescendant extends Ancestor implements Interface{
Propchange: jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/testmodel/inheritance/AnotherDescendant.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied: jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/testmodel/inheritance/Descendant.java (from r535963, jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/portals/graffito/jcr/testmodel/inheritance/Descendant.java)
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/testmodel/inheritance/Descendant.java?view=diff&rev=536999&p1=jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/portals/graffito/jcr/testmodel/inheritance/Descendant.java&r1=535963&p2=jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/testmodel/inheritance/Descendant.java&r2=536999
==============================================================================
--- jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/portals/graffito/jcr/testmodel/inheritance/Descendant.java (original)
+++ jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/testmodel/inheritance/Descendant.java Thu May 10 14:25:11 2007
@@ -14,9 +14,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.portals.graffito.jcr.testmodel.inheritance;
+package org.apache.jackrabbit.ocm.testmodel.inheritance;
-import org.apache.portals.graffito.jcr.testmodel.interfaces.AnotherInterface;
+import org.apache.jackrabbit.ocm.testmodel.interfaces.AnotherInterface;
public class Descendant extends Ancestor implements AnotherInterface {
Propchange: jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/testmodel/inheritance/Descendant.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied: jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/testmodel/inheritance/SubDescendant.java (from r535963, jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/portals/graffito/jcr/testmodel/inheritance/SubDescendant.java)
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/testmodel/inheritance/SubDescendant.java?view=diff&rev=536999&p1=jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/portals/graffito/jcr/testmodel/inheritance/SubDescendant.java&r1=535963&p2=jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/testmodel/inheritance/SubDescendant.java&r2=536999
==============================================================================
--- jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/portals/graffito/jcr/testmodel/inheritance/SubDescendant.java (original)
+++ jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/testmodel/inheritance/SubDescendant.java Thu May 10 14:25:11 2007
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.portals.graffito.jcr.testmodel.inheritance;
+package org.apache.jackrabbit.ocm.testmodel.inheritance;
public class SubDescendant extends Descendant {
Propchange: jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/testmodel/inheritance/SubDescendant.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/testmodel/inheritance/impl/CmsObjectImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/testmodel/inheritance/impl/CmsObjectImpl.java?view=diff&rev=536999&r1=535963&r2=536999
==============================================================================
--- jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/testmodel/inheritance/impl/CmsObjectImpl.java (original)
+++ jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/testmodel/inheritance/impl/CmsObjectImpl.java Thu May 10 14:25:11 2007
@@ -14,10 +14,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.portals.graffito.jcr.testmodel.inheritance.impl;
+package org.apache.jackrabbit.ocm.testmodel.inheritance.impl;
-import org.apache.portals.graffito.jcr.testmodel.interfaces.CmsObject;
-import org.apache.portals.graffito.jcr.testmodel.interfaces.Folder;
+import org.apache.jackrabbit.ocm.testmodel.interfaces.CmsObject;
+import org.apache.jackrabbit.ocm.testmodel.interfaces.Folder;
Modified: jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/testmodel/inheritance/impl/ContentImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/testmodel/inheritance/impl/ContentImpl.java?view=diff&rev=536999&r1=535963&r2=536999
==============================================================================
--- jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/testmodel/inheritance/impl/ContentImpl.java (original)
+++ jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/testmodel/inheritance/impl/ContentImpl.java Thu May 10 14:25:11 2007
@@ -14,9 +14,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.portals.graffito.jcr.testmodel.inheritance.impl;
+package org.apache.jackrabbit.ocm.testmodel.inheritance.impl;
-import org.apache.portals.graffito.jcr.testmodel.interfaces.Content;
+import org.apache.jackrabbit.ocm.testmodel.interfaces.Content;
Modified: jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/testmodel/inheritance/impl/DocumentImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/testmodel/inheritance/impl/DocumentImpl.java?view=diff&rev=536999&r1=535963&r2=536999
==============================================================================
--- jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/testmodel/inheritance/impl/DocumentImpl.java (original)
+++ jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/testmodel/inheritance/impl/DocumentImpl.java Thu May 10 14:25:11 2007
@@ -14,12 +14,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.portals.graffito.jcr.testmodel.inheritance.impl;
+package org.apache.jackrabbit.ocm.testmodel.inheritance.impl;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.portals.graffito.jcr.testmodel.interfaces.Document;
+import org.apache.jackrabbit.ocm.testmodel.interfaces.Document;
/**
* CMS VersionnedDocument implementation.
Modified: jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/testmodel/inheritance/impl/DocumentStream.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/testmodel/inheritance/impl/DocumentStream.java?view=diff&rev=536999&r1=535963&r2=536999
==============================================================================
--- jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/testmodel/inheritance/impl/DocumentStream.java (original)
+++ jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/testmodel/inheritance/impl/DocumentStream.java Thu May 10 14:25:11 2007
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.portals.graffito.jcr.testmodel.inheritance.impl;
+package org.apache.jackrabbit.ocm.testmodel.inheritance.impl;
import java.io.ByteArrayInputStream;
Modified: jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/testmodel/inheritance/impl/FolderImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/testmodel/inheritance/impl/FolderImpl.java?view=diff&rev=536999&r1=535963&r2=536999
==============================================================================
--- jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/testmodel/inheritance/impl/FolderImpl.java (original)
+++ jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/testmodel/inheritance/impl/FolderImpl.java Thu May 10 14:25:11 2007
@@ -14,13 +14,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.portals.graffito.jcr.testmodel.inheritance.impl;
+package org.apache.jackrabbit.ocm.testmodel.inheritance.impl;
import java.util.ArrayList;
import java.util.List;
-import org.apache.portals.graffito.jcr.testmodel.interfaces.CmsObject;
-import org.apache.portals.graffito.jcr.testmodel.interfaces.Folder;
+import org.apache.jackrabbit.ocm.testmodel.interfaces.CmsObject;
+import org.apache.jackrabbit.ocm.testmodel.interfaces.Folder;
Modified: jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/testmodel/interfaces/AnotherInterface.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/testmodel/interfaces/AnotherInterface.java?view=diff&rev=536999&r1=535963&r2=536999
==============================================================================
--- jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/testmodel/interfaces/AnotherInterface.java (original)
+++ jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/testmodel/interfaces/AnotherInterface.java Thu May 10 14:25:11 2007
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.portals.graffito.jcr.testmodel.interfaces;
+package org.apache.jackrabbit.ocm.testmodel.interfaces;
public interface AnotherInterface
{
Modified: jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/testmodel/interfaces/CmsObject.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/testmodel/interfaces/CmsObject.java?view=diff&rev=536999&r1=535963&r2=536999
==============================================================================
--- jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/testmodel/interfaces/CmsObject.java (original)
+++ jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/testmodel/interfaces/CmsObject.java Thu May 10 14:25:11 2007
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.portals.graffito.jcr.testmodel.interfaces;
+package org.apache.jackrabbit.ocm.testmodel.interfaces;
public interface CmsObject {
Modified: jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/testmodel/interfaces/Content.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/testmodel/interfaces/Content.java?view=diff&rev=536999&r1=535963&r2=536999
==============================================================================
--- jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/testmodel/interfaces/Content.java (original)
+++ jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/testmodel/interfaces/Content.java Thu May 10 14:25:11 2007
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.portals.graffito.jcr.testmodel.interfaces;
+package org.apache.jackrabbit.ocm.testmodel.interfaces;
public interface Content extends CmsObject {
Modified: jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/testmodel/interfaces/Document.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/testmodel/interfaces/Document.java?view=diff&rev=536999&r1=535963&r2=536999
==============================================================================
--- jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/testmodel/interfaces/Document.java (original)
+++ jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/testmodel/interfaces/Document.java Thu May 10 14:25:11 2007
@@ -14,9 +14,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.portals.graffito.jcr.testmodel.interfaces;
+package org.apache.jackrabbit.ocm.testmodel.interfaces;
-import org.apache.portals.graffito.jcr.testmodel.inheritance.impl.DocumentStream;
+import org.apache.jackrabbit.ocm.testmodel.inheritance.impl.DocumentStream;
public interface Document extends Content {
Modified: jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/testmodel/interfaces/Folder.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/testmodel/interfaces/Folder.java?view=diff&rev=536999&r1=535963&r2=536999
==============================================================================
--- jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/testmodel/interfaces/Folder.java (original)
+++ jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/testmodel/interfaces/Folder.java Thu May 10 14:25:11 2007
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.portals.graffito.jcr.testmodel.interfaces;
+package org.apache.jackrabbit.ocm.testmodel.interfaces;
import java.util.List;
Modified: jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/testmodel/interfaces/Interface.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/testmodel/interfaces/Interface.java?view=diff&rev=536999&r1=535963&r2=536999
==============================================================================
--- jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/testmodel/interfaces/Interface.java (original)
+++ jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/testmodel/interfaces/Interface.java Thu May 10 14:25:11 2007
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.portals.graffito.jcr.testmodel.interfaces;
+package org.apache.jackrabbit.ocm.testmodel.interfaces;
public interface Interface
{
Modified: jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/testmodel/proxy/Detail.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/testmodel/proxy/Detail.java?view=diff&rev=536999&r1=535963&r2=536999
==============================================================================
--- jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/testmodel/proxy/Detail.java (original)
+++ jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/testmodel/proxy/Detail.java Thu May 10 14:25:11 2007
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.portals.graffito.jcr.testmodel.proxy;
+package org.apache.jackrabbit.ocm.testmodel.proxy;
public class Detail
{
Modified: jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/testmodel/proxy/Main.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/testmodel/proxy/Main.java?view=diff&rev=536999&r1=535963&r2=536999
==============================================================================
--- jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/testmodel/proxy/Main.java (original)
+++ jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/testmodel/proxy/Main.java Thu May 10 14:25:11 2007
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.portals.graffito.jcr.testmodel.proxy;
+package org.apache.jackrabbit.ocm.testmodel.proxy;
import java.util.Collection;
Modified: jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/testmodel/uuid/A.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/testmodel/uuid/A.java?view=diff&rev=536999&r1=535963&r2=536999
==============================================================================
--- jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/testmodel/uuid/A.java (original)
+++ jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/testmodel/uuid/A.java Thu May 10 14:25:11 2007
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.portals.graffito.jcr.testmodel.uuid;
+package org.apache.jackrabbit.ocm.testmodel.uuid;
/**
Modified: jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/testmodel/uuid/Ancestor.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/testmodel/uuid/Ancestor.java?view=diff&rev=536999&r1=535963&r2=536999
==============================================================================
--- jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/testmodel/uuid/Ancestor.java (original)
+++ jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/testmodel/uuid/Ancestor.java Thu May 10 14:25:11 2007
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.portals.graffito.jcr.testmodel.uuid;
+package org.apache.jackrabbit.ocm.testmodel.uuid;
/**
Modified: jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/testmodel/uuid/B.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/testmodel/uuid/B.java?view=diff&rev=536999&r1=535963&r2=536999
==============================================================================
--- jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/testmodel/uuid/B.java (original)
+++ jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/testmodel/uuid/B.java Thu May 10 14:25:11 2007
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.portals.graffito.jcr.testmodel.uuid;
+package org.apache.jackrabbit.ocm.testmodel.uuid;
import java.util.Collection;
Modified: jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/testmodel/uuid/B2.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/testmodel/uuid/B2.java?view=diff&rev=536999&r1=535963&r2=536999
==============================================================================
--- jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/testmodel/uuid/B2.java (original)
+++ jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/testmodel/uuid/B2.java Thu May 10 14:25:11 2007
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.portals.graffito.jcr.testmodel.uuid;
+package org.apache.jackrabbit.ocm.testmodel.uuid;
import java.util.Collection;
Modified: jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/testmodel/uuid/Descendant.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/testmodel/uuid/Descendant.java?view=diff&rev=536999&r1=535963&r2=536999
==============================================================================
--- jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/testmodel/uuid/Descendant.java (original)
+++ jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/testmodel/uuid/Descendant.java Thu May 10 14:25:11 2007
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.portals.graffito.jcr.testmodel.uuid;
+package org.apache.jackrabbit.ocm.testmodel.uuid;
/**
Modified: jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/test-config/jcrmapping-atomic.xml
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/test-config/jcrmapping-atomic.xml?view=diff&rev=536999&r1=536998&r2=536999
==============================================================================
--- jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/test-config/jcrmapping-atomic.xml (original)
+++ jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/test-config/jcrmapping-atomic.xml Thu May 10 14:25:11 2007
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE graffito-jcr PUBLIC "-//The Apache Software Foundation//DTD Repository//EN" "./src/dtd/graffito-jcr-mapping.dtd">
-<graffito-jcr>
+<!DOCTYPE jackrabbit-ocm PUBLIC "-//The Apache Software Foundation//DTD Repository//EN" "./src/dtd/jackrabbit-ocm.dtd">
+<jackrabbit-ocm>
<class-descriptor
- className="org.apache.portals.graffito.jcr.testmodel.Atomic" jcrNodeType="nt:unstructured" discriminator="true" >
+ className="org.apache.jackrabbit.ocm.testmodel.Atomic" jcrNodeType="nt:unstructured" discriminator="true" >
<field-descriptor fieldName="path" path="true" />
<field-descriptor fieldName="string" jcrName="string" />
<field-descriptor fieldName="booleanObject" jcrName="booleanObject" />
@@ -17,26 +17,26 @@
<field-descriptor fieldName="doublePrimitive" jcrName="doublePrimitive" />
<field-descriptor fieldName="inputStream" jcrName="inputStream" />
<field-descriptor fieldName="timestamp" jcrName="timestamp" />
- <field-descriptor fieldName="int2boolean" jcrName="int2boolean" converter="org.apache.portals.graffito.jcr.persistence.atomic.Int2BooleanTypeConverterImpl" />
- <field-descriptor fieldName="namedProperty" jcrName="namedProperty" converter="org.apache.portals.graffito.jcr.persistence.atomictypeconverter.impl.NameTypeConverterImpl" />
- <field-descriptor fieldName="pathProperty" jcrName="pathProperty" converter="org.apache.portals.graffito.jcr.persistence.atomictypeconverter.impl.PathTypeConverterImpl" />
- <field-descriptor fieldName="undefinedProperty" jcrName="undefinedProperty" converter="org.apache.portals.graffito.jcr.persistence.atomictypeconverter.impl.UndefinedTypeConverterImpl" />
+ <field-descriptor fieldName="int2boolean" jcrName="int2boolean" converter="org.apache.jackrabbit.ocm.persistence.atomic.Int2BooleanTypeConverterImpl" />
+ <field-descriptor fieldName="namedProperty" jcrName="namedProperty" converter="org.apache.jackrabbit.ocm.persistence.atomictypeconverter.impl.NameTypeConverterImpl" />
+ <field-descriptor fieldName="pathProperty" jcrName="pathProperty" converter="org.apache.jackrabbit.ocm.persistence.atomictypeconverter.impl.PathTypeConverterImpl" />
+ <field-descriptor fieldName="undefinedProperty" jcrName="undefinedProperty" converter="org.apache.jackrabbit.ocm.persistence.atomictypeconverter.impl.UndefinedTypeConverterImpl" />
</class-descriptor>
<class-descriptor
- className="org.apache.portals.graffito.jcr.testmodel.MultiValue" jcrNodeType="nt:unstructured" discriminator="true" >
+ className="org.apache.jackrabbit.ocm.testmodel.MultiValue" jcrNodeType="nt:unstructured" discriminator="true" >
<field-descriptor fieldName="path" path="true" />
<field-descriptor fieldName="name" jcrName="name" />
<collection-descriptor fieldName="multiValues" jcrName="multiValue" proxy="false"
elementClassName="java.lang.String"
- collectionConverter="org.apache.portals.graffito.jcr.persistence.collectionconverter.impl.MultiValueCollectionConverterImpl" />
+ collectionConverter="org.apache.jackrabbit.ocm.persistence.collectionconverter.impl.MultiValueCollectionConverterImpl" />
<collection-descriptor fieldName="nullMultiValues" jcrName="nullMultiValue" proxy="false"
elementClassName="java.lang.String"
- collectionConverter="org.apache.portals.graffito.jcr.persistence.collectionconverter.impl.MultiValueCollectionConverterImpl" />
+ collectionConverter="org.apache.jackrabbit.ocm.persistence.collectionconverter.impl.MultiValueCollectionConverterImpl" />
</class-descriptor>
-</graffito-jcr>
-
\ No newline at end of file
+</jackrabbit-ocm>
+
Modified: jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/test-config/jcrmapping-auto.xml
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/test-config/jcrmapping-auto.xml?view=diff&rev=536999&r1=536998&r2=536999
==============================================================================
--- jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/test-config/jcrmapping-auto.xml (original)
+++ jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/test-config/jcrmapping-auto.xml Thu May 10 14:25:11 2007
@@ -1,65 +1,65 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE graffito-jcr PUBLIC "-//The Apache Software Foundation//DTD Repository//EN" "./src/dtd/graffito-jcr-mapping.dtd">
-<graffito-jcr>
+<!DOCTYPE jackrabbit-ocm PUBLIC "-//The Apache Software Foundation//DTD Repository//EN" "./src/dtd/jackrabbit-ocm.dtd">
+<jackrabbit-ocm>
<!-- INTERFACE MAPPING -->
- <class-descriptor className="org.apache.portals.graffito.jcr.testmodel.interfaces.CmsObject" interface="true" discriminator="false"
- jcrNodeType="graffito:cmsobject" />
+ <class-descriptor className="org.apache.jackrabbit.ocm.testmodel.interfaces.CmsObject" interface="true" discriminator="false"
+ jcrNodeType="ocm:cmsobject" />
- <class-descriptor className="org.apache.portals.graffito.jcr.testmodel.interfaces.Folder" interface="true" discriminator="false"
- extend="org.apache.portals.graffito.jcr.testmodel.interfaces.CmsObject" jcrNodeType="graffito:folder" />
+ <class-descriptor className="org.apache.jackrabbit.ocm.testmodel.interfaces.Folder" interface="true" discriminator="false"
+ extend="org.apache.jackrabbit.ocm.testmodel.interfaces.CmsObject" jcrNodeType="ocm:folder" />
- <class-descriptor className="org.apache.portals.graffito.jcr.testmodel.interfaces.Content" interface="true" discriminator="false"
- extend="org.apache.portals.graffito.jcr.testmodel.interfaces.CmsObject" jcrNodeType="graffito:content" />
+ <class-descriptor className="org.apache.jackrabbit.ocm.testmodel.interfaces.Content" interface="true" discriminator="false"
+ extend="org.apache.jackrabbit.ocm.testmodel.interfaces.CmsObject" jcrNodeType="ocm:content" />
- <class-descriptor className="org.apache.portals.graffito.jcr.testmodel.interfaces.Document" interface="true" discriminator="false"
- extend="org.apache.portals.graffito.jcr.testmodel.interfaces.Content" jcrNodeType="graffito:document" />
+ <class-descriptor className="org.apache.jackrabbit.ocm.testmodel.interfaces.Document" interface="true" discriminator="false"
+ extend="org.apache.jackrabbit.ocm.testmodel.interfaces.Content" jcrNodeType="ocm:document" />
<!-- CLASS MAPPING. The FolderImpl has the autoRetrieve, autoUpdate & autoInsert parameters set to false -->
- <class-descriptor className="org.apache.portals.graffito.jcr.testmodel.inheritance.impl.CmsObjectImpl" jcrNodeType="graffito:cmsobjectimpl"
+ <class-descriptor className="org.apache.jackrabbit.ocm.testmodel.inheritance.impl.CmsObjectImpl" jcrNodeType="ocm:cmsobjectimpl"
discriminator="false" abstract="true" >
- <implement-descriptor interfaceName="org.apache.portals.graffito.jcr.testmodel.interfaces.CmsObject" />
+ <implement-descriptor interfaceName="org.apache.jackrabbit.ocm.testmodel.interfaces.CmsObject" />
<field-descriptor fieldName="path" path="true" />
- <field-descriptor fieldName="name" jcrName="graffito:name" id="true" />
+ <field-descriptor fieldName="name" jcrName="ocm:name" id="true" />
<bean-descriptor fieldName="parentFolder"
- converter="org.apache.portals.graffito.jcr.persistence.beanconverter.impl.ParentBeanConverterImpl" />
+ converter="org.apache.jackrabbit.ocm.persistence.beanconverter.impl.ParentBeanConverterImpl" />
</class-descriptor>
- <class-descriptor className="org.apache.portals.graffito.jcr.testmodel.inheritance.impl.FolderImpl" jcrNodeType="graffito:folderimpl"
- extend="org.apache.portals.graffito.jcr.testmodel.inheritance.impl.CmsObjectImpl" discriminator="false" >
- <implement-descriptor interfaceName="org.apache.portals.graffito.jcr.testmodel.interfaces.Folder" />
+ <class-descriptor className="org.apache.jackrabbit.ocm.testmodel.inheritance.impl.FolderImpl" jcrNodeType="ocm:folderimpl"
+ extend="org.apache.jackrabbit.ocm.testmodel.inheritance.impl.CmsObjectImpl" discriminator="false" >
+ <implement-descriptor interfaceName="org.apache.jackrabbit.ocm.testmodel.interfaces.Folder" />
<collection-descriptor fieldName="children" proxy="true" autoUpdate="false" autoInsert="false" autoRetrieve="false"
- elementClassName="org.apache.portals.graffito.jcr.testmodel.inheritance.impl.CmsObjectImpl"
- collectionConverter="org.apache.portals.graffito.jcr.persistence.collectionconverter.impl.NTCollectionConverterImpl" />
+ elementClassName="org.apache.jackrabbit.ocm.testmodel.inheritance.impl.CmsObjectImpl"
+ collectionConverter="org.apache.jackrabbit.ocm.persistence.collectionconverter.impl.NTCollectionConverterImpl" />
</class-descriptor >
- <class-descriptor className="org.apache.portals.graffito.jcr.testmodel.inheritance.impl.ContentImpl" jcrNodeType="graffito:contentimpl" abstract="true"
- extend="org.apache.portals.graffito.jcr.testmodel.inheritance.impl.CmsObjectImpl" discriminator="false" >
- <implement-descriptor interfaceName="org.apache.portals.graffito.jcr.testmodel.interfaces.Content" />
+ <class-descriptor className="org.apache.jackrabbit.ocm.testmodel.inheritance.impl.ContentImpl" jcrNodeType="ocm:contentimpl" abstract="true"
+ extend="org.apache.jackrabbit.ocm.testmodel.inheritance.impl.CmsObjectImpl" discriminator="false" >
+ <implement-descriptor interfaceName="org.apache.jackrabbit.ocm.testmodel.interfaces.Content" />
</class-descriptor>
- <class-descriptor className="org.apache.portals.graffito.jcr.testmodel.inheritance.impl.DocumentImpl" jcrNodeType="graffito:documentimpl"
- extend="org.apache.portals.graffito.jcr.testmodel.inheritance.impl.ContentImpl" discriminator="false" >
- <implement-descriptor interfaceName="org.apache.portals.graffito.jcr.testmodel.interfaces.Document" />
- <field-descriptor fieldName="contentType" jcrName="graffito:contenttype" />
- <field-descriptor fieldName="size" jcrName="graffito:size" />
- <bean-descriptor fieldName="documentStream" jcrName="graffito:documentstream" autoUpdate="false" autoInsert="false" autoRetrieve="false" />
+ <class-descriptor className="org.apache.jackrabbit.ocm.testmodel.inheritance.impl.DocumentImpl" jcrNodeType="ocm:documentimpl"
+ extend="org.apache.jackrabbit.ocm.testmodel.inheritance.impl.ContentImpl" discriminator="false" >
+ <implement-descriptor interfaceName="org.apache.jackrabbit.ocm.testmodel.interfaces.Document" />
+ <field-descriptor fieldName="contentType" jcrName="ocm:contenttype" />
+ <field-descriptor fieldName="size" jcrName="ocm:size" />
+ <bean-descriptor fieldName="documentStream" jcrName="ocm:documentstream" autoUpdate="false" autoInsert="false" autoRetrieve="false" />
</class-descriptor >
- <class-descriptor className="org.apache.portals.graffito.jcr.testmodel.inheritance.impl.DocumentStream" jcrNodeType="graffito:documentstream" discriminator="false" >
+ <class-descriptor className="org.apache.jackrabbit.ocm.testmodel.inheritance.impl.DocumentStream" jcrNodeType="ocm:documentstream" discriminator="false" >
<field-descriptor fieldName="path" path="true" />
- <field-descriptor fieldName="encoding" jcrName="graffito:encoding" />
- <field-descriptor fieldName="content" jcrName="graffito:binarycontent" />
+ <field-descriptor fieldName="encoding" jcrName="ocm:encoding" />
+ <field-descriptor fieldName="content" jcrName="ocm:binarycontent" />
</class-descriptor>
-</graffito-jcr>
+</jackrabbit-ocm>
+
-
\ No newline at end of file
Modified: jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/test-config/jcrmapping-avoidrecursiveloop.xml
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/test-config/jcrmapping-avoidrecursiveloop.xml?view=diff&rev=536999&r1=536998&r2=536999
==============================================================================
--- jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/test-config/jcrmapping-avoidrecursiveloop.xml (original)
+++ jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/test-config/jcrmapping-avoidrecursiveloop.xml Thu May 10 14:25:11 2007
@@ -1,24 +1,24 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE graffito-jcr PUBLIC "-//The Apache Software Foundation//DTD Repository//EN" "./src/dtd/graffito-jcr-mapping.dtd">
-<graffito-jcr>
+<!DOCTYPE jackrabbit-ocm PUBLIC "-//The Apache Software Foundation//DTD Repository//EN" "./src/dtd/jackrabbit-ocm.dtd">
+<jackrabbit-ocm>
<class-descriptor
- className="org.apache.portals.graffito.jcr.testmodel.crossreference.A" jcrNodeType="nt:unstructured" >
+ className="org.apache.jackrabbit.ocm.testmodel.crossreference.A" jcrNodeType="nt:unstructured" >
<field-descriptor fieldName="path" path="true" />
<field-descriptor fieldName="a1" jcrName="a1" />
<field-descriptor fieldName="a2" jcrName="a2" />
<bean-descriptor fieldName="b" jcrName="b" proxy="false" />
<collection-descriptor fieldName="collection" proxy="false"
- elementClassName="org.apache.portals.graffito.jcr.testmodel.crossreference.B"
- collectionConverter="org.apache.portals.graffito.jcr.persistence.collectionconverter.impl.NTCollectionConverterImpl" />
+ elementClassName="org.apache.jackrabbit.ocm.testmodel.crossreference.B"
+ collectionConverter="org.apache.jackrabbit.ocm.persistence.collectionconverter.impl.NTCollectionConverterImpl" />
</class-descriptor>
- <class-descriptor className="org.apache.portals.graffito.jcr.testmodel.crossreference.B" jcrNodeType="nt:unstructured" >
+ <class-descriptor className="org.apache.jackrabbit.ocm.testmodel.crossreference.B" jcrNodeType="nt:unstructured" >
<field-descriptor fieldName="b1" jcrName="b1" />
<field-descriptor fieldName="b2" jcrName="b2" />
- <bean-descriptor fieldName="a" jcrName="a" proxy="false" converter="org.apache.portals.graffito.jcr.persistence.beanconverter.impl.ParentBeanConverterImpl" />
+ <bean-descriptor fieldName="a" jcrName="a" proxy="false" converter="org.apache.jackrabbit.ocm.persistence.beanconverter.impl.ParentBeanConverterImpl" />
</class-descriptor>
-</graffito-jcr>
-
\ No newline at end of file
+</jackrabbit-ocm>
+
Modified: jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/test-config/jcrmapping-beandescriptor.xml
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/test-config/jcrmapping-beandescriptor.xml?view=diff&rev=536999&r1=536998&r2=536999
==============================================================================
--- jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/test-config/jcrmapping-beandescriptor.xml (original)
+++ jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/test-config/jcrmapping-beandescriptor.xml Thu May 10 14:25:11 2007
@@ -1,17 +1,17 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE graffito-jcr PUBLIC "-//The Apache Software Foundation//DTD Repository//EN" "./src/dtd/graffito-jcr-mapping.dtd">
-<graffito-jcr>
- <class-descriptor className="org.apache.portals.graffito.jcr.testmodel.D" jcrNodeType="nt:unstructured" jcrSuperTypes="nt:base">
+<!DOCTYPE jackrabbit-ocm PUBLIC "-//The Apache Software Foundation//DTD Repository//EN" "./src/dtd/jackrabbit-ocm.dtd">
+<jackrabbit-ocm>
+ <class-descriptor className="org.apache.jackrabbit.ocm.testmodel.D" jcrNodeType="nt:unstructured" jcrSuperTypes="nt:base">
<field-descriptor fieldName="path" path="true" />
<field-descriptor fieldName="d1" jcrName="d1" jcrType="String" jcrAutoCreated="false" jcrMandatory="false"
jcrOnParentVersion="IGNORE" jcrProtected="false" jcrMultiple="false" />
- <bean-descriptor fieldName="b1" jcrName="b1" converter="org.apache.portals.graffito.jcr.persistence.beanconverter.impl.InlineBeanConverterImpl" />
+ <bean-descriptor fieldName="b1" jcrName="b1" converter="org.apache.jackrabbit.ocm.persistence.beanconverter.impl.InlineBeanConverterImpl" />
</class-descriptor>
- <class-descriptor className="org.apache.portals.graffito.jcr.testmodel.E" jcrNodeType="nt:unstructured" jcrSuperTypes="nt:base">
+ <class-descriptor className="org.apache.jackrabbit.ocm.testmodel.E" jcrNodeType="nt:unstructured" jcrSuperTypes="nt:base">
<field-descriptor fieldName="path" path="true" />
<field-descriptor fieldName="d1"
jcrName="d1"
@@ -24,11 +24,11 @@
<bean-descriptor fieldName="b1"
jcrName="b1"
- converter="org.apache.portals.graffito.jcr.persistence.beanconverter.FakeBeanConverter" />
+ converter="org.apache.jackrabbit.ocm.persistence.beanconverter.FakeBeanConverter" />
</class-descriptor>
- <class-descriptor className="org.apache.portals.graffito.jcr.testmodel.DFull" jcrNodeType="nt:unstructured" jcrSuperTypes="nt:base">
+ <class-descriptor className="org.apache.jackrabbit.ocm.testmodel.DFull" jcrNodeType="nt:unstructured" jcrSuperTypes="nt:base">
<field-descriptor fieldName="path" path="true" />
<field-descriptor fieldName="d1" jcrName="d1" jcrType="String" jcrAutoCreated="false" jcrMandatory="false"
jcrOnParentVersion="IGNORE" jcrProtected="false" jcrMultiple="false" />
@@ -39,5 +39,5 @@
<field-descriptor fieldName="b2" jcrName="b2" jcrType="String" jcrAutoCreated="false" jcrMandatory="false"
jcrOnParentVersion="IGNORE" jcrProtected="false" jcrMultiple="false" />
</class-descriptor>
-</graffito-jcr>
-
\ No newline at end of file
+</jackrabbit-ocm>
+
Modified: jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/test-config/jcrmapping-inheritance.xml
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/test-config/jcrmapping-inheritance.xml?view=diff&rev=536999&r1=536998&r2=536999
==============================================================================
--- jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/test-config/jcrmapping-inheritance.xml (original)
+++ jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/test-config/jcrmapping-inheritance.xml Thu May 10 14:25:11 2007
@@ -1,99 +1,99 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE graffito-jcr PUBLIC "-//The Apache Software Foundation//DTD Repository//EN" "./src/dtd/graffito-jcr-mapping.dtd">
-<graffito-jcr>
+<!DOCTYPE jackrabbit-ocm PUBLIC "-//The Apache Software Foundation//DTD Repository//EN" "./src/dtd/jackrabbit-ocm.dtd">
+<jackrabbit-ocm>
<!--MAPPING USED TO TEST INTERFACES WITHOUT NODE TYPE -->
- <class-descriptor className="org.apache.portals.graffito.jcr.testmodel.interfaces.Interface" interface="true" />
+ <class-descriptor className="org.apache.jackrabbit.ocm.testmodel.interfaces.Interface" interface="true" />
- <class-descriptor className="org.apache.portals.graffito.jcr.testmodel.interfaces.AnotherInterface" interface="true" />
+ <class-descriptor className="org.apache.jackrabbit.ocm.testmodel.interfaces.AnotherInterface" interface="true" />
<!--MAPPING USED TO TEST INTERFACES WITH NODE TYPE -->
- <class-descriptor className="org.apache.portals.graffito.jcr.testmodel.interfaces.CmsObject" interface="true" discriminator="false"
- jcrNodeType="graffito:cmsobject" />
+ <class-descriptor className="org.apache.jackrabbit.ocm.testmodel.interfaces.CmsObject" interface="true" discriminator="false"
+ jcrNodeType="ocm:cmsobject" />
- <class-descriptor className="org.apache.portals.graffito.jcr.testmodel.interfaces.Folder" interface="true" discriminator="false"
- extend="org.apache.portals.graffito.jcr.testmodel.interfaces.CmsObject" jcrNodeType="graffito:folder" />
+ <class-descriptor className="org.apache.jackrabbit.ocm.testmodel.interfaces.Folder" interface="true" discriminator="false"
+ extend="org.apache.jackrabbit.ocm.testmodel.interfaces.CmsObject" jcrNodeType="ocm:folder" />
- <class-descriptor className="org.apache.portals.graffito.jcr.testmodel.interfaces.Content" interface="true" discriminator="false"
- extend="org.apache.portals.graffito.jcr.testmodel.interfaces.CmsObject" jcrNodeType="graffito:content" />
+ <class-descriptor className="org.apache.jackrabbit.ocm.testmodel.interfaces.Content" interface="true" discriminator="false"
+ extend="org.apache.jackrabbit.ocm.testmodel.interfaces.CmsObject" jcrNodeType="ocm:content" />
- <class-descriptor className="org.apache.portals.graffito.jcr.testmodel.interfaces.Document" interface="true" discriminator="false"
- extend="org.apache.portals.graffito.jcr.testmodel.interfaces.Content" jcrNodeType="graffito:document" />
+ <class-descriptor className="org.apache.jackrabbit.ocm.testmodel.interfaces.Document" interface="true" discriminator="false"
+ extend="org.apache.jackrabbit.ocm.testmodel.interfaces.Content" jcrNodeType="ocm:document" />
<!-- MAPPING USED TO TEST NODE TYPE PER HIERARCHY -->
- <class-descriptor className="org.apache.portals.graffito.jcr.testmodel.inheritance.Ancestor" abstract="true" >
+ <class-descriptor className="org.apache.jackrabbit.ocm.testmodel.inheritance.Ancestor" abstract="true" >
<field-descriptor fieldName="path" path="true" />
<field-descriptor fieldName="ancestorField" jcrName="ancestorField" />
</class-descriptor>
- <class-descriptor className="org.apache.portals.graffito.jcr.testmodel.inheritance.Descendant"
- extend="org.apache.portals.graffito.jcr.testmodel.inheritance.Ancestor">
- <implement-descriptor interfaceName="org.apache.portals.graffito.jcr.testmodel.interfaces.AnotherInterface" />
+ <class-descriptor className="org.apache.jackrabbit.ocm.testmodel.inheritance.Descendant"
+ extend="org.apache.jackrabbit.ocm.testmodel.inheritance.Ancestor">
+ <implement-descriptor interfaceName="org.apache.jackrabbit.ocm.testmodel.interfaces.AnotherInterface" />
<field-descriptor fieldName="descendantField" jcrName="descendantField" />
<field-descriptor fieldName="intField" jcrName="intField" />
</class-descriptor >
- <class-descriptor className="org.apache.portals.graffito.jcr.testmodel.inheritance.AnotherDescendant"
- extend="org.apache.portals.graffito.jcr.testmodel.inheritance.Ancestor" >
- <implement-descriptor interfaceName="org.apache.portals.graffito.jcr.testmodel.interfaces.Interface" />
+ <class-descriptor className="org.apache.jackrabbit.ocm.testmodel.inheritance.AnotherDescendant"
+ extend="org.apache.jackrabbit.ocm.testmodel.inheritance.Ancestor" >
+ <implement-descriptor interfaceName="org.apache.jackrabbit.ocm.testmodel.interfaces.Interface" />
<field-descriptor fieldName="anotherDescendantField" jcrName="anotherDescendantField" />
</class-descriptor>
- <class-descriptor className="org.apache.portals.graffito.jcr.testmodel.inheritance.SubDescendant"
- extend="org.apache.portals.graffito.jcr.testmodel.inheritance.Descendant" >
+ <class-descriptor className="org.apache.jackrabbit.ocm.testmodel.inheritance.SubDescendant"
+ extend="org.apache.jackrabbit.ocm.testmodel.inheritance.Descendant" >
<field-descriptor fieldName="subDescendantField" jcrName="subDescendantField" />
</class-descriptor>
<!-- MAPPING USED TO TEST NODE TYPE PER CONCRETE CLASS -->
- <class-descriptor className="org.apache.portals.graffito.jcr.testmodel.inheritance.impl.CmsObjectImpl" jcrNodeType="graffito:cmsobjectimpl"
+ <class-descriptor className="org.apache.jackrabbit.ocm.testmodel.inheritance.impl.CmsObjectImpl" jcrNodeType="ocm:cmsobjectimpl"
discriminator="false" abstract="true" >
- <implement-descriptor interfaceName="org.apache.portals.graffito.jcr.testmodel.interfaces.CmsObject" />
+ <implement-descriptor interfaceName="org.apache.jackrabbit.ocm.testmodel.interfaces.CmsObject" />
<field-descriptor fieldName="path" path="true" />
- <field-descriptor fieldName="name" jcrName="graffito:name" id="true" />
+ <field-descriptor fieldName="name" jcrName="ocm:name" id="true" />
<bean-descriptor fieldName="parentFolder"
- converter="org.apache.portals.graffito.jcr.persistence.beanconverter.impl.ParentBeanConverterImpl" />
+ converter="org.apache.jackrabbit.ocm.persistence.beanconverter.impl.ParentBeanConverterImpl" />
</class-descriptor>
- <class-descriptor className="org.apache.portals.graffito.jcr.testmodel.inheritance.impl.FolderImpl" jcrNodeType="graffito:folderimpl"
- extend="org.apache.portals.graffito.jcr.testmodel.inheritance.impl.CmsObjectImpl" discriminator="false" >
- <implement-descriptor interfaceName="org.apache.portals.graffito.jcr.testmodel.interfaces.Folder" />
+ <class-descriptor className="org.apache.jackrabbit.ocm.testmodel.inheritance.impl.FolderImpl" jcrNodeType="ocm:folderimpl"
+ extend="org.apache.jackrabbit.ocm.testmodel.inheritance.impl.CmsObjectImpl" discriminator="false" >
+ <implement-descriptor interfaceName="org.apache.jackrabbit.ocm.testmodel.interfaces.Folder" />
<collection-descriptor fieldName="children" proxy="true" autoUpdate="false"
- elementClassName="org.apache.portals.graffito.jcr.testmodel.inheritance.impl.CmsObjectImpl"
- collectionConverter="org.apache.portals.graffito.jcr.persistence.collectionconverter.impl.NTCollectionConverterImpl" />
+ elementClassName="org.apache.jackrabbit.ocm.testmodel.inheritance.impl.CmsObjectImpl"
+ collectionConverter="org.apache.jackrabbit.ocm.persistence.collectionconverter.impl.NTCollectionConverterImpl" />
</class-descriptor >
- <class-descriptor className="org.apache.portals.graffito.jcr.testmodel.inheritance.impl.ContentImpl" jcrNodeType="graffito:contentimpl" abstract="true"
- extend="org.apache.portals.graffito.jcr.testmodel.inheritance.impl.CmsObjectImpl" discriminator="false" >
- <implement-descriptor interfaceName="org.apache.portals.graffito.jcr.testmodel.interfaces.Content" />
+ <class-descriptor className="org.apache.jackrabbit.ocm.testmodel.inheritance.impl.ContentImpl" jcrNodeType="ocm:contentimpl" abstract="true"
+ extend="org.apache.jackrabbit.ocm.testmodel.inheritance.impl.CmsObjectImpl" discriminator="false" >
+ <implement-descriptor interfaceName="org.apache.jackrabbit.ocm.testmodel.interfaces.Content" />
</class-descriptor>
- <class-descriptor className="org.apache.portals.graffito.jcr.testmodel.inheritance.impl.DocumentImpl" jcrNodeType="graffito:documentimpl"
- extend="org.apache.portals.graffito.jcr.testmodel.inheritance.impl.ContentImpl" discriminator="false" >
- <implement-descriptor interfaceName="org.apache.portals.graffito.jcr.testmodel.interfaces.Document" />
- <field-descriptor fieldName="contentType" jcrName="graffito:contenttype" />
- <field-descriptor fieldName="size" jcrName="graffito:size" />
- <bean-descriptor fieldName="documentStream" jcrName="graffito:documentstream" proxy="true" />
+ <class-descriptor className="org.apache.jackrabbit.ocm.testmodel.inheritance.impl.DocumentImpl" jcrNodeType="ocm:documentimpl"
+ extend="org.apache.jackrabbit.ocm.testmodel.inheritance.impl.ContentImpl" discriminator="false" >
+ <implement-descriptor interfaceName="org.apache.jackrabbit.ocm.testmodel.interfaces.Document" />
+ <field-descriptor fieldName="contentType" jcrName="ocm:contenttype" />
+ <field-descriptor fieldName="size" jcrName="ocm:size" />
+ <bean-descriptor fieldName="documentStream" jcrName="ocm:documentstream" proxy="true" />
</class-descriptor >
- <class-descriptor className="org.apache.portals.graffito.jcr.testmodel.inheritance.impl.DocumentStream" jcrNodeType="graffito:documentstream" discriminator="false" >
+ <class-descriptor className="org.apache.jackrabbit.ocm.testmodel.inheritance.impl.DocumentStream" jcrNodeType="ocm:documentstream" discriminator="false" >
<field-descriptor fieldName="path" path="true" />
- <field-descriptor fieldName="encoding" jcrName="graffito:encoding" />
- <field-descriptor fieldName="content" jcrName="graffito:binarycontent" />
+ <field-descriptor fieldName="encoding" jcrName="ocm:encoding" />
+ <field-descriptor fieldName="content" jcrName="ocm:binarycontent" />
</class-descriptor>
-</graffito-jcr>
+</jackrabbit-ocm>
+
-
\ No newline at end of file
Modified: jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/test-config/jcrmapping-jcrnodetypes.xml
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/test-config/jcrmapping-jcrnodetypes.xml?view=diff&rev=536999&r1=536998&r2=536999
==============================================================================
--- jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/test-config/jcrmapping-jcrnodetypes.xml (original)
+++ jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/test-config/jcrmapping-jcrnodetypes.xml Thu May 10 14:25:11 2007
@@ -1,45 +1,45 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE graffito-jcr PUBLIC "-//The Apache Software Foundation//DTD Repository//EN" "./src/dtd/graffito-jcr-mapping.dtd">
-<graffito-jcr>
+<!DOCTYPE jackrabbit-ocm PUBLIC "-//The Apache Software Foundation//DTD Repository//EN" "./src/dtd/jackrabbit-ocm.dtd">
+<jackrabbit-ocm>
- <class-descriptor className="org.apache.portals.graffito.jcr.testmodel.HierarchyNode" jcrNodeType="nt:hierarchyNode" >
+ <class-descriptor className="org.apache.jackrabbit.ocm.testmodel.HierarchyNode" jcrNodeType="nt:hierarchyNode" >
<field-descriptor fieldName="path" path="true" />
<field-descriptor fieldName="creationDate" jcrName="jcr:created"/>
</class-descriptor>
- <class-descriptor className="org.apache.portals.graffito.jcr.testmodel.Folder" jcrNodeType="nt:folder"
- extend="org.apache.portals.graffito.jcr.testmodel.HierarchyNode" >
+ <class-descriptor className="org.apache.jackrabbit.ocm.testmodel.Folder" jcrNodeType="nt:folder"
+ extend="org.apache.jackrabbit.ocm.testmodel.HierarchyNode" >
<field-descriptor fieldName="path" path="true" />
<collection-descriptor fieldName="children" proxy="false" autoUpdate="false"
- elementClassName="org.apache.portals.graffito.jcr.testmodel.HierarchyNode"
- collectionConverter="org.apache.portals.graffito.jcr.persistence.collectionconverter.impl.NTCollectionConverterImpl" />
+ elementClassName="org.apache.jackrabbit.ocm.testmodel.HierarchyNode"
+ collectionConverter="org.apache.jackrabbit.ocm.persistence.collectionconverter.impl.NTCollectionConverterImpl" />
</class-descriptor>
- <class-descriptor className="org.apache.portals.graffito.jcr.testmodel.File" jcrNodeType="nt:file"
- extend="org.apache.portals.graffito.jcr.testmodel.HierarchyNode" >
+ <class-descriptor className="org.apache.jackrabbit.ocm.testmodel.File" jcrNodeType="nt:file"
+ extend="org.apache.jackrabbit.ocm.testmodel.HierarchyNode" >
<field-descriptor fieldName="path" path="true" />
<bean-descriptor fieldName="resource" jcrName="jcr:content" />
</class-descriptor>
- <class-descriptor className="org.apache.portals.graffito.jcr.testmodel.Resource" jcrNodeType="nt:resource">
+ <class-descriptor className="org.apache.jackrabbit.ocm.testmodel.Resource" jcrNodeType="nt:resource">
<field-descriptor fieldName="mimeType" jcrName="jcr:mimeType"/>
<!-- field-descriptor fieldName="encoding" jcrName="jcr:encoding"/ -->
<field-descriptor fieldName="data" jcrName="jcr:data"/>
<field-descriptor fieldName="lastModified" jcrName="jcr:lastModified"/>
</class-descriptor>
- <class-descriptor className="org.apache.portals.graffito.jcr.testmodel.PropertyTest" jcrNodeType="graffito:propertytest" >
+ <class-descriptor className="org.apache.jackrabbit.ocm.testmodel.PropertyTest" jcrNodeType="ocm:propertytest" >
<field-descriptor fieldName="path" path="true" />
- <field-descriptor fieldName="requiredProp" jcrName="graffito:requiredProp" />
- <field-descriptor fieldName="requiredWithConstraintsProp" jcrName="graffito:requiredWithConstraintsProp" jcrValueConstraints="abc,def,ghi" />
- <field-descriptor fieldName="autoCreatedProp" jcrName="graffito:autoCreatedProp" jcrDefaultValue="aaa" />
- <field-descriptor fieldName="autoCreatedWithConstraintsProp" jcrName="graffito:autoCreatedWithConstraintsProp" jcrDefaultValue="ccc" jcrValueConstraints="bbb,ccc,ddd"/>
- <field-descriptor fieldName="mandatoryProp" jcrName="graffito:mandatoryProp" jcrMandatory="true" />
- <field-descriptor fieldName="mandatoryWithConstaintsProp" jcrName="graffito:mandatoryWithConstaintsProp" jcrMandatory="true" jcrValueConstraints="xx,yy"/>
- <field-descriptor fieldName="protectedWithDefaultValueProp" jcrName="graffito:protectedWithDefaultValueProp" jcrProtected="true"/>
+ <field-descriptor fieldName="requiredProp" jcrName="ocm:requiredProp" />
+ <field-descriptor fieldName="requiredWithConstraintsProp" jcrName="ocm:requiredWithConstraintsProp" jcrValueConstraints="abc,def,ghi" />
+ <field-descriptor fieldName="autoCreatedProp" jcrName="ocm:autoCreatedProp" jcrDefaultValue="aaa" />
+ <field-descriptor fieldName="autoCreatedWithConstraintsProp" jcrName="ocm:autoCreatedWithConstraintsProp" jcrDefaultValue="ccc" jcrValueConstraints="bbb,ccc,ddd"/>
+ <field-descriptor fieldName="mandatoryProp" jcrName="ocm:mandatoryProp" jcrMandatory="true" />
+ <field-descriptor fieldName="mandatoryWithConstaintsProp" jcrName="ocm:mandatoryWithConstaintsProp" jcrMandatory="true" jcrValueConstraints="xx,yy"/>
+ <field-descriptor fieldName="protectedWithDefaultValueProp" jcrName="ocm:protectedWithDefaultValueProp" jcrProtected="true"/>
</class-descriptor>
-</graffito-jcr>
-
\ No newline at end of file
+</jackrabbit-ocm>
+
Modified: jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/test-config/jcrmapping-proxy.xml
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/test-config/jcrmapping-proxy.xml?view=diff&rev=536999&r1=536998&r2=536999
==============================================================================
--- jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/test-config/jcrmapping-proxy.xml (original)
+++ jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/test-config/jcrmapping-proxy.xml Thu May 10 14:25:11 2007
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE graffito-jcr PUBLIC "-//The Apache Software Foundation//DTD Repository//EN" "./src/dtd/graffito-jcr-mapping.dtd">
-<graffito-jcr>
+<!DOCTYPE jackrabbit-ocm PUBLIC "-//The Apache Software Foundation//DTD Repository//EN" "./src/dtd/jackrabbit-ocm.dtd">
+<jackrabbit-ocm>
- <class-descriptor className="org.apache.portals.graffito.jcr.testmodel.proxy.Main" jcrNodeType="nt:unstructured" >
+ <class-descriptor className="org.apache.jackrabbit.ocm.testmodel.proxy.Main" jcrNodeType="nt:unstructured" >
<!-- Field-descriptor is used to map simple attributes to jcr property -->
<field-descriptor fieldName="path" path="true" />
<bean-descriptor fieldName="proxyDetail" jcrName="proxydetail" proxy="true" jcrNodeType="nt:unstructured" />
@@ -11,15 +11,15 @@
<bean-descriptor fieldName="detail" jcrName="detail" proxy="false" jcrNodeType="nt:unstructured" />
<collection-descriptor fieldName="proxyCollection" jcrName="proxycollection" proxy="true"
- elementClassName="org.apache.portals.graffito.jcr.testmodel.proxy.Detail" jcrNodeType="nt:unstructured"/>
+ elementClassName="org.apache.jackrabbit.ocm.testmodel.proxy.Detail" jcrNodeType="nt:unstructured"/>
<collection-descriptor fieldName="nullProxyCollection" jcrName="nullproxycollection" proxy="true"
- elementClassName="org.apache.portals.graffito.jcr.testmodel.proxy.Detail" jcrNodeType="nt:unstructured"/>
+ elementClassName="org.apache.jackrabbit.ocm.testmodel.proxy.Detail" jcrNodeType="nt:unstructured"/>
</class-descriptor>
- <class-descriptor className="org.apache.portals.graffito.jcr.testmodel.proxy.Detail" jcrNodeType="nt:unstructured" >
+ <class-descriptor className="org.apache.jackrabbit.ocm.testmodel.proxy.Detail" jcrNodeType="nt:unstructured" >
<field-descriptor fieldName="path" path="true" />
<field-descriptor fieldName="field" jcrName="field" />
</class-descriptor>
-</graffito-jcr>
-
\ No newline at end of file
+</jackrabbit-ocm>
+
Modified: jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/test-config/jcrmapping-sibling.xml
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/test-config/jcrmapping-sibling.xml?view=diff&rev=536999&r1=536998&r2=536999
==============================================================================
--- jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/test-config/jcrmapping-sibling.xml (original)
+++ jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/test-config/jcrmapping-sibling.xml Thu May 10 14:25:11 2007
@@ -1,23 +1,23 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE graffito-jcr PUBLIC "-//The Apache Software Foundation//DTD Repository//EN" "./src/dtd/graffito-jcr-mapping.dtd">
-<graffito-jcr>
+<!DOCTYPE jackrabbit-ocm PUBLIC "-//The Apache Software Foundation//DTD Repository//EN" "./src/dtd/jackrabbit-ocm.dtd">
+<jackrabbit-ocm>
- <class-descriptor className="org.apache.portals.graffito.jcr.testmodel.Page" jcrNodeType="graffito:pagewithoutsibling" discriminator="false" >
+ <class-descriptor className="org.apache.jackrabbit.ocm.testmodel.Page" jcrNodeType="ocm:pagewithoutsibling" discriminator="false" >
<field-descriptor fieldName="path" path="true" />
- <field-descriptor fieldName="title" jcrName="graffito:title" />
+ <field-descriptor fieldName="title" jcrName="ocm:title" />
<collection-descriptor fieldName="paragraphs" proxy="false"
- elementClassName="org.apache.portals.graffito.jcr.testmodel.Paragraph"
- collectionConverter="org.apache.portals.graffito.jcr.persistence.collectionconverter.impl.NTCollectionConverterImpl" />
+ elementClassName="org.apache.jackrabbit.ocm.testmodel.Paragraph"
+ collectionConverter="org.apache.jackrabbit.ocm.persistence.collectionconverter.impl.NTCollectionConverterImpl" />
</class-descriptor>
- <class-descriptor className="org.apache.portals.graffito.jcr.testmodel.Paragraph" jcrNodeType="graffito:paragraph" discriminator="false" >
+ <class-descriptor className="org.apache.jackrabbit.ocm.testmodel.Paragraph" jcrNodeType="ocm:paragraph" discriminator="false" >
<field-descriptor fieldName="path" path="true" />
- <field-descriptor fieldName="text" jcrName="graffito:text"/>
+ <field-descriptor fieldName="text" jcrName="ocm:text"/>
</class-descriptor>
<class-descriptor
- className="org.apache.portals.graffito.jcr.testmodel.Atomic" jcrNodeType="nt:unstructured" discriminator="true" >
+ className="org.apache.jackrabbit.ocm.testmodel.Atomic" jcrNodeType="nt:unstructured" discriminator="true" >
<field-descriptor fieldName="path" path="true" />
<field-descriptor fieldName="string" jcrName="string" />
<field-descriptor fieldName="booleanObject" jcrName="booleanObject" />
@@ -33,5 +33,5 @@
<field-descriptor fieldName="timestamp" jcrName="timestamp" />
</class-descriptor>
-</graffito-jcr>
-
\ No newline at end of file
+</jackrabbit-ocm>
+
Modified: jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/test-config/jcrmapping-testdigester.xml
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/test-config/jcrmapping-testdigester.xml?view=diff&rev=536999&r1=536998&r2=536999
==============================================================================
--- jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/test-config/jcrmapping-testdigester.xml (original)
+++ jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/test-config/jcrmapping-testdigester.xml Thu May 10 14:25:11 2007
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE graffito-jcr PUBLIC "-//The Apache Software Foundation//DTD Repository//EN" "./src/dtd/graffito-jcr-mapping.dtd">
-<graffito-jcr>
+<!DOCTYPE jackrabbit-ocm PUBLIC "-//The Apache Software Foundation//DTD Repository//EN" "./src/dtd/jackrabbit-ocm.dtd">
+<jackrabbit-ocm>
@@ -12,7 +12,7 @@
-->
<class-descriptor
- className="org.apache.portals.graffito.jcr.testmodel.A"
+ className="org.apache.jackrabbit.ocm.testmodel.A"
jcrNodeType="nt:unstructured" jcrMixinTypes="mixin:a,mixin:b">
<!-- Field-descriptor is used to map simple attributes to jcr property -->
<field-descriptor fieldName="path" path="true" />
@@ -24,7 +24,7 @@
* proxy="true" => use lazy laoding for this attribute b when retrieving A
-->
<bean-descriptor fieldName="b" jcrName="b" proxy="false"
- converter="org.apache.portals.graffito.jcr.persistence.beanconverter.impl.InlineBeanConverterImpl"
+ converter="org.apache.jackrabbit.ocm.persistence.beanconverter.impl.InlineBeanConverterImpl"
jcrNodeType="nt:unstructured" jcrAutoCreated="false"
jcrMandatory="false" jcrOnParentVersion="IGNORE" jcrProtected="false"
jcrSameNameSiblings="false" />
@@ -36,19 +36,19 @@
-->
<collection-descriptor fieldName="collection"
jcrName="collection" proxy="false"
- elementClassName="org.apache.portals.graffito.jcr.testmodel.C"
- jcrNodeType="graffito:C" jcrAutoCreated="false" jcrMandatory="false"
+ elementClassName="org.apache.jackrabbit.ocm.testmodel.C"
+ jcrNodeType="ocm:C" jcrAutoCreated="false" jcrMandatory="false"
jcrOnParentVersion="IGNORE" jcrProtected="false"
jcrSameNameSiblings="false" />
<collection-descriptor fieldName="emptyCollection"
jcrName="emptyCollection" proxy="false"
- elementClassName="org.apache.portals.graffito.jcr.testmodel.C" />
+ elementClassName="org.apache.jackrabbit.ocm.testmodel.C" />
</class-descriptor>
<class-descriptor
- className="org.apache.portals.graffito.jcr.testmodel.B"
+ className="org.apache.jackrabbit.ocm.testmodel.B"
jcrNodeType="nt:unstructured" jcrSuperTypes="nt:base">
<!-- Field-descriptor is used to map simple attributes to jcr property -->
@@ -63,40 +63,40 @@
</class-descriptor>
<class-descriptor
- className="org.apache.portals.graffito.jcr.testmodel.C"
- jcrNodeType="graffito:C" discriminator="false">
+ className="org.apache.jackrabbit.ocm.testmodel.C"
+ jcrNodeType="ocm:C" discriminator="false">
<!-- Field-descriptor is used to map simple attributes to jcr property -->
- <field-descriptor fieldName="id" jcrName="graffito:id"
+ <field-descriptor fieldName="id" jcrName="ocm:id"
id="true" />
- <field-descriptor fieldName="name" jcrName="graffito:name" />
+ <field-descriptor fieldName="name" jcrName="ocm:name" />
</class-descriptor>
<class-descriptor
- className="org.apache.portals.graffito.jcr.testmodel.hashmap.Main"
+ className="org.apache.jackrabbit.ocm.testmodel.hashmap.Main"
jcrNodeType="nt:unstructured">
<field-descriptor fieldName="path" path="true" />
<field-descriptor fieldName="text" jcrName="text" />
<collection-descriptor fieldName="elements" proxy="false"
- elementClassName="org.apache.portals.graffito.jcr.testmodel.hashmap.Element"
- collectionConverter="org.apache.portals.graffito.jcr.persistence.collectionconverter.impl.NTCollectionConverterImpl"
- collectionClassName="org.apache.portals.graffito.jcr.testmodel.hashmap.HashMapElement" />
+ elementClassName="org.apache.jackrabbit.ocm.testmodel.hashmap.Element"
+ collectionConverter="org.apache.jackrabbit.ocm.persistence.collectionconverter.impl.NTCollectionConverterImpl"
+ collectionClassName="org.apache.jackrabbit.ocm.testmodel.hashmap.HashMapElement" />
</class-descriptor>
<class-descriptor
- className="org.apache.portals.graffito.jcr.testmodel.hashmap.Element"
- jcrNodeType="graffito:element" discriminator="false">
- <field-descriptor fieldName="id" jcrName="graffito:id" />
- <field-descriptor fieldName="text" jcrName="graffito:text" />
+ className="org.apache.jackrabbit.ocm.testmodel.hashmap.Element"
+ jcrNodeType="ocm:element" discriminator="false">
+ <field-descriptor fieldName="id" jcrName="ocm:id" />
+ <field-descriptor fieldName="text" jcrName="ocm:text" />
</class-descriptor>
<class-descriptor
- className="org.apache.portals.graffito.jcr.testmodel.uuid.A" jcrNodeType="nt:unstructured" >
+ className="org.apache.jackrabbit.ocm.testmodel.uuid.A" jcrNodeType="nt:unstructured" >
<field-descriptor fieldName="path" path="true" />
<field-descriptor fieldName="uuid" uuid="true" />
<field-descriptor fieldName="stringData" jcrName="stringData" />
</class-descriptor>
-</graffito-jcr>
+</jackrabbit-ocm>
Modified: jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/test-config/jcrmapping-uuid.xml
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/test-config/jcrmapping-uuid.xml?view=diff&rev=536999&r1=536998&r2=536999
==============================================================================
--- jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/test-config/jcrmapping-uuid.xml (original)
+++ jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/test-config/jcrmapping-uuid.xml Thu May 10 14:25:11 2007
@@ -1,41 +1,41 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE graffito-jcr PUBLIC "-//The Apache Software Foundation//DTD Repository//EN" "./src/dtd/graffito-jcr-mapping.dtd">
-<graffito-jcr>
+<!DOCTYPE jackrabbit-ocm PUBLIC "-//The Apache Software Foundation//DTD Repository//EN" "./src/dtd/jackrabbit-ocm.dtd">
+<jackrabbit-ocm>
<class-descriptor
- className="org.apache.portals.graffito.jcr.testmodel.uuid.A" jcrNodeType="nt:unstructured" jcrMixinTypes="mix:referenceable" >
+ className="org.apache.jackrabbit.ocm.testmodel.uuid.A" jcrNodeType="nt:unstructured" jcrMixinTypes="mix:referenceable" >
<field-descriptor fieldName="path" path="true" />
<field-descriptor fieldName="uuid" uuid="true" />
<field-descriptor fieldName="stringData" jcrName="stringData" />
</class-descriptor>
<class-descriptor
- className="org.apache.portals.graffito.jcr.testmodel.uuid.B" jcrNodeType="nt:unstructured" >
+ className="org.apache.jackrabbit.ocm.testmodel.uuid.B" jcrNodeType="nt:unstructured" >
<field-descriptor fieldName="path" path="true" />
- <field-descriptor fieldName="reference2A" jcrName="reference2A" converter="org.apache.portals.graffito.jcr.persistence.atomictypeconverter.impl.ReferenceTypeConverterImpl" />
+ <field-descriptor fieldName="reference2A" jcrName="reference2A" converter="org.apache.jackrabbit.ocm.persistence.atomictypeconverter.impl.ReferenceTypeConverterImpl" />
<collection-descriptor fieldName="multiReferences" jcrName="multiReferences" proxy="false"
- collectionConverter="org.apache.portals.graffito.jcr.persistence.collectionconverter.impl.ReferenceCollectionConverterImpl" />
+ collectionConverter="org.apache.jackrabbit.ocm.persistence.collectionconverter.impl.ReferenceCollectionConverterImpl" />
</class-descriptor>
<class-descriptor
- className="org.apache.portals.graffito.jcr.testmodel.uuid.B2" jcrNodeType="nt:unstructured" >
+ className="org.apache.jackrabbit.ocm.testmodel.uuid.B2" jcrNodeType="nt:unstructured" >
<field-descriptor fieldName="path" path="true" />
- <bean-descriptor fieldName="a" jcrName="a" converter="org.apache.portals.graffito.jcr.persistence.beanconverter.impl.ReferenceBeanConverterImpl" />
+ <bean-descriptor fieldName="a" jcrName="a" converter="org.apache.jackrabbit.ocm.persistence.beanconverter.impl.ReferenceBeanConverterImpl" />
<collection-descriptor fieldName="multiReferences" jcrName="multiReferences" proxy="false"
- collectionConverter="org.apache.portals.graffito.jcr.persistence.collectionconverter.impl.BeanReferenceCollectionConverterImpl" />
+ collectionConverter="org.apache.jackrabbit.ocm.persistence.collectionconverter.impl.BeanReferenceCollectionConverterImpl" />
</class-descriptor>
- <class-descriptor className="org.apache.portals.graffito.jcr.testmodel.uuid.Ancestor" abstract="true" jcrMixinTypes="mix:referenceable">
+ <class-descriptor className="org.apache.jackrabbit.ocm.testmodel.uuid.Ancestor" abstract="true" jcrMixinTypes="mix:referenceable">
<field-descriptor fieldName="path" path="true" />
<field-descriptor fieldName="uuid" uuid="true" />
</class-descriptor>
- <class-descriptor className="org.apache.portals.graffito.jcr.testmodel.uuid.Descendant" jcrMixinTypes="mix:referenceable"
- extend="org.apache.portals.graffito.jcr.testmodel.uuid.Ancestor">
+ <class-descriptor className="org.apache.jackrabbit.ocm.testmodel.uuid.Descendant" jcrMixinTypes="mix:referenceable"
+ extend="org.apache.jackrabbit.ocm.testmodel.uuid.Ancestor">
<field-descriptor fieldName="stringData" jcrName="stringData" />
</class-descriptor >
-</graffito-jcr>
-
\ No newline at end of file
+</jackrabbit-ocm>
+