[jboss-svn-commits] JBL Code SVN: r35350 - in labs/jbosslabs/labs-3.0-build/integration/mgnl-services/projects: src/main/java/org/jboss/community/magnolia/services/navigation and 2 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Wed Sep 29 07:26:17 EDT 2010
Author: unibrew
Date: 2010-09-29 07:26:16 -0400 (Wed, 29 Sep 2010)
New Revision: 35350
Added:
labs/jbosslabs/labs-3.0-build/integration/mgnl-services/projects/src/main/java/org/jboss/community/magnolia/services/utils/HasVisibleChildrenPages.java
labs/jbosslabs/labs-3.0-build/integration/mgnl-services/projects/src/main/java/org/jboss/community/magnolia/services/utils/VisibleChildrenPages.java
Removed:
labs/jbosslabs/labs-3.0-build/integration/mgnl-services/projects/src/main/java/org/jboss/community/magnolia/services/utils/ChildrenPages.java
Modified:
labs/jbosslabs/labs-3.0-build/integration/mgnl-services/projects/pom.xml
labs/jbosslabs/labs-3.0-build/integration/mgnl-services/projects/src/main/java/org/jboss/community/magnolia/services/navigation/ProjectNavigationBean.java
labs/jbosslabs/labs-3.0-build/integration/mgnl-services/projects/src/main/java/org/jboss/community/project/ProjectProperty.java
Log:
[ORG-564] Slowly finishing the thing.
Modified: labs/jbosslabs/labs-3.0-build/integration/mgnl-services/projects/pom.xml
===================================================================
--- labs/jbosslabs/labs-3.0-build/integration/mgnl-services/projects/pom.xml 2010-09-29 11:15:27 UTC (rev 35349)
+++ labs/jbosslabs/labs-3.0-build/integration/mgnl-services/projects/pom.xml 2010-09-29 11:26:16 UTC (rev 35350)
@@ -60,9 +60,6 @@
<url>http://projectlombok.org/mavenrepo</url>
</repository>
</repositories>
-<profiles>
-<profile>
- <id>magnoliaAuthor</id>
<build>
<plugins>
<plugin>
@@ -85,32 +82,5 @@
</plugin>
</plugins>
</build>
-</profile>
-<profile>
- <id>magnoliaPublic</id>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <version>2.2</version>
- <configuration>
- <archive>
- <manifestFile>src/main/resources/magnoliaPublic/META-INF/MANIFEST.MF</manifestFile>
- </archive>
- </configuration>
- </plugin>
- </plugins>
- </build>
-</profile>
-</profiles>
</project>
Modified: labs/jbosslabs/labs-3.0-build/integration/mgnl-services/projects/src/main/java/org/jboss/community/magnolia/services/navigation/ProjectNavigationBean.java
===================================================================
--- labs/jbosslabs/labs-3.0-build/integration/mgnl-services/projects/src/main/java/org/jboss/community/magnolia/services/navigation/ProjectNavigationBean.java 2010-09-29 11:15:27 UTC (rev 35349)
+++ labs/jbosslabs/labs-3.0-build/integration/mgnl-services/projects/src/main/java/org/jboss/community/magnolia/services/navigation/ProjectNavigationBean.java 2010-09-29 11:26:16 UTC (rev 35350)
@@ -21,7 +21,8 @@
import org.jboss.community.magnolia.services.exceptions.ProjectNavigationException;
import org.jboss.community.magnolia.services.exceptions.ProjectServiceException;
import org.jboss.community.magnolia.services.project.ProjectsService;
-import org.jboss.community.magnolia.services.utils.ChildrenPages;
+import org.jboss.community.magnolia.services.utils.HasVisibleChildrenPages;
+import org.jboss.community.magnolia.services.utils.VisibleChildrenPages;
import org.jboss.community.magnolia.services.utils.EnumHashMapValueExtractor;
import org.jboss.community.project.Project;
@@ -50,7 +51,7 @@
static {
Configuration cfg = new Configuration();
try {
- cfg.setDirectoryForTemplateLoading(new File("/Users/rysiek/Work/freemarkerTemplates"));
+ cfg.setDirectoryForTemplateLoading(new File(ProjectNavigationBean.class.getResource("/freemarkerTemplates").getPath()));
cfg.setObjectWrapper(new DefaultObjectWrapper());
} catch (IOException e) {
String message ="ProjectNavigation service could not be initialized due to missing freemarker templates directory";
@@ -91,9 +92,11 @@
TemplateHashModel roundingModeEnums = (TemplateHashModel) enumModels.get("org.jboss.community.project.ProjectProperty");
root.put("ProjectProperty", roundingModeEnums);
root.put("extractValue", new EnumHashMapValueExtractor());
- root.put("childrenPages",new ChildrenPages());
+ root.put("childrenPages",new VisibleChildrenPages());
+ root.put("hasVisibleChildren", new HasVisibleChildrenPages());
root.put("integerValue",new Integer(0));
root.put("navigationType", navigationType);
+ root.put("contextPath", contextPathPrefix);
template.process(root, html);
html.flush();
} catch (IOException e) {
Deleted: labs/jbosslabs/labs-3.0-build/integration/mgnl-services/projects/src/main/java/org/jboss/community/magnolia/services/utils/ChildrenPages.java
===================================================================
--- labs/jbosslabs/labs-3.0-build/integration/mgnl-services/projects/src/main/java/org/jboss/community/magnolia/services/utils/ChildrenPages.java 2010-09-29 11:15:27 UTC (rev 35349)
+++ labs/jbosslabs/labs-3.0-build/integration/mgnl-services/projects/src/main/java/org/jboss/community/magnolia/services/utils/ChildrenPages.java 2010-09-29 11:26:16 UTC (rev 35350)
@@ -1,53 +0,0 @@
-/**
- *
- */
-package org.jboss.community.magnolia.services.utils;
-
-import info.magnolia.cms.core.Content;
-import info.magnolia.cms.core.HierarchyManager;
-import info.magnolia.cms.core.ItemType;
-
-import java.util.Collection;
-import java.util.List;
-
-import javax.jcr.RepositoryException;
-
-import org.apache.log4j.Logger;
-
-import freemarker.ext.beans.StringModel;
-import freemarker.template.TemplateMethodModelEx;
-import freemarker.template.TemplateModelException;
-
-/**
- * @author rysiek
- *
- */
-public class ChildrenPages implements TemplateMethodModelEx {
-
- Logger log = Logger.getLogger(ChildrenPages.class);
-
- public Object exec(List arguments) throws TemplateModelException {
- System.out.println("BEGINING 1");
- if (arguments.size() != 2) {
- throw new TemplateModelException("Wrong number of arguments.");
- }
- System.out.println("BEGINING 2");
- String parentPageUUID = arguments.get(0).toString();
- System.out.println("BEGINING 3");
- HierarchyManager websiteHM = (HierarchyManager)((StringModel)arguments.get(1)).getWrappedObject();
- System.out.println("BEGINING 4");
- try {
- System.out.println("I'M HERE");
- Content parentPage = websiteHM.getContentByUUID(parentPageUUID);
- System.out.println("I FOUND PAGE: "+parentPage.toString());
- Collection c = parentPage.getChildren(ItemType.CONTENT);
- System.out.println("FOUND COLLECTION :"+c);
- return c;
- } catch (RepositoryException e) {
- String message = "Could not find page in website repository or something else unexpected happened.";
- log.warn(message,e);
- }
- return null;
- }
-
-}
Added: labs/jbosslabs/labs-3.0-build/integration/mgnl-services/projects/src/main/java/org/jboss/community/magnolia/services/utils/HasVisibleChildrenPages.java
===================================================================
--- labs/jbosslabs/labs-3.0-build/integration/mgnl-services/projects/src/main/java/org/jboss/community/magnolia/services/utils/HasVisibleChildrenPages.java (rev 0)
+++ labs/jbosslabs/labs-3.0-build/integration/mgnl-services/projects/src/main/java/org/jboss/community/magnolia/services/utils/HasVisibleChildrenPages.java 2010-09-29 11:26:16 UTC (rev 35350)
@@ -0,0 +1,52 @@
+package org.jboss.community.magnolia.services.utils;
+
+import info.magnolia.cms.core.Content;
+import info.magnolia.cms.core.DefaultContent;
+import info.magnolia.cms.core.HierarchyManager;
+import info.magnolia.cms.core.ItemType;
+import info.magnolia.cms.core.NodeData;
+
+import java.util.Collection;
+import java.util.List;
+
+import javax.jcr.RepositoryException;
+
+import org.apache.log4j.Logger;
+
+import freemarker.ext.beans.StringModel;
+import freemarker.template.TemplateMethodModelEx;
+import freemarker.template.TemplateModelException;
+
+/**
+ *
+ * @author rysiek
+ *
+ */
+public class HasVisibleChildrenPages implements TemplateMethodModelEx {
+
+ Logger log = Logger.getLogger(HasVisibleChildrenPages.class);
+
+ public Object exec(List arguments) throws TemplateModelException {
+ if (arguments.size() != 2) {
+ throw new TemplateModelException("Wrong number of arguments.");
+ }
+ String parentPageUUID = arguments.get(0).toString();
+ HierarchyManager websiteHM = (HierarchyManager)((StringModel)arguments.get(1)).getWrappedObject();
+ try {
+ Content parentPage = websiteHM.getContentByUUID(parentPageUUID);
+ Collection<DefaultContent> pages = parentPage.getChildren(ItemType.CONTENT);
+ for (DefaultContent page : pages) {
+ NodeData nd = page.getNodeData("hideInNav");
+ if (nd==null || !nd.getBoolean()) {
+ return true;
+ }
+ }
+ return false;
+ } catch (RepositoryException e) {
+ String message = "Could not find page in website repository or something else unexpected happened.";
+ log.warn(message,e);
+ }
+ return false;
+ }
+
+}
Added: labs/jbosslabs/labs-3.0-build/integration/mgnl-services/projects/src/main/java/org/jboss/community/magnolia/services/utils/VisibleChildrenPages.java
===================================================================
--- labs/jbosslabs/labs-3.0-build/integration/mgnl-services/projects/src/main/java/org/jboss/community/magnolia/services/utils/VisibleChildrenPages.java (rev 0)
+++ labs/jbosslabs/labs-3.0-build/integration/mgnl-services/projects/src/main/java/org/jboss/community/magnolia/services/utils/VisibleChildrenPages.java 2010-09-29 11:26:16 UTC (rev 35350)
@@ -0,0 +1,63 @@
+/**
+ *
+ */
+package org.jboss.community.magnolia.services.utils;
+
+import info.magnolia.cms.core.Content;
+import info.magnolia.cms.core.DefaultContent;
+import info.magnolia.cms.core.HierarchyManager;
+import info.magnolia.cms.core.ItemType;
+import info.magnolia.cms.core.NodeData;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+
+import javax.jcr.RepositoryException;
+
+import org.apache.log4j.Logger;
+
+import freemarker.ext.beans.StringModel;
+import freemarker.template.TemplateMethodModelEx;
+import freemarker.template.TemplateModelException;
+
+/**
+ * @author rysiek
+ *
+ */
+public class VisibleChildrenPages implements TemplateMethodModelEx {
+
+ Logger log = Logger.getLogger(VisibleChildrenPages.class);
+
+ public Object exec(List arguments) throws TemplateModelException {
+ System.out.println("BEGINING 1");
+ if (arguments.size() != 2) {
+ throw new TemplateModelException("Wrong number of arguments.");
+ }
+ System.out.println("BEGINING 2");
+ String parentPageUUID = arguments.get(0).toString();
+ System.out.println("BEGINING 3");
+ HierarchyManager websiteHM = (HierarchyManager)((StringModel)arguments.get(1)).getWrappedObject();
+ System.out.println("BEGINING 4");
+ List<DefaultContent> pagesToDisplay = new ArrayList<DefaultContent>();
+ try {
+ System.out.println("I'M HERE");
+ Content parentPage = websiteHM.getContentByUUID(parentPageUUID);
+ System.out.println("I FOUND PAGE: "+parentPage.toString());
+ Collection<DefaultContent> pages = parentPage.getChildren(ItemType.CONTENT);
+ System.out.println("FOUND COLLECTION :"+pages);
+ for (DefaultContent page : pages) {
+ NodeData nd = page.getNodeData("hideInNav");
+ if (nd==null || !nd.getBoolean()) {
+ pagesToDisplay.add(page);
+ }
+ }
+ return pagesToDisplay;
+ } catch (RepositoryException e) {
+ String message = "Could not find page in website repository or something else unexpected happened.";
+ log.warn(message,e);
+ }
+ return pagesToDisplay;
+ }
+
+}
Modified: labs/jbosslabs/labs-3.0-build/integration/mgnl-services/projects/src/main/java/org/jboss/community/project/ProjectProperty.java
===================================================================
--- labs/jbosslabs/labs-3.0-build/integration/mgnl-services/projects/src/main/java/org/jboss/community/project/ProjectProperty.java 2010-09-29 11:15:27 UTC (rev 35349)
+++ labs/jbosslabs/labs-3.0-build/integration/mgnl-services/projects/src/main/java/org/jboss/community/project/ProjectProperty.java 2010-09-29 11:26:16 UTC (rev 35350)
@@ -44,6 +44,7 @@
BLOG_LINK("blogLink"),
BLOG_LINK_UUID("blogLink_UUID"),
TWITTER_LINK("twitterLink"),
+ TWITTER_LINK_UUID("twitterLink_UUID"),
// Source code tab
SOURCE_LINK("srcLink"),
@@ -63,12 +64,14 @@
BUILD_LINK_UUID("buildLink_UUID"),
BUILD_END_LEVEL("bldEndLevel"),
HUDSON_LINK("hudsonLink"),
+ HUDSON_LINK_UUID("hudsonLink_UUID"),
// Issue tracker tab
ISSUE_TRACKER_LINK("issueTrackerLink"),
ISSUE_TRACKER_LINK_UUID("issueTrackerLink_UUID"),
ISSUE_TRACKER_END_LEVEL("istEndLevel"),
- JIRA_LINK("jiraLink");
+ JIRA_LINK("jiraLink"),
+ JIRA_LINK_UUID("jiraLink_UUID");
private String propertyKey;
More information about the jboss-svn-commits
mailing list