You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by gp...@apache.org on 2010/11/19 03:35:43 UTC
svn commit: r1036713 - in /myfaces/extensions/validator/trunk: assembly/
assembly/src/main/assembly/
component-support/generic-support/src/main/java/org/apache/myfaces/extensions/validator/generic/renderkit/
core/src/main/config/ core/src/main/java/org...
Author: gpetracek
Date: Fri Nov 19 02:35:42 2010
New Revision: 1036713
URL: http://svn.apache.org/viewvc?rev=1036713&view=rev
Log:
sync trunk and branches
Removed:
myfaces/extensions/validator/trunk/core/src/main/config/
Modified:
myfaces/extensions/validator/trunk/assembly/pom.xml
myfaces/extensions/validator/trunk/assembly/src/main/assembly/corebin.xml
myfaces/extensions/validator/trunk/assembly/src/main/assembly/coresrc.xml
myfaces/extensions/validator/trunk/component-support/generic-support/src/main/java/org/apache/myfaces/extensions/validator/generic/renderkit/ExtValGenericRenderKit.java
myfaces/extensions/validator/trunk/component-support/generic-support/src/main/java/org/apache/myfaces/extensions/validator/generic/renderkit/ExtValGenericRendererWrapper.java
myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/DefaultExtValCoreConfiguration.java
myfaces/extensions/validator/trunk/parent/pom.xml
myfaces/extensions/validator/trunk/validation-modules/pom.xml
myfaces/extensions/validator/trunk/validation-modules/property-validation/pom.xml
Modified: myfaces/extensions/validator/trunk/assembly/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/trunk/assembly/pom.xml?rev=1036713&r1=1036712&r2=1036713&view=diff
==============================================================================
--- myfaces/extensions/validator/trunk/assembly/pom.xml (original)
+++ myfaces/extensions/validator/trunk/assembly/pom.xml Fri Nov 19 02:35:42 2010
@@ -185,7 +185,7 @@
</exclusion>
</exclusions>
</dependency>
-
+
<dependency>
<groupId>org.apache.myfaces.extensions.validator.component-support-modules</groupId>
<artifactId>myfaces-extval-trinidad-support</artifactId>
Modified: myfaces/extensions/validator/trunk/assembly/src/main/assembly/corebin.xml
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/trunk/assembly/src/main/assembly/corebin.xml?rev=1036713&r1=1036712&r2=1036713&view=diff
==============================================================================
--- myfaces/extensions/validator/trunk/assembly/src/main/assembly/corebin.xml (original)
+++ myfaces/extensions/validator/trunk/assembly/src/main/assembly/corebin.xml Fri Nov 19 02:35:42 2010
@@ -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>
Modified: myfaces/extensions/validator/trunk/assembly/src/main/assembly/coresrc.xml
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/trunk/assembly/src/main/assembly/coresrc.xml?rev=1036713&r1=1036712&r2=1036713&view=diff
==============================================================================
--- myfaces/extensions/validator/trunk/assembly/src/main/assembly/coresrc.xml (original)
+++ myfaces/extensions/validator/trunk/assembly/src/main/assembly/coresrc.xml Fri Nov 19 02:35:42 2010
@@ -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>
Modified: myfaces/extensions/validator/trunk/component-support/generic-support/src/main/java/org/apache/myfaces/extensions/validator/generic/renderkit/ExtValGenericRenderKit.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/trunk/component-support/generic-support/src/main/java/org/apache/myfaces/extensions/validator/generic/renderkit/ExtValGenericRenderKit.java?rev=1036713&r1=1036712&r2=1036713&view=diff
==============================================================================
--- myfaces/extensions/validator/trunk/component-support/generic-support/src/main/java/org/apache/myfaces/extensions/validator/generic/renderkit/ExtValGenericRenderKit.java (original)
+++ myfaces/extensions/validator/trunk/component-support/generic-support/src/main/java/org/apache/myfaces/extensions/validator/generic/renderkit/ExtValGenericRenderKit.java Fri Nov 19 02:35:42 2010
@@ -68,7 +68,15 @@ public class ExtValGenericRenderKit exte
}
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;
Modified: myfaces/extensions/validator/trunk/component-support/generic-support/src/main/java/org/apache/myfaces/extensions/validator/generic/renderkit/ExtValGenericRendererWrapper.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/trunk/component-support/generic-support/src/main/java/org/apache/myfaces/extensions/validator/generic/renderkit/ExtValGenericRendererWrapper.java?rev=1036713&r1=1036712&r2=1036713&view=diff
==============================================================================
--- myfaces/extensions/validator/trunk/component-support/generic-support/src/main/java/org/apache/myfaces/extensions/validator/generic/renderkit/ExtValGenericRendererWrapper.java (original)
+++ myfaces/extensions/validator/trunk/component-support/generic-support/src/main/java/org/apache/myfaces/extensions/validator/generic/renderkit/ExtValGenericRendererWrapper.java Fri Nov 19 02:35:42 2010
@@ -91,7 +91,15 @@ public final class ExtValGenericRenderer
{
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;
}
Modified: myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/DefaultExtValCoreConfiguration.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/DefaultExtValCoreConfiguration.java?rev=1036713&r1=1036712&r2=1036713&view=diff
==============================================================================
--- myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/DefaultExtValCoreConfiguration.java (original)
+++ myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/DefaultExtValCoreConfiguration.java Fri Nov 19 02:35:42 2010
@@ -145,7 +145,7 @@ public class DefaultExtValCoreConfigurat
* 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;
Modified: myfaces/extensions/validator/trunk/parent/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/trunk/parent/pom.xml?rev=1036713&r1=1036712&r2=1036713&view=diff
==============================================================================
--- myfaces/extensions/validator/trunk/parent/pom.xml (original)
+++ myfaces/extensions/validator/trunk/parent/pom.xml Fri Nov 19 02:35:42 2010
@@ -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>
Modified: myfaces/extensions/validator/trunk/validation-modules/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/trunk/validation-modules/pom.xml?rev=1036713&r1=1036712&r2=1036713&view=diff
==============================================================================
--- myfaces/extensions/validator/trunk/validation-modules/pom.xml (original)
+++ myfaces/extensions/validator/trunk/validation-modules/pom.xml Fri Nov 19 02:35:42 2010
@@ -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>
Modified: myfaces/extensions/validator/trunk/validation-modules/property-validation/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/trunk/validation-modules/property-validation/pom.xml?rev=1036713&r1=1036712&r2=1036713&view=diff
==============================================================================
--- myfaces/extensions/validator/trunk/validation-modules/property-validation/pom.xml (original)
+++ myfaces/extensions/validator/trunk/validation-modules/property-validation/pom.xml Fri Nov 19 02:35:42 2010
@@ -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>