You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flex.apache.org by jm...@apache.org on 2013/10/08 16:03:53 UTC
[38/62] [abbrv] [partial] Merged Apache Flex 4.9.0 release branch
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/f690ea2f/frameworks/projects/textLayout/bundles/ko_KR/textLayout.properties
----------------------------------------------------------------------
diff --git a/frameworks/projects/textLayout/bundles/ko_KR/textLayout.properties b/frameworks/projects/textLayout/bundles/ko_KR/textLayout.properties
new file mode 100644
index 0000000..fe7583b
--- /dev/null
+++ b/frameworks/projects/textLayout/bundles/ko_KR/textLayout.properties
@@ -0,0 +1,58 @@
+################################################################################
+##
+## 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.
+##
+################################################################################
+
+## Developer RTE Section
+
+missingStringResource=리소스 {0}에 대한 문자열이 없습니다.
+
+# Core errors
+
+invalidFlowElementConstruct=잘못된 FlowElement 하위 클래스를 생성하려고 했습니다.
+invalidSplitAtPosition=splitAtPosition에 대한 매개 변수가 잘못되었습니다.
+badMXMLChildrenArgument=유형 {0}의 잘못된 요소가 mxmlChildren으로 전달되었습니다.
+badReplaceChildrenIndex=FlowGroupElement.replaceChildren에 대한 인덱스가 범위를 벗어났습니다.
+invalidChildType=NewElement의 유형이 상위 항목이 될 수 는 유형이 아닙니다.
+badRemoveChild=제거할 하위 항목이 없습니다.
+invalidSplitAtIndex=splitAtIndex에 대한 매개 변수가 잘못되었습니다.
+badShallowCopyRange=shallowCopy에서 범위가 잘못되었습니다.
+badSurrogatePairCopy=SpanElement.shallowCopy에서 서로게이트 쌍을 절반만 복사
+invalidReplaceTextPositions=잘못된 위치가 SpanElement.replaceText로 전달되었습니다.
+invalidSurrogatePairSplit=서로게이트 쌍이 잘못 분할되었습니다.
+badPropertyValue=속성 {0} 값 {1}이(가) 범위를 벗어났습니다.
+
+# Selection/editing
+
+illegalOperation={0} 작업을 잘못 실행하려고 했습니다.
+
+# Shared import errors
+
+unexpectedXMLElementInSpan=범위 내 예기치 못한 요소 {0}이(가) 있습니다.
+unexpectedNamespace=예기치 못한 네임스페이스 {0}이(가) 있습니다.
+unknownElement=알 수 없는 요소 {0}입니다.
+unknownAttribute=요소 {1}에는 특성 {0}이(가) 허용되지 않습니다.
+
+# TEXT_FIELD_HTML_FORMAT import errors
+
+malformedTag=태그 {0}의 형식이 잘못되었습니다.
+malformedMarkup=마크업 {0}의 형식이 잘못되었습니다.
+
+# TEXT_LAYOUT_FORMAT import errors
+
+missingTextFlow=파싱할 TextFlow가 없습니다.
+expectedExactlyOneTextLayoutFormat={0} 에 한 개 또한 오직 한 개의 TextLayoutFormat이 필요합니다.
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/f690ea2f/frameworks/projects/textLayout/bundles/nb_NO/textLayout.properties
----------------------------------------------------------------------
diff --git a/frameworks/projects/textLayout/bundles/nb_NO/textLayout.properties b/frameworks/projects/textLayout/bundles/nb_NO/textLayout.properties
new file mode 100644
index 0000000..6ed6039
--- /dev/null
+++ b/frameworks/projects/textLayout/bundles/nb_NO/textLayout.properties
@@ -0,0 +1,58 @@
+################################################################################
+##
+## 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.
+##
+################################################################################
+
+## Developer RTE Section
+
+missingStringResource=Ingen streng for ressursen {0}
+
+# Core errors
+
+invalidFlowElementConstruct=Forsøk på å lage ugyldig FlowElement-underklasse
+invalidSplitAtPosition=Ugyldig parameter til splitAtPosition
+badMXMLChildrenArgument=Ugyldig element av typen {0} sendt til mxmlChildren
+badReplaceChildrenIndex=Indeks utenfor område til FlowGroupElement.replaceChildren
+invalidChildType=NewElement er ikke en type som dette kan være en overordnet for
+badRemoveChild=Finner ikke underordnet som skal fjernes
+invalidSplitAtIndex=Ugyldig parameter til splitAtIndex
+badShallowCopyRange=Ugyldig område i shallowCopy
+badSurrogatePairCopy=Kopierer bare halvparten av et surrogatpar i SpanElement.shallowCopy
+invalidReplaceTextPositions=Ugyldige plasseringer sendt til SpanElement.replaceText
+invalidSurrogatePairSplit=Ugyldig deling av surrogatpar
+badPropertyValue=Egenskap {0} verdi {1} er utenfor område
+
+# Selection/editing
+
+illegalOperation=Ulovlig forsøk på å kjøre operasjonen {0}
+
+# Shared import errors
+
+unexpectedXMLElementInSpan=Uventet element {0} i span
+unexpectedNamespace=Uventet navneområde {0}
+unknownElement=Ukjent element {0}
+unknownAttribute=Attributtet {0} er ikke tillatt i elementet {1}
+
+# TEXT_FIELD_HTML_FORMAT import errors
+
+malformedTag=Feilformatert kode {0}
+malformedMarkup=Feilformatert koding {0}
+
+# TEXT_LAYOUT_FORMAT import errors
+
+missingTextFlow=Ingen TextFlow å analysere
+expectedExactlyOneTextLayoutFormat=Forventet én og bare én TextLayoutFormat i {0}
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/f690ea2f/frameworks/projects/textLayout/bundles/nl_NL/textLayout.properties
----------------------------------------------------------------------
diff --git a/frameworks/projects/textLayout/bundles/nl_NL/textLayout.properties b/frameworks/projects/textLayout/bundles/nl_NL/textLayout.properties
new file mode 100644
index 0000000..b4b87da
--- /dev/null
+++ b/frameworks/projects/textLayout/bundles/nl_NL/textLayout.properties
@@ -0,0 +1,58 @@
+################################################################################
+##
+## 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.
+##
+################################################################################
+
+## Developer RTE Section
+
+missingStringResource=Geen tekenreeks voor resource {0}
+
+# Core errors
+
+invalidFlowElementConstruct=Poging tot samenstellen van ongeldige FlowElement-subklasse
+invalidSplitAtPosition=Ongeldige parameter naar splitAtPosition
+badMXMLChildrenArgument=Ongeldig element van type {0} doorgegeven aan mxmlChildren
+badReplaceChildrenIndex=Index naar FlowGroupElement.replaceChildren buiten bereik
+invalidChildType=NewElement niet van een type dat dit als bovenliggend element kan hebben
+badRemoveChild=Te verwijderen onderliggend element niet gevonden
+invalidSplitAtIndex=Ongeldige parameter naar splitAtIndex
+badShallowCopyRange=Ongeldig bereik in shallowCopy
+badSurrogatePairCopy=Alleen de helft van een vervangend paar in SpanElement.shallowCopy wordt gekopieerd
+invalidReplaceTextPositions=Ongeldige posities doorgegeven aan SpanElement.replaceText
+invalidSurrogatePairSplit=Ongeldige splitsing van een vervangend paar
+badPropertyValue=Waarde {1} van eigenschap {0} valt buiten bereik
+
+# Selection/editing
+
+illegalOperation=Ongeldige poging om {0}-bewerking uit te voeren
+
+# Shared import errors
+
+unexpectedXMLElementInSpan=Onverwacht element {0} binnen een span
+unexpectedNamespace=Onverwachte naamruimte {0}
+unknownElement=Onbekend element {0}
+unknownAttribute=Kenmerk {0] niet toegestaan in element {1}
+
+# TEXT_FIELD_HTML_FORMAT import errors
+
+malformedTag=Onjuist ingedeelde code {0}
+malformedMarkup=Onjuist ingedeelde markering {0}
+
+# TEXT_LAYOUT_FORMAT import errors
+
+missingTextFlow=Er is geen TextFlow om te parseren
+expectedExactlyOneTextLayoutFormat=Er werd slechts één, en niet meer dan één, TextLayoutFormat in {0} verwacht
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/f690ea2f/frameworks/projects/textLayout/bundles/pt_BR/textLayout.properties
----------------------------------------------------------------------
diff --git a/frameworks/projects/textLayout/bundles/pt_BR/textLayout.properties b/frameworks/projects/textLayout/bundles/pt_BR/textLayout.properties
new file mode 100644
index 0000000..caa602d
--- /dev/null
+++ b/frameworks/projects/textLayout/bundles/pt_BR/textLayout.properties
@@ -0,0 +1,58 @@
+################################################################################
+##
+## 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.
+##
+################################################################################
+
+## Developer RTE Section
+
+missingStringResource=Nenhuma string para o recurso {0}
+
+# Core errors
+
+invalidFlowElementConstruct=Tentativa de construção de uma subclasse FlowElement inválida
+invalidSplitAtPosition=Parâmetro inválido para splitAtPosition
+badMXMLChildrenArgument=Elemento incorreto do tipo {0} passado para mxmlChildren
+badReplaceChildrenIndex=Índice fora de intervalo para FlowGroupElement.replaceChildren
+invalidChildType=NewElement não é de um tipo do qual este possa ser pai
+badRemoveChild=O filho a ser removido não foi encontrado
+invalidSplitAtIndex=Parâmetro inválido para splitAtIndex
+badShallowCopyRange=Intervalo incorreto em shallowCopy
+badSurrogatePairCopy=Copiando somente metade de um par substituto em SpanElement.shallowCopy
+invalidReplaceTextPositions=Posições inválidas passadas para SpanElement.replaceText
+invalidSurrogatePairSplit=Divisão inválida de um par substituto
+badPropertyValue=O valor {1) da propriedade {0} está fora de intervalo
+
+# Selection/editing
+
+illegalOperation=Tentativa ilegal de executar a operação {0}
+
+# Shared import errors
+
+unexpectedXMLElementInSpan=Elemento inesperado {0} dentro de uma expansão
+unexpectedNamespace=Namespace inesperado {0}
+unknownElement=Elemento desconhecido {0}
+unknownAttribute=Atributo {0} não permitido no elemento {1}
+
+# TEXT_FIELD_HTML_FORMAT import errors
+
+malformedTag=Marca mal formada {0}
+malformedMarkup=Marcação mal formada {0}
+
+# TEXT_LAYOUT_FORMAT import errors
+
+missingTextFlow=Nenhum TextFlow para analisar
+expectedExactlyOneTextLayoutFormat=Era esperado um e somente um TextLayoutFormat em {0}
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/f690ea2f/frameworks/projects/textLayout/bundles/pt_PT/textLayout.properties
----------------------------------------------------------------------
diff --git a/frameworks/projects/textLayout/bundles/pt_PT/textLayout.properties b/frameworks/projects/textLayout/bundles/pt_PT/textLayout.properties
new file mode 100644
index 0000000..ae8478d
--- /dev/null
+++ b/frameworks/projects/textLayout/bundles/pt_PT/textLayout.properties
@@ -0,0 +1,58 @@
+################################################################################
+##
+## 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.
+##
+################################################################################
+
+## Developer RTE Section
+
+missingStringResource=Náo existe nenhuma string para o recurso [[0]]
+
+# Core errors
+
+invalidFlowElementConstruct=Tentativa inválida de construção da subclasse FlowElement
+invalidSplitAtPosition=Parâmetro inválido para splitAtPosition
+badMXMLChildrenArgument=Elemento do tipo [[0]] errado passsado ao mxmlChildren
+badReplaceChildrenIndex=Index para FlowGroupElement.replaceChildren está fora do alcance
+invalidChildType=NewElement não é de um tipo de que este possa ser pai
+badRemoveChild=Child para remover não encontrada
+invalidSplitAtIndex=Parâmetro inválido para splitAtIndex
+badShallowCopyRange=Intervalo errado em shallowCopy
+badSurrogatePairCopy=A copiar somente metade de um par substituto em SpanElement.shallowCopy
+invalidReplaceTextPositions=Posições inválidas passadas a SpanElement.replaceText
+invalidSurrogatePairSplit=Divisão inválida de um par subsituto
+badPropertyValue=Propriedade [[0]] valor [[1]] está for do alcance
+
+# Selection/editing
+
+illegalOperation=Tentativa ilegal de executar a operação [[0]]
+
+# Shared import errors
+
+unexpectedXMLElementInSpan=Elemento [[0]] inesperado dentro de um span
+unexpectedNamespace=Namespace [[0]] inesperado
+unknownElement=Elemento [[0]] desconhecido
+unknownAttribute=Atributo [[0]] não é permtido no elemento [[1]]
+
+# TEXT_FIELD_HTML_FORMAT import errors
+
+malformedTag=Tag [[0]] malformada
+malformedMarkup=Markup [[0]] malformado
+
+# TEXT_LAYOUT_FORMAT import errors
+
+missingTextFlow=Não existe nenhum TextFlow para analisar
+expectedExactlyOneTextLayoutFormat=Esperado um, e só um, TextLayoutFormat em [[0]]
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/f690ea2f/frameworks/projects/textLayout/bundles/ru_RU/textLayout.properties
----------------------------------------------------------------------
diff --git a/frameworks/projects/textLayout/bundles/ru_RU/textLayout.properties b/frameworks/projects/textLayout/bundles/ru_RU/textLayout.properties
new file mode 100644
index 0000000..c699f32
--- /dev/null
+++ b/frameworks/projects/textLayout/bundles/ru_RU/textLayout.properties
@@ -0,0 +1,58 @@
+################################################################################
+##
+## 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.
+##
+################################################################################
+
+## Developer RTE Section
+
+missingStringResource=Отсутствует строка для ресурса {0}
+
+# Core errors
+
+invalidFlowElementConstruct=Выполнена попытка создания недопустимого подкласса FlowElement
+invalidSplitAtPosition=Недействительный параметр для splitAtPosition
+badMXMLChildrenArgument=Недопустимый элемент типа {0} передан в mxmlChildren
+badReplaceChildrenIndex=Индекс для FlowGroupElement.replaceChildren находится за пределами допустимого диапазона
+invalidChildType=NewElement не является возможным нижестоящим типом для данного элемента
+badRemoveChild=Не найден нижестоящий элемент для удаления
+invalidSplitAtIndex=Недействительный параметр для splitAtIndex
+badShallowCopyRange=Недопустимый диапазон в shallowCopy
+badSurrogatePairCopy=Выполняется копирование только половины суррогатной пары в SpanElement.shallowCopy
+invalidReplaceTextPositions=Недействительные позиции переданы в SpanElement.replaceText
+invalidSurrogatePairSplit=Недействительное разделение суррогатной пары
+badPropertyValue=Указанное для свойства {0} значение {1} находится за пределами допустимого диапазона
+
+# Selection/editing
+
+illegalOperation=Недопустимая попытка выполнения операции {0}
+
+# Shared import errors
+
+unexpectedXMLElementInSpan=Непредвиденный элемент {0} в диапазоне
+unexpectedNamespace=Непредвиденное пространство имен {0}
+unknownElement=Неизвестный элемент {0}
+unknownAttribute=Атрибут {0} не разрешен для элемента {1}
+
+# TEXT_FIELD_HTML_FORMAT import errors
+
+malformedTag=Недопустимый тег {0}
+malformedMarkup=Недопустимая разметка {0}
+
+# TEXT_LAYOUT_FORMAT import errors
+
+missingTextFlow=Отсутствует TextFlow для анализа
+expectedExactlyOneTextLayoutFormat=Ожидался только один TextLayoutFormat в {0}
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/f690ea2f/frameworks/projects/textLayout/bundles/sv_SE/textLayout.properties
----------------------------------------------------------------------
diff --git a/frameworks/projects/textLayout/bundles/sv_SE/textLayout.properties b/frameworks/projects/textLayout/bundles/sv_SE/textLayout.properties
new file mode 100644
index 0000000..4e841aa
--- /dev/null
+++ b/frameworks/projects/textLayout/bundles/sv_SE/textLayout.properties
@@ -0,0 +1,58 @@
+################################################################################
+##
+## 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.
+##
+################################################################################
+
+## Developer RTE Section
+
+missingStringResource=Sträng saknas för resurs {0}
+
+# Core errors
+
+invalidFlowElementConstruct=Försök att konstruera ogiltig FlowElement-underklass
+invalidSplitAtPosition=Ogiltig parameter till splitAtPosition
+badMXMLChildrenArgument=Felaktigt element av typen {0} skickades till mxmlChildren
+badReplaceChildrenIndex=Index utanför intervallet: FlowGroupElement.replaceChildren
+invalidChildType=Typen som NewElement tillhör innebär att detta inte kan vara överordnat
+badRemoveChild=Underordnad som ska tas bort hittades inte
+invalidSplitAtIndex=Ogiltig parameter till splitAtIndex
+badShallowCopyRange=Felaktigt intervall i shallowCopy
+badSurrogatePairCopy=Endast hälften av surrogatparet i SpanElement.shallowCopy kopieras
+invalidReplaceTextPositions=Ogiltiga positioner skickades till SpanElement.replaceText
+invalidSurrogatePairSplit=Ogiltig delning av surrogatpar
+badPropertyValue=Egenskapen {0} och värde {1} är utanför intervallet
+
+# Selection/editing
+
+illegalOperation=Ogiltigt försök att köra åtgärden {0}
+
+# Shared import errors
+
+unexpectedXMLElementInSpan=Oväntat element {0} inom intervall
+unexpectedNamespace=Oväntat namnutrymme {0}
+unknownElement=Okänt element: {0}
+unknownAttribute=Attributet {0} är inte tillåtet i element {1}
+
+# TEXT_FIELD_HTML_FORMAT import errors
+
+malformedTag=Felaktig tagg {0}
+malformedMarkup=Felaktig markering {0}
+
+# TEXT_LAYOUT_FORMAT import errors
+
+missingTextFlow=Det finns inget TextFlow som kan tolkas
+expectedExactlyOneTextLayoutFormat=Endast en TextLayoutFormat förväntades i {0}
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/f690ea2f/frameworks/projects/textLayout/bundles/zh_CN/textLayout.properties
----------------------------------------------------------------------
diff --git a/frameworks/projects/textLayout/bundles/zh_CN/textLayout.properties b/frameworks/projects/textLayout/bundles/zh_CN/textLayout.properties
new file mode 100644
index 0000000..5898d55
--- /dev/null
+++ b/frameworks/projects/textLayout/bundles/zh_CN/textLayout.properties
@@ -0,0 +1,58 @@
+################################################################################
+##
+## 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.
+##
+################################################################################
+
+## Developer RTE Section
+
+missingStringResource=资源 {0} 没有字符串
+
+# Core errors
+
+invalidFlowElementConstruct=尝试构造无效 FlowElement 子类
+invalidSplitAtPosition=splitAtPosition 的参数无效
+badMXMLChildrenArgument=传递给 mxmlChildren 的类型 {0} 的元素错误
+badReplaceChildrenIndex=FlowGroupElement.replaceChildren 的索引超出范围
+invalidChildType=NewElement 不属于此项可作为其父代的类型
+badRemoveChild=找不到要删除的子代
+invalidSplitAtIndex=splitAtIndex 的参数无效
+badShallowCopyRange=shallowCopy 的范围错误
+badSurrogatePairCopy=仅复制了 SpanElement.shallowCopy 中代理对的一半
+invalidReplaceTextPositions=传递给 SpanElement.replaceText 的位置无效
+invalidSurrogatePairSplit=分割代理对无效
+badPropertyValue=属性 {0} 值 {1} 超出范围
+
+# Selection/editing
+
+illegalOperation=尝试执行 {0} 操作非法
+
+# Shared import errors
+
+unexpectedXMLElementInSpan=跨距中有意外元素 {0}
+unexpectedNamespace=意外命名空间 {0}
+unknownElement=未知元素 {0}
+unknownAttribute=元素 {1} 中不允许有属性 {0}
+
+# TEXT_FIELD_HTML_FORMAT import errors
+
+malformedTag=标签 {0} 格式不正确
+malformedMarkup=标记 {0} 格式不正确
+
+# TEXT_LAYOUT_FORMAT import errors
+
+missingTextFlow=没有要分析的 TextFlow
+expectedExactlyOneTextLayoutFormat={0} 中应有且仅有一个 TextLayoutFormat
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/f690ea2f/frameworks/projects/textLayout/bundles/zh_TW/textLayout.properties
----------------------------------------------------------------------
diff --git a/frameworks/projects/textLayout/bundles/zh_TW/textLayout.properties b/frameworks/projects/textLayout/bundles/zh_TW/textLayout.properties
new file mode 100644
index 0000000..ed0fe19
--- /dev/null
+++ b/frameworks/projects/textLayout/bundles/zh_TW/textLayout.properties
@@ -0,0 +1,58 @@
+################################################################################
+##
+## 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.
+##
+################################################################################
+
+## Developer RTE Section
+
+missingStringResource=資源 {0} 沒有字串
+
+# Core errors
+
+invalidFlowElementConstruct=嘗試建構無效的 FlowElement 子類別
+invalidSplitAtPosition=splitAtPosition 的參數無效
+badMXMLChildrenArgument=傳遞到 mxmlChildren 的類型 {0} 的元素錯誤
+badReplaceChildrenIndex=FlowGroupElement.replaceChildren 索引超出範圍
+invalidChildType=NewElement 不屬於此項目可做為其父項的類型
+badRemoveChild=找不到要移除的子項
+invalidSplitAtIndex=splitAtIndex 的參數無效
+badShallowCopyRange=shallowCopy 的範圍錯誤
+badSurrogatePairCopy=SpanElement.shallowCopy 的替代配對只複製一半
+invalidReplaceTextPositions=傳遞到 SpanElement.replaceText 的位置無效
+invalidSurrogatePairSplit=替代配對分割無效
+badPropertyValue=屬性 {0} 值 {1} 超出範圍
+
+# Selection/editing
+
+illegalOperation=執行 {0} 作業的嘗試不合法
+
+# Shared import errors
+
+unexpectedXMLElementInSpan=跨距內有非預期的元素 {0}
+unexpectedNamespace=非預期的命名空間 {0}
+unknownElement=不明元素 {0}
+unknownAttribute=元素 {1} 中不允許有屬性 {0}
+
+# TEXT_FIELD_HTML_FORMAT import errors
+
+malformedTag=格式錯誤的標籤 {0}
+malformedMarkup=格式錯誤的標記 {0}
+
+# TEXT_LAYOUT_FORMAT import errors
+
+missingTextFlow=沒有 TextFlow 可剖析
+expectedExactlyOneTextLayoutFormat={0} 應該有一個且只有一個 TextLayoutFormat
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/f690ea2f/frameworks/projects/textLayout/compile-config.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/textLayout/compile-config.xml b/frameworks/projects/textLayout/compile-config.xml
new file mode 100644
index 0000000..edd670f
--- /dev/null
+++ b/frameworks/projects/textLayout/compile-config.xml
@@ -0,0 +1,67 @@
+<!--
+
+ 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.
+
+-->
+<flex-config>
+ <compiler>
+ <external-library-path>
+ <path-element>${env.PLAYERGLOBAL_HOME}/${playerglobal.version}/playerglobal.swc</path-element>
+ </external-library-path>
+
+ <keep-as3-metadata>
+ <name>IMXMLObject</name>
+ </keep-as3-metadata>
+
+ <locale/>
+
+ <library-path/>
+
+ <namespaces>
+ <namespace>
+ <uri>library://ns.adobe.com/flashx/textLayout</uri>
+ <manifest>${source.dir}/manifest.xml</manifest>
+ </namespace>
+ </namespaces>
+
+ <source-path>
+ <path-element>${source.dir}/src</path-element>
+ </source-path>
+
+ <show-actionscript-warnings>false</show-actionscript-warnings>
+ </compiler>
+
+ <compute-digest>true</compute-digest>
+
+ <include-classes>
+ <class>flashx.textLayout.CoreClasses</class>
+ <class>flashx.textLayout.EditClasses</class>
+ <class>flashx.textLayout.ConversionClasses</class>
+ </include-classes>
+
+ <include-file>
+ <name>manifest.xml</name>
+ <path>${source.dir}/manifest.xml</path>
+ </include-file>
+
+ <include-namespaces>
+ <uri>library://ns.adobe.com/flashx/textLayout</uri>
+ </include-namespaces>
+
+ <resource-bundle-list>bundles.properties</resource-bundle-list>
+
+ <target-player>${playerglobal.version}</target-player>
+</flex-config>
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/f690ea2f/frameworks/projects/tool/build.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/tool/build.xml b/frameworks/projects/tool/build.xml
index 719dc62..7bdb178 100644
--- a/frameworks/projects/tool/build.xml
+++ b/frameworks/projects/tool/build.xml
@@ -60,28 +60,9 @@
<compc fork="true"
output="${FLEX_HOME}/frameworks/libs/automation/tool.swc">
<jvmarg line="${compc.jvm.args}"/>
- <target-player>${playerglobal.version}</target-player>
- <include-classes>ToolClasses</include-classes>
- <source-path path-element="${basedir}/src"/>
- <source-path path-element="${FLEX_HOME}/frameworks/projects/automation/src"/>
- <source-path path-element="${FLEX_HOME}/frameworks/projects/automation_spark/src"/>
- <library-path/>
- <external-library-path dir="${env.PLAYERGLOBAL_HOME}">
- <include name="${playerglobal.version}/playerglobal.swc"/>
- </external-library-path>
- <external-library-path dir="${FLEX_HOME}/frameworks/libs">
- <include name="automation/automation_agent.swc"/>
- <include name="framework.swc"/>
- <include name="mx/mx.swc"/>
- <include name="advancedgrids.swc"/>
- <include name="charts.swc"/>
- <include name="spark.swc"/>
- <include name="textLayout.swc"/>
- <include name="automation/automation_dmv.swc"/>
- <include name="datavisualization.swc"/>
- </external-library-path>
- <locale/>
- <accessible>true</accessible>
+ <load-config filename="compile-config.xml" />
+ <arg value="+playerglobal.version=${playerglobal.version}" />
+ <arg value="+env.PLAYERGLOBAL_HOME=${env.PLAYERGLOBAL_HOME}" />
</compc>
</target>
</project>
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/f690ea2f/frameworks/projects/tool/compile-config.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/tool/compile-config.xml b/frameworks/projects/tool/compile-config.xml
new file mode 100644
index 0000000..2a13816
--- /dev/null
+++ b/frameworks/projects/tool/compile-config.xml
@@ -0,0 +1,54 @@
+<!--
+
+ 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.
+
+-->
+<flex-config>
+
+ <compiler>
+ <accessible>true</accessible>
+
+ <external-library-path>
+ <path-element>${env.PLAYERGLOBAL_HOME}/${playerglobal.version}/playerglobal.swc</path-element>
+ <path-element>../../libs/framework.swc</path-element>
+ <path-element>../../libs/mx/mx.swc</path-element>
+ <path-element>../../libs/textLayout.swc</path-element>
+ <path-element>../../libs/advancedgrids.swc</path-element>
+ <path-element>../../libs/charts.swc</path-element>
+ <path-element>../../libs/spark.swc</path-element>
+ <path-element>../../libs/automation/automation_agent.swc</path-element>
+ <path-element>../../libs/automation/automation_dmv.swc</path-element>
+ </external-library-path>
+
+ <locale/>
+
+ <library-path/>
+
+ <source-path>
+ <path-element>src</path-element>
+ <path-element>../automation/src</path-element>
+ <path-element>../automation_spark/src</path-element>
+ </source-path>
+
+ <warn-no-constructor>false</warn-no-constructor>
+ </compiler>
+
+ <include-classes>
+ <class>ToolClasses</class>
+ </include-classes>
+
+ <target-player>${playerglobal.version}</target-player>
+</flex-config>
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/f690ea2f/frameworks/projects/tool_air/build.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/tool_air/build.xml b/frameworks/projects/tool_air/build.xml
index a934993..4a83dbc 100644
--- a/frameworks/projects/tool_air/build.xml
+++ b/frameworks/projects/tool_air/build.xml
@@ -64,33 +64,11 @@
-->
<compc fork="true"
- output="${FLEX_HOME}/frameworks/libs/automation/tool_air.swc"
- resource-bundle-list="${basedir}/bundles.properties">
+ output="${FLEX_HOME}/frameworks/libs/automation/tool_air.swc">
<jvmarg line="${compc.jvm.args}"/>
- <target-player>${playerglobal.version}</target-player>
- <include-classes>ToolAIRClasses</include-classes>
- <source-path path-element="${basedir}/src"/>
- <source-path path-element="${FLEX_HOME}/frameworks/projects/automation/src"/>
- <source-path path-element="${FLEX_HOME}/frameworks/projects/automation_air/src"/>
- <source-path path-element="${FLEX_HOME}/frameworks/projects/automation_spark/src"/>
-
- <library-path/>
- <external-library-path dir="${env.AIR_HOME}/frameworks/libs/air">
- <include name="airglobal.swc"/>
- </external-library-path>
- <external-library-path dir="${FLEX_HOME}/frameworks/libs">
- <include name="framework.swc"/>
- <include name="mx/mx.swc"/>
- <include name="advancedgrids.swc"/>
- <include name="charts.swc"/>
- <include name="spark.swc"/>
- <include name="textLayout.swc"/>
- <include name="automation/automation_agent.swc"/>
- <include name="automation/automation_dmv.swc"/>
- <include name="datavisualization.swc"/>
- </external-library-path>
- <locale/>
- <accessible>true</accessible>
+ <load-config filename="compile-config.xml" />
+ <arg value="+playerglobal.version=${playerglobal.version}" />
+ <arg value="+env.AIR_HOME=${env.AIR_HOME}" />
</compc>
</target>
@@ -102,25 +80,12 @@
<!-- because targets that run before flexTasks.jar gets built would fail. -->
<taskdef resource="flexTasks.tasks" classpath="${FLEX_HOME}/lib/flexTasks.jar"/>
<compc fork="true"
- output="${FLEX_HOME}/frameworks/locale/${locale}/tool_air_rb.swc"
- locale="${locale}">
-
- <target-player>11</target-player>
+ output="${FLEX_HOME}/frameworks/locale/${locale}/tool_air_rb.swc">
<jvmarg line="${compc.jvm.args}"/>
-
- <include-resource-bundles bundle="tool_air"/>
-
- <include-namespaces/>
- <include-classes/>
-
- <source-path path-element="${basedir}/bundles/${locale}"/>
- <source-path path-element="${FLEX_HOME}/frameworks/projects/framework/src"/>
-
- <include-libraries/>
- <library-path/>
- <external-library-path dir="${FLEX_HOME}/frameworks/libs">
- <include name="player/${local.playerglobal.version}/playerglobal.swc"/>
- </external-library-path>
+ <load-config filename="bundle-config.xml" />
+ <arg value="+playerglobal.version=${playerglobal.version}" />
+ <arg value="+env.PLAYERGLOBAL_HOME=${env.PLAYERGLOBAL_HOME}" />
+ <arg value="+locale=${locale}" />
</compc>
</target>
@@ -137,6 +102,9 @@
<param name="locale" value="de_DE"/>
</antcall>
<antcall target="tool_air_bundles">
+ <param name="locale" value="de_CH"/>
+ </antcall>
+ <antcall target="tool_air_bundles">
<param name="locale" value="en_US"/>
</antcall>
<antcall target="tool_air_bundles">
@@ -193,6 +161,9 @@
<param name="locale" value="de_DE"/>
</antcall>
<antcall target="tool_air_bundles-clean">
+ <param name="locale" value="de_CH"/>
+ </antcall>
+ <antcall target="tool_air_bundles-clean">
<param name="locale" value="en_US"/>
</antcall>
<antcall target="tool_air_bundles-clean">
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/f690ea2f/frameworks/projects/tool_air/bundle-config.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/tool_air/bundle-config.xml b/frameworks/projects/tool_air/bundle-config.xml
new file mode 100644
index 0000000..0556072
--- /dev/null
+++ b/frameworks/projects/tool_air/bundle-config.xml
@@ -0,0 +1,49 @@
+<!--
+
+ 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.
+
+-->
+<flex-config>
+
+ <compiler>
+ <external-library-path>
+ <path-element>${env.PLAYERGLOBAL_HOME}/${playerglobal.version}/playerglobal.swc</path-element>
+ </external-library-path>
+
+ <include-libraries/>
+
+ <library-path/>
+
+ <locale>
+ <locale-element>${locale}</locale-element>
+ </locale>
+
+ <source-path>
+ <path-element>bundles/${locale}</path-element>
+ <path-element>../framework/src</path-element>
+ </source-path>
+ </compiler>
+
+ <include-classes/>
+
+ <include-namespaces/>
+
+ <include-resource-bundles>
+ <bundle>tool_air</bundle>
+ </include-resource-bundles>
+
+ <target-player>11</target-player>
+</flex-config>
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/f690ea2f/frameworks/projects/tool_air/bundles/de_CH/tool_air.properties
----------------------------------------------------------------------
diff --git a/frameworks/projects/tool_air/bundles/de_CH/tool_air.properties b/frameworks/projects/tool_air/bundles/de_CH/tool_air.properties
new file mode 100644
index 0000000..25e37f0
--- /dev/null
+++ b/frameworks/projects/tool_air/bundles/de_CH/tool_air.properties
@@ -0,0 +1,31 @@
+################################################################################
+##
+## 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.
+##
+################################################################################
+# Developer RTE Section
+
+# QTP_air messages
+
+noConnectionToQTP=Die Anwendung ist mit der \u201eAutomation\u201c-Bibliothek f\u00fcr AIR verkn\u00fcpft. Es konnte jedoch keine Verbindung zu QTP hergestellt werden.
+noConnectionToQTP_Recommendation=Vergewissern Sie sich, dass QTP ge\u00f6ffnet und das AIR-Plug-in aktiviert ist, bevor Sie die Anwendung starten.
+
+securityError =Sicherheitsfehler beim Herstellen der Verbindung zu QTP.
+airHelperClassNotFound=Die Anwendung ist mit der \u201eAutomation\u201c-Bibliothek f\u00fcr AIR verkn\u00fcpft. Damit die AIR-Automatisierung funktioniert, sollte jedoch die Bibliothek \u201eautomation_air\u201c verwendet werden. Es wird ausdr\u00fccklich empfohlen, dass Sie diese Bibliothek hinzuf\u00fcgen, bevor Sie fortfahren.
+propertyCannotBeEvaluated =Die Eigenschaft(en) \u201e{0}\u201c konnte(n) nicht ausgewertet werden.
+qtpConnectionAttempt=Verbindung zu QTP wird hergestellt. Dieser Vorgang kann einige Sekunden dauern.
+qtpConnectionFailed=Die Verbindung zu QTP konnte nicht hergestellt werden. Entweder wurde QTP nicht gestartet oder es werden mehrere Anwendungen mit aktivierter Automatisierung ausgef\u00fchrt. Schlie\u00dfen Sie alle Instanzen der Anwendung, starten Sie QTP erneut und starten Sie die Anwendung erneut.
+qtpConnectionSuccess=Die Verbindung zu QTP wurde hergestellt
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/f690ea2f/frameworks/projects/tool_air/compile-config.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/tool_air/compile-config.xml b/frameworks/projects/tool_air/compile-config.xml
new file mode 100644
index 0000000..4b9fe71
--- /dev/null
+++ b/frameworks/projects/tool_air/compile-config.xml
@@ -0,0 +1,57 @@
+<!--
+
+ 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.
+
+-->
+<flex-config>
+
+ <compiler>
+ <accessible>true</accessible>
+
+ <external-library-path>
+ <path-element>${env.AIR_HOME}/frameworks/libs/air/airglobal.swc</path-element>
+ <path-element>../../libs/framework.swc</path-element>
+ <path-element>../../libs/mx/mx.swc</path-element>
+ <path-element>../../libs/textLayout.swc</path-element>
+ <path-element>../../libs/advancedgrids.swc</path-element>
+ <path-element>../../libs/charts.swc</path-element>
+ <path-element>../../libs/spark.swc</path-element>
+ <path-element>../../libs/automation/automation_agent.swc</path-element>
+ <path-element>../../libs/automation/automation_dmv.swc</path-element>
+ </external-library-path>
+
+ <locale/>
+
+ <library-path/>
+
+ <source-path>
+ <path-element>src</path-element>
+ <path-element>../automation/src</path-element>
+ <path-element>../automation_air/src</path-element>
+ <path-element>../automation_spark/src</path-element>
+ </source-path>
+
+ <warn-no-constructor>false</warn-no-constructor>
+ </compiler>
+
+ <include-classes>
+ <class>ToolAIRClasses</class>
+ </include-classes>
+
+ <resource-bundle-list>bundles.properties</resource-bundle-list>
+
+ <target-player>${playerglobal.version}</target-player>
+</flex-config>
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/f690ea2f/frameworks/projects/wireframe/.actionScriptProperties
----------------------------------------------------------------------
diff --git a/frameworks/projects/wireframe/.actionScriptProperties b/frameworks/projects/wireframe/.actionScriptProperties
index 22cc7d1..a743c0e 100644
--- a/frameworks/projects/wireframe/.actionScriptProperties
+++ b/frameworks/projects/wireframe/.actionScriptProperties
@@ -1,38 +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.
-##
-################################################################################
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<actionScriptProperties mainApplicationPath="wireframe.as" projectUUID="a5cf1b73-b911-4eb1-abc6-e7144be2f4cb" version="6">
- <compiler additionalCompilerArguments="-include-file=defaults.css,../defaults.css -resource-bundle-list=bundles.properties -library-path= -locale=en_US" autoRSLOrdering="true" copyDependentFiles="false" fteInMXComponents="false" generateAccessible="true" htmlExpressInstall="true" htmlGenerate="false" htmlHistoryManagement="false" htmlPlayerVersionCheck="true" includeNetmonSwc="false" outputFolderPath="bin" sourceFolderPath="src" strict="true" targetPlayerVersion="0.0.0" useApolloConfig="false" useDebugRSLSwfs="true" verifyDigests="true" warn="true">
- <compilerSourcePath/>
- <libraryPath defaultLinkType="0">
- <libraryPathEntry kind="3" linkType="2" path="${PROJECT_FRAMEWORKS}/libs/player/11.1/playerglobal.swc" useDefaultLinkType="false"/>
- <libraryPathEntry kind="3" linkType="2" path="${PROJECT_FRAMEWORKS}/libs/osmf.swc" useDefaultLinkType="false"/>
- <libraryPathEntry kind="3" linkType="2" path="${PROJECT_FRAMEWORKS}/libs/textLayout.swc" useDefaultLinkType="false"/>
- <libraryPathEntry kind="3" linkType="2" path="/framework/bin/framework.swc" useDefaultLinkType="false"/>
- <libraryPathEntry kind="3" linkType="2" path="/spark/bin/spark.swc" useDefaultLinkType="false"/>
- <libraryPathEntry kind="3" linkType="2" path="/mx/bin/mx.swc" useDefaultLinkType="false"/>
- </libraryPath>
- <sourceAttachmentPath/>
- </compiler>
- <applications>
- <application path="wireframe.as"/>
- </applications>
- <modules/>
- <buildCSSFiles/>
-</actionScriptProperties>
+<?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.
+
+-->
+<actionScriptProperties mainApplicationPath="wireframe.as" projectUUID="a5cf1b73-b911-4eb1-abc6-e7144be2f4cb" version="6">
+ <compiler additionalCompilerArguments="-include-file=defaults.css,../defaults.css -resource-bundle-list=bundles.properties -library-path= -locale=en_US" autoRSLOrdering="true" copyDependentFiles="false" fteInMXComponents="false" generateAccessible="true" htmlExpressInstall="true" htmlGenerate="false" htmlHistoryManagement="false" htmlPlayerVersionCheck="true" includeNetmonSwc="false" outputFolderPath="bin" sourceFolderPath="src" strict="true" targetPlayerVersion="0.0.0" useApolloConfig="false" useDebugRSLSwfs="true" verifyDigests="true" warn="true">
+ <compilerSourcePath/>
+ <libraryPath defaultLinkType="0">
+ <libraryPathEntry kind="3" linkType="2" path="${PROJECT_FRAMEWORKS}/libs/player/11.1/playerglobal.swc" useDefaultLinkType="false"/>
+ <libraryPathEntry kind="3" linkType="2" path="${PROJECT_FRAMEWORKS}/libs/osmf.swc" useDefaultLinkType="false"/>
+ <libraryPathEntry kind="3" linkType="2" path="${PROJECT_FRAMEWORKS}/libs/textLayout.swc" useDefaultLinkType="false"/>
+ <libraryPathEntry kind="3" linkType="2" path="/framework/bin/framework.swc" useDefaultLinkType="false"/>
+ <libraryPathEntry kind="3" linkType="2" path="/spark/bin/spark.swc" useDefaultLinkType="false"/>
+ <libraryPathEntry kind="3" linkType="2" path="/mx/bin/mx.swc" useDefaultLinkType="false"/>
+ </libraryPath>
+ <sourceAttachmentPath/>
+ </compiler>
+ <applications>
+ <application path="wireframe.as"/>
+ </applications>
+ <modules/>
+ <buildCSSFiles/>
+</actionScriptProperties>
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/f690ea2f/frameworks/projects/wireframe/.flexLibProperties
----------------------------------------------------------------------
diff --git a/frameworks/projects/wireframe/.flexLibProperties b/frameworks/projects/wireframe/.flexLibProperties
index 560e815..4e9fbd8 100644
--- a/frameworks/projects/wireframe/.flexLibProperties
+++ b/frameworks/projects/wireframe/.flexLibProperties
@@ -1,22 +1,22 @@
-################################################################################
-##
-## 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.
-##
-################################################################################
<?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.
+
+-->
<flexLibProperties includeAllClasses="false" version="3">
<includeClasses>
<classEntry path="WireframeClasses"/>
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/f690ea2f/frameworks/projects/wireframe/build.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/wireframe/build.xml b/frameworks/projects/wireframe/build.xml
index 94220b5..490f6b2 100644
--- a/frameworks/projects/wireframe/build.xml
+++ b/frameworks/projects/wireframe/build.xml
@@ -21,113 +21,97 @@
<project name="wireframe" default="main" basedir=".">
- <property name="FLEX_HOME" location="${basedir}/../../.."/>
-
+ <property name="FLEX_HOME" location="${basedir}/../../.."/>
+
<property file="${FLEX_HOME}/env.properties"/>
<property environment="env"/>
- <property file="${FLEX_HOME}/build.properties"/>
-
- <target name="main" depends="clean,compile" description="Clean build of wireframe.swc"/>
-
- <target name="clean">
- <delete failonerror="false">
- <fileset file="${basedir}/bundles.properties"/>
- <fileset dir="${FLEX_HOME}/frameworks/themes/Wireframe">
- <include name="wireframe.swc"/>
- <include name="wireframe.swc.incr"/>
- </fileset>
- </delete>
- </target>
-
- <target name="compile" description="Compiles wireframe.swc">
- <echo message="Compiling frameworks/themes/Wireframe/wireframe.swc"/>
-
- <!-- Load the <compc> task. We can't do this at the <project> level -->
- <!-- because targets that run before flexTasks.jar gets built would fail. -->
- <taskdef resource="flexTasks.tasks" classpath="${FLEX_HOME}/lib/flexTasks.jar"/>
- <!--
- This project builds a theme SWC containing skin classes.
- It has no MXML tags and therefore no manifest.
- Link in the classes (and their dependencies)
- listed in WireframeClasses.as.
- Compile against framework.swc, but don't link it into wireframe.swc.
- Link in accessibility support.
- Include various CSS and asset files in the SWC.
- Don't put any resources into the SWC. (The classes don't require any.)
- Write a bundle list of referenced resource bundles
- into the file bundles.properties in this directory.
- (This should be an empty list.)
- -->
- <compc fork="true"
- output="${FLEX_HOME}/frameworks/themes/Wireframe/wireframe.swc"
- resource-bundle-list="${basedir}/bundles.properties">
- <target-player>${playerglobal.version}</target-player>
- <jvmarg line="${compc.jvm.args}"/>
- <include-classes>WireframeClasses</include-classes>
- <source-path path-element="${basedir}/src"/>
- <library-path/>
+ <property file="${FLEX_HOME}/build.properties"/>
+
+ <target name="main" depends="clean,compile" description="Clean build of wireframe.swc"/>
+
+ <target name="clean">
+ <delete failonerror="false">
+ <fileset file="${basedir}/bundles.properties"/>
+ <fileset dir="${FLEX_HOME}/frameworks/themes/Wireframe">
+ <include name="wireframe.swc"/>
+ <include name="wireframe.swc.incr"/>
+ </fileset>
+ </delete>
+ </target>
+
+ <target name="compile" description="Compiles wireframe.swc">
+ <echo message="Compiling frameworks/themes/Wireframe/wireframe.swc"/>
+
+ <!-- Load the <compc> task. We can't do this at the <project> level -->
+ <!-- because targets that run before flexTasks.jar gets built would fail. -->
+ <taskdef resource="flexTasks.tasks" classpath="${FLEX_HOME}/lib/flexTasks.jar"/>
+ <!--
+ This project builds a theme SWC containing skin classes.
+ It has no MXML tags and therefore no manifest.
+ Link in the classes (and their dependencies)
+ listed in WireframeClasses.as.
+ Compile against framework.swc, but don't link it into wireframe.swc.
+ Link in accessibility support.
+ Include various CSS and asset files in the SWC.
+ Don't put any resources into the SWC. (The classes don't require any.)
+ Write a bundle list of referenced resource bundles
+ into the file bundles.properties in this directory.
+ (This should be an empty list.)
+ -->
+ <compc fork="true"
+ output="${FLEX_HOME}/frameworks/themes/Wireframe/wireframe.swc">
+ <jvmarg line="${compc.jvm.args}"/>
+ <load-config filename="${FLEX_HOME}/frameworks/flex-config.xml"/>
+ <load-config filename="compile-config.xml" />
+ <arg value="+playerglobal.version=${playerglobal.version}" />
+ <arg value="+env.PLAYERGLOBAL_HOME=${env.PLAYERGLOBAL_HOME}" />
+ </compc>
+ </target>
+
+ <target name="doc" depends="clean-temp-docs" description="updates wireframe.swc with asdoc xml">
+ <!-- Load the <asdoc> task. We can't do this at the <project> level -->
+ <!-- because targets that run before flexTasks.jar gets built would fail. -->
+ <taskdef resource="flexTasks.tasks" classpath="${FLEX_HOME}/lib/flexTasks.jar"/>
+
+ <condition property="asdoc.jvm.args" value="-Xmx384m">
+ <os family="windows"/>
+ </condition>
+
+ <condition property="asdoc.jvm.args" value="-Xmx512m">
+ <os family="mac"/>
+ </condition>
+
+ <condition property="asdoc.jvm.args" value="-Xmx512m">
+ <os family="unix"/>
+ </condition>
+
+ <!-- Call asdoc to generate dita xml files -->
+ <asdoc output="${FLEX_HOME}/tempDoc" lenient="true" failonerror="true" keep-xml="true" skip-xsl="true" fork="true">
+ <compiler.source-path path-element="${basedir}/src"/>
+ <doc-classes class="WireframeClasses"/>
<external-library-path dir="${env.PLAYERGLOBAL_HOME}">
<include name="${playerglobal.version}/playerglobal.swc"/>
- </external-library-path>
+ </external-library-path>
<external-library-path dir="${FLEX_HOME}/frameworks/libs">
- <include name="framework.swc"/>
- <include name="mx/mx.swc"/>
- <include name="spark.swc"/>
- <include name="airspark.swc"/>
- <include name="textLayout.swc"/>
- </external-library-path>
- <include-file name="defaults.css" path="${basedir}/defaults.css"/>
- <include-file name="assets/Tree_folderClosedIcon.png" path="${basedir}/assets/Tree_folderClosedIcon.png"/>
- <include-file name="assets/Tree_folderOpenIcon.png" path="${basedir}/assets/Tree_folderOpenIcon.png"/>
- <locale/>
- <accessible>true</accessible>
- </compc>
- </target>
-
- <target name="doc" depends="clean-temp-docs" description="updates wireframe.swc with asdoc xml">
- <!-- Load the <asdoc> task. We can't do this at the <project> level -->
- <!-- because targets that run before flexTasks.jar gets built would fail. -->
- <taskdef resource="flexTasks.tasks" classpath="${FLEX_HOME}/lib/flexTasks.jar"/>
-
- <condition property="asdoc.jvm.args" value="-Xmx384m">
- <os family="windows"/>
- </condition>
-
- <condition property="asdoc.jvm.args" value="-Xmx512m">
- <os family="mac"/>
- </condition>
-
- <condition property="asdoc.jvm.args" value="-Xmx512m">
- <os family="unix"/>
- </condition>
-
- <!-- Call asdoc to generate dita xml files -->
- <asdoc output="${FLEX_HOME}/tempDoc" lenient="true" failonerror="true" keep-xml="true" skip-xsl="true" fork="true">
- <compiler.source-path path-element="${basedir}/src"/>
- <doc-classes class="WireframeClasses"/>
- <external-library-path dir="${env.PLAYERGLOBAL_HOME}">
- <include name="${playerglobal.version}/playerglobal.swc"/>
+ <include name="framework.swc" />
+ <include name="mx/mx.swc"/>
+ <include name="spark.swc" />
</external-library-path>
- <external-library-path dir="${FLEX_HOME}/frameworks/libs">
- <include name="framework.swc" />
- <include name="mx/mx.swc"/>
- <include name="spark.swc" />
- </external-library-path>
- <jvmarg line="${asdoc.jvm.args}"/>
- </asdoc>
-
- <!-- updates wireframe.swc with asdoc xml -->
- <zip destfile="${FLEX_HOME}/frameworks/themes/Wireframe/wireframe.swc" update="true">
- <zipfileset dir="${FLEX_HOME}/tempDoc/tempdita" prefix="docs">
- <include name="*.*"/>
- <exclude name="ASDoc_Config.xml"/>
- <exclude name="overviews.xml"/>
- </zipfileset>
- </zip>
- </target>
-
- <target name="clean-temp-docs">
- <delete dir="${FLEX_HOME}/tempDoc" failonerror="false" includeEmptyDirs="true"/>
- </target>
+ <jvmarg line="${asdoc.jvm.args}"/>
+ </asdoc>
+
+ <!-- updates wireframe.swc with asdoc xml -->
+ <zip destfile="${FLEX_HOME}/frameworks/themes/Wireframe/wireframe.swc" update="true">
+ <zipfileset dir="${FLEX_HOME}/tempDoc/tempdita" prefix="docs">
+ <include name="*.*"/>
+ <exclude name="ASDoc_Config.xml"/>
+ <exclude name="overviews.xml"/>
+ </zipfileset>
+ </zip>
+ </target>
+
+ <target name="clean-temp-docs">
+ <delete dir="${FLEX_HOME}/tempDoc" failonerror="false" includeEmptyDirs="true"/>
+ </target>
</project>
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/f690ea2f/frameworks/projects/wireframe/compile-config.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/wireframe/compile-config.xml b/frameworks/projects/wireframe/compile-config.xml
new file mode 100644
index 0000000..36f1536
--- /dev/null
+++ b/frameworks/projects/wireframe/compile-config.xml
@@ -0,0 +1,64 @@
+<!--
+
+ 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.
+
+-->
+<flex-config>
+
+ <compiler>
+ <accessible>true</accessible>
+
+ <external-library-path>
+ <path-element>${env.PLAYERGLOBAL_HOME}/${playerglobal.version}/playerglobal.swc</path-element>
+ <path-element>../../libs/framework.swc</path-element>
+ <path-element>../../libs/mx/mx.swc</path-element>
+ <path-element>../../libs/spark.swc</path-element>
+ <path-element>../../libs/air/airspark.swc</path-element>
+ <path-element>../../libs/textLayout.swc</path-element>
+ </external-library-path>
+
+ <locale/>
+
+ <library-path/>
+
+ <source-path>
+ <path-element>src</path-element>
+ </source-path>
+
+ <warn-no-constructor>false</warn-no-constructor>
+ </compiler>
+
+ <include-classes>
+ <class>WireframeClasses</class>
+ </include-classes>
+
+ <include-file>
+ <name>defaults.css</name>
+ <path>defaults.css</path>
+ </include-file>
+ <include-file>
+ <name>assets/Tree_folderClosedIcon.png</name>
+ <path>assets/Tree_folderClosedIcon.png</path>
+ </include-file>
+ <include-file>
+ <name>assets/Tree_folderOpenIcon.png</name>
+ <path>assets/Tree_folderOpenIcon.png</path>
+ </include-file>
+
+ <resource-bundle-list>bundles.properties</resource-bundle-list>
+
+ <target-player>${playerglobal.version}</target-player>
+</flex-config>
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/f690ea2f/frameworks/spark-manifest.xml
----------------------------------------------------------------------
diff --git a/frameworks/spark-manifest.xml b/frameworks/spark-manifest.xml
index f0db73b..30727db 100644
--- a/frameworks/spark-manifest.xml
+++ b/frameworks/spark-manifest.xml
@@ -45,6 +45,7 @@
<component id="BlurFilter" class="spark.filters.BlurFilter"/>
<component id="BorderContainer" class="spark.components.BorderContainer"/>
<component id="Bounce" class="spark.effects.easing.Bounce"/>
+ <component id="BusyIndicator" class="spark.components.BusyIndicator"/>
<component id="Button" class="spark.components.Button"/>
<component id="ButtonBar" class="spark.components.ButtonBar"/>
<component id="ButtonBarButton" class="spark.components.ButtonBarButton"/>
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/f690ea2f/frameworks/tests/basicTests/BasicTests-config.xml
----------------------------------------------------------------------
diff --git a/frameworks/tests/basicTests/BasicTests-config.xml b/frameworks/tests/basicTests/BasicTests-config.xml
index b5d9417..5c9f671 100644
--- a/frameworks/tests/basicTests/BasicTests-config.xml
+++ b/frameworks/tests/basicTests/BasicTests-config.xml
@@ -93,8 +93,10 @@
<symbol>spark.scripts.NumberValidatorTestScript</symbol>
<symbol>spark.scripts.SortTestScript</symbol>
<!--
+ From mustella.swc
-->
<symbol>ExitWhenDone</symbol>
+ <symbol>SetShowRTE</symbol>
<symbol>SendFormattedResultsToLog</symbol>
</includes>
</flex-config>
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/f690ea2f/frameworks/tests/basicTests/basicLoader.as
----------------------------------------------------------------------
diff --git a/frameworks/tests/basicTests/basicLoader.as b/frameworks/tests/basicTests/basicLoader.as
index 0bd15f5..4753219 100644
--- a/frameworks/tests/basicTests/basicLoader.as
+++ b/frameworks/tests/basicTests/basicLoader.as
@@ -33,8 +33,8 @@ public class basicLoader extends MovieClip
super();
text = new TextField();
- text.width = stage.stageWidth;
- text.height = stage.stageHeight;
+ text.width = 176;
+ text.height = 81;
var tf:TextFormat;
tf = new TextFormat;
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/f690ea2f/frameworks/tests/basicTests/halo/scripts/SWFLoaderTestScript.mxml
----------------------------------------------------------------------
diff --git a/frameworks/tests/basicTests/halo/scripts/SWFLoaderTestScript.mxml b/frameworks/tests/basicTests/halo/scripts/SWFLoaderTestScript.mxml
index 5bf73e3..7b1787e 100644
--- a/frameworks/tests/basicTests/halo/scripts/SWFLoaderTestScript.mxml
+++ b/frameworks/tests/basicTests/halo/scripts/SWFLoaderTestScript.mxml
@@ -51,7 +51,7 @@
</TestCase>
<TestCase testID="SWFLoaderTest1">
<body>
- <AssertPixelValue target="haloSWFLoaderTests.testLoader" x="10" y="10" value="0x0066CC" />
+ <AssertPixelValue target="haloSWFLoaderTests.testLoader" x="10" y="10" value="0xFF9933" />
</body>
</TestCase>
</testCases>
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/f690ea2f/frameworks/themes/AeonGraphical/build.xml
----------------------------------------------------------------------
diff --git a/frameworks/themes/AeonGraphical/build.xml b/frameworks/themes/AeonGraphical/build.xml
index a053e92..f0d42ef 100644
--- a/frameworks/themes/AeonGraphical/build.xml
+++ b/frameworks/themes/AeonGraphical/build.xml
@@ -22,12 +22,15 @@
<property name="FLEX_HOME" location="${basedir}/../../.."/>
- <!-- Required for OSX 10.6 / Snow Leopard Performance -->
- <condition property="local.d32" value="-d32" >
+ <!-- Required for OSX 10.6 / Snow Leopard Performance. -->
+ <!-- Java 7 on Mac requires OSX 10.7.3 or higher and is 64-bit only -->
+ <!-- local.d32 is set/used in build.properties so this needs to be done first. -->
+ <condition property="local.d32" value="-d32">
<and>
+ <os family="windows"/>
<equals arg1="${sun.arch.data.model}" arg2="64"/>
<equals arg1="${os.arch}" arg2="x86_64"/>
- <os family="mac"/>
+ <equals arg1="${ant.java.version}" arg2="1.6"/>
</and>
</condition>
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/f690ea2f/ide/constructFlexForIDE.sh
----------------------------------------------------------------------
diff --git a/ide/constructFlexForIDE.sh b/ide/constructFlexForIDE.sh
index b7ec896..f4e3680 100755
--- a/ide/constructFlexForIDE.sh
+++ b/ide/constructFlexForIDE.sh
@@ -70,7 +70,7 @@ copyFileOrDirectory()
fi
if [ -d "${ADOBE_FLEX_SDK_DIR}/$f" ] ; then
- rsync --archive --ignore-existing "${ADOBE_FLEX_SDK_DIR}/$f" "${dir}"
+ rsync --archive --ignore-existing --force "${ADOBE_FLEX_SDK_DIR}/$f" "${dir}"
fi
}
@@ -102,6 +102,15 @@ then
exit 1;
fi
+# FlashBuilder requires the frameworks/rsls directory.
+
+if [ ! -d "${IDE_SDK_DIR}/frameworks/rsls" ]
+then
+ echo ${IDE_SDK_DIR} does not appear to be a Apache Flex distribution with rsls.
+ echo If this is a source distribution of Apache Flex you must first build the rsls.
+ exit 1;
+fi
+
if [ "$2" = "" ]
then
# Look for installed FlashBuilder versions 4.5, 4.6 and 4.7.
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/f690ea2f/ide/flashbuilder/build.xml
----------------------------------------------------------------------
diff --git a/ide/flashbuilder/build.xml b/ide/flashbuilder/build.xml
index 106eb20..2fe4410 100644
--- a/ide/flashbuilder/build.xml
+++ b/ide/flashbuilder/build.xml
@@ -36,20 +36,22 @@
<property name="air.dir" value="${env.AIR_HOME}"/>
<property name="debugger" value="${env.FLASHPLAYER_DEBUGGER}"/>
- <target name="main" depends="create-config-files,expand-config-tokens"
- description="Create framework config files in format expected by Adobe FlashBuilder"/>
-
<target name="clean">
<delete dir="${basedir}/config" failonerror="false" />
+ <delete file="${basedir}/FlashBuilderProjectFiles.zip" failonerror="false" />
</target>
+ <target name="main" depends="expand-config-tokens"
+ description="Create framework config files in format expected by Adobe FlashBuilder"/>
+
<!-- For testing. Run this to integrate this SDK (in-place) with playerglobal.swc and
AIR, and modify the framework config files to be the format FB expects. Only
the AIR kit for the platform specified by AIR_HOME will be incorporated.
+ FlashBuilder also expects frameworks/rsls to exist.
There is no clean for this operation.
-->
- <target name="make-sdk" depends="install-config,install-playerglobal,install-air"
+ <target name="make-sdk" depends="check-rsls,install-config,install-playerglobal,install-air"
description="Converts this SDK into the layout FlashBuilder expects."/>
<target name="create-config-files"
@@ -63,7 +65,7 @@
</copy>
</target>
- <target name="expand-config-tokens" description="Expand {airHome} and {playerglobalHome} tokens">
+ <target name="expand-config-tokens" depends="create-config-files" description="Expand {airHome} and {playerglobalHome} tokens">
<echo message="expanding {airHome} and {playerglobalHome} tokens"/>
<fix-config-file-for-flashbuilder file="${basedir}/config/air-config.xml" />
<fix-config-file-for-flashbuilder file="${basedir}/config/airmobile-config.xml" />
@@ -102,8 +104,14 @@
</replace>
</sequential>
</macrodef>
+
+ <target name="check-rsls">
+ <available file="${frameworks.dir}/rsls" type="dir" property="rsls.dir.exists"/>
+ <fail message="The ${frameworks.dir}/rsls directory must be created. Use the frameworks-rsls ant target in ${FLEX_HOME}."
+ unless="rsls.dir.exists"/>
+ </target>
- <target name="install-config">
+ <target name="install-config" depends="expand-config-tokens">
<copy todir="${frameworks.dir}" verbose="true">
<fileset dir="${basedir}/config"/>
</copy>
@@ -123,4 +131,13 @@
<chmod dir="${basedir}" perm="755" includes="bin/*, **/*.bat, **/*.sh" />
</target>
+ <target name="zip-project-files">
+ <zip destfile="${basedir}/FlashBuilderProjectFiles.zip">
+ <zipfileset dir="${FLEX_HOME}" prefix="${release.version}">
+ <include name="**/.*"/>
+ <exclude name="mustella/**/.*"/>
+ <exclude name="temp/**/.*"/>
+ </zipfileset>
+ </zip>
+ </target>
</project>
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/f690ea2f/ide/flashbuilder/makeApacheFlexForFlashBuilder.bat
----------------------------------------------------------------------
diff --git a/ide/flashbuilder/makeApacheFlexForFlashBuilder.bat b/ide/flashbuilder/makeApacheFlexForFlashBuilder.bat
index 7830520..472685f 100755
--- a/ide/flashbuilder/makeApacheFlexForFlashBuilder.bat
+++ b/ide/flashbuilder/makeApacheFlexForFlashBuilder.bat
@@ -21,8 +21,8 @@ REM ############################################################################
REM This script should be used to create an Apache Flex SDK that has the
REM directory structure that the Adobe Flash Builder IDE expects. If this is a
-REM source package, you must build the binaries first. See the README at the root
-REM for instructions.
+REM source package, you must build the binaries and the RSLs first. See the README at
+REM the root for instructions.
REM
REM This script assumes that it is in the ide/flashbuilder directory of the Apache Flex SDK
REM The files from this SDK will be copied to the new directory structure.
@@ -45,7 +45,7 @@ REM
REM Adobe AIR SDK Version 3.1
REM
set ADOBE_AIR_SDK_WIN_FILE=AdobeAIRSDK.zip
-set ADOBE_AIR_SDK_WIN_URL=http://airdownload.adobe.com/air/win/download/3.1/%ADOBE_AIR_SDK_WIN_FILE%
+set ADOBE_AIR_SDK_WIN_URL=http://airdownload.adobe.com/air/win/download/3.4/%ADOBE_AIR_SDK_WIN_FILE%
REM
REM Adobe Flash Player Version 11.1
@@ -61,11 +61,19 @@ REM
REM Quick check to see if there are binaries.
REM
:checkJar
-if exist "%APACHE_FLEX_BIN_DISTRO_DIR%\lib\mxmlc.jar" goto gotDir
+if exist "%APACHE_FLEX_BIN_DISTRO_DIR%\lib\mxmlc.jar" goto gotRSLs
echo You must build the binaries for this SDK first. See the README at the root.
goto :eof
REM
+REM Quick check to see if there are binaries.
+REM
+:gotRSLs
+if exist "%APACHE_FLEX_BIN_DISTRO_DIR%\frameworks\rsls" goto gotDir
+echo You must build the RSLs for this SDK first. See the README at the root.
+goto :eof
+
+REM
REM Set FLEX_HOME to the fully qualified path to %1.
REM Make sure the directory for the Apache Flex SDK exists.
REM
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/f690ea2f/ide/flashbuilder/makeApacheFlexForFlashBuilder.sh
----------------------------------------------------------------------
diff --git a/ide/flashbuilder/makeApacheFlexForFlashBuilder.sh b/ide/flashbuilder/makeApacheFlexForFlashBuilder.sh
index 27c9c09..c303400 100755
--- a/ide/flashbuilder/makeApacheFlexForFlashBuilder.sh
+++ b/ide/flashbuilder/makeApacheFlexForFlashBuilder.sh
@@ -21,8 +21,8 @@
# This script should be used to create an Apache Flex SDK that has the
# directory structure that the Adobe Flash Builder IDE expects. If this is a
-# source package, you must build the binaries first. See the README at the root
-# for instructions.
+# source package, you must build the binaries and the RSLs first. See the README at the
+# root for instructions.
#
# The Adobe AIR SDK and the Adobe Flash Player playerglobal.swc are integrated
# into the new directory structure. The paths in the framework configuration files are
@@ -38,7 +38,7 @@
APACHE_FLEX_BIN_DIR="$( cd $( dirname -- "$0" ) > /dev/null ; pwd )"/../..
# Adobe AIR SDK Version 3.1
-ADOBE_AIR_SDK_MAC_URL=http://airdownload.adobe.com/air/mac/download/3.1/AdobeAIRSDK.tbz2
+ADOBE_AIR_SDK_MAC_URL=http://airdownload.adobe.com/air/mac/download/3.4/AdobeAIRSDK.tbz2
# Adobe Flash Player Version 11.1
ADOBE_FLASHPLAYER_GLOBALPLAYER_SWC_URL=http://fpdownload.macromedia.com/get/flashplayer/updaters/11/playerglobal11_1.swc
@@ -60,6 +60,13 @@ then
exit 1;
fi
+# quick check to see if the RSLs are there
+if [ ! -d "${APACHE_FLEX_BIN_DIR}/frameworks/rsls" ]
+then
+ echo You must build the RSLs for this SDK first. See the README at the root.
+ exit 1;
+fi
+
# make sure the directory for the Apache Flex SDK exists
mkdir -p "$FLEX_HOME"
@@ -103,4 +110,4 @@ cp -p -v "$FLEX_HOME"/ide/flashbuilder/config/*-config.xml "$FLEX_HOME/framework
rm -rf "$tempDir"
# remove the stagging directory for downloaded software
-rm -rf "$FLEX_HOME/in"
\ No newline at end of file
+rm -rf "$FLEX_HOME/in"
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/f690ea2f/jenkins.xml
----------------------------------------------------------------------
diff --git a/jenkins.xml b/jenkins.xml
index d59cfa9..a4ebcf8 100644
--- a/jenkins.xml
+++ b/jenkins.xml
@@ -44,7 +44,7 @@
<echo message="Be patient. This takes a few minutes..." />
<mkdir dir="${FLEX_HOME}/air"/>
<mkdir dir="${FLEX_HOME}/temp"/>
- <get src="http://airdownload.adobe.com/air/win/download/3.1/AdobeAIRSDK.zip"
+ <get src="http://airdownload.adobe.com/air/win/download/3.4/AdobeAIRSDK.zip"
dest="${FLEX_HOME}/temp/AIR Integration Kit.zip"
verbose="false"/>
<unzip dest="${FLEX_HOME}/air/AIR Integration Kit" src="${FLEX_HOME}/temp/AIR Integration Kit.zip" />
@@ -106,7 +106,7 @@
<target name="playerglobal11.3-download" if="target11.3">
<mkdir dir="${basedir}/lib/player/${playerglobal.version}"/>
- <get src="http://labsdownload.adobe.com/pub/labs/flashplatformruntimes/flashplayer11-3/flashplayer11-3_p3_playerglobal_050412.swc"
+ <get src="http://fpdownload.macromedia.com/pub/flashplayer/updaters/11/playerglobal11_3.swc"
dest="${basedir}/lib/player/${playerglobal.version}/playerglobal.swc"
verbose="false"/>
</target>
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/f690ea2f/modules/build.xml
----------------------------------------------------------------------
diff --git a/modules/build.xml b/modules/build.xml
index bfb4894..931dec4 100644
--- a/modules/build.xml
+++ b/modules/build.xml
@@ -83,11 +83,9 @@
<ant dir="${basedir}/antTasks" target="clean"/>
<ant dir="${basedir}/asc/build/java" target="clean"/>
<ant dir="${basedir}/thirdparty/xerces-patch" target="clean"/>
- <delete file="${FLEX_LIB}/asc.jar"/>
- <!--delete dir="${FLEX_LIB}/*.jar" failonerror="false"/-->
<delete includeemptydirs="true" failonerror="false">
<fileset dir="${FLEX_LIB}">
- <exclude name="**/*" />
+ <include name="*" />
</fileset>
</delete>
</target>
@@ -160,19 +158,15 @@
</target>
<target name="batik" description="Build batik-all-flex.jar">
-
- <echo message="This target should be run with Java 1.4.2_14. It doesn't work with Java 1.5."/>
-
<ant antfile="${basedir}/downloads.xml" target="batik-jars" dir="${basedir}"/>
<ant dir="${basedir}/thirdparty/batik" target="batik-all-flex-jar">
<property name="deprecation" value="off"/>
+ <property name="sun-codecs.disabled" value="true"/>
</ant>
</target>
<target name="batik-clean">
- <mkdir dir="${basedir}/thirdparty/batik/lib"/>
<ant dir="${basedir}/thirdparty/batik" target="batik-all-flex-clean"/>
- <delete dir="${basedir}/thirdparty/batik/lib"/>
</target>
<target name="velocity" description="Build velocity-dep-1.4-flex.jar">
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/f690ea2f/modules/compiler/build.xml
----------------------------------------------------------------------
diff --git a/modules/compiler/build.xml b/modules/compiler/build.xml
index 45f889b..c45a89f 100644
--- a/modules/compiler/build.xml
+++ b/modules/compiler/build.xml
@@ -58,7 +58,7 @@
<!-- Including Adobe proprietary font and license code. -->
<property name="mxmlc.mpl_excludes.classpath" value="${opt.dir}/afe.jar ${opt.dir}/aglj40.jar ${opt.dir}/rideau.jar ${opt.dir}/flex-fontkit.jar "/>
<property name="mxmlc.adobe.classpath" value="${mxmlc.mpl_excludes.classpath} asc.jar ${ext.dir}/xml-apis.jar batik-all-flex.jar velocity-dep-1.4-flex.jar ${ext.dir}/commons-collections.jar ${ext.dir}/commons-discovery.jar ${ext.dir}/commons-logging.jar swfutils.jar fxgutils.jar ${opt.dir}/flex-messaging-common.jar ${localized.mxmlc.jars} ${ext.dir}/xalan.jar"/>
- <property name="mxmlc.classpath" value="${mxmlc.adobe.classpath} ${env.property.dir}"/>
+ <property name="mxmlc.classpath" value="${mxmlc.adobe.classpath} ${ext.dir}/xml-apis-ext.jar ${env.property.dir}"/>
<property name="compc.main" value="flex2.tools.Compc"/>
<property name="compc.classpath" value="mxmlc.jar ${mxmlc.classpath}"/>
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/f690ea2f/modules/compiler/src/java/flash/css/Descriptor.java
----------------------------------------------------------------------
diff --git a/modules/compiler/src/java/flash/css/Descriptor.java b/modules/compiler/src/java/flash/css/Descriptor.java
index db08ff6..f7016c1 100644
--- a/modules/compiler/src/java/flash/css/Descriptor.java
+++ b/modules/compiler/src/java/flash/css/Descriptor.java
@@ -23,7 +23,7 @@ import flash.util.Trace;
import flex2.compiler.util.CompilerMessage.CompilerError;
import flex2.compiler.util.ThreadLocalToolkit;
import org.apache.flex.forks.batik.css.parser.CSSLexicalUnit;
-import org.w3c.flex.forks.css.sac.LexicalUnit;
+import org.w3c.css.sac.LexicalUnit;
/**
* This class represents a descriptor/property within a CSS rule
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/f690ea2f/modules/compiler/src/java/flash/css/FontFaceRule.java
----------------------------------------------------------------------
diff --git a/modules/compiler/src/java/flash/css/FontFaceRule.java b/modules/compiler/src/java/flash/css/FontFaceRule.java
index 72eef2ae..6980d5a 100644
--- a/modules/compiler/src/java/flash/css/FontFaceRule.java
+++ b/modules/compiler/src/java/flash/css/FontFaceRule.java
@@ -26,8 +26,8 @@ import flex2.compiler.util.MimeMappings;
import flex2.compiler.util.ThreadLocalToolkit;
import flash.fonts.FontFace;
import flash.util.Trace;
-import org.w3c.flex.forks.css.sac.CSSException;
-import org.w3c.flex.forks.css.sac.LexicalUnit;
+import org.w3c.css.sac.CSSException;
+import org.w3c.css.sac.LexicalUnit;
import java.util.*;
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/f690ea2f/modules/compiler/src/java/flash/css/StyleDeclaration.java
----------------------------------------------------------------------
diff --git a/modules/compiler/src/java/flash/css/StyleDeclaration.java b/modules/compiler/src/java/flash/css/StyleDeclaration.java
index 367f2ca..25358f9 100644
--- a/modules/compiler/src/java/flash/css/StyleDeclaration.java
+++ b/modules/compiler/src/java/flash/css/StyleDeclaration.java
@@ -19,7 +19,7 @@
package flash.css;
-import org.w3c.flex.forks.css.sac.LexicalUnit;
+import org.w3c.css.sac.LexicalUnit;
import java.util.ArrayList;
import java.util.HashMap;
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/f690ea2f/modules/compiler/src/java/flash/css/StyleDocumentHandler.java
----------------------------------------------------------------------
diff --git a/modules/compiler/src/java/flash/css/StyleDocumentHandler.java b/modules/compiler/src/java/flash/css/StyleDocumentHandler.java
index ad89357..50c9f00 100644
--- a/modules/compiler/src/java/flash/css/StyleDocumentHandler.java
+++ b/modules/compiler/src/java/flash/css/StyleDocumentHandler.java
@@ -23,7 +23,7 @@ import org.apache.flex.forks.batik.css.parser.CSSLexicalUnit;
import org.apache.flex.forks.batik.css.parser.DefaultConditionalSelector;
import org.apache.flex.forks.batik.css.parser.DefaultDescendantSelector;
import org.apache.flex.forks.batik.css.parser.DefaultElementSelector;
-import org.w3c.flex.forks.css.sac.*;
+import org.w3c.css.sac.*;
/**
* An implementation of DocumentHandler, which creates rules, hands
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/f690ea2f/modules/compiler/src/java/flash/css/StyleParser.java
----------------------------------------------------------------------
diff --git a/modules/compiler/src/java/flash/css/StyleParser.java b/modules/compiler/src/java/flash/css/StyleParser.java
index e59ac41..9556b18 100644
--- a/modules/compiler/src/java/flash/css/StyleParser.java
+++ b/modules/compiler/src/java/flash/css/StyleParser.java
@@ -37,10 +37,10 @@ import flex2.compiler.util.CompilerMessage;
import flex2.compiler.util.ThreadLocalToolkit;
import org.apache.flex.forks.batik.css.parser.Parser;
-import org.w3c.flex.forks.css.sac.CSSException;
-import org.w3c.flex.forks.css.sac.CSSParseException;
-import org.w3c.flex.forks.css.sac.ErrorHandler;
-import org.w3c.flex.forks.css.sac.InputSource;
+import org.w3c.css.sac.CSSException;
+import org.w3c.css.sac.CSSParseException;
+import org.w3c.css.sac.ErrorHandler;
+import org.w3c.css.sac.InputSource;
/**
* The class is a wrapper around the Batik CSS Parser. It uses a