Skip to content
Browse files

LPS-27651 Apply

  • Loading branch information...
1 parent c77dda7 commit 58a11987eac05d27e6e5d64e468533d96c7aaf25 @brianchandotcom brianchandotcom committed May 30, 2012
Showing with 11 additions and 33 deletions.
  1. +1 −0 app.server.properties
  2. +10 −27 build-dist.xml
  3. +0 −6 build.xml
View
1 app.server.properties
@@ -206,6 +206,7 @@
app.server.weblogic.portal.context=ROOT
app.server.weblogic.portal.dir=${app.server.weblogic.deploy.dir}/${app.server.weblogic.portal.context}
app.server.weblogic.temp.dir=${app.server.weblogic.dir}/${app.server.weblogic.instance.name}/log
+ app.server.weblogic.wlserver.dir=${app.server.weblogic.dir}/wlserver
app.server.weblogic.work.dir=${app.server.weblogic.dir}/${app.server.weblogic.instance.name}/log
app.server.weblogic.zip.name=wls${app.server.weblogic.version.build}_dev.zip
app.server.weblogic.zip.url=http://download.oracle.com/otn/nt/middleware/11g/wls/${app.server.weblogic.version.build}/wls${app.server.weblogic.version.build}_dev.zip
View
37 build-dist.xml
@@ -1152,20 +1152,6 @@ release was successful.</echo>
</target>
<target name="unzip-weblogic">
- <property name="app.server.weblogic.dir.abs" location="${app.server.weblogic.dir}" />
-
- <property name="app.server.weblogic.instance.dir.abs" location="${app.server.weblogic.instance.dir}" />
-
- <pathconvert property="app.server.weblogic.instance.dir.unix" targetos="unix">
- <path location="${app.server.weblogic.instance.dir.abs}" />
- </pathconvert>
-
- <var name="app.server.weblogic.wlserver.dir" value="${app.server.weblogic.dir.abs}/wlserver" />
-
- <pathconvert property="app.server.weblogic.wlserver.dir.unix" targetos="unix">
- <path location="${app.server.weblogic.wlserver.dir}" />
- </pathconvert>
-
<if>
<not>
<available file="${app.server.parent.dir}/${app.server.weblogic.zip.name}" />
@@ -1216,8 +1202,8 @@ closeTemplate()</echo>
<if>
<os family="windows" />
<then>
- <exec dir="${app.server.weblogic.dir.abs}" executable="cmd">
- <env key="MW_HOME" value="${app.server.weblogic.dir.abs}" />
+ <exec dir="${app.server.weblogic.dir}" executable="cmd">
+ <env key="MW_HOME" value="${app.server.weblogic.dir}" />
<arg value="/c" />
<arg value="configure.cmd" />
</exec>
@@ -1226,7 +1212,7 @@ closeTemplate()</echo>
set "USER_MEM_ARGS=-Xmx1024m -XX:PermSize=256m"
-set "MW_HOME=${app.server.weblogic.dir.abs}"
+set "MW_HOME=${app.server.weblogic.dir}"
set "WL_HOME=${app.server.weblogic.wlserver.dir}"
@@ -1245,7 +1231,7 @@ set "CLASSPATH=%FMWCONFIG_CLASSPATH%"
set "USER_MEM_ARGS=-Xmx1024m -XX:PermSize=512m"
-set "MW_HOME=${app.server.weblogic.dir.abs}"
+set "MW_HOME=${app.server.weblogic.dir}"
call startWebLogic.cmd</echo>
</then>
@@ -1297,9 +1283,6 @@ sh startWebLogic.sh</echo>
</target>
<target name="unzip-websphere">
- <property name="app.server.parent.dir.abs" location="${app.server.parent.dir}" />
- <property name="app.server.websphere.dir.abs" location="${app.server.websphere.dir}" />
-
<if>
<or>
<not>
@@ -1344,7 +1327,7 @@ them in ${app.server.parent.dir}. Then rerun this task.
<echo file="${tstamp.value}/was/WAS/liferay-responsefile.txt">
-OPT disableOSPrereqChecking="true"
-OPT feature="noFeature"
- -OPT installLocation="${app.server.websphere.dir.abs}"
+ -OPT installLocation="${app.server.websphere.dir}"
-OPT installType="installNew"
-OPT PROF_cellName=liferay-cell
-OPT PROF_enableAdminSecurity="false"
@@ -1378,7 +1361,7 @@ them in ${app.server.parent.dir}. Then rerun this task.
/>
<echo file="${tstamp.value}/updi/UpdateInstaller/liferay-responsefile.txt">
- -OPT installLocation="${app.server.websphere.dir.abs}\UpdateInstaller"
+ -OPT installLocation="${app.server.websphere.dir}\UpdateInstaller"
-OPT silentInstallLicenseAcceptance="true"
-OPT skipStartMenu=true
</echo>
@@ -1389,15 +1372,15 @@ them in ${app.server.parent.dir}. Then rerun this task.
<arg line="/c install.exe -options liferay-responsefile.txt -silent" />
</exec>
- <echo file="${app.server.websphere.dir.abs}/UpdateInstaller/liferay-responsefile.txt">
- -W maintenance.package="${app.server.parent.dir.abs}\${app.server.websphere.fix.pack.jdk.name};${app.server.parent.dir.abs}\${app.server.websphere.fix.pack.was.name}"
- -W product.location="${app.server.websphere.dir.abs}"
+ <echo file="${app.server.websphere.dir}/UpdateInstaller/liferay-responsefile.txt">
+ -W maintenance.package="${app.server.parent.dir}\${app.server.websphere.fix.pack.jdk.name};${app.server.parent.dir}\${app.server.websphere.fix.pack.was.name}"
+ -W product.location="${app.server.websphere.dir}"
-W update.type="install"
</echo>
<echo>Installing fix pack.</echo>
- <exec dir="${app.server.websphere.dir.abs}/UpdateInstaller" executable="cmd.exe">
+ <exec dir="${app.server.websphere.dir}/UpdateInstaller" executable="cmd.exe">
<arg line="/c update.exe -options liferay-responsefile.txt -silent" />
</exec>
View
6 build.xml
@@ -799,12 +799,6 @@ set JAVA_OPTS=-Dfile.encoding=UTF8 -Djava.net.preferIPv4Stack=true -Djonas.felix
<echo>Installing liferay-portal.war.</echo>
- <property name="app.server.websphere.instance.dir.abs" location="${app.server.websphere.instance.dir}" />
-
- <pathconvert property="app.server.websphere.instance.dir.unix" targetos="unix">
- <path location="${app.server.websphere.instance.dir.abs}" />
- </pathconvert>
-
<echo file="wsadmin.py">
def uninstallApp(appName):
app = ''

0 comments on commit 58a1198

Please sign in to comment.
Something went wrong with that request. Please try again.