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 2f725b1 fix SampleAmfWebApp. Somethings where renamed that make it
fail, and pom structure was generating incorrect dependencies that generates an
incorrect build
2f725b1 is described below
commit 2f725b1e3fa94939303079f2b779f56cc11557eb
Author: Carlos Rovira <[email protected]>
AuthorDate: Thu Apr 19 23:12:16 2018 +0200
fix SampleAmfWebApp. Somethings where renamed that make it fail, and pom
structure was generating incorrect dependencies that generates an incorrect
build
---
examples/amf/SampleAmfWebApp/pom.xml | 6 +-
.../META-INF/{royale => flex}/services-config.xml | 2 +-
examples/royale/RemoteObjectAMFTest/pom.xml | 10 ++++
.../src/main/resources/assets/royale_logo.png | Bin 0 -> 181871 bytes
.../src/main/webapp/WEB-INF/web.xml | 66 +++++++++++++++++++++
5 files changed, 81 insertions(+), 3 deletions(-)
diff --git a/examples/amf/SampleAmfWebApp/pom.xml
b/examples/amf/SampleAmfWebApp/pom.xml
index 9f01f8a..2ccbb09 100644
--- a/examples/amf/SampleAmfWebApp/pom.xml
+++ b/examples/amf/SampleAmfWebApp/pom.xml
@@ -19,12 +19,15 @@
--><project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
<modelVersion>4.0.0</modelVersion>
+ <!--
+ this corrupts the packagin and makes an invalid wat
<parent>
<groupId>org.apache.royale.examples</groupId>
<artifactId>examples-amf-server</artifactId>
<version>0.9.3-SNAPSHOT</version>
</parent>
-
+ -->
+ <groupId>org.apache.royale.examples</groupId>
<artifactId>sampleamfwebapp</artifactId>
<version>0.9.3-SNAPSHOT</version>
<packaging>war</packaging>
@@ -105,7 +108,6 @@
<artifactId>RemoteObjectAMFTest</artifactId>
<version>0.9.3-SNAPSHOT</version>
<type>war</type>
- <scope>runtime</scope>
</dependency>
</dependencies>
diff --git
a/examples/amf/SampleAmfWebApp/src/main/resources/META-INF/royale/services-config.xml
b/examples/amf/SampleAmfWebApp/src/main/resources/META-INF/flex/services-config.xml
similarity index 99%
rename from
examples/amf/SampleAmfWebApp/src/main/resources/META-INF/royale/services-config.xml
rename to
examples/amf/SampleAmfWebApp/src/main/resources/META-INF/flex/services-config.xml
index c1a7064..5b76e21 100644
---
a/examples/amf/SampleAmfWebApp/src/main/resources/META-INF/royale/services-config.xml
+++
b/examples/amf/SampleAmfWebApp/src/main/resources/META-INF/flex/services-config.xml
@@ -70,7 +70,7 @@
<flex-client>
<!-- Make sure clients are automatically expired -->
<timeout-minutes>720</timeout-minutes>
- </royale-client>
+ </flex-client>
<logging>
<!--
diff --git a/examples/royale/RemoteObjectAMFTest/pom.xml
b/examples/royale/RemoteObjectAMFTest/pom.xml
index 2c7fa44..058bb5c 100644
--- a/examples/royale/RemoteObjectAMFTest/pom.xml
+++ b/examples/royale/RemoteObjectAMFTest/pom.xml
@@ -45,6 +45,10 @@
<directory>src/main/resources</directory>
<filtering>true</filtering>
</resource>
+ <resource>
+ <directory>src/main/webapp</directory>
+ <filtering>true</filtering>
+ </resource>
</resources>
<plugins>
<plugin>
@@ -55,6 +59,12 @@
<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> -->
</configuration>
</plugin>
<plugin>
diff --git
a/examples/royale/RemoteObjectAMFTest/src/main/resources/assets/royale_logo.png
b/examples/royale/RemoteObjectAMFTest/src/main/resources/assets/royale_logo.png
new file mode 100644
index 0000000..08612eb
Binary files /dev/null and
b/examples/royale/RemoteObjectAMFTest/src/main/resources/assets/royale_logo.png
differ
diff --git
a/examples/royale/RemoteObjectAMFTest/src/main/webapp/WEB-INF/web.xml
b/examples/royale/RemoteObjectAMFTest/src/main/webapp/WEB-INF/web.xml
new file mode 100644
index 0000000..6f839bd
--- /dev/null
+++ b/examples/royale/RemoteObjectAMFTest/src/main/webapp/WEB-INF/web.xml
@@ -0,0 +1,66 @@
+<?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.
+
+-->
+<web-app xmlns="http://java.sun.com/xml/ns/javaee";
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd";
+ version="3.0">
+
+ <display-name>RemoteObjectAMFTest</display-name>
+ <servlet-mapping>
+ <servlet-name>default</servlet-name>
+ <url-pattern>*.html</url-pattern>
+ </servlet-mapping>
+ <servlet-mapping>
+ <servlet-name>default</servlet-name>
+ <url-pattern>*.jpg</url-pattern>
+ </servlet-mapping>
+ <servlet-mapping>
+ <servlet-name>default</servlet-name>
+ <url-pattern>*.png</url-pattern>
+ </servlet-mapping>
+ <servlet-mapping>
+ <servlet-name>default</servlet-name>
+ <url-pattern>*.gif</url-pattern>
+ </servlet-mapping>
+ <servlet-mapping>
+ <servlet-name>default</servlet-name>
+ <url-pattern>*.svg</url-pattern>
+ </servlet-mapping>
+ <servlet-mapping>
+ <servlet-name>default</servlet-name>
+ <url-pattern>*.ico</url-pattern>
+ </servlet-mapping>
+ <servlet-mapping>
+ <servlet-name>default</servlet-name>
+ <url-pattern>*.css</url-pattern>
+ </servlet-mapping>
+ <servlet-mapping>
+ <servlet-name>default</servlet-name>
+ <url-pattern>*.js</url-pattern>
+ </servlet-mapping>
+ <servlet-mapping>
+ <servlet-name>default</servlet-name>
+ <url-pattern>*.json</url-pattern>
+ </servlet-mapping>
+ <servlet-mapping>
+ <servlet-name>default</servlet-name>
+ <url-pattern>*.manifest</url-pattern>
+ </servlet-mapping>
+</web-app>
\ No newline at end of file
--
To stop receiving notification emails like this one, please contact
[email protected].
