Permalink
Browse files

Source formatting

git-svn-id: svn://svn.liferay.com/repos/public/portal/trunk@53536 05bdf26c-840f-0410-9ced-eb539d925f36
  • Loading branch information...
1 parent 1085961 commit 6320d232f20f9222c5ad5b1f9cff21d7f91f5500 @brianchandotcom brianchandotcom committed May 22, 2010
Showing with 1,286 additions and 1,286 deletions.
  1. +18 −18 build-common-java.xml
  2. +14 −14 build-common-web.xml
  3. +12 −12 build-common.xml
  4. +226 −226 build-dist.xml
  5. +5 −5 build-test-cluster.xml
  6. +72 −72 build.xml
  7. +29 −29 portal-client/build.xml
  8. +207 −207 portal-impl/build.xml
  9. +690 −690 portal-web/build.xml
  10. +13 −13 util-taglib/build.xml
View
@@ -63,13 +63,31 @@
</if>
</target>
+ <target name="deploy" depends="jar">
+ <copy file="${jar.file}.jar" todir="${deploy.dir}" />
+ </target>
+
<target name="jar" depends="compile">
<jar
basedir="classes"
jarfile="${jar.file}.jar"
/>
</target>
+ <target name="jar-javadoc">
+ <jar
+ basedir="${javadoc.dir}"
+ jarfile="${jar.file}-javadoc.jar"
+ />
+ </target>
+
+ <target name="jar-sources">
+ <jar
+ basedir="src"
+ jarfile="${jar.file}-sources.jar"
+ />
+ </target>
+
<target name="java2html">
<java
classname="j2h"
@@ -115,22 +133,4 @@
<arg line="-quiet -tag generated" />
</javadoc>
</target>
-
- <target name="deploy" depends="jar">
- <copy file="${jar.file}.jar" todir="${deploy.dir}" />
- </target>
-
- <target name="jar-javadoc">
- <jar
- basedir="${javadoc.dir}"
- jarfile="${jar.file}-javadoc.jar"
- />
- </target>
-
- <target name="jar-sources">
- <jar
- basedir="src"
- jarfile="${jar.file}-sources.jar"
- />
- </target>
</project>
View
@@ -48,20 +48,6 @@
</if>
</target>
- <target name="war" depends="compile">
- <if>
- <available file="docroot" />
- <then>
- <war
- basedir="docroot"
- destfile="${war.file}.war"
- excludes="WEB-INF/web.xml"
- webxml="docroot/WEB-INF/web.xml"
- />
- </then>
- </if>
- </target>
-
<target name="deploy" depends="compile">
<if>
<equals arg1="${war.file}" arg2="portal-web" />
@@ -165,4 +151,18 @@
</then>
</if>
</target>
+
+ <target name="war" depends="compile">
+ <if>
+ <available file="docroot" />
+ <then>
+ <war
+ basedir="docroot"
+ destfile="${war.file}.war"
+ excludes="WEB-INF/web.xml"
+ webxml="docroot/WEB-INF/web.xml"
+ />
+ </then>
+ </if>
+ </target>
</project>
View
@@ -100,10 +100,6 @@
<contains string="${os.name}" substring="Windows" casesensitive="false"/>
</condition>
- <target name="setproxy" if="setproxy.proxy.host">
- <setproxy proxyhost="${setproxy.proxy.host}" proxyport="${setproxy.proxy.port}" />
- </target>
-
<property name="definitions.dir" value="${project.dir}/definitions" />
<xmlcatalog id="dtd.catalog">
@@ -224,14 +220,6 @@ ECJ was automatically installed. Please rerun your task.
</then>
</if>
- <target name="print-current-time">
- <tstamp>
- <format property="current.time" pattern="MMMM d, yyyy 'at' hh:mm aa" />
- </tstamp>
-
- <echo message="${current.time}" />
- </target>
-
<target name="compile">
</target>
@@ -266,6 +254,18 @@ ECJ was automatically installed. Please rerun your task.
</java>
</target>
+ <target name="print-current-time">
+ <tstamp>
+ <format property="current.time" pattern="MMMM d, yyyy 'at' hh:mm aa" />
+ </tstamp>
+
+ <echo message="${current.time}" />
+ </target>
+
+ <target name="setproxy" if="setproxy.proxy.host">
+ <setproxy proxyhost="${setproxy.proxy.host}" proxyport="${setproxy.proxy.port}" />
+ </target>
+
<target name="test">
<delete dir="test-classes" />
<delete dir="test-results" />
Oops, something went wrong.

0 comments on commit 6320d23

Please sign in to comment.