You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by gr...@apache.org on 2005/05/11 17:47:17 UTC
svn commit: r169649 [3/3] - in /myfaces/trunk/src:
components/org/apache/myfaces/custom/buffer/
components/org/apache/myfaces/custom/calendar/
components/org/apache/myfaces/custom/checkbox/
components/org/apache/myfaces/custom/collapsiblepanel/
components/org/apache/myfaces/custom/creditcardvalidator/
components/org/apache/myfaces/custom/crosstable/
components/org/apache/myfaces/custom/datalist/
components/org/apache/myfaces/custom/div/
components/org/apache/myfaces/custom/emailvalidator/
components/org/apache/myfaces/custom/equalvalidator/
components/org/apache/myfaces/custom/fileupload/
components/org/apache/myfaces/custom/inputHtml/
components/org/apache/myfaces/custom/isbnvalidator/
components/org/apache/myfaces/custom/jslistener/
components/org/apache/myfaces/custom/jsvalueset/
components/org/apache/myfaces/custom/layout/
components/org/apache/myfaces/custom/navigation/
junit/org/apache/myfaces/context/servlet/ myfaces/org/apache/myfaces/config/
myfaces/org/apache/myfaces/config/element/
myfaces/org/apache/myfaces/config/impl/digester/
myfaces/org/apache/myfaces/config/impl/digester/elements/
myfaces/org/apache/myfaces/context/
myfaces/org/apache/myfaces/context/portlet/
myfaces/org/apache/myfaces/context/servlet/
Modified: myfaces/trunk/src/myfaces/org/apache/myfaces/config/RuntimeConfig.java
URL: http://svn.apache.org/viewcvs/myfaces/trunk/src/myfaces/org/apache/myfaces/config/RuntimeConfig.java?rev=169649&r1=169648&r2=169649&view=diff
==============================================================================
--- myfaces/trunk/src/myfaces/org/apache/myfaces/config/RuntimeConfig.java (original)
+++ myfaces/trunk/src/myfaces/org/apache/myfaces/config/RuntimeConfig.java Wed May 11 08:47:12 2005
@@ -1,12 +1,12 @@
/*
* Copyright 2004 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.
@@ -30,36 +30,6 @@
*
* @author Manfred Geiler (latest modification by $Author$)
* @version $Revision$ $Date$
- * $Log$
- * Revision 1.4 2004/10/13 11:50:59 matze
- * renamed packages to org.apache
- *
- * Revision 1.3 2004/09/08 09:28:56 manolito
- * moved MyfacesConfig to package config
- *
- * Revision 1.2 2004/07/07 08:34:58 mwessendorf
- * removed unused import-statements
- *
- * Revision 1.1 2004/07/07 00:25:05 o_rossmueller
- * tidy up config/confignew package (moved confignew classes to package config)
- *
- * Revision 1.4 2004/07/01 22:05:09 mwessendorf
- * ASF switch
- *
- * Revision 1.3 2004/06/16 23:02:24 o_rossmueller
- * merged confignew_branch
- *
- * Revision 1.2.2.1 2004/06/16 01:25:52 o_rossmueller
- * refactorings: FactoryFinder, decorator creation, dispenser (removed reverse order)
- * bug fixes
- * additional tests
- *
- * Revision 1.2 2004/06/08 20:50:09 o_rossmueller
- * completed configurator
- *
- * Revision 1.1 2004/05/17 14:28:28 manolito
- * new configuration concept
- *
*/
public class RuntimeConfig
{
@@ -76,7 +46,7 @@
if (runtimeConfig == null)
{
runtimeConfig = new RuntimeConfig();
- externalContext.getApplicationMap().put(APPLICATION_MAP_PARAM_NAME, runtimeConfig);
+ externalContext.getApplicationMap().put(APPLICATION_MAP_PARAM_NAME, runtimeConfig);
}
return runtimeConfig;
}
Modified: myfaces/trunk/src/myfaces/org/apache/myfaces/config/element/ListEntries.java
URL: http://svn.apache.org/viewcvs/myfaces/trunk/src/myfaces/org/apache/myfaces/config/element/ListEntries.java?rev=169649&r1=169648&r2=169649&view=diff
==============================================================================
--- myfaces/trunk/src/myfaces/org/apache/myfaces/config/element/ListEntries.java (original)
+++ myfaces/trunk/src/myfaces/org/apache/myfaces/config/element/ListEntries.java Wed May 11 08:47:12 2005
@@ -1,12 +1,12 @@
/*
* Copyright 2004 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.
@@ -20,19 +20,6 @@
/**
* @author Manfred Geiler (latest modification by $Author$)
* @version $Revision$ $Date$
- * $Log$
- * Revision 1.2 2004/10/13 11:50:59 matze
- * renamed packages to org.apache
- *
- * Revision 1.1 2004/07/07 00:25:04 o_rossmueller
- * tidy up config/confignew package (moved confignew classes to package config)
- *
- * Revision 1.2 2004/07/01 22:05:04 mwessendorf
- * ASF switch
- *
- * Revision 1.1 2004/05/17 14:28:26 manolito
- * new configuration concept
- *
*/
public interface ListEntries
{
@@ -44,5 +31,5 @@
* @return Iterator over {@link ListEntry} entries
*/
public Iterator getListEntries();
-
+
}
Modified: myfaces/trunk/src/myfaces/org/apache/myfaces/config/element/ListEntry.java
URL: http://svn.apache.org/viewcvs/myfaces/trunk/src/myfaces/org/apache/myfaces/config/element/ListEntry.java?rev=169649&r1=169648&r2=169649&view=diff
==============================================================================
--- myfaces/trunk/src/myfaces/org/apache/myfaces/config/element/ListEntry.java (original)
+++ myfaces/trunk/src/myfaces/org/apache/myfaces/config/element/ListEntry.java Wed May 11 08:47:12 2005
@@ -1,12 +1,12 @@
/*
* Copyright 2004 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.
@@ -18,19 +18,6 @@
/**
* @author Manfred Geiler (latest modification by $Author$)
* @version $Revision$ $Date$
- * $Log$
- * Revision 1.2 2004/10/13 11:50:59 matze
- * renamed packages to org.apache
- *
- * Revision 1.1 2004/07/07 00:25:04 o_rossmueller
- * tidy up config/confignew package (moved confignew classes to package config)
- *
- * Revision 1.2 2004/07/01 22:05:04 mwessendorf
- * ASF switch
- *
- * Revision 1.1 2004/05/17 14:28:26 manolito
- * new configuration concept
- *
*/
public interface ListEntry
{
Modified: myfaces/trunk/src/myfaces/org/apache/myfaces/config/element/ManagedBean.java
URL: http://svn.apache.org/viewcvs/myfaces/trunk/src/myfaces/org/apache/myfaces/config/element/ManagedBean.java?rev=169649&r1=169648&r2=169649&view=diff
==============================================================================
--- myfaces/trunk/src/myfaces/org/apache/myfaces/config/element/ManagedBean.java (original)
+++ myfaces/trunk/src/myfaces/org/apache/myfaces/config/element/ManagedBean.java Wed May 11 08:47:12 2005
@@ -1,12 +1,12 @@
/*
* Copyright 2004 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.
@@ -22,26 +22,6 @@
/**
* @author Manfred Geiler (latest modification by $Author$)
* @version $Revision$ $Date$
- * $Log$
- * Revision 1.2 2004/10/13 11:50:59 matze
- * renamed packages to org.apache
- *
- * Revision 1.1 2004/07/07 00:25:04 o_rossmueller
- * tidy up config/confignew package (moved confignew classes to package config)
- *
- * Revision 1.3 2004/07/01 22:05:04 mwessendorf
- * ASF switch
- *
- * Revision 1.2 2004/06/16 23:02:22 o_rossmueller
- * merged confignew_branch
- *
- * Revision 1.1.2.1 2004/06/16 02:07:22 o_rossmueller
- * get navigation rules from RuntimeConfig
- * refactored all remaining usages of MyFacesFactoryFinder to use RuntimeConfig
- *
- * Revision 1.1 2004/05/17 14:28:26 manolito
- * new configuration concept
- *
*/
public interface ManagedBean
{
Modified: myfaces/trunk/src/myfaces/org/apache/myfaces/config/element/ManagedProperty.java
URL: http://svn.apache.org/viewcvs/myfaces/trunk/src/myfaces/org/apache/myfaces/config/element/ManagedProperty.java?rev=169649&r1=169648&r2=169649&view=diff
==============================================================================
--- myfaces/trunk/src/myfaces/org/apache/myfaces/config/element/ManagedProperty.java (original)
+++ myfaces/trunk/src/myfaces/org/apache/myfaces/config/element/ManagedProperty.java Wed May 11 08:47:12 2005
@@ -1,12 +1,12 @@
/*
* Copyright 2004 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.
@@ -25,32 +25,6 @@
* @author Anton Koinov
* @version $Revision$ $Date$
- * $Log$
- * Revision 1.3 2004/10/13 11:50:59 matze
- * renamed packages to org.apache
- *
- * Revision 1.2 2004/10/05 22:34:21 dave0000
- * bug 1021656 with related improvements
- *
- * Revision 1.1 2004/07/07 00:25:04 o_rossmueller
- * tidy up config/confignew package (moved confignew classes to package config)
- *
- * Revision 1.3 2004/07/01 22:05:04 mwessendorf
- * ASF switch
- *
- * Revision 1.2 2004/06/16 23:02:22 o_rossmueller
- * merged confignew_branch
- *
- * Revision 1.1.2.1 2004/06/13 15:59:06 o_rossmueller
- * started integration of new config mechanism:
- * - factories
- * - components
- * - render kits
- * - managed beans + managed properties (no list/map initialization)
- *
- * Revision 1.1 2004/05/17 14:28:26 manolito
- * new configuration concept
- *
*/
public interface ManagedProperty
{
Modified: myfaces/trunk/src/myfaces/org/apache/myfaces/config/element/MapEntries.java
URL: http://svn.apache.org/viewcvs/myfaces/trunk/src/myfaces/org/apache/myfaces/config/element/MapEntries.java?rev=169649&r1=169648&r2=169649&view=diff
==============================================================================
--- myfaces/trunk/src/myfaces/org/apache/myfaces/config/element/MapEntries.java (original)
+++ myfaces/trunk/src/myfaces/org/apache/myfaces/config/element/MapEntries.java Wed May 11 08:47:12 2005
@@ -1,12 +1,12 @@
/*
* Copyright 2004 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.
@@ -21,19 +21,6 @@
*
* @author Manfred Geiler (latest modification by $Author$)
* @version $Revision$ $Date$
- * $Log$
- * Revision 1.2 2004/10/13 11:50:59 matze
- * renamed packages to org.apache
- *
- * Revision 1.1 2004/07/07 00:25:04 o_rossmueller
- * tidy up config/confignew package (moved confignew classes to package config)
- *
- * Revision 1.2 2004/07/01 22:05:04 mwessendorf
- * ASF switch
- *
- * Revision 1.1 2004/05/17 14:28:26 manolito
- * new configuration concept
- *
*/
public interface MapEntries
{
Modified: myfaces/trunk/src/myfaces/org/apache/myfaces/config/element/MapEntry.java
URL: http://svn.apache.org/viewcvs/myfaces/trunk/src/myfaces/org/apache/myfaces/config/element/MapEntry.java?rev=169649&r1=169648&r2=169649&view=diff
==============================================================================
--- myfaces/trunk/src/myfaces/org/apache/myfaces/config/element/MapEntry.java (original)
+++ myfaces/trunk/src/myfaces/org/apache/myfaces/config/element/MapEntry.java Wed May 11 08:47:12 2005
@@ -1,12 +1,12 @@
/*
* Copyright 2004 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.
@@ -18,19 +18,6 @@
/**
* @author Manfred Geiler (latest modification by $Author$)
* @version $Revision$ $Date$
- * $Log$
- * Revision 1.2 2004/10/13 11:50:59 matze
- * renamed packages to org.apache
- *
- * Revision 1.1 2004/07/07 00:25:04 o_rossmueller
- * tidy up config/confignew package (moved confignew classes to package config)
- *
- * Revision 1.2 2004/07/01 22:05:04 mwessendorf
- * ASF switch
- *
- * Revision 1.1 2004/05/17 14:28:26 manolito
- * new configuration concept
- *
*/
public interface MapEntry
{
Modified: myfaces/trunk/src/myfaces/org/apache/myfaces/config/element/NavigationCase.java
URL: http://svn.apache.org/viewcvs/myfaces/trunk/src/myfaces/org/apache/myfaces/config/element/NavigationCase.java?rev=169649&r1=169648&r2=169649&view=diff
==============================================================================
--- myfaces/trunk/src/myfaces/org/apache/myfaces/config/element/NavigationCase.java (original)
+++ myfaces/trunk/src/myfaces/org/apache/myfaces/config/element/NavigationCase.java Wed May 11 08:47:12 2005
@@ -1,12 +1,12 @@
/*
* Copyright 2004 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.
@@ -22,24 +22,11 @@
*
* @author Manfred Geiler (latest modification by $Author$)
* @version $Revision$ $Date$
- * $Log$
- * Revision 1.2 2004/10/13 11:50:59 matze
- * renamed packages to org.apache
- *
- * Revision 1.1 2004/07/07 00:25:04 o_rossmueller
- * tidy up config/confignew package (moved confignew classes to package config)
- *
- * Revision 1.2 2004/07/01 22:05:04 mwessendorf
- * ASF switch
- *
- * Revision 1.1 2004/05/17 14:28:26 manolito
- * new configuration concept
- *
*/
public interface NavigationCase
{
// <!ELEMENT navigation-case (description*, display-name*, icon*, from-action?, from-outcome?, to-view-id, redirect?)>
-
+
public String getFromAction();
public String getFromOutcome();
public boolean isRedirect();
Modified: myfaces/trunk/src/myfaces/org/apache/myfaces/config/element/NavigationRule.java
URL: http://svn.apache.org/viewcvs/myfaces/trunk/src/myfaces/org/apache/myfaces/config/element/NavigationRule.java?rev=169649&r1=169648&r2=169649&view=diff
==============================================================================
--- myfaces/trunk/src/myfaces/org/apache/myfaces/config/element/NavigationRule.java (original)
+++ myfaces/trunk/src/myfaces/org/apache/myfaces/config/element/NavigationRule.java Wed May 11 08:47:12 2005
@@ -1,12 +1,12 @@
/*
* Copyright 2004 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.
@@ -23,19 +23,6 @@
*
* @author Manfred Geiler (latest modification by $Author$)
* @version $Revision$ $Date$
- * $Log$
- * Revision 1.2 2004/10/13 11:50:59 matze
- * renamed packages to org.apache
- *
- * Revision 1.1 2004/07/07 00:25:04 o_rossmueller
- * tidy up config/confignew package (moved confignew classes to package config)
- *
- * Revision 1.2 2004/07/01 22:05:04 mwessendorf
- * ASF switch
- *
- * Revision 1.1 2004/05/17 14:28:26 manolito
- * new configuration concept
- *
*/
public interface NavigationRule
{
Modified: myfaces/trunk/src/myfaces/org/apache/myfaces/config/element/Renderer.java
URL: http://svn.apache.org/viewcvs/myfaces/trunk/src/myfaces/org/apache/myfaces/config/element/Renderer.java?rev=169649&r1=169648&r2=169649&view=diff
==============================================================================
--- myfaces/trunk/src/myfaces/org/apache/myfaces/config/element/Renderer.java (original)
+++ myfaces/trunk/src/myfaces/org/apache/myfaces/config/element/Renderer.java Wed May 11 08:47:12 2005
@@ -1,12 +1,12 @@
/*
* Copyright 2004 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.
@@ -18,19 +18,6 @@
/**
* @author Manfred Geiler (latest modification by $Author$)
* @version $Revision$ $Date$
- * $Log$
- * Revision 1.2 2004/10/13 11:50:59 matze
- * renamed packages to org.apache
- *
- * Revision 1.1 2004/07/07 00:25:04 o_rossmueller
- * tidy up config/confignew package (moved confignew classes to package config)
- *
- * Revision 1.2 2004/07/01 22:05:04 mwessendorf
- * ASF switch
- *
- * Revision 1.1 2004/05/17 14:28:26 manolito
- * new configuration concept
- *
*/
public interface Renderer
{
Modified: myfaces/trunk/src/myfaces/org/apache/myfaces/config/impl/digester/DigesterFacesConfigDispenserImpl.java
URL: http://svn.apache.org/viewcvs/myfaces/trunk/src/myfaces/org/apache/myfaces/config/impl/digester/DigesterFacesConfigDispenserImpl.java?rev=169649&r1=169648&r2=169649&view=diff
==============================================================================
--- myfaces/trunk/src/myfaces/org/apache/myfaces/config/impl/digester/DigesterFacesConfigDispenserImpl.java (original)
+++ myfaces/trunk/src/myfaces/org/apache/myfaces/config/impl/digester/DigesterFacesConfigDispenserImpl.java Wed May 11 08:47:12 2005
@@ -1,12 +1,12 @@
/*
* Copyright 2004 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.
@@ -35,20 +35,6 @@
/**
* @author <a href="mailto:oliver@rossmueller.com">Oliver Rossmueller</a>
- *
- * $Log$
- * Revision 1.4 2005/03/04 00:28:45 mmarinschek
- * Changes in configuration due to missing Attribute/Property classes for the converter; not building in the functionality yet except for part of the converter properties
- *
- * Revision 1.3 2004/10/13 11:50:59 matze
- * renamed packages to org.apache
- *
- * Revision 1.2 2004/07/10 13:55:42 mwessendorf
- * imports
- *
- * Revision 1.1 2004/07/07 00:25:05 o_rossmueller
- * tidy up config/confignew package (moved confignew classes to package config)
- *
*/
public class DigesterFacesConfigDispenserImpl implements FacesConfigDispenser
{
Modified: myfaces/trunk/src/myfaces/org/apache/myfaces/config/impl/digester/DigesterFacesConfigUnmarshallerImpl.java
URL: http://svn.apache.org/viewcvs/myfaces/trunk/src/myfaces/org/apache/myfaces/config/impl/digester/DigesterFacesConfigUnmarshallerImpl.java?rev=169649&r1=169648&r2=169649&view=diff
==============================================================================
--- myfaces/trunk/src/myfaces/org/apache/myfaces/config/impl/digester/DigesterFacesConfigUnmarshallerImpl.java (original)
+++ myfaces/trunk/src/myfaces/org/apache/myfaces/config/impl/digester/DigesterFacesConfigUnmarshallerImpl.java Wed May 11 08:47:12 2005
@@ -1,12 +1,12 @@
/*
* Copyright 2004 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.
@@ -29,26 +29,6 @@
/**
* @author <a href="mailto:oliver@rossmueller.com">Oliver Rossmueller</a>
- *
- * $Log$
- * Revision 1.6 2005/03/04 00:28:45 mmarinschek
- * Changes in configuration due to missing Attribute/Property classes for the converter; not building in the functionality yet except for part of the converter properties
- *
- * Revision 1.5 2004/11/25 08:34:42 matzew
- * applyed patch MYFACES-26. Thanks to Takashi Okamoto for supporting this.
- *
- * Revision 1.4 2004/10/13 11:50:59 matze
- * renamed packages to org.apache
- *
- * Revision 1.3 2004/07/13 23:11:12 o_rossmueller
- * fix #990302: set redirect correctly for navigation case (+ test in ConfigurationTest)
- *
- * Revision 1.2 2004/07/07 08:34:58 mwessendorf
- * removed unused import-statements
- *
- * Revision 1.1 2004/07/07 00:25:05 o_rossmueller
- * tidy up config/confignew package (moved confignew classes to package config)
- *
*/
public class DigesterFacesConfigUnmarshallerImpl implements FacesConfigUnmarshaller
{
@@ -97,7 +77,7 @@
digester.addCallMethod("faces-config/converter/converter-for-class", "setForClass", 0);
digester.addCallMethod("faces-config/converter/converter-class", "setConverterClass", 0);
digester.addObjectCreate("faces-config/converter/attribute",Attribute.class);
- digester.addSetNext("faces-config/converter/attribute","addAttribute");
+ digester.addSetNext("faces-config/converter/attribute","addAttribute");
digester.addCallMethod("faces-config/converter/attribute/description", "addDescription", 0);
digester.addCallMethod("faces-config/converter/attribute/display-name", "addDisplayName", 0);
digester.addCallMethod("faces-config/converter/attribute/icon", "addIcon", 0);
Modified: myfaces/trunk/src/myfaces/org/apache/myfaces/config/impl/digester/elements/Attribute.java
URL: http://svn.apache.org/viewcvs/myfaces/trunk/src/myfaces/org/apache/myfaces/config/impl/digester/elements/Attribute.java?rev=169649&r1=169648&r2=169649&view=diff
==============================================================================
--- myfaces/trunk/src/myfaces/org/apache/myfaces/config/impl/digester/elements/Attribute.java (original)
+++ myfaces/trunk/src/myfaces/org/apache/myfaces/config/impl/digester/elements/Attribute.java Wed May 11 08:47:12 2005
@@ -11,7 +11,7 @@
/**
* @author Martin Marinschek
* @version $Revision$ $Date$
- *
+ *
The "attribute" element represents a named, typed, value associated with
the parent UIComponent via the generic attributes mechanism.
@@ -19,13 +19,8 @@
component.
<!ELEMENT attribute (description*, display-name*, icon*, attribute-name, attribute-class, default-value?, suggested-value?, attribute-extension*)>
-
+
* <p/>
- * $Log$
- * Revision 1.1 2005/03/04 00:28:45 mmarinschek
- * Changes in configuration due to missing Attribute/Property classes for the converter; not building in the functionality yet except for part of the converter properties
- *
- *
*/
public class Attribute
{
Modified: myfaces/trunk/src/myfaces/org/apache/myfaces/config/impl/digester/elements/ManagedProperty.java
URL: http://svn.apache.org/viewcvs/myfaces/trunk/src/myfaces/org/apache/myfaces/config/impl/digester/elements/ManagedProperty.java?rev=169649&r1=169648&r2=169649&view=diff
==============================================================================
--- myfaces/trunk/src/myfaces/org/apache/myfaces/config/impl/digester/elements/ManagedProperty.java (original)
+++ myfaces/trunk/src/myfaces/org/apache/myfaces/config/impl/digester/elements/ManagedProperty.java Wed May 11 08:47:12 2005
@@ -1,12 +1,12 @@
/*
* Copyright 2004 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.
@@ -27,13 +27,6 @@
* @author Anton Koinov
*
* @version $Revision$ $Date$
- * $Log$
- * Revision 1.3 2004/10/13 11:51:00 matze
- * renamed packages to org.apache
- *
- * Revision 1.2 2004/10/05 22:34:21 dave0000
- * bug 1021656 with related improvements
- *
*/
public class ManagedProperty implements org.apache.myfaces.config.element.ManagedProperty
{
@@ -121,12 +114,12 @@
_type = TYPE_VALUE;
}
-
+
public Object getRuntimeValue(FacesContext facesContext)
{
if (_valueBinding == null)
{
- _valueBinding =
+ _valueBinding =
UIComponentTag.isValueReference(_value)
? facesContext.getApplication().createValueBinding(_value)
: DUMMY_VB;
@@ -144,22 +137,22 @@
throw new UnsupportedOperationException();
}
- public Class getType(FacesContext facesContext)
+ public Class getType(FacesContext facesContext)
{
throw new UnsupportedOperationException();
}
- public Object getValue(FacesContext facesContext)
+ public Object getValue(FacesContext facesContext)
{
throw new UnsupportedOperationException();
}
- public boolean isReadOnly(FacesContext facesContext)
+ public boolean isReadOnly(FacesContext facesContext)
{
throw new UnsupportedOperationException();
}
- public void setValue(FacesContext facesContext, Object value)
+ public void setValue(FacesContext facesContext, Object value)
{
throw new UnsupportedOperationException();
}
Modified: myfaces/trunk/src/myfaces/org/apache/myfaces/config/impl/digester/elements/Property.java
URL: http://svn.apache.org/viewcvs/myfaces/trunk/src/myfaces/org/apache/myfaces/config/impl/digester/elements/Property.java?rev=169649&r1=169648&r2=169649&view=diff
==============================================================================
--- myfaces/trunk/src/myfaces/org/apache/myfaces/config/impl/digester/elements/Property.java (original)
+++ myfaces/trunk/src/myfaces/org/apache/myfaces/config/impl/digester/elements/Property.java Wed May 11 08:47:12 2005
@@ -23,10 +23,6 @@
<!ELEMENT property (description*, display-name*, icon*, property-name, property-class, default-value?, suggested-value?, property-extension*)>
* <p/>
- * $Log$
- * Revision 1.1 2005/03/04 00:28:45 mmarinschek
- * Changes in configuration due to missing Attribute/Property classes for the converter; not building in the functionality yet except for part of the converter properties
- *
*/
public class Property
{
Modified: myfaces/trunk/src/myfaces/org/apache/myfaces/context/ReleaseableExternalContext.java
URL: http://svn.apache.org/viewcvs/myfaces/trunk/src/myfaces/org/apache/myfaces/context/ReleaseableExternalContext.java?rev=169649&r1=169648&r2=169649&view=diff
==============================================================================
--- myfaces/trunk/src/myfaces/org/apache/myfaces/context/ReleaseableExternalContext.java (original)
+++ myfaces/trunk/src/myfaces/org/apache/myfaces/context/ReleaseableExternalContext.java Wed May 11 08:47:12 2005
@@ -21,12 +21,8 @@
*
* @author Stan Silvert (latest modification by $Author$)
* @version $Revision$ $Date$
- * $Log$
- * Revision 1.1 2005/01/26 17:03:10 matzew
- * MYFACES-86. portlet support provided by Stan Silver (JBoss Group)
- *
*/
-public interface ReleaseableExternalContext
+public interface ReleaseableExternalContext
{
/**
* Release resources that the ExternalContext is holding onto.
Modified: myfaces/trunk/src/myfaces/org/apache/myfaces/context/portlet/ApplicationMap.java
URL: http://svn.apache.org/viewcvs/myfaces/trunk/src/myfaces/org/apache/myfaces/context/portlet/ApplicationMap.java?rev=169649&r1=169648&r2=169649&view=diff
==============================================================================
--- myfaces/trunk/src/myfaces/org/apache/myfaces/context/portlet/ApplicationMap.java (original)
+++ myfaces/trunk/src/myfaces/org/apache/myfaces/context/portlet/ApplicationMap.java Wed May 11 08:47:12 2005
@@ -1,12 +1,12 @@
/*
* Copyright 2004 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.
@@ -23,13 +23,9 @@
/**
* PortletContext attributes as a Map.
- *
+ *
* @author Stan Silvert (latest modification by $Author$)
* @version $Revision$ $Date$
- * $Log$
- * Revision 1.1 2005/01/26 17:03:09 matzew
- * MYFACES-86. portlet support provided by Stan Silver (JBoss Group)
- *
*/
public class ApplicationMap extends AbstractAttributeMap
{
Modified: myfaces/trunk/src/myfaces/org/apache/myfaces/context/portlet/InitParameterMap.java
URL: http://svn.apache.org/viewcvs/myfaces/trunk/src/myfaces/org/apache/myfaces/context/portlet/InitParameterMap.java?rev=169649&r1=169648&r2=169649&view=diff
==============================================================================
--- myfaces/trunk/src/myfaces/org/apache/myfaces/context/portlet/InitParameterMap.java (original)
+++ myfaces/trunk/src/myfaces/org/apache/myfaces/context/portlet/InitParameterMap.java Wed May 11 08:47:12 2005
@@ -1,12 +1,12 @@
/*
* Copyright 2004 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.
@@ -25,13 +25,9 @@
/**
* ServletContext init parameters as Map.
- *
+ *
* @author Stan Silvert (latest modification by $Author$)
* @version $Revision$ $Date$
- * $Log$
- * Revision 1.1 2005/01/26 17:03:09 matzew
- * MYFACES-86. portlet support provided by Stan Silver (JBoss Group)
- *
*/
public class InitParameterMap extends AbstractAttributeMap
{
@@ -63,19 +59,19 @@
{
return _portletContext.getInitParameterNames();
}
-
+
public boolean equals(Object o) {
boolean retValue;
-
+
retValue = super.equals(o);
return retValue;
}
-
+
public int hashCode() {
int retValue;
-
+
retValue = super.hashCode();
return retValue;
}
-
+
}
Modified: myfaces/trunk/src/myfaces/org/apache/myfaces/context/portlet/PortletExternalContextImpl.java
URL: http://svn.apache.org/viewcvs/myfaces/trunk/src/myfaces/org/apache/myfaces/context/portlet/PortletExternalContextImpl.java?rev=169649&r1=169648&r2=169649&view=diff
==============================================================================
--- myfaces/trunk/src/myfaces/org/apache/myfaces/context/portlet/PortletExternalContextImpl.java (original)
+++ myfaces/trunk/src/myfaces/org/apache/myfaces/context/portlet/PortletExternalContextImpl.java Wed May 11 08:47:12 2005
@@ -52,22 +52,18 @@
*
* @author Stan Silvert (latest modification by $Author$)
* @version $Revision$ $Date$
- * $Log$
- * Revision 1.1 2005/01/26 17:03:09 matzew
- * MYFACES-86. portlet support provided by Stan Silver (JBoss Group)
- *
*/
public class PortletExternalContextImpl extends ExternalContext implements ReleaseableExternalContext {
-
+
private static final Log log = LogFactory.getLog(PortletExternalContextImpl.class);
-
+
private static final String INIT_PARAMETER_MAP_ATTRIBUTE = InitParameterMap.class.getName();
private static final Map EMPTY_UNMODIFIABLE_MAP = Collections.unmodifiableMap(new HashMap(0));
-
+
PortletContext _portletContext;
PortletRequest _portletRequest;
PortletResponse _portletResponse;
-
+
private Map _applicationMap;
private Map _sessionMap;
private Map _requestMap;
@@ -78,18 +74,18 @@
private Map _requestCookieMap;
private Map _initParameterMap;
private boolean _isActionRequest;
-
+
/** Creates a new instance of PortletFacesContextImpl */
public PortletExternalContextImpl(PortletContext portletContext,
PortletRequest portletRequest,
- PortletResponse portletResponse)
+ PortletResponse portletResponse)
{
_portletContext = portletContext;
_portletRequest = portletRequest;
_portletResponse = portletResponse;
_isActionRequest = (portletRequest != null &&
portletRequest instanceof ActionRequest);
-
+
if (_isActionRequest)
{
ActionRequest actionRequest = (ActionRequest)portletRequest;
@@ -105,7 +101,7 @@
PortletSession session = portletRequest.getPortletSession(false);
if (session != null) {
- characterEncoding = (String) session.getAttribute(ViewHandler.CHARACTER_ENCODING_KEY,
+ characterEncoding = (String) session.getAttribute(ViewHandler.CHARACTER_ENCODING_KEY,
PortletSession.PORTLET_SCOPE);
}
@@ -120,7 +116,7 @@
}
}
}
-
+
private String lookupCharacterEncoding(String contentType)
{
String characterEncoding = null;
@@ -153,15 +149,15 @@
}
return characterEncoding;
}
-
- public void dispatch(String path) throws IOException
+
+ public void dispatch(String path) throws IOException
{
if (_isActionRequest)
{ // dispatch only allowed for RenderRequest
String msg = "Can not call dispatch() during a portlet ActionRequest";
throw new IllegalStateException(msg);
}
-
+
PortletRequestDispatcher requestDispatcher
= _portletContext.getRequestDispatcher(path); //TODO: figure out why I need named dispatcher
try
@@ -181,27 +177,27 @@
}
}
}
-
+
public String encodeActionURL(String url) {
checkNull(url, "url");
return _portletResponse.encodeURL(url);
}
-
+
public String encodeNamespace(String name) {
if (_isActionRequest)
{ // encodeNamespace only allowed for RenderRequest
String msg = "Can not call encodeNamespace() during a portlet ActionRequest";
throw new IllegalStateException(msg);
}
-
+
return ((RenderResponse)_portletResponse).getNamespace() + name;
}
-
+
public String encodeResourceURL(String url) {
checkNull(url, "url");
return _portletResponse.encodeURL(url);
}
-
+
public Map getApplicationMap() {
if (_applicationMap == null)
{
@@ -209,19 +205,19 @@
}
return _applicationMap;
}
-
+
public String getAuthType() {
return _portletRequest.getAuthType();
}
-
+
public Object getContext() {
return _portletContext;
}
-
+
public String getInitParameter(String name) {
return _portletContext.getInitParameter(name);
}
-
+
public Map getInitParameterMap() {
if (_initParameterMap == null)
{
@@ -234,23 +230,23 @@
}
return _initParameterMap;
}
-
+
public String getRemoteUser() {
return _portletRequest.getRemoteUser();
}
-
+
public Object getRequest() {
return _portletRequest;
}
-
+
public String getRequestContextPath() {
return _portletRequest.getContextPath();
}
-
+
public Map getRequestCookieMap() {
return EMPTY_UNMODIFIABLE_MAP;
}
-
+
public Map getRequestHeaderMap() {
if (_requestHeaderMap == null)
{
@@ -258,7 +254,7 @@
}
return _requestHeaderMap;
}
-
+
public Map getRequestHeaderValuesMap() {
if (_requestHeaderValuesMap == null)
{
@@ -266,15 +262,15 @@
}
return _requestHeaderValuesMap;
}
-
+
public Locale getRequestLocale() {
return _portletRequest.getLocale();
}
-
+
public Iterator getRequestLocales() {
return new EnumerationIterator(_portletRequest.getLocales());
}
-
+
public Map getRequestMap() {
if (_requestMap == null)
{
@@ -282,7 +278,7 @@
}
return _requestMap;
}
-
+
public Map getRequestParameterMap() {
if (_requestParameterMap == null)
{
@@ -290,12 +286,12 @@
}
return _requestParameterMap;
}
-
+
public Iterator getRequestParameterNames() {
// TODO: find out why it is not done this way in ServletExternalContextImpl
return new EnumerationIterator(_portletRequest.getParameterNames());
}
-
+
public Map getRequestParameterValuesMap() {
if (_requestParameterValuesMap == null)
{
@@ -303,40 +299,40 @@
}
return _requestParameterValuesMap;
}
-
+
public String getRequestPathInfo() {
return null; // must return null
}
-
+
public String getRequestServletPath() {
return null; // must return null
}
-
+
public URL getResource(String path) throws MalformedURLException {
checkNull(path, "path");
-
+
return _portletContext.getResource(path);
}
-
+
public InputStream getResourceAsStream(String path) {
checkNull(path, "path");
-
+
return _portletContext.getResourceAsStream(path);
}
-
+
public Set getResourcePaths(String path) {
checkNull(path, "path");
return _portletContext.getResourcePaths(path);
}
-
+
public Object getResponse() {
return _portletResponse;
}
-
+
public Object getSession(boolean create) {
return _portletRequest.getPortletSession(create);
}
-
+
public Map getSessionMap() {
if (_sessionMap == null)
{
@@ -344,30 +340,30 @@
}
return _sessionMap;
}
-
+
public Principal getUserPrincipal() {
return _portletRequest.getUserPrincipal();
}
-
+
public boolean isUserInRole(String role) {
checkNull(role, "role");
-
+
return _portletRequest.isUserInRole(role);
}
-
+
public void log(String message) {
checkNull(message, "message");
-
+
_portletContext.log(message);
}
-
+
public void log(String message, Throwable exception) {
checkNull(message, "message");
checkNull(exception, "exception");
-
+
_portletContext.log(message, exception);
}
-
+
public void redirect(String url) throws IOException {
if (_portletResponse instanceof ActionResponse)
{
@@ -378,7 +374,7 @@
throw new IllegalArgumentException("Only ActionResponse supported");
}
}
-
+
public void release() {
_portletContext = null;
_portletRequest = null;
@@ -393,13 +389,13 @@
_requestCookieMap = null;
_initParameterMap = null;
}
-
- private void checkNull(Object o, String param)
+
+ private void checkNull(Object o, String param)
{
if (o == null)
{
throw new NullPointerException(param + " can not be null.");
}
}
-
+
}
Modified: myfaces/trunk/src/myfaces/org/apache/myfaces/context/portlet/RequestHeaderMap.java
URL: http://svn.apache.org/viewcvs/myfaces/trunk/src/myfaces/org/apache/myfaces/context/portlet/RequestHeaderMap.java?rev=169649&r1=169648&r2=169649&view=diff
==============================================================================
--- myfaces/trunk/src/myfaces/org/apache/myfaces/context/portlet/RequestHeaderMap.java (original)
+++ myfaces/trunk/src/myfaces/org/apache/myfaces/context/portlet/RequestHeaderMap.java Wed May 11 08:47:12 2005
@@ -1,12 +1,12 @@
/*
* Copyright 2004 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.
@@ -23,13 +23,9 @@
/**
* PortletRequest headers as Map.
- *
+ *
* @author Stan Silvert (latest modification by $Author$)
* @version $Revision$ $Date$
- * $Log$
- * Revision 1.1 2005/01/26 17:03:09 matzew
- * MYFACES-86. portlet support provided by Stan Silver (JBoss Group)
- *
*/
public class RequestHeaderMap extends AbstractAttributeMap
{
Modified: myfaces/trunk/src/myfaces/org/apache/myfaces/context/portlet/RequestHeaderValuesMap.java
URL: http://svn.apache.org/viewcvs/myfaces/trunk/src/myfaces/org/apache/myfaces/context/portlet/RequestHeaderValuesMap.java?rev=169649&r1=169648&r2=169649&view=diff
==============================================================================
--- myfaces/trunk/src/myfaces/org/apache/myfaces/context/portlet/RequestHeaderValuesMap.java (original)
+++ myfaces/trunk/src/myfaces/org/apache/myfaces/context/portlet/RequestHeaderValuesMap.java Wed May 11 08:47:12 2005
@@ -1,12 +1,12 @@
/*
* Copyright 2004 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.
@@ -26,13 +26,9 @@
/**
* PortletRequest header values (multi-value headers) as Map of String[].
- *
+ *
* @author Stan Silvert (latest modification by $Author$)
* @version $Revision$ $Date$
- * $Log$
- * Revision 1.1 2005/01/26 17:03:09 matzew
- * MYFACES-86. portlet support provided by Stan Silver (JBoss Group)
- *
*/
public class RequestHeaderValuesMap extends AbstractAttributeMap
{
Modified: myfaces/trunk/src/myfaces/org/apache/myfaces/context/portlet/RequestMap.java
URL: http://svn.apache.org/viewcvs/myfaces/trunk/src/myfaces/org/apache/myfaces/context/portlet/RequestMap.java?rev=169649&r1=169648&r2=169649&view=diff
==============================================================================
--- myfaces/trunk/src/myfaces/org/apache/myfaces/context/portlet/RequestMap.java (original)
+++ myfaces/trunk/src/myfaces/org/apache/myfaces/context/portlet/RequestMap.java Wed May 11 08:47:12 2005
@@ -1,12 +1,12 @@
/*
* Copyright 2004 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.
@@ -22,13 +22,9 @@
/**
* PortletRequest attributes Map.
- *
+ *
* @author Stan Silvert (latest modification by $Author$)
* @version $Revision$ $Date$
- * $Log$
- * Revision 1.1 2005/01/26 17:03:09 matzew
- * MYFACES-86. portlet support provided by Stan Silver (JBoss Group)
- *
*/
public class RequestMap extends AbstractAttributeMap
{
Modified: myfaces/trunk/src/myfaces/org/apache/myfaces/context/portlet/RequestParameterMap.java
URL: http://svn.apache.org/viewcvs/myfaces/trunk/src/myfaces/org/apache/myfaces/context/portlet/RequestParameterMap.java?rev=169649&r1=169648&r2=169649&view=diff
==============================================================================
--- myfaces/trunk/src/myfaces/org/apache/myfaces/context/portlet/RequestParameterMap.java (original)
+++ myfaces/trunk/src/myfaces/org/apache/myfaces/context/portlet/RequestParameterMap.java Wed May 11 08:47:12 2005
@@ -1,12 +1,12 @@
/*
* Copyright 2004 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.
@@ -22,13 +22,9 @@
/**
* PortletRequest parameters as Map.
- *
+ *
* @author Stan Silvert (latest modification by $Author$)
* @version $Revision$ $Date$
- * $Log$
- * Revision 1.1 2005/01/26 17:03:09 matzew
- * MYFACES-86. portlet support provided by Stan Silver (JBoss Group)
- *
*/
public class RequestParameterMap extends AbstractAttributeMap
{
Modified: myfaces/trunk/src/myfaces/org/apache/myfaces/context/portlet/RequestParameterValuesMap.java
URL: http://svn.apache.org/viewcvs/myfaces/trunk/src/myfaces/org/apache/myfaces/context/portlet/RequestParameterValuesMap.java?rev=169649&r1=169648&r2=169649&view=diff
==============================================================================
--- myfaces/trunk/src/myfaces/org/apache/myfaces/context/portlet/RequestParameterValuesMap.java (original)
+++ myfaces/trunk/src/myfaces/org/apache/myfaces/context/portlet/RequestParameterValuesMap.java Wed May 11 08:47:12 2005
@@ -1,12 +1,12 @@
/*
* Copyright 2004 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.
@@ -21,13 +21,9 @@
/**
* PortletRequest multi-value parameters as Map.
- *
+ *
* @author Stan Silvert (latest modification by $Author$)
* @version $Revision$ $Date$
- * $Log$
- * Revision 1.1 2005/01/26 17:03:09 matzew
- * MYFACES-86. portlet support provided by Stan Silver (JBoss Group)
- *
*/
public class RequestParameterValuesMap extends AbstractAttributeMap
{
Modified: myfaces/trunk/src/myfaces/org/apache/myfaces/context/portlet/SessionMap.java
URL: http://svn.apache.org/viewcvs/myfaces/trunk/src/myfaces/org/apache/myfaces/context/portlet/SessionMap.java?rev=169649&r1=169648&r2=169649&view=diff
==============================================================================
--- myfaces/trunk/src/myfaces/org/apache/myfaces/context/portlet/SessionMap.java (original)
+++ myfaces/trunk/src/myfaces/org/apache/myfaces/context/portlet/SessionMap.java Wed May 11 08:47:12 2005
@@ -1,12 +1,12 @@
/*
* Copyright 2004 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.
@@ -24,14 +24,9 @@
/**
* Portlet scope PortletSession attibutes as Map.
- *
+ *
* @author Stan Silvert (latest modification by $Author$)
* @version $Revision$ $Date$
- * $Log$
- * Revision 1.1 2005/01/26 17:03:09 matzew
- * MYFACES-86. portlet support provided by Stan Silver (JBoss Group)
- *
- *
*/
public class SessionMap extends AbstractAttributeMap
{
@@ -45,7 +40,7 @@
protected Object getAttribute(String key)
{
PortletSession portletSession = getSession();
- return (portletSession == null)
+ return (portletSession == null)
? null : portletSession.getAttribute(key.toString(), PortletSession.PORTLET_SCOPE);
}
@@ -70,7 +65,7 @@
? NullEnumeration.instance()
: portletSession.getAttributeNames(PortletSession.PORTLET_SCOPE);
}
-
+
private PortletSession getSession()
{
return _portletRequest.getPortletSession(false);
Modified: myfaces/trunk/src/myfaces/org/apache/myfaces/context/servlet/AbstractAttributeMap.java
URL: http://svn.apache.org/viewcvs/myfaces/trunk/src/myfaces/org/apache/myfaces/context/servlet/AbstractAttributeMap.java?rev=169649&r1=169648&r2=169649&view=diff
==============================================================================
--- myfaces/trunk/src/myfaces/org/apache/myfaces/context/servlet/AbstractAttributeMap.java (original)
+++ myfaces/trunk/src/myfaces/org/apache/myfaces/context/servlet/AbstractAttributeMap.java Wed May 11 08:47:12 2005
@@ -1,12 +1,12 @@
/*
* Copyright 2004 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.
@@ -28,23 +28,9 @@
/**
* Helper Map implementation for use with different Attribute Maps.
- *
+ *
* @author Anton Koinov (latest modification by $Author$)
* @version $Revision$ $Date$
- *
- * $Log$
- * Revision 1.9 2004/10/13 11:51:00 matze
- * renamed packages to org.apache
- *
- * Revision 1.8 2004/07/03 18:29:18 dave0000
- * Remove redundant code, small fixes.
- *
- * Revision 1.7 2004/07/01 22:05:04 mwessendorf
- * ASF switch
- *
- * Revision 1.6 2004/03/30 05:34:56 dave0000
- * change entrySet() to not use HashMap and avoid copying data
- *
*/
public abstract class AbstractAttributeMap
implements Map
@@ -236,14 +222,14 @@
{
return AbstractAttributeMap.this.containsValue(o);
}
-
+
public boolean remove(Object o)
{
if (o == null)
{
return false;
}
-
+
for (Iterator it = iterator(); it.hasNext();)
{
if (o.equals(it.next()))
@@ -252,7 +238,7 @@
return true;
}
}
-
+
return false;
}
}
@@ -271,13 +257,13 @@
public Iterator iterator() {
return new EntryIterator();
}
-
+
public boolean contains(Object o) {
if (!(o instanceof Entry))
{
return false;
}
-
+
Entry entry = (Entry) o;
Object key = entry.getKey();
Object value = entry.getValue();
@@ -285,25 +271,25 @@
{
return false;
}
-
+
return value.equals(AbstractAttributeMap.this.get(key));
}
-
+
public boolean remove(Object o) {
if (!(o instanceof Entry))
{
return false;
}
-
+
Entry entry = (Entry) o;
Object key = entry.getKey();
Object value = entry.getValue();
- if (key == null || value == null
+ if (key == null || value == null
|| !value.equals(AbstractAttributeMap.this.get(key)))
{
return false;
}
-
+
return AbstractAttributeMap.this.remove(((Entry) o).getKey()) != null;
}
}
@@ -318,7 +304,7 @@
public Object next()
{
super.next();
- // Must create new Entry every time--value of the entry must stay
+ // Must create new Entry every time--value of the entry must stay
// linked to the same attribute name
return new EntrySetEntry(_currentKey);
}
@@ -327,12 +313,12 @@
private class EntrySetEntry implements Entry
{
private final Object _currentKey;
-
+
public EntrySetEntry(Object currentKey)
{
_currentKey = currentKey;
}
-
+
public Object getKey()
{
return _currentKey;
Modified: myfaces/trunk/src/myfaces/org/apache/myfaces/context/servlet/ApplicationMap.java
URL: http://svn.apache.org/viewcvs/myfaces/trunk/src/myfaces/org/apache/myfaces/context/servlet/ApplicationMap.java?rev=169649&r1=169648&r2=169649&view=diff
==============================================================================
--- myfaces/trunk/src/myfaces/org/apache/myfaces/context/servlet/ApplicationMap.java (original)
+++ myfaces/trunk/src/myfaces/org/apache/myfaces/context/servlet/ApplicationMap.java Wed May 11 08:47:12 2005
@@ -1,12 +1,12 @@
/*
* Copyright 2004 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.
@@ -22,20 +22,9 @@
/**
* ServletContext attributes as a Map.
- *
+ *
* @author Anton Koinov (latest modification by $Author$)
* @version $Revision$ $Date$
- *
- * $Log$
- * Revision 1.10 2004/10/13 11:51:00 matze
- * renamed packages to org.apache
- *
- * Revision 1.9 2004/07/01 22:05:04 mwessendorf
- * ASF switch
- *
- * Revision 1.8 2004/03/30 07:43:33 dave0000
- * add $Log
- *
*/
public class ApplicationMap extends AbstractAttributeMap
{
Modified: myfaces/trunk/src/myfaces/org/apache/myfaces/context/servlet/CookieMap.java
URL: http://svn.apache.org/viewcvs/myfaces/trunk/src/myfaces/org/apache/myfaces/context/servlet/CookieMap.java?rev=169649&r1=169648&r2=169649&view=diff
==============================================================================
--- myfaces/trunk/src/myfaces/org/apache/myfaces/context/servlet/CookieMap.java (original)
+++ myfaces/trunk/src/myfaces/org/apache/myfaces/context/servlet/CookieMap.java Wed May 11 08:47:12 2005
@@ -1,12 +1,12 @@
/*
* Copyright 2004 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.
@@ -22,20 +22,10 @@
/**
* HttpServletRequest Cookies as Map.
- *
+ *
* @author Dimitry D'hondt
* @author Anton Koinov
* @version $Revision$ $Date$
- * $Log$
- * Revision 1.10 2004/11/24 13:40:11 manolito
- * additional null cookies fixes
- *
- * Revision 1.9 2004/11/24 13:36:11 manolito
- * SF-Bug #1072442 fixed
- *
- * Revision 1.8 2004/11/23 12:26:45 manolito
- * SF-Bug #1071640 fixed
- *
*/
public class CookieMap extends AbstractAttributeMap
{
@@ -140,13 +130,13 @@
return new CookieNameEnumeration(cookies);
}
}
-
+
private static class CookieNameEnumeration implements Enumeration
{
private final Cookie[] _cookies;
private final int _length;
private int _index;
-
+
public CookieNameEnumeration(Cookie[] cookies)
{
_cookies = cookies;
Modified: myfaces/trunk/src/myfaces/org/apache/myfaces/context/servlet/ServletFacesContextImpl.java
URL: http://svn.apache.org/viewcvs/myfaces/trunk/src/myfaces/org/apache/myfaces/context/servlet/ServletFacesContextImpl.java?rev=169649&r1=169648&r2=169649&view=diff
==============================================================================
--- myfaces/trunk/src/myfaces/org/apache/myfaces/context/servlet/ServletFacesContextImpl.java (original)
+++ myfaces/trunk/src/myfaces/org/apache/myfaces/context/servlet/ServletFacesContextImpl.java Wed May 11 08:47:12 2005
@@ -1,12 +1,12 @@
/*
* Copyright 2004 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.
@@ -43,25 +43,6 @@
* @author Manfred Geiler (latest modification by $Author$)
* @author Anton Koinov
* @version $Revision$ $Date$
- * $Log$
- * Revision 1.18 2005/01/26 17:03:11 matzew
- * MYFACES-86. portlet support provided by Stan Silver (JBoss Group)
- *
- * Revision 1.17 2004/10/13 11:51:00 matze
- * renamed packages to org.apache
- *
- * Revision 1.16 2004/07/18 21:44:40 o_rossmueller
- * fix #992629: implemented FacesContext.getRenderKit()
- *
- * Revision 1.15 2004/07/01 22:05:04 mwessendorf
- * ASF switch
- *
- * Revision 1.14 2004/04/16 13:56:59 manolito
- * Bug #922317 - ClassCastException in action handler after adding message
- *
- * Revision 1.13 2004/03/31 11:58:38 manolito
- * custom component refactoring
- *
*/
public class ServletFacesContextImpl
extends FacesContext
@@ -89,22 +70,22 @@
// TODO: FIXME: the name of this class should be changed.
public ServletFacesContextImpl(PortletContext portletContext,
PortletRequest portletRequest,
- PortletResponse portletResponse)
+ PortletResponse portletResponse)
{
this(new PortletExternalContextImpl(portletContext,
portletRequest,
portletResponse));
}
-
+
public ServletFacesContextImpl(ServletContext servletContext,
ServletRequest servletRequest,
ServletResponse servletResponse)
{
- this(new ServletExternalContextImpl(servletContext,
+ this(new ServletExternalContextImpl(servletContext,
servletRequest,
servletResponse));
}
-
+
private ServletFacesContextImpl(ReleaseableExternalContext externalContext)
{
_application = ((ApplicationFactory)FactoryFinder.getFactory(FactoryFinder.APPLICATION_FACTORY))
@@ -213,7 +194,7 @@
}
String renderKitId = getViewRoot().getRenderKitId();
-
+
if (renderKitId == null)
{
return null;
@@ -322,7 +303,7 @@
{
_responseComplete = true;
}
-
+
// Portlet need to do this to change from ActionRequest/Response to
// RenderRequest/Response
public void setExternalContext(ReleaseableExternalContext extContext)
Modified: myfaces/trunk/src/myfaces/org/apache/myfaces/context/servlet/SessionMap.java
URL: http://svn.apache.org/viewcvs/myfaces/trunk/src/myfaces/org/apache/myfaces/context/servlet/SessionMap.java?rev=169649&r1=169648&r2=169649&view=diff
==============================================================================
--- myfaces/trunk/src/myfaces/org/apache/myfaces/context/servlet/SessionMap.java (original)
+++ myfaces/trunk/src/myfaces/org/apache/myfaces/context/servlet/SessionMap.java Wed May 11 08:47:12 2005
@@ -1,12 +1,12 @@
/*
* Copyright 2004 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.
@@ -23,19 +23,9 @@
/**
* HttpSession attibutes as Map.
- *
+ *
* @author Anton Koinov (latest modification by $Author$)
* @version $Revision$ $Date$
- * $Log$
- * Revision 1.13 2004/10/13 11:51:00 matze
- * renamed packages to org.apache
- *
- * Revision 1.12 2004/07/01 22:05:04 mwessendorf
- * ASF switch
- *
- * Revision 1.11 2004/04/16 15:35:59 manolito
- * Log
- *
*/
public class SessionMap extends AbstractAttributeMap
{
@@ -49,7 +39,7 @@
protected Object getAttribute(String key)
{
HttpSession httpSession = getSession();
- return (httpSession == null)
+ return (httpSession == null)
? null : httpSession.getAttribute(key.toString());
}
@@ -74,7 +64,7 @@
? NullEnumeration.instance()
: httpSession.getAttributeNames();
}
-
+
private HttpSession getSession()
{
return _httpRequest.getSession(false);