This is an automated email from the ASF dual-hosted git repository.
aharui pushed a commit to branch feature/rename
in repository https://gitbox.apache.org/repos/asf/royale-compiler.git
commit 328753a10cf06b7f97ed064d2ab293e98c09bce6
Author: Alex Harui <aha...@apache.org>
AuthorDate: Wed Oct 4 11:25:08 2017 -0700
got most of it to compile with Ant
---
compiler-build-tools/build.xml | 4 +-
compiler-jburg-types/build.xml | 2 +-
.../apache/royale/compiler/clients/ASDOCJSC.java | 10 +-
.../royale/compiler/clients/COMPJSCNative.java | 2 +-
.../{COMPJSCFlex.java => COMPJSCRoyale.java} | 8 +-
.../apache/royale/compiler/clients/EXTERNC.java | 2 +-
.../apache/royale/compiler/clients/MXMLJSC.java | 2 +-
.../royale/compiler/clients/MXMLJSCNative.java | 4 +-
.../royale/compiler/clients/MXMLJSCNode.java | 4 +-
.../{MXMLJSCFlex.java => MXMLJSCRoyale.java} | 12 +-
...CFlexCordova.java => MXMLJSCRoyaleCordova.java} | 12 +-
.../royale/compiler/clients/RoyaleToolGroup.java | 2 +-
.../codegen/js/royale/JSRoyaleEmitter.java | 6 +-
.../mxml/royale/MXMLRoyaleASDocEmitter.java | 10 +-
.../codegen/mxml/royale/MXMLRoyaleEmitter.java | 10 +-
.../internal/driver/js/JSSourceFileHandler.java | 2 +-
.../driver/js/goog/JSGoogCompcConfiguration.java | 4 +-
.../driver/js/goog/JSGoogConfiguration.java | 4 +-
.../driver/mxml/ASDocASSourceFileHandler.java | 2 +-
.../driver/mxml/ASDocMXMLSourceFileHandler.java | 2 +-
.../driver/mxml/MXMLSourceFileHandler.java | 2 +-
.../{RoyaleProject.java => RoyaleJSProject.java} | 2 +-
.../compiler/internal/targets/RoyaleTarget.java | 6 +-
.../codegen/externals/TestExternalsJSCompile.java | 4 +-
.../codegen/js/royale/TestRoyaleProject.java | 2 +-
.../compiler/internal/test/RoyaleTestBase.java | 4 -
.../royale/compiler/internal/test/TestBase.java | 8 +-
.../org/apache/royale/utils/EnvProperties.java | 129 ---------------------
.../org/apache/royale/utils/AntTestAdapter.java | 2 +-
.../org/apache/royale/utils/EnvProperties.java | 28 ++++-
.../java/org/apache/royale/utils/ITestAdapter.java | 2 +-
.../org/apache/royale/utils/MavenTestAdapter.java | 22 ++--
compiler/build.xml | 2 +-
.../org/apache/royale/compiler/clients/ASDOC.java | 2 +-
.../org/apache/royale/compiler/clients/COMPC.java | 2 +-
.../royale/compiler/clients/FalconToolGroup.java | 2 +-
.../org/apache/royale/compiler/clients/MXMLC.java | 3 +-
.../apache/royale/compiler/clients/Optimizer.java | 2 +-
.../databinding/MXMLBindingDirectiveHelper.java | 6 +-
.../compiler/internal/config/FileConfigurator.java | 5 +-
.../compiler/internal/projects/RoyaleProject.java | 4 +-
.../compiler/internal/targets/FlexRSLInfo.java | 6 +-
.../internal/targets/RoyaleAppSWFTarget.java | 38 +++---
.../targets/RoyaleApplicationFrame1Info.java | 8 +-
.../internal/targets/RoyaleFrame1Info.java | 4 +-
.../internal/targets/RoyaleLibraryFrame1Info.java | 2 +-
.../internal/targets/RoyaleLibrarySWFTarget.java | 6 +-
.../compiler/internal/targets/RoyaleTarget.java | 6 +-
...RoyaleOnlyConfigurationOptionNotSupported.java} | 0
.../tools/debugger/expression/AS3DebuggerBURM.jbg | 22 ++--
.../src/main/java/flex2/tools/Tool.java | 2 -
royale-ant-tasks/build.xml | 6 +-
.../org/apache/royale/compiler/ant/COMPCTask.java | 2 +
royale-ant-tasks/src/test/build.xml | 10 +-
.../org/apache/royale/maven/BaseCompileMojo.java | 2 +-
.../java/org/apache/royale/maven/BaseMojo.java | 6 +-
.../org/apache/royale/maven/CompileASDocMojo.java | 2 +-
.../org/apache/royale/maven/CompileASMojo.java | 2 +-
.../org/apache/royale/maven/CompileAppMojo.java | 2 +-
.../org/apache/royale/maven/CompileJSMojo.java | 2 +-
.../apache/royale/maven/CompileTypedefsMojo.java | 2 +-
61 files changed, 182 insertions(+), 291 deletions(-)
diff --git a/compiler-build-tools/build.xml b/compiler-build-tools/build.xml
index 2f950bc..4e167e9 100644
--- a/compiler-build-tools/build.xml
+++ b/compiler-build-tools/build.xml
@@ -76,7 +76,7 @@
source="${javac.src}" target="${javac.src}">
<compilerarg value="-Xlint:all,-path,-fallthrough"/>
<src path="${compiler-build-tools}/src/main/java"/>
- <include
name="org/apache/flex/compiler/tools/annotate/AnnotateClass.java"/>
+ <include
name="org/apache/royale/compiler/tools/annotate/AnnotateClass.java"/>
<classpath>
<pathelement
location="${compiler-build-tools}/target/classes"/>
</classpath>
@@ -90,7 +90,7 @@
<javac debug="${javac.debug}" deprecation="${javac.deprecation}"
destdir="${compiler-build-tools}/target/classes"
includeAntRuntime="true" source="${javac.src}"
target="${javac.src}">
<src path="${compiler-build-tools}/src/main/java"/>
- <include
name="org/apache/flex/compiler/tools/unknowntreehandler/UnknownTreePatternInputOutput.java"/>
+ <include
name="org/apache/royale/compiler/tools/unknowntreehandler/UnknownTreePatternInputOutput.java"/>
<compilerarg value="-Xlint:all,-path,-fallthrough"/>
</javac>
</target>
diff --git a/compiler-jburg-types/build.xml b/compiler-jburg-types/build.xml
index 69cc3bd..8059e57 100644
--- a/compiler-jburg-types/build.xml
+++ b/compiler-jburg-types/build.xml
@@ -65,7 +65,7 @@
source="${javac.src}" target="${javac.src}">
<compilerarg value="-Xlint:all,-path,-fallthrough"/>
<src path="${compiler-jburg-types}/src/main/java"/>
- <include
name="org/apache/flex/compiler/internal/as/codegen/IASNodeAdapter.java"/>
+ <include
name="org/apache/royale/compiler/internal/as/codegen/IASNodeAdapter.java"/>
<classpath>
<pathelement
location="${compiler-jburg-types}/../compiler/lib/external/jburg.jar"/>
</classpath>
diff --git
a/compiler-jx/src/main/java/org/apache/royale/compiler/clients/ASDOCJSC.java
b/compiler-jx/src/main/java/org/apache/royale/compiler/clients/ASDOCJSC.java
index 5e0344e..c4a78e9 100644
--- a/compiler-jx/src/main/java/org/apache/royale/compiler/clients/ASDOCJSC.java
+++ b/compiler-jx/src/main/java/org/apache/royale/compiler/clients/ASDOCJSC.java
@@ -63,7 +63,7 @@ import org.apache.royale.compiler.units.ICompilationUnit;
* @author Erik de Bruin
* @author Michael Schmalle
*/
-public class ASDOCJSC extends MXMLJSCFlex
+public class ASDOCJSC extends MXMLJSCRoyale
{
/*
* Exit code enumerations.
@@ -134,12 +134,12 @@ public class ASDOCJSC extends MXMLJSCFlex
backend = new MXMLJSCJSSWCBackend();
break;
- case FLEXJS:
- case FLEXJS_DUAL:
+ case ROYALE:
+ case ROYALE_DUAL:
backend = new MXMLRoyaleASDocBackend();
break;
- case FLEXJS_DITA:
+ case ROYALE_DITA:
backend = new MXMLRoyaleASDocDITABackend();
break;
@@ -314,7 +314,7 @@ public class ASDOCJSC extends MXMLJSCFlex
}
/**
- * Replaces FlexApplicationProject::buildSWF()
+ * Replaces RoyaleApplicationProject::buildSWF()
*
* @param applicationProject
* @param rootClassName
diff --git
a/compiler-jx/src/main/java/org/apache/royale/compiler/clients/COMPJSCNative.java
b/compiler-jx/src/main/java/org/apache/royale/compiler/clients/COMPJSCNative.java
index f40b6f8..ec69b6c 100644
---
a/compiler-jx/src/main/java/org/apache/royale/compiler/clients/COMPJSCNative.java
+++
b/compiler-jx/src/main/java/org/apache/royale/compiler/clients/COMPJSCNative.java
@@ -383,7 +383,7 @@ public class COMPJSCNative extends MXMLJSCNative
}
/**
- * Replaces FlexApplicationProject::buildSWF()
+ * Replaces RoyaleApplicationProject::buildSWF()
*
* @param applicationProject
* @param rootClassName
diff --git
a/compiler-jx/src/main/java/org/apache/royale/compiler/clients/COMPJSCFlex.java
b/compiler-jx/src/main/java/org/apache/royale/compiler/clients/COMPJSCRoyale.java
similarity index 99%
rename from
compiler-jx/src/main/java/org/apache/royale/compiler/clients/COMPJSCFlex.java
rename to
compiler-jx/src/main/java/org/apache/royale/compiler/clients/COMPJSCRoyale.java
index 3bc639a..033954a 100644
---
a/compiler-jx/src/main/java/org/apache/royale/compiler/clients/COMPJSCFlex.java
+++
b/compiler-jx/src/main/java/org/apache/royale/compiler/clients/COMPJSCRoyale.java
@@ -67,7 +67,7 @@ import org.apache.royale.swc.io.SWCReader;
* @author Erik de Bruin
* @author Michael Schmalle
*/
-public class COMPJSCFlex extends MXMLJSCFlex
+public class COMPJSCRoyale extends MXMLJSCRoyale
{
/*
* Exit code enumerations.
@@ -121,7 +121,7 @@ public class COMPJSCFlex extends MXMLJSCFlex
{
long startTime = System.nanoTime();
- final COMPJSCFlex mxmlc = new COMPJSCFlex();
+ final COMPJSCRoyale mxmlc = new COMPJSCRoyale();
final List<ICompilerProblem> problems = new
ArrayList<ICompilerProblem>();
final int exitCode = mxmlc.mainNoExit(args, problems, true);
@@ -131,7 +131,7 @@ public class COMPJSCFlex extends MXMLJSCFlex
return exitCode;
}
- public COMPJSCFlex()
+ public COMPJSCRoyale()
{
IBackend backend = new MXMLRoyaleSWCBackend();
@@ -384,7 +384,7 @@ public class COMPJSCFlex extends MXMLJSCFlex
}
/**
- * Replaces FlexApplicationProject::buildSWF()
+ * Replaces RoyaleApplicationProject::buildSWF()
*
* @param applicationProject
* @param rootClassName
diff --git
a/compiler-jx/src/main/java/org/apache/royale/compiler/clients/EXTERNC.java
b/compiler-jx/src/main/java/org/apache/royale/compiler/clients/EXTERNC.java
index ea6bf09..6c02db0 100644
--- a/compiler-jx/src/main/java/org/apache/royale/compiler/clients/EXTERNC.java
+++ b/compiler-jx/src/main/java/org/apache/royale/compiler/clients/EXTERNC.java
@@ -35,7 +35,7 @@ import
org.apache.royale.compiler.internal.codegen.externals.reference.Reference
import org.apache.royale.compiler.problems.ICompilerProblem;
import org.apache.royale.compiler.problems.UnexpectedExceptionProblem;
import org.apache.royale.compiler.targets.ITarget.TargetType;
-import org.apache.royale.tools.FlexTool;
+import org.apache.flex.tools.FlexTool;
import com.google.javascript.jscomp.Result;
diff --git
a/compiler-jx/src/main/java/org/apache/royale/compiler/clients/MXMLJSC.java
b/compiler-jx/src/main/java/org/apache/royale/compiler/clients/MXMLJSC.java
index 07d7359..4f6a605 100644
--- a/compiler-jx/src/main/java/org/apache/royale/compiler/clients/MXMLJSC.java
+++ b/compiler-jx/src/main/java/org/apache/royale/compiler/clients/MXMLJSC.java
@@ -75,7 +75,7 @@ import org.apache.royale.swf.ISWF;
import org.apache.royale.swf.SWF;
import org.apache.royale.swf.types.RGB;
import org.apache.royale.swf.types.Rect;
-import org.apache.royale.tools.FlexTool;
+import org.apache.flex.tools.FlexTool;
import org.apache.royale.utils.ArgumentUtil;
import org.apache.royale.utils.FilenameNormalization;
diff --git
a/compiler-jx/src/main/java/org/apache/royale/compiler/clients/MXMLJSCNative.java
b/compiler-jx/src/main/java/org/apache/royale/compiler/clients/MXMLJSCNative.java
index 3cc9c62..341d551 100644
---
a/compiler-jx/src/main/java/org/apache/royale/compiler/clients/MXMLJSCNative.java
+++
b/compiler-jx/src/main/java/org/apache/royale/compiler/clients/MXMLJSCNative.java
@@ -71,7 +71,7 @@ import org.apache.royale.compiler.targets.ITarget.TargetType;
import org.apache.royale.compiler.targets.ITargetSettings;
import org.apache.royale.compiler.units.ICompilationUnit;
import org.apache.royale.compiler.units.ICompilationUnit.UnitType;
-import org.apache.royale.tools.FlexTool;
+import org.apache.flex.tools.FlexTool;
import org.apache.royale.utils.ArgumentUtil;
import org.apache.royale.utils.FilenameNormalization;
@@ -423,7 +423,7 @@ public class MXMLJSCNative implements JSCompilerEntryPoint,
ProblemQueryProvider
}
/**
- * Replaces FlexApplicationProject::buildSWF()
+ * Replaces RoyaleApplicationProject::buildSWF()
*
* @param applicationProject
* @param rootClassName
diff --git
a/compiler-jx/src/main/java/org/apache/royale/compiler/clients/MXMLJSCNode.java
b/compiler-jx/src/main/java/org/apache/royale/compiler/clients/MXMLJSCNode.java
index 217317a..080cb60 100644
---
a/compiler-jx/src/main/java/org/apache/royale/compiler/clients/MXMLJSCNode.java
+++
b/compiler-jx/src/main/java/org/apache/royale/compiler/clients/MXMLJSCNode.java
@@ -71,7 +71,7 @@ import org.apache.royale.compiler.targets.ITarget.TargetType;
import org.apache.royale.compiler.targets.ITargetSettings;
import org.apache.royale.compiler.units.ICompilationUnit;
import org.apache.royale.compiler.units.ICompilationUnit.UnitType;
-import org.apache.royale.tools.FlexTool;
+import org.apache.flex.tools.FlexTool;
import org.apache.royale.utils.ArgumentUtil;
import org.apache.royale.utils.FilenameNormalization;
@@ -425,7 +425,7 @@ public class MXMLJSCNode implements JSCompilerEntryPoint,
ProblemQueryProvider,
}
/**
- * Replaces FlexApplicationProject::buildSWF()
+ * Replaces RoyaleApplicationProject::buildSWF()
*
* @param applicationProject
* @param rootClassName
diff --git
a/compiler-jx/src/main/java/org/apache/royale/compiler/clients/MXMLJSCFlex.java
b/compiler-jx/src/main/java/org/apache/royale/compiler/clients/MXMLJSCRoyale.java
similarity index 98%
rename from
compiler-jx/src/main/java/org/apache/royale/compiler/clients/MXMLJSCFlex.java
rename to
compiler-jx/src/main/java/org/apache/royale/compiler/clients/MXMLJSCRoyale.java
index 91c1221..e4db798 100644
---
a/compiler-jx/src/main/java/org/apache/royale/compiler/clients/MXMLJSCFlex.java
+++
b/compiler-jx/src/main/java/org/apache/royale/compiler/clients/MXMLJSCRoyale.java
@@ -72,7 +72,7 @@ import org.apache.royale.compiler.targets.ITarget.TargetType;
import org.apache.royale.compiler.targets.ITargetSettings;
import org.apache.royale.compiler.units.ICompilationUnit;
import org.apache.royale.compiler.units.ICompilationUnit.UnitType;
-import org.apache.royale.tools.FlexTool;
+import org.apache.flex.tools.FlexTool;
import org.apache.royale.utils.ArgumentUtil;
import org.apache.royale.utils.FilenameNormalization;
@@ -83,7 +83,7 @@ import com.google.common.collect.Iterables;
* @author Erik de Bruin
* @author Michael Schmalle
*/
-public class MXMLJSCFlex implements JSCompilerEntryPoint, ProblemQueryProvider,
+public class MXMLJSCRoyale implements JSCompilerEntryPoint,
ProblemQueryProvider,
FlexTool
{
@Override
@@ -149,7 +149,7 @@ public class MXMLJSCFlex implements JSCompilerEntryPoint,
ProblemQueryProvider,
{
long startTime = System.nanoTime();
- final MXMLJSCFlex mxmlc = new MXMLJSCFlex();
+ final MXMLJSCRoyale mxmlc = new MXMLJSCRoyale();
final List<ICompilerProblem> problems = new
ArrayList<ICompilerProblem>();
final int exitCode = mxmlc.mainNoExit(args, problems, true);
@@ -173,12 +173,12 @@ public class MXMLJSCFlex implements JSCompilerEntryPoint,
ProblemQueryProvider,
protected IJSApplication jsTarget;
private IJSPublisher jsPublisher;
- public MXMLJSCFlex()
+ public MXMLJSCRoyale()
{
this(new MXMLRoyaleBackend());
}
- public MXMLJSCFlex(IBackend backend)
+ public MXMLJSCRoyale(IBackend backend)
{
workspace = new Workspace();
workspace.setASDocDelegate(new RoyaleASDocDelegate());
@@ -431,7 +431,7 @@ public class MXMLJSCFlex implements JSCompilerEntryPoint,
ProblemQueryProvider,
}
/**
- * Replaces FlexApplicationProject::buildSWF()
+ * Replaces RoyaleApplicationProject::buildSWF()
*
* @param applicationProject
* @param rootClassName
diff --git
a/compiler-jx/src/main/java/org/apache/royale/compiler/clients/MXMLJSCFlexCordova.java
b/compiler-jx/src/main/java/org/apache/royale/compiler/clients/MXMLJSCRoyaleCordova.java
similarity index 98%
rename from
compiler-jx/src/main/java/org/apache/royale/compiler/clients/MXMLJSCFlexCordova.java
rename to
compiler-jx/src/main/java/org/apache/royale/compiler/clients/MXMLJSCRoyaleCordova.java
index ef6396f..a6ca153 100644
---
a/compiler-jx/src/main/java/org/apache/royale/compiler/clients/MXMLJSCFlexCordova.java
+++
b/compiler-jx/src/main/java/org/apache/royale/compiler/clients/MXMLJSCRoyaleCordova.java
@@ -71,7 +71,7 @@ import org.apache.royale.compiler.targets.ITarget.TargetType;
import org.apache.royale.compiler.targets.ITargetSettings;
import org.apache.royale.compiler.units.ICompilationUnit;
import org.apache.royale.compiler.units.ICompilationUnit.UnitType;
-import org.apache.royale.tools.FlexTool;
+import org.apache.flex.tools.FlexTool;
import org.apache.royale.utils.ArgumentUtil;
import org.apache.royale.utils.FilenameNormalization;
@@ -82,7 +82,7 @@ import com.google.common.collect.Iterables;
* @author Erik de Bruin
* @author Michael Schmalle
*/
-public class MXMLJSCFlexCordova implements JSCompilerEntryPoint,
ProblemQueryProvider,
+public class MXMLJSCRoyaleCordova implements JSCompilerEntryPoint,
ProblemQueryProvider,
FlexTool
{
@Override
@@ -148,7 +148,7 @@ public class MXMLJSCFlexCordova implements
JSCompilerEntryPoint, ProblemQueryPro
{
long startTime = System.nanoTime();
- final MXMLJSCFlexCordova mxmlc = new MXMLJSCFlexCordova();
+ final MXMLJSCRoyaleCordova mxmlc = new MXMLJSCRoyaleCordova();
final List<ICompilerProblem> problems = new
ArrayList<ICompilerProblem>();
final int exitCode = mxmlc.mainNoExit(args, problems, true);
@@ -172,12 +172,12 @@ public class MXMLJSCFlexCordova implements
JSCompilerEntryPoint, ProblemQueryPro
protected IJSApplication jsTarget;
private IJSPublisher jsPublisher;
- public MXMLJSCFlexCordova()
+ public MXMLJSCRoyaleCordova()
{
this(new MXMLRoyaleCordovaBackend());
}
- public MXMLJSCFlexCordova(IBackend backend)
+ public MXMLJSCRoyaleCordova(IBackend backend)
{
workspace = new Workspace();
workspace.setASDocDelegate(new RoyaleASDocDelegate());
@@ -428,7 +428,7 @@ public class MXMLJSCFlexCordova implements
JSCompilerEntryPoint, ProblemQueryPro
}
/**
- * Replaces FlexApplicationProject::buildSWF()
+ * Replaces RoyaleApplicationProject::buildSWF()
*
* @param applicationProject
* @param rootClassName
diff --git
a/compiler-jx/src/main/java/org/apache/royale/compiler/clients/RoyaleToolGroup.java
b/compiler-jx/src/main/java/org/apache/royale/compiler/clients/RoyaleToolGroup.java
index 947cbf6..1b5d58a 100644
---
a/compiler-jx/src/main/java/org/apache/royale/compiler/clients/RoyaleToolGroup.java
+++
b/compiler-jx/src/main/java/org/apache/royale/compiler/clients/RoyaleToolGroup.java
@@ -20,7 +20,7 @@
package org.apache.royale.compiler.clients;
import
org.apache.royale.compiler.internal.driver.mxml.royale.MXMLRoyaleASDocDITABackend;
-import org.apache.royale.tools.AbstractFlexToolGroup;
+import org.apache.flex.tools.AbstractFlexToolGroup;
/**
* Created by christoferdutz on 10.11.14.
diff --git
a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/royale/JSRoyaleEmitter.java
b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/royale/JSRoyaleEmitter.java
index 88df1eb..0d0e0ad 100644
---
a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/royale/JSRoyaleEmitter.java
+++
b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/royale/JSRoyaleEmitter.java
@@ -70,7 +70,7 @@ import
org.apache.royale.compiler.internal.embedding.EmbedData;
import org.apache.royale.compiler.internal.embedding.EmbedMIMEType;
import org.apache.royale.compiler.internal.projects.CompilerProject;
import org.apache.royale.compiler.internal.projects.RoyaleJSProject;
-import org.apache.royale.compiler.internal.projects.FlexProject;
+import org.apache.royale.compiler.internal.projects.RoyaleProject;
import org.apache.royale.compiler.internal.tree.as.*;
import org.apache.royale.compiler.problems.EmbedUnableToReadSourceProblem;
import org.apache.royale.compiler.projects.ICompilerProject;
@@ -1198,7 +1198,7 @@ public class JSRoyaleEmitter extends JSGoogEmitter
implements IJSRoyaleEmitter
*/
public boolean isProxy(IExpressionNode obj)
{
- FlexProject project = (FlexProject)getWalker().getProject();
+ RoyaleProject project = (RoyaleProject)getWalker().getProject();
// See if it is Proxy
ITypeDefinition leftDef = obj.resolveType(project);
if (leftDef == null)
@@ -1233,7 +1233,7 @@ public class JSRoyaleEmitter extends JSGoogEmitter
implements IJSRoyaleEmitter
*/
public boolean isDateProperty(IExpressionNode obj)
{
- FlexProject project = (FlexProject)getWalker().getProject();
+ RoyaleProject project = (RoyaleProject)getWalker().getProject();
if (obj.getNodeID() == ASTNodeID.MemberAccessExpressionID)
{
IDefinition leftDef;
diff --git
a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/mxml/royale/MXMLRoyaleASDocEmitter.java
b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/mxml/royale/MXMLRoyaleASDocEmitter.java
index 429e242..69885c4 100644
---
a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/mxml/royale/MXMLRoyaleASDocEmitter.java
+++
b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/mxml/royale/MXMLRoyaleASDocEmitter.java
@@ -41,7 +41,7 @@ import
org.apache.royale.compiler.internal.codegen.js.royale.JSRoyaleASDocEmitte
import
org.apache.royale.compiler.internal.codegen.js.royale.JSRoyaleEmitterTokens;
import org.apache.royale.compiler.internal.codegen.js.utils.EmitterUtils;
import org.apache.royale.compiler.internal.codegen.mxml.MXMLEmitter;
-import org.apache.royale.compiler.internal.projects.FlexProject;
+import org.apache.royale.compiler.internal.projects.RoyaleProject;
import org.apache.royale.compiler.projects.ICompilerProject;
import org.apache.royale.compiler.tree.ASTNodeID;
import org.apache.royale.compiler.tree.as.*;
@@ -521,7 +521,7 @@ public class MXMLRoyaleASDocEmitter extends MXMLEmitter
implements
public void emitPropertyOverride(IMXMLPropertySpecifierNode propertyNode)
{
- FlexProject project = (FlexProject) getMXMLWalker().getProject();
+ RoyaleProject project = (RoyaleProject) getMXMLWalker().getProject();
Name propertyOverride = project.getPropertyOverrideClassName();
emitPropertyOrStyleOverride(propertyOverride, propertyNode);
}
@@ -534,7 +534,7 @@ public class MXMLRoyaleASDocEmitter extends MXMLEmitter
implements
*/
void emitStyleOverride(IMXMLStyleSpecifierNode styleNode)
{
- FlexProject project = (FlexProject) getMXMLWalker().getProject();
+ RoyaleProject project = (RoyaleProject) getMXMLWalker().getProject();
Name styleOverride = project.getStyleOverrideClassName();
emitPropertyOrStyleOverride(styleOverride, styleNode);
}
@@ -620,7 +620,7 @@ public class MXMLRoyaleASDocEmitter extends MXMLEmitter
implements
inStatesOverride = true;
MXMLDescriptorSpecifier currentInstance = getCurrentDescriptor("ps");
- FlexProject project = (FlexProject) getMXMLWalker().getProject();
+ RoyaleProject project = (RoyaleProject) getMXMLWalker().getProject();
Name eventOverride = project.getEventOverrideClassName();
IASNode parentNode = eventNode.getParent();
@@ -680,7 +680,7 @@ public class MXMLRoyaleASDocEmitter extends MXMLEmitter
implements
inStatesOverride = true;
MXMLDescriptorSpecifier currentInstance = getCurrentDescriptor("ps");
- FlexProject project = (FlexProject) getMXMLWalker().getProject();
+ RoyaleProject project = (RoyaleProject) getMXMLWalker().getProject();
Name instanceOverrideName = project.getInstanceOverrideClassName();
MXMLDescriptorSpecifier overrideInstances = getCurrentDescriptor("so");
diff --git
a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/mxml/royale/MXMLRoyaleEmitter.java
b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/mxml/royale/MXMLRoyaleEmitter.java
index b465aaf..1fc90ba 100644
---
a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/mxml/royale/MXMLRoyaleEmitter.java
+++
b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/mxml/royale/MXMLRoyaleEmitter.java
@@ -64,7 +64,7 @@ import
org.apache.royale.compiler.internal.codegen.js.utils.EmitterUtils;
import org.apache.royale.compiler.internal.codegen.mxml.MXMLEmitter;
import
org.apache.royale.compiler.internal.driver.js.royale.JSCSSCompilationSession;
import org.apache.royale.compiler.internal.projects.RoyaleJSProject;
-import org.apache.royale.compiler.internal.projects.FlexProject;
+import org.apache.royale.compiler.internal.projects.RoyaleProject;
import org.apache.royale.compiler.internal.scopes.ASProjectScope;
import org.apache.royale.compiler.internal.targets.ITargetAttributes;
import org.apache.royale.compiler.internal.tree.as.FunctionCallNode;
@@ -1932,7 +1932,7 @@ public class MXMLRoyaleEmitter extends MXMLEmitter
implements
public void emitPropertyOverride(IMXMLPropertySpecifierNode propertyNode)
{
- FlexProject project = (FlexProject) getMXMLWalker().getProject();
+ RoyaleProject project = (RoyaleProject) getMXMLWalker().getProject();
Name propertyOverride = project.getPropertyOverrideClassName();
emitPropertyOrStyleOverride(propertyOverride, propertyNode);
}
@@ -1945,7 +1945,7 @@ public class MXMLRoyaleEmitter extends MXMLEmitter
implements
*/
void emitStyleOverride(IMXMLStyleSpecifierNode styleNode)
{
- FlexProject project = (FlexProject) getMXMLWalker().getProject();
+ RoyaleProject project = (RoyaleProject) getMXMLWalker().getProject();
Name styleOverride = project.getStyleOverrideClassName();
emitPropertyOrStyleOverride(styleOverride, styleNode);
}
@@ -2031,7 +2031,7 @@ public class MXMLRoyaleEmitter extends MXMLEmitter
implements
inStatesOverride = true;
MXMLDescriptorSpecifier currentInstance = getCurrentDescriptor("ps");
- FlexProject project = (FlexProject) getMXMLWalker().getProject();
+ RoyaleProject project = (RoyaleProject) getMXMLWalker().getProject();
Name eventOverride = project.getEventOverrideClassName();
IASNode parentNode = eventNode.getParent();
@@ -2091,7 +2091,7 @@ public class MXMLRoyaleEmitter extends MXMLEmitter
implements
inStatesOverride = true;
MXMLDescriptorSpecifier currentInstance = getCurrentDescriptor("ps");
- FlexProject project = (FlexProject) getMXMLWalker().getProject();
+ RoyaleProject project = (RoyaleProject) getMXMLWalker().getProject();
Name instanceOverrideName = project.getInstanceOverrideClassName();
MXMLDescriptorSpecifier overrideInstances = getCurrentDescriptor("so");
diff --git
a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/driver/js/JSSourceFileHandler.java
b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/driver/js/JSSourceFileHandler.java
index f8afad1..2feae00 100644
---
a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/driver/js/JSSourceFileHandler.java
+++
b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/driver/js/JSSourceFileHandler.java
@@ -29,7 +29,7 @@ import org.apache.royale.compiler.units.ICompilationUnit;
* Implementation of ISourceFileHandler that constructs
* {@link ASCompilationUnit}'s. JSSourceFileHandler is the SourceFileHandler
* that provides JSCompilationUnit for *.as files. JSDriver registers
- * JSSourceFileHandler at FlexApplicationProject. This implementation is part
of
+ * JSSourceFileHandler at RoyaleApplicationProject. This implementation is
part of
* FalconJS. For more details on FalconJS see
org.apache.royale.compiler.JSDriver
*/
public final class JSSourceFileHandler implements ISourceFileHandler
diff --git
a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/driver/js/goog/JSGoogCompcConfiguration.java
b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/driver/js/goog/JSGoogCompcConfiguration.java
index 30d4b85..d776b8d 100644
---
a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/driver/js/goog/JSGoogCompcConfiguration.java
+++
b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/driver/js/goog/JSGoogCompcConfiguration.java
@@ -34,7 +34,7 @@ import org.apache.royale.compiler.config.ConfigurationValue;
import org.apache.royale.compiler.exceptions.ConfigurationException;
import org.apache.royale.compiler.internal.config.annotations.Arguments;
import org.apache.royale.compiler.internal.config.annotations.Config;
-import org.apache.royale.compiler.internal.config.annotations.FlexOnly;
+import org.apache.royale.compiler.internal.config.annotations.RoyaleOnly;
import
org.apache.royale.compiler.internal.config.annotations.InfiniteArguments;
import org.apache.royale.compiler.internal.config.annotations.Mapping;
@@ -124,7 +124,7 @@ public class JSGoogCompcConfiguration extends
JSConfiguration
@Override
@Config
@Mapping({"compiler", "mxml", "children-as-data"})
- @FlexOnly
+ @RoyaleOnly
public void setCompilerMxmlChildrenAsData(ConfigurationValue cv, Boolean
asData) throws ConfigurationException
{
childrenAsData = asData;
diff --git
a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/driver/js/goog/JSGoogConfiguration.java
b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/driver/js/goog/JSGoogConfiguration.java
index 0963110..7363cdd 100644
---
a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/driver/js/goog/JSGoogConfiguration.java
+++
b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/driver/js/goog/JSGoogConfiguration.java
@@ -34,7 +34,7 @@ import org.apache.royale.compiler.config.ConfigurationValue;
import org.apache.royale.compiler.exceptions.ConfigurationException;
import org.apache.royale.compiler.internal.config.annotations.Arguments;
import org.apache.royale.compiler.internal.config.annotations.Config;
-import org.apache.royale.compiler.internal.config.annotations.FlexOnly;
+import org.apache.royale.compiler.internal.config.annotations.RoyaleOnly;
import
org.apache.royale.compiler.internal.config.annotations.InfiniteArguments;
import org.apache.royale.compiler.internal.config.annotations.Mapping;
@@ -123,7 +123,7 @@ public class JSGoogConfiguration extends JSConfiguration
@Override
@Config
@Mapping({"compiler", "mxml", "children-as-data"})
- @FlexOnly
+ @RoyaleOnly
public void setCompilerMxmlChildrenAsData(ConfigurationValue cv, Boolean
asData) throws ConfigurationException
{
childrenAsData = asData;
diff --git
a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/driver/mxml/ASDocASSourceFileHandler.java
b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/driver/mxml/ASDocASSourceFileHandler.java
index 4616b81..40a8535 100644
---
a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/driver/mxml/ASDocASSourceFileHandler.java
+++
b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/driver/mxml/ASDocASSourceFileHandler.java
@@ -31,7 +31,7 @@ import org.apache.royale.compiler.units.ICompilationUnit;
* Implementation of ISourceFileHandler that constructs
* {@link ASCompilationUnit}'s. MXMLSourceFileHandler is the SourceFileHandler
* that provides JSCompilationUnit for *.mxml files. JSDriver registers
- * MXMLSourceFileHandler at FlexApplicationProject. This implementation is part
+ * MXMLSourceFileHandler at RoyaleApplicationProject. This implementation is
part
* of FalconJS. For more details on FalconJS see
* org.apache.royale.compiler.JSDriver
*/
diff --git
a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/driver/mxml/ASDocMXMLSourceFileHandler.java
b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/driver/mxml/ASDocMXMLSourceFileHandler.java
index 76f3622..6241c7c 100644
---
a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/driver/mxml/ASDocMXMLSourceFileHandler.java
+++
b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/driver/mxml/ASDocMXMLSourceFileHandler.java
@@ -32,7 +32,7 @@ import org.apache.royale.compiler.units.ICompilationUnit;
* Implementation of ISourceFileHandler that constructs
* {@link ASCompilationUnit}'s. MXMLSourceFileHandler is the SourceFileHandler
* that provides JSCompilationUnit for *.mxml files. JSDriver registers
- * MXMLSourceFileHandler at FlexApplicationProject. This implementation is part
+ * MXMLSourceFileHandler at RoyaleApplicationProject. This implementation is
part
* of FalconJS. For more details on FalconJS see
* org.apache.royale.compiler.JSDriver
*/
diff --git
a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/driver/mxml/MXMLSourceFileHandler.java
b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/driver/mxml/MXMLSourceFileHandler.java
index 3d82648..de660a8 100644
---
a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/driver/mxml/MXMLSourceFileHandler.java
+++
b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/driver/mxml/MXMLSourceFileHandler.java
@@ -30,7 +30,7 @@ import org.apache.royale.compiler.units.ICompilationUnit;
* Implementation of ISourceFileHandler that constructs
* {@link ASCompilationUnit}'s. MXMLSourceFileHandler is the SourceFileHandler
* that provides JSCompilationUnit for *.mxml files. JSDriver registers
- * MXMLSourceFileHandler at FlexApplicationProject. This implementation is part
+ * MXMLSourceFileHandler at RoyaleApplicationProject. This implementation is
part
* of FalconJS. For more details on FalconJS see
* org.apache.royale.compiler.JSDriver
*/
diff --git
a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/projects/RoyaleProject.java
b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/projects/RoyaleJSProject.java
similarity index 99%
rename from
compiler-jx/src/main/java/org/apache/royale/compiler/internal/projects/RoyaleProject.java
rename to
compiler-jx/src/main/java/org/apache/royale/compiler/internal/projects/RoyaleJSProject.java
index 1b06878..fc466c9 100644
---
a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/projects/RoyaleProject.java
+++
b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/projects/RoyaleJSProject.java
@@ -66,7 +66,7 @@ import com.google.common.collect.ImmutableList;
* @author aharui
*
*/
-public class RoyaleJSProject extends FlexProject
+public class RoyaleJSProject extends RoyaleProject
{
/**
diff --git
a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/targets/RoyaleTarget.java
b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/targets/RoyaleTarget.java
index 4a8b8e3..6c7005c 100644
---
a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/targets/RoyaleTarget.java
+++
b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/targets/RoyaleTarget.java
@@ -63,7 +63,7 @@ public class RoyaleTarget extends JSTarget implements
IJSTarget
///////////
//
- // Copied from FlexAppSWFTarget.java then modified
+ // Copied from RoyaleAppSWFTarget.java then modified
//
///////////
/**
@@ -299,7 +299,7 @@ public class RoyaleTarget extends JSTarget implements
IJSTarget
for (ICompilationUnit unit : units)
{
try {
-
FlexApplicationFrame1Info.collectMixinMetaData(mixinClassNames, unit);
+
RoyaleApplicationFrame1Info.collectMixinMetaData(mixinClassNames, unit);
} catch (InterruptedException e) {
// TODO Auto-generated catch block
e.printStackTrace();
@@ -312,7 +312,7 @@ public class RoyaleTarget extends JSTarget implements
IJSTarget
for (ICompilationUnit unit : units)
{
try {
-
FlexApplicationFrame1Info.collectRemoteClassMetaData(remoteClassAliasMap, unit);
+
RoyaleApplicationFrame1Info.collectRemoteClassMetaData(remoteClassAliasMap,
unit);
} catch (InterruptedException e) {
// TODO Auto-generated catch block
e.printStackTrace();
diff --git
a/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/externals/TestExternalsJSCompile.java
b/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/externals/TestExternalsJSCompile.java
index 4a7a715..270f688 100644
---
a/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/externals/TestExternalsJSCompile.java
+++
b/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/externals/TestExternalsJSCompile.java
@@ -38,7 +38,7 @@ import org.apache.royale.compiler.config.Configurator;
import org.apache.royale.compiler.internal.codegen.as.ASFilterWriter;
import org.apache.royale.compiler.internal.driver.js.royale.RoyaleBackend;
import org.apache.royale.compiler.internal.projects.RoyaleJSProject;
-import org.apache.royale.compiler.internal.projects.FlexProjectConfigurator;
+import org.apache.royale.compiler.internal.projects.RoyaleProjectConfigurator;
import org.apache.royale.compiler.internal.targets.JSTarget;
import org.apache.royale.compiler.internal.workspaces.Workspace;
import org.apache.royale.compiler.problems.ICompilerProblem;
@@ -100,7 +100,7 @@ public class TestExternalsJSCompile
backend = new RoyaleBackend();
if (project == null)
project = new RoyaleJSProject(workspace, backend);
- FlexProjectConfigurator.configure(project);
+ RoyaleProjectConfigurator.configure(project);
//writer = backend.createWriterBuffer(project);
//emitter = backend.createEmitter(writer);
diff --git
a/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/royale/TestRoyaleProject.java
b/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/royale/TestRoyaleProject.java
index bf5a7d5..a89e7f4 100644
---
a/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/royale/TestRoyaleProject.java
+++
b/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/royale/TestRoyaleProject.java
@@ -47,7 +47,7 @@ import org.junit.Test;
*
* @author Erik de Bruin
*/
-public class TestRoyaleJSProject extends TestGoogProject
+public class TestRoyaleProject extends TestGoogProject
{
private static ITestAdapter testAdapter =
TestAdapterFactory.getTestAdapter();
diff --git
a/compiler-jx/src/test/java/org/apache/royale/compiler/internal/test/RoyaleTestBase.java
b/compiler-jx/src/test/java/org/apache/royale/compiler/internal/test/RoyaleTestBase.java
index a55cb6e..0e2b8d8 100644
---
a/compiler-jx/src/test/java/org/apache/royale/compiler/internal/test/RoyaleTestBase.java
+++
b/compiler-jx/src/test/java/org/apache/royale/compiler/internal/test/RoyaleTestBase.java
@@ -61,10 +61,6 @@ public class RoyaleTestBase extends TestBase
{
libraries.add(new File(FilenameNormalization.normalize(env.FPSDK
+ "/" + env.FPVER + "/playerglobal.swc")));
- libraries.add(new File(FilenameNormalization.normalize(env.SDK
- + "/frameworks/libs/framework.swc")));
- libraries.add(new File(FilenameNormalization.normalize(env.SDK
- + "\\frameworks\\libs\\rpc.swc")));
libraries.add(new File(env.ASJS + "/frameworks/libs/Core.swc"));
libraries.add(new File(env.ASJS + "/frameworks/libs/Basic.swc"));
libraries.add(new File(env.ASJS + "/frameworks/libs/HTML.swc"));
diff --git
a/compiler-jx/src/test/java/org/apache/royale/compiler/internal/test/TestBase.java
b/compiler-jx/src/test/java/org/apache/royale/compiler/internal/test/TestBase.java
index ede52a6..dc122a7 100644
---
a/compiler-jx/src/test/java/org/apache/royale/compiler/internal/test/TestBase.java
+++
b/compiler-jx/src/test/java/org/apache/royale/compiler/internal/test/TestBase.java
@@ -48,7 +48,7 @@ import org.apache.royale.compiler.config.Configurator;
import org.apache.royale.compiler.driver.IBackend;
import org.apache.royale.compiler.internal.codegen.as.ASFilterWriter;
import org.apache.royale.compiler.internal.projects.RoyaleJSProject;
-import org.apache.royale.compiler.internal.projects.FlexProjectConfigurator;
+import org.apache.royale.compiler.internal.projects.RoyaleProjectConfigurator;
import org.apache.royale.compiler.internal.projects.ISourceFileHandler;
import org.apache.royale.compiler.internal.targets.JSTarget;
import org.apache.royale.compiler.internal.tree.as.FunctionNode;
@@ -109,10 +109,6 @@ public class TestBase implements ITestBase
@Before
public void setUp()
{
- assertNotNull("Environment variable FLEX_HOME is not set", env.SDK);
- assertNotNull("Environment variable PLAYERGLOBAL_HOME is not set",
- env.FPSDK);
-
errors = new ArrayList<ICompilerProblem>();
if (project == null)
@@ -122,7 +118,7 @@ public class TestBase implements ITestBase
project.setProxyBaseClass("flash.utils.Proxy");
}
project.setProblems(errors);
- FlexProjectConfigurator.configure(project);
+ RoyaleProjectConfigurator.configure(project);
try {
Configurator projectConfigurator = backend.createConfigurator();
project.setTargetSettings(projectConfigurator.getTargetSettings(null));
diff --git
a/compiler-jx/src/test/java/org/apache/royale/utils/EnvProperties.java
b/compiler-jx/src/test/java/org/apache/royale/utils/EnvProperties.java
deleted file mode 100644
index d63feec..0000000
--- a/compiler-jx/src/test/java/org/apache/royale/utils/EnvProperties.java
+++ /dev/null
@@ -1,129 +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.royale.utils;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.util.Properties;
-
-
-/**
- * EnvProperties checks in following order for a value.
- *
- * 1) unittest.properties
- * 2) environment variables
- * 3) for key FLEX_HOME & PLAYERGLOBAL_HOME sets a default value.
- */
-public class EnvProperties {
-
- /**
- * PLAYERGLOBAL_HOME
- */
- public String FPSDK;
-
- /**
- * AIR_HOME
- */
- public String AIRSDK;
-
- /**
- * FLASHPLAYER_DEBUGGER
- */
- public String FDBG;
-
- /**
- * ASJS_HOME
- */
- public String ASJS;
-
- /**
- * GOOG_HOME
- */
- public String GOOG;
-
- /**
- * PLAYERGLOBAL_VERSION
- */
- public String FPVER;
-
- private static EnvProperties env;
-
- public static EnvProperties initiate() {
- if(env == null) {
- env = new EnvProperties();
- env.setup();
- }
- return env;
- }
-
- private void setup()
- {
- String prefix = "";
- Properties p = new Properties();
- String envFileName =
FilenameNormalization.normalize("../../../env.properties");
- try {
- File f = new File(envFileName);
- if (f.exists())
- {
- p.load(new FileInputStream( f ));
- prefix = "env.";
- }
- } catch (FileNotFoundException e) {
- System.out.println(envFileName + " not found");
- try {
- File f = new File("unittest.properties");
- p.load(new FileInputStream( f ));
- } catch (FileNotFoundException e1) {
- System.out.println("unittest.properties not found");
- } catch (IOException e1) {
- // Ignore
- }
- } catch (IOException e) {
- // Ignore
- }
-
- FPSDK = p.getProperty(prefix + "PLAYERGLOBAL_HOME",
System.getenv("PLAYERGLOBAL_HOME"));
- if(FPSDK == null)
- FPSDK =
FilenameNormalization.normalize("../../../frameworks/libs/player");
- System.out.println("environment property - PLAYERGLOBAL_HOME = " +
FPSDK);
-
- FPVER = p.getProperty(prefix + "PLAYERGLOBAL_VERSION",
System.getenv("PLAYERGLOBAL_VERSION"));
- if (FPVER == null)
- FPVER = "11.1";
- System.out.println("environment property - PLAYERGLOBAL_VERSION = " +
FPVER);
-
- AIRSDK = p.getProperty(prefix + "AIR_HOME", System.getenv("AIR_HOME"));
- System.out.println("environment property - AIR_HOME = " + AIRSDK);
-
- FDBG = p.getProperty(prefix + "FLASHPLAYER_DEBUGGER",
System.getenv("FLASHPLAYER_DEBUGGER"));
- System.out.println("environment property - FLASHPLAYER_DEBUGGER = " +
FDBG);
-
- ASJS = p.getProperty(prefix + "ASJS_HOME", System.getenv("ASJS_HOME"));
- if (ASJS == null)
- ASJS = FilenameNormalization.normalize("../../../../royale-asjs");
- System.out.println("environment property - ASJS_HOME = " + ASJS);
-
- GOOG = p.getProperty(prefix + "GOOG_HOME", System.getenv("GOOG_HOME"));
- System.out.println("environment property - GOOG_HOME = " + GOOG);
- }
-
-}
diff --git
a/compiler-test-utils/src/main/java/org/apache/royale/utils/AntTestAdapter.java
b/compiler-test-utils/src/main/java/org/apache/royale/utils/AntTestAdapter.java
index 40f2367..1e37e2a 100644
---
a/compiler-test-utils/src/main/java/org/apache/royale/utils/AntTestAdapter.java
+++
b/compiler-test-utils/src/main/java/org/apache/royale/utils/AntTestAdapter.java
@@ -90,7 +90,7 @@ public class AntTestAdapter implements ITestAdapter {
}
@Override
- public String getFlexJsManifestPath(String type) {
+ public String getRoyaleManifestPath(String type) {
return null;
}
diff --git
a/compiler-test-utils/src/main/java/org/apache/royale/utils/EnvProperties.java
b/compiler-test-utils/src/main/java/org/apache/royale/utils/EnvProperties.java
index d7d284a..346e857 100644
---
a/compiler-test-utils/src/main/java/org/apache/royale/utils/EnvProperties.java
+++
b/compiler-test-utils/src/main/java/org/apache/royale/utils/EnvProperties.java
@@ -31,10 +31,19 @@ import java.util.Properties;
*
* 1) unittest.properties
* 2) environment variables
- * 3) for key FLEX_HOME & PLAYERGLOBAL_HOME sets a default value.
*/
public class EnvProperties {
+ /**
+ * FLEX_HOME
+ */
+ public String SDK;
+
+ /**
+ * TLF_HOME
+ */
+ public String TLF;
+
/**
* PLAYERGLOBAL_HOME
*/
@@ -56,6 +65,11 @@ public class EnvProperties {
public String ASJS;
/**
+ * GOOG_HOME
+ */
+ public String GOOG;
+
+ /**
* PLAYERGLOBAL_VERSION
*/
public String FPVER;
@@ -97,9 +111,10 @@ public class EnvProperties {
// Ignore
}
+ SDK = p.getProperty(prefix + "FLEX_HOME",
System.getenv("FLEX_HOME"));
+ System.out.println("environment property - FLEX_HOME = " + SDK);
+
FPSDK = p.getProperty(prefix + "PLAYERGLOBAL_HOME",
System.getenv("PLAYERGLOBAL_HOME"));
- if(FPSDK == null)
- FPSDK =
FilenameNormalization.normalize("../../../frameworks/libs/player");
System.out.println("environment property - PLAYERGLOBAL_HOME =
" + FPSDK);
FPVER = p.getProperty(prefix + "PLAYERGLOBAL_VERSION",
System.getenv("PLAYERGLOBAL_VERSION"));
@@ -107,6 +122,9 @@ public class EnvProperties {
FPVER = "11.1";
System.out.println("environment property - PLAYERGLOBAL_VERSION = " +
FPVER);
+ TLF = p.getProperty(prefix + "TLF_HOME", System.getenv("TLF_HOME"));
+ System.out.println("environment property - TLF_HOME = " + TLF);
+
AIRSDK = p.getProperty(prefix + "AIR_HOME",
System.getenv("AIR_HOME"));
System.out.println("environment property - AIR_HOME = " +
AIRSDK);
@@ -117,6 +135,10 @@ public class EnvProperties {
if (ASJS == null)
ASJS =
FilenameNormalization.normalize("../../../../royale-asjs");
System.out.println("environment property - ASJS_HOME = " +
ASJS);
+
+ GOOG = p.getProperty(prefix + "GOOG_HOME", System.getenv("GOOG_HOME"));
+ System.out.println("environment property - GOOG_HOME = " + GOOG);
+
}
}
diff --git
a/compiler-test-utils/src/main/java/org/apache/royale/utils/ITestAdapter.java
b/compiler-test-utils/src/main/java/org/apache/royale/utils/ITestAdapter.java
index fec9858..2477397 100644
---
a/compiler-test-utils/src/main/java/org/apache/royale/utils/ITestAdapter.java
+++
b/compiler-test-utils/src/main/java/org/apache/royale/utils/ITestAdapter.java
@@ -41,7 +41,7 @@ public interface ITestAdapter {
File getFlexArtifactResourceBundle(String artifactName);
- String getFlexJsManifestPath(String type);
+ String getRoyaleManifestPath(String type);
File getRoyaleArtifact(String artifactName);
diff --git
a/compiler-test-utils/src/main/java/org/apache/royale/utils/MavenTestAdapter.java
b/compiler-test-utils/src/main/java/org/apache/royale/utils/MavenTestAdapter.java
index e0240f0..abc1041 100644
---
a/compiler-test-utils/src/main/java/org/apache/royale/utils/MavenTestAdapter.java
+++
b/compiler-test-utils/src/main/java/org/apache/royale/utils/MavenTestAdapter.java
@@ -86,9 +86,9 @@ public class MavenTestAdapter implements ITestAdapter {
}
@Override
- public String getRoyaleManifestPath(String type) {
- File configsZip = getDependency("org.apache.royale.framework",
"framework",
- System.getProperty("royaleVersion"), "zip", "configs");
+ public String getFlexManifestPath(String type) {
+ File configsZip = getDependency("org.apache.flex.framework",
"framework",
+ System.getProperty("flexVersion"), "zip", "configs");
File frameworkDir = configsZip.getParentFile();
File unpackedConfigsDir = new File(frameworkDir, "configs_zip");
// If the directory doesn't exist, we have to create it by unpacking
the zip archive.
@@ -100,20 +100,20 @@ public class MavenTestAdapter implements ITestAdapter {
}
@Override
- public File getRoyaleArtifact(String artifactName) {
- String royaleVersion = System.getProperty("royaleVersion");
- return getDependency("org.apache.royale.framework", artifactName,
royaleVersion, "swc", null);
+ public File getFlexArtifact(String artifactName) {
+ String flexVersion = System.getProperty("flexVersion");
+ return getDependency("org.apache.flex.framework", artifactName,
flexVersion, "swc", null);
}
@Override
- public File getRoyaleArtifactResourceBundle(String artifactName) {
- String royaleVersion = System.getProperty("royaleVersion");
- return getDependency("org.apache.royale.framework", artifactName,
royaleVersion, "rb.swc", "en_US");
+ public File getFlexArtifactResourceBundle(String artifactName) {
+ String flexVersion = System.getProperty("flexVersion");
+ return getDependency("org.apache.flex.framework", artifactName,
flexVersion, "rb.swc", "en_US");
}
@Override
- public String getRoyaleJsManifestPath(String type) {
- File configsZip = getDependency("org.apache.royale.framework.royale",
"framework",
+ public String getRoyaleManifestPath(String type) {
+ File configsZip = getDependency("org.apache.royale.framework",
"framework",
System.getProperty("royaleVersion"), "zip", "configs");
File frameworkDir = configsZip.getParentFile();
File unpackedConfigsDir = new File(frameworkDir, "configs_zip");
diff --git a/compiler/build.xml b/compiler/build.xml
index eccf1f4..f0900da 100644
--- a/compiler/build.xml
+++ b/compiler/build.xml
@@ -497,7 +497,7 @@
</copy>
<!-- Copy the config file for the flex-tool-api. -->
<copy todir="${compiler}/target/classes/META-INF/services"
-
file="src/main/resources/META-INF/services/org.apache.royale.tools.FlexToolGroup"/>
+
file="src/main/resources/META-INF/services/org.apache.flex.tools.FlexToolGroup"/>
</target>
<target name="set.messages.en.uptodate">
diff --git
a/compiler/src/main/java/org/apache/royale/compiler/clients/ASDOC.java
b/compiler/src/main/java/org/apache/royale/compiler/clients/ASDOC.java
index 91c19d6..88eba86 100644
--- a/compiler/src/main/java/org/apache/royale/compiler/clients/ASDOC.java
+++ b/compiler/src/main/java/org/apache/royale/compiler/clients/ASDOC.java
@@ -44,7 +44,7 @@ import org.apache.royale.swc.io.ISWCWriter;
import org.apache.royale.swc.io.SWCDirectoryWriter;
import org.apache.royale.swc.io.SWCWriter;
import org.apache.royale.swf.io.SizeReportWritingSWFWriter;
-import org.apache.royale.tools.FlexTool;
+import org.apache.flex.tools.FlexTool;
import org.apache.royale.utils.FilenameNormalization;
/**
diff --git
a/compiler/src/main/java/org/apache/royale/compiler/clients/COMPC.java
b/compiler/src/main/java/org/apache/royale/compiler/clients/COMPC.java
index fdc4d4e..49efb0d 100644
--- a/compiler/src/main/java/org/apache/royale/compiler/clients/COMPC.java
+++ b/compiler/src/main/java/org/apache/royale/compiler/clients/COMPC.java
@@ -42,7 +42,7 @@ import org.apache.royale.swc.io.ISWCWriter;
import org.apache.royale.swc.io.SWCDirectoryWriter;
import org.apache.royale.swc.io.SWCWriter;
import org.apache.royale.swf.io.SizeReportWritingSWFWriter;
-import org.apache.royale.tools.FlexTool;
+import org.apache.flex.tools.FlexTool;
import org.apache.royale.utils.FilenameNormalization;
/**
diff --git
a/compiler/src/main/java/org/apache/royale/compiler/clients/FalconToolGroup.java
b/compiler/src/main/java/org/apache/royale/compiler/clients/FalconToolGroup.java
index d165088..1edda0d 100644
---
a/compiler/src/main/java/org/apache/royale/compiler/clients/FalconToolGroup.java
+++
b/compiler/src/main/java/org/apache/royale/compiler/clients/FalconToolGroup.java
@@ -19,7 +19,7 @@
package org.apache.royale.compiler.clients;
-import org.apache.royale.tools.AbstractFlexToolGroup;
+import org.apache.flex.tools.AbstractFlexToolGroup;
/**
* FlexToolGroup exposing the implementations of the Falcon compilers tools.
diff --git
a/compiler/src/main/java/org/apache/royale/compiler/clients/MXMLC.java
b/compiler/src/main/java/org/apache/royale/compiler/clients/MXMLC.java
index 6a96602..b23a1c8 100644
--- a/compiler/src/main/java/org/apache/royale/compiler/clients/MXMLC.java
+++ b/compiler/src/main/java/org/apache/royale/compiler/clients/MXMLC.java
@@ -38,6 +38,8 @@ import java.util.Set;
import org.apache.commons.io.FilenameUtils;
import org.apache.commons.io.output.CountingOutputStream;
+import org.apache.flex.tools.FlexTool;
+
import org.apache.royale.compiler.Messages;
import org.apache.royale.compiler.clients.problems.CompilerProblemCategorizer;
import org.apache.royale.compiler.clients.problems.ProblemFormatter;
@@ -89,7 +91,6 @@ import org.apache.royale.swf.Header;
import org.apache.royale.swf.ISWF;
import org.apache.royale.swf.io.ISWFWriter;
import org.apache.royale.swf.io.SizeReportWritingSWFWriter;
-import org.apache.royale.tools.FlexTool;
import org.apache.royale.utils.FilenameNormalization;
import com.google.common.base.Function;
diff --git
a/compiler/src/main/java/org/apache/royale/compiler/clients/Optimizer.java
b/compiler/src/main/java/org/apache/royale/compiler/clients/Optimizer.java
index c25c1ca..c3a75a4 100644
--- a/compiler/src/main/java/org/apache/royale/compiler/clients/Optimizer.java
+++ b/compiler/src/main/java/org/apache/royale/compiler/clients/Optimizer.java
@@ -69,7 +69,7 @@ import java.util.Map;
import java.util.Set;
import org.apache.commons.io.IOUtils;
-import org.apache.royale.tools.FlexTool;
+import org.apache.flex.tools.FlexTool;
/**
* Command line optimizer - can read in a swf, apply the optimizations usually
done during swf linking,
diff --git
a/compiler/src/main/java/org/apache/royale/compiler/internal/codegen/databinding/MXMLBindingDirectiveHelper.java
b/compiler/src/main/java/org/apache/royale/compiler/internal/codegen/databinding/MXMLBindingDirectiveHelper.java
index 31c4013..78712cf 100644
---
a/compiler/src/main/java/org/apache/royale/compiler/internal/codegen/databinding/MXMLBindingDirectiveHelper.java
+++
b/compiler/src/main/java/org/apache/royale/compiler/internal/codegen/databinding/MXMLBindingDirectiveHelper.java
@@ -40,7 +40,7 @@ import
org.apache.royale.compiler.internal.as.codegen.MXMLClassDirectiveProcesso
import
org.apache.royale.compiler.internal.codegen.databinding.WatcherInfoBase.WatcherType;
import org.apache.royale.compiler.internal.projects.RoyaleProject;
import org.apache.royale.compiler.internal.scopes.ASScope;
-import org.apache.royale.compiler.internal.targets.FlexAppSWFTarget;
+import org.apache.royale.compiler.internal.targets.RoyaleAppSWFTarget;
import org.apache.royale.compiler.internal.tree.as.BinaryOperatorAsNode;
import org.apache.royale.compiler.internal.tree.as.FunctionCallNode;
import org.apache.royale.compiler.internal.tree.as.IdentifierNode;
@@ -152,9 +152,9 @@ public class MXMLBindingDirectiveHelper
boolean isFlexSDK = false;
ISWFTarget target = host.getProject().getSWFTarget();
- if (target instanceof FlexAppSWFTarget)
+ if (target instanceof RoyaleAppSWFTarget)
{
- if (!((FlexAppSWFTarget)target).isFlexInfo())
+ if (!((RoyaleAppSWFTarget)target).isFlexInfo())
{
makeSpecialMemberVariablesForBinding();
isFlexSDK = true;
diff --git
a/compiler/src/main/java/org/apache/royale/compiler/internal/config/FileConfigurator.java
b/compiler/src/main/java/org/apache/royale/compiler/internal/config/FileConfigurator.java
index 43e741c..ddb06b5 100644
---
a/compiler/src/main/java/org/apache/royale/compiler/internal/config/FileConfigurator.java
+++
b/compiler/src/main/java/org/apache/royale/compiler/internal/config/FileConfigurator.java
@@ -156,9 +156,12 @@ public class FileConfigurator
{
if (!qname.equals(rootElement))
{
- throw new SAXConfigurationException(
+ if (!qname.equals("flex-config"))
+ {
+ throw new SAXConfigurationException(
new
ConfigurationException.IncorrectElement(rootElement, qname, this.source,
locator.getLineNumber()),
locator);
+ }
}
final ParseContext ctx = new ParseContext();
contextStack.push(ctx);
diff --git
a/compiler/src/main/java/org/apache/royale/compiler/internal/projects/RoyaleProject.java
b/compiler/src/main/java/org/apache/royale/compiler/internal/projects/RoyaleProject.java
index 8b78269..730a9d8 100644
---
a/compiler/src/main/java/org/apache/royale/compiler/internal/projects/RoyaleProject.java
+++
b/compiler/src/main/java/org/apache/royale/compiler/internal/projects/RoyaleProject.java
@@ -78,7 +78,7 @@ import
org.apache.royale.compiler.internal.scopes.ASProjectScope;
import org.apache.royale.compiler.internal.scopes.ASScope;
import org.apache.royale.compiler.internal.scopes.PackageScope;
import org.apache.royale.compiler.internal.targets.AppSWFTarget;
-import org.apache.royale.compiler.internal.targets.FlexAppSWFTarget;
+import org.apache.royale.compiler.internal.targets.RoyaleAppSWFTarget;
import org.apache.royale.compiler.internal.targets.SWCTarget;
import org.apache.royale.compiler.internal.tree.mxml.MXMLImplicitImportNode;
import org.apache.royale.compiler.internal.workspaces.Workspace;
@@ -545,7 +545,7 @@ public class RoyaleProject extends ASProject implements
IRoyaleProject
if (isFlex())
{
String rootClassName = targetSettings.getRootClassName();
- target = new
FlexAppSWFTarget(ReferenceFactory.packageQualifiedReference(
+ target = new
RoyaleAppSWFTarget(ReferenceFactory.packageQualifiedReference(
getWorkspace(), rootClassName, true),
this, targetSettings, progressMonitor);
}
diff --git
a/compiler/src/main/java/org/apache/royale/compiler/internal/targets/FlexRSLInfo.java
b/compiler/src/main/java/org/apache/royale/compiler/internal/targets/FlexRSLInfo.java
index 21ae10f..99fcf41 100644
---
a/compiler/src/main/java/org/apache/royale/compiler/internal/targets/FlexRSLInfo.java
+++
b/compiler/src/main/java/org/apache/royale/compiler/internal/targets/FlexRSLInfo.java
@@ -40,11 +40,11 @@ import org.apache.royale.swc.ISWC;
* Class that contains information about RSLs used by a royale application SWF.
* <p>
* The information about RSLs is computed from {@link ITargetSettings} and
- * {@code FlexApplicationFrame1Info}.
+ * {@code RoyaleApplicationFrame1Info}.
*/
final class FlexRSLInfo
{
- FlexRSLInfo(FlexApplicationFrame1Info frame1Info, RoyaleProject
royaleProject, ITargetSettings targetSettings)
+ FlexRSLInfo(RoyaleApplicationFrame1Info frame1Info, RoyaleProject
royaleProject, ITargetSettings targetSettings)
{
this.frame1Info = frame1Info;
this.royaleProject = royaleProject;
@@ -66,7 +66,7 @@ final class FlexRSLInfo
}
}
- private final FlexApplicationFrame1Info frame1Info;
+ private final RoyaleApplicationFrame1Info frame1Info;
private final ITargetSettings targetSettings;
private final RoyaleProject royaleProject;
diff --git
a/compiler/src/main/java/org/apache/royale/compiler/internal/targets/RoyaleAppSWFTarget.java
b/compiler/src/main/java/org/apache/royale/compiler/internal/targets/RoyaleAppSWFTarget.java
index d465298..06fe9c2 100644
---
a/compiler/src/main/java/org/apache/royale/compiler/internal/targets/RoyaleAppSWFTarget.java
+++
b/compiler/src/main/java/org/apache/royale/compiler/internal/targets/RoyaleAppSWFTarget.java
@@ -104,7 +104,7 @@ import static
org.apache.royale.compiler.mxml.IMXMLLanguageConstants.*;
* Sub-class of {@link AppSWFTarget} that builds an application SWF that uses
* the royale framework.
*/
-public class FlexAppSWFTarget extends AppSWFTarget
+public class RoyaleAppSWFTarget extends AppSWFTarget
{
/**
* Constructor
@@ -118,7 +118,7 @@ public class FlexAppSWFTarget extends AppSWFTarget
* @param progressMonitor {@link ITargetProgressMonitor} to which status is
* reported as this {@link AppSWFTarget} is built.
*/
- public FlexAppSWFTarget(IResolvedQualifiersReference mainApplicationClass,
RoyaleProject project,
+ public RoyaleAppSWFTarget(IResolvedQualifiersReference
mainApplicationClass, RoyaleProject project,
ITargetSettings targetSettings, ITargetProgressMonitor
progressMonitor) throws InterruptedException
{
super(project, targetSettings, progressMonitor);
@@ -372,7 +372,7 @@ public class FlexAppSWFTarget extends AppSWFTarget
assert frames.getLast().rootedUnits.contains(rootClassCU) :
"The main class definition for the last frame, must be the main
class definition for the SWF.";
final FramesInformation explicitFrames =
getExplicitFramesInformation();
- return new FlexApplicationFramesInformation(frames, explicitFrames,
initialFactoryClass, systemManagerFrame, applicationFrame);
+ return new RoyaleApplicationFramesInformation(frames, explicitFrames,
initialFactoryClass, systemManagerFrame, applicationFrame);
}
@Override
@@ -691,10 +691,10 @@ public class FlexAppSWFTarget extends AppSWFTarget
* Sub-class of {@link FramesInformation} that can create {@link SWFFrame}s
* for all the frames in a royale application SWF.
*/
- private class FlexApplicationFramesInformation extends FramesInformation
+ private class RoyaleApplicationFramesInformation extends FramesInformation
{
- FlexApplicationFramesInformation(Iterable<SWFFrameInfo> implicitFrames,
+ RoyaleApplicationFramesInformation(Iterable<SWFFrameInfo>
implicitFrames,
FramesInformation explicitFrames,
ClassDefinition initialFactoryClass,
SWFFrameInfo systemManagerFrame,
@@ -712,7 +712,7 @@ public class FlexAppSWFTarget extends AppSWFTarget
private final ClassDefinition initialFactoryClass;
private final SWFFrameInfo systemManagerFrame;
private final SWFFrameInfo applicationFrame;
- private FlexApplicationFrame1Info frame1Info;
+ private RoyaleApplicationFrame1Info frame1Info;
/**
* If we are targeting flex 4.0 or greater and the root application
@@ -720,7 +720,7 @@ public class FlexAppSWFTarget extends AppSWFTarget
* analysis of the CSS type selectors in the root application class.
*
* @param builtCompilationUnits An {@link ImmutableSet} of all the
- * {@link ICompilationUnit}s built by the {@link FlexAppSWFTarget}.
+ * {@link ICompilationUnit}s built by the {@link RoyaleAppSWFTarget}.
* @param problems {@link Collection} of {@link ICompilerProblem}s to
* which {@link ICompilerProblem}s found by this method will be added.
* @throws InterruptedException
@@ -758,7 +758,7 @@ public class FlexAppSWFTarget extends AppSWFTarget
final FlexDelegate delegate = getDelegate();
final ClassDefinition rootClassDefinition =
getRootClassDefinition();
- frame1Info = new FlexApplicationFrame1Info(royaleProject,
+ frame1Info = new RoyaleApplicationFrame1Info(royaleProject,
targetSettings,
rootClassDefinition,
delegate.getGenerateSystemManagerAndFlexInit(),
@@ -814,10 +814,10 @@ public class FlexAppSWFTarget extends AppSWFTarget
}
/**
- * Sub-class of {@link FlexTarget} that adds logic specific to building
flex
+ * Sub-class of {@link RoyaleTarget} that adds logic specific to building
flex
* applications.
*/
- private class FlexDelegate extends FlexTarget
+ private class FlexDelegate extends RoyaleTarget
{
FlexDelegate(IClassDefinition mainApplicationClassDefinition,
ITargetSettings targetSettings, RoyaleProject project)
{
@@ -890,7 +890,7 @@ public class FlexAppSWFTarget extends AppSWFTarget
/**
* Cached frame 1 information.
*/
- private FlexApplicationFrame1Info frame1Info;
+ private RoyaleApplicationFrame1Info frame1Info;
/**
* Cached RSL information
@@ -1181,11 +1181,11 @@ public class FlexAppSWFTarget extends AppSWFTarget
return rootNode;
}
- final FlexApplicationFrame1Info getFrame1Info() throws
InterruptedException
+ final RoyaleApplicationFrame1Info getFrame1Info() throws
InterruptedException
{
if (frame1Info != null)
return frame1Info;
- frame1Info = new FlexApplicationFrame1Info(royaleProject,
+ frame1Info = new RoyaleApplicationFrame1Info(royaleProject,
targetSettings, mainApplicationClassDefinition,
getGenerateSystemManagerAndFlexInit(),
isFlexInfo((ClassDefinition)mainApplicationClassDefinition),
getBuiltCompilationUnitSet().compilationUnits);
return frame1Info;
@@ -1205,7 +1205,7 @@ public class FlexAppSWFTarget extends AppSWFTarget
*
* @param mainApplicationFrame {@link SWFFrame} that contains the main
* application class of the royale application SWF being built.
- * @param frame1Info {@link FlexApplicationFrame1Info} containing frame
+ * @param frame1Info {@link RoyaleApplicationFrame1Info} containing
frame
* 1 related code generation information collected from all the
* {@link ICompilationUnit}s being built into the royale application
SWF.
* @param emittedCompilationUnits
@@ -1214,7 +1214,7 @@ public class FlexAppSWFTarget extends AppSWFTarget
* {@link SWFFrame}, false otherwise.
* @throws InterruptedException
*/
- boolean addGeneratedCodeToMainApplicationFrame(SWFFrame
mainApplicationFrame, FlexApplicationFrame1Info frame1Info,
+ boolean addGeneratedCodeToMainApplicationFrame(SWFFrame
mainApplicationFrame, RoyaleApplicationFrame1Info frame1Info,
Set<ICompilationUnit> emittedCompilationUnits,
Collection<ICompilerProblem> problems) throws
InterruptedException
{
@@ -1272,7 +1272,7 @@ public class FlexAppSWFTarget extends AppSWFTarget
*
* @param frame frame to add the generated DoABC for this class.
*/
- private void
addGeneratedCompiledResourceBundleInfoToFrame(FlexApplicationFrame1Info
frame1Info, SWFFrame frame)
+ private void
addGeneratedCompiledResourceBundleInfoToFrame(RoyaleApplicationFrame1Info
frame1Info, SWFFrame frame)
{
Collection<String> locales = royaleProject.getLocales();
@@ -1353,7 +1353,7 @@ public class FlexAppSWFTarget extends AppSWFTarget
* @throws InterruptedException
*/
private boolean addGeneratedFlexInitToFrame(final
Collection<ICompilerProblem> problems, SWFFrame frame, Set<ICompilationUnit>
emittedCompilationUnits,
- boolean isAppFlexInfo, FlexApplicationFrame1Info frame1Info,
FlexRSLInfo rslInfo) throws InterruptedException
+ boolean isAppFlexInfo, RoyaleApplicationFrame1Info frame1Info,
FlexRSLInfo rslInfo) throws InterruptedException
{
ABCEmitter emitter = new ABCEmitter();
emitter.visit(ABCConstants.VERSION_ABC_MAJOR_FP10,
ABCConstants.VERSION_ABC_MINOR_FP10);
@@ -1752,7 +1752,7 @@ public class FlexAppSWFTarget extends AppSWFTarget
* .
*
* @param frame {@link SWFFrame} to add the generated class to.
- * @param frame1Info {@link FlexApplicationFrame1Info}
+ * @param frame1Info {@link RoyaleApplicationFrame1Info}
* @param systemManagerClass {@link ClassDefinition} for factory class
* for which a generated sub-class should be created, usually
* {@code mx.managers.SystemManager}.
@@ -1765,7 +1765,7 @@ public class FlexAppSWFTarget extends AppSWFTarget
* specified {@link SWFFrame}, false otherwise.
* @throws InterruptedException
*/
- boolean addGeneratedSystemManagerToFrame(SWFFrame frame,
FlexApplicationFrame1Info frame1Info, ClassDefinition systemManagerClass,
+ boolean addGeneratedSystemManagerToFrame(SWFFrame frame,
RoyaleApplicationFrame1Info frame1Info, ClassDefinition systemManagerClass,
ImmutableSet<ICompilationUnit> builtCompilationUnits,
Collection<ICompilerProblem> problemCollection) throws
InterruptedException
{
diff --git
a/compiler/src/main/java/org/apache/royale/compiler/internal/targets/RoyaleApplicationFrame1Info.java
b/compiler/src/main/java/org/apache/royale/compiler/internal/targets/RoyaleApplicationFrame1Info.java
index 123cefd..ae41bad 100644
---
a/compiler/src/main/java/org/apache/royale/compiler/internal/targets/RoyaleApplicationFrame1Info.java
+++
b/compiler/src/main/java/org/apache/royale/compiler/internal/targets/RoyaleApplicationFrame1Info.java
@@ -45,16 +45,16 @@ import
org.apache.royale.compiler.units.requests.IFileScopeRequestResult;
import com.google.common.collect.ImmutableSet;
/**
- * Concrete sub-class of {@code FlexFrame1Info} that contains information
about code that uses the Flex
+ * Concrete sub-class of {@code RoyaleFrame1Info} that contains information
about code that uses the Flex
* framework that is needed by the compiler to generate code in the first frame
* of Flex application SWFs.
* <p>
* This information is collected by looking at all the {@link
ICompilationUnit}s
* that will be built into a Flex application SWF.
*/
-final class FlexApplicationFrame1Info extends FlexFrame1Info
+final class RoyaleApplicationFrame1Info extends RoyaleFrame1Info
{
- FlexApplicationFrame1Info(RoyaleProject royaleProject,
+ RoyaleApplicationFrame1Info(RoyaleProject royaleProject,
ITargetSettings targetSettings,
IClassDefinition mainApplicationClassDefinition,
boolean generateSystemManagerAndFlexInit,
@@ -94,7 +94,7 @@ final class FlexApplicationFrame1Info extends FlexFrame1Info
* {@inheritDoc}
* <p>
* In addition to the information collected by the base class (
- * {@link FlexFrame1Info} ), this class collects:
+ * {@link RoyaleFrame1Info} ), this class collects:
* <ul>
* <li>Mix-in class names</li>
* <li>File names of SWCs that contributed to code the royale application
SWF</li>
diff --git
a/compiler/src/main/java/org/apache/royale/compiler/internal/targets/RoyaleFrame1Info.java
b/compiler/src/main/java/org/apache/royale/compiler/internal/targets/RoyaleFrame1Info.java
index e5cb9e1..c921823 100644
---
a/compiler/src/main/java/org/apache/royale/compiler/internal/targets/RoyaleFrame1Info.java
+++
b/compiler/src/main/java/org/apache/royale/compiler/internal/targets/RoyaleFrame1Info.java
@@ -50,9 +50,9 @@ import org.apache.royale.swc.ISWC;
* This information is collected by looking at all the {@link
ICompilationUnit}s
* that will be built into a royale application SWF or royale SWC.
*/
-abstract class FlexFrame1Info
+abstract class RoyaleFrame1Info
{
- protected FlexFrame1Info(RoyaleProject royaleProject)
+ protected RoyaleFrame1Info(RoyaleProject royaleProject)
{
this.royaleProject = royaleProject;
IResolvedQualifiersReference resourceBundleRef =
ReferenceFactory.packageQualifiedReference(
diff --git
a/compiler/src/main/java/org/apache/royale/compiler/internal/targets/RoyaleLibraryFrame1Info.java
b/compiler/src/main/java/org/apache/royale/compiler/internal/targets/RoyaleLibraryFrame1Info.java
index 1a0b077..24ec8bb 100644
---
a/compiler/src/main/java/org/apache/royale/compiler/internal/targets/RoyaleLibraryFrame1Info.java
+++
b/compiler/src/main/java/org/apache/royale/compiler/internal/targets/RoyaleLibraryFrame1Info.java
@@ -31,7 +31,7 @@ import com.google.common.collect.ImmutableSet;
* This information is collected by looking at all the {@link
ICompilationUnit}s
* that will be built into a royale SWC.
*/
-class RoyaleLibraryFrame1Info extends FlexFrame1Info
+class RoyaleLibraryFrame1Info extends RoyaleFrame1Info
{
RoyaleLibraryFrame1Info(RoyaleProject royaleProject,
diff --git
a/compiler/src/main/java/org/apache/royale/compiler/internal/targets/RoyaleLibrarySWFTarget.java
b/compiler/src/main/java/org/apache/royale/compiler/internal/targets/RoyaleLibrarySWFTarget.java
index 0a9522d..17ac8b7 100644
---
a/compiler/src/main/java/org/apache/royale/compiler/internal/targets/RoyaleLibrarySWFTarget.java
+++
b/compiler/src/main/java/org/apache/royale/compiler/internal/targets/RoyaleLibrarySWFTarget.java
@@ -338,10 +338,10 @@ public final class RoyaleLibrarySWFTarget extends
LibrarySWFTarget
/**
- * Sub-class of {@link FlexTarget} that adds logic specific to building
+ * Sub-class of {@link RoyaleTarget} that adds logic specific to building
* library.swf's in royale SWCs.
*/
- private class FlexDelegate extends FlexTarget
+ private class FlexDelegate extends RoyaleTarget
{
FlexDelegate(ITargetSettings targetSettings, RoyaleProject project)
@@ -442,7 +442,7 @@ public final class RoyaleLibrarySWFTarget extends
LibrarySWFTarget
*/
private void codegenInfoMethod(ClassGeneratorHelper classGen,
String rootClassQName,
- FlexFrame1Info frame1Info,
+ RoyaleFrame1Info frame1Info,
Set<String> accessibleClassNames,
Collection<ICompilerProblem> problemCollection) throws
InterruptedException
{
diff --git
a/compiler/src/main/java/org/apache/royale/compiler/internal/targets/RoyaleTarget.java
b/compiler/src/main/java/org/apache/royale/compiler/internal/targets/RoyaleTarget.java
index 2ff1484..56f97cc 100644
---
a/compiler/src/main/java/org/apache/royale/compiler/internal/targets/RoyaleTarget.java
+++
b/compiler/src/main/java/org/apache/royale/compiler/internal/targets/RoyaleTarget.java
@@ -77,9 +77,9 @@ import static
org.apache.royale.compiler.mxml.IMXMLLanguageConstants.*;
* Delegate class used by flex specific targets to generate flex specific code.
* If we were writing this compiler in C++ this would be a mix-in class.
*/
-public abstract class FlexTarget
+public abstract class RoyaleTarget
{
- FlexTarget(ITargetSettings targetSettings, RoyaleProject project)
+ RoyaleTarget(ITargetSettings targetSettings, RoyaleProject project)
{
royaleProject = project;
this.targetSettings = targetSettings;
@@ -270,7 +270,7 @@ public abstract class FlexTarget
IASNode rootNode,
ITargetAttributes targetAttributes,
Collection<String> compiledLocales,
- FlexFrame1Info frame1Info,
+ RoyaleFrame1Info frame1Info,
Set<String> accessibilityClassNames,
String royaleInitClassName,
String stylesClassName,
diff --git
a/compiler/src/main/java/org/apache/royale/compiler/problems/FlexOnlyConfigurationOptionNotSupported.java
b/compiler/src/main/java/org/apache/royale/compiler/problems/RoyaleOnlyConfigurationOptionNotSupported.java
similarity index 100%
rename from
compiler/src/main/java/org/apache/royale/compiler/problems/FlexOnlyConfigurationOptionNotSupported.java
rename to
compiler/src/main/java/org/apache/royale/compiler/problems/RoyaleOnlyConfigurationOptionNotSupported.java
diff --git
a/debugger/src/main/jburg/flash/tools/debugger/expression/AS3DebuggerBURM.jbg
b/debugger/src/main/jburg/flash/tools/debugger/expression/AS3DebuggerBURM.jbg
index 0f0aa04..e2e8fc1 100644
---
a/debugger/src/main/jburg/flash/tools/debugger/expression/AS3DebuggerBURM.jbg
+++
b/debugger/src/main/jburg/flash/tools/debugger/expression/AS3DebuggerBURM.jbg
@@ -32,16 +32,16 @@ header
which is called by the code generator.
*/
- import static org.apache.flex.abc.ABCConstants.*;
- import static org.apache.flex.compiler.tree.ASTNodeID.*;
-
- import org.apache.flex.compiler.constants.IASLanguageConstants;
- import org.apache.flex.compiler.exceptions.BURMAbortException;
- import org.apache.flex.compiler.problems.*;
- import org.apache.flex.compiler.internal.semantics.SemanticUtils;
- import org.apache.flex.compiler.tree.ASTNodeID;
- import org.apache.flex.compiler.tree.as.IASNode;
- import org.apache.flex.compiler.tree.as.ITryNode;
+ import static org.apache.royale.abc.ABCConstants.*;
+ import static org.apache.royale.compiler.tree.ASTNodeID.*;
+
+ import org.apache.royale.compiler.constants.IASLanguageConstants;
+ import org.apache.royale.compiler.exceptions.BURMAbortException;
+ import org.apache.royale.compiler.problems.*;
+ import org.apache.royale.compiler.internal.semantics.SemanticUtils;
+ import org.apache.royale.compiler.tree.ASTNodeID;
+ import org.apache.royale.compiler.tree.as.IASNode;
+ import org.apache.royale.compiler.tree.as.ITryNode;
}
INodeType IASNode;
@@ -50,7 +50,7 @@ OpcodeType ASTNodeID;
/*
* The I-node type is IASNode, and it has its own adapter.
*/
-INodeAdapter org.apache.flex.compiler.internal.as.codegen.IASNodeAdapter;
+INodeAdapter org.apache.royale.compiler.internal.as.codegen.IASNodeAdapter;
// Generate Java output.
Language java;
diff --git a/flex-compiler-oem/src/main/java/flex2/tools/Tool.java
b/flex-compiler-oem/src/main/java/flex2/tools/Tool.java
index cf27434..9a25bac 100644
--- a/flex-compiler-oem/src/main/java/flex2/tools/Tool.java
+++ b/flex-compiler-oem/src/main/java/flex2/tools/Tool.java
@@ -19,8 +19,6 @@
package flex2.tools;
-import static
org.apache.royale.compiler.clients.MXMLJSC.JSOutputType.FLEXJS_DUAL;
-
import java.io.File;
import java.io.FileInputStream;
import java.io.IOException;
diff --git a/royale-ant-tasks/build.xml b/royale-ant-tasks/build.xml
index 3fb1142..f9689d9 100644
--- a/royale-ant-tasks/build.xml
+++ b/royale-ant-tasks/build.xml
@@ -58,7 +58,7 @@
<!-- JAR manifest entries -->
<property name="manifest.sealed" value="false"/>
- <property name="manifest.Implementation-Title" value="Apache Flex
Compiler"/>
+ <property name="manifest.Implementation-Title" value="Apache Royale
Compiler"/>
<property name="manifest.Implementation-Version"
value="${release.version}"/>
<property name="manifest.Implementation-Vendor" value="Apache Software
Foundation"/>
@@ -95,7 +95,7 @@
<target name="set.falcon.royaletasks.jar.uptodate">
<uptodate property="falcon.royaletasks.jar.uptodate"
- targetfile="${sdk}/falcon-royaletasks.jar">
+ targetfile="${sdk}/falcon-royaleTasks.jar">
<srcfiles dir="${royaletasks}/target/classes">
<include name="**/*.class"/>
<include name="**/*.properties"/>
@@ -118,7 +118,7 @@
<attribute name="Implementation-Vendor"
value="${manifest.Implementation-Vendor}"/>
<attribute name="Class-Path" value="jsc.jar
../../compiler/lib/compiler.jar ../../lib/compiler.jar"/>
</manifest>
- <fileset dir="${royaletasks}/src/main/resources"
includes="royaleTasks.tasks"/>
+ <fileset dir="${royaletasks}/src/main/resources"
includes="flexTasks.tasks"/>
<fileset dir="${royaletasks}/target/classes"
includes="${royaletasks.ant.binaries}"/>
</jar>
</target>
diff --git
a/royale-ant-tasks/src/main/java/org/apache/royale/compiler/ant/COMPCTask.java
b/royale-ant-tasks/src/main/java/org/apache/royale/compiler/ant/COMPCTask.java
index 031550a..fddd721 100644
---
a/royale-ant-tasks/src/main/java/org/apache/royale/compiler/ant/COMPCTask.java
+++
b/royale-ant-tasks/src/main/java/org/apache/royale/compiler/ant/COMPCTask.java
@@ -29,6 +29,7 @@ import org.apache.tools.ant.DynamicConfigurator;
import org.apache.royale.compiler.ant.config.ConfigBoolean;
import org.apache.royale.compiler.ant.config.ConfigInt;
import org.apache.royale.compiler.ant.config.ConfigString;
+import org.apache.royale.compiler.ant.config.ConfigAppendString;
import org.apache.royale.compiler.ant.config.ConfigVariable;
import org.apache.royale.compiler.ant.config.NestedAttributeElement;
import org.apache.royale.compiler.ant.config.IOptionSource;
@@ -185,6 +186,7 @@ public final class COMPCTask extends FlexTask implements
DynamicConfigurator
new ConfigString(new OptionSpec("size-report")),
new ConfigString(new OptionSpec("target-player")),
new ConfigString(new OptionSpec("tools-locale")),
+ new ConfigAppendString(new OptionSpec("configname")),
// Int options
new ConfigInt(new OptionSpec("default-background-color")),
diff --git a/royale-ant-tasks/src/test/build.xml
b/royale-ant-tasks/src/test/build.xml
index 4e81547..1a57a83 100644
--- a/royale-ant-tasks/src/test/build.xml
+++ b/royale-ant-tasks/src/test/build.xml
@@ -51,7 +51,7 @@
</condition>
<property name="compiler"
value="${royaletasks.tests}/../../../compiler-jx"/>
- <condition property="royalesdk" value="${FLEX_HOME}"
else="${env.FLEX_HOME}">
+ <condition property="flexsdk" value="${FLEX_HOME}" else="${env.FLEX_HOME}">
<isset property="FLEX_HOME" />
</condition>
<condition property="playerglobal.version"
value="${env.PLAYERGLOBAL_VERSION}">
@@ -68,22 +68,24 @@
</path>
<target name="ant.tests">
- <property name="FLEX_HOME" value="${royalesdk}"/>
+ <property name="FLEX_HOME" value="${flexsdk}"/>
<property name="FALCONJX_HOME" value="${falcon}"/>
<echo message="GOOG_HOME: ${GOOG_HOME}"/>
- <echo>FLEX_HOME=${royalesdk}</echo>
+ <echo>FLEX_HOME=${flexsdk}</echo>
<echo>FALCONJX_HOME=${FALCONJX_HOME}</echo>
- <taskdef resource="royaleTasks.tasks" classpathref="lib.path"/>
+ <taskdef resource="flexTasks.tasks" classpathref="lib.path"/>
<mxmlc file="${royaletasks.tests}/as/Hello.as"
output="${royaletasks}/target/junit/Hello.swf"
compiler.targets="SWF"
closure-lib="${GOOG_HOME}"
+ configname="flex"
target-player="${playerglobal.version}">
<arg value="+env.PLAYERGLOBAL_HOME=${env.PLAYERGLOBAL_HOME}" />
</mxmlc>
<delete file="${royaletasks}/target/junit/Hello.swf"/>
<compc output="${royaletasks}/target/junit/Hello.swc"
include-classes="Hello"
compiler.targets="SWF"
+ configname="flex"
target-player="${playerglobal.version}">
<source-path path-element="${royaletasks.tests}/as"/>
<arg value="+env.PLAYERGLOBAL_HOME=${env.PLAYERGLOBAL_HOME}" />
diff --git
a/royale-maven-plugin/src/main/java/org/apache/royale/maven/BaseCompileMojo.java
b/royale-maven-plugin/src/main/java/org/apache/royale/maven/BaseCompileMojo.java
index b8ef3f4..e983270 100644
---
a/royale-maven-plugin/src/main/java/org/apache/royale/maven/BaseCompileMojo.java
+++
b/royale-maven-plugin/src/main/java/org/apache/royale/maven/BaseCompileMojo.java
@@ -14,7 +14,7 @@
package org.apache.royale.maven;
-import org.apache.royale.tools.FlexTool;
+import org.apache.flex.tools.FlexTool;
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.velocity.VelocityContext;
diff --git
a/royale-maven-plugin/src/main/java/org/apache/royale/maven/BaseMojo.java
b/royale-maven-plugin/src/main/java/org/apache/royale/maven/BaseMojo.java
index 66f284e..20a9a04 100644
--- a/royale-maven-plugin/src/main/java/org/apache/royale/maven/BaseMojo.java
+++ b/royale-maven-plugin/src/main/java/org/apache/royale/maven/BaseMojo.java
@@ -15,9 +15,9 @@
package org.apache.royale.maven;
import org.apache.royale.maven.utils.DependencyHelper;
-import org.apache.royale.tools.FlexTool;
-import org.apache.royale.tools.FlexToolGroup;
-import org.apache.royale.tools.FlexToolRegistry;
+import org.apache.flex.tools.FlexTool;
+import org.apache.flex.tools.FlexToolGroup;
+import org.apache.flex.tools.FlexToolRegistry;
import org.apache.maven.artifact.Artifact;
import org.apache.maven.plugin.AbstractMojo;
import org.apache.maven.plugin.MojoExecutionException;
diff --git
a/royale-maven-plugin/src/main/java/org/apache/royale/maven/CompileASDocMojo.java
b/royale-maven-plugin/src/main/java/org/apache/royale/maven/CompileASDocMojo.java
index 4fc07e8..e2da7dd 100644
---
a/royale-maven-plugin/src/main/java/org/apache/royale/maven/CompileASDocMojo.java
+++
b/royale-maven-plugin/src/main/java/org/apache/royale/maven/CompileASDocMojo.java
@@ -14,7 +14,7 @@
package org.apache.royale.maven;
-import org.apache.royale.tools.FlexTool;
+import org.apache.flex.tools.FlexTool;
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugins.annotations.LifecyclePhase;
import org.apache.maven.plugins.annotations.Mojo;
diff --git
a/royale-maven-plugin/src/main/java/org/apache/royale/maven/CompileASMojo.java
b/royale-maven-plugin/src/main/java/org/apache/royale/maven/CompileASMojo.java
index 6891f3e..6263665 100644
---
a/royale-maven-plugin/src/main/java/org/apache/royale/maven/CompileASMojo.java
+++
b/royale-maven-plugin/src/main/java/org/apache/royale/maven/CompileASMojo.java
@@ -14,7 +14,7 @@
package org.apache.royale.maven;
-import org.apache.royale.tools.FlexTool;
+import org.apache.flex.tools.FlexTool;
import org.apache.maven.artifact.Artifact;
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugins.annotations.Component;
diff --git
a/royale-maven-plugin/src/main/java/org/apache/royale/maven/CompileAppMojo.java
b/royale-maven-plugin/src/main/java/org/apache/royale/maven/CompileAppMojo.java
index e415cdd..ed91f38 100644
---
a/royale-maven-plugin/src/main/java/org/apache/royale/maven/CompileAppMojo.java
+++
b/royale-maven-plugin/src/main/java/org/apache/royale/maven/CompileAppMojo.java
@@ -14,7 +14,7 @@
package org.apache.royale.maven;
-import org.apache.royale.tools.FlexTool;
+import org.apache.flex.tools.FlexTool;
import org.apache.maven.artifact.Artifact;
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugins.annotations.LifecyclePhase;
diff --git
a/royale-maven-plugin/src/main/java/org/apache/royale/maven/CompileJSMojo.java
b/royale-maven-plugin/src/main/java/org/apache/royale/maven/CompileJSMojo.java
index ad207e7..2762aa2 100644
---
a/royale-maven-plugin/src/main/java/org/apache/royale/maven/CompileJSMojo.java
+++
b/royale-maven-plugin/src/main/java/org/apache/royale/maven/CompileJSMojo.java
@@ -14,7 +14,7 @@
package org.apache.royale.maven;
-import org.apache.royale.tools.FlexTool;
+import org.apache.flex.tools.FlexTool;
import org.apache.maven.artifact.Artifact;
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugins.annotations.Component;
diff --git
a/royale-maven-plugin/src/main/java/org/apache/royale/maven/CompileTypedefsMojo.java
b/royale-maven-plugin/src/main/java/org/apache/royale/maven/CompileTypedefsMojo.java
index 270bcc7..1c095b3 100644
---
a/royale-maven-plugin/src/main/java/org/apache/royale/maven/CompileTypedefsMojo.java
+++
b/royale-maven-plugin/src/main/java/org/apache/royale/maven/CompileTypedefsMojo.java
@@ -14,7 +14,7 @@
package org.apache.royale.maven;
-import org.apache.royale.tools.FlexTool;
+import org.apache.flex.tools.FlexTool;
import org.apache.maven.artifact.Artifact;
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugins.annotations.Component;
--
To stop receiving notification emails like this one, please contact
"commits@royale.apache.org" <commits@royale.apache.org>.
