[jboss-svn-commits] JBL Code SVN: r15362 - in labs/jbosslabs/trunk/portal-extensions: jboss-forums and 1 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Tue Sep 25 11:29:26 EDT 2007
Author: wrzep
Date: 2007-09-25 11:29:26 -0400 (Tue, 25 Sep 2007)
New Revision: 15362
Modified:
labs/jbosslabs/trunk/portal-extensions/jboss-forums/maven.xml
labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/project.xml
labs/jbosslabs/trunk/portal-extensions/maven.xml
Log:
JBLAB-892
removing forums
fixed wiki deployment issues
Modified: labs/jbosslabs/trunk/portal-extensions/jboss-forums/maven.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/jboss-forums/maven.xml 2007-09-25 14:41:15 UTC (rev 15361)
+++ labs/jbosslabs/trunk/portal-extensions/jboss-forums/maven.xml 2007-09-25 15:29:26 UTC (rev 15362)
@@ -71,7 +71,8 @@
</goal>
<goal name="forums:deploy">
- <ant:copy tofile="${local.deploy.dir}/jboss-forums.ear" file="target/jboss-forums.ear" />
+ <!--
+ <ant:copy tofile="${local.deploy.dir}/jboss-forums.ear" file="target/jboss-forums.ear" /> -->
</goal>
<goal name="forums:all">
Modified: labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/project.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/project.xml 2007-09-25 14:41:15 UTC (rev 15361)
+++ labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/project.xml 2007-09-25 15:29:26 UTC (rev 15362)
@@ -5,32 +5,32 @@
See terms of license at gnu.org.
-->
<project>
- <pomVersion>3</pomVersion>
- <extend>../common.xml</extend>
- <id>wiki</id>
- <name>Wiki portlet and servlet</name>
- <currentVersion>1.0</currentVersion>
+ <pomVersion>3</pomVersion>
+ <extend>../common.xml</extend>
+ <id>wiki</id>
+ <name>Wiki portlet and servlet</name>
+ <currentVersion>1.0</currentVersion>
<build>
- <sourceDirectory>src/java</sourceDirectory>
- <resources>
- <resource>
- <directory>src/etc/</directory>
- <include>**/*.properties</include>
- </resource>
- <resource>
- <directory>src/etc/</directory>
- <include>**/*.xml</include>
- </resource>
- <resource>
- <directory>src/etc/</directory>
- <include>**/*.types</include>
- </resource>
- </resources>
- </build>
- <organization>
- <name>Tomasz Szymanski</name>
- <url>http://mamut.net.pl</url>
- </organization>
+ <sourceDirectory>src/java</sourceDirectory>
+ <resources>
+ <resource>
+ <directory>src/etc/</directory>
+ <include>**/*.properties</include>
+ </resource>
+ <resource>
+ <directory>src/etc/</directory>
+ <include>**/*.xml</include>
+ </resource>
+ <resource>
+ <directory>src/etc/</directory>
+ <include>**/*.types</include>
+ </resource>
+ </resources>
+ </build>
+ <organization>
+ <name>Tomasz Szymanski</name>
+ <url>http://mamut.net.pl</url>
+ </organization>
<dependencies>
<dependency>
@@ -41,7 +41,7 @@
<war.bundle>true</war.bundle>
</properties>
</dependency>
-
+
<dependency>
<groupId>ajax4jsf</groupId>
<artifactId>oscache</artifactId>
@@ -50,153 +50,173 @@
<war.bundle>true</war.bundle>
</properties>
</dependency>
-
+
<dependency>
- <groupId>jboss</groupId>
- <artifactId>javax.servlet</artifactId>
- <version>1.0</version>
- <jar>javax.servlet.jar</jar>
- </dependency>
-
- <dependency>
- <groupId>wiki-common</groupId>
- <artifactId>wiki-common</artifactId>
- <version>1.0</version>
- <jar>wiki-common.jar</jar>
- </dependency>
-
+ <groupId>jboss</groupId>
+ <artifactId>javax.servlet</artifactId>
+ <version>1.0</version>
+ <jar>javax.servlet.jar</jar>
+ </dependency>
+
<dependency>
- <groupId>jboss</groupId>
- <artifactId>javax.servlet.jsp</artifactId>
- <version>1.0</version>
- <jar>javax.servlet.jsp.jar</jar>
- </dependency>
-
+ <groupId>wiki-common</groupId>
+ <artifactId>wiki-common</artifactId>
+ <version>1.0</version>
+ <jar>wiki-common.jar</jar>
+ </dependency>
+
<dependency>
- <groupId>jboss</groupId>
- <artifactId>activation</artifactId>
- <version>1.0</version>
- <jar>activation.jar</jar>
- </dependency>
-
- <dependency>
- <groupId>commons-fileupload</groupId>
- <artifactId>commons-fileupload.jar</artifactId>
- <version>1.1</version>
- <jar>commons-fileupload-1.1.jar</jar>
- <properties>
- <war.bundle>true</war.bundle>
- </properties>
- </dependency>
-
- <dependency>
- <groupId>dom4j</groupId>
- <artifactId>dom4j</artifactId>
- <version>1.6</version>
- </dependency>
-
- <dependency>
- <groupId>jdom</groupId>
- <artifactId>jdom</artifactId>
- <version>1.0</version>
- </dependency>
-
- <dependency>
- <groupId>jboss</groupId>
- <artifactId>jboss-ejb3x</artifactId>
- <version>1.0</version>
- <jar>jboss-ejb3x.jar</jar>
- </dependency>
-
- <dependency>
- <groupId>jboss</groupId>
- <artifactId>jboss-ejb3</artifactId>
- <version>1.0</version>
- <jar>jboss-ejb3.jar</jar>
- </dependency>
-
- <dependency>
- <id>portlet-api</id>
- <version>1.0</version>
+ <groupId>jboss</groupId>
+ <artifactId>javax.servlet.jsp</artifactId>
+ <version>1.0</version>
+ <jar>javax.servlet.jsp.jar</jar>
</dependency>
-
+
<dependency>
- <groupId>jboss</groupId>
- <artifactId>jboss-jmx</artifactId>
- <version>1.0</version>
- <jar>jboss-jmx.jar</jar>
- </dependency>
-
+ <groupId>jboss</groupId>
+ <artifactId>activation</artifactId>
+ <version>1.0</version>
+ <jar>activation.jar</jar>
+ </dependency>
+
<dependency>
- <groupId>jboss</groupId>
- <artifactId>jboss-common</artifactId>
- <version>1.0</version>
- <jar>jboss-common.jar</jar>
+ <groupId>commons-fileupload</groupId>
+ <artifactId>commons-fileupload.jar</artifactId>
+ <version>1.1</version>
+ <jar>commons-fileupload-1.1.jar</jar>
+ <properties>
+ <war.bundle>true</war.bundle>
+ </properties>
</dependency>
-
+
<dependency>
- <groupId>jboss</groupId>
- <artifactId>portal-common-lib</artifactId>
- <version>1.0</version>
- <jar>portal-common-lib.jar</jar>
+ <groupId>dom4j</groupId>
+ <artifactId>dom4j</artifactId>
+ <version>1.6</version>
</dependency>
-
+
<dependency>
- <groupId>jboss</groupId>
- <artifactId>portal-core-lib</artifactId>
- <version>1.0</version>
- <jar>portal-core-lib.jar</jar>
+ <groupId>jdom</groupId>
+ <artifactId>jdom</artifactId>
+ <version>1.0</version>
</dependency>
-
+
<dependency>
- <groupId>jboss</groupId>
- <artifactId>portal-portlet-lib</artifactId>
- <version>1.0</version>
- <jar>portal-portlet-lib.jar</jar>
+ <groupId>jboss</groupId>
+ <artifactId>jboss-ejb3x</artifactId>
+ <version>1.0</version>
+ <jar>jboss-ejb3x.jar</jar>
</dependency>
-
+
<dependency>
- <groupId>myfaces</groupId>
- <artifactId>myfaces-api</artifactId>
- <version>1.1.4</version>
- </dependency>
- <dependency>
- <groupId>myfaces</groupId>
- <artifactId>myfaces-impl</artifactId>
- <version>1.1.4</version>
- </dependency>
- <dependency>
- <groupId>myfaces</groupId>
- <artifactId>tomahawk</artifactId>
- <version>1.1.3</version>
- <properties>
- <war.bundle>true</war.bundle>
- </properties>
- </dependency>
-
- <dependency>
- <groupId>myfaces</groupId>
- <artifactId>jsf-facelets</artifactId>
- <version>1.0</version>
- <jar>jsf-facelets.jar</jar>
- </dependency>
- <dependency>
- <groupId>myfaces</groupId>
- <artifactId>el-api</artifactId>
- <version>1.0</version>
- <jar>el-api.jar</jar>
- </dependency>
- <dependency>
- <groupId>myfaces</groupId>
- <artifactId>el-ri</artifactId>
- <version>1.0</version>
- <jar>el-ri.jar</jar>
- </dependency>
- <dependency>
- <groupId>myfaces</groupId>
- <artifactId>jsf-facelets-portlet</artifactId>
- <version>1.0</version>
- <jar>jsf-facelets-portlet.jar</jar>
- </dependency>
- </dependencies>
+ <groupId>jboss</groupId>
+ <artifactId>jboss-ejb3</artifactId>
+ <version>1.0</version>
+ <jar>jboss-ejb3.jar</jar>
+ </dependency>
+
+ <dependency>
+ <id>portlet-api</id>
+ <version>1.0</version>
+ </dependency>
+
+ <dependency>
+ <groupId>jboss</groupId>
+ <artifactId>jboss-jmx</artifactId>
+ <version>1.0</version>
+ <jar>jboss-jmx.jar</jar>
+ </dependency>
+
+ <dependency>
+ <groupId>jboss</groupId>
+ <artifactId>jboss-common</artifactId>
+ <version>1.0</version>
+ <jar>jboss-common.jar</jar>
+ </dependency>
+
+ <dependency>
+ <groupId>jboss</groupId>
+ <artifactId>portal-common-lib</artifactId>
+ <version>1.0</version>
+ <jar>portal-common-lib.jar</jar>
+ </dependency>
+
+ <dependency>
+ <groupId>jboss</groupId>
+ <artifactId>portal-core-lib</artifactId>
+ <version>1.0</version>
+ <jar>portal-core-lib.jar</jar>
+ </dependency>
+
+ <dependency>
+ <groupId>jboss</groupId>
+ <artifactId>portal-portlet-lib</artifactId>
+ <version>1.0</version>
+ <jar>portal-portlet-lib.jar</jar>
+ </dependency>
+
+ <dependency>
+ <groupId>myfaces</groupId>
+ <artifactId>myfaces-api</artifactId>
+ <version>1.1.4</version>
+ </dependency>
+ <dependency>
+ <groupId>myfaces</groupId>
+ <artifactId>myfaces-impl</artifactId>
+ <version>1.1.4</version>
+ </dependency>
+ <dependency>
+ <groupId>myfaces</groupId>
+ <artifactId>tomahawk</artifactId>
+ <version>1.1.3</version>
+ <properties>
+ <war.bundle>true</war.bundle>
+ </properties>
+ </dependency>
+
+ <dependency>
+ <groupId>myfaces</groupId>
+ <artifactId>jsf-facelets</artifactId>
+ <version>1.0</version>
+ <jar>jsf-facelets.jar</jar>
+ <properties>
+ <war.bundle>true</war.bundle>
+ </properties>
+ </dependency>
+ <dependency>
+ <groupId>myfaces</groupId>
+ <artifactId>el-api</artifactId>
+ <version>1.0</version>
+ <jar>el-api.jar</jar>
+ <properties>
+ <war.bundle>true</war.bundle>
+ </properties>
+ </dependency>
+ <dependency>
+ <groupId>myfaces</groupId>
+ <artifactId>el-ri</artifactId>
+ <version>1.0</version>
+ <jar>el-ri.jar</jar>
+ <properties>
+ <war.bundle>true</war.bundle>
+ </properties>
+ </dependency>
+ <dependency>
+ <groupId>myfaces</groupId>
+ <artifactId>jsf-facelets-portlet</artifactId>
+ <version>1.0</version>
+ <jar>jsf-facelets-portlet.jar</jar>
+ <properties>
+ <war.bundle>true</war.bundle>
+ </properties>
+ </dependency>
+ <dependency>
+ <groupId>jboss</groupId>
+ <artifactId>portal-faces-lib</artifactId>
+ <jar>portal-faces-lib.jar</jar>
+ <properties>
+ <war.bundle>true</war.bundle>
+ </properties>
+ </dependency>
+ </dependencies>
</project>
Modified: labs/jbosslabs/trunk/portal-extensions/maven.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/maven.xml 2007-09-25 14:41:15 UTC (rev 15361)
+++ labs/jbosslabs/trunk/portal-extensions/maven.xml 2007-09-25 15:29:26 UTC (rev 15362)
@@ -135,6 +135,8 @@
<ant:copy todir="${maven.repo.local}/jboss/jars" overwrite="true">
<ant:fileset dir="binaries/portal/to-copy/jboss-portal.sar/lib" />
</ant:copy>
+ <ant:copy todir="${maven.repo.local}/jboss/jars" overwrite="true"
+ file="binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/lib2/portal-faces-lib.jar" />
<ant:exec dir="${basedir}/shotoku" executable="maven">
<ant:arg line="all" />
More information about the jboss-svn-commits
mailing list