flex-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From carlosrov...@apache.org
Subject [35/53] git commit: [flex-asjs] [refs/heads/feature/mdl] - Merge branches 'feature-autobuild/example-maven-dirs' and 'feature/mdl' of https://git-wip-us.apache.org/repos/asf/flex-asjs into feature-autobuild/example-maven-dirs
Date Thu, 10 Nov 2016 09:23:42 GMT
Merge branches 'feature-autobuild/example-maven-dirs' and 'feature/mdl' of https://git-wip-us.apache.org/repos/asf/flex-asjs
into feature-autobuild/example-maven-dirs


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

Branch: refs/heads/feature/mdl
Commit: a54a76e2130384b01bab17152374e2c3c4f2f446
Parents: 52d4f35 dd64210
Author: Christofer Dutz <christofer.dutz@codecentric.de>
Authored: Tue Nov 8 16:13:28 2016 +0100
Committer: Christofer Dutz <christofer.dutz@codecentric.de>
Committed: Tue Nov 8 16:13:28 2016 +0100

----------------------------------------------------------------------
 distribution/pom.xml                            |   6 +
 examples/flexjs/MDLExample/.vscode/launch.json  |  21 ++
 examples/flexjs/MDLExample/.vscode/tasks.json   |  10 +
 examples/flexjs/MDLExample/asconfig.json        |  14 +
 examples/flexjs/MDLExample/pom.xml              | 118 ++++++++
 .../flexjs/MDLExample/src/main/flex/App.mxml    | 140 ++++++++++
 .../MDLExample/src/main/resources/Unknown.jpg   | Bin 0 -> 50531 bytes
 .../main/resources/mdl-js-index-template.html   |  33 +++
 .../src/main/resources/mdl-styles.css           |  43 +++
 examples/flexjs/pom.xml                         |   1 +
 examples/pom.xml                                |   6 +-
 .../MaterialDesignLite/.vscode/tasks.json       |  10 +
 .../projects/MaterialDesignLite/build.xml       | 116 ++++++++
 frameworks/projects/MaterialDesignLite/pom.xml  | 117 ++++++++
 .../src/main/config/compile-as-config.xml       |  87 ++++++
 .../src/main/flex/MDLClasses.as                 |  37 +++
 .../src/main/flex/org/apache/flex/mdl/Button.as | 230 ++++++++++++++++
 .../src/main/flex/org/apache/flex/mdl/Card.as   | 105 ++++++++
 .../flex/org/apache/flex/mdl/CardActions.as     |  80 ++++++
 .../main/flex/org/apache/flex/mdl/CardMedia.as  |  80 ++++++
 .../main/flex/org/apache/flex/mdl/CardMenu.as   |  80 ++++++
 .../org/apache/flex/mdl/CardSupportingText.as   |  80 ++++++
 .../main/flex/org/apache/flex/mdl/CardTitle.as  |  80 ++++++
 .../main/flex/org/apache/flex/mdl/CheckBox.as   | 161 +++++++++++
 .../flex/org/apache/flex/mdl/RadioButton.as     | 266 +++++++++++++++++++
 .../src/main/flex/org/apache/flex/mdl/Slider.as | 262 ++++++++++++++++++
 .../src/main/flex/org/apache/flex/mdl/Spacer.as |  65 +++++
 .../main/flex/org/apache/flex/mdl/TextInput.as  | 156 +++++++++++
 .../flex/org/apache/flex/mdl/beads/Badge.as     | 157 +++++++++++
 .../flex/org/apache/flex/mdl/beads/Disabled.as  |  98 +++++++
 .../org/apache/flex/mdl/beads/TextPrompt.as     | 151 +++++++++++
 .../apache/flex/mdl/supportClasses/CardInner.as | 102 +++++++
 .../src/main/resources/defaults.css             |  33 +++
 .../src/main/resources/mdl-as-manifest.xml      |  26 ++
 .../src/main/resources/mdl-manifest.xml         |  41 +++
 frameworks/projects/pom.xml                     |   1 +
 36 files changed, 3010 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/a54a76e2/examples/pom.xml
----------------------------------------------------------------------
diff --cc examples/pom.xml
index 3c5398a,e0c8976..8d8751a
--- a/examples/pom.xml
+++ b/examples/pom.xml
@@@ -97,13 -97,13 +97,13 @@@
              </execution>
            </executions>
            <configuration>
-             <warSourceDirectory>${basedir}/target/javascript/bin/js-debug</warSourceDirectory>
+             <warSourceDirectory>${compiler.output-dir}</warSourceDirectory>
              <failOnMissingWebXml>false</failOnMissingWebXml>
-             <webResources>
+             <!--webResources>
                <resource>
 -                <directory>${build.outputDirectory}</directory>
 +                <directory>${compiler.output-dir}</directory>
                </resource>
-             </webResources>
+             </webResources-->
            </configuration>
          </plugin>
          <plugin>


Mime
View raw message