[jboss-svn-commits] JBL Code SVN: r35472 - in labs/jbosslabs/labs-3.0-build/integration/mgnl-services/projects/src/main/java/org/jboss/community/magnolia/services: project and 1 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Fri Oct 8 13:19:07 EDT 2010
Author: unibrew
Date: 2010-10-08 13:19:06 -0400 (Fri, 08 Oct 2010)
New Revision: 35472
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/project/ProjectsServiceBean.java
labs/jbosslabs/labs-3.0-build/integration/mgnl-services/projects/src/main/java/org/jboss/community/magnolia/services/utils/ContentGetterByUUID.java
labs/jbosslabs/labs-3.0-build/integration/mgnl-services/projects/src/main/java/org/jboss/community/magnolia/services/utils/VisibleChildrenPages.java
Log:
[ORG-564] Clearing development system outs
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-10-08 16:04:35 UTC (rev 35471)
+++ labs/jbosslabs/labs-3.0-build/integration/mgnl-services/projects/src/main/java/org/jboss/community/magnolia/services/navigation/ProjectNavigationBean.java 2010-10-08 17:19:06 UTC (rev 35472)
@@ -96,7 +96,6 @@
Project project = projectsService.getProject(projectIdName,parentIdName);
template = freemarkerCfg.getTemplate("projectNavigation.ftl");
root.put("project", project);
- System.out.println("PROJECT: "+project.toString());
BeansWrapper wrapper = BeansWrapper.getDefaultInstance();
TemplateHashModel enumModels = wrapper.getEnumModels();
TemplateHashModel roundingModeEnums = (TemplateHashModel) enumModels.get("org.jboss.community.project.ProjectProperty");
Modified: labs/jbosslabs/labs-3.0-build/integration/mgnl-services/projects/src/main/java/org/jboss/community/magnolia/services/project/ProjectsServiceBean.java
===================================================================
--- labs/jbosslabs/labs-3.0-build/integration/mgnl-services/projects/src/main/java/org/jboss/community/magnolia/services/project/ProjectsServiceBean.java 2010-10-08 16:04:35 UTC (rev 35471)
+++ labs/jbosslabs/labs-3.0-build/integration/mgnl-services/projects/src/main/java/org/jboss/community/magnolia/services/project/ProjectsServiceBean.java 2010-10-08 17:19:06 UTC (rev 35472)
@@ -54,7 +54,6 @@
Query projectQuery = websiteQM.createQuery(getQueryStatementVer1(idName,parentIdName), info.magnolia.cms.core.search.Query.SQL);
QueryResult queryResult = projectQuery.execute();
- System.out.println("JESTEM TU");
Collection<DefaultContent> projectNodes = queryResult.getContent("mgnl:contentNode");
HashMap<ProjectProperty,String> projectProperties = new HashMap<ProjectProperty,String>();
if (!projectNodes.isEmpty()) {
@@ -63,7 +62,6 @@
projectQuery = websiteQM.createQuery(getQueryStatementVer2(idName,parentIdName), info.magnolia.cms.core.search.Query.SQL);
queryResult = projectQuery.execute();
- System.out.println("JESTEM TU");
projectNodes = queryResult.getContent("mgnl:contentNode");
if (!projectNodes.isEmpty()) {
extractQueryResults(projectNodes, projectProperties, websiteHM);
@@ -90,21 +88,17 @@
private void extractQueryResults (Collection<DefaultContent> projectNodes,HashMap<ProjectProperty,String> projectProperties,HierarchyManager websiteHM) throws ValueFormatException, IllegalStateException, RepositoryException {
DefaultContent projectNode = projectNodes.iterator().next();
- System.out.println("OBJECT: "+projectNode.toString()+" HANDLE: "+projectNode.getHandle());
Collection<DefaultNodeData> properties = projectNode.getNodeDataCollection();
for (DefaultNodeData projectProperty : properties) {
- System.out.println("NodeType: "+projectProperty.getType()+"NodeCOntent: "+" NodeDataHandle: "+projectProperty.getHandle()+" NodeDataStringValue: "+projectProperty.getValue().getString());
String handle = projectProperty.getHandle();
String projectPropertyName = projectProperty.getName();
- System.out.println("projectPropertyName: "+projectPropertyName);
ProjectProperty propertyEnum = ProjectProperty.BUILD_LINK.getPropertyByKey(projectPropertyName);
if (propertyEnum==null) {
- log.warn("Encountered project property name that is not yet defined.");
+ // This means it's a property that we don't need e.g. 'navigationType' or 'inherit'
continue;
}
String projectPropertyValue = projectProperty.getValue().getString();
- System.out.println("PROJECTPROPERTYVALUE: "+projectPropertyValue);
//TODO: This is a bit wrong that exception is being thrown during standard UUID link checking.
boolean isUUID=false;
@@ -117,7 +111,6 @@
}
if (isUUID) {
- System.out.println("INSIDE UUID MATCHED");
ProjectProperty propertyUUIDEnum = ProjectProperty.BUILD_LINK.getPropertyByKey(projectPropertyName+"_UUID");
if (propertyUUIDEnum==null) {
log.warn("Encountered project property UUID link that is not yet defined.");
@@ -135,31 +128,26 @@
projectProperties.put(propertyEnum, handleFromProjectProperty);
} else {
- System.out.println("INSIDE ELSE OF UUID");
projectProperties.put(propertyEnum, projectPropertyValue);
}
}
}
private String getQueryStatementVer1 (String projectId,String parentProjectId) {
- System.out.println("QUERY VER1 PROJECTID: "+projectId+" PARENTID: "+parentProjectId);
String query = "SELECT * FROM nt:base " +
"WHERE mgnl:template = 'projectNavigation' " +
"AND jcr:path LIKE '/";
query+=parentProjectId!=null && parentProjectId.trim().length()>0?parentProjectId+"/":"";
query+=projectId+"/headerParagraphs/%'";
- System.out.println("QUERY1: "+query);
return query;
}
private String getQueryStatementVer2 (String projectId,String parentProjectId) {
- System.out.println("QUERY VER2 PROJECTID: "+projectId+" PARENTID: "+parentProjectId);
String query = "SELECT * FROM nt:base " +
"WHERE mgnl:template = 'projectNavigation' " +
"AND jcr:path LIKE '/";
query+=parentProjectId!=null && parentProjectId.trim().length()>0?parentProjectId+"/%/":"";
query+=projectId+"/headerParagraphs/%'";
- System.out.println("QUERY2: "+query);
return query;
}
Modified: labs/jbosslabs/labs-3.0-build/integration/mgnl-services/projects/src/main/java/org/jboss/community/magnolia/services/utils/ContentGetterByUUID.java
===================================================================
--- labs/jbosslabs/labs-3.0-build/integration/mgnl-services/projects/src/main/java/org/jboss/community/magnolia/services/utils/ContentGetterByUUID.java 2010-10-08 16:04:35 UTC (rev 35471)
+++ labs/jbosslabs/labs-3.0-build/integration/mgnl-services/projects/src/main/java/org/jboss/community/magnolia/services/utils/ContentGetterByUUID.java 2010-10-08 17:19:06 UTC (rev 35472)
@@ -24,9 +24,7 @@
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();
try {
Content content = websiteHM.getContentByUUID(parentPageUUID);
Modified: 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 2010-10-08 16:04:35 UTC (rev 35471)
+++ labs/jbosslabs/labs-3.0-build/integration/mgnl-services/projects/src/main/java/org/jboss/community/magnolia/services/utils/VisibleChildrenPages.java 2010-10-08 17:19:06 UTC (rev 35472)
@@ -30,22 +30,15 @@
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()) {
More information about the jboss-svn-commits
mailing list