Skip to content

Commit

Permalink
Rename "/> to " />
Browse files Browse the repository at this point in the history
  • Loading branch information
brianchandotcom committed May 11, 2012
1 parent 9672911 commit 54253d6
Show file tree
Hide file tree
Showing 7 changed files with 43 additions and 43 deletions.
12 changes: 6 additions & 6 deletions build-dist.xml
Original file line number Diff line number Diff line change
Expand Up @@ -822,7 +822,7 @@ release was successful.</echo>

<chmod perm="a+x">
<fileset dir="${app.server.geronimo.bin.dir}">
<include name="*.sh"/>
<include name="*.sh" />
</fileset>
</chmod>
</target>
Expand Down Expand Up @@ -861,7 +861,7 @@ release was successful.</echo>

<chmod perm="a+x">
<fileset dir="${app.server.glassfish.bin.dir}">
<exclude name="*.bat"/>
<exclude name="*.bat" />
</fileset>
</chmod>
</target>
Expand Down Expand Up @@ -897,7 +897,7 @@ release was successful.</echo>

<chmod perm="a+x">
<fileset dir="${app.server.jboss.bin.dir}">
<include name="*.sh"/>
<include name="*.sh" />
</fileset>
</chmod>

Expand All @@ -916,7 +916,7 @@ release was successful.</echo>
<replacevalue><![CDATA[<security-domains>
<security-domain name="PortalRealm">
<authentication>
<login-module code="com.liferay.portal.security.jaas.PortalLoginModule" flag="required"/>
<login-module code="com.liferay.portal.security.jaas.PortalLoginModule" flag="required" />
</authentication>
</security-domain>]]>
</replacevalue>
Expand Down Expand Up @@ -995,7 +995,7 @@ release was successful.</echo>

<chmod perm="a+x">
<fileset dir="${app.server.jonas.bin.dir}">
<exclude name="*.bat"/>
<exclude name="*.bat" />
</fileset>
</chmod>

Expand Down Expand Up @@ -1113,7 +1113,7 @@ release was successful.</echo>

<chmod perm="a+x">
<fileset dir="${app.server.tomcat.bin.dir}">
<include name="*.sh"/>
<include name="*.sh" />
</fileset>
</chmod>

Expand Down
4 changes: 2 additions & 2 deletions build-test-tomcat.xml
Original file line number Diff line number Diff line change
Expand Up @@ -169,13 +169,13 @@ web.server.display.node=true</echo>
</antcall>
</then>
<else>
<antcall target="prepare-root-xml" inheritAll="false"/>
<antcall target="prepare-root-xml" inheritAll="false" />
</else>
</if>
</then>
</if>

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

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

Expand Down
2 changes: 1 addition & 1 deletion build-test-websphere-6.1.xml
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@
<replacefilter token="genericJvmArguments=&quot;&quot;" value="genericJvmArguments=&quot;-Dfile.encoding=UTF8 -Xk22000 -Xp64k,16k&quot;" />
<replacefilter token="verboseModeGarbageCollection=&quot;false&quot;" value="verboseModeGarbageCollection=&quot;true&quot;" />
<replacefilter token="verboseModeJNI=&quot;false&quot;" value="verboseModeJNI=&quot;false&quot; initialHeapSize=&quot;256&quot; maximumHeapSize=&quot;1024&quot;" />
<replacefilter token="xmi:id=&quot;DynamicCache_" value="defaultPriority=&quot;3&quot; hashSize=&quot;0&quot; cacheSize=&quot;3000&quot; xmi:id=&quot;DynamicCache_"/>
<replacefilter token="xmi:id=&quot;DynamicCache_" value="defaultPriority=&quot;3&quot; hashSize=&quot;0&quot; cacheSize=&quot;3000&quot; xmi:id=&quot;DynamicCache_" />
</replace>

<exec executable="${pscp.executable}">
Expand Down
2 changes: 1 addition & 1 deletion build-test-websphere-7.0.xml
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@
<replacefilter token="genericJvmArguments=&quot;&quot;" value="genericJvmArguments=&quot;-Dfile.encoding=UTF8 -Xk22000 -Xp64k,16k&quot;" />
<replacefilter token="verboseModeGarbageCollection=&quot;false&quot;" value="verboseModeGarbageCollection=&quot;true&quot;" />
<replacefilter token="verboseModeJNI=&quot;false&quot;" value="verboseModeJNI=&quot;false&quot; initialHeapSize=&quot;256&quot; maximumHeapSize=&quot;1024&quot;" />
<replacefilter token="xmi:id=&quot;DynamicCache_" value="defaultPriority=&quot;3&quot; hashSize=&quot;0&quot; cacheSize=&quot;3000&quot; xmi:id=&quot;DynamicCache_"/>
<replacefilter token="xmi:id=&quot;DynamicCache_" value="defaultPriority=&quot;3&quot; hashSize=&quot;0&quot; cacheSize=&quot;3000&quot; xmi:id=&quot;DynamicCache_" />
</replace>

<exec executable="${pscp.executable}">
Expand Down
2 changes: 1 addition & 1 deletion build-test-websphere-8.0.xml
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@
<replacefilter token="genericJvmArguments=&quot;&quot;" value="genericJvmArguments=&quot;-Dfile.encoding=UTF8 -Xk22000 -Xp64k,16k&quot;" />
<replacefilter token="verboseModeGarbageCollection=&quot;false&quot;" value="verboseModeGarbageCollection=&quot;true&quot;" />
<replacefilter token="verboseModeJNI=&quot;false&quot;" value="verboseModeJNI=&quot;false&quot; initialHeapSize=&quot;256&quot; maximumHeapSize=&quot;1024&quot;" />
<replacefilter token="xmi:id=&quot;DynamicCache_" value="defaultPriority=&quot;3&quot; hashSize=&quot;0&quot; cacheSize=&quot;3000&quot; xmi:id=&quot;DynamicCache_"/>
<replacefilter token="xmi:id=&quot;DynamicCache_" value="defaultPriority=&quot;3&quot; hashSize=&quot;0&quot; cacheSize=&quot;3000&quot; xmi:id=&quot;DynamicCache_" />
</replace>

<exec executable="${pscp.executable}">
Expand Down
56 changes: 28 additions & 28 deletions build-test.xml
Original file line number Diff line number Diff line change
Expand Up @@ -1986,12 +1986,12 @@
<isset property="skip.delete-liferay-home" />
</not>
<then>
<delete dir="${user.home}/liferay"/>
<delete dir="${user.home}/liferay" />
</then>
</if>

<delete includeemptydirs="true">
<fileset dir="${app.server.parent.dir}" excludes="*.zip"/>
<fileset dir="${app.server.parent.dir}" excludes="*.zip" />
</delete>
</target>

Expand Down Expand Up @@ -2672,16 +2672,16 @@ auto.deploy.dest.dir=C:/WINDOWS/system32/config/systemprofile/liferay/websphere-
<if>
<isset property="set.permission.algorithm.5" />
<then>
<replace file="portal-impl/src/portal-ext.properties" token="#permissions.user.check.algorithm=5" value="permissions.user.check.algorithm=5"/>
<replace file="portal-impl/src/portal-ext.properties" token="#permissions.view.dynamic.inheritance=false" value="permissions.view.dynamic.inheritance=false"/>
<replace file="portal-impl/src/portal-ext.properties" token="#permissions.user.check.algorithm=5" value="permissions.user.check.algorithm=5" />
<replace file="portal-impl/src/portal-ext.properties" token="#permissions.view.dynamic.inheritance=false" value="permissions.view.dynamic.inheritance=false" />
</then>
</if>

<if>
<isset property="set.permission.algorithm.6" />
<then>
<replace file="portal-impl/src/portal-ext.properties" token="permissions.user.check.algorithm=5" value=""/>
<replace file="portal-impl/src/portal-ext.properties" token="permissions.view.dynamic.inheritance=false" value=""/>
<replace file="portal-impl/src/portal-ext.properties" token="permissions.user.check.algorithm=5" value="" />
<replace file="portal-impl/src/portal-ext.properties" token="permissions.view.dynamic.inheritance=false" value="" />
</then>
</if>
</target>
Expand Down Expand Up @@ -3069,7 +3069,7 @@ file.
<isset property="skip.delete-liferay-home" />
</not>
<then>
<delete dir="${user.home}/liferay"/>
<delete dir="${user.home}/liferay" />
</then>
</if>

Expand Down Expand Up @@ -3162,10 +3162,10 @@ file.
<copy file="${sql.dir}${sql.file}" tofile="${sql.file}" />

<replace file="${sql.file}">
<replacefilter token="drop database lportal;" value="drop database ${db.schema};"/>
<replacefilter token="create database lportal;" value="create database ${db.schema} pagesize 8192;"/>
<replacefilter token="create database lportal pagesize 8192;" value="create database ${db.schema} pagesize 8192;"/>
<replacefilter token="connect to lportal;" value="connect to ${db.schema} USER ${db.username} USING ${db.password};"/>
<replacefilter token="drop database lportal;" value="drop database ${db.schema};" />
<replacefilter token="create database lportal;" value="create database ${db.schema} pagesize 8192;" />
<replacefilter token="create database lportal pagesize 8192;" value="create database ${db.schema} pagesize 8192;" />
<replacefilter token="connect to lportal;" value="connect to ${db.schema} USER ${db.username} USING ${db.password};" />
</replace>

<exec executable="${plink.executable}">
Expand Down Expand Up @@ -3232,16 +3232,16 @@ file.
<isset property="test.database.collate" />
<then>
<replace file="${sql.file}">
<replacefilter token="drop database if exists lportal;" value="drop database if exists ${db.schema};"/>
<replacefilter token="create database lportal character set utf8;" value="create database ${db.schema} character set utf8 collate utf8_bin;"/>
<replacefilter token="use lportal;" value="use ${db.schema};"/>
<replacefilter token="drop database if exists lportal;" value="drop database if exists ${db.schema};" />
<replacefilter token="create database lportal character set utf8;" value="create database ${db.schema} character set utf8 collate utf8_bin;" />
<replacefilter token="use lportal;" value="use ${db.schema};" />
</replace>
</then>
<else>
<replace file="${sql.file}">
<replacefilter token="drop database if exists lportal;" value="drop database if exists ${db.schema};"/>
<replacefilter token="create database lportal character set utf8;" value="create database ${db.schema} character set utf8;"/>
<replacefilter token="use lportal;" value="use ${db.schema};"/>
<replacefilter token="drop database if exists lportal;" value="drop database if exists ${db.schema};" />
<replacefilter token="create database lportal character set utf8;" value="create database ${db.schema} character set utf8;" />
<replacefilter token="use lportal;" value="use ${db.schema};" />
</replace>
</else>
</if>
Expand Down Expand Up @@ -3331,9 +3331,9 @@ file.
<copy file="${sql.dir}${sql.file}" tofile="${sql.file}" />

<replace file="${sql.file}">
<replacefilter token="drop database lportal;" value="drop database ${db.schema};"/>
<replacefilter token="create database lportal encoding = 'UNICODE';" value="create database ${db.schema} encoding = 'UNICODE';"/>
<replacefilter token="\c lportal;" value="\c ${db.schema};"/>
<replacefilter token="drop database lportal;" value="drop database ${db.schema};" />
<replacefilter token="create database lportal encoding = 'UNICODE';" value="create database ${db.schema} encoding = 'UNICODE';" />
<replacefilter token="\c lportal;" value="\c ${db.schema};" />
</replace>

<exec executable="${plink.executable}">
Expand Down Expand Up @@ -3400,9 +3400,9 @@ file.
<copy file="${sql.dir}${sql.file}" tofile="${sql.file}" />

<replace file="${sql.file}">
<replacefilter token="drop database lportal;" value="drop database ${db.schema};"/>
<replacefilter token="create database lportal;" value="create database ${db.schema};"/>
<replacefilter token="use lportal;" value="use ${db.schema};"/>
<replacefilter token="drop database lportal;" value="drop database ${db.schema};" />
<replacefilter token="create database lportal;" value="create database ${db.schema};" />
<replacefilter token="use lportal;" value="use ${db.schema};" />
</replace>

<exec executable="${plink.executable}">
Expand Down Expand Up @@ -3457,9 +3457,9 @@ file.

<replace file="${sql.file}">
<replacefilter token="use master" value="use master${line.separator}dump transaction master with no_log${line.separator}go${line.separator}if exists (select * from master.dbo.sysdatabases where name = &quot;${db.schema}&quot;)${line.separator}begin${line.separator}drop database ${db.schema}${line.separator}end${line.separator}go${line.separator}create database ${db.schema} on ${db.device.name} = &quot;250m&quot;${line.separator}go" />
<replacefilter token="exec sp_dboption 'lportal', 'allow nulls by default' , true" value="exec sp_dboption '${db.schema}', 'allow nulls by default' , true"/>
<replacefilter token="exec sp_dboption 'lportal', 'select into/bulkcopy/pllsort' , true" value="exec sp_dboption '${db.schema}', 'select into/bulkcopy/pllsort' , true"/>
<replacefilter token="use lportal" value="use ${db.schema}${line.separator}go"/>
<replacefilter token="exec sp_dboption 'lportal', 'allow nulls by default' , true" value="exec sp_dboption '${db.schema}', 'allow nulls by default' , true" />
<replacefilter token="exec sp_dboption 'lportal', 'select into/bulkcopy/pllsort' , true" value="exec sp_dboption '${db.schema}', 'select into/bulkcopy/pllsort' , true" />
<replacefilter token="use lportal" value="use ${db.schema}${line.separator}go" />
</replace>

<exec executable="${plink.executable}">
Expand Down Expand Up @@ -3819,9 +3819,9 @@ file.

<antcall target="revert-test-properties" />

<antcall target="test-integration" inheritAll="false"/>
<antcall target="test-integration" inheritAll="false" />

<antcall target="test-unit" inheritAll="false"/>
<antcall target="test-unit" inheritAll="false" />

<ant dir="sql" target="test-sample-sql" inheritAll="false" />

Expand Down
8 changes: 4 additions & 4 deletions portal-web/build.xml
Original file line number Diff line number Diff line change
Expand Up @@ -121,9 +121,9 @@
/>
</path>
<sequential>
<basename property="dir.name" file="@{dir}"/>
<basename property="dir.name" file="@{dir}" />
<if>
<available file="docroot/html/js/aui/${dir.name}/assets/skins/sam/${dir.name}.css"/>
<available file="docroot/html/js/aui/${dir.name}/assets/skins/sam/${dir.name}.css" />
<then>
<concat append="true" destfile="docroot/html/ALLOY_ZIP/build/aui-skins/tmp/alloy.css">
<filelist
Expand All @@ -134,7 +134,7 @@
</then>
</if>
<if>
<available file="docroot/html/js/aui/${dir.name}/assets/skins/sam/"/>
<available file="docroot/html/js/aui/${dir.name}/assets/skins/sam/" />
<then>
<copy todir="docroot/html/themes/_unstyled/images/aui/">
<fileset dir="docroot/html/js/aui/${dir.name}/assets/skins/sam/" includes="**/*.png,**/*.jpg,**/*.gif" />
Expand Down Expand Up @@ -622,7 +622,7 @@ var defaultTypes = []]>
</replace>

<replace dir="docroot/html/js/editor/fckeditor/editor/filemanager/browser/liferay">
<include name="**/*.html"/>
<include name="**/*.html" />
<replacetoken><![CDATA[<html>]]></replacetoken>
<replacevalue><![CDATA[<html xmlns="http://www.w3.org/1999/xhtml">]]></replacevalue>
</replace>
Expand Down

0 comments on commit 54253d6

Please sign in to comment.