myfaces-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From lof...@apache.org
Subject [myfaces-tobago] 02/04: Revert "TOBAGO-1924: Using jars instead of repackaging, when possible * create some self-packaged jars ** jquery-ui (contains widgets only) ** typeahead (patch)"
Date Thu, 20 Sep 2018 13:42:47 GMT
This is an automated email from the ASF dual-hosted git repository.

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

commit 807ddb6feb28d99150c768c3797ad5e588f3aea8
Author: Udo Schnurpfeil <lofwyr@apache.org>
AuthorDate: Thu Sep 20 15:33:31 2018 +0200

    Revert "TOBAGO-1924: Using jars instead of repackaging, when possible * create some self-packaged
jars ** jquery-ui (contains widgets only) ** typeahead (patch)"
    
    This reverts commit 9cb2097
---
 tobago-theme/tobago-theme-standard/pom.xml         | 10 --------
 .../standard}/jquery-ui/1.12.1.custom/jquery-ui.js |  0
 .../jquery-ui/1.12.1.custom/jquery-ui.min.js       |  0
 .../0.11.1-patched-with-1212/typeahead.js          |  0
 .../0.11.1-patched-with-1212/typeahead.min.js      |  0
 tobago-tool/pom.xml                                |  2 --
 tobago-tool/tobago-pack-jquery-ui/pom.xml          | 30 ----------------------
 tobago-tool/tobago-pack-typeahead/pom.xml          | 30 ----------------------
 8 files changed, 72 deletions(-)

diff --git a/tobago-theme/tobago-theme-standard/pom.xml b/tobago-theme/tobago-theme-standard/pom.xml
index 562ab37..0568b41 100644
--- a/tobago-theme/tobago-theme-standard/pom.xml
+++ b/tobago-theme/tobago-theme-standard/pom.xml
@@ -140,16 +140,6 @@
       <version>2.22.2</version>
     </dependency>
     <dependency>
-      <groupId>org.apache.myfaces.tobago</groupId>
-        <artifactId>tobago-pack-jquery-ui</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-tool/tobago-pack-jquery-ui/src/main/resources/META-INF/resources/tobago/pack/jquery-ui/1.12.1.custom/jquery-ui.js
b/tobago-theme/tobago-theme-standard/src/main/resources/META-INF/resources/tobago/standard/jquery-ui/1.12.1.custom/jquery-ui.js
similarity index 100%
rename from tobago-tool/tobago-pack-jquery-ui/src/main/resources/META-INF/resources/tobago/pack/jquery-ui/1.12.1.custom/jquery-ui.js
rename to tobago-theme/tobago-theme-standard/src/main/resources/META-INF/resources/tobago/standard/jquery-ui/1.12.1.custom/jquery-ui.js
diff --git a/tobago-tool/tobago-pack-jquery-ui/src/main/resources/META-INF/resources/tobago/pack/jquery-ui/1.12.1.custom/jquery-ui.min.js
b/tobago-theme/tobago-theme-standard/src/main/resources/META-INF/resources/tobago/standard/jquery-ui/1.12.1.custom/jquery-ui.min.js
similarity index 100%
rename from tobago-tool/tobago-pack-jquery-ui/src/main/resources/META-INF/resources/tobago/pack/jquery-ui/1.12.1.custom/jquery-ui.min.js
rename to tobago-theme/tobago-theme-standard/src/main/resources/META-INF/resources/tobago/standard/jquery-ui/1.12.1.custom/jquery-ui.min.js
diff --git a/tobago-tool/tobago-pack-typeahead/src/main/resources/META-INF/resources/tobago/pack/typeahead/0.11.1-patched-with-1212/typeahead.js
b/tobago-theme/tobago-theme-standard/src/main/resources/META-INF/resources/tobago/standard/typeahead/0.11.1-patched-with-1212/typeahead.js
similarity index 100%
rename from tobago-tool/tobago-pack-typeahead/src/main/resources/META-INF/resources/tobago/pack/typeahead/0.11.1-patched-with-1212/typeahead.js
rename to tobago-theme/tobago-theme-standard/src/main/resources/META-INF/resources/tobago/standard/typeahead/0.11.1-patched-with-1212/typeahead.js
diff --git a/tobago-tool/tobago-pack-typeahead/src/main/resources/META-INF/resources/tobago/pack/typeahead/0.11.1-patched-with-1212/typeahead.min.js
b/tobago-theme/tobago-theme-standard/src/main/resources/META-INF/resources/tobago/standard/typeahead/0.11.1-patched-with-1212/typeahead.min.js
similarity index 100%
rename from tobago-tool/tobago-pack-typeahead/src/main/resources/META-INF/resources/tobago/pack/typeahead/0.11.1-patched-with-1212/typeahead.min.js
rename to tobago-theme/tobago-theme-standard/src/main/resources/META-INF/resources/tobago/standard/typeahead/0.11.1-patched-with-1212/typeahead.min.js
diff --git a/tobago-tool/pom.xml b/tobago-tool/pom.xml
index 2d032ad..54de8dd 100644
--- a/tobago-tool/pom.xml
+++ b/tobago-tool/pom.xml
@@ -27,8 +27,6 @@
   <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/tobago-pack-jquery-ui/pom.xml b/tobago-tool/tobago-pack-jquery-ui/pom.xml
deleted file mode 100644
index d213349..0000000
--- a/tobago-tool/tobago-pack-jquery-ui/pom.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?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/maven-v4_0_0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>org.apache.myfaces.tobago</groupId>
-    <artifactId>tobago-tool</artifactId>
-    <version>4.3.0-SNAPSHOT</version>
-  </parent>
-  <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-tool/tobago-pack-typeahead/pom.xml b/tobago-tool/tobago-pack-typeahead/pom.xml
deleted file mode 100644
index cf2357b..0000000
--- a/tobago-tool/tobago-pack-typeahead/pom.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?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/maven-v4_0_0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>org.apache.myfaces.tobago</groupId>
-    <artifactId>tobago-tool</artifactId>
-    <version>4.3.0-SNAPSHOT</version>
-  </parent>
-  <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>


Mime
View raw message