You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by lo...@apache.org on 2018/08/30 15:28:32 UTC
[myfaces-tobago] 02/02: TOBAGO-1924: Using jars instead of repackaging, when possible * create some self-packaged jars jquery-ui (contains widgets only) typeahead (patch)

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

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

commit 9cb2097406a4a66b823e5c3cf5b7c3d99cdabad5
Author: Udo Schnurpfeil <lo...@apache.org>
AuthorDate: Thu Aug 30 17:28:17 2018 +0200

    TOBAGO-1924: Using jars instead of repackaging, when possible
    * create some self-packaged jars
    ** jquery-ui (contains widgets only)
    ** typeahead (patch)
---
 tobago-theme/tobago-theme-standard/pom.xml          | 10 ++++++++++
 .../src/main/resources/META-INF/tobago-config.xml   |  8 ++++----
 tobago-tool/pom.xml                                 |  2 ++
 tobago-tool/{ => tobago-pack-jquery-ui}/pom.xml     | 21 ++++++++-------------
 .../pack}/jquery-ui/1.12.1.custom/jquery-ui.js      |  0
 .../pack}/jquery-ui/1.12.1.custom/jquery-ui.min.js  |  0
 tobago-tool/{ => tobago-pack-typeahead}/pom.xml     | 21 ++++++++-------------
 .../typeahead/0.11.1-patched-with-1212/typeahead.js |  0
 .../0.11.1-patched-with-1212/typeahead.min.js       |  0
 9 files changed, 32 insertions(+), 30 deletions(-)

diff --git a/tobago-theme/tobago-theme-standard/pom.xml b/tobago-theme/tobago-theme-standard/pom.xml
index 0568b41..6d07e92 100644
--- a/tobago-theme/tobago-theme-standard/pom.xml
+++ b/tobago-theme/tobago-theme-standard/pom.xml
@@ -140,6 +140,16 @@
       <version>2.22.2</version>
     </dependency>
     <dependency>
+      <groupId>org.apache.myfaces.tobago</groupId>
+        <artifactId>tobago-pack-jquery-ui-widget</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.myfaces.tobago</groupId>
+        <artifactId>tobago-pack-typeahead</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
       <groupId>org.webjars</groupId>
         <artifactId>Eonasdan-bootstrap-datetimepicker</artifactId>
       <version>4.17.47</version>
diff --git a/tobago-theme/tobago-theme-standard/src/main/resources/META-INF/tobago-config.xml b/tobago-theme/tobago-theme-standard/src/main/resources/META-INF/tobago-config.xml
index 90c4029..8b88c31 100644
--- a/tobago-theme/tobago-theme-standard/src/main/resources/META-INF/tobago-config.xml
+++ b/tobago-theme/tobago-theme-standard/src/main/resources/META-INF/tobago-config.xml
@@ -39,14 +39,14 @@
       <resources production="true">
         <includes>
           <script name="/webjars/jquery/3.3.1-1/jquery.min.js"/>
-          <script name="/tobago/standard/jquery-ui/1.12.1.custom/jquery-ui.min.js"/>
+          <script name="/tobago/pack/jquery-ui/1.12.1.custom/jquery-ui.min.js"/>
           <script name="/webjars/tether/1.4.0/js/tether.min.js"/>
           <script name="/webjars/popper.js/1.14.3/popper.min.js"/>
           <script name="/tobago/standard/tobago-bootstrap/${project.version}/js/bootstrap.min.js"/>
           <script name="/webjars/momentjs/2.22.2/min/moment-with-locales.min.js"/>
           <script name="/webjars/Eonasdan-bootstrap-datetimepicker/4.17.47/js/bootstrap-datetimepicker.min.js"/>
           <script name="/tobago/standard/tobago-bootstrap/${project.version}/js/tobago.min.js"/>
-          <script name="/tobago/standard/typeahead/0.11.1-patched-with-1212/typeahead.min.js"/>
+          <script name="/tobago/pack/typeahead/0.11.1-patched-with-1212/typeahead.min.js"/>
           <style name="/webjars/tether/1.4.0/css/tether.min.css"/>
           <style name="/tobago/standard/tobago-bootstrap/${project.version}/css/bootstrap.min.css"/>
           <style name="/webjars/font-awesome/4.7.0/css/font-awesome.min.css"/>
@@ -56,7 +56,7 @@
       <resources production="false">
         <includes>
           <script name="/webjars/jquery/3.3.1-1/jquery.js"/>
-          <script name="/tobago/standard/jquery-ui/1.12.1.custom/jquery-ui.js"/>
+          <script name="/tobago/pack/jquery-ui/1.12.1.custom/jquery-ui.js"/>
           <script name="/webjars/tether/1.4.0/js/tether.js"/>
           <script name="/webjars/popper.js/1.14.3/popper.js"/>
           <script name="/tobago/standard/tobago-bootstrap/${project.version}/js/bootstrap.js"/>
@@ -78,7 +78,7 @@
           <script name="/tobago/standard/tobago-bootstrap/${project.version}/js/tobago-tab.js"/>
           <script name="/tobago/standard/tobago-bootstrap/${project.version}/js/tobago-tree.js"/>
           <script name="/tobago/standard/tobago-bootstrap/${project.version}/js/tobago-utils.js"/>
-          <script name="/tobago/standard/typeahead/0.11.1-patched-with-1212/typeahead.js"/>
+          <script name="/tobago/pack/typeahead/0.11.1-patched-with-1212/typeahead.js"/>
           <style name="/webjars/tether/1.4.0/css/tether.css"/>
           <style name="/tobago/standard/tobago-bootstrap/${project.version}/css/bootstrap.css"/>
           <style name="/webjars/font-awesome/4.7.0/css/font-awesome.css"/>
diff --git a/tobago-tool/pom.xml b/tobago-tool/pom.xml
index 54de8dd..2d032ad 100644
--- a/tobago-tool/pom.xml
+++ b/tobago-tool/pom.xml
@@ -27,6 +27,8 @@
   <artifactId>tobago-tool</artifactId>
 
   <modules>
+    <module>tobago-pack-jquery-ui</module>
+    <module>tobago-pack-typeahead</module>
     <module>tobago-tool-apt</module>
     <module>tobago-tool-annotation</module>
     <module>tobago-tool-test</module>
diff --git a/tobago-tool/pom.xml b/tobago-tool/tobago-pack-jquery-ui/pom.xml
similarity index 69%
copy from tobago-tool/pom.xml
copy to tobago-tool/tobago-pack-jquery-ui/pom.xml
index 54de8dd..d213349 100644
--- a/tobago-tool/pom.xml
+++ b/tobago-tool/tobago-pack-jquery-ui/pom.xml
@@ -13,23 +13,18 @@
  * 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.e.
+ * 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/maven-v4_0_0.xsd">
+<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/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.apache.myfaces.tobago</groupId>
-    <artifactId>tobago</artifactId>
+    <artifactId>tobago-tool</artifactId>
     <version>4.3.0-SNAPSHOT</version>
   </parent>
-  <packaging>pom</packaging>
-  <name>Tobago Tool</name>
-  <artifactId>tobago-tool</artifactId>
-
-  <modules>
-    <module>tobago-tool-apt</module>
-    <module>tobago-tool-annotation</module>
-    <module>tobago-tool-test</module>
-  </modules>
-
+  <artifactId>tobago-pack-jquery-ui</artifactId>
+  <packaging>jar</packaging>
+  <name>Tobago Package for jQuery UI</name>
+  <description>Contains the widget stuff of jQuery UI</description>
 </project>
diff --git a/tobago-theme/tobago-theme-standard/src/main/resources/META-INF/resources/tobago/standard/jquery-ui/1.12.1.custom/jquery-ui.js b/tobago-tool/tobago-pack-jquery-ui/src/main/resources/META-INF/resources/tobago/pack/jquery-ui/1.12.1.custom/jquery-ui.js
similarity index 100%
rename from tobago-theme/tobago-theme-standard/src/main/resources/META-INF/resources/tobago/standard/jquery-ui/1.12.1.custom/jquery-ui.js
rename to tobago-tool/tobago-pack-jquery-ui/src/main/resources/META-INF/resources/tobago/pack/jquery-ui/1.12.1.custom/jquery-ui.js
diff --git a/tobago-theme/tobago-theme-standard/src/main/resources/META-INF/resources/tobago/standard/jquery-ui/1.12.1.custom/jquery-ui.min.js b/tobago-tool/tobago-pack-jquery-ui/src/main/resources/META-INF/resources/tobago/pack/jquery-ui/1.12.1.custom/jquery-ui.min.js
similarity index 100%
rename from tobago-theme/tobago-theme-standard/src/main/resources/META-INF/resources/tobago/standard/jquery-ui/1.12.1.custom/jquery-ui.min.js
rename to tobago-tool/tobago-pack-jquery-ui/src/main/resources/META-INF/resources/tobago/pack/jquery-ui/1.12.1.custom/jquery-ui.min.js
diff --git a/tobago-tool/pom.xml b/tobago-tool/tobago-pack-typeahead/pom.xml
similarity index 69%
copy from tobago-tool/pom.xml
copy to tobago-tool/tobago-pack-typeahead/pom.xml
index 54de8dd..cf2357b 100644
--- a/tobago-tool/pom.xml
+++ b/tobago-tool/tobago-pack-typeahead/pom.xml
@@ -13,23 +13,18 @@
  * 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.e.
+ * 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/maven-v4_0_0.xsd">
+<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/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.apache.myfaces.tobago</groupId>
-    <artifactId>tobago</artifactId>
+    <artifactId>tobago-tool</artifactId>
     <version>4.3.0-SNAPSHOT</version>
   </parent>
-  <packaging>pom</packaging>
-  <name>Tobago Tool</name>
-  <artifactId>tobago-tool</artifactId>
-
-  <modules>
-    <module>tobago-tool-apt</module>
-    <module>tobago-tool-annotation</module>
-    <module>tobago-tool-test</module>
-  </modules>
-
+  <artifactId>tobago-pack-typeahead</artifactId>
+  <packaging>jar</packaging>
+  <name>Tobago Package for Typeahead</name>
+  <description>Contains a patched version of Typehead, because there is no current release</description>
 </project>
diff --git a/tobago-theme/tobago-theme-standard/src/main/resources/META-INF/resources/tobago/standard/typeahead/0.11.1-patched-with-1212/typeahead.js b/tobago-tool/tobago-pack-typeahead/src/main/resources/META-INF/resources/tobago/pack/typeahead/0.11.1-patched-with-1212/typeahead.js
similarity index 100%
rename from tobago-theme/tobago-theme-standard/src/main/resources/META-INF/resources/tobago/standard/typeahead/0.11.1-patched-with-1212/typeahead.js
rename to tobago-tool/tobago-pack-typeahead/src/main/resources/META-INF/resources/tobago/pack/typeahead/0.11.1-patched-with-1212/typeahead.js
diff --git a/tobago-theme/tobago-theme-standard/src/main/resources/META-INF/resources/tobago/standard/typeahead/0.11.1-patched-with-1212/typeahead.min.js b/tobago-tool/tobago-pack-typeahead/src/main/resources/META-INF/resources/tobago/pack/typeahead/0.11.1-patched-with-1212/typeahead.min.js
similarity index 100%
rename from tobago-theme/tobago-theme-standard/src/main/resources/META-INF/resources/tobago/standard/typeahead/0.11.1-patched-with-1212/typeahead.min.js
rename to tobago-tool/tobago-pack-typeahead/src/main/resources/META-INF/resources/tobago/pack/typeahead/0.11.1-patched-with-1212/typeahead.min.js
[myfaces-tobago] 02/02: TOBAGO-1924: Using jars instead of repackaging, when possible * create some self-packaged jars ** jquery-ui (contains widgets only) ** typeahead (patch)

[myfaces-tobago] 02/02: TOBAGO-1924: Using jars instead of repackaging, when possible * create some self-packaged jars jquery-ui (contains widgets only) typeahead (patch)
