[jboss-svn-commits] JBL Code SVN: r8868 - in labs/jbosslabs/trunk/portal-extensions-2.6: configuration/to-copy/server/default/deploy and 5 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Tue Jan 16 10:47:56 EST 2007
Author: adamw
Date: 2007-01-16 10:47:46 -0500 (Tue, 16 Jan 2007)
New Revision: 8868
Removed:
labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/portal-mysql-ds.xml
Modified:
labs/jbosslabs/trunk/portal-extensions-2.6/configuration/maven.xml
labs/jbosslabs/trunk/portal-extensions-2.6/configuration/to-copy/server/default/deploy/
labs/jbosslabs/trunk/portal-extensions-2.6/counters-ejb3/maven.xml
labs/jbosslabs/trunk/portal-extensions-2.6/jbosswiki/maven.xml
labs/jbosslabs/trunk/portal-extensions-2.6/jmm/maven.xml
labs/jbosslabs/trunk/portal-extensions-2.6/polls/maven.xml
Log:
http://jira.jboss.com/jira/browse/JBLAB-817
Modified: labs/jbosslabs/trunk/portal-extensions-2.6/configuration/maven.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions-2.6/configuration/maven.xml 2007-01-16 15:24:59 UTC (rev 8867)
+++ labs/jbosslabs/trunk/portal-extensions-2.6/configuration/maven.xml 2007-01-16 15:47:46 UTC (rev 8868)
@@ -29,10 +29,10 @@
</ant:copy>
<ant:delete file="${local.deploy.dir}/jboss-portal.sar/conf/data/default-object.xml" />
<ant:delete dir="${local.deploy.dir}/jboss-portal.sar/portal-samples.war" />
- <ant:delete dir="${local.deploy.dir}/jboss-portal.sar/portal-wsrp.war" />
+ <ant:delete dir="${local.deploy.dir}/jboss-portal.sar/portal-wsrp.sar" />
<ant:delete dir="${local.deploy.dir}/jbossweb-tomcat55.sar/ROOT.war" />
- <ant:delete dir="${local.deploy.dir}/hibernate-deployer.sar" />
- <ant:delete dir="${local.deploy.dir}/jboss-ws4ee.war" />
+ <ant:delete dir="${local.deploy.dir}/jboss-hibernate.deployer" />
+ <ant:delete dir="${local.deploy.dir}/jboss-ws4ee.sar" />
</goal>
</project>
Property changes on: labs/jbosslabs/trunk/portal-extensions-2.6/configuration/to-copy/server/default/deploy
___________________________________________________________________
Name: svn:ignore
- JBLabs-ds.xml
portal-login-ds.xml
portal-mysql-ds.xml
+ JBLabs-ds.xml
portal-login-ds.xml
portal-mysql-ds.xml
portal-hsqldb-ds.xml
Modified: labs/jbosslabs/trunk/portal-extensions-2.6/counters-ejb3/maven.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions-2.6/counters-ejb3/maven.xml 2007-01-16 15:24:59 UTC (rev 8867)
+++ labs/jbosslabs/trunk/portal-extensions-2.6/counters-ejb3/maven.xml 2007-01-16 15:47:46 UTC (rev 8868)
@@ -20,9 +20,9 @@
</goal>
<goal name="deploy">
- <ant:copy
+ <!--<ant:copy
tofile="${local.deploy.dir}/counters.ejb3"
- file="target/counters-ejb3-1.0.jar" />
+ file="target/counters-ejb3-1.0.jar" />-->
</goal>
<goal name="clean">
Modified: labs/jbosslabs/trunk/portal-extensions-2.6/jbosswiki/maven.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions-2.6/jbosswiki/maven.xml 2007-01-16 15:24:59 UTC (rev 8867)
+++ labs/jbosslabs/trunk/portal-extensions-2.6/jbosswiki/maven.xml 2007-01-16 15:47:46 UTC (rev 8868)
@@ -16,7 +16,7 @@
</goal>
<goal name="deploy">
- <attainGoal name="wiki:deploy" />
+ <!--<attainGoal name="wiki:deploy" />-->
</goal>
<goal name="clean">
Modified: labs/jbosslabs/trunk/portal-extensions-2.6/jmm/maven.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions-2.6/jmm/maven.xml 2007-01-16 15:24:59 UTC (rev 8867)
+++ labs/jbosslabs/trunk/portal-extensions-2.6/jmm/maven.xml 2007-01-16 15:47:46 UTC (rev 8868)
@@ -27,7 +27,7 @@
</goal>
<goal name="deploy">
- <ant:copy todir="${local.deploy.dir}" file="jmm-common/target/jmm-common.jar" />
+ <!-- <ant:copy todir="${local.deploy.dir}" file="jmm-common/target/jmm-common.jar" />
<maven:reactor includes="project.xml" excludes="" basedir="${basedir}/jmm-portlet"
banner="Deploy"
goals="deploy" ignoreFailures="false" />
@@ -35,7 +35,7 @@
<maven:reactor includes="project.xml" excludes="" basedir="${basedir}/jmm-service"
banner="Deploy"
goals="deploy" ignoreFailures="false" />
- </j:if>
+ </j:if>-->
</goal>
<goal name="clean">
Modified: labs/jbosslabs/trunk/portal-extensions-2.6/polls/maven.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions-2.6/polls/maven.xml 2007-01-16 15:24:59 UTC (rev 8867)
+++ labs/jbosslabs/trunk/portal-extensions-2.6/polls/maven.xml 2007-01-16 15:47:46 UTC (rev 8868)
@@ -33,7 +33,8 @@
<!--<ant:copy tofile="${local.deploy.dir}/polls-commons.jar" file="target/polls-portlet.jar" />
<ant:copy tofile="${local.deploy.dir}/polls-portlet.war" file="target/polls-portlet.war" />-->
<!--ant:copy tofile="${local.deploy.dir}/polls.ejb3" file="target/polls-portlet-1.0.ejb3" /-->
- <attainGoal name="prj-war-deploy" />
+
+ <!--<attainGoal name="prj-war-deploy" />-->
</goal>
<goal name="clean">
Deleted: labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/portal-mysql-ds.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/portal-mysql-ds.xml 2007-01-16 15:24:59 UTC (rev 8867)
+++ labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/to-copy/portal-mysql-ds.xml 2007-01-16 15:47:46 UTC (rev 8868)
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- ~ JBoss, a division of Red Hat ~
- ~ Copyright 2006, Red Hat Middleware, LLC, and individual ~
- ~ contributors as indicated by the @authors tag. See the ~
- ~ copyright.txt in the distribution for a full listing of ~
- ~ individual contributors. ~
- ~ ~
- ~ This is free software; you can redistribute it and/or modify it ~
- ~ under the terms of the GNU Lesser General Public License as ~
- ~ published by the Free Software Foundation; either version 2.1 of ~
- ~ the License, or (at your option) any later version. ~
- ~ ~
- ~ This software is distributed in the hope that it will be useful, ~
- ~ but WITHOUT ANY WARRANTY; without even the implied warranty of ~
- ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ~
- ~ Lesser General Public License for more details. ~
- ~ ~
- ~ You should have received a copy of the GNU Lesser General Public ~
- ~ License along with this software; if not, write to the Free ~
- ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA ~
- ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org. ~
- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
-
-<datasources>
- <local-tx-datasource>
- <jndi-name>PortalDS</jndi-name>
- <connection-url>jdbc:mysql://localhost:3306/jbossportal?useServerPrepStmts=false</connection-url>
- <driver-class>org.gjt.mm.mysql.Driver</driver-class>
- <user-name>portal</user-name>
- <password>portalpassword</password>
- </local-tx-datasource>
-</datasources>
More information about the jboss-svn-commits
mailing list