You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flex.apache.org by jm...@apache.org on 2017/03/15 04:06:31 UTC

[43/50] [abbrv] git commit: [flex-sdk] [refs/heads/master] - Fix 3rd party download issues

Fix 3rd party download issues


Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/c8c63274
Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/c8c63274
Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/c8c63274

Branch: refs/heads/master
Commit: c8c63274d6c39669797c7bcc945ab7d30973d91b
Parents: 7418641
Author: Justin Mclean <jm...@apache.org>
Authored: Sat Feb 11 12:18:18 2017 +1100
Committer: Justin Mclean <jm...@apache.org>
Committed: Sat Feb 11 12:18:18 2017 +1100

----------------------------------------------------------------------
 README                |  7 +++++++
 modules/downloads.xml | 22 +++++++---------------
 2 files changed, 14 insertions(+), 15 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/c8c63274/README
----------------------------------------------------------------------
diff --git a/README b/README
index 5fef11d..0bd9999 100644
--- a/README
+++ b/README
@@ -120,6 +120,9 @@ Optional: Adobe Extension Manager CS5 (* 7)   ADOBE_EXTENSION_MANAGER
 
 Optional: Flex Messaging Common (* 8)         BLAZEDS_HOME
 
+Java Cryptography Extensions
+    (see note (*9))
+
 ---------------------------------------------------------------------
 
 * 1)
@@ -234,6 +237,10 @@ to point to your BLAZEDS root folder. If you are using a released artifact, the
 source should be included in the artifact, so setting BLAZEDS_HOME is not
 required.
 
+* 9)
+The Java Cryptography Extensions (JCE) Unlimited Strength jars are needed in
+order to download 3rd party software. Download and install this from Oracle
+which version you need will depend on your Java version and OS.
 
 Get the source code
 -------------------

http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/c8c63274/modules/downloads.xml
----------------------------------------------------------------------
diff --git a/modules/downloads.xml b/modules/downloads.xml
index 14d2731..a233100 100644
--- a/modules/downloads.xml
+++ b/modules/downloads.xml
@@ -78,9 +78,8 @@
     <property name="commons-discovery.name" value="commons-discovery-0.2"/>	
     <property name="commons-logging.name" value="commons-logging-1.0.4"/>
 	
-    <property name="saxon9.bin.zip" value="saxonb9-1-0-8j.zip"/>
-    <property name="saxon9.jar.dir" value="saxonb9-1-0-8j"/>
-    <property name="saxon9.download.url" value="http://downloads.sourceforge.net/project/saxon/Saxon-B/9.1.0.8/saxonb9-1-0-8j.zip?r=&amp;ts=1482018310&amp;use_mirror=internode"/>
+    <property name="saxon9.jar" value="saxonb9-1-0-8.jar"/>
+    <property name="saxon9.download.url" value="http://repo1.maven.org/maven2/net/sourceforge/saxon/saxon/9.1.0.8/saxon-9.1.0.8.jar"/>
     
     <property name="xerces.dir" value="xerces-2_9_1"/>
      
@@ -450,28 +449,21 @@
         description="Copies sax9.jar to the lib directory.">
 
         <get src="${saxon9.download.url}" 
-            dest="${download.dir}/${saxon9.bin.zip}" 
+            dest="${download.dir}/${saxon9.jar}" 
             verbose="false" ignoreerrors="true"/>
 
         <antcall target="get-from-cache-if-needed" >
-            <param name="filename" value="${saxon9.bin.zip}" />
+            <param name="filename" value="${saxon9.jar}" />
             <param name="destDir" value="${download.dir}" />
         </antcall>
         <antcall target="fail-if-not-found" >
-            <param name="filename" value="${saxon9.bin.zip}" />
+            <param name="filename" value="${saxon9.jar}" />
             <param name="destDir" value="${download.dir}" />
         </antcall>
 
-    	<unzip src="${download.dir}/${saxon9.bin.zip}"
-    		dest="${download.dir}/${saxon9.jar.dir}"/>
+        <copy file="${download.dir}/${saxon9.jar}" toDir="${lib.ext.dir}" verbose="true"/>
         
-        <copy file="${download.dir}/${saxon9.jar.dir}/saxon9.jar" toDir="${lib.ext.dir}" verbose="true"/>
-        
-        <copy todir="${lib.ext.dir}/saxon9-NOTICES">
-            <fileset dir="${download.dir}/${saxon9.jar.dir}/notices" includes="**"/>
-        </copy>
-        
-        <delete dir="${download.dir}/${saxon9.jar.dir}"/>
+        <delete dir="${download.dir}/${saxon9.jar}"/>
     </target>
     	
     <!--