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 bc250fe This will hopefully fix Jenkins reattaching amf sample to the
parent pom and finish the war putting the web.xml in the right place. As well
renaming to match rest of names and logs
bc250fe is described below
commit bc250fe1fb7df537f3cedf6ef1aa9aac9ac62fd8
Author: Carlos Rovira <[email protected]>
AuthorDate: Mon Apr 23 01:02:42 2018 +0200
This will hopefully fix Jenkins reattaching amf sample to the parent pom
and finish the war putting the web.xml in the right place. As well renaming to
match rest of names and logs
---
examples/amf/SampleAmfWebApp/pom.xml | 11 +++--
.../src/main/webapp}/WEB-INF/web.xml | 2 +-
examples/amf/pom.xml | 51 ++++++++++++++++++++--
examples/pom.xml | 3 +-
4 files changed, 56 insertions(+), 11 deletions(-)
diff --git a/examples/amf/SampleAmfWebApp/pom.xml
b/examples/amf/SampleAmfWebApp/pom.xml
index 571e196..2f5a3b0 100644
--- a/examples/amf/SampleAmfWebApp/pom.xml
+++ b/examples/amf/SampleAmfWebApp/pom.xml
@@ -19,19 +19,18 @@
--><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>
+ <artifactId>examples-amf-webapps</artifactId>
<version>0.9.3-SNAPSHOT</version>
</parent>
- -->
- <groupId>org.apache.royale.examples</groupId>
- <artifactId>sampleamfwebapp</artifactId>
+
+ <artifactId>SampleAmfWebApp</artifactId>
<version>0.9.3-SNAPSHOT</version>
<packaging>war</packaging>
+ <name>Apache Royale: Examples: AMF Web Apps: SampleAmfWebApp</name>
+
<properties>
<java.version>1.7</java.version>
</properties>
diff --git
a/examples/royale/RemoteObjectAMFTest/src/main/resources/WEB-INF/web.xml
b/examples/amf/SampleAmfWebApp/src/main/webapp/WEB-INF/web.xml
similarity index 97%
rename from
examples/royale/RemoteObjectAMFTest/src/main/resources/WEB-INF/web.xml
rename to examples/amf/SampleAmfWebApp/src/main/webapp/WEB-INF/web.xml
index 6f839bd..9c3e3b6 100644
--- a/examples/royale/RemoteObjectAMFTest/src/main/resources/WEB-INF/web.xml
+++ b/examples/amf/SampleAmfWebApp/src/main/webapp/WEB-INF/web.xml
@@ -22,7 +22,7 @@
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>
+ <display-name>SampleAmfWebApp</display-name>
<servlet-mapping>
<servlet-name>default</servlet-name>
<url-pattern>*.html</url-pattern>
diff --git a/examples/amf/pom.xml b/examples/amf/pom.xml
index 4257531..4c38f6c 100644
--- a/examples/amf/pom.xml
+++ b/examples/amf/pom.xml
@@ -26,14 +26,59 @@
<version>0.9.3-SNAPSHOT</version>
</parent>
- <artifactId>examples-amf-server</artifactId>
+ <artifactId>examples-amf-webapps</artifactId>
<version>0.9.3-SNAPSHOT</version>
<packaging>pom</packaging>
- <name>Apache Royale: Examples: AMF Server</name>
+ <name>Apache Royale: Examples: AMF Web Apps</name>
+
+ <properties combine.self="override">
+
+ </properties>
<modules>
<module>SampleAmfWebApp</module>
</modules>
-</project>
+ <build>
+ <sourceDirectory>src/main/java</sourceDirectory>
+ <resources combine.self="override">
+
+ </resources>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <inherited>false</inherited>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-resources-plugin</artifactId>
+ <version>3.0.1</version>
+ <configuration combine.self="override">
+
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ <plugins>
+ <!-- Makes it possible to run the example directly by running 'mvn
tomcat7:run' -->
+ <plugin>
+ <inherited>false</inherited>
+ <groupId>org.apache.tomcat.maven</groupId>
+ <artifactId>tomcat7-maven-plugin</artifactId>
+ <version>2.2</version>
+ <configuration combine.self="override">
+
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+ <profiles>
+ <profile>
+ <id>release</id>
+
+ <properties combine.self="override">
+
+ </properties>
+ </profile>
+ </profiles>
+</project>
\ No newline at end of file
diff --git a/examples/pom.xml b/examples/pom.xml
index 70331a1..44cc9d0 100644
--- a/examples/pom.xml
+++ b/examples/pom.xml
@@ -41,10 +41,11 @@
<modules>
<module>express</module>
<module>royale</module>
+ <module>blog</module>
<module>native</module>
<module>node</module>
+
<module>amf</module>
- <module>blog</module>
<module>examples-tests</module>
<module>examples-integrationtests</module>
--
To stop receiving notification emails like this one, please contact
[email protected].
