Author: sascharodekamp
Date: Tue Apr 24 13:51:43 2012 New Revision: 1329721 URL: http://svn.apache.org/viewvc?rev=1329721&view=rev Log: Move the repository mapping files in a sub package. To differ between file and data mappings. Each node contains now a field which identifies the party who created the content and the party which modified it last. Added: ofbiz/trunk/framework/jcr/src/org/ofbiz/jcr/orm/jackrabbit/data/JackrabbitArticle.java (contents, props changed) - copied, changed from r1329569, ofbiz/trunk/framework/jcr/src/org/ofbiz/jcr/orm/jackrabbit/JackrabbitArticle.java ofbiz/trunk/framework/jcr/src/org/ofbiz/jcr/orm/jackrabbit/data/JackrabbitLocalizedContent.java (contents, props changed) - copied, changed from r1329569, ofbiz/trunk/framework/jcr/src/org/ofbiz/jcr/orm/jackrabbit/JackrabbitLocalizedContent.java ofbiz/trunk/framework/jcr/src/org/ofbiz/jcr/orm/jackrabbit/data/JackrabbitNews.java (contents, props changed) - copied, changed from r1329569, ofbiz/trunk/framework/jcr/src/org/ofbiz/jcr/orm/jackrabbit/JackrabbitNews.java ofbiz/trunk/framework/jcr/src/org/ofbiz/jcr/orm/jackrabbit/data/JackrabbitUnstructured.java (contents, props changed) - copied, changed from r1329569, ofbiz/trunk/framework/jcr/src/org/ofbiz/jcr/orm/jackrabbit/JackrabbitUnstructured.java ofbiz/trunk/framework/jcr/src/org/ofbiz/jcr/orm/jackrabbit/file/JackrabbitFile.java (contents, props changed) - copied, changed from r1329569, ofbiz/trunk/framework/jcr/src/org/ofbiz/jcr/orm/jackrabbit/JackrabbitFile.java ofbiz/trunk/framework/jcr/src/org/ofbiz/jcr/orm/jackrabbit/file/JackrabbitFolder.java (contents, props changed) - copied, changed from r1329569, ofbiz/trunk/framework/jcr/src/org/ofbiz/jcr/orm/jackrabbit/JackrabbitFolder.java ofbiz/trunk/framework/jcr/src/org/ofbiz/jcr/orm/jackrabbit/file/JackrabbitHierarchyNode.java (contents, props changed) - copied, changed from r1329569, ofbiz/trunk/framework/jcr/src/org/ofbiz/jcr/orm/jackrabbit/JackrabbitHierarchyNode.java ofbiz/trunk/framework/jcr/src/org/ofbiz/jcr/orm/jackrabbit/file/JackrabbitResource.java (contents, props changed) - copied, changed from r1329569, ofbiz/trunk/framework/jcr/src/org/ofbiz/jcr/orm/jackrabbit/JackrabbitResource.java Copied: ofbiz/trunk/framework/jcr/src/org/ofbiz/jcr/orm/jackrabbit/data/JackrabbitArticle.java (from r1329569, ofbiz/trunk/framework/jcr/src/org/ofbiz/jcr/orm/jackrabbit/JackrabbitArticle.java) URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/jcr/src/org/ofbiz/jcr/orm/jackrabbit/data/JackrabbitArticle.java?p2=ofbiz/trunk/framework/jcr/src/org/ofbiz/jcr/orm/jackrabbit/data/JackrabbitArticle.java&p1=ofbiz/trunk/framework/jcr/src/org/ofbiz/jcr/orm/jackrabbit/JackrabbitArticle.java&r1=1329569&r2=1329721&rev=1329721&view=diff ============================================================================== --- ofbiz/trunk/framework/jcr/src/org/ofbiz/jcr/orm/jackrabbit/JackrabbitArticle.java (original) +++ ofbiz/trunk/framework/jcr/src/org/ofbiz/jcr/orm/jackrabbit/data/JackrabbitArticle.java Tue Apr 24 13:51:43 2012 @@ -1,4 +1,4 @@ -package org.ofbiz.jcr.orm.jackrabbit; +package org.ofbiz.jcr.orm.jackrabbit.data; import java.util.Calendar; Propchange: ofbiz/trunk/framework/jcr/src/org/ofbiz/jcr/orm/jackrabbit/data/JackrabbitArticle.java ------------------------------------------------------------------------------ svn:mime-type = text/plain Copied: ofbiz/trunk/framework/jcr/src/org/ofbiz/jcr/orm/jackrabbit/data/JackrabbitLocalizedContent.java (from r1329569, ofbiz/trunk/framework/jcr/src/org/ofbiz/jcr/orm/jackrabbit/JackrabbitLocalizedContent.java) URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/jcr/src/org/ofbiz/jcr/orm/jackrabbit/data/JackrabbitLocalizedContent.java?p2=ofbiz/trunk/framework/jcr/src/org/ofbiz/jcr/orm/jackrabbit/data/JackrabbitLocalizedContent.java&p1=ofbiz/trunk/framework/jcr/src/org/ofbiz/jcr/orm/jackrabbit/JackrabbitLocalizedContent.java&r1=1329569&r2=1329721&rev=1329721&view=diff ============================================================================== --- ofbiz/trunk/framework/jcr/src/org/ofbiz/jcr/orm/jackrabbit/JackrabbitLocalizedContent.java (original) +++ ofbiz/trunk/framework/jcr/src/org/ofbiz/jcr/orm/jackrabbit/data/JackrabbitLocalizedContent.java Tue Apr 24 13:51:43 2012 @@ -1,4 +1,4 @@ -package org.ofbiz.jcr.orm.jackrabbit; +package org.ofbiz.jcr.orm.jackrabbit.data; import java.util.GregorianCalendar; Propchange: ofbiz/trunk/framework/jcr/src/org/ofbiz/jcr/orm/jackrabbit/data/JackrabbitLocalizedContent.java ------------------------------------------------------------------------------ svn:mime-type = text/plain Copied: ofbiz/trunk/framework/jcr/src/org/ofbiz/jcr/orm/jackrabbit/data/JackrabbitNews.java (from r1329569, ofbiz/trunk/framework/jcr/src/org/ofbiz/jcr/orm/jackrabbit/JackrabbitNews.java) URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/jcr/src/org/ofbiz/jcr/orm/jackrabbit/data/JackrabbitNews.java?p2=ofbiz/trunk/framework/jcr/src/org/ofbiz/jcr/orm/jackrabbit/data/JackrabbitNews.java&p1=ofbiz/trunk/framework/jcr/src/org/ofbiz/jcr/orm/jackrabbit/JackrabbitNews.java&r1=1329569&r2=1329721&rev=1329721&view=diff ============================================================================== --- ofbiz/trunk/framework/jcr/src/org/ofbiz/jcr/orm/jackrabbit/JackrabbitNews.java (original) +++ ofbiz/trunk/framework/jcr/src/org/ofbiz/jcr/orm/jackrabbit/data/JackrabbitNews.java Tue Apr 24 13:51:43 2012 @@ -1,4 +1,4 @@ -package org.ofbiz.jcr.orm.jackrabbit; +package org.ofbiz.jcr.orm.jackrabbit.data; import java.util.Calendar; Propchange: ofbiz/trunk/framework/jcr/src/org/ofbiz/jcr/orm/jackrabbit/data/JackrabbitNews.java ------------------------------------------------------------------------------ svn:mime-type = text/plain Copied: ofbiz/trunk/framework/jcr/src/org/ofbiz/jcr/orm/jackrabbit/data/JackrabbitUnstructured.java (from r1329569, ofbiz/trunk/framework/jcr/src/org/ofbiz/jcr/orm/jackrabbit/JackrabbitUnstructured.java) URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/jcr/src/org/ofbiz/jcr/orm/jackrabbit/data/JackrabbitUnstructured.java?p2=ofbiz/trunk/framework/jcr/src/org/ofbiz/jcr/orm/jackrabbit/data/JackrabbitUnstructured.java&p1=ofbiz/trunk/framework/jcr/src/org/ofbiz/jcr/orm/jackrabbit/JackrabbitUnstructured.java&r1=1329569&r2=1329721&rev=1329721&view=diff ============================================================================== --- ofbiz/trunk/framework/jcr/src/org/ofbiz/jcr/orm/jackrabbit/JackrabbitUnstructured.java (original) +++ ofbiz/trunk/framework/jcr/src/org/ofbiz/jcr/orm/jackrabbit/data/JackrabbitUnstructured.java Tue Apr 24 13:51:43 2012 @@ -1,12 +1,12 @@ -package org.ofbiz.jcr.orm.jackrabbit; +package org.ofbiz.jcr.orm.jackrabbit.data; import java.util.Calendar; import java.util.GregorianCalendar; import org.apache.jackrabbit.ocm.mapper.impl.annotation.Field; import org.apache.jackrabbit.ocm.mapper.impl.annotation.Node; -import org.ofbiz.jcr.access.jackrabbit.ConstantsJackrabbit; import org.ofbiz.jcr.orm.OfbizRepositoryMapping; +import org.ofbiz.jcr.util.jackrabbit.JackrabbitUtils; @Node(isAbstract = true, jcrMixinTypes = "mix:versionable") public abstract class JackrabbitUnstructured implements OfbizRepositoryMapping { @@ -21,6 +21,10 @@ public abstract class JackrabbitUnstruct private Calendar creationDate; @Field private boolean localized; + @Field + private String partyThatCreatedTheContent; + @Field + private String lastUpdatedParty; protected JackrabbitUnstructured() { // create an empty object @@ -49,11 +53,7 @@ public abstract class JackrabbitUnstruct */ @Override public void setPath(String nodePath) { - // check if the node path is an absolute path - if (!nodePath.startsWith(ConstantsJackrabbit.ROOTPATH)) { - nodePath = ConstantsJackrabbit.ROOTPATH + nodePath; - } - + nodePath = JackrabbitUtils.createAbsoluteNodePath(nodePath); this.path = nodePath; } @@ -94,4 +94,20 @@ public abstract class JackrabbitUnstruct this.localized = isLocalized; } + public void setPartyThatCreatedTheContent(String partyId) { + this.partyThatCreatedTheContent = partyId; + } + + public String getPartyThatCreatedTheContent() { + return this.partyThatCreatedTheContent; + } + + public void setLastUpdatedParty(String partyId) { + this.lastUpdatedParty = partyId; + } + + public String getLastUpdatedParty() { + return this.lastUpdatedParty; + } + } Propchange: ofbiz/trunk/framework/jcr/src/org/ofbiz/jcr/orm/jackrabbit/data/JackrabbitUnstructured.java ------------------------------------------------------------------------------ svn:mime-type = text/plain Copied: ofbiz/trunk/framework/jcr/src/org/ofbiz/jcr/orm/jackrabbit/file/JackrabbitFile.java (from r1329569, ofbiz/trunk/framework/jcr/src/org/ofbiz/jcr/orm/jackrabbit/JackrabbitFile.java) URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/jcr/src/org/ofbiz/jcr/orm/jackrabbit/file/JackrabbitFile.java?p2=ofbiz/trunk/framework/jcr/src/org/ofbiz/jcr/orm/jackrabbit/file/JackrabbitFile.java&p1=ofbiz/trunk/framework/jcr/src/org/ofbiz/jcr/orm/jackrabbit/JackrabbitFile.java&r1=1329569&r2=1329721&rev=1329721&view=diff ============================================================================== --- ofbiz/trunk/framework/jcr/src/org/ofbiz/jcr/orm/jackrabbit/JackrabbitFile.java (original) +++ ofbiz/trunk/framework/jcr/src/org/ofbiz/jcr/orm/jackrabbit/file/JackrabbitFile.java Tue Apr 24 13:51:43 2012 @@ -1,4 +1,4 @@ -package org.ofbiz.jcr.orm.jackrabbit; +package org.ofbiz.jcr.orm.jackrabbit.file; import org.apache.jackrabbit.ocm.mapper.impl.annotation.Bean; import org.apache.jackrabbit.ocm.mapper.impl.annotation.Node; Propchange: ofbiz/trunk/framework/jcr/src/org/ofbiz/jcr/orm/jackrabbit/file/JackrabbitFile.java ------------------------------------------------------------------------------ svn:mime-type = text/plain Copied: ofbiz/trunk/framework/jcr/src/org/ofbiz/jcr/orm/jackrabbit/file/JackrabbitFolder.java (from r1329569, ofbiz/trunk/framework/jcr/src/org/ofbiz/jcr/orm/jackrabbit/JackrabbitFolder.java) URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/jcr/src/org/ofbiz/jcr/orm/jackrabbit/file/JackrabbitFolder.java?p2=ofbiz/trunk/framework/jcr/src/org/ofbiz/jcr/orm/jackrabbit/file/JackrabbitFolder.java&p1=ofbiz/trunk/framework/jcr/src/org/ofbiz/jcr/orm/jackrabbit/JackrabbitFolder.java&r1=1329569&r2=1329721&rev=1329721&view=diff ============================================================================== --- ofbiz/trunk/framework/jcr/src/org/ofbiz/jcr/orm/jackrabbit/JackrabbitFolder.java (original) +++ ofbiz/trunk/framework/jcr/src/org/ofbiz/jcr/orm/jackrabbit/file/JackrabbitFolder.java Tue Apr 24 13:51:43 2012 @@ -1,4 +1,4 @@ -package org.ofbiz.jcr.orm.jackrabbit; +package org.ofbiz.jcr.orm.jackrabbit.file; import java.util.ArrayList; import java.util.List; Propchange: ofbiz/trunk/framework/jcr/src/org/ofbiz/jcr/orm/jackrabbit/file/JackrabbitFolder.java ------------------------------------------------------------------------------ svn:mime-type = text/plain Copied: ofbiz/trunk/framework/jcr/src/org/ofbiz/jcr/orm/jackrabbit/file/JackrabbitHierarchyNode.java (from r1329569, ofbiz/trunk/framework/jcr/src/org/ofbiz/jcr/orm/jackrabbit/JackrabbitHierarchyNode.java) URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/jcr/src/org/ofbiz/jcr/orm/jackrabbit/file/JackrabbitHierarchyNode.java?p2=ofbiz/trunk/framework/jcr/src/org/ofbiz/jcr/orm/jackrabbit/file/JackrabbitHierarchyNode.java&p1=ofbiz/trunk/framework/jcr/src/org/ofbiz/jcr/orm/jackrabbit/JackrabbitHierarchyNode.java&r1=1329569&r2=1329721&rev=1329721&view=diff ============================================================================== --- ofbiz/trunk/framework/jcr/src/org/ofbiz/jcr/orm/jackrabbit/JackrabbitHierarchyNode.java (original) +++ ofbiz/trunk/framework/jcr/src/org/ofbiz/jcr/orm/jackrabbit/file/JackrabbitHierarchyNode.java Tue Apr 24 13:51:43 2012 @@ -1,4 +1,4 @@ -package org.ofbiz.jcr.orm.jackrabbit; +package org.ofbiz.jcr.orm.jackrabbit.file; import java.util.Calendar; @@ -7,13 +7,17 @@ import org.apache.jackrabbit.ocm.mapper. import org.ofbiz.jcr.orm.OfbizRepositoryMapping; import org.ofbiz.jcr.util.jackrabbit.JackrabbitUtils; -@Node(jcrType = "nt:hierarchyNode", jcrMixinTypes="mix:versionable") +@Node(jcrType = "nt:hierarchyNode", jcrMixinTypes = "mix:versionable") public class JackrabbitHierarchyNode implements OfbizRepositoryMapping { @Field(path = true, id = true, jcrProtected = true) protected String path; private String version; @Field(jcrName = "jcr:created") private Calendar creationDate; + @Field + private String lastUpdatedParty; + @Field + private String partyThatCreatedTheContent; public String getPath() { return path; @@ -42,4 +46,20 @@ public class JackrabbitHierarchyNode imp this.version = version; } + public void setPartyThatCreatedTheContent(String partyId) { + this.partyThatCreatedTheContent = partyId; + } + + public String getPartyThatCreatedTheContent() { + return this.partyThatCreatedTheContent; + } + + public void setLastUpdatedParty(String partyId) { + this.lastUpdatedParty = partyId; + } + + public String getLastUpdatedParty() { + return this.lastUpdatedParty; + } + } Propchange: ofbiz/trunk/framework/jcr/src/org/ofbiz/jcr/orm/jackrabbit/file/JackrabbitHierarchyNode.java ------------------------------------------------------------------------------ svn:mime-type = text/plain Copied: ofbiz/trunk/framework/jcr/src/org/ofbiz/jcr/orm/jackrabbit/file/JackrabbitResource.java (from r1329569, ofbiz/trunk/framework/jcr/src/org/ofbiz/jcr/orm/jackrabbit/JackrabbitResource.java) URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/jcr/src/org/ofbiz/jcr/orm/jackrabbit/file/JackrabbitResource.java?p2=ofbiz/trunk/framework/jcr/src/org/ofbiz/jcr/orm/jackrabbit/file/JackrabbitResource.java&p1=ofbiz/trunk/framework/jcr/src/org/ofbiz/jcr/orm/jackrabbit/JackrabbitResource.java&r1=1329569&r2=1329721&rev=1329721&view=diff ============================================================================== --- ofbiz/trunk/framework/jcr/src/org/ofbiz/jcr/orm/jackrabbit/JackrabbitResource.java (original) +++ ofbiz/trunk/framework/jcr/src/org/ofbiz/jcr/orm/jackrabbit/file/JackrabbitResource.java Tue Apr 24 13:51:43 2012 @@ -1,4 +1,4 @@ -package org.ofbiz.jcr.orm.jackrabbit; +package org.ofbiz.jcr.orm.jackrabbit.file; import java.io.InputStream; import java.util.Calendar; Propchange: ofbiz/trunk/framework/jcr/src/org/ofbiz/jcr/orm/jackrabbit/file/JackrabbitResource.java ------------------------------------------------------------------------------ svn:mime-type = text/plain |
Free forum by Nabble | Edit this page |