[jboss-svn-commits] JBL Code SVN: r14250 - in labs/jbosslabs/trunk/portal-extensions: forge-common and 10 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Wed Aug 15 09:06:01 EDT 2007
Author: adamw
Date: 2007-08-15 09:06:01 -0400 (Wed, 15 Aug 2007)
New Revision: 14250
Modified:
labs/jbosslabs/trunk/portal-extensions/forge-common/project.xml
labs/jbosslabs/trunk/portal-extensions/forge-contributor/project.xml
labs/jbosslabs/trunk/portal-extensions/forge-ejb3/project.xml
labs/jbosslabs/trunk/portal-extensions/forge-feeds/project.xml
labs/jbosslabs/trunk/portal-extensions/forge-kosmos-portlets/project.xml
labs/jbosslabs/trunk/portal-extensions/forge-portlets/project.xml
labs/jbosslabs/trunk/portal-extensions/jbosswiki/project.properties
labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/project.xml
labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/ShotokuMediaDataSource.java
labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/ShotokuWikiPageDictionary.java
labs/jbosslabs/trunk/portal-extensions/polls/project.xml
labs/jbosslabs/trunk/portal-extensions/primates/project.xml
labs/jbosslabs/trunk/portal-extensions/project.properties
Log:
Fixing build
Modified: labs/jbosslabs/trunk/portal-extensions/forge-common/project.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-common/project.xml 2007-08-15 12:00:34 UTC (rev 14249)
+++ labs/jbosslabs/trunk/portal-extensions/forge-common/project.xml 2007-08-15 13:06:01 UTC (rev 14250)
@@ -144,6 +144,24 @@
<artifactId>sitemesh</artifactId>
<version>2.3</version>
</dependency>
+
+ <dependency>
+ <groupId>shotoku-cache</groupId>
+ <artifactId>shotoku-cache</artifactId>
+ <jar>shotoku-cache.jar</jar>
+ </dependency>
+
+ <dependency>
+ <groupId>jboss-cache</groupId>
+ <artifactId>jboss-cache</artifactId>
+ <jar>jboss-cache.jar</jar>
+ </dependency>
+
+ <dependency>
+ <groupId>jgroups</groupId>
+ <artifactId>jgroups</artifactId>
+ <jar>jgroups.jar</jar>
+ </dependency>
</dependencies>
<build>
Modified: labs/jbosslabs/trunk/portal-extensions/forge-contributor/project.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-contributor/project.xml 2007-08-15 12:00:34 UTC (rev 14249)
+++ labs/jbosslabs/trunk/portal-extensions/forge-contributor/project.xml 2007-08-15 13:06:01 UTC (rev 14250)
@@ -103,6 +103,26 @@
<version>2.6.2</version>
</dependency>
+
+
+ <dependency>
+ <groupId>shotoku-cache</groupId>
+ <artifactId>shotoku-cache</artifactId>
+ <jar>shotoku-cache.jar</jar>
+ </dependency>
+
+ <dependency>
+ <groupId>jboss-cache</groupId>
+ <artifactId>jboss-cache</artifactId>
+ <jar>jboss-cache.jar</jar>
+ </dependency>
+
+ <dependency>
+ <groupId>jgroups</groupId>
+ <artifactId>jgroups</artifactId>
+ <jar>jgroups.jar</jar>
+ </dependency>
+
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
Modified: labs/jbosslabs/trunk/portal-extensions/forge-ejb3/project.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-ejb3/project.xml 2007-08-15 12:00:34 UTC (rev 14249)
+++ labs/jbosslabs/trunk/portal-extensions/forge-ejb3/project.xml 2007-08-15 13:06:01 UTC (rev 14250)
@@ -88,5 +88,23 @@
<artifactId>log4j</artifactId>
<version>1.2.9</version>
</dependency>
+
+ <dependency>
+ <groupId>shotoku-cache</groupId>
+ <artifactId>shotoku-cache</artifactId>
+ <jar>shotoku-cache.jar</jar>
+ </dependency>
+
+ <dependency>
+ <groupId>jboss-cache</groupId>
+ <artifactId>jboss-cache</artifactId>
+ <jar>jboss-cache.jar</jar>
+ </dependency>
+
+ <dependency>
+ <groupId>jgroups</groupId>
+ <artifactId>jgroups</artifactId>
+ <jar>jgroups.jar</jar>
+ </dependency>
</dependencies>
</project>
Modified: labs/jbosslabs/trunk/portal-extensions/forge-feeds/project.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-feeds/project.xml 2007-08-15 12:00:34 UTC (rev 14249)
+++ labs/jbosslabs/trunk/portal-extensions/forge-feeds/project.xml 2007-08-15 13:06:01 UTC (rev 14250)
@@ -29,5 +29,23 @@
<version>1.0</version>
<jar>shotoku-feeds.jar</jar>
</dependency>
+
+ <dependency>
+ <groupId>shotoku-cache</groupId>
+ <artifactId>shotoku-cache</artifactId>
+ <jar>shotoku-cache.jar</jar>
+ </dependency>
+
+ <dependency>
+ <groupId>jboss-cache</groupId>
+ <artifactId>jboss-cache</artifactId>
+ <jar>jboss-cache.jar</jar>
+ </dependency>
+
+ <dependency>
+ <groupId>jgroups</groupId>
+ <artifactId>jgroups</artifactId>
+ <jar>jgroups.jar</jar>
+ </dependency>
</dependencies>
</project>
Modified: labs/jbosslabs/trunk/portal-extensions/forge-kosmos-portlets/project.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-kosmos-portlets/project.xml 2007-08-15 12:00:34 UTC (rev 14249)
+++ labs/jbosslabs/trunk/portal-extensions/forge-kosmos-portlets/project.xml 2007-08-15 13:06:01 UTC (rev 14250)
@@ -98,7 +98,27 @@
<version>1.0</version>
<jar>javax.servlet.jsp.jar</jar>
</dependency>
-
+
+
+
+ <dependency>
+ <groupId>shotoku-cache</groupId>
+ <artifactId>shotoku-cache</artifactId>
+ <jar>shotoku-cache.jar</jar>
+ </dependency>
+
+ <dependency>
+ <groupId>jboss-cache</groupId>
+ <artifactId>jboss-cache</artifactId>
+ <jar>jboss-cache.jar</jar>
+ </dependency>
+
+ <dependency>
+ <groupId>jgroups</groupId>
+ <artifactId>jgroups</artifactId>
+ <jar>jgroups.jar</jar>
+ </dependency>
+
</dependencies>
<build>
Modified: labs/jbosslabs/trunk/portal-extensions/forge-portlets/project.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-portlets/project.xml 2007-08-15 12:00:34 UTC (rev 14249)
+++ labs/jbosslabs/trunk/portal-extensions/forge-portlets/project.xml 2007-08-15 13:06:01 UTC (rev 14250)
@@ -84,5 +84,23 @@
<artifactId>xercesImpl</artifactId>
<version>2.6.2</version>
</dependency>
+
+ <dependency>
+ <groupId>shotoku-cache</groupId>
+ <artifactId>shotoku-cache</artifactId>
+ <jar>shotoku-cache.jar</jar>
+ </dependency>
+
+ <dependency>
+ <groupId>jboss-cache</groupId>
+ <artifactId>jboss-cache</artifactId>
+ <jar>jboss-cache.jar</jar>
+ </dependency>
+
+ <dependency>
+ <groupId>jgroups</groupId>
+ <artifactId>jgroups</artifactId>
+ <jar>jgroups.jar</jar>
+ </dependency>
</dependencies>
</project>
Modified: labs/jbosslabs/trunk/portal-extensions/jbosswiki/project.properties
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/jbosswiki/project.properties 2007-08-15 12:00:34 UTC (rev 14249)
+++ labs/jbosslabs/trunk/portal-extensions/jbosswiki/project.properties 2007-08-15 13:06:01 UTC (rev 14250)
@@ -7,5 +7,9 @@
maven.jar.shotoku-base=${ext.root.dir}/shotoku/shotoku-base/target/shotoku-base.jar
maven.jar.shotoku-aop=${ext.root.dir}/shotoku/shotoku-aop/target/shotoku-aop.jar
+maven.jar.shotoku-cache=${ext.root.dir}/shotoku/shotoku-cache/cache-base/dist/shotoku-cache.jar
+maven.jar.jboss-cache=${ext.root.dir}/shotoku/lib/jboss-cache/jboss-cache.jar
+maven.jar.jgroups=${ext.root.dir}/shotoku/lib/jboss-cache/jgroups.jar
+
maven.war.classes.excludes=
maven.jar.includes=**/*
Modified: labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/project.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/project.xml 2007-08-15 12:00:34 UTC (rev 14249)
+++ labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/project.xml 2007-08-15 13:06:01 UTC (rev 14250)
@@ -165,5 +165,25 @@
<artifactId>jbossall-client</artifactId>
<version>3.2.3</version>
</dependency>
+
+
+
+ <dependency>
+ <groupId>shotoku-cache</groupId>
+ <artifactId>shotoku-cache</artifactId>
+ <jar>shotoku-cache.jar</jar>
+ </dependency>
+
+ <dependency>
+ <groupId>jboss-cache</groupId>
+ <artifactId>jboss-cache</artifactId>
+ <jar>jboss-cache.jar</jar>
+ </dependency>
+
+ <dependency>
+ <groupId>jgroups</groupId>
+ <artifactId>jgroups</artifactId>
+ <jar>jgroups.jar</jar>
+ </dependency>
</dependencies>
</project>
Modified: labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/ShotokuMediaDataSource.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/ShotokuMediaDataSource.java 2007-08-15 12:00:34 UTC (rev 14249)
+++ labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/ShotokuMediaDataSource.java 2007-08-15 13:06:01 UTC (rev 14250)
@@ -37,7 +37,6 @@
import org.jboss.shotoku.Directory;
import org.jboss.shotoku.Node;
import org.jboss.shotoku.Resource;
-import org.jboss.shotoku.cache.ShotokuCache;
import org.jboss.shotoku.cache.ShotokuResourceWatcher;
import org.jboss.shotoku.exceptions.DeleteException;
import org.jboss.shotoku.exceptions.NameFormatException;
Modified: labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/ShotokuWikiPageDictionary.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/ShotokuWikiPageDictionary.java 2007-08-15 12:00:34 UTC (rev 14249)
+++ labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/ShotokuWikiPageDictionary.java 2007-08-15 13:06:01 UTC (rev 14250)
@@ -30,7 +30,6 @@
import org.jboss.logging.Logger;
import org.jboss.shotoku.ContentManager;
import org.jboss.shotoku.Directory;
-import org.jboss.shotoku.cache.ShotokuCache;
import org.jboss.shotoku.cache.ShotokuResourceWatcher;
import org.jboss.shotoku.exceptions.NameFormatException;
import org.jboss.shotoku.exceptions.ResourceAlreadyExists;
@@ -200,7 +199,7 @@
}
public void setLanguageCode(String langCode) {
- ShotokuCache.remove(dictDir.getFullName());
+ // TODO ShotokuCache.remove(dictDir.getFullName());
ContentManager manager = ContentManager
.getContentManager(getPathToMedia());
Modified: labs/jbosslabs/trunk/portal-extensions/polls/project.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/polls/project.xml 2007-08-15 12:00:34 UTC (rev 14249)
+++ labs/jbosslabs/trunk/portal-extensions/polls/project.xml 2007-08-15 13:06:01 UTC (rev 14250)
@@ -133,5 +133,25 @@
<version>2.0</version>
<jar>jaxb-xjc.jar</jar>
</dependency>
+
+
+
+ <dependency>
+ <groupId>shotoku-cache</groupId>
+ <artifactId>shotoku-cache</artifactId>
+ <jar>shotoku-cache.jar</jar>
+ </dependency>
+
+ <dependency>
+ <groupId>jboss-cache</groupId>
+ <artifactId>jboss-cache</artifactId>
+ <jar>jboss-cache.jar</jar>
+ </dependency>
+
+ <dependency>
+ <groupId>jgroups</groupId>
+ <artifactId>jgroups</artifactId>
+ <jar>jgroups.jar</jar>
+ </dependency>
</dependencies>
</project>
Modified: labs/jbosslabs/trunk/portal-extensions/primates/project.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/primates/project.xml 2007-08-15 12:00:34 UTC (rev 14249)
+++ labs/jbosslabs/trunk/portal-extensions/primates/project.xml 2007-08-15 13:06:01 UTC (rev 14250)
@@ -54,5 +54,24 @@
<jar>jboss-annotations-ejb3.jar</jar>
</dependency>
+
+
+ <dependency>
+ <groupId>shotoku-cache</groupId>
+ <artifactId>shotoku-cache</artifactId>
+ <jar>shotoku-cache.jar</jar>
+ </dependency>
+
+ <dependency>
+ <groupId>jboss-cache</groupId>
+ <artifactId>jboss-cache</artifactId>
+ <jar>jboss-cache.jar</jar>
+ </dependency>
+
+ <dependency>
+ <groupId>jgroups</groupId>
+ <artifactId>jgroups</artifactId>
+ <jar>jgroups.jar</jar>
+ </dependency>
</dependencies>
</project>
Modified: labs/jbosslabs/trunk/portal-extensions/project.properties
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/project.properties 2007-08-15 12:00:34 UTC (rev 14249)
+++ labs/jbosslabs/trunk/portal-extensions/project.properties 2007-08-15 13:06:01 UTC (rev 14250)
@@ -27,6 +27,10 @@
maven.jar.blog-common=${ext.root.dir}/shotoku/lib/jboss-blog/jboss-blog-common.jar
maven.jar.blog-core=${ext.root.dir}/forge-blog/binaries/jboss-blog.sar/lib/jboss-blog-core.jar
+maven.jar.shotoku-cache=${ext.root.dir}/shotoku/shotoku-cache/cache-base/dist/shotoku-cache.jar
+maven.jar.jboss-cache=${ext.root.dir}/shotoku/lib/jboss-cache/jboss-cache.jar
+maven.jar.jgroups=${ext.root.dir}/shotoku/lib/jboss-cache/jgroups.jar
+
maven.multiproject.excludes=shotoku/project.xml
maven.war.classes.excludes=**/*
More information about the jboss-svn-commits
mailing list