Commit 1622dd96 authored by mindthegab's avatar mindthegab
Browse files

applying patch as per issue 47 

git-svn-id: http://maven-alfresco-archetypes.googlecode.com/svn/trunk@313 04253f4f-3451-0410-a141-5562f1e59037
parent 786d03d9

maven-alfresco-archetypes/maven-alfresco-amp-archetype/src/main/resources/archetype-resources/jetty/jetty-env.xml

0 → 100644
+18 −0
Original line number Diff line number Diff line 
<?xml version="1.0"?>

<!DOCTYPE Configure PUBLIC "-//Mort Bay Consulting//DTD Configure//EN" "http://jetty.mortbay.org/configure.dtd">



<Configure class="org.mortbay.jetty.webapp.WebAppContext">



    <New id="myDataSource"

        class="org.mortbay.jetty.plus.naming.Resource">

        <Arg>jdbc/dataSource</Arg>

        <Arg>

            <New class="com.mysql.jdbc.jdbc2.optional.MysqlConnectionPoolDataSource">

                <Set name="Url">jdbc:mysql://${alfresco.db.url}/${alfresco.db.name}</Set>

                <Set name="User">${alfresco.db.username}</Set>

                <Set name="Password">${alfresco.db.password}</Set>

            </New>

        </Arg>

    </New>



</Configure>

maven-alfresco-archetypes/maven-alfresco-amp-archetype/src/main/resources/archetype-resources/pom.xml

+5 −1
Original line number Diff line number Diff line
@@ -310,7 +310,6 @@ 
								<addMavenDescriptor>false</addMavenDescriptor>

							</archive>

							<warSourceExcludes>licenses/**</warSourceExcludes>

							<webResources></webResources>

							<webResources>

								<resource>

									<directory>${build.testOutputDirectory}</directory>
@@ -328,6 +327,11 @@ 
										<include>licenses/*.*</include>

									</includes>

									<filtering>false</filtering>

								</resource>

								<resource>

                                    <directory>jetty</directory>

                                    <targetPath>WEB-INF</targetPath>

                                    <filtering>true</filtering>

                                </resource>

							</webResources>

						</configuration>