You are viewing a plain text version of this content. The canonical link for it is here.
Posted to adffaces-commits@incubator.apache.org by jw...@apache.org on 2007/02/01 02:09:30 UTC
svn commit: r502077 [2/2] - in
/incubator/adffaces/branches/jwaldman-portal-pretrunkmerge/trinidad:
trinidad-api/src/main/java/org/apache/myfaces/trinidad/config/
trinidad-api/src/main/java/org/apache/myfaces/trinidad/context/
trinidad-impl/src/main/ja...
Modified: incubator/adffaces/branches/jwaldman-portal-pretrunkmerge/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/context/external/PortletInitParameterMap.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/jwaldman-portal-pretrunkmerge/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/context/external/PortletInitParameterMap.java?view=diff&rev=502077&r1=502076&r2=502077
==============================================================================
--- incubator/adffaces/branches/jwaldman-portal-pretrunkmerge/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/context/external/PortletInitParameterMap.java (original)
+++ incubator/adffaces/branches/jwaldman-portal-pretrunkmerge/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/context/external/PortletInitParameterMap.java Wed Jan 31 18:09:28 2007
@@ -1,17 +1,20 @@
/*
- * Copyright 2004 The Apache Software Foundation.
+ * 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
*
- * 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
*
- * 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.
+ * 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.
*/
Modified: incubator/adffaces/branches/jwaldman-portal-pretrunkmerge/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/context/external/PortletRequestMap.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/jwaldman-portal-pretrunkmerge/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/context/external/PortletRequestMap.java?view=diff&rev=502077&r1=502076&r2=502077
==============================================================================
--- incubator/adffaces/branches/jwaldman-portal-pretrunkmerge/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/context/external/PortletRequestMap.java (original)
+++ incubator/adffaces/branches/jwaldman-portal-pretrunkmerge/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/context/external/PortletRequestMap.java Wed Jan 31 18:09:28 2007
@@ -1,17 +1,20 @@
/*
- * Copyright 2004 The Apache Software Foundation.
+ * 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
*
- * 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
*
- * 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.
+ * 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.trinidadinternal.context.external;
Modified: incubator/adffaces/branches/jwaldman-portal-pretrunkmerge/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/context/external/PortletRequestParameterMap.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/jwaldman-portal-pretrunkmerge/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/context/external/PortletRequestParameterMap.java?view=diff&rev=502077&r1=502076&r2=502077
==============================================================================
--- incubator/adffaces/branches/jwaldman-portal-pretrunkmerge/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/context/external/PortletRequestParameterMap.java (original)
+++ incubator/adffaces/branches/jwaldman-portal-pretrunkmerge/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/context/external/PortletRequestParameterMap.java Wed Jan 31 18:09:28 2007
@@ -1,17 +1,20 @@
/*
- * Copyright 2004 The Apache Software Foundation.
+ * 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
*
- * 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
*
- * 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.
+ * 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.trinidadinternal.context.external;
Modified: incubator/adffaces/branches/jwaldman-portal-pretrunkmerge/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/context/external/PortletRequestParameterValuesMap.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/jwaldman-portal-pretrunkmerge/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/context/external/PortletRequestParameterValuesMap.java?view=diff&rev=502077&r1=502076&r2=502077
==============================================================================
--- incubator/adffaces/branches/jwaldman-portal-pretrunkmerge/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/context/external/PortletRequestParameterValuesMap.java (original)
+++ incubator/adffaces/branches/jwaldman-portal-pretrunkmerge/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/context/external/PortletRequestParameterValuesMap.java Wed Jan 31 18:09:28 2007
@@ -1,17 +1,20 @@
/*
- * Copyright 2004 The Apache Software Foundation.
+ * 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
*
- * 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
*
- * 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.
+ * 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.trinidadinternal.context.external;
Modified: incubator/adffaces/branches/jwaldman-portal-pretrunkmerge/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/context/external/ServletApplicationMap.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/jwaldman-portal-pretrunkmerge/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/context/external/ServletApplicationMap.java?view=diff&rev=502077&r1=502076&r2=502077
==============================================================================
--- incubator/adffaces/branches/jwaldman-portal-pretrunkmerge/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/context/external/ServletApplicationMap.java (original)
+++ incubator/adffaces/branches/jwaldman-portal-pretrunkmerge/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/context/external/ServletApplicationMap.java Wed Jan 31 18:09:28 2007
@@ -1,17 +1,20 @@
/*
- * Copyright 2004 The Apache Software Foundation.
+ * 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
*
- * 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
*
- * 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.
+ * 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.trinidadinternal.context.external;
Modified: incubator/adffaces/branches/jwaldman-portal-pretrunkmerge/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/context/external/ServletCookieMap.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/jwaldman-portal-pretrunkmerge/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/context/external/ServletCookieMap.java?view=diff&rev=502077&r1=502076&r2=502077
==============================================================================
--- incubator/adffaces/branches/jwaldman-portal-pretrunkmerge/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/context/external/ServletCookieMap.java (original)
+++ incubator/adffaces/branches/jwaldman-portal-pretrunkmerge/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/context/external/ServletCookieMap.java Wed Jan 31 18:09:28 2007
@@ -1,17 +1,20 @@
/*
- * Copyright 2004 The Apache Software Foundation.
+ * 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
*
- * 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
*
- * 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.
+ * 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.trinidadinternal.context.external;
@@ -22,7 +25,7 @@
/**
* HttpServletRequest Cookies as Map.
- *
+ *
* @author Dimitry D'hondt
* @author Anton Koinov
* @version $Revision: 278654 $ $Date: 2005-09-04 18:32:35 -0600 (Sun, 04 Sep 2005) $
Modified: incubator/adffaces/branches/jwaldman-portal-pretrunkmerge/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/context/external/ServletExternalContext.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/jwaldman-portal-pretrunkmerge/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/context/external/ServletExternalContext.java?view=diff&rev=502077&r1=502076&r2=502077
==============================================================================
--- incubator/adffaces/branches/jwaldman-portal-pretrunkmerge/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/context/external/ServletExternalContext.java (original)
+++ incubator/adffaces/branches/jwaldman-portal-pretrunkmerge/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/context/external/ServletExternalContext.java Wed Jan 31 18:09:28 2007
@@ -1,17 +1,20 @@
/*
- * Copyright 2004 The Apache Software Foundation.
+ * 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
*
- * 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
*
- * 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.
+ * 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.trinidadinternal.context.external;
@@ -45,7 +48,7 @@
* This class will implement the ExternalContext for use with Trinidad Configurations using the
* Trinidad {@link org.apache.myfaces.Trinidad.config.Configurator} object. <br>
* This code was origionally taken from MyFaces.
- *
+ *
* @author Manfred Geiler (Origional MyFaces Code)
* @author Anton Koinov
* @author Scott O'Bryan (latest modification by $Author$)
@@ -65,7 +68,7 @@
if (servletRequest != null && servletRequest instanceof HttpServletRequest)
{
_httpServletRequest = (HttpServletRequest) servletRequest;
-
+
if(_servletResponse != null)
{
_httpServletResponse = (HttpServletResponse) servletResponse;
@@ -158,12 +161,12 @@
{
_checkRequest();
_checkNull(url, "url");
-
+
if (_httpServletRequest == null)
{
throw new IllegalArgumentException("Only HttpServletRequest supported");
}
-
+
return _httpServletResponse.encodeURL(url);
}
@@ -509,7 +512,7 @@
_requestCookieMap = null;
_initParameterMap = null;
}
-
+
private void _checkNull(final Object o, final String param)
{
if (o == null)
@@ -517,7 +520,7 @@
throw new NullPointerException(param + " can not be null.");
}
}
-
+
private void _checkRequest()
{
if(_servletRequest == null)
@@ -525,15 +528,15 @@
throw new UnsupportedOperationException("Request is null on this context.");
}
}
-
+
private void _checkResponse()
{
if(_servletResponse == null)
{
throw new UnsupportedOperationException("Response is null on this context.");
- }
+ }
}
-
+
private String _lookupCharacterEncoding(final String contentType)
{
String characterEncoding = null;
Modified: incubator/adffaces/branches/jwaldman-portal-pretrunkmerge/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/context/external/ServletInitParameterMap.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/jwaldman-portal-pretrunkmerge/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/context/external/ServletInitParameterMap.java?view=diff&rev=502077&r1=502076&r2=502077
==============================================================================
--- incubator/adffaces/branches/jwaldman-portal-pretrunkmerge/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/context/external/ServletInitParameterMap.java (original)
+++ incubator/adffaces/branches/jwaldman-portal-pretrunkmerge/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/context/external/ServletInitParameterMap.java Wed Jan 31 18:09:28 2007
@@ -1,17 +1,20 @@
/*
- * 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.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * 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.trinidadinternal.context.external;
@@ -22,7 +25,7 @@
/**
* ServletContext init parameters as Map.
- *
+ *
* @author Anton Koinov (latest modification by $Author: oros $)
* @version $Revision: 278654 $ $Date: 2005-09-04 18:32:35 -0600 (Sun, 04 Sep 2005) $
*/
Modified: incubator/adffaces/branches/jwaldman-portal-pretrunkmerge/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/context/external/ServletRequestHeaderMap.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/jwaldman-portal-pretrunkmerge/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/context/external/ServletRequestHeaderMap.java?view=diff&rev=502077&r1=502076&r2=502077
==============================================================================
--- incubator/adffaces/branches/jwaldman-portal-pretrunkmerge/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/context/external/ServletRequestHeaderMap.java (original)
+++ incubator/adffaces/branches/jwaldman-portal-pretrunkmerge/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/context/external/ServletRequestHeaderMap.java Wed Jan 31 18:09:28 2007
@@ -1,17 +1,20 @@
/*
- * 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.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * 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.trinidadinternal.context.external;
@@ -21,7 +24,7 @@
/**
* HttpServletRequest headers as Map.
- *
+ *
* @author Anton Koinov (latest modification by $Author: oros $)
* @version $Revision: 278654 $ $Date: 2005-09-04 18:32:35 -0600 (Sun, 04 Sep 2005) $
*/
Modified: incubator/adffaces/branches/jwaldman-portal-pretrunkmerge/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/context/external/ServletRequestHeaderValuesMap.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/jwaldman-portal-pretrunkmerge/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/context/external/ServletRequestHeaderValuesMap.java?view=diff&rev=502077&r1=502076&r2=502077
==============================================================================
--- incubator/adffaces/branches/jwaldman-portal-pretrunkmerge/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/context/external/ServletRequestHeaderValuesMap.java (original)
+++ incubator/adffaces/branches/jwaldman-portal-pretrunkmerge/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/context/external/ServletRequestHeaderValuesMap.java Wed Jan 31 18:09:28 2007
@@ -1,17 +1,20 @@
/*
- * 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.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * 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.trinidadinternal.context.external;
@@ -26,7 +29,7 @@
/**
* HttpServletRequest header values (multi-value headers) as Map of String[].
- *
+ *
* @author Anton Koinov (latest modification by $Author: matze $)
* @version $Revision: 167257 $ $Date: 2004-10-13 05:51:02 -0600 (Wed, 13 Oct 2004) $
*/
Modified: incubator/adffaces/branches/jwaldman-portal-pretrunkmerge/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/context/external/ServletRequestMap.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/jwaldman-portal-pretrunkmerge/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/context/external/ServletRequestMap.java?view=diff&rev=502077&r1=502076&r2=502077
==============================================================================
--- incubator/adffaces/branches/jwaldman-portal-pretrunkmerge/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/context/external/ServletRequestMap.java (original)
+++ incubator/adffaces/branches/jwaldman-portal-pretrunkmerge/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/context/external/ServletRequestMap.java Wed Jan 31 18:09:28 2007
@@ -1,17 +1,20 @@
/*
- * 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.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * 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.trinidadinternal.context.external;
@@ -21,7 +24,7 @@
/**
* ServletRequest attributes Map.
- *
+ *
* @author Anton Koinov (latest modification by $Author: oros $)
* @version $Revision: 278654 $ $Date: 2005-09-04 18:32:35 -0600 (Sun, 04 Sep 2005) $
*/
Modified: incubator/adffaces/branches/jwaldman-portal-pretrunkmerge/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/context/external/ServletRequestParameterMap.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/jwaldman-portal-pretrunkmerge/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/context/external/ServletRequestParameterMap.java?view=diff&rev=502077&r1=502076&r2=502077
==============================================================================
--- incubator/adffaces/branches/jwaldman-portal-pretrunkmerge/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/context/external/ServletRequestParameterMap.java (original)
+++ incubator/adffaces/branches/jwaldman-portal-pretrunkmerge/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/context/external/ServletRequestParameterMap.java Wed Jan 31 18:09:28 2007
@@ -1,17 +1,20 @@
/*
- * 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.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * 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.trinidadinternal.context.external;
@@ -22,7 +25,7 @@
/**
* ServletRequest parameters as Map.
- *
+ *
* @author Anton Koinov (latest modification by $Author: matze $)
* @version $Revision: 167257 $ $Date: 2004-10-13 05:51:02 -0600 (Wed, 13 Oct 2004) $
*/
Modified: incubator/adffaces/branches/jwaldman-portal-pretrunkmerge/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/context/external/ServletRequestParameterValuesMap.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/jwaldman-portal-pretrunkmerge/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/context/external/ServletRequestParameterValuesMap.java?view=diff&rev=502077&r1=502076&r2=502077
==============================================================================
--- incubator/adffaces/branches/jwaldman-portal-pretrunkmerge/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/context/external/ServletRequestParameterValuesMap.java (original)
+++ incubator/adffaces/branches/jwaldman-portal-pretrunkmerge/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/context/external/ServletRequestParameterValuesMap.java Wed Jan 31 18:09:28 2007
@@ -1,17 +1,20 @@
/*
- * 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.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * 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.trinidadinternal.context.external;
@@ -22,7 +25,7 @@
/**
* ServletRequest multi-value parameters as Map.
- *
+ *
* @author Anton Koinov (latest modification by $Author: matze $)
* @version $Revision: 167257 $ $Date: 2004-10-13 05:51:02 -0600 (Wed, 13 Oct 2004) $
*/
Modified: incubator/adffaces/branches/jwaldman-portal-pretrunkmerge/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/context/external/ServletSessionMap.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/jwaldman-portal-pretrunkmerge/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/context/external/ServletSessionMap.java?view=diff&rev=502077&r1=502076&r2=502077
==============================================================================
--- incubator/adffaces/branches/jwaldman-portal-pretrunkmerge/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/context/external/ServletSessionMap.java (original)
+++ incubator/adffaces/branches/jwaldman-portal-pretrunkmerge/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/context/external/ServletSessionMap.java Wed Jan 31 18:09:28 2007
@@ -1,17 +1,20 @@
/*
- * Copyright 2004 The Apache Software Foundation.
+ * 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
*
- * 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
*
- * 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.
+ * 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.trinidadinternal.context.external;
Modified: incubator/adffaces/branches/jwaldman-portal-pretrunkmerge/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/skin/MinimalPortletSkinExtension.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/jwaldman-portal-pretrunkmerge/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/skin/MinimalPortletSkinExtension.java?view=diff&rev=502077&r1=502076&r2=502077
==============================================================================
--- incubator/adffaces/branches/jwaldman-portal-pretrunkmerge/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/skin/MinimalPortletSkinExtension.java (original)
+++ incubator/adffaces/branches/jwaldman-portal-pretrunkmerge/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/skin/MinimalPortletSkinExtension.java Wed Jan 31 18:09:28 2007
@@ -1,5 +1,21 @@
- /* Copyright (c) 2001, 2006, Oracle. All rights reserved. */
-
+/*
+ * 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.trinidadinternal.renderkit.core.skin;
@@ -28,5 +44,5 @@
"minimal",
XhtmlConstants.OUTPUT_MODE_PORTLET);
}
-
+
}
Modified: incubator/adffaces/branches/jwaldman-portal-pretrunkmerge/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/skin/SimplePortletSkin.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/jwaldman-portal-pretrunkmerge/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/skin/SimplePortletSkin.java?view=diff&rev=502077&r1=502076&r2=502077
==============================================================================
--- incubator/adffaces/branches/jwaldman-portal-pretrunkmerge/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/skin/SimplePortletSkin.java (original)
+++ incubator/adffaces/branches/jwaldman-portal-pretrunkmerge/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/skin/SimplePortletSkin.java Wed Jan 31 18:09:28 2007
@@ -1,8 +1,21 @@
/*
-** Copyright (c) 2001-2005, Oracle Corporation. All Rights Reserved.
-**
-**34567890123456789012345678901234567890123456789012345678901234567890123456789
-*/
+ * 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.trinidadinternal.renderkit.core.skin;
import java.util.HashMap;
@@ -56,21 +69,21 @@
{
return CoreRenderKit.OUTPUT_MODE_PORTLET;
}
-
+
/**
* Returns the style class map, or null if there is no map.
* The style class map for Portlet skins is a full style class name TO portlet style class name
* map. It does not compress style classes.
* @param arc RenderingContext
- * @return Map<String, String> It should be a map that contains the full style class name as
+ * @return Map<String, String> It should be a map that contains the full style class name as
* the key, and the value is a portlet style class.
*/
public Map<String, String> getStyleClassMap(
RenderingContext arc
)
{
- return _STYLES_MAP;
+ return _STYLES_MAP;
}
@@ -78,7 +91,7 @@
private static final String _NULL_STYLE = new String();
private static final String _PORTLET_FONT = "portlet-font";
private static final String _PORTLET_FONT_DIM = "portlet-font-dim";
-
+
// all these map to portlet-form-label
private static final String[] _FORM_LABEL_SELECTORS = new String[]
{
@@ -86,23 +99,23 @@
"af|outputLabel",
"af|inputChoice::label",
"af|inputColor::label",
- "af|inputDate::label",
+ "af|inputDate::label",
"af|inputFile::label",
- "af|inputListOfValues::label",
+ "af|inputListOfValues::label",
"af|inputNumberSpinbox::label",
"af|inputText::label",
- "af|panelLabelAndMessage::label",
+ "af|panelLabelAndMessage::label",
"af|selectBooleanCheckbox::label",
"af|selectBooleanRadio::label",
"af|selectManyCheckbox::label",
- "af|selectManyListbox::label",
+ "af|selectManyListbox::label",
"af|selectOneChoice::label",
- "af|selectOneListbox::label",
- "af|selectOneRadio::label",
+ "af|selectOneListbox::label",
+ "af|selectOneRadio::label",
XhtmlLafConstants.AF_MENU_CHOICE_LABEL_STYLE_CLASS,
SkinSelectors.SHUTTLE_HEADER_STYLE_CLASS,
};
-
+
// all these map to portlet-form-input-field
private static final String[] _FORM_INPUT_SELECTORS = new String[]
{
@@ -112,10 +125,10 @@
"af|inputText::content",
"af|inputColor::content",
SkinSelectors.AF_SELECT_INPUT_DATE_CONTENT_STYLE_CLASS,
- "af|inputListOfValues::content",
- "af|panelLabelAndMessage::content",
- };
-
+ "af|inputListOfValues::content",
+ "af|panelLabelAndMessage::content",
+ };
+
// all these map to portlet-form-field - Text for a field (not input field. e.g., checkboxes)
private static final String[] _FORM_FIELD_SELECTORS = new String[]
{
@@ -129,8 +142,8 @@
"af|selectOneListbox::content",
"af|selectOneRadio::content",
"af|selectOrderShuttle::content"
- };
-
+ };
+
// portlet-form-button
private static final String[] _PORTLET_FORM_BUTTON = new String[]
{
@@ -156,31 +169,31 @@
SimpleDesktopConstants.AF_MENU_BAR_STYLE_CLASS,
SimpleDesktopConstants.AF_PANEL_SIDE_BAR_STYLE_CLASS,
};
-
+
// These map to 'portlet-table-body' + itself (add portlet-table-body to the style class )
private static final String[] _TABLE_BODY_PLUS_ITSELF = new String[]
{
- SkinSelectors.AF_COLUMN_CELL_NUMBER_STYLE,
+ SkinSelectors.AF_COLUMN_CELL_NUMBER_STYLE,
SkinSelectors.AF_COLUMN_CELL_ICON_FORMAT_STYLE,
SkinSelectors.AF_TABLE_SELECT_ONE_CELL_ICON_FORMAT_STYLE,
SkinSelectors.AF_TABLE_SELECT_MANY_CELL_ICON_FORMAT_STYLE,
- SkinSelectors.TABLE_SELECT_CELL_STYLE,
+ SkinSelectors.TABLE_SELECT_CELL_STYLE,
};
-
+
// These map to 'portlet-table-alternate' + itself (add portlet-table-alternate to the style class )
private static final String[] _TABLE_ALT_PLUS_ITSELF = new String[]
{
- SkinSelectors.AF_COLUMN_CELL_ICON_BAND_STYLE,
+ SkinSelectors.AF_COLUMN_CELL_ICON_BAND_STYLE,
SkinSelectors.AF_TABLE_SELECT_ONE_CELL_ICON_BAND_STYLE,
SkinSelectors.AF_TABLE_SELECT_MANY_CELL_ICON_BAND_STYLE,
SkinSelectors.AF_COLUMN_CELL_NUMBER_BAND_STYLE,
- SkinSelectors.TABLE_BAND_SELECT_CELL_STYLE,
+ SkinSelectors.TABLE_BAND_SELECT_CELL_STYLE,
};
-
+
// These map to 'portlet-table-header' + itself (add portlet-table-header to the style class )
private static final String[] _TABLE_HDR_PLUS_ITSELF = new String[]
{
- SkinSelectors.AF_COLUMN_HEADER_NUMBER_STYLE,
+ SkinSelectors.AF_COLUMN_HEADER_NUMBER_STYLE,
SkinSelectors.AF_COLUMN_HEADER_ICON_STYLE,
SkinSelectors.AF_COLUMN_ROW_HEADER_TEXT_STYLE,
};
@@ -199,36 +212,36 @@
// Begin form control mappings
// ---------------------------
- // portlet-form-label - Text used for the descriptive label
+ // portlet-form-label - Text used for the descriptive label
// of the whole form not the label for fields
// portlet-form-input-field - Text of the user-input in an input field.
// portlet-form-field-label - Text for a separator of fields (e.g., checkboxes)
// portlet-form-field - Text for a field (not input field. e.g., checkboxes)
// Currently UNUSED
// portlet-form-button (text on a button)
- // portlet-icon-label (Text that appears beside a context depended action icon)
- // portlet-dlg-icon-label (Text that appears beside a 'standard' icon (OK, Cancel))
-
+ // portlet-icon-label (Text that appears beside a context depended action icon)
+ // portlet-dlg-icon-label (Text that appears beside a 'standard' icon (OK, Cancel))
+
// TODO: put some style class on the <input> for checkboxes so I can
// map it to portlet-form-field????
// TODO: I use portlet-font for the text in a choice. Is this right?
-
-
+
+
for (int i=0; i < _FORM_LABEL_SELECTORS.length; i++)
_STYLES_MAP.put(_FORM_LABEL_SELECTORS[i], "portlet-form-label");
-
+
for (int i=0; i < _FORM_INPUT_SELECTORS.length; i++)
- _STYLES_MAP.put(_FORM_INPUT_SELECTORS[i], "portlet-form-input-field");
-
+ _STYLES_MAP.put(_FORM_INPUT_SELECTORS[i], "portlet-form-input-field");
+
for (int i=0; i < _FORM_FIELD_SELECTORS.length; i++)
- _STYLES_MAP.put(_FORM_FIELD_SELECTORS[i], "portlet-form-field");
-
-
+ _STYLES_MAP.put(_FORM_FIELD_SELECTORS[i], "portlet-form-field");
+
+
for (int i=0; i < _PORTLET_FORM_BUTTON.length; i++)
- _STYLES_MAP.put(_PORTLET_FORM_BUTTON[i], "portlet-form-button");
-
+ _STYLES_MAP.put(_PORTLET_FORM_BUTTON[i], "portlet-form-button");
+
_STYLES_MAP.put(XhtmlLafConstants.AF_PANEL_FORM_LABEL_CELL_STYLE_CLASS, _NULL_STYLE);
-
+
// End form control mappings
// -------------------------
@@ -257,39 +270,39 @@
// Begin table mappings
// --------------------
for (int i=0; i < _TABLE_TEXT_SELECTORS.length; i++)
- _STYLES_MAP.put(_TABLE_TEXT_SELECTORS[i], "portlet-table-text");
-
- _STYLES_MAP.put(SkinSelectors.AF_TABLE_COLUMN_FOOTER_STYLE, "portlet-table-footer");
- _STYLES_MAP.put(SkinSelectors.AF_TABLE_DETAIL_STYLE, "portlet-table-body");
+ _STYLES_MAP.put(_TABLE_TEXT_SELECTORS[i], "portlet-table-text");
+
+ _STYLES_MAP.put(SkinSelectors.AF_TABLE_COLUMN_FOOTER_STYLE, "portlet-table-footer");
+ _STYLES_MAP.put(SkinSelectors.AF_TABLE_DETAIL_STYLE, "portlet-table-body");
_STYLES_MAP.put(SkinSelectors.AF_COLUMN_CELL_TEXT_STYLE, "portlet-table-body");
_STYLES_MAP.put(SkinSelectors.AF_COLUMN_TOTAL_NUMBER_STYLE, "portlet-table-body");
- _STYLES_MAP.put(SkinSelectors.AF_COLUMN_TOTAL_TEXT_STYLE, "portlet-table-body");
+ _STYLES_MAP.put(SkinSelectors.AF_COLUMN_TOTAL_TEXT_STYLE, "portlet-table-body");
_STYLES_MAP.put(SkinSelectors.AF_COLUMN_CELL_TEXT_BAND_STYLE, "portlet-table-alternate");
_STYLES_MAP.put(SkinSelectors.AF_COLUMN_HEADER_TEXT_STYLE, "portlet-table-header");
// selectInputDate and chooseDate have tables
_STYLES_MAP.put(SkinSelectors.AF_SELECT_INPUT_DATE_HEADER_STYLE_CLASS, "portlet-table-header");
_STYLES_MAP.put(SkinSelectors.AF_CHOOSE_DATE_HEADER_STYLE_CLASS, "portlet-table-header");
- _STYLES_MAP.put(SkinSelectors.AF_CHOOSE_DATE_CONTENT_STYLE_CLASS, "portlet-table-body");
+ _STYLES_MAP.put(SkinSelectors.AF_CHOOSE_DATE_CONTENT_STYLE_CLASS, "portlet-table-body");
// add portlet-table-body + itself
for (int i=0; i < _TABLE_BODY_PLUS_ITSELF.length; i++)
{
- _STYLES_MAP.put(_TABLE_BODY_PLUS_ITSELF[i], "portlet-table-text " +
+ _STYLES_MAP.put(_TABLE_BODY_PLUS_ITSELF[i], "portlet-table-text " +
StyleUtils.convertToValidSelector(_TABLE_BODY_PLUS_ITSELF[i]));
}
-
+
// add portlet-table-alternate + itself
for (int i=0; i < _TABLE_ALT_PLUS_ITSELF.length; i++)
{
- _STYLES_MAP.put(_TABLE_ALT_PLUS_ITSELF[i], "portlet-table-text " +
- StyleUtils.convertToValidSelector(_TABLE_ALT_PLUS_ITSELF[i]));
+ _STYLES_MAP.put(_TABLE_ALT_PLUS_ITSELF[i], "portlet-table-text " +
+ StyleUtils.convertToValidSelector(_TABLE_ALT_PLUS_ITSELF[i]));
}
-
+
// add portlet-table-header + itself
for (int i=0; i < _TABLE_HDR_PLUS_ITSELF.length; i++)
{
- _STYLES_MAP.put(_TABLE_HDR_PLUS_ITSELF[i], "portlet-table-text " +
- StyleUtils.convertToValidSelector(_TABLE_HDR_PLUS_ITSELF[i]));
+ _STYLES_MAP.put(_TABLE_HDR_PLUS_ITSELF[i], "portlet-table-text " +
+ StyleUtils.convertToValidSelector(_TABLE_HDR_PLUS_ITSELF[i]));
}
// Since we null'd out the properties, there is no reason to output this
@@ -314,9 +327,9 @@
// portlet-font-dim mappings
// -------------------
- _STYLES_MAP.put(SkinSelectors.AF_NAVIGATION_PATH_SELECTED_STEP_STYLE_CLASS, _PORTLET_FONT);
- _STYLES_MAP.put(SkinSelectors.AF_NAVIGATION_PATH_STEP_STYLE_CLASS, _PORTLET_FONT);
- _STYLES_MAP.put(SkinSelectors.NAV_BAR_ILINK_STYLE_CLASS, _PORTLET_FONT_DIM);
+ _STYLES_MAP.put(SkinSelectors.AF_NAVIGATION_PATH_SELECTED_STEP_STYLE_CLASS, _PORTLET_FONT);
+ _STYLES_MAP.put(SkinSelectors.AF_NAVIGATION_PATH_STEP_STYLE_CLASS, _PORTLET_FONT);
+ _STYLES_MAP.put(SkinSelectors.NAV_BAR_ILINK_STYLE_CLASS, _PORTLET_FONT_DIM);
_STYLES_MAP.put("AFInstructionTextDisabled", _PORTLET_FONT_DIM);
_STYLES_MAP.put("AFFieldTextDisabled", _PORTLET_FONT_DIM);
_STYLES_MAP.put("AFFieldTextLTRDisabled", _PORTLET_FONT_DIM);
@@ -330,24 +343,24 @@
_STYLES_MAP.put(XhtmlLafConstants.DISABLED_STYLE_CLASS, _PORTLET_FONT_DIM);
_STYLES_MAP.put(SkinSelectors.AF_SELECT_INPUT_DATE_DISABLED_STYLE_CLASS, _PORTLET_FONT_DIM);
_STYLES_MAP.put(SkinSelectors.AF_CHOOSE_DATE_DISABLED_STYLE_CLASS, _PORTLET_FONT_DIM);
-
+
// We want to keep certain aspects of these styles, so we blank
// out the aspects we don't want in portlet-desktop.xss:
// keep boldness
_STYLES_MAP.put("AFDataTextDisabled", "portlet-font-dim AFDataTextDisabled");
// keep boldness and alignment
_STYLES_MAP.put("AFDataNumberDisabled", "portlet-font-dim AFDataNumberDisabled");
- _STYLES_MAP.put("AFFieldNumberDisabled", "portlet-font-dim AFFieldNumberDisabled");
+ _STYLES_MAP.put("AFFieldNumberDisabled", "portlet-font-dim AFFieldNumberDisabled");
_STYLES_MAP.put(XhtmlLafConstants.AF_MENU_BUTTONS_TEXT_DISABLED_STYLE_CLASS,"portlet-font-dim " +
- StyleUtils.convertToValidSelector(XhtmlLafConstants.AF_MENU_BUTTONS_TEXT_DISABLED_STYLE_CLASS));
+ StyleUtils.convertToValidSelector(XhtmlLafConstants.AF_MENU_BUTTONS_TEXT_DISABLED_STYLE_CLASS));
+
-
// end portlet-font-dim mappings
// -------------------
// begin portlet-font mappings
// -------------------
-
+
_STYLES_MAP.put(SkinSelectors.INSTRUCTION_TEXT_STYLE_CLASS,_PORTLET_FONT);
_STYLES_MAP.put("AFFieldText", _PORTLET_FONT);
_STYLES_MAP.put("AFFieldTextLTR", _PORTLET_FONT);
@@ -368,10 +381,10 @@
// I'll leave this in.
_STYLES_MAP.put("af|document", "portlet-font " +
StyleUtils.convertToValidSelector("af|document"));
-
+
_STYLES_MAP.put(SkinSelectors.AF_SELECT_INPUT_DATE_ENABLED_STYLE_CLASS,_PORTLET_FONT);
_STYLES_MAP.put(SkinSelectors.NAV_BAR_ALINK_STYLE_CLASS, _PORTLET_FONT);
- _STYLES_MAP.put(SkinSelectors.NAV_BAR_VIEW_STYLE_CLASS, _PORTLET_FONT);
+ _STYLES_MAP.put(SkinSelectors.NAV_BAR_VIEW_STYLE_CLASS, _PORTLET_FONT);
_STYLES_MAP.put(SkinSelectors.PAGE_STAMP_TEXT_STYLE_CLASS, _PORTLET_FONT);
_STYLES_MAP.put(SkinSelectors.AF_TREE_TABLE_MP_STYLE_CLASS, _PORTLET_FONT);
_STYLES_MAP.put(SkinSelectors.AF_NAVIGATION_PATH_STYLE_CLASS,_PORTLET_FONT);
@@ -381,27 +394,27 @@
_STYLES_MAP.put(SkinSelectors.LINK_STYLE_CLASS, _PORTLET_FONT);
_STYLES_MAP.put(XhtmlLafConstants.LINK_TEXT_STYLE_CLASS, _PORTLET_FONT);
_STYLES_MAP.put(SkinSelectors.AF_CHOOSE_DATE_ENABLED_STYLE_CLASS, _PORTLET_FONT);
-
+
// keep boldness
_STYLES_MAP.put(SkinSelectors.AF_CHOOSE_DATE_SELECTED_STYLE_CLASS,
"portlet-font " +
StyleUtils.convertToValidSelector(SkinSelectors.AF_CHOOSE_DATE_SELECTED_STYLE_CLASS));
-
+
// keep boldness
_STYLES_MAP.put(SkinSelectors.AF_SELECT_INPUT_DATE_SELECTED_STYLE_CLASS,
"portlet-font " +
StyleUtils.convertToValidSelector(SkinSelectors.AF_SELECT_INPUT_DATE_SELECTED_STYLE_CLASS));
-
+
// navigationPane components.
// these contains contextual selectors which will break unless we keep the class in tact
_STYLES_MAP.put(SkinSelectors.AF_NAVIGATION_LEVEL_TABS_MID_STYLE_CLASS, "portlet-font " +
StyleUtils.convertToValidSelector(SkinSelectors.AF_NAVIGATION_LEVEL_TABS_MID_STYLE_CLASS));
_STYLES_MAP.put(SkinSelectors.AF_NAVIGATION_LEVEL_LIST_CONTENT_STYLE_CLASS, "portlet-font " +
- StyleUtils.convertToValidSelector(SkinSelectors.AF_NAVIGATION_LEVEL_LIST_CONTENT_STYLE_CLASS));
+ StyleUtils.convertToValidSelector(SkinSelectors.AF_NAVIGATION_LEVEL_LIST_CONTENT_STYLE_CLASS));
_STYLES_MAP.put(SkinSelectors.AF_NAVIGATION_LEVEL_BUTTONS_CONTENT_STYLE_CLASS, "portlet-font " +
- StyleUtils.convertToValidSelector(SkinSelectors.AF_NAVIGATION_LEVEL_BUTTONS_CONTENT_STYLE_CLASS));
+ StyleUtils.convertToValidSelector(SkinSelectors.AF_NAVIGATION_LEVEL_BUTTONS_CONTENT_STYLE_CLASS));
_STYLES_MAP.put(SkinSelectors.AF_NAVIGATION_LEVEL_BAR_CONTENT_STYLE_CLASS, "portlet-font " +
- StyleUtils.convertToValidSelector(SkinSelectors.AF_NAVIGATION_LEVEL_BAR_CONTENT_STYLE_CLASS));
+ StyleUtils.convertToValidSelector(SkinSelectors.AF_NAVIGATION_LEVEL_BAR_CONTENT_STYLE_CLASS));
// may need padding + nowrap, so we keep the style
_STYLES_MAP.put(XhtmlLafConstants.AF_PANEL_PAGE_PRIVACY_STYLE_CLASS, "portlet-font " +
StyleUtils.convertToValidSelector(XhtmlLafConstants.AF_PANEL_PAGE_PRIVACY_STYLE_CLASS));
@@ -414,7 +427,7 @@
StyleUtils.convertToValidSelector(XhtmlLafConstants.AF_MENU_BUTTONS_TEXT_DISABLED_STYLE_CLASS));
_STYLES_MAP.put(XhtmlLafConstants.AF_MENU_BUTTONS_TEXT_DISABLED_STYLE_CLASS,"portlet-font " +
StyleUtils.convertToValidSelector(XhtmlLafConstants.AF_MENU_BUTTONS_TEXT_DISABLED_STYLE_CLASS));
-
+
// end portlet-font
// -------------------
@@ -429,7 +442,7 @@
// header classes (e.g., AF_PANEL_HEADER_STYLE_CLAS) to null and
// map AFHeaderAlias to portlet-section-header and map
// AFSubheaderAlias to portlet-section-subheader.
-
+
// For now, we just render portlet-section-header for the header
_STYLES_MAP.put(SkinSelectors.AF_PANEL_HEADER_STYLE_CLASS, "portlet-section-header");
_STYLES_MAP.put(SkinSelectors.AF_PANEL_HEADER_ERROR_STYLE_CLASS, "portlet-section-header");
@@ -439,7 +452,7 @@
StyleUtils.convertToValidSelector(SimpleDesktopConstants.AF_PANEL_BOX_HEADER_STYLE_CLASS));
_STYLES_MAP.put(SkinSelectors.AF_PANELACCORDION_TITLE_LINK_STYLE_CLASS,
"portlet-section-header");
-
+
// end portlet-section-header
@@ -450,7 +463,7 @@
// was requested by the portal team
//
// tabs might be styled, so leave them alone for padding and such.
- _STYLES_MAP.put(SimpleDesktopConstants.AF_MENU_TABS_SELECTED_STYLE_CLASS,
+ _STYLES_MAP.put(SimpleDesktopConstants.AF_MENU_TABS_SELECTED_STYLE_CLASS,
"portlet-table-selected " +
StyleUtils.convertToValidSelector(SimpleDesktopConstants.AF_MENU_TABS_SELECTED_STYLE_CLASS));
_STYLES_MAP.put(SimpleDesktopConstants.AF_MENU_TABS_ENABLED_STYLE_CLASS,
@@ -482,7 +495,7 @@
"portlet-table-alternate");
- // end menu
+ // end menu
}
Modified: incubator/adffaces/branches/jwaldman-portal-pretrunkmerge/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/util/ExternalContextUtils.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/jwaldman-portal-pretrunkmerge/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/util/ExternalContextUtils.java?view=diff&rev=502077&r1=502076&r2=502077
==============================================================================
--- incubator/adffaces/branches/jwaldman-portal-pretrunkmerge/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/util/ExternalContextUtils.java (original)
+++ incubator/adffaces/branches/jwaldman-portal-pretrunkmerge/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/util/ExternalContextUtils.java Wed Jan 31 18:09:28 2007
@@ -1,17 +1,20 @@
/*
- * Copyright 2001-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.
+ * 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.trinidadinternal.util;
@@ -27,7 +30,7 @@
/**
* This provides some functionality for determining some things about the
* native request object that is not provided by the base utils.
- *
+ *
* @author Scott O'Bryan (latest modification by $Author$)
* @version $Revision$ $Date$
*/
@@ -35,7 +38,7 @@
{
/**
* Returns the character encoding or null if there isn't any
- *
+ *
* @param externalContext
* @return
*/
@@ -66,7 +69,7 @@
/**
* Returns the content length or -1 if the unknown.
- *
+ *
* @param externalContext
* the ExternalContext
* @return the length or -1
@@ -97,7 +100,7 @@
/**
* Returns the content type from the current externalContext or <code>null</code> if unknown.
- *
+ *
* @param externalContext
* the ExternalContext
* @return the content type or <code>null</code>
@@ -129,7 +132,7 @@
/**
* Returns the request input stream if one is available
- *
+ *
* @param externalContext
* @return
* @throws IOException
@@ -162,7 +165,7 @@
/**
* Returns <code>true</code> if this externalContext represents an "action". An action request
* is any ServletRequest or a portlet ActionRequest. It is assumed that the ExternalContext
- *
+ *
* @return a boolean of <code>true</code> if this is a Portlet ActionRequest or an non-portlet
* request.
*/
@@ -182,10 +185,10 @@
/**
* Returns whether or not this external context is from a Portlet or a Servlet.
- *
+ *
* @param externalContext
* the ExternalContext to check
- *
+ *
* @return <code>true</code> if this is a portlet RenderRequest or ActionRequest and
* <code>false<code> if it is not.
*/
@@ -231,7 +234,7 @@
// Performance enhancement. These will be needed anyway, let's not get them every time.
private static final Class _PORTLET_ACTION_REQUEST_CLASS;
private static final Class _PORTLET_CONTEXT_CLASS;
-
+
static
{
Class context;
Modified: incubator/adffaces/branches/jwaldman-portal-pretrunkmerge/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/webapp/TrinidadListenerImpl.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/jwaldman-portal-pretrunkmerge/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/webapp/TrinidadListenerImpl.java?view=diff&rev=502077&r1=502076&r2=502077
==============================================================================
--- incubator/adffaces/branches/jwaldman-portal-pretrunkmerge/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/webapp/TrinidadListenerImpl.java (original)
+++ incubator/adffaces/branches/jwaldman-portal-pretrunkmerge/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/webapp/TrinidadListenerImpl.java Wed Jan 31 18:09:28 2007
@@ -1,17 +1,20 @@
/*
- * Copyright 2004-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.
+ * 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.trinidadinternal.webapp;
Modified: incubator/adffaces/branches/jwaldman-portal-pretrunkmerge/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/webapp/wrappers/ActionRequestWrapper.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/jwaldman-portal-pretrunkmerge/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/webapp/wrappers/ActionRequestWrapper.java?view=diff&rev=502077&r1=502076&r2=502077
==============================================================================
--- incubator/adffaces/branches/jwaldman-portal-pretrunkmerge/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/webapp/wrappers/ActionRequestWrapper.java (original)
+++ incubator/adffaces/branches/jwaldman-portal-pretrunkmerge/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/webapp/wrappers/ActionRequestWrapper.java Wed Jan 31 18:09:28 2007
@@ -1,17 +1,20 @@
/*
- * Copyright 2004-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.
+ * 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.trinidadinternal.webapp.wrappers;
@@ -38,9 +41,9 @@
public ActionRequestWrapper(ActionRequest request)
{
super(request);
- _req = request;
+ _req = request;
}
-
+
private ActionRequest _req;
/* (non-Javadoc)
@@ -88,6 +91,6 @@
*/
public void setCharacterEncoding(String arg0) throws UnsupportedEncodingException
{
- _req.setCharacterEncoding(arg0);
+ _req.setCharacterEncoding(arg0);
}
}
Modified: incubator/adffaces/branches/jwaldman-portal-pretrunkmerge/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/webapp/wrappers/ActionResponseWrapper.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/jwaldman-portal-pretrunkmerge/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/webapp/wrappers/ActionResponseWrapper.java?view=diff&rev=502077&r1=502076&r2=502077
==============================================================================
--- incubator/adffaces/branches/jwaldman-portal-pretrunkmerge/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/webapp/wrappers/ActionResponseWrapper.java (original)
+++ incubator/adffaces/branches/jwaldman-portal-pretrunkmerge/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/webapp/wrappers/ActionResponseWrapper.java Wed Jan 31 18:09:28 2007
@@ -1,17 +1,20 @@
/*
- * Copyright 2004-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.
+ * 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.trinidadinternal.webapp.wrappers;
@@ -25,7 +28,7 @@
import javax.portlet.WindowStateException;
/**
- * TODO: Document this
+ * TODO: Document this
*
* @author Scott O'Bryan (latest modification by $Author$)
* @version $Revision$ $Date$
@@ -38,7 +41,7 @@
super(response);
_resp = response;
}
-
+
private ActionResponse _resp;
/* (non-Javadoc)
Modified: incubator/adffaces/branches/jwaldman-portal-pretrunkmerge/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/webapp/wrappers/PortletContextWrapper.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/jwaldman-portal-pretrunkmerge/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/webapp/wrappers/PortletContextWrapper.java?view=diff&rev=502077&r1=502076&r2=502077
==============================================================================
--- incubator/adffaces/branches/jwaldman-portal-pretrunkmerge/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/webapp/wrappers/PortletContextWrapper.java (original)
+++ incubator/adffaces/branches/jwaldman-portal-pretrunkmerge/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/webapp/wrappers/PortletContextWrapper.java Wed Jan 31 18:09:28 2007
@@ -1,17 +1,20 @@
/*
- * Copyright 2004-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.
+ * 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.trinidadinternal.webapp.wrappers;
@@ -25,7 +28,7 @@
import javax.portlet.PortletRequestDispatcher;
/**
- * TODO: Document this
+ * TODO: Document this
*
* @author Scott O'Bryan (latest modification by $Author$)
* @version $Revision$ $Date$
@@ -37,7 +40,7 @@
{
_context = context;
}
-
+
private PortletContext _context;
/**
Modified: incubator/adffaces/branches/jwaldman-portal-pretrunkmerge/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/webapp/wrappers/PortletRequestDispatcherWrapper.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/jwaldman-portal-pretrunkmerge/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/webapp/wrappers/PortletRequestDispatcherWrapper.java?view=diff&rev=502077&r1=502076&r2=502077
==============================================================================
--- incubator/adffaces/branches/jwaldman-portal-pretrunkmerge/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/webapp/wrappers/PortletRequestDispatcherWrapper.java (original)
+++ incubator/adffaces/branches/jwaldman-portal-pretrunkmerge/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/webapp/wrappers/PortletRequestDispatcherWrapper.java Wed Jan 31 18:09:28 2007
@@ -1,17 +1,20 @@
/*
- * Copyright 2004-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.
+ * 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.trinidadinternal.webapp.wrappers;
@@ -23,7 +26,7 @@
import javax.portlet.RenderResponse;
/**
- * TODO: Document this
+ * TODO: Document this
*
* @author Scott O'Bryan (latest modification by $Author$)
* @version $Revision$ $Date$
@@ -35,9 +38,9 @@
{
_dispatch = dispatcher;
}
-
+
private PortletRequestDispatcher _dispatch;
-
+
/* (non-Javadoc)
* @see javax.portlet.PortletRequestDispatcher#include(javax.portlet.RenderRequest, javax.portlet.RenderResponse)
*/
Modified: incubator/adffaces/branches/jwaldman-portal-pretrunkmerge/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/webapp/wrappers/PortletRequestWrapper.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/jwaldman-portal-pretrunkmerge/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/webapp/wrappers/PortletRequestWrapper.java?view=diff&rev=502077&r1=502076&r2=502077
==============================================================================
--- incubator/adffaces/branches/jwaldman-portal-pretrunkmerge/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/webapp/wrappers/PortletRequestWrapper.java (original)
+++ incubator/adffaces/branches/jwaldman-portal-pretrunkmerge/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/webapp/wrappers/PortletRequestWrapper.java Wed Jan 31 18:09:28 2007
@@ -1,17 +1,20 @@
/*
- * Copyright 2004-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.
+ * 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.trinidadinternal.webapp.wrappers;
@@ -28,7 +31,7 @@
import javax.portlet.WindowState;
/**
- * TODO: Document this
+ * TODO: Document this
*
* @author Scott O'Bryan (latest modification by $Author$)
* @version $Revision$ $Date$
@@ -40,7 +43,7 @@
{
_req = request;
}
-
+
private PortletRequest _req;
/**
@@ -358,7 +361,7 @@
{
_req.setAttribute(arg0, arg1);
}
-
+
public PortletRequest getRequest()
{
return _req;
Modified: incubator/adffaces/branches/jwaldman-portal-pretrunkmerge/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/webapp/wrappers/PortletResponseWrapper.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/jwaldman-portal-pretrunkmerge/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/webapp/wrappers/PortletResponseWrapper.java?view=diff&rev=502077&r1=502076&r2=502077
==============================================================================
--- incubator/adffaces/branches/jwaldman-portal-pretrunkmerge/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/webapp/wrappers/PortletResponseWrapper.java (original)
+++ incubator/adffaces/branches/jwaldman-portal-pretrunkmerge/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/webapp/wrappers/PortletResponseWrapper.java Wed Jan 31 18:09:28 2007
@@ -1,24 +1,27 @@
/*
- * Copyright 2004-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.
+ * 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.trinidadinternal.webapp.wrappers;
import javax.portlet.PortletResponse;
/**
- * TODO: Document this
+ * TODO: Document this
*
* @author Scott O'Bryan (latest modification by $Author$)
* @version $Revision$ $Date$
@@ -28,11 +31,11 @@
{
public PortletResponseWrapper(PortletResponse response)
{
- _resp = response;
+ _resp = response;
}
-
+
private PortletResponse _resp;
-
+
public PortletResponse getResponse()
{
return _resp;
Modified: incubator/adffaces/branches/jwaldman-portal-pretrunkmerge/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/webapp/wrappers/RenderRequestWrapper.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/jwaldman-portal-pretrunkmerge/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/webapp/wrappers/RenderRequestWrapper.java?view=diff&rev=502077&r1=502076&r2=502077
==============================================================================
--- incubator/adffaces/branches/jwaldman-portal-pretrunkmerge/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/webapp/wrappers/RenderRequestWrapper.java (original)
+++ incubator/adffaces/branches/jwaldman-portal-pretrunkmerge/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/webapp/wrappers/RenderRequestWrapper.java Wed Jan 31 18:09:28 2007
@@ -1,24 +1,27 @@
/*
- * Copyright 2004-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.
+ * 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.trinidadinternal.webapp.wrappers;
import javax.portlet.RenderRequest;
/**
- * TODO: Document this
+ * TODO: Document this
*
* @author Scott O'Bryan (latest modification by $Author$)
* @version $Revision$ $Date$
@@ -31,7 +34,7 @@
super(request);
_req = request;
}
-
+
private RenderRequest _req;
/* (non-Javadoc)
Modified: incubator/adffaces/branches/jwaldman-portal-pretrunkmerge/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/webapp/wrappers/RenderResponseWrapper.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/jwaldman-portal-pretrunkmerge/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/webapp/wrappers/RenderResponseWrapper.java?view=diff&rev=502077&r1=502076&r2=502077
==============================================================================
--- incubator/adffaces/branches/jwaldman-portal-pretrunkmerge/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/webapp/wrappers/RenderResponseWrapper.java (original)
+++ incubator/adffaces/branches/jwaldman-portal-pretrunkmerge/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/webapp/wrappers/RenderResponseWrapper.java Wed Jan 31 18:09:28 2007
@@ -1,17 +1,20 @@
/*
- * Copyright 2004-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.
+ * 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.trinidadinternal.webapp.wrappers;
@@ -24,7 +27,7 @@
import javax.portlet.RenderResponse;
/**
- * TODO: Document this
+ * TODO: Document this
*
* @author Scott O'Bryan (latest modification by $Author$)
* @version $Revision$ $Date$
@@ -37,7 +40,7 @@
super(response);
_resp = response;
}
-
+
private RenderResponse _resp;
/* (non-Javadoc)