You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by mb...@apache.org on 2007/03/16 14:24:21 UTC

svn commit: r518967 [17/20] - in /myfaces/core/branches/jsf12: api/src/main/java-templates/javax/faces/component/ api/src/main/java/javax/faces/application/ api/src/main/java/javax/faces/component/ api/src/main/java/javax/faces/context/ api/src/main/ja...

Modified: myfaces/core/branches/jsf12/impl/src/main/java/org/apache/myfaces/el/unified/resolver/implicitobject/RequestScopeImplicitObject.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/jsf12/impl/src/main/java/org/apache/myfaces/el/unified/resolver/implicitobject/RequestScopeImplicitObject.java?view=diff&rev=518967&r1=518966&r2=518967
==============================================================================
--- myfaces/core/branches/jsf12/impl/src/main/java/org/apache/myfaces/el/unified/resolver/implicitobject/RequestScopeImplicitObject.java (original)
+++ myfaces/core/branches/jsf12/impl/src/main/java/org/apache/myfaces/el/unified/resolver/implicitobject/RequestScopeImplicitObject.java Fri Mar 16 06:24:10 2007
@@ -1,54 +1,54 @@
-/*
- * Copyright 2006 The Apache Software Foundation.
- *
- * 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.apache.myfaces.el.unified.resolver.implicitobject;
-
-import java.beans.FeatureDescriptor;
-import java.util.Map;
-import javax.el.ELContext;
-
-/**
- * Encapsulates information needed by the ImplicitObjectResolver
- *
- * @author Stan Silvert
- */
-public class RequestScopeImplicitObject extends ImplicitObject {
-    
-    private static final String NAME = "requestScope".intern();
-    
-    /** Creates a new instance of RequestScopeImplicitObject */
-    public RequestScopeImplicitObject() {
-    }
-
-    public Object getValue(ELContext context) {
-        return externalContext(context).getRequestMap();
-    }
-
-    public String getName() {
-        return NAME;
-    }
-    
-    public Class getType() {
-        return Object.class;
-    }
-
-    public FeatureDescriptor getDescriptor() {
-        return makeDescriptor(NAME, 
-                             "Request scope attributes", 
-                             Map.class);
-    }
-    
-}
+/*
+ * Copyright 2006 The Apache Software Foundation.
+ *
+ * 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.apache.myfaces.el.unified.resolver.implicitobject;
+
+import java.beans.FeatureDescriptor;
+import java.util.Map;
+import javax.el.ELContext;
+
+/**
+ * Encapsulates information needed by the ImplicitObjectResolver
+ *
+ * @author Stan Silvert
+ */
+public class RequestScopeImplicitObject extends ImplicitObject {
+    
+    private static final String NAME = "requestScope".intern();
+    
+    /** Creates a new instance of RequestScopeImplicitObject */
+    public RequestScopeImplicitObject() {
+    }
+
+    public Object getValue(ELContext context) {
+        return externalContext(context).getRequestMap();
+    }
+
+    public String getName() {
+        return NAME;
+    }
+    
+    public Class getType() {
+        return Object.class;
+    }
+
+    public FeatureDescriptor getDescriptor() {
+        return makeDescriptor(NAME, 
+                             "Request scope attributes", 
+                             Map.class);
+    }
+    
+}

Propchange: myfaces/core/branches/jsf12/impl/src/main/java/org/apache/myfaces/el/unified/resolver/implicitobject/RequestScopeImplicitObject.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: myfaces/core/branches/jsf12/impl/src/main/java/org/apache/myfaces/el/unified/resolver/implicitobject/SessionImplicitObject.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/jsf12/impl/src/main/java/org/apache/myfaces/el/unified/resolver/implicitobject/SessionImplicitObject.java?view=diff&rev=518967&r1=518966&r2=518967
==============================================================================
--- myfaces/core/branches/jsf12/impl/src/main/java/org/apache/myfaces/el/unified/resolver/implicitobject/SessionImplicitObject.java (original)
+++ myfaces/core/branches/jsf12/impl/src/main/java/org/apache/myfaces/el/unified/resolver/implicitobject/SessionImplicitObject.java Fri Mar 16 06:24:10 2007
@@ -1,53 +1,53 @@
-/*
- * Copyright 2006 The Apache Software Foundation.
- *
- * 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.apache.myfaces.el.unified.resolver.implicitobject;
-
-import java.beans.FeatureDescriptor;
-import javax.el.ELContext;
-
-/**
- * Encapsulates information needed by the ImplicitObjectResolver
- *
- * @author Stan Silvert
- */
-public class SessionImplicitObject extends ImplicitObject {
-    
-    private static final String NAME = "session".intern();
-    
-    /** Creates a new instance of SessionImplicitObject */
-    public SessionImplicitObject() {
-    }
-
-    public Object getValue(ELContext context) {
-        return externalContext(context).getSession(false);
-    }
-
-    public String getName() {
-        return NAME;
-    }
-    
-    public Class getType() {
-        return null;
-    }
-
-    public FeatureDescriptor getDescriptor() {
-        return makeDescriptor(NAME, 
-                             "Session instance for the current request or null if no session exists", 
-                             Object.class);
-    }
-    
-}
+/*
+ * Copyright 2006 The Apache Software Foundation.
+ *
+ * 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.apache.myfaces.el.unified.resolver.implicitobject;
+
+import java.beans.FeatureDescriptor;
+import javax.el.ELContext;
+
+/**
+ * Encapsulates information needed by the ImplicitObjectResolver
+ *
+ * @author Stan Silvert
+ */
+public class SessionImplicitObject extends ImplicitObject {
+    
+    private static final String NAME = "session".intern();
+    
+    /** Creates a new instance of SessionImplicitObject */
+    public SessionImplicitObject() {
+    }
+
+    public Object getValue(ELContext context) {
+        return externalContext(context).getSession(false);
+    }
+
+    public String getName() {
+        return NAME;
+    }
+    
+    public Class getType() {
+        return null;
+    }
+
+    public FeatureDescriptor getDescriptor() {
+        return makeDescriptor(NAME, 
+                             "Session instance for the current request or null if no session exists", 
+                             Object.class);
+    }
+    
+}

Propchange: myfaces/core/branches/jsf12/impl/src/main/java/org/apache/myfaces/el/unified/resolver/implicitobject/SessionImplicitObject.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: myfaces/core/branches/jsf12/impl/src/main/java/org/apache/myfaces/el/unified/resolver/implicitobject/SessionScopeImplicitObject.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/jsf12/impl/src/main/java/org/apache/myfaces/el/unified/resolver/implicitobject/SessionScopeImplicitObject.java?view=diff&rev=518967&r1=518966&r2=518967
==============================================================================
--- myfaces/core/branches/jsf12/impl/src/main/java/org/apache/myfaces/el/unified/resolver/implicitobject/SessionScopeImplicitObject.java (original)
+++ myfaces/core/branches/jsf12/impl/src/main/java/org/apache/myfaces/el/unified/resolver/implicitobject/SessionScopeImplicitObject.java Fri Mar 16 06:24:10 2007
@@ -1,54 +1,54 @@
-/*
- * Copyright 2006 The Apache Software Foundation.
- *
- * 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.apache.myfaces.el.unified.resolver.implicitobject;
-
-import java.beans.FeatureDescriptor;
-import java.util.Map;
-import javax.el.ELContext;
-
-/**
- * Encapsulates information needed by the ImplicitObjectResolver
- *
- * @author Stan Silvert
- */
-public class SessionScopeImplicitObject extends ImplicitObject {
-    
-    private static final String NAME = "sessionScope".intern();
-    
-    /** Creates a new instance of SessionScopeImplicitObject */
-    public SessionScopeImplicitObject() {
-    }
-
-    public Object getValue(ELContext context) {
-        return externalContext(context).getSessionMap();
-    }
-
-    public String getName() {
-        return NAME;
-    }
-    
-    public Class getType() {
-        return Object.class;
-    }
-
-    public FeatureDescriptor getDescriptor() {
-        return makeDescriptor(NAME, 
-                             "Session scope attributes", 
-                             Map.class);
-    }
-    
-}
+/*
+ * Copyright 2006 The Apache Software Foundation.
+ *
+ * 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.apache.myfaces.el.unified.resolver.implicitobject;
+
+import java.beans.FeatureDescriptor;
+import java.util.Map;
+import javax.el.ELContext;
+
+/**
+ * Encapsulates information needed by the ImplicitObjectResolver
+ *
+ * @author Stan Silvert
+ */
+public class SessionScopeImplicitObject extends ImplicitObject {
+    
+    private static final String NAME = "sessionScope".intern();
+    
+    /** Creates a new instance of SessionScopeImplicitObject */
+    public SessionScopeImplicitObject() {
+    }
+
+    public Object getValue(ELContext context) {
+        return externalContext(context).getSessionMap();
+    }
+
+    public String getName() {
+        return NAME;
+    }
+    
+    public Class getType() {
+        return Object.class;
+    }
+
+    public FeatureDescriptor getDescriptor() {
+        return makeDescriptor(NAME, 
+                             "Session scope attributes", 
+                             Map.class);
+    }
+    
+}

Propchange: myfaces/core/branches/jsf12/impl/src/main/java/org/apache/myfaces/el/unified/resolver/implicitobject/SessionScopeImplicitObject.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: myfaces/core/branches/jsf12/impl/src/main/java/org/apache/myfaces/el/unified/resolver/implicitobject/ViewImplicitObject.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/jsf12/impl/src/main/java/org/apache/myfaces/el/unified/resolver/implicitobject/ViewImplicitObject.java?view=diff&rev=518967&r1=518966&r2=518967
==============================================================================
--- myfaces/core/branches/jsf12/impl/src/main/java/org/apache/myfaces/el/unified/resolver/implicitobject/ViewImplicitObject.java (original)
+++ myfaces/core/branches/jsf12/impl/src/main/java/org/apache/myfaces/el/unified/resolver/implicitobject/ViewImplicitObject.java Fri Mar 16 06:24:10 2007
@@ -1,54 +1,54 @@
-/*
- * Copyright 2006 The Apache Software Foundation.
- *
- * 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.apache.myfaces.el.unified.resolver.implicitobject;
-
-import java.beans.FeatureDescriptor;
-import javax.el.ELContext;
-import javax.faces.component.UIViewRoot;
-
-/**
- * Encapsulates information needed by the ImplicitObjectResolver
- *
- * @author Stan Silvert
- */
-public class ViewImplicitObject extends ImplicitObject {
-    
-    private static final String NAME = "view".intern();
-    
-    /** Creates a new instance of ViewImplicitObject */
-    public ViewImplicitObject() {
-    }
-
-    public Object getValue(ELContext context) {
-        return facesContext(context).getViewRoot();
-    }
-
-    public String getName() {
-        return NAME;
-    }
-    
-    public Class getType() {
-        return null;
-    }
-
-    public FeatureDescriptor getDescriptor() {
-        return makeDescriptor(NAME, 
-                             "The root object of a JSF component tree", 
-                             UIViewRoot.class);
-    }
-    
-}
+/*
+ * Copyright 2006 The Apache Software Foundation.
+ *
+ * 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.apache.myfaces.el.unified.resolver.implicitobject;
+
+import java.beans.FeatureDescriptor;
+import javax.el.ELContext;
+import javax.faces.component.UIViewRoot;
+
+/**
+ * Encapsulates information needed by the ImplicitObjectResolver
+ *
+ * @author Stan Silvert
+ */
+public class ViewImplicitObject extends ImplicitObject {
+    
+    private static final String NAME = "view".intern();
+    
+    /** Creates a new instance of ViewImplicitObject */
+    public ViewImplicitObject() {
+    }
+
+    public Object getValue(ELContext context) {
+        return facesContext(context).getViewRoot();
+    }
+
+    public String getName() {
+        return NAME;
+    }
+    
+    public Class getType() {
+        return null;
+    }
+
+    public FeatureDescriptor getDescriptor() {
+        return makeDescriptor(NAME, 
+                             "The root object of a JSF component tree", 
+                             UIViewRoot.class);
+    }
+    
+}

Propchange: myfaces/core/branches/jsf12/impl/src/main/java/org/apache/myfaces/el/unified/resolver/implicitobject/ViewImplicitObject.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: myfaces/core/branches/jsf12/impl/src/main/java/org/apache/myfaces/event/SetPropertyActionListener.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/jsf12/impl/src/main/java/org/apache/myfaces/event/SetPropertyActionListener.java?view=diff&rev=518967&r1=518966&r2=518967
==============================================================================
--- myfaces/core/branches/jsf12/impl/src/main/java/org/apache/myfaces/event/SetPropertyActionListener.java (original)
+++ myfaces/core/branches/jsf12/impl/src/main/java/org/apache/myfaces/event/SetPropertyActionListener.java Fri Mar 16 06:24:10 2007
@@ -1,121 +1,121 @@
-/*
- * Copyright 2005 The Apache Software Foundation.
- *
- * 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.apache.myfaces.event;
-
-import javax.el.ELContext;
-import javax.el.ValueExpression;
-import javax.faces.component.StateHolder;
-import javax.faces.context.FacesContext;
-import javax.faces.event.AbortProcessingException;
-import javax.faces.event.ActionEvent;
-import javax.faces.event.ActionListener;
-
-/**
- * The MyFaces implementation of the <code>SetPropertyActionListener</code>.
- * 
- * @author Dennis Byrne
- * @since 1.2
- */
-public class SetPropertyActionListener implements ActionListener, StateHolder
-{
-
-    private ValueExpression target;
-    
-    private ValueExpression value;
-    
-    private boolean _transient ;
-    
-    public SetPropertyActionListener(){}
-    
-    public SetPropertyActionListener(ValueExpression target, ValueExpression value)
-    {
-        this.target = target;
-        this.value = value;
-    }
-    
-    public void processAction(ActionEvent actionEvent) throws AbortProcessingException
-    {
-        
-        if( target == null )
-            throw new AbortProcessingException("@target has not been set");
-
-        if( value == null )
-            throw new AbortProcessingException("@value has not been set");
-        
-        FacesContext ctx = FacesContext.getCurrentInstance();
-        
-        if( ctx == null )
-            throw new AbortProcessingException("FacesContext ctx is null");
-        
-        ELContext ectx = ctx.getELContext();
-        
-        if( ectx == null )
-            throw new AbortProcessingException("ELContext ectx is null");
-        
-        // TODO use a Converter before calling setValue 
-        
-        target.setValue(ectx, value.getValue(ectx));
-        
-    }
-
-    public Object saveState(FacesContext context)
-    {
-        Object[] state = new Object[2];
-        state[0] = target;
-        state[1] = value;
-        return state;
-    }
-
-    public void restoreState(FacesContext context, Object state)
-    {
-        Object[] values = new Object[2];
-        target = (ValueExpression) values[0];
-        value = (ValueExpression) values[1];
-    }
-
-    public boolean isTransient()
-    {
-        return _transient;
-    }
-
-    public void setTransient(boolean _transient)
-    {
-        this._transient = _transient;
-    }
-
-    public ValueExpression getTarget()
-    {
-        return target;
-    }
-
-    public void setTarget(ValueExpression target)
-    {
-        this.target = target;
-    }
-
-    public ValueExpression getValue()
-    {
-        return value;
-    }
-
-    public void setValue(ValueExpression value)
-    {
-        this.value = value;
-    }
-
-}
+/*
+ * Copyright 2005 The Apache Software Foundation.
+ *
+ * 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.apache.myfaces.event;
+
+import javax.el.ELContext;
+import javax.el.ValueExpression;
+import javax.faces.component.StateHolder;
+import javax.faces.context.FacesContext;
+import javax.faces.event.AbortProcessingException;
+import javax.faces.event.ActionEvent;
+import javax.faces.event.ActionListener;
+
+/**
+ * The MyFaces implementation of the <code>SetPropertyActionListener</code>.
+ * 
+ * @author Dennis Byrne
+ * @since 1.2
+ */
+public class SetPropertyActionListener implements ActionListener, StateHolder
+{
+
+    private ValueExpression target;
+    
+    private ValueExpression value;
+    
+    private boolean _transient ;
+    
+    public SetPropertyActionListener(){}
+    
+    public SetPropertyActionListener(ValueExpression target, ValueExpression value)
+    {
+        this.target = target;
+        this.value = value;
+    }
+    
+    public void processAction(ActionEvent actionEvent) throws AbortProcessingException
+    {
+        
+        if( target == null )
+            throw new AbortProcessingException("@target has not been set");
+
+        if( value == null )
+            throw new AbortProcessingException("@value has not been set");
+        
+        FacesContext ctx = FacesContext.getCurrentInstance();
+        
+        if( ctx == null )
+            throw new AbortProcessingException("FacesContext ctx is null");
+        
+        ELContext ectx = ctx.getELContext();
+        
+        if( ectx == null )
+            throw new AbortProcessingException("ELContext ectx is null");
+        
+        // TODO use a Converter before calling setValue 
+        
+        target.setValue(ectx, value.getValue(ectx));
+        
+    }
+
+    public Object saveState(FacesContext context)
+    {
+        Object[] state = new Object[2];
+        state[0] = target;
+        state[1] = value;
+        return state;
+    }
+
+    public void restoreState(FacesContext context, Object state)
+    {
+        Object[] values = new Object[2];
+        target = (ValueExpression) values[0];
+        value = (ValueExpression) values[1];
+    }
+
+    public boolean isTransient()
+    {
+        return _transient;
+    }
+
+    public void setTransient(boolean _transient)
+    {
+        this._transient = _transient;
+    }
+
+    public ValueExpression getTarget()
+    {
+        return target;
+    }
+
+    public void setTarget(ValueExpression target)
+    {
+        this.target = target;
+    }
+
+    public ValueExpression getValue()
+    {
+        return value;
+    }
+
+    public void setValue(ValueExpression value)
+    {
+        this.value = value;
+    }
+
+}

Propchange: myfaces/core/branches/jsf12/impl/src/main/java/org/apache/myfaces/event/SetPropertyActionListener.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: myfaces/core/branches/jsf12/impl/src/main/java/org/apache/myfaces/lifecycle/PhaseListenerManager.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/jsf12/impl/src/main/java/org/apache/myfaces/lifecycle/PhaseListenerManager.java?view=diff&rev=518967&r1=518966&r2=518967
==============================================================================
--- myfaces/core/branches/jsf12/impl/src/main/java/org/apache/myfaces/lifecycle/PhaseListenerManager.java (original)
+++ myfaces/core/branches/jsf12/impl/src/main/java/org/apache/myfaces/lifecycle/PhaseListenerManager.java Fri Mar 16 06:24:10 2007
@@ -1,100 +1,100 @@
-/*
- * 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.
- */
-
-package org.apache.myfaces.lifecycle;
-
-import java.util.HashMap;
-import java.util.Map;
-import javax.faces.context.FacesContext;
-import javax.faces.event.PhaseEvent;
-import javax.faces.event.PhaseId;
-import javax.faces.event.PhaseListener;
-import javax.faces.lifecycle.Lifecycle;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-/**
- * This class encapsulates the logic used to call PhaseListeners.  It was 
- * needed because of issue 9 of the JSF 1.2 spec.  See section 11.3 for more
- * details.
- *
- * @author Stan Silvert
- */
-class PhaseListenerManager {
-    
-    private static final Log log = LogFactory.getLog(PhaseListenerManager.class);
-    
-    private Lifecycle lifecycle;
-    private FacesContext facesContext;
-    private PhaseListener[] phaseListeners;
-    
-    // Tracks success in the beforePhase.  Listeners that throw an exception
-    // in beforePhase or were never called because a previous listener threw
-    // an exception should not have its afterPhase called
-    private Map<PhaseId, boolean[]> listenerSuccessMap = new HashMap<PhaseId, boolean[]>();
-    
-    /** Creates a new instance of PhaseListenerManager */
-    PhaseListenerManager(Lifecycle lifecycle, FacesContext facesContext, PhaseListener[] phaseListeners) {
-        this.lifecycle = lifecycle;
-        this.facesContext = facesContext;
-        this.phaseListeners = phaseListeners;
-    }
-    
-    private boolean isListenerForThisPhase(PhaseListener phaseListener, PhaseId phaseId) {
-        int listenerPhaseId = phaseListener.getPhaseId().getOrdinal();
-        return (listenerPhaseId == PhaseId.ANY_PHASE.getOrdinal() ||
-                listenerPhaseId == phaseId.getOrdinal());
-    }
-    
-    void informPhaseListenersBefore(PhaseId phaseId) {
-        boolean[] beforePhaseSuccess = new boolean[phaseListeners.length];
-        listenerSuccessMap.put(phaseId, beforePhaseSuccess);
-        
-        for (int i = 0; i < phaseListeners.length; i++) {
-            PhaseListener phaseListener = phaseListeners[i];
-            if (isListenerForThisPhase(phaseListener, phaseId)) {
-                try {
-                    phaseListener.beforePhase(new PhaseEvent(facesContext, phaseId, lifecycle));
-                    beforePhaseSuccess[i] = true;
-                } catch (Exception e) {
-                    beforePhaseSuccess[i] = false; // redundant - for clarity
-                    log.error("Exception in PhaseListener " + phaseId.toString() + " beforePhase.", e);
-                    return;
-                }
-            }
-        }
-    }
-
-    void informPhaseListenersAfter(PhaseId phaseId) {
-        boolean[] beforePhaseSuccess = listenerSuccessMap.get(phaseId);
-        
-        for (int i = phaseListeners.length - 1; i >= 0; i--)  {
-            PhaseListener phaseListener = phaseListeners[i];
-            if (isListenerForThisPhase(phaseListener, phaseId) 
-                && beforePhaseSuccess[i]) {
-                try {
-                    phaseListener.afterPhase(new PhaseEvent(facesContext, phaseId, lifecycle));
-                } catch (Exception e) {
-                    log.error("Exception in PhaseListener " + phaseId.toString() + " afterPhase", e);
-                }
-            }
-        }
-
-    }
-}
+/*
+ * 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.
+ */
+
+package org.apache.myfaces.lifecycle;
+
+import java.util.HashMap;
+import java.util.Map;
+import javax.faces.context.FacesContext;
+import javax.faces.event.PhaseEvent;
+import javax.faces.event.PhaseId;
+import javax.faces.event.PhaseListener;
+import javax.faces.lifecycle.Lifecycle;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+/**
+ * This class encapsulates the logic used to call PhaseListeners.  It was 
+ * needed because of issue 9 of the JSF 1.2 spec.  See section 11.3 for more
+ * details.
+ *
+ * @author Stan Silvert
+ */
+class PhaseListenerManager {
+    
+    private static final Log log = LogFactory.getLog(PhaseListenerManager.class);
+    
+    private Lifecycle lifecycle;
+    private FacesContext facesContext;
+    private PhaseListener[] phaseListeners;
+    
+    // Tracks success in the beforePhase.  Listeners that throw an exception
+    // in beforePhase or were never called because a previous listener threw
+    // an exception should not have its afterPhase called
+    private Map<PhaseId, boolean[]> listenerSuccessMap = new HashMap<PhaseId, boolean[]>();
+    
+    /** Creates a new instance of PhaseListenerManager */
+    PhaseListenerManager(Lifecycle lifecycle, FacesContext facesContext, PhaseListener[] phaseListeners) {
+        this.lifecycle = lifecycle;
+        this.facesContext = facesContext;
+        this.phaseListeners = phaseListeners;
+    }
+    
+    private boolean isListenerForThisPhase(PhaseListener phaseListener, PhaseId phaseId) {
+        int listenerPhaseId = phaseListener.getPhaseId().getOrdinal();
+        return (listenerPhaseId == PhaseId.ANY_PHASE.getOrdinal() ||
+                listenerPhaseId == phaseId.getOrdinal());
+    }
+    
+    void informPhaseListenersBefore(PhaseId phaseId) {
+        boolean[] beforePhaseSuccess = new boolean[phaseListeners.length];
+        listenerSuccessMap.put(phaseId, beforePhaseSuccess);
+        
+        for (int i = 0; i < phaseListeners.length; i++) {
+            PhaseListener phaseListener = phaseListeners[i];
+            if (isListenerForThisPhase(phaseListener, phaseId)) {
+                try {
+                    phaseListener.beforePhase(new PhaseEvent(facesContext, phaseId, lifecycle));
+                    beforePhaseSuccess[i] = true;
+                } catch (Exception e) {
+                    beforePhaseSuccess[i] = false; // redundant - for clarity
+                    log.error("Exception in PhaseListener " + phaseId.toString() + " beforePhase.", e);
+                    return;
+                }
+            }
+        }
+    }
+
+    void informPhaseListenersAfter(PhaseId phaseId) {
+        boolean[] beforePhaseSuccess = listenerSuccessMap.get(phaseId);
+        
+        for (int i = phaseListeners.length - 1; i >= 0; i--)  {
+            PhaseListener phaseListener = phaseListeners[i];
+            if (isListenerForThisPhase(phaseListener, phaseId) 
+                && beforePhaseSuccess[i]) {
+                try {
+                    phaseListener.afterPhase(new PhaseEvent(facesContext, phaseId, lifecycle));
+                } catch (Exception e) {
+                    log.error("Exception in PhaseListener " + phaseId.toString() + " afterPhase", e);
+                }
+            }
+        }
+
+    }
+}

Propchange: myfaces/core/branches/jsf12/impl/src/main/java/org/apache/myfaces/lifecycle/PhaseListenerManager.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: myfaces/core/branches/jsf12/impl/src/main/java/org/apache/myfaces/portlet/PortletUtil.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: myfaces/core/branches/jsf12/impl/src/main/java/org/apache/myfaces/taglib/core/SetPropertyActionListenerTag.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/jsf12/impl/src/main/java/org/apache/myfaces/taglib/core/SetPropertyActionListenerTag.java?view=diff&rev=518967&r1=518966&r2=518967
==============================================================================
--- myfaces/core/branches/jsf12/impl/src/main/java/org/apache/myfaces/taglib/core/SetPropertyActionListenerTag.java (original)
+++ myfaces/core/branches/jsf12/impl/src/main/java/org/apache/myfaces/taglib/core/SetPropertyActionListenerTag.java Fri Mar 16 06:24:10 2007
@@ -1,115 +1,115 @@
-/*
- * Copyright 2005 The Apache Software Foundation.
- *
- * 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.apache.myfaces.taglib.core;
-
-import javax.el.ValueExpression;
-import javax.faces.component.ActionSource;
-import javax.faces.component.UIComponent;
-import javax.faces.event.ActionListener;
-import javax.faces.webapp.UIComponentClassicTagBase;
-import javax.servlet.jsp.JspException;
-import javax.servlet.jsp.tagext.TagSupport;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-import org.apache.myfaces.event.SetPropertyActionListener;
-
-/**
- * @author Dennis Byrne
- * @since 1.2
- */
-
-public class SetPropertyActionListenerTag extends TagSupport
-{
-    
-    private static final Log log = LogFactory.getLog(SetPropertyActionListenerTag.class);
-    
-    private ValueExpression target;
-    
-    private ValueExpression value;
-
-    public int doStartTag() throws JspException 
-    {
-        
-        if(log.isDebugEnabled())
-            log.debug("JSF 1.2 Spec : Create a new instance of the ActionListener");
-
-        ActionListener actionListener = new SetPropertyActionListener(target, value);
-        
-        UIComponentClassicTagBase tag = UIComponentClassicTagBase.getParentUIComponentClassicTagBase(pageContext);
-        
-        if(tag == null)
-            throw new JspException("Could not find a " +
-                    "parent UIComponentClassicTagBase ... is this " +
-                    "tag in a child of a UIComponentClassicTagBase?");
-        
-        if(tag.getCreated())
-        {
-            
-            UIComponent component = tag.getComponentInstance();
-            
-            if(component == null)
-                throw new JspException(" Could not locate a UIComponent " +
-                        "for a UIComponentClassicTagBase w/ a " +
-                        "JSP id of " + tag.getJspId());
-            
-            if( ! ( component instanceof ActionSource ) )
-                throw new JspException("Component w/ id of " + component.getId() 
-                        + " is associated w/ a tag w/ JSP id of " + tag.getJspId() 
-                        + ". This component is of type " + component.getClass() 
-                        + ", which is not an " + ActionSource.class );
-            
-            if(log.isDebugEnabled())
-                log.debug(" ... register it with the UIComponent " +
-                        "instance associated with our most immediately " +
-                        "surrounding UIComponentTagBase");
-            
-            ((ActionSource)component).addActionListener(actionListener);
-            
-        }
-        
-        return SKIP_BODY;
-    }
-    
-    public ValueExpression getTarget()
-    {
-        return target;
-    }
-
-    public void setTarget(ValueExpression target)
-    {
-        this.target = target;
-    }
-
-    public ValueExpression getValue()
-    {
-        return value;
-    }
-
-    public void setValue(ValueExpression value)
-    {
-        this.value = value;
-    }
-    
-    public void release() 
-    {
-        target = null;
-        value = null;
-    }
-    
-}
+/*
+ * Copyright 2005 The Apache Software Foundation.
+ *
+ * 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.apache.myfaces.taglib.core;
+
+import javax.el.ValueExpression;
+import javax.faces.component.ActionSource;
+import javax.faces.component.UIComponent;
+import javax.faces.event.ActionListener;
+import javax.faces.webapp.UIComponentClassicTagBase;
+import javax.servlet.jsp.JspException;
+import javax.servlet.jsp.tagext.TagSupport;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+import org.apache.myfaces.event.SetPropertyActionListener;
+
+/**
+ * @author Dennis Byrne
+ * @since 1.2
+ */
+
+public class SetPropertyActionListenerTag extends TagSupport
+{
+    
+    private static final Log log = LogFactory.getLog(SetPropertyActionListenerTag.class);
+    
+    private ValueExpression target;
+    
+    private ValueExpression value;
+
+    public int doStartTag() throws JspException 
+    {
+        
+        if(log.isDebugEnabled())
+            log.debug("JSF 1.2 Spec : Create a new instance of the ActionListener");
+
+        ActionListener actionListener = new SetPropertyActionListener(target, value);
+        
+        UIComponentClassicTagBase tag = UIComponentClassicTagBase.getParentUIComponentClassicTagBase(pageContext);
+        
+        if(tag == null)
+            throw new JspException("Could not find a " +
+                    "parent UIComponentClassicTagBase ... is this " +
+                    "tag in a child of a UIComponentClassicTagBase?");
+        
+        if(tag.getCreated())
+        {
+            
+            UIComponent component = tag.getComponentInstance();
+            
+            if(component == null)
+                throw new JspException(" Could not locate a UIComponent " +
+                        "for a UIComponentClassicTagBase w/ a " +
+                        "JSP id of " + tag.getJspId());
+            
+            if( ! ( component instanceof ActionSource ) )
+                throw new JspException("Component w/ id of " + component.getId() 
+                        + " is associated w/ a tag w/ JSP id of " + tag.getJspId() 
+                        + ". This component is of type " + component.getClass() 
+                        + ", which is not an " + ActionSource.class );
+            
+            if(log.isDebugEnabled())
+                log.debug(" ... register it with the UIComponent " +
+                        "instance associated with our most immediately " +
+                        "surrounding UIComponentTagBase");
+            
+            ((ActionSource)component).addActionListener(actionListener);
+            
+        }
+        
+        return SKIP_BODY;
+    }
+    
+    public ValueExpression getTarget()
+    {
+        return target;
+    }
+
+    public void setTarget(ValueExpression target)
+    {
+        this.target = target;
+    }
+
+    public ValueExpression getValue()
+    {
+        return value;
+    }
+
+    public void setValue(ValueExpression value)
+    {
+        this.value = value;
+    }
+    
+    public void release() 
+    {
+        target = null;
+        value = null;
+    }
+    
+}

Propchange: myfaces/core/branches/jsf12/impl/src/main/java/org/apache/myfaces/taglib/core/SetPropertyActionListenerTag.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: myfaces/core/branches/jsf12/impl/src/main/java/org/apache/myfaces/webapp/AbstractMyFacesListener.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/jsf12/impl/src/main/java/org/apache/myfaces/webapp/AbstractMyFacesListener.java?view=diff&rev=518967&r1=518966&r2=518967
==============================================================================
--- myfaces/core/branches/jsf12/impl/src/main/java/org/apache/myfaces/webapp/AbstractMyFacesListener.java (original)
+++ myfaces/core/branches/jsf12/impl/src/main/java/org/apache/myfaces/webapp/AbstractMyFacesListener.java Fri Mar 16 06:24:10 2007
@@ -1,70 +1,70 @@
-package org.apache.myfaces.webapp;
-
-/*
- * 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.
- */
-
-import javax.servlet.ServletContextAttributeEvent;
-import javax.servlet.ServletRequestAttributeEvent;
-import javax.servlet.http.HttpSessionBindingEvent;
-
-import org.apache.myfaces.config.annotation.LifecycleProviderFactory;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-import java.lang.reflect.InvocationTargetException;
-
-/**
- * @author Dennis Byrne
- */
-
-public abstract class AbstractMyFacesListener {
-    private static Log log = LogFactory.getLog(AbstractMyFacesListener.class);
-
-    protected void doPreDestroy(ServletRequestAttributeEvent event, String scope) {
-		doPreDestroy(event.getValue(), event.getName(), scope);
-	}
-
-	protected void doPreDestroy(HttpSessionBindingEvent event, String scope) {
-		doPreDestroy(event.getValue(), event.getName(), scope);
-	}
-
-	protected void doPreDestroy(ServletContextAttributeEvent event, String scope) {
-		doPreDestroy(event.getValue(), event.getName(), scope);
-	}
-	
-	protected void doPreDestroy(Object value, String name, String scope) {
-        
-        if(value != null)
-		{
-			//AnnotatedManagedBeanHandler handler =
-			//	new AnnotatedManagedBeanHandler(value, scope, name);
-
-			//handler.invokePreDestroy();
-
-            try
-            {
-                LifecycleProviderFactory.getLifecycleProviderFactory().getLifecycleProvider(null).destroyInstance(value);
-            } catch (IllegalAccessException e)
-            {
-                log.error("", e);
-            } catch (InvocationTargetException e)
-            {
-                log.error("", e);
-            }
-        }
-	}
-}
+package org.apache.myfaces.webapp;
+
+/*
+ * 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.
+ */
+
+import javax.servlet.ServletContextAttributeEvent;
+import javax.servlet.ServletRequestAttributeEvent;
+import javax.servlet.http.HttpSessionBindingEvent;
+
+import org.apache.myfaces.config.annotation.LifecycleProviderFactory;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+import java.lang.reflect.InvocationTargetException;
+
+/**
+ * @author Dennis Byrne
+ */
+
+public abstract class AbstractMyFacesListener {
+    private static Log log = LogFactory.getLog(AbstractMyFacesListener.class);
+
+    protected void doPreDestroy(ServletRequestAttributeEvent event, String scope) {
+		doPreDestroy(event.getValue(), event.getName(), scope);
+	}
+
+	protected void doPreDestroy(HttpSessionBindingEvent event, String scope) {
+		doPreDestroy(event.getValue(), event.getName(), scope);
+	}
+
+	protected void doPreDestroy(ServletContextAttributeEvent event, String scope) {
+		doPreDestroy(event.getValue(), event.getName(), scope);
+	}
+	
+	protected void doPreDestroy(Object value, String name, String scope) {
+        
+        if(value != null)
+		{
+			//AnnotatedManagedBeanHandler handler =
+			//	new AnnotatedManagedBeanHandler(value, scope, name);
+
+			//handler.invokePreDestroy();
+
+            try
+            {
+                LifecycleProviderFactory.getLifecycleProviderFactory().getLifecycleProvider(null).destroyInstance(value);
+            } catch (IllegalAccessException e)
+            {
+                log.error("", e);
+            } catch (InvocationTargetException e)
+            {
+                log.error("", e);
+            }
+        }
+	}
+}

Propchange: myfaces/core/branches/jsf12/impl/src/main/java/org/apache/myfaces/webapp/AbstractMyFacesListener.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: myfaces/core/branches/jsf12/impl/src/main/java/org/apache/myfaces/webapp/MyFacesHttpSessionAttributeListener.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/jsf12/impl/src/main/java/org/apache/myfaces/webapp/MyFacesHttpSessionAttributeListener.java?view=diff&rev=518967&r1=518966&r2=518967
==============================================================================
--- myfaces/core/branches/jsf12/impl/src/main/java/org/apache/myfaces/webapp/MyFacesHttpSessionAttributeListener.java (original)
+++ myfaces/core/branches/jsf12/impl/src/main/java/org/apache/myfaces/webapp/MyFacesHttpSessionAttributeListener.java Fri Mar 16 06:24:10 2007
@@ -1,26 +1,26 @@
-package org.apache.myfaces.webapp;
-
-import javax.servlet.http.HttpSessionAttributeListener;
-import javax.servlet.http.HttpSessionBindingEvent;
-
-import org.apache.myfaces.config.ManagedBeanBuilder;
-
-/**
- * @author Dennis Byrne
- */
-
-public class MyFacesHttpSessionAttributeListener extends AbstractMyFacesListener
-		implements HttpSessionAttributeListener {
-
-	public void attributeAdded(HttpSessionBindingEvent event) { // noop
-	}
-
-	public void attributeRemoved(HttpSessionBindingEvent event) {
-		doPreDestroy(event, ManagedBeanBuilder.SESSION);
-	}
-
-	public void attributeReplaced(HttpSessionBindingEvent event) {
-		doPreDestroy(event, ManagedBeanBuilder.SESSION);
-	}
-
-}
+package org.apache.myfaces.webapp;
+
+import javax.servlet.http.HttpSessionAttributeListener;
+import javax.servlet.http.HttpSessionBindingEvent;
+
+import org.apache.myfaces.config.ManagedBeanBuilder;
+
+/**
+ * @author Dennis Byrne
+ */
+
+public class MyFacesHttpSessionAttributeListener extends AbstractMyFacesListener
+		implements HttpSessionAttributeListener {
+
+	public void attributeAdded(HttpSessionBindingEvent event) { // noop
+	}
+
+	public void attributeRemoved(HttpSessionBindingEvent event) {
+		doPreDestroy(event, ManagedBeanBuilder.SESSION);
+	}
+
+	public void attributeReplaced(HttpSessionBindingEvent event) {
+		doPreDestroy(event, ManagedBeanBuilder.SESSION);
+	}
+
+}

Propchange: myfaces/core/branches/jsf12/impl/src/main/java/org/apache/myfaces/webapp/MyFacesHttpSessionAttributeListener.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: myfaces/core/branches/jsf12/impl/src/main/java/org/apache/myfaces/webapp/MyFacesHttpSessionListener.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/jsf12/impl/src/main/java/org/apache/myfaces/webapp/MyFacesHttpSessionListener.java?view=diff&rev=518967&r1=518966&r2=518967
==============================================================================
--- myfaces/core/branches/jsf12/impl/src/main/java/org/apache/myfaces/webapp/MyFacesHttpSessionListener.java (original)
+++ myfaces/core/branches/jsf12/impl/src/main/java/org/apache/myfaces/webapp/MyFacesHttpSessionListener.java Fri Mar 16 06:24:10 2007
@@ -1,34 +1,34 @@
-package org.apache.myfaces.webapp;
-
-import java.util.Enumeration;
-
-import javax.servlet.http.HttpSession;
-import javax.servlet.http.HttpSessionEvent;
-import javax.servlet.http.HttpSessionListener;
-
-import org.apache.myfaces.config.ManagedBeanBuilder;
-
-/**
- * @author Dennis Byrne
- */
-
-public class MyFacesHttpSessionListener extends AbstractMyFacesListener implements HttpSessionListener {
-
-	public void sessionCreated(HttpSessionEvent event) { // noop
-	}
-
-	public void sessionDestroyed(HttpSessionEvent event) {
-		
-		HttpSession session = event.getSession();
-		Enumeration<String> attributes = session.getAttributeNames();
-		
-		while(attributes.hasMoreElements())
-		{
-			String name = attributes.nextElement();
-			Object value = session.getAttribute(name);
-			doPreDestroy(value, name, ManagedBeanBuilder.SESSION);
-		}
-		
-	}
-
-}
+package org.apache.myfaces.webapp;
+
+import java.util.Enumeration;
+
+import javax.servlet.http.HttpSession;
+import javax.servlet.http.HttpSessionEvent;
+import javax.servlet.http.HttpSessionListener;
+
+import org.apache.myfaces.config.ManagedBeanBuilder;
+
+/**
+ * @author Dennis Byrne
+ */
+
+public class MyFacesHttpSessionListener extends AbstractMyFacesListener implements HttpSessionListener {
+
+	public void sessionCreated(HttpSessionEvent event) { // noop
+	}
+
+	public void sessionDestroyed(HttpSessionEvent event) {
+		
+		HttpSession session = event.getSession();
+		Enumeration<String> attributes = session.getAttributeNames();
+		
+		while(attributes.hasMoreElements())
+		{
+			String name = attributes.nextElement();
+			Object value = session.getAttribute(name);
+			doPreDestroy(value, name, ManagedBeanBuilder.SESSION);
+		}
+		
+	}
+
+}

Propchange: myfaces/core/branches/jsf12/impl/src/main/java/org/apache/myfaces/webapp/MyFacesHttpSessionListener.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: myfaces/core/branches/jsf12/impl/src/main/java/org/apache/myfaces/webapp/MyFacesServletContextListener.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/jsf12/impl/src/main/java/org/apache/myfaces/webapp/MyFacesServletContextListener.java?view=diff&rev=518967&r1=518966&r2=518967
==============================================================================
--- myfaces/core/branches/jsf12/impl/src/main/java/org/apache/myfaces/webapp/MyFacesServletContextListener.java (original)
+++ myfaces/core/branches/jsf12/impl/src/main/java/org/apache/myfaces/webapp/MyFacesServletContextListener.java Fri Mar 16 06:24:10 2007
@@ -1,25 +1,25 @@
-package org.apache.myfaces.webapp;
-
-import javax.servlet.ServletContextAttributeEvent;
-import javax.servlet.ServletContextAttributeListener;
-
-import org.apache.myfaces.config.ManagedBeanBuilder;
-
-/**
- * @author Dennis Byrne
- */
-
-public class MyFacesServletContextListener extends AbstractMyFacesListener implements ServletContextAttributeListener {
-
-	public void attributeAdded(ServletContextAttributeEvent event) { // noop
-	}
-
-	public void attributeRemoved(ServletContextAttributeEvent event) {
-		doPreDestroy(event, ManagedBeanBuilder.APPLICATION);
-	}
-
-	public void attributeReplaced(ServletContextAttributeEvent event) {
-		doPreDestroy(event, ManagedBeanBuilder.APPLICATION);
-	}
-
-}
+package org.apache.myfaces.webapp;
+
+import javax.servlet.ServletContextAttributeEvent;
+import javax.servlet.ServletContextAttributeListener;
+
+import org.apache.myfaces.config.ManagedBeanBuilder;
+
+/**
+ * @author Dennis Byrne
+ */
+
+public class MyFacesServletContextListener extends AbstractMyFacesListener implements ServletContextAttributeListener {
+
+	public void attributeAdded(ServletContextAttributeEvent event) { // noop
+	}
+
+	public void attributeRemoved(ServletContextAttributeEvent event) {
+		doPreDestroy(event, ManagedBeanBuilder.APPLICATION);
+	}
+
+	public void attributeReplaced(ServletContextAttributeEvent event) {
+		doPreDestroy(event, ManagedBeanBuilder.APPLICATION);
+	}
+
+}

Propchange: myfaces/core/branches/jsf12/impl/src/main/java/org/apache/myfaces/webapp/MyFacesServletContextListener.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: myfaces/core/branches/jsf12/impl/src/main/java/org/apache/myfaces/webapp/MyFacesServletRequestListener.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/jsf12/impl/src/main/java/org/apache/myfaces/webapp/MyFacesServletRequestListener.java?view=diff&rev=518967&r1=518966&r2=518967
==============================================================================
--- myfaces/core/branches/jsf12/impl/src/main/java/org/apache/myfaces/webapp/MyFacesServletRequestListener.java (original)
+++ myfaces/core/branches/jsf12/impl/src/main/java/org/apache/myfaces/webapp/MyFacesServletRequestListener.java Fri Mar 16 06:24:10 2007
@@ -1,34 +1,34 @@
-package org.apache.myfaces.webapp;
-
-import java.util.Enumeration;
-
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletRequestEvent;
-import javax.servlet.ServletRequestListener;
-
-import org.apache.myfaces.config.ManagedBeanBuilder;
-
-/**
- * @author Dennis Byrne
- */
-
-public class MyFacesServletRequestListener extends AbstractMyFacesListener implements ServletRequestListener {
-
-	public void requestDestroyed(ServletRequestEvent event) {
-
-		ServletRequest request = event.getServletRequest();
-		Enumeration<String> attributes = request.getAttributeNames();
-		
-		while(attributes.hasMoreElements()) 
-		{
-			String name = attributes.nextElement();
-			Object attribute = request.getAttribute(name);
-			doPreDestroy(attribute, name, ManagedBeanBuilder.REQUEST);
-		}
-		
-	}
-		
-	public void requestInitialized(ServletRequestEvent event) { // noop
-	}
-
-}
+package org.apache.myfaces.webapp;
+
+import java.util.Enumeration;
+
+import javax.servlet.ServletRequest;
+import javax.servlet.ServletRequestEvent;
+import javax.servlet.ServletRequestListener;
+
+import org.apache.myfaces.config.ManagedBeanBuilder;
+
+/**
+ * @author Dennis Byrne
+ */
+
+public class MyFacesServletRequestListener extends AbstractMyFacesListener implements ServletRequestListener {
+
+	public void requestDestroyed(ServletRequestEvent event) {
+
+		ServletRequest request = event.getServletRequest();
+		Enumeration<String> attributes = request.getAttributeNames();
+		
+		while(attributes.hasMoreElements()) 
+		{
+			String name = attributes.nextElement();
+			Object attribute = request.getAttribute(name);
+			doPreDestroy(attribute, name, ManagedBeanBuilder.REQUEST);
+		}
+		
+	}
+		
+	public void requestInitialized(ServletRequestEvent event) { // noop
+	}
+
+}

Propchange: myfaces/core/branches/jsf12/impl/src/main/java/org/apache/myfaces/webapp/MyFacesServletRequestListener.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: myfaces/core/branches/jsf12/impl/src/main/java/org/apache/myfaces/webapp/MyfacesServletRequestAttributeListener.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/jsf12/impl/src/main/java/org/apache/myfaces/webapp/MyfacesServletRequestAttributeListener.java?view=diff&rev=518967&r1=518966&r2=518967
==============================================================================
--- myfaces/core/branches/jsf12/impl/src/main/java/org/apache/myfaces/webapp/MyfacesServletRequestAttributeListener.java (original)
+++ myfaces/core/branches/jsf12/impl/src/main/java/org/apache/myfaces/webapp/MyfacesServletRequestAttributeListener.java Fri Mar 16 06:24:10 2007
@@ -1,26 +1,26 @@
-package org.apache.myfaces.webapp;
-
-import javax.servlet.ServletRequestAttributeEvent;
-import javax.servlet.ServletRequestAttributeListener;
-
-import org.apache.myfaces.config.ManagedBeanBuilder;
-
-/**
- * @author Dennis Byrne
- */
-
-public class MyfacesServletRequestAttributeListener extends AbstractMyFacesListener
-		implements ServletRequestAttributeListener {
-	
-	public void attributeAdded(ServletRequestAttributeEvent event) { // noop
-	}
-
-	public void attributeRemoved(ServletRequestAttributeEvent event) { 
-		doPreDestroy(event, ManagedBeanBuilder.REQUEST);
-	}
-
-	public void attributeReplaced(ServletRequestAttributeEvent event) {
-		doPreDestroy(event, ManagedBeanBuilder.REQUEST);		
-	}
-
-}
+package org.apache.myfaces.webapp;
+
+import javax.servlet.ServletRequestAttributeEvent;
+import javax.servlet.ServletRequestAttributeListener;
+
+import org.apache.myfaces.config.ManagedBeanBuilder;
+
+/**
+ * @author Dennis Byrne
+ */
+
+public class MyfacesServletRequestAttributeListener extends AbstractMyFacesListener
+		implements ServletRequestAttributeListener {
+	
+	public void attributeAdded(ServletRequestAttributeEvent event) { // noop
+	}
+
+	public void attributeRemoved(ServletRequestAttributeEvent event) { 
+		doPreDestroy(event, ManagedBeanBuilder.REQUEST);
+	}
+
+	public void attributeReplaced(ServletRequestAttributeEvent event) {
+		doPreDestroy(event, ManagedBeanBuilder.REQUEST);		
+	}
+
+}

Propchange: myfaces/core/branches/jsf12/impl/src/main/java/org/apache/myfaces/webapp/MyfacesServletRequestAttributeListener.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: myfaces/core/branches/jsf12/impl/src/main/resources/LICENSE.txt
URL: http://svn.apache.org/viewvc/myfaces/core/branches/jsf12/impl/src/main/resources/LICENSE.txt?view=diff&rev=518967&r1=518966&r2=518967
==============================================================================
--- myfaces/core/branches/jsf12/impl/src/main/resources/LICENSE.txt (original)
+++ myfaces/core/branches/jsf12/impl/src/main/resources/LICENSE.txt Fri Mar 16 06:24:10 2007
@@ -1,174 +1,174 @@
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.

Propchange: myfaces/core/branches/jsf12/impl/src/main/resources/LICENSE.txt
------------------------------------------------------------------------------
    svn:eol-style = native