update dependency

zkoss · Jul 17, 2014 · 9d1ec00 · 9d1ec00
1 parent f8b0970
commit 9d1ec00
Show file tree

Hide file tree

Showing 14 changed files with 17 additions and 97 deletions.
diff --git a/dist/lib/ckez.jar b/dist/lib/ckez.jar
diff --git a/dist/lib/gmapsz.jar b/dist/lib/gmapsz.jar
diff --git a/dist/lib/mil.jar b/dist/lib/mil.jar
diff --git a/dist/lib/timelinez.jar b/dist/lib/timelinez.jar
diff --git a/dist/lib/timeplotz.jar b/dist/lib/timeplotz.jar
diff --git a/dist/lib/zcommons-el.jar b/dist/lib/zcommons-el.jar
diff --git a/dist/lib/zhtml.jar b/dist/lib/zhtml.jar
diff --git a/dist/lib/zkdemo.war b/dist/lib/zkdemo.war
diff --git a/dist/lib/zklighter.jar b/dist/lib/zklighter.jar
diff --git a/dist/lib/zkplus.jar b/dist/lib/zkplus.jar
diff --git a/dist/lib/zuljsp.jar b/dist/lib/zuljsp.jar
diff --git a/gmapsz/pom.xml b/gmapsz/pom.xml
@@ -17,21 +17,25 @@
       <groupId>org.zkoss.common</groupId>
       <artifactId>zcommon</artifactId>
       <version>${zk.version}</version>
+      <optional>true</optional>
     </dependency>
     <dependency>
       <groupId>org.zkoss.common</groupId>
       <artifactId>zweb</artifactId>
       <version>${zk.version}</version>
+      <optional>true</optional>
     </dependency>
     <dependency>
       <groupId>org.zkoss.zk</groupId>
       <artifactId>zk</artifactId>
       <version>${zk.version}</version>
+      <optional>true</optional>
     </dependency>
     <dependency>
       <groupId>org.zkoss.zk</groupId>
       <artifactId>zul</artifactId>
       <version>${zk.version}</version>
+      <optional>true</optional>
     </dependency>
   </dependencies>
 </project> 
diff --git a/gmapszTest/WebContent/test2/B70-Gmapsz-44.zul b/gmapszTest/WebContent/test2/B70-Gmapsz-44.zul
@@ -4,24 +4,19 @@
 		2. All the overlays should be removed.
 	</label>
 	<button id="clearBtn" label="Clear" onClick="map.getChildren().clear()"/>
+	<button id="showBtn" label="Show" onClick="myinfo.setOpen(true)"/>
 	<gmaps id="map" height="400px" width="75%" showZoomCtrl="false">
-	       <ginfo id="myinfo" open="true" lat="37.4200" lng="-122.1490">
-	           <![CDATA[
-	               Hello, <a href="http://www.zkoss.org">ZK</a>.
-	           ]]>
-	       </ginfo>
-	       <gmarker id="mymark" lat="37.4300" lng="-122.1490">
-	           <![CDATA[
-	               Hello, <a href="http://www.zkoss.org">ZK</a> on top of Gmarker.
-	           ]]>
-	       </gmarker>
-	       <attribute name="onMapClick">
-	           Gmarker gmarker = event.getGmarker();
-	           if (gmarker != null) {
-	               gmarker.setOpen(true);
-	           }
-	       </attribute>
-			<gimage src="/img/Globe-128x128.png" swlat="37.44215478" swlng="-122.14273453" nelat="37.45033195" nelng="-122.13191986"/>
+       <ginfo id="myinfo" open="true" lat="37.4200" lng="-122.1490">
+           <![CDATA[
+               Hello, <a href="http://www.zkoss.org">ZK</a>.
+           ]]>
+       </ginfo>
+       <gmarker id="mymark" lat="37.4300" lng="-122.1490">
+           <![CDATA[
+               Hello, <a href="http://www.zkoss.org">ZK</a> on top of Gmarker.
+           ]]>
+       </gmarker>
+		<gimage src="/img/Globe-128x128.png" swlat="37.44215478" swlng="-122.14273453" nelat="37.45033195" nelng="-122.13191986"/>
         <gpolyline points="37.42838786,-122.13998795,3,37.43561240,-122.13277816,3,37.42416187,-122.11441040,3,
                                        37.42157162,-122.12007522,3,37.41734524,-122.12316513,3,37.42838786,-122.13998795,3"/>
         <gpolygon points="37.43838786,-122.12998795,3,37.42561240,-122.12277816,3,37.43416187,-122.12441040,3,

diff --git a/gmapszTest/pom.xml b/gmapszTest/pom.xml
@@ -12,19 +12,9 @@
 		<commons-logging.version>1.1.1</commons-logging.version>
 		<servlet.version>2.4</servlet.version>
 		<jetty.version>6.1.16</jetty.version>
-		<jgroovy.version>1.5.6</jgroovy.version>
-		<jruby.version>1.1.2</jruby.version>
-		<jython.version>2.2.1</jython.version>
 		<js.version>1.7R1</js.version>
 		<poi.version>3.7</poi.version>
-		<jxl.version>2.6.12</jxl.version>		
-		<jasperreports.version>4.0.1</jasperreports.version>
-		<jfreechart.version>1.0.13</jfreechart.version>
-		<filters.version>2.0.235</filters.version>
-		<ckez.version>3.3.2_50</ckez.version>
 		<gmapsz.version>3.0.3-FL</gmapsz.version>
-		<timelinez.version>2.3.1_50</timelinez.version>
-		<timeplotz.version>1.1_50</timeplotz.version>
 	</properties>
 	<version>7.0.2-Eval</version>
 	<packaging>war</packaging>
@@ -76,16 +66,6 @@
 		</pluginRepository>
 	</pluginRepositories>
 	<dependencies>
-		<dependency>
-			<groupId>org.zkoss.theme</groupId>
-			<artifactId>sapphire</artifactId>
-			<version>${project.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.zkoss.theme</groupId>
-			<artifactId>silvertail</artifactId>
-			<version>${project.version}</version>
-		</dependency>
 		<dependency>
 			<groupId>javax.servlet</groupId>
 			<artifactId>servlet-api</artifactId>
@@ -168,24 +148,6 @@
 			<version>${bsh.version}</version>
 			<scope>runtime</scope>
 		</dependency>
-		<dependency>
-			<groupId>org.codehaus.groovy</groupId>
-			<artifactId>groovy-all</artifactId>
-			<version>${jgroovy.version}</version>
-			<scope>runtime</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.jruby</groupId>
-			<artifactId>jruby</artifactId>
-			<version>${jruby.version}</version>
-			<scope>runtime</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.python</groupId>
-			<artifactId>jython</artifactId>
-			<version>${jython.version}</version>
-			<scope>runtime</scope>
-		</dependency>
 		<dependency>
 			<groupId>rhino</groupId>
 			<artifactId>js</artifactId>
@@ -202,48 +164,7 @@
 					<artifactId>log4j</artifactId>
 				</exclusion>
 			</exclusions>
-		</dependency>
-		<dependency>
-			<groupId>net.sourceforge.jexcelapi</groupId>
-			<artifactId>jxl</artifactId>
-			<version>${jxl.version}</version>
-		</dependency>		
-		<dependency>
-			<groupId>net.sf.jasperreports</groupId>
-			<artifactId>jasperreports</artifactId>
-			<version>${jasperreports.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>jfree</groupId>
-			<artifactId>jfreechart</artifactId>
-			<version>${jfreechart.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>com.jhlabs</groupId>
-			<artifactId>filters</artifactId>
-			<version>${filters.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.zkoss.zkforge</groupId>
-			<artifactId>ckez</artifactId>
-			<version>${ckez.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.zkoss.zkforge</groupId>
-			<artifactId>timelinez</artifactId>
-			<version>${timelinez.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.zkoss.zkforge</groupId>
-			<artifactId>timeplotz</artifactId>
-			<version>${timeplotz.version}</version>
-			<exclusions>
-				<exclusion>
-					<groupId>org.zkoss.zkforge</groupId>
-					<artifactId>timelinez</artifactId>
-				</exclusion>
-			</exclusions>
-		</dependency>
+		</dependency>	
 		<dependency>
 			<groupId>org.zkoss.zkforge</groupId>
 			<artifactId>gmapsz</artifactId>