flex-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From carlosrov...@apache.org
Subject [46/50] git commit: [flex-asjs] [refs/heads/feature/amf] - fix maven build for RemoteObjectAMFTest
Date Wed, 06 Sep 2017 22:31:39 GMT
fix maven build for RemoteObjectAMFTest


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

Branch: refs/heads/feature/amf
Commit: 85ccb270580f3cf658be3de147ee22dc6210186a
Parents: 91db162
Author: Alex Harui <aharui@apache.org>
Authored: Tue Aug 22 22:12:24 2017 -0700
Committer: Carlos Rovira <carlosrovira@apache.org>
Committed: Thu Sep 7 00:24:03 2017 +0200

----------------------------------------------------------------------
 examples/flexjs/RemoteObjectAMFTest/pom.xml     | 25 ++++++++++++++++----
 .../RemoteObjectAMFTest/src/main/flex/App.mxml  |  4 ++--
 examples/flexjs/pom.xml                         |  1 +
 3 files changed, 23 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/85ccb270/examples/flexjs/RemoteObjectAMFTest/pom.xml
----------------------------------------------------------------------
diff --git a/examples/flexjs/RemoteObjectAMFTest/pom.xml b/examples/flexjs/RemoteObjectAMFTest/pom.xml
index a8e369c..849521f 100644
--- a/examples/flexjs/RemoteObjectAMFTest/pom.xml
+++ b/examples/flexjs/RemoteObjectAMFTest/pom.xml
@@ -55,9 +55,9 @@
         <extensions>true</extensions>
         <configuration>
           <mainClass>App.mxml</mainClass>
-          <targets>JSFlex</targets>
-          <htmlTemplate>${basedir}/target/javascript/bin/js-debug/mdl-js-index-template.html</htmlTemplate>
-          <additionalCompilerOptions>-compiler.exclude-defaults-css-files=Basic-0.9.0-SNAPSHOT.swc:defaults.css</additionalCompilerOptions>
+          <targets>SWF,JSFlex</targets>
+          <!--<htmlTemplate>${basedir}/target/javascript/bin/js-debug/mdl-js-index-template.html</htmlTemplate>-->
+          <!--<additionalCompilerOptions>-compiler.exclude-defaults-css-files=Basic-0.9.0-SNAPSHOT.swc:defaults.css</additionalCompilerOptions>-->
         </configuration>
       </plugin>
       <plugin>
@@ -73,20 +73,35 @@
 
   <dependencies>
     <dependency>
+      <groupId>com.adobe.flash.framework</groupId>
+      <artifactId>playerglobal</artifactId>
+      <version>${flash.version}</version>
+      <type>swc</type>
+      <scope>provided</scope>
+    </dependency>
+      
+    <!--<dependency>
       <groupId>org.apache.flex.flexjs.framework</groupId>
       <artifactId>MaterialDesignLite</artifactId>
       <version>0.9.0-SNAPSHOT</version>
       <type>swc</type>
       <classifier>js</classifier>
-    </dependency>
+    </dependency>-->
 
     <dependency>
       <groupId>org.apache.flex.flexjs.framework</groupId>
       <artifactId>Network</artifactId>
       <version>0.9.0-SNAPSHOT</version>
       <type>swc</type>
+      <classifier>swf</classifier>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.flex.flexjs.framework</groupId>
+      <artifactId>Network</artifactId>
+      <version>0.9.0-SNAPSHOT</version>
+      <type>swc</type>
       <classifier>js</classifier>
     </dependency>
   </dependencies>
 
-</project>
\ No newline at end of file
+</project>

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/85ccb270/examples/flexjs/RemoteObjectAMFTest/src/main/flex/App.mxml
----------------------------------------------------------------------
diff --git a/examples/flexjs/RemoteObjectAMFTest/src/main/flex/App.mxml b/examples/flexjs/RemoteObjectAMFTest/src/main/flex/App.mxml
index 2709cff..974bdd5 100644
--- a/examples/flexjs/RemoteObjectAMFTest/src/main/flex/App.mxml
+++ b/examples/flexjs/RemoteObjectAMFTest/src/main/flex/App.mxml
@@ -17,7 +17,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 
 -->
-<mdl:Application xmlns:fx="http://ns.adobe.com/mxml/2009"
+<js:Application xmlns:fx="http://ns.adobe.com/mxml/2009"
                  xmlns:js="library://ns.apache.org/flexjs/basic"
                  xmlns:mdl="library://ns.apache.org/flexjs/mdl"
                  xmlns:local="*">
@@ -71,4 +71,4 @@ limitations under the License.
 
     <fx:Style source="../../main/resources/mdl-styles.css"/>
 
-</mdl:Application>
+</js:Application>

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/85ccb270/examples/flexjs/pom.xml
----------------------------------------------------------------------
diff --git a/examples/flexjs/pom.xml b/examples/flexjs/pom.xml
index a749153..1a5a5f4 100644
--- a/examples/flexjs/pom.xml
+++ b/examples/flexjs/pom.xml
@@ -58,6 +58,7 @@
     <module>MobileMap</module>
     <module>MobileStocks</module>
     <module>MobileTrader</module>
+    <module>RemoteObjectAMFTest</module>
     <module>StorageExample</module>
     <module>StyleExample</module>
     <module>TeamPage</module>


Mime
View raw message