This is an automated email from the ASF dual-hosted git repository.

carlosrovira pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/royale-asjs.git


The following commit(s) were added to refs/heads/develop by this push:
     new 2434c7b  simplify location of web.xml in RemoteObjectAMFTest. This 
web.xml will be "overlayed" in the final war app sample. tested that 
"js-release" version works perfectly with AMF :)
2434c7b is described below

commit 2434c7b70b71e1cbb2720fd07c78e1b09857aae7
Author: Carlos Rovira <[email protected]>
AuthorDate: Thu Apr 19 23:37:49 2018 +0200

    simplify location of web.xml in RemoteObjectAMFTest. This web.xml will be 
"overlayed" in the final war app sample. tested that "js-release" version works 
perfectly with AMF :)
---
 examples/royale/RemoteObjectAMFTest/pom.xml                  | 12 +-----------
 .../src/main/{webapp => resources}/WEB-INF/web.xml           |  0
 2 files changed, 1 insertion(+), 11 deletions(-)

diff --git a/examples/royale/RemoteObjectAMFTest/pom.xml 
b/examples/royale/RemoteObjectAMFTest/pom.xml
index 058bb5c..ead44fa 100644
--- a/examples/royale/RemoteObjectAMFTest/pom.xml
+++ b/examples/royale/RemoteObjectAMFTest/pom.xml
@@ -45,10 +45,6 @@
         <directory>src/main/resources</directory>
         <filtering>true</filtering>
       </resource>
-      <resource>
-        <directory>src/main/webapp</directory>
-        <filtering>true</filtering>
-      </resource>
     </resources>
     <plugins>
       <plugin>
@@ -58,13 +54,7 @@
         <configuration>
           <mainClass>App.mxml</mainClass>
           <targets>SWF,JSRoyale</targets>
-          <!-- <debug>false</debug> -->
-          <!-- <includeFiles>
-            <include-file>
-              <name>web.xml</name>
-              <path>../src/main/webapp/WEB-INF/web.xml</path>
-            </include-file>
-          </includeFiles> -->
+          <debug>false</debug>
         </configuration>
       </plugin>
       <plugin>
diff --git 
a/examples/royale/RemoteObjectAMFTest/src/main/webapp/WEB-INF/web.xml 
b/examples/royale/RemoteObjectAMFTest/src/main/resources/WEB-INF/web.xml
similarity index 100%
rename from examples/royale/RemoteObjectAMFTest/src/main/webapp/WEB-INF/web.xml
rename to examples/royale/RemoteObjectAMFTest/src/main/resources/WEB-INF/web.xml

-- 
To stop receiving notification emails like this one, please contact
[email protected].

Reply via email to