Menu
▾
▴
[Jboss-svn-commits] JBL Code SVN: r1516 - in trunk/forge/portal-extensions: . binaries/maven-repo-addons/tmate/jars forge-feeds forge-feeds/src/java/org/jboss/forge/feeds forge-service
Author: adamw Date: 2005-11-04 16:51:42 -0500 (Fri, 04 Nov 2005) New Revision: 1516 Modified: trunk/forge/portal-extensions/binaries/maven-repo-addons/tmate/jars/javasvn-cli.jar trunk/forge/portal-extensions/binaries/maven-repo-addons/tmate/jars/javasvn-javahl.jar trunk/forge/portal-extensions/binaries/maven-repo-addons/tmate/jars/javasvn.jar trunk/forge/portal-extensions/forge-feeds/project.xml trunk/forge/portal-extensions/forge-feeds/src/java/org/jboss/forge/feeds/FeedsDescriptor.java trunk/forge/portal-extensions/forge-service/project.xml trunk/forge/portal-extensions/maven.xml Log: http://jira.jboss.com/jira/browse/JBLAB-408 : Minor improvements New tmate binaries. Modified: trunk/forge/portal-extensions/binaries/maven-repo-addons/tmate/jars/javasvn-cli.jar =================================================================== (Binary files differ) Modified: trunk/forge/portal-extensions/binaries/maven-repo-addons/tmate/jars/javasvn-javahl.jar =================================================================== (Binary files differ) Modified: trunk/forge/portal-extensions/binaries/maven-repo-addons/tmate/jars/javasvn.jar =================================================================== (Binary files differ) Modified: trunk/forge/portal-extensions/forge-feeds/project.xml =================================================================== --- trunk/forge/portal-extensions/forge-feeds/project.xml 2005-11-04 19:54:46 UTC (rev 1515) +++ trunk/forge/portal-extensions/forge-feeds/project.xml 2005-11-04 21:51:42 UTC (rev 1516) @@ -33,17 +33,11 @@ <dependency> <id>jdom</id> <version>1.0</version> - <properties> - <war.bundle>true</war.bundle> - </properties> </dependency> <dependency> <id>rome</id> <version>0.7</version> - <properties> - <war.bundle>true</war.bundle> - </properties> </dependency> <dependency> @@ -57,6 +51,26 @@ </dependency> <dependency> + <groupId>taglibs</groupId> + <artifactId>jstl</artifactId> + <version>1.0</version> + <jar>jstl.jar</jar> + <properties> + <war.bundle>true</war.bundle> + </properties> + </dependency> + + <dependency> + <groupId>taglibs</groupId> + <artifactId>standard</artifactId> + <version>1.0</version> + <jar>standard.jar</jar> + <properties> + <war.bundle>true</war.bundle> + </properties> + </dependency> + + <dependency> <groupId>xerces</groupId> <artifactId>xercesImpl</artifactId> <version>2.6.2</version> Modified: trunk/forge/portal-extensions/forge-feeds/src/java/org/jboss/forge/feeds/FeedsDescriptor.java =================================================================== --- trunk/forge/portal-extensions/forge-feeds/src/java/org/jboss/forge/feeds/FeedsDescriptor.java 2005-11-04 19:54:46 UTC (rev 1515) +++ trunk/forge/portal-extensions/forge-feeds/src/java/org/jboss/forge/feeds/FeedsDescriptor.java 2005-11-04 21:51:42 UTC (rev 1516) @@ -331,6 +331,8 @@ } private void fillContext() { + String[] allFeedTypes = FeedFactory.getAllFeedTypes(); + context = new DelegateContext(); for (String feedGroup : feedGroups.keySet()) { Set<String> feedsInGroup = feedGroups.get(feedGroup); @@ -346,10 +348,15 @@ DelegateContext feedContext = groupContext.next("feeds"); feedContext.put("name", feedDisplayNames.get(feedName)); - for (String feedType : feedTypes.keySet()) { + Set availableTypes = feedTypes.keySet(); + for (String feedType : allFeedTypes) { DelegateContext typeContext = feedContext.next("types"); - typeContext.put("name", feedType); - typeContext.put("link", generateFeedLink(false, feedName, feedType)); + + if (availableTypes.contains(feedType)) { + typeContext.next("feed"); + typeContext.put("name", feedType); + typeContext.put("link", generateFeedLink(false, feedName, feedType)); + } } } } Modified: trunk/forge/portal-extensions/forge-service/project.xml =================================================================== --- trunk/forge/portal-extensions/forge-service/project.xml 2005-11-04 19:54:46 UTC (rev 1515) +++ trunk/forge/portal-extensions/forge-service/project.xml 2005-11-04 21:51:42 UTC (rev 1516) @@ -53,9 +53,29 @@ </properties> </dependency> + <dependency> + <groupId>taglibs</groupId> + <artifactId>jstl</artifactId> + <version>1.0</version> + <jar>jstl.jar</jar> + <properties> + <ejb.manifest.classpath>true</ejb.manifest.classpath> + </properties> + </dependency> + + <dependency> + <groupId>taglibs</groupId> + <artifactId>standard</artifactId> + <version>1.0</version> + <jar>standard.jar</jar> + <properties> + <ejb.manifest.classpath>true</ejb.manifest.classpath> + </properties> + </dependency> + <dependency> <id>rome</id> - <version>0.5</version> + <version>0.7</version> <properties> <ejb.manifest.classpath>true</ejb.manifest.classpath> </properties> Modified: trunk/forge/portal-extensions/maven.xml =================================================================== --- trunk/forge/portal-extensions/maven.xml 2005-11-04 19:54:46 UTC (rev 1515) +++ trunk/forge/portal-extensions/maven.xml 2005-11-04 21:51:42 UTC (rev 1516) @@ -64,22 +64,12 @@ <!-- Copying the dependency JARs --> <ant:copy todir="${forge.ear.dir}/target/${forge.ear.name}" - file="${maven.repo.local}/rome/jars/rome-0.5.jar" + file="${maven.repo.local}/rome/jars/rome-0.7.jar" overwrite="true" /> <ant:copy todir="${forge.ear.dir}/target/${forge.ear.name}" file="${maven.repo.local}/jdom/jars/jdom-1.0.jar" overwrite="true" /> - <!--<ant:copy todir="${forge.ear.dir}/target/${forge.ear.name}" flatten="true" overwrite="true"> - <ant:fileset dir="${maven.repo.local}/tmate/jars"> - <ant:filename name="*.jar" /> - </ant:fileset> - </ant:copy>--> - <!--<ant:copy todir="${forge.ear.dir}/target/${forge.ear.name}" flatten="true" overwrite="true"> - <ant:fileset dir="${maven.repo.local}/shotoku/jars"> - <ant:filename name="*.jar" /> - </ant:fileset> - </ant:copy>--> <!-- Deploying the ear --> <ant:copy todir="${local.deploy.dir}" overwrite="true"> |
