You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flex.apache.org by qu...@apache.org on 2015/06/01 00:18:43 UTC
[01/50] [abbrv] git commit: [flex-utilities]
[refs/heads/as3httpclient-work] - add comment so folks don't remove
force-linking trick
Repository: flex-utilities
Updated Branches:
refs/heads/as3httpclient-work df3dcd66e -> e15c4a844
add comment so folks don't remove force-linking trick
Project: http://git-wip-us.apache.org/repos/asf/flex-utilities/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-utilities/commit/66e127eb
Tree: http://git-wip-us.apache.org/repos/asf/flex-utilities/tree/66e127eb
Diff: http://git-wip-us.apache.org/repos/asf/flex-utilities/diff/66e127eb
Branch: refs/heads/as3httpclient-work
Commit: 66e127ebf41988782ccc570ec4be7a54063d2dba
Parents: 29e04b0
Author: Alex Harui <ah...@apache.org>
Authored: Thu Apr 9 16:24:00 2015 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Thu Apr 9 16:24:00 2015 -0700
----------------------------------------------------------------------
installer/src/InstallApacheFlex.mxml | 4 ++++
1 file changed, 4 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/66e127eb/installer/src/InstallApacheFlex.mxml
----------------------------------------------------------------------
diff --git a/installer/src/InstallApacheFlex.mxml b/installer/src/InstallApacheFlex.mxml
index 341f060..0fd98ac 100644
--- a/installer/src/InstallApacheFlex.mxml
+++ b/installer/src/InstallApacheFlex.mxml
@@ -114,6 +114,10 @@ variables are not required because the locations of these pieces are known.
import mx.rpc.http.HTTPService;
import mx.utils.StringUtil;
+ // This force-links all of the ant task handlers into the Installer.
+ // The Installer doesn't use most of them directly but some script
+ // it runs might.
+ import AntClasses; AntClasses;
import org.apache.flex.ant.Ant;
import org.apache.flex.packageflexsdk.model.InstallerComponentVO;
import org.apache.flex.packageflexsdk.model.OS;
[10/50] [abbrv] git commit: [flex-utilities]
[refs/heads/as3httpclient-work] - FLEX-34756 The unit test revealed a bug in
the solution: isTextFieldReadyForSpellingJob() should return true only if the
textFlow is not damaged (it used to do the opposite).
Posted by qu...@apache.org.
FLEX-34756 The unit test revealed a bug in the solution: isTextFieldReadyForSpellingJob() should return true only if the textFlow is not damaged (it used to do the opposite).
Project: http://git-wip-us.apache.org/repos/asf/flex-utilities/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-utilities/commit/8363ebf3
Tree: http://git-wip-us.apache.org/repos/asf/flex-utilities/tree/8363ebf3
Diff: http://git-wip-us.apache.org/repos/asf/flex-utilities/diff/8363ebf3
Branch: refs/heads/as3httpclient-work
Commit: 8363ebf3be1d105dc168f2e75bb6aefe32da6430
Parents: daf48a0
Author: Mihai Chira <mi...@apache.org>
Authored: Fri Apr 10 14:25:47 2015 +0200
Committer: Mihai Chira <mi...@apache.org>
Committed: Fri Apr 10 14:25:47 2015 +0200
----------------------------------------------------------------------
.../SpellingUIEx/src/com/adobe/linguistics/spelling/SpellUI.as | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/8363ebf3/Squiggly/main/SpellingUIEx/src/com/adobe/linguistics/spelling/SpellUI.as
----------------------------------------------------------------------
diff --git a/Squiggly/main/SpellingUIEx/src/com/adobe/linguistics/spelling/SpellUI.as b/Squiggly/main/SpellingUIEx/src/com/adobe/linguistics/spelling/SpellUI.as
index 9b55ff6..0033320 100644
--- a/Squiggly/main/SpellingUIEx/src/com/adobe/linguistics/spelling/SpellUI.as
+++ b/Squiggly/main/SpellingUIEx/src/com/adobe/linguistics/spelling/SpellUI.as
@@ -352,7 +352,7 @@ package com.adobe.linguistics.spelling
if(!textFlow || !textFlow.flowComposer)
return true;
- return textFlow.flowComposer.isDamaged(textFlow.textLength);
+ return !textFlow.flowComposer.isDamaged(textFlow.textLength);
}
private function spellCheckRange(start:uint, end:uint):void {
[36/50] [abbrv] git commit: [flex-utilities]
[refs/heads/as3httpclient-work] - - Added a locale chain example
Posted by qu...@apache.org.
- Added a locale chain example
Project: http://git-wip-us.apache.org/repos/asf/flex-utilities/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-utilities/commit/f8945125
Tree: http://git-wip-us.apache.org/repos/asf/flex-utilities/tree/f8945125
Diff: http://git-wip-us.apache.org/repos/asf/flex-utilities/diff/f8945125
Branch: refs/heads/as3httpclient-work
Commit: f894512567f719a3bfb259deb181bb8eaff4bd85
Parents: b43e167
Author: Christofer Dutz <ch...@codecentric.de>
Authored: Sat Apr 25 16:05:46 2015 +0200
Committer: Christofer Dutz <ch...@codecentric.de>
Committed: Sat Apr 25 16:05:46 2015 +0200
----------------------------------------------------------------------
.../examples/i18n/locale-chains/pom.xml | 40 ++++++
.../examples/i18n/locale-chains/swf/pom.xml | 79 ++++++++++++
.../locale-chains/swf/src/main/flex/Main.mxml | 63 ++++++++++
.../main/locales/de_AT/myresources.properties | 19 +++
.../main/locales/de_DE/myresources.properties | 20 +++
.../main/locales/en_GB/myresources.properties | 19 +++
.../main/locales/en_US/myresources.properties | 21 ++++
.../examples/i18n/locale-chains/war/pom.xml | 124 +++++++++++++++++++
.../war/src/main/webapp/WEB-INF/web.xml | 31 +++++
maven-flex-plugin/examples/i18n/pom.xml | 1 +
10 files changed, 417 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/f8945125/maven-flex-plugin/examples/i18n/locale-chains/pom.xml
----------------------------------------------------------------------
diff --git a/maven-flex-plugin/examples/i18n/locale-chains/pom.xml b/maven-flex-plugin/examples/i18n/locale-chains/pom.xml
new file mode 100644
index 0000000..bff39bc
--- /dev/null
+++ b/maven-flex-plugin/examples/i18n/locale-chains/pom.xml
@@ -0,0 +1,40 @@
+<?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 xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.flex.examples.i18n</groupId>
+ <artifactId>i18n</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>locale-chains</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ <packaging>pom</packaging>
+
+ <modules>
+ <module>swf</module>
+ <module>war</module>
+ </modules>
+
+</project>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/f8945125/maven-flex-plugin/examples/i18n/locale-chains/swf/pom.xml
----------------------------------------------------------------------
diff --git a/maven-flex-plugin/examples/i18n/locale-chains/swf/pom.xml b/maven-flex-plugin/examples/i18n/locale-chains/swf/pom.xml
new file mode 100644
index 0000000..e8630d6
--- /dev/null
+++ b/maven-flex-plugin/examples/i18n/locale-chains/swf/pom.xml
@@ -0,0 +1,79 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+ 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 xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.flex.examples.i18n</groupId>
+ <artifactId>locale-chains</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>locale-chains-swf</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ <packaging>swf</packaging>
+
+ <build>
+ <sourceDirectory>src/main/flex</sourceDirectory>
+ <plugins>
+ <plugin>
+ <groupId>net.flexmojos.oss</groupId>
+ <artifactId>flexmojos-maven-plugin</artifactId>
+ <version>7.1.0-SNAPSHOT</version>
+ <extensions>true</extensions>
+ <configuration>
+ <debug>true</debug>
+ <localesCompiled>
+ <locale>en_US</locale>
+ <locale>en_GB,en_US</locale>
+ <locale>de_DE,en_US</locale>
+ <locale>de_AT,de_DE,en_US</locale>
+ </localesCompiled>
+ </configuration>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.flex</groupId>
+ <artifactId>compiler</artifactId>
+ <version>4.14.1</version>
+ <type>pom</type>
+ </dependency>
+ </dependencies>
+ </plugin>
+ </plugins>
+ </build>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.flex</groupId>
+ <artifactId>framework</artifactId>
+ <version>4.14.1</version>
+ <type>pom</type>
+ </dependency>
+ <dependency>
+ <groupId>com.adobe.flash.framework</groupId>
+ <artifactId>playerglobal</artifactId>
+ <version>14.0</version>
+ <type>swc</type>
+ </dependency>
+ </dependencies>
+
+</project>
http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/f8945125/maven-flex-plugin/examples/i18n/locale-chains/swf/src/main/flex/Main.mxml
----------------------------------------------------------------------
diff --git a/maven-flex-plugin/examples/i18n/locale-chains/swf/src/main/flex/Main.mxml b/maven-flex-plugin/examples/i18n/locale-chains/swf/src/main/flex/Main.mxml
new file mode 100644
index 0000000..3f2cdad
--- /dev/null
+++ b/maven-flex-plugin/examples/i18n/locale-chains/swf/src/main/flex/Main.mxml
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+
+ 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.
+
+-->
+<s:Application xmlns:fx="http://ns.adobe.com/mxml/2009"
+ xmlns:s="library://ns.adobe.com/flex/spark">
+
+ <fx:Metadata>
+ [ResourceBundle("myresources")]
+ </fx:Metadata>
+
+ <fx:Script>
+ <![CDATA[
+ import mx.collections.ArrayCollection;
+
+ import spark.events.IndexChangeEvent;
+
+ [Bindable]
+ private var locales:ArrayCollection = new ArrayCollection([
+ {label:"US English", locale:"en_US"},
+ {label:"British English", locale:"en_GB,en_US"},
+ {label:"German", locale:"de_DE,en_US"},
+ {label:"Austrian German", locale:"de_AT,de_DE,en_US"}
+ ]);
+
+ private function onLanguageChange(event:IndexChangeEvent):void {
+ resourceManager.localeChain = getLocaleChain(localeSelector.selectedItem.locale);
+ }
+
+ private function getLocaleChain(str:String):Array {
+ var result:Array = [];
+ for each(var locale:String in str.split(",")) {
+ result.push(locale);
+ }
+ return result;
+ }
+
+ ]]>
+ </fx:Script>
+
+ <s:VGroup>
+ <s:ComboBox id="localeSelector" dataProvider="{locales}" change="onLanguageChange(event)"/>
+ <s:Label text="{resourceManager.getString('myresources','hotDrink')}"/>
+ <s:Label text="{resourceManager.getString('myresources','coldDrink')}"/>
+ <s:Label text="{resourceManager.getString('myresources','strangeDrink')}"/>
+ </s:VGroup>
+
+</s:Application>
http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/f8945125/maven-flex-plugin/examples/i18n/locale-chains/swf/src/main/locales/de_AT/myresources.properties
----------------------------------------------------------------------
diff --git a/maven-flex-plugin/examples/i18n/locale-chains/swf/src/main/locales/de_AT/myresources.properties b/maven-flex-plugin/examples/i18n/locale-chains/swf/src/main/locales/de_AT/myresources.properties
new file mode 100644
index 0000000..c48d822
--- /dev/null
+++ b/maven-flex-plugin/examples/i18n/locale-chains/swf/src/main/locales/de_AT/myresources.properties
@@ -0,0 +1,19 @@
+################################################################################
+##
+## 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.
+##
+################################################################################
+hotDrink=Haferl Kaffee
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/f8945125/maven-flex-plugin/examples/i18n/locale-chains/swf/src/main/locales/de_DE/myresources.properties
----------------------------------------------------------------------
diff --git a/maven-flex-plugin/examples/i18n/locale-chains/swf/src/main/locales/de_DE/myresources.properties b/maven-flex-plugin/examples/i18n/locale-chains/swf/src/main/locales/de_DE/myresources.properties
new file mode 100644
index 0000000..ca4e20e
--- /dev/null
+++ b/maven-flex-plugin/examples/i18n/locale-chains/swf/src/main/locales/de_DE/myresources.properties
@@ -0,0 +1,20 @@
+################################################################################
+##
+## 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.
+##
+################################################################################
+hotDrink=Tasse Kaffee
+coldDrink=Bier
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/f8945125/maven-flex-plugin/examples/i18n/locale-chains/swf/src/main/locales/en_GB/myresources.properties
----------------------------------------------------------------------
diff --git a/maven-flex-plugin/examples/i18n/locale-chains/swf/src/main/locales/en_GB/myresources.properties b/maven-flex-plugin/examples/i18n/locale-chains/swf/src/main/locales/en_GB/myresources.properties
new file mode 100644
index 0000000..b020332
--- /dev/null
+++ b/maven-flex-plugin/examples/i18n/locale-chains/swf/src/main/locales/en_GB/myresources.properties
@@ -0,0 +1,19 @@
+################################################################################
+##
+## 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.
+##
+################################################################################
+hotDrink=Cup of tee
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/f8945125/maven-flex-plugin/examples/i18n/locale-chains/swf/src/main/locales/en_US/myresources.properties
----------------------------------------------------------------------
diff --git a/maven-flex-plugin/examples/i18n/locale-chains/swf/src/main/locales/en_US/myresources.properties b/maven-flex-plugin/examples/i18n/locale-chains/swf/src/main/locales/en_US/myresources.properties
new file mode 100644
index 0000000..6959d2c
--- /dev/null
+++ b/maven-flex-plugin/examples/i18n/locale-chains/swf/src/main/locales/en_US/myresources.properties
@@ -0,0 +1,21 @@
+################################################################################
+##
+## 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.
+##
+################################################################################
+hotDrink=Cup of coffee
+coldDrink=Beer
+strangeDrink=Red Bull
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/f8945125/maven-flex-plugin/examples/i18n/locale-chains/war/pom.xml
----------------------------------------------------------------------
diff --git a/maven-flex-plugin/examples/i18n/locale-chains/war/pom.xml b/maven-flex-plugin/examples/i18n/locale-chains/war/pom.xml
new file mode 100644
index 0000000..e837c60
--- /dev/null
+++ b/maven-flex-plugin/examples/i18n/locale-chains/war/pom.xml
@@ -0,0 +1,124 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+ 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 xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.flex.examples.i18n</groupId>
+ <artifactId>locale-chains</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>locale-chains-war</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ <packaging>war</packaging>
+
+ <!--
+ Properties used in the wrapper template, used by maven-war-plugin to
+ perform the filtering.
+ -->
+ <properties>
+ <swf>locale-chains-swf-1.0.0-SNAPSHOT</swf>
+ <width>100%</width>
+ <height>100%</height>
+ <title>My First Application</title>
+ <useBrowserHistory>true</useBrowserHistory>
+ <bgcolor>white</bgcolor>
+ <version_major>10</version_major>
+ <version_minor>2</version_minor>
+ <version_revision>0</version_revision>
+ <expressInstallSwf>expressInstall.swf</expressInstallSwf>
+ <application>application</application>
+ </properties>
+
+ <build>
+ <plugins>
+ <!--
+ Copy all the flex related resources (SWFs, RSLs, ...)
+ -->
+ <plugin>
+ <groupId>net.flexmojos.oss</groupId>
+ <artifactId>flexmojos-maven-plugin</artifactId>
+ <version>7.1.0-SNAPSHOT</version>
+ <executions>
+ <execution>
+ <goals>
+ <goal>copy-flex-resources</goal>
+ </goals>
+ </execution>
+ </executions>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.flex</groupId>
+ <artifactId>compiler</artifactId>
+ <version>4.14.1</version>
+ <type>pom</type>
+ </dependency>
+ </dependencies>
+ </plugin>
+ <!--
+ Builds the war and copies the flex default wrapper template.
+ -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-war-plugin</artifactId>
+ <version>2.4</version>
+ <configuration>
+ <overlays>
+ <overlay>
+ <groupId>org.apache.flex.wrapper</groupId>
+ <artifactId>swfobject</artifactId>
+ <type>war</type>
+ <filtered>true</filtered>
+ </overlay>
+ </overlays>
+ </configuration>
+ </plugin>
+ <!--
+ Make the war project "runnable" by running mvn jetty:run
+ -->
+ <plugin>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>maven-jetty-plugin</artifactId>
+ <version>6.1.17</version>
+ </plugin>
+ </plugins>
+ </build>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.flex.examples.i18n</groupId>
+ <artifactId>locale-chains-swf</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ <type>swf</type>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.flex.wrapper</groupId>
+ <artifactId>swfobject</artifactId>
+ <version>4.14.1</version>
+ <type>war</type>
+ <scope>runtime</scope>
+ </dependency>
+ </dependencies>
+
+</project>
http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/f8945125/maven-flex-plugin/examples/i18n/locale-chains/war/src/main/webapp/WEB-INF/web.xml
----------------------------------------------------------------------
diff --git a/maven-flex-plugin/examples/i18n/locale-chains/war/src/main/webapp/WEB-INF/web.xml b/maven-flex-plugin/examples/i18n/locale-chains/war/src/main/webapp/WEB-INF/web.xml
new file mode 100644
index 0000000..8dd835a
--- /dev/null
+++ b/maven-flex-plugin/examples/i18n/locale-chains/war/src/main/webapp/WEB-INF/web.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+ 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.
+
+-->
+<web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns="http://java.sun.com/xml/ns/javaee"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"
+ id="WebApp_ID" version="2.5">
+
+ <display-name>war war</display-name>
+
+ <welcome-file-list>
+ <welcome-file>index.html</welcome-file>
+ </welcome-file-list>
+
+</web-app>
http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/f8945125/maven-flex-plugin/examples/i18n/pom.xml
----------------------------------------------------------------------
diff --git a/maven-flex-plugin/examples/i18n/pom.xml b/maven-flex-plugin/examples/i18n/pom.xml
index ac118df..26c6cc0 100644
--- a/maven-flex-plugin/examples/i18n/pom.xml
+++ b/maven-flex-plugin/examples/i18n/pom.xml
@@ -36,6 +36,7 @@
<modules>
<module>compiled-locales</module>
<module>runtime-locales</module>
+ <module>locale-chains</module>
</modules>
</project>
\ No newline at end of file
[34/50] [abbrv] git commit: [flex-utilities]
[refs/heads/as3httpclient-work] - - Add language selectors to the i18n
examples - Fixed some problems with the runtime loaded locales
Posted by qu...@apache.org.
- Add language selectors to the i18n examples
- Fixed some problems with the runtime loaded locales
Project: http://git-wip-us.apache.org/repos/asf/flex-utilities/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-utilities/commit/957c1e19
Tree: http://git-wip-us.apache.org/repos/asf/flex-utilities/tree/957c1e19
Diff: http://git-wip-us.apache.org/repos/asf/flex-utilities/diff/957c1e19
Branch: refs/heads/as3httpclient-work
Commit: 957c1e1977d70fbddff450cf50b1107290f558ce
Parents: 2b7f3e9
Author: Christofer Dutz <ch...@codecentric.de>
Authored: Sat Apr 25 14:36:07 2015 +0200
Committer: Christofer Dutz <ch...@codecentric.de>
Committed: Sat Apr 25 14:36:07 2015 +0200
----------------------------------------------------------------------
.../examples/i18n/compiled-locales/pom.xml | 2 +-
.../examples/i18n/compiled-locales/swf/pom.xml | 5 +-
.../swf/src/main/flex/Main.mxml | 25 +++++++--
.../examples/i18n/compiled-locales/war/pom.xml | 8 +--
.../examples/i18n/runtime-locales/pom.xml | 2 +-
.../examples/i18n/runtime-locales/swf/pom.xml | 5 +-
.../runtime-locales/swf/src/main/flex/Main.mxml | 54 +++++++++++++++++++-
.../examples/i18n/runtime-locales/war/pom.xml | 8 +--
8 files changed, 90 insertions(+), 19 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/957c1e19/maven-flex-plugin/examples/i18n/compiled-locales/pom.xml
----------------------------------------------------------------------
diff --git a/maven-flex-plugin/examples/i18n/compiled-locales/pom.xml b/maven-flex-plugin/examples/i18n/compiled-locales/pom.xml
index 83d1e60..be807ff 100644
--- a/maven-flex-plugin/examples/i18n/compiled-locales/pom.xml
+++ b/maven-flex-plugin/examples/i18n/compiled-locales/pom.xml
@@ -28,7 +28,7 @@
<version>1.0.0-SNAPSHOT</version>
</parent>
- <artifactId>compiled-locals</artifactId>
+ <artifactId>compiled-locales</artifactId>
<version>1.0.0-SNAPSHOT</version>
<packaging>pom</packaging>
http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/957c1e19/maven-flex-plugin/examples/i18n/compiled-locales/swf/pom.xml
----------------------------------------------------------------------
diff --git a/maven-flex-plugin/examples/i18n/compiled-locales/swf/pom.xml b/maven-flex-plugin/examples/i18n/compiled-locales/swf/pom.xml
index a15264c..4c23e35 100644
--- a/maven-flex-plugin/examples/i18n/compiled-locales/swf/pom.xml
+++ b/maven-flex-plugin/examples/i18n/compiled-locales/swf/pom.xml
@@ -24,11 +24,11 @@
<parent>
<groupId>org.apache.flex.examples.i18n</groupId>
- <artifactId>compiled-locals</artifactId>
+ <artifactId>compiled-locales</artifactId>
<version>1.0.0-SNAPSHOT</version>
</parent>
- <artifactId>compiled-locals-swf</artifactId>
+ <artifactId>compiled-locales-swf</artifactId>
<version>1.0.0-SNAPSHOT</version>
<packaging>swf</packaging>
@@ -41,6 +41,7 @@
<version>7.1.0-SNAPSHOT</version>
<extensions>true</extensions>
<configuration>
+ <debug>true</debug>
<localesCompiled>
<locale>en_US</locale>
<locale>de_DE</locale>
http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/957c1e19/maven-flex-plugin/examples/i18n/compiled-locales/swf/src/main/flex/Main.mxml
----------------------------------------------------------------------
diff --git a/maven-flex-plugin/examples/i18n/compiled-locales/swf/src/main/flex/Main.mxml b/maven-flex-plugin/examples/i18n/compiled-locales/swf/src/main/flex/Main.mxml
index ea188bc..a449ab7 100644
--- a/maven-flex-plugin/examples/i18n/compiled-locales/swf/src/main/flex/Main.mxml
+++ b/maven-flex-plugin/examples/i18n/compiled-locales/swf/src/main/flex/Main.mxml
@@ -18,13 +18,32 @@
-->
<s:Application xmlns:fx="http://ns.adobe.com/mxml/2009"
- xmlns:s="library://ns.adobe.com/flex/spark"
- xmlns:mx="library://ns.adobe.com/flex/mx">
+ xmlns:s="library://ns.adobe.com/flex/spark">
<fx:Metadata>
[ResourceBundle("myresources")]
</fx:Metadata>
- <s:Label text="{resourceManager.getString('myresources','greeting')}"/>
+ <fx:Script>
+ <![CDATA[
+ import mx.collections.ArrayCollection;
+
+ import spark.events.IndexChangeEvent;
+
+ [Bindable]
+ private var locales:ArrayCollection = new ArrayCollection([{label:"English", locale:"en_US"},
+ {label:"German", locale:"de_DE"}]);
+
+ private function onLanguageChange(event:IndexChangeEvent):void {
+ resourceManager.localeChain = [localeSelector.selectedItem.locale];
+ }
+
+ ]]>
+ </fx:Script>
+
+ <s:VGroup>
+ <s:ComboBox id="localeSelector" dataProvider="{locales}" change="onLanguageChange(event)"/>
+ <s:Label text="{resourceManager.getString('myresources','greeting')}"/>
+ </s:VGroup>
</s:Application>
http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/957c1e19/maven-flex-plugin/examples/i18n/compiled-locales/war/pom.xml
----------------------------------------------------------------------
diff --git a/maven-flex-plugin/examples/i18n/compiled-locales/war/pom.xml b/maven-flex-plugin/examples/i18n/compiled-locales/war/pom.xml
index e646f0a..b68bd30 100644
--- a/maven-flex-plugin/examples/i18n/compiled-locales/war/pom.xml
+++ b/maven-flex-plugin/examples/i18n/compiled-locales/war/pom.xml
@@ -24,11 +24,11 @@
<parent>
<groupId>org.apache.flex.examples.i18n</groupId>
- <artifactId>compiled-locals</artifactId>
+ <artifactId>compiled-locales</artifactId>
<version>1.0.0-SNAPSHOT</version>
</parent>
- <artifactId>compiled-locals-war</artifactId>
+ <artifactId>compiled-locales-war</artifactId>
<version>1.0.0-SNAPSHOT</version>
<packaging>war</packaging>
@@ -37,7 +37,7 @@
perform the filtering.
-->
<properties>
- <swf>swf-1.0.0-SNAPSHOT</swf>
+ <swf>compiled-locales-swf-1.0.0-SNAPSHOT</swf>
<width>100%</width>
<height>100%</height>
<title>My First Application</title>
@@ -107,7 +107,7 @@
<dependencies>
<dependency>
<groupId>org.apache.flex.examples.i18n</groupId>
- <artifactId>compiled-locals-swf</artifactId>
+ <artifactId>compiled-locales-swf</artifactId>
<version>1.0.0-SNAPSHOT</version>
<type>swf</type>
</dependency>
http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/957c1e19/maven-flex-plugin/examples/i18n/runtime-locales/pom.xml
----------------------------------------------------------------------
diff --git a/maven-flex-plugin/examples/i18n/runtime-locales/pom.xml b/maven-flex-plugin/examples/i18n/runtime-locales/pom.xml
index 635fc80..3a3a8d2 100644
--- a/maven-flex-plugin/examples/i18n/runtime-locales/pom.xml
+++ b/maven-flex-plugin/examples/i18n/runtime-locales/pom.xml
@@ -28,7 +28,7 @@
<version>1.0.0-SNAPSHOT</version>
</parent>
- <artifactId>runtime-locals</artifactId>
+ <artifactId>runtime-locales</artifactId>
<version>1.0.0-SNAPSHOT</version>
<packaging>pom</packaging>
http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/957c1e19/maven-flex-plugin/examples/i18n/runtime-locales/swf/pom.xml
----------------------------------------------------------------------
diff --git a/maven-flex-plugin/examples/i18n/runtime-locales/swf/pom.xml b/maven-flex-plugin/examples/i18n/runtime-locales/swf/pom.xml
index d6f6f7d..54818c6 100644
--- a/maven-flex-plugin/examples/i18n/runtime-locales/swf/pom.xml
+++ b/maven-flex-plugin/examples/i18n/runtime-locales/swf/pom.xml
@@ -24,11 +24,11 @@
<parent>
<groupId>org.apache.flex.examples.i18n</groupId>
- <artifactId>runtime-locals</artifactId>
+ <artifactId>runtime-locales</artifactId>
<version>1.0.0-SNAPSHOT</version>
</parent>
- <artifactId>runtime-locals-swf</artifactId>
+ <artifactId>runtime-locales-swf</artifactId>
<version>1.0.0-SNAPSHOT</version>
<packaging>swf</packaging>
@@ -41,6 +41,7 @@
<version>7.1.0-SNAPSHOT</version>
<extensions>true</extensions>
<configuration>
+ <debug>true</debug>
<localesRuntime>
<locale>en_US</locale>
<locale>de_DE</locale>
http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/957c1e19/maven-flex-plugin/examples/i18n/runtime-locales/swf/src/main/flex/Main.mxml
----------------------------------------------------------------------
diff --git a/maven-flex-plugin/examples/i18n/runtime-locales/swf/src/main/flex/Main.mxml b/maven-flex-plugin/examples/i18n/runtime-locales/swf/src/main/flex/Main.mxml
index ea188bc..db86365 100644
--- a/maven-flex-plugin/examples/i18n/runtime-locales/swf/src/main/flex/Main.mxml
+++ b/maven-flex-plugin/examples/i18n/runtime-locales/swf/src/main/flex/Main.mxml
@@ -19,12 +19,62 @@
-->
<s:Application xmlns:fx="http://ns.adobe.com/mxml/2009"
xmlns:s="library://ns.adobe.com/flex/spark"
- xmlns:mx="library://ns.adobe.com/flex/mx">
+ creationComplete="onCreationComplete(event)">
<fx:Metadata>
[ResourceBundle("myresources")]
</fx:Metadata>
- <s:Label text="{resourceManager.getString('myresources','greeting')}"/>
+ <fx:Script>
+ <![CDATA[
+ import mx.collections.ArrayCollection;
+ import mx.events.FlexEvent;
+ import mx.events.ResourceEvent;
+ import mx.modules.ModuleBase;
+
+ import spark.events.IndexChangeEvent;
+
+ // Actually I don't quite know why I need to do this ...
+ // without it, I get an error, that this class is missing.
+ private var tst:ModuleBase = null;
+
+ [Bindable]
+ private var locales:ArrayCollection = new ArrayCollection([{label: "English", locale: "en_US"},
+ {label: "German", locale: "de_DE"}]);
+
+ private function onCreationComplete(event:FlexEvent):void {
+ if("en" == Capabilities.language) {
+ localeSelector.selectedItem = locales.getItemAt(0);
+ } else if("de" == Capabilities.language) {
+ localeSelector.selectedItem = locales.getItemAt(1);
+ }
+ onLanguageChange();
+ }
+
+ private function onLanguageChange(event:IndexChangeEvent = null):void {
+ var selectedLocale:String = String(localeSelector.selectedItem.locale);
+
+ // Ensure that you are not loading the same resource module more than once.
+ if (resourceManager.getLocales().indexOf(selectedLocale) != -1) {
+ completeHandler(null);
+ } else {
+ var resourceModuleURL:String =
+ "./locales/runtime-locales-swf-1.0.0-SNAPSHOT-" + selectedLocale + ".swf";
+ var eventDispatcher:IEventDispatcher = resourceManager.loadResourceModule(resourceModuleURL);
+ eventDispatcher.addEventListener(ResourceEvent.COMPLETE, completeHandler);
+ }
+ }
+
+ private function completeHandler(event:ResourceEvent):void {
+ resourceManager.localeChain = [localeSelector.selectedItem.locale];
+ }
+
+ ]]>
+ </fx:Script>
+
+ <s:VGroup>
+ <s:ComboBox id="localeSelector" dataProvider="{locales}" change="onLanguageChange(event)"/>
+ <s:Label text="{resourceManager.getString('myresources','greeting')}"/>
+ </s:VGroup>
</s:Application>
http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/957c1e19/maven-flex-plugin/examples/i18n/runtime-locales/war/pom.xml
----------------------------------------------------------------------
diff --git a/maven-flex-plugin/examples/i18n/runtime-locales/war/pom.xml b/maven-flex-plugin/examples/i18n/runtime-locales/war/pom.xml
index 1403603..d1d753e 100644
--- a/maven-flex-plugin/examples/i18n/runtime-locales/war/pom.xml
+++ b/maven-flex-plugin/examples/i18n/runtime-locales/war/pom.xml
@@ -24,11 +24,11 @@
<parent>
<groupId>org.apache.flex.examples.i18n</groupId>
- <artifactId>runtime-locals</artifactId>
+ <artifactId>runtime-locales</artifactId>
<version>1.0.0-SNAPSHOT</version>
</parent>
- <artifactId>runtime-locals-war</artifactId>
+ <artifactId>runtime-locales-war</artifactId>
<version>1.0.0-SNAPSHOT</version>
<packaging>war</packaging>
@@ -37,7 +37,7 @@
perform the filtering.
-->
<properties>
- <swf>swf-1.0.0-SNAPSHOT</swf>
+ <swf>runtime-locales-swf-1.0.0-SNAPSHOT</swf>
<width>100%</width>
<height>100%</height>
<title>My First Application</title>
@@ -107,7 +107,7 @@
<dependencies>
<dependency>
<groupId>org.apache.flex.examples.i18n</groupId>
- <artifactId>runtime-locals-swf</artifactId>
+ <artifactId>runtime-locales-swf</artifactId>
<version>1.0.0-SNAPSHOT</version>
<type>swf</type>
</dependency>
[32/50] [abbrv] git commit: [flex-utilities]
[refs/heads/as3httpclient-work] - - Fine tuned the wrapper generation
Posted by qu...@apache.org.
- Fine tuned the wrapper generation
Project: http://git-wip-us.apache.org/repos/asf/flex-utilities/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-utilities/commit/dd6d4194
Tree: http://git-wip-us.apache.org/repos/asf/flex-utilities/tree/dd6d4194
Diff: http://git-wip-us.apache.org/repos/asf/flex-utilities/diff/dd6d4194
Branch: refs/heads/as3httpclient-work
Commit: dd6d4194f4c1b21fed64612785338a6716fa2125
Parents: 1a46b11
Author: Christofer Dutz <ch...@codecentric.de>
Authored: Sat Apr 25 12:07:47 2015 +0200
Committer: Christofer Dutz <ch...@codecentric.de>
Committed: Sat Apr 25 12:07:47 2015 +0200
----------------------------------------------------------------------
.../converter/wrapper/WrapperConverter.java | 16 +++++++++++-----
.../converter/mavenextension/FlexEventSpy.java | 3 ++-
2 files changed, 13 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/dd6d4194/mavenizer/converters/wrapper/src/main/java/org/apache/flex/utilities/converter/wrapper/WrapperConverter.java
----------------------------------------------------------------------
diff --git a/mavenizer/converters/wrapper/src/main/java/org/apache/flex/utilities/converter/wrapper/WrapperConverter.java b/mavenizer/converters/wrapper/src/main/java/org/apache/flex/utilities/converter/wrapper/WrapperConverter.java
index 6a2b691..7e4af4c 100644
--- a/mavenizer/converters/wrapper/src/main/java/org/apache/flex/utilities/converter/wrapper/WrapperConverter.java
+++ b/mavenizer/converters/wrapper/src/main/java/org/apache/flex/utilities/converter/wrapper/WrapperConverter.java
@@ -32,19 +32,25 @@ public class WrapperConverter extends BaseConverter implements Converter {
}
try {
- final File wrapperJar = File.createTempFile("SWFObjectWrapper-2.2", ".jar");
- generateZip(wrapperRootDir.listFiles(), wrapperJar);
+ // Rename the index.template.html to index.html
+ File indexHtml = new File(wrapperRootDir, "index.template.html");
+ if(!indexHtml.renameTo(new File(wrapperRootDir, "index.html"))) {
+ System.out.println("Could not rename index.template.html to index.html.");
+ }
+
+ final File wrapperWar = File.createTempFile("SWFObjectWrapper-2.2", ".war");
+ generateZip(wrapperRootDir.listFiles(), wrapperWar);
final MavenArtifact swfobjectWrapper = new MavenArtifact();
swfobjectWrapper.setGroupId("org.apache.flex.wrapper");
swfobjectWrapper.setArtifactId("swfobject");
swfobjectWrapper.setVersion(getFlexVersion(rootSourceDirectory));
- swfobjectWrapper.setPackaging("jar");
- swfobjectWrapper.addDefaultBinaryArtifact(wrapperJar);
+ swfobjectWrapper.setPackaging("war");
+ swfobjectWrapper.addDefaultBinaryArtifact(wrapperWar);
writeArtifact(swfobjectWrapper);
} catch (IOException e) {
- throw new ConverterException("Error creating wrapper jar.", e);
+ throw new ConverterException("Error creating wrapper war.", e);
}
}
http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/dd6d4194/mavenizer/maven-extension/src/main/java/org/apache/flex/utilities/converter/mavenextension/FlexEventSpy.java
----------------------------------------------------------------------
diff --git a/mavenizer/maven-extension/src/main/java/org/apache/flex/utilities/converter/mavenextension/FlexEventSpy.java b/mavenizer/maven-extension/src/main/java/org/apache/flex/utilities/converter/mavenextension/FlexEventSpy.java
index e946db0..9adf892 100644
--- a/mavenizer/maven-extension/src/main/java/org/apache/flex/utilities/converter/mavenextension/FlexEventSpy.java
+++ b/mavenizer/maven-extension/src/main/java/org/apache/flex/utilities/converter/mavenextension/FlexEventSpy.java
@@ -131,7 +131,8 @@ public class FlexEventSpy extends AbstractEventSpy {
// In order to compile some of the themes, we need to download a
// playerglobal version.
- logger.info("In order to convert the Apache Flex SDK, a Flash SDK has to be downloaded.");
+ logger.info("In order to convert some of the skins in the Apache Flex SDK, " +
+ "a Flash SDK has to be downloaded.");
File flashSdkRoot = downloadRetriever.retrieve(SdkType.FLASH, "10.2");
FileUtils.copyDirectory(flashSdkRoot, sdkRoot);
[22/50] [abbrv] git commit: [flex-utilities]
[refs/heads/as3httpclient-work] - - Minor updates making the plugin run in
the lib/ext directory of a Maven 3.3.1 installation.
Posted by qu...@apache.org.
- Minor updates making the plugin run in the lib/ext directory of a Maven 3.3.1 installation.
Project: http://git-wip-us.apache.org/repos/asf/flex-utilities/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-utilities/commit/cfcd4650
Tree: http://git-wip-us.apache.org/repos/asf/flex-utilities/tree/cfcd4650
Diff: http://git-wip-us.apache.org/repos/asf/flex-utilities/diff/cfcd4650
Branch: refs/heads/as3httpclient-work
Commit: cfcd4650661b6f0cb293d7af0bc2cb29efcdfdab
Parents: 2b96232
Author: Christofer Dutz <ch...@codecentric.de>
Authored: Sat Apr 18 21:46:55 2015 +0200
Committer: Christofer Dutz <ch...@codecentric.de>
Committed: Sat Apr 18 21:46:55 2015 +0200
----------------------------------------------------------------------
mavenizer/maven-extension/pom.xml | 8 ++-
.../converter/mavenextension/FlexEventSpy.java | 61 +++++++++++---------
mavenizer/pom.xml | 2 +-
3 files changed, 40 insertions(+), 31 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/cfcd4650/mavenizer/maven-extension/pom.xml
----------------------------------------------------------------------
diff --git a/mavenizer/maven-extension/pom.xml b/mavenizer/maven-extension/pom.xml
index 9b4a8e1..210a4e4 100644
--- a/mavenizer/maven-extension/pom.xml
+++ b/mavenizer/maven-extension/pom.xml
@@ -36,7 +36,7 @@
<plugin>
<groupId>org.sonatype.plugins</groupId>
<artifactId>sisu-maven-plugin</artifactId>
- <version>1.1</version>
+ <version>1.4</version>
<executions>
<execution>
<id>generate-index</id>
@@ -46,6 +46,7 @@
</execution>
</executions>
</plugin>
+
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
<version>2.4</version>
@@ -55,7 +56,6 @@
</descriptorRefs>
<finalName>flex-maven-extension-${project.version}</finalName>
<appendAssemblyId>false</appendAssemblyId>
-
</configuration>
<executions>
<execution>
@@ -100,11 +100,13 @@
<groupId>javax.inject</groupId>
<artifactId>javax.inject</artifactId>
<version>1</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-core</artifactId>
- <version>3.1.1</version>
+ <version>3.3.1</version>
+ <scope>provided</scope>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/cfcd4650/mavenizer/maven-extension/src/main/java/org/apache/flex/utilities/converter/mavenextension/FlexEventSpy.java
----------------------------------------------------------------------
diff --git a/mavenizer/maven-extension/src/main/java/org/apache/flex/utilities/converter/mavenextension/FlexEventSpy.java b/mavenizer/maven-extension/src/main/java/org/apache/flex/utilities/converter/mavenextension/FlexEventSpy.java
index b817beb..8c62236 100644
--- a/mavenizer/maven-extension/src/main/java/org/apache/flex/utilities/converter/mavenextension/FlexEventSpy.java
+++ b/mavenizer/maven-extension/src/main/java/org/apache/flex/utilities/converter/mavenextension/FlexEventSpy.java
@@ -18,6 +18,7 @@ import org.codehaus.plexus.logging.Logger;
import org.eclipse.aether.RepositoryEvent;
import org.eclipse.aether.artifact.Artifact;
+import javax.inject.Inject;
import javax.inject.Named;
import javax.inject.Singleton;
import java.io.File;
@@ -29,20 +30,23 @@ import java.io.File;
@Singleton
public class FlexEventSpy extends AbstractEventSpy {
- protected Context context;
- protected PlexusContainer plexusContainer;
+ @Inject
protected RepositorySystem repositorySystem;
+
+ @Inject
protected Logger logger;
+ @Inject
+ protected PlexusContainer plexusContainer;
+
protected boolean internalLookup = false;
protected boolean flexSplashScreenShown = false;
+ public FlexEventSpy() {
+ }
+
@Override
public void init(Context context) throws Exception {
- this.context = context;
- plexusContainer = (PlexusContainer) context.getData().get("plexus");
- repositorySystem = plexusContainer.lookup(RepositorySystem.class);
- logger = plexusContainer.lookup(Logger.class);
}
@Override
@@ -54,28 +58,27 @@ public class FlexEventSpy extends AbstractEventSpy {
try {
internalLookup = true;
Artifact artifact = repositoryEvent.getArtifact();
- MavenSession session = plexusContainer.lookup(MavenSession.class);
if (artifact.getGroupId().startsWith("org.apache.flex")) {
if(!flexSplashScreenShown) {
showFlexSplashScreen();
}
if(resolve(artifact.getGroupId(), artifact.getArtifactId(), artifact.getVersion(),
- artifact.getExtension(), artifact.getClassifier(), session) == null) {
+ artifact.getExtension(), artifact.getClassifier()) == null) {
initFlex(artifact.getVersion());
}
} else if (artifact.getGroupId().startsWith("com.adobe.flash")) {
if(resolve(artifact.getGroupId(), artifact.getArtifactId(), artifact.getVersion(),
- artifact.getExtension(), artifact.getClassifier(), session) == null) {
+ artifact.getExtension(), artifact.getClassifier()) == null) {
initFlash(artifact.getVersion());
}
} else if (artifact.getGroupId().startsWith("com.adobe.air")) {
if(resolve(artifact.getGroupId(), artifact.getArtifactId(), artifact.getVersion(),
- artifact.getExtension(), artifact.getClassifier(), session) == null) {
+ artifact.getExtension(), artifact.getClassifier()) == null) {
initAir(artifact.getVersion());
}
} else if (artifact.getGroupId().equals("com.adobe") && artifact.getArtifactId().equals("fontkit")) {
if(resolve(artifact.getGroupId(), artifact.getArtifactId(), artifact.getVersion(),
- artifact.getExtension(), artifact.getClassifier(), session) == null) {
+ artifact.getExtension(), artifact.getClassifier()) == null) {
initFontkit();
}
}
@@ -88,7 +91,7 @@ public class FlexEventSpy extends AbstractEventSpy {
}
protected org.apache.maven.artifact.Artifact resolve(String groupId, String artifactId, String version,
- String type, String classifier, MavenSession session) {
+ String type, String classifier) {
org.apache.maven.artifact.Artifact artifact;
if((classifier == null) || (classifier.length() == 0)) {
artifact = repositorySystem.createArtifact(groupId, artifactId, version, type);
@@ -96,13 +99,17 @@ public class FlexEventSpy extends AbstractEventSpy {
artifact = repositorySystem.createArtifactWithClassifier(groupId, artifactId, version, type, classifier);
}
if (!artifact.isResolved()) {
-
- ArtifactResolutionRequest req = new ArtifactResolutionRequest();
- req.setArtifact(artifact);
- req.setLocalRepository(session.getLocalRepository());
- req.setRemoteRepositories(session.getRequest().getRemoteRepositories());
- ArtifactResolutionResult res = repositorySystem.resolve(req);
- if (!res.isSuccess()) {
+ try {
+ MavenSession mavenSession = plexusContainer.lookup(MavenSession.class);
+ ArtifactResolutionRequest req = new ArtifactResolutionRequest();
+ req.setArtifact(artifact);
+ req.setLocalRepository(mavenSession.getLocalRepository());
+ req.setRemoteRepositories(mavenSession.getRequest().getRemoteRepositories());
+ ArtifactResolutionResult res = repositorySystem.resolve(req);
+ if (!res.isSuccess()) {
+ return null;
+ }
+ } catch (Exception e) {
return null;
}
}
@@ -113,8 +120,8 @@ public class FlexEventSpy extends AbstractEventSpy {
logger.info("===========================================================");
logger.info(" - Installing Apache Flex SDK " + version);
try {
- MavenSession session = plexusContainer.lookup(MavenSession.class);
- File localRepoBaseDir = new File(session.getLocalRepository().getBasedir());
+ MavenSession mavenSession = plexusContainer.lookup(MavenSession.class);
+ File localRepoBaseDir = new File(mavenSession.getLocalRepository().getBasedir());
DownloadRetriever downloadRetriever = new DownloadRetriever();
File sdkRoot = downloadRetriever.retrieve(SdkType.FLEX, version);
@@ -139,8 +146,8 @@ public class FlexEventSpy extends AbstractEventSpy {
logger.info("===========================================================");
logger.info(" - Installing Adobe Flash SDK " + version);
try {
- MavenSession session = plexusContainer.lookup(MavenSession.class);
- File localRepoBaseDir = new File(session.getLocalRepository().getBasedir());
+ MavenSession mavenSession = plexusContainer.lookup(MavenSession.class);
+ File localRepoBaseDir = new File(mavenSession.getLocalRepository().getBasedir());
DownloadRetriever downloadRetriever = new DownloadRetriever();
File sdkRoot = downloadRetriever.retrieve(SdkType.FLASH, version);
FlashConverter converter = new FlashConverter(sdkRoot, localRepoBaseDir);
@@ -156,8 +163,8 @@ public class FlexEventSpy extends AbstractEventSpy {
logger.info("===========================================================");
logger.info(" - Installing Adobe AIR SDK " + version);
try {
- MavenSession session = plexusContainer.lookup(MavenSession.class);
- File localRepoBaseDir = new File(session.getLocalRepository().getBasedir());
+ MavenSession mavenSession = plexusContainer.lookup(MavenSession.class);
+ File localRepoBaseDir = new File(mavenSession.getLocalRepository().getBasedir());
DownloadRetriever downloadRetriever = new DownloadRetriever();
File sdkRoot = downloadRetriever.retrieve(SdkType.AIR, version);
AirConverter converter = new AirConverter(sdkRoot, localRepoBaseDir);
@@ -173,8 +180,8 @@ public class FlexEventSpy extends AbstractEventSpy {
logger.info("===========================================================");
logger.info(" - Installing Adobe Fontkit libraries");
try {
- MavenSession session = plexusContainer.lookup(MavenSession.class);
- File localRepoBaseDir = new File(session.getLocalRepository().getBasedir());
+ MavenSession mavenSession = plexusContainer.lookup(MavenSession.class);
+ File localRepoBaseDir = new File(mavenSession.getLocalRepository().getBasedir());
DownloadRetriever downloadRetriever = new DownloadRetriever();
File sdkRoot = downloadRetriever.retrieve(SdkType.FONTKIT);
FontkitConverter converter = new FontkitConverter(sdkRoot, localRepoBaseDir);
http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/cfcd4650/mavenizer/pom.xml
----------------------------------------------------------------------
diff --git a/mavenizer/pom.xml b/mavenizer/pom.xml
index 285bb78..e5317f6 100644
--- a/mavenizer/pom.xml
+++ b/mavenizer/pom.xml
@@ -32,7 +32,7 @@
<packaging>pom</packaging>
<properties>
- <mavenVersion>3.1.0</mavenVersion>
+ <mavenVersion>3.1.1</mavenVersion>
<aetherVersion>0.9.0.M4</aetherVersion>
<wagonVersion>2.2</wagonVersion>
</properties>
[50/50] [abbrv] git commit: [flex-utilities]
[refs/heads/as3httpclient-work] - Merge remote-tracking branch
'origin/develop' into as3httpclient-work
Posted by qu...@apache.org.
Merge remote-tracking branch 'origin/develop' into as3httpclient-work
Conflicts:
installer/src/InstallApacheFlex.mxml
Project: http://git-wip-us.apache.org/repos/asf/flex-utilities/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-utilities/commit/e15c4a84
Tree: http://git-wip-us.apache.org/repos/asf/flex-utilities/tree/e15c4a84
Diff: http://git-wip-us.apache.org/repos/asf/flex-utilities/diff/e15c4a84
Branch: refs/heads/as3httpclient-work
Commit: e15c4a844e3c09474d9a2a65cc23fc0649364acf
Parents: df3dcd6 fb70515
Author: quetwo <ni...@theflexgroup.org>
Authored: Sun May 31 18:15:55 2015 -0400
Committer: quetwo <ni...@theflexgroup.org>
Committed: Sun May 31 18:15:55 2015 -0400
----------------------------------------------------------------------
.../AIRServer/CodeCoveragePreloadSWF.as | 81 +
.../AIRServer/CodeCoverageServer-app.xml | 265 +
CodeCoverage/AIRServer/CodeCoverageServer.mxml | 295 +
CodeCoverage/CodeCoveragePreloadSWF.as | 81 -
CodeCoverage/CodeCoverageServer-app.xml | 265 -
CodeCoverage/CodeCoverageServer.mxml | 295 -
CodeCoverage/JavaServer/README | 131 +
CodeCoverage/JavaServer/build.xml | 39 +
CodeCoverage/JavaServer/flex/build.xml | 68 +
.../flex/src/CodeCoverageClientSocket.as | 145 +
.../flex/src/CodeCoveragePreloadSWF.as | 190 +
CodeCoverage/JavaServer/java/build.xml | 157 +
.../JavaServer/java/ccserver.properties | 8 +
.../reporter/CodeCoverageReporter.java | 549 +
.../codecoverage/reporter/CoverageData.java | 113 +
.../codecoverage/reporter/CoverageSummary.java | 423 +
.../tools/codecoverage/reporter/LineInfo.java | 107 +
.../reporter/PackageSummaryInfo.java | 77 +
.../codecoverage/reporter/SummaryInfo.java | 187 +
.../codecoverage/reporter/SummaryType.java | 29 +
.../reporter/reports/IReportFactory.java | 37 +
.../reporter/reports/IReportWriter.java | 40 +
.../reporter/reports/ReportOptions.java | 204 +
.../reporter/reports/XMLReportFactory.java | 36 +
.../reporter/reports/XMLReportWriter.java | 371 +
.../reporter/swf/DebugLineVisitor.java | 239 +
.../reporter/swf/SWFLineReporter.java | 143 +
.../codecoverage/server/CodeCoverageServer.java | 556 +
.../codecoverage/server/DataSocketAccepter.java | 174 +
.../codecoverage/server/DataSocketReader.java | 88 +
.../codecoverage/server/PolicyFileServer.java | 167 +
MD5Checker/build.xml | 4 +-
.../spelling/framework/ResourceTable.as | 2 +-
.../spelling/framework/ui/SparkHighlighter.as | 13 +-
.../com/adobe/linguistics/spelling/SpellUI.as | 236 +-
.../linguistics/spelling/FLEX_34717_Tests.as | 2 +-
.../linguistics/spelling/FLEX_34756_Test.as | 160 +
.../linguistics/spelling/SpellingConfig.xml | 7 +
.../spelling/dictionaries/en_GB/en_GB.aff | 1150 +
.../spelling/dictionaries/en_GB/en_GB.dic | 46281 +++++++++++++++++
ant_on_air/build.xml | 2 +
ant_on_air/locale/en_AU/ant.properties | 33 +-
ant_on_air/locale/en_GB/ant.properties | 33 +-
ant_on_air/locale/en_US/ant.properties | 33 +-
.../src/org/apache/flex/ant/tags/Replace.as | 27 +-
.../org/apache/flex/ant/tags/ReplaceToken.as | 44 +
.../org/apache/flex/ant/tags/ReplaceValue.as | 44 +
.../src/org/apache/flex/ant/tags/TStamp.as | 11 +-
ant_on_air/tests/test.xml | 23 +-
installer/README | 53 +-
installer/build.xml | 10 +-
.../apache/flex/runtimelocale/ini/IniReader.as | 4 -
.../maven/plugins/flex/compiler/Compiler.java | 6 -
.../maven/plugins/flex/generator/Generator.java | 6 -
.../maven/plugins/flex/optimizer/Optimizer.java | 6 -
.../maven/plugins/flex/packager/Packager.java | 6 -
.../flex/maven/plugins/flex/test/Test.java | 6 -
.../flex/compiler/asdoc/AsdocCompilerImpl.java | 6 -
.../flex/compiler/compc/CompcCompilerImpl.java | 6 -
.../compiler/falcon/FalconCompilerImpl.java | 6 -
.../flex/compiler/mxmlc/MxmlcCompilerImpl.java | 6 -
.../examples/flexjs/flexjs-hello-world/pom.xml | 76 +
.../src/main/flex/FlexJSTest_basic.mxml | 53 +
.../src/main/flex/MyInitialView.mxml | 143 +
.../src/main/flex/StockDataJSONItemConverter.as | 38 +
.../src/main/flex/controllers/MyController.as | 92 +
.../src/main/flex/models/MyModel.as | 59 +
maven-flex-plugin/examples/flexjs/pom.xml | 40 +
.../examples/i18n/compiled-locales/pom.xml | 40 +
.../examples/i18n/compiled-locales/swf/pom.xml | 77 +
.../swf/src/main/flex/Main.mxml | 49 +
.../main/locales/de_DE/myresources.properties | 19 +
.../main/locales/en_US/myresources.properties | 19 +
.../examples/i18n/compiled-locales/war/pom.xml | 124 +
.../war/src/main/webapp/WEB-INF/web.xml | 31 +
.../examples/i18n/locale-chains/pom.xml | 40 +
.../examples/i18n/locale-chains/swf/pom.xml | 79 +
.../locale-chains/swf/src/main/flex/Main.mxml | 63 +
.../main/locales/de_AT/myresources.properties | 19 +
.../main/locales/de_DE/myresources.properties | 20 +
.../main/locales/en_GB/myresources.properties | 19 +
.../main/locales/en_US/myresources.properties | 21 +
.../examples/i18n/locale-chains/war/pom.xml | 124 +
.../war/src/main/webapp/WEB-INF/web.xml | 31 +
maven-flex-plugin/examples/i18n/pom.xml | 42 +
.../examples/i18n/runtime-locales/pom.xml | 40 +
.../examples/i18n/runtime-locales/swf/pom.xml | 77 +
.../runtime-locales/swf/src/main/flex/Main.mxml | 80 +
.../main/locales/de_DE/myresources.properties | 19 +
.../main/locales/en_US/myresources.properties | 19 +
.../examples/i18n/runtime-locales/war/pom.xml | 124 +
.../war/src/main/webapp/WEB-INF/web.xml | 31 +
maven-flex-plugin/examples/mobile/pom.xml | 40 +
.../examples/mobile/simple-air/pom.xml | 110 +
.../mobile/simple-air/src/main/air/sign.p12 | Bin 0 -> 2482 bytes
.../main/flex/SimpleAirMobileApplication.mxml | 27 +
.../simple-air/src/main/flex/tabs/Tab1.mxml | 24 +
.../simple-air/src/main/flex/tabs/Tab2.mxml | 24 +
.../src/main/resources/descriptor.xml | 297 +
maven-flex-plugin/examples/pom.xml | 120 +
.../maven/plugins/flex/AbstractFlexMojo.java | 6 -
.../plugins/flex/compiler/CompilerMojo.java | 6 -
.../plugins/flex/generator/GeneratorMojo.java | 6 -
.../plugins/flex/optimizer/OptimizerMojo.java | 6 -
.../plugins/flex/packager/PackagerMojo.java | 6 -
.../plugins/flex/test/TestCompilerMojo.java | 6 -
.../plugins/flex/test/TestGeneratorMojo.java | 6 -
.../maven/plugins/flex/test/TestRunnerMojo.java | 6 -
.../maven/plugins/mavenizer/MavenizerMojo.java | 6 -
mavenizer/LICENSE | 203 +
mavenizer/NOTICE | 5 +
mavenizer/README.txt | 310 +-
mavenizer/RELEASE_NOTES | 19 +
mavenizer/cli/pom.xml | 101 +
.../converter/core/SdkConverterCLI.java | 394 +
mavenizer/converters/air/pom.xml | 4 +-
.../utilities/converter/air/AirConverter.java | 11 +-
mavenizer/converters/base/pom.xml | 10 +-
.../flex/utilities/converter/BaseConverter.java | 47 +-
.../flex/utilities/converter/Converter.java | 2 -
.../src/main/resources/templates/default.ftl | 41 +
.../src/main/resources/templates/default.vm | 23 -
.../base/src/main/resources/templates/pom.ftl | 55 +
.../base/src/main/resources/templates/pom.vm | 37 -
.../base/src/main/resources/velocity.properties | 10 -
mavenizer/converters/flash/pom.xml | 4 +-
.../converter/flash/FlashConverter.java | 20 +-
mavenizer/converters/flex/pom.xml | 14 +-
.../utilities/converter/flex/FlexConverter.java | 77 +-
mavenizer/converters/fontkit/pom.xml | 41 +
.../converter/fontkit/FontkitConverter.java | 74 +
mavenizer/converters/pom.xml | 8 +-
mavenizer/converters/wrapper/pom.xml | 41 +
.../converter/wrapper/WrapperConverter.java | 93 +
mavenizer/core/pom.xml | 82 -
.../utilities/converter/core/AirDownloader.java | 55 -
.../converter/core/BatchConverter.java | 87 -
.../converter/core/FlashDownloader.java | 65 -
.../utilities/converter/core/SdkConverter.java | 70 -
mavenizer/deployers/aether/pom.xml | 4 +-
.../deployer/aether/AetherDeployer.java | 22 +-
mavenizer/deployers/maven/pom.xml | 4 +-
.../converter/deployer/maven/MavenDeployer.java | 4 -
mavenizer/deployers/pom.xml | 6 +-
mavenizer/maven-extension/pom.xml | 118 +
.../converter/mavenextension/FlexEventSpy.java | 241 +
mavenizer/mavenizer/pom.xml | 120 -
mavenizer/pom.xml | 28 +-
mavenizer/retrievers/base/pom.xml | 30 +-
.../retrievers/types/PlatformType.java | 23 +-
.../converter/retrievers/types/SdkType.java | 4 +-
.../converter/retrievers/utils/ProgressBar.java | 2 +-
.../retrievers/types/PlatformTypeTest.java | 69 +
mavenizer/retrievers/download/pom.xml | 15 +-
.../retrievers/download/DownloadRetriever.java | 376 +-
.../src/main/resources/message.properties | 1 +
mavenizer/retrievers/pom.xml | 6 +-
157 files changed, 57405 insertions(+), 1861 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/e15c4a84/installer/README
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/e15c4a84/installer/build.xml
----------------------------------------------------------------------
diff --cc installer/build.xml
index 49de697,24288dc..e052051
--- a/installer/build.xml
+++ b/installer/build.xml
@@@ -288,22 -293,10 +293,23 @@@
<isfalse value="${isMD5ok}"/>
</condition>
</fail>
+ -->
</target>
- <target name="compile" depends="get-as3commons.swc"
+ <target name="check-as3httpclient.swc">
+ <available file="${LIBRARY_DIR}/as3httpclient.swc" property="as3httpclient.swc.present"/>
+ </target>
+
+ <!-- This has a BSD license which is a reciprocal license with the Apache v2 license. -->
+ <target name="get-as3httpclient.swc" depends="check-as3commons.swc" unless="as3httpclient.swc.present"
+ description="Download as3httpclient.swc">
+ <mkdir dir="${LIBRARY_DIR}"/>
+ <get src="https://github.com/quetwo/as3httpclient/releases/download/1.0/as3httpclient.swc"
+ dest="${LIBRARY_DIR}/as3httpclient.swc"
+ verbose="true"/>
+ </target>
+
+ <target name="compile" depends="get-as3commons.swc, get-as3httpclient.swc"
description="Compiles the AIR application to a SWF file and places SWF in a temp directory to be packaged.">
<mxmlc file="${SOURCE_DIR}/${APP_NAME}.${APP_EXTENSION}"
output="${BUILD_DIR}/${APP_NAME}.swf"
[41/50] [abbrv] git commit: [flex-utilities]
[refs/heads/as3httpclient-work] - - Added an initial working example using
flexjs
Posted by qu...@apache.org.
- Added an initial working example using flexjs
Project: http://git-wip-us.apache.org/repos/asf/flex-utilities/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-utilities/commit/b145b025
Tree: http://git-wip-us.apache.org/repos/asf/flex-utilities/tree/b145b025
Diff: http://git-wip-us.apache.org/repos/asf/flex-utilities/diff/b145b025
Branch: refs/heads/as3httpclient-work
Commit: b145b025ca4f9421bdc62e3f79550f70d8aa9c2d
Parents: cb3fbd2
Author: Christofer Dutz <ch...@codecentric.de>
Authored: Fri May 8 16:41:34 2015 +0200
Committer: Christofer Dutz <ch...@codecentric.de>
Committed: Fri May 8 16:41:34 2015 +0200
----------------------------------------------------------------------
.../examples/flexjs/flexjs-hello-world/pom.xml | 76 ++++++++++
.../src/main/flex/FlexJSTest_basic.mxml | 53 +++++++
.../src/main/flex/MyInitialView.mxml | 143 +++++++++++++++++++
.../src/main/flex/StockDataJSONItemConverter.as | 38 +++++
.../src/main/flex/controllers/MyController.as | 92 ++++++++++++
.../src/main/flex/models/MyModel.as | 59 ++++++++
maven-flex-plugin/examples/flexjs/pom.xml | 40 ++++++
maven-flex-plugin/examples/pom.xml | 1 +
8 files changed, 502 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/b145b025/maven-flex-plugin/examples/flexjs/flexjs-hello-world/pom.xml
----------------------------------------------------------------------
diff --git a/maven-flex-plugin/examples/flexjs/flexjs-hello-world/pom.xml b/maven-flex-plugin/examples/flexjs/flexjs-hello-world/pom.xml
new file mode 100644
index 0000000..3ad9c85
--- /dev/null
+++ b/maven-flex-plugin/examples/flexjs/flexjs-hello-world/pom.xml
@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+ 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 xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.flex.examples.flexjs</groupId>
+ <artifactId>flexjs</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>flexjs-hello-world</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ <packaging>swf</packaging>
+
+ <build>
+ <sourceDirectory>src/main/flex</sourceDirectory>
+ <plugins>
+ <plugin>
+ <groupId>net.flexmojos.oss</groupId>
+ <artifactId>flexmojos-maven-plugin</artifactId>
+ <version>7.1.0-SNAPSHOT</version>
+ <extensions>true</extensions>
+ <configuration>
+ <sourceFile>FlexJSTest_basic.mxml</sourceFile>
+ <!--compilerName>Falcon</compilerName-->
+ <compilerName>FlexJS</compilerName>
+ <debug>true</debug>
+ </configuration>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.flex.compiler</groupId>
+ <artifactId>falcon-jx-compiler</artifactId>
+ <version>0.0.3-SNAPSHOT</version>
+ </dependency>
+ </dependencies>
+ </plugin>
+ </plugins>
+ </build>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.flex.flexjs</groupId>
+ <artifactId>framework</artifactId>
+ <version>0.0.3-SNAPSHOT</version>
+ <type>pom</type>
+ </dependency>
+ <!-- This is still only needed to satisfy check in Flexmojos -->
+ <dependency>
+ <groupId>com.adobe.flash.framework</groupId>
+ <artifactId>playerglobal</artifactId>
+ <version>14.0</version>
+ <type>swc</type>
+ </dependency>
+ </dependencies>
+
+</project>
http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/b145b025/maven-flex-plugin/examples/flexjs/flexjs-hello-world/src/main/flex/FlexJSTest_basic.mxml
----------------------------------------------------------------------
diff --git a/maven-flex-plugin/examples/flexjs/flexjs-hello-world/src/main/flex/FlexJSTest_basic.mxml b/maven-flex-plugin/examples/flexjs/flexjs-hello-world/src/main/flex/FlexJSTest_basic.mxml
new file mode 100644
index 0000000..b000196
--- /dev/null
+++ b/maven-flex-plugin/examples/flexjs/flexjs-hello-world/src/main/flex/FlexJSTest_basic.mxml
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+
+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.
+
+-->
+<basic:Application xmlns:fx="http://ns.adobe.com/mxml/2009"
+ xmlns:local="*"
+ xmlns:basic="library://ns.apache.org/flexjs/basic"
+ xmlns:models="models.*"
+ xmlns:controllers="controllers.*"
+ initialize="MyModel(model).labelText='Hello World'">
+
+ <fx:Script><![CDATA[ import models.MyModel; ]]></fx:Script>
+
+ <basic:valuesImpl>
+ <basic:SimpleCSSValuesImpl />
+ </basic:valuesImpl>
+ <basic:initialView>
+ <local:MyInitialView />
+ </basic:initialView>
+ <basic:model>
+ <models:MyModel />
+ </basic:model>
+ <basic:controller>
+ <controllers:MyController />
+ </basic:controller>
+ <basic:beads>
+ <basic:HTTPService id="service">
+ <basic:LazyCollection id="collection">
+ <basic:inputParser>
+ <basic:JSONInputParser />
+ </basic:inputParser>
+ <basic:itemConverter>
+ <local:StockDataJSONItemConverter />
+ </basic:itemConverter>
+ </basic:LazyCollection>
+ </basic:HTTPService>
+ </basic:beads>
+</basic:Application>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/b145b025/maven-flex-plugin/examples/flexjs/flexjs-hello-world/src/main/flex/MyInitialView.mxml
----------------------------------------------------------------------
diff --git a/maven-flex-plugin/examples/flexjs/flexjs-hello-world/src/main/flex/MyInitialView.mxml b/maven-flex-plugin/examples/flexjs/flexjs-hello-world/src/main/flex/MyInitialView.mxml
new file mode 100644
index 0000000..9a910cc
--- /dev/null
+++ b/maven-flex-plugin/examples/flexjs/flexjs-hello-world/src/main/flex/MyInitialView.mxml
@@ -0,0 +1,143 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+
+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.
+
+-->
+<basic:ViewBase xmlns:fx="http://ns.adobe.com/mxml/2009"
+ xmlns:basic="library://ns.apache.org/flexjs/basic"
+ >
+ <fx:Script>
+ <![CDATA[
+ import org.apache.flex.events.CustomEvent;
+ import org.apache.flex.events.Event;
+ import org.apache.flex.utils.Timer;
+
+ private var timer:org.apache.flex.utils.Timer;
+
+ public function get symbol():String
+ {
+ return list.selectedItem as String;
+ }
+
+ public function get city():String
+ {
+ return cityList.selectedItem as String;
+ }
+
+ public function get inputText():String
+ {
+ return input.text;
+ }
+
+ public function get comboBoxValue():String
+ {
+ return String(comboBox.selectedItem);
+ }
+
+ public function startTimer():void
+ {
+ timer = new org.apache.flex.utils.Timer(1000);
+ timer.addEventListener('timer', timerHandler);
+ timer.start()
+ }
+
+ public function timerHandler(event:org.apache.flex.events.Event):void
+ {
+ timerLabel.text = timer.currentCount.toString();
+ }
+ ]]>
+ </fx:Script>
+ <fx:Style>
+ @namespace basic "library://ns.apache.org/flexjs/basic";
+
+ .skinned {
+ background-image: url('ButtonImageUp.png');
+ border-style: none;
+ }
+
+ .skinned:hover {
+ background-image: url('ButtonImageOver.png');
+ }
+
+ .skinned:active {
+ background-image: url('ButtonImageDown.png');
+ }
+
+ </fx:Style>
+ <basic:Label id="lbl" x="100" y="25" >
+ <basic:beads>
+ <basic:SimpleBinding eventName="labelTextChanged"
+ sourceID="applicationModel"
+ sourcePropertyName="labelText"
+ destinationPropertyName="text" />
+ </basic:beads>
+ </basic:Label>
+ <basic:TextButton text="Start Timer" x="100" y="75" click="startTimer()" />
+ <basic:TextButton text="Stop Timer" x="100" y="100" click="timer.removeEventListener('timer', timerHandler);timer.stop()" />
+ <basic:Label id="timerLabel" x="100" y="125" />
+
+ <basic:List id="cityList" x="200" y="75" width="100" height="75" change="dispatchEvent(new CustomEvent('cityListChanged'))">
+ <basic:beads>
+ <basic:ConstantBinding
+ sourceID="applicationModel"
+ sourcePropertyName="cities"
+ destinationPropertyName="dataProvider" />
+ </basic:beads>
+ </basic:List>
+
+ <basic:TextArea x="320" y="25" width="150" height="75">
+ <basic:beads>
+ <basic:SimpleBinding eventName="labelTextChanged"
+ sourceID="applicationModel"
+ sourcePropertyName="labelText"
+ destinationPropertyName="text" />
+ </basic:beads>
+ </basic:TextArea>
+ <basic:TextInput id="input" x="320" y="110" />
+ <basic:TextButton text="Transfer" x="320" y="138" click="dispatchEvent(new CustomEvent('transferClicked'))" />
+
+ <basic:CheckBox id="checkbox" x="320" y="170" text="Check Me" />
+
+ <basic:RadioButton groupName="group1" text="Apples" value="0" x="100" y="150" />
+ <basic:RadioButton groupName="group1" text="Oranges" value="1" x="100" y="170" selected="true" />
+ <basic:RadioButton groupName="group1" text="Grapes" value="2" x="100" y="190" />
+
+ <basic:RadioButton groupName="group2" text="Red" value="red" x="100" y="250" selected="true" />
+ <basic:RadioButton groupName="group2" text="Green" value="green" x="100" y="270" />
+ <basic:RadioButton groupName="group2" text="Blue" value="blue" x="100" y="290" />
+
+ <basic:DropDownList id="list" x="200" y="200" width="100" height="18" change="dispatchEvent(new CustomEvent('listChanged'))">
+ <basic:beads>
+ <basic:ConstantBinding
+ sourceID="applicationModel"
+ sourcePropertyName="strings"
+ destinationPropertyName="dataProvider" />
+ </basic:beads>
+ </basic:DropDownList>
+ <basic:TextButton text="OK" x="200" y="230" click="dispatchEvent(new CustomEvent('buttonClicked'))" />
+ <basic:TextButton text="Skinned" x="200" y="260" width="80" height="24" className="skinned" click="dispatchEvent(new CustomEvent('buttonClicked'))" />
+
+ <basic:ComboBox id="comboBox" x="320" y="200" width="100" change="dispatchEvent(new CustomEvent('comboBoxChanged'))">
+ <basic:beads>
+ <basic:ConstantBinding
+ sourceID="applicationModel"
+ sourcePropertyName="cities"
+ destinationPropertyName="dataProvider" />
+ </basic:beads>
+ </basic:ComboBox>
+
+</basic:ViewBase>
http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/b145b025/maven-flex-plugin/examples/flexjs/flexjs-hello-world/src/main/flex/StockDataJSONItemConverter.as
----------------------------------------------------------------------
diff --git a/maven-flex-plugin/examples/flexjs/flexjs-hello-world/src/main/flex/StockDataJSONItemConverter.as b/maven-flex-plugin/examples/flexjs/flexjs-hello-world/src/main/flex/StockDataJSONItemConverter.as
new file mode 100644
index 0000000..5ad0c38
--- /dev/null
+++ b/maven-flex-plugin/examples/flexjs/flexjs-hello-world/src/main/flex/StockDataJSONItemConverter.as
@@ -0,0 +1,38 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+// 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.
+//
+////////////////////////////////////////////////////////////////////////////////
+package
+{
+import org.apache.flex.collections.converters.JSONItemConverter;
+
+ public class StockDataJSONItemConverter extends JSONItemConverter
+ {
+ public function StockDataJSONItemConverter()
+ {
+ super();
+ }
+
+ override public function convertItem(data:String):Object
+ {
+ var obj:Object = super.convertItem(data);
+ if (obj['query']['results'] == null)
+ return 'No Quote Available';
+ return obj['query']['results']['quote']['Ask'];
+ }
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/b145b025/maven-flex-plugin/examples/flexjs/flexjs-hello-world/src/main/flex/controllers/MyController.as
----------------------------------------------------------------------
diff --git a/maven-flex-plugin/examples/flexjs/flexjs-hello-world/src/main/flex/controllers/MyController.as b/maven-flex-plugin/examples/flexjs/flexjs-hello-world/src/main/flex/controllers/MyController.as
new file mode 100644
index 0000000..636ed30
--- /dev/null
+++ b/maven-flex-plugin/examples/flexjs/flexjs-hello-world/src/main/flex/controllers/MyController.as
@@ -0,0 +1,92 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+// 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.
+//
+////////////////////////////////////////////////////////////////////////////////
+package controllers
+{
+ import org.apache.flex.core.Application;
+ import org.apache.flex.core.IDocument;
+ import org.apache.flex.events.Event;
+
+
+ import models.MyModel;
+
+ public class MyController implements IDocument
+ {
+ public function MyController(app:Application = null)
+ {
+ if (app)
+ {
+ this.app = app as FlexJSTest_basic;
+ app.addEventListener("viewChanged", viewChangeHandler);
+ }
+ }
+
+ private var queryBegin:String = "http://query.yahooapis.com/v1/public/yql?q=select%20*%20from%20yahoo.finance.quotes%20where%20symbol%20in%20(%22";
+ private var queryEnd:String = "%22)%0A%09%09&env=http%3A%2F%2Fdatatables.org%2Falltables.env&format=json";
+ private var app:FlexJSTest_basic;
+
+ private function viewChangeHandler(event:Event):void
+ {
+ app.initialView.addEventListener("buttonClicked", buttonClickHandler);
+ app.initialView.addEventListener("listChanged", listChangedHandler);
+ app.initialView.addEventListener("cityListChanged", cityListChangeHandler);
+ app.initialView.addEventListener("transferClicked", transferClickHandler);
+ app.initialView.addEventListener("comboBoxChanged", comboBoxChangeHandler);
+ }
+
+ private function buttonClickHandler(event:Event):void
+ {
+ var sym:String = MyInitialView(app.initialView).symbol;
+ app.service.url = queryBegin + sym + queryEnd;
+ app.service.send();
+ app.service.addEventListener("complete", completeHandler);
+ }
+
+ private function completeHandler(event:Event):void
+ {
+ MyModel(app.model).labelText = app.collection.getItemAt(0) as String;
+ }
+
+ private function listChangedHandler(event:Event):void
+ {
+ MyModel(app.model).labelText = MyInitialView(app.initialView).symbol;
+ }
+
+ private function cityListChangeHandler(event:Event):void
+ {
+ MyModel(app.model).labelText = MyInitialView(app.initialView).city;
+ }
+
+ private function transferClickHandler(event:Event):void
+ {
+ MyModel(app.model).labelText = MyInitialView(app.initialView).inputText;
+ }
+
+ private function comboBoxChangeHandler(event:Event):void
+ {
+ MyModel(app.model).labelText = MyInitialView(app.initialView).comboBoxValue;
+ }
+
+ public function setDocument(document:Object, id:String = null):void
+ {
+ this.app = document as FlexJSTest_basic;
+ app.addEventListener("viewChanged", viewChangeHandler);
+ }
+
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/b145b025/maven-flex-plugin/examples/flexjs/flexjs-hello-world/src/main/flex/models/MyModel.as
----------------------------------------------------------------------
diff --git a/maven-flex-plugin/examples/flexjs/flexjs-hello-world/src/main/flex/models/MyModel.as b/maven-flex-plugin/examples/flexjs/flexjs-hello-world/src/main/flex/models/MyModel.as
new file mode 100644
index 0000000..1dc23e6
--- /dev/null
+++ b/maven-flex-plugin/examples/flexjs/flexjs-hello-world/src/main/flex/models/MyModel.as
@@ -0,0 +1,59 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+// 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.
+//
+////////////////////////////////////////////////////////////////////////////////
+package models
+{
+ import org.apache.flex.events.Event;
+ import org.apache.flex.events.EventDispatcher;
+
+ public class MyModel extends EventDispatcher
+ {
+ public function MyModel()
+ {
+ }
+
+ private var _labelText:String;
+
+ public function get labelText():String
+ {
+ return _labelText;
+ }
+
+ public function set labelText(value:String):void
+ {
+ if (value != _labelText)
+ {
+ _labelText = value;
+ dispatchEvent(new Event("labelTextChanged"));
+ }
+ }
+
+ private var _strings:Array = ["AAPL", "ADBE", "GOOG", "MSFT", "YHOO"];
+ public function get strings():Array
+ {
+ return _strings;
+ }
+
+ private var _cities:Array = ["London", "Miami", "Paris", "Sydney", "Tokyo"];
+ public function get cities():Array
+ {
+ return _cities;
+ }
+
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/b145b025/maven-flex-plugin/examples/flexjs/pom.xml
----------------------------------------------------------------------
diff --git a/maven-flex-plugin/examples/flexjs/pom.xml b/maven-flex-plugin/examples/flexjs/pom.xml
new file mode 100644
index 0000000..8d01b07
--- /dev/null
+++ b/maven-flex-plugin/examples/flexjs/pom.xml
@@ -0,0 +1,40 @@
+<?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 xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.flex.examples</groupId>
+ <artifactId>parent</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ </parent>
+
+ <groupId>org.apache.flex.examples.flexjs</groupId>
+ <artifactId>flexjs</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ <packaging>pom</packaging>
+
+ <modules>
+ <module>flexjs-hello-world</module>
+ </modules>
+
+</project>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/b145b025/maven-flex-plugin/examples/pom.xml
----------------------------------------------------------------------
diff --git a/maven-flex-plugin/examples/pom.xml b/maven-flex-plugin/examples/pom.xml
index 36f9a77..b83d09e 100644
--- a/maven-flex-plugin/examples/pom.xml
+++ b/maven-flex-plugin/examples/pom.xml
@@ -28,6 +28,7 @@
<packaging>pom</packaging>
<modules>
+ <module>flexjs</module>
<module>i18n</module>
</modules>
[39/50] [abbrv] git commit: [flex-utilities]
[refs/heads/as3httpclient-work] - Merge branch 'ant-tstamp-native' of
https://github.com/joshtynjala/flex-utilities into develop. This closes #5
Posted by qu...@apache.org.
Merge branch 'ant-tstamp-native' of https://github.com/joshtynjala/flex-utilities into develop. This closes #5
Project: http://git-wip-us.apache.org/repos/asf/flex-utilities/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-utilities/commit/33885087
Tree: http://git-wip-us.apache.org/repos/asf/flex-utilities/tree/33885087
Diff: http://git-wip-us.apache.org/repos/asf/flex-utilities/diff/33885087
Branch: refs/heads/as3httpclient-work
Commit: 338850873a2c3e1510bc97a501b2bc7fac65b36f
Parents: 624f41c 6018638
Author: Alex Harui <ah...@apache.org>
Authored: Tue Apr 28 09:02:19 2015 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Tue Apr 28 09:04:00 2015 -0700
----------------------------------------------------------------------
ant_on_air/src/org/apache/flex/ant/tags/TStamp.as | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
[24/50] [abbrv] git commit: [flex-utilities]
[refs/heads/as3httpclient-work] - - Applied some changes to make the
FlexEventSpy working with older Maven versions.
Posted by qu...@apache.org.
- Applied some changes to make the FlexEventSpy working with older Maven versions.
Project: http://git-wip-us.apache.org/repos/asf/flex-utilities/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-utilities/commit/34ba2e8e
Tree: http://git-wip-us.apache.org/repos/asf/flex-utilities/tree/34ba2e8e
Diff: http://git-wip-us.apache.org/repos/asf/flex-utilities/diff/34ba2e8e
Branch: refs/heads/as3httpclient-work
Commit: 34ba2e8eb8133d94514816f3893f93d391a291e6
Parents: 95af18d
Author: Christofer Dutz <ch...@codecentric.de>
Authored: Sun Apr 19 11:52:11 2015 +0200
Committer: Christofer Dutz <ch...@codecentric.de>
Committed: Sun Apr 19 11:52:11 2015 +0200
----------------------------------------------------------------------
.../converter/mavenextension/FlexEventSpy.java | 14 +++++---------
1 file changed, 5 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/34ba2e8e/mavenizer/maven-extension/src/main/java/org/apache/flex/utilities/converter/mavenextension/FlexEventSpy.java
----------------------------------------------------------------------
diff --git a/mavenizer/maven-extension/src/main/java/org/apache/flex/utilities/converter/mavenextension/FlexEventSpy.java b/mavenizer/maven-extension/src/main/java/org/apache/flex/utilities/converter/mavenextension/FlexEventSpy.java
index 8c62236..a378f98 100644
--- a/mavenizer/maven-extension/src/main/java/org/apache/flex/utilities/converter/mavenextension/FlexEventSpy.java
+++ b/mavenizer/maven-extension/src/main/java/org/apache/flex/utilities/converter/mavenextension/FlexEventSpy.java
@@ -11,9 +11,9 @@ import org.apache.maven.MavenExecutionException;
import org.apache.maven.artifact.resolver.ArtifactResolutionRequest;
import org.apache.maven.artifact.resolver.ArtifactResolutionResult;
import org.apache.maven.eventspy.AbstractEventSpy;
+import org.apache.maven.execution.ExecutionEvent;
import org.apache.maven.execution.MavenSession;
import org.apache.maven.repository.RepositorySystem;
-import org.codehaus.plexus.PlexusContainer;
import org.codehaus.plexus.logging.Logger;
import org.eclipse.aether.RepositoryEvent;
import org.eclipse.aether.artifact.Artifact;
@@ -36,8 +36,7 @@ public class FlexEventSpy extends AbstractEventSpy {
@Inject
protected Logger logger;
- @Inject
- protected PlexusContainer plexusContainer;
+ protected MavenSession mavenSession;
protected boolean internalLookup = false;
protected boolean flexSplashScreenShown = false;
@@ -51,7 +50,9 @@ public class FlexEventSpy extends AbstractEventSpy {
@Override
public void onEvent(Object o) throws Exception {
- if(o instanceof RepositoryEvent) {
+ if(o instanceof ExecutionEvent) {
+ mavenSession = ((ExecutionEvent) o).getSession();
+ } else if(o instanceof RepositoryEvent) {
RepositoryEvent repositoryEvent = (RepositoryEvent) o;
if(repositoryEvent.getType() == RepositoryEvent.EventType.ARTIFACT_RESOLVING) {
if(!internalLookup) {
@@ -100,7 +101,6 @@ public class FlexEventSpy extends AbstractEventSpy {
}
if (!artifact.isResolved()) {
try {
- MavenSession mavenSession = plexusContainer.lookup(MavenSession.class);
ArtifactResolutionRequest req = new ArtifactResolutionRequest();
req.setArtifact(artifact);
req.setLocalRepository(mavenSession.getLocalRepository());
@@ -120,7 +120,6 @@ public class FlexEventSpy extends AbstractEventSpy {
logger.info("===========================================================");
logger.info(" - Installing Apache Flex SDK " + version);
try {
- MavenSession mavenSession = plexusContainer.lookup(MavenSession.class);
File localRepoBaseDir = new File(mavenSession.getLocalRepository().getBasedir());
DownloadRetriever downloadRetriever = new DownloadRetriever();
File sdkRoot = downloadRetriever.retrieve(SdkType.FLEX, version);
@@ -146,7 +145,6 @@ public class FlexEventSpy extends AbstractEventSpy {
logger.info("===========================================================");
logger.info(" - Installing Adobe Flash SDK " + version);
try {
- MavenSession mavenSession = plexusContainer.lookup(MavenSession.class);
File localRepoBaseDir = new File(mavenSession.getLocalRepository().getBasedir());
DownloadRetriever downloadRetriever = new DownloadRetriever();
File sdkRoot = downloadRetriever.retrieve(SdkType.FLASH, version);
@@ -163,7 +161,6 @@ public class FlexEventSpy extends AbstractEventSpy {
logger.info("===========================================================");
logger.info(" - Installing Adobe AIR SDK " + version);
try {
- MavenSession mavenSession = plexusContainer.lookup(MavenSession.class);
File localRepoBaseDir = new File(mavenSession.getLocalRepository().getBasedir());
DownloadRetriever downloadRetriever = new DownloadRetriever();
File sdkRoot = downloadRetriever.retrieve(SdkType.AIR, version);
@@ -180,7 +177,6 @@ public class FlexEventSpy extends AbstractEventSpy {
logger.info("===========================================================");
logger.info(" - Installing Adobe Fontkit libraries");
try {
- MavenSession mavenSession = plexusContainer.lookup(MavenSession.class);
File localRepoBaseDir = new File(mavenSession.getLocalRepository().getBasedir());
DownloadRetriever downloadRetriever = new DownloadRetriever();
File sdkRoot = downloadRetriever.retrieve(SdkType.FONTKIT);
[19/50] [abbrv] git commit: [flex-utilities]
[refs/heads/as3httpclient-work] - - Added a "framework" artifact to the flash
converter - Made the Flex converter generate 3-digit versions - Added a
"maven-extension" module that buids a maven extension that
Posted by qu...@apache.org.
- Added a "framework" artifact to the flash converter
- Made the Flex converter generate 3-digit versions
- Added a "maven-extension" module that buids a maven extension that handles mavenization before maven starts to build.
Project: http://git-wip-us.apache.org/repos/asf/flex-utilities/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-utilities/commit/1edd30bd
Tree: http://git-wip-us.apache.org/repos/asf/flex-utilities/tree/1edd30bd
Diff: http://git-wip-us.apache.org/repos/asf/flex-utilities/diff/1edd30bd
Branch: refs/heads/as3httpclient-work
Commit: 1edd30bd04f1d693b9f5a9d0d8ce255fd57495e8
Parents: 6f2441d
Author: Christofer Dutz <ch...@codecentric.de>
Authored: Fri Apr 17 11:32:00 2015 +0200
Committer: Christofer Dutz <ch...@codecentric.de>
Committed: Fri Apr 17 11:32:00 2015 +0200
----------------------------------------------------------------------
.../converter/flash/FlashConverter.java | 11 +
.../utilities/converter/flex/FlexConverter.java | 2 +-
.../mavenextension/FlexSdkInitializer.java | 231 +++++++++++++++++++
mavenizer/pom.xml | 1 +
.../converter/retrievers/types/SdkType.java | 2 +-
5 files changed, 245 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/1edd30bd/mavenizer/converters/flash/src/main/java/org/apache/flex/utilities/converter/flash/FlashConverter.java
----------------------------------------------------------------------
diff --git a/mavenizer/converters/flash/src/main/java/org/apache/flex/utilities/converter/flash/FlashConverter.java b/mavenizer/converters/flash/src/main/java/org/apache/flex/utilities/converter/flash/FlashConverter.java
index a2c1831..776e0c6 100644
--- a/mavenizer/converters/flash/src/main/java/org/apache/flex/utilities/converter/flash/FlashConverter.java
+++ b/mavenizer/converters/flash/src/main/java/org/apache/flex/utilities/converter/flash/FlashConverter.java
@@ -244,6 +244,17 @@ public class FlashConverter extends BaseConverter implements Converter {
playerglobal.setPackaging("swc");
playerglobal.addDefaultBinaryArtifact(playerglobalSwc);
writeArtifact(playerglobal);
+
+ // Create a dummy pom artifact that references the playerglobal
+ // in order to consequently have a framework artifact for every
+ // part of flex.
+ final MavenArtifact framework = new MavenArtifact();
+ framework.setGroupId("com.adobe.flash");
+ framework.setArtifactId("framework");
+ framework.setVersion(version);
+ framework.setPackaging("pom");
+ framework.addDependency(playerglobal);
+ writePomArtifact(framework);
}
}
}
http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/1edd30bd/mavenizer/converters/flex/src/main/java/org/apache/flex/utilities/converter/flex/FlexConverter.java
----------------------------------------------------------------------
diff --git a/mavenizer/converters/flex/src/main/java/org/apache/flex/utilities/converter/flex/FlexConverter.java b/mavenizer/converters/flex/src/main/java/org/apache/flex/utilities/converter/flex/FlexConverter.java
index be8c000..4600b76 100644
--- a/mavenizer/converters/flex/src/main/java/org/apache/flex/utilities/converter/flex/FlexConverter.java
+++ b/mavenizer/converters/flex/src/main/java/org/apache/flex/utilities/converter/flex/FlexConverter.java
@@ -582,7 +582,7 @@ public class FlexConverter extends BaseConverter implements Converter {
final String build = root.getElementsByTagName("build").item(0).getTextContent();
// In general the version consists of the content of the version element with an appended build-number.
- return (build.equals("0")) ? version + "-SNAPSHOT" : version + "." + build;
+ return (build.equals("0")) ? version + "-SNAPSHOT" : version;
} catch (ParserConfigurationException pce) {
throw new RuntimeException(pce);
} catch (SAXException se) {
http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/1edd30bd/mavenizer/maven-extension/src/main/java/org/apache/flex/utilities/converter/mavenextension/FlexSdkInitializer.java
----------------------------------------------------------------------
diff --git a/mavenizer/maven-extension/src/main/java/org/apache/flex/utilities/converter/mavenextension/FlexSdkInitializer.java b/mavenizer/maven-extension/src/main/java/org/apache/flex/utilities/converter/mavenextension/FlexSdkInitializer.java
new file mode 100644
index 0000000..fecac35
--- /dev/null
+++ b/mavenizer/maven-extension/src/main/java/org/apache/flex/utilities/converter/mavenextension/FlexSdkInitializer.java
@@ -0,0 +1,231 @@
+/*
+ * 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.
+ */
+package org.apache.flex.utilities.converter.mavenextension;
+
+import org.apache.flex.utilities.converter.air.AirConverter;
+import org.apache.flex.utilities.converter.flash.FlashConverter;
+import org.apache.flex.utilities.converter.flex.FlexConverter;
+import org.apache.flex.utilities.converter.fontkit.FontkitConverter;
+import org.apache.flex.utilities.converter.retrievers.download.DownloadRetriever;
+import org.apache.flex.utilities.converter.retrievers.types.SdkType;
+import org.apache.maven.AbstractMavenLifecycleParticipant;
+import org.apache.maven.MavenExecutionException;
+import org.apache.maven.artifact.Artifact;
+import org.apache.maven.artifact.resolver.ArtifactResolutionRequest;
+import org.apache.maven.artifact.resolver.ArtifactResolutionResult;
+import org.apache.maven.execution.MavenSession;
+import org.apache.maven.repository.RepositorySystem;
+import org.codehaus.plexus.component.annotations.Component;
+import org.codehaus.plexus.component.annotations.Requirement;
+import org.codehaus.plexus.logging.Logger;
+
+import java.io.File;
+
+/**
+ * Created by christoferdutz on 16.04.15.
+ */
+@Component(role = AbstractMavenLifecycleParticipant.class, hint = "flex-sdk-initializer")
+public class FlexSdkInitializer extends AbstractMavenLifecycleParticipant {
+
+ public static final String AIR_GROUP_ID = "com.adobe.air";
+ public static final String FLASH_GROUP_ID = "com.adobe.flash";
+ public static final String FLEX_GROUP_ID = "org.apache.flex";
+ public static final String FONTKIT_GROUP_ID = "com.adobe";
+
+ public static final String FRAMEWORK = "framework";
+ public static final String COMPILER = "compiler";
+ public static final String FONTKIT = "fontkit";
+
+ public static final String POM = "pom";
+ public static final String JAR = "jar";
+
+ @Requirement
+ protected Logger logger;
+
+ @Requirement
+ private RepositorySystem repositorySystem;
+
+ @Override
+ public void afterProjectsRead(MavenSession session) throws MavenExecutionException {
+ super.afterProjectsRead(session);
+
+ // Get the maven local repo directory.
+ File mavenLocalRepoDir = new File(session.getLocalRepository().getBasedir());
+
+ logger.info(" \n" +
+ " `,;':, :';;; \n" +
+ " `:;''';' `++'';;, \n" +
+ " :;'''++;' .+'+''';;;\n" +
+ " : ;'''++++'' ,';+++''';'\n" +
+ " ,. `, ,. ..: , `, `'''+++##;'', ;;'+#+++''''\n" +
+ " ; ; ; ;; ;`: :,: ; ; ;'+++; #;;;;;:::;;;;+ +++'':\n" +
+ " ; ; : ;; ;., : : ;. ;;++# ';;;;;;;;;;+ .+++; \n" +
+ " `;: :; `;: :;: , :;` +;+# ,;;;:::::;: ;#+', \n" +
+ " ;++++:'++ : ;+,; ++;# +;::::::; ,+;;: \n" +
+ " ++++++,'++ `++' +'''` ;::::::, +:;;: \n" +
+ "`+++. '++ ++++++ +++ +++ ''''' ;::::: :;;;; \n" +
+ "+++` '++ ++++++++ +++` `++: :'';;; ;::` ::::: \n" +
+ "+++ '++ +++' :++: +++ +++ ;;;;;' :::::: \n" +
+ "+++ '++ +++ ++' `+++++` ;;;;;;: .:::::` \n" +
+ "+++++++ '++ +++:::+++. +++++ ;;;;;;; ,::::: \n" +
+ "+++++++ '++ +++++++++ :+++' ;;;;;;; ,::::: \n" +
+ "+++''' '++ +++;;;:` +++++ ;;;;;;` ::::::. \n" +
+ "+++ '++ +++ +++ +++ ;;;;;: :::::: \n" +
+ "+++ :++. ++++ ` :++, ,++; ''';;. `..: ::::;` \n" +
+ "+++ ++' +++++++ +++ +++ :'''; ,,,,,: ;;;;; \n" +
+ ";++` +++ ++++++ +++ +++ .+';+ :,,,,,,: `';;; \n" +
+ " ++' `+''' ::,,,,,::: ';;' \n" +
+ " :++ #;'' +:::,,,:::: .'':; \n" +
+ " ';;'' ::::::::::::' ,';;:.\n" +
+ " ;;;;''`;+;;::` .::;;'.,';;;;:\n" +
+ " `::;;;''':;; `;;;'';;;;;;\n" +
+ " :::;;;'';: ;;';;;;;:;\n" +
+ " ,:::;;;', ',;;;;::`\n" +
+ " .:::;:. ;:;;::: \n" +
+ " ::;, `,;;` \n");
+
+ logger.info("-------------------------------------------------------------------");
+ logger.info("- Intializing Apache Flex related resources");
+ logger.info("-------------------------------------------------------------------");
+ String flexVersion = session.getCurrentProject().getProperties().getProperty("flex.sdk.version", null);
+ String flashVersion = session.getCurrentProject().getProperties().getProperty("flash.sdk.version", null);
+ String airVersion = session.getCurrentProject().getProperties().getProperty("air.sdk.version", null);
+ boolean useFontkit = Boolean.valueOf(
+ session.getCurrentProject().getProperties().getProperty("flex.fontkit", "false"));
+
+ if (flexVersion != null) {
+ logger.info("flex.sdk.version = " + flexVersion);
+ Artifact flexFramework = resolve(FLEX_GROUP_ID, FRAMEWORK, flexVersion, POM, session);;
+ Artifact flexCompiler = resolve(FLEX_GROUP_ID, COMPILER, flexVersion, POM, session);
+
+ if (flexFramework == null || flexCompiler == null) {
+ logger.info(" - Installing");
+ // Use the Mavenizer to download and install the fex artifacts.
+ try {
+ DownloadRetriever downloadRetriever = new DownloadRetriever();
+ File flexSdkRoot = downloadRetriever.retrieve(SdkType.FLEX, flexVersion);
+ FlexConverter flexConverter = new FlexConverter(flexSdkRoot, mavenLocalRepoDir);
+ flexConverter.convert();
+ } catch (Exception ce) {
+ throw new MavenExecutionException(
+ "Caught exception while downloading and converting artifact.", ce);
+ }
+ } else {
+ logger.info(" - OK");
+ }
+ } else {
+ logger.info("flex.sdk.version = not set");
+ }
+
+ logger.info("-------------------------------------------------------------------");
+
+ if (flashVersion != null) {
+ logger.info("flash.sdk.version = " + flashVersion);
+ Artifact flashFramework = resolve(FLASH_GROUP_ID, FRAMEWORK, flashVersion, POM, session);
+
+ if (flashFramework == null) {
+ logger.info(" - Installing");
+ // Use the Mavenizer to download and install the playerglobal artifact.
+ try {
+ DownloadRetriever downloadRetriever = new DownloadRetriever();
+ File flashSdkRoot = downloadRetriever.retrieve(SdkType.FLASH, flashVersion);
+ FlashConverter flashConverter = new FlashConverter(flashSdkRoot, mavenLocalRepoDir);
+ flashConverter.convert();
+ } catch (Exception ce) {
+ throw new MavenExecutionException(
+ "Caught exception while downloading and converting artifact.", ce);
+ }
+ } else {
+ logger.info(" - OK");
+ }
+ } else {
+ logger.info("flash.sdk.version = not set");
+ }
+
+ logger.info("-------------------------------------------------------------------");
+
+ if (airVersion != null) {
+ logger.info("air.sdk.version = " + airVersion);
+ Artifact airFramework = resolve(AIR_GROUP_ID, FRAMEWORK, flexVersion, POM, session);
+ Artifact airCompiler = resolve(AIR_GROUP_ID, COMPILER, flexVersion, POM, session);
+
+ if (airFramework == null || airCompiler == null) {
+ logger.info(" - Installing");
+ // Use the Mavenizer to download and install the airglobal artifact.
+ try {
+ DownloadRetriever downloadRetriever = new DownloadRetriever();
+ File airSdkRoot = downloadRetriever.retrieve(SdkType.AIR, airVersion);
+ AirConverter airConverter = new AirConverter(airSdkRoot, mavenLocalRepoDir);
+ airConverter.convert();
+ } catch (Exception ce) {
+ throw new MavenExecutionException(
+ "Caught exception while downloading and converting artifact.", ce);
+ }
+ } else {
+ logger.info(" - OK");
+ }
+ } else {
+ logger.info("air.sdk.version = not set");
+ }
+
+ logger.info("-------------------------------------------------------------------");
+
+ if (useFontkit) {
+ logger.info("flex.fontkit = true");
+ Artifact fontkit = resolve(FONTKIT_GROUP_ID, FONTKIT, "1.0", JAR, session);
+
+ if (fontkit == null) {
+ logger.info(" - Installing");
+ // Use the Mavenizer to download and install the airglobal artifact.
+ try {
+ DownloadRetriever downloadRetriever = new DownloadRetriever();
+ File fontkitRoot = downloadRetriever.retrieve(SdkType.FONTKIT);
+ FontkitConverter fontkitConverter = new FontkitConverter(fontkitRoot, mavenLocalRepoDir);
+ fontkitConverter.convert();
+ } catch (Exception ce) {
+ throw new MavenExecutionException(
+ "Caught exception while downloading and converting artifact.", ce);
+ }
+ } else {
+ logger.info(" - OK");
+ }
+ } else {
+ logger.info("flex.fontkit = not set or set to 'false'");
+ }
+
+ logger.info("-------------------------------------------------------------------");
+ logger.info("- Finished initializing Apache Flex related resources");
+ logger.info("-------------------------------------------------------------------");
+ }
+
+ public Artifact resolve(String groupId, String artifactId, String version, String type, MavenSession session) {
+ Artifact artifact =
+ repositorySystem.createArtifact(groupId, artifactId, version, type);
+ if (!artifact.isResolved()) {
+ ArtifactResolutionRequest req = new ArtifactResolutionRequest();
+ req.setArtifact(artifact);
+ req.setLocalRepository(session.getLocalRepository());
+ req.setRemoteRepositories(session.getRequest().getRemoteRepositories());
+ ArtifactResolutionResult res = repositorySystem.resolve(req);
+ if (!res.isSuccess()) {
+ return null;
+ }
+ }
+ return artifact;
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/1edd30bd/mavenizer/pom.xml
----------------------------------------------------------------------
diff --git a/mavenizer/pom.xml b/mavenizer/pom.xml
index e781a91..285bb78 100644
--- a/mavenizer/pom.xml
+++ b/mavenizer/pom.xml
@@ -61,6 +61,7 @@
<module>converters</module>
<module>deployers</module>
<module>cli</module>
+ <module>maven-extension</module>
</modules>
<build>
http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/1edd30bd/mavenizer/retrievers/base/src/main/java/org/apache/flex/utilities/converter/retrievers/types/SdkType.java
----------------------------------------------------------------------
diff --git a/mavenizer/retrievers/base/src/main/java/org/apache/flex/utilities/converter/retrievers/types/SdkType.java b/mavenizer/retrievers/base/src/main/java/org/apache/flex/utilities/converter/retrievers/types/SdkType.java
index c6c1986..5ea0ba8 100644
--- a/mavenizer/retrievers/base/src/main/java/org/apache/flex/utilities/converter/retrievers/types/SdkType.java
+++ b/mavenizer/retrievers/base/src/main/java/org/apache/flex/utilities/converter/retrievers/types/SdkType.java
@@ -21,9 +21,9 @@ package org.apache.flex.utilities.converter.retrievers.types;
*/
public enum SdkType {
+ FLEX,
FLASH,
AIR,
- FLEX,
FONTKIT
}
[08/50] [abbrv] git commit: [flex-utilities]
[refs/heads/as3httpclient-work] - FLEX-34756 Adding a unit test that
reproduces the bug, and its supporting files.
Posted by qu...@apache.org.
http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/daf48a05/Squiggly/main/SpellingUIEx/tests/com/adobe/linguistics/spelling/dictionaries/en_GB/en_GB.dic
----------------------------------------------------------------------
diff --git a/Squiggly/main/SpellingUIEx/tests/com/adobe/linguistics/spelling/dictionaries/en_GB/en_GB.dic b/Squiggly/main/SpellingUIEx/tests/com/adobe/linguistics/spelling/dictionaries/en_GB/en_GB.dic
new file mode 100644
index 0000000..d002789
--- /dev/null
+++ b/Squiggly/main/SpellingUIEx/tests/com/adobe/linguistics/spelling/dictionaries/en_GB/en_GB.dic
@@ -0,0 +1,46281 @@
+46280
+abaft
+abbreviation/M
+abdicate/DNGSn
+Abelard/M
+abider/M
+Abidjan
+ablaze
+abloom
+aboveground
+abrader/M
+Abram/M
+abreaction/MS
+abrogator/MS
+abscond/DRSG
+absinthe/MS
+absoluteness/S
+absorbency/SM
+abstract/ShTVDPiGY
+absurdness/S
+Abuja/M
+Abyssinia/M
+Acadia
+accede/SDG
+accept/BDSRVGkhl
+acceptable/P
+accepted/U
+accommodate/DGnkSNVu
+accommodating/U
+accompanier/M
+accomplish/RLSGD
+accordion/MS3
+accost/DSG
+accountant/SM
+accrual/MS
+accurately/I
+accusal/M
+achene/SM
+achievable/U
+achieves/c
+acidification/M
+acidulous
+acoustical
+acquaintance/SM
+acquisition/MA
+acridity/SM
+acrobatics/M
+actinic
+actinide/MS
+actively/IA
+activity/SMI
+Acton/M
+actual/q8YSQ-
+adagio/S
+adaptation/M
+add/RDGS7
+additivity
+Adele/M
+adhere/DGRS
+adherence/MS
+adjudicator/MS
+adjunct/SYMV
+adjuration/M
+adjust/RLDlGS7V
+Adler/M
+administratrix/M
+admiralty/SM
+admiration/M
+adobe/NvVSMX
+adopted/AU
+adoption/M
+adorned/U
+adrenal/Y
+adrift
+adumbrate/VSGnvDN
+Adventist's
+adverse/yTDYGP
+advertise/LJ
+adze/DMSG
+Aegean/M
+Aeneas
+aerialist
+aerodrome/SM
+aerodynamic/SY
+aero-engine/MS
+affectedly/U
+affective/M
+affinity/MS
+affirmed/A
+affix/DSG
+affray/MSDG
+affricative/M
+aforesaid
+after/S
+age's/e
+agility/MS
+agitator/MS
+agnostic/MS
+agnosticism/SM
+agreeableness/ES
+agriculturalist
+Agrippa/M
+AI
+Aiken/M
+ain't
+airflow/MS
+airsick/P
+airtime
+airway/MS
+ajar
+alabaster/SM
+Alamo/S
+alanine/M
+Alaric/M
+alarm/3DGkS
+albacore/SM
+albedo/M
+albeit
+album/MS
+Aldridge/M
+alewife/M
+Alexia/M
+Alexis
+Alfonso/M
+Alger/M
+Algiers
+alienation/M
+alinement's
+alkyd/S
+Allah/M
+all-day
+allegation/M
+allergen/MSW
+alleyway/MS
+allies/M
+allocator/KSC
+allots/A
+allowable/P
+all-star
+Allstate
+alms/m
+alnico
+aloft
+along
+alpine/S
+al-Qa'ida/M
+Alsace/M
+alternation/M
+Alton/M
+alumni
+alundum
+alveolus/M
+AMA
+amanuenses
+Amazonian
+ambergris/MS
+Amdahl/M
+Amherst/M
+amide/MS
+amir's
+Amish/M
+amoral
+amorphous/PY
+amortise/nSGD
+amortize/nNSGD
+amour/MS
+amphibian/MS
+amphibology/M
+ample/PT
+amplification/M
+anarchy/3Ww1SM
+anastigmatic
+Andaman/M
+aneroid
+Anglican/MS
+Anglicanism/M
+Anglicise/nSGD
+Anglicize/nNSGD
+Anglophobia/M
+angularity/MS
+anhydrous/Y
+animate/DnASNG
+animated/Y
+anisette/SM
+annalen
+annihilator/SM
+anorak/SM
+anorexia/MS
+antediluvian/S
+anthem/MdS
+anthropometric/S
+anthropometry/WM
+antibody/MS
+anticompetitive
+antidemocratic
+antiformant
+antigenicity/SM
+Antigua/M
+Antioch/M
+antipasti
+antipodal/S
+antiquarian/MS
+antiquarianism/MS
+antisepses
+antisocial/Y
+antitrust/M
+antral
+anyway
+apace
+aphasic/S
+aphid/MS
+apiece
+apocrypha/oM
+apogee/SM
+Apollo/M
+apology/SQ8s9M3
+apostle/MS
+apotheoses
+Appian
+appliqu�d
+apply/vnNRGDSV
+appraisal/AMS
+appraise/AGSD
+appreciate/vyGVDNnuS
+apprehended/a
+approbation/MES
+Apr
+apsis/M
+aptness/IS
+aquaria
+aquiculture's
+aquiline
+Arabia/M
+Arafat/M
+arbutus/MS
+arcane/Y
+arcaneness
+arch/yTDRYSPGM
+archaist/MS
+archery/M
+Archimedes
+Argentine/SM
+argon/M
+arguable/YIU
+argumentativeness/S
+ark/MS
+armour-plate/D
+armpit/MS
+Arne/M
+around
+array/EGMSD
+arrhythmia/SM
+arrowhead/SM
+arsenate/M
+arsine/MS
+arsonist
+art/6MjZ32pS
+arteriolar
+artesian
+Artie/M
+artifice/oMRS
+artillery/3mSM
+artist/W1y
+asbestos/SM
+ascertain/L7SDG
+ASCII
+ascription/M
+Asiatic/MS
+asp/MWS
+aspect/MS
+asphyxiate/SDG
+asplenium
+assail/7DSG
+assassination/M
+assembles/A
+assembling/A
+assignee/MS
+assignor/SM
+associate/EDSGnN
+associativity/S
+assurance/SAM
+Assyria/M
+Assyriology
+Astana/M
+asterisk/SDGM
+astigmatism/MS
+astride
+astrophysicist/SM
+at/F
+atelier/SM
+Atlanta/MW
+Atman/M
+atoll/MS
+atomic/Y
+atonal
+atonality/SM
+atrial
+attaches/A
+attend/SRGD
+attendance/MS
+attentional/Y
+attentive/PIY
+attenuate/GnSDN
+attic/MS
+attorney/MS
+attractive/UY
+attractiveness/SM
+attribute/xGVvDS
+attrition/SM
+aubergine/MS
+Auckland/M
+audaciousness/S
+audibly/I
+audio/M
+audiometry/M
+audited/U
+auditorium/SM
+Aug
+augment/NnDRGS
+augmentation/M
+augury/SM
+Augusta/M
+Augusts
+Australasia/M
+Australia/M
+authorised/AU
+authoritative/YP
+autocrat/MWS1
+autodialler
+automata
+automotive
+autoregressive
+avalanche/GSMD
+avaunt/S
+avitaminoses
+aweigh
+awes/c
+awfulness/S
+axe/DmMGS
+axial/FY
+Ayr/M
+babble/RGDS
+babysit/RSG
+bacchanal/SM
+Bacchanalian/S
+backfield/MS
+backfill/SGD
+backlasher
+backscatter/dMS
+backslapper/SM
+backstop/MSGD
+backward/PSY
+bade
+bail/7MDGS
+bailey/S
+bailiff/MS
+balanced/cAeU
+balboa/MS
+Balearic/M
+ballistics/M
+balloon/3RSMDG
+balsa/SM
+balsam/dMS
+banality/SM
+Banbridge/M
+bandeaux
+banded/E
+Bangkok/M
+banish/GSLD
+bannister/SM
+banquette/MS
+bans/U
+banshee/SM
+banter/kdS
+banterer/M
+baptism/oSM
+bar/CDESUG
+barbarous/YP
+barbell/MS
+bareback
+bargepole/M
+barley/MS
+Barrett/M
+Barrow-in-Furness
+barycentre/MW
+baryon/MS
+baseball/SM
+baseband
+Basel/M
+bases/C
+bash/Sj6DG
+basilar
+basin/6MS
+basinful/S
+basing/C
+Basingstoke/M
+basswood/SM
+baste/nSN
+batcher
+bathtub/SM
+bathwater
+Bator/M
+battleship/SM
+baulky/TP
+bayonet/dMS
+bayou/SM
+Bea/M
+beady/T
+beagle/DGSM
+bearish/YP
+Beaujolais
+beautify/WNRSDnG
+because
+bedazzle/DLSG
+bedbug/SM
+bedrock/SM
+bedspread/MS
+Bedworth/M
+Beethoven/M
+befuddle/LSDG
+begonia/SM
+begrime/SDG
+begrudge/GDSk
+Beijing/M
+being/SM
+belabour/DGSM
+belate/Dih
+belief's/U
+believing/U
+belittle/GLDS
+bellboy/SM
+bell-hop's
+bell-ringer/S
+bellwether/MS
+Belmont/M
+belted/U
+Belton/M
+beltway/SM
+benedictory
+benefactor/SM
+benignant
+beribboned
+Berman/M
+Bernard/M
+Bernhard/M
+berserk/S
+Berwick/M
+beryl/MS
+beryllium/M
+bespatter/dS
+bespeak/GS
+bestial/Y
+bestride/SG
+bet/MRGSD
+Beth/M
+Bethany/M
+Betsey/M
+between/PS
+bewigged
+bicarbonate/MS
+bid/RMZdGJS
+bidet/SM
+bifocal/S
+biggish
+bigot/ydSM
+bilge/DGMS
+bilingualism/MS
+billboard/SGDM
+Billie/M
+biophysics/M
+birdhouse/SM
+birdieing
+birdseed/SM
+Birgit/M
+Biro/M
+Biscay/M
+biserial
+Bishkek/M
+bishop/dSM
+Bismarck/M
+bitch/GZDSz2M
+BITNET
+bitten
+biweekly/S
+biyearly
+blabber/d
+black-hearted
+blackjack/MSDG
+blameworthiness/S
+blank/PDGSTY
+blasting/M
+blastoff/SM
+blatant/Y
+bleater/M
+blend/RGSD
+blessing/M
+blew
+Bligh/M
+blip/DGMS
+blithe/YTP
+blitz/GSDM
+blitzkrieg/SM
+blockbusting/M
+Bloemfontein/M
+blood-letting/SM
+bloodstain/DMS
+bloodstream/SM
+blossomy
+blow-up/SM
+bluffness/S
+boar/MS
+board/RMGDSJ
+boastfulness/S
+bobtail/SMGD
+bodkin/MS
+body-colour
+body-piercing
+bog/GDMZS
+bohemian/S
+bola/SM
+bolero/MS
+bolter/M
+Boltzmann/M
+bondage/MS
+Boniface/M
+boniness/S
+bonsai/M
+booking/M
+bookshop/MS
+booth/MS
+Bootle/M
+bootlegging/M
+boozy/T
+bop/RGDS
+Borealis
+Boris/M
+born-again
+borosilicate/M
+Bose/M
+Botham/M
+bottommost
+botulinus/M
+boudoir/MS
+boutonni�re/SM
+boxy/T
+boy/MS
+brachia
+bract/MS
+Braille/M
+brain-dead
+brambling/M
+Brannon/M
+brassiness/S
+bravado
+brave/DYyTGPS
+bravery/SM
+bravest/M
+breakage/MS
+breakthrough/MS
+break-up/S
+breakwater/SM
+breastbone/SM
+brecciated
+breech-loaded
+Breton/M
+bride/SM
+Bridget/M
+Bridgnorth/M
+bridle/MGSD
+brigade/GDSM
+brigandage/SM
+brigantine/SM
+Brighton/M
+brinkmanship/MS
+broadcast/SARG
+broadloom/MS
+broadness/S
+broil/GRSD
+broker/d
+brokerage/MS
+bromide/SMW
+bronchus/M
+brood/GM2ZRSDk
+brougham/SM
+brownish
+brows/SDRBG
+bruit/S
+brusqueness/S
+Bryn/M
+buccaneer/GDSM
+bucker/M
+buckminsterfullerene
+bucksaw/MS
+bucolic/YS
+buffer/rd
+bufflehead/M
+buffoonish
+build/RGJS
+Bulgarian/MS
+bulgy/T
+bulker
+bumpkin/MS
+bunion/SM
+buoyant/Y
+burdened/Uc
+burdock/MS
+burg/RSM
+burgle/SDG
+burial/SAM
+Burlington/M
+burned/U
+burnish/RSGD
+burntness
+burp/MDSG
+bury/ADSG
+bus/MAS
+Busch/M
+bushiness/S
+bushland
+bushwhacking/M
+business/m5S
+businesslike
+businessperson/S
+busywork/SM
+buttonholer/M
+Buxtehude/M
+buzzword/SM
+by
+by-election/S
+Byrne/M
+c/nN
+cab/GMDXVSN
+cablegram/SM
+cactus/MS
+caecum/M
+Caesar
+cagiest
+cahoot/MS
+Caisos
+cajole/RLyDSG
+calcite/SM
+CALCOMP
+Calder
+caldera/SM
+caldron's
+calender/dMS
+calibrate/SAGDN
+calibrater's
+calico/M
+calla/SM
+callback/S
+calliper/SM
+callowness/S
+calls/aA
+calorie/SM
+calorific
+calyces's
+Camberley/M
+Camden/M
+camelhair's
+Campbellsport
+camp-site/SM
+campus/MS
+Canaan/M
+caning/M
+canniness/S
+cannon/dSM
+canonical/Q8q-
+can't
+canted/AI
+canvas/MRGDS
+capon/SM
+cappuccino/SM
+caps/8
+capsular
+captaincy/MS
+captioner
+captivate/SDG
+carboy/MS
+carbuncle/DSM
+card-carrying
+cardioid/M
+caribou/M
+Carmen/M
+carnal/Y
+carnival/SM
+carol-singing
+Carpathian/S
+carpentry/SM
+carrageen/M
+carried/a
+carrot/MS
+carsick/P
+Carson
+cart/RMD6GS
+cartload/MS
+caryatid/SM
+Carys
+cased/U
+Casey/M
+Cassels
+caster/nN
+casts/aAe
+casualness/S
+cat/M2ZzDGS
+catalepsy/MS
+catch-all/SM
+catchphrase/S
+catechism/MS
+catharsis/M
+cathedral/SM
+Catherine
+Cathy
+Caucasoid
+cavil/SDRGJ
+cc
+celandine/SM
+celebratedness/M
+cellar/dMS
+celluloid/MS
+centaur/MS
+centime/SM
+centurion/SM
+Cephalochordata
+Cephalopoda
+ceramic/3MS
+cerebellar
+cerebra/no
+cerise/MS
+cerium/M
+cermet/SM
+certification/MCA
+certiorari/M
+cession/FMAK
+CFO
+cha/Wy
+chalkboard/MS
+chammy's
+Chancellorship/S
+chances/a
+chanciness/S
+chandelier/MS
+chanson/SM
+chapbook/MS
+Chapman
+character/sQ98t+dpq6-MS
+charitable/UY
+charlatanism/SM
+chasm/SM
+ch�telaine/MS
+chauffeur/DSMG
+checkmate/MDSG
+checkout/S
+checksum/GMSD
+cheek/2GMzDZS
+cheekiness/S
+cheerleader/SM
+chelate/DnMNG
+chemosynthesis
+chemurgy/SM
+cheque/RSM
+chert/SM
+cherub/SMW
+Cheryl/M
+chevalier/MS
+chew/GRZ2S7D
+chickenfeed
+chickenpox/SM
+child/pM
+childlike/P
+China/Mm
+chine/SM
+chip/GMJZDS
+choir/GSDM
+cholera/MSW
+chomp/SDG
+Chopin
+choppiness/S
+choppy/TP
+chorale/MS
+choreography/MS
+chose
+Christ/M
+chromatics/M
+chromatograph/ZW
+chromium/SM
+chromosomal
+chronograph/ZSM
+Chrysler
+chum/2DzMZSG
+chunky/TP
+churchgoing/SM
+cinchona/SM
+circler/M
+circuit/MdS
+circuital
+circuitry/MS
+circuity/SM
+circulant
+circumcised/U
+circumciser/M
+circumflex/DSGM
+cl/GJ
+clairvoyant/SY
+clang/DRGS
+Clara
+Clarence
+classiness/S
+classing/e
+claustrophobic
+clearance/MS
+Clement/SM
+Cline
+clinometer/SIM
+cliometrician/S
+clipboard/SM
+Cliveden
+cloak-and-dagger
+cloaked/U
+cloister/MdS
+close-cropped
+closer/ESM
+clothesline/SGDM
+clothesman
+cloudless/PY
+cloudy/TP
+clown/SDGM
+clubbing/M
+clubhouse/MS
+clunk/DRM2GzZS
+coachloads
+coaler/M
+coal-fired
+coalitionist
+coarse/TPY
+coastal
+coastline/MS
+cocaine/SM
+cock-a-hoop
+cockatoo/SM
+cockpit/MS
+cockroach/SM
+cock-shy
+code/CDaAGS
+codebook/S
+codebreak
+codebreaker
+codename/D
+codpiece/MS
+coeval/SY
+cogent/Y
+cogitation/M
+cognition/AMKS
+cognoscenti
+coil/USADG
+Cointreau
+coital/Y
+cold-bloodedness
+coldish
+coldness/S
+Cole/M
+coleus/MS
+collaborative/S
+collectible/S
+collegial
+colloquium/SM
+colloquy/Mo
+coloratura/SM
+Colosseum
+colostomy/SM
+colour-code/D
+comae
+combat/vVu
+combed/U
+combustibility/SM
+come/RIGJS
+comedian/SM
+comfortableness/S
+comfy/T
+commemorate/NDvSVGn
+commemorator/S
+commercial/qQ8S-
+commercialness
+commiserate/VNnDGS
+commission/CRDSG
+commonly/U
+commonplace/P
+commons/M
+common-sense
+communicability/SM
+communicable/I
+communicated/a
+companion/DG7lMS
+compendia
+compensated/U
+compensator/M
+complainant/SM
+compliance/SM
+complicator/MS
+composition/CM
+comprehension/IMS
+comprehensiveness/S
+compress/XvNVhxb
+computed/AK
+computing/A
+concede/Rh
+conceiver/M
+conceptuality/M
+concerto/SM
+conchs
+conciliar
+conclusion/M
+concordant/Y
+concrete/GPYNDSnM
+concubinage/SM
+concupiscent
+concussion/M
+condescend/NXk
+conditionally/U
+condition's/K
+condolence/MS
+conducive/P
+conductance/4
+conductibility/MS
+conductor/SM
+conductress/MS
+coney's
+confabulation/M
+confederate/M
+conferee/MS
+confidential/PY
+confiner/M
+confirmed/PY
+conflagration/SM
+confr�re/SM
+confront/NRnx
+Confucian
+confusable
+confutation/M
+confuter/M
+congested/U
+congregate/GNnSD
+conjugacy
+conjugateness
+conjunctive/S
+conjuration/M
+connectivity/SM
+consent/SRGkD
+conservative/PS
+consigns/A
+consist/SGD
+consistent/IY
+console/RNkn7
+consonance/IM
+conspiracy/SM
+constant/IY
+constellation/MS
+constituency/MS
+constitute/DASG
+consulship/SM
+consultees'
+consumable/S
+consumer/3
+consummated/U
+consumptive/S
+contaminate/NVGDnS
+contamination/MCS
+contemporaneous/PY
+contemptible/Y
+continence/IMS
+contort/VDG
+contradict/SGyD
+contralto/SM
+contrapositive/S
+contrapuntal/Y
+contrariwise
+controllability/M
+convenient/YI
+conventionalist
+conversant/Y
+conversazione/M
+convert/RSbDG
+convex/Y
+conviction/MS
+convincing/UY
+convolution/C
+co-operant
+co-operative/SP
+cootie/MS
+copay/S
+coplanar
+Copland
+coprolite/M
+coralline
+Corbie
+cordage/MS
+cordon/dSM
+co-religionist
+Corfu/M
+corked/U
+cornfield/MS
+cornflour/M
+cornmeal
+corollary/SM
+coronary/S
+coroner/MS
+corps/SM
+Corrigan
+corruption's/I
+corsage/MS
+corset/dSM
+cort�ge/SM
+cortex/M
+Costa
+cotangent/SM
+Cotswold/M
+cottonwood/SM
+cottony
+Coulthard
+counsel/MDJGS
+countenancer/M
+counterargument/SM
+counter-espionage/SM
+counterforce/M
+counter-offensive/MS
+counter-revolution/ySM
+counter-revolutionary/MS
+counter-tenor/SM
+counterweight/GMSD
+counting/Ea
+counts/AaEf
+coupled/U
+courier/MGDS
+courtliness/S
+cove/RDGMS
+covenanter/M
+coverage/SM
+covetousness/S
+cow-pat/SM
+crackpot/MS
+crafter
+craftspeople
+craftspersons
+Cranfield/M
+craver/M
+craw/YSM
+crawl/SRDG
+crayfish/SGDM
+cream/ZDRS2zMG
+creamy/PT
+creativeness/S
+creator/SM
+credibly/I
+credo/MS
+creed/SM
+creedal
+crenelation/M
+creole/MS
+cr�pey
+crept
+crescent/MS
+Crestview
+Crete
+criminology/3wMS
+crimson/SMd
+cringe/GSD
+criss
+critique/MGSD
+crochet/dJSZr
+crocodile/MS
+crocus/MS
+croissant/SM
+croquette/MS
+crossfire/MS
+crossing/MS
+crosspoint
+cross-sectional
+cro�ton/SM
+crowbait
+crowd/cSDG
+crowfeet
+crudeness/S
+crudit�s
+crumbly/TP
+crutch/SDGM
+crux/M
+crybaby/MS
+cryogenic/S
+cryptography/W1SM
+Cryptozoic
+crystalline/S
+cubic/S
+cubit/SM
+cul/DG
+cull/S
+Cullen/M
+culmination/M
+culpa/SM
+culpable/YP
+cultivable
+cultivatable
+cumbersomeness/S
+cumbrous
+cumin/SM
+Cummings
+cumulus/M
+cupboard/MS
+cupola/DSGM
+curatorships
+curiosity/SM
+curiousness/S
+curlew/SM
+curlicue/SDMG
+curly/PT
+Curran/M
+cursory/K
+curve/SZGDM
+cushy/T
+cussed/EF
+cutlery/MS
+cyanide/SMGD
+cyclohexanol
+cylinder/wS1M
+cynical
+cypher/dSM
+czarevitch/M
+dad/MZS
+daffodil/SM
+Daguerre
+dainty/TSYP
+dairyland
+dais/SZM
+Daley/M
+dam/MDGS
+damageable
+Darcy/M
+darkness/S
+Darlene
+darling/PMS
+darnedest
+Daryl/M
+database/DMGS
+daughter/YMS
+daughters-in-law
+Davie
+daycare/S
+day-to-day
+daze/DiSGh
+DCB
+deaconess/SM
+deadbolt/S
+deadlock/MGSD
+deafening/M
+dean/MGD
+deanery/SM
+Dearing/M
+death-knell
+deathless/Y
+death-toll/M
+debauchery/SM
+debilitation/M
+debonair/PY
+Debussy/M
+decade/SM
+decadent/Y
+December/SM
+decilitre/MS
+decimetre/MS
+decision-making
+declarator/SM
+d�class�e
+decomposable/I
+decoration/ASM
+decorative/P
+dedication/M
+dedicator/MS
+deejay/GDSM
+deep/TPYS
+deep-frozen
+deep-rooted
+defend/Vuv
+define/KSDAG
+definitive/SP
+deform/xnR7GN
+deformity/SM
+deftness/S
+DeKalb
+delegable
+delete/NDnSG
+deletion/M
+deliberateness/S
+delightful/P
+delinquent/YSM
+delirious/PY
+delusion/M
+delve/RSDG
+demeanour
+d�mod�
+demonology/M
+demonstrativeness/MS
+demureness/S
+denominate/x
+densitometry/M
+dentist/MSy
+deny/DR7kGS
+deoxyribonucleic
+department/o
+departure/SM
+d�pays�
+dependability/MS
+dependable/P
+deplorer/M
+depraved/P
+depressant/S
+depressor/MS
+derision/M
+dermatitis/MS
+derogation/M
+Derry
+descendent
+description/M
+descriptor/SM
+desertification
+designation/M
+desire/BRl
+Desmond/M
+desolation/M
+despatch/GDS
+despondence/SZ
+destructible/I
+desultory/YP
+detach/GRSiLhD7
+detected/U
+detector/SM
+deterioration/M
+determinacy/I
+determinant/MS
+determined/P
+determiner/KMS
+detonated/U
+detox/SGD
+detritus/M
+Deutsch
+devastate/DNSnkVG
+devastation/M
+deviance/MSZ
+deviation/M
+devilish/PY
+devious/YP
+Dewey
+dewy/TP
+Dhaka/M
+dhoti/MS
+diabetes/M
+diagnose/DGaS
+diagnosis/a
+dialect/wWSo1M
+diam
+diarrhoea/SMW
+diaspora
+dice/DnSGN
+dichotomous/Y
+Dictaphone
+didactic/SY
+didactics/M
+Diderot
+Dido/M
+differ/Sd
+diffidence/MS
+digestibility/SM
+digit/q-s9SQ8M
+dignified/U
+digraph/SM
+digress/uNvDSGXV
+diktat/SM
+dilemma/SM
+dimension/DGpMoS
+diminuendo/MS
+dinghy/MS
+dioptre/SM
+dioxide/SM
+dioxin/S
+diplomat/3MS
+dipstick/MS
+dirndl/SM
+disbursal/S
+disciplinary
+disclaim/7
+discoth�que/MS
+discreet/PIY
+discuss/N7X
+disfigure/L
+dishcloth/MS
+disillusion/LDG
+disinterested/P
+Disneyland
+dispersive/P
+dispirited/Y
+disputably/I
+disputant/MS
+disruptor/M
+dissent/RGDS
+dissoluble/I
+dissolve/AGDS
+dissolved/U
+distastefulness/S
+distend/XN
+distillation/M
+distraught/Y
+distributable
+distribution/ASM
+distributional
+disturbed/U
+diva/SM
+divalent/S
+divergence/MS
+divers/NX
+diversion/My
+dividable
+divisiveness/S
+dobbin/MS
+documentation/M
+dodder/dSZ
+dodecahedra
+dodgy/T
+dog-clutch
+dog-collar/SM
+dogged/P
+dogmatics's
+dogs/f
+doing/aS
+domain/MS
+dominate/KNDSG
+Dominica/M
+Dominican/SM
+don't
+dopa/SM
+Dorian
+dork/ZS
+dormancy/SM
+dormitory/SM
+Dorset/M
+doss-house
+dot/M2ZdDkrGS
+double-glazed
+doubleness
+doubles/A
+doubloon/MS
+dowager/MS
+dowel/DSGM
+downfall/SM
+downplay/DGS
+downrange
+dozer/M
+drabness/S
+dragger/M
+drainage/SM
+draining-board/SM
+drainpipe/MS
+dram/w1SMW
+dramatics/M
+drape/RSDGy
+draughtsperson
+drawback/SM
+drawee/MS
+draws/ecA
+dreamland/SM
+dressy/TP
+drip-dry
+drizzle/GDSMkY
+drogue/MS
+dromedary/SM
+drudge/kyMSDG
+drumstick/SM
+Dryden
+duchy/MS
+duck/GDZSMJ
+duct/CDISGF
+due/MoPS
+duel/RMDGJS
+dugout/SM
+dumbfound/SGD
+Dumont
+dump/DR2GZS
+dun/TDGS
+dunce/SM
+dunderhead/SM
+durability/SM
+Durex
+dustiness/S
+duxes
+dwelling/M
+dwindle/SGD
+dybbuk/SM
+dyeing/M
+dyke/SM
+dyslexia/SM
+dyspepsia/SM
+dyspeptic/S
+earache/MS
+earnestness/S
+earning/M
+earthquake/MS
+earth-shattering
+ease/EDMSG
+EastEnders
+easterly/S
+eavesdrop/RDSG
+ebb/GDS
+eccentric/MSY
+Echinodermata
+�clat/M
+ectopic
+ecumenical/Y
+edge/DZMGRpSJ
+Edgewood
+edict/SM
+edifice/SM
+Edison
+editor/FMS
+Eduard
+educ/nNxV
+educated/cfU
+educe/DNG7S
+effendi/SM
+effeteness/S
+efflorescence/SM
+effrontery/MS
+effulgence/MS
+Egerton
+eggplant/SM
+egocentric/YS
+egregious/YP
+egret/SM
+Egyptian/S
+Egyptology
+eiderdown/SM
+eigenvector/MS
+eighty-seven/H
+eighty-three/H
+eisteddfodau
+elaborateness/S
+elastic/SQ8Y
+Elba
+elbowroom/MS
+elder/SY
+elected/U
+election/SM
+electrical/P
+electrocardiograph/MSZ
+electrolyse/GWSD
+electrolysis/M
+electromyographic/Y
+electron/SW1M
+electronegative
+electroweak
+elegance/ISM
+elephantiasis/M
+Elgar/M
+eliminate/SVnNDG
+eliteness
+elixir/MS
+Elmsford
+elongate/GnSND
+Elroy
+elsewhere
+elude/DuVGvS
+elution/M
+elver/MS
+Elys�e/M
+Elysium
+em/M
+embank/GLSD
+embarcadero
+embassy/MS
+embed/SDGJ
+embedder
+embellished/U
+embellisher/M
+emeriti
+Emerson
+Emilio/M
+Emory
+emotionalism/SM
+emperor/MS
+empiricism/MS
+empiricist
+employed/fUA
+employing/A
+employs/A
+empress/SM
+empty/SGDTP
+emu/MS
+emulate/nDVGSvN
+encase/GDLS
+enchain/DGS
+encipher/Sd
+enclosure/MS
+encomium/SM
+encyst/GLDS
+endocrine/S
+endorphins
+enduring/P
+enforcible/U
+Englander/S
+engraving/M
+Enid/M
+enjambment/MS
+enlightened/U
+enliven/LSd
+enormous/PY
+enshroud/SDG
+entente/MS
+entomb/DLGS
+enunciable
+enunciate/GSnDN
+environ/LdS
+environmental/3
+Ephesus
+epic/MSY
+epigenetic
+epinephrine/SM
+Epping
+equipage/SM
+equipped/UA
+equiv
+era/MS
+erasure/SM
+ergo
+Eric/M
+Eriksson/M
+erode/VDuNGxXSb
+erosive/P
+escadrille/M
+espionage/SM
+espousal/MS
+Essex/M
+Esterh�zy/M
+etch/RGSDJ
+ethanol/M
+ether/MQ8S
+Ethernet/MS
+ethnocentric
+ethylene/M
+Etruscan
+ETSI
+euphemism/SM
+euphoria/MS
+Euphrates
+eureka/S
+Europe/M
+euthanasia/SM
+evadable
+evangelic/Y
+Evangeline
+evenly/U
+evensong/MS
+eventfulness/S
+everyday/P
+evict/SGD
+evolute/SM
+exact/PSGYTDk
+exactitude/ISM
+exactness/IS
+example/MDGS
+exceptionable/U
+exceptional/UY
+excretory/S
+exculpate/SDNnyG
+excusable/IP
+excuse/RlGDS
+executive/MS
+exempt/DGS
+exertion/SMc
+exhaustible/I
+exhortation/M
+exigency/SM
+existent/F
+Exmoor/M
+exocrine
+exogamy/M
+exonerate/nSNVDG
+exotica
+expand/BDRXVNvGSu
+expediently/I
+expel/DSn7GN
+expended/U
+expender/M
+expenditure/MS
+expensiveness/IS
+explain/AGDS
+explanation/SM
+explicable/I
+exploit/RVM7GnDS
+expressibility/I
+expression/Mp
+expurgate/SDNGn
+extemporaneous/YP
+extempore/Qs89q-S
+extendedness/M
+extinct/V
+extort/GDVS
+extracellular/Y
+extra-curricular
+extramarital
+extraordinary/PYS
+extrasolar
+extraterrestrial/S
+extraterritoriality/SM
+extravaganza/MS
+extremeness/S
+extremism/MS
+extrusion/M
+exurbia/SM
+eyedropper/MS
+eye-level
+Ezra
+fable/MSDG
+face/CGKDASe
+faceless
+facelift
+face's/K
+face-saver
+facetiousness/S
+facilitate/yDGSNnV
+facing/MS
+facsimileing
+factionalism/SM
+facto
+factorial/SM
+Fagin
+Fairfax
+fair-weather
+fairy/MS
+Falkner
+fallibility/ISM
+fallible/PY
+fall's/ce
+falsify/RBGnDSN
+falter/rJdSk
+falutin
+fanatical/P
+fantasy/Q8Ws9DSGM
+fanzine/S
+farina/MS
+farmworker/S
+far-reaching
+fascicle/DSM
+fast-forward
+fatalism/MS
+fathom/7dMpS
+fathomable/U
+fatuity/SM
+fault-finding
+faultless/YP
+faulty/PTY
+faun/SM
+feathered/U
+feather-edge
+featherweight/SM
+feckless/YP
+fecund/ng
+fecundity/SM
+federalist
+feeding/M
+felicitously/I
+Felipe
+felony/SM
+felt-tip/S
+feminism/MS
+fences/C
+Fermanagh/M
+ferret/rdSM
+ferrite/M
+ferrule/DMSG
+ferryboat/MS
+fetlock/MS
+feud/DMSoG
+feudalism/SM
+fiat/MS
+fibrosis/M
+Fidel/M
+Fife/M
+fifty-twofold
+fightback
+fights/e
+fill/JDRYGS7
+filter-tipped
+filthiness/S
+finance/ASGD
+find/JRGS7
+fineness/SM
+finger/prdSMJ
+fingerprint/DGSM
+fingertip/MS
+finial/SM
+finite/CPYI
+finny/T
+fiord/MS
+fireplace/MS
+Firestone
+fire-storm/MS
+firewood/M
+fish-bowl/MS
+fished/c
+fisher/m
+fishmonger/SM
+fishy/PT
+fist/DMGS6
+fixity/MS
+flabby/TP
+flack/SDMG
+flagrant/Y
+flaker/M
+flaky/T
+flamb�/GSD
+flame/pGZRSMDkJ
+flamen/M
+flammable/IS
+flapjack/MS
+flash-pan
+flattop/SM
+flawlessness/S
+flea/MS
+fleabites
+fleawort/M
+fleetingly/M
+fleshly/T
+flexibility/MIS
+flightpath
+flights/c
+flinty/TP
+flirtation/M
+floodlight/GSM
+floorspace
+florescence/MIS
+florist/SM
+floweriness/S
+flowstone
+fluency/SM
+fluoroscope/SGDMW
+flush/7DPTGS
+fly-fishing
+flywheel/MS
+foamer
+foamy/TP
+fo'c'sle
+focus/CdGDAS
+focusable
+focus's
+foeticide
+fogydom
+fogyish
+foldaway
+folklore/3WSM
+folly/MS
+fondle/GDS
+fondler/M
+Fontaine/M
+fool/GDMS
+footman/M
+footprint/SM
+footsie/MS
+forbidding/PY
+forced/U
+forcer/M
+foreclosure/MS
+forefront/MS
+forehead/SM
+foreknow/SG
+foreknown
+forensics/M
+forequarters
+forerunner/MS
+foresaw
+foreword/SM
+forfeit/DRMSG
+forgave
+forget-me-not/S
+forging/MS
+formality/SMI
+formate/MS
+formulate/DAGSNn
+formulated/U
+Forster
+forswear/GS
+forthwith
+fortified/U
+fortissimo/S
+forty-onefold
+forty-three/H
+forum/MS
+Foss
+foster/dS
+fought/e
+founded/FU
+Fourier/M
+four-leaved
+four-square
+fox/MDzZG2S
+foxhound/MS
+fr
+Francesca
+franchiser/SM
+Fran�oise/M
+Frankfurt
+frankness/S
+fraud's
+Freddie
+Fredrick
+free-born
+freedmen/M
+freemasonry
+Freeport
+freight/SMRDG
+Frentzen
+fresh-faced
+Freud/M
+friction/oMSp
+friend/DGYMpS
+frieze/MGSD
+frigate/SM
+fright/DGMjS6
+frighteners
+frigidity/SM
+Frisian
+frisk/ZGSDz2
+frivolity/SM
+frivolousness/S
+fronter/F
+frothy/TP
+frown/DGSk
+frowner/M
+frumpy/T
+fulcrum/SM
+fulfilled/U
+fulfiller
+Fullerton
+full-length
+fulsome/YP
+fume/GkDZS
+fundamentalist
+fundholding
+fund-raiser/SM
+funeral/MS
+fur/GM2JZSD
+furl/UGDS
+furring/M
+furtherance/SM
+fuselage/SM
+fuses/CA
+fusilier/SM
+fusspot/SM
+futurist/W
+fuzzy/TP
+gaberdine/M
+gadabout/MS
+Gail
+galen
+galley/MS
+gallstone/MS
+galvanic
+gamesmen
+Ganges
+gantry/MS
+gaper/M
+Garfunkel/M
+garnish/LSDG
+garnishee/GMS
+gas/FC
+gasoline/M
+gasometer/M
+gastronomy/MWS
+gastropod/SM
+gasworks/M
+Gateshead/M
+gather/drSJ
+gaucherie/MS
+gavel/DSMG
+gawker
+gazillion/S
+gee-gee/SM
+geezer/MS
+gel/DMGS
+gelable
+Gemini
+gender/MSp
+gendered
+generate/AnVCGDSN
+generator/AMS
+generous/YP
+generously/U
+Genevieve/M
+genie/oSM
+genocidal
+genotype/MS
+genuflection/SM
+Geoff/M
+geomagnetic/Y
+geomagnetism/MS
+geophysical/Y
+geopolitic/YS
+George/SM
+Georgetown/M
+Georgian/S
+Gerald
+geranium/SM
+Gerard
+Gerber
+germination/M
+ghillie/MS
+ghostlike
+ghost-written
+giant/MS
+giantess/MS
+giber/M
+giddy/PGYTDS
+Gideon
+gigacycle/MS
+Gilbert/M
+gilt/S
+gimcrack/S
+gimp/DMGZS
+gin/MDSG
+ginkgoes
+girlfriend/SM
+giveth
+gizmo's
+glac�/DGS
+glacial/Y
+Gladys
+glasnost
+glean/DRSGJ
+Gleason
+Glenda
+Glendale
+glib/TPY
+gloaming/MS
+global/3Y
+globularity/M
+Gloria
+glossy/TSP
+glow/GRDkSM
+glycogen/MS
+Glyndebourne/M
+Glynn
+gnarl/GSMD
+gnat/MS
+gnomic
+gnu/MS
+goad/GDMS
+go-ahead
+goalie/MS
+goalpost/S
+go-between
+godchildren
+god-damn/D
+godhead/S
+Goering
+Goethe/M
+goitrous
+Golding
+gold-plated
+gonococcal
+good-humoured/Y
+good-looking
+good-natured/Y
+Goran
+Gordon/M
+gotten
+gourmandise
+gouty/T
+gr�ce
+graced/E
+graceless/YP
+gradate/DSG
+grade/nRCSDG
+gradient/SM
+gradualism/SM
+graduation/M
+graffiti
+grampus/MS
+grandniece/MS
+grant/DRMGS
+granulate/SDG
+granulocytic
+gratitude/SIM
+gravitation/M
+Grayson
+graze/RSGD
+greasepaint/SM
+greenery/SM
+greenfield
+greenfinch/SM
+greet/DRGSJ
+grenadier/SM
+gridiron/MS
+gridlock/DSG
+grimy/TP
+grin/DGS
+grind/RGJSk
+gristle/SM
+grittiness/S
+groat/MS
+groin/SMGD
+groom/SDGM
+Groot
+grotesqueness/S
+grovel/DSGR
+grub/zRMZ2DGS
+grudger/M
+grumble/GRJkSD
+GU
+guanine/SM
+Guardia
+guardianship/SM
+Guenther/M
+guerrillas
+guerrilla's
+guess/DRG7S
+guessed/e
+guildhall/SM
+guilefulness
+guilty/TP
+Guinea-Bissau/M
+Guinness
+gumboot/S
+gumption/SM
+Gunderson
+gunmen/M
+gunnery/SM
+gunning/M
+gunnysack/MS
+guppy/MS
+Gus
+gusset/SM
+gusts/E
+gut/MRGpDS
+Gwangju
+gym/MS
+gypsite
+gyroscope/SMW
+ha
+Haag/M
+habitable/P
+habitation/IMF
+habituation/M
+Hackett
+hadj's
+haem/SM
+haematoma/M
+haemolytic
+haemophiliac/SM
+Hague
+ha-ha
+haiku/M
+hair-drier
+hairless/P
+hairlike
+hair-raising
+halcyon/S
+half-deck
+half-hour/YS
+halfpence
+half-sister/SM
+half-sovereign
+halfwit/hiSMD
+halibut/M
+halite/MS
+hall/SM
+hallelujah/S
+Halley/M
+hallow/DGS
+Halloween
+hallucinate/nyNVGDS
+hallway/SM
+halter-neck
+halvers
+hammerhead/SM
+hammering/M
+hand/h6RzZSipMGD2
+handbill/SM
+handedly/f
+handful/MS
+handgun/MS
+handling/M
+handstand/SM
+hangnail/SM
+hanker/Jd
+hankerer/M
+Hanoverian
+Hansen
+ha'penny
+haphazardness/S
+haplessness/S
+harbourage
+hard-line/R
+hardshell
+hardy/TP
+harken/S
+harlotry/SM
+harpsichord/M3S
+Harrison
+Harrisonburg
+harshen/d
+harvest/MRGDS
+harvestmen/M
+hassock/MS
+hast/zZ2D
+hatchet/dMS
+hatchway/MS
+hatefulness/S
+haughty/YPT
+haul/cDSG
+have-not/MS
+havoc/SDMG
+Hawaiian/S
+hawkishness/S
+headmen/M
+headteacher/SM
+headway/SM
+health/M6jzS2Z
+healthcare
+hearing/SM
+hearsay/SM
+heartburn/GSM
+heartlessness/S
+heartstrings
+heath/RSyM
+Heathkit
+heaven/MSY
+Hebrew/SM
+heck
+hectogram/SM
+hedonist/WMS
+heel/pRSGMD
+Heidfeld
+Helena/M
+helix/M
+hellebore/SM
+Hellenic
+helpfulness/U
+helplessness/S
+Helsinki/M
+hemp/SM
+hen/yMS
+Henley/M
+Hennessey/M
+Henri/M
+herald/WGSMDy
+herbalist
+Herbert/M
+here/FI
+hereabout/S
+herein
+heretofore
+heritable/I
+Hermes
+Hertfordshire/M
+hesitance/ZS
+heterosexual/MYS
+Hettie/M
+Heuser/M
+hew/RGSD
+Hewett/M
+hexagram/SM
+heyday/MS
+hgwy
+Hiawatha
+hiccough
+hideaway/MS
+hideout/MS
+hieroglyph/SW
+high-hat
+high-jump
+highland/RSM
+high-spiritedness
+high-stepper
+hike/RSGD
+Hilbert
+hilliness/S
+Hinckley
+Hindemith
+Hindi
+hindsight/SM
+Hinduism
+hint/RSGMD
+hip/TZMDSG
+hipbone/SM
+hiring/S
+Hirsch
+histology/3MSw
+historian/SM
+history/SK1MW
+histrionic/SY
+histrionics/M
+hitch/RDSG
+HIV
+hoard/MSRDJG
+hobgoblin/SM
+Hoff/M
+hogback/SM
+hoist/SDG
+hold/RSGJ7
+Holden
+Holstein
+homecoming/SM
+homeland/MS
+home-making/M
+homesickness/S
+homiletic/S
+homoeotherm/ZW
+homogamy/M
+homogeneousness
+homogenize/DRGnSN
+Hondo
+hone/STGDM
+honester
+honey/SMD
+hooded/P
+hoofer/M
+hookup/MS
+horned/P
+horse-trading
+horsier
+horsing/M
+hos/Sd
+ho's/F
+hospitably/I
+hostility/MS
+hotness/S
+hounding/M
+houseboy/MS
+housebreak/SRJG
+house's/e
+house-to-house
+house-warming/SM
+Hove/M
+hover/dS
+hovercraft/M
+Hoyt/M
+HQ
+Huffman/M
+huffy/TP
+Huguenot/SM
+Hull/M
+hum/RSDG
+human/sQ8Y3-q9PS
+humaneness/I
+humanist/W
+humanize/CRDnSNG
+humanly/I
+humerus/M
+humidification/CM
+Hummel/M
+humorousness/S
+Hungary/M
+Huntley/M
+hurriedness/M
+hurter/M
+husband/DYyGSM
+hussy/SM
+hybridism/MS
+Hyderabad
+hydrangea/MS
+hydrochloride/M
+hydrogenates/C
+hydrostatics/M
+Hyman
+hymnal/MS
+hyperbola/MS
+hyperboloidal
+hyperplane/MS
+hypertrophy/DGSM
+hypotenuse/SM
+hypothalami
+hypotheses
+hysterectomy/SM
+Hyundai/M
+ICC/M
+icebox/SM
+icicle/SM
+iconoclasm/MS
+iconography/WMS
+ICU
+Ida/M
+idealist/W1
+idealogical
+identical/PY
+idiocy/SM
+idiomatic/U
+idolatress/S
+idyllist
+if/FS
+ignitable
+ignorance/SM
+iguana/SM
+iii
+Ikea/M
+ill-behaved
+ill-defined
+ill-equipped
+ill-tempered
+illume/GD
+illuminable
+illustrate/NnGDvSV
+illustration/M
+illustrious/YP
+ilmenite
+imaginably/U
+imagine/lnSVuNJDvG
+imaginer/M
+imbibe/RSDG
+immanency/SM
+immensity/SM
+immerse/SNbDGX
+immerser
+immolate/DGnSN
+immortal/Q8
+imped/d
+impeder/M
+imperial/3SY
+imperturbability/MS
+impetuous/PY
+impishness/S
+impresario/MS
+imprint/M
+imprison/L
+improver/M
+impudent/Y
+inalterableness
+inappropriate/P
+inbound
+in-car
+incarnadine/DSG
+inception/MS
+incipience/MSZ
+incise/XVGvDNSu
+incommode/GD
+inconceivability/SM
+inconceivable/P
+incontrovertible/Y
+incorporated/EU
+increase/Jk
+incriminate/SDNnyG
+incubation/M
+indemnity/MS
+indentation/M
+indication/M
+indicator/MS
+indices/M
+indigent/YS
+indissoluble/YP
+indistinct/P
+indistinguishable/P
+indoctrination/M
+industrialist
+industriousness/S
+inebriation/M
+ineffable/PY
+inertness/S
+inexplicable/PY
+inexplicit
+infantry/mMS
+infatuate/DSGnN
+inferential/Y
+inflate/DSGNn
+inflated/c
+inflater/M
+inflect/GxSVD
+in-flight
+infraction
+infrastructural
+ingenuously/E
+ingot/SM
+ingratiate/nGDSkN
+inhibit/SVdyXN
+inhibitor/MS
+in-house
+initialised/U
+initialized/U
+injunctive
+inlay/GS
+innermost
+innovate/NVnGuDSyv
+innovation/M
+innovator/SM
+inoculate/VGNDSn
+inordinate/YP
+inquisitive/PY
+inscribe/RNX
+insert/DGAS
+insidiousness/S
+insinuate/DGknNSV
+insolence/SM
+insolent/Y
+insomnia/SM
+inspired/U
+inspirer/M
+instanter
+instigate/SVnDNG
+instituted/A
+insult/DGkS
+insupportable/P
+insurrectionist
+intensiveness/S
+intention/DSoM
+intentionality/M
+interaction/SM
+intercept/GSD
+intercessor/SM
+interchange/SlGBD
+interfacing/M
+interfere/kRSGD
+intergeneration/oM
+interject/xGSD
+intermarry/SGD
+intermezzi
+intermodule/Nn
+internationalism/MS
+interplanetary
+interplay/MGDS
+interposition/M
+interpret/daNAnS
+interprocess
+intersect/GSD
+interstate/S
+intersurvey
+interurban/S
+intervocalic
+intimidation/M
+intradepartmental
+in-tray/S
+intrude/RuNXSDGVv
+intrusiveness/S
+inure/GDS
+invective/YPMS
+inventiveness/S
+inventress/MS
+invincible/PY
+inviting/U
+invokable
+involve/LGhSD
+iodide/MS
+ion's/U
+Irani
+Ireland/M
+iridescent/Y
+Irishwomen/M
+irksome/PY
+Irma
+ironer/S
+ironwood's
+ironworker/M
+irrepressible/Y
+irrigable
+Irvine
+Irwin/M
+Isaacson
+Isis
+Islamabad/M
+Islamic
+island/RSM
+Islay/M
+Islington/M
+isn't
+isocline/M
+isopleth/SM
+Italian/SM
+Ithacan
+its
+ix
+jackknife/DGMS
+Jacqueline
+Jaeger/M
+jag/ZDhGiS
+jaggy/T
+Jaipur
+Jakarta
+Jamaican/S
+Jameson
+janitorial
+Jardine
+jasper/MS
+javelin/MS
+jawline
+jay/MS
+jazz/S2GMDZ
+Jeanie
+Jehoshaphat
+Jesse/M
+jetty/MS
+jib/DMGS
+jihad/MS
+jingoist/WSM
+Joanne/M
+Joaquin
+jock/MS
+John/S
+johnny/SM
+join/FRSDG
+joins/A
+jointures
+jolt/DSRG
+Jonathan
+Jorge
+Jorgenson
+Joshua/M
+joss/M
+jowl/YSM
+joyless/PY
+Juanita
+jubilant/Y
+judgemental
+juicy/YPT
+julep/SM
+jump-start/G
+juncture/FMS
+jungle/SM
+junket/SdM
+junta/MS
+jurist/W
+juster/M
+juvenile/SM
+kaiser/SM
+Kano
+kappa/M
+katydid/MS
+kcal/M
+Kearney
+Keats/M
+keener/M
+keening/M
+keepsake/MS
+Keith
+Kendal
+Kenyan/S
+Kepler/M
+kerb/SM
+kerchief/SDM
+kerned
+keyclick/MS
+keyhole/SM
+kg
+Khmer
+kickballs
+kicky/T
+kid/RDMSGp
+kiddish
+Kiev/M
+kif-gloves
+Kilimanjaro/M
+killjoy/S
+kills/c
+kilowatt-hour
+Kimberly/M
+kinda
+kindness/S
+Kingsbury
+Kiowa
+Kirby
+Kirkpatrick
+Kitakyushu/M
+kitbag/M
+kitsch/ZSM
+kittiwakes
+Klondike
+knack/SRM
+kneecap/SGMD
+knick-knackery
+knight/GMDYS
+knit/RGSDJ
+knitting/M
+knotty/TP
+know/GJk7S
+knowing/T
+knowledge/SlM
+Knowles
+Kodachrome/M
+kola/SM
+Kong
+kook's
+kooky/T
+Kremlin/M
+Kronecker/M
+Kuenning/M
+kumquat/SM
+KwaZulu
+l/3
+lab/oMS
+label/aGDSA
+labiodental
+laboratory/SM
+laburnum/MS
+labyrinth/SM
+laceration/M
+lachrymose
+lackadaisicalness
+lactation/M
+lacunae
+laddie/MS
+ladybug/SM
+laevorotatory
+Lamaism
+Lamellibranchia
+lamina/Mn
+laminate/DGS
+Lancaster/M
+Lancelot/M
+landforms
+land-use
+lantern/MS
+Laos/M
+laps/SGD
+lapse's
+larboard/SM
+larcenist/S
+larcenous
+larceny/SM
+lark/MGDS
+larkspur/SM
+lasciviousness/S
+latching/M
+latticing/M
+Latvia/M
+laudanum/MS
+lauds/M
+laughable/P
+Launceston
+lavatory/SM
+lawgiver/SM
+lawlessness/S
+lawmaking/M
+lawnmower/S
+lawrencium/M
+layette/SM
+laying/ca
+lays/faAec
+Lazar
+Lazarus
+lazybones/M
+leading/a
+leaf/pSD2GMZ
+leafstalk/MS
+leasing/M
+Leatherdale
+leavening/M
+Leavenworth
+lectureship/SM
+led/a
+lefty/S3M
+legally/I
+legislator/MS
+legitimately/I
+legitimating/I
+legitimization/M
+Leiden
+Leif
+Leigh
+Lenten
+leper/SM
+lettered/U
+level/SDTPRGY
+Lewes
+lexeme/MS
+Libby/M
+liberalism/MS
+libertarian/SM
+libertarianism/M
+Libra
+Libya/M
+lichen/SM
+Lieberman/M
+lieder
+lifetaking
+light-heartedness/S
+lignite/SM
+liking/MS
+limb/SDMWp
+limestone/MS
+limpid/YP
+Limpopo
+Lin/M
+Lindbergh/M
+linen/SM
+lines/eAf
+ling/f
+lingua/Mo
+linguini's
+linkage/SM
+linseed/MS
+lionizer/M
+lip-synch
+liquefy/DRSG
+liqueur/MS
+liquorish
+Lisa
+listed/U
+listing/M
+literalism/M
+lithology/Mw
+Lithuania/M
+litigiousness/S
+litre/SM
+little/TP
+liturgics's
+livelong/S
+liverwurst's
+ll/C
+loads/AUc
+loansharkings
+loathsomeness/S
+loaves/M
+loci/M
+Locke
+locks/UA
+lode/MS
+lodestar/SM
+Logan
+logia
+login/S
+Loki/M
+loneliness/S
+lonesomeness/S
+long-ago
+long-distance
+longhair/SM
+longing/M
+long-lived
+long-range
+long-time
+loose-leaf
+Lorraine
+lotto/SM
+loudspeaker/SM
+Loughborough/M
+Louisa/M
+lour/SDG
+louse/CDSG
+love/pMk7RSYlDG
+loveless/PY
+Lowell
+lowliness/S
+loyalty/ESM
+Lucia/M
+Lucretia
+Ludwig
+luge/CM
+lukewarm/PY
+lull/GSD
+lulu/M
+luminance/M
+luminescence/MS
+luminous/YP
+lumpish/YP
+luncheonette/MS
+luncher/M
+lunger/M
+lupus/MS
+lust/GZSDjz62M
+lye/M
+lymphatic/S
+lyre/MSwW1
+Mabel/M
+Macedon
+Macedonia/M
+macintosh/SM
+MacIntyre
+Mackenzie
+Mackie
+Macmillan/M
+macram�/S
+macro/SM
+macrosimulation
+mad/RTYPGD
+madden/dkS
+madhouse/MS
+Magellan
+magi
+magisterial/Y
+magnanimous/Y
+magnetic/S
+magnolia/SM
+maidenhead/SM
+maidenliness
+Maier
+mainstreamer
+major/MS
+making/MS
+Malagasy/M
+maleficence/SM
+maleness/S
+mallard/SM
+Mallory
+malnutrition/SM
+malocclusion/MS
+Malta/M
+Mammalia
+mammography/S
+mandate/SMGyD
+man�ge/SGD
+Manhattan/M
+manhole/SM
+manikin/MS
+manoeuvres/e
+mansard/MS
+mantilla/MS
+mantis/MS
+manure/RMGDS
+manuscript/MS
+man-year/S
+Maoism
+mapping/M
+maraca/MS
+margin/oMdS
+mariachi's
+marijuana/SM
+Marin
+marina/nMS
+Marjory/M
+marketability/MS
+marketable/U
+Marlowe/M
+Marquess/M
+marriage/MBS
+marrow/MS
+marsupial/MS
+Martel
+marten/MS
+Marvin
+Marx/3M
+marzipan/SM
+Masai
+master-work/S
+matchlock/MS
+matchplay
+matchwood/SM
+maternal/Y
+mating/M
+matriarchs
+matron/MSY
+matt/M
+matter/d
+maturely/KI
+maturity/KMI
+Maurice
+maverick/MS
+Mavis
+maxilla/yM
+maze/SZMGD
+McCracken/M
+McDonald/M
+McDowell/M
+McGill/M
+McGovern/M
+McGregor/M
+McKesson/M
+McLeod/M
+McMahon/M
+McNeil/M
+mealtime/MS
+mealy/TPS
+mean/CSG
+meanest
+meaninglessness/S
+measurement/A
+mechanism/MS
+mechanochemically
+media/oMn
+mediaevalism
+mediaevalist
+medicament/SM
+medication/M
+meditative/P
+megacycle/MS
+megalith/SWM
+Meister
+melamine/MS
+Melanesian
+Melbourne
+melted/A
+melts/A
+Melvyn
+memorable/PY
+memoriam
+mendacity/MS
+mendicancy/MS
+mendicant/S
+mending/SM
+Mendip
+menopause/SM
+menstrual/K
+menswear/M
+mentality/MS
+menthol/MS
+merchant/BSM
+merchantman/M
+mercilessness/S
+merited/U
+mescal/SM
+mesdames/M
+mesdemoiselles/M
+meta
+metabolism/SM
+metabolize
+metacarpus/M
+metastable
+metempsychoses
+meteor/WS1M
+Metford
+method/1SMw
+metre/S1Ww
+mettlesome
+Mexican/S
+MGM
+miasma/MS
+mice/M
+Michelson
+micra's
+microdensitometer
+microdot/SM
+microelectronic/S
+microfossils
+microlevel
+micrometeorite/SWM
+microprocessing
+microscope/SMWw1Z
+Microsoft/M
+microstore
+mid-band/M
+midfield/M
+Midlands
+mid-life
+milch/M
+mile/SM
+Millie
+millimetre/S
+milliner/ZSM
+millisecond/SM
+Milne
+mimesis/M
+mindless/YP
+mindset/S
+Minerva
+minesweeper/SM
+minimax/M
+minnow/MS
+minor/SM
+Minotaur/M
+Minsk/MZ
+minuscule/SM
+minutia/M
+minx/MS
+mischance
+misfeasance/SM
+mislay
+misprision/SM
+missive/4
+Missouri
+misty/T
+mistype/J
+misunderstand/R
+mizzen/SM
+mizzenmast/MS
+mnemonic/YMS
+mob/CSDG
+moccasin/MS
+mockery/SM
+modification/M
+modulation/MCS
+moduli
+Moen/M
+mogul/MS
+molal
+molecular/Y
+molecule/MS
+mollycoddle/SGD
+molybdenite/M
+momenta/y
+momentary/PY
+mom's
+moneymaker/MS
+mongoloid/S
+monodist/S
+monody/MWS
+monolingualism
+monopoly/SM
+monotone/WMS1Z
+Montclair
+Monza
+mooch/RGDS
+moon/DSpMG
+moorland/SM
+moped/MS
+moppet/SM
+Moran/M
+Moray/M
+Mordecai
+morning/M
+Morpeth
+morphophonemics/M
+morris
+mortality/IMS
+Moslem/M
+motel/MS
+motherhood/MS
+motionless/Y
+motorboat/MS
+motorway/MS
+mouldiness/S
+mound/MDGS
+mountaintop/MS
+mounted/U
+Moussorgsky/M
+moustache/MDS
+Moyer/M
+Moyra/M
+Mozambican/S
+mpg
+MPV
+Ms
+much-needed
+muck/DGMZS
+mudslide/S
+mufti/SM
+mugginess/S
+mulatto/M
+Muller/M
+multi-access
+multichannel/M
+multicolumn
+multicomponent
+Multics/M
+multidimensionality
+multifunctional
+multilateral/Y
+multiplex's
+multi-purpose
+multiracial
+mumble/RSDGJ
+mumbo-jumbo
+Mumford/M
+Muse's
+mushy/TP
+Muslim/SM
+mutable/FI4
+mutest
+muttonchops
+muzzle-loader
+myrrh/MS
+mystic/YMS
+nabob/MS
+nacelle/MS
+Nagasaki/M
+nailer/M
+Nairobi/M
+naked/PY
+namby-pamby
+namelessness
+nanometre/SM
+naphthalene/SM
+narcosis/M
+Narragansett/M
+narrow-minded
+Nassau/M
+Nathalie/M
+naturally/U
+nature/ohMDS
+navvy/MS
+Nazi/SM
+N'Djamena/M
+Neanderthal/S
+near-sighted/PY
+near-sightedness/S
+necktie's
+necromantic
+necropsy/M
+necrotic
+needle/D5GRSM
+needy/TP
+Neely/M
+nefariousness/S
+neglectful/P
+neglectfulness/S
+neglig�e/SM
+negligent/Y
+neighbourliness/S
+neoclassic/M
+neocolonialism/SM
+neologism/MS
+Nepal/M
+nephrite/MWS
+Neptune/M
+nestle/DSG
+neural/Y
+neuritides
+neuritis/M
+neuroscience
+neurosurgeon/SM
+neutralise/M
+nevus's
+Newmarket/M
+newsflash/S
+newsroom/S
+news-stand/MS
+newsy/TS
+next
+NFS
+nicety/MS
+niche/GMSD
+Nicholson/M
+Nielson/M
+nightclothes
+nightdress/MS
+night-long
+nightmare/MS
+nightstand's
+night-watchman
+nimble/TPY
+Nina/M
+nine/SMH
+ninepence/M
+ninety-onefold
+Nintendo/M
+Nipponese
+nitrous
+nm
+Nobel/M
+nobelium/M
+Noble's
+nocturnal/S
+nocturne/SoM
+nod/oDMGZS
+nodule/MS
+nohow
+noire/S
+noiseless/YP
+Noll/M
+nominal/SY
+non-abrasive
+non-absorbent
+non-active
+non-athletic
+non-basic
+non-belligerency
+non-belligerent/S
+non-business
+nonchalant/Y
+non-compliance/MS
+non-conducting
+non-conductor/SM
+nonconformist/SM
+non-corrosive
+non-crystalline
+nondescript/YS
+non-disclosure/S
+non-dramatic
+non-exclusive
+non-functional/Y
+non-hereditary
+non-literary
+non-member/MS
+non-metal/SWM
+non-metropolitan
+non-military
+non-negative
+non-operational/Y
+non-orthogonal
+non-orthogonality
+non-partisan/S
+non-paying
+non-peak
+non-performance/SM
+non-porous
+non-recognition/S
+non-redeemable
+non-reducing
+non-representational/Y
+non-resident/SM
+non-residential
+non-scientific
+nonsense/1SMw
+non-sexist
+non-slip
+non-staining
+non-swimmer
+non-tenured
+non-union/S
+non-verbal/Y
+non-voter/SM
+noontide/SM
+noontime/SM
+noradrenalin
+noradrenaline/M
+normalizes/A
+north/MSG
+north-east/M
+northern/RS
+north-West/M
+notarial
+notation's/F
+noticeable/U
+Nottinghamshire/M
+nourished/fU
+nourishment/f
+nouveau
+novel/-MQ3S
+novena/MS
+Novocaine
+NT
+nuclear-free
+nucleation/M
+nudge/GSD
+Nugent/M
+nuke/SGMD
+numberplate/M
+numbers/Ae
+nursemaid/SM
+nutriment/MS
+nutritiousness/S
+nutshell/MS
+nuttiness/S
+nymphomaniac/S
+Oakland/M
+ob.
+obeyer/EM
+obfuscation/M
+objurgate/GSDnN
+obligation/M
+obliging/YP
+obliteration/M
+oblong/PS
+obnoxiousness/S
+oboist/S
+observability/M
+observe/BxkNRlnSDG
+obstacle/SM
+obstetric/S
+obstructer's
+O'Connor/M
+octavo/SM
+octennial
+odalisque/SM
+ode/MS
+Odis/M
+Odom/M
+oestrous
+off/RGMJ
+offhandedness/S
+officiation/M
+off-licence/MS
+ogress/S
+oil/m2RZGMSD
+oilcloth/SM
+Ojibwa/SM
+okra/MS
+oleaginous
+O'Leary/M
+oles
+oligarchs
+Olivia/M
+Olympian/S
+Omagh/M
+Oneida/SM
+one-off
+on-line
+onomatopoeia/MS
+Onondaga/SM
+ons
+on-screen
+ontology/1wMS
+onyx/SM
+oodles
+opalescence/S
+open-handedness/S
+open-plan
+opera/nSvuMV
+operate/DSGFN
+oppressive/P
+opprobrium/SM
+opt/1xwGWSD
+optimized/U
+opulence/MS
+or/NMn
+orderly/S
+ordination's/F
+oregano/SM
+organic/S
+orientation/EMA
+orient's
+originality/MS
+origination/M
+orneriness's
+orographic/M
+orography/WM
+Ortiz/M
+Orwell/M
+Osborn/M
+oscillation/M
+osmium/M
+ostensible/Y
+osteoarthritis/M
+osteoporoses
+ought
+oughtn't
+our/S
+overbuild/G
+overburden/k
+overflight
+overhand
+over-ride/GS
+over-the-counter
+over-the-top
+overtone
+oviform
+ownership/MS
+oxide/Q-nSMs
+oxymoron/M
+ozone-friendly
+paced/e
+pacesetting
+pacifist/W
+Packard/M
+packing/MS
+Paddington/M
+paediatrics/M
+pageboy/SM
+Pahaji
+paint/DRSGMJ
+painted/AU
+painter/Y
+paints/A
+pairwise
+palaeoecologist
+paled/I
+Paleozoic
+paler/I
+palfrey/SM
+palladia
+palliation/M
+palm/DMG3SZ
+palmist/y
+palpably/I
+palsy/DMSG
+pamphlet/SM
+panchromatic
+pancreatic
+pane/MDS
+panellist/MS
+panic/GMSZD
+panky
+panorama/MS
+pantechnicon
+pantihose
+pantiles
+pantomime/3SMDG
+pants/f
+paparazzi
+Papeete/M
+paperweight/SM
+parade/RMGDS
+paragliding
+paragon/MS
+paragraph/DMSG
+Paraguay/M
+paralegals
+paralyse/RShGWDk
+paramagnet/MW
+paramoecia
+paramoecium/M
+paraplegic/S
+parapsychologist/S
+parapsychology/SM
+parasitism/SM
+parasitology/M
+parenthesise/D
+parenthesize/D
+parenthetical
+paresis/M
+parimutuel/S
+parka/MS
+Parker/M
+parody/G3DMS
+paroxysmal
+parricide/MS
+parse
+partake/RSG
+partials
+particle/SM
+particularism
+partisan/MS
+parvenu/MS
+pas/GRDJ
+passable/I
+passband
+pass�/M
+pass�e
+passes/IcFf
+passing/Fc
+passionate/FEY
+passiveness/SI
+password/SMD
+pastoralism
+past's/A
+patch/DESG
+patcher/EM
+patellate
+path/pSM
+pathlessness
+pathogenesis/M
+patio/MS
+patriarchate/MS
+Patrice
+patrol/MDGS
+pawn/SGDM
+pawnbroker/SM
+payee/MS
+PC/M
+peaceable/P
+peak/DM2SiGZ
+peat/ZSM
+peaty/T
+pebbly/T
+peccadilloes
+peccary/MS
+pedestal/DGMS
+pedology
+peeled/U
+peignoir/MS
+pell
+Pembrokeshire
+pencil/MGDJS
+pending
+Pendle
+pendulous
+penetrator/SM
+peninsular
+penitence/SIM
+penmanship/MS
+pen-name/S
+pentatonic
+perceiver/SM
+perchlorination
+percolation/M
+percutaneous/Y
+perdition/MS
+perfectibility/MS
+perfectionist/SM
+perfidy/SM
+perfusion/M
+Pericles
+perigee/MS
+perinatal
+peripatetic/S
+perjure/DRSGZ
+permalloy/M
+permeability/SIM
+permissiveness/S
+permittivity
+peroration/SM
+peroxidase/M
+persistent/Y
+person/7oSM
+personable/P
+perspicacious/YP
+peruse/DRGS
+pervasiveness/S
+perverseness/S
+pest/SM
+pesticide/SM
+pewit/SM
+phalanges
+pharynges
+phi/MS
+philology/M13wS
+philosopher/MS
+phlebotomy
+phlegm/SM
+phobic/S
+phoneme/MS1
+phoney
+phonics/M
+phosphoresce
+photoengraver/SM
+photogenic/Y
+photomicrograph/ZM
+photorealism
+physiology/WM1Sw3
+physiotherapist/SM
+picaresque
+pick/DRSGZJ
+pickerel/MS
+pictogram
+pictograph/SMW
+picture-writing
+pidgin/SM
+pie/MS
+piecemeal
+piezoelectric
+piggish/YP
+piggyback/GDS
+pikestaff/MS
+piling/MS
+pimento/SM
+pimp/YSDMG
+pimply/MT
+pin/MGdDJS
+pinkie
+pinkness/S
+pinna
+pinnace/SM
+pi�on/S
+piousness/IS
+pipit/SM
+pippin/SM
+piss/DSG
+pit-a-pat
+Pitcairn
+pitman/M
+placed/aUA
+placekick/SGD
+placemen
+placket/SM
+plagiarism/SM
+plaice/M
+planarity
+plankton/MS
+planned/KU
+plant/IGSDA4
+plasterboard/SM
+plateful/S
+platen/MS
+plausible/IY
+play/eGADESacf
+playing/S
+playwriting/M
+plead/SDRGJk
+pleater/M
+plenipotentiary/S
+plethora/MS
+pliable/P
+pliancy/MS
+pliantness/M
+plughole
+plumage/SDM
+plumpness/S
+plutonium/M
+pneumatics/M
+pocketknife/M
+podgy/TP
+podiatry/3SM
+poikilothermic
+point-duty
+poisonousness
+polarimeter/SM
+polarise/CRnSGD
+pole/MDS
+poliomyelitides
+polish/RDJGS
+poltergeist/SM
+polyandrous
+polyether/S
+polygynous
+polyhedron/SM
+polyisocyanates
+polymorphic
+polyphony/SMW
+polystyrene/MS
+polytopes
+polyunsaturated
+polyunsaturates
+polyurethane/SM
+polyvinyl/M
+pomposity/SM
+poorhouse/MS
+popcorn/SM
+poppy/MS
+porch/SM
+porphyry/SM
+portcullis/MS
+portentous/PY
+porti�re/SM
+posed/4AI
+poser/IMS
+posit/vuSVd
+position/CGADKS
+positionable
+positiveness/S
+posits/C
+possessiveness/S
+possible/SIY
+postage/SM
+postbag/M
+posterior/SY
+posteriori
+post-feminist
+post-free
+postillion
+postmark/MSGD
+post-orbit
+postscript/SM
+post-structural
+postulation/M
+posturer/M
+potage/M
+pot-belly/DSM
+potion/SM
+pouffe/S
+POW
+powerboat/SM
+powerful/P
+ppm
+PPS
+practiser/M
+Praia/M
+prance/RGSDk
+prank/SM
+prattle/DRSGk
+pre/Q8s
+preamble/M
+preceptor/MS
+preciousness/S
+precipitous/YP
+precision/IM
+predatory
+predicable/S
+predicted/U
+predominate/Y
+pre-elect
+pre-existence/SM
+prefab/DSMG
+prefix/M
+prehensile
+premed/wS
+premiership/SM
+premium/SM
+preparative/SM
+preponderance/MS
+pre-programmed
+present/NnLYRS7xlDG
+presentation/MAo
+presidential/Y
+press-up/S
+pressure/M8q-9GQsDS
+pressure-cooker
+presto/S
+Preston/M
+presumable
+pretzel/SM
+priapic
+priestess/MS
+primacy/SM
+prime/PS
+princedom/SM
+princely/PT
+Pringle/M
+priori
+prismatic
+pristine/Y
+prithee/S
+private/nYTQ8SN-qPVv
+privateer/MGS
+privilege/SDMG
+prizewinner/S
+probable/I
+procaine/SM
+pro-choice
+procrastination/M
+prodigal/SY
+produced/e
+producer/AMS
+producible
+profaner
+professionalism/MS
+professor/oSM
+professorial
+programme/WSM
+programming/C
+projectile/SM
+Prokofiev/M
+prolapse/GSDM
+prolate
+proletarian/Q8-qS
+prologise
+prologize
+promethium/M
+promising/UY
+promissory
+promotion/MS
+promulgate/GSNnD
+pronounced/U
+propagation/M
+propagator/SM
+propane/SM
+prophecy/SM
+proportionality/M
+proportioner/M
+propose/DRGSNxX
+proprioception
+pro-Republican
+proscribe/DSXVGN
+prosodic/S
+protactinium/M
+protections
+protoplasm/SWM
+Protozoa
+protozoan/SM
+protrude/XSVuvDGN
+protuberant
+proves/AI
+provision/GMD
+provocative/PS
+provocativeness/S
+prudish/PY
+psittacoses
+psyche/M
+psychocultural
+psycholinguistics/M
+psychoneurosis/M
+psychos/S
+psychotherapeutic/S
+psychotherapy/SM
+psychotic/SY
+pub/MWSDG
+puberty/MS
+publication/KMA
+public's/A
+pucker/dS
+puddling/M
+puffer/Z
+pugnacity/SM
+pulchritudinous/M
+pulley/SM
+pullover/SM
+pumping/M
+pumpkin/MS
+punctuality/UM
+punished/U
+Punjabi
+pupa/M
+pupil/SM
+puppetry/SM
+purblind
+purchasable
+purdah/SM
+pureness/S
+purlieus
+pursuance/MS
+purview/MS
+put/DRGZS
+putted/e
+pyromaniac/MS
+pyrotechnic/S
+pyruvic
+Pythagorean
+q.t.
+quack/DGS
+quadriceps/SM
+quadrille/SM
+quadrillion/HMS
+quaffer/M
+quantifiable/U
+quantify/7NRDGnS
+quantity/MS
+quarterdeck/SM
+quash/SGD
+quaternary/S
+Quayle
+quincentenary/M
+quisling/SM
+quoit/GDSM
+quorum/SM
+quota/MSn
+quoted/U
+quoth
+rabble-rousing
+racialism/M
+rack/SDGM
+racquet/SM
+radiance/MS
+radiant/Y
+radioactivity/M
+radiocarbon/MS
+radio-telegraph/SZ
+radio-telephone/MS
+radish/SM
+radium/M
+Raikkonen
+rain/DMGSpZ
+raincoat/SM
+Raith
+rajah/MS
+ramp/DMSG
+rampant/Y
+ramshackle
+ran/Aec
+rancorous/Y
+Rangoon/M
+rapeseed/M
+rapier/MS
+rapport/MS
+rare/YGTP
+rarebit/MS
+ratatouille
+rationalist/W
+ratline/MS
+rattle/RGYJDS
+ravish/DRGLSk
+raw/YTP
+reactive/Nn
+readdress/G
+realisable/U
+reappoint/LG
+rear/DRMGS
+Reba/M
+rebroadcast/M
+recalcitrant
+recitalist
+reckoner/M
+reclamation/MS
+recluse/MSVN
+recombinant
+recompile/Nn
+rectify/GN7nDRS
+recusance/Z
+redeclare/N
+red-eye
+Redford/M
+red-hot
+redo/G
+reductionism/M
+reek/SDG
+re-enumerate/N
+re-equip/G
+re-establish
+referential/Y
+referral/SM
+reflation/y
+reflexivity/M
+refluence
+refraction
+refractometry
+refractoriness
+refurnish/G
+refutation/M
+reg/o
+regale/DG
+Reggie/M
+rehearsed/Uf
+rehearser/M
+Reilly/M
+releasable
+relentless/Y
+relevance/MIZ
+reliability/UM
+relief/M
+relight/G
+religion/3SM
+religiosity/M
+reliquary/SM
+remembrance/MS
+renaissance/S
+renal
+rent/DMRSG
+rep/MS
+repair's/E
+repast
+repeatable/U
+repenter
+repetitious/Y
+replace/L
+reply/NRnGV
+repression/M
+reproach/kDS6G7j
+reprogram/GRD
+republic/nNS
+reputably/E
+requestion/G
+requital/SM
+rerecord/G
+resemble/DSG
+reserve/nNih3
+reservoir/MS
+reset/G
+reside/DG
+resign/inhN
+resistibly/I
+resolve/B
+responder/MS
+responsible/PIY
+restaurateur/SM
+retardant/SM
+retardation/M
+retention/SM
+reticulum/M
+retinue/MS
+retrench/L
+retrievable/I
+revel/nRJSDGyN
+reverberate/NDGSn
+reverberation/M
+reverenced
+reverse/GbY
+revise/NX
+revitalise/Rn
+Revlon/M
+revolvable
+rewritable
+Rex/M
+Rh
+rheology/w3M
+rheumatic/SZ
+rheumy-eyed
+rhinestone/MS
+rhinoceros/SM
+Rhodesia/M
+Rhonda/M
+rhythm/1MwSW
+ribosomal
+Richardo/M
+Rickard/M
+rickety/T
+ride/GCRS
+rider's/ce
+ridiculous/YP
+riding/M
+riff/MS
+riffle/DSG
+riff-raff/M
+rifle/mGSMD
+rifle-fire
+rifling/M
+right-angled
+rightist
+rightmost
+rigidify/S
+rigour/SM
+rime/SM
+ring-pull
+ringside/MRS
+rinser
+ripen/dS
+ripple/GMYDS
+ritzy/T
+Riva/MS
+rive/RGDS
+Riviera/M
+riving/C
+riyal/SM
+Roarke/M
+robbery/SM
+Roberson/M
+Robespierre/M
+Robinson/M
+robotic/S
+Robson/M
+rock-climber/S
+rocketry/SM
+Rockingham
+Rockland/M
+Rodolfo/M
+roll/GUSD
+roll-back/SM
+Rollin/MS
+Rollo/M
+Romero/M
+rooibos
+rootstock/M
+rope/GRD7SM
+Roquefort/M
+Roscoe/M
+Rosebery/M
+rose-coloured
+Roselle/M
+Rosenthal/M
+rose-red
+Rostov/M
+rotary/S
+rotation/M
+rough/GSDPTY
+rough-hewn
+roughshod
+roundelay/SM
+roundish
+rowdy/PTSY
+Roxie/M
+royalist
+Rs.
+RSPCA
+Ruben/MS
+rubicund
+rubout
+Rudy/M
+Ruhr/M
+rumble/SGDJ
+rumen/MS
+rummy/TM
+rumour/DGSM
+rumple/SGD
+Rundle/M
+rung/SM
+runnable
+runner/SM
+run-through
+ruse/SM
+rush-hour
+Ruskin/M
+Russ
+Russian/SM
+rustication/M
+Ruthie/M
+RV
+Sabin/M
+Sabrina/M
+sackcloth/M
+sacred/Y
+sag/GDSZ
+sahara
+said/U
+saintliness
+saintly/T
+sake/S
+saleable/U
+sallow/T
+Salo
+Saltley
+saltly
+saltness
+salubriousness
+salvo/M
+samarium/M
+Samuelson/M
+sandbank/MS
+sandbox/MS
+sanely/I
+saneness
+sanguinary
+sank
+Santo/SM
+sap/DMRZG2pS
+sarcoma/MS
+sarcophagi
+sartorial/Y
+Saskatchewan/M
+sate/S
+satiate/GnDSN
+satisfied/EU
+saturnalia
+saunterer
+savable
+savoury/U
+sawbones/M
+Saxon/MS
+say/RGJS
+scad/M
+scalability
+scald/GSD
+scam/MDGS
+scans/NX
+scarecrow/MS
+scaremongering
+scarification/M
+scarify/NGDS
+scarlet/M
+schist/M
+Schneider/M
+Schoenberg/M
+scholarship/MS
+school-age
+sciatic
+science/M3SW
+science's/FK
+scion/SM
+Scorpio/MS
+scot
+scot-free
+scour/SDRG
+scoutmaster/SM
+scowl/GSD
+scrawl/SDGY
+screed/SM
+screening/M
+scribble/RSGDJ
+scrivener/MS
+scrofulous
+scrutineers
+scurrility/MS
+scurrilous/YP
+seaboard/M
+seaquake/M
+searchable/U
+seasonableness/U
+seasoning/M
+seawall/S
+seaweed/SM
+secateurs
+seceder
+secondary/Y
+section's/E
+Seder/MS
+sedimentary
+seditiousness
+seduce/RDNVvuGSn
+sedulous/Y
+seemly/TP
+sees/c
+segregated/U
+Seidel/M
+seizable
+Selassie/M
+selectiveness
+Selena/M
+selenium/M
+Seleucid/M
+self-aware
+self-awareness
+self-censorship
+self-confident/Y
+self-contradiction
+self-deception
+self-interest/D
+self-satisfied
+self-taught
+Selkirk/M
+sell-by
+sell-out
+seltzer/S
+semiarid
+semi-duplex
+semi-infinite
+seminal/Y
+semi-rigid
+semi-skilled
+Semite/WSM
+semi-tone/MS
+semitransparent
+Senegalese
+senescent
+sensitising/C
+sensitivity/IMS
+sensitizing/C
+sentence/MGDS
+sepal/SM
+separability/I
+separableness
+separatism/MS
+Sephardic
+sept/NWM
+seraph/W1SM
+serene/TY
+serology/w1M
+serve/AGCSKDF
+server/CKSM
+serving/CS
+servitude/SM
+seventy-eight/H
+seventy-six/H
+seventy-twofold
+severe/oTY
+sexuality/MS
+Sgt.
+shabbiness
+shadowed/c
+shadower/M
+shadowing/c
+Shaftesbury/M
+shaky/YT
+shalom
+shamanism
+shame/6MjpS
+Shamus/M
+shapeless/PY
+shareholder/MS
+shark/SM
+sharpener/S
+sheepwalk/MS
+sheik/SM
+shellfire/M
+shellfish/M
+shelter/drSM
+sheltered/U
+shepherd/GMSD
+Sheridan/M
+Shetland/S
+shingle/DMSG
+Shintoism/S
+shoelace/MS
+shoemaking
+shop-boy/MS
+shop-floor
+shopping/M
+shortage/MS
+shortcrust
+short-sighted/Y
+shoulder/d
+shoulder-length
+shove/DSG
+showing/M
+show-place/MS
+shrank/K
+shriek/DRSMG
+shrubbery/MS
+shrubby/T
+shrug/SDG
+shush/DSG
+shutter/dp
+shyest
+sickish
+sick-list
+side-by-side
+side-chapel
+sided/Y
+sidedness
+sidelight/MS
+side's/f
+sidestep/GDS
+side-table/S
+Sidney/M
+Siegel/M
+sifter/SM
+significance/ISM
+signor/MF
+signorina/SM
+Sikh/SM
+silent/Y
+silverfish/SM
+Silverman/M
+Simmons/M
+simplicity/MS
+since
+single-handed/Y
+siren/SM
+Sisyphus/M
+sit/RGSJ
+sixty-six/H
+skating-rink
+skill/DSM
+skilled/U
+skin-tight
+skivvy/DMSG
+skiwear
+skulk/RGSD
+sky-blue
+Skylab/M
+skyline/MS
+slam/RGSD
+slanderous/Y
+slap-up
+sleazy/PTY
+sleeve/SMGDp
+sleuth/GMDS
+slob/SM
+slot/DGSM
+slouch/DSGZ
+Slough/M
+Slovak/S
+Slovakia/M
+slowdown/MS
+slue/DSG
+slumber/MdS
+slyness/M
+Sm
+smack/GSMDR
+small/ST
+smallholding/SM
+small-minded
+small-mindedness
+small-time
+small-town
+smash/RkSGD
+smash-and-grab
+smattering/SM
+smilax/MS
+smilies
+smocking/M
+smokescreen/S
+smoke-stone
+smoking-jacket
+smoothish
+smug/PTY
+snake/GZDMS
+snappy/TP
+snare/GDMS
+snarer/M
+snarl/SDGkY
+snicker/d
+snitch/GDS
+snobbish/Y
+snobbishness
+Snodgrass/M
+snooker/d
+snoot/SzM2Z
+snowdrift/SM
+snowfield/SM
+snub-nosed
+soapsuds
+sociometry/MW
+sock/DMSG
+socket/dMS
+soever
+soign�
+solely
+solicited/U
+solid-state
+Solis/M
+somalia
+someone/M
+son/MW1SZ
+sore/TSY
+sorrel/SM
+sorrower/M
+sorry/TPY
+sorter/SM
+sorts/K
+soulless/Y
+sound/GJSTMDRYp
+sounding/M
+sounds/A
+sow/RGDS
+spa/MS
+spaciest
+spadework/M
+sparest
+sparseness
+speaking/Ua
+spearhead/GSMD
+specialise/cnGDS
+specifies/A
+specimen/SM
+specious/PY
+spectrograph/Z1M
+spectrophotometer/MWS
+speculator/SM
+speechless/PY
+speedboater
+Spencer/M
+spew/DRSG
+spider/MZS
+Spielberg/M
+spiller
+spine-chilling
+spinet/SM
+spinneret/SM
+spiraea/MS
+spiritualness
+splashdown/SM
+splendiferousness
+split/SRGM
+spoil/CSRDG
+spokespeople
+spoonbill/MS
+spoor/SM
+sporran/SM
+spouse/SM
+sprang
+spread/CGcSe
+spread-eagled
+spreadsheet/S
+springy/TP
+spry
+spud/SDGM
+spurn/DSG
+spurner
+sputa
+squeegee/MSG
+squeezable
+Squibb/M
+squiredom
+squireship
+squirrel/YMGSD
+squirter/M
+stab/RYDJSG
+stability/MSI
+Staffordshire/M
+stallholders
+stalwart/YS
+stalwartness
+stand/SfGJ
+stand-off/S
+staphylococcal
+staphylococcus
+star-spangled
+start/RSDG
+starts/A
+statistical
+statistician/SM
+stator/SM
+stealer/M
+steam/zR2DGMZS
+steed/SM
+steel-clad
+steer/GSD7
+stegosaurus/S
+stem/pGMDS
+stentorian
+stepchildren
+stepladder/SM
+sterilise/ADSG
+stern/SYT
+stevedore/SM
+stick/RZS2GzM
+sticky/PT
+stiffen/rSd
+stigmatised/U
+stile/MS
+still/SDPTG
+stimuli/M
+stinting/U
+Stirling/M
+stirrup/SM
+stochastic/Y
+stocking/MSD
+stocktaking/M
+Stoddard/M
+stodge/2MZ
+stolid/Y
+stolidity
+stomach/R6pDMG
+stonemason/SM
+stonewort/M
+stopoff
+stopover/SM
+storey/S
+stork's-bill
+storm-cock/MS
+storm-door/SM
+Stornoway/M
+Stourbridge
+Strachan
+strafe/SGD
+straggly/T
+straight-eight
+strait/SMY
+strait-laced
+strategic/S
+strayer/M
+stressed/U
+stressfulness
+stretchy/T
+stridden
+strikebreak/RG
+strike-breaking
+string/AGS
+stringent/Y
+strobe/SM
+stroke/SGDM
+struck
+struggler/M
+strum/DGS
+strumpet/MS
+stuffy/YTP
+stumble/GSDRk
+stumpy/T
+suavity/M
+sub-aqua
+sub-basement/MS
+subcontractor/SM
+subdirectory/S
+subdivide/XSDGN
+sub-edit/d
+subfamily/MS
+subfusc
+subgenera/W
+subject/vGSDuMV
+subjectivism
+subjectivist/S
+subjectivity/SM
+sublet/SG
+submerse/SbXGDN
+submit/ANSGDX
+suborn/NGDS
+subscript/DGS
+subsidised/U
+subsist/GSD
+subspecies/M
+substation/SM
+substratum/M
+substructure/MS
+subsume/GSD
+subtend/SDG
+subtitle/MSGD
+subvert/SDG
+succour/SGMDp
+suds/Z
+suffix/nSGDM
+suffusion/M
+suicide/SoM
+sulky/T
+Sumatra/M
+summation/FMS
+sunburn/MSD
+sunglasses
+Sunni/MS
+Sunnyvale/M
+sunroof/S
+sunshade/SM
+superabundance/M
+supercilious/YP
+supercooled
+superficiality/S
+superfine
+superintend/DSG
+supernatant
+supernatural/PY
+superstar/SM
+superstition/SM
+superstructure/SM
+supervised/U
+supine/PY
+supplementary/S
+suppression/M
+supra
+Supt.
+Surabaya/M
+sure-footed/Y
+sure-footedness
+surface-active
+surface-to-air
+surface-to-surface
+surfboard/MGS
+surfeit/MGSD
+surgical/Y
+Surinamese
+surmise/DGS
+surreal
+Surrey/M
+susceptibility/MSI
+Suzanne/M
+suzerain/SM
+swashbuckler/SM
+sweatshirt/S
+sweaty/PT
+sweepstake/MS
+swineherd/SM
+swingeing/Y
+switch/DMRGS
+switch-over/M
+swoosh/DSG
+sword/SmM
+swung
+sycamore/SM
+syllabary
+symptomatology/M
+synaesthetic
+synchronized/CU
+synchronizer/CSM
+syndicalist
+synonymity
+synopsis/M
+synthesis/rQ9S8dM
+synthetic/SY
+syphilitic/S
+systematise/nRSGD
+systematize/NRSGnD
+tabbouleh/S
+tablespoonful/MS
+Taft/M
+taiga/SM
+tail/AMCDSG
+tailgate/G
+take-off/SM
+taker/cS
+Talbot/M
+Taliesin/M
+talkie
+tame/RTGDYS7
+tamper/rdS
+Tanaka/M
+tandoori/S
+tangy/T
+Tania/M
+tans/Z
+Taoism/MS
+tap-dance/G
+tar/DMZGS
+tarantula/SM
+Tarawa/M
+tarsus/M
+tartan/MS
+Tashkent/M
+Tasmania/M
+tasteless/PY
+taverna/S
+tawny/TM
+tax-deductible
+Tchaikovsky/M
+TCP
+teaching/M
+teacloth
+tear-off
+tease
+teasel/MS
+teazel
+teddy/MS
+teeter/dS
+teetotal/R
+Teignbridge
+Tel.
+telefacsimile
+telemeter/WSM
+telemetry/MS
+telepathic
+teletext
+temperamental
+temperateness
+temperature/MS
+tempt/SRnGDkN
+tenacious/Y
+tenet/SM
+tensioner/S
+tentativeness
+tenter/M
+tepidness
+tercentennial/S
+termini
+term-time
+ternary/S
+terrestrial/YSM
+Terrill/M
+tertiary/S
+Tessa/M
+tessellation/M
+testimony/MS
+test's/F
+test-tube
+tethered/U
+textile/SM
+Thai/S
+Thames
+thane/SM
+thanklessness
+Thatcher/M
+that'll
+thermionics/M
+thermochemical
+thermoplastic/S
+thesaurus/SM
+Thespian/S
+Thessaly/M
+thicken/Sdr
+thieve/GyDS
+thimbleful/MS
+thingamabob/MS
+third-class
+thirty-eight/H
+thoracic
+Thornton/M
+threadbare
+threat/SM
+three-cornered
+three-handed
+threepence/M
+threnody/SM
+thrombosis/M
+Thule/M
+thumbnail/SM
+thunderstruck
+Thurman/M
+thwart/SDG
+thyroid/S
+Ti
+ticklish/P
+tiddlywinks
+tight-arsed
+tilde/SM
+tilters
+time-and-motion
+timeless/Y
+timeslot/MS
+timestamped
+Timmy/M
+timpanist/S
+Timur/M
+tingle/GDS
+Tioga/M
+Tipton
+tiredness
+tithe/SMDG
+T-junction/S
+Tobin/M
+tog/MGSD
+Tokyo/M
+tolerance/ISM
+toleration/M
+toll-gate/SM
+Tolstoy/M
+Tompkins/M
+tonal
+tonality/SM
+tone-deaf
+tonguing/M
+tonsillitis/M
+Tony/M
+toolbox/MS
+toothbrush/SM
+tootsie/M
+top/MWwGpR1JDS
+top-notch
+Toronto/M
+torrential
+torrid/Y
+torture/RDGS
+torus/SM
+Tosca/M
+tote/GS
+toupee/MS
+tow-bar/MS
+tow-head/SMD
+townspeople/M
+toxicology/3Mw
+toy/MDSG
+toymaker
+track/GMRSDp
+track-laying
+tractably/I
+tractor/FSMCA
+tract's/F
+trade-in/S
+traducement
+traffic-calmed
+tragic/Y
+train/ADGS
+train-spotting
+trample/DSG
+transcendent/oY
+transgression/M
+translatable/U
+translated/aU
+transmission/AM
+transponder/M
+trapshooting/M
+trash/SGD2MZ
+travelled/U
+treadle/DSGM
+treatise/MS
+treatment/KSM
+trenchant/Y
+Trescothick
+triangulation/M
+tribalism/M
+tribe/SmM5
+trichina/M
+trichloroethane
+trigger/d
+trigger-happy
+trimonthly
+tripe/M
+tripwire/SM
+trisect/SGD
+trisector
+trod/A
+Trondheim/M
+troopship/MS
+troth/S
+trouble/DGSM
+troublemaker/MS
+trousseau/M
+trousseaux
+trueness
+Trujillo/M
+trump/SDGM
+truss/GSD
+trusted/U
+trustful/P
+trusting/Y
+try-out/MS
+T-shirt/S
+tubing/M
+tubule/SM
+Tuck's
+Tully/M
+tumblerful/S
+tumbrils
+tune/ACSGD
+tunic/SM
+Tupperware
+turbinate
+turbojet/SM
+turboprop/SM
+Turing/M
+turn-buckle/SM
+turnover/MS
+turpitude/MS
+tutorial/MS
+Tuttle/M
+tweet/SRGD
+twenty-first/S
+twenty-three/H
+twenty-two
+Twickenham
+twiddly/T
+twit/DGSM
+'twixt
+two-wheeler/MS
+type/aASGD
+tyrannosaurus/S
+tyro/SM
+UFO/S
+Ukrainian/S
+ulcerate/SGNDn
+ulcerous
+Ulrika/M
+ultra/S
+ultraconservative/S
+ultra-high
+ultramarine/SM
+umbrage/SM
+unable
+unaccustomed/Y
+unalterable/Y
+unanimity/SM
+unavailable
+unbelieving/Y
+unchristian
+unconfirmed
+uncork/G
+uncouple/G
+unctuousness
+uncut
+understandability
+undertaking/M
+unending/Y
+unessential
+unfair
+unfit/DG
+ungainly
+unguent/S
+ungulate/S
+unilateralism/M
+Uniondale
+union's/EA
+unipolar
+Unix/M
+unlike
+unload/G
+unmanly
+unmarried
+unmovable
+unpopular
+unprovable
+unread/2B
+unselfconsciousness
+unsettle/ki
+unsolder
+unsound
+unstable
+unstinting/Y
+unsure
+unsuspecting/Y
+untouchable/MS
+unutterable/Y
+Upanishads
+uplift/SDG
+upped
+upper/S
+uppermost
+Uranus/M
+urbanite/SZM
+URL
+user/aM
+USSR
+utensil/SM
+utmost
+utopian
+Utrecht/M
+uvula/SM
+Uzi/M
+vacant/Y
+vacuity/MS
+vacuolated
+vacuum/MS
+vainglorious/Y
+Val/M
+Valentino/M
+Valenzuela/M
+Valparaiso/M
+valuably/I
+value-added
+valueless
+values/fc
+Vance/M
+vandal/Q8MS
+vanquish/RGDS
+variegate/SnDGN
+various/Y
+varsity/SM
+vascular
+Vaseline/M
+Vatican/M
+vaunt/DGS
+Vegemite
+veggie/SM
+vehicular
+velocity/SM
+velour/MS
+velum/M
+Venables
+vendetta/MS
+venomous/Y
+ventilation/M
+ventricular
+ventriloquies
+venturesome/Y
+Verdi/M
+veridical
+verifiable/U
+Vern/M
+versatility/SM
+versify/GNRSnD
+version/MIFAS
+vertebrate/SIM
+vertices
+vesicle/MS
+vesiculate/NGS
+Vesta/M
+vestibular
+vestry/mSM
+vests/I
+vex/F
+vexatious/Y
+VF
+vibrational
+vice/CSM
+Vicente/M
+vicissitude/MS
+Victoria/M
+Vidal/M
+Viennese/M
+Viet
+viewpoint/SM
+vigilantism/SM
+vigorous/Y
+Vila/M
+vile/PYT
+villa/SM
+villus/M
+vinaigrette/SM
+vino/M
+violinist
+Virgil/M
+virile
+virtuoso/SM
+viscosity/MS
+visit/AdS
+vista/SM
+vitalized/C
+vitrification/M
+viva/S
+vivisect/xGDS
+vixen/MS
+vocabulary/SM
+vocation's/IFA
+vocoder
+voice-over/S
+voltmeter/SM
+voluble/Y
+voluntarily/I
+vomit/Sd
+voracious/Y
+vouch/GSRD
+Vreeland/M
+vulnerability/SI
+vulva/M
+WAC
+wagon/SM
+waitress/MS
+Waldemar/M
+Walt/MR
+Walther/M
+warble/GRDS
+warden/MS
+warmonger/MS
+warning/M
+Warsaw/M
+washbasin/SM
+washhouse/S
+Washington/M
+waste/Sj6
+watchword/SM
+watermark/MDGS
+water-resistant
+Watford/M
+wattage/MS
+Watusi/M
+wax/GMZDS
+weaners
+Wear
+Wear-Tees
+weathercock/SM
+Weatherford/M
+weds/A
+weft/SM
+weightless/Y
+weightlifter/S
+Weiss/M
+Weldon/M
+well-deserved
+wellness
+well-thought-of
+Welshwoman/M
+Wentworth/M
+westbound
+Western
+wetland/S
+wet-nurse/S
+Weymouth/M
+Whatley/M
+Wheatstone/M
+wheelbarrow/MS
+wheelbase/MS
+whelk/SM
+whereat
+where'd
+whims/1Zw
+whipper-snapper/SM
+whiskey/MS
+whistle-blower/S
+white/PSTGMY
+white-collar
+white-out/S
+Whitfield/M
+Whitney/M
+Whitsuntide
+whoever
+whore/SDGM
+who're
+whorehouse/MS
+whorl/SMD
+wickerwork/M
+wide-angle
+wide-ranging
+wifeliness
+Wigan/M
+Wiggins
+wild/TYPSG
+wildfowl/M
+Wiley/M
+wilful/YP
+Willamette/M
+Willem
+willing/UY
+Willy
+Wiltshire/M
+wimple/MDSG
+windburn/SM
+Windhoek/M
+winding/SM
+window-shop
+windowsill/SM
+wine/ZMS
+Winthrop
+wiry/T
+wisdom/MS
+Wiseman
+wishing-well
+witch/MyDSG
+with
+withdrew
+withstood
+Witwatersrand
+wizard/ySYM
+wizen
+woebegone
+woken
+Woking
+Wolff/M
+wolverine/MS
+wonderer/M
+wonderland/SM
+wood/mZDS2M
+woodchuck/SM
+woody/T
+woolliness
+woozy/TYP
+wordbook/SM
+workfare/S
+workman/M
+workmanship/MS
+workout/MS
+WorldCom
+world-view/S
+worn-out
+worst/D
+would-be
+wrap's
+wreathe/S
+wren/SM
+wriggly/T
+wrinkle/GDSMY
+wristwatch/SM
+write-off/S
+wrought/Ic
+WWW
+Wylie/M
+Xerxes
+Xi'an/M
+xylophone/SM
+Yakutsk
+Yalta
+Yankee/S
+Yankeeism
+Yarborough
+Yashmak
+yawn/kGRDS
+ye
+yell/SGD
+Yid
+yin
+yokel/SM
+yo-yo
+ytterbium/M
+Zadie
+Zaire/M
+zaniness
+zealously
+zebra/MS
+zeroes
+Zetland
+zip/UGDS
+zircon/M
+zone/ASDG
+Zulu/MS
+AA
+Ababa/M
+abaser/M
+abated/U
+abbot/SM
+Abbott/M
+abbreviated/U
+abdication/M
+abhor/SGD
+abhorrent/Y
+abjectness/S
+abnormality/SM
+aborter
+abortive/P
+aboveboard
+abrade/DGVXvuNS
+abrasive/MS
+abreast
+abrogation/M
+abstracter/M
+abstraction/3SM
+Abu/M
+abusable
+acceleration/M
+accelerometer/MS
+accession/MDG
+acculturation/M
+accuracy/ISM
+achieve/RSfDG
+acoustician/M
+acquit/DGS
+acrobat/M1SW
+action/IMS4A
+actionable
+actuation/M
+acuity/MS
+adaptor/S
+addend/SM
+addict/DSGVu
+additional
+additive/YSM
+add-on/S
+addressed/Aa
+adductor/M
+Aden/M
+adjective/SM
+admission/AM
+admixture/MS
+adolescence/SK
+adolescent/MYS
+Adolph/M
+adorn/DLSG
+adsorbate/M
+adulate/SDNnGy
+adulation/M
+adulthood/SM
+adventitious/PY
+adventure's/a
+adventurous/U
+adventurousness/SM
+adversarial
+adversity/SM
+advisability/I
+advise/BLRSGDlh
+advocacy/MS
+aerodynamics/M
+aestivate/N
+AFC
+affability/SM
+affect/hVvNnkDiSG
+affliction/SM
+affluent/Y
+aforementioned
+Afrikaans
+Afrikaner/SM
+afro
+agency/SM
+aggressor/MS
+agile/TY
+aglow
+agoraphobic/S
+agree/dESLlG
+agronomy/3SMW
+ague/MS
+Ahab/M
+Aida/M
+aide/MS
+aide-m�moire
+ail/LSDG
+airborne
+airframe/MS
+airfreight/DSG
+airhead/SM
+airing/M
+airsickness/S
+airtight/P
+air-to-air
+aisle/DGSM
+Ajax
+al/AFC
+Alabamian/M
+Aladdin/M
+alba/M
+Alberta/M
+Alden/M
+Alec/M
+ALGOL
+Al-Haili
+aligner/MS
+aliquot/S
+alkyl/M
+Allegheny/S
+allegory/1MWS3w
+allegretto/MS
+allier
+allocation's/CKA
+all-time
+almost
+aloha/MS
+Alpert/M
+alphabet/sQ-SW89q1Mw
+alphanumerical
+al-Qaeda/M
+al-Sharif
+altar/SM
+although
+altogether
+alumna/M
+Alvarez
+amalgamate/SDG
+ambassadorship/MS
+ambience/M
+ambivalent/Y
+ambulance/MS
+Amelia/M
+amener
+amenorrhoea/M
+ammoniac
+ammunition/SM
+amniocenteses
+amoeboid
+Amos
+amputee/SM
+anagram/GMDS
+Anaheim/M
+analgesic/S
+anarchist/W
+anastomoses
+ancestral/Y
+ancestress/SM
+andiron/MS
+androgyny/MS
+anecdotal
+anemometer/SM
+Anglicism/S
+Anglophile/SM
+angst/MS
+anhydrite/M
+aniline/MS
+animalcule/S
+animately/I
+anklet/MS
+Annie/M
+annihilation/M
+anniversary/SM
+annoy/DkRSG
+anonymous/Y
+another/M
+ans/M
+answerable/U
+answered/U
+ante/MW
+anthracite/MS
+anthropomorphism/SM
+anthropomorphous
+antibiotic/MS
+anticipation/M
+anticoagulant/S
+antimacassar/MS
+antipathy/SMW
+antiphonal/S
+antiquity/SM
+antiresonance/M
+antislavery
+antisymmetry/W
+antiterrorism
+Antoinette/M
+anus/MS
+anybody/SM
+anyhow
+aorta/WSM
+apart/PL
+apex/SM
+aphrodisiac/SM
+apish/YP
+apophthegm/SM
+apparatus/SM
+appealing/U
+appeased/U
+appellation/M
+appellative/M
+applicator/SM
+appoints/EA
+apposite/Yx
+apprehender/M
+apprentice/DSGM
+appropriator/SM
+appurtenant
+apt/TPY
+Arabian/SM
+arable/S
+Arapaho/M
+arbitrariness/S
+arbour/MDS
+Arbroath/M
+arc/SMDG
+archaeopteryx
+archdiocesan
+archipelago/SM
+Arcturus
+ardent/Y
+Ards/M
+arduous/YP
+area/MS
+aren't
+Aretha/M
+arguably/IU
+argued/e
+argument/SnMN
+ariser
+Aristophanes
+Aristotelian/M
+Aristotle/M
+arithmetical
+Arizona/M
+armada/SM
+Armagnac
+Armenia/M
+armlet/SM
+Armstrong/M
+aroma/WSM1
+aromatic/PS
+arras/M
+arrears
+arrogate/DNGnS
+arsenide/M
+arterial
+arteriole/SM
+artful/P
+arthritis/M
+Arthurian
+articulateness/S
+artificiality/SM
+artistic/IY
+ascetic/MYS
+ascorbic
+asexual/Y
+ash/SMDGZ
+Ashland/M
+Asia/M
+asked/U
+asocial
+asparagus/SM
+aspartame/S
+asperity/SM
+aspirate/SGD
+aspirer/M
+aspirin/SM
+Assad/M
+assay/GDRS
+assertiveness/S
+assessor/SM
+asseverate/SGnDN
+assigned/KACU
+assigns/KCA
+assimilate/DSVGnN
+assimilationist
+assister/M
+associative/Y
+assonant/S
+assuming/U
+assumption/M
+asthmatic/S
+astonish/SLkDG
+Astoria/M
+astronomer/SM
+astrophysical
+asymptomatic/Y
+asymptote/1MSW
+Atari/M
+attached/AU
+attainably/U
+attained/AU
+attempted/A
+attenuator/SM
+attitudinal/Y
+attract/VuS7DGv
+au
+audible/YI
+Augustinian
+auricle/SM
+Australasian/S
+authenticator/MS
+authenticities
+authorial
+authorizes/A
+authorship/MS
+autocross
+autogyro/MS
+available/P
+avant-gardism
+avarice/MS
+ave/S
+aver/DG
+aviary/SM
+avionic/S
+avocation/MoS
+avoidance/MS
+avow/GSED
+awestruck
+awhile
+axed/F
+axillary
+axolotl/MS
+baa/GSD
+Babcock/M
+babe/SZM
+baccalaureate/SM
+backache/MS
+backer/SM
+backing/SM
+backlash/SDGM
+backlit
+backplate/MS
+backstairs
+backtrack/RGSD
+Backus
+backwater/MS
+badge/SRGMD
+badger/d
+bagginess/S
+baggy/TPS
+bagpipe/MRS
+baguette/MS
+bake/RGSDy
+baking/M
+baksheesh/MS
+baldric/M
+ballast/SMGD
+ball-bearing/S
+ballgame/S
+ballyhoo/MDGS
+balun
+balustrade/MS
+bandmaster/MS
+bandstop
+banisher/M
+banjoist/MS
+bank/S7RGJMD
+Bantu/M
+baptise/DRSG
+baptistery/SM
+barbarian/SM
+barbarianism/MS
+barbershop/SM
+barcarole/SM
+bard/MSDGW
+Barents
+barkeep/RS
+barmaid/SM
+Barnet/M
+baronage/MS
+baronet/SM
+Barr/MZ
+bar-room/MS
+bar's
+Bartley/M
+bas/Sd1o
+baseplate/M
+basetting
+basket/6SMy
+Basque/MS
+bassinet/MS
+bate/CDASG
+bater/C
+batted
+battle/RDLMSG
+bauble/MS
+BBC/M
+beachcomber/SM
+beard/pSGiDM
+beatably/U
+beaten/U
+beating/M
+beatitude/MS
+beatnik/MS
+became
+beckon/Sd
+bedchamber/M
+bedim/GSD
+bedlam/SM
+bedridden
+beech/SM
+beefeater
+beermat/S
+Beersheba/M
+beeves/M
+befit/SGDM
+befitting/Y
+befriend/DGS
+behaviour/aSM
+behest/MS
+behold/GSR
+bejewel/DGS
+Belarus/M
+belated/P
+belief/SME
+believably/U
+bellow/SDG
+Bellwood
+belonging/M
+bemoan/SGD
+bench/GSDM
+Benedict/M
+benevolent/YP
+Benghazi/M
+Bentley/MS
+berkelium/M
+beside/S
+besot/SDG
+bespangle/DSG
+bespoken
+bestir/SDG
+bestow/DSG
+betake/SG
+b�te/S
+bethought
+betwixt
+biased/U
+bicameral
+bicentennial/S
+bier/M
+biggie/M
+bikini/SMD
+biliary
+bimodal
+bin/DGSM
+binder/Z
+binomial/SYM
+bioengineering/M
+biotechnology/w3SM
+biplane/SM
+birthrate/MS
+bisyllabic
+bitterer
+Blackadder/M
+blackbodies
+blackmail/RGMDS
+Blackshirt/SM
+blacksmith/GSM
+Blackwell/M
+blameworthy/P
+bland/TPY
+blankness/S
+blarney/GSMD
+blaspheme/RDSZG
+blatherer
+blatting
+bleed/RSG
+blight/DGMS
+blighter/M
+blimey/S
+blinker/d
+blinks/M
+bliss/6jS
+blissful/P
+blizzard/SM
+blob/SMDG
+Bloch/M
+blockbuster/MS
+blonde/SM
+blondish
+blood-brother
+blood-heat
+bloodline/MS
+blood-money
+bloodroot/M
+bloodstone/M
+bloodymindedness
+Bloomington/M
+blot/GMRSD
+blotto
+blow-dry/GD
+blubber/dSZ
+blue/TZGSYPDMJ
+bluejeans
+bluer/M
+bluestocking/SM
+bluing/M
+boasted/e
+boat-hook/S
+boatyard/SM
+bock/SGD
+bodhisattva
+body/pDMSYG
+bodywork/MS
+boggle/DGSk
+boilerplate/SM
+Bois/M
+boisterous/YP
+boldness/S
+Bolivia/M
+bolt/UGSD
+bombast/WMS1
+bombed-out
+bonfire/SM
+bongo/MS
+bonhomie/SM
+bonny/T
+boohoo/SDG
+bookbindery/MS
+bookcase/SM
+booked/cA
+bookmaker/MS
+bookshelf/M
+bootie's
+bootleg/GSRD
+borate/DMS
+borderland/SM
+bore/RGSkDW
+boring/M
+born/AU
+boss/SzG2MDZ
+bossism/SM
+bosun/M
+bouffant
+bouillon/MS
+bouncy/YT
+bounded/P
+bountiful/P
+bout/MS
+Bowery
+bowl/R6MSDG
+bow-saw/MS
+boyfriend/SM
+bracket/dSM
+bracketing/M
+Brady
+brag/TSDRG
+brain/GD2pMZS
+brainchildren
+brainwash/SGD
+brainwave/S
+brambly/T
+bravura/MS
+bray/SGD
+Brazzaville/M
+bread-and-butter
+breadboard/DGMS
+breadwinner/SM
+break/eMS
+breeching/M
+Brett/M
+bridegroom/MS
+bridleway/S
+briefs/C
+Brigadoon/M
+brighten/drS
+brilliancy/SM
+brink/MS
+briquette/SM
+Bristol/M
+Britain/M
+Britten/M
+brittlely
+brochette/SM
+brogue/SM
+bronchiole/MS
+brooklet/SM
+Bros.
+brow/SM
+Brubeck/M
+brush/ZGSDM
+brushlike
+brush-off/S
+Brussels/M
+brutal/qQ8-
+Bryce/M
+BSkyB/M
+BTU
+Budapest/M
+budgie/MS
+Buena
+bug-eyed
+Buick/M
+building/MeS
+build-up/SM
+Bulawayo/M
+bulldoze/RGDS
+bullfight/RSMG
+bully/DGTMS
+bumble/DRkSG
+bunchy/T
+bunkhouse/MS
+burdening/c
+burdens/cU
+burgess/MS
+burglarious
+Burgoyne/M
+burlap/MS
+burler/M
+burliness/S
+bursa/yM
+bursar/MS
+bursty
+busher
+bushwhack/GRSD
+busty/T
+busyness
+but/DAGS
+Bute/M
+butterfat/MS
+butterfingers/M
+buzzard/SM
+byliner/M
+bypath/SM
+byword/SM
+Byzantine
+Byzantium
+cabal/GDSM
+caballero/SM
+cabbage/DGSM
+cabochon
+cabstand/SM
+cackle/DRSYG
+Caddick/M
+caddie
+caeca
+caecitis
+caffeine/SM
+cageyness
+cagoule/S
+calcification/M
+calcimine/DSMG
+Caledonia/M
+calfskin/SM
+call-boy
+calling/a
+callisthenic/S
+callisthenics/M
+Calvert/M
+Calvin/3M
+cambial
+came/c
+cameo/MSDG
+Canaveral
+cancerous/Y
+candelabrum/M
+candidness/S
+candour/SM
+cannabis/MS
+canyon/SM
+capable/IP
+capaciousness/S
+capacity/SMI
+capillarity/MS
+capital/-qMQs893S
+capped/U
+caprice/SM
+captor/SM
+captured/A
+carbohydrate/SM
+carbon/sQ9S8W-NqMn
+Carbondale
+carcinogenesis
+card-index
+cardiogram/SM
+careerism/M
+caresser/M
+cargo/M
+Caribbean
+carious/K
+car-jack/SDJRG
+Carlin/M
+Carline
+Carney/M
+Carnot
+carny/G
+Carolingian
+Carolyn
+carpet/dJSM
+carpeting/M
+carries/a
+cartridge/MS
+cash/DGSpM
+cash-book/MS
+cashew/SM
+cassette/MS
+casting/Mc
+Castro
+casual/PY
+cataclysm/WSM
+catacomb/MS
+catamaran/MS
+Catawba
+catcall/DGSM
+catchword/MS
+catkin/SM
+catlike
+cattiness/S
+catty/TP
+caucus/S
+caught/U
+cauldron/SM
+cause/GnDMoRSp
+cautiousness/I
+cavalier/YPSDG
+cave/mRSMDG
+caver/F
+Caxton
+CB
+CDs
+Cedric/M
+Celanese
+celebrant/SM
+celery/SM
+centenarian/SM
+centreboard/SM
+centrepiece/SM
+centring/M
+century/SM
+cephalic/S
+cerebral/S
+cert/SF
+cesspool/MS
+chador
+chafer/M
+chagrin/MS
+chain-smoke/GD
+chairmanship/MS
+chalcedony/SM
+chalk/MGZ2SD
+challenge/RDGSk
+championship/SM
+chancellery/SM
+chance's/a
+changeover/SM
+Channing
+chanticleer/SM
+chaos/MS
+charisma/M1W
+Charleston
+chart/RDG73MJS
+charter/dr
+chastity/SM
+chateaubriand
+Chattahoochee
+cheap/TY
+checkpoint/MS
+cheesy/PT
+chef/SM
+chemistry/SM
+cheroot/MS
+chestful/S
+chevron/SM
+chicer
+chicken-livered
+chilblain/SM
+childrearing
+Chilean/S
+chill/TDk2PRGMYS
+Chiltern/S
+chinchilla/MS
+Chinese/M
+chinstrap/S
+chipping/M
+chivalrous/PY
+chlorination/M
+chocoholic/S
+chocolatey
+choice/TSPYM
+chokeberry/M
+cholinesterase/M
+chopstick/SM
+chording/M
+Chorley
+chortle/RGDS
+chosen
+christening/MS
+Christie
+Christmastime
+chromatogram/MS
+chumminess/S
+Churchillian
+churlish/YP
+churn/RDGSM
+chutney/SM
+chyme/MS
+ciao/S
+CID
+cilium/M
+Cinerama
+cinnamon/SM
+circa
+Circe
+circle/GDSM
+circulating/A
+circumference/SM
+circumspect/Y
+cissy
+cistern/SM
+citadel/SM
+civil/s9qQ-8Y
+civility/ISM
+clairvoyance/MS
+clamour/GMDRS
+clarification/M
+clarify/NDGSn
+clarity/SM
+Clarke/M
+clasper/M
+class-conciousness
+classicism/SM
+classicist
+Claudio
+clavichord/SM
+clavier/MS
+clean-cut
+cleanlinesses
+clearness/S
+Cleopatra/M
+clericalism/MS
+clew/SMDG
+click/RSGDM
+cliffhanger/SM
+climacteric/MS
+clime/WSM
+clinical/K
+cliometric/S
+clip/RGSDJM
+cliquish/YP
+clitorides
+cloaca/M
+cloisonn�
+close-hauled
+closure/GDSM
+clothbound
+clothes-peg/SM
+cloudiness/S
+clouds/c
+cloudscape/SM
+clownishness/S
+clubroom/SM
+clued-up
+cluster/MdSJ
+cm
+Co
+coagulator/S
+cobblestone/SDM
+coca/SM
+coccyx/M
+cockade/MS
+cockney/MS
+coded/K4
+codeine/MS
+coding/4
+Coelenterata
+coelenterate/MS
+coffee-cup/SM
+coffer-dam/MS
+cognisance
+cognizance/AMS
+cogwheel/SM
+coherence/SIMZ
+cohesive/YP
+coke/SMDG
+cokey
+cola/SM
+Colby
+Coldfield
+collide/XDGxNS
+collimate/SCNDG
+colonel/SM
+colonialness
+colonised/U
+colorimeter/SMW
+colourant/SM
+Columbia/M
+column/D3SQ8M
+combustive
+cometary
+comfits/E
+comfortably/U
+comforter/SM
+comic/YMS
+coming/c
+Commander
+commando/SM
+commender/AM
+commensurably
+commenting
+commits/A
+committable
+commode/ESI
+communicate/BDxSVvGnNu
+communicates/a
+communicative/P
+commutable/I
+Compaq/M
+comparator/MS
+compatible/SIY
+compel/7NGSDnk
+compendium/MS
+compensable
+compiles/A
+complex/GxDYTPNXS
+complexity/cM
+complicate/GcDS
+complicit
+complicity/MS
+complimentary/U
+compose/CRDSXGN
+composing/EA
+comprehensibility/IMS
+compulsive/YSP
+compulsory/YS
+Comte
+conceitedness/S
+conceive/KSDaG
+conciliator/SM
+conclave/S
+condemn/Nn7RGDS
+condemnation/M
+conditioning/M
+conduction/M
+confab/DSMG
+confectioner/Z
+confessor/SM
+confident/cY
+configuration/AM
+Cong
+congener/SM
+congenial/U
+Congo/M
+Congolese
+congress/mxM5GSD
+congruency/M
+conk/RSD
+connection/MES
+connection's/A
+conscious/YU
+consequential/IY
+consequently/I
+consequentness
+conservatism/SM
+considerate/YnN
+consignment/A
+consistence/ZS
+consolatory
+consolidator/MS
+consonant/YSM
+conspirator/SoM
+conspire/G
+constipate/NGDSn
+constipation/M
+constructibility
+construe/DS7G
+construed/a
+construes/a
+cont
+contemplative/PS
+contemporaneity/MS
+contra/yS
+contraceptive/S
+contrite/P
+conundrum/MS
+convalesce/DSG
+convene/GADS
+convention/SoM
+convergence/SM
+converts/A
+conveyor/MS
+convince/RGDSk
+convinced/U
+convoke/GDNnS
+Conway/M
+cooker/SMZ
+cooled/c
+coop/RDGM
+co-operate/VSDGuNv
+coordinate/DGV
+Copernican
+copious/YP
+copula/nMSV
+coracle/SM
+coral/SM
+cord/EGSAMD
+cordial/PYS
+coriander/MS
+corm/SM
+corncrake/M
+cornstalk/MS
+coronate
+corporal/MS
+correction/SM
+corroborated/U
+corrugate/DSNnG
+corundum/M
+cos/S
+cosmic/Y
+cosset/Sd
+costly/TP
+cote/SM
+couch/DGSM
+councilperson/S
+countably/U
+counterbalance/MSDG
+counterexample/S
+counterfeit/GRSD
+counter-intelligence/MS
+counterpoise/DMGS
+counter-productive
+countervail/SGD
+Couperin
+courgette/SM
+courser/ESM
+courtesied
+courtesy/ESM
+couscous/MS
+coverlet/SM
+coveter/M
+cowardice/SM
+cowardliness/S
+cow-parsley/M
+co-written
+CPU/SM
+crab-apple/SM
+crabbiness/S
+crabbing/M
+crabgrass/S
+cradler/M
+craftiness/S
+Craig
+cramper/M
+crane/MDSG
+cranial
+Cranleigh
+crash-land/GD
+crawdad/S
+crawly/ST
+crazy/YSPT
+creaky/PT
+creamer/Z
+crease/GISCD
+creating/A
+credential/MS
+credibility/ISM
+creditor/MS
+credit's
+creditworthy
+creel/DGMS
+Creighton
+cr�me
+crescendos/C
+cress/S
+cretinous
+crevice/MS
+Crichton
+crispness/S
+criticism/MS
+Croatian
+crooked/P
+cross-check/DGS
+crossly
+crossness/MS
+cross-section/oS
+crotchet/MSZ2
+crucifix/XNMS
+crucifixion/M
+cruise/RSDG
+crumble/SJDG
+crummy/T
+crumple/SDG
+crusade/MRSDG
+crustacean/MS
+cry/CRSGD
+cryptanalytic
+crystallographer/MS
+crystallography/WM
+CSEU
+cu.
+cuckold/MDGyS
+cud/SM
+cudgel/DSGMJ
+culotte/S
+cultivation/M
+culvert/MS
+cum/S
+cumber/Sd
+cummerbund/SM
+cunning/TYP
+cupful/MS
+cupidity/SM
+curability/SM
+curator/SM
+curbside
+curettage/SM
+curium/M
+curled/U
+curling/M
+curls/U
+curmudgeon/MYS
+Currie
+curry/DGMS
+currycomb/SMDG
+curvature/MS
+curvilinearity/M
+cuspate
+Custer/M
+customhouse/S
+customised/C
+custom-made
+cutaway/SM
+cutlet/MS
+cut-off/SM
+cut-out/SM
+cutup/MS
+cyanate/M
+cycloidal
+cynosure/MS
+Cyrus
+cyst/SWM
+czarina/MS
+czarist
+d/to
+damaged/U
+Damascus/M
+dancelike
+Dane/S
+dangerous/YP
+danseuse/SM
+dark/PSDTGY
+dart/MGSRD
+Darwin
+DAT
+dative/S
+daughter-in-law
+daunted/U
+dauntlessness/S
+Davison/M
+deadbeat/SM
+deadliness/S
+deadwood/SM
+deaf/PYT
+deaf-and-dumb
+deafness/S
+death/pYMS
+deathblow/MS
+Debbie/M
+debt/MS
+Decalogue
+decimation/M
+declination/M
+d�collet�
+decorum/SM
+decoupage/DGSM
+d�coupage
+decree/SMdG
+decry/J
+dedicative
+deeds/a
+deepen/dS
+defecation/M
+defenceless/Y
+defended/U
+defiance/SM
+deficient/Y
+deficit/SM
+defile/L
+defined/U
+Defoe
+deg
+deification/M
+Deighton/M
+deign/DGS
+de-industrialization
+deleterious/PY
+deliciousness/S
+delicti
+delighted/P
+demean/D
+demented/PY
+demist/G
+demonstrableness/M
+demonstrably/I
+demur/GDS
+demurral/MS
+dengue/SM
+deniable/U
+denial/MS
+denoter
+density/SM
+depend/BSDGl
+dependently/I
+depicter/M
+deploy/LD7G
+deployed/A
+deportation/M
+depreciate/DnvGkSVN
+Derby/M
+dereference/R
+derivative/MPS
+descendant/SM
+descriptivism
+deserve/kih
+desiccator/SM
+designator/SM
+desired/U
+Desiree
+despise/SRGD
+dessert/SM
+destructor/M
+detonator/SM
+detract/DGVv
+deuteron/M
+Deuteronomy
+develop/cdAS
+deviant/MYS
+devil/DLyMGS
+devitalize
+devolution/SM
+devotee/SM
+devotion/SM
+dewclaw/SM
+dexterous/PY
+diagnosed/U
+diagonal/tQ+8SY
+diamondback/SM
+Diane
+diapason/SM
+Dibley
+dibs
+dichloride/M
+dicta/nM
+dictate/DGS
+dictator/MoS
+die-hard/S
+Dieppe
+dietician/MS
+Dietz
+difference/IMS
+digest/SKGD
+digestion's/I
+dilapidate/DGSNn
+dilator/MS
+dildo/SM
+dimethylglyoxime
+dimorphic
+ding/zDG2Z
+dingle/SM
+dinky/ST
+dinnertime/S
+dinosaur/SM
+diphtheria/SM
+directional/S
+director/MAS
+directors'
+disadvantage/i
+discern/LbkSGD
+discernible/I
+discipline/GDSM
+disconnectedness/S
+disconsolate/Y
+discotheque/SM
+discriminate/SnNDVGky
+disguise/GRDh
+disjointedness/S
+disjointness
+disorderly/P
+dispatch/R
+dispensate
+disproportion/N
+disproportionation/M
+dissatisfy
+dissociation/M
+dissoluteness/S
+distil/NS7VnG
+distributorship/M
+disulphide/M
+ditch/DSMG
+ditherer/S
+dive-bombing
+diversifier/M
+diversify/SGNDn
+diversity/SM
+divertimento/M
+divide/RuDSGxVXvN
+divided/AU
+divides/A
+divvy/DSMG
+dizziness/S
+DMZ
+doc/RSMDG
+document/NMRDGSn
+Dodoma/M
+does/ecUA
+doff/SDG
+doggerel/SM
+dog-paddle
+dome/SMGD
+domination/KM
+Dominic
+Dominique/M
+dona/SM
+donation/M
+Doncaster
+Donnelly
+doorpost
+doorstop/SM
+doorway/SM
+Doreen/M
+Doris
+dormant
+dotty/T
+double-edged
+doubtful/YP
+doubtless/PY
+dour/PTY
+douse/SGD
+dove/SM
+doveish
+downhearted/PY
+downhiller
+downlink/SGD
+downpour/SM
+downstage/S
+down-to-earth
+draggy/T
+Dramamine
+draw/SRG7J
+dreaminess/S
+dreariness/S
+dreg/SM
+dressiness/S
+dressmaker/SM
+Drew's
+Drexel
+driblet/SM
+drinkable/U
+drive-ins
+Druidical
+Druid's
+Drummond/M
+DTP
+duality/MS
+Dubuque
+dull/PYGSDT
+dullard/MS
+dumbness/S
+Dunbar/M
+Dunfermline/M
+dunghill/SM
+duo/SM
+duologue/M
+duopoly/3M
+dupe/RSMGD
+duplexer/M
+duplicability/M
+duration/MS
+Durham/M
+dusk/GSDM2Z
+D�sseldorf
+dust/2MZGSzRDp
+dustcart/M
+Dutchwomen/M
+duty/6jMS7
+Duxford/M
+dwarfism/MS
+dwell/GRJS
+Dwight
+dynasty/SMW
+eagerly/c
+eaglet/SM
+Ealham
+earful/SM
+ear-splitting
+earthmover/M
+earthy/PT
+East/RM
+eastward/S
+Ebrahim
+EC
+ecclesiology/3w
+�clair/SM
+ecocide/SM
+ectoplasm/M
+Ecuadorian
+ed.
+Edgerton
+edibleness/S
+Edith
+Editor-At-Large
+Edmundsbury
+Edna
+educatedness
+educationalist
+eelgrass/M
+e'er
+EFT
+egalitarian/S
+Egan/M
+egomania/SM
+eight/HMZS
+eighty-five/H
+ejaculate/nDGSNy
+ejector/MS
+elapse/SGD
+elastodynamics
+electability
+electrologist/SM
+electroluminescent
+electromagnetism/SM
+electrostatics/M
+elegy/MS
+elephant/SM
+elephantine
+elfish
+elicitation/M
+elision/M
+Ellen/M
+Ellie
+ellipsoidal
+Ellwood/M
+eloquence/SM
+elucidate/VNDSGn
+elucidation/M
+elves/M
+Ely/M
+email/MDGS
+emanate/DnVGSN
+emancipation/M
+embarkation/MSE
+emboss/GDRS
+embryology/S3wM
+emendation/M
+emerald/MS
+emerita
+Emil/M
+Emile/MZ
+emirate/MS
+Emirates/M
+emissary/SM
+emollient/S
+emphasized/c
+employ/DGLSRB
+employments/f
+empower/LSd
+empty-handed
+en/7M
+enable/RDGS
+enact/GLSD
+enacting/A
+enactment/A
+enamel/GMRDJS
+encapsulation/M
+encompass/DGS
+encounter/Sd
+encyclical/SM
+endothelial
+endpapers
+endurable/U
+enfeeble/LSDG
+England/M
+English-speaker
+engrosser/M
+enjoinder
+enlarge/RLDSG
+ennui/MS
+enormousness/S
+enqueue/SD
+enquiry/S
+enrobed
+enrollee/MS
+ensign/SM
+entirety/SM
+entitle/SDLG
+entity/SM
+entranceway/M
+environment/o
+envoy/MS
+epicentre/MS
+epicurean/S
+episode/W1SM
+epitaph/MS
+epithelium/SM
+equability/MS
+equable/YP
+equality/IMS
+equilibration/M
+equinox/MS
+equipoise/MSDG
+equiproportional/Y
+equips/A
+equispaced
+equivalent/YS
+equivocate/GDNSn
+Erickson
+erk
+ermine/SDM
+Erwin
+escalator/MS
+escallop/SM
+escapade/MS
+escapee/SM
+esp/Z
+espalier/SDGM
+especial/Y
+established/A
+esteem/EDGS
+Ethan
+Ethel
+EU
+euclidean
+Euston/M
+evaluate/xNVDGSn
+evangelist/WSM
+Evansville
+even/YdSPJ
+even-handed/Y
+evening/M
+eventful/P
+evocative/P
+evoke/VGuvSnDN
+evolutionary/Y
+Ewing
+exacerbation/M
+exacting/P
+exampled/U
+Excalibur
+excavation/M
+excel/DGS
+exchangeable
+excitatory
+excite/lknGNLRDSBh
+exciting/Uc
+exciton/M
+exclamation/MS
+excremental
+excrete/ynDGSN
+excruciate/DSNkG
+excruciation/M
+excursion/3MS
+excursiveness/S
+excusably/I
+exemption/MS
+exercises/c
+exhale/GNDSn
+exhibitionism/MS
+exhibitionist
+exhilarate/DSVNGkn
+exhume/GDSn
+exit/dSM
+exorbitant/Y
+expatiate/GNDSn
+expedient/YS
+expend/Du7VSGv
+experiences
+experimentalist
+experimentation/M
+exploded/U
+exploitative
+explorable
+exponential/YS
+exported/A
+exporting/A
+exposit/yXN
+expunge/SGD
+exquisite/YP
+extended/c
+extensibility/M
+extensive/FY
+extermination/M
+extinction/SM
+extragalactic
+extravehicular
+extremal
+extricate/GnDSN
+exultation/M
+eye-catching
+eyeglass/SM
+eyelid/SM
+eye-shadow
+eye-teeth
+eyrie's
+fa/M
+Fabians
+fa�ade/SM
+face-saving
+facilitator/SM
+fading/M
+Faeroe/M
+faery/SM
+faint/RGSPYTD
+fair/DTZPSGpJY
+Fairview
+faithful/UY
+Falk
+fallen
+falsifiability/M
+Falstaff
+familiar/9Qsq8-SY
+familiarise/k
+famously/I
+fanatic/MYS
+fang/SDM
+fantastic/Y
+far/d
+Farmington
+farmstead/MS
+farrier/SM
+far-sighted/YP
+farthest
+fascia/MS
+fascinate/DGSnkN
+fashions/A
+fasten/dASU
+fatherland/SM
+faultiness/S
+fauvism/S
+faux
+Fayetteville
+feature/DMGSp
+feature's/a
+federate/FNGnSD
+federative/Y
+feeling/PM
+feldspar/SM
+felicitate/DGSNn
+fellahin
+fellate
+fellatio/MS
+fellator
+felting/M
+feminise/nSGD
+feminize/nSNGD
+fenced/U
+Ferguson/M
+Ferreira
+fervent/Y
+f�te/SM
+fetishism/MS
+feverish/YP
+fewness/S
+FIA
+fianc�e/MS
+fibrillate/SGD
+fiche/SM
+fidget/SdZ
+fiducial/Y
+fiefdom/S
+fierce/TPY
+fifth-generation
+film/ZS2DMG
+filmy/TP
+fine/CFSDAG
+finer/FCA
+fingering/M
+fingernail/MS
+firebrand/SM
+fire-break/SM
+fire-eater
+fireside/M
+fire-water
+firmest
+firmly/I
+firmness/SM
+first-born/S
+first-class
+first-day
+Fishguard/M
+fishing/M
+fissionable/S
+fistulous
+fitness/S
+Fitzgerald
+fixative/S
+flaccid/Y
+flagellate/DSG
+flagship/SM
+flair/SM
+flammability/ISM
+flank's
+flattery/SM
+flattest/M
+flaunt/DkGS
+flaxen
+Fledermaus
+fledged/U
+fleet/DkGSTYPM
+fleeting/P
+fleshpot/SM
+flexes/A
+flexural
+flibbertigibbet/SM
+flighty/TP
+flinger/M
+flintlock/SM
+Flintshire/M
+flip-flop/S
+flirt/NDGZSn
+float/DGZSRN
+flock/DMJGS
+flog/DSGJR
+flogging/M
+floodlit
+floorboard/SM
+flop/2DGSzZ
+floppiness/S
+flowerbed/MS
+Floyd
+fluffy/PT
+fluid/Q8s9PSYM
+fluke/SGDMZ
+flung
+fluoride/nMS
+flyleaves
+flysheet/SM
+focussed/U
+fog/CGDS
+f�hn
+fold-out/SM
+foliate/CGSnDN
+fondness/S
+fontanelle/SM
+food/SM
+footlocker/SM
+footmarks
+footwear/M
+fop/GSMD
+fora
+foray/DSGM
+forbear/MSG
+foregather
+foregathered
+foreignness/S
+forensic/SY
+foreseen/U
+foreshorten/dS
+foresight/SMiDh
+forestall/GRSD
+forewent
+forger/SZM
+forgettably/U
+forgiveness/S
+forgoes
+formidable/PY
+form's
+forsooth
+forsworn
+fortify/DAGS
+fortuitous/YP
+fortunateness/M
+fortune-teller/SM
+fortuning
+forward/DYSTPRG
+fouls/M
+foundational
+founding/F
+foundling/SM
+fourpence/M
+four-wheel
+foveate
+foxtail/M
+fragmentation/M
+fragrant/Y
+frail/PTY
+Francesco
+frangibility/SM
+frangible
+frankincense/MS
+Fraser/M
+Frazer
+frazzle/GDS
+free/mTSYPdG
+freebase/DSG
+frequented/U
+frequently/I
+Fresnel
+fricassee/GSM
+fries/M
+frig/SJGD
+Fritz
+frogmarched
+froid
+frolic/SRDMG
+froufrou/SM
+fructose/SM
+frugal/Y
+frustration/M
+frustum/MS
+fudge/MSDG
+Fujitsu/M
+Fukuoka
+full-blown
+fulness's
+functionary/MS
+fungible/M
+fungoid/S
+fungus/M
+funk/S2DGMZ
+fun-loving
+furious/YP
+furnish/RSGDJ
+furnishes/A
+furniture/SM
+furtive/YP
+fusible
+fuzz/DZMGz2S
+FYI
+gab/GZSD2
+gabardine/MS
+gabby/T
+gabler
+Gabrielle
+gadget/SMy
+Gagarin
+gaiety/SM
+galactic
+Galahad
+galaxy/SM
+gale/AS
+gallant/SGDY
+gallon/SM
+gallonage/M
+Gallup
+galumph/SGD
+Galveston
+Gambian/S
+gambol/SGD
+ganglion/MW
+gangrenous
+gangway/MS
+garble/GDS
+Garbo/M
+gar�on/SM
+garden/dSrM
+gargantuan
+garments/f
+garment's/f
+garrulity/MS
+garrulousness/S
+Garry
+garter/dSM
+gasohol/S
+Gaspar
+gas's
+gastroenteritides
+Gatsby
+Gaylord
+gelatine
+geld/SGJD
+gem/SZMDG
+gemmology/3M
+gendarme/SM
+gene/SM
+general/Q8Ptq93+s-SM
+generalist
+generality/SM
+generation/CMA
+genital/YF
+genius/MS
+Genoa/M
+gentian/SM
+genus
+geodesic/S
+germander
+germanium/M
+germicidal
+germinal/Y
+Gershwin
+gestation/M
+gesundheit
+Gethsemane
+getup/MS
+Gew�rztraminer
+ghostliness/S
+gibbet/SMd
+giddiness/S
+gill/MSGD
+girdler/M
+giro/M
+girth/GDSM
+gist/M
+gladness/S
+glamorous/UY
+glass/2D6MGZzSp
+glassiness/S
+glass-making
+glimmer/dJS
+glueing
+gluon/M
+glyph/MS
+go/fGe
+goalmouth
+goalscorer/S
+gobbledegook/M
+godfather/SdM
+godliness/S
+godsend/MS
+goggle-box/SM
+goings-on
+goldenseal/M
+goldsmith/SM
+golf/MRSGD
+gollywog
+gong/SDMG
+goniometry
+Gonville
+Goober
+Goodman
+good-oh
+good-tempered
+googly/S
+gooseberry/SM
+goosebumps
+gorgeous/YP
+Gorham
+gorse/MS
+gosling/M
+gouge/DRGS
+Gough
+gourdful/S
+gourmandism
+grab/RSJDG
+grace/DpG6MjS
+gracing/E
+graciousness/MS
+graduand/SM
+grainer/M
+granddaughter/MS
+granite/MWS
+Grantham
+grantor's
+granularity/MS
+granule/nNMVS
+grapefruit/M
+graph/MWGwD1S
+graphite/MS
+grasp/Gk7DS
+grassland/SM
+grassy/T
+gravamen/MS
+graveside/S
+graveyard/MS
+gravid/YP
+gravity/SM
+gravy/MS
+Gray
+greasiness/S
+greatness/S
+Greenberg
+greengage/MS
+greensward/SM
+Gregorian
+grenadine/MS
+Gretchen
+griffon/M
+Grimaldi/M
+grimness/S
+grindstone/MS
+gringo/SM
+grisly/PT
+groove/GSDMZ
+Grosz
+grotto/SM
+grouch
<TRUNCATED>
[35/50] [abbrv] git commit: [flex-utilities]
[refs/heads/as3httpclient-work] - - Prevent the extension from doing anything
on missing resource bundles.
Posted by qu...@apache.org.
- Prevent the extension from doing anything on missing resource bundles.
Project: http://git-wip-us.apache.org/repos/asf/flex-utilities/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-utilities/commit/b43e1677
Tree: http://git-wip-us.apache.org/repos/asf/flex-utilities/tree/b43e1677
Diff: http://git-wip-us.apache.org/repos/asf/flex-utilities/diff/b43e1677
Branch: refs/heads/as3httpclient-work
Commit: b43e1677560cb8df42bce5a3626714aa143a59ad
Parents: 957c1e1
Author: Christofer Dutz <ch...@codecentric.de>
Authored: Sat Apr 25 15:39:08 2015 +0200
Committer: Christofer Dutz <ch...@codecentric.de>
Committed: Sat Apr 25 15:39:08 2015 +0200
----------------------------------------------------------------------
.../flex/utilities/converter/mavenextension/FlexEventSpy.java | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/b43e1677/mavenizer/maven-extension/src/main/java/org/apache/flex/utilities/converter/mavenextension/FlexEventSpy.java
----------------------------------------------------------------------
diff --git a/mavenizer/maven-extension/src/main/java/org/apache/flex/utilities/converter/mavenextension/FlexEventSpy.java b/mavenizer/maven-extension/src/main/java/org/apache/flex/utilities/converter/mavenextension/FlexEventSpy.java
index 9adf892..27b0ae7 100644
--- a/mavenizer/maven-extension/src/main/java/org/apache/flex/utilities/converter/mavenextension/FlexEventSpy.java
+++ b/mavenizer/maven-extension/src/main/java/org/apache/flex/utilities/converter/mavenextension/FlexEventSpy.java
@@ -65,11 +65,14 @@ public class FlexEventSpy extends AbstractEventSpy {
try {
internalLookup = true;
Artifact artifact = repositoryEvent.getArtifact();
- if (artifact.getGroupId().startsWith("org.apache.flex")) {
+
+ if (artifact.getGroupId().startsWith("org.apache.flex") &&
+ !"rb.swc".equals(artifact.getExtension())) {
// Output a cool spash-screen ... sorry for that ... couldn't resist :-)
if(!flexSplashScreenShown) {
showFlexSplashScreen();
}
+
if(!canResolve(artifact.getGroupId(), artifact.getArtifactId(), artifact.getVersion(),
artifact.getExtension(), artifact.getClassifier())) {
initFlex(artifact.getVersion());
[46/50] [abbrv] git commit: [flex-utilities]
[refs/heads/as3httpclient-work] - Fix:
https://issues.apache.org/jira/browse/FLEX-34839
Posted by qu...@apache.org.
Fix: https://issues.apache.org/jira/browse/FLEX-34839
- Make use of Apache Commons Lang3.SystemUtils for OS detection.
- Make SdkConverterCLI to use the detection.
- Removed the PowerMock lib, couldn't mock static final field, I remove dynamically the final modifier instead.
Project: http://git-wip-us.apache.org/repos/asf/flex-utilities/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-utilities/commit/6496873b
Tree: http://git-wip-us.apache.org/repos/asf/flex-utilities/tree/6496873b
Diff: http://git-wip-us.apache.org/repos/asf/flex-utilities/diff/6496873b
Branch: refs/heads/as3httpclient-work
Commit: 6496873b53142ab7476f5e3afa4ce1b49f1bf668
Parents: 002b4de
Author: Frédéric THOMAS <we...@gmail.com>
Authored: Thu May 14 13:04:43 2015 +0100
Committer: Frédéric THOMAS <we...@gmail.com>
Committed: Thu May 14 13:04:43 2015 +0100
----------------------------------------------------------------------
.../converter/core/SdkConverterCLI.java | 12 +--
mavenizer/retrievers/base/pom.xml | 32 ++------
.../retrievers/types/PlatformType.java | 84 ++------------------
.../converter/retrievers/utils/ProgressBar.java | 2 +-
.../retrievers/types/PlatformTypeTest.java | 72 +++++++++--------
5 files changed, 59 insertions(+), 143 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/6496873b/mavenizer/cli/src/main/java/org/apache/flex/utilities/converter/core/SdkConverterCLI.java
----------------------------------------------------------------------
diff --git a/mavenizer/cli/src/main/java/org/apache/flex/utilities/converter/core/SdkConverterCLI.java b/mavenizer/cli/src/main/java/org/apache/flex/utilities/converter/core/SdkConverterCLI.java
index 9f3d160..918dd70 100644
--- a/mavenizer/cli/src/main/java/org/apache/flex/utilities/converter/core/SdkConverterCLI.java
+++ b/mavenizer/cli/src/main/java/org/apache/flex/utilities/converter/core/SdkConverterCLI.java
@@ -2,7 +2,6 @@ package org.apache.flex.utilities.converter.core;
import org.apache.commons.cli.*;
import org.apache.commons.io.FileUtils;
-import org.apache.commons.lang3.SystemUtils;
import org.apache.flex.utilities.converter.air.AirConverter;
import org.apache.flex.utilities.converter.deployer.aether.AetherDeployer;
import org.apache.flex.utilities.converter.flash.FlashConverter;
@@ -122,14 +121,11 @@ public class SdkConverterCLI {
platforms.add(PlatformType.valueOf(platformName));
}
}
+
if(platforms.isEmpty()) {
- if(SystemUtils.IS_OS_WINDOWS) {
- platforms.add(PlatformType.WINDOWS);
- } else if(SystemUtils.IS_OS_MAC) {
- platforms.add(PlatformType.MAC);
- } else if(SystemUtils.IS_OS_LINUX) {
- platforms.add(PlatformType.LINUX);
- } else {
+ try {
+ platforms.add(PlatformType.getCurrent());
+ } catch (Exception e) {
System.err.println("Unsupported OS type. Provide manually using 'platform' parameter.");
System.exit(1);
}
http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/6496873b/mavenizer/retrievers/base/pom.xml
----------------------------------------------------------------------
diff --git a/mavenizer/retrievers/base/pom.xml b/mavenizer/retrievers/base/pom.xml
index d13b4cb..ace86c6 100644
--- a/mavenizer/retrievers/base/pom.xml
+++ b/mavenizer/retrievers/base/pom.xml
@@ -32,7 +32,7 @@
<properties>
<powermock.version>1.6.2</powermock.version>
- <junit.version>4.8.2</junit.version>
+ <junit.version>4.11</junit.version>
</properties>
<dependencies>
@@ -47,9 +47,9 @@
<version>1.8.1</version>
</dependency>
<dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- <version>2.6</version>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-lang3</artifactId>
+ <version>3.3.2</version>
</dependency>
<!--TEST-->
@@ -60,27 +60,9 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.powermock</groupId>
- <artifactId>powermock-module-junit4-rule-agent</artifactId>
- <version>${powermock.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.powermock</groupId>
- <artifactId>powermock-module-junit4</artifactId>
- <version>${powermock.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.powermock</groupId>
- <artifactId>powermock-api-easymock</artifactId>
- <version>${powermock.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.easymock</groupId>
- <artifactId>easymock</artifactId>
- <version>3.3.1</version>
+ <groupId>pl.pragmatists</groupId>
+ <artifactId>JUnitParams</artifactId>
+ <version>1.0.4</version>
<scope>test</scope>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/6496873b/mavenizer/retrievers/base/src/main/java/org/apache/flex/utilities/converter/retrievers/types/PlatformType.java
----------------------------------------------------------------------
diff --git a/mavenizer/retrievers/base/src/main/java/org/apache/flex/utilities/converter/retrievers/types/PlatformType.java b/mavenizer/retrievers/base/src/main/java/org/apache/flex/utilities/converter/retrievers/types/PlatformType.java
index 2dceba0..d7320d4 100644
--- a/mavenizer/retrievers/base/src/main/java/org/apache/flex/utilities/converter/retrievers/types/PlatformType.java
+++ b/mavenizer/retrievers/base/src/main/java/org/apache/flex/utilities/converter/retrievers/types/PlatformType.java
@@ -16,6 +16,8 @@
*/
package org.apache.flex.utilities.converter.retrievers.types;
+import org.apache.commons.lang3.SystemUtils;
+
/**
* Created by cdutz on 18.05.2014.
*/
@@ -25,95 +27,23 @@ public enum PlatformType {
LINUX,
MAC;
- public static PlatformType getCurrent()
- {
+ public static PlatformType getCurrent() throws Exception {
PlatformType platformType = null;
- if (isWindows())
+ if (SystemUtils.IS_OS_WINDOWS)
{
platformType = PlatformType.WINDOWS;
}
- else if (isMac())
+ else if (SystemUtils.IS_OS_MAC || SystemUtils.IS_OS_MAC_OSX)
{
platformType = PlatformType.MAC;
}
- else if (isUnixBased())
+ else if (SystemUtils.IS_OS_UNIX)
{
platformType = PlatformType.LINUX;
}
+ else throw new Exception("Unsupported OS.");
return platformType;
}
-
- static final String NET_BSD = "netbsd";
-
- static final String FREE_BSD = "freebsd";
-
- static final String WINDOWS_OS = "windows";
-
- static final String MAC_OS = "mac os x";
-
- static final String MAC_OS_DARWIN = "darwin";
-
- static final String LINUX_OS = "linux";
-
- static final String SOLARIS_OS = "sunos";
-
- private static String osString()
- {
- return System.getProperty( "os.name" ).toLowerCase();
- }
-
- /**
- * Return a boolean to show if we are running on Windows.
- *
- * @return true if we are running on Windows.
- */
- private static boolean isWindows()
- {
- return osString().startsWith( WINDOWS_OS );
- }
-
- /**
- * Return a boolean to show if we are running on Linux.
- *
- * @return true if we are running on Linux.
- */
- private static boolean isLinux()
- {
- return osString().startsWith( LINUX_OS ) ||
- // I know, but people said that workds...
- osString().startsWith( NET_BSD ) ||
- osString().startsWith( FREE_BSD );
- }
-
- /**
- * Return a boolean to show if we are running on Solaris.
- *
- * @return true if we are running on Solaris.
- */
- private static boolean isSolaris()
- {
- return osString().startsWith( SOLARIS_OS );
- }
-
- /**
- * Return a boolean to show if we are running on a unix-based OS.
- *
- * @return true if we are running on a unix-based OS.
- */
- private static boolean isUnixBased()
- {
- return isLinux() || isSolaris();
- }
-
- /**
- * Return a boolean to show if we are running on Mac OS X.
- *
- * @return true if we are running on Mac OS X.
- */
- private static boolean isMac()
- {
- return osString().startsWith( MAC_OS ) || osString().startsWith( MAC_OS_DARWIN );
- }
}
http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/6496873b/mavenizer/retrievers/base/src/main/java/org/apache/flex/utilities/converter/retrievers/utils/ProgressBar.java
----------------------------------------------------------------------
diff --git a/mavenizer/retrievers/base/src/main/java/org/apache/flex/utilities/converter/retrievers/utils/ProgressBar.java b/mavenizer/retrievers/base/src/main/java/org/apache/flex/utilities/converter/retrievers/utils/ProgressBar.java
index 72ee855..c15d26b 100644
--- a/mavenizer/retrievers/base/src/main/java/org/apache/flex/utilities/converter/retrievers/utils/ProgressBar.java
+++ b/mavenizer/retrievers/base/src/main/java/org/apache/flex/utilities/converter/retrievers/utils/ProgressBar.java
@@ -16,7 +16,7 @@
*/
package org.apache.flex.utilities.converter.retrievers.utils;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
/**
* Created by cdutz on 24.05.2014.
http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/6496873b/mavenizer/retrievers/base/src/test/java/org/apache/flex/utilities/converter/retrievers/types/PlatformTypeTest.java
----------------------------------------------------------------------
diff --git a/mavenizer/retrievers/base/src/test/java/org/apache/flex/utilities/converter/retrievers/types/PlatformTypeTest.java b/mavenizer/retrievers/base/src/test/java/org/apache/flex/utilities/converter/retrievers/types/PlatformTypeTest.java
index d8571bc..eeb6a22 100644
--- a/mavenizer/retrievers/base/src/test/java/org/apache/flex/utilities/converter/retrievers/types/PlatformTypeTest.java
+++ b/mavenizer/retrievers/base/src/test/java/org/apache/flex/utilities/converter/retrievers/types/PlatformTypeTest.java
@@ -1,61 +1,69 @@
package org.apache.flex.utilities.converter.retrievers.types;
-import org.junit.Rule;
+import junitparams.JUnitParamsRunner;
+import junitparams.Parameters;
+import org.apache.commons.lang3.SystemUtils;
+import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.rule.PowerMockRule;
+import java.lang.reflect.Field;
+import java.lang.reflect.Modifier;
import java.util.Arrays;
import java.util.Collection;
-import static org.easymock.EasyMock.expect;
import static org.junit.Assert.assertEquals;
-import static org.powermock.api.easymock.PowerMock.*;
/**
* @author: Frederic Thomas
* Date: 12/05/2015
* Time: 01:34
*/
-@PrepareForTest( { PlatformType.class })
-@RunWith(Parameterized.class)
+@RunWith(JUnitParamsRunner.class)
public class PlatformTypeTest {
- private String osName;
- private PlatformType platformType;
-
- @Rule
- public PowerMockRule powerMockRule = new PowerMockRule();
-
- @Parameterized.Parameters
- public static Collection<Object[]> data() {
+ private Class<SystemUtils> systemUtilsClass;
+ public static Collection<Object[]> platformParameters() {
return Arrays.asList(new Object[][]{
- {PlatformType.WINDOWS_OS, PlatformType.WINDOWS},
- {PlatformType.MAC_OS, PlatformType.MAC},
- {PlatformType.MAC_OS_DARWIN, PlatformType.MAC},
- {PlatformType.FREE_BSD, PlatformType.LINUX},
- {PlatformType.LINUX_OS, PlatformType.LINUX},
- {PlatformType.NET_BSD, PlatformType.LINUX},
- {PlatformType.SOLARIS_OS, PlatformType.LINUX}
+ {"IS_OS_WINDOWS", PlatformType.WINDOWS},
+ {"IS_OS_MAC", PlatformType.MAC},
+ {"IS_OS_MAC_OSX", PlatformType.MAC},
+ {"IS_OS_UNIX", PlatformType.LINUX}
});
}
- public PlatformTypeTest(String osName, PlatformType platformType) {
- this.osName = osName;
- this.platformType = platformType;
+ @Before
+ public void setUp() throws Exception {
+ systemUtilsClass = SystemUtils.class;
+
+ setFinalStatic(systemUtilsClass.getField("IS_OS_WINDOWS"), false);
+ setFinalStatic(systemUtilsClass.getField("IS_OS_MAC"), false);
+ setFinalStatic(systemUtilsClass.getField("IS_OS_MAC_OSX"), false);
+ setFinalStatic(systemUtilsClass.getField("IS_OS_UNIX"), false);
}
@Test
- public void it_returns_the_current_platform_type() throws Exception {
- mockStatic(System.class);
-
- expect(System.getProperty("os.name")).andReturn(osName).anyTimes();
- replayAll();
+ @Parameters(method = "platformParameters")
+ public void it_detects_the_current_platform_type(String fieldName, PlatformType platformType) throws Exception {
+ setFinalStatic(systemUtilsClass.getField(fieldName), true);
assertEquals(platformType, PlatformType.getCurrent());
- verifyAll();
+ }
+
+ @Test(expected = Exception.class)
+ public void it_throws_an_exception_when_it_can_not_detect_the_current_platform_type() throws Exception {
+ PlatformType.getCurrent();
+ }
+
+ private static void setFinalStatic(Field field, Object newValue) throws Exception {
+ field.setAccessible(true);
+
+ // remove final modifier from field
+ Field modifiersField = Field.class.getDeclaredField("modifiers");
+ modifiersField.setAccessible(true);
+ modifiersField.setInt(field, field.getModifiers() & ~Modifier.FINAL);
+
+ field.set(null, newValue);
}
}
[21/50] [abbrv] git commit: [flex-utilities]
[refs/heads/as3httpclient-work] - - Added the missing pom.xml (Was excluded
again)
Posted by qu...@apache.org.
- Added the missing pom.xml (Was excluded again)
Project: http://git-wip-us.apache.org/repos/asf/flex-utilities/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-utilities/commit/2b962323
Tree: http://git-wip-us.apache.org/repos/asf/flex-utilities/tree/2b962323
Diff: http://git-wip-us.apache.org/repos/asf/flex-utilities/diff/2b962323
Branch: refs/heads/as3httpclient-work
Commit: 2b962323b9dc337e9b112f532c37f70d9850b552
Parents: a1ac19f
Author: Christofer Dutz <ch...@codecentric.de>
Authored: Sat Apr 18 19:54:07 2015 +0200
Committer: Christofer Dutz <ch...@codecentric.de>
Committed: Sat Apr 18 19:54:07 2015 +0200
----------------------------------------------------------------------
mavenizer/maven-extension/pom.xml | 111 +++++++++++++++++++++++++++++++++
1 file changed, 111 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/2b962323/mavenizer/maven-extension/pom.xml
----------------------------------------------------------------------
diff --git a/mavenizer/maven-extension/pom.xml b/mavenizer/maven-extension/pom.xml
new file mode 100644
index 0000000..9b4a8e1
--- /dev/null
+++ b/mavenizer/maven-extension/pom.xml
@@ -0,0 +1,111 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+ 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 xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.flex.utilities.converter</groupId>
+ <artifactId>apache-flex-sdk-converter</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>maven-extension</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ <packaging>jar</packaging>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.sonatype.plugins</groupId>
+ <artifactId>sisu-maven-plugin</artifactId>
+ <version>1.1</version>
+ <executions>
+ <execution>
+ <id>generate-index</id>
+ <goals>
+ <goal>main-index</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <version>2.4</version>
+ <configuration>
+ <descriptorRefs>
+ <descriptorRef>jar-with-dependencies</descriptorRef>
+ </descriptorRefs>
+ <finalName>flex-maven-extension-${project.version}</finalName>
+ <appendAssemblyId>false</appendAssemblyId>
+
+ </configuration>
+ <executions>
+ <execution>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.flex.utilities.converter</groupId>
+ <artifactId>download-retriever</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.flex.utilities.converter</groupId>
+ <artifactId>flex-converter</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.flex.utilities.converter</groupId>
+ <artifactId>flash-converter</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.flex.utilities.converter</groupId>
+ <artifactId>air-converter</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.flex.utilities.converter</groupId>
+ <artifactId>fontkit-converter</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ </dependency>
+
+ <dependency>
+ <groupId>javax.inject</groupId>
+ <artifactId>javax.inject</artifactId>
+ <version>1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-core</artifactId>
+ <version>3.1.1</version>
+ </dependency>
+ </dependencies>
+
+</project>
[07/50] [abbrv] git commit: [flex-utilities]
[refs/heads/as3httpclient-work] - FLEX-34756 -Renamed some variables for
clarity -Separated the creation of the highlighters and SpellingService in
new functions, so that they can be mocked for unit testing.
Posted by qu...@apache.org.
FLEX-34756
-Renamed some variables for clarity
-Separated the creation of the highlighters and SpellingService in new functions, so that they can be mocked for unit testing.
Project: http://git-wip-us.apache.org/repos/asf/flex-utilities/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-utilities/commit/718d5a36
Tree: http://git-wip-us.apache.org/repos/asf/flex-utilities/tree/718d5a36
Diff: http://git-wip-us.apache.org/repos/asf/flex-utilities/diff/718d5a36
Branch: refs/heads/as3httpclient-work
Commit: 718d5a368822e5fccee734faa1bdd9a96ed0d895
Parents: 07c77ee
Author: Mihai Chira <mi...@apache.org>
Authored: Fri Apr 10 14:21:38 2015 +0200
Committer: Mihai Chira <mi...@apache.org>
Committed: Fri Apr 10 14:21:38 2015 +0200
----------------------------------------------------------------------
.../com/adobe/linguistics/spelling/SpellUI.as | 141 +++++++++----------
1 file changed, 70 insertions(+), 71 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/718d5a36/Squiggly/main/SpellingUIEx/src/com/adobe/linguistics/spelling/SpellUI.as
----------------------------------------------------------------------
diff --git a/Squiggly/main/SpellingUIEx/src/com/adobe/linguistics/spelling/SpellUI.as b/Squiggly/main/SpellingUIEx/src/com/adobe/linguistics/spelling/SpellUI.as
index 308a703..9b55ff6 100644
--- a/Squiggly/main/SpellingUIEx/src/com/adobe/linguistics/spelling/SpellUI.as
+++ b/Squiggly/main/SpellingUIEx/src/com/adobe/linguistics/spelling/SpellUI.as
@@ -88,15 +88,12 @@ package com.adobe.linguistics.spelling
//private var mTextField:RichEditableText;
- private var _dictname:String = new String();
- private var _hundict:HunspellDictionary = new HunspellDictionary();
- private var _userdict:UserDictionary = null;
- private var _sharedobj:SharedObject = null;
- private var scm:SpellingContextMenu;
-
- private var _newchecker:SpellChecker = null;
+ private var _dictionaryName:String = "";
+ private var _userDictionary:UserDictionary = null;
+ private var _sharedObject:SharedObject = null;
+ private var _scm:SpellingContextMenu;
private var _resource_locale:Object = null;
- private var _spellingservice:SpellingService = null;
+ private var _spellingService:SpellingService = null;
private static var _contextMenuEntries:Object = {enable:"Enable Spelling", disable:"Disable Spelling", add:"Add to dictionary"};
private static var _spellingConfigUrl:String = "SpellingConfig.xml";
@@ -130,16 +127,11 @@ package com.adobe.linguistics.spelling
if ( lang == null ) return;
// TODO: Change dict parameter type to a SpellCheck class or a URL string.
var txt:* = getComponentTextModel(comp);
- /*var comp1:UIComponent = txt.parent;
- var comp2:UIComponent = txt.owner;
- var comp3:UIComponent = txt.parentApplication;
- var comp4:UIComponent = txt.parentDocument;
- var comp5:UIComponent = txt.parentDocument.hostComponent; <--spark parent UICOmponent*/
if ( txt==null || _UITable[comp]!=undefined )
return;
// TODO: dangerous, is garbage collection going to clear this?
- _UITable[comp]=new SpellUI(txt, lang);
+ _UITable[comp] = new SpellUI(txt, lang);
_parentTable[txt] = comp;
_cacheDictTable[comp]=lang;
}
@@ -307,16 +299,15 @@ package com.adobe.linguistics.spelling
return;
}
_actualParent = textModel;
- mTextField = textModel ;
+ mTextField = textModel;
mTextField.addEventListener(FocusEvent.FOCUS_OUT, handleFocusOut);
mTextField.addEventListener(FocusEvent.FOCUS_IN, handleFocusIn);
mTextField.addEventListener(ScrollEvent.SCROLL, spellCheckScreen);
mTextField.parent.addEventListener(Event.RENDER, spellCheckScreen);
mTextField.parent.addEventListener(Event.CHANGE, handleChangeEvent);
- _dictname = lang;
+ _dictionaryName = lang;
loadConfig();
-
}
private function spellCheckScreen(event:Event):void
@@ -398,7 +389,7 @@ package com.adobe.linguistics.spelling
var tokenizer:TextTokenizer = new TextTokenizer(mTextField.text.substring(start,end));
for ( var token:Token = tokenizer.getFirstToken(); token != tokenizer.getLastToken(); token= tokenizer.getNextToken(token) ) {
- var result:Boolean=_spellingservice.checkWord(mTextField.text.substring(token.first+start, token.last+start));
+ var result:Boolean=_spellingService.checkWord(mTextField.text.substring(token.first+start, token.last+start));
if (!result){
if (_checkLastWord || (token.last+start != mTextField.text.length))
//hh.highlightWord(token.first+start, token.last+start-1);
@@ -449,36 +440,41 @@ package com.adobe.linguistics.spelling
return index;
}
- private function loadConfig():void{
- _resource_locale = SpellingConfiguration.resourceTable.getResource(_dictname);
-
- if ((_resource_locale != null) || (SpellUI._configXML != null))
- loadConfigComplete(null);
- else {
- SpellUI._configXMLLoader.addEventListener(Event.COMPLETE, loadConfigComplete);
-
- if (SpellUI._configXMLLoading == false)
- {
- SpellUI._configXMLLoader.load(new URLRequest(_spellingConfigUrl));
- SpellUI._configXMLLoading = true;
- }
- }
+ private function loadConfig():void
+ {
+ _resource_locale = SpellingConfiguration.resourceTable.getResource(_dictionaryName);
+
+ if ((_resource_locale != null) || (SpellUI._configXML != null))
+ loadConfigComplete(null);
+ else {
+ SpellUI._configXMLLoader.addEventListener(Event.COMPLETE, loadConfigComplete);
+
+ if (SpellUI._configXMLLoading == false)
+ {
+ SpellUI._configXMLLoader.load(new URLRequest(_spellingConfigUrl));
+ SpellUI._configXMLLoading = true;
+ }
+ }
}
private function loadConfigComplete(evt:Event):void{
if (_resource_locale == null) {
- if (SpellUI._configXML == null)
- SpellUI._configXML= new XML(evt.target.data);
-
- SpellingConfiguration.resourceTable.setResource(_dictname,{rule:SpellUI._configXML.LanguageResource.(@languageCode==_dictname).@ruleFile,
- dict:SpellUI._configXML.LanguageResource.(@languageCode==_dictname).@dictionaryFile});
- }
+ if (SpellUI._configXML == null)
+ SpellUI._configXML = new XML(evt.target.data);
+
+ SpellingConfiguration.resourceTable.setResource(_dictionaryName,{rule:SpellUI._configXML.LanguageResource.(@languageCode==_dictionaryName).@ruleFile,
+ dict:SpellUI._configXML.LanguageResource.(@languageCode==_dictionaryName).@dictionaryFile});
+ }
//New Added
- _spellingservice = new SpellingService(_dictname);
- _spellingservice.addEventListener(Event.COMPLETE, loadDictComplete);
- _spellingservice.init();
+ _spellingService = createSpellingService(_dictionaryName);
+ _spellingService.addEventListener(Event.COMPLETE, loadDictComplete);
+ _spellingService.init();
+ }
+
+ protected function createSpellingService(dictionaryName:String):SpellingService
+ {
+ return new SpellingService(dictionaryName);
}
-
@@ -489,27 +485,27 @@ package com.adobe.linguistics.spelling
// Lazy loading the UD only when the main dict is loaded successfully
if ((SpellUI._cache["Squiggly_UD"] as UserDictionary) == null)
{
- _sharedobj = SharedObject.getLocal("Squiggly_v03");
+ _sharedObject = SharedObject.getLocal("Squiggly_v03");
var vec:Vector.<String> = new Vector.<String>();
- if (_sharedobj.data.ud) {
- for each (var w:String in _sharedobj.data.ud)
+ if (_sharedObject.data.ud) {
+ for each (var w:String in _sharedObject.data.ud)
vec.push(w);
}
- _userdict = new UserDictionary(vec);
+ _userDictionary = new UserDictionary(vec);
- SpellUI._cache["Squiggly_SO"] = _sharedobj;
- SpellUI._cache["Squiggly_UD"] = _userdict;
+ SpellUI._cache["Squiggly_SO"] = _sharedObject;
+ SpellUI._cache["Squiggly_UD"] = _userDictionary;
}
else
{
- _sharedobj = SpellUI._cache["Squiggly_SO"];
- _userdict = SpellUI._cache["Squiggly_UD"];
+ _sharedObject = SpellUI._cache["Squiggly_SO"];
+ _userDictionary = SpellUI._cache["Squiggly_UD"];
}
- _spellingservice.addUserDictionary(_userdict);
+ _spellingService.addUserDictionary(_userDictionary);
// Add the context menu, this might be not successful
- scm = null;
+ _scm = null;
try {
addContextMenu(null);
}
@@ -523,28 +519,21 @@ package com.adobe.linguistics.spelling
private function addContextMenu(event:Event):void
{
- if ( scm != null ) return;
- if ( isHaloComponent ) {
- hh= new HaloHighlighter( _actualParent);
- hw= new HaloWordProcessor( _actualParent );
- }else if ( isSparkComponent ){
- hh = new SparkHighlighter( _actualParent);
- hw = new SparkWordProcessor( _actualParent);
- } else {
- trace("error now, later will be true");
- }
+ if ( _scm != null ) return;
+ hh = createHighlighter(isHaloComponent, _actualParent);
+ hw = createWordProcessor(isHaloComponent, _actualParent);
- scm = new SpellingContextMenu(hh, hw, _spellingservice, _actualParent, _actualParent.contextMenu);
- scm.setIgnoreWordCallback( addWordToUserDictionary );
+ _scm = new SpellingContextMenu(hh, hw, _spellingService, _actualParent, _actualParent.contextMenu);
+ _scm.setIgnoreWordCallback( addWordToUserDictionary );
// Halo need this
if (_actualParent.contextMenu == null)
{
- _actualParent.contextMenu = scm.contextMenu;
+ _actualParent.contextMenu = _scm.contextMenu;
}
- //hh.spellingEnabled=true;
_spellingEnabled = true;
+
try {
doSpellingJob();
}
@@ -553,13 +542,23 @@ package com.adobe.linguistics.spelling
// If it fails here, it should later triggered by the render event, so no need to do anything
}
}
-
+
+ protected function createHighlighter(isHaloComoponent:Boolean, parent:*):IHighlighter
+ {
+ return isHaloComoponent ? new HaloHighlighter(parent) : new SparkHighlighter(parent);
+ }
+
+ protected function createWordProcessor(isHaloComoponent:Boolean, parent:*):IWordProcessor
+ {
+ return isHaloComoponent ? new HaloWordProcessor(parent) : new SparkWordProcessor( _actualParent);
+ }
+
private function addWordToUserDictionary(word:String):void
{
- _userdict.addWord(word);
+ _userDictionary.addWord(word);
// TODO: serialization here might affect ther performance
- _sharedobj.data.ud = _userdict.wordList;
+ _sharedObject.data.ud = _userDictionary.wordList;
}
/**
@@ -571,9 +570,9 @@ package com.adobe.linguistics.spelling
hh.clearSquiggles();
}
- if(scm != null)
+ if(_scm != null)
{
- scm.cleanUp();
+ _scm.cleanUp();
}
_actualParent.removeEventListener(Event.ADDED_TO_STAGE, addContextMenu);
[11/50] [abbrv] git commit: [flex-utilities]
[refs/heads/as3httpclient-work] - FLEX-34756 Minor improvements.
Posted by qu...@apache.org.
FLEX-34756 Minor improvements.
Project: http://git-wip-us.apache.org/repos/asf/flex-utilities/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-utilities/commit/69d09d75
Tree: http://git-wip-us.apache.org/repos/asf/flex-utilities/tree/69d09d75
Diff: http://git-wip-us.apache.org/repos/asf/flex-utilities/diff/69d09d75
Branch: refs/heads/as3httpclient-work
Commit: 69d09d75f451c1491432da1de39fe80e0d6e6087
Parents: 8363ebf
Author: Mihai Chira <mi...@apache.org>
Authored: Fri Apr 10 14:26:40 2015 +0200
Committer: Mihai Chira <mi...@apache.org>
Committed: Fri Apr 10 14:26:40 2015 +0200
----------------------------------------------------------------------
.../src/com/adobe/linguistics/spelling/framework/ResourceTable.as | 2 +-
.../tests/com/adobe/linguistics/spelling/FLEX_34717_Tests.as | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/69d09d75/Squiggly/main/SpellingFramework/src/com/adobe/linguistics/spelling/framework/ResourceTable.as
----------------------------------------------------------------------
diff --git a/Squiggly/main/SpellingFramework/src/com/adobe/linguistics/spelling/framework/ResourceTable.as b/Squiggly/main/SpellingFramework/src/com/adobe/linguistics/spelling/framework/ResourceTable.as
index 80debc7..b16542a 100644
--- a/Squiggly/main/SpellingFramework/src/com/adobe/linguistics/spelling/framework/ResourceTable.as
+++ b/Squiggly/main/SpellingFramework/src/com/adobe/linguistics/spelling/framework/ResourceTable.as
@@ -41,7 +41,7 @@ package com.adobe.linguistics.spelling.framework
*/
public function ResourceTable()
{
- _resources = new Object();
+ _resources = {};
}
/**
http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/69d09d75/Squiggly/main/SpellingUIEx/tests/com/adobe/linguistics/spelling/FLEX_34717_Tests.as
----------------------------------------------------------------------
diff --git a/Squiggly/main/SpellingUIEx/tests/com/adobe/linguistics/spelling/FLEX_34717_Tests.as b/Squiggly/main/SpellingUIEx/tests/com/adobe/linguistics/spelling/FLEX_34717_Tests.as
index 624acae..9ce89df 100644
--- a/Squiggly/main/SpellingUIEx/tests/com/adobe/linguistics/spelling/FLEX_34717_Tests.as
+++ b/Squiggly/main/SpellingUIEx/tests/com/adobe/linguistics/spelling/FLEX_34717_Tests.as
@@ -44,7 +44,7 @@ package com.adobe.linguistics.spelling {
public function test_immediate_disable_after_enable():void
{
//given
- UIImpersonator.addChild(_input);
+ UIImpersonator.addElement(_input);
//when
SpellUI.enableSpelling(_input, "en_US");
[44/50] [abbrv] git commit: [flex-utilities]
[refs/heads/as3httpclient-work] - Merge remote-tracking branch
'origin/develop' into develop
Posted by qu...@apache.org.
Merge remote-tracking branch 'origin/develop' into develop
Project: http://git-wip-us.apache.org/repos/asf/flex-utilities/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-utilities/commit/3be7ca73
Tree: http://git-wip-us.apache.org/repos/asf/flex-utilities/tree/3be7ca73
Diff: http://git-wip-us.apache.org/repos/asf/flex-utilities/diff/3be7ca73
Branch: refs/heads/as3httpclient-work
Commit: 3be7ca7355a8cab48434d30e4466861476d630fe
Parents: b0fa8e3 681f027
Author: Christofer Dutz <ch...@codecentric.de>
Authored: Sat May 9 21:32:51 2015 +0200
Committer: Christofer Dutz <ch...@codecentric.de>
Committed: Sat May 9 21:32:51 2015 +0200
----------------------------------------------------------------------
.../flex/tools/codecoverage/reporter/CodeCoverageReporter.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
[45/50] [abbrv] git commit: [flex-utilities]
[refs/heads/as3httpclient-work] - Fix:
https://issues.apache.org/jira/browse/FLEX-34839
Posted by qu...@apache.org.
Fix: https://issues.apache.org/jira/browse/FLEX-34839
Project: http://git-wip-us.apache.org/repos/asf/flex-utilities/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-utilities/commit/002b4def
Tree: http://git-wip-us.apache.org/repos/asf/flex-utilities/tree/002b4def
Diff: http://git-wip-us.apache.org/repos/asf/flex-utilities/diff/002b4def
Branch: refs/heads/as3httpclient-work
Commit: 002b4defbbe9b2bc08b1c391b09d8346b758f73b
Parents: 3be7ca7
Author: Frédéric THOMAS <we...@gmail.com>
Authored: Wed May 13 15:55:22 2015 +0100
Committer: Frédéric THOMAS <we...@gmail.com>
Committed: Wed May 13 15:55:22 2015 +0100
----------------------------------------------------------------------
.../converter/mavenextension/FlexEventSpy.java | 3 +-
mavenizer/retrievers/base/pom.xml | 38 +++++++-
.../retrievers/types/PlatformType.java | 93 +++++++++++++++++++-
.../retrievers/types/PlatformTypeTest.java | 61 +++++++++++++
4 files changed, 192 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/002b4def/mavenizer/maven-extension/src/main/java/org/apache/flex/utilities/converter/mavenextension/FlexEventSpy.java
----------------------------------------------------------------------
diff --git a/mavenizer/maven-extension/src/main/java/org/apache/flex/utilities/converter/mavenextension/FlexEventSpy.java b/mavenizer/maven-extension/src/main/java/org/apache/flex/utilities/converter/mavenextension/FlexEventSpy.java
index 27b0ae7..034636d 100644
--- a/mavenizer/maven-extension/src/main/java/org/apache/flex/utilities/converter/mavenextension/FlexEventSpy.java
+++ b/mavenizer/maven-extension/src/main/java/org/apache/flex/utilities/converter/mavenextension/FlexEventSpy.java
@@ -6,6 +6,7 @@ import org.apache.flex.utilities.converter.flash.FlashConverter;
import org.apache.flex.utilities.converter.flex.FlexConverter;
import org.apache.flex.utilities.converter.fontkit.FontkitConverter;
import org.apache.flex.utilities.converter.retrievers.download.DownloadRetriever;
+import org.apache.flex.utilities.converter.retrievers.types.PlatformType;
import org.apache.flex.utilities.converter.retrievers.types.SdkType;
import org.apache.flex.utilities.converter.wrapper.WrapperConverter;
import org.apache.maven.MavenExecutionException;
@@ -175,7 +176,7 @@ public class FlexEventSpy extends AbstractEventSpy {
try {
File localRepoBaseDir = new File(mavenSession.getLocalRepository().getBasedir());
DownloadRetriever downloadRetriever = new DownloadRetriever();
- File sdkRoot = downloadRetriever.retrieve(SdkType.AIR, version);
+ File sdkRoot = downloadRetriever.retrieve(SdkType.AIR, version, PlatformType.getCurrent());
AirConverter converter = new AirConverter(sdkRoot, localRepoBaseDir);
converter.convert();
} catch (Throwable ce) {
http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/002b4def/mavenizer/retrievers/base/pom.xml
----------------------------------------------------------------------
diff --git a/mavenizer/retrievers/base/pom.xml b/mavenizer/retrievers/base/pom.xml
index 507ee13..d13b4cb 100644
--- a/mavenizer/retrievers/base/pom.xml
+++ b/mavenizer/retrievers/base/pom.xml
@@ -30,6 +30,11 @@
<version>1.0.0-SNAPSHOT</version>
<packaging>jar</packaging>
+ <properties>
+ <powermock.version>1.6.2</powermock.version>
+ <junit.version>4.8.2</junit.version>
+ </properties>
+
<dependencies>
<dependency>
<groupId>commons-io</groupId>
@@ -46,6 +51,37 @@
<artifactId>commons-lang</artifactId>
<version>2.6</version>
</dependency>
- </dependencies>
+ <!--TEST-->
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>${junit.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.powermock</groupId>
+ <artifactId>powermock-module-junit4-rule-agent</artifactId>
+ <version>${powermock.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.powermock</groupId>
+ <artifactId>powermock-module-junit4</artifactId>
+ <version>${powermock.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.powermock</groupId>
+ <artifactId>powermock-api-easymock</artifactId>
+ <version>${powermock.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.easymock</groupId>
+ <artifactId>easymock</artifactId>
+ <version>3.3.1</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
</project>
http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/002b4def/mavenizer/retrievers/base/src/main/java/org/apache/flex/utilities/converter/retrievers/types/PlatformType.java
----------------------------------------------------------------------
diff --git a/mavenizer/retrievers/base/src/main/java/org/apache/flex/utilities/converter/retrievers/types/PlatformType.java b/mavenizer/retrievers/base/src/main/java/org/apache/flex/utilities/converter/retrievers/types/PlatformType.java
index b5cf83f..2dceba0 100644
--- a/mavenizer/retrievers/base/src/main/java/org/apache/flex/utilities/converter/retrievers/types/PlatformType.java
+++ b/mavenizer/retrievers/base/src/main/java/org/apache/flex/utilities/converter/retrievers/types/PlatformType.java
@@ -23,6 +23,97 @@ public enum PlatformType {
WINDOWS,
LINUX,
- MAC
+ MAC;
+ public static PlatformType getCurrent()
+ {
+ PlatformType platformType = null;
+
+ if (isWindows())
+ {
+ platformType = PlatformType.WINDOWS;
+ }
+ else if (isMac())
+ {
+ platformType = PlatformType.MAC;
+ }
+ else if (isUnixBased())
+ {
+ platformType = PlatformType.LINUX;
+ }
+
+ return platformType;
+ }
+
+ static final String NET_BSD = "netbsd";
+
+ static final String FREE_BSD = "freebsd";
+
+ static final String WINDOWS_OS = "windows";
+
+ static final String MAC_OS = "mac os x";
+
+ static final String MAC_OS_DARWIN = "darwin";
+
+ static final String LINUX_OS = "linux";
+
+ static final String SOLARIS_OS = "sunos";
+
+ private static String osString()
+ {
+ return System.getProperty( "os.name" ).toLowerCase();
+ }
+
+ /**
+ * Return a boolean to show if we are running on Windows.
+ *
+ * @return true if we are running on Windows.
+ */
+ private static boolean isWindows()
+ {
+ return osString().startsWith( WINDOWS_OS );
+ }
+
+ /**
+ * Return a boolean to show if we are running on Linux.
+ *
+ * @return true if we are running on Linux.
+ */
+ private static boolean isLinux()
+ {
+ return osString().startsWith( LINUX_OS ) ||
+ // I know, but people said that workds...
+ osString().startsWith( NET_BSD ) ||
+ osString().startsWith( FREE_BSD );
+ }
+
+ /**
+ * Return a boolean to show if we are running on Solaris.
+ *
+ * @return true if we are running on Solaris.
+ */
+ private static boolean isSolaris()
+ {
+ return osString().startsWith( SOLARIS_OS );
+ }
+
+ /**
+ * Return a boolean to show if we are running on a unix-based OS.
+ *
+ * @return true if we are running on a unix-based OS.
+ */
+ private static boolean isUnixBased()
+ {
+ return isLinux() || isSolaris();
+ }
+
+ /**
+ * Return a boolean to show if we are running on Mac OS X.
+ *
+ * @return true if we are running on Mac OS X.
+ */
+ private static boolean isMac()
+ {
+ return osString().startsWith( MAC_OS ) || osString().startsWith( MAC_OS_DARWIN );
+ }
}
http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/002b4def/mavenizer/retrievers/base/src/test/java/org/apache/flex/utilities/converter/retrievers/types/PlatformTypeTest.java
----------------------------------------------------------------------
diff --git a/mavenizer/retrievers/base/src/test/java/org/apache/flex/utilities/converter/retrievers/types/PlatformTypeTest.java b/mavenizer/retrievers/base/src/test/java/org/apache/flex/utilities/converter/retrievers/types/PlatformTypeTest.java
new file mode 100644
index 0000000..d8571bc
--- /dev/null
+++ b/mavenizer/retrievers/base/src/test/java/org/apache/flex/utilities/converter/retrievers/types/PlatformTypeTest.java
@@ -0,0 +1,61 @@
+package org.apache.flex.utilities.converter.retrievers.types;
+
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+import org.powermock.core.classloader.annotations.PrepareForTest;
+import org.powermock.modules.junit4.rule.PowerMockRule;
+
+import java.util.Arrays;
+import java.util.Collection;
+
+import static org.easymock.EasyMock.expect;
+import static org.junit.Assert.assertEquals;
+import static org.powermock.api.easymock.PowerMock.*;
+
+/**
+ * @author: Frederic Thomas
+ * Date: 12/05/2015
+ * Time: 01:34
+ */
+@PrepareForTest( { PlatformType.class })
+@RunWith(Parameterized.class)
+public class PlatformTypeTest {
+
+ private String osName;
+ private PlatformType platformType;
+
+ @Rule
+ public PowerMockRule powerMockRule = new PowerMockRule();
+
+ @Parameterized.Parameters
+ public static Collection<Object[]> data() {
+
+ return Arrays.asList(new Object[][]{
+ {PlatformType.WINDOWS_OS, PlatformType.WINDOWS},
+ {PlatformType.MAC_OS, PlatformType.MAC},
+ {PlatformType.MAC_OS_DARWIN, PlatformType.MAC},
+ {PlatformType.FREE_BSD, PlatformType.LINUX},
+ {PlatformType.LINUX_OS, PlatformType.LINUX},
+ {PlatformType.NET_BSD, PlatformType.LINUX},
+ {PlatformType.SOLARIS_OS, PlatformType.LINUX}
+ });
+ }
+
+ public PlatformTypeTest(String osName, PlatformType platformType) {
+ this.osName = osName;
+ this.platformType = platformType;
+ }
+
+ @Test
+ public void it_returns_the_current_platform_type() throws Exception {
+ mockStatic(System.class);
+
+ expect(System.getProperty("os.name")).andReturn(osName).anyTimes();
+ replayAll();
+
+ assertEquals(platformType, PlatformType.getCurrent());
+ verifyAll();
+ }
+}
[12/50] [abbrv] git commit: [flex-utilities]
[refs/heads/as3httpclient-work] - Merge remote-tracking branch
'origin/develop' into develop
Posted by qu...@apache.org.
Merge remote-tracking branch 'origin/develop' into develop
Project: http://git-wip-us.apache.org/repos/asf/flex-utilities/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-utilities/commit/1c9c95de
Tree: http://git-wip-us.apache.org/repos/asf/flex-utilities/tree/1c9c95de
Diff: http://git-wip-us.apache.org/repos/asf/flex-utilities/diff/1c9c95de
Branch: refs/heads/as3httpclient-work
Commit: 1c9c95def2ea83f971a0cf01d24c6318292ad2ce
Parents: 69d09d7 55f0ba1
Author: Mihai Chira <mi...@apache.org>
Authored: Fri Apr 10 14:28:46 2015 +0200
Committer: Mihai Chira <mi...@apache.org>
Committed: Fri Apr 10 14:28:46 2015 +0200
----------------------------------------------------------------------
.../converter/core/SdkConverterCLI.java | 152 +++++++++++++------
.../utilities/converter/air/AirConverter.java | 11 +-
.../converter/flash/FlashConverter.java | 9 +-
.../utilities/converter/flex/FlexConverter.java | 11 +-
.../retrievers/download/DownloadRetriever.java | 1 -
5 files changed, 130 insertions(+), 54 deletions(-)
----------------------------------------------------------------------
[26/50] [abbrv] git commit: [flex-utilities]
[refs/heads/as3httpclient-work] - - Got rid of some Class-Loading issues when
using the EventSpy from within .mvn/extensions.xml
Posted by qu...@apache.org.
- Got rid of some Class-Loading issues when using the EventSpy from within .mvn/extensions.xml
Project: http://git-wip-us.apache.org/repos/asf/flex-utilities/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-utilities/commit/29eeb02e
Tree: http://git-wip-us.apache.org/repos/asf/flex-utilities/tree/29eeb02e
Diff: http://git-wip-us.apache.org/repos/asf/flex-utilities/diff/29eeb02e
Branch: refs/heads/as3httpclient-work
Commit: 29eeb02e3a491d7be4999482074d415b18b860cd
Parents: bfe6ba9
Author: Christofer Dutz <ch...@codecentric.de>
Authored: Sun Apr 19 13:03:33 2015 +0200
Committer: Christofer Dutz <ch...@codecentric.de>
Committed: Sun Apr 19 13:03:33 2015 +0200
----------------------------------------------------------------------
.../converter/mavenextension/FlexEventSpy.java | 31 ++++++++------------
mavenizer/retrievers/base/pom.xml | 6 ++--
.../converter/retrievers/utils/ProgressBar.java | 2 +-
3 files changed, 16 insertions(+), 23 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/29eeb02e/mavenizer/maven-extension/src/main/java/org/apache/flex/utilities/converter/mavenextension/FlexEventSpy.java
----------------------------------------------------------------------
diff --git a/mavenizer/maven-extension/src/main/java/org/apache/flex/utilities/converter/mavenextension/FlexEventSpy.java b/mavenizer/maven-extension/src/main/java/org/apache/flex/utilities/converter/mavenextension/FlexEventSpy.java
index f275677..f6d5c4f 100644
--- a/mavenizer/maven-extension/src/main/java/org/apache/flex/utilities/converter/mavenextension/FlexEventSpy.java
+++ b/mavenizer/maven-extension/src/main/java/org/apache/flex/utilities/converter/mavenextension/FlexEventSpy.java
@@ -99,27 +99,20 @@ public class FlexEventSpy extends AbstractEventSpy {
protected boolean canResolve(String groupId, String artifactId, String version,
String type, String classifier) {
- org.apache.maven.artifact.Artifact artifact;
- if((classifier == null) || (classifier.length() == 0)) {
- artifact = repositorySystem.createArtifact(groupId, artifactId, version, type);
- } else {
- artifact = repositorySystem.createArtifactWithClassifier(groupId, artifactId, version, type, classifier);
- }
- if (!artifact.isResolved()) {
- try {
- ArtifactResolutionRequest req = new ArtifactResolutionRequest();
- req.setArtifact(artifact);
- req.setLocalRepository(mavenSession.getLocalRepository());
- req.setRemoteRepositories(mavenSession.getRequest().getRemoteRepositories());
- ArtifactResolutionResult res = repositorySystem.resolve(req);
- if (!res.isSuccess()) {
- return false;
- }
- } catch (Exception e) {
- return false;
+ try {
+ ArtifactResolutionRequest req = new ArtifactResolutionRequest();
+ req.setLocalRepository(mavenSession.getLocalRepository());
+ req.setRemoteRepositories(mavenSession.getRequest().getRemoteRepositories());
+ if((classifier == null) || (classifier.length() == 0)) {
+ req.setArtifact(repositorySystem.createArtifact(groupId, artifactId, version, type));
+ } else {
+ req.setArtifact(repositorySystem.createArtifactWithClassifier(groupId, artifactId, version, type, classifier));
}
+ ArtifactResolutionResult res = repositorySystem.resolve(req);
+ return res.isSuccess();
+ } catch (Exception e) {
+ return false;
}
- return true;
}
protected void initFlex(String version) throws MavenExecutionException {
http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/29eeb02e/mavenizer/retrievers/base/pom.xml
----------------------------------------------------------------------
diff --git a/mavenizer/retrievers/base/pom.xml b/mavenizer/retrievers/base/pom.xml
index f311a65..507ee13 100644
--- a/mavenizer/retrievers/base/pom.xml
+++ b/mavenizer/retrievers/base/pom.xml
@@ -42,9 +42,9 @@
<version>1.8.1</version>
</dependency>
<dependency>
- <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-utils</artifactId>
- <version>3.0.15</version>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
+ <version>2.6</version>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/29eeb02e/mavenizer/retrievers/base/src/main/java/org/apache/flex/utilities/converter/retrievers/utils/ProgressBar.java
----------------------------------------------------------------------
diff --git a/mavenizer/retrievers/base/src/main/java/org/apache/flex/utilities/converter/retrievers/utils/ProgressBar.java b/mavenizer/retrievers/base/src/main/java/org/apache/flex/utilities/converter/retrievers/utils/ProgressBar.java
index 8e91864..72ee855 100644
--- a/mavenizer/retrievers/base/src/main/java/org/apache/flex/utilities/converter/retrievers/utils/ProgressBar.java
+++ b/mavenizer/retrievers/base/src/main/java/org/apache/flex/utilities/converter/retrievers/utils/ProgressBar.java
@@ -16,7 +16,7 @@
*/
package org.apache.flex.utilities.converter.retrievers.utils;
-import org.codehaus.plexus.util.StringUtils;
+import org.apache.commons.lang.StringUtils;
/**
* Created by cdutz on 24.05.2014.
[28/50] [abbrv] git commit: [flex-utilities]
[refs/heads/as3httpclient-work] - - Implemented a wrapper converter that
creates wrapper artifacts used as templates for web-projects.
Posted by qu...@apache.org.
- Implemented a wrapper converter that creates wrapper artifacts used as templates for web-projects.
Project: http://git-wip-us.apache.org/repos/asf/flex-utilities/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-utilities/commit/1a46b112
Tree: http://git-wip-us.apache.org/repos/asf/flex-utilities/tree/1a46b112
Diff: http://git-wip-us.apache.org/repos/asf/flex-utilities/diff/1a46b112
Branch: refs/heads/as3httpclient-work
Commit: 1a46b11276f24b2a13464461887bf63b4735006e
Parents: 05922ef
Author: Christofer Dutz <ch...@codecentric.de>
Authored: Thu Apr 23 17:15:44 2015 +0200
Committer: Christofer Dutz <ch...@codecentric.de>
Committed: Thu Apr 23 17:15:44 2015 +0200
----------------------------------------------------------------------
.../converter/core/SdkConverterCLI.java | 10 +++
mavenizer/converters/flex/pom.xml | 5 ++
mavenizer/converters/pom.xml | 1 +
mavenizer/converters/wrapper/pom.xml | 41 +++++++++
.../converter/wrapper/WrapperConverter.java | 87 ++++++++++++++++++++
mavenizer/maven-extension/pom.xml | 5 ++
.../converter/mavenextension/FlexEventSpy.java | 23 ++++--
.../converter/retrievers/types/SdkType.java | 3 +-
.../retrievers/download/DownloadRetriever.java | 41 ++++++---
9 files changed, 195 insertions(+), 21 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/1a46b112/mavenizer/cli/src/main/java/org/apache/flex/utilities/converter/core/SdkConverterCLI.java
----------------------------------------------------------------------
diff --git a/mavenizer/cli/src/main/java/org/apache/flex/utilities/converter/core/SdkConverterCLI.java b/mavenizer/cli/src/main/java/org/apache/flex/utilities/converter/core/SdkConverterCLI.java
index 56d5f1f..9f3d160 100644
--- a/mavenizer/cli/src/main/java/org/apache/flex/utilities/converter/core/SdkConverterCLI.java
+++ b/mavenizer/cli/src/main/java/org/apache/flex/utilities/converter/core/SdkConverterCLI.java
@@ -11,6 +11,7 @@ import org.apache.flex.utilities.converter.fontkit.FontkitConverter;
import org.apache.flex.utilities.converter.retrievers.download.DownloadRetriever;
import org.apache.flex.utilities.converter.retrievers.types.PlatformType;
import org.apache.flex.utilities.converter.retrievers.types.SdkType;
+import org.apache.flex.utilities.converter.wrapper.WrapperConverter;
import org.apache.maven.artifact.versioning.DefaultArtifactVersion;
import java.io.File;
@@ -253,6 +254,10 @@ public class SdkConverterCLI {
File fdkDownloadDirectory = retriever.retrieve(SdkType.FLEX, flexVersion);
// Unpack the archive to the FDK directory.
mergeDirectories(fdkDownloadDirectory, fdkDir);
+
+ // Add the swfobject files.
+ File swfObjectDirectory = retriever.retrieve(SdkType.SWFOBJECT);
+ mergeDirectories(swfObjectDirectory, fdkDir);
}
String flashVersions = cmd.getOptionValue(OPTION_FLASH_VERSIONS, "");
@@ -315,6 +320,11 @@ public class SdkConverterCLI {
FontkitConverter fontkitConverter = new FontkitConverter(fdkDir, mavenDir);
fontkitConverter.convert();
+ System.out.println("- Converting Wrappers from " + fdkDir.getAbsolutePath() +
+ " to " + mavenDir.getAbsolutePath());
+ WrapperConverter wrapperConverter = new WrapperConverter(fdkDir, mavenDir);
+ wrapperConverter.convert();
+
System.out.println("Finished conversion.");
}
http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/1a46b112/mavenizer/converters/flex/pom.xml
----------------------------------------------------------------------
diff --git a/mavenizer/converters/flex/pom.xml b/mavenizer/converters/flex/pom.xml
index 6df279f..480bc83 100644
--- a/mavenizer/converters/flex/pom.xml
+++ b/mavenizer/converters/flex/pom.xml
@@ -54,6 +54,11 @@
<artifactId>fontkit-converter</artifactId>
<version>1.0.0-SNAPSHOT</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.flex.utilities.converter</groupId>
+ <artifactId>wrapper-converter</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ </dependency>
</dependencies>
</project>
http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/1a46b112/mavenizer/converters/pom.xml
----------------------------------------------------------------------
diff --git a/mavenizer/converters/pom.xml b/mavenizer/converters/pom.xml
index d2dbad4..69a859b 100644
--- a/mavenizer/converters/pom.xml
+++ b/mavenizer/converters/pom.xml
@@ -39,6 +39,7 @@
<module>flash</module>
<module>flex</module>
<module>fontkit</module>
+ <module>wrapper</module>
</modules>
</project>
http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/1a46b112/mavenizer/converters/wrapper/pom.xml
----------------------------------------------------------------------
diff --git a/mavenizer/converters/wrapper/pom.xml b/mavenizer/converters/wrapper/pom.xml
new file mode 100644
index 0000000..86f8a43
--- /dev/null
+++ b/mavenizer/converters/wrapper/pom.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+ 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 xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.flex.utilities.converter</groupId>
+ <artifactId>converters</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>wrapper-converter</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ <packaging>jar</packaging>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.flex.utilities.converter</groupId>
+ <artifactId>base-converter</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ </dependency>
+ </dependencies>
+
+</project>
http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/1a46b112/mavenizer/converters/wrapper/src/main/java/org/apache/flex/utilities/converter/wrapper/WrapperConverter.java
----------------------------------------------------------------------
diff --git a/mavenizer/converters/wrapper/src/main/java/org/apache/flex/utilities/converter/wrapper/WrapperConverter.java b/mavenizer/converters/wrapper/src/main/java/org/apache/flex/utilities/converter/wrapper/WrapperConverter.java
new file mode 100644
index 0000000..6a2b691
--- /dev/null
+++ b/mavenizer/converters/wrapper/src/main/java/org/apache/flex/utilities/converter/wrapper/WrapperConverter.java
@@ -0,0 +1,87 @@
+package org.apache.flex.utilities.converter.wrapper;
+
+import org.apache.flex.utilities.converter.BaseConverter;
+import org.apache.flex.utilities.converter.Converter;
+import org.apache.flex.utilities.converter.exceptions.ConverterException;
+import org.apache.flex.utilities.converter.model.MavenArtifact;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+import org.xml.sax.SAXException;
+
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.parsers.ParserConfigurationException;
+import java.io.File;
+import java.io.IOException;
+
+/**
+ * Created by christoferdutz on 06.04.15.
+ */
+public class WrapperConverter extends BaseConverter implements Converter {
+
+ public WrapperConverter(File rootSourceDirectory, File rootTargetDirectory) throws ConverterException {
+ super(rootSourceDirectory, rootTargetDirectory);
+ }
+
+ @Override
+ protected void processDirectory() throws ConverterException {
+ File wrapperRootDir = new File(rootSourceDirectory, "templates/swfobject");
+ if(!wrapperRootDir.exists() || !wrapperRootDir.isDirectory()) {
+ System.out.println("Skipping Wrapper generation.");
+ return;
+ }
+
+ try {
+ final File wrapperJar = File.createTempFile("SWFObjectWrapper-2.2", ".jar");
+ generateZip(wrapperRootDir.listFiles(), wrapperJar);
+
+ final MavenArtifact swfobjectWrapper = new MavenArtifact();
+ swfobjectWrapper.setGroupId("org.apache.flex.wrapper");
+ swfobjectWrapper.setArtifactId("swfobject");
+ swfobjectWrapper.setVersion(getFlexVersion(rootSourceDirectory));
+ swfobjectWrapper.setPackaging("jar");
+ swfobjectWrapper.addDefaultBinaryArtifact(wrapperJar);
+
+ writeArtifact(swfobjectWrapper);
+ } catch (IOException e) {
+ throw new ConverterException("Error creating wrapper jar.", e);
+ }
+ }
+
+ /**
+ * Get the version of an Flex SDK from the content of the SDK directory.
+ *
+ * @return version string for the current Flex SDK
+ */
+ protected String getFlexVersion(File rootDirectory) throws ConverterException {
+ final File sdkDescriptor = new File(rootDirectory, "flex-sdk-description.xml");
+
+ // If the descriptor is not present, return null as this FDK directory doesn't
+ // seem to contain a Flex SDK.
+ if(!sdkDescriptor.exists()) {
+ return null;
+ }
+
+ final DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
+ try {
+ // Parse the document
+ final DocumentBuilder db = dbf.newDocumentBuilder();
+ final Document dom = db.parse(sdkDescriptor);
+
+ // Get name, version and build nodes
+ final Element root = dom.getDocumentElement();
+ final String version = root.getElementsByTagName("version").item(0).getTextContent();
+ final String build = root.getElementsByTagName("build").item(0).getTextContent();
+
+ // In general the version consists of the content of the version element with an appended build-number.
+ return (build.equals("0")) ? version + "-SNAPSHOT" : version;
+ } catch (ParserConfigurationException pce) {
+ throw new RuntimeException(pce);
+ } catch (SAXException se) {
+ throw new RuntimeException(se);
+ } catch (IOException ioe) {
+ throw new RuntimeException(ioe);
+ }
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/1a46b112/mavenizer/maven-extension/pom.xml
----------------------------------------------------------------------
diff --git a/mavenizer/maven-extension/pom.xml b/mavenizer/maven-extension/pom.xml
index 384fba9..4a96355 100644
--- a/mavenizer/maven-extension/pom.xml
+++ b/mavenizer/maven-extension/pom.xml
@@ -95,6 +95,11 @@
<artifactId>fontkit-converter</artifactId>
<version>1.0.0-SNAPSHOT</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.flex.utilities.converter</groupId>
+ <artifactId>wrapper-converter</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ </dependency>
<dependency>
<groupId>javax.inject</groupId>
http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/1a46b112/mavenizer/maven-extension/src/main/java/org/apache/flex/utilities/converter/mavenextension/FlexEventSpy.java
----------------------------------------------------------------------
diff --git a/mavenizer/maven-extension/src/main/java/org/apache/flex/utilities/converter/mavenextension/FlexEventSpy.java b/mavenizer/maven-extension/src/main/java/org/apache/flex/utilities/converter/mavenextension/FlexEventSpy.java
index f6d5c4f..e946db0 100644
--- a/mavenizer/maven-extension/src/main/java/org/apache/flex/utilities/converter/mavenextension/FlexEventSpy.java
+++ b/mavenizer/maven-extension/src/main/java/org/apache/flex/utilities/converter/mavenextension/FlexEventSpy.java
@@ -7,6 +7,7 @@ import org.apache.flex.utilities.converter.flex.FlexConverter;
import org.apache.flex.utilities.converter.fontkit.FontkitConverter;
import org.apache.flex.utilities.converter.retrievers.download.DownloadRetriever;
import org.apache.flex.utilities.converter.retrievers.types.SdkType;
+import org.apache.flex.utilities.converter.wrapper.WrapperConverter;
import org.apache.maven.MavenExecutionException;
import org.apache.maven.artifact.resolver.ArtifactResolutionRequest;
import org.apache.maven.artifact.resolver.ArtifactResolutionResult;
@@ -110,7 +111,7 @@ public class FlexEventSpy extends AbstractEventSpy {
}
ArtifactResolutionResult res = repositorySystem.resolve(req);
return res.isSuccess();
- } catch (Exception e) {
+ } catch (Throwable e) {
return false;
}
}
@@ -123,17 +124,25 @@ public class FlexEventSpy extends AbstractEventSpy {
DownloadRetriever downloadRetriever = new DownloadRetriever();
File sdkRoot = downloadRetriever.retrieve(SdkType.FLEX, version);
+ // In order to create a fully functional wrapper we need to download
+ // SWFObject and merge that with the fdk first.
+ File swfObjectRoot = downloadRetriever.retrieve(SdkType.SWFOBJECT);
+ FileUtils.copyDirectory(swfObjectRoot, sdkRoot);
+
// In order to compile some of the themes, we need to download a
// playerglobal version.
logger.info("In order to convert the Apache Flex SDK, a Flash SDK has to be downloaded.");
File flashSdkRoot = downloadRetriever.retrieve(SdkType.FLASH, "10.2");
FileUtils.copyDirectory(flashSdkRoot, sdkRoot);
+ // Convert the FDK itself.
FlexConverter converter = new FlexConverter(sdkRoot, localRepoBaseDir);
converter.convert();
- } catch (Exception ce) {
- logger.error("Error", ce);
- ce.printStackTrace();
+
+ // Convert the wrapper.
+ WrapperConverter wrapperConverter = new WrapperConverter(sdkRoot, localRepoBaseDir);
+ wrapperConverter.convert();
+ } catch (Throwable ce) {
throw new MavenExecutionException(
"Caught exception while downloading and converting artifact.", ce);
}
@@ -149,7 +158,7 @@ public class FlexEventSpy extends AbstractEventSpy {
File sdkRoot = downloadRetriever.retrieve(SdkType.FLASH, version);
FlashConverter converter = new FlashConverter(sdkRoot, localRepoBaseDir);
converter.convert();
- } catch (Exception ce) {
+ } catch (Throwable ce) {
throw new MavenExecutionException(
"Caught exception while downloading and converting artifact.", ce);
}
@@ -165,7 +174,7 @@ public class FlexEventSpy extends AbstractEventSpy {
File sdkRoot = downloadRetriever.retrieve(SdkType.AIR, version);
AirConverter converter = new AirConverter(sdkRoot, localRepoBaseDir);
converter.convert();
- } catch (Exception ce) {
+ } catch (Throwable ce) {
throw new MavenExecutionException(
"Caught exception while downloading and converting artifact.", ce);
}
@@ -181,7 +190,7 @@ public class FlexEventSpy extends AbstractEventSpy {
File sdkRoot = downloadRetriever.retrieve(SdkType.FONTKIT);
FontkitConverter converter = new FontkitConverter(sdkRoot, localRepoBaseDir);
converter.convert();
- } catch (Exception ce) {
+ } catch (Throwable ce) {
throw new MavenExecutionException(
"Caught exception while downloading and converting artifact.", ce);
}
http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/1a46b112/mavenizer/retrievers/base/src/main/java/org/apache/flex/utilities/converter/retrievers/types/SdkType.java
----------------------------------------------------------------------
diff --git a/mavenizer/retrievers/base/src/main/java/org/apache/flex/utilities/converter/retrievers/types/SdkType.java b/mavenizer/retrievers/base/src/main/java/org/apache/flex/utilities/converter/retrievers/types/SdkType.java
index 5ea0ba8..f8b3024 100644
--- a/mavenizer/retrievers/base/src/main/java/org/apache/flex/utilities/converter/retrievers/types/SdkType.java
+++ b/mavenizer/retrievers/base/src/main/java/org/apache/flex/utilities/converter/retrievers/types/SdkType.java
@@ -24,6 +24,7 @@ public enum SdkType {
FLEX,
FLASH,
AIR,
- FONTKIT
+ FONTKIT,
+ SWFOBJECT
}
http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/1a46b112/mavenizer/retrievers/download/src/main/java/org/apache/flex/utilities/converter/retrievers/download/DownloadRetriever.java
----------------------------------------------------------------------
diff --git a/mavenizer/retrievers/download/src/main/java/org/apache/flex/utilities/converter/retrievers/download/DownloadRetriever.java b/mavenizer/retrievers/download/src/main/java/org/apache/flex/utilities/converter/retrievers/download/DownloadRetriever.java
index 81c4f75..45c9570 100644
--- a/mavenizer/retrievers/download/src/main/java/org/apache/flex/utilities/converter/retrievers/download/DownloadRetriever.java
+++ b/mavenizer/retrievers/download/src/main/java/org/apache/flex/utilities/converter/retrievers/download/DownloadRetriever.java
@@ -125,20 +125,36 @@ public class DownloadRetriever extends BaseRetriever {
final File targetDirectory = new File(targetFile.getParent(),
targetFile.getName().substring(0, targetFile.getName().lastIndexOf(".") - 1));
final File libDestFile = new File(targetDirectory, "frameworks/libs/player/" + version + "/playerglobal.swc");
- if(!libDestFile.getParentFile().exists()) {
+ if (!libDestFile.getParentFile().exists()) {
libDestFile.getParentFile().mkdirs();
}
FileUtils.moveFile(targetFile, libDestFile);
return targetDirectory;
} else {
System.out.println("Extracting archive to temp directory.");
- final File targetDirectory = new File(targetFile.getParent(),
+ File targetDirectory = new File(targetFile.getParent(),
targetFile.getName().substring(0, targetFile.getName().lastIndexOf(".") - 1));
- unpack(targetFile, targetDirectory);
+ if(type.equals(SdkType.SWFOBJECT)) {
+ unpack(targetFile, new File(targetDirectory, "templates"));
+ } else {
+ unpack(targetFile, targetDirectory);
+ }
System.out.println();
System.out.println("Finished extracting.");
System.out.println("===========================================================");
+ // In case of the swfobject, delete some stuff we don't want in there.
+ if(type.equals(SdkType.SWFOBJECT)) {
+ File delFile = new File(targetDirectory, "templates/swfobject/index_dynamic.html");
+ FileUtils.deleteQuietly(delFile);
+ delFile = new File(targetDirectory, "templates/swfobject/index.html");
+ FileUtils.deleteQuietly(delFile);
+ delFile = new File(targetDirectory, "templates/swfobject/test.swf");
+ FileUtils.deleteQuietly(delFile);
+ delFile = new File(targetDirectory, "templates/swfobject/src");
+ FileUtils.deleteDirectory(delFile);
+ }
+
return targetDirectory;
}
}
@@ -250,7 +266,7 @@ public class DownloadRetriever extends BaseRetriever {
}
final StringBuilder stringBuilder = new StringBuilder();
- if (sdkType == SdkType.FLEX) {
+ if ((sdkType == SdkType.FLEX) || (sdkType == SdkType.SWFOBJECT)) {
final String path = artifactElement.getAttribute("path");
final String file = artifactElement.getAttribute("file");
if (!path.startsWith("http://")) {
@@ -260,7 +276,10 @@ public class DownloadRetriever extends BaseRetriever {
if(!path.endsWith("/")) {
stringBuilder.append("/");
}
- stringBuilder.append(file).append(".zip");
+ stringBuilder.append(file);
+ if(sdkType == SdkType.FLEX) {
+ stringBuilder.append(".zip");
+ }
} else {
final NodeList pathElements = artifactElement.getElementsByTagName("path");
final NodeList fileElements = artifactElement.getElementsByTagName("file");
@@ -318,7 +337,10 @@ public class DownloadRetriever extends BaseRetriever {
break;
case FONTKIT:
stringBuilder.append("//fontswf");
-
+ break;
+ case SWFOBJECT:
+ stringBuilder.append("//swfobject");
+ break;
}
return stringBuilder.toString();
}
@@ -413,11 +435,4 @@ public class DownloadRetriever extends BaseRetriever {
}
return result;
}
-
- public static void main(String[] args) throws Exception {
- DownloadRetriever downloadRetriever = new DownloadRetriever();
- //downloadRetriever.getAvailableVersions(SdkType.FLEX);
- //downloadRetriever.getAvailableVersions(SdkType.FLASH);
- downloadRetriever.getAvailableVersions(SdkType.AIR);
- }
}
[43/50] [abbrv] git commit: [flex-utilities]
[refs/heads/as3httpclient-work] - - Added the Apache Snapshot Repo to the
pluginRepositories
Posted by qu...@apache.org.
- Added the Apache Snapshot Repo to the pluginRepositories
Project: http://git-wip-us.apache.org/repos/asf/flex-utilities/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-utilities/commit/b0fa8e30
Tree: http://git-wip-us.apache.org/repos/asf/flex-utilities/tree/b0fa8e30
Diff: http://git-wip-us.apache.org/repos/asf/flex-utilities/diff/b0fa8e30
Branch: refs/heads/as3httpclient-work
Commit: b0fa8e3020ed446d81039390c99e3e402fbcf0c1
Parents: b145b02
Author: Christofer Dutz <ch...@codecentric.de>
Authored: Sat May 9 21:32:30 2015 +0200
Committer: Christofer Dutz <ch...@codecentric.de>
Committed: Sat May 9 21:32:30 2015 +0200
----------------------------------------------------------------------
maven-flex-plugin/examples/pom.xml | 17 +++++++++++++++--
1 file changed, 15 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/b0fa8e30/maven-flex-plugin/examples/pom.xml
----------------------------------------------------------------------
diff --git a/maven-flex-plugin/examples/pom.xml b/maven-flex-plugin/examples/pom.xml
index b83d09e..88af0ce 100644
--- a/maven-flex-plugin/examples/pom.xml
+++ b/maven-flex-plugin/examples/pom.xml
@@ -89,8 +89,21 @@
</snapshots>
</pluginRepository>
<!--
- This is where we get unreleased Flexmojos stuff from.
- -->
+ This is where we get unreleased Apache stuff from
+ -->
+ <pluginRepository>
+ <id>apache-snapshots</id>
+ <url>http://repository.apache.org/snapshots/</url>
+ <releases>
+ <enabled>false</enabled>
+ </releases>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ </pluginRepository>
+ <!--
+ This is where we get unreleased Flexmojos stuff from.
+ -->
<pluginRepository>
<id>sonatype-snapshots</id>
<url>https://oss.sonatype.org/content/repositories/snapshots/</url>
[05/50] [abbrv] git commit: [flex-utilities]
[refs/heads/as3httpclient-work] - - Added a loop to the accept license part
that loops as long as an unreadable answer (not yes/y or no/n) is entered and
only aborts if the user selects no.
Posted by qu...@apache.org.
- Added a loop to the accept license part that loops as long as an unreadable answer (not yes/y or no/n) is entered and only aborts if the user selects no.
Project: http://git-wip-us.apache.org/repos/asf/flex-utilities/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-utilities/commit/07c77ee3
Tree: http://git-wip-us.apache.org/repos/asf/flex-utilities/tree/07c77ee3
Diff: http://git-wip-us.apache.org/repos/asf/flex-utilities/diff/07c77ee3
Branch: refs/heads/as3httpclient-work
Commit: 07c77ee31304498a89ec170af214d09e22acc55f
Parents: f21e528
Author: Christofer Dutz <ch...@codecentric.de>
Authored: Fri Apr 10 09:14:50 2015 +0200
Committer: Christofer Dutz <ch...@codecentric.de>
Committed: Fri Apr 10 09:14:50 2015 +0200
----------------------------------------------------------------------
.../retrievers/download/DownloadRetriever.java | 17 +++++++++++------
1 file changed, 11 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/07c77ee3/mavenizer/retrievers/download/src/main/java/org/apache/flex/utilities/converter/retrievers/download/DownloadRetriever.java
----------------------------------------------------------------------
diff --git a/mavenizer/retrievers/download/src/main/java/org/apache/flex/utilities/converter/retrievers/download/DownloadRetriever.java b/mavenizer/retrievers/download/src/main/java/org/apache/flex/utilities/converter/retrievers/download/DownloadRetriever.java
index 115898d..96e95ff 100644
--- a/mavenizer/retrievers/download/src/main/java/org/apache/flex/utilities/converter/retrievers/download/DownloadRetriever.java
+++ b/mavenizer/retrievers/download/src/main/java/org/apache/flex/utilities/converter/retrievers/download/DownloadRetriever.java
@@ -342,14 +342,19 @@ public class DownloadRetriever extends BaseRetriever {
} else {
throw new RetrieverException("Unknown SdkType");
}
- System.out.println(question);
- System.out.print(questionProps.getProperty("DO_YOU_ACCEPT_QUESTION") + " ");
final BufferedReader reader = new BufferedReader(new InputStreamReader(System.in));
try {
- final String answer = reader.readLine();
- if (!"YES".equalsIgnoreCase(answer)) {
- System.out.println("You have to accept the license agreement in order to proceed.");
- throw new RetrieverException("You have to accept the license agreement in order to proceed.");
+ while (true) {
+ System.out.println(question);
+ System.out.print(questionProps.getProperty("DO_YOU_ACCEPT_QUESTION") + " ");
+ final String answer = reader.readLine();
+ if ("YES".equalsIgnoreCase(answer) || "Y".equalsIgnoreCase(answer)) {
+ return;
+ }
+ if ("NO".equalsIgnoreCase(answer) || "N".equalsIgnoreCase(answer)) {
+ System.out.println("You have to accept the license agreement in order to proceed.");
+ throw new RetrieverException("You have to accept the license agreement in order to proceed.");
+ }
}
} catch(IOException e) {
throw new RetrieverException("Couldn't read from Stdin.");
[06/50] [abbrv] git commit: [flex-utilities]
[refs/heads/as3httpclient-work] - - Added some more validation code -
Hardened the converters not to cause fatal exceptions if optional FDK parts
are missing.
Posted by qu...@apache.org.
- Added some more validation code
- Hardened the converters not to cause fatal exceptions if optional FDK parts are missing.
Project: http://git-wip-us.apache.org/repos/asf/flex-utilities/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-utilities/commit/55f0ba19
Tree: http://git-wip-us.apache.org/repos/asf/flex-utilities/tree/55f0ba19
Diff: http://git-wip-us.apache.org/repos/asf/flex-utilities/diff/55f0ba19
Branch: refs/heads/as3httpclient-work
Commit: 55f0ba191144b2d31f4c1a7a20dfefb2fcb46bec
Parents: 07c77ee
Author: Christofer Dutz <ch...@codecentric.de>
Authored: Fri Apr 10 12:08:07 2015 +0200
Committer: Christofer Dutz <ch...@codecentric.de>
Committed: Fri Apr 10 12:08:07 2015 +0200
----------------------------------------------------------------------
.../converter/core/SdkConverterCLI.java | 152 +++++++++++++------
.../utilities/converter/air/AirConverter.java | 11 +-
.../converter/flash/FlashConverter.java | 9 +-
.../utilities/converter/flex/FlexConverter.java | 11 +-
.../retrievers/download/DownloadRetriever.java | 1 -
5 files changed, 130 insertions(+), 54 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/55f0ba19/mavenizer/cli/src/main/java/org/apache/flex/utilities/converter/core/SdkConverterCLI.java
----------------------------------------------------------------------
diff --git a/mavenizer/cli/src/main/java/org/apache/flex/utilities/converter/core/SdkConverterCLI.java b/mavenizer/cli/src/main/java/org/apache/flex/utilities/converter/core/SdkConverterCLI.java
index 32cb60d..0f088e6 100644
--- a/mavenizer/cli/src/main/java/org/apache/flex/utilities/converter/core/SdkConverterCLI.java
+++ b/mavenizer/cli/src/main/java/org/apache/flex/utilities/converter/core/SdkConverterCLI.java
@@ -22,31 +22,51 @@ import java.util.*;
*/
public class SdkConverterCLI {
+ public static final String COMMAND_LIST = "list";
+ public static final String COMMAND_DOWNLOAD = "download";
+ public static final String COMMAND_CONVERT = "convert";
+ public static final String COMMAND_DEPLOY = "deploy";
+
+ public static final String OPTION_FLEX_VERSION = "flexVersion";
+ public static final String OPTION_FLASH_VERSIONS = "flashVersions";
+ public static final String OPTION_AIT_VERSION = "airVersion";
+ public static final String OPTION_FONTKIT = "fontkit";
+ public static final String OPTION_PLATFORMS = "platforms";
+
+ public static final String OPTION_FDK_DIR = "fdkDir";
+ public static final String OPTION_MAVEN_DIR = "mavenDir";
+
+ public static final String OPTION_REPO_URL = "repoUrl";
+ public static final String OPTION_REPO_USERNAME = "repoUsername";
+ public static final String OPTION_REPO_PASSWORD = "repoPassword";
+
+
+ @SuppressWarnings("unchecked")
public static void main(String[] args) throws Exception {
Options options = new Options();
options.addOption(OptionBuilder.withArgName("version").hasArg().
withDescription("(Optional and Only valid for download) Version of the " +
"FDK which should be downloaded.").
isRequired(false).
- create("flexVersion"));
+ create(OPTION_FLEX_VERSION));
options.addOption(OptionBuilder.withArgName("version(s)").hasArg().
withValueSeparator(',').
withDescription("(Optional and Only valid for download) Version(s) of the " +
"Adobe Flash SDK which should be downloaded. Multiple versions can " +
"be separated by \",\".").
isRequired(false).
- create("flashVersion"));
+ create(OPTION_FLASH_VERSIONS));
options.addOption(OptionBuilder.withArgName("version").hasArg().
withDescription("(Optional and Only valid for download) Version of the " +
"Adobe Air SDK which should be downloaded.").
isRequired(false).
- create("airVersion"));
+ create(OPTION_AIT_VERSION));
options.addOption(OptionBuilder.
withDescription("(Optional and Only valid for download) If provided, the " +
"Converter will also download the Fontkit libraries needed for font " +
"encoding.").
isRequired(false).
- create("fontkit"));
+ create(OPTION_FONTKIT));
options.addOption(OptionBuilder.withArgName("platform(s)").hasArg().
withValueSeparator(',').
withDescription("(Optional and Only valid for download) Platform the artifacts " +
@@ -54,34 +74,34 @@ public class SdkConverterCLI {
"on will be used. Valid options are: \"WINDOWS\", \"MAC\" and \"LNX\". " +
"Multiple versions can be separated by \",\".").
isRequired(false).
- create("platform"));
+ create(OPTION_PLATFORMS));
options.addOption(OptionBuilder.withArgName("dir").hasArg().
- withDescription("(Optional) Directory that the mavenized artifacts will be located in. " +
+ withDescription("(Optional) Directory that the FDK will be located in. " +
"If omitted, a temporary directory will be used.").
isRequired(false).
- create("mavenDir"));
+ create(OPTION_FDK_DIR));
options.addOption(OptionBuilder.withArgName("dir").hasArg().
- withDescription("(Optional) Directory that the FDK will be located in. " +
+ withDescription("(Optional) Directory that the mavenized artifacts will be located in. " +
"If omitted, a temporary directory will be used.").
isRequired(false).
- create("fdkDir"));
+ create(OPTION_MAVEN_DIR));
options.addOption(OptionBuilder.withArgName("url").hasArg().
withDescription("(Optional and only valid for deploy) Url of the remote Maven " +
"repository that the generated Maven artifacts should be deployed to.").
isRequired(false).
- create("repoUrl"));
+ create(OPTION_REPO_URL));
options.addOption(OptionBuilder.withArgName("username").hasArg().
withDescription("(Optional and only valid for deploy) Username used to authenticate " +
"on the remote Maven repository that the generated Maven artifacts should be " +
"deployed to.").
isRequired(false).
- create("repoUsername"));
+ create(OPTION_REPO_USERNAME));
options.addOption(OptionBuilder.withArgName("password").hasArg().
withDescription("(Optional and only valid for deploy) Password used to authenticate " +
"on the remote Maven repository that the generated Maven artifacts should be " +
"deployed to.").
isRequired(false).
- create("repoPassword"));
+ create(OPTION_REPO_PASSWORD));
CommandLineParser parser = new BasicParser();
try {
@@ -92,7 +112,7 @@ public class SdkConverterCLI {
// Find out the desired platform(s).
List<PlatformType> platforms = new ArrayList<PlatformType>();
- String platformParam = cmd.getOptionValue("platform");
+ String platformParam = cmd.getOptionValue(OPTION_PLATFORMS);
if((platformParam != null) && !platformParam.isEmpty()) {
String[] platformNames = platformParam.split(",");
for(String platformName : platformNames) {
@@ -112,13 +132,59 @@ public class SdkConverterCLI {
}
}
+ /////////////////////////////////////////////////////////
+ // Validate sensible combinations of commands.
+ /////////////////////////////////////////////////////////
+
+ // Check that all commands are valid.
+ for(String command : (List<String>) cmd.getArgList()) {
+ if(!COMMAND_LIST.equals(command) && !COMMAND_DOWNLOAD.equals(command) &&
+ !COMMAND_CONVERT.equals(command) && !COMMAND_DEPLOY.equals(command)) {
+ System.err.println("Unsupported command '" + command + "'.");
+ System.exit(1);
+ }
+ }
+
+ // Downloading and deploying without converting doesn't make sense.
+ if(cmd.getArgList().contains(COMMAND_DOWNLOAD) && !cmd.getArgList().contains(COMMAND_CONVERT) &&
+ cmd.getArgList().contains(COMMAND_DEPLOY)) {
+ System.err.println("Downloading and deploying without conversion doesn't make much sense.");
+ System.exit(1);
+ }
+
+ // If Downloading and not converting, the fdkDir parameter has to be provided as
+ // otherwise the download result would reside in some strange temp directory.
+ if(cmd.getArgList().contains(COMMAND_DOWNLOAD) && !cmd.getArgList().contains(COMMAND_CONVERT)
+ && !cmd.hasOption(OPTION_FDK_DIR)) {
+ System.err.println("Parameter 'fdkDir' required for task 'download' without conversion.");
+ System.exit(1);
+ }
+
+ // If Converting and not deploying, the mavenDir parameter has to be provided as
+ // otherwise the converted FDK would reside in some strange temp directory.
+ if(cmd.getArgList().contains(COMMAND_CONVERT) && !cmd.getArgList().contains(COMMAND_DEPLOY)
+ && !cmd.hasOption(OPTION_MAVEN_DIR)) {
+ System.err.println("Parameter 'mavenDir' required for task 'convert' without deployment.");
+ System.exit(1);
+ }
+
+ // Downloading nothing doesn't really make sense. On the bad side it even causes
+ // problems with the converter without any fdkDir parameter, therefore we abort here.
+ if(cmd.getArgList().contains(COMMAND_DOWNLOAD) && !cmd.hasOption(OPTION_FLEX_VERSION) &&
+ !cmd.hasOption(OPTION_FLASH_VERSIONS) && !cmd.hasOption(OPTION_AIT_VERSION) &&
+ !cmd.hasOption(OPTION_FONTKIT)) {
+ System.err.println("At least one of the parameters 'flexVersion', 'flashVersions', 'airVersion' or " +
+ "'fontkit' required for task 'download'.");
+ System.exit(1);
+ }
+
// Find out where to download or convert from.
- File fdkDir = cmd.hasOption("fdkDir") ?
- new File(cmd.getOptionValue("fdkDir")) : getTempDir("FLEX-DOWNLOAD");
+ File fdkDir = cmd.hasOption(OPTION_FDK_DIR) ?
+ new File(cmd.getOptionValue(OPTION_FDK_DIR)) : getTempDir("FLEX-DOWNLOAD-");
// Find out where to convert to or deploy from.
- File mavenDir = cmd.hasOption("mavenDir") ?
- new File(cmd.getOptionValue("mavenDir")) : getTempDir("FLEX-MAVEN");
+ File mavenDir = cmd.hasOption(OPTION_MAVEN_DIR) ?
+ new File(cmd.getOptionValue(OPTION_MAVEN_DIR)) : getTempDir("FLEX-MAVEN-");
////////////////////////////////////////////////////////////////////////////
// Exectute operations
@@ -130,7 +196,7 @@ public class SdkConverterCLI {
}
// Output a list of all available downloads.
- if(cmd.getArgList().contains("list")) {
+ if(cmd.getArgList().contains(COMMAND_LIST)) {
System.out.println("-----------------------------------------------");
System.out.println("- Available downloads");
System.out.println("-----------------------------------------------");
@@ -176,14 +242,14 @@ public class SdkConverterCLI {
}
// Handle the downloading of atifacts.
- if(cmd.getArgList().contains("download")) {
+ if(cmd.getArgList().contains(COMMAND_DOWNLOAD)) {
System.out.println("-----------------------------------------------");
System.out.println("- Downloading");
System.out.println("-----------------------------------------------");
DownloadRetriever retriever = new DownloadRetriever();
- String flexVersion = cmd.getOptionValue("flexVersion", null);
+ String flexVersion = cmd.getOptionValue(OPTION_FLEX_VERSION, null);
if(flexVersion != null) {
System.out.println("- Downloading Flex SDK version: " + flexVersion +
" to directory: " + fdkDir.getAbsolutePath());
@@ -192,7 +258,7 @@ public class SdkConverterCLI {
mergeDirectories(fdkDownloadDirectory, fdkDir);
}
- String flashVersions = cmd.getOptionValue("flashVersion", "");
+ String flashVersions = cmd.getOptionValue(OPTION_FLASH_VERSIONS, "");
if(!flashVersions.isEmpty()) {
for(String flashVersion : flashVersions.split(",")) {
System.out.println("- Downloading Flash SDK version: " + flashVersion +
@@ -203,21 +269,19 @@ public class SdkConverterCLI {
}
}
- String airVersions = cmd.getOptionValue("airVersion", "");
- if(!airVersions.isEmpty()) {
- for(String airVersion : airVersions.split(",")) {
- for(PlatformType platformType : platforms) {
- System.out.println("- Downloading Air SDK version: " + airVersion +
- " and platform " + platformType.name() +
- " to directory: " + fdkDir.getAbsolutePath());
- File airDownloadDirectory = retriever.retrieve(SdkType.AIR, airVersion, platformType);
- // Integrate the download into the FDK directory.
- mergeDirectories(airDownloadDirectory, fdkDir);
- }
+ String airVersion = cmd.getOptionValue(OPTION_AIT_VERSION, "");
+ if(!airVersion.isEmpty()) {
+ for(PlatformType platformType : platforms) {
+ System.out.println("- Downloading Air SDK version: " + airVersion +
+ " and platform " + platformType.name() +
+ " to directory: " + fdkDir.getAbsolutePath());
+ File airDownloadDirectory = retriever.retrieve(SdkType.AIR, airVersion, platformType);
+ // Integrate the download into the FDK directory.
+ mergeDirectories(airDownloadDirectory, fdkDir);
}
}
- if(cmd.hasOption("fontkit")) {
+ if(cmd.hasOption(OPTION_FONTKIT)) {
System.out.println("- Downloading Flex Fontkit libraries" +
" to directory: " + fdkDir.getAbsolutePath());
File fontkitDownloadDirectory = retriever.retrieve(SdkType.FONTKIT);
@@ -229,7 +293,7 @@ public class SdkConverterCLI {
}
// Handle the conversion.
- if(cmd.getArgList().contains("convert")) {
+ if(cmd.getArgList().contains(COMMAND_CONVERT)) {
System.out.println("-----------------------------------------------");
System.out.println("- Conversion");
System.out.println("-----------------------------------------------");
@@ -244,7 +308,7 @@ public class SdkConverterCLI {
FlashConverter flashConverter = new FlashConverter(fdkDir, mavenDir);
flashConverter.convert();
- System.out.println("- Converting Air SDKs from " + fdkDir.getAbsolutePath() +
+ System.out.println("- Converting Air SDK from " + fdkDir.getAbsolutePath() +
" to " + mavenDir.getAbsolutePath());
AirConverter airConverter = new AirConverter(fdkDir, mavenDir);
airConverter.convert();
@@ -258,19 +322,19 @@ public class SdkConverterCLI {
}
// Handle the deployment.
- if(cmd.getArgList().contains("deploy")) {
+ if(cmd.getArgList().contains(COMMAND_DEPLOY)) {
System.out.println("-----------------------------------------------");
System.out.println("- Deployment");
System.out.println("-----------------------------------------------");
- if(!cmd.hasOption("repoUrl")) {
+ if(!cmd.hasOption(OPTION_REPO_URL)) {
System.err.println("Parameter 'repoUrl' required for task 'deploy'.");
System.exit(1);
}
- String repoUrl = cmd.getOptionValue("repoUrl");
- String repoUsername = cmd.getOptionValue("repoUsername", null);
- String repoPassword = cmd.getOptionValue("repoPassword", null);
+ String repoUrl = cmd.getOptionValue(OPTION_REPO_URL);
+ String repoUsername = cmd.getOptionValue(OPTION_REPO_USERNAME, null);
+ String repoPassword = cmd.getOptionValue(OPTION_REPO_PASSWORD, null);
System.out.println("- Deploying libraries to " + repoUrl + " from " + mavenDir.getAbsolutePath());
@@ -292,8 +356,8 @@ public class SdkConverterCLI {
"directories in your systems temp directory and uses these for the follwoing commands.\n" +
" - list:\nList all available versions and platforms (for download)\n" +
" - download:\nDownload the selected versions of FDK parts specified by 'flexVersion', " +
- "'flashVersion', 'airVersion' and 'fontkit' and creates an FDK in the directory specified by " +
- "'fdkDir'. If 'airVersion' is specified, the 'platform' parameter specifies the platforms for which " +
+ "'flashVersions', 'airVersion' and 'fontkit' and creates an FDK in the directory specified by " +
+ "'fdkDir'. If 'airVersion' is specified, the 'platforms' parameter specifies the platforms for which " +
"the given AIR SDK should be downloaded, if not specified the current systems platform is used. \n" +
" - convert:\nConvert the FDK located in 'fdkDir' into a mavenized form at 'mavenDir'.\n" +
" - deploy:\nDeploy the maven artifacts located in 'mavenDir', to the remote maven repository " +
@@ -303,8 +367,8 @@ public class SdkConverterCLI {
HelpFormatter helpFormatter = new HelpFormatter();
helpFormatter.printHelp("java -jar apache-flex-sdk-converter.jar [list] [-fdkDir <fdkDir>] " +
- "[-mavenDir <mavenDir>] [[-flexVersion <version>] [-flashVersion <version(s)>] " +
- "[-airVersion <version> [-platform <platform(s)>]] [-fontkit] download] [convert] " +
+ "[-mavenDir <mavenDir>] [[-flexVersion <version>] [-flashVersions <version(s)>] " +
+ "[-airVersion <version> [-platforms <platform(s)>]] [-fontkit] download] [convert] " +
"[-repoUrl <url> [-repoUsername <username> -repoPassword <password>] deploy]",
headerText, options, "");
}
http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/55f0ba19/mavenizer/converters/air/src/main/java/org/apache/flex/utilities/converter/air/AirConverter.java
----------------------------------------------------------------------
diff --git a/mavenizer/converters/air/src/main/java/org/apache/flex/utilities/converter/air/AirConverter.java b/mavenizer/converters/air/src/main/java/org/apache/flex/utilities/converter/air/AirConverter.java
index c655df5..d1dbbfc 100644
--- a/mavenizer/converters/air/src/main/java/org/apache/flex/utilities/converter/air/AirConverter.java
+++ b/mavenizer/converters/air/src/main/java/org/apache/flex/utilities/converter/air/AirConverter.java
@@ -52,8 +52,9 @@ public class AirConverter extends BaseConverter implements Converter {
*/
@Override
protected void processDirectory() throws ConverterException {
- if(!rootSourceDirectory.exists() || !rootSourceDirectory.isDirectory()) {
- throw new ConverterException("Air SDK directory '" + rootSourceDirectory.getPath() + "' is invalid.");
+ if((airSdkVersion == null) || !rootSourceDirectory.exists() || !rootSourceDirectory.isDirectory()) {
+ System.out.println("Skipping AIR SDK generation.");
+ return;
}
generateCompilerArtifacts();
@@ -210,9 +211,11 @@ public class AirConverter extends BaseConverter implements Converter {
// stick to that for now.
final File sdkDescriptor = new File(rootDirectory, "AIR SDK Readme.txt");
+
+ // If the descriptor is not present, return null as this FDK directory doesn't
+ // seem to contain a AIR SDK.
if(!sdkDescriptor.exists() || !sdkDescriptor.isFile()) {
- throw new ConverterException("Air SDK directory '" + rootDirectory.getPath() +
- "' is missing a the version text-file 'AIR SDK Readme.txt'.");
+ return null;
}
DataInputStream in = null;
http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/55f0ba19/mavenizer/converters/flash/src/main/java/org/apache/flex/utilities/converter/flash/FlashConverter.java
----------------------------------------------------------------------
diff --git a/mavenizer/converters/flash/src/main/java/org/apache/flex/utilities/converter/flash/FlashConverter.java b/mavenizer/converters/flash/src/main/java/org/apache/flex/utilities/converter/flash/FlashConverter.java
index 5ce72f6..a2c1831 100644
--- a/mavenizer/converters/flash/src/main/java/org/apache/flex/utilities/converter/flash/FlashConverter.java
+++ b/mavenizer/converters/flash/src/main/java/org/apache/flex/utilities/converter/flash/FlashConverter.java
@@ -53,7 +53,8 @@ public class FlashConverter extends BaseConverter implements Converter {
@Override
protected void processDirectory() throws ConverterException {
if(!rootSourceDirectory.exists() || !rootSourceDirectory.isDirectory()) {
- throw new ConverterException("Flash SDK directory '" + rootSourceDirectory.getPath() + "' is invalid.");
+ System.out.println("Skipping Flash SDK generation.");
+ return;
}
generateRuntimeArtifacts();
@@ -69,7 +70,7 @@ public class FlashConverter extends BaseConverter implements Converter {
// Create a list of all libs that should belong to the Flash SDK runtime.
final File directory = new File(rootSourceDirectory, "runtimes" + File.separator + "player");
if(!directory.exists() || !directory.isDirectory()) {
- System.out.println("Skipping runtime generation.");
+ System.out.println("Skipping Flash runtime generation.");
return;
}
final List<File> playerVersions = new ArrayList<File>();
@@ -214,8 +215,10 @@ public class FlashConverter extends BaseConverter implements Converter {
protected void generateFrameworkArtifacts() throws ConverterException {
// Create a list of all libs that should belong to the Flash SDK runtime.
final File directory = new File(rootSourceDirectory, "frameworks.libs.player".replace(".", File.separator));
+ // It seems the fdk directory doesn't contain any flash resources.
if (!directory.exists() || !directory.isDirectory()) {
- throw new ConverterException("Runtime directory does not exist.");
+ System.out.println("Skipping Flash framework generation.");
+ return;
}
final List<File> playerVersions = new ArrayList<File>();
final File[] versions = directory.listFiles();
http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/55f0ba19/mavenizer/converters/flex/src/main/java/org/apache/flex/utilities/converter/flex/FlexConverter.java
----------------------------------------------------------------------
diff --git a/mavenizer/converters/flex/src/main/java/org/apache/flex/utilities/converter/flex/FlexConverter.java b/mavenizer/converters/flex/src/main/java/org/apache/flex/utilities/converter/flex/FlexConverter.java
index 841aec6..be8c000 100644
--- a/mavenizer/converters/flex/src/main/java/org/apache/flex/utilities/converter/flex/FlexConverter.java
+++ b/mavenizer/converters/flex/src/main/java/org/apache/flex/utilities/converter/flex/FlexConverter.java
@@ -61,8 +61,9 @@ public class FlexConverter extends BaseConverter implements Converter {
*/
@Override
protected void processDirectory() throws ConverterException {
- if(!rootSourceDirectory.exists() || !rootSourceDirectory.isDirectory()) {
- throw new ConverterException("Flex SDK directory '" + rootSourceDirectory.getPath() + "' is invalid.");
+ if((flexSdkVersion == null) || !rootSourceDirectory.exists() || !rootSourceDirectory.isDirectory()) {
+ System.out.println("Skipping Flex SDK generation.");
+ return;
}
generateCompilerArtifacts();
@@ -563,6 +564,12 @@ public class FlexConverter extends BaseConverter implements Converter {
protected String getFlexVersion(File rootDirectory) throws ConverterException {
final File sdkDescriptor = new File(rootDirectory, "flex-sdk-description.xml");
+ // If the descriptor is not present, return null as this FDK directory doesn't
+ // seem to contain a Flex SDK.
+ if(!sdkDescriptor.exists()) {
+ return null;
+ }
+
final DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
try {
// Parse the document
http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/55f0ba19/mavenizer/retrievers/download/src/main/java/org/apache/flex/utilities/converter/retrievers/download/DownloadRetriever.java
----------------------------------------------------------------------
diff --git a/mavenizer/retrievers/download/src/main/java/org/apache/flex/utilities/converter/retrievers/download/DownloadRetriever.java b/mavenizer/retrievers/download/src/main/java/org/apache/flex/utilities/converter/retrievers/download/DownloadRetriever.java
index 96e95ff..81c4f75 100644
--- a/mavenizer/retrievers/download/src/main/java/org/apache/flex/utilities/converter/retrievers/download/DownloadRetriever.java
+++ b/mavenizer/retrievers/download/src/main/java/org/apache/flex/utilities/converter/retrievers/download/DownloadRetriever.java
@@ -31,7 +31,6 @@ import org.apache.http.impl.client.DefaultHttpClient;
import org.apache.maven.artifact.versioning.DefaultArtifactVersion;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
-import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
import org.xml.sax.SAXException;
[27/50] [abbrv] git commit: [flex-utilities]
[refs/heads/as3httpclient-work] - - Fixed a bug making the converter not copy
rsls correctly as we stripped the build number from the version (Which was
also used for finding the rsls ... which contained the b
Posted by qu...@apache.org.
- Fixed a bug making the converter not copy rsls correctly as we stripped the build number from the version (Which was also used for finding the rsls ... which contained the build number in their versions)
Project: http://git-wip-us.apache.org/repos/asf/flex-utilities/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-utilities/commit/05922ef7
Tree: http://git-wip-us.apache.org/repos/asf/flex-utilities/tree/05922ef7
Diff: http://git-wip-us.apache.org/repos/asf/flex-utilities/diff/05922ef7
Branch: refs/heads/as3httpclient-work
Commit: 05922ef7ba1dd02a1a61fff092665c0da7d09819
Parents: 29eeb02
Author: Christofer Dutz <ch...@codecentric.de>
Authored: Mon Apr 20 16:12:39 2015 +0200
Committer: Christofer Dutz <ch...@codecentric.de>
Committed: Mon Apr 20 16:12:39 2015 +0200
----------------------------------------------------------------------
.../utilities/converter/flex/FlexConverter.java | 40 ++++++++++++++++++--
1 file changed, 37 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/05922ef7/mavenizer/converters/flex/src/main/java/org/apache/flex/utilities/converter/flex/FlexConverter.java
----------------------------------------------------------------------
diff --git a/mavenizer/converters/flex/src/main/java/org/apache/flex/utilities/converter/flex/FlexConverter.java b/mavenizer/converters/flex/src/main/java/org/apache/flex/utilities/converter/flex/FlexConverter.java
index 4600b76..6def8a1 100644
--- a/mavenizer/converters/flex/src/main/java/org/apache/flex/utilities/converter/flex/FlexConverter.java
+++ b/mavenizer/converters/flex/src/main/java/org/apache/flex/utilities/converter/flex/FlexConverter.java
@@ -41,6 +41,7 @@ import java.util.zip.ZipOutputStream;
public class FlexConverter extends BaseConverter implements Converter {
protected String flexSdkVersion;
+ protected String flexBuild;
/**
* @param rootSourceDirectory Path to the root of the original Flex SDK.
@@ -52,6 +53,7 @@ public class FlexConverter extends BaseConverter implements Converter {
// Get the version of the current Flex SDK.
this.flexSdkVersion = getFlexVersion(rootSourceDirectory);
+ this.flexBuild = getFlexBuild(rootSourceDirectory);
}
/**
@@ -592,8 +594,40 @@ public class FlexConverter extends BaseConverter implements Converter {
}
}
+ /**
+ * Get the version of an Flex SDK from the content of the SDK directory.
+ *
+ * @return version string for the current Flex SDK
+ */
+ protected String getFlexBuild(File rootDirectory) throws ConverterException {
+ final File sdkDescriptor = new File(rootDirectory, "flex-sdk-description.xml");
+
+ // If the descriptor is not present, return null as this FDK directory doesn't
+ // seem to contain a Flex SDK.
+ if(!sdkDescriptor.exists()) {
+ return null;
+ }
+
+ final DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
+ try {
+ // Parse the document
+ final DocumentBuilder db = dbf.newDocumentBuilder();
+ final Document dom = db.parse(sdkDescriptor);
+
+ // Get name, version and build nodes
+ final Element root = dom.getDocumentElement();
+ return root.getElementsByTagName("build").item(0).getTextContent();
+ } catch (ParserConfigurationException pce) {
+ throw new RuntimeException(pce);
+ } catch (SAXException se) {
+ throw new RuntimeException(se);
+ } catch (IOException ioe) {
+ throw new RuntimeException(ioe);
+ }
+ }
+
protected File getRsl(String artifactId) {
- final FlexRslFilter filter = new FlexRslFilter(artifactId, flexSdkVersion);
+ final FlexRslFilter filter = new FlexRslFilter(artifactId, flexSdkVersion, flexBuild);
final File rslDirectory = new File(rootSourceDirectory, "frameworks" + File.separator + "rsls");
final File[] rsls = rslDirectory.listFiles(filter);
if ((rsls != null) && (rsls.length == 1)) {
@@ -660,8 +694,8 @@ public class FlexConverter extends BaseConverter implements Converter {
public static class FlexRslFilter implements FilenameFilter {
private String fileName;
- public FlexRslFilter(String artifactName, String artifactVersion) {
- this.fileName = artifactName + "_" + artifactVersion + ".swf";
+ public FlexRslFilter(String artifactName, String artifactVersion, String build) {
+ this.fileName = artifactName + "_" + artifactVersion + "." + build + ".swf";
}
public boolean accept(File dir, String name) {
[04/50] [abbrv] git commit: [flex-utilities]
[refs/heads/as3httpclient-work] - - Fixed the parent artifact name to
"apache-flex-sdk-converter"
Posted by qu...@apache.org.
- Fixed the parent artifact name to "apache-flex-sdk-converter"
Project: http://git-wip-us.apache.org/repos/asf/flex-utilities/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-utilities/commit/f21e5281
Tree: http://git-wip-us.apache.org/repos/asf/flex-utilities/tree/f21e5281
Diff: http://git-wip-us.apache.org/repos/asf/flex-utilities/diff/f21e5281
Branch: refs/heads/as3httpclient-work
Commit: f21e5281f671da19fc9e3eabb978918226eaf3c9
Parents: 48b73f3
Author: Christofer Dutz <ch...@codecentric.de>
Authored: Fri Apr 10 08:53:25 2015 +0200
Committer: Christofer Dutz <ch...@codecentric.de>
Committed: Fri Apr 10 08:53:25 2015 +0200
----------------------------------------------------------------------
mavenizer/cli/pom.xml | 2 +-
mavenizer/converters/pom.xml | 2 +-
mavenizer/deployers/pom.xml | 2 +-
mavenizer/retrievers/pom.xml | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/f21e5281/mavenizer/cli/pom.xml
----------------------------------------------------------------------
diff --git a/mavenizer/cli/pom.xml b/mavenizer/cli/pom.xml
index 4d4c8eb..839838e 100644
--- a/mavenizer/cli/pom.xml
+++ b/mavenizer/cli/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.flex.utilities.converter</groupId>
- <artifactId>flex-sdk-converter</artifactId>
+ <artifactId>apache-flex-sdk-converter</artifactId>
<version>1.0.0-SNAPSHOT</version>
</parent>
http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/f21e5281/mavenizer/converters/pom.xml
----------------------------------------------------------------------
diff --git a/mavenizer/converters/pom.xml b/mavenizer/converters/pom.xml
index 10ba0ef..d2dbad4 100644
--- a/mavenizer/converters/pom.xml
+++ b/mavenizer/converters/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.flex.utilities.converter</groupId>
- <artifactId>flex-sdk-converter</artifactId>
+ <artifactId>apache-flex-sdk-converter</artifactId>
<version>1.0.0-SNAPSHOT</version>
</parent>
http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/f21e5281/mavenizer/deployers/pom.xml
----------------------------------------------------------------------
diff --git a/mavenizer/deployers/pom.xml b/mavenizer/deployers/pom.xml
index 9557778..692b45d 100644
--- a/mavenizer/deployers/pom.xml
+++ b/mavenizer/deployers/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.flex.utilities.converter</groupId>
- <artifactId>flex-sdk-converter</artifactId>
+ <artifactId>apache-flex-sdk-converter</artifactId>
<version>1.0.0-SNAPSHOT</version>
</parent>
http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/f21e5281/mavenizer/retrievers/pom.xml
----------------------------------------------------------------------
diff --git a/mavenizer/retrievers/pom.xml b/mavenizer/retrievers/pom.xml
index 0ad50ae..a95bf41 100644
--- a/mavenizer/retrievers/pom.xml
+++ b/mavenizer/retrievers/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.flex.utilities.converter</groupId>
- <artifactId>flex-sdk-converter</artifactId>
+ <artifactId>apache-flex-sdk-converter</artifactId>
<version>1.0.0-SNAPSHOT</version>
</parent>
[33/50] [abbrv] git commit: [flex-utilities]
[refs/heads/as3httpclient-work] - - Started setting up an example project
consisting of multiple projects that all demonstrate the stuff described in
the Flex Wiki Tutorials
Posted by qu...@apache.org.
- Started setting up an example project consisting of multiple projects that all demonstrate the stuff described in the Flex Wiki Tutorials
Project: http://git-wip-us.apache.org/repos/asf/flex-utilities/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-utilities/commit/2b7f3e95
Tree: http://git-wip-us.apache.org/repos/asf/flex-utilities/tree/2b7f3e95
Diff: http://git-wip-us.apache.org/repos/asf/flex-utilities/diff/2b7f3e95
Branch: refs/heads/as3httpclient-work
Commit: 2b7f3e956ef47d2febb097087117cf091f152886
Parents: dd6d419
Author: Christofer Dutz <ch...@codecentric.de>
Authored: Sat Apr 25 12:09:08 2015 +0200
Committer: Christofer Dutz <ch...@codecentric.de>
Committed: Sat Apr 25 12:09:08 2015 +0200
----------------------------------------------------------------------
.../examples/i18n/compiled-locales/pom.xml | 40 ++++++
.../examples/i18n/compiled-locales/swf/pom.xml | 76 ++++++++++++
.../swf/src/main/flex/Main.mxml | 30 +++++
.../main/locales/de_DE/myresources.properties | 19 +++
.../main/locales/en_US/myresources.properties | 19 +++
.../examples/i18n/compiled-locales/war/pom.xml | 124 +++++++++++++++++++
.../war/src/main/webapp/WEB-INF/web.xml | 31 +++++
maven-flex-plugin/examples/i18n/pom.xml | 41 ++++++
.../examples/i18n/runtime-locales/pom.xml | 40 ++++++
.../examples/i18n/runtime-locales/swf/pom.xml | 76 ++++++++++++
.../runtime-locales/swf/src/main/flex/Main.mxml | 30 +++++
.../main/locales/de_DE/myresources.properties | 19 +++
.../main/locales/en_US/myresources.properties | 19 +++
.../examples/i18n/runtime-locales/war/pom.xml | 124 +++++++++++++++++++
.../war/src/main/webapp/WEB-INF/web.xml | 31 +++++
maven-flex-plugin/examples/pom.xml | 105 ++++++++++++++++
16 files changed, 824 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/2b7f3e95/maven-flex-plugin/examples/i18n/compiled-locales/pom.xml
----------------------------------------------------------------------
diff --git a/maven-flex-plugin/examples/i18n/compiled-locales/pom.xml b/maven-flex-plugin/examples/i18n/compiled-locales/pom.xml
new file mode 100644
index 0000000..83d1e60
--- /dev/null
+++ b/maven-flex-plugin/examples/i18n/compiled-locales/pom.xml
@@ -0,0 +1,40 @@
+<?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 xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.flex.examples.i18n</groupId>
+ <artifactId>i18n</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>compiled-locals</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ <packaging>pom</packaging>
+
+ <modules>
+ <module>swf</module>
+ <module>war</module>
+ </modules>
+
+</project>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/2b7f3e95/maven-flex-plugin/examples/i18n/compiled-locales/swf/pom.xml
----------------------------------------------------------------------
diff --git a/maven-flex-plugin/examples/i18n/compiled-locales/swf/pom.xml b/maven-flex-plugin/examples/i18n/compiled-locales/swf/pom.xml
new file mode 100644
index 0000000..a15264c
--- /dev/null
+++ b/maven-flex-plugin/examples/i18n/compiled-locales/swf/pom.xml
@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+ 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 xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.flex.examples.i18n</groupId>
+ <artifactId>compiled-locals</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>compiled-locals-swf</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ <packaging>swf</packaging>
+
+ <build>
+ <sourceDirectory>src/main/flex</sourceDirectory>
+ <plugins>
+ <plugin>
+ <groupId>net.flexmojos.oss</groupId>
+ <artifactId>flexmojos-maven-plugin</artifactId>
+ <version>7.1.0-SNAPSHOT</version>
+ <extensions>true</extensions>
+ <configuration>
+ <localesCompiled>
+ <locale>en_US</locale>
+ <locale>de_DE</locale>
+ </localesCompiled>
+ </configuration>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.flex</groupId>
+ <artifactId>compiler</artifactId>
+ <version>4.14.1</version>
+ <type>pom</type>
+ </dependency>
+ </dependencies>
+ </plugin>
+ </plugins>
+ </build>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.flex</groupId>
+ <artifactId>framework</artifactId>
+ <version>4.14.1</version>
+ <type>pom</type>
+ </dependency>
+ <dependency>
+ <groupId>com.adobe.flash.framework</groupId>
+ <artifactId>playerglobal</artifactId>
+ <version>14.0</version>
+ <type>swc</type>
+ </dependency>
+ </dependencies>
+
+</project>
http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/2b7f3e95/maven-flex-plugin/examples/i18n/compiled-locales/swf/src/main/flex/Main.mxml
----------------------------------------------------------------------
diff --git a/maven-flex-plugin/examples/i18n/compiled-locales/swf/src/main/flex/Main.mxml b/maven-flex-plugin/examples/i18n/compiled-locales/swf/src/main/flex/Main.mxml
new file mode 100644
index 0000000..ea188bc
--- /dev/null
+++ b/maven-flex-plugin/examples/i18n/compiled-locales/swf/src/main/flex/Main.mxml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+
+ 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.
+
+-->
+<s:Application xmlns:fx="http://ns.adobe.com/mxml/2009"
+ xmlns:s="library://ns.adobe.com/flex/spark"
+ xmlns:mx="library://ns.adobe.com/flex/mx">
+
+ <fx:Metadata>
+ [ResourceBundle("myresources")]
+ </fx:Metadata>
+
+ <s:Label text="{resourceManager.getString('myresources','greeting')}"/>
+
+</s:Application>
http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/2b7f3e95/maven-flex-plugin/examples/i18n/compiled-locales/swf/src/main/locales/de_DE/myresources.properties
----------------------------------------------------------------------
diff --git a/maven-flex-plugin/examples/i18n/compiled-locales/swf/src/main/locales/de_DE/myresources.properties b/maven-flex-plugin/examples/i18n/compiled-locales/swf/src/main/locales/de_DE/myresources.properties
new file mode 100644
index 0000000..f792b93
--- /dev/null
+++ b/maven-flex-plugin/examples/i18n/compiled-locales/swf/src/main/locales/de_DE/myresources.properties
@@ -0,0 +1,19 @@
+################################################################################
+##
+## 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.
+##
+################################################################################
+greeting=Hallo Welt!
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/2b7f3e95/maven-flex-plugin/examples/i18n/compiled-locales/swf/src/main/locales/en_US/myresources.properties
----------------------------------------------------------------------
diff --git a/maven-flex-plugin/examples/i18n/compiled-locales/swf/src/main/locales/en_US/myresources.properties b/maven-flex-plugin/examples/i18n/compiled-locales/swf/src/main/locales/en_US/myresources.properties
new file mode 100644
index 0000000..ba8ac99
--- /dev/null
+++ b/maven-flex-plugin/examples/i18n/compiled-locales/swf/src/main/locales/en_US/myresources.properties
@@ -0,0 +1,19 @@
+################################################################################
+##
+## 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.
+##
+################################################################################
+greeting=Hello World!
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/2b7f3e95/maven-flex-plugin/examples/i18n/compiled-locales/war/pom.xml
----------------------------------------------------------------------
diff --git a/maven-flex-plugin/examples/i18n/compiled-locales/war/pom.xml b/maven-flex-plugin/examples/i18n/compiled-locales/war/pom.xml
new file mode 100644
index 0000000..e646f0a
--- /dev/null
+++ b/maven-flex-plugin/examples/i18n/compiled-locales/war/pom.xml
@@ -0,0 +1,124 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+ 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 xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.flex.examples.i18n</groupId>
+ <artifactId>compiled-locals</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>compiled-locals-war</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ <packaging>war</packaging>
+
+ <!--
+ Properties used in the wrapper template, used by maven-war-plugin to
+ perform the filtering.
+ -->
+ <properties>
+ <swf>swf-1.0.0-SNAPSHOT</swf>
+ <width>100%</width>
+ <height>100%</height>
+ <title>My First Application</title>
+ <useBrowserHistory>true</useBrowserHistory>
+ <bgcolor>white</bgcolor>
+ <version_major>10</version_major>
+ <version_minor>2</version_minor>
+ <version_revision>0</version_revision>
+ <expressInstallSwf>expressInstall.swf</expressInstallSwf>
+ <application>application</application>
+ </properties>
+
+ <build>
+ <plugins>
+ <!--
+ Copy all the flex related resources (SWFs, RSLs, ...)
+ -->
+ <plugin>
+ <groupId>net.flexmojos.oss</groupId>
+ <artifactId>flexmojos-maven-plugin</artifactId>
+ <version>7.1.0-SNAPSHOT</version>
+ <executions>
+ <execution>
+ <goals>
+ <goal>copy-flex-resources</goal>
+ </goals>
+ </execution>
+ </executions>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.flex</groupId>
+ <artifactId>compiler</artifactId>
+ <version>4.14.1</version>
+ <type>pom</type>
+ </dependency>
+ </dependencies>
+ </plugin>
+ <!--
+ Builds the war and copies the flex default wrapper template.
+ -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-war-plugin</artifactId>
+ <version>2.4</version>
+ <configuration>
+ <overlays>
+ <overlay>
+ <groupId>org.apache.flex.wrapper</groupId>
+ <artifactId>swfobject</artifactId>
+ <type>war</type>
+ <filtered>true</filtered>
+ </overlay>
+ </overlays>
+ </configuration>
+ </plugin>
+ <!--
+ Make the war project "runnable" by running mvn jetty:run
+ -->
+ <plugin>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>maven-jetty-plugin</artifactId>
+ <version>6.1.17</version>
+ </plugin>
+ </plugins>
+ </build>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.flex.examples.i18n</groupId>
+ <artifactId>compiled-locals-swf</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ <type>swf</type>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.flex.wrapper</groupId>
+ <artifactId>swfobject</artifactId>
+ <version>4.14.1</version>
+ <type>war</type>
+ <scope>runtime</scope>
+ </dependency>
+ </dependencies>
+
+</project>
http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/2b7f3e95/maven-flex-plugin/examples/i18n/compiled-locales/war/src/main/webapp/WEB-INF/web.xml
----------------------------------------------------------------------
diff --git a/maven-flex-plugin/examples/i18n/compiled-locales/war/src/main/webapp/WEB-INF/web.xml b/maven-flex-plugin/examples/i18n/compiled-locales/war/src/main/webapp/WEB-INF/web.xml
new file mode 100644
index 0000000..8dd835a
--- /dev/null
+++ b/maven-flex-plugin/examples/i18n/compiled-locales/war/src/main/webapp/WEB-INF/web.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+ 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.
+
+-->
+<web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns="http://java.sun.com/xml/ns/javaee"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"
+ id="WebApp_ID" version="2.5">
+
+ <display-name>war war</display-name>
+
+ <welcome-file-list>
+ <welcome-file>index.html</welcome-file>
+ </welcome-file-list>
+
+</web-app>
http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/2b7f3e95/maven-flex-plugin/examples/i18n/pom.xml
----------------------------------------------------------------------
diff --git a/maven-flex-plugin/examples/i18n/pom.xml b/maven-flex-plugin/examples/i18n/pom.xml
new file mode 100644
index 0000000..ac118df
--- /dev/null
+++ b/maven-flex-plugin/examples/i18n/pom.xml
@@ -0,0 +1,41 @@
+<?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 xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.flex.examples</groupId>
+ <artifactId>parent</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ </parent>
+
+ <groupId>org.apache.flex.examples.i18n</groupId>
+ <artifactId>i18n</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ <packaging>pom</packaging>
+
+ <modules>
+ <module>compiled-locales</module>
+ <module>runtime-locales</module>
+ </modules>
+
+</project>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/2b7f3e95/maven-flex-plugin/examples/i18n/runtime-locales/pom.xml
----------------------------------------------------------------------
diff --git a/maven-flex-plugin/examples/i18n/runtime-locales/pom.xml b/maven-flex-plugin/examples/i18n/runtime-locales/pom.xml
new file mode 100644
index 0000000..635fc80
--- /dev/null
+++ b/maven-flex-plugin/examples/i18n/runtime-locales/pom.xml
@@ -0,0 +1,40 @@
+<?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 xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.flex.examples.i18n</groupId>
+ <artifactId>i18n</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>runtime-locals</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ <packaging>pom</packaging>
+
+ <modules>
+ <module>swf</module>
+ <module>war</module>
+ </modules>
+
+</project>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/2b7f3e95/maven-flex-plugin/examples/i18n/runtime-locales/swf/pom.xml
----------------------------------------------------------------------
diff --git a/maven-flex-plugin/examples/i18n/runtime-locales/swf/pom.xml b/maven-flex-plugin/examples/i18n/runtime-locales/swf/pom.xml
new file mode 100644
index 0000000..d6f6f7d
--- /dev/null
+++ b/maven-flex-plugin/examples/i18n/runtime-locales/swf/pom.xml
@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+ 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 xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.flex.examples.i18n</groupId>
+ <artifactId>runtime-locals</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>runtime-locals-swf</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ <packaging>swf</packaging>
+
+ <build>
+ <sourceDirectory>src/main/flex</sourceDirectory>
+ <plugins>
+ <plugin>
+ <groupId>net.flexmojos.oss</groupId>
+ <artifactId>flexmojos-maven-plugin</artifactId>
+ <version>7.1.0-SNAPSHOT</version>
+ <extensions>true</extensions>
+ <configuration>
+ <localesRuntime>
+ <locale>en_US</locale>
+ <locale>de_DE</locale>
+ </localesRuntime>
+ </configuration>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.flex</groupId>
+ <artifactId>compiler</artifactId>
+ <version>4.14.1</version>
+ <type>pom</type>
+ </dependency>
+ </dependencies>
+ </plugin>
+ </plugins>
+ </build>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.flex</groupId>
+ <artifactId>framework</artifactId>
+ <version>4.14.1</version>
+ <type>pom</type>
+ </dependency>
+ <dependency>
+ <groupId>com.adobe.flash.framework</groupId>
+ <artifactId>playerglobal</artifactId>
+ <version>14.0</version>
+ <type>swc</type>
+ </dependency>
+ </dependencies>
+
+</project>
http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/2b7f3e95/maven-flex-plugin/examples/i18n/runtime-locales/swf/src/main/flex/Main.mxml
----------------------------------------------------------------------
diff --git a/maven-flex-plugin/examples/i18n/runtime-locales/swf/src/main/flex/Main.mxml b/maven-flex-plugin/examples/i18n/runtime-locales/swf/src/main/flex/Main.mxml
new file mode 100644
index 0000000..ea188bc
--- /dev/null
+++ b/maven-flex-plugin/examples/i18n/runtime-locales/swf/src/main/flex/Main.mxml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+
+ 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.
+
+-->
+<s:Application xmlns:fx="http://ns.adobe.com/mxml/2009"
+ xmlns:s="library://ns.adobe.com/flex/spark"
+ xmlns:mx="library://ns.adobe.com/flex/mx">
+
+ <fx:Metadata>
+ [ResourceBundle("myresources")]
+ </fx:Metadata>
+
+ <s:Label text="{resourceManager.getString('myresources','greeting')}"/>
+
+</s:Application>
http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/2b7f3e95/maven-flex-plugin/examples/i18n/runtime-locales/swf/src/main/locales/de_DE/myresources.properties
----------------------------------------------------------------------
diff --git a/maven-flex-plugin/examples/i18n/runtime-locales/swf/src/main/locales/de_DE/myresources.properties b/maven-flex-plugin/examples/i18n/runtime-locales/swf/src/main/locales/de_DE/myresources.properties
new file mode 100644
index 0000000..f792b93
--- /dev/null
+++ b/maven-flex-plugin/examples/i18n/runtime-locales/swf/src/main/locales/de_DE/myresources.properties
@@ -0,0 +1,19 @@
+################################################################################
+##
+## 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.
+##
+################################################################################
+greeting=Hallo Welt!
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/2b7f3e95/maven-flex-plugin/examples/i18n/runtime-locales/swf/src/main/locales/en_US/myresources.properties
----------------------------------------------------------------------
diff --git a/maven-flex-plugin/examples/i18n/runtime-locales/swf/src/main/locales/en_US/myresources.properties b/maven-flex-plugin/examples/i18n/runtime-locales/swf/src/main/locales/en_US/myresources.properties
new file mode 100644
index 0000000..ba8ac99
--- /dev/null
+++ b/maven-flex-plugin/examples/i18n/runtime-locales/swf/src/main/locales/en_US/myresources.properties
@@ -0,0 +1,19 @@
+################################################################################
+##
+## 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.
+##
+################################################################################
+greeting=Hello World!
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/2b7f3e95/maven-flex-plugin/examples/i18n/runtime-locales/war/pom.xml
----------------------------------------------------------------------
diff --git a/maven-flex-plugin/examples/i18n/runtime-locales/war/pom.xml b/maven-flex-plugin/examples/i18n/runtime-locales/war/pom.xml
new file mode 100644
index 0000000..1403603
--- /dev/null
+++ b/maven-flex-plugin/examples/i18n/runtime-locales/war/pom.xml
@@ -0,0 +1,124 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+ 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 xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.flex.examples.i18n</groupId>
+ <artifactId>runtime-locals</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>runtime-locals-war</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ <packaging>war</packaging>
+
+ <!--
+ Properties used in the wrapper template, used by maven-war-plugin to
+ perform the filtering.
+ -->
+ <properties>
+ <swf>swf-1.0.0-SNAPSHOT</swf>
+ <width>100%</width>
+ <height>100%</height>
+ <title>My First Application</title>
+ <useBrowserHistory>true</useBrowserHistory>
+ <bgcolor>white</bgcolor>
+ <version_major>10</version_major>
+ <version_minor>2</version_minor>
+ <version_revision>0</version_revision>
+ <expressInstallSwf>expressInstall.swf</expressInstallSwf>
+ <application>application</application>
+ </properties>
+
+ <build>
+ <plugins>
+ <!--
+ Copy all the flex related resources (SWFs, RSLs, ...)
+ -->
+ <plugin>
+ <groupId>net.flexmojos.oss</groupId>
+ <artifactId>flexmojos-maven-plugin</artifactId>
+ <version>7.1.0-SNAPSHOT</version>
+ <executions>
+ <execution>
+ <goals>
+ <goal>copy-flex-resources</goal>
+ </goals>
+ </execution>
+ </executions>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.flex</groupId>
+ <artifactId>compiler</artifactId>
+ <version>4.14.1</version>
+ <type>pom</type>
+ </dependency>
+ </dependencies>
+ </plugin>
+ <!--
+ Builds the war and copies the flex default wrapper template.
+ -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-war-plugin</artifactId>
+ <version>2.4</version>
+ <configuration>
+ <overlays>
+ <overlay>
+ <groupId>org.apache.flex.wrapper</groupId>
+ <artifactId>swfobject</artifactId>
+ <type>war</type>
+ <filtered>true</filtered>
+ </overlay>
+ </overlays>
+ </configuration>
+ </plugin>
+ <!--
+ Make the war project "runnable" by running mvn jetty:run
+ -->
+ <plugin>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>maven-jetty-plugin</artifactId>
+ <version>6.1.17</version>
+ </plugin>
+ </plugins>
+ </build>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.flex.examples.i18n</groupId>
+ <artifactId>runtime-locals-swf</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ <type>swf</type>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.flex.wrapper</groupId>
+ <artifactId>swfobject</artifactId>
+ <version>4.14.1</version>
+ <type>war</type>
+ <scope>runtime</scope>
+ </dependency>
+ </dependencies>
+
+</project>
http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/2b7f3e95/maven-flex-plugin/examples/i18n/runtime-locales/war/src/main/webapp/WEB-INF/web.xml
----------------------------------------------------------------------
diff --git a/maven-flex-plugin/examples/i18n/runtime-locales/war/src/main/webapp/WEB-INF/web.xml b/maven-flex-plugin/examples/i18n/runtime-locales/war/src/main/webapp/WEB-INF/web.xml
new file mode 100644
index 0000000..8dd835a
--- /dev/null
+++ b/maven-flex-plugin/examples/i18n/runtime-locales/war/src/main/webapp/WEB-INF/web.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+ 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.
+
+-->
+<web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns="http://java.sun.com/xml/ns/javaee"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"
+ id="WebApp_ID" version="2.5">
+
+ <display-name>war war</display-name>
+
+ <welcome-file-list>
+ <welcome-file>index.html</welcome-file>
+ </welcome-file-list>
+
+</web-app>
http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/2b7f3e95/maven-flex-plugin/examples/pom.xml
----------------------------------------------------------------------
diff --git a/maven-flex-plugin/examples/pom.xml b/maven-flex-plugin/examples/pom.xml
new file mode 100644
index 0000000..36f9a77
--- /dev/null
+++ b/maven-flex-plugin/examples/pom.xml
@@ -0,0 +1,105 @@
+<?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 xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <groupId>org.apache.flex.examples</groupId>
+ <artifactId>parent</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ <packaging>pom</packaging>
+
+ <modules>
+ <module>i18n</module>
+ </modules>
+
+ <repositories>
+ <!--
+ This is where we get released stuff from.
+ -->
+ <repository>
+ <id>maven-central</id>
+ <url>http://repo1.maven.org/maven2/</url>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ </repository>
+ <!--
+ This is where we get unreleased Apache stuff from
+ -->
+ <repository>
+ <id>apache-snapshots</id>
+ <url>http://repository.apache.org/snapshots/</url>
+ <releases>
+ <enabled>false</enabled>
+ </releases>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ </repository>
+ <!--
+ This is where we get unreleased Flexmojos stuff from.
+ -->
+ <repository>
+ <id>sonatype-snapshots</id>
+ <url>https://oss.sonatype.org/content/repositories/snapshots/</url>
+ <releases>
+ <enabled>false</enabled>
+ </releases>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ </repository>
+ </repositories>
+
+ <pluginRepositories>
+ <!--
+ This is where we get released stuff from.
+ -->
+ <pluginRepository>
+ <id>maven-central</id>
+ <url>http://repo1.maven.org/maven2/</url>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ </pluginRepository>
+ <!--
+ This is where we get unreleased Flexmojos stuff from.
+ -->
+ <pluginRepository>
+ <id>sonatype-snapshots</id>
+ <url>https://oss.sonatype.org/content/repositories/snapshots/</url>
+ <releases>
+ <enabled>false</enabled>
+ </releases>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ </pluginRepository>
+ </pluginRepositories>
+
+</project>
\ No newline at end of file
[47/50] [abbrv] git commit: [flex-utilities]
[refs/heads/as3httpclient-work] - AntOnAIR: fixed the license comment in
ant.properties locale files to use the correct comment format because it was
adding parts of the license text to the compiled resource b
Posted by qu...@apache.org.
AntOnAIR: fixed the license comment in ant.properties locale files to use the correct comment format because it was adding parts of the license text to the compiled resource bundle.
Project: http://git-wip-us.apache.org/repos/asf/flex-utilities/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-utilities/commit/2badd743
Tree: http://git-wip-us.apache.org/repos/asf/flex-utilities/tree/2badd743
Diff: http://git-wip-us.apache.org/repos/asf/flex-utilities/diff/2badd743
Branch: refs/heads/as3httpclient-work
Commit: 2badd7431d85e35ffd4933bc82a37a7114c8ed7d
Parents: 6496873
Author: Josh Tynjala <jo...@apache.org>
Authored: Fri May 15 10:42:14 2015 -0700
Committer: Josh Tynjala <jo...@apache.org>
Committed: Fri May 15 10:42:14 2015 -0700
----------------------------------------------------------------------
ant_on_air/locale/en_AU/ant.properties | 33 ++++++++++++-----------------
ant_on_air/locale/en_GB/ant.properties | 33 ++++++++++++-----------------
ant_on_air/locale/en_US/ant.properties | 33 ++++++++++++-----------------
3 files changed, 42 insertions(+), 57 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/2badd743/ant_on_air/locale/en_AU/ant.properties
----------------------------------------------------------------------
diff --git a/ant_on_air/locale/en_AU/ant.properties b/ant_on_air/locale/en_AU/ant.properties
index d0ae9b7..86870a2 100644
--- a/ant_on_air/locale/en_AU/ant.properties
+++ b/ant_on_air/locale/en_AU/ant.properties
@@ -1,22 +1,17 @@
-<?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.
-
--->
+# 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.
MKDIR=Created ya dir mate %1
COPY=Copying ya %1 file to %2
http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/2badd743/ant_on_air/locale/en_GB/ant.properties
----------------------------------------------------------------------
diff --git a/ant_on_air/locale/en_GB/ant.properties b/ant_on_air/locale/en_GB/ant.properties
index 8420313..6b5deaf 100644
--- a/ant_on_air/locale/en_GB/ant.properties
+++ b/ant_on_air/locale/en_GB/ant.properties
@@ -1,22 +1,17 @@
-<?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.
-
--->
+# 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.
MKDIR=Created directory %1
COPY=Copying %1 file to %2
http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/2badd743/ant_on_air/locale/en_US/ant.properties
----------------------------------------------------------------------
diff --git a/ant_on_air/locale/en_US/ant.properties b/ant_on_air/locale/en_US/ant.properties
index 8420313..6b5deaf 100644
--- a/ant_on_air/locale/en_US/ant.properties
+++ b/ant_on_air/locale/en_US/ant.properties
@@ -1,22 +1,17 @@
-<?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.
-
--->
+# 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.
MKDIR=Created directory %1
COPY=Copying %1 file to %2
[48/50] [abbrv] git commit: [flex-utilities]
[refs/heads/as3httpclient-work] - AntOnAIR: fixed issue in Replace task where
if the token was replaced with a value that contained the token,
the task could get stuck in an infinite loop
Posted by qu...@apache.org.
AntOnAIR: fixed issue in Replace task where if the token was replaced with a value that contained the token, the task could get stuck in an infinite loop
Project: http://git-wip-us.apache.org/repos/asf/flex-utilities/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-utilities/commit/6961f8a2
Tree: http://git-wip-us.apache.org/repos/asf/flex-utilities/tree/6961f8a2
Diff: http://git-wip-us.apache.org/repos/asf/flex-utilities/diff/6961f8a2
Branch: refs/heads/as3httpclient-work
Commit: 6961f8a209ff1903fc87eb98163ced965356a05c
Parents: 2badd74
Author: Josh Tynjala <jo...@apache.org>
Authored: Fri May 15 16:06:31 2015 -0700
Committer: Josh Tynjala <jo...@apache.org>
Committed: Fri May 15 16:06:31 2015 -0700
----------------------------------------------------------------------
ant_on_air/src/org/apache/flex/ant/tags/Replace.as | 2 +-
ant_on_air/tests/test.xml | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/6961f8a2/ant_on_air/src/org/apache/flex/ant/tags/Replace.as
----------------------------------------------------------------------
diff --git a/ant_on_air/src/org/apache/flex/ant/tags/Replace.as b/ant_on_air/src/org/apache/flex/ant/tags/Replace.as
index 0b7ff69..2873ee1 100644
--- a/ant_on_air/src/org/apache/flex/ant/tags/Replace.as
+++ b/ant_on_air/src/org/apache/flex/ant/tags/Replace.as
@@ -129,7 +129,7 @@ package org.apache.flex.ant.tags
var firstHalf:String = s.substr(0, c);
var secondHalf:String = s.substr(c);
s = firstHalf + secondHalf.replace(tokens[i], reps[i]);
- cur = c + 1;
+ cur = c + reps[i].length;
}
} while (c != -1)
}
http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/6961f8a2/ant_on_air/tests/test.xml
----------------------------------------------------------------------
diff --git a/ant_on_air/tests/test.xml b/ant_on_air/tests/test.xml
index 9b6cd8f..e218795 100644
--- a/ant_on_air/tests/test.xml
+++ b/ant_on_air/tests/test.xml
@@ -206,7 +206,7 @@
</replace>
<replace file="${basedir}/temp/custom.properties">
<replacetoken><![CDATA[<test/>]]></replacetoken>
- <replacevalue><![CDATA[<cdata/>]]></replacevalue>
+ <replacevalue><![CDATA[<replaced/><test/>]]></replacevalue>
</replace>
<loadproperties srcFile="${basedir}/temp/custom.properties" />
<fail message="replace did not work: found somekey">
@@ -240,10 +240,10 @@
</not>
</condition>
</fail>
- <fail message="replace did not work: did not find <cdata/>">
+ <fail message="replace did not work: did not find <replaced/><test/>">
<condition>
<not>
- <equals arg1="${xml}" arg2="<cdata/>" />
+ <equals arg1="${xml}" arg2="<replaced/><test/>" />
</not>
</condition>
</fail>
[02/50] [abbrv] git commit: [flex-utilities]
[refs/heads/as3httpclient-work] - use a different url for the zip swc until
we find a better url
Posted by qu...@apache.org.
use a different url for the zip swc until we find a better url
Project: http://git-wip-us.apache.org/repos/asf/flex-utilities/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-utilities/commit/d1de19d7
Tree: http://git-wip-us.apache.org/repos/asf/flex-utilities/tree/d1de19d7
Diff: http://git-wip-us.apache.org/repos/asf/flex-utilities/diff/d1de19d7
Branch: refs/heads/as3httpclient-work
Commit: d1de19d7e91991889968f49a00035529c37f1fdd
Parents: 66e127e
Author: Alex Harui <ah...@apache.org>
Authored: Thu Apr 9 17:03:25 2015 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Thu Apr 9 17:03:25 2015 -0700
----------------------------------------------------------------------
installer/build.xml | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/d1de19d7/installer/build.xml
----------------------------------------------------------------------
diff --git a/installer/build.xml b/installer/build.xml
index 6d76076..24288dc 100644
--- a/installer/build.xml
+++ b/installer/build.xml
@@ -68,6 +68,10 @@
<property name="binary.kit" value="${kit.prefix}-bin"/>
<property name="LOCAL_CONFIG_FILE" value="${basedir}/src/installer/sdk-installer-config-4.0.xml" />
+ <!--<property name="commons.zip" value="http://projects.yoolab.org/maven/content/repositories/releases/org/as3commons/as3commons-zip/1.0.0-alpha.1/as3commons-zip-1.0.0-alpha.1.swc" />-->
+ <!-- use this one for now until we find a better source -->
+ <property name="commons.zip" value="https://github.com/bigosmallm/MakeApacheFlexForFlashBuilder/blob/master/libs/as3commons-zip-1.0.0-alpha.1.swc?raw=true" />
+
<!--
Properties are immutable so value frozen first time property is set.
If FLEX_HOME is not set with -DFLEX_HOME=/path/to/flex/sdk on the ant command line
@@ -275,10 +279,11 @@
<target name="get-as3commons.swc" depends="check-as3commons.swc" unless="as3commons.swc.present"
description="Download as3commons.swc and fail if checksum mismatch.">
<mkdir dir="${LIBRARY_DIR}"/>
- <get src="http://projects.yoolab.org/maven/content/repositories/releases/org/as3commons/as3commons-zip/1.0.0-alpha.1/as3commons-zip-1.0.0-alpha.1.swc"
+ <get src="${commons.zip}"
dest="${LIBRARY_DIR}/as3commons-zip-1.0.0-alpha.1.swc"
verbose="true"/>
- <get src="http://projects.yoolab.org/maven/content/repositories/releases/org/as3commons/as3commons-zip/1.0.0-alpha.1/as3commons-zip-1.0.0-alpha.1.swc.md5"
+ <!-- skip checksum until we find a valid file
+ <get src="${commons.zip}.md5"
dest="${LIBRARY_DIR}/as3commons-zip-1.0.0-alpha.1.swc.md5"
verbose="true"/>
<checksum file="${LIBRARY_DIR}/as3commons-zip-1.0.0-alpha.1.swc" algorithm="md5" verifyProperty="isMD5ok"/>
@@ -288,6 +293,7 @@
<isfalse value="${isMD5ok}"/>
</condition>
</fail>
+ -->
</target>
<target name="compile" depends="get-as3commons.swc"
[31/50] [abbrv] git commit: [flex-utilities]
[refs/heads/as3httpclient-work] - AntOnAIR: added support for
and tags that may be added as childre of the tag,
similar to . These tags make it possible t
Posted by qu...@apache.org.
AntOnAIR: added support for <replacetoken> and <replacevalue> tags that may be added as childre of the <replace> tag, similar to <replacefilter>. These tags make it possible to use CDATA and new lines in tokens and values.
Project: http://git-wip-us.apache.org/repos/asf/flex-utilities/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-utilities/commit/c45b0786
Tree: http://git-wip-us.apache.org/repos/asf/flex-utilities/tree/c45b0786
Diff: http://git-wip-us.apache.org/repos/asf/flex-utilities/diff/c45b0786
Branch: refs/heads/as3httpclient-work
Commit: c45b078688dfcdc3c468af4c56983805987b24f6
Parents: 1a46b11
Author: Josh Tynjala <jo...@gmail.com>
Authored: Fri Apr 24 15:15:22 2015 -0700
Committer: Josh Tynjala <jo...@gmail.com>
Committed: Fri Apr 24 15:15:22 2015 -0700
----------------------------------------------------------------------
.../src/org/apache/flex/ant/tags/Replace.as | 25 +++++++++--
.../org/apache/flex/ant/tags/ReplaceToken.as | 44 ++++++++++++++++++++
.../org/apache/flex/ant/tags/ReplaceValue.as | 44 ++++++++++++++++++++
ant_on_air/tests/test.xml | 23 +++++++++-
4 files changed, 131 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/c45b0786/ant_on_air/src/org/apache/flex/ant/tags/Replace.as
----------------------------------------------------------------------
diff --git a/ant_on_air/src/org/apache/flex/ant/tags/Replace.as b/ant_on_air/src/org/apache/flex/ant/tags/Replace.as
index 6a3cac1..0b7ff69 100644
--- a/ant_on_air/src/org/apache/flex/ant/tags/Replace.as
+++ b/ant_on_air/src/org/apache/flex/ant/tags/Replace.as
@@ -26,6 +26,7 @@ package org.apache.flex.ant.tags
import org.apache.flex.ant.Ant;
import org.apache.flex.ant.tags.supportClasses.TaskHandler;
+ import org.apache.flex.xml.ITagHandler;
[Mixin]
public class Replace extends TaskHandler
@@ -89,10 +90,26 @@ package org.apache.flex.ant.tags
{
for (var i:int = 0; i < numChildren; i++)
{
- var rf:ReplaceFilter = getChildAt(i) as ReplaceFilter;
- rf.setContext(context);
- tokens.push(rf.token);
- reps.push(rf.value);
+ var child:ITagHandler = getChildAt(i);
+ if(child is ReplaceFilter)
+ {
+ var rf:ReplaceFilter = child as ReplaceFilter;
+ rf.setContext(context);
+ tokens.push(rf.token);
+ reps.push(rf.value);
+ }
+ else if(child is ReplaceToken)
+ {
+ var rt:ReplaceToken = child as ReplaceToken;
+ rt.setContext(context);
+ tokens.push(rt.text);
+ }
+ else if(child is ReplaceValue)
+ {
+ var rv:ReplaceValue = child as ReplaceValue;
+ rv.setContext(context);
+ reps.push(rv.text);
+ }
}
}
var n:int = tokens.length;
http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/c45b0786/ant_on_air/src/org/apache/flex/ant/tags/ReplaceToken.as
----------------------------------------------------------------------
diff --git a/ant_on_air/src/org/apache/flex/ant/tags/ReplaceToken.as b/ant_on_air/src/org/apache/flex/ant/tags/ReplaceToken.as
new file mode 100644
index 0000000..8bb811d
--- /dev/null
+++ b/ant_on_air/src/org/apache/flex/ant/tags/ReplaceToken.as
@@ -0,0 +1,44 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+// 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.
+//
+////////////////////////////////////////////////////////////////////////////////
+package org.apache.flex.ant.tags
+{
+ import mx.core.IFlexModuleFactory;
+
+ import org.apache.flex.ant.Ant;
+ import org.apache.flex.ant.tags.supportClasses.TagHandler;
+
+ [Mixin]
+ public class ReplaceToken extends TagHandler
+ {
+ public static function init(mf:IFlexModuleFactory):void
+ {
+ Ant.antTagProcessors["replacetoken"] = ReplaceToken;
+ }
+
+ public function ReplaceToken()
+ {
+ super();
+ }
+
+ public function get text():String
+ {
+ return ant.getValue(xml.text().toString(), context);
+ }
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/c45b0786/ant_on_air/src/org/apache/flex/ant/tags/ReplaceValue.as
----------------------------------------------------------------------
diff --git a/ant_on_air/src/org/apache/flex/ant/tags/ReplaceValue.as b/ant_on_air/src/org/apache/flex/ant/tags/ReplaceValue.as
new file mode 100644
index 0000000..227d8a9
--- /dev/null
+++ b/ant_on_air/src/org/apache/flex/ant/tags/ReplaceValue.as
@@ -0,0 +1,44 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+// 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.
+//
+////////////////////////////////////////////////////////////////////////////////
+package org.apache.flex.ant.tags
+{
+ import mx.core.IFlexModuleFactory;
+
+ import org.apache.flex.ant.Ant;
+ import org.apache.flex.ant.tags.supportClasses.TagHandler;
+
+ [Mixin]
+ public class ReplaceValue extends TagHandler
+ {
+ public static function init(mf:IFlexModuleFactory):void
+ {
+ Ant.antTagProcessors["replacevalue"] = ReplaceValue;
+ }
+
+ public function ReplaceValue()
+ {
+ super();
+ }
+
+ public function get text():String
+ {
+ return ant.getValue(xml.text().toString(), context);
+ }
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/c45b0786/ant_on_air/tests/test.xml
----------------------------------------------------------------------
diff --git a/ant_on_air/tests/test.xml b/ant_on_air/tests/test.xml
index fa4ea4d..9b6cd8f 100644
--- a/ant_on_air/tests/test.xml
+++ b/ant_on_air/tests/test.xml
@@ -186,6 +186,7 @@
<entry key="somekey" value="somevalue" />
<entry key="somekey1" value="somevalue1" />
<entry key="looptest" value="foo" />
+ <entry key="xml" value="<test/>" />
</propertyfile>
<fail message="propertyfile did not result in expected file">
<condition>
@@ -199,6 +200,14 @@
<replace file="${basedir}/temp/custom.properties">
<replacefilter token="key" value="ky" />
</replace>
+ <replace file="${basedir}/temp/custom.properties">
+ <replacetoken>loop</replacetoken>
+ <replacevalue>lop</replacevalue>
+ </replace>
+ <replace file="${basedir}/temp/custom.properties">
+ <replacetoken><![CDATA[<test/>]]></replacetoken>
+ <replacevalue><![CDATA[<cdata/>]]></replacevalue>
+ </replace>
<loadproperties srcFile="${basedir}/temp/custom.properties" />
<fail message="replace did not work: found somekey">
<condition>
@@ -212,6 +221,11 @@
</not>
</condition>
</fail>
+ <fail message="replace did not work: found looptest">
+ <condition>
+ <isset property="looptest" />
+ </condition>
+ </fail>
<fail message="replace did not work: did not find replacedkey1">
<condition>
<not>
@@ -222,7 +236,14 @@
<fail message="replace did not work: did not find food">
<condition>
<not>
- <equals arg1="${looptest}" arg2="food" />
+ <equals arg1="${loptest}" arg2="food" />
+ </not>
+ </condition>
+ </fail>
+ <fail message="replace did not work: did not find <cdata/>">
+ <condition>
+ <not>
+ <equals arg1="${xml}" arg2="<cdata/>" />
</not>
</condition>
</fail>
[49/50] [abbrv] git commit: [flex-utilities]
[refs/heads/as3httpclient-work] - - Added a air mobile example project.
Posted by qu...@apache.org.
- Added a air mobile example project.
Project: http://git-wip-us.apache.org/repos/asf/flex-utilities/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-utilities/commit/fb705158
Tree: http://git-wip-us.apache.org/repos/asf/flex-utilities/tree/fb705158
Diff: http://git-wip-us.apache.org/repos/asf/flex-utilities/diff/fb705158
Branch: refs/heads/as3httpclient-work
Commit: fb7051589c6c4b5d358712f5522c00c0f63f5d38
Parents: 6961f8a
Author: Christofer Dutz <ch...@codecentric.de>
Authored: Wed May 20 10:15:56 2015 +0200
Committer: Christofer Dutz <ch...@codecentric.de>
Committed: Wed May 20 10:15:56 2015 +0200
----------------------------------------------------------------------
maven-flex-plugin/examples/mobile/pom.xml | 40 +++
.../examples/mobile/simple-air/pom.xml | 110 +++++++
.../mobile/simple-air/src/main/air/sign.p12 | Bin 0 -> 2482 bytes
.../main/flex/SimpleAirMobileApplication.mxml | 27 ++
.../simple-air/src/main/flex/tabs/Tab1.mxml | 24 ++
.../simple-air/src/main/flex/tabs/Tab2.mxml | 24 ++
.../src/main/resources/descriptor.xml | 297 +++++++++++++++++++
maven-flex-plugin/examples/pom.xml | 1 +
8 files changed, 523 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/fb705158/maven-flex-plugin/examples/mobile/pom.xml
----------------------------------------------------------------------
diff --git a/maven-flex-plugin/examples/mobile/pom.xml b/maven-flex-plugin/examples/mobile/pom.xml
new file mode 100644
index 0000000..44b1683
--- /dev/null
+++ b/maven-flex-plugin/examples/mobile/pom.xml
@@ -0,0 +1,40 @@
+<?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 xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.flex.examples</groupId>
+ <artifactId>parent</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ </parent>
+
+ <groupId>org.apache.flex.examples.mobile</groupId>
+ <artifactId>mobile</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ <packaging>pom</packaging>
+
+ <modules>
+ <module>simple-air</module>
+ </modules>
+
+</project>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/fb705158/maven-flex-plugin/examples/mobile/simple-air/pom.xml
----------------------------------------------------------------------
diff --git a/maven-flex-plugin/examples/mobile/simple-air/pom.xml b/maven-flex-plugin/examples/mobile/simple-air/pom.xml
new file mode 100644
index 0000000..c49e789
--- /dev/null
+++ b/maven-flex-plugin/examples/mobile/simple-air/pom.xml
@@ -0,0 +1,110 @@
+<!--
+
+ 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 xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.flex.examples.mobile</groupId>
+ <artifactId>mobile</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>simple-air</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ <packaging>air</packaging>
+
+ <build>
+ <sourceDirectory>src/main/flex</sourceDirectory>
+ <plugins>
+ <plugin>
+ <groupId>net.flexmojos.oss</groupId>
+ <artifactId>flexmojos-maven-plugin</artifactId>
+ <version>7.1.0-SNAPSHOT</version>
+ <extensions>true</extensions>
+ <executions>
+ <execution>
+ <goals>
+ <goal>sign-air</goal>
+ </goals>
+ </execution>
+ </executions>
+
+ <configuration>
+ <!-- Strangely I get linker errors, if I comment in this line -->
+ <!--keepGeneratedActionscript>true</keepGeneratedActionscript-->
+
+ <storepass>flexmojos</storepass>
+ <descriptorTemplate>${basedir}/src/main/resources/descriptor.xml</descriptorTemplate>
+ <debug>true</debug>
+ </configuration>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.flex</groupId>
+ <artifactId>compiler</artifactId>
+ <version>4.14.1</version>
+ <type>pom</type>
+ </dependency>
+ <dependency>
+ <groupId>com.adobe.air.compiler</groupId>
+ <artifactId>adt</artifactId>
+ <version>17.0</version>
+ </dependency>
+ </dependencies>
+ </plugin>
+ </plugins>
+ </build>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.flex</groupId>
+ <artifactId>framework</artifactId>
+ <version>4.14.1</version>
+ <type>pom</type>
+ </dependency>
+
+ <!-- Add the components optimized for mobile use -->
+ <dependency>
+ <groupId>org.apache.flex.framework</groupId>
+ <artifactId>mobile</artifactId>
+ <version>4.14.1</version>
+ <type>pom</type>
+ </dependency>
+
+ <!-- Add the default mobile skin -->
+ <dependency>
+ <groupId>org.apache.flex.framework.themes</groupId>
+ <artifactId>mobile</artifactId>
+ <version>4.14.1</version>
+ <type>swc</type>
+ <scope>theme</scope>
+ </dependency>
+
+ <!-- Air runtime dependencies -->
+ <dependency>
+ <groupId>com.adobe.air</groupId>
+ <artifactId>framework</artifactId>
+ <version>17.0</version>
+ <type>pom</type>
+ </dependency>
+ </dependencies>
+
+</project>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/fb705158/maven-flex-plugin/examples/mobile/simple-air/src/main/air/sign.p12
----------------------------------------------------------------------
diff --git a/maven-flex-plugin/examples/mobile/simple-air/src/main/air/sign.p12 b/maven-flex-plugin/examples/mobile/simple-air/src/main/air/sign.p12
new file mode 100644
index 0000000..0be9fc3
Binary files /dev/null and b/maven-flex-plugin/examples/mobile/simple-air/src/main/air/sign.p12 differ
http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/fb705158/maven-flex-plugin/examples/mobile/simple-air/src/main/flex/SimpleAirMobileApplication.mxml
----------------------------------------------------------------------
diff --git a/maven-flex-plugin/examples/mobile/simple-air/src/main/flex/SimpleAirMobileApplication.mxml b/maven-flex-plugin/examples/mobile/simple-air/src/main/flex/SimpleAirMobileApplication.mxml
new file mode 100644
index 0000000..09845f7
--- /dev/null
+++ b/maven-flex-plugin/examples/mobile/simple-air/src/main/flex/SimpleAirMobileApplication.mxml
@@ -0,0 +1,27 @@
+<?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.
+
+-->
+<s:TabbedViewNavigatorApplication
+ xmlns:fx="http://ns.adobe.com/mxml/2009"
+ xmlns:s="library://ns.adobe.com/flex/spark">
+
+ <s:ViewNavigator label="tab1" firstView="tabs.Tab1"/>
+ <s:ViewNavigator label="tab2" firstView="tabs.Tab2"/>
+
+</s:TabbedViewNavigatorApplication>
http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/fb705158/maven-flex-plugin/examples/mobile/simple-air/src/main/flex/tabs/Tab1.mxml
----------------------------------------------------------------------
diff --git a/maven-flex-plugin/examples/mobile/simple-air/src/main/flex/tabs/Tab1.mxml b/maven-flex-plugin/examples/mobile/simple-air/src/main/flex/tabs/Tab1.mxml
new file mode 100644
index 0000000..dfe492c
--- /dev/null
+++ b/maven-flex-plugin/examples/mobile/simple-air/src/main/flex/tabs/Tab1.mxml
@@ -0,0 +1,24 @@
+<?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.
+
+-->
+<s:View xmlns:fx="http://ns.adobe.com/mxml/2009" xmlns:s="library://ns.adobe.com/flex/spark">
+
+ <s:Label text="tab1"/>
+
+</s:View>
http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/fb705158/maven-flex-plugin/examples/mobile/simple-air/src/main/flex/tabs/Tab2.mxml
----------------------------------------------------------------------
diff --git a/maven-flex-plugin/examples/mobile/simple-air/src/main/flex/tabs/Tab2.mxml b/maven-flex-plugin/examples/mobile/simple-air/src/main/flex/tabs/Tab2.mxml
new file mode 100644
index 0000000..e3a3783
--- /dev/null
+++ b/maven-flex-plugin/examples/mobile/simple-air/src/main/flex/tabs/Tab2.mxml
@@ -0,0 +1,24 @@
+<?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.
+
+-->
+<s:View xmlns:fx="http://ns.adobe.com/mxml/2009" xmlns:s="library://ns.adobe.com/flex/spark">
+
+ <s:Label text="tab2"/>
+
+</s:View>
http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/fb705158/maven-flex-plugin/examples/mobile/simple-air/src/main/resources/descriptor.xml
----------------------------------------------------------------------
diff --git a/maven-flex-plugin/examples/mobile/simple-air/src/main/resources/descriptor.xml b/maven-flex-plugin/examples/mobile/simple-air/src/main/resources/descriptor.xml
new file mode 100644
index 0000000..cdc220d
--- /dev/null
+++ b/maven-flex-plugin/examples/mobile/simple-air/src/main/resources/descriptor.xml
@@ -0,0 +1,297 @@
+<?xml version="1.0" encoding="utf-8" standalone="no"?>
+<application xmlns="http://ns.adobe.com/air/application/17.0">
+
+<!-- Adobe AIR Application Descriptor File Template.
+
+ Specifies parameters for identifying, installing, and launching AIR applications.
+
+ xmlns - The Adobe AIR namespace: http://ns.adobe.com/air/application/3.5
+ The last segment of the namespace specifies the version
+ of the AIR runtime required for this application to run.
+
+ minimumPatchLevel - The minimum patch level of the AIR runtime required to run
+ the application. Optional.
+-->
+
+ <!-- A universally unique application identifier. Must be unique across all AIR applications.
+ Using a reverse DNS-style name as the id is recommended. (Eg. com.example.ExampleApplication.) Required. -->
+ <id>SimpleAirMobile</id>
+
+ <!-- Used as the filename for the application. Required. -->
+ <filename>SimpleAirMobile</filename>
+
+ <!-- The name that is displayed in the AIR application installer.
+ May have multiple values for each language. See samples or xsd schema file. Optional. -->
+ <name>SimpleAirMobile</name>
+
+ <!-- A string value of the format <0-999>.<0-999>.<0-999> that represents application version which can be used to check for application upgrade.
+ Values can also be 1-part or 2-part. It is not necessary to have a 3-part value.
+ An updated version of application must have a versionNumber value higher than the previous version. Required for namespace >= 2.5 . -->
+ <versionNumber>1.0.0</versionNumber>
+
+ <!-- A string value (such as "v1", "2.5", or "Alpha 1") that represents the version of the application, as it should be shown to users. Optional. -->
+ <!-- <versionLabel></versionLabel> -->
+
+ <!-- Description, displayed in the AIR application installer.
+ May have multiple values for each language. See samples or xsd schema file. Optional. -->
+ <!-- <description></description> -->
+
+ <!-- Copyright information. Optional -->
+ <!-- <copyright></copyright> -->
+
+ <!-- Publisher ID. Used if you're updating an application created prior to 1.5.3 -->
+ <!-- <publisherID></publisherID> -->
+
+ <!-- Settings for the application's initial window. Required. -->
+ <initialWindow>
+ <!-- The main SWF or HTML file of the application. Required. -->
+ <!-- Note: In Flash Builder, the SWF reference is set automatically. -->
+ <content>${output}</content>
+
+ <!-- The title of the main window. Optional. -->
+ <!-- <title></title> -->
+
+ <!-- The type of system chrome to use (either "standard" or "none"). Optional. Default standard. -->
+ <!-- <systemChrome></systemChrome> -->
+
+ <!-- Whether the window is transparent. Only applicable when systemChrome is none. Optional. Default false. -->
+ <!-- <transparent></transparent> -->
+
+ <!-- Whether the window is initially visible. Optional. Default false. -->
+ <!-- <visible></visible> -->
+
+ <!-- Whether the user can minimize the window. Optional. Default true. -->
+ <!-- <minimizable></minimizable> -->
+
+ <!-- Whether the user can maximize the window. Optional. Default true. -->
+ <!-- <maximizable></maximizable> -->
+
+ <!-- Whether the user can resize the window. Optional. Default true. -->
+ <!-- <resizable></resizable> -->
+
+ <!-- The window's initial width in pixels. Optional. -->
+ <!-- <width></width> -->
+
+ <!-- The window's initial height in pixels. Optional. -->
+ <!-- <height></height> -->
+
+ <!-- The window's initial x position. Optional. -->
+ <!-- <x></x> -->
+
+ <!-- The window's initial y position. Optional. -->
+ <!-- <y></y> -->
+
+ <!-- The window's minimum size, specified as a width/height pair in pixels, such as "400 200". Optional. -->
+ <!-- <minSize></minSize> -->
+
+ <!-- The window's initial maximum size, specified as a width/height pair in pixels, such as "1600 1200". Optional. -->
+ <!-- <maxSize></maxSize> -->
+
+ <!-- The aspect ratio of the app ("portrait" or "landscape" or "any"). Optional. Mobile only. Default is the natural orientation of the device -->
+
+ <!-- <aspectRatio></aspectRatio> -->
+
+ <!-- Whether the app will begin auto-orienting on launch. Optional. Mobile only. Default false -->
+
+ <!-- <autoOrients></autoOrients> -->
+
+ <!-- Whether the app launches in full screen. Optional. Mobile only. Default false -->
+
+ <!-- <fullScreen></fullScreen> -->
+
+ <!-- The render mode for the app (either auto, cpu, gpu, or direct). Optional. Default auto -->
+
+ <!-- <renderMode></renderMode> -->
+
+ <!-- Whether the default direct mode rendering context allocates storage for depth and stencil buffers. Optional. Default false. -->
+ <!-- <depthAndStencil></depthAndStencil> -->
+
+ <!-- Whether or not to pan when a soft keyboard is raised or lowered (either "pan" or "none"). Optional. Defaults "pan." -->
+ <!-- <softKeyboardBehavior></softKeyboardBehavior> -->
+
+ <!-- Display Resolution for the app (either "standard" or "high"). Optional, OSX-only. Default "standard" -->
+ <!-- <requestedDisplayResolution></requestedDisplayResolution> -->
+ <autoOrients>true</autoOrients>
+ <fullScreen>false</fullScreen>
+ <visible>true</visible>
+ <softKeyboardBehavior>none</softKeyboardBehavior>
+ </initialWindow>
+
+ <!-- We recommend omitting the supportedProfiles element, -->
+ <!-- which in turn permits your application to be deployed to all -->
+ <!-- devices supported by AIR. If you wish to restrict deployment -->
+ <!-- (i.e., to only mobile devices) then add this element and list -->
+ <!-- only the profiles which your application does support. -->
+ <!-- <supportedProfiles>desktop extendedDesktop mobileDevice extendedMobileDevice</supportedProfiles> -->
+
+ <!-- Languages supported by application -->
+ <!-- Only these languages can be specified -->
+ <!-- <supportedLanguages>en de cs es fr it ja ko nl pl pt ru sv tr zh</supportedLanguages> -->
+
+ <!-- The subpath of the standard default installation location to use. Optional. -->
+ <!-- <installFolder></installFolder> -->
+
+ <!-- The subpath of the Programs menu to use. (Ignored on operating systems without a Programs menu.) Optional. -->
+ <!-- <programMenuFolder></programMenuFolder> -->
+
+ <!-- The icon the system uses for the application. For at least one resolution,
+ specify the path to a PNG file included in the AIR package. Optional. -->
+ <!-- <icon>
+ <image16x16></image16x16>
+ <image29x29></image29x29>
+ <image32x32></image32x32>
+ <image36x36></image36x36>
+ <image48x48></image48x48>
+ <image50x50></image50x50>
+ <image57x57></image57x57>
+ <image58x58></image58x58>
+ <image72x72></image72x72>
+ <image96x96></image96x96>
+ <image100x100></image100x100>
+ <image114x114></image114x114>
+ <image128x128></image128x128>
+ <image144x144></image144x144>
+ <image512x512></image512x512>
+ <image732x412></image732x412>
+ <image1024x1024></image1024x1024>
+ </icon> -->
+
+ <!-- Whether the application handles the update when a user double-clicks an update version
+ of the AIR file (true), or the default AIR application installer handles the update (false).
+ Optional. Default false. -->
+ <!-- <customUpdateUI></customUpdateUI> -->
+
+ <!-- Whether the application can be launched when the user clicks a link in a web browser.
+ Optional. Default false. -->
+ <!-- <allowBrowserInvocation></allowBrowserInvocation> -->
+
+ <!-- Listing of file types for which the application can register. Optional. -->
+ <!-- <fileTypes> -->
+
+ <!-- Defines one file type. Optional. -->
+ <!-- <fileType> -->
+
+ <!-- The name that the system displays for the registered file type. Required. -->
+ <!-- <name></name> -->
+
+ <!-- The extension to register. Required. -->
+ <!-- <extension></extension> -->
+
+ <!-- The description of the file type. Optional. -->
+ <!-- <description></description> -->
+
+ <!-- The MIME content type. -->
+ <!-- <contentType></contentType> -->
+
+ <!-- The icon to display for the file type. Optional. -->
+ <!-- <icon>
+ <image16x16></image16x16>
+ <image32x32></image32x32>
+ <image48x48></image48x48>
+ <image128x128></image128x128>
+ </icon> -->
+
+ <!-- </fileType> -->
+ <!-- </fileTypes> -->
+
+ <!-- iOS specific capabilities -->
+ <!-- <iPhone> -->
+ <!-- A list of plist key/value pairs to be added to the application Info.plist -->
+ <!-- <InfoAdditions>
+ <![CDATA[
+ <key>UIDeviceFamily</key>
+ <array>
+ <string>1</string>
+ <string>2</string>
+ </array>
+ <key>UIStatusBarStyle</key>
+ <string>UIStatusBarStyleBlackOpaque</string>
+ <key>UIRequiresPersistentWiFi</key>
+ <string>YES</string>
+ ]]>
+ </InfoAdditions> -->
+ <!-- A list of plist key/value pairs to be added to the application Entitlements.plist -->
+ <!-- <Entitlements>
+ <![CDATA[
+ <key>keychain-access-groups</key>
+ <array>
+ <string></string>
+ <string></string>
+ </array>
+ ]]>
+ </Entitlements> -->
+ <!-- Display Resolution for the app (either "standard" or "high"). Optional. Default "standard" -->
+ <!-- <requestedDisplayResolution></requestedDisplayResolution> -->
+ <!-- Forcing Render Mode CPU for the devices mentioned. Optional -->
+ <!-- <forceCPURenderModeForDevices></forceCPURenderModeForDevices> -->
+ <!-- File containing line separated list of external swf paths. These swfs won't be
+ packaged inside the application and corresponding stripped swfs will be output in
+ externalStrippedSwfs folder. -->
+ <!-- <externalSwfs></externalSwfs> -->
+ <!-- </iPhone> -->
+
+ <!-- Specify Android specific tags that get passed to AndroidManifest.xml file. -->
+ <!--<android> -->
+ <!-- <manifestAdditions>
+ <![CDATA[
+ <manifest android:installLocation="auto">
+ <uses-permission android:name="android.permission.INTERNET"/>
+ <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
+ <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>
+ <uses-feature android:required="true" android:name="android.hardware.touchscreen.multitouch"/>
+ <application android:enabled="true">
+ <activity android:excludeFromRecents="false">
+ <intent-filter>
+ <action android:name="android.intent.action.MAIN"/>
+ <category android:name="android.intent.category.LAUNCHER"/>
+ </intent-filter>
+ </activity>
+ </application>
+ </manifest>
+ ]]>
+ </manifestAdditions> -->
+ <!-- Color depth for the app (either "32bit" or "16bit"). Optional. Default 16bit before namespace 3.0, 32bit after -->
+ <!-- <colorDepth></colorDepth> -->
+ <!-- Indicates if the app contains video or not. Necessary for ordering of video planes with graphics plane, especially in Jellybean - if you app does video this must be set to true - valid values are true or false -->
+ <!-- <containsVideo></containsVideo> -->
+ <!-- </android> -->
+ <!-- End of the schema for adding the android specific tags in AndroidManifest.xml file -->
+
+ <android>
+ <colorDepth>16bit</colorDepth>
+ <manifestAdditions><![CDATA[
+ <manifest android:installLocation="auto">
+ <!--See the Adobe AIR documentation for more information about setting Google Android permissions-->
+ <!--Removing the permission android.permission.INTERNET will have the side effect
+ of preventing you from debugging your application on your device-->
+ <uses-permission android:name="android.permission.INTERNET"/>
+ <!--<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>-->
+ <!--<uses-permission android:name="android.permission.READ_PHONE_STATE"/>-->
+ <!--<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>-->
+ <!--The DISABLE_KEYGUARD and WAKE_LOCK permissions should be toggled together
+ in order to access AIR's SystemIdleMode APIs-->
+ <!--<uses-permission android:name="android.permission.DISABLE_KEYGUARD"/>-->
+ <!--<uses-permission android:name="android.permission.WAKE_LOCK"/>-->
+ <!--<uses-permission android:name="android.permission.CAMERA"/>-->
+ <!--<uses-permission android:name="android.permission.RECORD_AUDIO"/>-->
+ <!--The ACCESS_NETWORK_STATE and ACCESS_WIFI_STATE permissions should be toggled
+ together in order to use AIR's NetworkInfo APIs-->
+ <!--<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>-->
+ <!--<uses-permission android:name="android.permission.ACCESS_WIFI_STATE"/>-->
+ </manifest>
+
+ ]]></manifestAdditions>
+ </android>
+ <!--iPhone>
+ <InfoAdditions><![CDATA[
+ <key>UIDeviceFamily</key>
+ <array>
+ <string>1</string>
+ <string>2</string>
+ </array>
+ <key>UIApplicationExitsOnSuspend</key>
+ <true/>
+ ]]></InfoAdditions>
+ <requestedDisplayResolution>high</requestedDisplayResolution>
+ </iPhone-->
+</application>
http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/fb705158/maven-flex-plugin/examples/pom.xml
----------------------------------------------------------------------
diff --git a/maven-flex-plugin/examples/pom.xml b/maven-flex-plugin/examples/pom.xml
index 88af0ce..c8028bd 100644
--- a/maven-flex-plugin/examples/pom.xml
+++ b/maven-flex-plugin/examples/pom.xml
@@ -30,6 +30,7 @@
<modules>
<module>flexjs</module>
<module>i18n</module>
+ <module>mobile</module>
</modules>
<repositories>
[20/50] [abbrv] git commit: [flex-utilities]
[refs/heads/as3httpclient-work] - - Switched from VelocityTemplates to
Freemarker to avoid some anoying classloader problems in combination with
Maven. - Created a FlexEventSpy Maven core extension which liste
Posted by qu...@apache.org.
- Switched from VelocityTemplates to Freemarker to avoid some anoying classloader problems in combination with Maven.
- Created a FlexEventSpy Maven core extension which listens for resolution requests for Flex related resources and which kicks the converter in for missing parts.
Project: http://git-wip-us.apache.org/repos/asf/flex-utilities/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-utilities/commit/a1ac19f3
Tree: http://git-wip-us.apache.org/repos/asf/flex-utilities/tree/a1ac19f3
Diff: http://git-wip-us.apache.org/repos/asf/flex-utilities/diff/a1ac19f3
Branch: refs/heads/as3httpclient-work
Commit: a1ac19f3dda255e781f7c07b0da785a90dcc2a62
Parents: 1edd30b
Author: Christofer Dutz <ch...@codecentric.de>
Authored: Fri Apr 17 20:24:16 2015 +0200
Committer: Christofer Dutz <ch...@codecentric.de>
Committed: Fri Apr 17 20:24:16 2015 +0200
----------------------------------------------------------------------
mavenizer/converters/base/pom.xml | 6 +-
.../flex/utilities/converter/BaseConverter.java | 46 ++--
.../src/main/resources/templates/default.ftl | 41 ++++
.../src/main/resources/templates/default.vm | 41 ----
.../base/src/main/resources/templates/pom.ftl | 55 +++++
.../base/src/main/resources/templates/pom.vm | 55 -----
.../base/src/main/resources/velocity.properties | 29 ---
.../converter/mavenextension/FlexEventSpy.java | 225 ++++++++++++++++++
.../mavenextension/FlexSdkInitializer.java | 231 -------------------
9 files changed, 342 insertions(+), 387 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/a1ac19f3/mavenizer/converters/base/pom.xml
----------------------------------------------------------------------
diff --git a/mavenizer/converters/base/pom.xml b/mavenizer/converters/base/pom.xml
index e43226e..5a1b89c 100644
--- a/mavenizer/converters/base/pom.xml
+++ b/mavenizer/converters/base/pom.xml
@@ -42,9 +42,9 @@
<version>1.3.1</version>
</dependency>
<dependency>
- <groupId>org.apache.velocity</groupId>
- <artifactId>velocity</artifactId>
- <version>1.7</version>
+ <groupId>org.freemarker</groupId>
+ <artifactId>freemarker</artifactId>
+ <version>2.3.22</version>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/a1ac19f3/mavenizer/converters/base/src/main/java/org/apache/flex/utilities/converter/BaseConverter.java
----------------------------------------------------------------------
diff --git a/mavenizer/converters/base/src/main/java/org/apache/flex/utilities/converter/BaseConverter.java b/mavenizer/converters/base/src/main/java/org/apache/flex/utilities/converter/BaseConverter.java
index 3e1dbf7..5d904dd 100644
--- a/mavenizer/converters/base/src/main/java/org/apache/flex/utilities/converter/BaseConverter.java
+++ b/mavenizer/converters/base/src/main/java/org/apache/flex/utilities/converter/BaseConverter.java
@@ -19,10 +19,11 @@ package org.apache.flex.utilities.converter;
import com.sun.jersey.api.client.Client;
import com.sun.jersey.api.client.ClientResponse;
import com.sun.jersey.api.client.WebResource;
+import freemarker.template.Configuration;
+import freemarker.template.Template;
+import freemarker.template.TemplateExceptionHandler;
import org.apache.flex.utilities.converter.exceptions.ConverterException;
import org.apache.flex.utilities.converter.model.MavenArtifact;
-import org.apache.velocity.VelocityContext;
-import org.apache.velocity.app.VelocityEngine;
import org.codehaus.jettison.json.JSONArray;
import org.codehaus.jettison.json.JSONException;
import org.codehaus.jettison.json.JSONObject;
@@ -30,12 +31,12 @@ import org.codehaus.jettison.json.JSONTokener;
import java.io.*;
import java.math.BigInteger;
+import java.net.URL;
import java.security.MessageDigest;
import java.security.NoSuchAlgorithmException;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import java.util.Properties;
import java.util.zip.ZipEntry;
import java.util.zip.ZipOutputStream;
@@ -53,7 +54,7 @@ public abstract class BaseConverter {
protected File rootSourceDirectory;
protected File rootTargetDirectory;
- private VelocityEngine velocityEngine;
+ protected Configuration freemarkerConfig;
protected BaseConverter(File rootSourceDirectory, File rootTargetDirectory) throws ConverterException {
if(rootSourceDirectory == null) {
@@ -66,20 +67,10 @@ public abstract class BaseConverter {
this.rootSourceDirectory = rootSourceDirectory;
this.rootTargetDirectory = rootTargetDirectory;
- try {
- // Load some initial properties from the classpath.
- final Properties properties = new Properties();
- final InputStream propertyInputStream =
- getClass().getClassLoader().getResourceAsStream("velocity.properties");
- if(propertyInputStream != null) {
- properties.load(propertyInputStream);
- }
-
- // Instantiate the engine that will be used for every generation.
- velocityEngine = new VelocityEngine(properties);
- } catch (Exception e) {
- throw new ConverterException("Error initializing the velocity template engine.", e);
- }
+ this.freemarkerConfig = new Configuration(Configuration.VERSION_2_3_22);
+ this.freemarkerConfig.setDefaultEncoding("UTF-8");
+ this.freemarkerConfig.setTemplateExceptionHandler(TemplateExceptionHandler.RETHROW_HANDLER);
+ this.freemarkerConfig.setClassForTemplateLoading(this.getClass(), "/");
}
public void convert() throws ConverterException {
@@ -242,17 +233,16 @@ public abstract class BaseConverter {
protected void createPomDocument(final MavenArtifact metadata, File outputFile) throws ConverterException {
try {
// Build a context to hold the model
- final VelocityContext velocityContext = new VelocityContext();
- velocityContext.put("artifact", metadata);
+ Map freemarkerContext = new HashMap();
+ freemarkerContext.put("artifact", metadata);
// Try to get a template "templates/{type}.vm".
- final String templateName;
- if(velocityEngine.resourceExists("templates/" + metadata.getPackaging() + ".vm")) {
- templateName = "templates/" + metadata.getPackaging() + ".vm";
- } else if(velocityEngine.resourceExists("templates/default.vm")) {
- templateName = "templates/default.vm";
+ Template template;
+ URL check = this.getClass().getClassLoader().getResource("templates/" + metadata.getPackaging() + ".ftl");
+ if(check != null) {
+ template = freemarkerConfig.getTemplate("templates/" + metadata.getPackaging() + ".ftl");
} else {
- throw new ConverterException("No template found for generating pom output.");
+ template = freemarkerConfig.getTemplate("templates/default.ftl");
}
// Prepare an output stream to which the output can be generated.
@@ -266,8 +256,8 @@ public abstract class BaseConverter {
writer = new FileWriter(outputFile);
- // Have velocity generate the output for the template.
- velocityEngine.mergeTemplate(templateName, "utf-8", velocityContext, writer);
+ // Have Freemarker generate the output for the template.
+ template.process(freemarkerContext, writer);
} finally {
if(writer != null) {
writer.close();
http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/a1ac19f3/mavenizer/converters/base/src/main/resources/templates/default.ftl
----------------------------------------------------------------------
diff --git a/mavenizer/converters/base/src/main/resources/templates/default.ftl b/mavenizer/converters/base/src/main/resources/templates/default.ftl
new file mode 100644
index 0000000..e4a200b
--- /dev/null
+++ b/mavenizer/converters/base/src/main/resources/templates/default.ftl
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!--
+
+ 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 xmlns="http://maven.apache.org/POM/4.0.0">
+ <modelVersion>4.0.0</modelVersion>
+
+ <groupId>${artifact.groupId}</groupId>
+ <artifactId>${artifact.artifactId}</artifactId>
+ <version>${artifact.version}</version>
+ <packaging>${artifact.packaging}</packaging>
+
+<#if artifact.hasDependencies()>
+ <dependencies>
+<#list artifact.dependencies as dependency>
+ <dependency>
+ <groupId>${dependency.groupId}</groupId>
+ <artifactId>${dependency.artifactId}</artifactId>
+ <version>${dependency.version}</version>
+ <type>${dependency.packaging}</type>
+ </dependency>
+</#list>
+ </dependencies>
+</#if>
+
+</project>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/a1ac19f3/mavenizer/converters/base/src/main/resources/templates/default.vm
----------------------------------------------------------------------
diff --git a/mavenizer/converters/base/src/main/resources/templates/default.vm b/mavenizer/converters/base/src/main/resources/templates/default.vm
deleted file mode 100644
index 21b453f..0000000
--- a/mavenizer/converters/base/src/main/resources/templates/default.vm
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!--
-
- 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 xmlns="http://maven.apache.org/POM/4.0.0">
- <modelVersion>4.0.0</modelVersion>
-
- <groupId>${artifact.groupId}</groupId>
- <artifactId>${artifact.artifactId}</artifactId>
- <version>${artifact.version}</version>
- <packaging>${artifact.packaging}</packaging>
-
-#if ( $artifact.hasDependencies() )
- <dependencies>
-#foreach( $dependency in $artifact.dependencies )
- <dependency>
- <groupId>${dependency.groupId}</groupId>
- <artifactId>${dependency.artifactId}</artifactId>
- <version>${dependency.version}</version>
- <type>${dependency.packaging}</type>
- </dependency>
-#end
- </dependencies>
-#end
-
-</project>
http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/a1ac19f3/mavenizer/converters/base/src/main/resources/templates/pom.ftl
----------------------------------------------------------------------
diff --git a/mavenizer/converters/base/src/main/resources/templates/pom.ftl b/mavenizer/converters/base/src/main/resources/templates/pom.ftl
new file mode 100644
index 0000000..1242fb7
--- /dev/null
+++ b/mavenizer/converters/base/src/main/resources/templates/pom.ftl
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!--
+
+ 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 xmlns="http://maven.apache.org/POM/4.0.0">
+ <modelVersion>4.0.0</modelVersion>
+
+ <groupId>${artifact.groupId}</groupId>
+ <artifactId>${artifact.artifactId}</artifactId>
+ <version>${artifact.version}</version>
+ <packaging>${artifact.packaging}</packaging>
+
+<#if artifact.hasDependencies()>
+ <dependencies>
+<#list artifact.dependencies as dependency>
+ <dependency>
+ <groupId>${dependency.groupId}</groupId>
+ <artifactId>${dependency.artifactId}</artifactId>
+ <version>${dependency.version}</version>
+<#if dependency.packaging != "jar">
+ <type>${dependency.packaging}</type>
+</#if>
+ </dependency>
+</#list>
+ </dependencies>
+
+ <dependencyManagement>
+ <dependencies>
+<#list artifact.dependencies as dependency>
+ <dependency>
+ <groupId>${dependency.groupId}</groupId>
+ <artifactId>${dependency.artifactId}</artifactId>
+ <version>${dependency.version}</version>
+ </dependency>
+</#list>
+ </dependencies>
+ </dependencyManagement>
+</#if>
+
+</project>
http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/a1ac19f3/mavenizer/converters/base/src/main/resources/templates/pom.vm
----------------------------------------------------------------------
diff --git a/mavenizer/converters/base/src/main/resources/templates/pom.vm b/mavenizer/converters/base/src/main/resources/templates/pom.vm
deleted file mode 100644
index fc0016b..0000000
--- a/mavenizer/converters/base/src/main/resources/templates/pom.vm
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!--
-
- 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 xmlns="http://maven.apache.org/POM/4.0.0">
- <modelVersion>4.0.0</modelVersion>
-
- <groupId>${artifact.groupId}</groupId>
- <artifactId>${artifact.artifactId}</artifactId>
- <version>${artifact.version}</version>
- <packaging>${artifact.packaging}</packaging>
-
-#if ( $artifact.hasDependencies() )
- <dependencies>
-#foreach( $dependency in $artifact.dependencies )
- <dependency>
- <groupId>${dependency.groupId}</groupId>
- <artifactId>${dependency.artifactId}</artifactId>
- <version>${dependency.version}</version>
-#if ($dependency.packaging != "jar")
- <type>${dependency.packaging}</type>
-#end
- </dependency>
-#end
- </dependencies>
-
- <dependencyManagement>
- <dependencies>
-#foreach( $dependency in $artifact.dependencies )
- <dependency>
- <groupId>${dependency.groupId}</groupId>
- <artifactId>${dependency.artifactId}</artifactId>
- <version>${dependency.version}</version>
- </dependency>
-#end
- </dependencies>
- </dependencyManagement>
-#end
-
-</project>
http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/a1ac19f3/mavenizer/converters/base/src/main/resources/velocity.properties
----------------------------------------------------------------------
diff --git a/mavenizer/converters/base/src/main/resources/velocity.properties b/mavenizer/converters/base/src/main/resources/velocity.properties
deleted file mode 100644
index 905ad59..0000000
--- a/mavenizer/converters/base/src/main/resources/velocity.properties
+++ /dev/null
@@ -1,29 +0,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.
-##
-################################################################################
-
-#
-# specify three resource loaders to use
-#
-resource.loader = class
-
-#
-# for the loader we call 'class', use the ClasspathResourceLoader
-#
-class.resource.loader.description = Velocity Classpath Resource Loader
-class.resource.loader.class = org.apache.velocity.runtime.resource.loader.ClasspathResourceLoader
http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/a1ac19f3/mavenizer/maven-extension/src/main/java/org/apache/flex/utilities/converter/mavenextension/FlexEventSpy.java
----------------------------------------------------------------------
diff --git a/mavenizer/maven-extension/src/main/java/org/apache/flex/utilities/converter/mavenextension/FlexEventSpy.java b/mavenizer/maven-extension/src/main/java/org/apache/flex/utilities/converter/mavenextension/FlexEventSpy.java
new file mode 100644
index 0000000..b817beb
--- /dev/null
+++ b/mavenizer/maven-extension/src/main/java/org/apache/flex/utilities/converter/mavenextension/FlexEventSpy.java
@@ -0,0 +1,225 @@
+package org.apache.flex.utilities.converter.mavenextension;
+
+import org.apache.commons.io.FileUtils;
+import org.apache.flex.utilities.converter.air.AirConverter;
+import org.apache.flex.utilities.converter.flash.FlashConverter;
+import org.apache.flex.utilities.converter.flex.FlexConverter;
+import org.apache.flex.utilities.converter.fontkit.FontkitConverter;
+import org.apache.flex.utilities.converter.retrievers.download.DownloadRetriever;
+import org.apache.flex.utilities.converter.retrievers.types.SdkType;
+import org.apache.maven.MavenExecutionException;
+import org.apache.maven.artifact.resolver.ArtifactResolutionRequest;
+import org.apache.maven.artifact.resolver.ArtifactResolutionResult;
+import org.apache.maven.eventspy.AbstractEventSpy;
+import org.apache.maven.execution.MavenSession;
+import org.apache.maven.repository.RepositorySystem;
+import org.codehaus.plexus.PlexusContainer;
+import org.codehaus.plexus.logging.Logger;
+import org.eclipse.aether.RepositoryEvent;
+import org.eclipse.aether.artifact.Artifact;
+
+import javax.inject.Named;
+import javax.inject.Singleton;
+import java.io.File;
+
+/**
+ * Created by christoferdutz on 17.04.15.
+ */
+@Named
+@Singleton
+public class FlexEventSpy extends AbstractEventSpy {
+
+ protected Context context;
+ protected PlexusContainer plexusContainer;
+ protected RepositorySystem repositorySystem;
+ protected Logger logger;
+
+ protected boolean internalLookup = false;
+ protected boolean flexSplashScreenShown = false;
+
+ @Override
+ public void init(Context context) throws Exception {
+ this.context = context;
+ plexusContainer = (PlexusContainer) context.getData().get("plexus");
+ repositorySystem = plexusContainer.lookup(RepositorySystem.class);
+ logger = plexusContainer.lookup(Logger.class);
+ }
+
+ @Override
+ public void onEvent(Object o) throws Exception {
+ if(o instanceof RepositoryEvent) {
+ RepositoryEvent repositoryEvent = (RepositoryEvent) o;
+ if(repositoryEvent.getType() == RepositoryEvent.EventType.ARTIFACT_RESOLVING) {
+ if(!internalLookup) {
+ try {
+ internalLookup = true;
+ Artifact artifact = repositoryEvent.getArtifact();
+ MavenSession session = plexusContainer.lookup(MavenSession.class);
+ if (artifact.getGroupId().startsWith("org.apache.flex")) {
+ if(!flexSplashScreenShown) {
+ showFlexSplashScreen();
+ }
+ if(resolve(artifact.getGroupId(), artifact.getArtifactId(), artifact.getVersion(),
+ artifact.getExtension(), artifact.getClassifier(), session) == null) {
+ initFlex(artifact.getVersion());
+ }
+ } else if (artifact.getGroupId().startsWith("com.adobe.flash")) {
+ if(resolve(artifact.getGroupId(), artifact.getArtifactId(), artifact.getVersion(),
+ artifact.getExtension(), artifact.getClassifier(), session) == null) {
+ initFlash(artifact.getVersion());
+ }
+ } else if (artifact.getGroupId().startsWith("com.adobe.air")) {
+ if(resolve(artifact.getGroupId(), artifact.getArtifactId(), artifact.getVersion(),
+ artifact.getExtension(), artifact.getClassifier(), session) == null) {
+ initAir(artifact.getVersion());
+ }
+ } else if (artifact.getGroupId().equals("com.adobe") && artifact.getArtifactId().equals("fontkit")) {
+ if(resolve(artifact.getGroupId(), artifact.getArtifactId(), artifact.getVersion(),
+ artifact.getExtension(), artifact.getClassifier(), session) == null) {
+ initFontkit();
+ }
+ }
+ } finally {
+ internalLookup = false;
+ }
+ }
+ }
+ }
+ }
+
+ protected org.apache.maven.artifact.Artifact resolve(String groupId, String artifactId, String version,
+ String type, String classifier, MavenSession session) {
+ org.apache.maven.artifact.Artifact artifact;
+ if((classifier == null) || (classifier.length() == 0)) {
+ artifact = repositorySystem.createArtifact(groupId, artifactId, version, type);
+ } else {
+ artifact = repositorySystem.createArtifactWithClassifier(groupId, artifactId, version, type, classifier);
+ }
+ if (!artifact.isResolved()) {
+
+ ArtifactResolutionRequest req = new ArtifactResolutionRequest();
+ req.setArtifact(artifact);
+ req.setLocalRepository(session.getLocalRepository());
+ req.setRemoteRepositories(session.getRequest().getRemoteRepositories());
+ ArtifactResolutionResult res = repositorySystem.resolve(req);
+ if (!res.isSuccess()) {
+ return null;
+ }
+ }
+ return artifact;
+ }
+
+ protected void initFlex(String version) throws MavenExecutionException {
+ logger.info("===========================================================");
+ logger.info(" - Installing Apache Flex SDK " + version);
+ try {
+ MavenSession session = plexusContainer.lookup(MavenSession.class);
+ File localRepoBaseDir = new File(session.getLocalRepository().getBasedir());
+ DownloadRetriever downloadRetriever = new DownloadRetriever();
+ File sdkRoot = downloadRetriever.retrieve(SdkType.FLEX, version);
+
+ // In order to compile some of the themes, we need to download a
+ // playerglobal version.
+ logger.info("In order to convert the Apache Flex SDK, a Flash SDK has to be downloaded.");
+ File flashSdkRoot = downloadRetriever.retrieve(SdkType.FLASH, "10.2");
+ FileUtils.copyDirectory(flashSdkRoot, sdkRoot);
+
+ FlexConverter converter = new FlexConverter(sdkRoot, localRepoBaseDir);
+ converter.convert();
+ } catch (Exception ce) {
+ logger.error("Error", ce);
+ ce.printStackTrace();
+ throw new MavenExecutionException(
+ "Caught exception while downloading and converting artifact.", ce);
+ }
+ logger.info(" - Finished installing Apache Flex SDK " + version);
+ }
+
+ protected void initFlash(String version) throws MavenExecutionException {
+ logger.info("===========================================================");
+ logger.info(" - Installing Adobe Flash SDK " + version);
+ try {
+ MavenSession session = plexusContainer.lookup(MavenSession.class);
+ File localRepoBaseDir = new File(session.getLocalRepository().getBasedir());
+ DownloadRetriever downloadRetriever = new DownloadRetriever();
+ File sdkRoot = downloadRetriever.retrieve(SdkType.FLASH, version);
+ FlashConverter converter = new FlashConverter(sdkRoot, localRepoBaseDir);
+ converter.convert();
+ } catch (Exception ce) {
+ throw new MavenExecutionException(
+ "Caught exception while downloading and converting artifact.", ce);
+ }
+ logger.info(" - Finished installing Adobe Flash SDK " + version);
+ }
+
+ protected void initAir(String version) throws MavenExecutionException {
+ logger.info("===========================================================");
+ logger.info(" - Installing Adobe AIR SDK " + version);
+ try {
+ MavenSession session = plexusContainer.lookup(MavenSession.class);
+ File localRepoBaseDir = new File(session.getLocalRepository().getBasedir());
+ DownloadRetriever downloadRetriever = new DownloadRetriever();
+ File sdkRoot = downloadRetriever.retrieve(SdkType.AIR, version);
+ AirConverter converter = new AirConverter(sdkRoot, localRepoBaseDir);
+ converter.convert();
+ } catch (Exception ce) {
+ throw new MavenExecutionException(
+ "Caught exception while downloading and converting artifact.", ce);
+ }
+ logger.info(" - Finished installing Adobe AIR SDK " + version);
+ }
+
+ protected void initFontkit() throws MavenExecutionException {
+ logger.info("===========================================================");
+ logger.info(" - Installing Adobe Fontkit libraries");
+ try {
+ MavenSession session = plexusContainer.lookup(MavenSession.class);
+ File localRepoBaseDir = new File(session.getLocalRepository().getBasedir());
+ DownloadRetriever downloadRetriever = new DownloadRetriever();
+ File sdkRoot = downloadRetriever.retrieve(SdkType.FONTKIT);
+ FontkitConverter converter = new FontkitConverter(sdkRoot, localRepoBaseDir);
+ converter.convert();
+ } catch (Exception ce) {
+ throw new MavenExecutionException(
+ "Caught exception while downloading and converting artifact.", ce);
+ }
+ logger.info(" - Finished installing Adobe Fontkit libraries");
+ }
+
+
+ protected void showFlexSplashScreen() {
+ logger.info(" \n" +
+ " `,;':, :';;; \n" +
+ " `:;''';' `++'';;, \n" +
+ " :;'''++;' .+'+''';;;\n" +
+ " : ;'''++++'' ,';+++''';'\n" +
+ " ,. `, ,. ..: , `, `'''+++##;'', ;;'+#+++''''\n" +
+ " ; ; ; ;; ;`: :,: ; ; ;'+++; #;;;;;:::;;;;+ +++'':\n" +
+ " ; ; : ;; ;., : : ;. ;;++# ';;;;;;;;;;+ .+++; \n" +
+ " `;: :; `;: :;: , :;` +;+# ,;;;:::::;: ;#+', \n" +
+ " ;++++:'++ : ;+,; ++;# +;::::::; ,+;;: \n" +
+ " ++++++,'++ `++' +'''` ;::::::, +:;;: \n" +
+ " `+++. '++ ++++++ +++ +++ ''''' ;::::: :;;;; \n" +
+ " +++` '++ ++++++++ +++` `++: :'';;; ;::` ::::: \n" +
+ " +++ '++ +++' :++: +++ +++ ;;;;;' :::::: \n" +
+ " +++ '++ +++ ++' `+++++` ;;;;;;: .:::::` \n" +
+ " +++++++ '++ +++:::+++. +++++ ;;;;;;; ,::::: \n" +
+ " +++++++ '++ +++++++++ :+++' ;;;;;;; ,::::: \n" +
+ " +++''' '++ +++;;;:` +++++ ;;;;;;` ::::::. \n" +
+ " +++ '++ +++ +++ +++ ;;;;;: :::::: \n" +
+ " +++ :++. ++++ ` :++, ,++; ''';;. `..: ::::;` \n" +
+ " +++ ++' +++++++ +++ +++ :'''; ,,,,,: ;;;;; \n" +
+ " ;++` +++ ++++++ +++ +++ .+';+ :,,,,,,: `';;; \n" +
+ " ++' `+''' ::,,,,,::: ';;' \n" +
+ " :++ #;'' +:::,,,:::: .'':; \n" +
+ " ';;'' ::::::::::::' ,';;:.\n" +
+ " ;;;;''`;+;;::` .::;;'.,';;;;:\n" +
+ " `::;;;''':;; `;;;'';;;;;;\n" +
+ " :::;;;'';: ;;';;;;;:;\n" +
+ " ,:::;;;', ',;;;;::`\n" +
+ " .:::;:. ;:;;::: \n" +
+ " ::;, `,;;` \n");
+ flexSplashScreenShown = true;
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/a1ac19f3/mavenizer/maven-extension/src/main/java/org/apache/flex/utilities/converter/mavenextension/FlexSdkInitializer.java
----------------------------------------------------------------------
diff --git a/mavenizer/maven-extension/src/main/java/org/apache/flex/utilities/converter/mavenextension/FlexSdkInitializer.java b/mavenizer/maven-extension/src/main/java/org/apache/flex/utilities/converter/mavenextension/FlexSdkInitializer.java
deleted file mode 100644
index fecac35..0000000
--- a/mavenizer/maven-extension/src/main/java/org/apache/flex/utilities/converter/mavenextension/FlexSdkInitializer.java
+++ /dev/null
@@ -1,231 +0,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.
- */
-package org.apache.flex.utilities.converter.mavenextension;
-
-import org.apache.flex.utilities.converter.air.AirConverter;
-import org.apache.flex.utilities.converter.flash.FlashConverter;
-import org.apache.flex.utilities.converter.flex.FlexConverter;
-import org.apache.flex.utilities.converter.fontkit.FontkitConverter;
-import org.apache.flex.utilities.converter.retrievers.download.DownloadRetriever;
-import org.apache.flex.utilities.converter.retrievers.types.SdkType;
-import org.apache.maven.AbstractMavenLifecycleParticipant;
-import org.apache.maven.MavenExecutionException;
-import org.apache.maven.artifact.Artifact;
-import org.apache.maven.artifact.resolver.ArtifactResolutionRequest;
-import org.apache.maven.artifact.resolver.ArtifactResolutionResult;
-import org.apache.maven.execution.MavenSession;
-import org.apache.maven.repository.RepositorySystem;
-import org.codehaus.plexus.component.annotations.Component;
-import org.codehaus.plexus.component.annotations.Requirement;
-import org.codehaus.plexus.logging.Logger;
-
-import java.io.File;
-
-/**
- * Created by christoferdutz on 16.04.15.
- */
-@Component(role = AbstractMavenLifecycleParticipant.class, hint = "flex-sdk-initializer")
-public class FlexSdkInitializer extends AbstractMavenLifecycleParticipant {
-
- public static final String AIR_GROUP_ID = "com.adobe.air";
- public static final String FLASH_GROUP_ID = "com.adobe.flash";
- public static final String FLEX_GROUP_ID = "org.apache.flex";
- public static final String FONTKIT_GROUP_ID = "com.adobe";
-
- public static final String FRAMEWORK = "framework";
- public static final String COMPILER = "compiler";
- public static final String FONTKIT = "fontkit";
-
- public static final String POM = "pom";
- public static final String JAR = "jar";
-
- @Requirement
- protected Logger logger;
-
- @Requirement
- private RepositorySystem repositorySystem;
-
- @Override
- public void afterProjectsRead(MavenSession session) throws MavenExecutionException {
- super.afterProjectsRead(session);
-
- // Get the maven local repo directory.
- File mavenLocalRepoDir = new File(session.getLocalRepository().getBasedir());
-
- logger.info(" \n" +
- " `,;':, :';;; \n" +
- " `:;''';' `++'';;, \n" +
- " :;'''++;' .+'+''';;;\n" +
- " : ;'''++++'' ,';+++''';'\n" +
- " ,. `, ,. ..: , `, `'''+++##;'', ;;'+#+++''''\n" +
- " ; ; ; ;; ;`: :,: ; ; ;'+++; #;;;;;:::;;;;+ +++'':\n" +
- " ; ; : ;; ;., : : ;. ;;++# ';;;;;;;;;;+ .+++; \n" +
- " `;: :; `;: :;: , :;` +;+# ,;;;:::::;: ;#+', \n" +
- " ;++++:'++ : ;+,; ++;# +;::::::; ,+;;: \n" +
- " ++++++,'++ `++' +'''` ;::::::, +:;;: \n" +
- "`+++. '++ ++++++ +++ +++ ''''' ;::::: :;;;; \n" +
- "+++` '++ ++++++++ +++` `++: :'';;; ;::` ::::: \n" +
- "+++ '++ +++' :++: +++ +++ ;;;;;' :::::: \n" +
- "+++ '++ +++ ++' `+++++` ;;;;;;: .:::::` \n" +
- "+++++++ '++ +++:::+++. +++++ ;;;;;;; ,::::: \n" +
- "+++++++ '++ +++++++++ :+++' ;;;;;;; ,::::: \n" +
- "+++''' '++ +++;;;:` +++++ ;;;;;;` ::::::. \n" +
- "+++ '++ +++ +++ +++ ;;;;;: :::::: \n" +
- "+++ :++. ++++ ` :++, ,++; ''';;. `..: ::::;` \n" +
- "+++ ++' +++++++ +++ +++ :'''; ,,,,,: ;;;;; \n" +
- ";++` +++ ++++++ +++ +++ .+';+ :,,,,,,: `';;; \n" +
- " ++' `+''' ::,,,,,::: ';;' \n" +
- " :++ #;'' +:::,,,:::: .'':; \n" +
- " ';;'' ::::::::::::' ,';;:.\n" +
- " ;;;;''`;+;;::` .::;;'.,';;;;:\n" +
- " `::;;;''':;; `;;;'';;;;;;\n" +
- " :::;;;'';: ;;';;;;;:;\n" +
- " ,:::;;;', ',;;;;::`\n" +
- " .:::;:. ;:;;::: \n" +
- " ::;, `,;;` \n");
-
- logger.info("-------------------------------------------------------------------");
- logger.info("- Intializing Apache Flex related resources");
- logger.info("-------------------------------------------------------------------");
- String flexVersion = session.getCurrentProject().getProperties().getProperty("flex.sdk.version", null);
- String flashVersion = session.getCurrentProject().getProperties().getProperty("flash.sdk.version", null);
- String airVersion = session.getCurrentProject().getProperties().getProperty("air.sdk.version", null);
- boolean useFontkit = Boolean.valueOf(
- session.getCurrentProject().getProperties().getProperty("flex.fontkit", "false"));
-
- if (flexVersion != null) {
- logger.info("flex.sdk.version = " + flexVersion);
- Artifact flexFramework = resolve(FLEX_GROUP_ID, FRAMEWORK, flexVersion, POM, session);;
- Artifact flexCompiler = resolve(FLEX_GROUP_ID, COMPILER, flexVersion, POM, session);
-
- if (flexFramework == null || flexCompiler == null) {
- logger.info(" - Installing");
- // Use the Mavenizer to download and install the fex artifacts.
- try {
- DownloadRetriever downloadRetriever = new DownloadRetriever();
- File flexSdkRoot = downloadRetriever.retrieve(SdkType.FLEX, flexVersion);
- FlexConverter flexConverter = new FlexConverter(flexSdkRoot, mavenLocalRepoDir);
- flexConverter.convert();
- } catch (Exception ce) {
- throw new MavenExecutionException(
- "Caught exception while downloading and converting artifact.", ce);
- }
- } else {
- logger.info(" - OK");
- }
- } else {
- logger.info("flex.sdk.version = not set");
- }
-
- logger.info("-------------------------------------------------------------------");
-
- if (flashVersion != null) {
- logger.info("flash.sdk.version = " + flashVersion);
- Artifact flashFramework = resolve(FLASH_GROUP_ID, FRAMEWORK, flashVersion, POM, session);
-
- if (flashFramework == null) {
- logger.info(" - Installing");
- // Use the Mavenizer to download and install the playerglobal artifact.
- try {
- DownloadRetriever downloadRetriever = new DownloadRetriever();
- File flashSdkRoot = downloadRetriever.retrieve(SdkType.FLASH, flashVersion);
- FlashConverter flashConverter = new FlashConverter(flashSdkRoot, mavenLocalRepoDir);
- flashConverter.convert();
- } catch (Exception ce) {
- throw new MavenExecutionException(
- "Caught exception while downloading and converting artifact.", ce);
- }
- } else {
- logger.info(" - OK");
- }
- } else {
- logger.info("flash.sdk.version = not set");
- }
-
- logger.info("-------------------------------------------------------------------");
-
- if (airVersion != null) {
- logger.info("air.sdk.version = " + airVersion);
- Artifact airFramework = resolve(AIR_GROUP_ID, FRAMEWORK, flexVersion, POM, session);
- Artifact airCompiler = resolve(AIR_GROUP_ID, COMPILER, flexVersion, POM, session);
-
- if (airFramework == null || airCompiler == null) {
- logger.info(" - Installing");
- // Use the Mavenizer to download and install the airglobal artifact.
- try {
- DownloadRetriever downloadRetriever = new DownloadRetriever();
- File airSdkRoot = downloadRetriever.retrieve(SdkType.AIR, airVersion);
- AirConverter airConverter = new AirConverter(airSdkRoot, mavenLocalRepoDir);
- airConverter.convert();
- } catch (Exception ce) {
- throw new MavenExecutionException(
- "Caught exception while downloading and converting artifact.", ce);
- }
- } else {
- logger.info(" - OK");
- }
- } else {
- logger.info("air.sdk.version = not set");
- }
-
- logger.info("-------------------------------------------------------------------");
-
- if (useFontkit) {
- logger.info("flex.fontkit = true");
- Artifact fontkit = resolve(FONTKIT_GROUP_ID, FONTKIT, "1.0", JAR, session);
-
- if (fontkit == null) {
- logger.info(" - Installing");
- // Use the Mavenizer to download and install the airglobal artifact.
- try {
- DownloadRetriever downloadRetriever = new DownloadRetriever();
- File fontkitRoot = downloadRetriever.retrieve(SdkType.FONTKIT);
- FontkitConverter fontkitConverter = new FontkitConverter(fontkitRoot, mavenLocalRepoDir);
- fontkitConverter.convert();
- } catch (Exception ce) {
- throw new MavenExecutionException(
- "Caught exception while downloading and converting artifact.", ce);
- }
- } else {
- logger.info(" - OK");
- }
- } else {
- logger.info("flex.fontkit = not set or set to 'false'");
- }
-
- logger.info("-------------------------------------------------------------------");
- logger.info("- Finished initializing Apache Flex related resources");
- logger.info("-------------------------------------------------------------------");
- }
-
- public Artifact resolve(String groupId, String artifactId, String version, String type, MavenSession session) {
- Artifact artifact =
- repositorySystem.createArtifact(groupId, artifactId, version, type);
- if (!artifact.isResolved()) {
- ArtifactResolutionRequest req = new ArtifactResolutionRequest();
- req.setArtifact(artifact);
- req.setLocalRepository(session.getLocalRepository());
- req.setRemoteRepositories(session.getRequest().getRemoteRepositories());
- ArtifactResolutionResult res = repositorySystem.resolve(req);
- if (!res.isSuccess()) {
- return null;
- }
- }
- return artifact;
- }
-
-}
[17/50] [abbrv] git commit: [flex-utilities]
[refs/heads/as3httpclient-work] - - Made the fontkit converter not to throw
an exception if the 'optional' directory doesn't exist
Posted by qu...@apache.org.
- Made the fontkit converter not to throw an exception if the 'optional' directory doesn't exist
Project: http://git-wip-us.apache.org/repos/asf/flex-utilities/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-utilities/commit/16976268
Tree: http://git-wip-us.apache.org/repos/asf/flex-utilities/tree/16976268
Diff: http://git-wip-us.apache.org/repos/asf/flex-utilities/diff/16976268
Branch: refs/heads/as3httpclient-work
Commit: 16976268d19ee4250ade795cdc75459ea6604f0e
Parents: 9804635
Author: Christofer Dutz <ch...@codecentric.de>
Authored: Sat Apr 11 12:26:34 2015 +0200
Committer: Christofer Dutz <ch...@codecentric.de>
Committed: Sat Apr 11 12:26:34 2015 +0200
----------------------------------------------------------------------
.../apache/flex/utilities/converter/fontkit/FontkitConverter.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/16976268/mavenizer/converters/fontkit/src/main/java/org/apache/flex/utilities/converter/fontkit/FontkitConverter.java
----------------------------------------------------------------------
diff --git a/mavenizer/converters/fontkit/src/main/java/org/apache/flex/utilities/converter/fontkit/FontkitConverter.java b/mavenizer/converters/fontkit/src/main/java/org/apache/flex/utilities/converter/fontkit/FontkitConverter.java
index e222db5..81fbe09 100644
--- a/mavenizer/converters/fontkit/src/main/java/org/apache/flex/utilities/converter/fontkit/FontkitConverter.java
+++ b/mavenizer/converters/fontkit/src/main/java/org/apache/flex/utilities/converter/fontkit/FontkitConverter.java
@@ -20,7 +20,8 @@ public class FontkitConverter extends BaseConverter implements Converter {
protected void processDirectory() throws ConverterException {
File fontkitRootDir = new File(rootSourceDirectory, "lib/external/optional");
if(!fontkitRootDir.exists() || !fontkitRootDir.isDirectory()) {
- throw new ConverterException("Fontkit directory '" + fontkitRootDir.getPath() + "' is invalid.");
+ System.out.println("Skipping Fontkit generation.");
+ return;
}
File afeJar = new File(fontkitRootDir, "afe.jar");
[14/50] [abbrv] git commit: [flex-utilities]
[refs/heads/as3httpclient-work] - - Fixed the handling of the "help" command.
Posted by qu...@apache.org.
- Fixed the handling of the "help" command.
Project: http://git-wip-us.apache.org/repos/asf/flex-utilities/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-utilities/commit/a7e26306
Tree: http://git-wip-us.apache.org/repos/asf/flex-utilities/tree/a7e26306
Diff: http://git-wip-us.apache.org/repos/asf/flex-utilities/diff/a7e26306
Branch: refs/heads/as3httpclient-work
Commit: a7e263066851a812e2c2cb705592ac5483faff57
Parents: 55f0ba1
Author: Christofer Dutz <ch...@codecentric.de>
Authored: Sat Apr 11 09:43:39 2015 +0200
Committer: Christofer Dutz <ch...@codecentric.de>
Committed: Sat Apr 11 09:43:39 2015 +0200
----------------------------------------------------------------------
.../flex/utilities/converter/core/SdkConverterCLI.java | 9 +++------
1 file changed, 3 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/a7e26306/mavenizer/cli/src/main/java/org/apache/flex/utilities/converter/core/SdkConverterCLI.java
----------------------------------------------------------------------
diff --git a/mavenizer/cli/src/main/java/org/apache/flex/utilities/converter/core/SdkConverterCLI.java b/mavenizer/cli/src/main/java/org/apache/flex/utilities/converter/core/SdkConverterCLI.java
index 0f088e6..56d5f1f 100644
--- a/mavenizer/cli/src/main/java/org/apache/flex/utilities/converter/core/SdkConverterCLI.java
+++ b/mavenizer/cli/src/main/java/org/apache/flex/utilities/converter/core/SdkConverterCLI.java
@@ -22,6 +22,7 @@ import java.util.*;
*/
public class SdkConverterCLI {
+ public static final String COMMAND_HELP = "help";
public static final String COMMAND_LIST = "list";
public static final String COMMAND_DOWNLOAD = "download";
public static final String COMMAND_CONVERT = "convert";
@@ -106,8 +107,9 @@ public class SdkConverterCLI {
CommandLineParser parser = new BasicParser();
try {
CommandLine cmd = parser.parse(options, args);
- if(cmd.getArgList().isEmpty() || cmd.getArgList().contains("help")) {
+ if(cmd.getArgList().isEmpty() || cmd.getArgList().contains(COMMAND_HELP)) {
printHelp(options);
+ System.exit(0);
}
// Find out the desired platform(s).
@@ -190,11 +192,6 @@ public class SdkConverterCLI {
// Exectute operations
////////////////////////////////////////////////////////////////////////////
- // Print the help screen.
- if(cmd.getArgList().contains("help")) {
- printHelp(options);
- }
-
// Output a list of all available downloads.
if(cmd.getArgList().contains(COMMAND_LIST)) {
System.out.println("-----------------------------------------------");
[42/50] [abbrv] git commit: [flex-utilities]
[refs/heads/as3httpclient-work] - FLEX-34823: Improve error handling for bad
data lines.
Posted by qu...@apache.org.
FLEX-34823: Improve error handling for bad data lines.
Report the file and line number if a line in the data file is malformed.
This can happen when the server is not shut down and therefore does not
flush its data to disk.
Project: http://git-wip-us.apache.org/repos/asf/flex-utilities/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-utilities/commit/681f0273
Tree: http://git-wip-us.apache.org/repos/asf/flex-utilities/tree/681f0273
Diff: http://git-wip-us.apache.org/repos/asf/flex-utilities/diff/681f0273
Branch: refs/heads/as3httpclient-work
Commit: 681f027363be1a2002149135569f4dc5a02da178
Parents: b145b02
Author: dloverin <da...@gmail.com>
Authored: Sun Apr 26 18:29:56 2015 -0400
Committer: dloverin <da...@gmail.com>
Committed: Sat May 9 11:03:16 2015 -0400
----------------------------------------------------------------------
.../flex/tools/codecoverage/reporter/CodeCoverageReporter.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/681f0273/CodeCoverage/JavaServer/java/src/org/apache/flex/tools/codecoverage/reporter/CodeCoverageReporter.java
----------------------------------------------------------------------
diff --git a/CodeCoverage/JavaServer/java/src/org/apache/flex/tools/codecoverage/reporter/CodeCoverageReporter.java b/CodeCoverage/JavaServer/java/src/org/apache/flex/tools/codecoverage/reporter/CodeCoverageReporter.java
index 9a4bb0e..7c0d868 100755
--- a/CodeCoverage/JavaServer/java/src/org/apache/flex/tools/codecoverage/reporter/CodeCoverageReporter.java
+++ b/CodeCoverage/JavaServer/java/src/org/apache/flex/tools/codecoverage/reporter/CodeCoverageReporter.java
@@ -454,9 +454,9 @@ public class CodeCoverageReporter
{
// "id,linenum"
// Split line and record linenum as a hit.
- if (firstChar >= '0' && firstChar <= '9')
+ String[] results = inLine.split(",");
+ if (results.length == 2 && firstChar >= '0' && firstChar <= '9')
{
- String[] results = inLine.split(",");
String file = stringPool.get(Integer.valueOf(results[0]));
int hitLineNumber = Integer.valueOf(results[1]);
coverageData.setLineExecuted(file, hitLineNumber);
@@ -464,7 +464,7 @@ public class CodeCoverageReporter
}
else
{
- System.err.println("Warning: line " + inLineNumber + ": unrecognized data, " + inLine);
+ System.err.println("Warning: file " + inFile.getAbsolutePath() + ", line " + inLineNumber + ": unrecognized data, " + inLine);
}
}
}
[37/50] [abbrv] git commit: [flex-utilities]
[refs/heads/as3httpclient-work] - - Fine tuned the example a little
Posted by qu...@apache.org.
- Fine tuned the example a little
Project: http://git-wip-us.apache.org/repos/asf/flex-utilities/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-utilities/commit/246511db
Tree: http://git-wip-us.apache.org/repos/asf/flex-utilities/tree/246511db
Diff: http://git-wip-us.apache.org/repos/asf/flex-utilities/diff/246511db
Branch: refs/heads/as3httpclient-work
Commit: 246511db5c328a2805366abfe5151a43b8c7b357
Parents: f894512
Author: Christofer Dutz <ch...@codecentric.de>
Authored: Sat Apr 25 16:19:46 2015 +0200
Committer: Christofer Dutz <ch...@codecentric.de>
Committed: Sat Apr 25 16:19:46 2015 +0200
----------------------------------------------------------------------
maven-flex-plugin/examples/i18n/locale-chains/swf/pom.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/246511db/maven-flex-plugin/examples/i18n/locale-chains/swf/pom.xml
----------------------------------------------------------------------
diff --git a/maven-flex-plugin/examples/i18n/locale-chains/swf/pom.xml b/maven-flex-plugin/examples/i18n/locale-chains/swf/pom.xml
index e8630d6..6d71468 100644
--- a/maven-flex-plugin/examples/i18n/locale-chains/swf/pom.xml
+++ b/maven-flex-plugin/examples/i18n/locale-chains/swf/pom.xml
@@ -45,8 +45,8 @@
<localesCompiled>
<locale>en_US</locale>
<locale>en_GB,en_US</locale>
- <locale>de_DE,en_US</locale>
- <locale>de_AT,de_DE,en_US</locale>
+ <locale>de_DE</locale>
+ <locale>de_AT,de_DE</locale>
</localesCompiled>
</configuration>
<dependencies>
[13/50] [abbrv] git commit: [flex-utilities]
[refs/heads/as3httpclient-work] - minor fixup
Posted by qu...@apache.org.
minor fixup
Project: http://git-wip-us.apache.org/repos/asf/flex-utilities/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-utilities/commit/618ae2c7
Tree: http://git-wip-us.apache.org/repos/asf/flex-utilities/tree/618ae2c7
Diff: http://git-wip-us.apache.org/repos/asf/flex-utilities/diff/618ae2c7
Branch: refs/heads/as3httpclient-work
Commit: 618ae2c7c1a5ddb742d160ad80dbfe3eb3fb6b81
Parents: 1c9c95d
Author: Alex Harui <ah...@apache.org>
Authored: Fri Apr 10 10:07:07 2015 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Fri Apr 10 10:07:07 2015 -0700
----------------------------------------------------------------------
mavenizer/README.txt | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/618ae2c7/mavenizer/README.txt
----------------------------------------------------------------------
diff --git a/mavenizer/README.txt b/mavenizer/README.txt
index d76b980..9707141 100644
--- a/mavenizer/README.txt
+++ b/mavenizer/README.txt
@@ -152,12 +152,12 @@ Some typical usage scenarios
- Download and create an FDK (Flex 4.14.1 with playerglobal 17.0 and 16.0
AIR SDK 17.0 for Windows and Mac and the fontkit libs):
- "... -fdkDir <FDK target dir> -flexVersion 4.14.1 -flashVersion 17.0,16.0 \
+ "... -fdkDir <FDK target dir> -flexVersion 4.14.1 -flashVersions 17.0,16.0 \
-airVersion 17.0 -platform WINDOWS,MAC -fontkit download"
- Download and convert an FDK (FDK assembled in temp directory using Air for
current systems platform only):
- "... -flexVersion 4.14.1 -flashVersion 17.0 -airVersion 17.0 -fontkit \
+ "... -flexVersion 4.14.1 -flashVersions 17.0 -airVersion 17.0 -fontkit \
-mavenDir <maven local repo> download convert"
- Deploy a bunch of maven artifacts to a remote maven repository:
@@ -165,7 +165,7 @@ Some typical usage scenarios
-repoUsername <username> -repoPassword <pasword> deploy"
- "The works" (TM): Download, Convert and Deploy using only temp directories:
- "... -flexVersion 4.14.1 -flashVersion 17.0 -airVersion 17.0 -fontkit \
+ "... -flexVersion 4.14.1 -flashVersions 17.0 -airVersion 17.0 -fontkit \
-repoUrl <url> -repoUsername <username> -repoPassword <pasword> \
download convert deploy"
[09/50] [abbrv] git commit: [flex-utilities]
[refs/heads/as3httpclient-work] - FLEX-34756 Adding a unit test that
reproduces the bug, and its supporting files.
Posted by qu...@apache.org.
FLEX-34756 Adding a unit test that reproduces the bug, and its supporting files.
Project: http://git-wip-us.apache.org/repos/asf/flex-utilities/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-utilities/commit/daf48a05
Tree: http://git-wip-us.apache.org/repos/asf/flex-utilities/tree/daf48a05
Diff: http://git-wip-us.apache.org/repos/asf/flex-utilities/diff/daf48a05
Branch: refs/heads/as3httpclient-work
Commit: daf48a05bc064dd7e3cb60a3dfe303e0d50dbe9f
Parents: 718d5a3
Author: Mihai Chira <mi...@apache.org>
Authored: Fri Apr 10 14:23:39 2015 +0200
Committer: Mihai Chira <mi...@apache.org>
Committed: Fri Apr 10 14:23:39 2015 +0200
----------------------------------------------------------------------
.../linguistics/spelling/FLEX_34756_Test.as | 160 +
.../linguistics/spelling/SpellingConfig.xml | 7 +
.../spelling/dictionaries/en_GB/en_GB.aff | 1150 +
.../spelling/dictionaries/en_GB/en_GB.dic | 46281 +++++++++++++++++
4 files changed, 47598 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/daf48a05/Squiggly/main/SpellingUIEx/tests/com/adobe/linguistics/spelling/FLEX_34756_Test.as
----------------------------------------------------------------------
diff --git a/Squiggly/main/SpellingUIEx/tests/com/adobe/linguistics/spelling/FLEX_34756_Test.as b/Squiggly/main/SpellingUIEx/tests/com/adobe/linguistics/spelling/FLEX_34756_Test.as
new file mode 100644
index 0000000..dcb074f
--- /dev/null
+++ b/Squiggly/main/SpellingUIEx/tests/com/adobe/linguistics/spelling/FLEX_34756_Test.as
@@ -0,0 +1,160 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+// 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.
+//
+////////////////////////////////////////////////////////////////////////////////
+
+package com.adobe.linguistics.spelling {
+ import com.adobe.linguistics.spelling.SpellUI;
+ import com.adobe.linguistics.spelling.framework.SpellingService;
+ import com.adobe.linguistics.spelling.framework.ui.IHighlighter;
+
+ import flash.events.Event;
+ import flash.events.IEventDispatcher;
+
+ import flashx.textLayout.edit.EditManager;
+ import flashx.textLayout.elements.FlowElement;
+ import flashx.textLayout.elements.ParagraphElement;
+ import flashx.textLayout.elements.SpanElement;
+
+ import mockolate.nice;
+ import mockolate.prepare;
+ import mockolate.received;
+ import mockolate.stub;
+
+ import org.flexunit.assertThat;
+ import org.flexunit.asserts.assertTrue;
+ import org.flexunit.async.Async;
+ import org.fluint.uiImpersonation.UIImpersonator;
+
+ import spark.components.RichEditableText;
+
+ public class FLEX_34756_Test {
+ private static var _textField:RichEditableText;
+ private static var _sut:SpellUI;
+ private static const TEXT_WITH_SPELLING_ERROR:String = "helloo";
+ private static const DICT:String = "en_GB";
+
+ [Before(async, timeout=5000)]
+ public function setUp():void
+ {
+ _textField = new RichEditableText();
+ UIImpersonator.addChild(_textField);
+ _textField.text = TEXT_WITH_SPELLING_ERROR;
+
+ var mockolateDispatcher:IEventDispatcher = prepare(IHighlighter, SpellingService);
+ mockolateDispatcher.addEventListener(Event.COMPLETE, Async.asyncHandler(this, onSetUpComplete, 5000, null, null));
+ }
+
+ private static function onSetUpComplete(event:Event, passThroughData:Object):void
+ {
+ SpellUIForTest.sparkHighlighter = nice(IHighlighter);
+ SpellUIForTest.spellingService = nice(SpellingService, "spellingService", [DICT]);
+
+ _sut = new SpellUIForTest(_textField, DICT);
+ }
+
+ [After]
+ public function tearDown():void
+ {
+ UIImpersonator.removeAllChildren();
+ _textField = null;
+ _sut = null;
+ }
+
+ [Test(async, timeout=2500)]
+ public function make_sure_it_doesnt_run_a_spelling_job_on_damaged_text_flow():void
+ {
+ //when
+ stub(SpellUIForTest.spellingService).method("init").dispatches(new Event(Event.COMPLETE));
+ SpellUI.enableSpelling(_textField, "en_GB");
+ SpellUIForTest.eventDispatcher.addEventListener(Event.COMPLETE, Async.asyncHandler(this, onDictionaryLoadComplete, 1500, null, null));
+ }
+
+ private function onDictionaryLoadComplete(event:Event, passThroughData:Object):void
+ {
+ //given
+ damageTextFlow();
+
+ //when
+ _sut.doSpellingJob();
+
+ //then
+ //doSpellingJob() is also called once after the dictionary finishes loading, hence 'atMost(1)' below
+ assertThat(SpellUIForTest.sparkHighlighter, received().method("clearSquiggles").atMost(1));
+ assertThat(SpellUIForTest.spellingService, received().method("checkWord").never());
+ }
+
+ private function damageTextFlow():void
+ {
+ var editManager:EditManager = _textField.textFlow.interactionManager as EditManager;
+ var firstLine:FlowElement = editManager.textFlow.findLeaf(0);
+ var paragraph:ParagraphElement = firstLine.getParagraph();
+ var span:SpanElement = new SpanElement();
+ span.text = " � ";
+ paragraph.addChildAt(0, span);
+
+ assertTrue(_textField.textFlow.flowComposer.isDamaged(_textField.textFlow.textLength));
+ }
+ }
+}
+
+import com.adobe.linguistics.spelling.SpellUI;
+import com.adobe.linguistics.spelling.framework.SpellingService;
+import com.adobe.linguistics.spelling.framework.ui.HaloHighlighter;
+import com.adobe.linguistics.spelling.framework.ui.IHighlighter;
+
+import flash.events.Event;
+import flash.events.EventDispatcher;
+import flash.events.IEventDispatcher;
+import flash.events.TimerEvent;
+import flash.utils.Timer;
+
+class SpellUIForTest extends SpellUI
+{
+ public static var sparkHighlighter:IHighlighter;
+ public static var spellingService:SpellingService;
+ public static var eventDispatcher:IEventDispatcher = new EventDispatcher();
+ private static var _timer:Timer = new Timer(100, 1);
+
+ public function SpellUIForTest(textModel:*, lang:String)
+ {
+ _timer.addEventListener(TimerEvent.TIMER_COMPLETE, onTimer);
+ super(textModel, lang);
+ }
+
+ private function onTimer(event:TimerEvent):void
+ {
+ eventDispatcher.dispatchEvent(new Event(Event.COMPLETE));
+ }
+
+ override protected function createHighlighter(isHaloComoponent:Boolean, parent:*):IHighlighter
+ {
+ //we're not dispatching the complete event just yet because this function is called before
+ //some extra processing is done after the dictionary is loaded. See SpellUI.addContextMenu()
+ _timer.stop();
+ _timer.reset();
+ _timer.start();
+
+ return isHaloComoponent ? new HaloHighlighter(parent) : sparkHighlighter;
+ }
+
+ override protected function createSpellingService(dictionaryName:String):SpellingService
+ {
+ return spellingService;
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/daf48a05/Squiggly/main/SpellingUIEx/tests/com/adobe/linguistics/spelling/SpellingConfig.xml
----------------------------------------------------------------------
diff --git a/Squiggly/main/SpellingUIEx/tests/com/adobe/linguistics/spelling/SpellingConfig.xml b/Squiggly/main/SpellingUIEx/tests/com/adobe/linguistics/spelling/SpellingConfig.xml
new file mode 100644
index 0000000..64ac97d
--- /dev/null
+++ b/Squiggly/main/SpellingUIEx/tests/com/adobe/linguistics/spelling/SpellingConfig.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding='UTF-8'?>
+<SpellingConfig>
+ <LanguageResource language="English GB"
+ languageCode="en_GB"
+ ruleFile="dictionaries/en_GB/en_GB.aff"
+ dictionaryFile="dictionaries/en_GB/en_GB.dic"/>
+</SpellingConfig>
http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/daf48a05/Squiggly/main/SpellingUIEx/tests/com/adobe/linguistics/spelling/dictionaries/en_GB/en_GB.aff
----------------------------------------------------------------------
diff --git a/Squiggly/main/SpellingUIEx/tests/com/adobe/linguistics/spelling/dictionaries/en_GB/en_GB.aff b/Squiggly/main/SpellingUIEx/tests/com/adobe/linguistics/spelling/dictionaries/en_GB/en_GB.aff
new file mode 100644
index 0000000..dc71ace
--- /dev/null
+++ b/Squiggly/main/SpellingUIEx/tests/com/adobe/linguistics/spelling/dictionaries/en_GB/en_GB.aff
@@ -0,0 +1,1150 @@
+# Affix file for British English MySpell dictionary
+# Also suitable as basis for Commonwealth and European English.
+# Built from scratch for MySpell. Released under LGPL.
+#
+# David Bartlett, Andrew Brown.
+# R 1.18, 11/04/05
+SET ISO8859-1
+TRY esia�nrtolcdugmfphbyvkw-'.zqjxSNRTLCGDMFPHBEAUYOIVKW����ZQJX����������
+REP 27
+REP f ph
+REP ph f
+REP f gh
+REP f ugh
+REP gh f
+REP ff ugh
+REP uf ough
+REP uff ough
+REP k ch
+REP ch k
+REP dg j
+REP j dg
+REP w ugh
+REP ness ity
+REP leness ility
+REP ness ivity
+REP eness ity
+REP og ogue
+REP ck qu
+REP ck que
+REP eg e.g.
+REP ie i.e.
+REP t ght
+REP ght t
+REP ok OK
+REP ts ce
+REP ce ts
+PFX A Y 2
+PFX A 0 re [^e]
+PFX A 0 re- e
+PFX a Y 1
+PFX a 0 mis .
+PFX I Y 4
+PFX I 0 il l
+PFX I 0 ir r
+PFX I 0 im [bmp]
+PFX I 0 in [^blmpr]
+PFX c Y 1
+PFX c 0 over .
+PFX U Y 1
+PFX U 0 un .
+PFX C Y 2
+PFX C 0 de [^e]
+PFX C 0 de- e
+PFX E Y 1
+PFX E 0 dis .
+PFX F Y 5
+PFX F 0 com [bmp]
+PFX F 0 co [aeiouh]
+PFX F 0 cor r
+PFX F 0 col l
+PFX F 0 con [^abehilmopru].
+PFX K Y 1
+PFX K 0 pre .
+PFX e Y 1
+PFX e 0 out .
+PFX f Y 2
+PFX f 0 under [^r]
+PFX f 0 under- r
+PFX O Y 1
+PFX O 0 non- .
+PFX 4 Y 1
+PFX 4 0 trans .
+SFX V Y 15
+SFX V 0 tive [aio]
+SFX V b ptive b
+SFX V d sive d
+SFX V be ptive be
+SFX V e tive ce
+SFX V de sive de
+SFX V ke cative ke
+SFX V e ptive me
+SFX V e ive [st]e
+SFX V e ative [^bcdkmst]e
+SFX V 0 lative [aeiou]l
+SFX V 0 ative [^aeiou]l
+SFX V 0 ive [st]
+SFX V y icative y
+SFX V 0 ative [^abdeilosty]
+SFX v Y 15
+SFX v 0 tively [aio]
+SFX v b ptively b
+SFX v d sively d
+SFX v be ptively be
+SFX v e tively ce
+SFX v de sively de
+SFX v ke catively ke
+SFX v e ptively me
+SFX v e ively [st]e
+SFX v e atively [^bcdkmst]e
+SFX v 0 latively [aeiou]l
+SFX v 0 atively [^aeiou]l
+SFX v 0 ively [st]
+SFX v y icatively y
+SFX v 0 atively [^abdeilosty]
+SFX u Y 15
+SFX u 0 tiveness [aio]
+SFX u b ptiveness b
+SFX u d siveness d
+SFX u be ptiveness be
+SFX u e tiveness ce
+SFX u de siveness de
+SFX u ke cativeness ke
+SFX u e ptiveness me
+SFX u e iveness [st]e
+SFX u e ativeness [^bcdkmst]e
+SFX u 0 lativeness [aeiou]l
+SFX u 0 ativeness [^aeiou]l
+SFX u 0 iveness [st]
+SFX u y icativeness y
+SFX u 0 ativeness [^abdeilosty]
+SFX N Y 26
+SFX N b ption b
+SFX N d sion d
+SFX N be ption be
+SFX N e tion ce
+SFX N de sion de
+SFX N ke cation ke
+SFX N e ption ume
+SFX N e mation [^u]me
+SFX N e ion [^o]se
+SFX N e ition ose
+SFX N e ation [iou]te
+SFX N e ion [^iou]te
+SFX N e ation [^bcdkmst]e
+SFX N el ulsion el
+SFX N 0 lation [aiou]l
+SFX N 0 ation [^aeiou]l
+SFX N 0 mation [aeiou]m
+SFX N 0 ation [^aeiou]m
+SFX N er ration er
+SFX N 0 ation [^e]r
+SFX N 0 ion [sx]
+SFX N t ssion mit
+SFX N 0 ion [^m]it
+SFX N 0 ation [^i]t
+SFX N y ication y
+SFX N 0 ation [^bdelmrstxy]
+SFX n Y 28
+SFX n 0 tion a
+SFX n e tion ce
+SFX n ke cation ke
+SFX n e ation [iou]te
+SFX n e ion [^iou]te
+SFX n e ation [^ckt]e
+SFX n el ulsion el
+SFX n 0 lation [aiou]l
+SFX n 0 ation [^aeiou]l
+SFX n er ration er
+SFX n 0 ation [^e]r
+SFX n y ation py
+SFX n y ication [^p]y
+SFX n 0 ation [^aelry]
+SFX n 0 tions a
+SFX n e tions ce
+SFX n ke cations ke
+SFX n e ations [iou]te
+SFX n e ions [^iou]te
+SFX n e ations [^ckt]e
+SFX n el ulsions el
+SFX n 0 lations [aiou]l
+SFX n 0 ations [^aeiou]l
+SFX n er rations er
+SFX n 0 ations [^e]r
+SFX n y ations py
+SFX n y ications [^p]y
+SFX n 0 ations [^aelry]
+SFX X Y 26
+SFX X b ptions b
+SFX X d sions d
+SFX X be ptions be
+SFX X e tions ce
+SFX X ke cations ke
+SFX X de sions de
+SFX X e ptions ume
+SFX X e mations [^u]me
+SFX X e ions [^o]se
+SFX X e itions ose
+SFX X e ations [iou]te
+SFX X e ions [^iou]te
+SFX X e ations [^bcdkmst]e
+SFX X el ulsions el
+SFX X 0 lations [aiou]l
+SFX X 0 ations [^aeiou]l
+SFX X 0 mations [aeiou]m
+SFX X 0 ations [^aeiou]m
+SFX X er rations er
+SFX X 0 ations [^e]r
+SFX X 0 ions [sx]
+SFX X t ssions mit
+SFX X 0 ions [^m]it
+SFX X 0 ations [^i]t
+SFX X y ications y
+SFX X 0 ations [^bdelmrstxy]
+SFX x Y 40
+SFX x b ptional b
+SFX x d sional d
+SFX x be ptional be
+SFX x e tional ce
+SFX x ke cational ke
+SFX x de sional de
+SFX x e ional [^o]se
+SFX x e itional ose
+SFX x e ional te
+SFX x e ational [^bcdkst]e
+SFX x el ulsional el
+SFX x 0 lational [aiou]l
+SFX x 0 ational [^aeiou]l
+SFX x er rational er
+SFX x 0 ational [^e]r
+SFX x 0 ional [sx]
+SFX x 0 ional [^n]t
+SFX x 0 ational nt
+SFX x y icational y
+SFX x 0 ational [^bdelrstxy]
+SFX x b ptionally b
+SFX x d sionally d
+SFX x be ptionally be
+SFX x e tionally ce
+SFX x ke cationally ke
+SFX x de sionally de
+SFX x e ionally [^o]se
+SFX x e itionally ose
+SFX x e ionally te
+SFX x e ationally [^bcdkst]e
+SFX x el ulsionally el
+SFX x 0 lationally [aiou]l
+SFX x 0 ationally [^aeiou]l
+SFX x er rationally er
+SFX x 0 ationally [^e]r
+SFX x 0 ionally [sx]
+SFX x 0 ionally [^n]t
+SFX x 0 ationally nt
+SFX x y icationally y
+SFX x 0 ationally [^bdelrstxy]
+SFX H N 13
+SFX H y ieth y
+SFX H ree ird ree
+SFX H ve fth ve
+SFX H e th [^ev]e
+SFX H 0 h t
+SFX H 0 th [^ety]
+SFX H y ieths y
+SFX H ree irds ree
+SFX H ve fths ve
+SFX H e ths [^ev]e
+SFX H 0 hs t
+SFX H 0 ths [^ety]
+SFX H 0 fold .
+SFX Y Y 9
+SFX Y 0 ally ic
+SFX Y 0 ly [^i]c
+SFX Y e y [^aeiou]le
+SFX Y 0 ly [aeiou]le
+SFX Y 0 ly [^l]e
+SFX Y 0 y [^aeiou]l
+SFX Y y ily [^aeiou]y
+SFX Y 0 ly [aeiou][ly]
+SFX Y 0 ly [^cely]
+SFX G Y 24
+SFX G e ing [^eioy]e
+SFX G 0 ing [eoy]e
+SFX G ie ying ie
+SFX G 0 bing [^aeio][aeiou]b
+SFX G 0 king [^aeio][aeiou]c
+SFX G 0 ding [^aeio][aeiou]d
+SFX G 0 fing [^aeio][aeiou]f
+SFX G 0 ging [^aeio][aeiou]g
+SFX G 0 king [^aeio][aeiou]k
+SFX G 0 ling [^aeio][eiou]l
+SFX G 0 ing [aeio][eiou]l
+SFX G 0 ling [^aeo]al
+SFX G 0 ing [aeo]al
+SFX G 0 ming [^aeio][aeiou]m
+SFX G 0 ning [^aeio][aeiou]n
+SFX G 0 ping [^aeio][aeiou]p
+SFX G 0 ring [^aeio][aeiou]r
+SFX G 0 sing [^aeio][aeiou]s
+SFX G 0 ting [^aeio][aeiou]t
+SFX G 0 ving [^aeio][aeiou]v
+SFX G 0 zing [^aeio][aeiou]z
+SFX G 0 ing [aeio][aeiou][bcdfgkmnprstvz]
+SFX G 0 ing [^aeiou][bcdfgklmnprstvz]
+SFX G 0 ing [^ebcdfgklmnprstvz]
+SFX J Y 25
+SFX J e ings [^eioy]e
+SFX J 0 ings [eoy]e
+SFX J ie yings ie
+SFX J 0 bings [^aeio][aeiou]b
+SFX J 0 king [^aeio][aeiou]c
+SFX J 0 dings [^aeio][aeiou]d
+SFX J 0 fings [^aeio][aeiou]f
+SFX J 0 gings [^aeio][aeiou]g
+SFX J 0 kings [^aeio][aeiou]k
+SFX J 0 lings [^aeio][eiou]l
+SFX J 0 ings [aeio][eiou]l
+SFX J 0 lings [^aeo]al
+SFX J 0 ings [aeo]al
+SFX J 0 mings [^aeio][aeiou]m
+SFX J 0 nings [^aeio][aiou]n
+SFX J 0 pings [^aeio][aeiou]p
+SFX J 0 rings [^aeio][aiou]r
+SFX J 0 sings [^aeio][aeiou]s
+SFX J 0 tings [^aeio][aiou]t
+SFX J 0 vings [^aeio][aeiou]v
+SFX J 0 zings [^aeio][aeiou]z
+SFX J 0 ings [^aeio]e[nrt]
+SFX J 0 ings [aeio][aeiou][bcdfgkmnprstvz]
+SFX J 0 ings [^aeiou][bcdfgklmnprstvz]
+SFX J 0 ings [^ebcdfgklmnprstvz]
+SFX k Y 8
+SFX k e ingly [^eioy]e
+SFX k 0 ingly [eoy]e
+SFX k ie yingly ie
+SFX k 0 kingly [^aeio][aeiou]c
+SFX k 0 lingly [^aeio][aeiou]l
+SFX k 0 ingly [aeio][aeiou][cl]
+SFX k 0 ingly [^aeiou][cl]
+SFX k 0 ingly [^ecl]
+SFX D Y 25
+SFX D 0 d [^e]e
+SFX D e d ee
+SFX D 0 bed [^aeio][aeiou]b
+SFX D 0 ked [^aeio][aeiou]c
+SFX D 0 ded [^aeio][aeiou]d
+SFX D 0 fed [^aeio][aeiou]f
+SFX D 0 ged [^aeio][aeiou]g
+SFX D 0 ked [^aeio][aeiou]k
+SFX D 0 led [^aeio][eiou]l
+SFX D 0 ed [aeio][eiou]l
+SFX D 0 led [^aeo]al
+SFX D 0 ed [aeo]al
+SFX D 0 med [^aeio][aeiou]m
+SFX D 0 ned [^aeio][aeiou]n
+SFX D 0 ped [^aeio][aeiou]p
+SFX D 0 red [^aeio][aeiou]r
+SFX D 0 sed [^aeio][aeiou]s
+SFX D 0 ted [^aeio][aeiou]t
+SFX D 0 ved [^aeio][aeiou]v
+SFX D 0 zed [^aeio][aeiou]z
+SFX D y ied [^aeiou]y
+SFX D 0 ed [aeiou]y
+SFX D 0 ed [aeio][aeiou][bcdfgkmnprstvz]
+SFX D 0 ed [^aeiou][bcdfgklmnprstvz]
+SFX D 0 ed [^ebcdfgklmnprstvyz]
+SFX d Y 16
+SFX d 0 d e
+SFX d 0 ked [^aeio][aeiou]c
+SFX d 0 led [^aeio][aeiou]l
+SFX d y ied [^aeiou]y
+SFX d 0 ed [aeiou]y
+SFX d 0 ed [aeio][aeiou][cl]
+SFX d 0 ed [^aeiou][cl]
+SFX d 0 ed [^ecly]
+SFX d e ing [^eioy]e
+SFX d 0 ing [eoy]e
+SFX d ie ying ie
+SFX d 0 king [^aeio][aeiou]c
+SFX d 0 ling [^aeio][aeiou]l
+SFX d 0 ing [aeio][aeiou][cl]
+SFX d 0 ing [^aeiou][cl]
+SFX d 0 ing [^ecl]
+SFX h Y 22
+SFX h 0 dly e
+SFX h 0 bedly [^aeio][aeiou]b
+SFX h 0 kedly [^aeio][aeiou]c
+SFX h 0 dedly [^aeio][aeiou]d
+SFX h 0 fedly [^aeio][aeiou]f
+SFX h 0 gedly [^aeio][aeiou]g
+SFX h 0 kedly [^aeio][aeiou]k
+SFX h 0 ledly [^aeio][aeiou]l
+SFX h 0 medly [^aeio][aeiou]m
+SFX h 0 nedly [^aeio][aiou]n
+SFX h 0 pedly [^aeio][aeiou]p
+SFX h 0 redly [^aeio][aiou]r
+SFX h 0 sedly [^aeio][aeiou]s
+SFX h 0 tedly [^aeio][aiou]t
+SFX h 0 vedly [^aeio][aeiou]v
+SFX h 0 zedly [^aeio][aeiou]z
+SFX h 0 edly [^aeio]e[nrt]
+SFX h y iedly [^aeiou]y
+SFX h 0 edly [aeiou]y
+SFX h 0 edly [aeio][aeiou][bcdfgklmnprstvz]
+SFX h 0 edly [^aeiou][bcdfgklmnprstvz]
+SFX h 0 edly [^ebcdfgklmnprstvyz]
+SFX i Y 22
+SFX i 0 dness e
+SFX i 0 bedness [^aeio][aeiou]b
+SFX i 0 kedness [^aeio][aeiou]c
+SFX i 0 dedness [^aeio][aeiou]d
+SFX i 0 fedness [^aeio][aeiou]f
+SFX i 0 gedness [^aeio][aeiou]g
+SFX i 0 kedness [^aeio][aeiou]k
+SFX i 0 ledness [^aeio][aeiou]l
+SFX i 0 medness [^aeio][aeiou]m
+SFX i 0 nedness [^aeio][aiou]n
+SFX i 0 pedness [^aeio][aeiou]p
+SFX i 0 redness [^aeio][aiou]r
+SFX i 0 sedness [^aeio][aeiou]s
+SFX i 0 tedness [^aeio][aiou]t
+SFX i 0 vedness [^aeio][aeiou]v
+SFX i 0 zedness [^aeio][aeiou]z
+SFX i 0 edness [^aeio]e[nrt]
+SFX i y iedness [^aeiou]y
+SFX i 0 edness [aeiou]y
+SFX i 0 edness [aeio][aeiou][bcdfgklmnprstvz]
+SFX i 0 edness [^aeiou][bcdfgklmnprstvz]
+SFX i 0 edness [^ebcdfgklmnprstvyz]
+SFX T Y 42
+SFX T 0 r e
+SFX T 0 st e
+SFX T 0 ber [^aeio][aeiou]b
+SFX T 0 best [^aeio][aeiou]b
+SFX T 0 ker [^aeio][aeiou]c
+SFX T 0 kest [^aeio][aeiou]c
+SFX T 0 der [^aeio][aeiou]d
+SFX T 0 dest [^aeio][aeiou]d
+SFX T 0 fer [^aeio][aeiou]f
+SFX T 0 fest [^aeio][aeiou]f
+SFX T 0 ger [^aeio][aeiou]g
+SFX T 0 gest [^aeio][aeiou]g
+SFX T 0 ker [^aeio][aeiou]k
+SFX T 0 kest [^aeio][aeiou]k
+SFX T 0 ler [^aeio][aeiou]l
+SFX T 0 lest [^aeio][aeiou]l
+SFX T 0 mer [^aeio][aeiou]m
+SFX T 0 mest [^aeio][aeiou]m
+SFX T 0 ner [^aeio][aeiou]n
+SFX T 0 nest [^aeio][aeiou]n
+SFX T 0 per [^aeio][aeiou]p
+SFX T 0 pest [^aeio][aeiou]p
+SFX T 0 rer [^aeio][aeiou]r
+SFX T 0 rest [^aeio][aeiou]r
+SFX T 0 ser [^aeio][aeiou]s
+SFX T 0 sest [^aeio][aeiou]s
+SFX T 0 ter [^aeio][aeiou]t
+SFX T 0 test [^aeio][aeiou]t
+SFX T 0 ver [^aeio][aeiou]v
+SFX T 0 vest [^aeio][aeiou]v
+SFX T 0 zer [^aeio][aeiou]z
+SFX T 0 zest [^aeio][aeiou]z
+SFX T y ier [^aeiou]y
+SFX T y iest [^aeiou]y
+SFX T 0 er [aeiou]y
+SFX T 0 est [aeiou]y
+SFX T 0 er [aeio][aeiou][bcdfgklmnprstvz]
+SFX T 0 er [^aeiou][bcdfgklmnprstvz]
+SFX T 0 er [^ebcdfgklmnprstvyz]
+SFX T 0 est [aeio][aeiou][bcdfgklmnprstvz]
+SFX T 0 est [^aeiou][bcdfgklmnprstvz]
+SFX T 0 est [^ebcdfgklmnprstvyz]
+SFX R Y 72
+SFX R 0 r e
+SFX R 0 rs e
+SFX R 0 ber [^aeio][aeiou]b
+SFX R 0 bers [^aeio][aeiou]b
+SFX R 0 ker [^aeio][aeiou]c
+SFX R 0 kers [^aeio][aeiou]c
+SFX R 0 der [^aeio][aeiou]d
+SFX R 0 ders [^aeio][aeiou]d
+SFX R 0 fer [^aeio][aeiou]f
+SFX R 0 fers [^aeio][aeiou]f
+SFX R 0 ger [^aeio][aeiou]g
+SFX R 0 gers [^aeio][aeiou]g
+SFX R 0 ker [^aeio][aeiou]k
+SFX R 0 kers [^aeio][aeiou]k
+SFX R 0 ler [^aeio][eiou]l
+SFX R 0 er [aeio][eiou]l
+SFX R 0 ler [^aeo]al
+SFX R 0 er [aeo]al
+SFX R 0 lers [^aeio][eiou]l
+SFX R 0 ers [aeio][eiou]l
+SFX R 0 lers [^aeo]al
+SFX R 0 ers [aeo]al
+SFX R 0 mer [^aeio][aeiou]m
+SFX R 0 mers [^aeio][aeiou]m
+SFX R 0 ner [^aeio][aeiou]n
+SFX R 0 ners [^aeio][aeiou]n
+SFX R 0 per [^aeio][aeiou]p
+SFX R 0 pers [^aeio][aeiou]p
+SFX R 0 rer [^aeio][aeiou]r
+SFX R 0 rers [^aeio][aeiou]r
+SFX R 0 ser [^aeio][aeiou]s
+SFX R 0 sers [^aeio][aeiou]s
+SFX R 0 ter [^aeio][aeiou]t
+SFX R 0 ters [^aeio][aeiou]t
+SFX R 0 ver [^aeio][aeiou]v
+SFX R 0 vers [^aeio][aeiou]v
+SFX R 0 zer [^aeio][aeiou]z
+SFX R 0 zers [^aeio][aeiou]z
+SFX R y ier [^aeiou]y
+SFX R y iers [^aeiou]y
+SFX R 0 er [aeiou]y
+SFX R 0 ers [aeiou]y
+SFX R 0 er [aeio][aeiou][bcdfgkmnprstvz]
+SFX R 0 ers [aeio][aeiou][bcdfgkmnprstvz]
+SFX R 0 er [^aeiou][bcdfgklmnprstvz]
+SFX R 0 ers [^aeiou][bcdfgklmnprstvz]
+SFX R 0 er [^ebcdfgklmnprstvyz]
+SFX R 0 ers [^ebcdfgklmnprstvyz]
+SFX R 0 r's e
+SFX R 0 ber's [^aeio][aeiou]b
+SFX R 0 ker's [^aeio][aeiou]c
+SFX R 0 der's [^aeio][aeiou]d
+SFX R 0 fer's [^aeio][aeiou]f
+SFX R 0 ger's [^aeio][aeiou]g
+SFX R 0 ker's [^aeio][aeiou]k
+SFX R 0 ler's [^aeio][eiou]l
+SFX R 0 er's [aeio][eiou]l
+SFX R 0 ler's [^aeo]al
+SFX R 0 er's [aeo]al
+SFX R 0 mer's [^aeio][aeiou]m
+SFX R 0 ner's [^aeio][aeiou]n
+SFX R 0 per's [^aeio][aeiou]p
+SFX R 0 rer's [^aeio][aeiou]r
+SFX R 0 ser's [^aeio][aeiou]s
+SFX R 0 ter's [^aeio][aeiou]t
+SFX R 0 ver's [^aeio][aeiou]v
+SFX R 0 zer's [^aeio][aeiou]z
+SFX R y ier's [^aeiou]y
+SFX R 0 er's [aeiou]y
+SFX R 0 er's [aeio][aeiou][bcdfgkmnprstvz]
+SFX R 0 er's [^aeiou][bcdfgklmnprstvz]
+SFX R 0 er's [^ebcdfgklmnprstvyz]
+SFX r Y 24
+SFX r 0 r e
+SFX r 0 ler [^aeio][aeiou]l
+SFX r 0 ker [^aeio][aeiou]c
+SFX r y ier [^aeiou]y
+SFX r 0 er [aeiou]y
+SFX r 0 er [aeio][aeiou][cl]
+SFX r 0 er [^aeiou][cl]
+SFX r 0 er [^ecly]
+SFX r 0 rs e
+SFX r 0 lers [^aeio][aeiou]l
+SFX r 0 kers [^aeio][aeiou]c
+SFX r y iers [^aeiou]y
+SFX r 0 ers [aeiou]y
+SFX r 0 ers [aeio][aeiou][cl]
+SFX r 0 ers [^aeiou][cl]
+SFX r 0 ers [^ecly]
+SFX r 0 r's e
+SFX r 0 ler's [^aeio][aeiou]l
+SFX r 0 ker's [^aeio][aeiou]c
+SFX r y ier's [^aeiou]y
+SFX r 0 er's [aeiou]y
+SFX r 0 er's [aeio][aeiou][cl]
+SFX r 0 er's [^aeiou][cl]
+SFX r 0 er's [^ecly]
+SFX S Y 9
+SFX S y ies [^aeiou]y
+SFX S 0 s [aeiou]y
+SFX S 0 es [sxz]
+SFX S 0 es [cs]h
+SFX S 0 s [^cs]h
+SFX S 0 s [ae]u
+SFX S 0 x [ae]u
+SFX S 0 s [^ae]u
+SFX S 0 s [^hsuxyz]
+SFX P Y 6
+SFX P y iness [^aeiou]y
+SFX P 0 ness [aeiou]y
+SFX P 0 ness [^y]
+SFX P y iness's [^aeiou]y
+SFX P 0 ness's [aeiou]y
+SFX P 0 ness's [^y]
+SFX m Y 20
+SFX m 0 sman [bdknmt]
+SFX m 0 sman [aeiou][bdklmnt]e
+SFX m 0 man [^aeiou][bdklmnt]e
+SFX m 0 man [^bdklmnt]e
+SFX m 0 man [^bdeknmt]
+SFX m 0 smen [bdknmt]
+SFX m 0 smen [aeiou][bdklmnt]e
+SFX m 0 men [^aeiou][bdklmnt]e
+SFX m 0 men [^bdklmnt]e
+SFX m 0 men [^bdeknmt]
+SFX m 0 sman's [bdknmt]
+SFX m 0 sman's [aeiou][bdklmnt]e
+SFX m 0 man's [^aeiou][bdklmnt]e
+SFX m 0 man's [^bdklmnt]e
+SFX m 0 man's [^bdeknmt]
+SFX m 0 smen's [bdknmt]
+SFX m 0 smen's [aeiou][bdklmnt]e
+SFX m 0 men's [^aeiou][bdklmnt]e
+SFX m 0 men's [^bdklmnt]e
+SFX m 0 men's [^bdeknmt]
+SFX 5 Y 15
+SFX 5 0 swoman [bdknmt]
+SFX 5 0 swoman [aeiou][bdklmnt]e
+SFX 5 0 woman [^aeiou][bdklmnt]e
+SFX 5 0 woman [^bdklmnt]e
+SFX 5 0 woman [^bdeknmt]
+SFX 5 0 swomen [bdknmt]
+SFX 5 0 swomen [aeiou][bdklmnt]e
+SFX 5 0 women [^aeiou][bdklmnt]e
+SFX 5 0 women [^bdklmnt]e
+SFX 5 0 women [^bdeknmt]
+SFX 5 0 swoman's [bdknmt]
+SFX 5 0 swoman's [aeiou][bdklmnt]e
+SFX 5 0 woman's [^aeiou][bdklmnt]e
+SFX 5 0 woman's [^bdklmnt]e
+SFX 5 0 woman's [^bdeknmt]
+SFX 6 Y 3
+SFX 6 y iful [^aeiou]y
+SFX 6 0 ful [aeiou]y
+SFX 6 0 ful [^y]
+SFX j Y 3
+SFX j y ifully [^aeiou]y
+SFX j 0 fully [aeiou]y
+SFX j 0 fully [^y]
+SFX p Y 5
+SFX p y iless [^aeiou]y
+SFX p 0 less [aeiou]y
+SFX p 0 ess ll
+SFX p 0 less [^l]l
+SFX p 0 less [^ly]
+SFX Q Y 44
+SFX Q 0 tise a
+SFX Q e ise [^l]e
+SFX Q le ilise [^aeiou]le
+SFX Q e ise [aeiou]le
+SFX Q um ise um
+SFX Q 0 ise [^u]m
+SFX Q s se is
+SFX Q 0 ise [^i]s
+SFX Q y ise [^aeiou]y
+SFX Q 0 ise [aeiou]y
+SFX Q 0 ise [^aemsy]
+SFX Q 0 tises a
+SFX Q e ises [^l]e
+SFX Q le ilises [^aeiou]le
+SFX Q e ises [aeiou]le
+SFX Q um ises um
+SFX Q 0 ises [^u]m
+SFX Q s ses is
+SFX Q 0 ises [^i]s
+SFX Q y ises [^aeiou]y
+SFX Q 0 ises [aeiou]y
+SFX Q 0 ises [^aemsy]
+SFX Q 0 tised a
+SFX Q e ised [^l]e
+SFX Q le ilised [^aeiou]le
+SFX Q e ised [aeiou]le
+SFX Q um ised um
+SFX Q 0 ised [^u]m
+SFX Q s sed is
+SFX Q 0 ised [^i]s
+SFX Q y ised [^aeiou]y
+SFX Q 0 ised [aeiou]y
+SFX Q 0 ised [^aemsy]
+SFX Q 0 tising a
+SFX Q e ising [^l]e
+SFX Q le ilising [^aeiou]le
+SFX Q e ising [aeiou]le
+SFX Q um ising um
+SFX Q 0 ising [^u]m
+SFX Q s sing is
+SFX Q 0 ising [^i]s
+SFX Q y ising [^aeiou]y
+SFX Q 0 ising [aeiou]y
+SFX Q 0 ising [^aemsy]
+SFX 8 Y 44
+SFX 8 0 tize a
+SFX 8 e ize [^l]e
+SFX 8 le ilize [^aeiou]le
+SFX 8 e ize [aeiou]le
+SFX 8 um ize um
+SFX 8 0 ize [^u]m
+SFX 8 s ze is
+SFX 8 0 ize [^i]s
+SFX 8 y ize [^aeiou]y
+SFX 8 0 ize [aeiou]y
+SFX 8 0 ize [^aemsy]
+SFX 8 0 tizes a
+SFX 8 e izes [^l]e
+SFX 8 le ilizes [^aeiou]le
+SFX 8 e izes [aeiou]le
+SFX 8 um izes um
+SFX 8 0 izes [^u]m
+SFX 8 s zes is
+SFX 8 0 izes [^i]s
+SFX 8 y izes [^aeiou]y
+SFX 8 0 izes [aeiou]y
+SFX 8 0 izes [^aemsy]
+SFX 8 0 tized a
+SFX 8 e ized [^l]e
+SFX 8 le ilized [^aeiou]le
+SFX 8 e ized [aeiou]le
+SFX 8 um ized um
+SFX 8 0 ized [^u]m
+SFX 8 s zed is
+SFX 8 0 ized [^i]s
+SFX 8 y ized [^aeiou]y
+SFX 8 0 ized [aeiou]y
+SFX 8 0 ized [^aemsy]
+SFX 8 0 tizing a
+SFX 8 e izing [^l]e
+SFX 8 le ilizing [^aeiou]le
+SFX 8 e izing [aeiou]le
+SFX 8 um izing um
+SFX 8 0 izing [^u]m
+SFX 8 s zing is
+SFX 8 0 izing [^i]s
+SFX 8 y izing [^aeiou]y
+SFX 8 0 izing [aeiou]y
+SFX 8 0 izing [^aemsy]
+SFX q Y 22
+SFX q 0 tisation a
+SFX q e isation [^l]e
+SFX q le ilisation [^aeiou]le
+SFX q e isation [aeiou]le
+SFX q um isation um
+SFX q 0 isation [^u]m
+SFX q s sation is
+SFX q 0 isation [^i]s
+SFX q y isation [^aeiou]y
+SFX q 0 isation [aeiou]y
+SFX q 0 isation [^aemsy]
+SFX q 0 tisations a
+SFX q e isations [^l]e
+SFX q le ilisations [^aeiou]le
+SFX q e isations [aeiou]le
+SFX q um isations um
+SFX q 0 isations [^u]m
+SFX q s sations is
+SFX q 0 isations [^i]s
+SFX q y isations [^aeiou]y
+SFX q 0 isations [aeiou]y
+SFX q 0 isations [^aemsy]
+SFX - Y 22
+SFX - 0 tization a
+SFX - e ization [^l]e
+SFX - le ilization [^aeiou]le
+SFX - e ization [aeiou]le
+SFX - um ization um
+SFX - 0 ization [^u]m
+SFX - s zation is
+SFX - 0 ization [^i]s
+SFX - y ization [^aeiou]y
+SFX - 0 ization [aeiou]y
+SFX - 0 ization [^aemsy]
+SFX - 0 tizations a
+SFX - e izations [^l]e
+SFX - le ilizations [^aeiou]le
+SFX - e izations [aeiou]le
+SFX - um izations um
+SFX - 0 izations [^u]m
+SFX - s zations is
+SFX - 0 izations [^i]s
+SFX - y izations [^aeiou]y
+SFX - 0 izations [aeiou]y
+SFX - 0 izations [^aemsy]
+SFX s Y 33
+SFX s 0 tiser a
+SFX s e iser [^l]e
+SFX s le iliser [^aeiou]le
+SFX s e iser [aeiou]le
+SFX s um iser um
+SFX s 0 iser [^u]m
+SFX s s ser is
+SFX s 0 iser [^i]s
+SFX s y iser [^aeiou]y
+SFX s 0 iser [aeiou]y
+SFX s 0 iser [^aemsy]
+SFX s 0 tisers a
+SFX s e isers [^l]e
+SFX s le ilisers [^aeiou]le
+SFX s e isers [aeiou]le
+SFX s um isers um
+SFX s 0 isers [^u]m
+SFX s s sers is
+SFX s 0 isers [^i]s
+SFX s y isers [^aeiou]y
+SFX s 0 isers [aeiou]y
+SFX s 0 isers [^aemsy]
+SFX s 0 tiser's a
+SFX s e iser's [^l]e
+SFX s le iliser's [^aeiou]le
+SFX s e iser's [aeiou]le
+SFX s um iser's um
+SFX s 0 iser's [^u]m
+SFX s s ser's is
+SFX s 0 iser's [^i]s
+SFX s y iser's [^aeiou]y
+SFX s 0 iser's [aeiou]y
+SFX s 0 iser's [^aemsy]
+SFX 9 Y 33
+SFX 9 0 tizer a
+SFX 9 e izer [^l]e
+SFX 9 le ilizer [^aeiou]le
+SFX 9 e izer [aeiou]le
+SFX 9 um izer um
+SFX 9 0 izer [^u]m
+SFX 9 s zer is
+SFX 9 0 izer [^i]s
+SFX 9 y izer [^aeiou]y
+SFX 9 0 izer [aeiou]y
+SFX 9 0 izer [^aemsy]
+SFX 9 0 tizers a
+SFX 9 e izers [^l]e
+SFX 9 le ilizers [^aeiou]le
+SFX 9 e izers [aeiou]le
+SFX 9 um izers um
+SFX 9 0 izers [^u]m
+SFX 9 s zers is
+SFX 9 0 izers [^i]s
+SFX 9 y izers [^aeiou]y
+SFX 9 0 izers [aeiou]y
+SFX 9 0 izers [^aemsy]
+SFX 9 0 tizer's a
+SFX 9 e izer's [^l]e
+SFX 9 le ilizer's [^aeiou]le
+SFX 9 e izer's [aeiou]le
+SFX 9 um izer's um
+SFX 9 0 izer's [^u]m
+SFX 9 s zer's is
+SFX 9 0 izer's [^i]s
+SFX 9 y izer's [^aeiou]y
+SFX 9 0 izer's [aeiou]y
+SFX 9 0 izer's [^aemsy]
+SFX t Y 22
+SFX t 0 tisable a
+SFX t e isable [^l]e
+SFX t le ilisable [^aeiou]le
+SFX t e isable [aeiou]le
+SFX t um isable um
+SFX t 0 isable [^u]m
+SFX t s sable is
+SFX t 0 isable [^i]s
+SFX t y isable [^aeiou]y
+SFX t 0 isable [aeiou]y
+SFX t 0 isable [^aemsy]
+SFX t 0 tisability a
+SFX t e isability [^l]e
+SFX t le ilisability [^aeiou]le
+SFX t e isability [aeiou]le
+SFX t um isability um
+SFX t 0 isability [^u]m
+SFX t s sability is
+SFX t 0 isability [^i]s
+SFX t y isability [^aeiou]y
+SFX t 0 isability [aeiou]y
+SFX t 0 isability [^aemsy]
+SFX + Y 22
+SFX + 0 tizable a
+SFX + e izable [^l]e
+SFX + le ilizable [^aeiou]le
+SFX + e izable [aeiou]le
+SFX + um izable um
+SFX + 0 izable [^u]m
+SFX + s zable is
+SFX + 0 izable [^i]s
+SFX + y izable [^aeiou]y
+SFX + 0 izable [aeiou]y
+SFX + 0 izable [^aemsy]
+SFX + 0 tizability a
+SFX + e izability [^l]e
+SFX + le ilizability [^aeiou]le
+SFX + e izability [aeiou]le
+SFX + um izability um
+SFX + 0 izability [^u]m
+SFX + s zability is
+SFX + 0 izability [^i]s
+SFX + y izability [^aeiou]y
+SFX + 0 izability [aeiou]y
+SFX + 0 izability [^aemsy]
+SFX M Y 1
+SFX M 0 's .
+SFX B Y 48
+SFX B e able [^acegilotu]e
+SFX B 0 able [acegilou]e
+SFX B te ble ate
+SFX B e able [^a]te
+SFX B 0 bable [^aeio][aeiou]b
+SFX B 0 kable [^aeio][aeiou]c
+SFX B 0 dable [^aeio][aeiou]d
+SFX B 0 fable [^aeio][aeiou]f
+SFX B 0 gable [^aeio][aeiou]g
+SFX B 0 kable [^aeio][aeiou]k
+SFX B 0 lable [^aeio][aeiou]l
+SFX B 0 mable [^aeio][aeiou]m
+SFX B 0 nable [^aeio][aeiou]n
+SFX B 0 pable [^aeio][aeiou]p
+SFX B 0 rable [^aeio][aeiou]r
+SFX B 0 sable [^aeio][aeiou]s
+SFX B 0 table [^aeio][aeiou]t
+SFX B 0 vable [^aeio][aeiou]v
+SFX B 0 zable [^aeio][aeiou]z
+SFX B 0 able [aeio][aeiou][bcdfgklmnprstvz]
+SFX B 0 able [^aeiou][bcdfgklmnprstvz]
+SFX B y iable [^aeiou]y
+SFX B 0 able [aeiou]y
+SFX B 0 able [^ebcdfgklmnprstvzy]
+SFX B e ability [^acegilotu]e
+SFX B 0 ability [acegilou]e
+SFX B te bility ate
+SFX B e ability [^a]te
+SFX B 0 bability [^aeio][aeiou]b
+SFX B 0 kability [^aeio][aeiou]c
+SFX B 0 dability [^aeio][aeiou]d
+SFX B 0 fability [^aeio][aeiou]f
+SFX B 0 gability [^aeio][aeiou]g
+SFX B 0 kability [^aeio][aeiou]k
+SFX B 0 lability [^aeio][aeiou]l
+SFX B 0 mability [^aeio][aeiou]m
+SFX B 0 nability [^aeio][aeiou]n
+SFX B 0 pability [^aeio][aeiou]p
+SFX B 0 rability [^aeio][aeiou]r
+SFX B 0 sability [^aeio][aeiou]s
+SFX B 0 tability [^aeio][aeiou]t
+SFX B 0 vability [^aeio][aeiou]v
+SFX B 0 zability [^aeio][aeiou]z
+SFX B 0 ability [aeio][aeiou][bcdfgklmnprstvz]
+SFX B 0 ability [^aeiou][bcdfgklmnprstvz]
+SFX B y iability [^aeiou]y
+SFX B 0 ability [aeiou]y
+SFX B 0 ability [^ebcdfgklmnprstvzy]
+SFX 7 Y 9
+SFX 7 e able [acegilou]e
+SFX 7 0 able [^acegilou]e
+SFX 7 0 kable [^aeio][aeiou]c
+SFX 7 0 lable [^aeio][aeiou]l
+SFX 7 0 able [aeio][aeiou][cl]
+SFX 7 0 able [^aeiou][cl]
+SFX 7 y iable [^aeiou]y
+SFX 7 0 able [aeiou]y
+SFX 7 0 able [^cely]
+SFX g Y 9
+SFX g e ability [^acegilou]e
+SFX g 0 ability [acegilou]e
+SFX g 0 kability [^aeio][aeiou]c
+SFX g 0 lability [^aeio][aeiou]l
+SFX g 0 ability [aeio][aeiou][cl]
+SFX g 0 ability [^aeiou][cl]
+SFX g y iability [^aeiou]y
+SFX g 0 ability [aeiou]y
+SFX g 0 ability [^cely]
+SFX l Y 9
+SFX l e ably [^acegilou]e
+SFX l 0 ably [acegilou]e
+SFX l 0 kably [^aeio][aeiou]c
+SFX l 0 lably [^aeio][aeiou]l
+SFX l 0 ably [aeio][aeiou][cl]
+SFX l 0 ably [^aeiou][cl]
+SFX l y iably [^aeiou]y
+SFX l 0 ably [aeiou]y
+SFX l 0 ably [^cely]
+SFX b Y 3
+SFX b e ible [^aeiou]e
+SFX b 0 ible [aeiou]e
+SFX b 0 ible [^e]
+SFX L Y 12
+SFX L 0 ament m
+SFX L y iment [^aeiou]y
+SFX L 0 ment [aeiou]y
+SFX L 0 ment [^my]
+SFX L 0 aments m
+SFX L y iments [^aeiou]y
+SFX L 0 ments [aeiou]y
+SFX L 0 ments [^my]
+SFX L 0 ament's m
+SFX L y iment's [^aeiou]y
+SFX L 0 ment's [aeiou]y
+SFX L 0 ment's [^my]
+SFX Z Y 22
+SFX Z e y [^aeiouy]e
+SFX Z 0 y [aeiouy]e
+SFX Z 0 ey [aiouy]
+SFX Z 0 by [^aeio][aeiou]b
+SFX Z 0 ky [^aeio][aeiou]c
+SFX Z 0 dy [^aeio][aeiou]d
+SFX Z 0 fy [^aeio][aeiou]f
+SFX Z 0 gy [^aeio][aeiou]g
+SFX Z 0 ky [^aeio][aeiou]k
+SFX Z 0 ly [^aeio][aeiou]l
+SFX Z 0 my [^aeio][aeiou]m
+SFX Z 0 ny [^aeio][aiou]n
+SFX Z 0 py [^aeio][aeiou]p
+SFX Z 0 ry [^aeio][aiou]r
+SFX Z 0 sy [^aeio][aeiou]s
+SFX Z 0 ty [^aeio][aiou]t
+SFX Z 0 vy [^aeio][aeiou]v
+SFX Z 0 zy [^aeio][aeiou]z
+SFX Z 0 y [^aeio]e[nrt]
+SFX Z 0 y [aeio][aeiou][bcdfgklmnprstvz]
+SFX Z 0 y [^aeiou][bcdfgklmnprstvz]
+SFX Z 0 y [^aebcdfgiklmnoprstuvyz]
+SFX 2 Y 21
+SFX 2 e iness [^aeiouy]e
+SFX 2 0 iness [aeiouy]e
+SFX 2 0 biness [^aeio][aeiou]b
+SFX 2 0 kiness [^aeio][aeiou]c
+SFX 2 0 diness [^aeio][aeiou]d
+SFX 2 0 finess [^aeio][aeiou]f
+SFX 2 0 giness [^aeio][aeiou]g
+SFX 2 0 kiness [^aeio][aeiou]k
+SFX 2 0 liness [^aeio][aeiou]l
+SFX 2 0 miness [^aeio][aeiou]m
+SFX 2 0 niness [^aeio][aiou]n
+SFX 2 0 piness [^aeio][aeiou]p
+SFX 2 0 riness [^aeio][aiou]r
+SFX 2 0 siness [^aeio][aeiou]s
+SFX 2 0 tiness [^aeio][aiou]t
+SFX 2 0 viness [^aeio][aeiou]v
+SFX 2 0 ziness [^aeio][aeiou]z
+SFX 2 0 iness [^aeio]e[nrt]
+SFX 2 0 iness [aeio][aeiou][bcdfgklmnprstvz]
+SFX 2 0 iness [^aeiou][bcdfgklmnprstvz]
+SFX 2 0 iness [^ebcdfgklmnprstvz]
+SFX z Y 24
+SFX z e ily [^aeiouy]e
+SFX z 0 ily [aeiouy]e
+SFX z 0 ily [aiou]y
+SFX z ey ily ey
+SFX z y ily [^aeiou]y
+SFX z 0 bily [^aeio][aeiou]b
+SFX z 0 kily [^aeio][aeiou]c
+SFX z 0 dily [^aeio][aeiou]d
+SFX z 0 fily [^aeio][aeiou]f
+SFX z 0 gily [^aeio][aeiou]g
+SFX z 0 kily [^aeio][aeiou]k
+SFX z 0 lily [^aeio][aeiou]l
+SFX z 0 mily [^aeio][aeiou]m
+SFX z 0 nily [^aeio][aiou]n
+SFX z 0 pily [^aeio][aeiou]p
+SFX z 0 rily [^aeio][aiou]r
+SFX z 0 sily [^aeio][aeiou]s
+SFX z 0 tily [^aeio][aiou]t
+SFX z 0 vily [^aeio][aeiou]v
+SFX z 0 zily [^aeio][aeiou]z
+SFX z 0 ily [^aeio]e[nrt]
+SFX z 0 ily [aeio][aeiou][bcdfgklmnprstvyz]
+SFX z 0 ily [^aeiou][bcdfgklmnprstvyz]
+SFX z 0 ily [^ebcdfgklmnprstvyz]
+SFX y Y 15
+SFX y e ory te
+SFX y e atory [mr]e
+SFX y e ary se
+SFX y 0 ry [^mrst]e
+SFX y 0 ory [^aeous]t
+SFX y 0 ry [aeous]t
+SFX y 0 ery h
+SFX y 0 atory [^i]m
+SFX y im matory im
+SFX y 0 ory s
+SFX y 0 ary ion
+SFX y 0 ry [^i]on
+SFX y 0 nery [aiu]n
+SFX y 0 ry [^aiou]n
+SFX y 0 ry [^ehmstn]
+SFX O Y 12
+SFX O 0 l a
+SFX O e al [^bcgv]e
+SFX O e ial [bcgv]e
+SFX O 0 ial [bcrx]
+SFX O um al um
+SFX O 0 al [^u]m
+SFX O y al ty
+SFX O y ial [^t]y
+SFX O 0 ual [px]t
+SFX O 0 tal [iu]t
+SFX O 0 al [^ipux]t
+SFX O 0 al [^aebcrtxmy]
+SFX o Y 12
+SFX o 0 lly a
+SFX o e ally [^bcgv]e
+SFX o e ially [bcgv]e
+SFX o 0 ially [bcrx]
+SFX o um ally um
+SFX o 0 ally [^u]m
+SFX o y ally ty
+SFX o y ially [^t]y
+SFX o 0 ually [px]t
+SFX o 0 tally [iu]t
+SFX o 0 ally [^ipux]t
+SFX o 0 ally [^aebcrtxmy]
+SFX W Y 21
+SFX W ce tific ce
+SFX W e atic me
+SFX W se tic se
+SFX W le ic ble
+SFX W e ic [^b]le
+SFX W e ic [^clms]e
+SFX W 0 lic [ay]l
+SFX W 0 ic [^ay]l
+SFX W us ic us
+SFX W 0 tic [^u]s
+SFX W er ric er
+SFX W 0 ic [^e]r
+SFX W 0 atic [aeiou]m
+SFX W 0 ic [^aeiou]m
+SFX W 0 tic ma
+SFX W a ic [^m]a
+SFX W y etic thy
+SFX W y ic [^t]hy
+SFX W y tic sy
+SFX W y ic [^hs]y
+SFX W 0 ic [^aelmrsy]
+SFX w Y 9
+SFX w e ical e
+SFX w er rical er
+SFX w 0 ical [^e]r
+SFX w 0 atical [aeiou]m
+SFX w 0 ical [^aeiou]m
+SFX w 0 tical ma
+SFX w a ical [^m]a
+SFX w y ical y
+SFX w 0 ical [^aemry]
+SFX 1 Y 9
+SFX 1 e ically e
+SFX 1 er rically er
+SFX 1 0 ically [^e]r
+SFX 1 0 atically [aeiou]m
+SFX 1 0 ically [^aeiou]m
+SFX 1 0 tically ma
+SFX 1 a ically [^m]a
+SFX 1 y ically y
+SFX 1 0 ically [^aemry]
+SFX 3 Y 21
+SFX 3 e ist [^aceiou]e
+SFX 3 ce tist ce
+SFX 3 0 ist [aeiou]e
+SFX 3 y ist [^aeioubp]y
+SFX 3 0 ist [aeioubp]y
+SFX 3 o ist o
+SFX 3 0 ists [^eoy]
+SFX 3 e ists [^aceiou]e
+SFX 3 ce tists ce
+SFX 3 0 ists [aeiou]e
+SFX 3 y ists [^aeioubp]y
+SFX 3 0 ists [aeioubp]y
+SFX 3 o ists o
+SFX 3 0 ists [^eoy]
+SFX 3 e ist's [^aceiou]e
+SFX 3 ce tist's ce
+SFX 3 0 ist's [aeiou]e
+SFX 3 y ist's [^aeioubp]y
+SFX 3 0 ist's [aeioubp]y
+SFX 3 o ist's o
+SFX 3 0 ist's [^eoy]
[16/50] [abbrv] git commit: [flex-utilities]
[refs/heads/as3httpclient-work] - - Removed the "(TM)" behind "The Works" as
I don't think it's an actual trademark and I dont want the next release to be
vetoed because of me being a little humoristic :-)
Posted by qu...@apache.org.
- Removed the "(TM)" behind "The Works" as I don't think it's an actual trademark and I dont want the next release to be vetoed because of me being a little humoristic :-)
Project: http://git-wip-us.apache.org/repos/asf/flex-utilities/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-utilities/commit/98046356
Tree: http://git-wip-us.apache.org/repos/asf/flex-utilities/tree/98046356
Diff: http://git-wip-us.apache.org/repos/asf/flex-utilities/diff/98046356
Branch: refs/heads/as3httpclient-work
Commit: 9804635634435284bf5623a10d77d91390da6919
Parents: fe3b8b2
Author: Christofer Dutz <ch...@codecentric.de>
Authored: Sat Apr 11 11:19:51 2015 +0200
Committer: Christofer Dutz <ch...@codecentric.de>
Committed: Sat Apr 11 11:19:51 2015 +0200
----------------------------------------------------------------------
mavenizer/README.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/98046356/mavenizer/README.txt
----------------------------------------------------------------------
diff --git a/mavenizer/README.txt b/mavenizer/README.txt
index 9707141..7f84e76 100644
--- a/mavenizer/README.txt
+++ b/mavenizer/README.txt
@@ -164,7 +164,7 @@ Some typical usage scenarios
"... -mavenDir <dir with maven artifacts> -repoUrl <url> \
-repoUsername <username> -repoPassword <pasword> deploy"
- - "The works" (TM): Download, Convert and Deploy using only temp directories:
+ - "The works": Download, Convert and Deploy using only temp directories:
"... -flexVersion 4.14.1 -flashVersions 17.0 -airVersion 17.0 -fontkit \
-repoUrl <url> -repoUsername <username> -repoPassword <pasword> \
download convert deploy"
[23/50] [abbrv] git commit: [flex-utilities]
[refs/heads/as3httpclient-work] - - Reduced the maven-core version to the
minimal one possible.
Posted by qu...@apache.org.
- Reduced the maven-core version to the minimal one possible.
Project: http://git-wip-us.apache.org/repos/asf/flex-utilities/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-utilities/commit/95af18d9
Tree: http://git-wip-us.apache.org/repos/asf/flex-utilities/tree/95af18d9
Diff: http://git-wip-us.apache.org/repos/asf/flex-utilities/diff/95af18d9
Branch: refs/heads/as3httpclient-work
Commit: 95af18d9f22e5d650eaecb39ced94d22b511cea1
Parents: cfcd465
Author: Christofer Dutz <ch...@codecentric.de>
Authored: Sat Apr 18 21:58:19 2015 +0200
Committer: Christofer Dutz <ch...@codecentric.de>
Committed: Sat Apr 18 21:58:19 2015 +0200
----------------------------------------------------------------------
mavenizer/maven-extension/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/95af18d9/mavenizer/maven-extension/pom.xml
----------------------------------------------------------------------
diff --git a/mavenizer/maven-extension/pom.xml b/mavenizer/maven-extension/pom.xml
index 210a4e4..384fba9 100644
--- a/mavenizer/maven-extension/pom.xml
+++ b/mavenizer/maven-extension/pom.xml
@@ -105,7 +105,7 @@
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-core</artifactId>
- <version>3.3.1</version>
+ <version>3.1.1</version>
<scope>provided</scope>
</dependency>
</dependencies>
[03/50] [abbrv] git commit: [flex-utilities]
[refs/heads/as3httpclient-work] - Added missing fontkit pom
Posted by qu...@apache.org.
Added missing fontkit pom
Project: http://git-wip-us.apache.org/repos/asf/flex-utilities/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-utilities/commit/48b73f3a
Tree: http://git-wip-us.apache.org/repos/asf/flex-utilities/tree/48b73f3a
Diff: http://git-wip-us.apache.org/repos/asf/flex-utilities/diff/48b73f3a
Branch: refs/heads/as3httpclient-work
Commit: 48b73f3ae2760390e0912db808705f944c1e7565
Parents: d1de19d
Author: Christofer Dutz <ch...@codecentric.de>
Authored: Fri Apr 10 08:50:01 2015 +0200
Committer: Christofer Dutz <ch...@codecentric.de>
Committed: Fri Apr 10 08:50:01 2015 +0200
----------------------------------------------------------------------
mavenizer/converters/fontkit/pom.xml | 41 +++++++++++++++++++++++++++++++
1 file changed, 41 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/48b73f3a/mavenizer/converters/fontkit/pom.xml
----------------------------------------------------------------------
diff --git a/mavenizer/converters/fontkit/pom.xml b/mavenizer/converters/fontkit/pom.xml
new file mode 100644
index 0000000..3d472e0
--- /dev/null
+++ b/mavenizer/converters/fontkit/pom.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+ 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 xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.flex.utilities.converter</groupId>
+ <artifactId>converters</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>fontkit-converter</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ <packaging>jar</packaging>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.flex.utilities.converter</groupId>
+ <artifactId>base-converter</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ </dependency>
+ </dependencies>
+
+</project>
[29/50] [abbrv] git commit: [flex-utilities]
[refs/heads/as3httpclient-work] - AntOnAIR: specifies swf-version 23 when
building SWC and test SWF to match the 4.0 AIR descriptor in the tests. When
using an SDK newer than 4.0, AIR would quit with 'error wh
Posted by qu...@apache.org.
AntOnAIR: specifies swf-version 23 when building SWC and test SWF to match the 4.0 AIR descriptor in the tests. When using an SDK newer than 4.0, AIR would quit with 'error while loading initial content' when running the tests because the newer SDK would build with a higher swf-version than 23 by default, so it wouldn't be compatible with the 4.0 AIR descriptor.
Project: http://git-wip-us.apache.org/repos/asf/flex-utilities/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-utilities/commit/1e870fd6
Tree: http://git-wip-us.apache.org/repos/asf/flex-utilities/tree/1e870fd6
Diff: http://git-wip-us.apache.org/repos/asf/flex-utilities/diff/1e870fd6
Branch: refs/heads/as3httpclient-work
Commit: 1e870fd61ad5015782798f30fc72f264a72e2845
Parents: 1a46b11
Author: Josh Tynjala <jo...@gmail.com>
Authored: Fri Apr 24 11:59:57 2015 -0700
Committer: Josh Tynjala <jo...@gmail.com>
Committed: Fri Apr 24 11:59:57 2015 -0700
----------------------------------------------------------------------
ant_on_air/build.xml | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/1e870fd6/ant_on_air/build.xml
----------------------------------------------------------------------
diff --git a/ant_on_air/build.xml b/ant_on_air/build.xml
index f83fbba..2048eff 100644
--- a/ant_on_air/build.xml
+++ b/ant_on_air/build.xml
@@ -128,6 +128,7 @@
description="Compiles the SWC.">
<compc
output="${LIBRARY_DIR}/${LIBRARY_NAME}.swc"
+ swf-version="23"
debug="${DEBUG_FLAG}"
failonerror="true"
fork="true"
@@ -158,6 +159,7 @@
<mxmlc file="${basedir}/tests/AntOnAir.mxml"
output="${basedir}/tests/AntOnAir.swf"
debug="${DEBUG_FLAG}"
+ swf-version="23"
failonerror="true"
fork="true"
maxmemory="512m">
[15/50] [abbrv] git commit: [flex-utilities]
[refs/heads/as3httpclient-work] - Merge remote-tracking branch
'origin/develop' into develop
Posted by qu...@apache.org.
Merge remote-tracking branch 'origin/develop' into develop
Project: http://git-wip-us.apache.org/repos/asf/flex-utilities/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-utilities/commit/fe3b8b26
Tree: http://git-wip-us.apache.org/repos/asf/flex-utilities/tree/fe3b8b26
Diff: http://git-wip-us.apache.org/repos/asf/flex-utilities/diff/fe3b8b26
Branch: refs/heads/as3httpclient-work
Commit: fe3b8b26073b6a0c155c81fda26ce9586a526244
Parents: a7e2630 618ae2c
Author: Christofer Dutz <ch...@codecentric.de>
Authored: Sat Apr 11 09:49:37 2015 +0200
Committer: Christofer Dutz <ch...@codecentric.de>
Committed: Sat Apr 11 09:49:37 2015 +0200
----------------------------------------------------------------------
.../spelling/framework/ResourceTable.as | 2 +-
.../com/adobe/linguistics/spelling/SpellUI.as | 143 +-
.../linguistics/spelling/FLEX_34717_Tests.as | 2 +-
.../linguistics/spelling/FLEX_34756_Test.as | 160 +
.../linguistics/spelling/SpellingConfig.xml | 7 +
.../spelling/dictionaries/en_GB/en_GB.aff | 1150 +
.../spelling/dictionaries/en_GB/en_GB.dic | 46281 +++++++++++++++++
mavenizer/README.txt | 6 +-
8 files changed, 47674 insertions(+), 77 deletions(-)
----------------------------------------------------------------------
[38/50] [abbrv] git commit: [flex-utilities]
[refs/heads/as3httpclient-work] - Merge branch 'ant-swf-version' of
https://github.com/joshtynjala/flex-utilities into develop. This closes #4
Posted by qu...@apache.org.
Merge branch 'ant-swf-version' of https://github.com/joshtynjala/flex-utilities into develop. This closes #4
Project: http://git-wip-us.apache.org/repos/asf/flex-utilities/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-utilities/commit/624f41c9
Tree: http://git-wip-us.apache.org/repos/asf/flex-utilities/tree/624f41c9
Diff: http://git-wip-us.apache.org/repos/asf/flex-utilities/diff/624f41c9
Branch: refs/heads/as3httpclient-work
Commit: 624f41c927bb45d462924ff5627704df4c20f842
Parents: 246511d 1e870fd
Author: Alex Harui <ah...@apache.org>
Authored: Tue Apr 28 08:53:42 2015 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Tue Apr 28 09:01:30 2015 -0700
----------------------------------------------------------------------
ant_on_air/build.xml | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
[18/50] [abbrv] git commit: [flex-utilities]
[refs/heads/as3httpclient-work] - - Added slf4j-simple dependency to get rid
of slf4j warnings.
Posted by qu...@apache.org.
- Added slf4j-simple dependency to get rid of slf4j warnings.
Project: http://git-wip-us.apache.org/repos/asf/flex-utilities/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-utilities/commit/6f2441dc
Tree: http://git-wip-us.apache.org/repos/asf/flex-utilities/tree/6f2441dc
Diff: http://git-wip-us.apache.org/repos/asf/flex-utilities/diff/6f2441dc
Branch: refs/heads/as3httpclient-work
Commit: 6f2441dc12766bbd42b3f30bce25a90b816aca7d
Parents: 1697626
Author: Christofer Dutz <ch...@codecentric.de>
Authored: Sat Apr 11 12:49:33 2015 +0200
Committer: Christofer Dutz <ch...@codecentric.de>
Committed: Sat Apr 11 12:49:33 2015 +0200
----------------------------------------------------------------------
mavenizer/cli/pom.xml | 5 +++++
1 file changed, 5 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/6f2441dc/mavenizer/cli/pom.xml
----------------------------------------------------------------------
diff --git a/mavenizer/cli/pom.xml b/mavenizer/cli/pom.xml
index 839838e..5a7449a 100644
--- a/mavenizer/cli/pom.xml
+++ b/mavenizer/cli/pom.xml
@@ -91,6 +91,11 @@
<artifactId>commons-lang3</artifactId>
<version>3.3.2</version>
</dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-simple</artifactId>
+ <version>1.7.7</version>
+ </dependency>
</dependencies>
</project>
[30/50] [abbrv] git commit: [flex-utilities]
[refs/heads/as3httpclient-work] - AntOnAIR: switched from
spark.formatters.DateTimeFormatter to native
flash.globalization.DateTimeFormatter to make project more easily portable to
pure AS3
Posted by qu...@apache.org.
AntOnAIR: switched from spark.formatters.DateTimeFormatter to native flash.globalization.DateTimeFormatter to make project more easily portable to pure AS3
Project: http://git-wip-us.apache.org/repos/asf/flex-utilities/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-utilities/commit/60186382
Tree: http://git-wip-us.apache.org/repos/asf/flex-utilities/tree/60186382
Diff: http://git-wip-us.apache.org/repos/asf/flex-utilities/diff/60186382
Branch: refs/heads/as3httpclient-work
Commit: 60186382d1c8d3e3b486751981ca2ea0c99ca461
Parents: 1a46b11
Author: Josh Tynjala <jo...@gmail.com>
Authored: Fri Apr 24 13:58:25 2015 -0700
Committer: Josh Tynjala <jo...@gmail.com>
Committed: Fri Apr 24 13:58:25 2015 -0700
----------------------------------------------------------------------
ant_on_air/src/org/apache/flex/ant/tags/TStamp.as | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/60186382/ant_on_air/src/org/apache/flex/ant/tags/TStamp.as
----------------------------------------------------------------------
diff --git a/ant_on_air/src/org/apache/flex/ant/tags/TStamp.as b/ant_on_air/src/org/apache/flex/ant/tags/TStamp.as
index 8b7f88b..0646a1f 100644
--- a/ant_on_air/src/org/apache/flex/ant/tags/TStamp.as
+++ b/ant_on_air/src/org/apache/flex/ant/tags/TStamp.as
@@ -21,7 +21,8 @@ package org.apache.flex.ant.tags
import mx.core.IFlexModuleFactory;
import mx.resources.ResourceManager;
- import spark.formatters.DateTimeFormatter;
+ import flash.globalization.DateTimeFormatter;
+ import flash.globalization.LocaleID;
import org.apache.flex.ant.Ant;
import org.apache.flex.ant.tags.supportClasses.TaskHandler;
@@ -44,14 +45,14 @@ package org.apache.flex.ant.tags
super.execute(callbackMode, context);
var d:Date = new Date();
- var df:DateTimeFormatter = new DateTimeFormatter();
- df.dateTimePattern = "yyyyMMdd";
+ var df:DateTimeFormatter = new DateTimeFormatter(LocaleID.DEFAULT);
+ df.setDateTimePattern("yyyyMMdd");
var dstamp:String = df.format(d);
context["DSTAMP"] = dstamp;
- df.dateTimePattern = "hhmm";
+ df.setDateTimePattern("hhmm");
var tstamp:String = df.format(d);
context["TSTAMP"] = tstamp;
- df.dateTimePattern = "MMMM dd yyyy";
+ df.setDateTimePattern("MMMM dd yyyy");
var today:String = df.format(d);
context["TODAY"] = today;
[25/50] [abbrv] git commit: [flex-utilities]
[refs/heads/as3httpclient-work] - - Cleaned up the code a little.
Posted by qu...@apache.org.
- Cleaned up the code a little.
Project: http://git-wip-us.apache.org/repos/asf/flex-utilities/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-utilities/commit/bfe6ba99
Tree: http://git-wip-us.apache.org/repos/asf/flex-utilities/tree/bfe6ba99
Diff: http://git-wip-us.apache.org/repos/asf/flex-utilities/diff/bfe6ba99
Branch: refs/heads/as3httpclient-work
Commit: bfe6ba997093ac3dc7ab315605332a954b0220ed
Parents: 34ba2e8
Author: Christofer Dutz <ch...@codecentric.de>
Authored: Sun Apr 19 12:17:24 2015 +0200
Committer: Christofer Dutz <ch...@codecentric.de>
Committed: Sun Apr 19 12:17:24 2015 +0200
----------------------------------------------------------------------
.../converter/mavenextension/FlexEventSpy.java | 32 ++++++++++++--------
1 file changed, 19 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/bfe6ba99/mavenizer/maven-extension/src/main/java/org/apache/flex/utilities/converter/mavenextension/FlexEventSpy.java
----------------------------------------------------------------------
diff --git a/mavenizer/maven-extension/src/main/java/org/apache/flex/utilities/converter/mavenextension/FlexEventSpy.java b/mavenizer/maven-extension/src/main/java/org/apache/flex/utilities/converter/mavenextension/FlexEventSpy.java
index a378f98..f275677 100644
--- a/mavenizer/maven-extension/src/main/java/org/apache/flex/utilities/converter/mavenextension/FlexEventSpy.java
+++ b/mavenizer/maven-extension/src/main/java/org/apache/flex/utilities/converter/mavenextension/FlexEventSpy.java
@@ -24,6 +24,11 @@ import javax.inject.Singleton;
import java.io.File;
/**
+ * Maven EventSpy that listens for resolution requests and in case of Flex related
+ * artifacts, it pre-checks their availability. If they are not available, it uses
+ * the apache flex sdk converter to automatically download and convert the missing
+ * artifacts before continuing the build normally.
+ *
* Created by christoferdutz on 17.04.15.
*/
@Named
@@ -60,26 +65,27 @@ public class FlexEventSpy extends AbstractEventSpy {
internalLookup = true;
Artifact artifact = repositoryEvent.getArtifact();
if (artifact.getGroupId().startsWith("org.apache.flex")) {
+ // Output a cool spash-screen ... sorry for that ... couldn't resist :-)
if(!flexSplashScreenShown) {
showFlexSplashScreen();
}
- if(resolve(artifact.getGroupId(), artifact.getArtifactId(), artifact.getVersion(),
- artifact.getExtension(), artifact.getClassifier()) == null) {
+ if(!canResolve(artifact.getGroupId(), artifact.getArtifactId(), artifact.getVersion(),
+ artifact.getExtension(), artifact.getClassifier())) {
initFlex(artifact.getVersion());
}
} else if (artifact.getGroupId().startsWith("com.adobe.flash")) {
- if(resolve(artifact.getGroupId(), artifact.getArtifactId(), artifact.getVersion(),
- artifact.getExtension(), artifact.getClassifier()) == null) {
+ if(!canResolve(artifact.getGroupId(), artifact.getArtifactId(), artifact.getVersion(),
+ artifact.getExtension(), artifact.getClassifier())) {
initFlash(artifact.getVersion());
}
} else if (artifact.getGroupId().startsWith("com.adobe.air")) {
- if(resolve(artifact.getGroupId(), artifact.getArtifactId(), artifact.getVersion(),
- artifact.getExtension(), artifact.getClassifier()) == null) {
+ if(!canResolve(artifact.getGroupId(), artifact.getArtifactId(), artifact.getVersion(),
+ artifact.getExtension(), artifact.getClassifier())) {
initAir(artifact.getVersion());
}
} else if (artifact.getGroupId().equals("com.adobe") && artifact.getArtifactId().equals("fontkit")) {
- if(resolve(artifact.getGroupId(), artifact.getArtifactId(), artifact.getVersion(),
- artifact.getExtension(), artifact.getClassifier()) == null) {
+ if(!canResolve(artifact.getGroupId(), artifact.getArtifactId(), artifact.getVersion(),
+ artifact.getExtension(), artifact.getClassifier())) {
initFontkit();
}
}
@@ -91,8 +97,8 @@ public class FlexEventSpy extends AbstractEventSpy {
}
}
- protected org.apache.maven.artifact.Artifact resolve(String groupId, String artifactId, String version,
- String type, String classifier) {
+ protected boolean canResolve(String groupId, String artifactId, String version,
+ String type, String classifier) {
org.apache.maven.artifact.Artifact artifact;
if((classifier == null) || (classifier.length() == 0)) {
artifact = repositorySystem.createArtifact(groupId, artifactId, version, type);
@@ -107,13 +113,13 @@ public class FlexEventSpy extends AbstractEventSpy {
req.setRemoteRepositories(mavenSession.getRequest().getRemoteRepositories());
ArtifactResolutionResult res = repositorySystem.resolve(req);
if (!res.isSuccess()) {
- return null;
+ return false;
}
} catch (Exception e) {
- return null;
+ return false;
}
}
- return artifact;
+ return true;
}
protected void initFlex(String version) throws MavenExecutionException {
[40/50] [abbrv] git commit: [flex-utilities]
[refs/heads/as3httpclient-work] - Merge branch
'ant-replacetoken-replacevalue' of
https://github.com/joshtynjala/flex-utilities into develop. This closes #6
Posted by qu...@apache.org.
Merge branch 'ant-replacetoken-replacevalue' of https://github.com/joshtynjala/flex-utilities into develop. This closes #6
Project: http://git-wip-us.apache.org/repos/asf/flex-utilities/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-utilities/commit/cb3fbd25
Tree: http://git-wip-us.apache.org/repos/asf/flex-utilities/tree/cb3fbd25
Diff: http://git-wip-us.apache.org/repos/asf/flex-utilities/diff/cb3fbd25
Branch: refs/heads/as3httpclient-work
Commit: cb3fbd25cd424ac5dced936476a26cb62d7ffe9e
Parents: 3388508 c45b078
Author: Alex Harui <ah...@apache.org>
Authored: Tue Apr 28 09:10:48 2015 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Tue Apr 28 09:16:32 2015 -0700
----------------------------------------------------------------------
.../src/org/apache/flex/ant/tags/Replace.as | 25 +++++++++--
.../org/apache/flex/ant/tags/ReplaceToken.as | 44 ++++++++++++++++++++
.../org/apache/flex/ant/tags/ReplaceValue.as | 44 ++++++++++++++++++++
ant_on_air/tests/test.xml | 23 +++++++++-
4 files changed, 131 insertions(+), 5 deletions(-)
----------------------------------------------------------------------