You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@netbeans.apache.org by ma...@apache.org on 2018/09/07 18:34:42 UTC
[incubator-netbeans] 01/02: [NETBEANS-1074] Module Review web.jsf12
+ web.jsf12ri
This is an automated email from the ASF dual-hosted git repository.
matthiasblaesing pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-netbeans.git
commit c5c2b738cd5f9dadb837ab973564b96590370073
Author: Matthias Bläsing <mb...@doppel-helix.eu>
AuthorDate: Thu Sep 6 17:15:58 2018 +0200
[NETBEANS-1074] Module Review web.jsf12 + web.jsf12ri
---
web.jsf12/external/jsf-api-1.2_05-license.txt | 1 -
web.jsf12/nbproject/project.properties | 2 +-
web.jsf12/nbproject/project.xml | 3 +-
.../external/binaries-list | 4 +--
.../external/jsf-impl-1.2_05-license.txt | 5 ++-
web.jsf12ri/nbproject/project.properties | 16 +--------
web.jsf12ri/nbproject/project.xml | 11 +-----
.../src/org/netbeans/modules/web/jsf12ri/jsf12.xml | 10 ++----
.../org/netbeans/modules/web/jsf12ri/jsf12ri.xml | 42 ----------------------
9 files changed, 11 insertions(+), 83 deletions(-)
diff --git a/web.jsf12/external/jsf-api-1.2_05-license.txt b/web.jsf12/external/jsf-api-1.2_05-license.txt
index e0be1a9..4452bc1 100644
--- a/web.jsf12/external/jsf-api-1.2_05-license.txt
+++ b/web.jsf12/external/jsf-api-1.2_05-license.txt
@@ -3,7 +3,6 @@ Version: 1.2_05
License: CDDL-1.0
Description: Java Server Faces
Origin: http://java.sun.com/javaee/javaserverfaces/download.html
-OSR: 3743
COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0
diff --git a/web.jsf12/nbproject/project.properties b/web.jsf12/nbproject/project.properties
index d92369b..254f212 100644
--- a/web.jsf12/nbproject/project.properties
+++ b/web.jsf12/nbproject/project.properties
@@ -15,5 +15,5 @@
# specific language governing permissions and limitations
# under the License.
-release.external/jsf-api-1.2_05.jar=modules/ext/jsf-1_2/jsf-api-1.2_05.jar
+release.external/jsf-api-1.2_05.jar=modules/ext/jsf-1_2/jsf-api.jar
spec.version.base=1.28.0
diff --git a/web.jsf12/nbproject/project.xml b/web.jsf12/nbproject/project.xml
index 84d497f..53fb0a1 100644
--- a/web.jsf12/nbproject/project.xml
+++ b/web.jsf12/nbproject/project.xml
@@ -39,7 +39,8 @@
<subpackages>javax.faces</subpackages>
</public-packages>
<class-path-extension>
- <runtime-relative-path>ext/jsf-1_2/jsf-api-1.2_05.jar</runtime-relative-path>
+ <runtime-relative-path>ext/jsf-1_2/jsf-api.jar</runtime-relative-path>
+ <binary-origin>external/jsf-api-1.2_05.jar</binary-origin>
</class-path-extension>
</data>
</configuration>
diff --git a/web.jsf12/nbproject/project.properties b/web.jsf12ri/external/binaries-list
similarity index 88%
copy from web.jsf12/nbproject/project.properties
copy to web.jsf12ri/external/binaries-list
index d92369b..08c2513 100644
--- a/web.jsf12/nbproject/project.properties
+++ b/web.jsf12ri/external/binaries-list
@@ -15,5 +15,5 @@
# specific language governing permissions and limitations
# under the License.
-release.external/jsf-api-1.2_05.jar=modules/ext/jsf-1_2/jsf-api-1.2_05.jar
-spec.version.base=1.28.0
+909BD7A44E88905187DAE1E8B880486206C8893F javax.faces:jsf-impl:1.2_05
+
diff --git a/web.jsf12/external/jsf-api-1.2_05-license.txt b/web.jsf12ri/external/jsf-impl-1.2_05-license.txt
similarity index 99%
copy from web.jsf12/external/jsf-api-1.2_05-license.txt
copy to web.jsf12ri/external/jsf-impl-1.2_05-license.txt
index e0be1a9..98a5d28 100644
--- a/web.jsf12/external/jsf-api-1.2_05-license.txt
+++ b/web.jsf12ri/external/jsf-impl-1.2_05-license.txt
@@ -1,9 +1,8 @@
-Name: Java Server Faces
+Name: Java Server Faces - Reference Implementation
Version: 1.2_05
License: CDDL-1.0
-Description: Java Server Faces
+Description: Java Server Faces - Reference Implementation
Origin: http://java.sun.com/javaee/javaserverfaces/download.html
-OSR: 3743
COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0
diff --git a/web.jsf12ri/nbproject/project.properties b/web.jsf12ri/nbproject/project.properties
index 6b5e55b..b7fbb5c 100644
--- a/web.jsf12ri/nbproject/project.properties
+++ b/web.jsf12ri/nbproject/project.properties
@@ -15,21 +15,7 @@
# specific language governing permissions and limitations
# under the License.
-# Hidden class found: com.sun.org.apache.commons.collections.CursorableLinkedList$Listable in method protected void com.sun.org.apache.commons.collections.CursorableLinkedList$Cursor.listableRemoved(com.sun.org.apache.commons.collections.CursorableLinkedList$Listable) in class com.sun.org.apache.commons.collections.CursorableLinkedList$Cursor
-# Hidden class found: com.sun.org.apache.commons.collections.CursorableLinkedList$Listable in method protected void com.sun.org.apache.commons.collections.CursorableLinkedList.broadcastListableInserted(com.sun.org.apache.commons.collections.CursorableLinkedList$Listable) in class com.sun.org.apache.commons.collections.CursorableLinkedList
-# Hidden class found: com.sun.org.apache.commons.collections.CursorableLinkedList$Listable in method protected void com.sun.org.apache.commons.collections.CursorableLinkedList$Cursor.listableChanged(com.sun.org.apache.commons.collections.CursorableLinkedList$Listable) in class com.sun.org.apache.commons.collections.CursorableLinkedList$Cursor
-# Hidden class found: com.sun.org.apache.commons.collections.CursorableLinkedList$Listable in method protected java.io.Serializable com.sun.org.apache.commons.collections.CursorableLinkedList.insertListable(com.sun.org.apache.commons.collections.CursorableLinkedList$Listable,com.sun.org.apache.commons.collections.CursorableLinkedList$Listable,java.lang.Object) in class com.sun.org.apache.commons.collections.CursorableLinkedList
-# Hidden class found: com.sun.org.apache.commons.collections.CursorableLinkedList$Listable in method protected void com.sun.org.apache.commons.collections.CursorableLinkedList$Cursor.listableInserted(com.sun.org.apache.commons.collections.CursorableLinkedList$Listable) in class com.sun.org.apache.commons.collections.CursorableLinkedList$Cursor
-# Hidden class found: com.sun.org.apache.commons.collections.CursorableLinkedList$Listable in method protected void com.sun.org.apache.commons.collections.CursorableLinkedList.broadcastListableRemoved(com.sun.org.apache.commons.collections.CursorableLinkedList$Listable) in class com.sun.org.apache.commons.collections.CursorableLinkedList
-# Hidden class found: com.sun.faces.lifecycle.LifecycleFactoryImpl$LifecycleWrapper in field protected java.util.HashMap<java.lang.String,com.sun.faces.lifecycle.LifecycleFactoryImpl$LifecycleWrapper> com.sun.faces.lifecycle.LifecycleFactoryImpl.lifecycleMap in class com.sun.faces.lifecycle.LifecycleFactoryImpl
-# Hidden class found: com.sun.org.apache.commons.collections.CursorableLinkedList$Listable in method protected void com.sun.org.apache.commons.collections.CursorableLinkedList.broadcastListableChanged(com.sun.org.apache.commons.collections.CursorableLinkedList$Listable) in class com.sun.org.apache.commons.collections.CursorableLinkedList
-# Hidden class found: com.sun.org.apache.commons.collections.CursorableLinkedList$Listable in method protected void com.sun.org.apache.commons.collections.CursorableLinkedList.removeListable(com.sun.org.apache.commons.collections.CursorableLinkedList$Listable) in class com.sun.org.apache.commons.collections.CursorableLinkedList
-
-release.../web.jsf12/external/jsf-1.2.zip!/jsf-1.2/commons-beanutils.jar=modules/ext/jsf-1_2/commons-beanutils.jar
-release.../web.jsf12/external/jsf-1.2.zip!/jsf-1.2/commons-collections.jar=modules/ext/jsf-1_2/commons-collections.jar
-release.../web.jsf12/external/jsf-1.2.zip!/jsf-1.2/commons-digester.jar=modules/ext/jsf-1_2/commons-digester.jar
-release.../web.jsf12/external/jsf-1.2.zip!/jsf-1.2/commons-logging.jar=modules/ext/jsf-1_2/commons-logging.jar
-release.../web.jsf12/external/jsf-1.2.zip!/jsf-1.2/jsf-impl.jar=modules/ext/jsf-1_2/jsf-impl.jar
+release.external/jsf-impl-1.2_05.jar=modules/ext/jsf-1_2/jsf-impl.jar
sigtest.gen.fail.on.error=false
spec.version.base=1.28.0
diff --git a/web.jsf12ri/nbproject/project.xml b/web.jsf12ri/nbproject/project.xml
index e514c13..96a9dba 100644
--- a/web.jsf12ri/nbproject/project.xml
+++ b/web.jsf12ri/nbproject/project.xml
@@ -79,19 +79,10 @@
<package>com.sun.faces.taglib.jsf_core</package>
<package>com.sun.faces.util</package>
<package>com.sun.faces.vendor</package>
- <package>com.sun.org.apache.commons.beanutils</package>
- <package>com.sun.org.apache.commons.beanutils.converters</package>
- <package>com.sun.org.apache.commons.beanutils.locale</package>
- <package>com.sun.org.apache.commons.beanutils.locale.converters</package>
- <package>com.sun.org.apache.commons.collections</package>
- <package>com.sun.org.apache.commons.collections.comparators</package>
- <package>com.sun.org.apache.commons.collections.iterators</package>
- <package>com.sun.org.apache.commons.digester</package>
- <package>com.sun.org.apache.commons.digester.rss</package>
- <package>com.sun.org.apache.commons.digester.xmlrules</package>
</friend-packages>
<class-path-extension>
<runtime-relative-path>ext/jsf-1_2/jsf-impl.jar</runtime-relative-path>
+ <binary-origin>external/jsf-impl-1.2_05.jar</binary-origin>
</class-path-extension>
</data>
</configuration>
diff --git a/web.jsf12ri/src/org/netbeans/modules/web/jsf12ri/jsf12.xml b/web.jsf12ri/src/org/netbeans/modules/web/jsf12ri/jsf12.xml
index b81ee0f..1c6bcc3 100644
--- a/web.jsf12ri/src/org/netbeans/modules/web/jsf12ri/jsf12.xml
+++ b/web.jsf12ri/src/org/netbeans/modules/web/jsf12ri/jsf12.xml
@@ -26,10 +26,6 @@
<localizing-bundle>org/netbeans/modules/web/jsf12/Bundle</localizing-bundle>
<volume>
<type>classpath</type>
- <resource>jar:nbinst://org.netbeans.modules.web.jsf12ri/modules/ext/jsf-1_2/commons-beanutils.jar!/</resource>
- <resource>jar:nbinst://org.netbeans.modules.web.jsf12ri/modules/ext/jsf-1_2/commons-collections.jar!/</resource>
- <resource>jar:nbinst://org.netbeans.modules.web.jsf12ri/modules/ext/jsf-1_2/commons-digester.jar!/</resource>
- <resource>jar:nbinst://org.netbeans.modules.web.jsf12ri/modules/ext/jsf-1_2/commons-logging.jar!/</resource>
<resource>jar:nbinst://org.netbeans.modules.web.jsf12/modules/ext/jsf-1_2/jsf-api.jar!/</resource>
<resource>jar:nbinst://org.netbeans.modules.web.jsf12ri/modules/ext/jsf-1_2/jsf-impl.jar!/</resource>
</volume>
@@ -38,13 +34,11 @@
<resource>jar:nbinst://org.netbeans.modules.j2ee.platform/docs/javaee-doc-api.jar!/</resource>
</volume>
<properties>
- <!-- please check with mkleint@netbeans.org before/after updating this or "classpath" section -->
<property>
<name>maven-dependencies</name>
<value>
- javax.faces:jsf-api:1.2_04-p01:jar
- javax.faces:jsf-impl:1.2_04-p01:jar
- commons-digester:commons-digester:1.5:jar
+ javax.faces:jsf-api:1.2_05:jar
+ javax.faces:jsf-impl:1.2_05:jar
</value>
</property>
</properties>
diff --git a/web.jsf12ri/src/org/netbeans/modules/web/jsf12ri/jsf12ri.xml b/web.jsf12ri/src/org/netbeans/modules/web/jsf12ri/jsf12ri.xml
deleted file mode 100644
index 3b13284..0000000
--- a/web.jsf12ri/src/org/netbeans/modules/web/jsf12ri/jsf12ri.xml
+++ /dev/null
@@ -1,42 +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.
-
--->
-<library version="3.0" xmlns="http://www.netbeans.org/ns/library-declaration/3">
- <name>jsf12ri</name>
- <type>j2se</type>
- <localizing-bundle>org/netbeans/modules/web/jsf12ri/Bundle</localizing-bundle>
- <volume>
- <type>classpath</type>
- <resource>jar:nbinst://org.netbeans.modules.web.jsf12ri/modules/ext/jsf-1_2/jsf-impl.jar!/</resource>
- </volume>
- <volume>
- <type>javadoc</type>
- <resource>jar:nbinst:///docs/javaee-doc-api.jar!/</resource>
- </volume>
- <properties>
- <!-- please check with mkleint@netbeans.org before/after updating this or "classpath" section -->
- <property>
- <name>maven-dependencies</name>
- <value>javax.faces:jsf-impl:1.2_04-p01:jar</value>
- </property>
- </properties>
-</library>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@netbeans.apache.org
For additional commands, e-mail: commits-help@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists