7109717 vpanels build is slowed unnecessarily by .jar downloads
authorStephen Talley <stephen.talley@oracle.com>
Tue, 08 Nov 2011 14:00:46 -0500
changeset 781 c25e916b5ba9
parent 780 73447aec6bfd
child 782 428d2fa55766
7109717 vpanels build is slowed unnecessarily by .jar downloads
usr/src/java/env-common.xml
usr/src/java/lib/TimingFramework-1.0-src.zip
usr/src/java/lib/TimingFramework-1.0.jar
usr/src/java/lib/build.xml
usr/src/java/lib/swingx-0.9.3-src.zip
usr/src/java/lib/swingx-0.9.3.jar
--- a/usr/src/java/env-common.xml	Wed Oct 19 21:28:03 2011 -0400
+++ b/usr/src/java/env-common.xml	Tue Nov 08 14:00:46 2011 -0500
@@ -75,8 +75,6 @@
 	    location="${proto.root}/usr/share/vpanels" />
 	<property name="abs.vpanels" location="/usr/share/vpanels" />
 	<property name="abs.app" location="${abs.vpanels}/app" />
-	<property name="url.vpanels"
-	    value="http://www.opensolaris.org/os/project/vpanels/files" />
 
 	<fileset id="ws.extlibs" dir="${ws.java}/lib" includes="**/*.jar" />
 </project>
Binary file usr/src/java/lib/TimingFramework-1.0-src.zip has changed
Binary file usr/src/java/lib/TimingFramework-1.0.jar has changed
--- a/usr/src/java/lib/build.xml	Wed Oct 19 21:28:03 2011 -0400
+++ b/usr/src/java/lib/build.xml	Tue Nov 08 14:00:46 2011 -0500
@@ -1,60 +1,33 @@
 <?xml version="1.0"?>
 <!--
   CDDL HEADER START
- 
+
   The contents of this file are subject to the terms of the
   Common Development and Distribution License (the "License").
   You may not use this file except in compliance with the License.
- 
+
   You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
   or http://www.opensolaris.org/os/licensing.
   See the License for the specific language governing permissions
   and limitations under the License.
- 
+
   When distributing Covered Code, include this CDDL HEADER in each
   file and include the License file at usr/src/OPENSOLARIS.LICENSE.
   If applicable, add the following below this CDDL HEADER, with the
   fields enclosed by brackets "[]" replaced with your own identifying
   information: Portions Copyright [yyyy] [name of copyright owner]
- 
+
   CDDL HEADER END
- 
-  Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
-  Use is subject to license terms.
- 
-  ident	"@(#)build.xml	1.4	08/07/14 SMI"
+
+  Copyright (c) 2008, 2011, Oracle and/or its affiliates. All rights reserved.
 -->
 
-<project name="vpanels-client" default="jar">
+<project name="vpanels-client">
 	<import file="../build-common.xml" />
 
-	<fileset id="extlibs" dir="." includes="**/*.jar" />
-
-	<macrodef name="getvpfile">
-		<attribute name="file" />
-		<sequential>
-			<get src="${url.vpanels}/@{file}"
-			    dest="@{file}" verbose="true"
-			    usetimestamp="true" />
-		</sequential>
-	</macrodef>
-
-	<!--
-	  Compile target pulls down the jars and source files we
-	  require.  We don't remove them on clobber because there's no
-	  need to and we want to download the files as infrequently as
-	  possible.
-	-->
-	<target name="jar">
-		<getvpfile file="TimingFramework-1.0-src.zip" />
-		<getvpfile file="TimingFramework-1.0.jar" />
-		<getvpfile file="swingx-0.9.3-src.zip" />
-		<getvpfile file="swingx-0.9.3.jar" />
-	</target>
-
-	<target name="install" depends="jar">
+	<target name="install">
 		<copy flatten="yes" todir="${proto.vpanels}">
-			<fileset refid="extlibs" />
+			<fileset dir="." includes="**/*.jar" />
 		</copy>
 	</target>
 </project>
Binary file usr/src/java/lib/swingx-0.9.3-src.zip has changed
Binary file usr/src/java/lib/swingx-0.9.3.jar has changed