Skip to content

Commit

Permalink
LPS-41349
Browse files Browse the repository at this point in the history
  • Loading branch information
@michaelhashimoto @brianchandotcom
michaelhashimoto authored and brianchandotcom committed Oct 16, 2013
1 parent 8617aa1 commit 7a5b4e9
Show file tree
Hide file tree
Showing 7 changed files with 29 additions and 23 deletions.
6 changes: 3 additions & 3 deletions build-test-glassfish.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ app.server.glassfish.dir=${app.server.parent.dir}/${bundled.dir.name}</echo>

<ant dir="portal-impl" target="deploy-properties" inheritAll="false" />

<delete dir="${user.home}/liferay" />
<delete dir="${test.liferay.home}" />

<if>
<or>
Expand All @@ -101,7 +101,7 @@ app.server.glassfish.dir=${app.server.parent.dir}/${bundled.dir.name}</echo>
<then>
<copy
file="${hudson.license.dependencies.dir}/${lp.version}/license"
todir="${user.home}/liferay/ee"
todir="${test.liferay.home}/ee"
/>
</then>
<elseif>
Expand All @@ -114,7 +114,7 @@ app.server.glassfish.dir=${app.server.parent.dir}/${bundled.dir.name}</echo>
<equals arg1="${lp.version}" arg2="6.1.20" />
</or>
<then>
<copy todir="${user.home}/liferay/deploy">
<copy todir="${test.liferay.home}/deploy">
<fileset
dir="${hudson.license.dependencies.dir}/${lp.version}"
includes="license-portal-*.xml"
Expand Down
6 changes: 3 additions & 3 deletions build-test-jboss.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ app.server.jboss.dir=${app.server.parent.dir}/${bundled.dir.name}</echo>
<resource-root path="mysql.jar" />]]></replacevalue>
</replace>

<delete dir="${user.home}/liferay" />
<delete dir="${test.liferay.home}" />

<if>
<or>
Expand All @@ -107,7 +107,7 @@ app.server.jboss.dir=${app.server.parent.dir}/${bundled.dir.name}</echo>
<then>
<copy
file="${hudson.license.dependencies.dir}/${lp.version}/license"
todir="${user.home}/liferay/ee"
todir="${test.liferay.home}/ee"
/>
</then>
<elseif>
Expand All @@ -120,7 +120,7 @@ app.server.jboss.dir=${app.server.parent.dir}/${bundled.dir.name}</echo>
<equals arg1="${lp.version}" arg2="6.1.20" />
</or>
<then>
<copy todir="${user.home}/liferay/deploy">
<copy todir="${test.liferay.home}/deploy">
<fileset
dir="${hudson.license.dependencies.dir}/${lp.version}"
includes="license-portal-*.xml"
Expand Down
10 changes: 5 additions & 5 deletions build-test-plugins.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@
<equals arg1="${plugins.deployed}" arg2="true" />
</not>
<then>
<delete dir="${user.home}/liferay/data" />
<delete dir="${user.home}/liferay/deploy" />
<delete dir="${test.liferay.home}/data" />
<delete dir="${test.liferay.home}/deploy" />
</then>
</if>

Expand All @@ -23,7 +23,7 @@ app.server.deploy.dir=${app.server.dir}/profiles/liferay/wsadmin-deploy
app.server.lib.global.dir=${app.server.dir}/lib/ext
app.server.portal.dir=${app.server.dir}/profiles/liferay/installedApps/liferay-cell/liferay-portal.ear/liferay-portal.war

auto.deploy.dir=$${user.home}/liferay/deploy
auto.deploy.dir=${test.liferay.home}/deploy

plugins.includes=${plugins.includes}</echo>
</then>
Expand All @@ -32,7 +32,7 @@ plugins.includes=${plugins.includes}</echo>
app.server.lib.global.dir=${simple.server.lib.global.dir}
app.server.portal.dir=${simple.server.portal.dir}

auto.deploy.dir=$${user.home}/liferay/deploy
auto.deploy.dir=${test.liferay.home}/deploy

plugins.includes=${plugins.includes}</echo>
</else>
Expand Down Expand Up @@ -74,7 +74,7 @@ plugins.includes=${plugins.includes}</echo>
</else>
</if>

<copy todir="${user.home}/liferay/deploy">
<copy todir="${test.liferay.home}/deploy">
<fileset
dir="${hudson.plugin.dependencies.dir}/${file.dir}"
includes="${plugins.includes}"
Expand Down
2 changes: 1 addition & 1 deletion build-test-tck.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ work.dir=${basedir.unix}/tools/tck/work</echo>
replace="/"
/>

<copy todir="${user.home}/liferay/deploy" flatten="true">
<copy todir="${test.liferay.home}/deploy" flatten="true">
<fileset
dir="tools/tck/dist/${test.directory}"
includes="**/*.war"
Expand Down
8 changes: 4 additions & 4 deletions build-test-tomcat.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@

<copy
file="${hudson.portal.dependencies.dir}${lp.version}/lpe2005-ee5207-hook-5.2.7.1.war"
todir="${user.home}/liferay/deploy"
todir="${test.liferay.home}/deploy"
/>
</target>

Expand Down Expand Up @@ -193,7 +193,7 @@ web.server.display.node=true</echo>

<antcall target="deploy-properties" inheritAll="false" />

<delete dir="${user.home}/liferay" />
<delete dir="${test.liferay.home}" />

<if>
<or>
Expand All @@ -204,7 +204,7 @@ web.server.display.node=true</echo>
<then>
<copy
file="${hudson.license.dependencies.dir}/${lp.version}/license"
todir="${user.home}/liferay/ee"
todir="${test.liferay.home}/ee"
/>
</then>
<elseif>
Expand All @@ -217,7 +217,7 @@ web.server.display.node=true</echo>
<equals arg1="${lp.version}" arg2="6.1.20" />
</or>
<then>
<copy todir="${user.home}/liferay/deploy">
<copy todir="${test.liferay.home}/deploy">
<fileset
dir="${hudson.license.dependencies.dir}/${lp.version}"
includes="license-portal-*.xml"
Expand Down
14 changes: 7 additions & 7 deletions build-test.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -858,7 +858,7 @@
<isset property="skip.delete-liferay-home" />
</not>
<then>
<delete dir="${user.home}/liferay" />
<delete dir="${test.liferay.home}" />
</then>
</if>

Expand Down Expand Up @@ -1403,7 +1403,7 @@
</target>

<target name="prepare-portal-ext-properties" depends="generate-test-properties">
<echo file="portal-impl/src/portal-ext.properties">liferay.home=$${user.home}/liferay
<echo file="portal-impl/src/portal-ext.properties">liferay.home=${test.liferay.home}

plugin.notifications.enabled=false

Expand Down Expand Up @@ -1685,7 +1685,7 @@ message.boards.subscribe.by.default=false</echo>
<then>
<replace
file="portal-impl/src/portal-ext.properties"
token="liferay.home=$${user.home}/liferay"
token="liferay.home=$${test.liferay.home}"
value="liferay.home=C:/WINDOWS/system32/config/systemprofile/liferay"
/>

Expand Down Expand Up @@ -2336,14 +2336,14 @@ custom.sql.function.isnotnull=CONVERT(VARCHAR,?) IS NOT NULL</echo>
<isset property="skip.delete-liferay-home" />
</not>
<then>
<delete dir="${user.home}/liferay" />
<delete dir="${test.liferay.home}" />
</then>
</if>

<if>
<equals arg1="${database}" arg2="hsql" />
<then>
<delete dir="${user.home}/liferay/data" includeemptydirs="true" />
<delete dir="${test.liferay.home}/data" includeemptydirs="true" />

<if>
<not>
Expand All @@ -2354,8 +2354,8 @@ custom.sql.function.isnotnull=CONVERT(VARCHAR,?) IS NOT NULL</echo>
</or>
</not>
<then>
<copy file="sql/${database.name}.properties" tofile="${user.home}/liferay/data/hsql/${database.name}.properties" />
<copy file="sql/${database.name}.script" tofile="${user.home}/liferay/data/hsql/${database.name}.script" />
<copy file="sql/${database.name}.properties" tofile="${test.liferay.home}/data/hsql/${database.name}.properties" />
<copy file="sql/${database.name}.script" tofile="${test.liferay.home}/data/hsql/${database.name}.script" />
</then>
</if>
</then>
Expand Down
6 changes: 6 additions & 0 deletions test.properties
View file
Original file line number Diff line number Diff line change
Expand Up @@ -250,6 +250,12 @@
WorkflowadminPGWikiTestCase.all.hook.plugins.includes=kaleo-upgrade-hook
WorkflowadminPGWikiTestCase.all.web.plugins.includes=kaleo-web

##
## Test Environment
##

test.liferay.home=${basedir.unix}/liferay-home

##
## Utilities
##
Expand Down

0 comments on commit 7a5b4e9

Please sign in to comment.