Skip to content
Browse files

git-svn-id: https://svn.potix.com/svn/zk1/branches/5.0@10765 dd50bd9b…

…-9913-0410-b9ba-e07a3075be86
  • Loading branch information...
1 parent 6906a35 commit 75644d780b0c75c3e80b44c1ed385e3be32c43cf @tomyeh tomyeh committed Feb 10, 2009
View
0 MyApp/import.libs
No changes.
View
11 build
@@ -343,15 +343,6 @@ function invoke_ant
ear_libs=nonexist
fi
- local import_libs=
- if [ -f import.libs ] ; then
- import_libs=$(cat import.libs | tr '\n' ',')
- import_libs=${import_libs%,}
- fi
- if [ "$import_libs" = "" ] ; then
- import_libs=nonexist
- fi
-
local deploy=
local unziplist=
if [ -f deploy ] ; then
@@ -444,7 +435,7 @@ function invoke_ant
-Djs.trim=$jstrim -Dzipjs=$zipjslist\
-Dzipcss=$zipcsslist\
-Dwar.libs="$war_libs" -Dbasedir=. \
- -Dear.libs="$ear_libs" -Dimport.libs="$import_libs" \
+ -Dear.libs="$ear_libs" \
-Dproject.name="$2" -Dproject.version="$prjver" \
-Dsource.version="$srcver" -Dtarget.version="$tgtver" \
-Dhaltonerror=$haltonerror -Dout.dir=$outdir \
View
5 build.prop.xml
@@ -31,7 +31,6 @@ Copyright (C) 2002 Potix Corporation. All Rights Reserved.
<property name="src.dir" value="src"/>
<property name="src.archive.dir" value="${src.dir}/archive"/>
-<property name="src.export.dir" value="${src.dir}/export"/>
<property name="src.mesg.dir" value="${src.archive.dir}/metainfo/mesg"/>
<property name="manifest.mf" value="${src.archive.dir}/META-INF/MANIFEST.MF"/>
<property name="application.xml" value="${src.archive.dir}/META-INF/application.xml"/>
@@ -55,10 +54,6 @@ Copyright (C) 2002 Potix Corporation. All Rights Reserved.
<property name="dist.lib.dir" value="${dist.dir}/lib"/>
<property name="dist.lib.ext.dir" value="${dist.lib.dir}/ext"/>
<property name="dist.conf.dir" value="${dist.dir}/conf"/>
-<property name="dist.install.dir" value="${dist.conf.dir}/install"/>
-<property name="dist.upgrade.dir" value="${dist.conf.dir}/upgrade"/>
-<property name="dist.test.dir" value="${dist.conf.dir}/test"/>
-<property name="dist.export.dir" value="${dist.dir}/export"/>
<property name="working.javadoc.dir" value="${working.dir}/javadoc/${project.name}"/>
<property name="dist.javadoc.dir" value="${share.javadoc.dir}/${project.name}"/>
<property name="out.metainf.dir" value="${out.dir}/META-INF"/>
View
43 build.target.xml
@@ -39,12 +39,6 @@ Copyright (C) 2002-2006 Potix Corporation. All Rights Reserved.
<!-- ====== -->
<!-- DEPLOY -->
<!-- ====== -->
-<target name="deploy.export" depends="config.build" if="src.export.dir.exist">
- <copy todir="${dist.export.dir}" preservelastmodified="yes">
- <fileset dir="${src.export.dir}"/>
- </copy>
-</target>
-
<target name="deploy.lib" depends="config.build" if="deploy.lib.required">
<copy todir="${dist.lib.dir}" preservelastmodified="yes">
<fileset dir="${out.dir}" includes="${xar.name}, ${jad.name}"/>
@@ -133,14 +127,13 @@ if="deploy.jboss.required">
</copy>
</target>
-<target name="deploy"
-depends="deploy.export, deploy.lib, deploy.tomcat, deploy.jboss">
+<target name="deploy" depends="deploy.lib, deploy.tomcat, deploy.jboss">
</target>
<!-- ===== -->
<!-- BUILD -->
<!-- ===== -->
-<target name="build.jar" depends="gentime, compile, copy.web.jar" if="build.jar.required">
+<target name="build.jar" depends="gentime, compile" if="build.jar.required">
<mkdir dir="${src.archive.dir}"/>
<mkdir dir="${codegen.archive.dir}"/>
@@ -168,7 +161,7 @@ depends="deploy.export, deploy.lib, deploy.tomcat, deploy.jboss">
excludes="META-INF/MANIFEST.MF"/>
</jar>
</target>
-<target name="build.jad" depends="compile, copy.web.jar" if="build.jad.required">
+<target name="build.jad" depends="compile" if="build.jad.required">
<mkdir dir="${src.archive.dir}"/>
<mkdir dir="${codegen.archive.dir}"/>
@@ -193,16 +186,6 @@ depends="deploy.export, deploy.lib, deploy.tomcat, deploy.jboss">
<arg value="${out.dir}/${jad.name}"/>
</exec>
</target>
-<!-- copy WEB-relevant resource to jar (into codegen.archive.web.dir) -->
-<target name="copy.web.jar" depends="deploy.export" if="copy.web.jar.required">
- <mkdir dir="${codegen.archive.web.dir}"/>
- <copy todir="${codegen.archive.web.dir}" preservelastmodified="yes"
- failonerror="false">
- <fileset dir="${dist.export.dir}" includes="${import.libs}"/>
- <fileset dir="${dist.lib.ext.dir}" includes="${import.libs}"/>
- <fileset dir="${src.export.dir}" includes="${import.libs}"/>
- </copy>
-</target>
<target name="gentime" depends="config" if="gentime.required">
<exec executable="bash" dir="." failonerror="true">
<arg value="${bin.dir}/gentime"/>
@@ -219,8 +202,6 @@ depends="deploy.export, deploy.lib, deploy.tomcat, deploy.jboss">
manifest="${war.dir}/META-INF/MANIFEST.MF">
<fileset dir="${war.dir}" includes="**"
excludes="WEB-INF/web.xml, META-INF/MANIFEST.MF"/>
- <fileset dir="${dist.export.dir}" includes="${import.libs}"/>
- <fileset dir="${dist.lib.ext.dir}" includes="${import.libs}"/>
<lib dir="${dist.lib.ext.dir}" includes="${war.libs}"/>
<lib dir="${dist.lib.dir}" includes="${war.libs}"/>
@@ -247,20 +228,11 @@ depends="deploy.export, deploy.lib, deploy.tomcat, deploy.jboss">
<!-- ===== -->
<!-- CLEAN -->
<!-- ===== -->
-<target name="clean.all" depends="config" if="clean.all.required">
- <delete quiet="true" includeEmptyDirs="true">
- <fileset dir="${dist.export.dir}" includes="**"/>
- </delete>
- <!--delete quiet="true">
- <fileset dir="${dist.lib.dir}" includes="*.?ar, *.jad"/>
- </delete-->
-</target>
-
<target name="clean.bin" depends="config" if="clean.bin.required">
<delete quiet="true" dir="${bin.dir}"/>
</target>
-<target name="clean" depends="clean.all, clean.bin">
+<target name="clean" depends="clean.bin">
<delete quiet="true" dir="${out.dir}"/>
<delete quiet="true" dir="${tmp.dir}"/>
<delete quiet="true" dir="${outv.dir}"/>
@@ -277,12 +249,7 @@ depends="deploy.export, deploy.lib, deploy.tomcat, deploy.jboss">
<!-- ========= -->
<!-- UNIT TEST -->
<!-- ========= -->
-<target name="deploy.test" depends="config" if="dist.test.dir.exist">
- <copy todir="${jboss.app.test.dir}" preservelastmodified="yes">
- <fileset dir="${dist.test.dir}" includes="**"/>
- </copy>
-</target>
-<target name="utest" depends="build, deploy.test">
+<target name="utest" depends="build">
<property name="class.test" value="**/*Test.java"/><!-- test all if not defined -->
<echo message="Test ${class.test}..."/>
View
11 build.txt
@@ -54,9 +54,6 @@ build.setting or build.setting.local
Optinal. Default: true if and only if D.ON is false
Controls whether to optimize code generation.
-MANIFEST.MF (Must)
- Used if the project doesn't contain MANIFEST.MF
-
----------
Files located under the project directory:
----------
@@ -111,14 +108,6 @@ ear.libs (Optional)
or dist/lib/ext that shall be packed to the result ear (format must be ear).
Used only if format: ear.
-import.libs (Optional)
- Specifies a list of files (one per line) under dist/export that
- shall be packed to the result war (format must be war).
- Note: dist/export is generated if a project contains src/export.
-
-cactus.properties (Must if Web-based Unit Test)
- Specifies the information required by web-based unit test codes.
-
class.test.local (Optional)
Specifies a list of classes (one per line) that the unit test must
test. If no classes specified at all, all classes registered in all
View
10 build.xml
@@ -45,9 +45,6 @@ Copyright (C) 2002 Potix Corporation. All Rights Reserved.
<!--tstamp/-->
<available file="${src.mesg.dir}" property="src.mesg.dir.exist"/>
- <available file="${src.export.dir}" property="src.export.dir.exist"/>
-
- <available file="${dist.test.dir}" property="dist.test.dir.exist"/>
<available file="${bin.dir}/CVS" property="bin.CVS.dir.exist"/>
<available file="${bin.dir}/.svn" property="bin.svn.dir.exist"/>
@@ -65,12 +62,6 @@ Copyright (C) 2002 Potix Corporation. All Rights Reserved.
</not>
</condition>
- <condition property="copy.web.jar.required">
- <not>
- <equals arg1="${import.libs}" arg2="nonexist"/>
- </not>
- </condition>
-
<!-- format -->
<condition property="build.ear.required">
<equals arg1="${format}" arg2="ear"/>
@@ -187,7 +178,6 @@ Copyright (C) 2002 Potix Corporation. All Rights Reserved.
</target>
<target name="config.build" depends="config">
<mkdir dir="${codegen.dir}"/>
- <mkdir dir="${dist.export.dir}"/>
</target>
<!-- ======= -->
View
BIN dist/lib/zklighter.jar
Binary file not shown.
View
5 release
@@ -165,7 +165,7 @@ if [ "$target" == "official" ] || [ "$target" == "daily" ] ; then
cp -rp zkplus/codegen/* zkplus/src/* ../src/zkplus
cd ..
rm -rf $srcnm
- rm -rf src/*/archive src/*/export
+ rm -rf src/*/archive
echo Output '*-sources.jar'
cd src
find -name 'package.html' | xargs rm -rf
@@ -225,9 +225,6 @@ if [ "$target" == "official" ] || [ "$target" == "daily" ] ; then
chmod 644 /tmp/zk/$binnm/dist/lib/*.jar
chmod 644 /tmp/zk/$binnm/dist/lib/*/*.jar
- if [ -d dist/export/WEB-INF ] ; then
- cp -rp dist/export/WEB-INF/* /tmp/zk/$binnm/dist/WEB-INF
- fi
cp -rp zweb/src/archive/web/WEB-INF/tld/web /tmp/zk/$binnm/dist/WEB-INF/tld
cp -rp zk/src/archive/web/WEB-INF/tld/zk /tmp/zk/$binnm/dist/WEB-INF/tld
cp -rp zul/src/archive/web/WEB-INF/tld/zul /tmp/zk/$binnm/dist/WEB-INF/tld
View
0 zhtml/import.libs
No changes.
View
1 zk/import.libs
@@ -1 +0,0 @@
-
View
0 zkdemo/import.libs
No changes.
View
1 zkex/import.libs
@@ -1 +0,0 @@
-
View
4 zklighter/src/org/zkoss/zklighter/Lighter.java
@@ -137,9 +137,7 @@ private static void genCSS(Element el) throws IOException {
ci.pure = false;
final List browsers = new LinkedList();
for (Iterator it = el.getElements("browser").iterator(); it.hasNext();) {
- final String browser = ((Element)it.next()).getText(true);
- browsers.add(browser);
- outCSS(dst, srcs, browser, ci);
+ browsers.add(((Element)it.next()).getText(true));
}
//merge all browser CSS into one
View
0 zkmax/import.libs
No changes.
View
0 zkplus/import.libs
No changes.
View
1 zkplus/src/org/zkoss/zkplus/acegi/AcegiSecurityContextListener.java
@@ -30,7 +30,6 @@
import org.zkoss.zk.ui.event.EventThreadCleanup;
import org.zkoss.zk.ui.event.EventThreadResume;
import org.zkoss.zk.ui.util.Configuration;
-import org.zkoss.zk.au.Command;
import org.zkoss.util.logging.Log;
import org.zkoss.web.servlet.BufferedResponse;
View
0 zml/import.libs
No changes.
View
1 zul/import.libs
@@ -1 +0,0 @@
-
View
1 zweb/import.libs
@@ -1 +0,0 @@
-

0 comments on commit 75644d7

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