myfaces-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From we...@apache.org
Subject [myfaces] branch master updated: MYFACES-4265: Reduction of implemented js aftifacts to the minium needed to work and and introspect, TODO in the long run we will move the sources to js maps, but this is out of scope for now
Date Fri, 11 Jan 2019 10:19:41 GMT
This is an automated email from the ASF dual-hosted git repository.

werpu pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/myfaces.git


The following commit(s) were added to refs/heads/master by this push:
     new 5af6fa5  MYFACES-4265: Reduction of implemented js aftifacts to the minium needed
to work and and introspect, TODO in the long run we will move the sources to js maps, but
this is out of scope for now
     new 7f0290d  Merge branch 'master' of https://gitbox.apache.org/repos/asf/myfaces
5af6fa5 is described below

commit 5af6fa5d000a2c8bc5d5e347187860aeb676f8c5
Author: Werner Punz <werner.punz@gmail.com>
AuthorDate: Fri Jan 11 11:16:26 2019 +0100

    MYFACES-4265: Reduction of implemented js aftifacts to the minium
    needed to work and and introspect, TODO in the long run
    we will move the sources to js maps, but this is out of scope for now
---
 api/pom.xml                                        | 78 +++++++++++-----------
 .../assembler/jsfscripts-uncompressed-compiler.xml | 36 ----------
 2 files changed, 38 insertions(+), 76 deletions(-)

diff --git a/api/pom.xml b/api/pom.xml
index 257b7f5..bc11a93 100644
--- a/api/pom.xml
+++ b/api/pom.xml
@@ -36,34 +36,13 @@
 
     <build>
 
+
         <resources>
             <!-- standard resources -->
             <resource>
                 <directory>src/main/resources</directory>
             </resource>
 
-            <!-- javascript resources -->
-            <resource>
-                <directory>src/main/javascript/META-INF/resources/myfaces/_impl/_util</directory>
-                <targetPath>META-INF/internal-resources/org.apache.myfaces.core.impl.util</targetPath>
-            </resource>
-            <resource>
-                <directory>src/main/javascript/META-INF/resources/myfaces/_impl/i18n</directory>
-                <targetPath>META-INF/internal-resources/org.apache.myfaces.core.impl.i18n</targetPath>
-            </resource>
-            <resource>
-                <directory>src/main/javascript/META-INF/resources/myfaces/_impl/core</directory>
-                <targetPath>META-INF/internal-resources/org.apache.myfaces.core.impl.core</targetPath>
-            </resource>
-            <resource>
-                <directory>src/main/javascript/META-INF/resources/myfaces/_impl/xhrCore</directory>
-                <targetPath>META-INF/internal-resources/org.apache.myfaces.core.impl.xhrCore</targetPath>
-            </resource>
-            <resource>
-                <directory>src/main/javascript/META-INF/resources/myfaces/api</directory>
-                <targetPath>META-INF/internal-resources/org.apache.myfaces.core.api</targetPath>
-            </resource>
-
         </resources>
 
         <plugins>
@@ -113,6 +92,7 @@
                 <version>1.0.1</version>
                 <extensions>true</extensions>
                 <executions>
+
                      <execution>
                         <id>compile</id>
                         <goals>
@@ -120,29 +100,14 @@
                         </goals>
                         <phase>process-resources</phase>
                         <configuration>
+                            <sourceDirectory>${basedir}/src/main/javascript/META-INF/resources</sourceDirectory>
                             <descriptor>${basedir}/src/assembler/jsfscripts-compiler.xml</descriptor>
                             <excludes>
                                 <exclude>**/myfaces/_impl/core/jsf-uncompressed.js</exclude>
                             </excludes>
                         </configuration>
                     </execution>
-                    <execution>
-                        <id>compile-uncompressed</id>
-                        <goals>
-                            <goal>compile</goal>
-                        </goals>
-                        <phase>process-resources</phase>
-                        <configuration>
-                            <descriptor>${basedir}/src/assembler/jsfscripts-uncompressed-compiler.xml</descriptor>
-                            <outputDirectory>${basedir}/target/classes/META-INF/internal-resources/javax.faces/</outputDirectory>
-                            <excludes>
-                                <exclude>**/myfaces/_impl/core/Impl.js</exclude>
-                                <exclude>**/myfaces/_impl/_util/*</exclude>
-                                <exclude>**/myfaces/_impl/xhrCore/*</exclude>
-                                <exclude>**/myfaces/api/*</exclude>
-                            </excludes>
-                        </configuration>
-                    </execution>
+
                     <execution>
                         <id>compile-uncompressed-full</id>
                         <goals>
@@ -150,6 +115,7 @@
                         </goals>
                         <phase>process-resources</phase>
                         <configuration>
+                            <sourceDirectory>${basedir}/src/main/javascript/META-INF/resources</sourceDirectory>
                             <descriptor>${basedir}/src/assembler/jsfscripts-uncompressed-full-compiler.xml</descriptor>
                             <outputDirectory>${basedir}/target/classes/META-INF/internal-resources/javax.faces/</outputDirectory>
                             <excludes>
@@ -164,6 +130,7 @@
                         </goals>
                         <phase>process-resources</phase>
                         <configuration>
+                            <sourceDirectory>${basedir}/src/main/javascript/META-INF/resources</sourceDirectory>
                             <descriptor>${basedir}/src/assembler/jsfscripts-minimal-compiler.xml</descriptor>
                             <outputDirectory>${basedir}/target/classes/META-INF/internal-resources/javax.faces/</outputDirectory>
                             <excludes>
@@ -179,10 +146,12 @@
                         </goals>
                         <phase>process-resources</phase>
                         <configuration>
+                            <sourceDirectory>${basedir}/src/main/javascript/META-INF/resources</sourceDirectory>
                             <descriptor>${basedir}/src/assembler/jsfscripts-i18n-compiler.xml</descriptor>
                             <outputDirectory>${basedir}/target/classes/META-INF/resources/myfaces/</outputDirectory>
                             <excludes>
                                 <exclude>**/myfaces/_impl/core/jsf-uncompressed.js</exclude>
+
                             </excludes>
                         </configuration>
                     </execution>
@@ -199,6 +168,7 @@
                             <excludes>
                                 <exclude>jsf-uncompressed.js</exclude>
                                 <exclude>jsf-uncompressed-full.js</exclude>
+
                             </excludes>
                             <compressor>yahooUI</compressor>
 
@@ -216,12 +186,15 @@
                             <excludes>
                                 <exclude>jsf-uncompressed.js</exclude>
                                 <exclude>jsf-uncompressed-full.js</exclude>
+
                             </excludes>
                             <compressor>yahooUI</compressor>
 
                         </configuration>
                     </execution>
 
+
+
                 <execution>
                         <id>compress-alternatives</id>
                         <goals>
@@ -232,8 +205,9 @@
                         <configuration>
                             <scripts>target/classes/META-INF/internal-resources/javax.faces/</scripts>
                             <excludes>
-                                <exclude>jsf-uncompressed.js</exclude>
                                 <exclude>jsf-uncompressed-full.js</exclude>
+                                <exclude>META-INF/**/*.js</exclude>
+
                             </excludes>
                             <compressor>yahooUI</compressor>
 
@@ -248,6 +222,7 @@
                 </configuration>
             </plugin>
 
+
             <!-- we want to use the test cases also in myfacse-impl, thus creating a test-jar
-->
             <plugin>
                 <artifactId>maven-jar-plugin</artifactId>
@@ -263,9 +238,32 @@
                     <archive>
                         <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
                     </archive>
+                    <!-- we need to clean up some junk left by the myfaces javascript
assembly -->
+
                 </configuration>
             </plugin>
 
+            <plugin>
+                <artifactId>maven-jar-plugin</artifactId>
+                <version>2.2</version>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>jar</goal>
+                        </goals>
+                    </execution>
+                </executions>
+                <configuration>
+                    <excludes>
+                        <exclude>**/META-INF/resources/myfaces/myfaces/**</exclude>
+                        <exclude>**/META-INF/resources/javax.faces/myfaces/**</exclude>
+                        <exclude>**/META-INF/resources/javax.faces/myfaces/**</exclude>
+                    </excludes>
+                </configuration>
+            </plugin>
+
+
+
             <!--
                 berlios jsunit under apache2 license to cover javascript core routines which
                 do not have to rely on a browser or can work on browser mockups!
diff --git a/api/src/assembler/jsfscripts-uncompressed-compiler.xml b/api/src/assembler/jsfscripts-uncompressed-compiler.xml
deleted file mode 100644
index 19663c4..0000000
--- a/api/src/assembler/jsfscripts-uncompressed-compiler.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0"?>
-<!--
- * 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.
--->
-<!--
-an assembly which provdides the entire infrastructure
-dynamically loaded, this is easier for debugging.
-In the long run we probably will move this
-to javascript maps instead
--->
-<assembler>
-    <scripts>
-
-        <script>
-            <fileName>jsf-uncompressed.js</fileName>
-            <includes>
-                <include>**/_impl/core/_EvalHandlers.js</include>
-                <include>**/_impl/core/_Runtime.js</include>
-                <include>**/_impl/core/jsf-uncompressed.js</include>
-            </includes>
-        </script>
-    </scripts>
-</assembler>


Mime
View raw message