embjopr-commits July 2010

embjopr-commits@lists.jboss.org

1 participants
15 discussions

EMBJOPR SVN: r961 - in trunk: core/src/main/java/org/jboss/on/embedded/ui/nav and 1 other directory.

by embjopr-commits＠lists.jboss.org

Author: ips Date: 2010-07-21 16:56:47 -0400 (Wed, 21 Jul 2010) New Revision: 961 Modified: trunk/core/src/main/java/org/jboss/on/embedded/ui/nav/SubCategoryTreeNode.java trunk/pom.xml Log: do not display subcat nodes that have no child types or child subcats (https://jira.jboss.org/browse/EMBJOPR-307) Modified: trunk/core/src/main/java/org/jboss/on/embedded/ui/nav/SubCategoryTreeNode.java =================================================================== --- trunk/core/src/main/java/org/jboss/on/embedded/ui/nav/SubCategoryTreeNode.java 2010-07-21 20:55:37 UTC (rev 960) +++ trunk/core/src/main/java/org/jboss/on/embedded/ui/nav/SubCategoryTreeNode.java 2010-07-21 20:56:47 UTC (rev 961) @@ -71,7 +71,10 @@ Set<ResourceSubCategory> sortedSubCategories = new TreeSet<ResourceSubCategory>(subCategories); for (ResourceSubCategory subCategory : sortedSubCategories) { - addChild(new SubCategoryTreeNode(getUniqueKey(), subCategory, parentResource)); + if (!subCategory.getChildSubCategories().isEmpty() || !subCategory.findTaggedResourceTypes().isEmpty()) + { + addChild(new SubCategoryTreeNode(getUniqueKey(), subCategory, parentResource)); + } } } Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-07-21 20:55:37 UTC (rev 960) +++ trunk/pom.xml 2010-07-21 20:56:47 UTC (rev 961) @@ -26,7 +26,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.0.B06</version> + <version>3.0.0</version> </parent> <groupId>org.jboss.jopr</groupId> @@ -70,7 +70,7 @@ <jaxb.version>2.1.9</jaxb.version> <jboss.web.version>3.0.0-beta-2</jboss.web.version> <richfaces.version>3.3.3.Final</richfaces.version> - <rhq.version>3.0.0.B06</rhq.version> + <rhq.version>3.0.0</rhq.version> <jopr.version>${rhq.version}</jopr.version> <seam.version>2.1.0.SP1</seam.version> <seam.embedded.version>beta3.SP3</seam.embedded.version>

14 years, 5 months

1
0
0 / 0

EMBJOPR SVN: r960 - in branches/EmbJopr_1_3: core/src/main/java/org/jboss/on/embedded/ui/nav and 1 other directory.

by embjopr-commits＠lists.jboss.org

Author: ips Date: 2010-07-21 16:55:37 -0400 (Wed, 21 Jul 2010) New Revision: 960 Modified: branches/EmbJopr_1_3/core/src/main/java/org/jboss/on/embedded/ui/nav/SubCategoryTreeNode.java branches/EmbJopr_1_3/pom.xml Log: do not display subcat nodes that have no child types or child subcats (https://jira.jboss.org/browse/EMBJOPR-307) Modified: branches/EmbJopr_1_3/core/src/main/java/org/jboss/on/embedded/ui/nav/SubCategoryTreeNode.java =================================================================== --- branches/EmbJopr_1_3/core/src/main/java/org/jboss/on/embedded/ui/nav/SubCategoryTreeNode.java 2010-07-20 01:47:28 UTC (rev 959) +++ branches/EmbJopr_1_3/core/src/main/java/org/jboss/on/embedded/ui/nav/SubCategoryTreeNode.java 2010-07-21 20:55:37 UTC (rev 960) @@ -71,7 +71,10 @@ Set<ResourceSubCategory> sortedSubCategories = new TreeSet<ResourceSubCategory>(subCategories); for (ResourceSubCategory subCategory : sortedSubCategories) { - addChild(new SubCategoryTreeNode(getUniqueKey(), subCategory, parentResource)); + if (!subCategory.getChildSubCategories().isEmpty() || !subCategory.findTaggedResourceTypes().isEmpty()) + { + addChild(new SubCategoryTreeNode(getUniqueKey(), subCategory, parentResource)); + } } } Modified: branches/EmbJopr_1_3/pom.xml =================================================================== --- branches/EmbJopr_1_3/pom.xml 2010-07-20 01:47:28 UTC (rev 959) +++ branches/EmbJopr_1_3/pom.xml 2010-07-21 20:55:37 UTC (rev 960) @@ -55,8 +55,8 @@ <properties> - <jbas4.finalName>jbas4-admin-console</jbas4.finalName> - <jbas5.finalName>jbas5-admin-console</jbas5.finalName> + <jbas4.finalName>admin-console</jbas4.finalName> + <jbas5.finalName>admin-console</jbas5.finalName>  <rhq.groupId>org.rhq</rhq.groupId> @@ -163,7 +163,7 @@ <modules> <module>core</module> - <module>jbas4</module> +  <module>jbas5</module>  </modules>

14 years, 5 months

1
0
0 / 0

EMBJOPR SVN: r959 - branches/EmbJopr_1_3/jbas5.

by embjopr-commits＠lists.jboss.org

Author: ips Date: 2010-07-19 21:47:28 -0400 (Mon, 19 Jul 2010) New Revision: 959 Modified: branches/EmbJopr_1_3/jbas5/pom.xml Log: upgrade hornetq plugin from 1.0.0.BETA to 1.0.0.CR2 Modified: branches/EmbJopr_1_3/jbas5/pom.xml =================================================================== --- branches/EmbJopr_1_3/jbas5/pom.xml 2010-07-16 20:23:57 UTC (rev 958) +++ branches/EmbJopr_1_3/jbas5/pom.xml 2010-07-20 01:47:28 UTC (rev 959) @@ -82,7 +82,7 @@ <artifactItem> <groupId>org.hornetq</groupId> <artifactId>hornetq-jopr-plugin</artifactId> - <version>1.0.0.BETA1</version> + <version>1.0.0.CR2</version> </artifactItem> </artifactItems> </configuration>

14 years, 5 months

1
0
0 / 0

EMBJOPR SVN: r958 - in trunk: core/src/main/webapp/css and 1 other directory.

by embjopr-commits＠lists.jboss.org

Author: ips Date: 2010-07-16 16:23:57 -0400 (Fri, 16 Jul 2010) New Revision: 958 Modified: trunk/core/src/main/webapp/css/console-style.css trunk/pom.xml Log: make font smaller in left nav tree; change name of war written to target dir to admin-console.war; remove jbas4 and jbas5 modules from root pom Modified: trunk/core/src/main/webapp/css/console-style.css =================================================================== --- trunk/core/src/main/webapp/css/console-style.css 2010-07-16 20:11:24 UTC (rev 957) +++ trunk/core/src/main/webapp/css/console-style.css 2010-07-16 20:23:57 UTC (rev 958) @@ -83,7 +83,6 @@ overflow: auto; background: #eff2f4; border-right: 1px solid #dee6ee; - font-size: 0.75em; } #footer { @@ -659,10 +658,11 @@ /* ------ Tree Controls from RichFaces ---------- */ .rich-tree { - + } .rich-tree-node { + font-size: 0.7em; white-space: normal; } Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-07-16 20:11:24 UTC (rev 957) +++ trunk/pom.xml 2010-07-16 20:23:57 UTC (rev 958) @@ -56,9 +56,9 @@ <properties> - <jbas4.finalName>jbas4-admin-console</jbas4.finalName> - <jbas5.finalName>jbas5-admin-console</jbas5.finalName> - <jbas6.finalName>jbas6-admin-console</jbas6.finalName> + <jbas4.finalName>admin-console</jbas4.finalName> + <jbas5.finalName>admin-console</jbas5.finalName> + <jbas6.finalName>admin-console</jbas6.finalName>  <rhq.groupId>org.rhq</rhq.groupId> @@ -165,8 +165,10 @@ <modules> <module>core</module> - <module>jbas4</module> - <module>jbas5</module> +  +  +  <module>jbas6</module>

14 years, 5 months

1
0
0 / 0

EMBJOPR SVN: r957 - branches/EmbJopr_1_3/core/src/main/webapp/css.

by embjopr-commits＠lists.jboss.org

Author: ips Date: 2010-07-16 16:11:24 -0400 (Fri, 16 Jul 2010) New Revision: 957 Modified: branches/EmbJopr_1_3/core/src/main/webapp/css/console-style.css Log: make font size of tree node text smaller Modified: branches/EmbJopr_1_3/core/src/main/webapp/css/console-style.css =================================================================== --- branches/EmbJopr_1_3/core/src/main/webapp/css/console-style.css 2010-06-16 21:06:05 UTC (rev 956) +++ branches/EmbJopr_1_3/core/src/main/webapp/css/console-style.css 2010-07-16 20:11:24 UTC (rev 957) @@ -80,7 +80,6 @@ overflow: auto; background: #eff2f4; border-right: 1px solid #dee6ee; - font-size: 0.75em; } #footer { @@ -660,6 +659,7 @@ } .rich-tree-node { + font-size: 0.7em; white-space: normal; }

14 years, 5 months

1
0
0 / 0

← Newer
1
2
Older →

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

embjopr-commits July 2010