Author: suat
Date: Tue Sep 6 08:06:11 2011
New Revision: 1165557
URL: http://svn.apache.org/viewvc?rev=1165557&view=rev
Log:
STANBOL-306:
-Added two predicates for mixin types and primary type properties of JCR
instead of parsing them manually
Modified:
incubator/stanbol/trunk/cmsadapter/cmis/src/main/java/org/apache/stanbol/cmsadapter/cmis/repository/CMISRDFMapper.java
incubator/stanbol/trunk/cmsadapter/core/pom.xml
incubator/stanbol/trunk/cmsadapter/jcr/src/main/java/org/apache/stanbol/cmsadapter/jcr/repository/JCRRDFMapper.java
incubator/stanbol/trunk/cmsadapter/servicesapi/src/main/java/org/apache/stanbol/cmsadapter/servicesapi/helper/CMSAdapterVocabulary.java
Modified:
incubator/stanbol/trunk/cmsadapter/cmis/src/main/java/org/apache/stanbol/cmsadapter/cmis/repository/CMISRDFMapper.java
URL:
http://svn.apache.org/viewvc/incubator/stanbol/trunk/cmsadapter/cmis/src/main/java/org/apache/stanbol/cmsadapter/cmis/repository/CMISRDFMapper.java?rev=1165557&r1=1165556&r2=1165557&view=diff
==============================================================================
---
incubator/stanbol/trunk/cmsadapter/cmis/src/main/java/org/apache/stanbol/cmsadapter/cmis/repository/CMISRDFMapper.java
(original)
+++
incubator/stanbol/trunk/cmsadapter/cmis/src/main/java/org/apache/stanbol/cmsadapter/cmis/repository/CMISRDFMapper.java
Tue Sep 6 08:06:11 2011
@@ -150,7 +150,7 @@ public class CMISRDFMapper extends BaseR
* This method creates the actual object in the content repository. The
type of the object to be created
* is determined by following conditions:
* <p>
- * First if its base type is set by {@link
CMSAdapterVocabulary#BASE_TYPE_ID} predicate and it is set as
+ * First if its base type is set by {@link
CMSAdapterVocabulary#CMIS_BASE_TYPE_ID} predicate and it is set as
* <b>cmis:folder</b> or <b>cmis:document</b>.
* <p>
* If the base type of the object is not set, its parent assertion is
checked. If it has a parent
@@ -233,7 +233,7 @@ public class CMISRDFMapper extends BaseR
@SuppressWarnings("rawtypes")
private Class hasBaseType(NonLiteral uri, MGraph graph) {
- Iterator<Triple> it = graph.filter(uri,
CMSAdapterVocabulary.BASE_TYPE_ID, null);
+ Iterator<Triple> it = graph.filter(uri,
CMSAdapterVocabulary.CMIS_BASE_TYPE_ID, null);
if (it.hasNext()) {
String type =
RDFBridgeHelper.parseStringValue(it.next().getObject().toString());
if (type.contentEquals(BaseTypeId.CMIS_FOLDER.value())) {
Modified: incubator/stanbol/trunk/cmsadapter/core/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/stanbol/trunk/cmsadapter/core/pom.xml?rev=1165557&r1=1165556&r2=1165557&view=diff
==============================================================================
--- incubator/stanbol/trunk/cmsadapter/core/pom.xml (original)
+++ incubator/stanbol/trunk/cmsadapter/core/pom.xml Tue Sep 6 08:06:11 2011
@@ -67,13 +67,7 @@
<artifactId>org.apache.stanbol.enhancer.servicesapi</artifactId>
</dependency>
- <!-- Entityhub -->
- <dependency>
- <groupId>org.apache.stanbol</groupId>
-
<artifactId>org.apache.stanbol.entityhub.servicesapi</artifactId>
- </dependency>
-
- <!-- Clerezza -->
+ <!-- Clerezza -->
<dependency>
<groupId>org.apache.clerezza</groupId>
<artifactId>rdf.core</artifactId>
@@ -84,14 +78,6 @@
</dependency>
<dependency>
- <groupId>javax.jcr</groupId>
- <artifactId>jcr</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.jackrabbit</groupId>
- <artifactId>jackrabbit-jcr-rmi</artifactId>
- </dependency>
- <dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.scr.annotations</artifactId>
</dependency>
Modified:
incubator/stanbol/trunk/cmsadapter/jcr/src/main/java/org/apache/stanbol/cmsadapter/jcr/repository/JCRRDFMapper.java
URL:
http://svn.apache.org/viewvc/incubator/stanbol/trunk/cmsadapter/jcr/src/main/java/org/apache/stanbol/cmsadapter/jcr/repository/JCRRDFMapper.java?rev=1165557&r1=1165556&r2=1165557&view=diff
==============================================================================
---
incubator/stanbol/trunk/cmsadapter/jcr/src/main/java/org/apache/stanbol/cmsadapter/jcr/repository/JCRRDFMapper.java
(original)
+++
incubator/stanbol/trunk/cmsadapter/jcr/src/main/java/org/apache/stanbol/cmsadapter/jcr/repository/JCRRDFMapper.java
Tue Sep 6 08:06:11 2011
@@ -138,7 +138,7 @@ public class JCRRDFMapper extends BaseRD
n = parent.getNode(nodeName);
} else {
String nodeType =
RDFBridgeHelper.getResourceStringValue(nodeSubject,
- getUriRefFromJCRConstant(Property.JCR_PRIMARY_TYPE), graph);
+ CMSAdapterVocabulary.JCR_PRIMARY_TYPE, graph);
if (nodeType.contentEquals("")) {
n = parent.addNode(nodeName);
@@ -153,8 +153,7 @@ public class JCRRDFMapper extends BaseRD
}
// check mixin types
- Iterator<Triple> mixins = graph.filter(nodeSubject,
- getUriRefFromJCRConstant(Property.JCR_MIXIN_TYPES), null);
+ Iterator<Triple> mixins = graph.filter(nodeSubject,
CMSAdapterVocabulary.JCR_MIXIN_TYPES, null);
String mixinType = "";
while (mixins.hasNext()) {
Resource r = mixins.next().getObject();
@@ -427,33 +426,21 @@ public class JCRRDFMapper extends BaseRD
log.warn("Failed to process property of node", e);
}
}
- createDefaultPropertiesForRDF(n, subject, graph);
- }
- private void createDefaultPropertiesForRDF(Node n, NonLiteral subject,
MGraph graph) {
+ String path = "";
try {
- checkDefaultPropertyInitialization(subject,
CMSAdapterVocabulary.CMS_OBJECT_PATH, n.getPath(),
- graph);
+ path = n.getPath();
} catch (RepositoryException e) {
- log.warn("Failed to initialize path property", e);
+ log.warn("Failed to get path of node", e);
}
+ String name = "";
try {
- checkDefaultPropertyInitialization(subject,
CMSAdapterVocabulary.CMS_OBJECT_NAME, n.getName(),
- graph);
+ name = n.getName();
} catch (RepositoryException e) {
- log.warn("Failed to initialize name property", e);
+ log.warn("Failed to get name of the node", e);
}
- }
- private void checkDefaultPropertyInitialization(NonLiteral subject,
- UriRef property,
- String value,
- MGraph graph) {
- LiteralFactory literalFactory = LiteralFactory.getInstance();
- String oldValue = RDFBridgeHelper.getResourceStringValue(subject,
property, graph);
- if (oldValue.contentEquals("")) {
- graph.add(new TripleImpl(subject, property,
literalFactory.createTypedLiteral(value)));
- }
+ RDFBridgeHelper.createDefaultPropertiesForRDF(subject, graph, path,
name);
}
private UriRef getNodeURI(Node n) {
@@ -587,12 +574,6 @@ public class JCRRDFMapper extends BaseRD
}
}
- private UriRef getUriRefFromJCRConstant(String jcrConstant) {
- int end = jcrConstant.indexOf('}');
- String uri = jcrConstant.substring(1, end) + "/" +
jcrConstant.substring(end + 1);
- return new UriRef(uri);
- }
-
@Override
public boolean canMap(String connectionType) {
return connectionType.contentEquals("JCR");
Modified:
incubator/stanbol/trunk/cmsadapter/servicesapi/src/main/java/org/apache/stanbol/cmsadapter/servicesapi/helper/CMSAdapterVocabulary.java
URL:
http://svn.apache.org/viewvc/incubator/stanbol/trunk/cmsadapter/servicesapi/src/main/java/org/apache/stanbol/cmsadapter/servicesapi/helper/CMSAdapterVocabulary.java?rev=1165557&r1=1165556&r2=1165557&view=diff
==============================================================================
---
incubator/stanbol/trunk/cmsadapter/servicesapi/src/main/java/org/apache/stanbol/cmsadapter/servicesapi/helper/CMSAdapterVocabulary.java
(original)
+++
incubator/stanbol/trunk/cmsadapter/servicesapi/src/main/java/org/apache/stanbol/cmsadapter/servicesapi/helper/CMSAdapterVocabulary.java
Tue Sep 6 08:06:11 2011
@@ -155,10 +155,23 @@ public class CMSAdapterVocabulary {
public static final UriRef CMS_OBJECT_HAS_URI = new
UriRef(CMS_ADAPTER_VOCABULARY_URI + "#hasURI");
/*
+ * JCR Specific URI references
+ */
+ /**
+ * The predicate representing the primary type of JCR content repository
objects
+ */
+ public static final UriRef JCR_PRIMARY_TYPE = new UriRef(NamespaceEnum.jcr
+ "primaryType");
+
+ /**
+ * The predicate representing mixin types of JCR content repository objects
+ */
+ public static final UriRef JCR_MIXIN_TYPES = new UriRef(NamespaceEnum.cmis
+ "mixinTypes");
+
+ /*
* CMIS Specific URI references
*/
/**
* The predicate representing the base type of CMIS content repository
objects
*/
- public static final UriRef BASE_TYPE_ID = new UriRef(NamespaceEnum.cmis +
"baseTypeId");
+ public static final UriRef CMIS_BASE_TYPE_ID = new
UriRef(NamespaceEnum.cmis + "baseTypeId");
}
