You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flex.apache.org by cd...@apache.org on 2016/09/29 15:07:32 UTC
[1/3] git commit: [flex-asjs]
[refs/heads/feature-autobuild/maven-archetypes] - Attempt to fix the build
which seems to ba breaking on docs
Repository: flex-asjs
Updated Branches:
refs/heads/feature-autobuild/maven-archetypes db1eda0a5 -> 33eaf210f
Attempt to fix the build which seems to ba breaking on docs
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/b762ed63
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/b762ed63
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/b762ed63
Branch: refs/heads/feature-autobuild/maven-archetypes
Commit: b762ed6339c055b6d617197f2562121af0532504
Parents: 58e255c
Author: greg-dove <gr...@gmail.com>
Authored: Thu Sep 29 22:07:59 2016 +1300
Committer: greg-dove <gr...@gmail.com>
Committed: Thu Sep 29 22:07:59 2016 +1300
----------------------------------------------------------------------
.../flex/org/apache/flex/reflection/TypeDefinition.as | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/b762ed63/frameworks/projects/Reflection/src/main/flex/org/apache/flex/reflection/TypeDefinition.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Reflection/src/main/flex/org/apache/flex/reflection/TypeDefinition.as b/frameworks/projects/Reflection/src/main/flex/org/apache/flex/reflection/TypeDefinition.as
index 346c6ed..f0d2c47 100755
--- a/frameworks/projects/Reflection/src/main/flex/org/apache/flex/reflection/TypeDefinition.as
+++ b/frameworks/projects/Reflection/src/main/flex/org/apache/flex/reflection/TypeDefinition.as
@@ -33,16 +33,18 @@ COMPILE::SWF {
public class TypeDefinition extends DefinitionWithMetaData
{
- COMPILE::JS
+
//js storage support for class aliases
+ COMPILE::JS
private static var _aliasMappings:Object={};
- COMPILE::JS
+
/**
* @private
* @param aliasName
* @param classObject
*/
+ COMPILE::JS
internal static function registerClassAlias(aliasName:String, classObject:Class ) :void{
var info:* = classObject.prototype.FLEXJS_CLASS_INFO;
if (info) {
@@ -67,12 +69,13 @@ COMPILE::SWF {
} else throw new Error("registerClassAlias error: classObject is not Reflectable "+classObject);
}
- COMPILE::JS
+
/**
* @private
* @param aliasName
- * @return
+ * @return the class that is mapped to by the alias
*/
+ COMPILE::JS
internal static function getClassByAlias(aliasName:String):Class {
return _aliasMappings[aliasName];
}
[3/3] git commit: [flex-asjs]
[refs/heads/feature-autobuild/maven-archetypes] - - Added missing archetype
descriptor
Posted by cd...@apache.org.
- Added missing archetype descriptor
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/33eaf210
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/33eaf210
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/33eaf210
Branch: refs/heads/feature-autobuild/maven-archetypes
Commit: 33eaf210fd1885b8518204d5bfa42970e5a58cce
Parents: 241fb72
Author: Christofer Dutz <ch...@codecentric.de>
Authored: Thu Sep 29 17:04:35 2016 +0200
Committer: Christofer Dutz <ch...@codecentric.de>
Committed: Thu Sep 29 17:04:35 2016 +0200
----------------------------------------------------------------------
.../src/main/resources/maven/archetype.xml | 27 ++++++++++++++++++++
1 file changed, 27 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/33eaf210/archetypes/flexjs-simple-application-archetype/src/main/resources/maven/archetype.xml
----------------------------------------------------------------------
diff --git a/archetypes/flexjs-simple-application-archetype/src/main/resources/maven/archetype.xml b/archetypes/flexjs-simple-application-archetype/src/main/resources/maven/archetype.xml
new file mode 100644
index 0000000..0daccb1
--- /dev/null
+++ b/archetypes/flexjs-simple-application-archetype/src/main/resources/maven/archetype.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+-->
+<archetype xmlns="http://maven.apache.org/plugins/maven-archetype-plugin/archetype/1.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/plugins/maven-archetype-plugin/archetype/1.0.0 http://maven.apache.org/xsd/archetype-1.0.0.xsd">
+ <id>flexjs-simple-application-archetype</id>
+ <resources>
+ <resource>src/main/java/App.java</resource>
+ </resources>
+</archetype>
[2/3] git commit: [flex-asjs]
[refs/heads/feature-autobuild/maven-archetypes] - Merge branches 'develop'
and 'feature-autobuild/maven-archetypes' of
https://git-wip-us.apache.org/repos/asf/flex-asjs into develop
Posted by cd...@apache.org.
Merge branches 'develop' and 'feature-autobuild/maven-archetypes' of https://git-wip-us.apache.org/repos/asf/flex-asjs into develop
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/241fb729
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/241fb729
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/241fb729
Branch: refs/heads/feature-autobuild/maven-archetypes
Commit: 241fb72988119e3e30a0333eff90755295f2d734
Parents: b762ed6 db1eda0
Author: Christofer Dutz <ch...@codecentric.de>
Authored: Thu Sep 29 11:29:02 2016 +0200
Committer: Christofer Dutz <ch...@codecentric.de>
Committed: Thu Sep 29 11:29:02 2016 +0200
----------------------------------------------------------------------
.../flexjs-simple-application-archetype/pom.xml | 36 +++++++
.../archetype-resources/.mvn/extensions.xml | 30 ++++++
.../main/resources/archetype-resources/pom.xml | 98 ++++++++++++++++++++
.../archetype-resources/src/main/flex/App.mxml | 30 ++++++
.../flexjs-simple-library-archetype/pom.xml | 36 +++++++
.../main/resources/archetype-resources/pom.xml | 33 +++++++
.../src/main/resources/maven/archetype.xml | 30 ++++++
archetypes/pom.xml | 75 +++++++++++++++
pom.xml | 1 +
9 files changed, 369 insertions(+)
----------------------------------------------------------------------