sync trunk and branches
git-svn-id: https://svn.apache.org/repos/asf/myfaces/extensions/validator/trunk@1036713 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/assembly/pom.xml b/assembly/pom.xml
index 107033f..9d8c393 100644
--- a/assembly/pom.xml
+++ b/assembly/pom.xml
@@ -185,7 +185,7 @@
</exclusion>
</exclusions>
</dependency>
-
+
<dependency>
<groupId>org.apache.myfaces.extensions.validator.component-support-modules</groupId>
<artifactId>myfaces-extval-trinidad-support</artifactId>
diff --git a/assembly/src/main/assembly/corebin.xml b/assembly/src/main/assembly/corebin.xml
index cb6795b..40bca57 100644
--- a/assembly/src/main/assembly/corebin.xml
+++ b/assembly/src/main/assembly/corebin.xml
@@ -1,3 +1,21 @@
+<!--
+ 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.
+-->
<assembly>
<id>corebin</id>
<formats>
diff --git a/assembly/src/main/assembly/coresrc.xml b/assembly/src/main/assembly/coresrc.xml
index ee186c6..0389f5c 100644
--- a/assembly/src/main/assembly/coresrc.xml
+++ b/assembly/src/main/assembly/coresrc.xml
@@ -1,3 +1,21 @@
+<!--
+ 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.
+-->
<assembly>
<id>coresrc</id>
<formats>
diff --git a/component-support/generic-support/src/main/java/org/apache/myfaces/extensions/validator/generic/renderkit/ExtValGenericRenderKit.java b/component-support/generic-support/src/main/java/org/apache/myfaces/extensions/validator/generic/renderkit/ExtValGenericRenderKit.java
index 7dbed7b..769c581 100644
--- a/component-support/generic-support/src/main/java/org/apache/myfaces/extensions/validator/generic/renderkit/ExtValGenericRenderKit.java
+++ b/component-support/generic-support/src/main/java/org/apache/myfaces/extensions/validator/generic/renderkit/ExtValGenericRenderKit.java
@@ -68,7 +68,15 @@
}
else
{
- return proxy.invokeSuper(obj, args);
+ try
+ {
+ method.setAccessible(true);
+ return method.invoke(obj, args);
+ }
+ catch (Throwable t)
+ {
+ return proxy.invokeSuper(obj, args);
+ }
}
return null;
diff --git a/component-support/generic-support/src/main/java/org/apache/myfaces/extensions/validator/generic/renderkit/ExtValGenericRendererWrapper.java b/component-support/generic-support/src/main/java/org/apache/myfaces/extensions/validator/generic/renderkit/ExtValGenericRendererWrapper.java
index f4a2efd..96b08f2 100644
--- a/component-support/generic-support/src/main/java/org/apache/myfaces/extensions/validator/generic/renderkit/ExtValGenericRendererWrapper.java
+++ b/component-support/generic-support/src/main/java/org/apache/myfaces/extensions/validator/generic/renderkit/ExtValGenericRendererWrapper.java
@@ -91,7 +91,15 @@
{
logger.finest("method " + method.getName() + " called without rendering-interceptors");
- return proxy.invokeSuper(obj, args);
+ try
+ {
+ method.setAccessible(true);
+ return method.invoke(this.wrapped, args);
+ }
+ catch (Throwable t)
+ {
+ return proxy.invokeSuper(obj, args);
+ }
}
return null;
}
diff --git a/core/src/main/config/faces-config.xml b/core/src/main/config/faces-config.xml
deleted file mode 100644
index abd4dc4..0000000
--- a/core/src/main/config/faces-config.xml
+++ /dev/null
@@ -1,31 +0,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.
--->
-
-<faces-config xmlns="http://java.sun.com/xml/ns/javaee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-facesconfig_1_2.xsd"
- version="1.2">
- <factory>
- <render-kit-factory>org.apache.myfaces.extensions.validator.core.renderkit.ExtValRenderKitFactory</render-kit-factory>
- </factory>
-
- <lifecycle>
- <phase-listener>org.apache.myfaces.extensions.validator.core.startup.ExtValStartupListener</phase-listener>
- </lifecycle>
-</faces-config>
\ No newline at end of file
diff --git a/core/src/main/java/org/apache/myfaces/extensions/validator/core/DefaultExtValCoreConfiguration.java b/core/src/main/java/org/apache/myfaces/extensions/validator/core/DefaultExtValCoreConfiguration.java
index af08b46..4713246 100644
--- a/core/src/main/java/org/apache/myfaces/extensions/validator/core/DefaultExtValCoreConfiguration.java
+++ b/core/src/main/java/org/apache/myfaces/extensions/validator/core/DefaultExtValCoreConfiguration.java
@@ -145,7 +145,7 @@
* value is specified, the {@link DefaultProxyHelper} is returned.
*/
@ToDo(value = Priority.MEDIUM, description = "The tryToInstantiateClassForName can return a null value which isn't "
- + "handled correctly afyterwards. We should throw an exception like in rendererProxy method.")
+ + "handled correctly afterwards. We should throw an exception like in rendererProxy method.")
public ProxyHelper proxyHelper()
{
String customProxyHelperClassName = WebXmlParameter.CUSTOM_PROXY_HELPER;
diff --git a/parent/pom.xml b/parent/pom.xml
index 1758621..a13098c 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -179,8 +179,8 @@
<repository>
<id>maven2-repository.dev.java.net</id>
<name>Java.net Repository for Maven</name>
- <url>http://download.java.net/maven/1/</url>
- <layout>legacy</layout>
+ <url>http://download.java.net/maven/2/</url>
+ <layout>default</layout>
</repository>
</repositories>
diff --git a/validation-modules/pom.xml b/validation-modules/pom.xml
index d01e64b..d49d9f7 100644
--- a/validation-modules/pom.xml
+++ b/validation-modules/pom.xml
@@ -37,9 +37,9 @@
</parent>
<scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/myfaces/extensions/validator/test/validation-modules</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/myfaces/extensions/validator/test/validation-modules</developerConnection>
- <url>http://svn.apache.org/viewvc/myfaces/extensions/validator/test/validation-modules</url>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/myfaces/extensions/validator/trunk/validation-modules</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/myfaces/extensions/validator/trunk/validation-modules</developerConnection>
+ <url>http://svn.apache.org/viewvc/myfaces/extensions/validator/trunk/validation-modules</url>
</scm>
<modules>
diff --git a/validation-modules/property-validation/pom.xml b/validation-modules/property-validation/pom.xml
index 6620444..3453204 100644
--- a/validation-modules/property-validation/pom.xml
+++ b/validation-modules/property-validation/pom.xml
@@ -102,6 +102,17 @@
</dependencies>
<build>
+ <resources>
+ <resource>
+ <directory>src/main/resources</directory>
+ </resource>
+ <resource>
+ <directory>src/main/java</directory>
+ <includes>
+ <include>**/*properties</include>
+ </includes>
+ </resource>
+ </resources>
<plugins>
<plugin>
<inherited>true</inherited>
