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 2014/10/11 03:45:58 UTC

[1/5] git commit: [flex-utilities] [refs/heads/develop] - fix ui path and update version

Repository: flex-utilities
Updated Branches:
  refs/heads/develop ffccc7ece -> 8de9b1a34


fix ui path and update version


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

Branch: refs/heads/develop
Commit: cb9548453dcc03d725186eb3a617c1c3a4abb107
Parents: ffccc7e
Author: Justin Mclean <jm...@apache.org>
Authored: Sat Oct 11 12:43:27 2014 +1100
Committer: Justin Mclean <jm...@apache.org>
Committed: Sat Oct 11 12:43:27 2014 +1100

----------------------------------------------------------------------
 Squiggly/build.xml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/cb954845/Squiggly/build.xml
----------------------------------------------------------------------
diff --git a/Squiggly/build.xml b/Squiggly/build.xml
index 7c68f2f..a6359b7 100644
--- a/Squiggly/build.xml
+++ b/Squiggly/build.xml
@@ -28,7 +28,7 @@
         <isset property="env.FLEX_HOME" />
     </condition>
         	
-    <property name="version" value="1.0" />
+    <property name="version" value="1.1" />
 	
     <path id="flexTasks.path">
         <fileset dir="${FLEX_HOME}">
@@ -68,10 +68,10 @@
 		    <doc-classes class="com.adobe.linguistics.spelling.framework.ResourceTable"/>
 		    <doc-classes class="com.adobe.linguistics.spelling.framework.SpellingConfiguration"/>		    
 		    <doc-classes class="com.adobe.linguistics.spelling.framework.SpellingService"/>		    
-		    <doc-classes class="com.adobe.linguistics.spelling.ui.IHighlighter"/>
-		    <doc-classes class="com.adobe.linguistics.spelling.ui.HaloHighlighter"/>
-			<doc-classes class="com.adobe.linguistics.spelling.ui.SparkHighlighter"/>
-			<doc-classes class="com.adobe.linguistics.spelling.ui.TLFHighlighter"/>
+		    <doc-classes class="com.adobe.linguistics.spelling.framework.ui.IHighlighter"/>
+		    <doc-classes class="com.adobe.linguistics.spelling.framework.ui.HaloHighlighter"/>
+			<doc-classes class="com.adobe.linguistics.spelling.framework.ui.SparkHighlighter"/>
+			<doc-classes class="com.adobe.linguistics.spelling.framework.ui.TLFHighlighter"/>
 	    		    
 			<compiler.source-path path-element="main/SpellingUI/src"/>
 			<compiler.source-path path-element="main/SpellingUITLF/src"/>
@@ -80,7 +80,7 @@
 			<compiler.source-path path-element="main/SpellingFramework/src"/>
 			
 			<package name="com.adobe.linguistics.spelling" description="This package providing spell checking functionality to your action script applications. This includes the core spell checking engine and the optional SpellUI class for easy integration with your existing Flex projects." />
-			<package name="com.adobe.linguistics.spelling.ui" description="This package provides text highlighting related functionalities." />
+			<package name="com.adobe.linguistics.spelling.framework.ui" description="This package provides text highlighting related functionalities." />
 			<package name="com.adobe.linguistics.spelling.framework" description="This package provides spelling service and spelling configuration related functionalities." />
 			<package name="com.adobe.linguistics.utils" description="This package provides text parsing and tokenizing related classes." />
 		</asdoc>
@@ -207,4 +207,4 @@
     	</delete>
     	<delete dir="${basedir}/out"/> 
     </target>
-</project>
\ No newline at end of file
+</project>


[4/5] git commit: [flex-utilities] [refs/heads/develop] - add installer script

Posted by jm...@apache.org.
add installer script


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

Branch: refs/heads/develop
Commit: 711e4544f65562023fc5a4bc83f8f7edcb012435
Parents: cbe8bfa
Author: Justin Mclean <jm...@apache.org>
Authored: Sat Oct 11 12:44:40 2014 +1100
Committer: Justin Mclean <jm...@apache.org>
Committed: Sat Oct 11 12:44:40 2014 +1100

----------------------------------------------------------------------
 Squiggly/installer.xml | 127 ++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 127 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/711e4544/Squiggly/installer.xml
----------------------------------------------------------------------
diff --git a/Squiggly/installer.xml b/Squiggly/installer.xml
new file mode 100644
index 0000000..c936408
--- /dev/null
+++ b/Squiggly/installer.xml
@@ -0,0 +1,127 @@
+<?xml version="1.0"?>
+<!--
+
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+
+-->
+
+<project name="squiggly_install" default="install" basedir=".">
+    
+    <!-- Required for OSX 10.6 / Snow Leopard Performance. -->
+    <!-- Java 7 on Mac requires OSX 10.7.3 or higher and is 64-bit only -->
+    <!-- local.d32 is set/used in build.properties so this needs to be done first. -->
+    <condition property="local.d32" value="-d32">
+        <and>
+            <os family="windows"/>
+            <equals arg1="${sun.arch.data.model}" arg2="64"/>
+            <equals arg1="${os.arch}" arg2="x86_64"/>
+            <equals arg1="${ant.java.version}" arg2="1.6"/>
+        </and>
+    </condition>
+    	
+    <condition property="isMacOrLinux" value="mac">
+    	<or>
+    		<os family="mac" />
+    		<os family="unix" />
+    	</or>
+    </condition>
+    <condition property="isWindows" value="windows">
+        <os family="windows" />
+    </condition>
+        	
+	<property environment="env"/>
+    <condition property="FLEX_HOME" value="${env.FLEX_HOME}">
+        <isset property="env.FLEX_HOME" />
+    </condition>
+
+    <property file="${FLEX_HOME}/local.properties"/>
+    <property file="${FLEX_HOME}/build.properties"/>
+    <property file="${basedir}/${bundle}.properties"/>
+
+	<property name="download.dir" value="${FLEX_HOME}/in"/>
+	<property name="unpack.dir" value="${FLEX_HOME}/squiggly"/>
+	<property name="mirror.url" value="http://flex.apache.org/single-mirror-url.cgi" />
+	
+    <property name="squiggly.url.folder" value="flex/squiggly/1.1" />
+   
+    <target name="file-setup-win" if="isWindows">
+    	<property name="squiggly.url.file" value="apache-flex-squiggly-1.1-bin.zip" />
+    	<property name="squiggly.url.md5" value="34a0d8d445f8f1307cad35e25d1377bd" />
+    </target>
+	
+    <target name="file-setup-unix" if="isMacOrLinux">
+    	<property name="squiggly.url.file" value="apache-flex-squiggly-1.1-bin.tar.gz" />
+    	<property name="squiggly.url.md5" value="ea03691ec15f625c5281e0d01dcc9570" />
+    </target>
+
+    <target name="install" depends="file-setup-win,file-setup-unix,squiggly-download-unpack" description="Adds squiggly to an Apache Flex SDK">
+        <delete dir="${download.dir}" />
+        <echo>Squiggly installed</echo>
+    </target>
+    
+    <target name="squiggly-download-unpack" description="Downloads squiggly and copies into the Apache Flex SDK">
+        <mkdir dir="${download.dir}"/>
+    	
+    	<get src="${mirror.url}" dest="${download.dir}/mirror.txt" />
+    	<replace file="${download.dir}/mirror.txt" token="&lt;p&gt;" />
+    	<replace file="${download.dir}/mirror.txt" token="&lt;/p&gt;" />
+    	<loadfile property="squiggly.url.server" srcFile="${download.dir}/mirror.txt" />
+    	
+    	<echo>Downloading ${squiggly.url.server}/${squiggly.url.folder}/${squiggly.url.file}</echo>
+        
+    	<antcall target="download-check-md5">
+            <param name="domain" value="${squiggly.url.server}" />
+            <param name="folder" value="${squiggly.url.folder}" />
+            <param name="file" value="${squiggly.url.file}" />
+            <param name="dest" value="${download.dir}/${squiggly.url.file}"/>
+			<param name="failmessage" value="Squiggly download failed" />
+			<param name="md5" value="${squiggly.url.md5}" />
+        </antcall>
+    	
+    	<mkdir dir="${unpack.dir}"/>
+    	<antcall target="files-unzip" />
+    	<antcall target="files-untar" />
+    </target>
+			
+    <target name="files-unzip" if="isWindows">
+    	<unzip dest="${unpack.dir}">
+    		<fileset file="${download.dir}/${squiggly.url.file}" />
+    	</unzip>
+    </target>
+	
+    <target name="files-untar" if="isMacOrLinux">
+    	<untar dest="${unpack.dir}" compression="gzip">
+    		<fileset file="${download.dir}/${squiggly.url.file}" />
+    	</untar>
+    </target>
+
+    <target name="download-check-md5" description="Downloads file, and verifies checksum.">     
+    	<tstamp />
+    	<property name="ts" value="${DSTAMP}${TSTAMP}" />
+        <get src="${domain}/${folder}/${file}?ts=${ts}" dest="${dest}" verbose="true" />
+        <antcall target="check-md5" />
+    </target>
+
+    <target name="check-md5" description="Verifies MD5 checksum, and fails if checksum doesn't match">
+        <echo>Checking ${dest} matches ${md5}</echo>
+        <checksum file="${dest}" algorithm="MD5" verifyproperty="md5.failed" property="${md5}" />
+        <fail message="${failmessage}">
+            <condition>
+                <equals arg1="${md5.failed}" arg2="false" />
+            </condition>
+        </fail>
+    </target>
+</project>


[5/5] git commit: [flex-utilities] [refs/heads/develop] - fix ui path

Posted by jm...@apache.org.
fix ui path


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

Branch: refs/heads/develop
Commit: 8de9b1a34fd8cb525c96cf7a42d01af95404871a
Parents: 711e454
Author: Justin Mclean <jm...@apache.org>
Authored: Sat Oct 11 12:45:31 2014 +1100
Committer: Justin Mclean <jm...@apache.org>
Committed: Sat Oct 11 12:45:31 2014 +1100

----------------------------------------------------------------------
 .../src/com/adobe/linguistics/spelling/SpellUIForTLF.as      | 8 ++++----
 .../src/com/adobe/linguistics/spelling/ui/TLFHighlighter.as  | 2 +-
 .../com/adobe/linguistics/spelling/ui/TLFWordProcessor.as    | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/8de9b1a3/Squiggly/ane/Squiggly/AdobeSpellingUITLF/src/com/adobe/linguistics/spelling/SpellUIForTLF.as
----------------------------------------------------------------------
diff --git a/Squiggly/ane/Squiggly/AdobeSpellingUITLF/src/com/adobe/linguistics/spelling/SpellUIForTLF.as b/Squiggly/ane/Squiggly/AdobeSpellingUITLF/src/com/adobe/linguistics/spelling/SpellUIForTLF.as
index 96c496b..157dc48 100644
--- a/Squiggly/ane/Squiggly/AdobeSpellingUITLF/src/com/adobe/linguistics/spelling/SpellUIForTLF.as
+++ b/Squiggly/ane/Squiggly/AdobeSpellingUITLF/src/com/adobe/linguistics/spelling/SpellUIForTLF.as
@@ -23,10 +23,10 @@ package com.adobe.linguistics.spelling
 	import com.adobe.linguistics.spelling.framework.ResourceTable;
 	import com.adobe.linguistics.spelling.framework.SpellingConfiguration;
 	import com.adobe.linguistics.spelling.framework.SpellingService;
-	import com.adobe.linguistics.spelling.ui.IHighlighter;
-	import com.adobe.linguistics.spelling.ui.IWordProcessor;
-	import com.adobe.linguistics.spelling.ui.TLFHighlighter;
-	import com.adobe.linguistics.spelling.ui.TLFWordProcessor;
+	import com.adobe.linguistics.spelling.ui.framework.IHighlighter;
+	import com.adobe.linguistics.spelling.ui.framework.IWordProcessor;
+	import com.adobe.linguistics.spelling.ui.framework.TLFHighlighter;
+	import com.adobe.linguistics.spelling.ui.framework.TLFWordProcessor;
 	import com.adobe.linguistics.utils.TextFilter;
 	import com.adobe.linguistics.utils.TextTokenizer;
 	import com.adobe.linguistics.utils.Token;

http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/8de9b1a3/Squiggly/ane/Squiggly/AdobeSpellingUITLF/src/com/adobe/linguistics/spelling/ui/TLFHighlighter.as
----------------------------------------------------------------------
diff --git a/Squiggly/ane/Squiggly/AdobeSpellingUITLF/src/com/adobe/linguistics/spelling/ui/TLFHighlighter.as b/Squiggly/ane/Squiggly/AdobeSpellingUITLF/src/com/adobe/linguistics/spelling/ui/TLFHighlighter.as
index 3c8c7e9..69da9fe 100644
--- a/Squiggly/ane/Squiggly/AdobeSpellingUITLF/src/com/adobe/linguistics/spelling/ui/TLFHighlighter.as
+++ b/Squiggly/ane/Squiggly/AdobeSpellingUITLF/src/com/adobe/linguistics/spelling/ui/TLFHighlighter.as
@@ -35,7 +35,7 @@ package com.adobe.linguistics.spelling.ui
 	import flashx.textLayout.edit.SelectionManager;
 	import flashx.textLayout.elements.TextFlow;
 	import flashx.textLayout.tlf_internal;
-	import com.adobe.linguistics.spelling.ui.IHighlighter;
+	import com.adobe.linguistics.spelling.framework.ui.IHighlighter;
 
 
 	use namespace tlf_internal;	

http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/8de9b1a3/Squiggly/ane/Squiggly/AdobeSpellingUITLF/src/com/adobe/linguistics/spelling/ui/TLFWordProcessor.as
----------------------------------------------------------------------
diff --git a/Squiggly/ane/Squiggly/AdobeSpellingUITLF/src/com/adobe/linguistics/spelling/ui/TLFWordProcessor.as b/Squiggly/ane/Squiggly/AdobeSpellingUITLF/src/com/adobe/linguistics/spelling/ui/TLFWordProcessor.as
index 8cb3197..dfe8791 100644
--- a/Squiggly/ane/Squiggly/AdobeSpellingUITLF/src/com/adobe/linguistics/spelling/ui/TLFWordProcessor.as
+++ b/Squiggly/ane/Squiggly/AdobeSpellingUITLF/src/com/adobe/linguistics/spelling/ui/TLFWordProcessor.as
@@ -36,7 +36,7 @@ package com.adobe.linguistics.spelling.ui
 	import flashx.textLayout.container.ContainerController;
 	import flashx.textLayout.elements.FlowLeafElement;
 	import flashx.textLayout.elements.ParagraphElement;
-	import com.adobe.linguistics.spelling.ui.IWordProcessor;
+	import com.adobe.linguistics.spelling.framework.ui.IWordProcessor;
 	
 	use namespace tlf_internal;	
 	


[3/5] git commit: [flex-utilities] [refs/heads/develop] - updated release notes

Posted by jm...@apache.org.
updated release notes


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

Branch: refs/heads/develop
Commit: cbe8bfadaa5d3a07c130d183e0a6da40f9cfeb4a
Parents: 381e573
Author: Justin Mclean <jm...@apache.org>
Authored: Sat Oct 11 12:44:08 2014 +1100
Committer: Justin Mclean <jm...@apache.org>
Committed: Sat Oct 11 12:44:08 2014 +1100

----------------------------------------------------------------------
 Squiggly/RELEASE_NOTES | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/cbe8bfad/Squiggly/RELEASE_NOTES
----------------------------------------------------------------------
diff --git a/Squiggly/RELEASE_NOTES b/Squiggly/RELEASE_NOTES
index ca5315a..b3c7912 100644
--- a/Squiggly/RELEASE_NOTES
+++ b/Squiggly/RELEASE_NOTES
@@ -4,10 +4,9 @@ Apche Flex Squiggly 1.1
 
 Squiggly 1.1 has the following changes from Squiggly 1.0:
 - Mavenized version of Squiggly
+- Added installer ant file
 - Added en_US and en_GB dictionaries
-
-The following bugs have been fixed:
-
+- Nows work with halo and saprk components
 
 ------------------------------------------------
 Apche Flex Squiggly 1.0


[2/5] git commit: [flex-utilities] [refs/heads/develop] - update version

Posted by jm...@apache.org.
update version


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

Branch: refs/heads/develop
Commit: 381e57389c89352563e9aea6fe1e8a2b1796cf22
Parents: cb95484
Author: Justin Mclean <jm...@apache.org>
Authored: Sat Oct 11 12:43:45 2014 +1100
Committer: Justin Mclean <jm...@apache.org>
Committed: Sat Oct 11 12:43:45 2014 +1100

----------------------------------------------------------------------
 Squiggly/README | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/381e5738/Squiggly/README
----------------------------------------------------------------------
diff --git a/Squiggly/README b/Squiggly/README
index 6b69397..b2fa7b4 100644
--- a/Squiggly/README
+++ b/Squiggly/README
@@ -15,9 +15,9 @@ How to build Squiggly using ant (no IDE is required)
 ==========================================================================================
 
 1.  On Linux or Mac un tar/gzip the source distribution:
-	    tar -zxvf apache-flex-squiggly-1.0.tar.gz
+	    tar -zxvf apache-flex-squiggly-1.1.tar.gz
 	Or if on windows unzip 
-		apache-flex-squiggly-1.0.zip
+		apache-flex-squiggly-1.1.zip
 
 2.  In the base directory, run:
         ant compile
@@ -86,7 +86,7 @@ If you are using the simple UI integration feature (SpellUI class), in addition
 to what mentioned above, you also need:
 - SpellingConfig.xml in [YourProject]/src
 - SpellingUI.swc in [YourProject]/src
-- SpellingUIEx.swc if you need spark support in Flex 4) in [YourProject]/libs 
+- SpellingUIEx.swc (if you need spark support in Flex 4) in [YourProject]/libs 
 
 You can download dictionaries and use those by editing SpellingConfig.xml.