[jboss-svn-commits] JBL Code SVN: r8434 - in labs/jbosslabs/trunk/portal-extensions/jmm: . jmm-common jmm-portlet jmm-service
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Wed Dec 20 07:01:47 EST 2006
Author: wrzep
Date: 2006-12-20 07:01:42 -0500 (Wed, 20 Dec 2006)
New Revision: 8434
Added:
labs/jbosslabs/trunk/portal-extensions/jmm/common.xml
Removed:
labs/jbosslabs/trunk/portal-extensions/jmm/project.xml
Modified:
labs/jbosslabs/trunk/portal-extensions/jmm/jmm-common/
labs/jbosslabs/trunk/portal-extensions/jmm/jmm-common/project.xml
labs/jbosslabs/trunk/portal-extensions/jmm/jmm-portlet/
labs/jbosslabs/trunk/portal-extensions/jmm/jmm-portlet/maven.xml
labs/jbosslabs/trunk/portal-extensions/jmm/jmm-portlet/project.xml
labs/jbosslabs/trunk/portal-extensions/jmm/jmm-service/
labs/jbosslabs/trunk/portal-extensions/jmm/jmm-service/maven.xml
labs/jbosslabs/trunk/portal-extensions/jmm/jmm-service/project.xml
labs/jbosslabs/trunk/portal-extensions/jmm/maven.xml
Log:
http://jira.jboss.com/jira/browse/JBLAB-815
Pawel
Added: labs/jbosslabs/trunk/portal-extensions/jmm/common.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/jmm/common.xml 2006-12-20 11:46:33 UTC (rev 8433)
+++ labs/jbosslabs/trunk/portal-extensions/jmm/common.xml 2006-12-20 12:01:42 UTC (rev 8434)
@@ -0,0 +1,19 @@
+<?xml version='1.0' encoding='ISO-8859-1'?>
+<!--
+ JBoss, the OpenSource J2EE webOS
+ Distributable under LGPL license.
+ See terms of license at gnu.org.
+ -->
+<project>
+ <pomVersion>3</pomVersion>
+ <extend>../common.xml</extend>
+ <id>jmm-common</id>
+ <name>JEMS Maturity Matrix Common Library</name>
+ <currentVersion>1.0</currentVersion>
+ <organization>
+ <name>Pawel Wrzeszcz</name>
+ <url></url>
+ </organization>
+ <description></description>
+ <dependencies/>
+</project>
Property changes on: labs/jbosslabs/trunk/portal-extensions/jmm/jmm-common
___________________________________________________________________
Name: svn:ignore
+ target
Modified: labs/jbosslabs/trunk/portal-extensions/jmm/jmm-common/project.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/jmm/jmm-common/project.xml 2006-12-20 11:46:33 UTC (rev 8433)
+++ labs/jbosslabs/trunk/portal-extensions/jmm/jmm-common/project.xml 2006-12-20 12:01:42 UTC (rev 8434)
@@ -6,7 +6,7 @@
-->
<project>
<pomVersion>3</pomVersion>
- <extend>../project.xml</extend>
+ <extend>../common.xml</extend>
<id>jmm-common</id>
<name>JEMS Maturity Matrix Common Library</name>
<currentVersion>1.0</currentVersion>
@@ -22,75 +22,18 @@
<groupId>jboss-forge</groupId>
<artifactId>forge-common</artifactId>
<version>1.0</version>
- <properties>
- <ejb.manifest.classpath>true</ejb.manifest.classpath>
- <war.manifest.classpath>true</war.manifest.classpath>
- </properties>
</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>
- <properties>
- <war.bundle>true</war.bundle>
- </properties>
- </dependency>
-
- <dependency>
- <groupId>tmate</groupId>
- <artifactId>javasvn</artifactId>
- <version>1.0</version>
- <jar>javasvn.jar</jar>
- <properties>
- <war.bundle>true</war.bundle>
- <ejb.manifest.classpath>true</ejb.manifest.classpath>
- </properties>
- </dependency>
-
- <dependency>
- <groupId>kosmos</groupId>
- <artifactId>kosmos</artifactId>
- <jar>kosmos-server.jar</jar>
- <version>1.0</version>
- <properties>
- <war.bundle>true</war.bundle>
- <ejb.manifest.classpath>true</ejb.manifest.classpath>
- <war.manifest.classpath>true</war.manifest.classpath>
- </properties>
- </dependency>
-
- <dependency>
- <groupId>hessian</groupId>
- <artifactId>hessian</artifactId>
- <version>3.0.1</version>
- <jar>hessian-3.0.13.jar</jar>
- <properties>
- <war.bundle>true</war.bundle>
- <war.manifest.classpath>true</war.manifest.classpath>
- <ejb.manifest.classpath>true</ejb.manifest.classpath>
- </properties>
- </dependency>
-
- <dependency>
<groupId>shotoku</groupId>
<artifactId>shotoku-base</artifactId>
<version>1.0</version>
<jar>shotoku-base.jar</jar>
- <properties>
- <ejb.manifest.classpath>true</ejb.manifest.classpath>
- <war.manifest.classpath>true</war.manifest.classpath>
- </properties>
</dependency>
<!-- JBoss EJB3 dependencies -->
+
<dependency>
<groupId>jboss</groupId>
<artifactId>ejb3-persistence</artifactId>
@@ -102,7 +45,8 @@
<artifactId>jboss-ejb3x</artifactId>
<version>3.0RC6</version>
<jar>jboss-ejb3x.jar</jar>
- </dependency>
+ </dependency>
+
<dependency>
<groupId>jboss</groupId>
<artifactId>jboss-j2ee</artifactId>
@@ -127,6 +71,7 @@
<version>2.0</version>
<jar>jaxb-api.jar</jar>
</dependency>
-
+
+
</dependencies>
</project>
Property changes on: labs/jbosslabs/trunk/portal-extensions/jmm/jmm-portlet
___________________________________________________________________
Name: svn:ignore
+ target
Modified: labs/jbosslabs/trunk/portal-extensions/jmm/jmm-portlet/maven.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/jmm/jmm-portlet/maven.xml 2006-12-20 11:46:33 UTC (rev 8433)
+++ labs/jbosslabs/trunk/portal-extensions/jmm/jmm-portlet/maven.xml 2006-12-20 12:01:42 UTC (rev 8434)
@@ -21,6 +21,7 @@
</goal>
<goal name="clean">
+ <ant:delete file="${local.deploy.dir}/forge-jmm.war"/>
<attainGoal name="module-clean" />
</goal>
Modified: labs/jbosslabs/trunk/portal-extensions/jmm/jmm-portlet/project.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/jmm/jmm-portlet/project.xml 2006-12-20 11:46:33 UTC (rev 8433)
+++ labs/jbosslabs/trunk/portal-extensions/jmm/jmm-portlet/project.xml 2006-12-20 12:01:42 UTC (rev 8434)
@@ -6,9 +6,9 @@
-->
<project>
<pomVersion>3</pomVersion>
- <extend>../project.xml</extend>
+ <extend>../common.xml</extend>
<id>jmm</id>
- <name>JEMS Maturity Matrix</name>
+ <name>JEMS Maturity Matrix Portlet</name>
<currentVersion>1.0</currentVersion>
<organization>
<name>Pawel Wrzeszcz</name>
@@ -23,7 +23,6 @@
<artifactId>forge-common</artifactId>
<version>1.0</version>
<properties>
- <ejb.manifest.classpath>true</ejb.manifest.classpath>
<war.manifest.classpath>true</war.manifest.classpath>
</properties>
</dependency>
@@ -32,8 +31,7 @@
<groupId>jboss-forge</groupId>
<artifactId>jmm-common</artifactId>
<jar>jmm-common.jar</jar>
- <properties>
- <ejb.manifest.classpath>true</ejb.manifest.classpath>
+ <properties>
<war.manifest.classpath>true</war.manifest.classpath>
</properties>
</dependency>
@@ -54,89 +52,14 @@
</dependency>
<dependency>
- <groupId>tmate</groupId>
- <artifactId>javasvn</artifactId>
- <version>1.0</version>
- <jar>javasvn.jar</jar>
- <properties>
- <war.bundle>true</war.bundle>
- <ejb.manifest.classpath>true</ejb.manifest.classpath>
- </properties>
- </dependency>
-
- <dependency>
- <groupId>kosmos</groupId>
- <artifactId>kosmos</artifactId>
- <jar>kosmos-server.jar</jar>
- <version>1.0</version>
- <properties>
- <war.bundle>true</war.bundle>
- <ejb.manifest.classpath>true</ejb.manifest.classpath>
- <war.manifest.classpath>true</war.manifest.classpath>
- </properties>
- </dependency>
-
- <dependency>
- <groupId>hessian</groupId>
- <artifactId>hessian</artifactId>
- <version>3.0.1</version>
- <jar>hessian-3.0.13.jar</jar>
- <properties>
- <war.bundle>true</war.bundle>
- <war.manifest.classpath>true</war.manifest.classpath>
- <ejb.manifest.classpath>true</ejb.manifest.classpath>
- </properties>
- </dependency>
-
- <dependency>
<groupId>shotoku</groupId>
<artifactId>shotoku-base</artifactId>
<version>1.0</version>
<jar>shotoku-base.jar</jar>
<properties>
- <ejb.manifest.classpath>true</ejb.manifest.classpath>
<war.manifest.classpath>true</war.manifest.classpath>
</properties>
</dependency>
- <!-- JBoss EJB3 dependencies -->
-
- <dependency>
- <groupId>jboss</groupId>
- <artifactId>ejb3-persistence</artifactId>
- <version>3.0RC6</version>
- <jar>ejb3-persistence.jar</jar>
- </dependency>
- <dependency>
- <groupId>jboss</groupId>
- <artifactId>jboss-ejb3x</artifactId>
- <version>3.0RC6</version>
- <jar>jboss-ejb3x.jar</jar>
- </dependency>
- <dependency>
- <groupId>jboss</groupId>
- <artifactId>jboss-j2ee</artifactId>
- <version></version>
- <jar>jboss-j2ee.jar</jar>
- </dependency>
- <dependency>
- <groupId>jboss</groupId>
- <artifactId>jboss-annotations-ejb3</artifactId>
- <version></version>
- <jar>jboss-annotations-ejb3.jar</jar>
- </dependency>
- <dependency>
- <groupId>jboss</groupId>
- <artifactId>jbossall-client</artifactId>
- <version>3.2.3</version>
- </dependency>
-
- <dependency>
- <groupId>jaxb</groupId>
- <artifactId>JAXB2</artifactId>
- <version>2.0</version>
- <jar>jaxb-api.jar</jar>
- </dependency>
-
</dependencies>
</project>
Property changes on: labs/jbosslabs/trunk/portal-extensions/jmm/jmm-service
___________________________________________________________________
Name: svn:ignore
+ target
Modified: labs/jbosslabs/trunk/portal-extensions/jmm/jmm-service/maven.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/jmm/jmm-service/maven.xml 2006-12-20 11:46:33 UTC (rev 8433)
+++ labs/jbosslabs/trunk/portal-extensions/jmm/jmm-service/maven.xml 2006-12-20 12:01:42 UTC (rev 8434)
@@ -24,7 +24,7 @@
</goal>
<goal name="build-sar">
-<!-- <ant:copy todir="target/${jmm.service.sar}" file="../jmm-common/target/${jmm.common.final.name}" /> -->
+- <ant:copy todir="target/${jmm.service.sar}" file="../jmm-common/target/${jmm.common.final.name}" />
<ant:copy todir="target/${jmm.service.sar}">
<ant:fileset dir="src/app" flatten="true" overwrite="true">
<ant:filename name="**" />
Modified: labs/jbosslabs/trunk/portal-extensions/jmm/jmm-service/project.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/jmm/jmm-service/project.xml 2006-12-20 11:46:33 UTC (rev 8433)
+++ labs/jbosslabs/trunk/portal-extensions/jmm/jmm-service/project.xml 2006-12-20 12:01:42 UTC (rev 8434)
@@ -6,7 +6,7 @@
-->
<project>
<pomVersion>3</pomVersion>
- <extend>../project.xml</extend>
+ <extend>../common.xml</extend>
<id>jmm-service</id>
<name>JEMS Maturity Matrix Service</name>
<currentVersion>1.0</currentVersion>
@@ -34,17 +34,10 @@
<jar>jmm-common.jar</jar>
<properties>
<ejb.manifest.classpath>true</ejb.manifest.classpath>
- <ejb.bundle>true</ejb.bundle>
+ <ejb.bundle>false</ejb.bundle>
</properties>
</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>
@@ -59,7 +52,6 @@
<version>1.0</version>
<jar>javasvn.jar</jar>
<properties>
- <war.bundle>true</war.bundle>
<ejb.bundle>true</ejb.bundle>
</properties>
</dependency>
@@ -79,13 +71,13 @@
<groupId>hessian</groupId>
<artifactId>hessian</artifactId>
<version>3.0.1</version>
- <jar>hessian-3.0.13.jar</jar>
+ <jar>hessian-3.0.13.jar</jar>
<properties>
<ejb.manifest.classpath>true</ejb.manifest.classpath>
<ejb.bundle>true</ejb.bundle>
</properties>
</dependency>
-<!--
+
<dependency>
<groupId>shotoku</groupId>
<artifactId>shotoku-base</artifactId>
@@ -95,7 +87,7 @@
<ejb.manifest.classpath>true</ejb.manifest.classpath>
</properties>
</dependency>
- -->
+
<!-- JBoss EJB3 dependencies -->
<dependency>
@@ -127,7 +119,7 @@
<artifactId>jbossall-client</artifactId>
<version>3.2.3</version>
</dependency>
-
+
<dependency>
<groupId>jaxb</groupId>
<artifactId>JAXB2</artifactId>
Modified: labs/jbosslabs/trunk/portal-extensions/jmm/maven.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/jmm/maven.xml 2006-12-20 11:46:33 UTC (rev 8433)
+++ labs/jbosslabs/trunk/portal-extensions/jmm/maven.xml 2006-12-20 12:01:42 UTC (rev 8434)
@@ -25,14 +25,14 @@
<goal name="deploy">
<maven:reactor includes="jmm-common/project.xml" excludes="" basedir="."
- banner="jmm-common.jar"
+ banner="Deploy"
goals="deploy" ignoreFailures="false" />
<maven:reactor includes="jmm-portlet/project.xml" excludes="" basedir="."
- banner="portlet"
+ banner="Deploy"
goals="deploy" ignoreFailures="false" />
-<!-- <maven:reactor includes="jmm-service/project.xml" excludes="" basedir="."
- banner="service"
- goals="deploy" ignoreFailures="false" /> -->
+<!-- <maven:reactor includes="jmm-service/project.xml" excludes="" basedir="."
+ banner="Deploy"
+ goals="deploy" ignoreFailures="false" />-->
</goal>
<goal name="clean"/>
Deleted: labs/jbosslabs/trunk/portal-extensions/jmm/project.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/jmm/project.xml 2006-12-20 11:46:33 UTC (rev 8433)
+++ labs/jbosslabs/trunk/portal-extensions/jmm/project.xml 2006-12-20 12:01:42 UTC (rev 8434)
@@ -1,142 +0,0 @@
-<?xml version='1.0' encoding='ISO-8859-1'?>
-<!--
- JBoss, the OpenSource J2EE webOS
- Distributable under LGPL license.
- See terms of license at gnu.org.
- -->
-<project>
- <pomVersion>3</pomVersion>
- <extend>../common.xml</extend>
- <id>jmm-common</id>
- <name>JEMS Maturity Matrix Common Library</name>
- <currentVersion>1.0</currentVersion>
- <organization>
- <name>Pawel Wrzeszcz</name>
- <url></url>
- </organization>
- <description></description>
-
- <dependencies>
-
- <dependency>
- <groupId>jboss-forge</groupId>
- <artifactId>forge-common</artifactId>
- <version>1.0</version>
- <properties>
- <ejb.manifest.classpath>true</ejb.manifest.classpath>
- <war.manifest.classpath>true</war.manifest.classpath>
- </properties>
- </dependency>
-<!--
- <dependency>
- <groupId>jboss-forge</groupId>
- <artifactId>status-common</artifactId>
- <jar>status-common.jar</jar>
- <properties>
- <ejb.manifest.classpath>true</ejb.manifest.classpath>
- <war.manifest.classpath>true</war.manifest.classpath>
- </properties>
- </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>
- <properties>
- <war.bundle>true</war.bundle>
- </properties>
- </dependency>
-
- <dependency>
- <groupId>tmate</groupId>
- <artifactId>javasvn</artifactId>
- <version>1.0</version>
- <jar>javasvn.jar</jar>
- <properties>
- <war.bundle>true</war.bundle>
- <ejb.manifest.classpath>true</ejb.manifest.classpath>
- </properties>
- </dependency>
-
- <dependency>
- <groupId>kosmos</groupId>
- <artifactId>kosmos</artifactId>
- <jar>kosmos-server.jar</jar>
- <version>1.0</version>
- <properties>
- <war.bundle>true</war.bundle>
- <ejb.manifest.classpath>true</ejb.manifest.classpath>
- <war.manifest.classpath>true</war.manifest.classpath>
- </properties>
- </dependency>
-
- <dependency>
- <groupId>hessian</groupId>
- <artifactId>hessian</artifactId>
- <version>3.0.1</version>
- <jar>hessian-3.0.13.jar</jar>
- <properties>
- <war.bundle>true</war.bundle>
- <war.manifest.classpath>true</war.manifest.classpath>
- <ejb.manifest.classpath>true</ejb.manifest.classpath>
- </properties>
- </dependency>
-
- <dependency>
- <groupId>shotoku</groupId>
- <artifactId>shotoku-base</artifactId>
- <version>1.0</version>
- <jar>shotoku-base.jar</jar>
- <properties>
- <ejb.manifest.classpath>true</ejb.manifest.classpath>
- <war.manifest.classpath>true</war.manifest.classpath>
- </properties>
- </dependency>
-
- <!-- JBoss EJB3 dependencies -->
-
- <dependency>
- <groupId>jboss</groupId>
- <artifactId>ejb3-persistence</artifactId>
- <version>3.0RC6</version>
- <jar>ejb3-persistence.jar</jar>
- </dependency>
- <dependency>
- <groupId>jboss</groupId>
- <artifactId>jboss-ejb3x</artifactId>
- <version>3.0RC6</version>
- <jar>jboss-ejb3x.jar</jar>
- </dependency>
- <dependency>
- <groupId>jboss</groupId>
- <artifactId>jboss-j2ee</artifactId>
- <version></version>
- <jar>jboss-j2ee.jar</jar>
- </dependency>
- <dependency>
- <groupId>jboss</groupId>
- <artifactId>jboss-annotations-ejb3</artifactId>
- <version></version>
- <jar>jboss-annotations-ejb3.jar</jar>
- </dependency>
- <dependency>
- <groupId>jboss</groupId>
- <artifactId>jbossall-client</artifactId>
- <version>3.2.3</version>
- </dependency>
-
- <dependency>
- <groupId>jaxb</groupId>
- <artifactId>JAXB2</artifactId>
- <version>2.0</version>
- <jar>jaxb-api.jar</jar>
- </dependency>
-
- </dependencies>
-</project>
More information about the jboss-svn-commits
mailing list