Commit 27fb75b1 authored by maoo's avatar maoo
Browse files

Fixed Issue #73 - Tested with version 4.0.b; changed... 

Fixed Issue #73 - Tested with version 4.0.b; changed alfresco-global.properties to use pom.xml db.* params
Upgraded h2 support to 1.2

git-svn-id: http://maven-alfresco-archetypes.googlecode.com/svn/trunk@384 04253f4f-3451-0410-a141-5562f1e59037
parent 5ea00ed6

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

+3 −3
Original line number Diff line number Diff line
@@ -7,8 +7,8 @@ 
         class="org.mortbay.jetty.plus.naming.Resource">

        <Arg>jdbc/dataSource</Arg>

        <Arg>

            <New class="org.h2.jdbcx.JdbcDataSource">

                <Set name="URL">jdbc:h2:${alfresco.data.location}/h2_data/${alfresco.db.name};${alfresco.db.params}</Set>

            <New class="${alfresco.db.datasource.class}">

                <Set name="URL">${alfresco.db.url}</Set>

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

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

            </New>

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

+7 −4
Original line number Diff line number Diff line
@@ -86,19 +86,21 @@ 
			slash, e.g. '/var/log/alfresco/' ) | | Jetty embedded run logs by

			default in target/alfresco.log

		-->

        <alfresco.version>3.4.a</alfresco.version>

        <alfresco.version>4.0.b</alfresco.version>

        <alfresco.edition>community</alfresco.edition>

		<alfresco.data.location>./alf_data_jetty</alfresco.data.location>

		<alfresco.db.name>alf_jetty</alfresco.db.name>

		<alfresco.db.username>alfresco</alfresco.db.username>

		<alfresco.db.password>alfresco</alfresco.db.password>

        <alfresco.db.params>MODE=PostgreSQL;AUTO_SERVER=TRUE;DB_CLOSE_ON_EXIT=FALSE;LOCK_TIMEOUT=10000;MVCC=TRUE</alfresco.db.params>

        <alfresco.db.url>jdbc:h2:${alfresco.data.location}/h2_data/${alfresco.db.name};${alfresco.db.params}</alfresco.db.url>

        <alfresco.db.datasource.class>org.h2.jdbcx.JdbcDataSource</alfresco.db.datasource.class>

        <webapp.log.level>error</webapp.log.level>

		<webapp.log.dir></webapp.log.dir>

		<!--  End of testing webapp specific properties -->

		<!--  Module specific build time properties -->

		<module.log.level>debug</module.log.level>

        <spring.version>3.0.0.RELEASE</spring.version>

        <spring.version>3.0.5.RELEASE</spring.version>

	</properties>

	<!--

		need to list these as a provided so that Maven doesn't download them
@@ -490,6 +492,7 @@ 
                    <groupId>org.hibernate</groupId>

                    <artifactId>hibernate</artifactId>

                    <version>3.2.7.ga</version>

                    <scope>provided</scope>

                    <exclusions>

                        <exclusion>

                            <groupId>net.sf.ehcache</groupId>
@@ -500,7 +503,7 @@ 
                <dependency>

                    <groupId>tk.skuro.alfresco</groupId>

                    <artifactId>h2-support</artifactId>

                    <version>1.1</version>

                    <version>1.2</version>

                </dependency>

			</dependencies>

		</profile>

maven-alfresco-archetypes/maven-alfresco-amp-archetype/src/main/resources/archetype-resources/src/test/properties/local/alfresco-global.properties

+4 −3
Original line number Diff line number Diff line
@@ -26,15 +26,16 @@ index.recovery.mode=AUTO 
# Fail or not when there are node integrity checker errors

integrity.failOnError=true



db.driver=org.h2.Driver

db.url=jdbc:h2:${alfresco.data.location}/h2_data/${alfresco.db.name};${alfresco.db.params}

db.driver=${alfresco.db.driver}

db.url=${alfresco.db.url}

db.username=${alfresco.db.username}

db.password=${alfresco.db.password}

db.pool.initial=10

db.pool.max=100



# Dialect is autodetected starting from 3.2

# H2 dialect

hibernate.dialect=org.hibernate.dialect.H2Dialect

#hibernate.dialect=org.hibernate.dialect.H2Dialect



# Change the following values only if you know what you're doing.

# Default should suffice in most cases when running jetty embedded