diff --git a/zkjsp/build.setting b/zkjsp/build.setting index 5b314d7..d5ed32f 100644 --- a/zkjsp/build.setting +++ b/zkjsp/build.setting @@ -6,5 +6,5 @@ debug=true optimize=true jboss.deploy=default/deploy start.service=Apache Tomcat -version=2.6.0-FL +version=2.6.0 zkmob-version=0.8.7 \ No newline at end of file diff --git a/zkjsp/dist/lib/zkjsp-demo.war b/zkjsp/dist/lib/zkjsp-demo.war index 321071f..6eac6fc 100644 Binary files a/zkjsp/dist/lib/zkjsp-demo.war and b/zkjsp/dist/lib/zkjsp-demo.war differ diff --git a/zkjsp/dist/lib/zuljsp.jar b/zkjsp/dist/lib/zuljsp.jar index cd6d775..79b0987 100644 Binary files a/zkjsp/dist/lib/zuljsp.jar and b/zkjsp/dist/lib/zuljsp.jar differ diff --git a/zkjsp/sub-release b/zkjsp/sub-release index 3491440..380b5a0 100644 --- a/zkjsp/sub-release +++ b/zkjsp/sub-release @@ -154,13 +154,13 @@ cd /tmp/zk echo Output ${binnm}.zip zip -qr9 ${binnm}.zip $binnm -if [ "$target" == "official" ] ; then +#if [ "$target" == "official" ] ; then #Prepare maven repository function mvnrepo { echo "Create $1-$ver-bundle.jar" mkdir -p $1 mv /tmp/zk/$binnm/dist/src/$1-sources.jar $1/$1-$ver-sources.jar -+ sed -e "/version/s/-SNAPSHOT//" $maindir/$1/pom.xml > $1/pom.xml + sed -e "/version/s/-SNAPSHOT//" $maindir/$1/pom.xml > $1/pom.xml cp $maindir/dist/lib/$1.jar $1/$1-$ver.jar # should change mode to make sure it is accessable # or sometimes will cause 'access denied' problem @@ -174,7 +174,7 @@ if [ "$target" == "official" ] ; then mv *-bundle.jar /tmp/maven cd .. rm -rf maven -fi +#fi cd /tmp/zk rm -rf $binnm diff --git a/zkjsp/zkjsp-demo/src/org/zkoss/jspdemo/ui/GmapImportScript.java b/zkjsp/zkjsp-demo/src/org/zkoss/jspdemo/ui/GmapImportScript.java index 3d475c3..9c5e4ef 100644 --- a/zkjsp/zkjsp-demo/src/org/zkoss/jspdemo/ui/GmapImportScript.java +++ b/zkjsp/zkjsp-demo/src/org/zkoss/jspdemo/ui/GmapImportScript.java @@ -28,7 +28,7 @@ public void afterCompose() { this.setContent("zk.googleAPIkey='"+gmapKey+"'");//for zk 5 - this.setType("text/javascript"); + //this.setType("text/javascript"); } } diff --git a/zkjsp/zuljsp/src/org/zkoss/jsp/Version.java b/zkjsp/zuljsp/src/org/zkoss/jsp/Version.java index c70a95f..57eb3c1 100644 --- a/zkjsp/zuljsp/src/org/zkoss/jsp/Version.java +++ b/zkjsp/zuljsp/src/org/zkoss/jsp/Version.java @@ -21,5 +21,5 @@ public class Version { /** The version UID used to identify the resources. */ - public static final String UID = "2.6.0-FL"; + public static final String UID = "2.6.0"; }