You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by Konstantin Kolinko <kn...@gmail.com> on 2011/10/25 13:06:19 UTC

Re: svn commit: r1188313 [1/5] - in /tomcat/trunk/java: javax/el/ org/apache/catalina/authenticator/ org/apache/catalina/connector/ org/apache/catalina/core/ org/apache/catalina/deploy/ org/apache/catalina/ha/session/ org/apache/catalina/ha/tcp/ org/

http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/deploy/LocalStrings.properties?r1=1188313&r2=1188312&pathrev=1188313

The new value of webXml.mergeConflictOrder is wrong, it is
concatenation of two values.

It is the only glitch that I noted.

Is your tool able to find properties that are not mentioned in
*.properties files?

Best regards,
Konstantin Kolinko

2011/10/24  <ma...@apache.org>:
> Author: markt
> Date: Mon Oct 24 19:18:39 2011
> New Revision: 1188313
>
> URL: http://svn.apache.org/viewvc?rev=1188313&view=rev
> Log:
> Remove unused properties
>
> Removed:
>    tomcat/trunk/java/org/apache/catalina/tribes/membership/LocalStrings.properties
>    tomcat/trunk/java/org/apache/catalina/tribes/membership/LocalStrings_es.properties
> Modified:
>    tomcat/trunk/java/javax/el/LocalStrings.properties
>    tomcat/trunk/java/javax/el/LocalStrings_es.properties
>    tomcat/trunk/java/org/apache/catalina/authenticator/LocalStrings.properties
>    tomcat/trunk/java/org/apache/catalina/authenticator/LocalStrings_es.properties
>    tomcat/trunk/java/org/apache/catalina/authenticator/LocalStrings_fr.properties
>    tomcat/trunk/java/org/apache/catalina/authenticator/LocalStrings_ja.properties
>    tomcat/trunk/java/org/apache/catalina/connector/LocalStrings.properties
>    tomcat/trunk/java/org/apache/catalina/connector/LocalStrings_es.properties
>    tomcat/trunk/java/org/apache/catalina/connector/LocalStrings_fr.properties
>    tomcat/trunk/java/org/apache/catalina/connector/LocalStrings_ja.properties
>    tomcat/trunk/java/org/apache/catalina/core/LocalStrings.properties
>    tomcat/trunk/java/org/apache/catalina/core/LocalStrings_es.properties
>    tomcat/trunk/java/org/apache/catalina/core/LocalStrings_fr.properties
>    tomcat/trunk/java/org/apache/catalina/core/LocalStrings_ja.properties
>    tomcat/trunk/java/org/apache/catalina/deploy/LocalStrings.properties
>    tomcat/trunk/java/org/apache/catalina/ha/session/LocalStrings.properties
>    tomcat/trunk/java/org/apache/catalina/ha/session/LocalStrings_es.properties
>    tomcat/trunk/java/org/apache/catalina/ha/tcp/LocalStrings.properties
>    tomcat/trunk/java/org/apache/catalina/ha/tcp/LocalStrings_es.properties
>    tomcat/trunk/java/org/apache/catalina/loader/LocalStrings.properties
>    tomcat/trunk/java/org/apache/catalina/loader/LocalStrings_es.properties
>    tomcat/trunk/java/org/apache/catalina/loader/LocalStrings_fr.properties
>    tomcat/trunk/java/org/apache/catalina/loader/LocalStrings_ja.properties
>    tomcat/trunk/java/org/apache/catalina/manager/LocalStrings.properties
>    tomcat/trunk/java/org/apache/catalina/manager/LocalStrings_de.properties
>    tomcat/trunk/java/org/apache/catalina/manager/LocalStrings_es.properties
>    tomcat/trunk/java/org/apache/catalina/manager/LocalStrings_fr.properties
>    tomcat/trunk/java/org/apache/catalina/manager/LocalStrings_ja.properties
>    tomcat/trunk/java/org/apache/catalina/realm/LocalStrings.properties
>    tomcat/trunk/java/org/apache/catalina/realm/LocalStrings_es.properties
>    tomcat/trunk/java/org/apache/catalina/realm/LocalStrings_fr.properties
>    tomcat/trunk/java/org/apache/catalina/realm/LocalStrings_ja.properties
>    tomcat/trunk/java/org/apache/catalina/servlets/LocalStrings.properties
>    tomcat/trunk/java/org/apache/catalina/servlets/LocalStrings_es.properties
>    tomcat/trunk/java/org/apache/catalina/servlets/LocalStrings_fr.properties
>    tomcat/trunk/java/org/apache/catalina/servlets/LocalStrings_ja.properties
>    tomcat/trunk/java/org/apache/catalina/session/LocalStrings.properties
>    tomcat/trunk/java/org/apache/catalina/session/LocalStrings_es.properties
>    tomcat/trunk/java/org/apache/catalina/session/LocalStrings_fr.properties
>    tomcat/trunk/java/org/apache/catalina/session/LocalStrings_ja.properties
>    tomcat/trunk/java/org/apache/catalina/startup/LocalStrings.properties
>    tomcat/trunk/java/org/apache/catalina/startup/LocalStrings_es.properties
>    tomcat/trunk/java/org/apache/catalina/startup/LocalStrings_fr.properties
>    tomcat/trunk/java/org/apache/catalina/startup/LocalStrings_ja.properties
>    tomcat/trunk/java/org/apache/catalina/tribes/transport/LocalStrings.properties
>    tomcat/trunk/java/org/apache/catalina/tribes/transport/LocalStrings_es.properties
>    tomcat/trunk/java/org/apache/catalina/users/LocalStrings.properties
>    tomcat/trunk/java/org/apache/catalina/users/LocalStrings_es.properties
>    tomcat/trunk/java/org/apache/catalina/users/LocalStrings_fr.properties
>    tomcat/trunk/java/org/apache/catalina/users/LocalStrings_ja.properties
>    tomcat/trunk/java/org/apache/catalina/util/LocalStrings.properties
>    tomcat/trunk/java/org/apache/catalina/valves/LocalStrings.properties
>    tomcat/trunk/java/org/apache/catalina/valves/LocalStrings_es.properties
>    tomcat/trunk/java/org/apache/catalina/valves/LocalStrings_fr.properties
>    tomcat/trunk/java/org/apache/catalina/valves/LocalStrings_ja.properties
>    tomcat/trunk/java/org/apache/coyote/ajp/LocalStrings.properties
>    tomcat/trunk/java/org/apache/coyote/ajp/LocalStrings_es.properties
>    tomcat/trunk/java/org/apache/coyote/http11/LocalStrings.properties
>    tomcat/trunk/java/org/apache/coyote/http11/LocalStrings_es.properties
>    tomcat/trunk/java/org/apache/coyote/http11/LocalStrings_fr.properties
>    tomcat/trunk/java/org/apache/coyote/http11/LocalStrings_ja.properties
>    tomcat/trunk/java/org/apache/el/Messages.properties
>    tomcat/trunk/java/org/apache/el/Messages_es.properties
>    tomcat/trunk/java/org/apache/jasper/resources/LocalStrings.properties
>    tomcat/trunk/java/org/apache/jasper/resources/LocalStrings_es.properties
>    tomcat/trunk/java/org/apache/jasper/resources/LocalStrings_fr.properties
>    tomcat/trunk/java/org/apache/jasper/resources/LocalStrings_ja.properties
>    tomcat/trunk/java/org/apache/naming/resources/LocalStrings.properties
>    tomcat/trunk/java/org/apache/naming/resources/LocalStrings_es.properties
>    tomcat/trunk/java/org/apache/naming/resources/LocalStrings_fr.properties
>    tomcat/trunk/java/org/apache/naming/resources/LocalStrings_ja.properties
>    tomcat/trunk/java/org/apache/tomcat/util/net/res/LocalStrings.properties
>    tomcat/trunk/java/org/apache/tomcat/util/net/res/LocalStrings_es.properties
>    tomcat/trunk/java/org/apache/tomcat/util/net/res/LocalStrings_fr.properties
>    tomcat/trunk/java/org/apache/tomcat/util/net/res/LocalStrings_ja.properties

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org


Re: svn commit: r1188313 [1/5] - in /tomcat/trunk/java: javax/el/ org/apache/catalina/authenticator/ org/apache/catalina/connector/ org/apache/catalina/core/ org/apache/catalina/deploy/ org/apache/catalina/ha/session/ org/apache/catalina/ha/tcp/ org/

Posted by Mark Thomas <ma...@apache.org>.
On 25/10/2011 12:06, Konstantin Kolinko wrote:
> http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/deploy/LocalStrings.properties?r1=1188313&r2=1188312&pathrev=1188313
> 
> The new value of webXml.mergeConflictOrder is wrong, it is
> concatenation of two values.
> 
> It is the only glitch that I noted.

Thanks. Fixed.

> Is your tool able to find properties that are not mentioned in
> *.properties files?

IntelliJ doesn't appear to be able to do that. JInto can. I may
re-install that and work my way through but as I said before it is
rather clunky. I'm still looking for alternative options.

Mark

> 
> Best regards,
> Konstantin Kolinko
> 
> 2011/10/24  <ma...@apache.org>:
>> Author: markt
>> Date: Mon Oct 24 19:18:39 2011
>> New Revision: 1188313
>>
>> URL: http://svn.apache.org/viewvc?rev=1188313&view=rev
>> Log:
>> Remove unused properties
>>
>> Removed:
>>    tomcat/trunk/java/org/apache/catalina/tribes/membership/LocalStrings.properties
>>    tomcat/trunk/java/org/apache/catalina/tribes/membership/LocalStrings_es.properties
>> Modified:
>>    tomcat/trunk/java/javax/el/LocalStrings.properties
>>    tomcat/trunk/java/javax/el/LocalStrings_es.properties
>>    tomcat/trunk/java/org/apache/catalina/authenticator/LocalStrings.properties
>>    tomcat/trunk/java/org/apache/catalina/authenticator/LocalStrings_es.properties
>>    tomcat/trunk/java/org/apache/catalina/authenticator/LocalStrings_fr.properties
>>    tomcat/trunk/java/org/apache/catalina/authenticator/LocalStrings_ja.properties
>>    tomcat/trunk/java/org/apache/catalina/connector/LocalStrings.properties
>>    tomcat/trunk/java/org/apache/catalina/connector/LocalStrings_es.properties
>>    tomcat/trunk/java/org/apache/catalina/connector/LocalStrings_fr.properties
>>    tomcat/trunk/java/org/apache/catalina/connector/LocalStrings_ja.properties
>>    tomcat/trunk/java/org/apache/catalina/core/LocalStrings.properties
>>    tomcat/trunk/java/org/apache/catalina/core/LocalStrings_es.properties
>>    tomcat/trunk/java/org/apache/catalina/core/LocalStrings_fr.properties
>>    tomcat/trunk/java/org/apache/catalina/core/LocalStrings_ja.properties
>>    tomcat/trunk/java/org/apache/catalina/deploy/LocalStrings.properties
>>    tomcat/trunk/java/org/apache/catalina/ha/session/LocalStrings.properties
>>    tomcat/trunk/java/org/apache/catalina/ha/session/LocalStrings_es.properties
>>    tomcat/trunk/java/org/apache/catalina/ha/tcp/LocalStrings.properties
>>    tomcat/trunk/java/org/apache/catalina/ha/tcp/LocalStrings_es.properties
>>    tomcat/trunk/java/org/apache/catalina/loader/LocalStrings.properties
>>    tomcat/trunk/java/org/apache/catalina/loader/LocalStrings_es.properties
>>    tomcat/trunk/java/org/apache/catalina/loader/LocalStrings_fr.properties
>>    tomcat/trunk/java/org/apache/catalina/loader/LocalStrings_ja.properties
>>    tomcat/trunk/java/org/apache/catalina/manager/LocalStrings.properties
>>    tomcat/trunk/java/org/apache/catalina/manager/LocalStrings_de.properties
>>    tomcat/trunk/java/org/apache/catalina/manager/LocalStrings_es.properties
>>    tomcat/trunk/java/org/apache/catalina/manager/LocalStrings_fr.properties
>>    tomcat/trunk/java/org/apache/catalina/manager/LocalStrings_ja.properties
>>    tomcat/trunk/java/org/apache/catalina/realm/LocalStrings.properties
>>    tomcat/trunk/java/org/apache/catalina/realm/LocalStrings_es.properties
>>    tomcat/trunk/java/org/apache/catalina/realm/LocalStrings_fr.properties
>>    tomcat/trunk/java/org/apache/catalina/realm/LocalStrings_ja.properties
>>    tomcat/trunk/java/org/apache/catalina/servlets/LocalStrings.properties
>>    tomcat/trunk/java/org/apache/catalina/servlets/LocalStrings_es.properties
>>    tomcat/trunk/java/org/apache/catalina/servlets/LocalStrings_fr.properties
>>    tomcat/trunk/java/org/apache/catalina/servlets/LocalStrings_ja.properties
>>    tomcat/trunk/java/org/apache/catalina/session/LocalStrings.properties
>>    tomcat/trunk/java/org/apache/catalina/session/LocalStrings_es.properties
>>    tomcat/trunk/java/org/apache/catalina/session/LocalStrings_fr.properties
>>    tomcat/trunk/java/org/apache/catalina/session/LocalStrings_ja.properties
>>    tomcat/trunk/java/org/apache/catalina/startup/LocalStrings.properties
>>    tomcat/trunk/java/org/apache/catalina/startup/LocalStrings_es.properties
>>    tomcat/trunk/java/org/apache/catalina/startup/LocalStrings_fr.properties
>>    tomcat/trunk/java/org/apache/catalina/startup/LocalStrings_ja.properties
>>    tomcat/trunk/java/org/apache/catalina/tribes/transport/LocalStrings.properties
>>    tomcat/trunk/java/org/apache/catalina/tribes/transport/LocalStrings_es.properties
>>    tomcat/trunk/java/org/apache/catalina/users/LocalStrings.properties
>>    tomcat/trunk/java/org/apache/catalina/users/LocalStrings_es.properties
>>    tomcat/trunk/java/org/apache/catalina/users/LocalStrings_fr.properties
>>    tomcat/trunk/java/org/apache/catalina/users/LocalStrings_ja.properties
>>    tomcat/trunk/java/org/apache/catalina/util/LocalStrings.properties
>>    tomcat/trunk/java/org/apache/catalina/valves/LocalStrings.properties
>>    tomcat/trunk/java/org/apache/catalina/valves/LocalStrings_es.properties
>>    tomcat/trunk/java/org/apache/catalina/valves/LocalStrings_fr.properties
>>    tomcat/trunk/java/org/apache/catalina/valves/LocalStrings_ja.properties
>>    tomcat/trunk/java/org/apache/coyote/ajp/LocalStrings.properties
>>    tomcat/trunk/java/org/apache/coyote/ajp/LocalStrings_es.properties
>>    tomcat/trunk/java/org/apache/coyote/http11/LocalStrings.properties
>>    tomcat/trunk/java/org/apache/coyote/http11/LocalStrings_es.properties
>>    tomcat/trunk/java/org/apache/coyote/http11/LocalStrings_fr.properties
>>    tomcat/trunk/java/org/apache/coyote/http11/LocalStrings_ja.properties
>>    tomcat/trunk/java/org/apache/el/Messages.properties
>>    tomcat/trunk/java/org/apache/el/Messages_es.properties
>>    tomcat/trunk/java/org/apache/jasper/resources/LocalStrings.properties
>>    tomcat/trunk/java/org/apache/jasper/resources/LocalStrings_es.properties
>>    tomcat/trunk/java/org/apache/jasper/resources/LocalStrings_fr.properties
>>    tomcat/trunk/java/org/apache/jasper/resources/LocalStrings_ja.properties
>>    tomcat/trunk/java/org/apache/naming/resources/LocalStrings.properties
>>    tomcat/trunk/java/org/apache/naming/resources/LocalStrings_es.properties
>>    tomcat/trunk/java/org/apache/naming/resources/LocalStrings_fr.properties
>>    tomcat/trunk/java/org/apache/naming/resources/LocalStrings_ja.properties
>>    tomcat/trunk/java/org/apache/tomcat/util/net/res/LocalStrings.properties
>>    tomcat/trunk/java/org/apache/tomcat/util/net/res/LocalStrings_es.properties
>>    tomcat/trunk/java/org/apache/tomcat/util/net/res/LocalStrings_fr.properties
>>    tomcat/trunk/java/org/apache/tomcat/util/net/res/LocalStrings_ja.properties
> 
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
> For additional commands, e-mail: dev-help@tomcat.apache.org
> 


---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org