This is an automated email from the ASF dual-hosted git repository. joshtynjala pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/flex-blazeds.git
commit 811b5c84be9606902776e688fb9222b013eaea59 Merge: c666ef4 7011cd7 Author: Josh Tynjala <[email protected]> AuthorDate: Mon Feb 23 14:13:38 2026 -0800 Merge branch 'develop' into jakartaee ApproveBlazeDS.xml | 421 +++++++++++++-------- distribution/pom.xml | 6 + distribution/src/assembly/assemble-bin.xml | 12 +- distribution/src/assembly/assemble-src.xml | 26 ++ pom.xml | 8 +- samples/classic-turnkey-samples/backend/pom.xml | 11 + .../main/webapp/WEB-INF/flex/services-config.xml | 12 +- .../backend/src/main/webapp/index.htm | 7 +- .../frontend/inventory/asconfig.json | 19 + .../frontend/inventory/pom.xml | 101 +++++ .../src/main/resources/index-template.html} | 35 +- .../frontend/inventory/src/main/royale/Main.mxml | 219 +++++++++++ .../frontend/inventory/src/main/royale/Product.as | 44 +++ .../inventory/src/main/royale/ProductForm.mxml | 130 +++++++ .../inventory/src/main/royale/SearchPopup.mxml | 115 ++++++ samples/classic-turnkey-samples/frontend/pom.xml | 1 + samples/pom.xml | 1 + samples/typed-object/backend/pom.xml | 95 +++++ .../flex/blazeds/samples/typed/TypedObject.java | 59 +++ .../blazeds/samples/typed/TypedObjectService.java | 33 ++ .../main/webapp/WEB-INF/flex/services-config.xml | 102 +++++ .../backend/src/main/webapp/WEB-INF/web.xml | 48 +++ samples/typed-object/frontend/asconfig.json | 19 + samples/typed-object/frontend/pom.xml | 117 ++++++ .../src/main/resources/index-template.html} | 35 +- .../frontend/src/main/royale/Main.mxml | 112 ++++++ .../flex/blazeds/samples/typed/TypedObject.as | 29 ++ samples/{ => typed-object}/pom.xml | 14 +- 28 files changed, 1609 insertions(+), 222 deletions(-) diff --cc samples/classic-turnkey-samples/backend/pom.xml index 7a5567e,3d139df..f90e633 --- a/samples/classic-turnkey-samples/backend/pom.xml +++ b/samples/classic-turnkey-samples/backend/pom.xml @@@ -136,6 -141,12 +141,12 @@@ <artifactId>hsqldb</artifactId> <version>1.8.0.10</version> </dependency> + <dependency> + <groupId>org.apache.flex.blazeds.samples.turnkey</groupId> + <artifactId>inventory</artifactId> - <version>4.9.0-SNAPSHOT</version> ++ <version>5.0.0-SNAPSHOT</version> + <type>war</type> + </dependency> <dependency> <groupId>org.apache.flex.blazeds.samples.turnkey</groupId> <artifactId>runtimeconfig-messaging</artifactId> diff --cc samples/classic-turnkey-samples/frontend/inventory/pom.xml index 0000000,85fd38b..e004824 mode 000000,100644..100644 --- a/samples/classic-turnkey-samples/frontend/inventory/pom.xml +++ b/samples/classic-turnkey-samples/frontend/inventory/pom.xml @@@ -1,0 -1,101 +1,101 @@@ + <?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. + + --><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> + + <parent> + <groupId>org.apache.flex.blazeds.samples.turnkey</groupId> + <artifactId>blazeds-classic-turnkey-samples-frontend</artifactId> - <version>4.9.0-SNAPSHOT</version> ++ <version>5.0.0-SNAPSHOT</version> + </parent> + + <groupId>org.apache.flex.blazeds.samples.turnkey</groupId> + <artifactId>inventory</artifactId> - <version>4.9.0-SNAPSHOT</version> ++ <version>5.0.0-SNAPSHOT</version> + <packaging>swf</packaging> + + <name>Apache Flex BlazeDS: Samples: Inventory</name> + + <build> + <sourceDirectory>src/main/royale</sourceDirectory> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-dependency-plugin</artifactId> + <executions> + <execution> + <id>copy-themes</id> + <phase>generate-resources</phase> + <configuration> + <includes>defaults.css</includes> + </configuration> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.apache.royale.compiler</groupId> + <artifactId>royale-maven-plugin</artifactId> + <extensions>true</extensions> + <configuration> + <mainClass>Main.mxml</mainClass> + <targets>JSRoyale</targets> + <debug>false</debug> + <htmlTemplate>${basedir}/target/javascript/bin/js-debug/index-template.html</htmlTemplate> + <additionalCompilerOptions> + -js-dynamic-access-unknown-members=true; + -source-map=true; + </additionalCompilerOptions> + </configuration> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-war-plugin</artifactId> + </plugin> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>build-helper-maven-plugin</artifactId> + </plugin> + </plugins> + </build> + + <dependencies> + <dependency> + <groupId>org.apache.royale.framework</groupId> + <artifactId>Jewel</artifactId> + <version>0.9.11-SNAPSHOT</version> + <type>swc</type> + <classifier>js</classifier> + </dependency> + <dependency> + <groupId>org.apache.royale.framework</groupId> + <artifactId>JewelTheme</artifactId> + <version>0.9.11-SNAPSHOT</version> + <type>swc</type> + <scope>theme</scope> + <classifier>js</classifier> + </dependency> + <dependency> + <groupId>org.apache.royale.framework</groupId> + <artifactId>MXRoyaleBase</artifactId> + <version>0.9.11-SNAPSHOT</version> + <type>swc</type> + <classifier>js</classifier> + </dependency> + </dependencies> + </project> diff --cc samples/typed-object/backend/pom.xml index 0000000,d495fb1..59def32 mode 000000,100644..100644 --- a/samples/typed-object/backend/pom.xml +++ b/samples/typed-object/backend/pom.xml @@@ -1,0 -1,95 +1,95 @@@ + <?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. + + --><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> + + <parent> + <groupId>org.apache.flex.blazeds.samples.typed-object</groupId> + <artifactId>blazeds-typed-object-sample</artifactId> - <version>4.9.0-SNAPSHOT</version> ++ <version>5.0.0-SNAPSHOT</version> + </parent> + + <groupId>org.apache.flex.blazeds.samples.typed-object</groupId> + <artifactId>blazeds-typed-object-backend</artifactId> - <version>4.9.0-SNAPSHOT</version> ++ <version>5.0.0-SNAPSHOT</version> + <packaging>war</packaging> + + <name>Apache Flex BlazeDS: Typed Object Sample: Backend</name> + + <properties> + <java.version>1.8</java.version> + </properties> + + <build> + <sourceDirectory>src/main/java</sourceDirectory> + <finalName>typed-object</finalName> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-compiler-plugin</artifactId> + <version>3.5.1</version> + <configuration> + <source>${java.version}</source> + <target>${java.version}</target> + </configuration> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-war-plugin</artifactId> + <configuration> + <overlays> + <overlay> + <groupId>org.apache.flex.blazeds.samples.typed-object</groupId> + <artifactId>blazeds-typed-object-frontend</artifactId> + </overlay> + </overlays> + </configuration> + </plugin> + </plugins> + </build> + + <dependencies> + <dependency> + <groupId>org.apache.flex.blazeds</groupId> + <artifactId>flex-messaging-common</artifactId> - <version>4.9.0-SNAPSHOT</version> ++ <version>5.0.0-SNAPSHOT</version> + </dependency> + <dependency> + <groupId>org.apache.flex.blazeds</groupId> + <artifactId>flex-messaging-core</artifactId> - <version>4.9.0-SNAPSHOT</version> ++ <version>5.0.0-SNAPSHOT</version> + </dependency> + <dependency> + <groupId>org.apache.flex.blazeds</groupId> + <artifactId>flex-messaging-proxy</artifactId> - <version>4.9.0-SNAPSHOT</version> ++ <version>5.0.0-SNAPSHOT</version> + </dependency> + <dependency> + <groupId>org.apache.flex.blazeds</groupId> + <artifactId>flex-messaging-remoting</artifactId> - <version>4.9.0-SNAPSHOT</version> ++ <version>5.0.0-SNAPSHOT</version> + </dependency> + <dependency> + <groupId>org.apache.flex.blazeds.samples.typed-object</groupId> + <artifactId>blazeds-typed-object-frontend</artifactId> - <version>4.9.0-SNAPSHOT</version> ++ <version>5.0.0-SNAPSHOT</version> + <type>war</type> + </dependency> + </dependencies> + </project> diff --cc samples/typed-object/frontend/pom.xml index 0000000,5d6ea0b..da2c13f mode 000000,100644..100644 --- a/samples/typed-object/frontend/pom.xml +++ b/samples/typed-object/frontend/pom.xml @@@ -1,0 -1,117 +1,117 @@@ + <?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. + + --><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> + + <parent> + <groupId>org.apache.flex.blazeds.samples.typed-object</groupId> + <artifactId>blazeds-typed-object-sample</artifactId> - <version>4.9.0-SNAPSHOT</version> ++ <version>5.0.0-SNAPSHOT</version> + </parent> + + <groupId>org.apache.flex.blazeds.samples.typed-object</groupId> + <artifactId>blazeds-typed-object-frontend</artifactId> - <version>4.9.0-SNAPSHOT</version> ++ <version>5.0.0-SNAPSHOT</version> + <packaging>swf</packaging> + + <name>Apache Flex BlazeDS: Typed Object Sample: Frontend</name> + + <build> + <sourceDirectory>src/main/royale</sourceDirectory> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-dependency-plugin</artifactId> + <executions> + <execution> + <id>copy-themes</id> + <phase>generate-resources</phase> + <configuration> + <includes>defaults.css</includes> + </configuration> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.apache.royale.compiler</groupId> + <artifactId>royale-maven-plugin</artifactId> + <version>0.9.11-SNAPSHOT</version> + <extensions>true</extensions> + <configuration> + <mainClass>Main.mxml</mainClass> + <targets>JSRoyale</targets> + <debug>false</debug> + <htmlTemplate>${basedir}/src/main/resources/index-template.html</htmlTemplate> + <keepAs3Metadata> + <name>Bindable</name> + <name>Managed</name> + <name>ChangeEvent</name> + <name>NonCommittingChangeEvent</name> + <name>Transient</name> + <name>Mixin</name> + </keepAs3Metadata> + <additionalCompilerOptions> + -js-dynamic-access-unknown-members=true; + -source-map=true; + </additionalCompilerOptions> + </configuration> + <dependencies> + <dependency> + <groupId>org.apache.royale.compiler</groupId> + <artifactId>compiler-jx</artifactId> + <version>0.9.11-SNAPSHOT</version> + </dependency> + </dependencies> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-war-plugin</artifactId> + </plugin> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>build-helper-maven-plugin</artifactId> + </plugin> + </plugins> + </build> + + <dependencies> + <dependency> + <groupId>org.apache.royale.framework</groupId> + <artifactId>Jewel</artifactId> + <version>0.9.11-SNAPSHOT</version> + <type>swc</type> + <classifier>js</classifier> + </dependency> + <dependency> + <groupId>org.apache.royale.framework</groupId> + <artifactId>JewelTheme</artifactId> + <version>0.9.11-SNAPSHOT</version> + <type>swc</type> + <scope>theme</scope> + <classifier>js</classifier> + </dependency> + <dependency> + <groupId>org.apache.royale.framework</groupId> + <artifactId>MXRoyaleBase</artifactId> + <version>0.9.11-SNAPSHOT</version> + <type>swc</type> + <classifier>js</classifier> + </dependency> + </dependencies> + </project> diff --cc samples/typed-object/pom.xml index 40fb9b9,12f2a6d..ef40679 --- a/samples/typed-object/pom.xml +++ b/samples/typed-object/pom.xml @@@ -21,20 -21,20 +21,20 @@@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.apache.flex.blazeds</groupId> - <artifactId>blazeds</artifactId> + <groupId>org.apache.flex.blazeds.samples</groupId> + <artifactId>blazeds-samples</artifactId> - <version>4.9.0-SNAPSHOT</version> + <version>5.0.0-SNAPSHOT</version> </parent> - <groupId>org.apache.flex.blazeds.samples</groupId> - <artifactId>blazeds-samples</artifactId> + <groupId>org.apache.flex.blazeds.samples.typed-object</groupId> + <artifactId>blazeds-typed-object-sample</artifactId> - <version>4.9.0-SNAPSHOT</version> + <version>5.0.0-SNAPSHOT</version> <packaging>pom</packaging> - <name>Apache Flex BlazeDS: Samples</name> + <name>Apache Flex BlazeDS: Typed Object Sample</name> <modules> - <module>hello-world</module> - <module>classic-turnkey-samples</module> + <module>frontend</module> + <module>backend</module> </modules> </project>
