Author: remy.maucherat(a)jboss.com
Date: 2013-04-30 09:36:07 -0400 (Tue, 30 Apr 2013)
New Revision: 2196
Removed:
branches/8.0.x/src/main/java/org/apache/el/
branches/8.0.x/src/main/java/org/jboss/web/ELLogger.java
branches/8.0.x/src/main/java/org/jboss/web/ELMessages.java
Modified:
branches/8.0.x/pom.xml
Log:
Remove the bundled EL.
Modified: branches/8.0.x/pom.xml
===================================================================
(Binary files differ)
Deleted: branches/8.0.x/src/main/java/org/jboss/web/ELLogger.java
===================================================================
--- branches/8.0.x/src/main/java/org/jboss/web/ELLogger.java 2013-04-26 21:08:54 UTC (rev
2195)
+++ branches/8.0.x/src/main/java/org/jboss/web/ELLogger.java 2013-04-30 13:36:07 UTC (rev
2196)
@@ -1,44 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2012 Red Hat, Inc., and individual contributors
- * as indicated by the @author tags.
- *
- * Licensed 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.
- */
-
-package org.jboss.web;
-
-import static org.jboss.logging.Logger.Level.ERROR;
-import static org.jboss.logging.Logger.Level.INFO;
-import static org.jboss.logging.Logger.Level.WARN;
-
-import org.jboss.logging.BasicLogger;
-import org.jboss.logging.Cause;
-import org.jboss.logging.LogMessage;
-import org.jboss.logging.Logger;
-import org.jboss.logging.Message;
-import org.jboss.logging.MessageLogger;
-
-/**
- * Logging IDs 6300-6500
- * @author Remy Maucherat
- */
-@MessageLogger(projectCode = "JBWEB")
-public interface ELLogger extends BasicLogger {
-
- /**
- * A logger with the category of the package name.
- */
- ELLogger ROOT_LOGGER = Logger.getMessageLogger(ELLogger.class,
"org.apache.el");
-
-}
Deleted: branches/8.0.x/src/main/java/org/jboss/web/ELMessages.java
===================================================================
--- branches/8.0.x/src/main/java/org/jboss/web/ELMessages.java 2013-04-26 21:08:54 UTC
(rev 2195)
+++ branches/8.0.x/src/main/java/org/jboss/web/ELMessages.java 2013-04-30 13:36:07 UTC
(rev 2196)
@@ -1,125 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2012 Red Hat, Inc., and individual contributors
- * as indicated by the @author tags.
- *
- * Licensed 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.
- */
-
-package org.jboss.web;
-
-import org.jboss.logging.Cause;
-import org.jboss.logging.Message;
-import org.jboss.logging.MessageBundle;
-import org.jboss.logging.Messages;
-
-/**
- * Logging IDs 6000-6300
- * @author Remy Maucherat
- */
-@MessageBundle(projectCode = "JBWEB")
-public interface ELMessages {
-
- /**
- * The messages
- */
- ELMessages MESSAGES = Messages.getBundle(ELMessages.class);
-
- @Message(id = 6000, value = "Expected type cannot be null")
- String errorNullType();
-
- @Message(id = 6001, value = "ValueExpression is a literal and not writable:
%s")
- String errorPropertyNotWritable(Object value);
-
- @Message(id = 6002, value = "Cannot convert %s of type %s to %s")
- IllegalArgumentException errorConvertingWithException(Object obj, Class<? extends
Object> clazz, String type);
-
- @Message(id = 6003, value = "Cannot convert %s of type %s to %s")
- String errorConverting(Object obj, Class<? extends Object> clazz, Class<?
extends Object> type);
-
- @Message(id = 6004, value = "Cannot compare %s to %s")
- String errorComparing(Object obj1, Object obj2);
-
- @Message(id = 6005, value = "Expression cannot be null")
- String errorNullExpression();
-
- @Message(id = 6006, value = "Expression cannot contain both '#{..}' and
'${..}' : %s")
- String errorMixedExpression(String expression);
-
- @Message(id = 6007, value = "Failed to parse the expression [%s]")
- String errorParse(String expression);
-
- @Message(id = 6008, value = "Expression uses functions, but no FunctionMapper
was provided")
- String missingFunctionMapper();
-
- @Message(id = 6009, value = "Function ''%s'' not found")
- String functionNotFound(String function);
-
- @Message(id = 6010, value = "Function ''%s'' specifies %s
params, but %s were declared")
- String functionWrongParameterCount(String function, int count, int declared);
-
- @Message(id = 6011, value = "Parameter types cannot be null")
- String nullParameterTypes();
-
- @Message(id = 6012, value = "The identifier [%s] is not a valid Java identifier
as required by section 1.19 of the EL specification (Identifier ::= Java language
identifier). This check can be disabled by setting the system property
org.apache.el.parser.SKIP_IDENTIFIER_CHECK to true.")
- String errorNotJavaIdentifier(String identifier);
-
- @Message(id = 6013, value = "Error calling function
''%s''")
- String errorCallingFunction(String function);
-
- @Message(id = 6014, value = "ELResolver cannot handle a null base Object with
identifier ''%s''")
- String errorNullBaseObject(String identifier);
-
- @Message(id = 6015, value = "ELResolver did not handle type: %s with property of
''%s''")
- String errorResolving(Object type, Object property);
-
- @Message(id = 6016, value = "Target Unreachable, identifier
''%s'' resolved to null")
- String errorResolvingIdentifierType(String identifier);
-
- @Message(id = 6017, value = "Target Unreachable, ''%s'' returned
null")
- String errorResolvingProperty(Object property);
-
- @Message(id = 6018, value = "Illegal Syntax for Set Operation")
- String errorWithSetSyntax();
-
- @Message(id = 6019, value = "Method not found: %s.%s(%s)")
- String methodNotFound(Object base, Object method, String parameters);
-
- @Message(id = 6020, value = "Unable to find unambiguous method:
%s.%s(%s)")
- String ambiguousMethod(Object base, Object method, String parameters);
-
- @Message(id = 6021, value = "Invalid method expression: %s")
- String invalidMethodExpression(String expression);
-
- @Message(id = 6022, value = "Function mapper is null")
- NullPointerException invalidNullFunctionMapper();
-
- @Message(id = 6023, value = "Local name is null")
- NullPointerException invalidNullLocalName();
-
- @Message(id = 6024, value = "Method is null")
- NullPointerException invalidNullMethod();
-
- @Message(id = 6025, value = "Variable mapper is null")
- NullPointerException invalidNullVariableMapper();
-
- @Message(id = 6026, value = "Cannot set variables on factory")
- UnsupportedOperationException cannotSetVariablesOnFactory();
-
- @Message(id = 6027, value = "Identity '%s' was null and was unable to
invoke")
- String invalidNullIdentity(String image);
-
- @Message(id = 6028, value = "Identity '%s' does not reference a
MethodExpression instance, returned type: %s")
- String invalidIdentityHasWrongType(String image, String returnedType);
-
-}