[jboss-svn-commits] JBL Code SVN: r8930 - in labs/jbosslabs/trunk/portal-extensions-2.6: forge-ads and 7 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Fri Jan 19 19:01:24 EST 2007
Author: adamw
Date: 2007-01-19 19:01:23 -0500 (Fri, 19 Jan 2007)
New Revision: 8930
Removed:
labs/jbosslabs/trunk/portal-extensions-2.6/forge-sar/src/META-INF/
Modified:
labs/jbosslabs/trunk/portal-extensions-2.6/forge-ads/project.xml
labs/jbosslabs/trunk/portal-extensions-2.6/forge-blog/project.xml
labs/jbosslabs/trunk/portal-extensions-2.6/forge-common/maven.xml
labs/jbosslabs/trunk/portal-extensions-2.6/forge-feeds/maven.xml
labs/jbosslabs/trunk/portal-extensions-2.6/forge-file-access/maven.xml
labs/jbosslabs/trunk/portal-extensions-2.6/forge-navigation/project.xml
labs/jbosslabs/trunk/portal-extensions-2.6/maven.xml
labs/jbosslabs/trunk/portal-extensions-2.6/primates/maven.xml
labs/jbosslabs/trunk/portal-extensions-2.6/primates/project.properties
labs/jbosslabs/trunk/portal-extensions-2.6/primates/project.xml
labs/jbosslabs/trunk/portal-extensions-2.6/project.properties
Log:
Build & deployment changes
Modified: labs/jbosslabs/trunk/portal-extensions-2.6/forge-ads/project.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions-2.6/forge-ads/project.xml 2007-01-19 23:43:38 UTC (rev 8929)
+++ labs/jbosslabs/trunk/portal-extensions-2.6/forge-ads/project.xml 2007-01-20 00:01:23 UTC (rev 8930)
@@ -7,7 +7,7 @@
<project>
<pomVersion>3</pomVersion>
<extend>../common.xml</extend>
- <id>ads-portlet</id>
+ <id>forge-ads-portlet</id>
<name>Ads portlet</name>
<currentVersion>1.0</currentVersion>
<organization>
Modified: labs/jbosslabs/trunk/portal-extensions-2.6/forge-blog/project.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions-2.6/forge-blog/project.xml 2007-01-19 23:43:38 UTC (rev 8929)
+++ labs/jbosslabs/trunk/portal-extensions-2.6/forge-blog/project.xml 2007-01-20 00:01:23 UTC (rev 8930)
@@ -7,7 +7,7 @@
<project>
<pomVersion>3</pomVersion>
<extend>../common.xml</extend>
- <id>blog-portlet</id>
+ <id>forge-blog-portlet</id>
<name>Blog portlet</name>
<currentVersion>1.0</currentVersion>
<organization>
Modified: labs/jbosslabs/trunk/portal-extensions-2.6/forge-common/maven.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions-2.6/forge-common/maven.xml 2007-01-19 23:43:38 UTC (rev 8929)
+++ labs/jbosslabs/trunk/portal-extensions-2.6/forge-common/maven.xml 2007-01-20 00:01:23 UTC (rev 8930)
@@ -19,7 +19,7 @@
</goal>
<goal name="deploy">
- <ant:copy todir="${local.deploy.dir}/jboss-portal.sar/lib" flatten="true">
+ <ant:copy todir="${forge.jar.dest}" flatten="true">
<ant:fileset dir=".">
<ant:filename name="target/*.jar" />
</ant:fileset>
Modified: labs/jbosslabs/trunk/portal-extensions-2.6/forge-feeds/maven.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions-2.6/forge-feeds/maven.xml 2007-01-19 23:43:38 UTC (rev 8929)
+++ labs/jbosslabs/trunk/portal-extensions-2.6/forge-feeds/maven.xml 2007-01-20 00:01:23 UTC (rev 8930)
@@ -16,7 +16,7 @@
<goal name="deploy">
<ant:copy
- tofile="../${forge.sar.dir}/target/${forge.sar.name}/forge-feeds.jar"
+ todir="${forge.jar.dest}"
file="target/forge-feeds.jar" />
</goal>
Modified: labs/jbosslabs/trunk/portal-extensions-2.6/forge-file-access/maven.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions-2.6/forge-file-access/maven.xml 2007-01-19 23:43:38 UTC (rev 8929)
+++ labs/jbosslabs/trunk/portal-extensions-2.6/forge-file-access/maven.xml 2007-01-20 00:01:23 UTC (rev 8930)
@@ -16,7 +16,7 @@
<goal name="deploy">
<attainGoal name="prj-war-deploy" />
- <ant:copy tofile="${local.deploy.dir}/shotoku.sar/forge-file-access.jar"
+ <ant:copy todir="${forge.jar.dest}"
overwrite="true"
file="target/file-access.jar" />
</goal>
Modified: labs/jbosslabs/trunk/portal-extensions-2.6/forge-navigation/project.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions-2.6/forge-navigation/project.xml 2007-01-19 23:43:38 UTC (rev 8929)
+++ labs/jbosslabs/trunk/portal-extensions-2.6/forge-navigation/project.xml 2007-01-20 00:01:23 UTC (rev 8930)
@@ -7,7 +7,7 @@
<project>
<pomVersion>3</pomVersion>
<extend>../common.xml</extend>
- <id>navigation-portlet</id>
+ <id>forge-navigation-portlet</id>
<name>Navigation portlet</name>
<currentVersion>1.0</currentVersion>
<organization>
Modified: labs/jbosslabs/trunk/portal-extensions-2.6/maven.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions-2.6/maven.xml 2007-01-19 23:43:38 UTC (rev 8929)
+++ labs/jbosslabs/trunk/portal-extensions-2.6/maven.xml 2007-01-20 00:01:23 UTC (rev 8930)
@@ -44,19 +44,20 @@
</goal>
<goal name="prj-war-deploy">
- <ant:mkdir dir="../${forge.sar.dir}/target/${maven.final.name}.sar" />
- <ant:copy todir="../${forge.sar.dir}/target/${maven.final.name}.sar" overwrite="true">
+ <ant:mkdir dir="target/${maven.final.name}.sar" />
+ <ant:copy todir="target/${maven.final.name}.sar" overwrite="true">
<ant:fileset dir="../forge-sar-skeleton">
<ant:include name="**/*" />
</ant:fileset>
</ant:copy>
- <ant:copy todir="../${forge.sar.dir}/target/${maven.final.name}.sar" flatten="true" overwrite="true">
+ <ant:copy todir="target/${maven.final.name}.sar" flatten="true" overwrite="true">
<ant:fileset dir=".">
<ant:filename name="target/*ar" />
</ant:fileset>
</ant:copy>
- <j:set var="jar.to.dir" value="../${forge.sar.dir}/target/${maven.final.name}.sar" />
+ <j:set var="jar.to.dir" value="target/${maven.final.name}.sar" />
<attainGoal name="dir-to-jar" />
+ <ant:copy file="target/${maven.final.name}.sar" todir="${local.deploy.dir}" />
</goal>
<goal name="prj-jar-deploy">
@@ -90,41 +91,21 @@
<!-- A goal that deploys the sar into the appserver -->
<goal name="deploy-sar">
- <!-- Deleting the old sar -->
- <ant:delete dir="${local.deploy.dir}/${forge.sar.name}" />
-
- <!-- Copying application.xml -->
+ <!-- Copying forge-service.xml -->
<ant:copy
- file="${forge.sar.dir}/src/META-INF/jboss-service.xml"
- tofile="${forge.sar.dir}/target/${forge.sar.name}/META-INF/jboss-service.xml"
+ file="${forge.sar.dir}/src/forge-service.xml"
+ todir="${local.deploy.dir}"
overwrite="true" />
- <!-- Copying the dependency JARs -->
- <ant:copy
- todir="${forge.sar.dir}/target/${forge.sar.name}"
- file="${maven.repo.local}/rome/jars/rome-0.7.jar"
- overwrite="true" />
- <ant:copy
- todir="${forge.sar.dir}/target/${forge.sar.name}"
- file="${maven.repo.local}/jdom/jars/jdom-1.0.jar"
- overwrite="true" />
-
<!-- Copying JAXB jars to the lib directory -->
<ant:copy
- todir="${local.deploy.dir}/../lib"
+ todir="${forge.jar.dest}"
file="${maven.repo.local}/jaxb/jars/jaxb-impl.jar"
overwrite="true" />
<ant:copy
- todir="${local.deploy.dir}/../lib"
+ todir="${forge.jar.dest}"
file="${maven.repo.local}/jaxb/jars/jaxb-api.jar"
overwrite="true" />
-
- <!-- Deploying the sar -->
- <ant:copy todir="${local.deploy.dir}" overwrite="true">
- <ant:fileset dir="${forge.sar.dir}/target">
- <ant:include name="**" />
- </ant:fileset>
- </ant:copy>
</goal>
<!-- Copies necessary jars to the repository -->
@@ -236,7 +217,7 @@
<ant:fileset dir="binaries/portal/to-copy" />
</ant:copy>
- <ant:copy todir="${local.deploy.dir}../lib" overwrite="true"
+ <ant:copy todir="${local.deploy.dir}/../lib" overwrite="true"
file="binaries/mysql/mysql-connector-java-3.1.12-bin.jar" />
<j:set var="goal" value="prj-install" />
@@ -250,18 +231,16 @@
1. Delete ${local.deploy.dir}/portal-mysql-ds.xml
2. Copy an appropriate portal-*-ds.xml to the same dir (these files can be found in
portal-binaries/to-copy-head/setup)
-3. Modify the following files:
- - ${local.deploy.dir}/portal-forums.sar/portal-forums.sar/conf/hibernate/hibernate.cfg.xml
+3. (if you have DB problems) Modify the following files:
- ${local.deploy.dir}/jboss-portal.sar/conf/hibernate/hibernate.cfg.xml.
to use an appropriate dialect.
Now you can run the build with "maven all", and later start the server with:
-${local.server.dir}/bin/run.sh -c all.
+${local.server.dir}/bin/run.sh.
</echo>
</goal>
<goal name="clean">
- <ant:delete dir="${forge.sar.dir}/target" />
<j:set var="goal" value="clean" />
<attainGoal name="multiproject:goal" />
</goal>
@@ -273,7 +252,7 @@
</goal>
<goal name="deploy">
- <ant:delete dir="${local.deploy.dir}/${forge.sar.name}" />
+ <ant:delete dir="${forge.jar.dest}" />
<j:set var="goal" value="deploy" />
<attainGoal name="multiproject:goal" />
<attainGoal name="deploy-sar" />
@@ -281,9 +260,6 @@
<!-- Convenience goal that does clean, build, deploy -->
<goal name="all">
- <ant:delete dir="${local.deploy.dir}/${forge.sar.name}" />
- <ant:delete dir="${forge.sar.dir}/target" />
-
<attainGoal name="prepare-repo" />
<j:set var="goal" value="clean,build,deploy" />
Modified: labs/jbosslabs/trunk/portal-extensions-2.6/primates/maven.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions-2.6/primates/maven.xml 2007-01-19 23:43:38 UTC (rev 8929)
+++ labs/jbosslabs/trunk/portal-extensions-2.6/primates/maven.xml 2007-01-20 00:01:23 UTC (rev 8930)
@@ -14,14 +14,14 @@
<goal name="build">
<attainGoal name="war" />
<attainGoal name="ejb" />
- <ant:move file="target/primates-portlet-1.0.jar" tofile="target/primates-portlet-1.0.ejb3" />
+ <ant:move file="target/forge-primates-portlet.jar" tofile="target/forge-primates-portlet.ejb3" />
<attainGoal name="jar" />
</goal>
<goal name="deploy">
- <ant:copy tofile="${local.deploy.dir}/primates-portlet.war" file="target/primates-portlet.war" />
- <ant:copy tofile="${local.deploy.dir}/primates.ejb3" file="target/primates-portlet-1.0.ejb3" />
- <ant:copy tofile="${local.deploy.dir}/primates-commons.jar" file="target/primates-portlet-1.0.jar" />
+ <ant:copy todir="${local.deploy.dir}" file="target/forge-primates-portlet.war" />
+ <ant:copy todir="${local.deploy.dir}" file="target/forge-primates-portlet.ejb3" />
+ <ant:copy todir="${local.deploy.dir}" file="target/forge-primates-portlet.jar" />
</goal>
<goal name="clean">
Modified: labs/jbosslabs/trunk/portal-extensions-2.6/primates/project.properties
===================================================================
--- labs/jbosslabs/trunk/portal-extensions-2.6/primates/project.properties 2007-01-19 23:43:38 UTC (rev 8929)
+++ labs/jbosslabs/trunk/portal-extensions-2.6/primates/project.properties 2007-01-20 00:01:23 UTC (rev 8930)
@@ -6,3 +6,5 @@
maven.war.classes.excludes=**/*.class
maven.ear.src=${maven.build.dir}/ear
maven.ear.resources=${maven.build.dir}/ear2
+
+maven.final.name=${pom.artifactId}
Modified: labs/jbosslabs/trunk/portal-extensions-2.6/primates/project.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions-2.6/primates/project.xml 2007-01-19 23:43:38 UTC (rev 8929)
+++ labs/jbosslabs/trunk/portal-extensions-2.6/primates/project.xml 2007-01-20 00:01:23 UTC (rev 8930)
@@ -7,7 +7,7 @@
<project>
<pomVersion>3</pomVersion>
<extend>../common.xml</extend>
- <id>primates-portlet</id>
+ <id>forge-primates-portlet</id>
<name>Primates portlet</name>
<currentVersion>1.0</currentVersion>
<organization>
Modified: labs/jbosslabs/trunk/portal-extensions-2.6/project.properties
===================================================================
--- labs/jbosslabs/trunk/portal-extensions-2.6/project.properties 2007-01-19 23:43:38 UTC (rev 8929)
+++ labs/jbosslabs/trunk/portal-extensions-2.6/project.properties 2007-01-20 00:01:23 UTC (rev 8930)
@@ -4,9 +4,10 @@
jboss.jmx.deploy=HtmlAdaptor?action=invokeOp&name=portal:service=Deployer,type=Adapter&methodIndex=1
jboss.jmx.undeploy=HtmlAdaptor?action=invokeOp&name=portal:service=Deployer,type=Adapter&methodIndex=2
-forge.sar.name=w-jboss-forge.sar
forge.sar.dir=forge-sar
+forge.jar.dest=${local.deploy.dir}/../lib/forge
+
## Specify these properties if you are behind a proxy server
##maven.proxy.host
##maven.proxy.port
@@ -26,4 +27,4 @@
maven.multiproject.excludes=shotoku/project.xml
maven.war.classes.excludes=**/*
-maven.jar.includes=**/*.class
\ No newline at end of file
+maven.jar.includes=**/*.class
More information about the jboss-svn-commits
mailing list