Menu
▾
▴
[Jboss-svn-commits] JBL Code SVN: r4137 - in labs/shotoku/trunk: shotoku-feeds shotoku-feeds/lib shotoku-feeds/src/java/org/jboss/shotoku/feeds shotoku-test/src/java/org/jboss/shotoku/test/embedded
Author: adamw Date: 2006-05-08 10:55:14 -0400 (Mon, 08 May 2006) New Revision: 4137 Added: labs/shotoku/trunk/shotoku-feeds/lib/informa.jar labs/shotoku/trunk/shotoku-feeds/shotoku-feeds.iml Removed: labs/shotoku/trunk/shotoku-feeds/forge-feeds.iml labs/shotoku/trunk/shotoku-feeds/lib/informa/ Modified: labs/shotoku/trunk/shotoku-feeds/maven.xml labs/shotoku/trunk/shotoku-feeds/project.properties labs/shotoku/trunk/shotoku-feeds/project.xml labs/shotoku/trunk/shotoku-feeds/src/java/org/jboss/shotoku/feeds/FeedsCache.java labs/shotoku/trunk/shotoku-feeds/src/java/org/jboss/shotoku/feeds/FeedsDescriptor.java labs/shotoku/trunk/shotoku-feeds/src/java/org/jboss/shotoku/feeds/InformaBasedFeed.java labs/shotoku/trunk/shotoku-test/src/java/org/jboss/shotoku/test/embedded/TomekTest.java Log: http://jira.jboss.com/jira/browse/JBSHOTOKU-36 Deleted: labs/shotoku/trunk/shotoku-feeds/forge-feeds.iml =================================================================== --- labs/shotoku/trunk/shotoku-feeds/forge-feeds.iml 2006-05-08 14:38:34 UTC (rev 4136) +++ labs/shotoku/trunk/shotoku-feeds/forge-feeds.iml 2006-05-08 14:55:14 UTC (rev 4137) @@ -1,22 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<module version="4" relativePaths="true" type="JAVA_MODULE"> - <component name="ModuleRootManager" /> - <component name="NewModuleRootManager"> - <output url="file://$MODULE_DIR$/target" /> - <exclude-output /> - <content url="file://$MODULE_DIR$"> - <sourceFolder url="file://$MODULE_DIR$/src/java" isTestSource="false" /> - </content> - <orderEntry type="inheritedJdk" /> - <orderEntry type="sourceFolder" forTests="false" /> - <orderEntry type="library" name="jboss" level="application" /> - <orderEntry type="module" module-name="forge-common" /> - <orderEntry type="module" module-name="shotoku-base" /> - <orderEntry type="module" module-name="shotoku-aop" /> - <orderEntry type="library" name="feeds" level="application" /> - <orderEntry type="library" name="velocity" level="application" /> - <orderEntry type="library" name="commons" level="application" /> - <orderEntryProperties /> - </component> -</module> - Added: labs/shotoku/trunk/shotoku-feeds/lib/informa.jar =================================================================== (Binary files differ) Property changes on: labs/shotoku/trunk/shotoku-feeds/lib/informa.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: labs/shotoku/trunk/shotoku-feeds/maven.xml =================================================================== --- labs/shotoku/trunk/shotoku-feeds/maven.xml 2006-05-08 14:38:34 UTC (rev 4136) +++ labs/shotoku/trunk/shotoku-feeds/maven.xml 2006-05-08 14:55:14 UTC (rev 4137) @@ -6,7 +6,6 @@ <project xmlns:j="jelly:core" xmlns:ant="jelly:ant" xmlns:u="jelly:util"> <!-- Default war-project goals --> - <goal name="build"> <attainGoal name="war" /> </goal> @@ -20,6 +19,7 @@ <goal name="clean"> <attainGoal name="prj-clean" /> </goal> + <goal name="all"> <attainGoal name="clean" /> <attainGoal name="build" /> Modified: labs/shotoku/trunk/shotoku-feeds/project.properties =================================================================== --- labs/shotoku/trunk/shotoku-feeds/project.properties 2006-05-08 14:38:34 UTC (rev 4136) +++ labs/shotoku/trunk/shotoku-feeds/project.properties 2006-05-08 14:55:14 UTC (rev 4137) @@ -1,4 +1,7 @@ maven.repo.remote=http://repository.atlassian.com,http://www.ibiblio.org/maven,http://dist.codehaus.org/ maven.junit.fork=yes maven.war.src=${basedir}/src/web -maven.jar.informa=lib/informa/jars/informa-0.6.0.jar + +maven.jar.override=on +maven.jar.informa=${shotoku.root.dir}/shotoku-feeds/lib/informa.jar + Modified: labs/shotoku/trunk/shotoku-feeds/project.xml =================================================================== --- labs/shotoku/trunk/shotoku-feeds/project.xml 2006-05-08 14:38:34 UTC (rev 4136) +++ labs/shotoku/trunk/shotoku-feeds/project.xml 2006-05-08 14:55:14 UTC (rev 4137) @@ -15,99 +15,92 @@ <url>http://damon.sicore.org</url> </organization> <description></description> - + <dependencies> - <dependency> - <groupId>shotoku</groupId> - <artifactId>shotoku-base</artifactId> - <jar>shotoku-base.jar</jar> - </dependency> + <dependency> + <groupId>shotoku</groupId> + <artifactId>shotoku-base</artifactId> + <jar>shotoku-base.jar</jar> + </dependency> - <dependency> - <groupId>shotoku</groupId> - <artifactId>shotoku-base</artifactId> - <jar>shotoku-base.jar</jar> - </dependency> - - <dependency> - <groupId>aslibs</groupId> - <artifactId>javax.servlet</artifactId> - <version>1.0</version> - <jar>javax.servlet.jar</jar> - </dependency> - - <dependency> - <id>jdom</id> - <version>1.0</version> - </dependency> - - <dependency> - <id>rome</id> - <version>0.7</version> - </dependency> - <dependency> - <groupId>informa</groupId> - <artifactId>informa</artifactId> - <version>0.6.5</version> - <jar>informa.jar</jar> - <properties> - <war.bundle>true</war.bundle> - </properties> - </dependency> + <groupId>javax.servlet</groupId> + <artifactId>javax.servlet</artifactId> + <jar>javax.servlet.jar</jar> + </dependency> <dependency> - <groupId>taglibs</groupId> - <artifactId>jstl</artifactId> + <groupId>jdom</groupId> + <artifactId>jdom</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> + <groupId>rome</groupId> + <artifactId>rome</artifactId> + <version>0.8</version> <properties> <war.bundle>true</war.bundle> </properties> - </dependency> - - <dependency> + </dependency> + + <dependency> + <groupId>informa</groupId> + <artifactId>informa</artifactId> + <version>0.6.5</version> + <jar>informa.jar</jar> + <properties> + <war.bundle>true</war.bundle> + </properties> + </dependency> + + <dependency> <groupId>commons-collections</groupId> <artifactId>commons-collections</artifactId> <version>3.1</version> <properties> <war.bundle>true</war.bundle> </properties> - </dependency> - + </dependency> + <dependency> <groupId>xerces</groupId> <artifactId>xercesImpl</artifactId> - <version>2.6.2</version> + <version>2.8.0</version> + <properties> + <war.bundle>true</war.bundle> + </properties> </dependency> <dependency> <groupId>xerces</groupId> <artifactId>xmlParserAPIs</artifactId> - <version>2.6.2</version> + <version>2.8.0</version> + <properties> + <war.bundle>true</war.bundle> + </properties> </dependency> - - <dependency> - <groupId>xalan</groupId> - <artifactId>xalan</artifactId> - <version>2.6.0</version> - </dependency> + + <dependency> + <groupId>xalan</groupId> + <artifactId>xalan</artifactId> + <version>2.7.0</version> + <properties> + <war.bundle>true</war.bundle> + </properties> + </dependency> </dependencies> - <build> + <build> <sourceDirectory>src/java</sourceDirectory> <resources> <resource> <directory>src/etc/</directory> - <include>**/*.xml</include></resource></resources></build> + <include>**/*.xml</include> + </resource> + </resources> + </build> </project> Added: labs/shotoku/trunk/shotoku-feeds/shotoku-feeds.iml =================================================================== --- labs/shotoku/trunk/shotoku-feeds/shotoku-feeds.iml 2006-05-08 14:38:34 UTC (rev 4136) +++ labs/shotoku/trunk/shotoku-feeds/shotoku-feeds.iml 2006-05-08 14:55:14 UTC (rev 4137) @@ -0,0 +1,22 @@ +<?xml version="1.0" encoding="UTF-8"?> +<module version="4" relativePaths="true" type="JAVA_MODULE"> + <component name="ModuleRootManager" /> + <component name="NewModuleRootManager"> + <output url="file://$MODULE_DIR$/target" /> + <exclude-output /> + <content url="file://$MODULE_DIR$"> + <sourceFolder url="file://$MODULE_DIR$/src/java" isTestSource="false" /> + </content> + <orderEntry type="inheritedJdk" /> + <orderEntry type="sourceFolder" forTests="false" /> + <orderEntry type="module" module-name="shotoku" /> + <orderEntry type="module" module-name="shotoku-aop" /> + <orderEntry type="module" module-name="shotoku-base" /> + <orderEntry type="library" name="feeds" level="application" /> + <orderEntry type="library" name="jboss" level="application" /> + <orderEntry type="library" name="commons" level="application" /> + <orderEntry type="library" name="velocity" level="application" /> + <orderEntryProperties /> + </component> +</module> + Modified: labs/shotoku/trunk/shotoku-feeds/src/java/org/jboss/shotoku/feeds/FeedsCache.java =================================================================== --- labs/shotoku/trunk/shotoku-feeds/src/java/org/jboss/shotoku/feeds/FeedsCache.java 2006-05-08 14:38:34 UTC (rev 4136) +++ labs/shotoku/trunk/shotoku-feeds/src/java/org/jboss/shotoku/feeds/FeedsCache.java 2006-05-08 14:55:14 UTC (rev 4137) @@ -25,8 +25,8 @@ import org.jboss.shotoku.cache.ShotokuCacheItem; public class FeedsCache extends ShotokuCacheItem<Pair<String, String>, FeedsDescriptor> { - private FeedsDescriptor getDesc(String baseServerAddress) { - return new FeedsDescriptor(baseServerAddress); + private FeedsDescriptor getDesc(String id, String baseServerAddress) { + return new FeedsDescriptor(id, baseServerAddress); } public void update(Pair<String, String> key, FeedsDescriptor currentObject) { Modified: labs/shotoku/trunk/shotoku-feeds/src/java/org/jboss/shotoku/feeds/FeedsDescriptor.java =================================================================== --- labs/shotoku/trunk/shotoku-feeds/src/java/org/jboss/shotoku/feeds/FeedsDescriptor.java 2006-05-08 14:38:34 UTC (rev 4136) +++ labs/shotoku/trunk/shotoku-feeds/src/java/org/jboss/shotoku/feeds/FeedsDescriptor.java 2006-05-08 14:55:14 UTC (rev 4137) @@ -133,7 +133,7 @@ private String baseServerAddress; - public FeedsDescriptor(String baseServerAddress) { + public FeedsDescriptor(String id, String baseServerAddress) { this.baseServerAddress = baseServerAddress; String feedsBaseDir = ContentManager.getProperty(FEEDS_BASEDIR); Modified: labs/shotoku/trunk/shotoku-feeds/src/java/org/jboss/shotoku/feeds/InformaBasedFeed.java =================================================================== --- labs/shotoku/trunk/shotoku-feeds/src/java/org/jboss/shotoku/feeds/InformaBasedFeed.java 2006-05-08 14:38:34 UTC (rev 4136) +++ labs/shotoku/trunk/shotoku-feeds/src/java/org/jboss/shotoku/feeds/InformaBasedFeed.java 2006-05-08 14:55:14 UTC (rev 4137) @@ -46,12 +46,12 @@ } catch (ParseException e) { throw new IOException(e.getMessage()); } - - for (Iterator iter = childChannel.getItems().iterator(); iter.hasNext();) { - ItemIF nextItem = (ItemIF) iter.next(); - nextItem.setCreator(childChannel.getCreator()); - newItems.add(nextItem); - } + + for (Object o : childChannel.getItems()) { + ItemIF nextItem = (ItemIF) o; + nextItem.setCreator(childChannel.getCreator()); + newItems.add(nextItem); + } } Collections.sort(newItems, new ItemComparator(true)); Modified: labs/shotoku/trunk/shotoku-test/src/java/org/jboss/shotoku/test/embedded/TomekTest.java =================================================================== --- labs/shotoku/trunk/shotoku-test/src/java/org/jboss/shotoku/test/embedded/TomekTest.java 2006-05-08 14:38:34 UTC (rev 4136) +++ labs/shotoku/trunk/shotoku-test/src/java/org/jboss/shotoku/test/embedded/TomekTest.java 2006-05-08 14:55:14 UTC (rev 4137) @@ -16,13 +16,14 @@ return ret; } + public static void x(int[] a) { + a[2] = 10; + } + public static void main(String[] args) { - String[] t = "v".split("v", -1); - System.out.println("T content:"); - for (String x : t) { - System.out.println(x); - } - - System.out.println("---"); + int[] t = {1, 2, 3}; + System.out.println(t[2]); + x(t); + System.out.println(t[2]); } } |
