[jboss-svn-commits] JBL Code SVN: r8437 - 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 09:23:04 EST 2006
Author: wrzep
Date: 2006-12-20 09:22:59 -0500 (Wed, 20 Dec 2006)
New Revision: 8437
Added:
labs/jbosslabs/trunk/portal-extensions/jmm/build.properties
Modified:
labs/jbosslabs/trunk/portal-extensions/jmm/jmm-common/maven.xml
labs/jbosslabs/trunk/portal-extensions/jmm/jmm-common/project.properties
labs/jbosslabs/trunk/portal-extensions/jmm/jmm-portlet/project.properties
labs/jbosslabs/trunk/portal-extensions/jmm/jmm-portlet/project.xml
labs/jbosslabs/trunk/portal-extensions/jmm/jmm-service/build.properties
labs/jbosslabs/trunk/portal-extensions/jmm/jmm-service/maven.xml
labs/jbosslabs/trunk/portal-extensions/jmm/jmm-service/project.properties
labs/jbosslabs/trunk/portal-extensions/jmm/maven.xml
labs/jbosslabs/trunk/portal-extensions/jmm/project.properties
Log:
http://jira.jboss.com/jira/browse/JBLAB-815
Pawel
Added: labs/jbosslabs/trunk/portal-extensions/jmm/build.properties
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/jmm/build.properties 2006-12-20 13:37:33 UTC (rev 8436)
+++ labs/jbosslabs/trunk/portal-extensions/jmm/build.properties 2006-12-20 14:22:59 UTC (rev 8437)
@@ -0,0 +1,2 @@
+# By default do not deploy JMM service
+jmm.deploy.service=false
Modified: labs/jbosslabs/trunk/portal-extensions/jmm/jmm-common/maven.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/jmm/jmm-common/maven.xml 2006-12-20 13:37:33 UTC (rev 8436)
+++ labs/jbosslabs/trunk/portal-extensions/jmm/jmm-common/maven.xml 2006-12-20 14:22:59 UTC (rev 8437)
@@ -11,14 +11,12 @@
</goal>
<goal name="build">
- <attainGoal name="jar" />
- <ant:move tofile="target/${jmm.common.final.name}" file="target/${maven.final.name}.jar" />
-
- <ant:copy toDir="${maven.repo.local}/jboss-forge/jars/" file="target/${jmm.common.final.name}" overwrite="true"/>
+ <attainGoal name="jar" />
+ <ant:copy toDir="${maven.repo.local}/jboss-forge/jars/" file="target/${maven.final.name}.jar" overwrite="true"/>
</goal>
<goal name="deploy">
- <ant:copy todir="${local.deploy.dir}" file="target/${jmm.common.final.name}" />
+ <ant:copy todir="${local.deploy.dir}" file="target/${maven.final.name}.jar" />
</goal>
<goal name="clean">
Modified: labs/jbosslabs/trunk/portal-extensions/jmm/jmm-common/project.properties
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/jmm/jmm-common/project.properties 2006-12-20 13:37:33 UTC (rev 8436)
+++ labs/jbosslabs/trunk/portal-extensions/jmm/jmm-common/project.properties 2006-12-20 14:22:59 UTC (rev 8437)
@@ -1,16 +1,4 @@
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.ejb.includes=**/service/**,**/META-INF/**
-#maven.jar.excludes=**/JMMPortlet.class,**/service/**,**/persistence.xml
-#maven.war.classes.includes=**/JMMPortlet.class
-#**/service/impl/db/protocol/*
-
-maven.ejb.includes=**/service/**,**/META-INF/**
-maven.jar.includes=**/common/**
-maven.war.classes.includes=**/portlet/**
-
-jmm.service.final.name=jmm-service.ejb3
-jmm.common.final.name=jmm-common.jar
-jmm.service.sar=jmm-service.sar/
\ No newline at end of file
+maven.final.name=${pom.artifactId}
\ No newline at end of file
Modified: labs/jbosslabs/trunk/portal-extensions/jmm/jmm-portlet/project.properties
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/jmm/jmm-portlet/project.properties 2006-12-20 13:37:33 UTC (rev 8436)
+++ labs/jbosslabs/trunk/portal-extensions/jmm/jmm-portlet/project.properties 2006-12-20 14:22:59 UTC (rev 8437)
@@ -1,16 +1,4 @@
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.ejb.includes=**/service/**,**/META-INF/**
-#maven.jar.excludes=**/JMMPortlet.class,**/service/**,**/persistence.xml
-#maven.war.classes.includes=**/JMMPortlet.class
-#**/service/impl/db/protocol/*
-
-maven.ejb.includes=**/service/**,**/META-INF/**
-maven.jar.includes=**/common/**
-maven.war.classes.includes=**/portlet/**
-
-jmm.service.final.name=jmm-service.ejb3
-jmm.common.final.name=jmm-common.jar
-jmm.service.sar=jmm-service.sar/
\ No newline at end of file
+maven.final.name=${pom.artifactId}
\ No newline at end of file
Modified: labs/jbosslabs/trunk/portal-extensions/jmm/jmm-portlet/project.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/jmm/jmm-portlet/project.xml 2006-12-20 13:37:33 UTC (rev 8436)
+++ labs/jbosslabs/trunk/portal-extensions/jmm/jmm-portlet/project.xml 2006-12-20 14:22:59 UTC (rev 8437)
@@ -15,6 +15,7 @@
<url></url>
</organization>
<description></description>
+
<dependencies>
Modified: labs/jbosslabs/trunk/portal-extensions/jmm/jmm-service/build.properties
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/jmm/jmm-service/build.properties 2006-12-20 13:37:33 UTC (rev 8436)
+++ labs/jbosslabs/trunk/portal-extensions/jmm/jmm-service/build.properties 2006-12-20 14:22:59 UTC (rev 8437)
@@ -1,3 +1,3 @@
-# By default deploy JMM service on the same AS as Labs
-jmm.service.server.dir=${local.deploy.dir}
+# Path to JBoss AS for JMM service
+jmm.service.server.dir=${local.server.dir}
jmm.service.deploy.dir=${jmm.service.server.dir}/server/all/deploy
\ No newline at end of file
Modified: labs/jbosslabs/trunk/portal-extensions/jmm/jmm-service/maven.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/jmm/jmm-service/maven.xml 2006-12-20 13:37:33 UTC (rev 8436)
+++ labs/jbosslabs/trunk/portal-extensions/jmm/jmm-service/maven.xml 2006-12-20 14:22:59 UTC (rev 8437)
@@ -51,7 +51,7 @@
</goal>
<goal name="deploy-ejb">
- <ant:copy todir="${jmm.service.deploy.dir}/jmm-service.sar" file="target/${jmm.service.final.name}" />
+ <ant:copy todir="${jmm.service.deploy.dir}" file="target/${jmm.service.final.name}" />
</goal>
<goal name="clean">
@@ -64,7 +64,7 @@
<!-- Clean JMM service local files (in case we want to use remote service) -->
<ant:delete file="${local.deploy.dir}/jmm-service.ejb3" />
- <ant:delete file="${local.deploy.dir}/jmm-service.sar" />
+ <ant:delete dir="${local.deploy.dir}/jmm-service.sar" />
</goal>
<!-- TODO INSTALL -->
Modified: labs/jbosslabs/trunk/portal-extensions/jmm/jmm-service/project.properties
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/jmm/jmm-service/project.properties 2006-12-20 13:37:33 UTC (rev 8436)
+++ labs/jbosslabs/trunk/portal-extensions/jmm/jmm-service/project.properties 2006-12-20 14:22:59 UTC (rev 8437)
@@ -2,14 +2,7 @@
maven.junit.fork=yes
maven.war.src=${basedir}/src/web
-#maven.ejb.includes=**/service/**,**/META-INF/**
-#maven.jar.excludes=**/JMMPortlet.class,**/service/**,**/persistence.xml
-#maven.war.classes.includes=**/JMMPortlet.class
-#**/service/impl/db/protocol/*
-
maven.ejb.includes=**/service/**,**/META-INF/**
-maven.jar.includes=**/common/**
-maven.war.classes.includes=**/portlet/**
jmm.service.final.name=jmm-service.ejb3
jmm.common.final.name=jmm-common.jar
Modified: labs/jbosslabs/trunk/portal-extensions/jmm/maven.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/jmm/maven.xml 2006-12-20 13:37:33 UTC (rev 8436)
+++ labs/jbosslabs/trunk/portal-extensions/jmm/maven.xml 2006-12-20 14:22:59 UTC (rev 8437)
@@ -18,9 +18,15 @@
<maven:reactor includes="jmm-portlet/project.xml" excludes="" basedir="."
banner="Building"
goals="clean,build" ignoreFailures="false" />
- <maven:reactor includes="jmm-service/project.xml" excludes="" basedir="."
- banner="Building"
- goals="clean,build" ignoreFailures="false" />
+
+ <maven:reactor includes="jmm-service/project.xml" excludes="" basedir="."
+ banner="Clean"
+ goals="clean" ignoreFailures="false" />
+ <j:if test="${jmm.deploy.service}">
+ <maven:reactor includes="jmm-service/project.xml" excludes="" basedir="."
+ banner="Building"
+ goals="build" ignoreFailures="false" />
+ </j:if>
</goal>
<goal name="deploy">
@@ -30,9 +36,13 @@
<maven:reactor includes="jmm-portlet/project.xml" excludes="" basedir="."
banner="Deploy"
goals="deploy" ignoreFailures="false" />
-<!-- <maven:reactor includes="jmm-service/project.xml" excludes="" basedir="."
+
+ <j:if test="${jmm.deploy.service}">
+ <maven:reactor includes="jmm-service/project.xml" excludes="" basedir="."
banner="Deploy"
- goals="deploy" ignoreFailures="false" />-->
+ goals="deploy" ignoreFailures="false" />
+ </j:if>
+
</goal>
<goal name="clean"/>
Modified: labs/jbosslabs/trunk/portal-extensions/jmm/project.properties
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/jmm/project.properties 2006-12-20 13:37:33 UTC (rev 8436)
+++ labs/jbosslabs/trunk/portal-extensions/jmm/project.properties 2006-12-20 14:22:59 UTC (rev 8437)
@@ -2,14 +2,7 @@
maven.junit.fork=yes
maven.war.src=${basedir}/src/web
-#maven.ejb.includes=**/service/**,**/META-INF/**
-#maven.jar.excludes=**/JMMPortlet.class,**/service/**,**/persistence.xml
-#maven.war.classes.includes=**/JMMPortlet.class
-#**/service/impl/db/protocol/*
-
maven.ejb.includes=**/service/**,**/META-INF/**
-maven.jar.includes=**/common/**
-maven.war.classes.includes=**/portlet/**
jmm.service.final.name=jmm-service.ejb3
jmm.common.final.name=jmm-common.jar
More information about the jboss-svn-commits
mailing list