Author: ate
Date: Tue Sep 4 12:49:00 2012
New Revision: 1380610
URL: http://svn.apache.org/viewvc?rev=1380610&view=rev
Log:
RAVE-696: OCM annotations should not be needed on the model interfaces
Modified:
rave/sandbox/content-services/rave-jcr-integration/page-configuration/src/main/java/org/apache/rave/jcr/config/JcrConfigManager.java
rave/sandbox/content-services/rave-jcr-integration/page-configuration/src/main/java/org/apache/rave/jcr/config/model/JcrPageFragment.java
rave/sandbox/content-services/rave-jcr-integration/page-configuration/src/main/java/org/apache/rave/jcr/config/model/api/PageConfiguration.java
rave/sandbox/content-services/rave-jcr-integration/page-configuration/src/main/java/org/apache/rave/jcr/config/model/api/PageDefinition.java
rave/sandbox/content-services/rave-jcr-integration/page-configuration/src/main/java/org/apache/rave/jcr/config/model/api/PageFragment.java
rave/sandbox/content-services/rave-jcr-integration/page-configuration/src/main/java/org/apache/rave/jcr/config/model/api/UrlConfiguration.java
rave/sandbox/content-services/rave-jcr-integration/page-configuration/src/main/java/org/apache/rave/jcr/config/model/api/UrlMapping.java
rave/sandbox/content-services/rave-web-hmvc/src/main/java/org/apache/rave/portal/web/hmvc/HmvcHandlerMethodMappingByConfig.java
Modified:
rave/sandbox/content-services/rave-jcr-integration/page-configuration/src/main/java/org/apache/rave/jcr/config/JcrConfigManager.java
URL:
http://svn.apache.org/viewvc/rave/sandbox/content-services/rave-jcr-integration/page-configuration/src/main/java/org/apache/rave/jcr/config/JcrConfigManager.java?rev=1380610&r1=1380609&r2=1380610&view=diff
==============================================================================
---
rave/sandbox/content-services/rave-jcr-integration/page-configuration/src/main/java/org/apache/rave/jcr/config/JcrConfigManager.java
(original)
+++
rave/sandbox/content-services/rave-jcr-integration/page-configuration/src/main/java/org/apache/rave/jcr/config/JcrConfigManager.java
Tue Sep 4 12:49:00 2012
@@ -35,10 +35,7 @@ import org.apache.rave.jcr.config.model.
import org.apache.rave.jcr.config.model.JcrPageDefinition;
import org.apache.rave.jcr.config.model.JcrPageFragment;
import org.apache.rave.jcr.config.model.api.PageConfiguration;
-import org.apache.rave.jcr.config.model.api.PageDefinition;
-import org.apache.rave.jcr.config.model.api.PageFragment;
import org.apache.rave.jcr.config.model.api.UrlConfiguration;
-import org.apache.rave.jcr.config.model.api.UrlMapping;
import org.apache.rave.jcr.config.url.JcrUrlConfiguration;
import org.apache.rave.jcr.config.url.JcrUrlMapping;
import org.slf4j.Logger;
@@ -139,11 +136,6 @@ public class JcrConfigManager implements
@SuppressWarnings("rawtypes")
List<Class> classes = new ArrayList<Class>();
//
- classes.add(UrlConfiguration.class);
- classes.add(UrlMapping.class);
- classes.add(PageFragment.class);
- classes.add(PageDefinition.class);
- classes.add(PageConfiguration.class);
// implementations:
classes.add(JcrUrlMapping.class);
classes.add(JcrUrlConfiguration.class);
Modified:
rave/sandbox/content-services/rave-jcr-integration/page-configuration/src/main/java/org/apache/rave/jcr/config/model/JcrPageFragment.java
URL:
http://svn.apache.org/viewvc/rave/sandbox/content-services/rave-jcr-integration/page-configuration/src/main/java/org/apache/rave/jcr/config/model/JcrPageFragment.java?rev=1380610&r1=1380609&r2=1380610&view=diff
==============================================================================
---
rave/sandbox/content-services/rave-jcr-integration/page-configuration/src/main/java/org/apache/rave/jcr/config/model/JcrPageFragment.java
(original)
+++
rave/sandbox/content-services/rave-jcr-integration/page-configuration/src/main/java/org/apache/rave/jcr/config/model/JcrPageFragment.java
Tue Sep 4 12:49:00 2012
@@ -65,7 +65,7 @@ public class JcrPageFragment implements
private String name;
@Bean(jcrType = "raveconfig:pagefragment", jcrName =
"raveconfig:parentfragment")
- private PageFragment parent;
+ private JcrPageFragment jcrParent;
@Collection(elementClassName = JcrPageFragment.class, jcrType =
"raveconfig:pagefragment", jcrName = "pageFragments")
private List<PageFragment> children;
@@ -74,6 +74,16 @@ public class JcrPageFragment implements
return path;
}
+ // needed only for OCM mapper which used Java bean methods mapping to
determine the persistent field or bean type
+ public JcrPageFragment getJcrParent() {
+ return jcrParent;
+ }
+
+ // needed only for OCM mapper which used Java bean methods mapping to
determine the persistent field or bean type
+ public void setJcrParent(JcrPageFragment jcrParent) {
+ this.jcrParent = jcrParent;
+ }
+
@Override
public String getViewName() {
return viewName;
@@ -100,13 +110,12 @@ public class JcrPageFragment implements
@Override
public PageFragment getParent() {
- return parent;
-
+ return getJcrParent();
}
@Override
public void setParent(PageFragment parent) {
- this.parent = (JcrPageFragment) parent;
+ setJcrParent((JcrPageFragment)parent);
}
@Override
@@ -179,7 +188,7 @@ public class JcrPageFragment implements
sb.append(", description='").append(description).append('\'');
sb.append(", controller='").append(controller).append('\'');
sb.append(", name='").append(name).append('\'');
- sb.append(", parent=").append(parent);
+ sb.append(", jcrParent=").append(jcrParent);
sb.append('}');
return sb.toString();
}
Modified:
rave/sandbox/content-services/rave-jcr-integration/page-configuration/src/main/java/org/apache/rave/jcr/config/model/api/PageConfiguration.java
URL:
http://svn.apache.org/viewvc/rave/sandbox/content-services/rave-jcr-integration/page-configuration/src/main/java/org/apache/rave/jcr/config/model/api/PageConfiguration.java?rev=1380610&r1=1380609&r2=1380610&view=diff
==============================================================================
---
rave/sandbox/content-services/rave-jcr-integration/page-configuration/src/main/java/org/apache/rave/jcr/config/model/api/PageConfiguration.java
(original)
+++
rave/sandbox/content-services/rave-jcr-integration/page-configuration/src/main/java/org/apache/rave/jcr/config/model/api/PageConfiguration.java
Tue Sep 4 12:49:00 2012
@@ -21,8 +21,6 @@ package org.apache.rave.jcr.config.model
import java.util.List;
-import org.apache.jackrabbit.ocm.mapper.impl.annotation.Node;
-
/**
* Page configuration contains PageDefinition and PageFragment
*
@@ -30,7 +28,6 @@ import org.apache.jackrabbit.ocm.mapper.
* @see org.apache.rave.jcr.config.model.api.PageDefinition
* @see PageFragment
*/
-@Node(isInterface = true, jcrType = "mix:referenceable", discriminator = false)
public interface PageConfiguration {
/**
Modified:
rave/sandbox/content-services/rave-jcr-integration/page-configuration/src/main/java/org/apache/rave/jcr/config/model/api/PageDefinition.java
URL:
http://svn.apache.org/viewvc/rave/sandbox/content-services/rave-jcr-integration/page-configuration/src/main/java/org/apache/rave/jcr/config/model/api/PageDefinition.java?rev=1380610&r1=1380609&r2=1380610&view=diff
==============================================================================
---
rave/sandbox/content-services/rave-jcr-integration/page-configuration/src/main/java/org/apache/rave/jcr/config/model/api/PageDefinition.java
(original)
+++
rave/sandbox/content-services/rave-jcr-integration/page-configuration/src/main/java/org/apache/rave/jcr/config/model/api/PageDefinition.java
Tue Sep 4 12:49:00 2012
@@ -19,12 +19,9 @@
package org.apache.rave.jcr.config.model.api;
-import org.apache.jackrabbit.ocm.mapper.impl.annotation.Node;
-
/**
* @version "$Id$"
*/
-@Node(isInterface = true, jcrType = "mix:referenceable", discriminator = false)
public interface PageDefinition extends PageFragment {
}
Modified:
rave/sandbox/content-services/rave-jcr-integration/page-configuration/src/main/java/org/apache/rave/jcr/config/model/api/PageFragment.java
URL:
http://svn.apache.org/viewvc/rave/sandbox/content-services/rave-jcr-integration/page-configuration/src/main/java/org/apache/rave/jcr/config/model/api/PageFragment.java?rev=1380610&r1=1380609&r2=1380610&view=diff
==============================================================================
---
rave/sandbox/content-services/rave-jcr-integration/page-configuration/src/main/java/org/apache/rave/jcr/config/model/api/PageFragment.java
(original)
+++
rave/sandbox/content-services/rave-jcr-integration/page-configuration/src/main/java/org/apache/rave/jcr/config/model/api/PageFragment.java
Tue Sep 4 12:49:00 2012
@@ -21,12 +21,9 @@ package org.apache.rave.jcr.config.model
import java.util.List;
-import org.apache.jackrabbit.ocm.mapper.impl.annotation.Node;
-
/**
* @version "$Id$"
*/
-@Node(isInterface = true, jcrType = "mix:referenceable", discriminator = false)
public interface PageFragment {
Modified:
rave/sandbox/content-services/rave-jcr-integration/page-configuration/src/main/java/org/apache/rave/jcr/config/model/api/UrlConfiguration.java
URL:
http://svn.apache.org/viewvc/rave/sandbox/content-services/rave-jcr-integration/page-configuration/src/main/java/org/apache/rave/jcr/config/model/api/UrlConfiguration.java?rev=1380610&r1=1380609&r2=1380610&view=diff
==============================================================================
---
rave/sandbox/content-services/rave-jcr-integration/page-configuration/src/main/java/org/apache/rave/jcr/config/model/api/UrlConfiguration.java
(original)
+++
rave/sandbox/content-services/rave-jcr-integration/page-configuration/src/main/java/org/apache/rave/jcr/config/model/api/UrlConfiguration.java
Tue Sep 4 12:49:00 2012
@@ -21,12 +21,9 @@ package org.apache.rave.jcr.config.model
import java.util.List;
-import org.apache.jackrabbit.ocm.mapper.impl.annotation.Node;
-
/**
* @version "$Id$"
*/
-@Node(isInterface = true, jcrType = "mix:referenceable", discriminator = false)
public interface UrlConfiguration {
void initialize(PageConfiguration configuration);
Modified:
rave/sandbox/content-services/rave-jcr-integration/page-configuration/src/main/java/org/apache/rave/jcr/config/model/api/UrlMapping.java
URL:
http://svn.apache.org/viewvc/rave/sandbox/content-services/rave-jcr-integration/page-configuration/src/main/java/org/apache/rave/jcr/config/model/api/UrlMapping.java?rev=1380610&r1=1380609&r2=1380610&view=diff
==============================================================================
---
rave/sandbox/content-services/rave-jcr-integration/page-configuration/src/main/java/org/apache/rave/jcr/config/model/api/UrlMapping.java
(original)
+++
rave/sandbox/content-services/rave-jcr-integration/page-configuration/src/main/java/org/apache/rave/jcr/config/model/api/UrlMapping.java
Tue Sep 4 12:49:00 2012
@@ -21,12 +21,9 @@ package org.apache.rave.jcr.config.model
import java.util.List;
-import org.apache.jackrabbit.ocm.mapper.impl.annotation.Node;
-
/**
* @version "$Id$"
*/
-@Node(isInterface = true, jcrType = "mix:referenceable", discriminator = false)
public interface UrlMapping {
void setParent(UrlMapping parent);
Modified:
rave/sandbox/content-services/rave-web-hmvc/src/main/java/org/apache/rave/portal/web/hmvc/HmvcHandlerMethodMappingByConfig.java
URL:
http://svn.apache.org/viewvc/rave/sandbox/content-services/rave-web-hmvc/src/main/java/org/apache/rave/portal/web/hmvc/HmvcHandlerMethodMappingByConfig.java?rev=1380610&r1=1380609&r2=1380610&view=diff
==============================================================================
---
rave/sandbox/content-services/rave-web-hmvc/src/main/java/org/apache/rave/portal/web/hmvc/HmvcHandlerMethodMappingByConfig.java
(original)
+++
rave/sandbox/content-services/rave-web-hmvc/src/main/java/org/apache/rave/portal/web/hmvc/HmvcHandlerMethodMappingByConfig.java
Tue Sep 4 12:49:00 2012
@@ -134,7 +134,6 @@ public class HmvcHandlerMethodMappingByC
configsLastChecked = System.currentTimeMillis();
final PageConfiguration configuration =
configManager.loadConfiguration(configurationPath);
final UrlConfiguration urlConfig =
configManager.loadUrlConfig(urlMappingsPath, configuration);
- // TODO use urlConfig
processConfiguration(urlConfig);
}
}
@@ -147,7 +146,6 @@ public class HmvcHandlerMethodMappingByC
configManager.lastModified(urlMappingsPath) >
configsLastChecked ) {
final PageConfiguration configuration =
configManager.loadConfiguration(configurationPath);
final UrlConfiguration urlConfig =
configManager.loadUrlConfig(urlMappingsPath, configuration);
- // TODO use urlConfig
processConfiguration(urlConfig);
}
}
