Author: adamw Date: 2006-07-10 16:42:31 -0400 (Mon, 10 Jul 2006) New Revision: 4990 Added: labs/jbosslabs/trunk/portal-extensions/configuration/to-copy/bin/ labs/jbosslabs/trunk/portal-extensions/configuration/to-copy/bin/pluggable-instrumentor.jar labs/jbosslabs/trunk/portal-extensions/configuration/to-copy/bin/run.conf labs/jbosslabs/trunk/portal-extensions/configuration/to-copy/server/ labs/jbosslabs/trunk/portal-extensions/configuration/to-copy/server/all/ labs/jbosslabs/trunk/portal-extensions/configuration/to-copy/server/all/conf/ labs/jbosslabs/trunk/portal-extensions/configuration/to-copy/server/all/deploy/ labs/jbosslabs/trunk/portal-extensions/configuration/to-copy/server/all/deploy/JBLabs-ds.xml.sample labs/jbosslabs/trunk/portal-extensions/configuration/to-copy/server/all/deploy/ear-deployer.xml labs/jbosslabs/trunk/portal-extensions/configuration/to-copy/server/all/deploy/jboss-aop-jdk50.deployer/ labs/jbosslabs/trunk/portal-extensions/configuration/to-copy/server/all/deploy/jboss-portal.sar/ labs/jbosslabs/trunk/portal-extensions/configuration/to-copy/server/all/deploy/mail-service.xml Removed: labs/jbosslabs/trunk/portal-extensions/configuration/to-copy-bin/ labs/jbosslabs/trunk/portal-extensions/configuration/to-copy/JBLabs-ds.xml.sample labs/jbosslabs/trunk/portal-extensions/configuration/to-copy/ear-deployer.xml labs/jbosslabs/trunk/portal-extensions/configuration/to-copy/jboss-aop-jdk50.deployer/ labs/jbosslabs/trunk/portal-extensions/configuration/to-copy/jboss-portal.sar/ labs/jbosslabs/trunk/portal-extensions/configuration/to-copy/mail-service.xml Modified: labs/jbosslabs/trunk/portal-extensions/configuration/maven.xml Log: http://jira.jboss.org/jira/browse/JBLAB-712 Modified: labs/jbosslabs/trunk/portal-extensions/configuration/maven.xml =================================================================== --- labs/jbosslabs/trunk/portal-extensions/configuration/maven.xml 2006-07-10 20:31:42 UTC (rev 4989) +++ labs/jbosslabs/trunk/portal-extensions/configuration/maven.xml 2006-07-10 20:42:31 UTC (rev 4990) @@ -17,16 +17,11 @@ </goal> <goal name="deploy"> - <ant:copy todir="${local.deploy.dir}" overwrite="true"> + <ant:copy todir="${local.server.dir}" overwrite="true"> <ant:fileset dir="to-copy"> <exclude name="**/*.sample"/> </ant:fileset> </ant:copy> - <ant:copy todir="${local.server.dir}/bin" overwrite="true"> - <ant:fileset dir="to-copy-bin"> - <exclude name="**/*.sample"/> - </ant:fileset> - </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}/jbossweb-tomcat55.sar/ROOT.war" /> Deleted: labs/jbosslabs/trunk/portal-extensions/configuration/to-copy/JBLabs-ds.xml.sample =================================================================== --- labs/jbosslabs/trunk/portal-extensions/configuration/to-copy/JBLabs-ds.xml.sample 2006-07-10 20:31:42 UTC (rev 4989) +++ labs/jbosslabs/trunk/portal-extensions/configuration/to-copy/JBLabs-ds.xml.sample 2006-07-10 20:42:31 UTC (rev 4990) @@ -1,12 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<datasources> - <local-tx-datasource> - <jndi-name>LabsDS</jndi-name> - <connection-url> - jdbc:mysql://localhost:3306/dotorgdata?useServerPrepStmts=false - </connection-url> - <driver-class>org.gjt.mm.mysql.Driver</driver-class> - <user-name>dotorgdata</user-name> - <password></password> - </local-tx-datasource> -</datasources> Copied: labs/jbosslabs/trunk/portal-extensions/configuration/to-copy/bin/pluggable-instrumentor.jar (from rev 4986, labs/jbosslabs/trunk/portal-extensions/configuration/to-copy-bin/pluggable-instrumentor.jar) Copied: labs/jbosslabs/trunk/portal-extensions/configuration/to-copy/bin/run.conf (from rev 4986, labs/jbosslabs/trunk/portal-extensions/configuration/to-copy-bin/run.conf) Deleted: labs/jbosslabs/trunk/portal-extensions/configuration/to-copy/ear-deployer.xml =================================================================== --- labs/jbosslabs/trunk/portal-extensions/configuration/to-copy/ear-deployer.xml 2006-07-10 20:31:42 UTC (rev 4989) +++ labs/jbosslabs/trunk/portal-extensions/configuration/to-copy/ear-deployer.xml 2006-07-10 20:42:31 UTC (rev 4990) @@ -1,19 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<!-- The JBoss service configuration file for the EAR deployer service. -$Id: ear-deployer.xml,v 1.1 2004/09/05 15:50:06 starksm Exp $ ---> -<server> - <!-- EAR deployer, remove if you are not using ear deployments --> - <mbean code="org.jboss.deployment.EARDeployer" - name="jboss.j2ee:service=EARDeployer"> - <!-- A flag indicating if ear deployments should have their own scoped - class loader to isolate their classes from other deployments. - --> - <attribute name="Isolated">false</attribute> - <!-- A flag indicating if the ear components should have in VM call - optimization disabled. - --> - <attribute name="CallByValue">false</attribute> - </mbean> -</server> Deleted: labs/jbosslabs/trunk/portal-extensions/configuration/to-copy/mail-service.xml =================================================================== --- labs/jbosslabs/trunk/portal-extensions/configuration/to-copy/mail-service.xml 2006-07-10 20:31:42 UTC (rev 4989) +++ labs/jbosslabs/trunk/portal-extensions/configuration/to-copy/mail-service.xml 2006-07-10 20:42:31 UTC (rev 4990) @@ -1,42 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE server> -<!-- $Id: mail-service.xml,v 1.5.6.1 2005/06/01 06:20:43 starksm Exp $ --> - -<server> - - <!-- ==================================================================== --> - <!-- Mail Connection Factory --> - <!-- ==================================================================== --> - - <mbean code="org.jboss.mail.MailService" - name="jboss:service=Mail"> - <attribute name="JNDIName">java:/Mail</attribute> - <attribute name="User">nobody</attribute> - <attribute name="Password">password</attribute> - <attribute name="Configuration"> - <!-- Test --> - <configuration> - <!-- Change to your mail server prototocol --> - <property name="mail.store.protocol" value="pop3"/> - <property name="mail.transport.protocol" value="smtp"/> - - <!-- Change to the user who will receive mail --> - <property name="mail.user" value="nobody"/> - - <!-- Change to the mail server --> - <property name="mail.pop3.host" value="pop3.nosuchhost.nosuchdomain.com"/> - - <!-- Change to the SMTP gateway server --> - <property name="mail.smtp.host" value="localhost"/> - - <!-- Change to the address mail will be from --> - <property name="mail.from" value="do-...@jb..."/> - - <!-- Enable debugging output from the javamail classes --> - <property name="mail.debug" value="false"/> - </configuration> - <depends>jboss:service=Naming</depends> - </attribute> - </mbean> - -</server> Copied: labs/jbosslabs/trunk/portal-extensions/configuration/to-copy/server/all/deploy/JBLabs-ds.xml.sample (from rev 4986, labs/jbosslabs/trunk/portal-extensions/configuration/to-copy/JBLabs-ds.xml.sample) Copied: labs/jbosslabs/trunk/portal-extensions/configuration/to-copy/server/all/deploy/ear-deployer.xml (from rev 4986, labs/jbosslabs/trunk/portal-extensions/configuration/to-copy/ear-deployer.xml) Copied: labs/jbosslabs/trunk/portal-extensions/configuration/to-copy/server/all/deploy/jboss-aop-jdk50.deployer (from rev 4986, labs/jbosslabs/trunk/portal-extensions/configuration/to-copy/jboss-aop-jdk50.deployer) Copied: labs/jbosslabs/trunk/portal-extensions/configuration/to-copy/server/all/deploy/jboss-portal.sar (from rev 4986, labs/jbosslabs/trunk/portal-extensions/configuration/to-copy/jboss-portal.sar) Copied: labs/jbosslabs/trunk/portal-extensions/configuration/to-copy/server/all/deploy/mail-service.xml (from rev 4986, labs/jbosslabs/trunk/portal-extensions/configuration/to-copy/mail-service.xml) |